From c663b6440964f6ac48027143ac9e63298991f9d0 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:33:34 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1157639 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- konqueror/listview/konq_infolistviewitem.cc | 54 ++--- konqueror/listview/konq_infolistviewitem.h | 12 +- konqueror/listview/konq_infolistviewwidget.cc | 70 +++--- konqueror/listview/konq_infolistviewwidget.h | 12 +- konqueror/listview/konq_listview.cc | 112 ++++----- konqueror/listview/konq_listview.h | 20 +- konqueror/listview/konq_listviewitems.cc | 74 +++--- konqueror/listview/konq_listviewitems.h | 18 +- konqueror/listview/konq_listviewwidget.cc | 314 +++++++++++++------------- konqueror/listview/konq_listviewwidget.h | 104 ++++----- konqueror/listview/konq_textviewitem.cc | 28 +-- konqueror/listview/konq_textviewitem.h | 12 +- konqueror/listview/konq_textviewwidget.cc | 16 +- konqueror/listview/konq_textviewwidget.h | 12 +- konqueror/listview/konq_treeviewitem.cc | 8 +- konqueror/listview/konq_treeviewitem.h | 6 +- konqueror/listview/konq_treeviewwidget.cc | 40 ++-- konqueror/listview/konq_treeviewwidget.h | 14 +- 18 files changed, 463 insertions(+), 463 deletions(-) (limited to 'konqueror/listview') diff --git a/konqueror/listview/konq_infolistviewitem.cc b/konqueror/listview/konq_infolistviewitem.cc index 02aac1d07..7b06a4996 100644 --- a/konqueror/listview/konq_infolistviewitem.cc +++ b/konqueror/listview/konq_infolistviewitem.cc @@ -24,8 +24,8 @@ #include #include #include -#include -#include +#include +#include #include #include "konq_infolistviewitem.h" #include "konq_infolistviewwidget.h" @@ -98,7 +98,7 @@ void KonqInfoListViewItem::updateContents() case KIO::UDS_ACCESS_TIME: case KIO::UDS_CREATION_TIME: { - QDateTime dt; + TQDateTime dt; time_t _time = m_fileitem->time( tmpColumn->udsId ); if ( _time != 0 ) { @@ -121,7 +121,7 @@ void KonqInfoListViewItem::gotMetaInfo() if (!info.isValid()) return; - QStringList::ConstIterator it = m_ILVWidget->columnKeys().begin(); + TQStringList::ConstIterator it = m_ILVWidget->columnKeys().begin(); for (int i = 1; it != m_ILVWidget->columnKeys().end(); ++it, ++i) { KFileMetaInfoItem kfmii = info.item(*it); @@ -132,12 +132,12 @@ void KonqInfoListViewItem::gotMetaInfo() if (!kfmii.isValid()) continue; - QString s = kfmii.string().simplifyWhiteSpace(); - setText(i, s.isNull() ? QString("") : s); + TQString s = kfmii.string().simplifyWhiteSpace(); + setText(i, s.isNull() ? TQString("") : s); } } -int KonqInfoListViewItem::compare( QListViewItem *item, int col, bool ascending ) const +int KonqInfoListViewItem::compare( TQListViewItem *item, int col, bool ascending ) const { if ( col == 0 ) return KonqBaseListViewItem::compare( item, 0, ascending ); @@ -150,16 +150,16 @@ int KonqInfoListViewItem::compare( QListViewItem *item, int col, bool ascending if ( size1 < col || size2 < col ) return ascending ? ( size2 - size1 ) : ( size1 - size2 ); - QVariant value1 = m_columnValues[ col-1 ]; - QVariant value2 = i->m_columnValues[ col-1 ]; - QVariant::Type type1 = m_columnTypes[ col-1 ]; - QVariant::Type type2 = i->m_columnTypes[ col-1 ]; + TQVariant value1 = m_columnValues[ col-1 ]; + TQVariant value2 = i->m_columnValues[ col-1 ]; + TQVariant::Type type1 = m_columnTypes[ col-1 ]; + TQVariant::Type type2 = i->m_columnTypes[ col-1 ]; if ( type1 != type2 ) return ascending ? ( type1 - type2 ) : ( type2 - type1 ); #define KONQ_CASE( x ) \ - case QVariant::x:\ + case TQVariant::x:\ return ( value1.to##x() > value2.to##x() ) ? 1 : ( value1.to##x() == value2.to##x() ) ? 0 : -1; switch( type1 ) { @@ -172,7 +172,7 @@ int KonqInfoListViewItem::compare( QListViewItem *item, int col, bool ascending KONQ_CASE( Date ) KONQ_CASE( Time ) KONQ_CASE( DateTime ) - case QVariant::Size: + case TQVariant::Size: { int w1 = value1.toSize().width(); int w2 = value2.toSize().width(); @@ -187,8 +187,8 @@ int KonqInfoListViewItem::compare( QListViewItem *item, int col, bool ascending } #undef KONQ_CASE - QString text1 = text(col); - QString text2 = i->text(col); + TQString text1 = text(col); + TQString text2 = i->text(col); if ( text1.isEmpty() ) return ascending ? 1 : -1; @@ -206,19 +206,19 @@ void KonqInfoListViewItem::setDisabled( bool disabled ) setPixmap( 0, m_fileitem->pixmap( iconSize, state() ) ); } -void KonqInfoListViewItem::paintCell( QPainter *_painter, const QColorGroup & _cg, int _column, int _width, int _alignment ) +void KonqInfoListViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _alignment ) { - QColorGroup cg( _cg ); + TQColorGroup cg( _cg ); if ( _column == 0 ) { _painter->setFont( m_pListViewWidget->itemFont() ); } - cg.setColor( QColorGroup::Text, m_pListViewWidget->itemColor() ); + cg.setColor( TQColorGroup::Text, m_pListViewWidget->itemColor() ); KListView *lv = static_cast< KListView* >( listView() ); - const QPixmap *pm = lv->viewport()->paletteBackgroundPixmap(); + const TQPixmap *pm = lv->viewport()->paletteBackgroundPixmap(); if ( _column == 0 && isSelected() && !lv->allColumnsShowFocus() ) { int newWidth = width( lv->fontMetrics(), lv, _column ); @@ -226,11 +226,11 @@ void KonqInfoListViewItem::paintCell( QPainter *_painter, const QColorGroup & _c newWidth = _width; if ( pm && !pm->isNull() ) { - cg.setBrush( QColorGroup::Base, QBrush( backgroundColor(_column), *pm ) ); - QPoint o = _painter->brushOrigin(); + cg.setBrush( TQColorGroup::Base, TQBrush( backgroundColor(_column), *pm ) ); + TQPoint o = _painter->brushOrigin(); _painter->setBrushOrigin( o.x() - lv->contentsX(), o.y() - lv->contentsY() ); - const QColorGroup::ColorRole crole = - QPalette::backgroundRoleFromMode( lv->viewport()->backgroundMode() ); + const TQColorGroup::ColorRole crole = + TQPalette::backgroundRoleFromMode( lv->viewport()->backgroundMode() ); _painter->fillRect( newWidth, 0, _width - newWidth, height(), cg.brush( crole ) ); _painter->setBrushOrigin( o ); } @@ -245,14 +245,14 @@ void KonqInfoListViewItem::paintCell( QPainter *_painter, const QColorGroup & _c KListViewItem::paintCell( _painter, cg, _column, _width, _alignment ); } -void KonqInfoListViewItem::paintFocus( QPainter * _painter, const QColorGroup & cg, const QRect & _r ) +void KonqInfoListViewItem::paintFocus( TQPainter * _painter, const TQColorGroup & cg, const TQRect & _r ) { - QRect r( _r ); - QListView *lv = static_cast< QListView * >( listView() ); + TQRect r( _r ); + TQListView *lv = static_cast< TQListView * >( listView() ); r.setWidth( width( lv->fontMetrics(), lv, 0 ) ); if ( r.right() > lv->header()->sectionRect( 0 ).right() ) r.setRight( lv->header()->sectionRect( 0 ).right() ); - QListViewItem::paintFocus( _painter, cg, r ); + TQListViewItem::paintFocus( _painter, cg, r ); } #if 0 diff --git a/konqueror/listview/konq_infolistviewitem.h b/konqueror/listview/konq_infolistviewitem.h index 886ba66af..8dec97ee5 100644 --- a/konqueror/listview/konq_infolistviewitem.h +++ b/konqueror/listview/konq_infolistviewitem.h @@ -21,7 +21,7 @@ #define __konq_infolistviewitems_h__ #include "konq_listview.h" -#include +#include #include // for mode_t @@ -55,15 +55,15 @@ class KonqInfoListViewItem : public KonqBaseListViewItem virtual ~KonqInfoListViewItem() { } - virtual void paintCell( QPainter *_painter, const QColorGroup & cg, + virtual void paintCell( TQPainter *_painter, const TQColorGroup & cg, int column, int width, int alignment ); - virtual void paintFocus( QPainter * _painter, const QColorGroup & cg, const QRect & r ); + virtual void paintFocus( TQPainter * _painter, const TQColorGroup & cg, const TQRect & r ); virtual void updateContents(); virtual void setDisabled( bool disabled ); virtual void gotMetaInfo(); - virtual int compare(QListViewItem *item, int col, bool ascending) const; + virtual int compare(TQListViewItem *item, int col, bool ascending) const; protected: /** @@ -72,8 +72,8 @@ class KonqInfoListViewItem : public KonqBaseListViewItem KonqInfoListViewWidget* m_ILVWidget; private: - QValueVector m_columnTypes; - QValueVector m_columnValues; + TQValueVector m_columnTypes; + TQValueVector m_columnValues; }; #endif diff --git a/konqueror/listview/konq_infolistviewwidget.cc b/konqueror/listview/konq_infolistviewwidget.cc index c9ef4b0e4..783c6eef3 100644 --- a/konqueror/listview/konq_infolistviewwidget.cc +++ b/konqueror/listview/konq_infolistviewwidget.cc @@ -29,16 +29,16 @@ #include #include -#include +#include KonqInfoListViewWidget::KonqInfoListViewWidget( KonqListView* parent, - QWidget* parentWidget) + TQWidget* parentWidget) : KonqBaseListViewWidget(parent, parentWidget) { m_metaInfoJob = 0; m_mtSelector = new KSelectAction(i18n("View &As"), 0, this, - SLOT(slotSelectMimeType()), + TQT_SLOT(slotSelectMimeType()), parent->actionCollection(), "view_as" ); kdDebug(1203) << "created info list view\n"; @@ -52,10 +52,10 @@ KonqInfoListViewWidget::~KonqInfoListViewWidget() void KonqInfoListViewWidget::slotSelectMimeType() { - QString comment = m_mtSelector->currentText(); + TQString comment = m_mtSelector->currentText(); // find the mime type by comment - QMapIterator it; + TQMapIterator it; for (it = m_counts.begin(); it!=m_counts.end(); ++it) { if ((*it).mimetype->comment() == comment) @@ -94,26 +94,26 @@ void KonqInfoListViewWidget::createFavoriteColumns() (mimeTypeInfo = KFileMetaInfoProvider::self() ->mimeTypeInfo(m_favorite.mimetype->name()))) { - QStringList preferredCols = mimeTypeInfo->preferredKeys(); + TQStringList preferredCols = mimeTypeInfo->preferredKeys(); m_columnKeys.clear(); //We create the columnKeys as we're creating //the actual columns, to make sure they're synced // get the translations - QStringList groups = mimeTypeInfo->preferredGroups(); + TQStringList groups = mimeTypeInfo->preferredGroups(); if (groups.isEmpty()) groups = mimeTypeInfo->supportedGroups(); - QStringList::Iterator prefKey = preferredCols.begin(); + TQStringList::Iterator prefKey = preferredCols.begin(); for (; prefKey != preferredCols.end(); ++prefKey) { - QStringList::Iterator group = groups.begin(); + TQStringList::Iterator group = groups.begin(); for (; group != groups.end(); ++group) { const KFileMimeTypeInfo::GroupInfo* groupInfo = mimeTypeInfo->groupInfo(*group); if(groupInfo) { - QStringList keys = groupInfo->supportedKeys(); - QStringList::Iterator key = keys.begin(); + TQStringList keys = groupInfo->supportedKeys(); + TQStringList::Iterator key = keys.begin(); for (; key != keys.end(); ++key) { if ( *key == *prefKey ) @@ -147,7 +147,7 @@ void KonqInfoListViewWidget::rebuildView() // make a KFileItemList from all our Items KFileItemList list; - QListViewItemIterator it(this); + TQListViewItemIterator it(this); for (; it.current(); ++it) { list.append(static_cast(it.current())->item()); @@ -157,7 +157,7 @@ void KonqInfoListViewWidget::rebuildView() clear(); // and rebuild them - for (QPtrListIterator kit(list); kit.current(); ++kit) + for (TQPtrListIterator kit(list); kit.current(); ++kit) { KonqInfoListViewItem* tmp = new KonqInfoListViewItem( this, *kit ); // if (m_goToFirstItem==false) @@ -190,7 +190,7 @@ void KonqInfoListViewWidget::rebuildView() void KonqInfoListViewWidget::slotNewItems( const KFileItemList& list) { slotStarted(); // ############# WHY? - for (QPtrListIterator kit ( list ); kit.current(); ++kit ) + for (TQPtrListIterator kit ( list ); kit.current(); ++kit ) { KonqInfoListViewItem * tmp = new KonqInfoListViewItem( this, *kit ); @@ -201,7 +201,7 @@ void KonqInfoListViewWidget::slotNewItems( const KFileItemList& list) } if ( !m_itemsToSelect.isEmpty() ) { - QStringList::Iterator tsit = m_itemsToSelect.find( (*kit)->name() ); + TQStringList::Iterator tsit = m_itemsToSelect.find( (*kit)->name() ); if ( tsit != m_itemsToSelect.end() ) { m_itemsToSelect.remove( tsit ); setSelected( tmp, true ); @@ -230,16 +230,16 @@ void KonqInfoListViewWidget::slotNewItems( const KFileItemList& list) // start getting metainfo from the files if (m_metaInfoJob) { - for (QPtrListIterator kit ( list ); kit.current(); ++kit ) + for (TQPtrListIterator kit ( list ); kit.current(); ++kit ) m_metaInfoTodo.append(kit.current()); } else { m_metaInfoJob = KIO::fileMetaInfo(list); - connect( m_metaInfoJob, SIGNAL( gotMetaInfo( const KFileItem*)), - this, SLOT( slotMetaInfo( const KFileItem*))); - connect( m_metaInfoJob, SIGNAL( result( KIO::Job*)), - this, SLOT( slotMetaInfoResult())); + connect( m_metaInfoJob, TQT_SIGNAL( gotMetaInfo( const KFileItem*)), + this, TQT_SLOT( slotMetaInfo( const KFileItem*))); + connect( m_metaInfoJob, TQT_SIGNAL( result( KIO::Job*)), + this, TQT_SLOT( slotMetaInfoResult())); } } @@ -250,16 +250,16 @@ void KonqInfoListViewWidget::slotRefreshItems( const KFileItemList& list) // start getting metainfo from the files if (m_metaInfoJob) { - for (QPtrListIterator kit ( list ); kit.current(); ++kit ) + for (TQPtrListIterator kit ( list ); kit.current(); ++kit ) m_metaInfoTodo.append(kit.current()); } else { m_metaInfoJob = KIO::fileMetaInfo(list); - connect( m_metaInfoJob, SIGNAL( gotMetaInfo( const KFileItem*)), - this, SLOT( slotMetaInfo( const KFileItem*))); - connect( m_metaInfoJob, SIGNAL( result( KIO::Job*)), - this, SLOT( slotMetaInfoResult())); + connect( m_metaInfoJob, TQT_SIGNAL( gotMetaInfo( const KFileItem*)), + this, TQT_SLOT( slotMetaInfo( const KFileItem*))); + connect( m_metaInfoJob, TQT_SIGNAL( result( KIO::Job*)), + this, TQT_SLOT( slotMetaInfoResult())); } KonqBaseListViewWidget::slotRefreshItems(list); } @@ -286,7 +286,7 @@ void KonqInfoListViewWidget::slotClear() void KonqInfoListViewWidget::slotMetaInfo(const KFileItem* item) { // need to search for the item (any better way?) - QListViewItemIterator it(this); + TQListViewItemIterator it(this); for (; it.current(); ++it) { if (static_cast(it.current())->item()==item) @@ -312,10 +312,10 @@ void KonqInfoListViewWidget::slotMetaInfoResult() else { m_metaInfoJob = KIO::fileMetaInfo(m_metaInfoTodo); - connect( m_metaInfoJob, SIGNAL( gotMetaInfo( const KFileItem*)), - this, SLOT( slotMetaInfo( const KFileItem*))); - connect( m_metaInfoJob, SIGNAL( result( KIO::Job*)), - this, SLOT( slotMetaInfoResult())); + connect( m_metaInfoJob, TQT_SIGNAL( gotMetaInfo( const KFileItem*)), + this, TQT_SLOT( slotMetaInfo( const KFileItem*))); + connect( m_metaInfoJob, TQT_SIGNAL( result( KIO::Job*)), + this, TQT_SLOT( slotMetaInfoResult())); m_metaInfoTodo.clear(); } } @@ -327,7 +327,7 @@ void KonqInfoListViewWidget::determineCounts(const KFileItemList& list) // get the counts for (KFileItemListIterator it(list); it.current(); ++it) { - QString mt = it.current()->mimetype(); + TQString mt = it.current()->mimetype(); m_counts[mt].count++; if (!m_counts[mt].mimetype) m_counts[mt].mimetype = it.current()->determineMimeType(); @@ -338,9 +338,9 @@ void KonqInfoListViewWidget::determineCounts(const KFileItemList& list) KFileMetaInfoProvider* prov = KFileMetaInfoProvider::self(); - QStringList mtlist; + TQStringList mtlist; - QMapIterator it; + TQMapIterator it; for (it = m_counts.begin(); it!=m_counts.end(); ++it) { // look if there is a plugin for this mimetype @@ -365,12 +365,12 @@ void KonqInfoListViewWidget::determineCounts(const KFileItemList& list) } m_mtSelector->setItems(mtlist); -// QPopupMenu* menu = m_mtSelector->popupMenu(); +// TQPopupMenu* menu = m_mtSelector->popupMenu(); // insert the icons // for (int i=0; icount(); ++i) // { -// menu->changeItem(i, QIconSet(blah)); +// menu->changeItem(i, TQIconSet(blah)); // } if (m_favorite.mimetype) diff --git a/konqueror/listview/konq_infolistviewwidget.h b/konqueror/listview/konq_infolistviewwidget.h index 9d866dc1f..5ae497ac2 100644 --- a/konqueror/listview/konq_infolistviewwidget.h +++ b/konqueror/listview/konq_infolistviewwidget.h @@ -22,8 +22,8 @@ #include "konq_listviewwidget.h" #include -#include -#include +#include +#include namespace KIO {class MetaInfoJob;} class KonqListView; @@ -37,10 +37,10 @@ class KonqInfoListViewWidget : public KonqBaseListViewWidget // friend class KonqTextViewItem; Q_OBJECT public: - KonqInfoListViewWidget( KonqListView *parent, QWidget *parentWidget ); + KonqInfoListViewWidget( KonqListView *parent, TQWidget *parentWidget ); ~KonqInfoListViewWidget(); - const QStringList columnKeys() {return m_columnKeys;} + const TQStringList columnKeys() {return m_columnKeys;} virtual bool openURL( const KURL &url ); @@ -76,8 +76,8 @@ class KonqInfoListViewWidget : public KonqBaseListViewWidget }; // all the mimetypes - QMap m_counts; - QStringList m_columnKeys; + TQMap m_counts; + TQStringList m_columnKeys; KonqILVMimeType m_favorite; diff --git a/konqueror/listview/konq_listview.cc b/konqueror/listview/konq_listview.cc index 1e67fce36..f256e8e3b 100644 --- a/konqueror/listview/konq_listview.cc +++ b/konqueror/listview/konq_listview.cc @@ -36,10 +36,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include @@ -63,7 +63,7 @@ KonqListViewFactory::~KonqListViewFactory() s_defaultViewProps = 0; } -KParts::Part* KonqListViewFactory::createPartObject( QWidget *parentWidget, const char *, QObject *parent, const char *name, const char*, const QStringList &args ) +KParts::Part* KonqListViewFactory::createPartObject( TQWidget *parentWidget, const char *, TQObject *parent, const char *name, const char*, const TQStringList &args ) { if( args.count() < 1 ) kdWarning() << "KonqListView: Missing Parameter" << endl; @@ -144,7 +144,7 @@ void ListViewBrowserExtension::updateActions() void ListViewBrowserExtension::copySelection( bool move ) { KonqDrag *urlData = new KonqDrag( m_listView->listViewWidget()->selectedUrls(false), m_listView->listViewWidget()->selectedUrls(true), move ); - QApplication::clipboard()->setData( urlData ); + TQApplication::clipboard()->setData( urlData ); } void ListViewBrowserExtension::paste() @@ -159,15 +159,15 @@ void ListViewBrowserExtension::pasteTo( const KURL& url ) void ListViewBrowserExtension::rename() { - QListViewItem* item = m_listView->listViewWidget()->currentItem(); + TQListViewItem* item = m_listView->listViewWidget()->currentItem(); Q_ASSERT ( item ); m_listView->listViewWidget()->rename( item, 0 ); // Enhanced rename: Don't highlight the file extension. KLineEdit* le = m_listView->listViewWidget()->renameLineEdit(); if ( le ) { - const QString txt = le->text(); - QString pattern; + const TQString txt = le->text(); + TQString pattern; KMimeType::diagnoseFileName( txt, pattern ); if (!pattern.isEmpty() && pattern.at(0)=='*' && pattern.find('*',1)==-1) le->setSelection(0, txt.length()-pattern.stripWhiteSpace().length()+1); @@ -199,7 +199,7 @@ void ListViewBrowserExtension::setSaveViewPropertiesLocally(bool value) m_listView->props()->setSaveViewPropertiesLocally( value ); } -void ListViewBrowserExtension::setNameFilter( const QString &nameFilter ) +void ListViewBrowserExtension::setNameFilter( const TQString &nameFilter ) { m_listView->setNameFilter( nameFilter ); } @@ -216,7 +216,7 @@ void ListViewBrowserExtension::editMimeType() KonqOperations::editMimeType( items.first()->mimetype() ); } -KonqListView::KonqListView( QWidget *parentWidget, QObject *parent, const char *name, const QString& mode ) +KonqListView::KonqListView( TQWidget *parentWidget, TQObject *parent, const char *name, const TQString& mode ) : KonqDirPart( parent, name ) ,m_headerTimer(0) { @@ -228,7 +228,7 @@ KonqListView::KonqListView( QWidget *parentWidget, QObject *parent, const char * setBrowserExtension( new ListViewBrowserExtension( this ) ); - QString xmlFile; + TQString xmlFile; if (mode=="TextView") { @@ -278,20 +278,20 @@ KonqListView::KonqListView( QWidget *parentWidget, QObject *parent, const char * m_pListView->confColumns[10].setData(I18N_NOOP("File Type"),"Type",KIO::UDS_FILE_TYPE,m_paShowType); - connect( m_pListView, SIGNAL( selectionChanged() ), - m_extension, SLOT( updateActions() ) ); - connect( m_pListView, SIGNAL( selectionChanged() ), - this, SLOT( slotSelectionChanged() ) ); + connect( m_pListView, TQT_SIGNAL( selectionChanged() ), + m_extension, TQT_SLOT( updateActions() ) ); + connect( m_pListView, TQT_SIGNAL( selectionChanged() ), + this, TQT_SLOT( slotSelectionChanged() ) ); - connect( m_pListView, SIGNAL( currentChanged(QListViewItem*) ), - m_extension, SLOT( updateActions() ) ); - connect(m_pListView->header(),SIGNAL(indexChange(int,int,int)),this,SLOT(headerDragged(int,int,int))); - connect(m_pListView->header(),SIGNAL(clicked(int)),this,SLOT(slotHeaderClicked(int))); - connect(m_pListView->header(),SIGNAL(sizeChange(int,int,int)),SLOT(slotHeaderSizeChanged())); + 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())); // signals from konqdirpart (for BC reasons) - connect( this, SIGNAL( findOpened( KonqDirPart * ) ), SLOT( slotKFindOpened() ) ); - connect( this, SIGNAL( findClosed( KonqDirPart * ) ), SLOT( slotKFindClosed() ) ); + connect( this, TQT_SIGNAL( findOpened( KonqDirPart * ) ), TQT_SLOT( slotKFindOpened() ) ); + connect( this, TQT_SIGNAL( findClosed( KonqDirPart * ) ), TQT_SLOT( slotKFindClosed() ) ); loadPlugins( this, this, instance() ); } @@ -312,7 +312,7 @@ void KonqListView::guiActivateEvent( KParts::GUIActivateEvent *event ) bool KonqListView::doOpenURL( const KURL &url ) { KURL u( url ); - const QString prettyURL = url.pathOrURL(); + const TQString prettyURL = url.pathOrURL(); emit setWindowCaption( prettyURL ); return m_pListView->openURL( url ); } @@ -335,7 +335,7 @@ void KonqListView::determineIcon( KonqBaseListViewItem * item ) (void) item->item()->determineMimeType(); - //QPixmap newIcon = item->item()->pixmap( m_parent->iconSize(), + //TQPixmap newIcon = item->item()->pixmap( m_parent->iconSize(), // item->state() ); //if ( oldSerial != newIcon.serialNumber() ) // item->setPixmap( 0, newIcon ); @@ -344,14 +344,14 @@ void KonqListView::determineIcon( KonqBaseListViewItem * item ) item->updateContents(); } -void KonqListView::saveState( QDataStream &stream ) +void KonqListView::saveState( TQDataStream &stream ) { //kdDebug(1202) << k_funcinfo << endl; KonqDirPart::saveState( stream ); m_pListView->saveState( stream ); } -void KonqListView::restoreState( QDataStream &stream ) +void KonqListView::restoreState( TQDataStream &stream ) { //kdDebug(1202) << k_funcinfo << endl; KonqDirPart::restoreState( stream ); @@ -366,12 +366,12 @@ void KonqListView::disableIcons( const KURL::List &lst ) void KonqListView::slotSelect() { bool ok; - QString pattern = KInputDialog::getText( QString::null, + TQString pattern = KInputDialog::getText( TQString::null, i18n( "Select files:" ), "*", &ok, m_pListView ); if ( !ok ) return; - QRegExp re( pattern, true, true ); + TQRegExp re( pattern, true, true ); m_pListView->blockSignals( true ); @@ -397,12 +397,12 @@ void KonqListView::slotSelect() void KonqListView::slotUnselect() { bool ok; - QString pattern = KInputDialog::getText( QString::null, + TQString pattern = KInputDialog::getText( TQString::null, i18n( "Unselect files:" ), "*", &ok, m_pListView ); if ( !ok ) return; - QRegExp re( pattern, TRUE, TRUE ); + TQRegExp re( pattern, TRUE, TRUE ); m_pListView->blockSignals(TRUE); @@ -494,7 +494,7 @@ void KonqListView::slotColumnToggled() m_pListView->updateListContents(); //save the config - QStringList lstColumns; + TQStringList lstColumns; int currentColumn(m_pListView->m_filenameColumn+1); for (int i=0; i<(int)m_pListView->NumberOfAtoms; i++) { @@ -523,7 +523,7 @@ void KonqListView::slotHeaderClicked(int sec) for (uint i=0; iNumberOfAtoms; i++) if (m_pListView->confColumns[i].displayInColumn==sec) clickedColumn=i; kdDebug(1202)<<"atom index "<columns(); i++ ) { @@ -589,7 +589,7 @@ void KonqListView::slotSaveAfterHeaderDrag() void KonqListView::slotSaveColumnWidths() { - QValueList lstColumnWidths; + TQValueList lstColumnWidths; for ( int i=0; i < m_pListView->columns(); i++ ) { @@ -620,8 +620,8 @@ void KonqListView::slotHeaderSizeChanged() { if ( !m_headerTimer ) { - m_headerTimer = new QTimer( this ); - connect( m_headerTimer, SIGNAL( timeout() ), this, SLOT( slotSaveColumnWidths() ) ); + m_headerTimer = new TQTimer( this ); + connect( m_headerTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotSaveColumnWidths() ) ); } else m_headerTimer->stop(); @@ -643,37 +643,37 @@ void KonqListView::slotKFindClosed() void KonqListView::setupActions() { - m_paShowTime=new KToggleAction(i18n("Show &Modification Time"), 0,this, SLOT(slotColumnToggled()), actionCollection(), "show_time" ); + m_paShowTime=new KToggleAction(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, SLOT(slotColumnToggled()),actionCollection(), "show_type" ); + m_paShowType=new KToggleAction(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, SLOT(slotColumnToggled()),actionCollection(), "show_mimetype" ); + m_paShowMimeType=new KToggleAction(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, SLOT(slotColumnToggled()),actionCollection(), "show_access_time" ); + m_paShowAccessTime=new KToggleAction(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, SLOT(slotColumnToggled()),actionCollection(), "show_creation_time" ); + m_paShowCreateTime=new KToggleAction(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, SLOT(slotColumnToggled()),actionCollection(), "show_link_dest" ); + m_paShowLinkDest=new KToggleAction(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, SLOT(slotColumnToggled()),actionCollection(), "show_size" ); + m_paShowSize=new KToggleAction(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, SLOT(slotColumnToggled()),actionCollection(), "show_owner" ); + m_paShowOwner=new KToggleAction(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, SLOT(slotColumnToggled()),actionCollection(), "show_group" ); + m_paShowGroup=new KToggleAction(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, SLOT(slotColumnToggled()),actionCollection(), "show_permissions" ); + m_paShowPermissions=new KToggleAction(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, SLOT(slotColumnToggled()),actionCollection(), "show_url" ); + m_paShowURL=new KToggleAction(i18n("Show URL"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_url" ); - m_paSelect = new KAction( i18n( "Se&lect..." ), CTRL+Key_Plus, this, SLOT( slotSelect() ), actionCollection(), "select" ); - m_paUnselect = new KAction( i18n( "Unselect..." ), CTRL+Key_Minus, this, SLOT( slotUnselect() ), actionCollection(), "unselect" ); - m_paSelectAll = KStdAction::selectAll( this, SLOT( slotSelectAll() ), actionCollection(), "selectall" ); - m_paUnselectAll = new KAction( i18n( "Unselect All" ), CTRL+Key_U, this, SLOT( slotUnselectAll() ), actionCollection(), "unselectall" ); - m_paInvertSelection = new KAction( i18n( "&Invert Selection" ), CTRL+Key_Asterisk, this, SLOT( slotInvertSelection() ), actionCollection(), "invertselection" ); + 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_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_paShowDot = new KToggleAction( i18n( "Show &Hidden Files" ), 0, this, SLOT( slotShowDot() ), actionCollection(), "show_dot" ); + m_paShowDot = new KToggleAction( 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, SLOT(slotCaseInsensitive()),actionCollection(), "sort_caseinsensitive" ); + m_paCaseInsensitive = new KToggleAction(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 b149b703c..8665160d3 100644 --- a/konqueror/listview/konq_listview.h +++ b/konqueror/listview/konq_listview.h @@ -27,9 +27,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include "konq_listviewwidget.h" @@ -44,7 +44,7 @@ public: KonqListViewFactory(); virtual ~KonqListViewFactory(); - virtual KParts::Part* createPartObject( QWidget *parentWidget, const char *, QObject *parent, const char *name, const char*, const QStringList &args ); + virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *, TQObject *parent, const char *name, const char*, const TQStringList &args ); static KInstance *instance(); static KonqPropsView *defaultViewProps(); @@ -65,7 +65,7 @@ class KonqListView : public KonqDirPart Q_OBJECT Q_PROPERTY( bool supportsUndo READ supportsUndo ) public: - KonqListView( QWidget *parentWidget, QObject *parent, const char *name, const QString& mode ); + KonqListView( TQWidget *parentWidget, TQObject *parent, const char *name, const TQString& mode ); virtual ~KonqListView(); virtual const KFileItem * currentItem(); @@ -75,8 +75,8 @@ public: bool supportsUndo() const { return true; } - virtual void saveState( QDataStream &stream ); - virtual void restoreState( QDataStream &stream ); + virtual void saveState( TQDataStream &stream ); + virtual void restoreState( TQDataStream &stream ); // "Cut" icons : disable those whose URL is in lst, enable the others virtual void disableIcons( const KURL::List & lst ); @@ -86,7 +86,7 @@ public: //int iconSize() { return m_pListView->iconSize(); } void determineIcon( KonqBaseListViewItem * item ); - QPtrList & lstPendingMimeIconItems() { return m_mimeTypeResolver->m_lstPendingMimeIconItems; } + TQPtrList & lstPendingMimeIconItems() { return m_mimeTypeResolver->m_lstPendingMimeIconItems; } void listingComplete(); virtual void newIconSize( int ); @@ -145,7 +145,7 @@ private: KonqBaseListViewWidget *m_pListView; KMimeTypeResolver *m_mimeTypeResolver; - QTimer *m_headerTimer; + TQTimer *m_headerTimer; KAction *m_paSelect; KAction *m_paUnselect; @@ -195,7 +195,7 @@ class ListViewBrowserExtension : public KonqDirPartBrowserExtension void reparseConfiguration(); void setSaveViewPropertiesLocally( bool value ); - void setNameFilter( const QString &nameFilter ); + void setNameFilter( const TQString &nameFilter ); // void refreshMimeTypes is missing void properties(); diff --git a/konqueror/listview/konq_listviewitems.cc b/konqueror/listview/konq_listviewitems.cc index f946856c4..3c70f1fb0 100644 --- a/konqueror/listview/konq_listviewitems.cc +++ b/konqueror/listview/konq_listviewitems.cc @@ -23,11 +23,11 @@ #include #include #include -#include -#include +#include +#include #include -static QString retrieveExtraEntry( KFileItem* fileitem, int numExtra ) +static TQString retrieveExtraEntry( KFileItem* fileitem, int numExtra ) { /// ######## SLOOOOW KIO::UDSEntry::ConstIterator it = fileitem->entry().begin(); @@ -44,7 +44,7 @@ static QString retrieveExtraEntry( KFileItem* fileitem, int numExtra ) } } } - return QString::null; + return TQString::null; } @@ -70,7 +70,7 @@ KonqListViewItem::KonqListViewItem( KonqBaseListViewWidget *_listViewWidget, KFi KonqListViewItem::~KonqListViewItem() { - for ( QValueVector::iterator + for ( TQValueVector::iterator it = m_pixmaps.begin(), itEnd = m_pixmaps.end(); it != itEnd; ++it ) delete *it; @@ -130,7 +130,7 @@ void KonqListViewItem::updateContents() case KIO::UDS_ACCESS_TIME: case KIO::UDS_CREATION_TIME: { - QDateTime dt; + TQDateTime dt; time_t _time = m_fileitem->time( tmpColumn->udsId ); if ( _time != 0 ) { @@ -141,14 +141,14 @@ void KonqListViewItem::updateContents() break; case KIO::UDS_EXTRA: { - const QString entryStr = retrieveExtraEntry( m_fileitem, numExtra ); - if ( tmpColumn->type == QVariant::DateTime ) + const TQString entryStr = retrieveExtraEntry( m_fileitem, numExtra ); + if ( tmpColumn->type == TQVariant::DateTime ) { - QDateTime dt = QDateTime::fromString( entryStr, Qt::ISODate ); + TQDateTime dt = TQDateTime::fromString( entryStr, Qt::ISODate ); setText(tmpColumn->displayInColumn, KGlobal::locale()->formatDateTime(dt)); } - else // if ( tmpColumn->type == QVariant::String ) + else // if ( tmpColumn->type == TQVariant::String ) setText(tmpColumn->displayInColumn, entryStr); ++numExtra; break; @@ -180,12 +180,12 @@ void KonqListViewItem::setActive( bool active ) setPixmap( 0, m_fileitem->pixmap( iconSize, state() ) ); } -void KonqListViewItem::setPixmap( int column, const QPixmap& pm ) +void KonqListViewItem::setPixmap( int column, const TQPixmap& pm ) { if ( column < 0 ) return; - const QPixmap *current = pixmap( column ); + const TQPixmap *current = pixmap( column ); if ( ( pm.isNull() && !current ) || ( current && pm.serialNumber() == current->serialNumber() ) ) @@ -198,7 +198,7 @@ void KonqListViewItem::setPixmap( int column, const QPixmap& pm ) m_pixmaps.resize( column+1 ); delete current; - m_pixmaps[column] = pm.isNull() ? 0 : new QPixmap( pm ); + m_pixmaps[column] = pm.isNull() ? 0 : new TQPixmap( pm ); int newWidth = pm.isNull() ? 0 : pm.width(); int newHeight = pm.isNull() ? 0 : pm.height(); @@ -218,7 +218,7 @@ void KonqListViewItem::setPixmap( int column, const QPixmap& pm ) // If we're just replacing the icon with another one its size -- i.e. a // "highlighted" icon, don't bother repainting the whole widget. - QListView *lv = m_pListViewWidget; + TQListView *lv = m_pListViewWidget; int decorationWidth = lv->treeStepSize() * ( depth() + ( lv->rootIsDecorated() ? 1 : 0 ) ); int x = lv->header()->sectionPos( column ) + decorationWidth + lv->itemMargin(); @@ -228,19 +228,19 @@ void KonqListViewItem::setPixmap( int column, const QPixmap& pm ) lv->repaintContents( x, y, w, h ); } -const QPixmap* KonqListViewItem::pixmap( int column ) const +const TQPixmap* KonqListViewItem::pixmap( int column ) const { bool ok; if ((int)m_pixmaps.count() <= column) return 0; - QPixmap *pm = m_pixmaps.at( column, &ok ); + TQPixmap *pm = m_pixmaps.at( column, &ok ); if( !ok ) return 0; return pm; } -int KonqBaseListViewItem::compare( QListViewItem* item, int col, bool ascending ) const +int KonqBaseListViewItem::compare( TQListViewItem* item, int col, bool ascending ) const { KonqListViewItem* k = static_cast( item ); if ( sortChar != k->sortChar ) @@ -273,11 +273,11 @@ int KonqBaseListViewItem::compare( QListViewItem* item, int col, bool ascending } case KIO::UDS_EXTRA: { - if ( cInfo->type & QVariant::DateTime ) { - const QString entryStr1 = retrieveExtraEntry( m_fileitem, numExtra ); - QDateTime dt1 = QDateTime::fromString( entryStr1, Qt::ISODate ); - const QString entryStr2 = retrieveExtraEntry( k->m_fileitem, numExtra ); - QDateTime dt2 = QDateTime::fromString( entryStr2, Qt::ISODate ); + if ( cInfo->type & TQVariant::DateTime ) { + const TQString entryStr1 = retrieveExtraEntry( m_fileitem, numExtra ); + TQDateTime dt1 = TQDateTime::fromString( entryStr1, Qt::ISODate ); + const TQString entryStr2 = retrieveExtraEntry( k->m_fileitem, numExtra ); + TQDateTime dt2 = TQDateTime::fromString( entryStr2, Qt::ISODate ); return ( dt1 > dt2 ) ? 1 : ( dt1 < dt2 ) ? -1 : 0; } } @@ -294,19 +294,19 @@ int KonqBaseListViewItem::compare( QListViewItem* item, int col, bool ascending } } -void KonqListViewItem::paintCell( QPainter *_painter, const QColorGroup & _cg, int _column, int _width, int _alignment ) +void KonqListViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _alignment ) { - QColorGroup cg( _cg ); + TQColorGroup cg( _cg ); if ( _column == 0 ) { _painter->setFont( m_pListViewWidget->itemFont() ); } - cg.setColor( QColorGroup::Text, m_pListViewWidget->itemColor() ); + cg.setColor( TQColorGroup::Text, m_pListViewWidget->itemColor() ); KListView *lv = static_cast< KListView* >( listView() ); - const QPixmap *pm = lv->viewport()->paletteBackgroundPixmap(); + const TQPixmap *pm = lv->viewport()->paletteBackgroundPixmap(); if ( _column == 0 && isSelected() && !lv->allColumnsShowFocus() ) { int newWidth = width( lv->fontMetrics(), lv, _column ); @@ -314,11 +314,11 @@ void KonqListViewItem::paintCell( QPainter *_painter, const QColorGroup & _cg, i newWidth = _width; if ( pm && !pm->isNull() ) { - cg.setBrush( QColorGroup::Base, QBrush( backgroundColor(_column), *pm ) ); - QPoint o = _painter->brushOrigin(); + cg.setBrush( TQColorGroup::Base, TQBrush( backgroundColor(_column), *pm ) ); + TQPoint o = _painter->brushOrigin(); _painter->setBrushOrigin( o.x() - lv->contentsX(), o.y() - lv->contentsY() ); - const QColorGroup::ColorRole crole = - QPalette::backgroundRoleFromMode( lv->viewport()->backgroundMode() ); + const TQColorGroup::ColorRole crole = + TQPalette::backgroundRoleFromMode( lv->viewport()->backgroundMode() ); _painter->fillRect( newWidth, 0, _width - newWidth, height(), cg.brush( crole ) ); _painter->setBrushOrigin( o ); } @@ -333,14 +333,14 @@ void KonqListViewItem::paintCell( QPainter *_painter, const QColorGroup & _cg, i KListViewItem::paintCell( _painter, cg, _column, _width, _alignment ); } -void KonqListViewItem::paintFocus( QPainter * _painter, const QColorGroup & cg, const QRect & _r ) +void KonqListViewItem::paintFocus( TQPainter * _painter, const TQColorGroup & cg, const TQRect & _r ) { - QRect r( _r ); - QListView *lv = static_cast< QListView * >( listView() ); + TQRect r( _r ); + TQListView *lv = static_cast< TQListView * >( listView() ); r.setWidth( width( lv->fontMetrics(), lv, 0 ) ); if ( r.right() > lv->header()->sectionRect( 0 ).right() ) r.setRight( lv->header()->sectionRect( 0 ).right() ); - QListViewItem::paintFocus( _painter, cg, r ); + TQListViewItem::paintFocus( _painter, cg, r ); } const char* KonqBaseListViewItem::makeAccessString( const mode_t mode) @@ -419,10 +419,10 @@ KonqBaseListViewItem::~KonqBaseListViewItem() m_pListViewWidget->m_selected->removeRef(this); } -QRect KonqBaseListViewItem::rect() const +TQRect KonqBaseListViewItem::rect() const { - QRect r = m_pListViewWidget->itemRect(this); - return QRect( m_pListViewWidget->viewportToContents( r.topLeft() ), QSize( r.width(), r.height() ) ); + TQRect r = m_pListViewWidget->itemRect(this); + return TQRect( m_pListViewWidget->viewportToContents( r.topLeft() ), TQSize( r.width(), r.height() ) ); } void KonqBaseListViewItem::mimetypeFound() diff --git a/konqueror/listview/konq_listviewitems.h b/konqueror/listview/konq_listviewitems.h index 6e0cbc513..d3dd2b1ad 100644 --- a/konqueror/listview/konq_listviewitems.h +++ b/konqueror/listview/konq_listviewitems.h @@ -21,10 +21,10 @@ #define __konq_listviewitems_h__ #include -#include +#include #include -#include +#include // for mode_t #include @@ -52,7 +52,7 @@ class KonqBaseListViewItem : public KListViewItem virtual void updateContents() = 0; virtual void setDisabled( bool disabled ) { m_bDisabled = disabled; } virtual void setActive ( bool active ) { m_bActive = active; } - virtual int compare( QListViewItem* i, int col, bool ascending ) const; + virtual int compare( TQListViewItem* i, int col, bool ascending ) const; int state() const { @@ -64,7 +64,7 @@ class KonqBaseListViewItem : public KListViewItem } /** For KonqMimeTypeResolver */ - QRect rect() const; + TQRect rect() const; protected: short int sortChar; @@ -106,18 +106,18 @@ class KonqListViewItem : public KonqBaseListViewItem virtual ~KonqListViewItem(); - virtual void paintCell( QPainter *_painter, const QColorGroup & cg, + virtual void paintCell( TQPainter *_painter, const TQColorGroup & cg, int column, int width, int alignment ); - virtual void paintFocus( QPainter * _painter, const QColorGroup & cg, const QRect & r ); + virtual void paintFocus( TQPainter * _painter, const TQColorGroup & cg, const TQRect & r ); virtual void updateContents(); virtual void setDisabled( bool disabled ); virtual void setActive ( bool active ); - virtual void setPixmap( int column, const QPixmap & pm ); - virtual const QPixmap * pixmap( int column ) const; + virtual void setPixmap( int column, const TQPixmap & pm ); + virtual const TQPixmap * pixmap( int column ) const; private: - QValueVector m_pixmaps; + TQValueVector m_pixmaps; }; #endif diff --git a/konqueror/listview/konq_listviewwidget.cc b/konqueror/listview/konq_listviewwidget.cc index 7d9231758..8f166af0a 100644 --- a/konqueror/listview/konq_listviewwidget.cc +++ b/konqueror/listview/konq_listviewwidget.cc @@ -35,13 +35,13 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -51,27 +51,27 @@ ColumnInfo::ColumnInfo() ,name() ,desktopFileName() ,udsId(0) - ,type(QVariant::Invalid) + ,type(TQVariant::Invalid) ,displayThisOne(false) ,toggleThisOne(0) {} -void ColumnInfo::setData(const QString& n, const QString& desktopName, int kioUds, +void ColumnInfo::setData(const TQString& n, const TQString& desktopName, int kioUds, KToggleAction* someAction, int theWidth) { displayInColumn=-1; name=n; desktopFileName=desktopName; udsId=kioUds; - type=QVariant::Invalid; + type=TQVariant::Invalid; displayThisOne=false; toggleThisOne=someAction; width=theWidth; } -void ColumnInfo::setData(const QString& n, const QString& desktopName, int kioUds, - QVariant::Type t, KToggleAction* someAction, int theWidth) +void ColumnInfo::setData(const TQString& n, const TQString& desktopName, int kioUds, + TQVariant::Type t, KToggleAction* someAction, int theWidth) { displayInColumn=-1; name=n; @@ -84,7 +84,7 @@ void ColumnInfo::setData(const QString& n, const QString& desktopName, int kioUd } -KonqBaseListViewWidget::KonqBaseListViewWidget( KonqListView *parent, QWidget *parentWidget) +KonqBaseListViewWidget::KonqBaseListViewWidget( KonqListView *parent, TQWidget *parentWidget) : KListView(parentWidget) ,sortedByColumn(0) ,m_pBrowserView(parent) @@ -119,62 +119,62 @@ KonqBaseListViewWidget::KonqBaseListViewWidget( KonqListView *parent, QWidget *p initConfig(); #if 0 - connect( this, SIGNAL(rightButtonPressed(QListViewItem*,const QPoint&,int)), - this, SLOT(slotRightButtonPressed(QListViewItem*,const QPoint&,int))); + connect( this, TQT_SIGNAL(rightButtonPressed(TQListViewItem*,const TQPoint&,int)), + this, TQT_SLOT(slotRightButtonPressed(TQListViewItem*,const TQPoint&,int))); #endif - connect( this, SIGNAL(returnPressed( QListViewItem * )), - this, SLOT(slotReturnPressed( QListViewItem * )) ); - connect( this, SIGNAL( mouseButtonClicked( int, QListViewItem *, const QPoint&, int )), - this, SLOT( slotMouseButtonClicked2( int, QListViewItem *, const QPoint&, int )) ); - connect( this, SIGNAL(executed( QListViewItem * )), - this, SLOT(slotExecuted( QListViewItem * )) ); - - connect( this, SIGNAL(currentChanged( QListViewItem * )), - this, SLOT(slotCurrentChanged( QListViewItem * )) ); - connect( this, SIGNAL(itemRenamed( QListViewItem *, const QString &, int )), - this, SLOT(slotItemRenamed( QListViewItem *, const QString &, int )) ); - connect( this, SIGNAL(contextMenuRequested( QListViewItem *, const QPoint&, int )), - this, SLOT(slotPopupMenu( QListViewItem *, const QPoint&, int )) ); - connect( this, SIGNAL(selectionChanged()), this, SLOT(slotSelectionChanged()) ); - - connect( horizontalScrollBar(), SIGNAL(valueChanged( int )), - this, SIGNAL(viewportAdjusted()) ); - connect( verticalScrollBar(), SIGNAL(valueChanged( int )), - this, SIGNAL(viewportAdjusted()) ); + 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(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 the directory lister - connect( m_dirLister, SIGNAL(started( const KURL & )), - this, SLOT(slotStarted()) ); - connect( m_dirLister, SIGNAL(completed()), this, SLOT(slotCompleted()) ); - connect( m_dirLister, SIGNAL(canceled()), this, SLOT(slotCanceled()) ); - connect( m_dirLister, SIGNAL(clear()), this, SLOT(slotClear()) ); - connect( m_dirLister, SIGNAL(newItems( const KFileItemList & ) ), - this, SLOT(slotNewItems( const KFileItemList & )) ); - connect( m_dirLister, SIGNAL(deleteItem( KFileItem * )), - this, SLOT(slotDeleteItem( KFileItem * )) ); - connect( m_dirLister, SIGNAL(refreshItems( const KFileItemList & )), - this, SLOT( slotRefreshItems( const KFileItemList & )) ); - connect( m_dirLister, SIGNAL(redirection( const KURL & )), - this, SLOT(slotRedirection( const KURL & )) ); - connect( m_dirLister, SIGNAL(itemsFilteredByMime( const KFileItemList & )), - m_pBrowserView, SIGNAL(itemsFilteredByMime( const KFileItemList & )) ); - - connect( m_dirLister, SIGNAL(infoMessage( const QString& )), - m_pBrowserView->extension(), SIGNAL(infoMessage( const QString& )) ); - connect( m_dirLister, SIGNAL(percent( int )), - m_pBrowserView->extension(), SIGNAL(loadingProgress( int )) ); - connect( m_dirLister, SIGNAL(speed( int )), - m_pBrowserView->extension(), SIGNAL(speedProgress( int )) ); - - connect( header(), SIGNAL(sizeChange( int, int, int )), SLOT(slotUpdateBackground()) ); + 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()) ); viewport()->setMouseTracking( true ); - viewport()->setFocusPolicy( QWidget::WheelFocus ); - setFocusPolicy( QWidget::WheelFocus ); + viewport()->setFocusPolicy( TQWidget::WheelFocus ); + setFocusPolicy( TQWidget::WheelFocus ); setAcceptDrops( true ); //looks better with the statusbar - setFrameStyle( QFrame::StyledPanel | QFrame::Sunken ); + setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken ); setShowSortIndicator( true ); } @@ -193,7 +193,7 @@ KonqBaseListViewWidget::~KonqBaseListViewWidget() void KonqBaseListViewWidget::readProtocolConfig( const KURL & url ) { - const QString protocol = url.protocol(); + const TQString protocol = url.protocol(); KonqListViewSettings config( protocol ); config.readConfig(); sortedByColumn = config.sortBy(); @@ -201,8 +201,8 @@ void KonqBaseListViewWidget::readProtocolConfig( const KURL & url ) m_filenameColumnWidth = config.fileNameColumnWidth(); - QStringList lstColumns = config.columns(); - QValueList lstColumnWidths = config.columnWidths(); + TQStringList lstColumns = config.columns(); + TQValueList lstColumnWidths = config.columnWidths(); if (lstColumns.isEmpty()) { // Default column selection @@ -227,18 +227,18 @@ void KonqBaseListViewWidget::readProtocolConfig( const KURL & url ) KProtocolInfo::ExtraFieldList::Iterator extraFieldsIt = extraFields.begin(); for ( int num = 1; extraFieldsIt != extraFields.end(); ++extraFieldsIt, ++num ) { - const QString column = (*extraFieldsIt).name; + const TQString column = (*extraFieldsIt).name; if ( lstColumns.find(column) == lstColumns.end() ) lstColumns << column; - const QString type = (*extraFieldsIt).type; // ## TODO use when sorting - QVariant::Type t = QVariant::Invalid; + const TQString type = (*extraFieldsIt).type; // ## TODO use when sorting + TQVariant::Type t = TQVariant::Invalid; if ( type.lower() == "qstring" ) - t = QVariant::String; + t = TQVariant::String; else if ( type.lower() == "qdatetime" ) - t = QVariant::DateTime; + t = TQVariant::DateTime; else kdWarning() << "Unsupported ExtraType '" << type << "'" << endl; - confColumns[extraIndex++].setData( column, QString("Extra%1").arg(num), KIO::UDS_EXTRA, t, 0); + confColumns[extraIndex++].setData( column, TQString("Extra%1").arg(num), KIO::UDS_EXTRA, t, 0); } //disable everything @@ -273,7 +273,7 @@ void KonqBaseListViewWidget::readProtocolConfig( const KURL & url ) { // Default Column widths ColumnInfo *tmpColumn = &confColumns[j]; - QString str; + TQString str; if ( tmpColumn->udsId == KIO::UDS_SIZE ) str = KGlobal::locale()->formatNumber( 888888888, 0 ) + " "; @@ -293,9 +293,9 @@ void KonqBaseListViewWidget::readProtocolConfig( const KURL & url ) str = "a_long_lonq_long_very_long_url"; else if ( (tmpColumn->udsId & KIO::UDS_TIME) || (tmpColumn->udsId == KIO::UDS_EXTRA && - (tmpColumn->type & QVariant::DateTime)) ) + (tmpColumn->type & TQVariant::DateTime)) ) { - QDateTime dt( QDate( 2000, 10, 10 ), QTime( 20, 20, 20 ) ); + TQDateTime dt( TQDate( 2000, 10, 10 ), TQTime( 20, 20, 20 ) ); str = KGlobal::locale()->formatDateTime( dt ) + "--"; } else @@ -308,7 +308,7 @@ void KonqBaseListViewWidget::readProtocolConfig( const KURL & url ) } } //check what the protocol provides - QStringList listingList = KProtocolInfo::listing( url ); + TQStringList listingList = KProtocolInfo::listing( url ); kdDebug(1202) << k_funcinfo << "protocol: " << protocol << endl; // Even if this is not given by the protocol, we can determine it. @@ -325,7 +325,7 @@ void KonqBaseListViewWidget::readProtocolConfig( const KURL & url ) continue; } - QStringList::Iterator listIt = listingList.find( confColumns[i].desktopFileName ); + TQStringList::Iterator listIt = listingList.find( confColumns[i].desktopFileName ); if ( listIt == listingList.end() ) // not found -> hide { //move all columns behind one to the front @@ -388,35 +388,35 @@ void KonqBaseListViewWidget::initConfig() { m_pSettings = KonqFMSettings::settings(); - QFont stdFont( m_pSettings->standardFont() ); + TQFont stdFont( m_pSettings->standardFont() ); setFont( stdFont ); //TODO: create config GUI - QFont itemFont( m_pSettings->standardFont() ); + TQFont itemFont( m_pSettings->standardFont() ); itemFont.setUnderline( m_pSettings->underlineLink() ); setItemFont( itemFont ); setItemColor( m_pSettings->normalTextColor() ); - bool on = m_pSettings->showFileTips() && QToolTip::isGloballyEnabled(); + bool on = m_pSettings->showFileTips() && TQToolTip::isGloballyEnabled(); m_fileTip->setOptions( on, m_pSettings->showPreviewsInFileTips(), m_pSettings->numFileTips() ); updateListContents(); } -void KonqBaseListViewWidget::contentsMousePressEvent( QMouseEvent *e ) +void KonqBaseListViewWidget::contentsMousePressEvent( TQMouseEvent *e ) { if ( m_rubber ) { - QRect r( m_rubber->normalize() ); + TQRect r( m_rubber->normalize() ); delete m_rubber; m_rubber = 0; repaintContents( r, FALSE ); } delete m_selected; - m_selected = new QPtrList; + m_selected = new TQPtrList; - QPoint vp = contentsToViewport( e->pos() ); + TQPoint vp = contentsToViewport( e->pos() ); KonqBaseListViewItem* item = isExecuteArea( vp ) ? static_cast( itemAt( vp ) ) : 0L; @@ -426,13 +426,13 @@ void KonqBaseListViewWidget::contentsMousePressEvent( QMouseEvent *e ) else { if ( e->button() == LeftButton ) { - m_rubber = new QRect( e->x(), e->y(), 0, 0 ); + m_rubber = new TQRect( e->x(), e->y(), 0, 0 ); clearSelection(); emit selectionChanged(); m_fileTip->setItem( 0 ); } if ( e->button() != RightButton ) - QListView::contentsMousePressEvent( e ); + TQListView::contentsMousePressEvent( e ); } // Store list of selected items at mouse-press time. // This is used when autoscrolling (why?) @@ -440,12 +440,12 @@ void KonqBaseListViewWidget::contentsMousePressEvent( QMouseEvent *e ) selectedItems( m_selected ); } -void KonqBaseListViewWidget::contentsMouseReleaseEvent( QMouseEvent *e ) +void KonqBaseListViewWidget::contentsMouseReleaseEvent( TQMouseEvent *e ) { if ( m_rubber ) { - QRect r( m_rubber->normalize() ); + TQRect r( m_rubber->normalize() ); delete m_rubber; m_rubber = 0; repaintContents( r, FALSE ); @@ -453,8 +453,8 @@ void KonqBaseListViewWidget::contentsMouseReleaseEvent( QMouseEvent *e ) if ( m_scrollTimer ) { - disconnect( m_scrollTimer, SIGNAL( timeout() ), - this, SLOT( slotAutoScroll() ) ); + disconnect( m_scrollTimer, TQT_SIGNAL( timeout() ), + this, TQT_SLOT( slotAutoScroll() ) ); m_scrollTimer->stop(); delete m_scrollTimer; m_scrollTimer = 0; @@ -464,7 +464,7 @@ void KonqBaseListViewWidget::contentsMouseReleaseEvent( QMouseEvent *e ) KListView::contentsMouseReleaseEvent( e ); } -void KonqBaseListViewWidget::contentsMouseMoveEvent( QMouseEvent *e ) +void KonqBaseListViewWidget::contentsMouseMoveEvent( TQMouseEvent *e ) { if ( m_rubber ) { @@ -472,7 +472,7 @@ void KonqBaseListViewWidget::contentsMouseMoveEvent( QMouseEvent *e ) return; } - QPoint vp = contentsToViewport( e->pos() ); + TQPoint vp = contentsToViewport( e->pos() ); KonqBaseListViewItem* item = isExecuteArea( vp ) ? static_cast( itemAt( vp ) ) : 0; @@ -490,7 +490,7 @@ void KonqBaseListViewWidget::contentsMouseMoveEvent( QMouseEvent *e ) m_pBrowserView->emitMouseOver( item->item() ); vp.setY( itemRect( item ).y() ); - QRect rect( viewportToContents( vp ), QSize(20, item->height()) ); + TQRect rect( viewportToContents( vp ), TQSize(20, item->height()) ); m_fileTip->setItem( item->item(), rect, item->pixmap( 0 ) ); m_fileTip->setPreview( KGlobalSettings::showFilePreview( item->item()->url() ) ); setShowToolTips( !m_pSettings->showFileTips() ); @@ -508,7 +508,7 @@ void KonqBaseListViewWidget::contentsMouseMoveEvent( QMouseEvent *e ) KListView::contentsMouseMoveEvent( e ); } -void KonqBaseListViewWidget::contentsWheelEvent( QWheelEvent *e ) +void KonqBaseListViewWidget::contentsWheelEvent( TQWheelEvent *e ) { // when scrolling with mousewheel, stop possible pending filetip m_fileTip->setItem( 0 ); @@ -524,7 +524,7 @@ void KonqBaseListViewWidget::contentsWheelEvent( QWheelEvent *e ) KListView::contentsWheelEvent( e ); } -void KonqBaseListViewWidget::leaveEvent( QEvent *e ) +void KonqBaseListViewWidget::leaveEvent( TQEvent *e ) { if ( m_activeItem != 0 ) { @@ -540,20 +540,20 @@ void KonqBaseListViewWidget::leaveEvent( QEvent *e ) KListView::leaveEvent( e ); } -void KonqBaseListViewWidget::drawRubber( QPainter *p ) +void KonqBaseListViewWidget::drawRubber( TQPainter *p ) { if ( !m_rubber ) return; p->setRasterOp( NotROP ); - p->setPen( QPen( color0, 1 ) ); + p->setPen( TQPen( color0, 1 ) ); p->setBrush( NoBrush ); - QPoint pt( m_rubber->x(), m_rubber->y() ); + TQPoint pt( m_rubber->x(), m_rubber->y() ); pt = contentsToViewport( pt ); - style().drawPrimitive( QStyle::PE_RubberBand, p, - QRect( pt.x(), pt.y(), m_rubber->width(), m_rubber->height() ), - colorGroup(), QStyle::Style_Default, colorGroup().base() ); + style().drawPrimitive( TQStyle::PE_RubberBand, p, + TQRect( pt.x(), pt.y(), m_rubber->width(), m_rubber->height() ), + colorGroup(), TQStyle::Style_Default, colorGroup().base() ); } @@ -564,13 +564,13 @@ void KonqBaseListViewWidget::slotAutoScroll() // this code assumes that all items have the same height - const QPoint pos = viewport()->mapFromGlobal( QCursor::pos() ); - const QPoint vc = viewportToContents( pos ); + const TQPoint pos = viewport()->mapFromGlobal( TQCursor::pos() ); + const TQPoint vc = viewportToContents( pos ); if ( vc == m_rubber->bottomRight() ) return; - QRect oldRubber = *m_rubber; + TQRect oldRubber = *m_rubber; const int oldTop = m_rubber->normalize().top(); const int oldBottom = m_rubber->normalize().bottom(); @@ -578,18 +578,18 @@ void KonqBaseListViewWidget::slotAutoScroll() m_rubber->setBottomRight( vc ); - QListViewItem *cur = itemAt( QPoint(0,0) ); + TQListViewItem *cur = itemAt( TQPoint(0,0) ); bool block = signalsBlocked(); blockSignals( true ); - QRect rr; - QRect nr = m_rubber->normalize(); + TQRect rr; + TQRect nr = m_rubber->normalize(); bool changed = FALSE; if ( cur ) { - QRect rect; + TQRect rect; if ( allColumnsShowFocus() ) rect = itemRect( cur ); else { @@ -598,7 +598,7 @@ void KonqBaseListViewWidget::slotAutoScroll() } - rect = QRect( viewportToContents( rect.topLeft() ), + rect = TQRect( viewportToContents( rect.topLeft() ), viewportToContents( rect.bottomRight() ) ); if ( !allColumnsShowFocus() ) @@ -612,8 +612,8 @@ void KonqBaseListViewWidget::slotAutoScroll() rect.setWidth( header()->headerWidth() ); } - QRect r = rect; - QListViewItem *tmp = cur; + TQRect r = rect; + TQListViewItem *tmp = cur; while ( cur && rect.top() <= oldBottom ) { @@ -687,21 +687,21 @@ void KonqBaseListViewWidget::slotAutoScroll() blockSignals( block ); emit selectionChanged(); - QRect allRect = oldRubber.normalize(); + TQRect allRect = oldRubber.normalize(); if ( changed ) { allRect |= rr.normalize(); } allRect |= m_rubber->normalize(); - QPoint point = contentsToViewport( allRect.topLeft() ); - allRect = QRect( point.x(), point.y(), allRect.width(), allRect.height() ); + TQPoint point = contentsToViewport( allRect.topLeft() ); + allRect = TQRect( point.x(), point.y(), allRect.width(), allRect.height() ); allRect &= viewport()->rect(); allRect.addCoords( -2, -2, 2, 2 ); - QPixmap backrubber( viewport()->rect().size() ); + TQPixmap backrubber( viewport()->rect().size() ); backrubber.fill( viewport(), viewport()->rect().topLeft() ); - QPainter p( &backrubber ); + TQPainter p( &backrubber ); p.save(); drawContentsOffset( &p, contentsX(), @@ -716,46 +716,46 @@ void KonqBaseListViewWidget::slotAutoScroll() const int scroll_margin = 40; ensureVisible( vc.x(), vc.y(), scroll_margin, scroll_margin ); - if ( !QRect( scroll_margin, scroll_margin, + if ( !TQRect( scroll_margin, scroll_margin, viewport()->width() - 2*scroll_margin, viewport()->height() - 2*scroll_margin ).contains( pos ) ) { if ( !m_scrollTimer ) { - m_scrollTimer = new QTimer( this ); + m_scrollTimer = new TQTimer( this ); - connect( m_scrollTimer, SIGNAL( timeout() ), - this, SLOT( slotAutoScroll() ) ); + connect( m_scrollTimer, TQT_SIGNAL( timeout() ), + this, TQT_SLOT( slotAutoScroll() ) ); m_scrollTimer->start( 100, false ); } } else if ( m_scrollTimer ) { - disconnect( m_scrollTimer, SIGNAL( timeout() ), - this, SLOT( slotAutoScroll() ) ); + disconnect( m_scrollTimer, TQT_SIGNAL( timeout() ), + this, TQT_SLOT( slotAutoScroll() ) ); m_scrollTimer->stop(); delete m_scrollTimer; m_scrollTimer = 0; } } -void KonqBaseListViewWidget::viewportPaintEvent( QPaintEvent *e ) +void KonqBaseListViewWidget::viewportPaintEvent( TQPaintEvent *e ) { KListView::viewportPaintEvent( e ); - QPainter p( viewport() ); + TQPainter p( viewport() ); drawRubber( &p ); p.end(); } -void KonqBaseListViewWidget::viewportResizeEvent(QResizeEvent * e) +void KonqBaseListViewWidget::viewportResizeEvent(TQResizeEvent * e) { KListView::viewportResizeEvent(e); emit viewportAdjusted(); } -void KonqBaseListViewWidget::viewportDragMoveEvent( QDragMoveEvent *_ev ) +void KonqBaseListViewWidget::viewportDragMoveEvent( TQDragMoveEvent *_ev ) { KonqBaseListViewItem *item = isExecuteArea( _ev->pos() ) ? (KonqBaseListViewItem*)itemAt( _ev->pos() ) : 0L; @@ -788,7 +788,7 @@ void KonqBaseListViewWidget::viewportDragMoveEvent( QDragMoveEvent *_ev ) } } -void KonqBaseListViewWidget::viewportDragEnterEvent( QDragEnterEvent *_ev ) +void KonqBaseListViewWidget::viewportDragEnterEvent( TQDragEnterEvent *_ev ) { m_dragOverItem = 0L; @@ -796,14 +796,14 @@ void KonqBaseListViewWidget::viewportDragEnterEvent( QDragEnterEvent *_ev ) _ev->acceptAction(); } -void KonqBaseListViewWidget::viewportDragLeaveEvent( QDragLeaveEvent * ) +void KonqBaseListViewWidget::viewportDragLeaveEvent( TQDragLeaveEvent * ) { if ( m_dragOverItem != 0L ) setSelected( m_dragOverItem, false ); m_dragOverItem = 0L; } -void KonqBaseListViewWidget::viewportDropEvent( QDropEvent *ev ) +void KonqBaseListViewWidget::viewportDropEvent( TQDropEvent *ev ) { if ( m_dirLister->url().isEmpty() ) return; @@ -830,9 +830,9 @@ void KonqBaseListViewWidget::startDrag() m_fileTip->setItem( 0 ); KURL::List urls = selectedUrls( false ); - QListViewItem * m_pressedItem = currentItem(); + TQListViewItem * m_pressedItem = currentItem(); - QPixmap pixmap2; + TQPixmap pixmap2; bool pixmap0Invalid = !m_pressedItem->pixmap(0) || m_pressedItem->pixmap(0)->isNull(); // Multiple URLs ? @@ -855,7 +855,7 @@ void KonqBaseListViewWidget::startDrag() drag->drag(); } -void KonqBaseListViewWidget::slotItemRenamed( QListViewItem *item, const QString &name, int col ) +void KonqBaseListViewWidget::slotItemRenamed( TQListViewItem *item, const TQString &name, int col ) { Q_ASSERT( col == 0 ); Q_ASSERT( item != 0 ); @@ -898,7 +898,7 @@ void KonqBaseListViewWidget::slotSelectionChanged() } void KonqBaseListViewWidget::slotMouseButtonClicked2( int _button, - QListViewItem *_item, const QPoint& pos, int ) + TQListViewItem *_item, const TQPoint& pos, int ) { if ( _button == MidButton ) { @@ -909,7 +909,7 @@ void KonqBaseListViewWidget::slotMouseButtonClicked2( int _button, } } -void KonqBaseListViewWidget::slotExecuted( QListViewItem *item ) +void KonqBaseListViewWidget::slotExecuted( TQListViewItem *item ) { if ( !item ) return; @@ -917,11 +917,11 @@ void KonqBaseListViewWidget::slotExecuted( QListViewItem *item ) // isExecuteArea() checks whether the mouse pointer is // over an area where an action should be triggered // (i.e. the Name column, including pixmap and "+") - if ( isExecuteArea( viewport()->mapFromGlobal( QCursor::pos() ) ) ) + if ( isExecuteArea( viewport()->mapFromGlobal( TQCursor::pos() ) ) ) slotReturnPressed( item ); } -void KonqBaseListViewWidget::selectedItems( QPtrList *_list ) +void KonqBaseListViewWidget::selectedItems( TQPtrList *_list ) { iterator it = begin(); for ( ; it != end(); it++ ) @@ -967,7 +967,7 @@ KonqPropsView * KonqBaseListViewWidget::props() const return m_pBrowserView->m_pProps; } -void KonqBaseListViewWidget::slotReturnPressed( QListViewItem *_item ) +void KonqBaseListViewWidget::slotReturnPressed( TQListViewItem *_item ) { if ( !_item ) return; @@ -985,11 +985,11 @@ void KonqBaseListViewWidget::slotReturnPressed( QListViewItem *_item ) if (_item->pixmap(0) != 0) { // Rect of the QListViewItem's pixmap area. - QRect rect = _item->listView()->itemRect(_item); + TQRect rect = _item->listView()->itemRect(_item); // calculate nesting depth int nestingDepth = 0; - for (QListViewItem *currentItem = _item->parent(); + for (TQListViewItem *currentItem = _item->parent(); currentItem != 0; currentItem = currentItem->parent()) nestingDepth++; @@ -1007,7 +1007,7 @@ void KonqBaseListViewWidget::slotReturnPressed( QListViewItem *_item ) rect.setWidth(_item->pixmap(0)->width()); // gather pixmap - QPixmap *pix = new QPixmap(*(_item->pixmap(0))); + TQPixmap *pix = new TQPixmap(*(_item->pixmap(0))); // call the icon effect KIconEffect::visualActivate(viewport(), rect, pix); @@ -1019,13 +1019,13 @@ void KonqBaseListViewWidget::slotReturnPressed( QListViewItem *_item ) KMessageBox::information( 0, i18n("You must take the file out of the trash before being able to use it.") ); } -void KonqBaseListViewWidget::slotPopupMenu( QListViewItem *i, const QPoint &point, int c ) +void KonqBaseListViewWidget::slotPopupMenu( TQListViewItem *i, const TQPoint &point, int c ) { kdDebug(1202) << "KonqBaseListViewWidget::slotPopupMenu" << endl; popupMenu( point, ( i != 0 && c == -1 ) ); // i != 0 && c == -1 when activated by keyboard } -void KonqBaseListViewWidget::popupMenu( const QPoint& _global, bool alwaysForSelectedFiles ) +void KonqBaseListViewWidget::popupMenu( const TQPoint& _global, bool alwaysForSelectedFiles ) { m_fileTip->setItem( 0 ); @@ -1037,7 +1037,7 @@ void KonqBaseListViewWidget::popupMenu( const QPoint& _global, bool alwaysForSel // a popup for the current dir instead. if ( alwaysForSelectedFiles || isExecuteArea( viewport()->mapFromGlobal( _global ) ) ) { - QPtrList items; + TQPtrList items; selectedItems( &items ); for ( KonqBaseListViewItem *item = items.first(); item; item = items.next() ) lstItems.append( item->item() ); @@ -1224,7 +1224,7 @@ void KonqBaseListViewWidget::slotCanceled() //kdDebug(1202) << k_funcinfo << endl; setComplete(); - emit m_pBrowserView->canceled( QString::null ); + emit m_pBrowserView->canceled( TQString::null ); } void KonqBaseListViewWidget::slotClear() @@ -1246,7 +1246,7 @@ void KonqBaseListViewWidget::slotNewItems( const KFileItemList & entries ) { //kdDebug(1202) << k_funcinfo << entries.count() << endl; - for ( QPtrListIterator kit ( entries ); kit.current(); ++kit ) + for ( TQPtrListIterator kit ( entries ); kit.current(); ++kit ) { KonqListViewItem * tmp = new KonqListViewItem( this, *kit ); if ( !m_itemFound && tmp->text(0) == m_itemToGoTo ) @@ -1255,7 +1255,7 @@ void KonqBaseListViewWidget::slotNewItems( const KFileItemList & entries ) m_itemFound = true; } if ( !m_itemsToSelect.isEmpty() ) { - QStringList::Iterator tsit = m_itemsToSelect.find( (*kit)->name() ); + TQStringList::Iterator tsit = m_itemsToSelect.find( (*kit)->name() ); if ( tsit != m_itemsToSelect.end() ) { m_itemsToSelect.remove( tsit ); setSelected( tmp, true ); @@ -1325,7 +1325,7 @@ void KonqBaseListViewWidget::slotRefreshItems( const KFileItemList & entries ) { //kdDebug(1202) << k_funcinfo << endl; - QPtrListIterator kit ( entries ); + TQPtrListIterator kit ( entries ); for ( ; kit.current(); ++kit ) { iterator it = begin(); @@ -1349,7 +1349,7 @@ void KonqBaseListViewWidget::slotRedirection( const KURL & url ) readProtocolConfig( url ); createColumns(); } - const QString prettyURL = url.pathOrURL(); + const TQString prettyURL = url.pathOrURL(); emit m_pBrowserView->extension()->setLocationBarURL( prettyURL ); emit m_pBrowserView->setWindowCaption( prettyURL ); m_pBrowserView->m_url = url; @@ -1416,22 +1416,22 @@ KonqBaseListViewWidget::iterator KonqBaseListViewWidget::iterator::operator++(in return it; } -void KonqBaseListViewWidget::paintEmptyArea( QPainter *p, const QRect &r ) +void KonqBaseListViewWidget::paintEmptyArea( TQPainter *p, const TQRect &r ) { - const QPixmap *pm = viewport()->paletteBackgroundPixmap(); + const TQPixmap *pm = viewport()->paletteBackgroundPixmap(); if (!pm || pm->isNull()) p->fillRect(r, viewport()->backgroundColor()); else { - QRect devRect = p->xForm( r ); + TQRect devRect = p->xForm( r ); int ax = (devRect.x() + contentsX()); int ay = (devRect.y() + contentsY()); /* kdDebug() << "KonqBaseListViewWidget::paintEmptyArea " << r.x() << "," << r.y() << " " << r.width() << "x" << r.height() << " drawing pixmap with offset " << ax << "," << ay << endl;*/ - p->drawTiledPixmap(r, *pm, QPoint(ax, ay)); + p->drawTiledPixmap(r, *pm, TQPoint(ax, ay)); } } @@ -1455,19 +1455,19 @@ void KonqBaseListViewWidget::disableIcons( const KURL::List & lst ) } } -void KonqBaseListViewWidget::saveState( QDataStream & ds ) +void KonqBaseListViewWidget::saveState( TQDataStream & ds ) { - QString str; + TQString str; if ( currentItem() ) str = static_cast(currentItem())->item()->url().fileName(true); ds << str << m_url; } -void KonqBaseListViewWidget::restoreState( QDataStream & ds ) +void KonqBaseListViewWidget::restoreState( TQDataStream & ds ) { m_restored = true; - QString str; + TQString str; KURL url; ds >> str >> url; if ( !str.isEmpty() ) @@ -1490,8 +1490,8 @@ void KonqBaseListViewWidget::slotUpdateBackground() { if ( !m_backgroundTimer ) { - m_backgroundTimer = new QTimer( this ); - connect( m_backgroundTimer, SIGNAL( timeout() ), viewport(), SLOT( update() ) ); + m_backgroundTimer = new TQTimer( this ); + connect( m_backgroundTimer, TQT_SIGNAL( timeout() ), viewport(), TQT_SLOT( update() ) ); } else m_backgroundTimer->stop(); @@ -1506,7 +1506,7 @@ bool KonqBaseListViewWidget::caseInsensitiveSort() const } // based on isExecuteArea from klistview.cpp -int KonqBaseListViewWidget::executeArea( QListViewItem *_item ) +int KonqBaseListViewWidget::executeArea( TQListViewItem *_item ) { if ( !_item ) return 0; diff --git a/konqueror/listview/konq_listviewwidget.h b/konqueror/listview/konq_listviewwidget.h index d6451e50d..19cb4b16d 100644 --- a/konqueror/listview/konq_listviewwidget.h +++ b/konqueror/listview/konq_listviewwidget.h @@ -20,8 +20,8 @@ #ifndef __konq_listviewwidget_h__ #define __konq_listviewwidget_h__ -#include -#include +#include +#include #include #include @@ -55,15 +55,15 @@ class ColumnInfo { public: ColumnInfo(); - void setData( const QString& n, const QString& desktopName, int kioUds, + void setData( const TQString& n, const TQString& desktopName, int kioUds, KToggleAction *someAction, int theWith = -1 ); - void setData( const QString& n, const QString& desktopName, int kioUds /* UDS_EXTRA */, - QVariant::Type type, KToggleAction *someAction, int theWith = -1 ); + void setData( const TQString& n, const TQString& desktopName, int kioUds /* UDS_EXTRA */, + TQVariant::Type type, KToggleAction *someAction, int theWith = -1 ); int displayInColumn; - QString name; - QString desktopFileName; + TQString name; + TQString desktopFileName; int udsId; - QVariant::Type type; // only used if udsId == UDS_EXTRA + TQVariant::Type type; // only used if udsId == UDS_EXTRA bool displayThisOne; KToggleAction *toggleThisOne; int width; @@ -81,7 +81,7 @@ class KonqBaseListViewWidget : public KListView Q_OBJECT public: - KonqBaseListViewWidget( KonqListView *parent, QWidget *parentWidget ); + KonqBaseListViewWidget( KonqListView *parent, TQWidget *parentWidget ); virtual ~KonqBaseListViewWidget(); unsigned int NumberOfAtoms; @@ -108,40 +108,40 @@ public: virtual bool openURL( const KURL &url ); - void selectedItems( QPtrList *_list ); + void selectedItems( TQPtrList *_list ); KFileItemList visibleFileItems(); KFileItemList selectedFileItems(); KURL::List selectedUrls( bool mostLocal = false ); /** @return the KonqListViewDir which handles the directory _url */ - //virtual KonqListViewDir *findDir ( const QString & _url ); + //virtual KonqListViewDir *findDir ( const TQString & _url ); /** * @return the Properties instance for this view. Used by the items. */ KonqPropsView *props() const; - //QPtrList *columnConfigInfo() { return &confColumns; }; - QValueVector& columnConfigInfo() { return confColumns; }; - QString sortedByColumn; + //TQPtrList *columnConfigInfo() { return &confColumns; }; + TQValueVector& columnConfigInfo() { return confColumns; }; + TQString sortedByColumn; virtual void setShowIcons( bool enable ) { m_showIcons = enable; } virtual bool showIcons() { return m_showIcons; } - void setItemFont( const QFont &f ) { m_itemFont = f; } - QFont itemFont() const { return m_itemFont; } - void setItemColor( const QColor &c ) { m_itemColor = c; } - QColor itemColor() const { return m_itemColor; } + void setItemFont( const TQFont &f ) { m_itemFont = f; } + TQFont itemFont() const { return m_itemFont; } + void setItemColor( const TQColor &c ) { m_itemColor = c; } + TQColor itemColor() const { return m_itemColor; } int iconSize() const { return props()->iconSize(); } void setAscending( bool b ) { m_bAscending = b; } bool ascending() const { return m_bAscending; } bool caseInsensitiveSort() const; - virtual void paintEmptyArea( QPainter *p, const QRect &r ); + virtual void paintEmptyArea( TQPainter *p, const TQRect &r ); - virtual void saveState( QDataStream & ); - virtual void restoreState( QDataStream & ); + virtual void saveState( TQDataStream & ); + virtual void restoreState( TQDataStream & ); virtual void disableIcons( const KURL::List& lst ); @@ -154,16 +154,16 @@ signals: public slots: //virtual void slotOnItem( KonqBaseListViewItem* _item ); // The '2' was added to differentiate it from KListView::slotMouseButtonClicked() - void slotMouseButtonClicked2( int _button, QListViewItem *_item, const QPoint& pos, int ); - virtual void slotExecuted( QListViewItem *_item ); - void slotItemRenamed( QListViewItem *, const QString &, int ); + void slotMouseButtonClicked2( int _button, TQListViewItem *_item, const TQPoint& pos, int ); + virtual void slotExecuted( TQListViewItem *_item ); + void slotItemRenamed( TQListViewItem *, const TQString &, int ); protected slots: void slotAutoScroll(); // from QListView - virtual void slotReturnPressed( QListViewItem *_item ); - virtual void slotCurrentChanged( QListViewItem *_item ) { slotOnItem( _item ); } + virtual void slotReturnPressed( TQListViewItem *_item ); + virtual void slotCurrentChanged( TQListViewItem *_item ) { slotOnItem( _item ); } // slots connected to the directory lister virtual void slotStarted(); @@ -174,7 +174,7 @@ protected slots: virtual void slotDeleteItem( KFileItem * ); virtual void slotRefreshItems( const KFileItemList & ); virtual void slotRedirection( const KURL & ); - void slotPopupMenu( QListViewItem *, const QPoint&, int ); + void slotPopupMenu( TQListViewItem *, const TQPoint&, int ); // forces a repaint on column size changes / branch expansion // when there is a background pixmap @@ -199,54 +199,54 @@ protected: void initConfig(); virtual void startDrag(); - virtual void viewportDragMoveEvent( QDragMoveEvent *_ev ); - virtual void viewportDragEnterEvent( QDragEnterEvent *_ev ); - virtual void viewportDragLeaveEvent( QDragLeaveEvent *_ev ); - virtual void viewportDropEvent( QDropEvent *_ev ); - virtual void viewportPaintEvent( QPaintEvent *e ); - virtual void viewportResizeEvent( QResizeEvent *e ); + virtual void viewportDragMoveEvent( TQDragMoveEvent *_ev ); + virtual void viewportDragEnterEvent( TQDragEnterEvent *_ev ); + virtual void viewportDragLeaveEvent( TQDragLeaveEvent *_ev ); + virtual void viewportDropEvent( TQDropEvent *_ev ); + virtual void viewportPaintEvent( TQPaintEvent *e ); + virtual void viewportResizeEvent( TQResizeEvent *e ); - virtual void drawRubber( QPainter * ); - virtual void contentsMousePressEvent( QMouseEvent *e ); - virtual void contentsMouseReleaseEvent( QMouseEvent *e ); - virtual void contentsMouseMoveEvent( QMouseEvent *e ); - virtual void contentsWheelEvent( QWheelEvent * e ); + virtual void drawRubber( TQPainter * ); + virtual void contentsMousePressEvent( TQMouseEvent *e ); + virtual void contentsMouseReleaseEvent( TQMouseEvent *e ); + virtual void contentsMouseMoveEvent( TQMouseEvent *e ); + virtual void contentsWheelEvent( TQWheelEvent * e ); - virtual void leaveEvent( QEvent *e ); + virtual void leaveEvent( TQEvent *e ); /** Common method for slotCompleted and slotCanceled */ virtual void setComplete(); //the second parameter is set to true when the menu shortcut is pressed, //so the position of the mouse pointer doesn't matter when using keyboard, aleXXX - virtual void popupMenu( const QPoint& _global, bool alwaysForSelectedFiles = false ); + virtual void popupMenu( const TQPoint& _global, bool alwaysForSelectedFiles = false ); //this one is called only by KListView, and this is friend anyways (Alex) //KDirLister *dirLister() const { return m_dirLister; } protected: - int executeArea( QListViewItem *_item ); + int executeArea( TQListViewItem *_item ); /** The directory lister for this URL */ KDirLister *m_dirLister; - //QPtrList confColumns; + //TQPtrList confColumns; // IMO there is really no need for an advanced data structure //we have a fixed number of members, //it consumes less memory and access should be faster (Alex) // This might not be the case for ever... we should introduce custom fields in kio (David) - QValueVector confColumns; + TQValueVector confColumns; KonqBaseListViewItem *m_dragOverItem; KonqBaseListViewItem *m_activeItem; - QPtrList *m_selected; - QTimer *m_scrollTimer; + TQPtrList *m_selected; + TQTimer *m_scrollTimer; - QFont m_itemFont; - QColor m_itemColor; + TQFont m_itemFont; + TQColor m_itemColor; - QRect *m_rubber; - QPixmap *m_backrubber; + TQRect *m_rubber; + TQPixmap *m_backrubber; bool m_bTopLevelComplete:1; bool m_showIcons:1; @@ -261,9 +261,9 @@ protected: KURL m_url; - QString m_itemToGoTo; - QStringList m_itemsToSelect; - QTimer *m_backgroundTimer; + TQString m_itemToGoTo; + TQStringList m_itemsToSelect; + TQTimer *m_backgroundTimer; KonqFileTip *m_fileTip; }; diff --git a/konqueror/listview/konq_textviewitem.cc b/konqueror/listview/konq_textviewitem.cc index 71d1de833..8e03e171e 100644 --- a/konqueror/listview/konq_textviewitem.cc +++ b/konqueror/listview/konq_textviewitem.cc @@ -24,17 +24,17 @@ #include #include -int KonqTextViewItem::compare( QListViewItem *item, int col, bool ascending ) const +int KonqTextViewItem::compare( TQListViewItem *item, int col, bool ascending ) const { if (col==1) return KonqBaseListViewItem::compare(item, 0, ascending); return KonqBaseListViewItem::compare(item, col, ascending); } -/*QString KonqTextViewItem::key( int _column, bool asc) const +/*TQString KonqTextViewItem::key( int _column, bool asc) const { if (_column==1) return key(0,asc); - QString tmp = QString::number( sortChar ); + TQString tmp = TQString::number( sortChar ); //check if it is a time column if (_column>1) { @@ -48,7 +48,7 @@ int KonqTextViewItem::compare( QListViewItem *item, int col, bool ascending ) co || (cInfo->udsId==KIO::UDS_ACCESS_TIME) || (cInfo->udsId==KIO::UDS_CREATION_TIME)) { - tmp += QString::number( m_fileitem->time(cInfo->udsId) ).rightJustify( 14, '0' ); + tmp += TQString::number( m_fileitem->time(cInfo->udsId) ).rightJustify( 14, '0' ); return tmp; } else if (cInfo->udsId==KIO::UDS_SIZE) @@ -67,7 +67,7 @@ int KonqTextViewItem::compare( QListViewItem *item, int col, bool ascending ) co void KonqTextViewItem::updateContents() { - QString tmp; + TQString tmp; KIO::filesize_t size=m_fileitem->size(); mode_t m=m_fileitem->mode(); @@ -185,7 +185,7 @@ void KonqTextViewItem::updateContents() { if ((*it).m_uds==(unsigned int)tmpColumn->udsId) { - QDateTime dt; + TQDateTime dt; dt.setTime_t((time_t) (*it).m_long); setText(tmpColumn->displayInColumn,KGlobal::locale()->formatDateTime(dt)); break; @@ -200,25 +200,25 @@ void KonqTextViewItem::updateContents() }; } -void KonqTextViewItem::paintCell( QPainter *_painter, const QColorGroup & _cg, int _column, int _width, int _alignment ) +void KonqTextViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _alignment ) { - QColorGroup cg( _cg ); - cg.setColor(QColorGroup::Text, static_cast(listView())->colors[type]); + TQColorGroup cg( _cg ); + cg.setColor(TQColorGroup::Text, static_cast(listView())->colors[type]); // Don't do that! Keep things readable whatever the selection background color is -// cg.setColor(QColorGroup::HighlightedText, static_cast(listView())->highlight[type]); -// cg.setColor(QColorGroup::Highlight, Qt::darkGray); +// cg.setColor(TQColorGroup::HighlightedText, static_cast(listView())->highlight[type]); +// cg.setColor(TQColorGroup::Highlight, Qt::darkGray); KListViewItem::paintCell( _painter, cg, _column, _width, _alignment ); } -/*void KonqTextViewItem::paintFocus( QPainter *_p, const QColorGroup &_cg, const QRect &_r ) +/*void KonqTextViewItem::paintFocus( TQPainter *_p, const TQColorGroup &_cg, const TQRect &_r ) { listView()->style().drawFocusRect( _p, _r, _cg, isSelected() ? &_cg.highlight() : &_cg.base(), isSelected() ); - QPixmap pix( _r.width(), _r.height() ); + TQPixmap pix( _r.width(), _r.height() ); bitBlt( &pix, 0, 0, _p->device(), _r.left(), _r.top(), _r.width(), _r.height() ); - QImage im = pix.convertToImage(); + TQImage im = pix.convertToImage(); im = KImageEffect::fade( im, 0.25, Qt::black ); _p->drawImage( _r.topLeft(), im ); }*/ diff --git a/konqueror/listview/konq_textviewitem.h b/konqueror/listview/konq_textviewitem.h index 413016bea..9aeb6d6be 100644 --- a/konqueror/listview/konq_textviewitem.h +++ b/konqueror/listview/konq_textviewitem.h @@ -20,8 +20,8 @@ #ifndef __konq_textviewitem_h__ #define __konq_textviewitem_h__ -#include -#include +#include +#include #include #include #include "konq_listviewitems.h" @@ -53,12 +53,12 @@ class KonqTextViewItem : public KonqBaseListViewItem */ KonqTextViewItem( KonqTextViewWidget *_parent, KFileItem* _fileitem ); virtual ~KonqTextViewItem() {/*cerr<<"~KonqTextViewItem: "< +#include #include #include @@ -29,7 +29,7 @@ #include -KonqTextViewWidget::KonqTextViewWidget( KonqListView *parent, QWidget *parentWidget ) +KonqTextViewWidget::KonqTextViewWidget( KonqListView *parent, TQWidget *parentWidget ) :KonqBaseListViewWidget(parent,parentWidget) { kdDebug(1202) << "+KonqTextViewWidget" << endl; @@ -44,7 +44,7 @@ KonqTextViewWidget::KonqTextViewWidget( KonqListView *parent, QWidget *parentWid setRootIsDecorated(false); colors[KTVI_REGULAR]=Qt::black; - colors[KTVI_EXEC]=QColor(0,170,0); + colors[KTVI_EXEC]=TQColor(0,170,0); colors[KTVI_REGULARLINK]=Qt::black; colors[KTVI_DIR]=Qt::black; colors[KTVI_DIRLINK]=Qt::black; @@ -79,7 +79,7 @@ void KonqTextViewWidget::slotNewItems( const KFileItemList & entries ) { //kdDebug(1202) << k_funcinfo << entries.count() << endl; - for ( QPtrListIterator kit ( entries ); kit.current(); ++kit ) + for ( TQPtrListIterator kit ( entries ); kit.current(); ++kit ) { KonqTextViewItem *tmp = new KonqTextViewItem( this, *kit ); if ( !m_itemFound && tmp->text(0) == m_itemToGoTo ) @@ -88,7 +88,7 @@ void KonqTextViewWidget::slotNewItems( const KFileItemList & entries ) m_itemFound = true; } if ( !m_itemsToSelect.isEmpty() ) { - QStringList::Iterator tsit = m_itemsToSelect.find( (*kit)->name() ); + TQStringList::Iterator tsit = m_itemsToSelect.find( (*kit)->name() ); if ( tsit != m_itemsToSelect.end() ) { m_itemsToSelect.remove( tsit ); setSelected( tmp, true ); @@ -152,7 +152,7 @@ void KonqTextViewWidget::setComplete() } } -bool KonqTextViewWidget::isExecuteArea( const QPoint& point ) +bool KonqTextViewWidget::isExecuteArea( const TQPoint& point ) { if (!itemAt( point ) ) return false; @@ -168,7 +168,7 @@ bool KonqTextViewWidget::isExecuteArea( const QPoint& point ) return ( x > offset && x < ( offset + width ) ); } -/*void KonqTextViewWidget::viewportDragMoveEvent( QDragMoveEvent *_ev ) +/*void KonqTextViewWidget::viewportDragMoveEvent( TQDragMoveEvent *_ev ) { KonqBaseListViewItem *item = isNameColumn( _ev->pos() ) ? (KonqBaseListViewItem*)itemAt( _ev->pos() ) : 0L; @@ -200,7 +200,7 @@ bool KonqTextViewWidget::isExecuteArea( const QPoint& point ) } } -void KonqTextViewWidget::viewportDropEvent( QDropEvent *ev ) +void KonqTextViewWidget::viewportDropEvent( TQDropEvent *ev ) { if ( m_dirLister->url().isEmpty() ) return; diff --git a/konqueror/listview/konq_textviewwidget.h b/konqueror/listview/konq_textviewwidget.h index f799286ff..06a5cbbb5 100644 --- a/konqueror/listview/konq_textviewwidget.h +++ b/konqueror/listview/konq_textviewwidget.h @@ -34,21 +34,21 @@ class KonqTextViewWidget : public KonqBaseListViewWidget friend class KonqTextViewItem; Q_OBJECT public: - KonqTextViewWidget( KonqListView *parent, QWidget *parentWidget ); + KonqTextViewWidget( KonqListView *parent, TQWidget *parentWidget ); ~KonqTextViewWidget(); - virtual bool isExecuteArea( const QPoint& point ); + virtual bool isExecuteArea( const TQPoint& point ); protected slots: // slots connected to the directory lister virtual void setComplete(); virtual void slotNewItems( const KFileItemList & ); protected: -// bool isNameColumn(const QPoint& point ); -// virtual void viewportDragMoveEvent( QDragMoveEvent *_ev ); -// virtual void viewportDropEvent( QDropEvent *ev ); +// bool isNameColumn(const TQPoint& point ); +// virtual void viewportDragMoveEvent( TQDragMoveEvent *_ev ); +// virtual void viewportDropEvent( TQDropEvent *ev ); virtual void createColumns(); - QColor colors[11]; + TQColor colors[11]; }; #endif diff --git a/konqueror/listview/konq_treeviewitem.cc b/konqueror/listview/konq_treeviewitem.cc index 09b9d941b..32baf1c41 100644 --- a/konqueror/listview/konq_treeviewitem.cc +++ b/konqueror/listview/konq_treeviewitem.cc @@ -57,7 +57,7 @@ void KonqListViewDir::open( bool _open, bool _reload ) KFileItemList lst; lst.setAutoDelete( false ); - QListViewItem* it = firstChild(); + TQListViewItem* it = firstChild(); while ( it ) { lst.append( static_cast(it)->item() ); @@ -72,7 +72,7 @@ void KonqListViewDir::open( bool _open, bool _reload ) { treeView->stopListingSubFolder( this ); - QListViewItem* it = firstChild(); + TQListViewItem* it = firstChild(); while ( it ) { // unselect the items in the closed folder @@ -84,12 +84,12 @@ void KonqListViewDir::open( bool _open, bool _reload ) } } - QListViewItem::setOpen( _open ); + TQListViewItem::setOpen( _open ); treeView->slotOnViewport(); } } -QString KonqListViewDir::url( int _trailing ) +TQString KonqListViewDir::url( int _trailing ) { return item()->url().url( _trailing ); } diff --git a/konqueror/listview/konq_treeviewitem.h b/konqueror/listview/konq_treeviewitem.h index 5341a811a..b17adacaf 100644 --- a/konqueror/listview/konq_treeviewitem.h +++ b/konqueror/listview/konq_treeviewitem.h @@ -20,7 +20,7 @@ #ifndef __konq_treeviewitem_h__ #define __konq_treeviewitem_h__ -#include +#include #include "konq_listviewitems.h" class KFileItem; @@ -48,7 +48,7 @@ public: KonqListViewDir( KonqTreeViewWidget *_treeview, KonqListViewDir *_parent, KFileItem *_fileitem ); /** - * Called when user opens the directory (inherited from QListViewItem). + * Called when user opens the directory (inherited from TQListViewItem). * Just calls @ref #open(). */ virtual void setOpen( bool _open ); @@ -70,7 +70,7 @@ public: * URL of this directory * @param _trailing set to true for a trailing slash (see KURL) */ - QString url( int _trailing ); + TQString url( int _trailing ); protected: bool m_bComplete; diff --git a/konqueror/listview/konq_treeviewwidget.cc b/konqueror/listview/konq_treeviewwidget.cc index 67844fa3d..4d04f2fa4 100644 --- a/konqueror/listview/konq_treeviewwidget.cc +++ b/konqueror/listview/konq_treeviewwidget.cc @@ -24,10 +24,10 @@ #include #include -template class QDict; +template class TQDict; -KonqTreeViewWidget::KonqTreeViewWidget( KonqListView *parent, QWidget *parentWidget) +KonqTreeViewWidget::KonqTreeViewWidget( KonqListView *parent, TQWidget *parentWidget) : KonqBaseListViewWidget( parent, parentWidget ) { kdDebug(1202) << "+KonqTreeViewWidget" << endl; @@ -35,12 +35,12 @@ KonqTreeViewWidget::KonqTreeViewWidget( KonqListView *parent, QWidget *parentWid setRootIsDecorated( true ); setTreeStepSize( 20 ); - connect( m_dirLister, SIGNAL( completed( const KURL & ) ), - this, SLOT( slotCompleted( const KURL & ) ) ); - connect( m_dirLister, SIGNAL( clear( const KURL & ) ), - this, SLOT( slotClear( const KURL & ) ) ); - connect( m_dirLister, SIGNAL( redirection( const KURL &, const KURL & ) ), - this, SLOT( slotRedirection( const KURL &, const KURL & ) ) ); + 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 & ) ) ); } KonqTreeViewWidget::~KonqTreeViewWidget() @@ -59,7 +59,7 @@ bool KonqTreeViewWidget::openURL( const KURL &url ) if ( m_pBrowserView->extension()->urlArgs().reload ) { - QDictIterator it( m_dictSubDirs ); + TQDictIterator it( m_dictSubDirs ); for (; it.current(); ++it ) if ( it.current()->isOpen() ) m_urlsToReload.append( it.current()->url( -1 ) ); @@ -75,11 +75,11 @@ bool KonqTreeViewWidget::openURL( const KURL &url ) return KonqBaseListViewWidget::openURL( url ); } -void KonqTreeViewWidget::saveState( QDataStream &stream ) +void KonqTreeViewWidget::saveState( TQDataStream &stream ) { - QStringList openDirList; + TQStringList openDirList; - QDictIterator it( m_dictSubDirs ); + TQDictIterator it( m_dictSubDirs ); for (; it.current(); ++it ) { if ( it.current()->isOpen() ) @@ -90,7 +90,7 @@ void KonqTreeViewWidget::saveState( QDataStream &stream ) KonqBaseListViewWidget::saveState( stream ); } -void KonqTreeViewWidget::restoreState( QDataStream &stream ) +void KonqTreeViewWidget::restoreState( TQDataStream &stream ) { stream >> m_urlsToOpen; KonqBaseListViewWidget::restoreState( stream ); @@ -148,7 +148,7 @@ void KonqTreeViewWidget::slotClear( const KURL & _url ) if ( item ) { // search all subdirs of _url (item) - QDictIterator it( m_dictSubDirs ); + TQDictIterator it( m_dictSubDirs ); while ( it.current() ) { if ( !_url.equals( it.currentKey(), true ) @@ -168,7 +168,7 @@ void KonqTreeViewWidget::slotClear( const KURL & _url ) // the following code. // delete all child items, their fileitems are no longer valid - QListViewItem *child; + TQListViewItem *child; while ( (child = item->firstChild()) ) delete child; @@ -192,7 +192,7 @@ void KonqTreeViewWidget::slotNewItems( const KFileItemList &entries ) if (!entries.count()) return; // Find parent item - it's the same for all the items - QPtrListIterator kit( entries ); + TQPtrListIterator kit( entries ); KURL dir( (*kit)->url().upURL() ); KonqListViewDir *parentDir = 0L; @@ -201,7 +201,7 @@ void KonqTreeViewWidget::slotNewItems( const KFileItemList &entries ) if ( !parentDir ) // hack for zeroconf://domain/type/service listed in zeroconf:/type/ dir { - dir.setHost( QString::null ); + dir.setHost( TQString::null ); parentDir = m_dictSubDirs[ dir.url(-1) ]; } @@ -246,7 +246,7 @@ void KonqTreeViewWidget::slotNewItems( const KFileItemList &entries ) } if ( !m_itemsToSelect.isEmpty() ) { - QStringList::Iterator tsit = m_itemsToSelect.find( (*kit)->name() ); + TQStringList::Iterator tsit = m_itemsToSelect.find( (*kit)->name() ); if ( tsit != m_itemsToSelect.end() ) { m_itemsToSelect.remove( tsit ); setSelected( fileItem ? fileItem : dirItem, true ); @@ -258,7 +258,7 @@ void KonqTreeViewWidget::slotNewItems( const KFileItemList &entries ) if ( dirItem ) { - QString u = (*kit)->url().url( 0 ); + TQString u = (*kit)->url().url( 0 ); if ( m_urlsToOpen.remove( u ) ) dirItem->open( true, false ); else if ( m_urlsToReload.remove( u ) ) @@ -280,7 +280,7 @@ void KonqTreeViewWidget::slotNewItems( const KFileItemList &entries ) void KonqTreeViewWidget::slotDeleteItem( KFileItem *_fileItem ) { - QString url = _fileItem->url().url(-1); + TQString url = _fileItem->url().url(-1); // Check if this item is in m_dictSubDirs, and if yes, then remove it slotClear( _fileItem->url() ); diff --git a/konqueror/listview/konq_treeviewwidget.h b/konqueror/listview/konq_treeviewwidget.h index 86119a8bf..3f08cc3d5 100644 --- a/konqueror/listview/konq_treeviewwidget.h +++ b/konqueror/listview/konq_treeviewwidget.h @@ -21,7 +21,7 @@ #include "konq_listviewwidget.h" #include "konq_treeviewitem.h" -#include +#include #include #include @@ -34,13 +34,13 @@ class KonqTreeViewWidget : public KonqBaseListViewWidget Q_OBJECT public: - KonqTreeViewWidget( KonqListView *parent, QWidget *parentWidget ); + KonqTreeViewWidget( KonqListView *parent, TQWidget *parentWidget ); virtual ~KonqTreeViewWidget(); virtual bool openURL( const KURL &url ); - virtual void saveState( QDataStream &stream ); - virtual void restoreState( QDataStream &stream ); + virtual void saveState( TQDataStream &stream ); + virtual void restoreState( TQDataStream &stream ); protected slots: // slots connected to the directory lister @@ -53,15 +53,15 @@ protected slots: virtual void slotDeleteItem( KFileItem *_fileTtem ); protected: - KonqListViewDir *findDir( const QString &_url ); + KonqListViewDir *findDir( const TQString &_url ); void openSubFolder( KonqListViewDir *_dir, bool _reload ); void stopListingSubFolder( KonqListViewDir *_dir ); // URL -> item (for directories only) - QDict m_dictSubDirs; + TQDict m_dictSubDirs; - QStringList m_urlsToOpen, m_urlsToReload; + TQStringList m_urlsToOpen, m_urlsToReload; }; #endif -- cgit v1.2.3