diff options
Diffstat (limited to 'konqueror/listview')
| -rw-r--r-- | konqueror/listview/konq_infolistviewitem.cpp | 2 | ||||
| -rw-r--r-- | konqueror/listview/konq_infolistviewwidget.cpp | 28 | ||||
| -rw-r--r-- | konqueror/listview/konq_infolistviewwidget.h | 2 | ||||
| -rw-r--r-- | konqueror/listview/konq_listview.cpp | 102 | ||||
| -rw-r--r-- | konqueror/listview/konq_listview.h | 4 | ||||
| -rw-r--r-- | konqueror/listview/konq_listview.kcfg | 2 | ||||
| -rw-r--r-- | konqueror/listview/konq_listviewitems.cpp | 8 | ||||
| -rw-r--r-- | konqueror/listview/konq_listviewwidget.cpp | 190 | ||||
| -rw-r--r-- | konqueror/listview/konq_listviewwidget.h | 2 | ||||
| -rw-r--r-- | konqueror/listview/konq_textviewitem.cpp | 4 | ||||
| -rw-r--r-- | konqueror/listview/konq_textviewwidget.cpp | 26 | ||||
| -rw-r--r-- | konqueror/listview/konq_textviewwidget.h | 2 | ||||
| -rw-r--r-- | konqueror/listview/konq_treeviewwidget.cpp | 12 | ||||
| -rw-r--r-- | konqueror/listview/konq_treeviewwidget.h | 2 |
14 files changed, 195 insertions, 191 deletions
diff --git a/konqueror/listview/konq_infolistviewitem.cpp b/konqueror/listview/konq_infolistviewitem.cpp index 18efb3f8f..f945333b8 100644 --- a/konqueror/listview/konq_infolistviewitem.cpp +++ b/konqueror/listview/konq_infolistviewitem.cpp @@ -218,7 +218,7 @@ void KonqInfoListViewItem::paintCell( TQPainter *_painter, const TQColorGroup & cg.setColor( TQColorGroup::Text, m_pListViewWidget->itemColor() ); TDEListView *lv = static_cast< TDEListView* >( listView() ); - const TQPixmap *pm = TQT_TQPIXMAP_CONST(lv->viewport()->paletteBackgroundPixmap()); + const TQPixmap *pm = lv->viewport()->paletteBackgroundPixmap(); if ( _column == 0 && isSelected() && !lv->allColumnsShowFocus() ) { int newWidth = width( lv->fontMetrics(), lv, _column ); diff --git a/konqueror/listview/konq_infolistviewwidget.cpp b/konqueror/listview/konq_infolistviewwidget.cpp index e835f1cb3..8ec62c79a 100644 --- a/konqueror/listview/konq_infolistviewwidget.cpp +++ b/konqueror/listview/konq_infolistviewwidget.cpp @@ -37,8 +37,8 @@ KonqInfoListViewWidget::KonqInfoListViewWidget( KonqListView* parent, { m_metaInfoJob = 0; - m_mtSelector = new TDESelectAction(i18n("View &As"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotSelectMimeType()), + m_mtSelector = new TDESelectAction(i18n("View &As"), 0, this, + TQ_SLOT(slotSelectMimeType()), parent->actionCollection(), "view_as" ); kdDebug(1203) << "created info list view\n"; @@ -237,10 +237,10 @@ void KonqInfoListViewWidget::slotNewItems( const KFileItemList& list) else { m_metaInfoJob = TDEIO::fileMetaInfo(list); - connect( m_metaInfoJob, TQT_SIGNAL( gotMetaInfo( const KFileItem*)), - this, TQT_SLOT( slotMetaInfo( const KFileItem*))); - connect( m_metaInfoJob, TQT_SIGNAL( result( TDEIO::Job*)), - this, TQT_SLOT( slotMetaInfoResult())); + connect( m_metaInfoJob, TQ_SIGNAL( gotMetaInfo( const KFileItem*)), + this, TQ_SLOT( slotMetaInfo( const KFileItem*))); + connect( m_metaInfoJob, TQ_SIGNAL( result( TDEIO::Job*)), + this, TQ_SLOT( slotMetaInfoResult())); } } @@ -257,10 +257,10 @@ void KonqInfoListViewWidget::slotRefreshItems( const KFileItemList& list) else { m_metaInfoJob = TDEIO::fileMetaInfo(list); - connect( m_metaInfoJob, TQT_SIGNAL( gotMetaInfo( const KFileItem*)), - this, TQT_SLOT( slotMetaInfo( const KFileItem*))); - connect( m_metaInfoJob, TQT_SIGNAL( result( TDEIO::Job*)), - this, TQT_SLOT( slotMetaInfoResult())); + connect( m_metaInfoJob, TQ_SIGNAL( gotMetaInfo( const KFileItem*)), + this, TQ_SLOT( slotMetaInfo( const KFileItem*))); + connect( m_metaInfoJob, TQ_SIGNAL( result( TDEIO::Job*)), + this, TQ_SLOT( slotMetaInfoResult())); } KonqBaseListViewWidget::slotRefreshItems(list); } @@ -313,10 +313,10 @@ void KonqInfoListViewWidget::slotMetaInfoResult() else { m_metaInfoJob = TDEIO::fileMetaInfo(m_metaInfoTodo); - connect( m_metaInfoJob, TQT_SIGNAL( gotMetaInfo( const KFileItem*)), - this, TQT_SLOT( slotMetaInfo( const KFileItem*))); - connect( m_metaInfoJob, TQT_SIGNAL( result( TDEIO::Job*)), - this, TQT_SLOT( slotMetaInfoResult())); + connect( m_metaInfoJob, TQ_SIGNAL( gotMetaInfo( const KFileItem*)), + this, TQ_SLOT( slotMetaInfo( const KFileItem*))); + connect( m_metaInfoJob, TQ_SIGNAL( result( TDEIO::Job*)), + this, TQ_SLOT( slotMetaInfoResult())); m_metaInfoTodo.clear(); } } diff --git a/konqueror/listview/konq_infolistviewwidget.h b/konqueror/listview/konq_infolistviewwidget.h index 258a20090..07cede196 100644 --- a/konqueror/listview/konq_infolistviewwidget.h +++ b/konqueror/listview/konq_infolistviewwidget.h @@ -35,7 +35,7 @@ class TDESelectAction; class KonqInfoListViewWidget : public KonqBaseListViewWidget { // friend class KonqTextViewItem; - Q_OBJECT + TQ_OBJECT public: KonqInfoListViewWidget( KonqListView *parent, TQWidget *parentWidget ); ~KonqInfoListViewWidget(); diff --git a/konqueror/listview/konq_listview.cpp b/konqueror/listview/konq_listview.cpp index 5a06068ca..33424ca52 100644 --- a/konqueror/listview/konq_listview.cpp +++ b/konqueror/listview/konq_listview.cpp @@ -46,7 +46,7 @@ #include <sys/stat.h> #include <time.h> #include <unistd.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <konq_sort_constants.h> @@ -289,20 +289,20 @@ KonqListView::KonqListView( TQWidget *parentWidget, TQObject *parent, const char // Note: File Type is in fact the mimetype comment. We use UDS_FILE_TYPE but that's not what we show in fact :/ m_pListView->confColumns[10].setData(I18N_NOOP("File Type"),"Type",TDEIO::UDS_FILE_TYPE,m_paShowType); - connect( m_pListView, TQT_SIGNAL( selectionChanged() ), - m_extension, TQT_SLOT( updateActions() ) ); - connect( m_pListView, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( slotSelectionChanged() ) ); + connect( m_pListView, TQ_SIGNAL( selectionChanged() ), + m_extension, TQ_SLOT( updateActions() ) ); + connect( m_pListView, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( slotSelectionChanged() ) ); - connect( m_pListView, TQT_SIGNAL( currentChanged(TQListViewItem*) ), - m_extension, TQT_SLOT( updateActions() ) ); - connect(m_pListView->header(),TQT_SIGNAL(indexChange(int,int,int)),this,TQT_SLOT(headerDragged(int,int,int))); - connect(m_pListView->header(),TQT_SIGNAL(clicked(int)),this,TQT_SLOT(slotHeaderClicked(int))); - connect(m_pListView->header(),TQT_SIGNAL(sizeChange(int,int,int)),TQT_SLOT(slotHeaderSizeChanged())); + connect( m_pListView, TQ_SIGNAL( currentChanged(TQListViewItem*) ), + m_extension, TQ_SLOT( updateActions() ) ); + connect(m_pListView->header(),TQ_SIGNAL(indexChange(int,int,int)),this,TQ_SLOT(headerDragged(int,int,int))); + connect(m_pListView->header(),TQ_SIGNAL(clicked(int)),this,TQ_SLOT(slotHeaderClicked(int))); + connect(m_pListView->header(),TQ_SIGNAL(sizeChange(int,int,int)),TQ_SLOT(slotHeaderSizeChanged())); // signals from konqdirpart (for BC reasons) - connect( this, TQT_SIGNAL( findOpened( KonqDirPart * ) ), TQT_SLOT( slotKFindOpened() ) ); - connect( this, TQT_SIGNAL( findClosed( KonqDirPart * ) ), TQT_SLOT( slotKFindClosed() ) ); + connect( this, TQ_SIGNAL( findOpened( KonqDirPart * ) ), TQ_SLOT( slotKFindOpened() ) ); + connect( this, TQ_SIGNAL( findClosed( KonqDirPart * ) ), TQ_SLOT( slotKFindClosed() ) ); loadPlugins( this, this, instance() ); } @@ -393,7 +393,7 @@ void KonqListView::slotSelect() for (KonqBaseListViewWidget::iterator it = m_pListView->begin(); it != m_pListView->end(); it++ ) { if ((m_pListView->automaticSelection()) && (it->isSelected())) { - it->setSelected(FALSE); + it->setSelected(false); //the following line is to prevent that more than one item were selected //and now get deselected and automaticSelection() was true, this shouldn't happen //but who knows, aleXXX @@ -401,11 +401,11 @@ void KonqListView::slotSelect() } if ( it->isVisible() ) { if ( re.exactMatch( it->text(0) ) ) { - it->setSelected(TRUE); + it->setSelected(true); } } else { - it->setSelected(FALSE); + it->setSelected(false); } } m_pListView->blockSignals( false ); @@ -422,22 +422,22 @@ void KonqListView::slotUnselect() if ( !ok ) return; - TQRegExp re( pattern, TRUE, TRUE ); + TQRegExp re( pattern, true, true ); - m_pListView->blockSignals(TRUE); + m_pListView->blockSignals(true); for (KonqBaseListViewWidget::iterator it = m_pListView->begin(); it != m_pListView->end(); it++ ) { if ( it->isVisible() ) { if ( re.exactMatch( it->text(0) ) ) { - it->setSelected(FALSE); + it->setSelected(false); } } else { - it->setSelected(FALSE); + it->setSelected(false); } } - m_pListView->blockSignals(FALSE); + m_pListView->blockSignals(false); m_pListView->deactivateAutomaticSelection(); emit m_pListView->selectionChanged(); m_pListView->viewport()->update(); @@ -445,14 +445,14 @@ void KonqListView::slotUnselect() void KonqListView::slotSelectAll() { - m_pListView->selectAll(TRUE); + m_pListView->selectAll(true); m_pListView->deactivateAutomaticSelection(); emit m_pListView->selectionChanged(); } void KonqListView::slotUnselectAll() { - m_pListView->selectAll(FALSE); + m_pListView->selectAll(false); m_pListView->deactivateAutomaticSelection(); emit m_pListView->selectionChanged(); } @@ -463,7 +463,7 @@ void KonqListView::slotInvertSelection() if ((m_pListView->automaticSelection()) && (m_pListView->currentItem()!=0) && (m_pListView->currentItem()->isSelected())) - m_pListView->currentItem()->setSelected(FALSE); + m_pListView->currentItem()->setSelected(false); m_pListView->invertSelection(); m_pListView->deactivateAutomaticSelection(); @@ -563,7 +563,7 @@ void KonqListView::slotHeaderClicked(int sec) if (nameOfSortColumn!=m_pListView->sortedByColumn) { m_pListView->sortedByColumn=nameOfSortColumn; - m_pListView->setAscending(TRUE); + m_pListView->setAscending(true); } else { @@ -789,7 +789,7 @@ void KonqListView::headerDragged(int sec, int from, int to) kdDebug(1202)<<"section: "<<sec<<" fromIndex: "<<from<<" toIndex "<<to<<endl; //at this point the columns aren't moved yet, so I let the listview //rearrange the stuff and use a single shot timer - TQTimer::singleShot(200,this,TQT_SLOT(slotSaveAfterHeaderDrag())); + TQTimer::singleShot(200,this,TQ_SLOT(slotSaveAfterHeaderDrag())); } const KFileItem * KonqListView::currentItem() @@ -863,7 +863,7 @@ void KonqListView::slotHeaderSizeChanged() if ( !m_headerTimer ) { m_headerTimer = new TQTimer( this ); - connect( m_headerTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotSaveColumnWidths() ) ); + connect( m_headerTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotSaveColumnWidths() ) ); } else m_headerTimer->stop(); @@ -885,33 +885,33 @@ void KonqListView::slotKFindClosed() void KonqListView::setupActions() { - m_paShowTime=new TDEToggleAction(i18n("Show &Modification Time"), 0,this, TQT_SLOT(slotColumnToggled()), actionCollection(), "show_time" ); + m_paShowTime=new TDEToggleAction(i18n("Show &Modification Time"), 0,this, TQ_SLOT(slotColumnToggled()), actionCollection(), "show_time" ); m_paShowTime->setCheckedState(i18n("Hide &Modification Time")); - m_paShowType=new TDEToggleAction(i18n("Show &File Type"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_type" ); + m_paShowType=new TDEToggleAction(i18n("Show &File Type"), 0, this, TQ_SLOT(slotColumnToggled()),actionCollection(), "show_type" ); m_paShowType->setCheckedState(i18n("Hide &File Type")); - m_paShowMimeType=new TDEToggleAction(i18n("Show MimeType"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_mimetype" ); + m_paShowMimeType=new TDEToggleAction(i18n("Show MimeType"), 0, this, TQ_SLOT(slotColumnToggled()),actionCollection(), "show_mimetype" ); m_paShowMimeType->setCheckedState(i18n("Hide MimeType")); - m_paShowAccessTime=new TDEToggleAction(i18n("Show &Access Time"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_access_time" ); + m_paShowAccessTime=new TDEToggleAction(i18n("Show &Access Time"), 0, this, TQ_SLOT(slotColumnToggled()),actionCollection(), "show_access_time" ); m_paShowAccessTime->setCheckedState(i18n("Hide &Access Time")); - m_paShowCreateTime=new TDEToggleAction(i18n("Show &Creation Time"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_creation_time" ); + m_paShowCreateTime=new TDEToggleAction(i18n("Show &Creation Time"), 0, this, TQ_SLOT(slotColumnToggled()),actionCollection(), "show_creation_time" ); m_paShowCreateTime->setCheckedState(i18n("Hide &Creation Time")); - m_paShowLinkDest=new TDEToggleAction(i18n("Show &Link Destination"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_link_dest" ); + m_paShowLinkDest=new TDEToggleAction(i18n("Show &Link Destination"), 0, this, TQ_SLOT(slotColumnToggled()),actionCollection(), "show_link_dest" ); m_paShowLinkDest->setCheckedState(i18n("Hide &Link Destination")); - m_paShowSize=new TDEToggleAction(i18n("Show Filesize"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_size" ); + m_paShowSize=new TDEToggleAction(i18n("Show Filesize"), 0, this, TQ_SLOT(slotColumnToggled()),actionCollection(), "show_size" ); m_paShowSize->setCheckedState(i18n("Hide Filesize")); - m_paShowOwner=new TDEToggleAction(i18n("Show Owner"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_owner" ); + m_paShowOwner=new TDEToggleAction(i18n("Show Owner"), 0, this, TQ_SLOT(slotColumnToggled()),actionCollection(), "show_owner" ); m_paShowOwner->setCheckedState(i18n("Hide Owner")); - m_paShowGroup=new TDEToggleAction(i18n("Show Group"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_group" ); + m_paShowGroup=new TDEToggleAction(i18n("Show Group"), 0, this, TQ_SLOT(slotColumnToggled()),actionCollection(), "show_group" ); m_paShowGroup->setCheckedState(i18n("Hide Group")); - m_paShowPermissions=new TDEToggleAction(i18n("Show Permissions"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_permissions" ); + m_paShowPermissions=new TDEToggleAction(i18n("Show Permissions"), 0, this, TQ_SLOT(slotColumnToggled()),actionCollection(), "show_permissions" ); m_paShowPermissions->setCheckedState(i18n("Hide Permissions")); - m_paShowURL=new TDEToggleAction(i18n("Show URL"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_url" ); + m_paShowURL=new TDEToggleAction(i18n("Show URL"), 0, this, TQ_SLOT(slotColumnToggled()),actionCollection(), "show_url" ); - 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 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_paSelect = new TDEAction( i18n( "Se&lect..." ), CTRL+Key_Plus, this, TQ_SLOT( slotSelect() ), actionCollection(), "select" ); + m_paUnselect = new TDEAction( i18n( "Unselect..." ), CTRL+Key_Minus, this, TQ_SLOT( slotUnselect() ), actionCollection(), "unselect" ); + m_paSelectAll = KStdAction::selectAll( this, TQ_SLOT( slotSelectAll() ), actionCollection(), "selectall" ); + m_paUnselectAll = new TDEAction( i18n( "Unselect All" ), CTRL+Key_U, this, TQ_SLOT( slotUnselectAll() ), actionCollection(), "unselectall" ); + m_paInvertSelection = new TDEAction( i18n( "&Invert Selection" ), CTRL+Key_Asterisk, this, TQ_SLOT( slotInvertSelection() ), actionCollection(), "invertselection" ); // These 2 actions are 'fake' actions. They are defined so that the keyboard shortcuts // can be set from the 'Configure Shortcuts..." dialog. @@ -929,16 +929,16 @@ void KonqListView::setupActions() m_paRenameMovePrev->setToolTip( i18n("Complete rename operation and move the previous item")); m_paRenameMovePrev->setEnabled(false); - m_paShowDot = new TDEToggleAction( i18n( "Show &Hidden Files" ), 0, this, TQT_SLOT( slotShowDot() ), actionCollection(), "show_dot" ); + m_paShowDot = new TDEToggleAction( i18n( "Show &Hidden Files" ), 0, this, TQ_SLOT( slotShowDot() ), actionCollection(), "show_dot" ); // m_paShowDot->setCheckedState(i18n("Hide &Hidden Files")); - m_paCaseInsensitive = new TDEToggleAction(i18n("Case Insensitive Sort"), 0, this, TQT_SLOT(slotCaseInsensitive()),actionCollection(), "sort_caseinsensitive" ); + m_paCaseInsensitive = new TDEToggleAction(i18n("Case Insensitive Sort"), 0, this, TQ_SLOT(slotCaseInsensitive()),actionCollection(), "sort_caseinsensitive" ); m_paSortAlternate = new TDEAction( i18n( "&Alternate Sort Order" ), CTRL+Key_S, this, - TQT_SLOT( slotSortAlternate() ), actionCollection(), "alternate_sort_order"); + TQ_SLOT( slotSortAlternate() ), actionCollection(), "alternate_sort_order"); m_paSortAlternate->setToolTip( i18n( "Sort by PREVIOUS sort column" ) ); m_paSortReverse = new TDEAction( i18n( "&Reverse Sort Order" ), CTRL+Key_R, this, - TQT_SLOT( slotSortReverse() ), actionCollection(), "reverse_sort_order"); + TQ_SLOT( slotSortReverse() ), actionCollection(), "reverse_sort_order"); m_paSortReverse->setToolTip( i18n( "Reverse sort order of current sort column" ) ); /* @@ -948,17 +948,17 @@ void KonqListView::setupActions() TextSortOrder initialOrder = m_pProps->getSortOrder(); m_paOrderUnicodeUnmodified = new TDEToggleAction( i18n( "&Unicode based" ), ALT+Key_1, this, - TQT_SLOT( slotOrderUnicodeUnmodified() ), actionCollection(), "order_unicode_based" ); + TQ_SLOT( slotOrderUnicodeUnmodified() ), actionCollection(), "order_unicode_based" ); m_paOrderUnicodeUnmodified->setToolTip( i18n( "Strict numeric Unicode based order" ) ); m_paOrderUnicodeUnmodified->setChecked( initialOrder == UNICODE_UNMODIFIED ); m_paOrderUnicodeCaseInsensitive = new TDEToggleAction( i18n( "Unicode based, &case insensitive" ), ALT+Key_2, this, - TQT_SLOT( slotOrderUnicodeCaseInsensitive() ), actionCollection(), "order_unicode_based_case_insensitive" ); + TQ_SLOT( slotOrderUnicodeCaseInsensitive() ), actionCollection(), "order_unicode_based_case_insensitive" ); m_paOrderUnicodeCaseInsensitive->setToolTip( i18n( "Unicode based order but with lower/upper case ASCII letters adjacent" ) ); m_paOrderUnicodeCaseInsensitive->setChecked(initialOrder == UNICODE_CASEINSENSITIVE); m_paOrderLocale = new TDEToggleAction( i18n( "&Locale based" ), ALT+Key_3, this, - TQT_SLOT( slotOrderLocale() ), actionCollection(), "order_locale_based" ); + TQ_SLOT( slotOrderLocale() ), actionCollection(), "order_locale_based" ); m_paOrderLocale->setToolTip( i18n( "Locale based order, usually \"friendly\"" ) ); m_paOrderLocale->setChecked(initialOrder == LOCALE_UNMODIFIED); @@ -968,12 +968,12 @@ void KonqListView::setupActions() m_paOrderLocale->setExclusiveGroup( "sortOrder" ); m_paDisplayDirectoriesFirst = new TDEToggleAction( i18n("Group &Directories First"), CTRL+SHIFT+Key_F, this, - TQT_SLOT(slotToggleDisplayDirectoriesFirst()), actionCollection(), "group_directories_first"); + TQ_SLOT(slotToggleDisplayDirectoriesFirst()), actionCollection(), "group_directories_first"); m_paDisplayDirectoriesFirst->setToolTip( i18n( "Always display directories before non-directories" ) ); m_paDisplayDirectoriesFirst->setChecked(m_pProps->isDirsFirst()); m_paDisplayHiddenFirst = new TDEToggleAction( i18n("Group &Hidden First"), CTRL+SHIFT+Key_H, this, - TQT_SLOT(slotToggleDisplayHiddenFirst()), actionCollection(), "group_hidden_first"); + TQ_SLOT(slotToggleDisplayHiddenFirst()), actionCollection(), "group_hidden_first"); m_paDisplayHiddenFirst->setToolTip( i18n( "Always display hidden files before non-hidden files" ) ); m_paDisplayHiddenFirst->setChecked(m_pProps->isHiddenFirst()); diff --git a/konqueror/listview/konq_listview.h b/konqueror/listview/konq_listview.h index fc72f6e87..bcd2ec0a1 100644 --- a/konqueror/listview/konq_listview.h +++ b/konqueror/listview/konq_listview.h @@ -64,7 +64,7 @@ class KonqListView : public KonqDirPart friend class KonqBaseListViewWidget; friend class ListViewBrowserExtension; - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( bool supportsUndo READ supportsUndo ) public: @@ -211,7 +211,7 @@ private: class ListViewBrowserExtension : public KonqDirPartBrowserExtension { - Q_OBJECT + TQ_OBJECT friend class KonqListView; friend class KonqBaseListViewWidget; public: diff --git a/konqueror/listview/konq_listview.kcfg b/konqueror/listview/konq_listview.kcfg index 5c31c5cea..81e9af735 100644 --- a/konqueror/listview/konq_listview.kcfg +++ b/konqueror/listview/konq_listview.kcfg @@ -49,7 +49,7 @@ <whatsthis></whatsthis> </entry> <entry key="FileNameColumnWidth" type="Int"> - <default code="true">25 * TDEApplication::kApplication()->fontMetrics().width( "m" )</default> + <default code="true">25 * tdeApp->fontMetrics().width( "m" )</default> <label>Width of the FileName Column</label> <whatsthis></whatsthis> </entry> diff --git a/konqueror/listview/konq_listviewitems.cpp b/konqueror/listview/konq_listviewitems.cpp index 1766a0b0b..3910095f9 100644 --- a/konqueror/listview/konq_listviewitems.cpp +++ b/konqueror/listview/konq_listviewitems.cpp @@ -161,7 +161,7 @@ void KonqListViewItem::updateContents() const TQString entryStr = retrieveExtraEntry( m_fileitem, numExtra ); if ( tmpColumn->type == TQVariant::DateTime ) { - TQDateTime dt = TQT_TQDATETIME_OBJECT(TQDateTime::fromString( entryStr, Qt::ISODate )); + TQDateTime dt = TQDateTime::fromString( entryStr, TQt::ISODate ); setText(tmpColumn->displayInColumn, TDEGlobal::locale()->formatDateTime(dt)); } @@ -292,9 +292,9 @@ int KonqBaseListViewItem::compare( TQListViewItem* item, int col, bool ascending { if ( cInfo->type & TQVariant::DateTime ) { const TQString entryStr1 = retrieveExtraEntry( m_fileitem, numExtra ); - TQDateTime dt1 = TQT_TQDATETIME_OBJECT(TQDateTime::fromString( entryStr1, Qt::ISODate )); + TQDateTime dt1 = TQDateTime::fromString( entryStr1, TQt::ISODate ); const TQString entryStr2 = retrieveExtraEntry( k->m_fileitem, numExtra ); - TQDateTime dt2 = TQT_TQDATETIME_OBJECT(TQDateTime::fromString( entryStr2, Qt::ISODate )); + TQDateTime dt2 = TQDateTime::fromString( entryStr2, TQt::ISODate ); return ( dt1 > dt2 ) ? 1 : ( dt1 < dt2 ) ? -1 : 0; } } @@ -322,7 +322,7 @@ void KonqListViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, cg.setColor( TQColorGroup::Text, m_pListViewWidget->itemColor() ); TDEListView *lv = static_cast< TDEListView* >( listView() ); - const TQPixmap *pm = TQT_TQPIXMAP_CONST(lv->viewport()->paletteBackgroundPixmap()); + const TQPixmap *pm = lv->viewport()->paletteBackgroundPixmap(); if ( _column == 0 && isSelected() && !lv->allColumnsShowFocus() ) { int newWidth = width( lv->fontMetrics(), lv, _column ); diff --git a/konqueror/listview/konq_listviewwidget.cpp b/konqueror/listview/konq_listviewwidget.cpp index ef70fe949..e1b1a5a66 100644 --- a/konqueror/listview/konq_listviewwidget.cpp +++ b/konqueror/listview/konq_listviewwidget.cpp @@ -121,61 +121,61 @@ KonqBaseListViewWidget::KonqBaseListViewWidget( KonqListView *parent, TQWidget * initConfig(); #if 0 - connect( this, TQT_SIGNAL(rightButtonPressed(TQListViewItem*,const TQPoint&,int)), - this, TQT_SLOT(slotRightButtonPressed(TQListViewItem*,const TQPoint&,int))); + connect( this, TQ_SIGNAL(rightButtonPressed(TQListViewItem*,const TQPoint&,int)), + this, TQ_SLOT(slotRightButtonPressed(TQListViewItem*,const TQPoint&,int))); #endif - connect( this, TQT_SIGNAL(returnPressed( TQListViewItem * )), - this, TQT_SLOT(slotReturnPressed( TQListViewItem * )) ); - connect( this, TQT_SIGNAL(mouseButtonClicked( int, TQListViewItem *, const TQPoint&, int )), - this, TQT_SLOT(slotMouseButtonClicked2( int, TQListViewItem *, const TQPoint&, int )) ); - connect( this, TQT_SIGNAL(executed( TQListViewItem * )), - this, TQT_SLOT(slotExecuted( TQListViewItem * )) ); - connect( this, TQT_SIGNAL(currentChanged( TQListViewItem * )), - this, TQT_SLOT(slotCurrentChanged( TQListViewItem * )) ); - connect( this, TQT_SIGNAL(itemRenamed( TQListViewItem *, const TQString &, int )), - this, TQT_SLOT(slotItemRenamed( TQListViewItem *, const TQString &, int )) ); - connect( this, TQT_SIGNAL(contextMenuRequested( TQListViewItem *, const TQPoint&, int )), - this, TQT_SLOT(slotPopupMenu( TQListViewItem *, const TQPoint&, int )) ); - connect( this, TQT_SIGNAL(renameNext( TQListViewItem *, int )), - this, TQT_SLOT(slotRenameNextItem( TQListViewItem*, int)) ); - connect( this, TQT_SIGNAL(renamePrev( TQListViewItem *, int )), - this, TQT_SLOT(slotRenamePrevItem( TQListViewItem*, int)) ); - connect( this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged()) ); - - connect( horizontalScrollBar(), TQT_SIGNAL(valueChanged( int )), - this, TQT_SIGNAL(viewportAdjusted()) ); - connect( verticalScrollBar(), TQT_SIGNAL(valueChanged( int )), - this, TQT_SIGNAL(viewportAdjusted()) ); + connect( this, TQ_SIGNAL(returnPressed( TQListViewItem * )), + this, TQ_SLOT(slotReturnPressed( TQListViewItem * )) ); + connect( this, TQ_SIGNAL(mouseButtonClicked( int, TQListViewItem *, const TQPoint&, int )), + this, TQ_SLOT(slotMouseButtonClicked2( int, TQListViewItem *, const TQPoint&, int )) ); + connect( this, TQ_SIGNAL(executed( TQListViewItem * )), + this, TQ_SLOT(slotExecuted( TQListViewItem * )) ); + connect( this, TQ_SIGNAL(currentChanged( TQListViewItem * )), + this, TQ_SLOT(slotCurrentChanged( TQListViewItem * )) ); + connect( this, TQ_SIGNAL(itemRenamed( TQListViewItem *, const TQString &, int )), + this, TQ_SLOT(slotItemRenamed( TQListViewItem *, const TQString &, int )) ); + connect( this, TQ_SIGNAL(contextMenuRequested( TQListViewItem *, const TQPoint&, int )), + this, TQ_SLOT(slotPopupMenu( TQListViewItem *, const TQPoint&, int )) ); + connect( this, TQ_SIGNAL(renameNext( TQListViewItem *, int )), + this, TQ_SLOT(slotRenameNextItem( TQListViewItem*, int)) ); + connect( this, TQ_SIGNAL(renamePrev( TQListViewItem *, int )), + this, TQ_SLOT(slotRenamePrevItem( TQListViewItem*, int)) ); + connect( this, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged()) ); + + connect( horizontalScrollBar(), TQ_SIGNAL(valueChanged( int )), + this, TQ_SIGNAL(viewportAdjusted()) ); + connect( verticalScrollBar(), TQ_SIGNAL(valueChanged( int )), + this, TQ_SIGNAL(viewportAdjusted()) ); // Connect the directory lister - connect( m_dirLister, TQT_SIGNAL(started( const KURL & )), - this, TQT_SLOT(slotStarted()) ); - connect( m_dirLister, TQT_SIGNAL(completed()), this, TQT_SLOT(slotCompleted()) ); - connect( m_dirLister, TQT_SIGNAL(canceled()), this, TQT_SLOT(slotCanceled()) ); - connect( m_dirLister, TQT_SIGNAL(clear()), this, TQT_SLOT(slotClear()) ); - connect( m_dirLister, TQT_SIGNAL(newItems( const KFileItemList & ) ), - this, TQT_SLOT(slotNewItems( const KFileItemList & )) ); - connect( m_dirLister, TQT_SIGNAL(deleteItem( KFileItem * )), - this, TQT_SLOT(slotDeleteItem( KFileItem * )) ); - connect( m_dirLister, TQT_SIGNAL(refreshItems( const KFileItemList & )), - this, TQT_SLOT( slotRefreshItems( const KFileItemList & )) ); - connect( m_dirLister, TQT_SIGNAL(redirection( const KURL & )), - this, TQT_SLOT(slotRedirection( const KURL & )) ); - connect( m_dirLister, TQT_SIGNAL(itemsFilteredByMime( const KFileItemList & )), - m_pBrowserView, TQT_SIGNAL(itemsFilteredByMime( const KFileItemList & )) ); - - connect( m_dirLister, TQT_SIGNAL(infoMessage( const TQString& )), - m_pBrowserView->extension(), TQT_SIGNAL(infoMessage( const TQString& )) ); - connect( m_dirLister, TQT_SIGNAL(percent( int )), - m_pBrowserView->extension(), TQT_SIGNAL(loadingProgress( int )) ); - connect( m_dirLister, TQT_SIGNAL(speed( int )), - m_pBrowserView->extension(), TQT_SIGNAL(speedProgress( int )) ); - - connect( header(), TQT_SIGNAL(sizeChange( int, int, int )), TQT_SLOT(slotUpdateBackground()) ); + connect( m_dirLister, TQ_SIGNAL(started( const KURL & )), + this, TQ_SLOT(slotStarted()) ); + connect( m_dirLister, TQ_SIGNAL(completed()), this, TQ_SLOT(slotCompleted()) ); + connect( m_dirLister, TQ_SIGNAL(canceled()), this, TQ_SLOT(slotCanceled()) ); + connect( m_dirLister, TQ_SIGNAL(clear()), this, TQ_SLOT(slotClear()) ); + connect( m_dirLister, TQ_SIGNAL(newItems( const KFileItemList & ) ), + this, TQ_SLOT(slotNewItems( const KFileItemList & )) ); + connect( m_dirLister, TQ_SIGNAL(deleteItem( KFileItem * )), + this, TQ_SLOT(slotDeleteItem( KFileItem * )) ); + connect( m_dirLister, TQ_SIGNAL(refreshItems( const KFileItemList & )), + this, TQ_SLOT( slotRefreshItems( const KFileItemList & )) ); + connect( m_dirLister, TQ_SIGNAL(redirection( const KURL & )), + this, TQ_SLOT(slotRedirection( const KURL & )) ); + connect( m_dirLister, TQ_SIGNAL(itemsFilteredByMime( const KFileItemList & )), + m_pBrowserView, TQ_SIGNAL(itemsFilteredByMime( const KFileItemList & )) ); + + connect( m_dirLister, TQ_SIGNAL(infoMessage( const TQString& )), + m_pBrowserView->extension(), TQ_SIGNAL(infoMessage( const TQString& )) ); + connect( m_dirLister, TQ_SIGNAL(percent( int )), + m_pBrowserView->extension(), TQ_SIGNAL(loadingProgress( int )) ); + connect( m_dirLister, TQ_SIGNAL(speed( int )), + m_pBrowserView->extension(), TQ_SIGNAL(speedProgress( int )) ); + + connect( header(), TQ_SIGNAL(sizeChange( int, int, int )), TQ_SLOT(slotUpdateBackground()) ); viewport()->setMouseTracking( true ); - viewport()->setFocusPolicy( TQ_WheelFocus ); - setFocusPolicy( TQ_WheelFocus ); + viewport()->setFocusPolicy( TQWidget::WheelFocus ); + setFocusPolicy( TQWidget::WheelFocus ); setAcceptDrops( true ); //looks better with the statusbar @@ -237,9 +237,9 @@ void KonqBaseListViewWidget::readProtocolConfig( const KURL & url ) lstColumns << column; const TQString type = (*extraFieldsIt).type; // ## TODO use when sorting TQVariant::Type t = TQVariant::Invalid; - if ( type.lower() == TQString(TQSTRING_OBJECT_NAME_STRING).lower() ) + if ( type.lower() == TQString("TQString").lower() ) t = TQVariant::String; - else if ( type.lower() == TQString(TQDATETIME_OBJECT_NAME_STRING).lower() ) + else if ( type.lower() == TQString("TQDateTime").lower() ) t = TQVariant::DateTime; else kdWarning() << "Unsupported ExtraType '" << type << "'" << endl; @@ -412,7 +412,7 @@ void KonqBaseListViewWidget::contentsMousePressEvent( TQMouseEvent *e ) { TQRect r( m_rubber->normalize() ); delete m_rubber; m_rubber = 0; - repaintContents( r, FALSE ); + repaintContents( r, false ); } delete m_selected; @@ -426,13 +426,13 @@ void KonqBaseListViewWidget::contentsMousePressEvent( TQMouseEvent *e ) { TDEListView::contentsMousePressEvent( e ); } else { - if ( e->button() == Qt::LeftButton ) { + if ( e->button() == TQt::LeftButton ) { m_rubber = new TQRect( e->x(), e->y(), 0, 0 ); clearSelection(); emit selectionChanged(); m_fileTip->setItem( 0 ); } - if ( e->button() != Qt::RightButton ) { + if ( e->button() != TQt::RightButton ) { TQListView::contentsMousePressEvent( e ); } } @@ -449,11 +449,11 @@ void KonqBaseListViewWidget::contentsMouseReleaseEvent( TQMouseEvent *e ) { TQRect r( m_rubber->normalize() ); delete m_rubber; m_rubber = 0; - repaintContents( r, FALSE ); + repaintContents( r, false ); } if ( m_scrollTimer ) { - disconnect( m_scrollTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotAutoScroll() ) ); + disconnect( m_scrollTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotAutoScroll() ) ); m_scrollTimer->stop(); delete m_scrollTimer; m_scrollTimer = 0; @@ -525,33 +525,37 @@ void KonqBaseListViewWidget::contentsWheelEvent( TQWheelEvent *e ) void KonqBaseListViewWidget::contentsMouseDoubleClickEvent(TQMouseEvent *e) { - if (m_rubber) { - TQRect r(m_rubber->normalize()); - delete m_rubber; - m_rubber = NULL; - repaintContents(r, false); - } - - TQPoint vp = contentsToViewport(e->pos()); - KonqBaseListViewItem* item = isExecuteArea(vp) ? - static_cast<KonqBaseListViewItem*>(itemAt(vp)) : NULL; + if (m_rubber) + { + TQRect r(m_rubber->normalize()); + delete m_rubber; + m_rubber = NULL; + repaintContents(r, false); + } - if (item) { + TQPoint vp = contentsToViewport(e->pos()); + KonqBaseListViewItem* item = isExecuteArea(vp) ? + static_cast<KonqBaseListViewItem*>(itemAt(vp)) : NULL; + + if (item) + { TDEListView::contentsMouseDoubleClickEvent(e); - } - else { + } + else if (m_pSettings->doubleClickMoveToParent()) + { KParts::URLArgs args; args.trustedSource = true; - KURL baseURL(m_dirLister->url().internalReferenceURL()); - if (baseURL.isEmpty()) - { - baseURL = m_dirLister->url(); - } - KURL upURL = baseURL.upURL(); - if (!upURL.isEmpty()) { - m_pBrowserView->extension()->openURLRequest(upURL, args); - } - } + KURL baseURL(m_dirLister->url().internalReferenceURL()); + if (baseURL.isEmpty()) + { + baseURL = m_dirLister->url(); + } + KURL upURL = baseURL.upURL(); + if (!upURL.isEmpty()) + { + m_pBrowserView->extension()->openURLRequest(upURL, args); + } + } } void KonqBaseListViewWidget::leaveEvent( TQEvent *e ) @@ -581,7 +585,7 @@ void KonqBaseListViewWidget::drawRubber( TQPainter *p ) TQPoint pt( m_rubber->x(), m_rubber->y() ); pt = contentsToViewport( pt ); - style().tqdrawPrimitive( TQStyle::PE_RubberBand, p, + style().drawPrimitive( TQStyle::PE_RubberBand, p, TQRect( pt.x(), pt.y(), m_rubber->width(), m_rubber->height() ), colorGroup(), TQStyle::Style_Default, colorGroup().base() ); } @@ -615,7 +619,7 @@ void KonqBaseListViewWidget::slotAutoScroll() TQRect rr; TQRect nr = m_rubber->normalize(); - bool changed = FALSE; + bool changed = false; if ( cur ) { @@ -653,7 +657,7 @@ void KonqBaseListViewWidget::slotAutoScroll() { setSelected( cur, true ); setActiveMultiSelectItem( at ); - changed = TRUE; + changed = true; rr = rr.unite( itemRect( cur ) ); } } @@ -661,7 +665,7 @@ void KonqBaseListViewWidget::slotAutoScroll() { if ( cur->isSelected() ) { - changed = TRUE; + changed = true; rr = rr.unite( itemRect( cur ) ); } @@ -691,7 +695,7 @@ void KonqBaseListViewWidget::slotAutoScroll() { setSelected( cur, true ); setActiveMultiSelectItem( at ); - changed = TRUE; + changed = true; rr = rr.unite( itemRect( cur ) ); } } @@ -699,7 +703,7 @@ void KonqBaseListViewWidget::slotAutoScroll() { if ( cur->isSelected() ) { - changed = TRUE; + changed = true; rr = rr.unite( itemRect( cur ) ); } @@ -758,15 +762,15 @@ void KonqBaseListViewWidget::slotAutoScroll() { m_scrollTimer = new TQTimer( this ); - connect( m_scrollTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotAutoScroll() ) ); + connect( m_scrollTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotAutoScroll() ) ); m_scrollTimer->start( 100, false ); } } else if ( m_scrollTimer ) { - disconnect( m_scrollTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotAutoScroll() ) ); + disconnect( m_scrollTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotAutoScroll() ) ); m_scrollTimer->stop(); delete m_scrollTimer; m_scrollTimer = 0; @@ -968,7 +972,7 @@ void KonqBaseListViewWidget::slotSelectionChanged() void KonqBaseListViewWidget::slotMouseButtonClicked2( int _button, TQListViewItem *_item, const TQPoint& pos, int ) { - if ( _button == Qt::MidButton ) + if ( _button == TQt::MidButton ) { if ( _item && isExecuteArea( viewport()->mapFromGlobal(pos) ) ) m_pBrowserView->mmbClicked( static_cast<KonqBaseListViewItem *>(_item)->item() ); @@ -1486,7 +1490,7 @@ KonqBaseListViewWidget::iterator KonqBaseListViewWidget::iterator::operator++(in void KonqBaseListViewWidget::paintEmptyArea( TQPainter *p, const TQRect &r ) { - const TQPixmap *pm = TQT_TQPIXMAP_CONST(viewport()->paletteBackgroundPixmap()); + const TQPixmap *pm = viewport()->paletteBackgroundPixmap(); if (!pm || pm->isNull()) p->fillRect(r, viewport()->backgroundColor()); @@ -1559,7 +1563,7 @@ void KonqBaseListViewWidget::slotUpdateBackground() if ( !m_backgroundTimer ) { m_backgroundTimer = new TQTimer( this ); - connect( m_backgroundTimer, TQT_SIGNAL( timeout() ), viewport(), TQT_SLOT( update() ) ); + connect( m_backgroundTimer, TQ_SIGNAL( timeout() ), viewport(), TQ_SLOT( update() ) ); } else m_backgroundTimer->stop(); diff --git a/konqueror/listview/konq_listviewwidget.h b/konqueror/listview/konq_listviewwidget.h index a8a06408b..ebae4c389 100644 --- a/konqueror/listview/konq_listviewwidget.h +++ b/konqueror/listview/konq_listviewwidget.h @@ -79,7 +79,7 @@ class KonqBaseListViewWidget : public TDEListView friend class KonqListView; friend class ListViewBrowserExtension; - Q_OBJECT + TQ_OBJECT public: KonqBaseListViewWidget( KonqListView *parent, TQWidget *parentWidget ); diff --git a/konqueror/listview/konq_textviewitem.cpp b/konqueror/listview/konq_textviewitem.cpp index 1076e10af..625e10f79 100644 --- a/konqueror/listview/konq_textviewitem.cpp +++ b/konqueror/listview/konq_textviewitem.cpp @@ -210,7 +210,7 @@ void KonqTextViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, cg.setColor(TQColorGroup::Text, static_cast<KonqTextViewWidget *>(listView())->colors[type]); // Don't do that! Keep things readable whatever the selection background color is // cg.setColor(TQColorGroup::HighlightedText, static_cast<KonqTextViewWidget *>(listView())->highlight[type]); -// cg.setColor(TQColorGroup::Highlight, Qt::darkGray); +// cg.setColor(TQColorGroup::Highlight, TQt::darkGray); TDEListViewItem::paintCell( _painter, cg, _column, _width, _alignment ); } @@ -223,7 +223,7 @@ void KonqTextViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, TQPixmap pix( _r.width(), _r.height() ); bitBlt( &pix, 0, 0, _p->device(), _r.left(), _r.top(), _r.width(), _r.height() ); TQImage im = pix.convertToImage(); - im = KImageEffect::fade( im, 0.25, Qt::black ); + im = KImageEffect::fade( im, 0.25, TQt::black ); _p->drawImage( _r.topLeft(), im ); }*/ diff --git a/konqueror/listview/konq_textviewwidget.cpp b/konqueror/listview/konq_textviewwidget.cpp index ab227899a..0bf67cf81 100644 --- a/konqueror/listview/konq_textviewwidget.cpp +++ b/konqueror/listview/konq_textviewwidget.cpp @@ -40,22 +40,22 @@ KonqTextViewWidget::KonqTextViewWidget( KonqListView *parent, TQWidget *parentWi // I know, but I want to have it this way and I use it all the time. // If I want to have free space, I disable some columns. // If people don't like it, they can use a different view type. Alex - setAllColumnsShowFocus(TRUE); + setAllColumnsShowFocus(true); setRootIsDecorated(false); - colors[KTVI_REGULAR]=Qt::black; + colors[KTVI_REGULAR]=TQt::black; colors[KTVI_EXEC]=TQColor(0,170,0); - colors[KTVI_REGULARLINK]=Qt::black; - colors[KTVI_DIR]=Qt::black; - colors[KTVI_DIRLINK]=Qt::black; - colors[KTVI_BADLINK]=Qt::red; - colors[KTVI_SOCKET]=Qt::magenta; - colors[KTVI_FIFO]=Qt::magenta; - colors[KTVI_UNKNOWN]=Qt::red; - colors[KTVI_CHARDEV]=Qt::blue; - colors[KTVI_BLOCKDEV]=Qt::blue; - - m_showIcons=FALSE; + colors[KTVI_REGULARLINK]=TQt::black; + colors[KTVI_DIR]=TQt::black; + colors[KTVI_DIRLINK]=TQt::black; + colors[KTVI_BADLINK]=TQt::red; + colors[KTVI_SOCKET]=TQt::magenta; + colors[KTVI_FIFO]=TQt::magenta; + colors[KTVI_UNKNOWN]=TQt::red; + colors[KTVI_CHARDEV]=TQt::blue; + colors[KTVI_BLOCKDEV]=TQt::blue; + + m_showIcons=false; } KonqTextViewWidget::~KonqTextViewWidget() diff --git a/konqueror/listview/konq_textviewwidget.h b/konqueror/listview/konq_textviewwidget.h index 06a5cbbb5..d42014ba1 100644 --- a/konqueror/listview/konq_textviewwidget.h +++ b/konqueror/listview/konq_textviewwidget.h @@ -32,7 +32,7 @@ class KonqTextViewItem; class KonqTextViewWidget : public KonqBaseListViewWidget { friend class KonqTextViewItem; - Q_OBJECT + TQ_OBJECT public: KonqTextViewWidget( KonqListView *parent, TQWidget *parentWidget ); ~KonqTextViewWidget(); diff --git a/konqueror/listview/konq_treeviewwidget.cpp b/konqueror/listview/konq_treeviewwidget.cpp index 77adc4b61..02c297c88 100644 --- a/konqueror/listview/konq_treeviewwidget.cpp +++ b/konqueror/listview/konq_treeviewwidget.cpp @@ -35,12 +35,12 @@ KonqTreeViewWidget::KonqTreeViewWidget( KonqListView *parent, TQWidget *parentWi setRootIsDecorated( true ); setTreeStepSize( 20 ); - connect( m_dirLister, TQT_SIGNAL( completed( const KURL & ) ), - this, TQT_SLOT( slotCompleted( const KURL & ) ) ); - connect( m_dirLister, TQT_SIGNAL( clear( const KURL & ) ), - this, TQT_SLOT( slotClear( const KURL & ) ) ); - connect( m_dirLister, TQT_SIGNAL( redirection( const KURL &, const KURL & ) ), - this, TQT_SLOT( slotRedirection( const KURL &, const KURL & ) ) ); + connect( m_dirLister, TQ_SIGNAL( completed( const KURL & ) ), + this, TQ_SLOT( slotCompleted( const KURL & ) ) ); + connect( m_dirLister, TQ_SIGNAL( clear( const KURL & ) ), + this, TQ_SLOT( slotClear( const KURL & ) ) ); + connect( m_dirLister, TQ_SIGNAL( redirection( const KURL &, const KURL & ) ), + this, TQ_SLOT( slotRedirection( const KURL &, const KURL & ) ) ); } KonqTreeViewWidget::~KonqTreeViewWidget() diff --git a/konqueror/listview/konq_treeviewwidget.h b/konqueror/listview/konq_treeviewwidget.h index 01b85ddf6..0f16240db 100644 --- a/konqueror/listview/konq_treeviewwidget.h +++ b/konqueror/listview/konq_treeviewwidget.h @@ -32,7 +32,7 @@ class KonqTreeViewWidget : public KonqBaseListViewWidget { friend class KonqListViewDir; - Q_OBJECT + TQ_OBJECT public: KonqTreeViewWidget( KonqListView *parent, TQWidget *parentWidget ); virtual ~KonqTreeViewWidget(); |