diff options
Diffstat (limited to 'konqueror/listview')
-rw-r--r-- | konqueror/listview/konq_infolistviewitem.cc | 4 | ||||
-rw-r--r-- | konqueror/listview/konq_infolistviewwidget.cc | 2 | ||||
-rw-r--r-- | konqueror/listview/konq_infolistviewwidget.h | 4 | ||||
-rw-r--r-- | konqueror/listview/konq_listview.cc | 34 | ||||
-rw-r--r-- | konqueror/listview/konq_listview.h | 44 | ||||
-rw-r--r-- | konqueror/listview/konq_listviewitems.cc | 8 | ||||
-rw-r--r-- | konqueror/listview/konq_listviewitems.h | 2 | ||||
-rw-r--r-- | konqueror/listview/konq_listviewwidget.cc | 26 | ||||
-rw-r--r-- | konqueror/listview/konq_listviewwidget.h | 16 | ||||
-rw-r--r-- | konqueror/listview/konq_textviewitem.cc | 2 |
10 files changed, 71 insertions, 71 deletions
diff --git a/konqueror/listview/konq_infolistviewitem.cc b/konqueror/listview/konq_infolistviewitem.cc index 42b9222ae..79e0ead82 100644 --- a/konqueror/listview/konq_infolistviewitem.cc +++ b/konqueror/listview/konq_infolistviewitem.cc @@ -217,7 +217,7 @@ void KonqInfoListViewItem::paintCell( TQPainter *_painter, const TQColorGroup & cg.setColor( TQColorGroup::Text, m_pListViewWidget->itemColor() ); - KListView *lv = static_cast< KListView* >( listView() ); + TDEListView *lv = static_cast< TDEListView* >( listView() ); const TQPixmap *pm = TQT_TQPIXMAP_CONST(lv->viewport()->paletteBackgroundPixmap()); if ( _column == 0 && isSelected() && !lv->allColumnsShowFocus() ) { @@ -242,7 +242,7 @@ void KonqInfoListViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _width = newWidth; } - KListViewItem::paintCell( _painter, cg, _column, _width, _alignment ); + TDEListViewItem::paintCell( _painter, cg, _column, _width, _alignment ); } void KonqInfoListViewItem::paintFocus( TQPainter * _painter, const TQColorGroup & cg, const TQRect & _r ) diff --git a/konqueror/listview/konq_infolistviewwidget.cc b/konqueror/listview/konq_infolistviewwidget.cc index 9a87baa17..60a3ec2b0 100644 --- a/konqueror/listview/konq_infolistviewwidget.cc +++ b/konqueror/listview/konq_infolistviewwidget.cc @@ -37,7 +37,7 @@ KonqInfoListViewWidget::KonqInfoListViewWidget( KonqListView* parent, { m_metaInfoJob = 0; - m_mtSelector = new KSelectAction(i18n("View &As"), 0, TQT_TQOBJECT(this), + m_mtSelector = new TDESelectAction(i18n("View &As"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSelectMimeType()), parent->actionCollection(), "view_as" ); diff --git a/konqueror/listview/konq_infolistviewwidget.h b/konqueror/listview/konq_infolistviewwidget.h index c4dcf5076..258a20090 100644 --- a/konqueror/listview/konq_infolistviewwidget.h +++ b/konqueror/listview/konq_infolistviewwidget.h @@ -27,7 +27,7 @@ namespace TDEIO {class MetaInfoJob;} class KonqListView; -class KSelectAction; +class TDESelectAction; /** * The info list view @@ -81,7 +81,7 @@ class KonqInfoListViewWidget : public KonqBaseListViewWidget KonqILVMimeType m_favorite; - KSelectAction* m_mtSelector; + TDESelectAction* m_mtSelector; TDEIO::MetaInfoJob* m_metaInfoJob; KFileItemList m_metaInfoTodo; }; diff --git a/konqueror/listview/konq_listview.cc b/konqueror/listview/konq_listview.cc index a1f522bf6..43a6468fc 100644 --- a/konqueror/listview/konq_listview.cc +++ b/konqueror/listview/konq_listview.cc @@ -643,37 +643,37 @@ void KonqListView::slotKFindClosed() void KonqListView::setupActions() { - m_paShowTime=new KToggleAction(i18n("Show &Modification Time"), 0,this, TQT_SLOT(slotColumnToggled()), actionCollection(), "show_time" ); + m_paShowTime=new TDEToggleAction(i18n("Show &Modification Time"), 0,this, TQT_SLOT(slotColumnToggled()), actionCollection(), "show_time" ); m_paShowTime->setCheckedState(i18n("Hide &Modification Time")); - m_paShowType=new KToggleAction(i18n("Show &File Type"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_type" ); + m_paShowType=new TDEToggleAction(i18n("Show &File Type"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_type" ); m_paShowType->setCheckedState(i18n("Hide &File Type")); - m_paShowMimeType=new KToggleAction(i18n("Show MimeType"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_mimetype" ); + m_paShowMimeType=new TDEToggleAction(i18n("Show MimeType"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_mimetype" ); m_paShowMimeType->setCheckedState(i18n("Hide MimeType")); - m_paShowAccessTime=new KToggleAction(i18n("Show &Access Time"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_access_time" ); + m_paShowAccessTime=new TDEToggleAction(i18n("Show &Access Time"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_access_time" ); m_paShowAccessTime->setCheckedState(i18n("Hide &Access Time")); - m_paShowCreateTime=new KToggleAction(i18n("Show &Creation Time"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_creation_time" ); + m_paShowCreateTime=new TDEToggleAction(i18n("Show &Creation Time"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_creation_time" ); m_paShowCreateTime->setCheckedState(i18n("Hide &Creation Time")); - m_paShowLinkDest=new KToggleAction(i18n("Show &Link Destination"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_link_dest" ); + m_paShowLinkDest=new TDEToggleAction(i18n("Show &Link Destination"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_link_dest" ); m_paShowLinkDest->setCheckedState(i18n("Hide &Link Destination")); - m_paShowSize=new KToggleAction(i18n("Show Filesize"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_size" ); + m_paShowSize=new TDEToggleAction(i18n("Show Filesize"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_size" ); m_paShowSize->setCheckedState(i18n("Hide Filesize")); - m_paShowOwner=new KToggleAction(i18n("Show Owner"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_owner" ); + m_paShowOwner=new TDEToggleAction(i18n("Show Owner"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_owner" ); m_paShowOwner->setCheckedState(i18n("Hide Owner")); - m_paShowGroup=new KToggleAction(i18n("Show Group"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_group" ); + m_paShowGroup=new TDEToggleAction(i18n("Show Group"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_group" ); m_paShowGroup->setCheckedState(i18n("Hide Group")); - m_paShowPermissions=new KToggleAction(i18n("Show Permissions"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_permissions" ); + m_paShowPermissions=new TDEToggleAction(i18n("Show Permissions"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_permissions" ); m_paShowPermissions->setCheckedState(i18n("Hide Permissions")); - m_paShowURL=new KToggleAction(i18n("Show URL"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_url" ); + m_paShowURL=new TDEToggleAction(i18n("Show URL"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_url" ); - m_paSelect = new KAction( i18n( "Se&lect..." ), CTRL+Key_Plus, this, TQT_SLOT( slotSelect() ), actionCollection(), "select" ); - m_paUnselect = new KAction( i18n( "Unselect..." ), CTRL+Key_Minus, this, TQT_SLOT( slotUnselect() ), actionCollection(), "unselect" ); + m_paSelect = new TDEAction( i18n( "Se&lect..." ), CTRL+Key_Plus, this, TQT_SLOT( slotSelect() ), actionCollection(), "select" ); + m_paUnselect = new TDEAction( i18n( "Unselect..." ), CTRL+Key_Minus, this, TQT_SLOT( slotUnselect() ), actionCollection(), "unselect" ); m_paSelectAll = KStdAction::selectAll( this, TQT_SLOT( slotSelectAll() ), actionCollection(), "selectall" ); - m_paUnselectAll = new KAction( i18n( "Unselect All" ), CTRL+Key_U, this, TQT_SLOT( slotUnselectAll() ), actionCollection(), "unselectall" ); - m_paInvertSelection = new KAction( i18n( "&Invert Selection" ), CTRL+Key_Asterisk, this, TQT_SLOT( slotInvertSelection() ), actionCollection(), "invertselection" ); + m_paUnselectAll = new TDEAction( i18n( "Unselect All" ), CTRL+Key_U, this, TQT_SLOT( slotUnselectAll() ), actionCollection(), "unselectall" ); + m_paInvertSelection = new TDEAction( i18n( "&Invert Selection" ), CTRL+Key_Asterisk, this, TQT_SLOT( slotInvertSelection() ), actionCollection(), "invertselection" ); - m_paShowDot = new KToggleAction( i18n( "Show &Hidden Files" ), 0, this, TQT_SLOT( slotShowDot() ), actionCollection(), "show_dot" ); + m_paShowDot = new TDEToggleAction( i18n( "Show &Hidden Files" ), 0, this, TQT_SLOT( slotShowDot() ), actionCollection(), "show_dot" ); // m_paShowDot->setCheckedState(i18n("Hide &Hidden Files")); - m_paCaseInsensitive = new KToggleAction(i18n("Case Insensitive Sort"), 0, this, TQT_SLOT(slotCaseInsensitive()),actionCollection(), "sort_caseinsensitive" ); + m_paCaseInsensitive = new TDEToggleAction(i18n("Case Insensitive Sort"), 0, this, TQT_SLOT(slotCaseInsensitive()),actionCollection(), "sort_caseinsensitive" ); newIconSize( KIcon::SizeSmall /* default size */ ); } diff --git a/konqueror/listview/konq_listview.h b/konqueror/listview/konq_listview.h index 127ecc3b2..5b175e13a 100644 --- a/konqueror/listview/konq_listview.h +++ b/konqueror/listview/konq_listview.h @@ -34,8 +34,8 @@ #include <konq_propsview.h> #include "konq_listviewwidget.h" -class KAction; -class KToggleAction; +class TDEAction; +class TDEToggleAction; class ListViewBrowserExtension; class KonqListViewFactory : public KParts::Factory @@ -147,26 +147,26 @@ private: KMimeTypeResolver<KonqBaseListViewItem,KonqListView> *m_mimeTypeResolver; TQTimer *m_headerTimer; - KAction *m_paSelect; - KAction *m_paUnselect; - KAction *m_paSelectAll; - KAction *m_paUnselectAll; - KAction *m_paInvertSelection; - - KToggleAction *m_paCaseInsensitive; - - KToggleAction *m_paShowDot; - KToggleAction *m_paShowTime; - KToggleAction *m_paShowType; - KToggleAction *m_paShowMimeType; - KToggleAction *m_paShowAccessTime; - KToggleAction *m_paShowCreateTime; - KToggleAction *m_paShowLinkDest; - KToggleAction *m_paShowSize; - KToggleAction *m_paShowOwner; - KToggleAction *m_paShowGroup; - KToggleAction *m_paShowPermissions; - KToggleAction *m_paShowURL; + TDEAction *m_paSelect; + TDEAction *m_paUnselect; + TDEAction *m_paSelectAll; + TDEAction *m_paUnselectAll; + TDEAction *m_paInvertSelection; + + TDEToggleAction *m_paCaseInsensitive; + + TDEToggleAction *m_paShowDot; + TDEToggleAction *m_paShowTime; + TDEToggleAction *m_paShowType; + TDEToggleAction *m_paShowMimeType; + TDEToggleAction *m_paShowAccessTime; + TDEToggleAction *m_paShowCreateTime; + TDEToggleAction *m_paShowLinkDest; + TDEToggleAction *m_paShowSize; + TDEToggleAction *m_paShowOwner; + TDEToggleAction *m_paShowGroup; + TDEToggleAction *m_paShowPermissions; + TDEToggleAction *m_paShowURL; }; class ListViewBrowserExtension : public KonqDirPartBrowserExtension diff --git a/konqueror/listview/konq_listviewitems.cc b/konqueror/listview/konq_listviewitems.cc index 925f33f8f..cebf7d5be 100644 --- a/konqueror/listview/konq_listviewitems.cc +++ b/konqueror/listview/konq_listviewitems.cc @@ -305,7 +305,7 @@ void KonqListViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, cg.setColor( TQColorGroup::Text, m_pListViewWidget->itemColor() ); - KListView *lv = static_cast< KListView* >( listView() ); + TDEListView *lv = static_cast< TDEListView* >( listView() ); const TQPixmap *pm = TQT_TQPIXMAP_CONST(lv->viewport()->paletteBackgroundPixmap()); if ( _column == 0 && isSelected() && !lv->allColumnsShowFocus() ) { @@ -330,7 +330,7 @@ void KonqListViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, _width = newWidth; } - KListViewItem::paintCell( _painter, cg, _column, _width, _alignment ); + TDEListViewItem::paintCell( _painter, cg, _column, _width, _alignment ); } void KonqListViewItem::paintFocus( TQPainter * _painter, const TQColorGroup & cg, const TQRect & _r ) @@ -391,7 +391,7 @@ const char* KonqBaseListViewItem::makeAccessString( const mode_t mode) } KonqBaseListViewItem::KonqBaseListViewItem(KonqBaseListViewWidget *_listViewWidget, KFileItem* _fileitem) -:KListViewItem(_listViewWidget) +:TDEListViewItem(_listViewWidget) ,sortChar(0) ,m_bDisabled(false) ,m_bActive(false) @@ -400,7 +400,7 @@ KonqBaseListViewItem::KonqBaseListViewItem(KonqBaseListViewWidget *_listViewWidg {} KonqBaseListViewItem::KonqBaseListViewItem(KonqBaseListViewWidget *_listViewWidget, KonqBaseListViewItem *_parent, KFileItem* _fileitem) -:KListViewItem(_parent) +:TDEListViewItem(_parent) ,sortChar(0) ,m_bDisabled(false) ,m_bActive(false) diff --git a/konqueror/listview/konq_listviewitems.h b/konqueror/listview/konq_listviewitems.h index b54f1c2db..c96bff5a0 100644 --- a/konqueror/listview/konq_listviewitems.h +++ b/konqueror/listview/konq_listviewitems.h @@ -36,7 +36,7 @@ class KFileItem; class KonqBaseListViewWidget; -class KonqBaseListViewItem : public KListViewItem +class KonqBaseListViewItem : public TDEListViewItem { public: KonqBaseListViewItem( KonqBaseListViewWidget *_listViewWidget, diff --git a/konqueror/listview/konq_listviewwidget.cc b/konqueror/listview/konq_listviewwidget.cc index bd26db191..af7058748 100644 --- a/konqueror/listview/konq_listviewwidget.cc +++ b/konqueror/listview/konq_listviewwidget.cc @@ -58,7 +58,7 @@ ColumnInfo::ColumnInfo() void ColumnInfo::setData(const TQString& n, const TQString& desktopName, int kioUds, - KToggleAction* someAction, int theWidth) + TDEToggleAction* someAction, int theWidth) { displayInColumn=-1; name=n; @@ -71,7 +71,7 @@ void ColumnInfo::setData(const TQString& n, const TQString& desktopName, int kio } void ColumnInfo::setData(const TQString& n, const TQString& desktopName, int kioUds, - TQVariant::Type t, KToggleAction* someAction, int theWidth) + TQVariant::Type t, TDEToggleAction* someAction, int theWidth) { displayInColumn=-1; name=n; @@ -85,7 +85,7 @@ void ColumnInfo::setData(const TQString& n, const TQString& desktopName, int kio KonqBaseListViewWidget::KonqBaseListViewWidget( KonqListView *parent, TQWidget *parentWidget) - : KListView(parentWidget) + : TDEListView(parentWidget) ,sortedByColumn(0) ,m_pBrowserView(parent) ,m_dirLister(new KDirLister( true /*m_showIcons==false*/)) @@ -111,7 +111,7 @@ KonqBaseListViewWidget::KonqBaseListViewWidget( KonqListView *parent, TQWidget * m_bTopLevelComplete = true; - //Adjust KListView behaviour + //Adjust TDEListView behaviour setMultiSelection(true); setSelectionModeExt( FileManager ); setDragEnabled(true); @@ -421,7 +421,7 @@ void KonqBaseListViewWidget::contentsMousePressEvent( TQMouseEvent *e ) static_cast<KonqBaseListViewItem*>( itemAt( vp ) ) : 0L; if ( item ) { - KListView::contentsMousePressEvent( e ); + TDEListView::contentsMousePressEvent( e ); } else { if ( e->button() == Qt::LeftButton ) @@ -461,7 +461,7 @@ void KonqBaseListViewWidget::contentsMouseReleaseEvent( TQMouseEvent *e ) } delete m_selected; m_selected = 0; - KListView::contentsMouseReleaseEvent( e ); + TDEListView::contentsMouseReleaseEvent( e ); } void KonqBaseListViewWidget::contentsMouseMoveEvent( TQMouseEvent *e ) @@ -505,7 +505,7 @@ void KonqBaseListViewWidget::contentsMouseMoveEvent( TQMouseEvent *e ) } } - KListView::contentsMouseMoveEvent( e ); + TDEListView::contentsMouseMoveEvent( e ); } void KonqBaseListViewWidget::contentsWheelEvent( TQWheelEvent *e ) @@ -521,7 +521,7 @@ void KonqBaseListViewWidget::contentsWheelEvent( TQWheelEvent *e ) reportItemCounts(); m_pBrowserView->emitMouseOver( 0 ); - KListView::contentsWheelEvent( e ); + TDEListView::contentsWheelEvent( e ); } void KonqBaseListViewWidget::leaveEvent( TQEvent *e ) @@ -537,7 +537,7 @@ void KonqBaseListViewWidget::leaveEvent( TQEvent *e ) m_fileTip->setItem( 0 ); - KListView::leaveEvent( e ); + TDEListView::leaveEvent( e ); } void KonqBaseListViewWidget::drawRubber( TQPainter *p ) @@ -742,7 +742,7 @@ void KonqBaseListViewWidget::slotAutoScroll() void KonqBaseListViewWidget::viewportPaintEvent( TQPaintEvent *e ) { - KListView::viewportPaintEvent( e ); + TDEListView::viewportPaintEvent( e ); TQPainter p( viewport() ); drawRubber( &p ); @@ -751,7 +751,7 @@ void KonqBaseListViewWidget::viewportPaintEvent( TQPaintEvent *e ) void KonqBaseListViewWidget::viewportResizeEvent(TQResizeEvent * e) { - KListView::viewportResizeEvent(e); + TDEListView::viewportResizeEvent(e); emit viewportAdjusted(); } @@ -861,7 +861,7 @@ void KonqBaseListViewWidget::slotItemRenamed( TQListViewItem *item, const TQStri Q_ASSERT( item != 0 ); // The correct behavior is to show the old name until the rename has successfully - // completed. Unfortunately, KListView forces us to allow the text to be changed + // completed. Unfortunately, TDEListView forces us to allow the text to be changed // before we try the rename, so set it back to the pre-rename state. KonqBaseListViewItem *renamedItem = static_cast<KonqBaseListViewItem*>(item); renamedItem->updateContents(); @@ -873,7 +873,7 @@ void KonqBaseListViewWidget::slotItemRenamed( TQListViewItem *item, const TQStri KonqOperations::rename( this, renamedItem->item()->url(), TDEIO::encodeFileName( name ) ); } - // When the KListViewLineEdit loses focus, focus tends to go to the location bar... + // When the TDEListViewLineEdit loses focus, focus tends to go to the location bar... setFocus(); } diff --git a/konqueror/listview/konq_listviewwidget.h b/konqueror/listview/konq_listviewwidget.h index cbfcc446b..1fc8b0eb7 100644 --- a/konqueror/listview/konq_listviewwidget.h +++ b/konqueror/listview/konq_listviewwidget.h @@ -37,7 +37,7 @@ class TQRect; class KDirLister; class KonqFMSettings; class ListViewPropertiesExtension; -class KToggleAction; +class TDEToggleAction; class KonqListView; class KonqFileTip; class ListViewBrowserExtension; @@ -56,24 +56,24 @@ class ColumnInfo public: ColumnInfo(); void setData( const TQString& n, const TQString& desktopName, int kioUds, - KToggleAction *someAction, int theWith = -1 ); + TDEToggleAction *someAction, int theWith = -1 ); void setData( const TQString& n, const TQString& desktopName, int kioUds /* UDS_EXTRA */, - TQVariant::Type type, KToggleAction *someAction, int theWith = -1 ); + TQVariant::Type type, TDEToggleAction *someAction, int theWith = -1 ); int displayInColumn; TQString name; TQString desktopFileName; int udsId; TQVariant::Type type; // only used if udsId == UDS_EXTRA bool displayThisOne; - KToggleAction *toggleThisOne; + TDEToggleAction *toggleThisOne; int width; }; /** - * The tree view widget (based on KListView). + * The tree view widget (based on TDEListView). * Most of the functionality is here. */ -class KonqBaseListViewWidget : public KListView +class KonqBaseListViewWidget : public TDEListView { friend class KonqBaseListViewItem; friend class KonqListView; @@ -154,7 +154,7 @@ signals: public slots: //virtual void slotOnItem( KonqBaseListViewItem* _item ); - // The '2' was added to differentiate it from KListView::slotMouseButtonClicked() + // The '2' was added to differentiate it from TDEListView::slotMouseButtonClicked() void slotMouseButtonClicked2( int _button, TQListViewItem *_item, const TQPoint& pos, int ); virtual void slotExecuted( TQListViewItem *_item ); void slotItemRenamed( TQListViewItem *, const TQString &, int ); @@ -222,7 +222,7 @@ protected: //so the position of the mouse pointer doesn't matter when using keyboard, aleXXX virtual void popupMenu( const TQPoint& _global, bool alwaysForSelectedFiles = false ); - //this one is called only by KListView, and this is friend anyways (Alex) + //this one is called only by TDEListView, and this is friend anyways (Alex) //KDirLister *dirLister() const { return m_dirLister; } protected: diff --git a/konqueror/listview/konq_textviewitem.cc b/konqueror/listview/konq_textviewitem.cc index 4b989a9e7..ac63cd443 100644 --- a/konqueror/listview/konq_textviewitem.cc +++ b/konqueror/listview/konq_textviewitem.cc @@ -208,7 +208,7 @@ void KonqTextViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, // cg.setColor(TQColorGroup::HighlightedText, static_cast<KonqTextViewWidget *>(listView())->highlight[type]); // cg.setColor(TQColorGroup::Highlight, Qt::darkGray); - KListViewItem::paintCell( _painter, cg, _column, _width, _alignment ); + TDEListViewItem::paintCell( _painter, cg, _column, _width, _alignment ); } /*void KonqTextViewItem::paintFocus( TQPainter *_p, const TQColorGroup &_cg, const TQRect &_r ) |