From f2bfcad7ffdd09911f282afe2a2051b3708601c9 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 4 Feb 2013 14:16:51 -0600 Subject: Rename KIcon to enhance compatibility with KDE4 --- tdeui/AUTHORS | 2 +- tdeui/kanimwidget.cpp | 2 +- tdeui/kanimwidget.h | 2 +- tdeui/kcombobox.cpp | 4 +- tdeui/kdialog.cpp | 4 +- tdeui/kedittoolbar.cpp | 16 +++--- tdeui/kguiitem.cpp | 2 +- tdeui/kguiitem.h | 6 +- tdeui/khelpmenu.cpp | 2 +- tdeui/kiconview.cpp | 116 +++++++++++++++++++------------------- tdeui/kiconview.h | 48 ++++++++-------- tdeui/kiconviewsearchline.cpp | 40 ++++++------- tdeui/kiconviewsearchline.h | 18 +++--- tdeui/kmessagebox.cpp | 2 +- tdeui/kpassdlg.cpp | 2 +- tdeui/ksystemtray.cpp | 4 +- tdeui/ktabbar.cpp | 2 +- tdeui/ktip.cpp | 6 +- tdeui/tdeaction.cpp | 10 ++-- tdeui/tdeaction.h | 6 +- tdeui/tdeactionclasses.cpp | 4 +- tdeui/tdeactionselector.cpp | 2 +- tdeui/tdeactionselector.h | 4 +- tdeui/tdemainwindow.h | 2 +- tdeui/tdetoolbar.cpp | 14 ++--- tdeui/tdetoolbar.h | 4 +- tdeui/tdetoolbarbutton.cpp | 16 +++--- tdeui/tests/itemcontainertest.cpp | 16 +++--- tdeui/tests/itemcontainertest.h | 4 +- 29 files changed, 180 insertions(+), 180 deletions(-) (limited to 'tdeui') diff --git a/tdeui/AUTHORS b/tdeui/AUTHORS index a1fcc2fd3..fdfac1fc0 100644 --- a/tdeui/AUTHORS +++ b/tdeui/AUTHORS @@ -46,7 +46,7 @@ Nicolas Hadacek Key configuration classes, bug fixes Christoph Neerfeld -KIconLoader class +TDEIconLoader class Sven Radej KLineEdit, KCombo, TDEToolbar, KStatusBar diff --git a/tdeui/kanimwidget.cpp b/tdeui/kanimwidget.cpp index 004127b9a..664117ce3 100644 --- a/tdeui/kanimwidget.cpp +++ b/tdeui/kanimwidget.cpp @@ -185,7 +185,7 @@ void KAnimWidget::updateIcons() if (parent()->inherits( "TDEToolBar" )) d->size = ((TDEToolBar*)parent())->iconSize(); if (!d->size) - d->size = TDEGlobal::iconLoader()->currentSize(KIcon::MainToolbar); + d->size = TDEGlobal::iconLoader()->currentSize(TDEIcon::MainToolbar); TQString path = TDEGlobal::iconLoader()->iconPath(d->icon_name, -d->size); TQImage img(path); diff --git a/tdeui/kanimwidget.h b/tdeui/kanimwidget.h index 2275f2cf9..77abf837a 100644 --- a/tdeui/kanimwidget.h +++ b/tdeui/kanimwidget.h @@ -102,7 +102,7 @@ public: /** * Sets the name of the animated icons to load. This will use the - * KIconLoader::loadAnimated method for the actual loading. + * TDEIconLoader::loadAnimated method for the actual loading. * * @param icons The name of the icons to use for the animation */ diff --git a/tdeui/kcombobox.cpp b/tdeui/kcombobox.cpp index bd3f566b7..e5b8c3043 100644 --- a/tdeui/kcombobox.cpp +++ b/tdeui/kcombobox.cpp @@ -489,7 +489,7 @@ void KHistoryCombo::addToHistory( const TQString& item ) // now add the item if ( myPixProvider ) - insertItem( myPixProvider->pixmapFor(item, KIcon::SizeSmall), item, 0); + insertItem( myPixProvider->pixmapFor(item, TDEIcon::SizeSmall), item, 0); else insertItem( item, 0 ); @@ -679,7 +679,7 @@ void KHistoryCombo::insertItems( const TQStringList& items ) const TQString item = *it; if ( !item.isEmpty() ) { // only insert non-empty items if ( myPixProvider ) - insertItem( myPixProvider->pixmapFor(item, KIcon::SizeSmall), + insertItem( myPixProvider->pixmapFor(item, TDEIcon::SizeSmall), item ); else insertItem( item ); diff --git a/tdeui/kdialog.cpp b/tdeui/kdialog.cpp index 53d7b4f05..ddac1ddd8 100644 --- a/tdeui/kdialog.cpp +++ b/tdeui/kdialog.cpp @@ -342,8 +342,8 @@ KSMModalDialogHeader::KSMModalDialogHeader(TQWidget* parent) seperatorbox->setMargin(0); TQWidget* ticon = new TQWidget( frame ); - KIconLoader * ldr = TDEGlobal::iconLoader(); - TQPixmap trinityPixmap = ldr->loadIcon("kmenu", KIcon::Panel, KIcon::SizeLarge, KIcon::DefaultState, 0L, true); + TDEIconLoader * ldr = TDEGlobal::iconLoader(); + TQPixmap trinityPixmap = ldr->loadIcon("kmenu", TDEIcon::Panel, TDEIcon::SizeLarge, TDEIcon::DefaultState, 0L, true); // Manually draw the alpha portions of the icon onto the widget background color... TQRgb backgroundRgb = ticon->paletteBackgroundColor().rgb(); diff --git a/tdeui/kedittoolbar.cpp b/tdeui/kedittoolbar.cpp index cd6111a48..e1abdc875 100644 --- a/tdeui/kedittoolbar.cpp +++ b/tdeui/kedittoolbar.cpp @@ -767,10 +767,10 @@ void KEditToolbarWidget::setupLayout() this, TQT_SLOT(slotToolbarSelected(const TQString&))); // TQPushButton *new_toolbar = new TQPushButton(i18n("&New"), this); -// new_toolbar->setPixmap(BarIcon("filenew", KIcon::SizeSmall)); +// new_toolbar->setPixmap(BarIcon("filenew", TDEIcon::SizeSmall)); // new_toolbar->setEnabled(false); // disabled until implemented // TQPushButton *del_toolbar = new TQPushButton(i18n("&Delete"), this); -// del_toolbar->setPixmap(BarIcon("editdelete", KIcon::SizeSmall)); +// del_toolbar->setPixmap(BarIcon("editdelete", TDEIcon::SizeSmall)); // del_toolbar->setEnabled(false); // disabled until implemented // our list of inactive actions @@ -966,7 +966,7 @@ void KEditToolbarWidget::loadActionList(TQDomElement& elem) TQMap active_list; // see if our current action is in this toolbar - KIconLoader *loader = TDEGlobal::instance()->iconLoader(); + TDEIconLoader *loader = TDEGlobal::instance()->iconLoader(); TQDomNode n = elem.lastChild(); for( ; !n.isNull(); n = n.previousSibling() ) { @@ -1018,9 +1018,9 @@ void KEditToolbarWidget::loadActionList(TQDomElement& elem) act->setText(1, action->plainText()); if (action->hasIcon()) if (!action->icon().isEmpty()) - act->setPixmap(0, loader->loadIcon(action->icon(), KIcon::Toolbar, 16, KIcon::DefaultState, 0, true) ); + act->setPixmap(0, loader->loadIcon(action->icon(), TDEIcon::Toolbar, 16, TDEIcon::DefaultState, 0, true) ); else // Has iconset - act->setPixmap(0, action->iconSet(KIcon::Toolbar).pixmap()); + act->setPixmap(0, action->iconSet(TDEIcon::Toolbar).pixmap()); active_list.insert(action->name(), true); break; @@ -1041,9 +1041,9 @@ void KEditToolbarWidget::loadActionList(TQDomElement& elem) act->setText(1, action->plainText()); if (action->hasIcon()) if (!action->icon().isEmpty()) - act->setPixmap(0, loader->loadIcon(action->icon(), KIcon::Toolbar, 16, KIcon::DefaultState, 0, true) ); + act->setPixmap(0, loader->loadIcon(action->icon(), TDEIcon::Toolbar, 16, TDEIcon::DefaultState, 0, true) ); else // Has iconset - act->setPixmap(0, action->iconSet(KIcon::Toolbar).pixmap()); + act->setPixmap(0, action->iconSet(TDEIcon::Toolbar).pixmap()); } // finally, add default separators to the inactive list @@ -1373,7 +1373,7 @@ void KEditToolbarWidget::updateLocal(TQDomElement& elem) void KEditToolbarWidget::slotChangeIcon() { - // We can't use KIconChooser here, since it's in libtdeio + // We can't use TDEIconChooser here, since it's in libtdeio // ##### KDE4: reconsider this, e.g. move KEditToolbar to libtdeio //if the process is already running (e.g. when somebody clicked the change button twice (see #127149)) - do nothing... diff --git a/tdeui/kguiitem.cpp b/tdeui/kguiitem.cpp index e4d09bff2..dd30e1fe8 100644 --- a/tdeui/kguiitem.cpp +++ b/tdeui/kguiitem.cpp @@ -149,7 +149,7 @@ TQString KGuiItem::plainText() const return stripped; } -TQIconSet KGuiItem::iconSet( KIcon::Group group, int size, TDEInstance* instance ) const +TQIconSet KGuiItem::iconSet( TDEIcon::Group group, int size, TDEInstance* instance ) const { if( d->m_hasIcon ) { diff --git a/tdeui/kguiitem.h b/tdeui/kguiitem.h index e7d53568a..bb1233de3 100644 --- a/tdeui/kguiitem.h +++ b/tdeui/kguiitem.h @@ -61,10 +61,10 @@ public: TQString text() const; TQString plainText() const; #ifndef KDE_NO_COMPAT - TQIconSet iconSet( KIcon::Group, int size = 0, TDEInstance* instance = TDEGlobal::instance()) const; - TQIconSet iconSet() const { return iconSet( KIcon::Small ); } + TQIconSet iconSet( TDEIcon::Group, int size = 0, TDEInstance* instance = TDEGlobal::instance()) const; + TQIconSet iconSet() const { return iconSet( TDEIcon::Small ); } #else - TQIconSet iconSet( KIcon::Group=KIcon::Small, int size = 0, TDEInstance* instance = TDEGlobal::instance()) const; + TQIconSet iconSet( TDEIcon::Group=TDEIcon::Small, int size = 0, TDEInstance* instance = TDEGlobal::instance()) const; #endif TQString iconName() const; diff --git a/tdeui/khelpmenu.cpp b/tdeui/khelpmenu.cpp index ed329493c..041be33ce 100644 --- a/tdeui/khelpmenu.cpp +++ b/tdeui/khelpmenu.cpp @@ -127,7 +127,7 @@ TDEPopupMenu* KHelpMenu::menu() bool need_separator = false; if (kapp->authorizeTDEAction("help_contents")) { - mMenu->insertItem( BarIcon( "contents", KIcon::SizeSmall), + mMenu->insertItem( BarIcon( "contents", TDEIcon::SizeSmall), TQString(i18n( "%1 &Handbook" ).arg( appName)) ,menuHelpContents ); mMenu->connectItem( menuHelpContents, this, TQT_SLOT(appHelpActivated()) ); mMenu->setAccel( TDEStdAccel::shortcut(TDEStdAccel::Help), menuHelpContents ); diff --git a/tdeui/kiconview.cpp b/tdeui/kiconview.cpp index 185450880..3a139985a 100644 --- a/tdeui/kiconview.cpp +++ b/tdeui/kiconview.cpp @@ -36,17 +36,17 @@ #include #include -class KIconView::KIconViewPrivate +class TDEIconView::TDEIconViewPrivate { public: - KIconViewPrivate() { - mode = KIconView::Execute; + TDEIconViewPrivate() { + mode = TDEIconView::Execute; fm = 0L; doAutoSelect = true; textHeight = 0; dragHoldItem = 0L; } - KIconView::Mode mode; + TDEIconView::Mode mode; bool doAutoSelect; TQFontMetrics *fm; TQPixmapCache maskCache; @@ -56,10 +56,10 @@ public: TQTimer doubleClickIgnoreTimer; }; -KIconView::KIconView( TQWidget *parent, const char *name, WFlags f ) +TDEIconView::TDEIconView( TQWidget *parent, const char *name, WFlags f ) : TQIconView( parent, name, f ) { - d = new KIconViewPrivate; + d = new TDEIconViewPrivate; connect( this, TQT_SIGNAL( onViewport() ), this, TQT_SLOT( slotOnViewport() ) ); @@ -80,24 +80,24 @@ KIconView::KIconView( TQWidget *parent, const char *name, WFlags f ) connect( &d->dragHoldTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotDragHoldTimeout()) ); } -KIconView::~KIconView() +TDEIconView::~TDEIconView() { delete d->fm; delete d; } -void KIconView::setMode( KIconView::Mode mode ) +void TDEIconView::setMode( TDEIconView::Mode mode ) { d->mode = mode; } -KIconView::Mode KIconView::mode() const +TDEIconView::Mode TDEIconView::mode() const { return d->mode; } -void KIconView::slotOnItem( TQIconViewItem *item ) +void TDEIconView::slotOnItem( TQIconViewItem *item ) { if ( item ) { if ( m_bUseSingle ) { @@ -112,7 +112,7 @@ void KIconView::slotOnItem( TQIconViewItem *item ) } } -void KIconView::slotOnViewport() +void TDEIconView::slotOnViewport() { if ( m_bUseSingle && m_bChangeCursorOverItem ) viewport()->unsetCursor(); @@ -121,12 +121,12 @@ void KIconView::slotOnViewport() m_pCurrentItem = 0L; } -void KIconView::slotSettingsChanged(int category) +void TDEIconView::slotSettingsChanged(int category) { if ( category != TDEApplication::SETTINGS_MOUSE ) return; m_bUseSingle = TDEGlobalSettings::singleClick(); - //kdDebug() << "KIconView::slotSettingsChanged for mouse, usesingle=" << m_bUseSingle << endl; + //kdDebug() << "TDEIconView::slotSettingsChanged for mouse, usesingle=" << m_bUseSingle << endl; disconnect( this, TQT_SIGNAL( mouseButtonClicked( int, TQIconViewItem *, const TQPoint & ) ), @@ -157,7 +157,7 @@ void KIconView::slotSettingsChanged(int category) viewport()->unsetCursor(); } -void KIconView::slotAutoSelect() +void TDEIconView::slotAutoSelect() { // check that the item still exists if( index( m_pCurrentItem ) == -1 || !d->doAutoSelect ) @@ -232,14 +232,14 @@ void KIconView::slotAutoSelect() setSelected( m_pCurrentItem, true ); } else - kdDebug() << "KIconView: That's not supposed to happen!!!!" << endl; + kdDebug() << "TDEIconView: That's not supposed to happen!!!!" << endl; } -void KIconView::emitExecute( TQIconViewItem *item, const TQPoint &pos ) +void TDEIconView::emitExecute( TQIconViewItem *item, const TQPoint &pos ) { if ( d->mode != Execute ) { - // kdDebug() << "KIconView::emitExecute : not in execute mode !" << endl; + // kdDebug() << "TDEIconView::emitExecute : not in execute mode !" << endl; return; } @@ -256,7 +256,7 @@ void KIconView::emitExecute( TQIconViewItem *item, const TQPoint &pos ) } } -void KIconView::updateDragHoldItem( TQDropEvent *e ) +void TDEIconView::updateDragHoldItem( TQDropEvent *e ) { TQIconViewItem *item = findItem( e->pos() ); @@ -274,21 +274,21 @@ void KIconView::updateDragHoldItem( TQDropEvent *e ) } } -void KIconView::focusOutEvent( TQFocusEvent *fe ) +void TDEIconView::focusOutEvent( TQFocusEvent *fe ) { m_pAutoSelect->stop(); TQIconView::focusOutEvent( fe ); } -void KIconView::leaveEvent( TQEvent *e ) +void TDEIconView::leaveEvent( TQEvent *e ) { m_pAutoSelect->stop(); TQIconView::leaveEvent( e ); } -void KIconView::contentsMousePressEvent( TQMouseEvent *e ) +void TDEIconView::contentsMousePressEvent( TQMouseEvent *e ) { if( (selectionMode() == Extended) && (e->state() & ShiftButton) && !(e->state() & ControlButton) ) { bool block = signalsBlocked(); @@ -303,7 +303,7 @@ void KIconView::contentsMousePressEvent( TQMouseEvent *e ) d->doAutoSelect = false; } -void KIconView::contentsMouseDoubleClickEvent ( TQMouseEvent * e ) +void TDEIconView::contentsMouseDoubleClickEvent ( TQMouseEvent * e ) { TQIconView::contentsMouseDoubleClickEvent( e ); @@ -318,9 +318,9 @@ void KIconView::contentsMouseDoubleClickEvent ( TQMouseEvent * e ) d->doubleClickIgnoreTimer.start(0, true); } -void KIconView::slotMouseButtonClicked( int btn, TQIconViewItem *item, const TQPoint &pos ) +void TDEIconView::slotMouseButtonClicked( int btn, TQIconViewItem *item, const TQPoint &pos ) { - //kdDebug() << " KIconView::slotMouseButtonClicked() item=" << item << endl; + //kdDebug() << " TDEIconView::slotMouseButtonClicked() item=" << item << endl; if( d->doubleClickIgnoreTimer.isActive() ) return; // Ignore double click @@ -328,19 +328,19 @@ void KIconView::slotMouseButtonClicked( int btn, TQIconViewItem *item, const TQP emitExecute( item, pos ); } -void KIconView::contentsMouseReleaseEvent( TQMouseEvent *e ) +void TDEIconView::contentsMouseReleaseEvent( TQMouseEvent *e ) { d->doAutoSelect = true; TQIconView::contentsMouseReleaseEvent( e ); } -void KIconView::contentsDragEnterEvent( TQDragEnterEvent *e ) +void TDEIconView::contentsDragEnterEvent( TQDragEnterEvent *e ) { updateDragHoldItem( e ); TQIconView::contentsDragEnterEvent( e ); } -void KIconView::contentsDragLeaveEvent( TQDragLeaveEvent *e ) +void TDEIconView::contentsDragLeaveEvent( TQDragLeaveEvent *e ) { d->dragHoldTimer.stop(); d->dragHoldItem = 0L; @@ -348,19 +348,19 @@ void KIconView::contentsDragLeaveEvent( TQDragLeaveEvent *e ) } -void KIconView::contentsDragMoveEvent( TQDragMoveEvent *e ) +void TDEIconView::contentsDragMoveEvent( TQDragMoveEvent *e ) { updateDragHoldItem( e ); TQIconView::contentsDragMoveEvent( e ); } -void KIconView::contentsDropEvent( TQDropEvent* e ) +void TDEIconView::contentsDropEvent( TQDropEvent* e ) { d->dragHoldTimer.stop(); TQIconView::contentsDropEvent( e ); } -void KIconView::slotDragHoldTimeout() +void TDEIconView::slotDragHoldTimeout() { TQIconViewItem *tmp = d->dragHoldItem; d->dragHoldItem = 0L; @@ -368,7 +368,7 @@ void KIconView::slotDragHoldTimeout() emit held( tmp ); } -void KIconView::takeItem( TQIconViewItem * item ) +void TDEIconView::takeItem( TQIconViewItem * item ) { if ( item == d->dragHoldItem ) { @@ -379,13 +379,13 @@ void KIconView::takeItem( TQIconViewItem * item ) TQIconView::takeItem( item ); } -void KIconView::cancelPendingHeldSignal() +void TDEIconView::cancelPendingHeldSignal() { d->dragHoldTimer.stop(); d->dragHoldItem = 0L; } -void KIconView::wheelEvent( TQWheelEvent *e ) +void TDEIconView::wheelEvent( TQWheelEvent *e ) { if (horizontalScrollBar() && (arrangement() == TQIconView::TopToBottom)) { TQWheelEvent ce(e->pos(), e->delta(), e->state(), Qt::Horizontal); @@ -398,14 +398,14 @@ void KIconView::wheelEvent( TQWheelEvent *e ) TQIconView::wheelEvent(e); } -void KIconView::setFont( const TQFont &font ) +void TDEIconView::setFont( const TQFont &font ) { delete d->fm; d->fm = 0L; TQIconView::setFont( font ); } -TQFontMetrics *KIconView::itemFontMetrics() const +TQFontMetrics *TDEIconView::itemFontMetrics() const { if (!d->fm) { // TQIconView creates one too, but we can't access it @@ -414,7 +414,7 @@ TQFontMetrics *KIconView::itemFontMetrics() const return d->fm; } -TQPixmap KIconView::selectedIconPixmap( TQPixmap *pix, const TQColor &col ) const +TQPixmap TDEIconView::selectedIconPixmap( TQPixmap *pix, const TQColor &col ) const { TQPixmap m; if ( d->maskCache.find( TQString::number( pix->serialNumber() ), m ) ) @@ -424,12 +424,12 @@ TQPixmap KIconView::selectedIconPixmap( TQPixmap *pix, const TQColor &col ) cons return m; } -int KIconView::iconTextHeight() const +int TDEIconView::iconTextHeight() const { return d->textHeight > 0 ? d->textHeight : ( wordWrapIconText() ? 99 : 1 ); } -void KIconView::setIconTextHeight( int n ) +void TDEIconView::setIconTextHeight( int n ) { int oldHeight = iconTextHeight(); if ( n > 1 ) @@ -447,25 +447,25 @@ void KIconView::setIconTextHeight( int n ) ///////////// -struct KIconViewItem::KIconViewItemPrivate +struct TDEIconViewItem::TDEIconViewItemPrivate { TQSize m_pixmapSize; }; -void KIconViewItem::init() +void TDEIconViewItem::init() { m_wordWrap = 0L; d = 0L; calcRect(); } -KIconViewItem::~KIconViewItem() +TDEIconViewItem::~TDEIconViewItem() { delete m_wordWrap; delete d; } -void KIconViewItem::calcRect( const TQString& text_ ) +void TDEIconViewItem::calcRect( const TQString& text_ ) { bool drawRoundedRect = TDEGlobalSettings::iconUseRoundedRect(); @@ -475,14 +475,14 @@ void KIconViewItem::calcRect( const TQString& text_ ) delete m_wordWrap; m_wordWrap = 0L; #ifndef NDEBUG // be faster for the end-user, such a bug will have been fixed before hand :) - if ( !iconView()->inherits("KIconView") ) + if ( !iconView()->inherits("TDEIconView") ) { - kdWarning() << "KIconViewItem used in a " << iconView()->className() << " !!" << endl; + kdWarning() << "TDEIconViewItem used in a " << iconView()->className() << " !!" << endl; return; } #endif - //kdDebug() << "KIconViewItem::calcRect - " << text() << endl; - KIconView *view = static_cast(iconView()); + //kdDebug() << "TDEIconViewItem::calcRect - " << text() << endl; + TDEIconView *view = static_cast(iconView()); TQRect itemIconRect = pixmapRect(); TQRect itemTextRect = textRect(); TQRect itemRect = rect(); @@ -532,7 +532,7 @@ void KIconViewItem::calcRect( const TQString& text_ ) t = text_.isEmpty() ? text() : text_; // Max text height - int nbLines = static_cast( iconView() )->iconTextHeight(); + int nbLines = static_cast( iconView() )->iconTextHeight(); int height = nbLines > 0 ? fm->height() * nbLines : 0xFFFFFFFF; // Should not be higher than pixmap if text is alongside icons @@ -629,16 +629,16 @@ void KIconViewItem::calcRect( const TQString& text_ ) } -void KIconViewItem::paintItem( TQPainter *p, const TQColorGroup &cg ) +void TDEIconViewItem::paintItem( TQPainter *p, const TQColorGroup &cg ) { TQIconView* view = iconView(); Q_ASSERT( view ); if ( !view ) return; #ifndef NDEBUG // be faster for the end-user, such a bug will have been fixed before hand :) - if ( !view->inherits("KIconView") ) + if ( !view->inherits("TDEIconView") ) { - kdWarning() << "KIconViewItem used in a " << view->className() << " !!" << endl; + kdWarning() << "TDEIconViewItem used in a " << view->className() << " !!" << endl; return; } #endif @@ -651,14 +651,14 @@ void KIconViewItem::paintItem( TQPainter *p, const TQColorGroup &cg ) p->restore(); } -KWordWrap * KIconViewItem::wordWrap() +KWordWrap * TDEIconViewItem::wordWrap() { return m_wordWrap; } -void KIconViewItem::paintPixmap( TQPainter *p, const TQColorGroup &cg ) +void TDEIconViewItem::paintPixmap( TQPainter *p, const TQColorGroup &cg ) { - KIconView *kview = static_cast(iconView()); + TDEIconView *kview = static_cast(iconView()); #ifndef QT_NO_PICTURE if ( picture() ) { @@ -702,7 +702,7 @@ void KIconViewItem::paintPixmap( TQPainter *p, const TQColorGroup &cg ) } } -void KIconViewItem::paintText( TQPainter *p, const TQColorGroup &cg ) +void TDEIconViewItem::paintText( TQPainter *p, const TQColorGroup &cg ) { bool drawRoundedRect = TDEGlobalSettings::iconUseRoundedRect(); int textX; @@ -732,20 +732,20 @@ void KIconViewItem::paintText( TQPainter *p, const TQColorGroup &cg ) m_wordWrap->drawText( p, textX, textY, align | KWordWrap::Truncate ); } -TQSize KIconViewItem::pixmapSize() const +TQSize TDEIconViewItem::pixmapSize() const { return d ? d->m_pixmapSize : TQSize( 0, 0 ); } -void KIconViewItem::setPixmapSize( const TQSize& size ) +void TDEIconViewItem::setPixmapSize( const TQSize& size ) { if ( !d ) - d = new KIconViewItemPrivate; + d = new TDEIconViewItemPrivate; d->m_pixmapSize = size; } -void KIconView::virtual_hook( int, void* ) +void TDEIconView::virtual_hook( int, void* ) { /*BASE::virtual_hook( id, data );*/ } #include "kiconview.moc" diff --git a/tdeui/kiconview.h b/tdeui/kiconview.h index 8f0544b88..8c0cd5a24 100644 --- a/tdeui/kiconview.h +++ b/tdeui/kiconview.h @@ -39,20 +39,20 @@ * TQIconView::selectionChanged() signal. * **/ -class TDEUI_EXPORT KIconView : public TQIconView +class TDEUI_EXPORT TDEIconView : public TQIconView { - friend class KIconViewItem; + friend class TDEIconViewItem; Q_OBJECT TQ_ENUMS( Mode ) TQ_PROPERTY( Mode mode READ mode WRITE setMode ) public: - KIconView( TQWidget *parent = 0, const char *name = 0, WFlags f = 0 ); + TDEIconView( TQWidget *parent = 0, const char *name = 0, WFlags f = 0 ); - ~KIconView(); + ~TDEIconView(); /** - * KIconView has two different operating modes. Execute mode is depending + * TDEIconView has two different operating modes. Execute mode is depending * on the configuration of single-click or double-click where the signal * executed() will be emitted upon click/double-click. * In Select mode, this signal will not be emitted. @@ -180,7 +180,7 @@ protected: /** * This method allows to handle correctly cases where a subclass * needs the held() signal to not be triggered without calling - * a KIconView::contentsDrag*Event() method (which have side effects + * a TDEIconView::contentsDrag*Event() method (which have side effects * because they forward to TQIconView). */ void cancelPendingHeldSignal(); @@ -191,11 +191,11 @@ private slots: private: /** - * @internal. For use by KIconViewItem. + * @internal. For use by TDEIconViewItem. */ TQFontMetrics *itemFontMetrics() const; /** - * @internal. For use by KIconViewItem. + * @internal. For use by TDEIconViewItem. */ TQPixmap selectedIconPixmap( TQPixmap *pix, const TQColor &col ) const; @@ -210,40 +210,40 @@ private: protected: virtual void virtual_hook( int id, void* data ); private: - class KIconViewPrivate; - KIconViewPrivate *d; + class TDEIconViewPrivate; + TDEIconViewPrivate *d; }; class KWordWrap; /** * @short A variant of TQIconViewItem that wraps words better. * - * KIconViewItem exists to improve the word-wrap functionality of QIconViewItem - * Use KIconViewItem instead of TQIconViewItem for any iconview item you might have :) + * TDEIconViewItem exists to improve the word-wrap functionality of QIconViewItem + * Use TDEIconViewItem instead of TQIconViewItem for any iconview item you might have :) * * @author David Faure */ -class TDEUI_EXPORT KIconViewItem : public TQIconViewItem +class TDEUI_EXPORT TDEIconViewItem : public TQIconViewItem { public: // Need to redefine all the constructors - I want Java ! - KIconViewItem( TQIconView *parent ) + TDEIconViewItem( TQIconView *parent ) : TQIconViewItem( parent ) { init(); } // We need to call it because the parent ctor won't call our reimplementation :((( - KIconViewItem( TQIconView *parent, TQIconViewItem *after ) + TDEIconViewItem( TQIconView *parent, TQIconViewItem *after ) : TQIconViewItem( parent, after ) { init(); } - KIconViewItem( TQIconView *parent, const TQString &text ) + TDEIconViewItem( TQIconView *parent, const TQString &text ) : TQIconViewItem( parent, text ) { init(); } - KIconViewItem( TQIconView *parent, TQIconViewItem *after, const TQString &text ) + TDEIconViewItem( TQIconView *parent, TQIconViewItem *after, const TQString &text ) : TQIconViewItem( parent, after, text ) { init(); } - KIconViewItem( TQIconView *parent, const TQString &text, const TQPixmap &icon ) + TDEIconViewItem( TQIconView *parent, const TQString &text, const TQPixmap &icon ) : TQIconViewItem( parent, text, icon ) { init(); } - KIconViewItem( TQIconView *parent, TQIconViewItem *after, const TQString &text, const TQPixmap &icon ) + TDEIconViewItem( TQIconView *parent, TQIconViewItem *after, const TQString &text, const TQPixmap &icon ) : TQIconViewItem( parent, after, text, icon ) { init(); } - KIconViewItem( TQIconView *parent, const TQString &text, const TQPicture &picture ) + TDEIconViewItem( TQIconView *parent, const TQString &text, const TQPicture &picture ) : TQIconViewItem( parent, text, picture ) { init(); } - KIconViewItem( TQIconView *parent, TQIconViewItem *after, const TQString &text, const TQPicture &picture ) + TDEIconViewItem( TQIconView *parent, TQIconViewItem *after, const TQString &text, const TQPicture &picture ) : TQIconViewItem( parent, after, text, picture ) { init(); } - virtual ~KIconViewItem(); + virtual ~TDEIconViewItem(); /** * Using this function, you can specify a custom size for the pixmap. The @@ -274,8 +274,8 @@ protected: private: KWordWrap* m_wordWrap; - struct KIconViewItemPrivate; - KIconViewItemPrivate *d; + struct TDEIconViewItemPrivate; + TDEIconViewItemPrivate *d; }; #endif diff --git a/tdeui/kiconviewsearchline.cpp b/tdeui/kiconviewsearchline.cpp index a10e220a4..33df94a6a 100644 --- a/tdeui/kiconviewsearchline.cpp +++ b/tdeui/kiconviewsearchline.cpp @@ -35,10 +35,10 @@ typedef TQValueList QIconViewItemList; -class KIconViewSearchLine::KIconViewSearchLinePrivate +class TDEIconViewSearchLine::TDEIconViewSearchLinePrivate { public: - KIconViewSearchLinePrivate() : + TDEIconViewSearchLinePrivate() : iconView( 0 ), caseSensitive( DEFAULT_CASESENSITIVE ), activeSearch( false ), @@ -54,7 +54,7 @@ public: /****************************************************************************** * Public Methods * *****************************************************************************/ -KIconViewSearchLine::KIconViewSearchLine( TQWidget *parent, +TDEIconViewSearchLine::TDEIconViewSearchLine( TQWidget *parent, TQIconView *iconView, const char *name ) : KLineEdit( parent, name ) @@ -63,25 +63,25 @@ KIconViewSearchLine::KIconViewSearchLine( TQWidget *parent, init( iconView ); } -KIconViewSearchLine::KIconViewSearchLine( TQWidget *parent, const char *name ) : +TDEIconViewSearchLine::TDEIconViewSearchLine( TQWidget *parent, const char *name ) : KLineEdit( parent, name ) { d = NULL; init( NULL ); } -KIconViewSearchLine::~KIconViewSearchLine() +TDEIconViewSearchLine::~TDEIconViewSearchLine() { clear(); // empty hiddenItems, returning items back to iconView delete d; } -bool KIconViewSearchLine::caseSensitive() const +bool TDEIconViewSearchLine::caseSensitive() const { return d->caseSensitive; } -TQIconView *KIconViewSearchLine::iconView() const +TQIconView *TDEIconViewSearchLine::iconView() const { return d->iconView; } @@ -89,7 +89,7 @@ TQIconView *KIconViewSearchLine::iconView() const /****************************************************************************** * Public Slots * *****************************************************************************/ -void KIconViewSearchLine::updateSearch( const TQString &s ) +void TDEIconViewSearchLine::updateSearch( const TQString &s ) { long original_count; int original_hiddenListChanged; @@ -125,7 +125,7 @@ void KIconViewSearchLine::updateSearch( const TQString &s ) d->iconView->ensureItemVisible( currentItem ); } -void KIconViewSearchLine::clear() +void TDEIconViewSearchLine::clear() { // Clear hidden list, give items back to TQIconView, if it still exists TQIconViewItem *item = NULL; @@ -142,16 +142,16 @@ void KIconViewSearchLine::clear() KLineEdit::clear(); } -void KIconViewSearchLine::iconDeleted(const TQString &filename) { +void TDEIconViewSearchLine::iconDeleted(const TQString &filename) { // Do nothing... } -void KIconViewSearchLine::setCaseSensitive( bool cs ) +void TDEIconViewSearchLine::setCaseSensitive( bool cs ) { d->caseSensitive = cs; } -void KIconViewSearchLine::setIconView( TQIconView *iv ) +void TDEIconViewSearchLine::setIconView( TQIconView *iv ) { if ( d->iconView != NULL ) disconnect( d->iconView, TQT_SIGNAL( destroyed() ), @@ -172,7 +172,7 @@ void KIconViewSearchLine::setIconView( TQIconView *iv ) /****************************************************************************** * Protected Methods * *****************************************************************************/ -bool KIconViewSearchLine::itemMatches( const TQIconViewItem *item, +bool TDEIconViewSearchLine::itemMatches( const TQIconViewItem *item, const TQString &s ) const { if ( s.isEmpty() ) @@ -185,10 +185,10 @@ bool KIconViewSearchLine::itemMatches( const TQIconViewItem *item, return ( itemtext.find( s, 0, caseSensitive() ) >= 0 ); } -void KIconViewSearchLine::init( TQIconView *iconView ) +void TDEIconViewSearchLine::init( TQIconView *iconView ) { delete d; - d = new KIconViewSearchLinePrivate; + d = new TDEIconViewSearchLinePrivate; d->iconView = iconView; @@ -205,7 +205,7 @@ void KIconViewSearchLine::init( TQIconView *iconView ) setEnabled( false ); } -void KIconViewSearchLine::hideItem( TQIconViewItem *item ) +void TDEIconViewSearchLine::hideItem( TQIconViewItem *item ) { if ( ( item == NULL ) || ( d->iconView == NULL ) ) return; @@ -213,7 +213,7 @@ void KIconViewSearchLine::hideItem( TQIconViewItem *item ) item->setVisible(false); } -void KIconViewSearchLine::showItem( TQIconViewItem *item ) +void TDEIconViewSearchLine::showItem( TQIconViewItem *item ) { if ( d->iconView == NULL ) { @@ -229,14 +229,14 @@ void KIconViewSearchLine::showItem( TQIconViewItem *item ) /****************************************************************************** * Protected Slots * *****************************************************************************/ -void KIconViewSearchLine::queueSearch( const TQString &s ) +void TDEIconViewSearchLine::queueSearch( const TQString &s ) { d->queuedSearches++; d->search = s; TQTimer::singleShot( 200, this, TQT_SLOT( activateSearch() ) ); } -void KIconViewSearchLine::activateSearch() +void TDEIconViewSearchLine::activateSearch() { d->queuedSearches--; @@ -253,7 +253,7 @@ void KIconViewSearchLine::activateSearch() /****************************************************************************** * Private Slots * *****************************************************************************/ -void KIconViewSearchLine::iconViewDeleted() +void TDEIconViewSearchLine::iconViewDeleted() { d->iconView = NULL; setEnabled( false ); diff --git a/tdeui/kiconviewsearchline.h b/tdeui/kiconviewsearchline.h index cb28d04cd..cef09b3ea 100644 --- a/tdeui/kiconviewsearchline.h +++ b/tdeui/kiconviewsearchline.h @@ -35,33 +35,33 @@ class TQIconViewItem; * * @since 3.3 */ -class TDEUI_EXPORT KIconViewSearchLine : public KLineEdit +class TDEUI_EXPORT TDEIconViewSearchLine : public KLineEdit { Q_OBJECT public: /** - * Constructs a KIconViewSearchLine with \a iconView being the TQIconView to + * Constructs a TDEIconViewSearchLine with \a iconView being the TQIconView to * be filtered. * * If \a iconView is null then the widget will be disabled until a iconview * is set with setIconView(). */ - KIconViewSearchLine( TQWidget *parent = 0, + TDEIconViewSearchLine( TQWidget *parent = 0, TQIconView *iconView = 0, const char *name = 0 ); /** - * Constructs a KIconViewSearchLine without any TQIconView to filter. The + * Constructs a TDEIconViewSearchLine without any TQIconView to filter. The * TQIconView object has to be set later with setIconView(). */ - KIconViewSearchLine( TQWidget *parent, const char *name ); + TDEIconViewSearchLine( TQWidget *parent, const char *name ); /** - * Destroys the KIconViewSearchLine. + * Destroys the TDEIconViewSearchLine. */ - virtual ~KIconViewSearchLine(); + virtual ~TDEIconViewSearchLine(); /** * Returns true if the search is case sensitive. This defaults to false. @@ -175,8 +175,8 @@ private slots: private: - class KIconViewSearchLinePrivate; - KIconViewSearchLinePrivate *d; + class TDEIconViewSearchLinePrivate; + TDEIconViewSearchLinePrivate *d; }; diff --git a/tdeui/kmessagebox.cpp b/tdeui/kmessagebox.cpp index 11644b25c..1e3c0bfda 100644 --- a/tdeui/kmessagebox.cpp +++ b/tdeui/kmessagebox.cpp @@ -82,7 +82,7 @@ static TQPixmap themedMessageBoxIcon(TQMessageBox::Icon icon) break; } - TQPixmap ret = TDEGlobal::iconLoader()->loadIcon(icon_name, KIcon::NoGroup, KIcon::SizeMedium, KIcon::DefaultState, 0, true); + TQPixmap ret = TDEGlobal::iconLoader()->loadIcon(icon_name, TDEIcon::NoGroup, TDEIcon::SizeMedium, TDEIcon::DefaultState, 0, true); if (ret.isNull()) return TQMessageBox::standardIcon(icon); diff --git a/tdeui/kpassdlg.cpp b/tdeui/kpassdlg.cpp index 46a8cccde..e2ca0bb80 100644 --- a/tdeui/kpassdlg.cpp +++ b/tdeui/kpassdlg.cpp @@ -351,7 +351,7 @@ void KPasswordDialog::init() // Row 1: pixmap + prompt TQLabel *lbl; - const TQPixmap pix( TDEGlobal::iconLoader()->loadIcon( d->iconName, KIcon::NoGroup, KIcon::SizeHuge, 0, 0, true)); + const TQPixmap pix( TDEGlobal::iconLoader()->loadIcon( d->iconName, TDEIcon::NoGroup, TDEIcon::SizeHuge, 0, 0, true)); if (!pix.isNull()) { lbl = new TQLabel(m_pMain); lbl->setPixmap(pix); diff --git a/tdeui/ksystemtray.cpp b/tdeui/ksystemtray.cpp index 84b3f2a94..572616833 100644 --- a/tdeui/ksystemtray.cpp +++ b/tdeui/ksystemtray.cpp @@ -317,12 +317,12 @@ TQPixmap KSystemTray::loadIcon( const TQString &icon, TDEInstance *instance ) TDEConfig *appCfg = kapp->config(); TDEConfigGroupSaver configSaver(appCfg, "System Tray"); int iconWidth = appCfg->readNumEntry("systrayIconWidth", 22); - return instance->iconLoader()->loadIcon( icon, KIcon::Panel, iconWidth ); + return instance->iconLoader()->loadIcon( icon, TDEIcon::Panel, iconWidth ); } TQPixmap KSystemTray::loadSizedIcon( const TQString &icon, int iconWidth, TDEInstance *instance ) { - return instance->iconLoader()->loadIcon( icon, KIcon::Panel, iconWidth ); + return instance->iconLoader()->loadIcon( icon, TDEIcon::Panel, iconWidth ); } void KSystemTray::setPixmap( const TQPixmap& p ) diff --git a/tdeui/ktabbar.cpp b/tdeui/ktabbar.cpp index 35242da4c..2e2fbe301 100644 --- a/tdeui/ktabbar.cpp +++ b/tdeui/ktabbar.cpp @@ -191,7 +191,7 @@ void KTabBar::mouseMoveEvent( TQMouseEvent *e ) } mHoverCloseButton = new TQPushButton( this ); - mHoverCloseButton->setIconSet( TDEGlobal::iconLoader()->loadIconSet("fileclose", KIcon::Toolbar, KIcon::SizeSmall) ); + mHoverCloseButton->setIconSet( TDEGlobal::iconLoader()->loadIconSet("fileclose", TDEIcon::Toolbar, TDEIcon::SizeSmall) ); mHoverCloseButton->setGeometry( rect ); TQToolTip::add(mHoverCloseButton,i18n("Close this tab")); mHoverCloseButton->setFlat(true); diff --git a/tdeui/ktip.cpp b/tdeui/ktip.cpp index 7be804565..d52e134b6 100644 --- a/tdeui/ktip.cpp +++ b/tdeui/ktip.cpp @@ -188,7 +188,7 @@ KTipDialog::KTipDialog(KTipDatabase *db, TQWidget *parent, const char *name) { img = TQImage(locate("data", "kdewizard/pics/wizard_small.png")); // colorize and check to figure the correct color - KIconEffect::colorize(img, mBlendedColor, 1.0); + TDEIconEffect::colorize(img, mBlendedColor, 1.0); QRgb colPixel( img.pixel(0,0) ); mBlendedColor = TQColor(tqRed(colPixel),tqGreen(colPixel),tqBlue(colPixel)); @@ -206,8 +206,8 @@ KTipDialog::KTipDialog(KTipDatabase *db, TQWidget *parent, const char *name) setCaption(i18n("Tip of the Day")); #ifdef Q_WS_X11 KWin::setIcons( winId(), - TDEGlobal::iconLoader()->loadIcon( "idea", KIcon::NoGroup, 32 ), - TDEGlobal::iconLoader()->loadIcon( "idea", KIcon::NoGroup, 16 ) ); + TDEGlobal::iconLoader()->loadIcon( "idea", TDEIcon::NoGroup, 32 ), + TDEGlobal::iconLoader()->loadIcon( "idea", TDEIcon::NoGroup, 16 ) ); #endif TQVBoxLayout *vbox = new TQVBoxLayout(this, marginHint(), spacingHint()); diff --git a/tdeui/tdeaction.cpp b/tdeui/tdeaction.cpp index 167a9a239..1cae013a2 100644 --- a/tdeui/tdeaction.cpp +++ b/tdeui/tdeaction.cpp @@ -663,7 +663,7 @@ int TDEAction::plug( TQWidget *w, int index ) instance = m_parentCollection->instance(); else instance = TDEGlobal::instance(); - id = menu->insertItem( d->iconSet( KIcon::Small, 0, instance ), d->text(), this,//dsweet + id = menu->insertItem( d->iconSet( TDEIcon::Small, 0, instance ), d->text(), this,//dsweet TQT_SLOT( slotPopupActivated() ), keyQt, -1, index ); } @@ -945,12 +945,12 @@ void TDEAction::updateIcon( int id ) if ( ::tqqt_cast( w ) ) { int itemId_ = itemId( id ); - static_cast(w)->changeItem( itemId_, d->iconSet( KIcon::Small ), d->text() ); + static_cast(w)->changeItem( itemId_, d->iconSet( TDEIcon::Small ), d->text() ); if (!d->m_cut.isNull()) updateShortcut( static_cast(w), itemId_ ); } else if ( ::tqqt_cast( w ) ) - static_cast(w)->changeItem( itemId( id ), d->iconSet( KIcon::Small ), d->text() ); + static_cast(w)->changeItem( itemId( id ), d->iconSet( TDEIcon::Small ), d->text() ); else if ( ::tqqt_cast( w ) ) static_cast(w)->setButtonIcon( itemId( id ), d->iconName() ); } @@ -988,11 +988,11 @@ void TDEAction::updateIconSet( int id ) if ( icon().isEmpty() && d->hasIcon() ) // only if there is no named icon ( scales better ) static_cast(w)->setButtonIconSet( itemId( id ), d->iconSet() ); else - static_cast(w)->setButtonIconSet( itemId( id ), d->iconSet( KIcon::Small ) ); + static_cast(w)->setButtonIconSet( itemId( id ), d->iconSet( TDEIcon::Small ) ); } } -TQIconSet TDEAction::iconSet( KIcon::Group group, int size ) const +TQIconSet TDEAction::iconSet( TDEIcon::Group group, int size ) const { return d->iconSet( group, size ); } diff --git a/tdeui/tdeaction.h b/tdeui/tdeaction.h index e8adcfff1..5919c9641 100644 --- a/tdeui/tdeaction.h +++ b/tdeui/tdeaction.h @@ -466,14 +466,14 @@ public: * Get the TQIconSet from which the icons used to display this action will * be chosen. * - * In KDE4 set group default to KIcon::Small while removing the other + * In KDE4 set group default to TDEIcon::Small while removing the other * iconSet() function. */ - virtual TQIconSet iconSet( KIcon::Group group, int size=0 ) const; + virtual TQIconSet iconSet( TDEIcon::Group group, int size=0 ) const; /** * Remove in KDE4 */ - TQIconSet iconSet() const { return iconSet( KIcon::Small ); } + TQIconSet iconSet() const { return iconSet( TDEIcon::Small ); } virtual TQString icon() const; diff --git a/tdeui/tdeactionclasses.cpp b/tdeui/tdeactionclasses.cpp index ccf0d278b..3b07f56ca 100644 --- a/tdeui/tdeactionclasses.cpp +++ b/tdeui/tdeactionclasses.cpp @@ -205,7 +205,7 @@ void TDEToggleAction::updateChecked( int id ) else { const KGuiItem* gui = d->m_checked ? d->m_checkedGuiItem : &guiItem(); if ( d->m_checkedGuiItem->hasIcon() ) - pm->changeItem( itemId_, gui->iconSet( KIcon::Small ), gui->text() ); + pm->changeItem( itemId_, gui->iconSet( TDEIcon::Small ), gui->text() ); else pm->changeItem( itemId_, gui->text() ); @@ -228,7 +228,7 @@ void TDEToggleAction::updateChecked( int id ) static_cast( w )->setButton( itemId( id ), d->m_checked ); if ( d->m_checkedGuiItem && d->m_checkedGuiItem->hasIcon() ) { const KGuiItem* gui = d->m_checked ? d->m_checkedGuiItem : &guiItem(); - static_cast( w )->setButtonIconSet( itemId( id ), gui->iconSet( KIcon::Toolbar ) ); + static_cast( w )->setButtonIconSet( itemId( id ), gui->iconSet( TDEIcon::Toolbar ) ); } } } diff --git a/tdeui/tdeactionselector.cpp b/tdeui/tdeactionselector.cpp index ac1974c77..3ef22a45f 100644 --- a/tdeui/tdeactionselector.cpp +++ b/tdeui/tdeactionselector.cpp @@ -60,7 +60,7 @@ TDEActionSelector::TDEActionSelector( TQWidget *parent, const char *name ) d->selectedInsertionPolicy = BelowCurrent; d->showUpDownButtons = true; - //int isz = IconSize( KIcon::Small ); + //int isz = IconSize( TDEIcon::Small ); TQHBoxLayout *lo = new TQHBoxLayout( this ); lo->setSpacing( KDialog::spacingHint() ); diff --git a/tdeui/tdeactionselector.h b/tdeui/tdeactionselector.h index 7cdd20116..fb382e58e 100644 --- a/tdeui/tdeactionselector.h +++ b/tdeui/tdeactionselector.h @@ -115,7 +115,7 @@ public: /** This enum identifies the icon sizes, used for the move buttons. The values correspond to the following pixel sizes: - @li SmallIcon - the return value of IconSize( KIcon::Small ), the user defined size + @li SmallIcon - the return value of IconSize( TDEIcon::Small ), the user defined size of a small icon in KDE. This is the default setting. @li Small - 16px @li Medium - 22px @@ -274,7 +274,7 @@ public: Sets the iconset for button @p button to @p iconset. You can use this method to et a costum icon set. Either created by TQIconSet, or use the application instance of - KIconLoader (recommended). + TDEIconLoader (recommended). */ void setButtonIconSet( const TQIconSet &iconset, MoveButton button ); diff --git a/tdeui/tdemainwindow.h b/tdeui/tdemainwindow.h index d5343f574..571a13797 100644 --- a/tdeui/tdemainwindow.h +++ b/tdeui/tdemainwindow.h @@ -731,7 +731,7 @@ public slots: * Example (adding a help button to the first toolbar): * * \code - * KIconLoader &loader = *TDEGlobal::iconLoader(); + * TDEIconLoader &loader = *TDEGlobal::iconLoader(); * TQPixmap pixmap = loader.loadIcon( "help" ); * toolBar(0)->insertButton( pixmap, 0, TQT_SIGNAL(clicked()), * this, TQT_SLOT(appHelpActivated()), true, i18n("Help") ); diff --git a/tdeui/tdetoolbar.cpp b/tdeui/tdetoolbar.cpp index c6049e658..02173e41b 100644 --- a/tdeui/tdetoolbar.cpp +++ b/tdeui/tdetoolbar.cpp @@ -913,9 +913,9 @@ int TDEToolBar::iconSize() const int TDEToolBar::iconSizeDefault() const { if (!::qstrcmp(name(), "mainToolBar")) - return TDEGlobal::iconLoader()->currentSize(KIcon::MainToolbar); + return TDEGlobal::iconLoader()->currentSize(TDEIcon::MainToolbar); - return TDEGlobal::iconLoader()->currentSize(KIcon::Toolbar); + return TDEGlobal::iconLoader()->currentSize(TDEIcon::Toolbar); } void TDEToolBar::setEnableContextMenu(bool enable ) @@ -1452,9 +1452,9 @@ void TDEToolBar::resizeEvent( TQResizeEvent *e ) void TDEToolBar::slotIconChanged(int group) { - if ((group != KIcon::Toolbar) && (group != KIcon::MainToolbar)) + if ((group != TDEIcon::Toolbar) && (group != TDEIcon::MainToolbar)) return; - if ((group == KIcon::MainToolbar) != !::qstrcmp(name(), "mainToolBar")) + if ((group == TDEIcon::MainToolbar) != !::qstrcmp(name(), "mainToolBar")) return; doModeChange(); @@ -2062,14 +2062,14 @@ TDEPopupMenu *TDEToolBar::contextMenu() TDEPopupMenu *size = new TDEPopupMenu( context, "size" ); size->insertItem( i18n("Default"), CONTEXT_ICONSIZES ); // Query the current theme for available sizes - KIconTheme *theme = TDEGlobal::instance()->iconLoader()->theme(); + TDEIconTheme *theme = TDEGlobal::instance()->iconLoader()->theme(); TQValueList avSizes; if (theme) { if (!::qstrcmp(name(), "mainToolBar")) - avSizes = theme->querySizes( KIcon::MainToolbar); + avSizes = theme->querySizes( TDEIcon::MainToolbar); else - avSizes = theme->querySizes( KIcon::Toolbar); + avSizes = theme->querySizes( TDEIcon::Toolbar); } d->iconSizes = avSizes; diff --git a/tdeui/tdetoolbar.h b/tdeui/tdetoolbar.h index 43362f512..37e22c9bb 100644 --- a/tdeui/tdetoolbar.h +++ b/tdeui/tdetoolbar.h @@ -830,11 +830,11 @@ public: /** * Set the icon size to load. Usually you should not call - * this, the icon size is taken care of by KIconLoader + * this, the icon size is taken care of by TDEIconLoader * and globally configured. * By default, the toolbar will load icons of size 32 for main * toolbars and 22 for other toolbars - * @see KIconLoader. + * @see TDEIconLoader. * * @param size The size to use */ diff --git a/tdeui/tdetoolbarbutton.cpp b/tdeui/tdetoolbarbutton.cpp index 0320e963a..da5fc7b9b 100644 --- a/tdeui/tdetoolbarbutton.cpp +++ b/tdeui/tdetoolbarbutton.cpp @@ -196,9 +196,9 @@ void TDEToolBarButton::modeChange() int pix_width = d->m_iconSize; if ( d->m_iconSize == 0 ) { if (d->m_parent && !strcmp(d->m_parent->name(), "mainToolBar")) - pix_width = IconSize( KIcon::MainToolbar ); + pix_width = IconSize( TDEIcon::MainToolbar ); else - pix_width = IconSize( KIcon::Toolbar ); + pix_width = IconSize( TDEIcon::Toolbar ); } int pix_height = pix_width; @@ -284,10 +284,10 @@ void TDEToolBarButton::setIcon( const TQString &icon ) // TQObject::name() return "const char *" instead of TQString. if (d->m_parent && !strcmp(d->m_parent->name(), "mainToolBar")) TQToolButton::setIconSet( d->m_instance->iconLoader()->loadIconSet( - d->m_iconName, KIcon::MainToolbar, d->m_iconSize )); + d->m_iconName, TDEIcon::MainToolbar, d->m_iconSize )); else TQToolButton::setIconSet( d->m_instance->iconLoader()->loadIconSet( - d->m_iconName, KIcon::Toolbar, d->m_iconSize )); + d->m_iconName, TDEIcon::Toolbar, d->m_iconSize )); } void TDEToolBarButton::setIconSet( const TQIconSet &iconset ) @@ -327,10 +327,10 @@ void TDEToolBarButton::setDefaultIcon( const TQString& icon ) TQIconSet set = iconSet(); TQPixmap pm; if (d->m_parent && !strcmp(d->m_parent->name(), "mainToolBar")) - pm = d->m_instance->iconLoader()->loadIcon( icon, KIcon::MainToolbar, + pm = d->m_instance->iconLoader()->loadIcon( icon, TDEIcon::MainToolbar, d->m_iconSize ); else - pm = d->m_instance->iconLoader()->loadIcon( icon, KIcon::Toolbar, + pm = d->m_instance->iconLoader()->loadIcon( icon, TDEIcon::Toolbar, d->m_iconSize ); set.setPixmap( pm, TQIconSet::Automatic, TQIconSet::Normal ); TQToolButton::setIconSet( set ); @@ -341,10 +341,10 @@ void TDEToolBarButton::setDisabledIcon( const TQString& icon ) TQIconSet set = iconSet(); TQPixmap pm; if (d->m_parent && !strcmp(d->m_parent->name(), "mainToolBar")) - pm = d->m_instance->iconLoader()->loadIcon( icon, KIcon::MainToolbar, + pm = d->m_instance->iconLoader()->loadIcon( icon, TDEIcon::MainToolbar, d->m_iconSize ); else - pm = d->m_instance->iconLoader()->loadIcon( icon, KIcon::Toolbar, + pm = d->m_instance->iconLoader()->loadIcon( icon, TDEIcon::Toolbar, d->m_iconSize ); set.setPixmap( pm, TQIconSet::Automatic, TQIconSet::Disabled ); TQToolButton::setIconSet( set ); diff --git a/tdeui/tests/itemcontainertest.cpp b/tdeui/tests/itemcontainertest.cpp index 76df739e8..af7fb41e2 100644 --- a/tdeui/tests/itemcontainertest.cpp +++ b/tdeui/tests/itemcontainertest.cpp @@ -1,5 +1,5 @@ /* -* Tests the item container widgets KIconView, TDEListView, TDEListBox +* Tests the item container widgets TDEIconView, TDEListView, TDEListBox * * Copyright (c) 2000 by Michael Reiher * @@ -97,8 +97,8 @@ TopLevel::TopLevel(TQWidget *parent, const char *name) TDEGlobal::config()->reparseConfiguration(); //Create IconView - TQGroupBox* gbIconView = new TQGroupBox( 1, Qt::Horizontal, "KIconView", this); - m_pIconView = new KIconView( gbIconView ); + TQGroupBox* gbIconView = new TQGroupBox( 1, Qt::Horizontal, "TDEIconView", this); + m_pIconView = new TDEIconView( gbIconView ); hBox->addWidget( gbIconView ); hBox->addSpacing( 5 ); connect( m_pIconView, TQT_SIGNAL( executed( TQIconViewItem* ) ), @@ -151,22 +151,22 @@ void TopLevel::slotSwitchMode( int id ) switch( id ) { case TopLevel::NoSelection: - m_pIconView->setSelectionMode( KIconView::NoSelection ); + m_pIconView->setSelectionMode( TDEIconView::NoSelection ); m_pListView->setSelectionMode( TQListView::NoSelection ); m_pListBox->setSelectionMode( TDEListBox::NoSelection ); break; case TopLevel::Single: - m_pIconView->setSelectionMode( KIconView::Single ); + m_pIconView->setSelectionMode( TDEIconView::Single ); m_pListView->setSelectionMode( TQListView::Single ); m_pListBox->setSelectionMode( TDEListBox::Single ); break; case TopLevel::Multi: - m_pIconView->setSelectionMode( KIconView::Multi ); + m_pIconView->setSelectionMode( TDEIconView::Multi ); m_pListView->setSelectionMode( TQListView::Multi ); m_pListBox->setSelectionMode( TDEListBox::Multi ); break; case TopLevel::Extended: - m_pIconView->setSelectionMode( KIconView::Extended ); + m_pIconView->setSelectionMode( TDEIconView::Extended ); m_pListView->setSelectionMode( TQListView::Extended ); m_pListBox->setSelectionMode( TDEListBox::Extended ); break; @@ -177,7 +177,7 @@ void TopLevel::slotSwitchMode( int id ) void TopLevel::slotIconViewExec( TQIconViewItem* item ) { - m_plblWidget->setText("KIconView"); + m_plblWidget->setText("TDEIconView"); m_plblSignal->setText("executed"); if( item ) m_plblItem->setText( item->text() ); diff --git a/tdeui/tests/itemcontainertest.h b/tdeui/tests/itemcontainertest.h index 3abc0e0a0..cb6cc3a51 100644 --- a/tdeui/tests/itemcontainertest.h +++ b/tdeui/tests/itemcontainertest.h @@ -3,7 +3,7 @@ #include -class KIconView; +class TDEIconView; class TDEListView; class TDEListBox; class TQButtonGroup; @@ -31,7 +31,7 @@ public slots: void slotClicked( TQIconViewItem* ) { tqDebug("CLICK");} void slotDoubleClicked( TQIconViewItem* ) { tqDebug("DOUBLE CLICK");} protected: - KIconView* m_pIconView; + TDEIconView* m_pIconView; TDEListView* m_pListView; TDEListBox* m_pListBox; -- cgit v1.2.1