summaryrefslogtreecommitdiffstats
path: root/konqueror/listview
diff options
context:
space:
mode:
Diffstat (limited to 'konqueror/listview')
-rw-r--r--konqueror/listview/konq_infolistviewitem.cc6
-rw-r--r--konqueror/listview/konq_infolistviewitem.h2
-rw-r--r--konqueror/listview/konq_infolistviewwidget.cc10
-rw-r--r--konqueror/listview/konq_infolistviewwidget.h2
-rw-r--r--konqueror/listview/konq_listview.cc20
-rw-r--r--konqueror/listview/konq_listview.h4
-rw-r--r--konqueror/listview/konq_listviewitems.cc24
-rw-r--r--konqueror/listview/konq_listviewitems.h2
-rw-r--r--konqueror/listview/konq_listviewwidget.cc72
-rw-r--r--konqueror/listview/konq_listviewwidget.h4
-rw-r--r--konqueror/listview/konq_textviewitem.cc4
-rw-r--r--konqueror/listview/konq_textviewitem.h2
-rw-r--r--konqueror/listview/konq_textviewwidget.cc6
-rw-r--r--konqueror/listview/konq_textviewwidget.h2
-rw-r--r--konqueror/listview/konq_treeviewwidget.cc6
-rw-r--r--konqueror/listview/konq_treeviewwidget.h2
16 files changed, 84 insertions, 84 deletions
diff --git a/konqueror/listview/konq_infolistviewitem.cc b/konqueror/listview/konq_infolistviewitem.cc
index 7b06a4996..842f870ec 100644
--- a/konqueror/listview/konq_infolistviewitem.cc
+++ b/konqueror/listview/konq_infolistviewitem.cc
@@ -206,7 +206,7 @@ void KonqInfoListViewItem::setDisabled( bool disabled )
setPixmap( 0, m_fileitem->pixmap( iconSize, state() ) );
}
-void KonqInfoListViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _alignment )
+void KonqInfoListViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _tqalignment )
{
TQColorGroup cg( _cg );
@@ -218,7 +218,7 @@ void KonqInfoListViewItem::paintCell( TQPainter *_painter, const TQColorGroup &
cg.setColor( TQColorGroup::Text, m_pListViewWidget->itemColor() );
KListView *lv = static_cast< KListView* >( listView() );
- const TQPixmap *pm = lv->viewport()->paletteBackgroundPixmap();
+ const TQPixmap *pm = TQT_TQPIXMAP_CONST(lv->viewport()->paletteBackgroundPixmap());
if ( _column == 0 && isSelected() && !lv->allColumnsShowFocus() )
{
int newWidth = width( lv->fontMetrics(), lv, _column );
@@ -242,7 +242,7 @@ void KonqInfoListViewItem::paintCell( TQPainter *_painter, const TQColorGroup &
_width = newWidth;
}
- KListViewItem::paintCell( _painter, cg, _column, _width, _alignment );
+ KListViewItem::paintCell( _painter, cg, _column, _width, _tqalignment );
}
void KonqInfoListViewItem::paintFocus( TQPainter * _painter, const TQColorGroup & cg, const TQRect & _r )
diff --git a/konqueror/listview/konq_infolistviewitem.h b/konqueror/listview/konq_infolistviewitem.h
index e81928118..2ba7b8067 100644
--- a/konqueror/listview/konq_infolistviewitem.h
+++ b/konqueror/listview/konq_infolistviewitem.h
@@ -56,7 +56,7 @@ class KonqInfoListViewItem : public KonqBaseListViewItem
virtual ~KonqInfoListViewItem() { }
virtual void paintCell( TQPainter *_painter, const TQColorGroup & cg,
- int column, int width, int alignment );
+ int column, int width, int tqalignment );
virtual void paintFocus( TQPainter * _painter, const TQColorGroup & cg, const TQRect & r );
virtual void updateContents();
virtual void setDisabled( bool disabled );
diff --git a/konqueror/listview/konq_infolistviewwidget.cc b/konqueror/listview/konq_infolistviewwidget.cc
index 783c6eef3..135e11a09 100644
--- a/konqueror/listview/konq_infolistviewwidget.cc
+++ b/konqueror/listview/konq_infolistviewwidget.cc
@@ -32,12 +32,12 @@
#include <tqstringlist.h>
KonqInfoListViewWidget::KonqInfoListViewWidget( KonqListView* parent,
- TQWidget* parentWidget)
- : KonqBaseListViewWidget(parent, parentWidget)
+ TQWidget* tqparentWidget)
+ : KonqBaseListViewWidget(parent, tqparentWidget)
{
m_metaInfoJob = 0;
- m_mtSelector = new KSelectAction(i18n("View &As"), 0, this,
+ m_mtSelector = new KSelectAction(i18n("View &As"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotSelectMimeType()),
parent->actionCollection(), "view_as" );
@@ -201,7 +201,7 @@ void KonqInfoListViewWidget::slotNewItems( const KFileItemList& list)
}
if ( !m_itemsToSelect.isEmpty() ) {
- TQStringList::Iterator tsit = m_itemsToSelect.find( (*kit)->name() );
+ TQStringList::Iterator tsit = m_itemsToSelect.tqfind( (*kit)->name() );
if ( tsit != m_itemsToSelect.end() ) {
m_itemsToSelect.remove( tsit );
setSelected( tmp, true );
@@ -375,7 +375,7 @@ void KonqInfoListViewWidget::determineCounts(const KFileItemList& list)
if (m_favorite.mimetype)
{
- m_mtSelector->setCurrentItem(mtlist.findIndex(m_favorite.mimetype->comment()));
+ m_mtSelector->setCurrentItem(mtlist.tqfindIndex(m_favorite.mimetype->comment()));
kdDebug(1203) << "favorite mimetype is " << m_favorite.mimetype->name() << endl;
}
createFavoriteColumns();
diff --git a/konqueror/listview/konq_infolistviewwidget.h b/konqueror/listview/konq_infolistviewwidget.h
index 5ae497ac2..46bda8b22 100644
--- a/konqueror/listview/konq_infolistviewwidget.h
+++ b/konqueror/listview/konq_infolistviewwidget.h
@@ -37,7 +37,7 @@ class KonqInfoListViewWidget : public KonqBaseListViewWidget
// friend class KonqTextViewItem;
Q_OBJECT
public:
- KonqInfoListViewWidget( KonqListView *parent, TQWidget *parentWidget );
+ KonqInfoListViewWidget( KonqListView *parent, TQWidget *tqparentWidget );
~KonqInfoListViewWidget();
const TQStringList columnKeys() {return m_columnKeys;}
diff --git a/konqueror/listview/konq_listview.cc b/konqueror/listview/konq_listview.cc
index f256e8e3b..3307073de 100644
--- a/konqueror/listview/konq_listview.cc
+++ b/konqueror/listview/konq_listview.cc
@@ -63,12 +63,12 @@ KonqListViewFactory::~KonqListViewFactory()
s_defaultViewProps = 0;
}
-KParts::Part* KonqListViewFactory::createPartObject( TQWidget *parentWidget, const char *, TQObject *parent, const char *name, const char*, const TQStringList &args )
+KParts::Part* KonqListViewFactory::createPartObject( TQWidget *tqparentWidget, const char *, TQObject *parent, const char *name, const char*, const TQStringList &args )
{
if( args.count() < 1 )
kdWarning() << "KonqListView: Missing Parameter" << endl;
- KParts::Part *obj = new KonqListView( parentWidget, parent, name, args.first() );
+ KParts::Part *obj = new KonqListView( tqparentWidget, parent, name, args.first() );
return obj;
}
@@ -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 );
- TQApplication::clipboard()->setData( urlData );
+ TQApplication::tqclipboard()->setData( urlData );
}
void ListViewBrowserExtension::paste()
@@ -169,11 +169,11 @@ void ListViewBrowserExtension::rename()
const TQString txt = le->text();
TQString pattern;
KMimeType::diagnoseFileName( txt, pattern );
- if (!pattern.isEmpty() && pattern.at(0)=='*' && pattern.find('*',1)==-1)
+ if (!pattern.isEmpty() && pattern.at(0)=='*' && pattern.tqfind('*',1)==-1)
le->setSelection(0, txt.length()-pattern.stripWhiteSpace().length()+1);
else
{
- int lastDot = txt.findRev('.');
+ int lastDot = txt.tqfindRev('.');
if (lastDot > 0)
le->setSelection(0, lastDot);
}
@@ -216,7 +216,7 @@ void ListViewBrowserExtension::editMimeType()
KonqOperations::editMimeType( items.first()->mimetype() );
}
-KonqListView::KonqListView( TQWidget *parentWidget, TQObject *parent, const char *name, const TQString& mode )
+KonqListView::KonqListView( TQWidget *tqparentWidget, TQObject *parent, const char *name, const TQString& mode )
: KonqDirPart( parent, name )
,m_headerTimer(0)
{
@@ -234,25 +234,25 @@ KonqListView::KonqListView( TQWidget *parentWidget, TQObject *parent, const char
{
kdDebug(1202) << "Creating KonqTextViewWidget" << endl;
xmlFile = "konq_textview.rc";
- m_pListView=new KonqTextViewWidget(this, parentWidget);
+ m_pListView=new KonqTextViewWidget(this, tqparentWidget);
}
else if (mode=="MixedTree")
{
kdDebug(1202) << "Creating KonqTreeViewWidget" << endl;
xmlFile = "konq_treeview.rc";
- m_pListView=new KonqTreeViewWidget(this,parentWidget);
+ m_pListView=new KonqTreeViewWidget(this,tqparentWidget);
}
else if (mode=="InfoListView")
{
kdDebug(1202) << "Creating KonqInfoListViewWidget" << endl;
xmlFile = "konq_infolistview.rc";
- m_pListView=new KonqInfoListViewWidget(this,parentWidget);
+ m_pListView=new KonqInfoListViewWidget(this,tqparentWidget);
}
else
{
kdDebug(1202) << "Creating KonqDetailedListViewWidget" << endl;
xmlFile = "konq_detailedlistview.rc";
- m_pListView = new KonqBaseListViewWidget( this, parentWidget);
+ m_pListView = new KonqBaseListViewWidget( this, tqparentWidget);
}
setWidget( m_pListView );
setDirLister( m_pListView->m_dirLister );
diff --git a/konqueror/listview/konq_listview.h b/konqueror/listview/konq_listview.h
index 8665160d3..0fc8f0340 100644
--- a/konqueror/listview/konq_listview.h
+++ b/konqueror/listview/konq_listview.h
@@ -44,7 +44,7 @@ public:
KonqListViewFactory();
virtual ~KonqListViewFactory();
- virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *, TQObject *parent, const char *name, const char*, const TQStringList &args );
+ virtual KParts::Part* createPartObject( TQWidget *tqparentWidget, 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( TQWidget *parentWidget, TQObject *parent, const char *name, const TQString& mode );
+ KonqListView( TQWidget *tqparentWidget, TQObject *parent, const char *name, const TQString& mode );
virtual ~KonqListView();
virtual const KFileItem * currentItem();
diff --git a/konqueror/listview/konq_listviewitems.cc b/konqueror/listview/konq_listviewitems.cc
index 3c70f1fb0..a66dbb06c 100644
--- a/konqueror/listview/konq_listviewitems.cc
+++ b/konqueror/listview/konq_listviewitems.cc
@@ -144,7 +144,7 @@ void KonqListViewItem::updateContents()
const TQString entryStr = retrieveExtraEntry( m_fileitem, numExtra );
if ( tmpColumn->type == TQVariant::DateTime )
{
- TQDateTime dt = TQDateTime::fromString( entryStr, Qt::ISODate );
+ TQDateTime dt = TQT_TQDATETIME_OBJECT(TQDateTime::fromString( entryStr, Qt::ISODate ));
setText(tmpColumn->displayInColumn,
KGlobal::locale()->formatDateTime(dt));
}
@@ -173,7 +173,7 @@ void KonqListViewItem::setActive( bool active )
if ( m_bActive == active )
return;
- //#### Optimize away repaint if possible, like the iconview does?
+ //#### Optimize away tqrepaint if possible, like the iconview does?
KonqBaseListViewItem::setActive( active );
int iconSize = m_pListViewWidget->iconSize();
iconSize = iconSize ? iconSize : KGlobal::iconLoader()->currentSize( KIcon::Small ); // Default = small
@@ -203,7 +203,7 @@ void KonqListViewItem::setPixmap( int column, const TQPixmap& pm )
int newWidth = pm.isNull() ? 0 : pm.width();
int newHeight = pm.isNull() ? 0 : pm.height();
- // If the height or width have changed then we're going to have to repaint
+ // If the height or width have changed then we're going to have to tqrepaint
// this whole thing. Fortunately since most of the calls are coming from
// setActive() this is the uncommon case.
@@ -211,12 +211,12 @@ void KonqListViewItem::setPixmap( int column, const TQPixmap& pm )
{
setup();
widthChanged( column );
- invalidateHeight();
+ tqinvalidateHeight();
return;
}
// If we're just replacing the icon with another one its size -- i.e. a
- // "highlighted" icon, don't bother repainting the whole widget.
+ // "highlighted" icon, don't bother tqrepainting the whole widget.
TQListView *lv = m_pListViewWidget;
@@ -225,7 +225,7 @@ void KonqListViewItem::setPixmap( int column, const TQPixmap& pm )
int y = lv->itemPos( this );
int w = newWidth;
int h = height();
- lv->repaintContents( x, y, w, h );
+ lv->tqrepaintContents( x, y, w, h );
}
const TQPixmap* KonqListViewItem::pixmap( int column ) const
@@ -275,9 +275,9 @@ int KonqBaseListViewItem::compare( TQListViewItem* item, int col, bool ascending
{
if ( cInfo->type & TQVariant::DateTime ) {
const TQString entryStr1 = retrieveExtraEntry( m_fileitem, numExtra );
- TQDateTime dt1 = TQDateTime::fromString( entryStr1, Qt::ISODate );
+ TQDateTime dt1 = TQT_TQDATETIME_OBJECT(TQDateTime::fromString( entryStr1, Qt::ISODate ));
const TQString entryStr2 = retrieveExtraEntry( k->m_fileitem, numExtra );
- TQDateTime dt2 = TQDateTime::fromString( entryStr2, Qt::ISODate );
+ TQDateTime dt2 = TQT_TQDATETIME_OBJECT(TQDateTime::fromString( entryStr2, Qt::ISODate ));
return ( dt1 > dt2 ) ? 1 : ( dt1 < dt2 ) ? -1 : 0;
}
}
@@ -294,7 +294,7 @@ int KonqBaseListViewItem::compare( TQListViewItem* item, int col, bool ascending
}
}
-void KonqListViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _alignment )
+void KonqListViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _tqalignment )
{
TQColorGroup cg( _cg );
@@ -306,7 +306,7 @@ void KonqListViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg,
cg.setColor( TQColorGroup::Text, m_pListViewWidget->itemColor() );
KListView *lv = static_cast< KListView* >( listView() );
- const TQPixmap *pm = lv->viewport()->paletteBackgroundPixmap();
+ const TQPixmap *pm = TQT_TQPIXMAP_CONST(lv->viewport()->paletteBackgroundPixmap());
if ( _column == 0 && isSelected() && !lv->allColumnsShowFocus() )
{
int newWidth = width( lv->fontMetrics(), lv, _column );
@@ -330,7 +330,7 @@ void KonqListViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg,
_width = newWidth;
}
- KListViewItem::paintCell( _painter, cg, _column, _width, _alignment );
+ KListViewItem::paintCell( _painter, cg, _column, _width, _tqalignment );
}
void KonqListViewItem::paintFocus( TQPainter * _painter, const TQColorGroup & cg, const TQRect & _r )
@@ -421,7 +421,7 @@ KonqBaseListViewItem::~KonqBaseListViewItem()
TQRect KonqBaseListViewItem::rect() const
{
- TQRect r = m_pListViewWidget->itemRect(this);
+ TQRect r = m_pListViewWidget->tqitemRect(this);
return TQRect( m_pListViewWidget->viewportToContents( r.topLeft() ), TQSize( r.width(), r.height() ) );
}
diff --git a/konqueror/listview/konq_listviewitems.h b/konqueror/listview/konq_listviewitems.h
index b54f1c2db..8e78b10f0 100644
--- a/konqueror/listview/konq_listviewitems.h
+++ b/konqueror/listview/konq_listviewitems.h
@@ -107,7 +107,7 @@ class KonqListViewItem : public KonqBaseListViewItem
virtual ~KonqListViewItem();
virtual void paintCell( TQPainter *_painter, const TQColorGroup & cg,
- int column, int width, int alignment );
+ int column, int width, int tqalignment );
virtual void paintFocus( TQPainter * _painter, const TQColorGroup & cg, const TQRect & r );
virtual void updateContents();
virtual void setDisabled( bool disabled );
diff --git a/konqueror/listview/konq_listviewwidget.cc b/konqueror/listview/konq_listviewwidget.cc
index 8f166af0a..d61518767 100644
--- a/konqueror/listview/konq_listviewwidget.cc
+++ b/konqueror/listview/konq_listviewwidget.cc
@@ -84,8 +84,8 @@ void ColumnInfo::setData(const TQString& n, const TQString& desktopName, int kio
}
-KonqBaseListViewWidget::KonqBaseListViewWidget( KonqListView *parent, TQWidget *parentWidget)
- : KListView(parentWidget)
+KonqBaseListViewWidget::KonqBaseListViewWidget( KonqListView *parent, TQWidget *tqparentWidget)
+ : KListView(tqparentWidget)
,sortedByColumn(0)
,m_pBrowserView(parent)
,m_dirLister(new KDirLister( true /*m_showIcons==false*/))
@@ -107,7 +107,7 @@ KonqBaseListViewWidget::KonqBaseListViewWidget( KonqListView *parent, TQWidget *
{
kdDebug(1202) << "+KonqBaseListViewWidget" << endl;
- m_dirLister->setMainWindow(topLevelWidget());
+ m_dirLister->setMainWindow(tqtopLevelWidget());
m_bTopLevelComplete = true;
@@ -169,8 +169,8 @@ KonqBaseListViewWidget::KonqBaseListViewWidget( KonqListView *parent, TQWidget *
connect( header(), TQT_SIGNAL(sizeChange( int, int, int )), TQT_SLOT(slotUpdateBackground()) );
viewport()->setMouseTracking( true );
- viewport()->setFocusPolicy( TQWidget::WheelFocus );
- setFocusPolicy( TQWidget::WheelFocus );
+ viewport()->setFocusPolicy( TQ_WheelFocus );
+ setFocusPolicy( TQ_WheelFocus );
setAcceptDrops( true );
//looks better with the statusbar
@@ -228,7 +228,7 @@ void KonqBaseListViewWidget::readProtocolConfig( const KURL & url )
for ( int num = 1; extraFieldsIt != extraFields.end(); ++extraFieldsIt, ++num )
{
const TQString column = (*extraFieldsIt).name;
- if ( lstColumns.find(column) == lstColumns.end() )
+ if ( lstColumns.tqfind(column) == lstColumns.end() )
lstColumns << column;
const TQString type = (*extraFieldsIt).type; // ## TODO use when sorting
TQVariant::Type t = TQVariant::Invalid;
@@ -325,7 +325,7 @@ void KonqBaseListViewWidget::readProtocolConfig( const KURL & url )
continue;
}
- TQStringList::Iterator listIt = listingList.find( confColumns[i].desktopFileName );
+ TQStringList::Iterator listIt = listingList.tqfind( confColumns[i].desktopFileName );
if ( listIt == listingList.end() ) // not found -> hide
{
//move all columns behind one to the front
@@ -410,7 +410,7 @@ void KonqBaseListViewWidget::contentsMousePressEvent( TQMouseEvent *e )
TQRect r( m_rubber->normalize() );
delete m_rubber;
m_rubber = 0;
- repaintContents( r, FALSE );
+ tqrepaintContents( r, FALSE );
}
delete m_selected;
@@ -424,14 +424,14 @@ void KonqBaseListViewWidget::contentsMousePressEvent( TQMouseEvent *e )
KListView::contentsMousePressEvent( e );
}
else {
- if ( e->button() == LeftButton )
+ if ( e->button() == Qt::LeftButton )
{
m_rubber = new TQRect( e->x(), e->y(), 0, 0 );
clearSelection();
emit selectionChanged();
m_fileTip->setItem( 0 );
}
- if ( e->button() != RightButton )
+ if ( e->button() != Qt::RightButton )
TQListView::contentsMousePressEvent( e );
}
// Store list of selected items at mouse-press time.
@@ -448,7 +448,7 @@ void KonqBaseListViewWidget::contentsMouseReleaseEvent( TQMouseEvent *e )
TQRect r( m_rubber->normalize() );
delete m_rubber;
m_rubber = 0;
- repaintContents( r, FALSE );
+ tqrepaintContents( r, FALSE );
}
if ( m_scrollTimer )
@@ -489,7 +489,7 @@ void KonqBaseListViewWidget::contentsMouseMoveEvent( TQMouseEvent *e )
emit m_pBrowserView->setStatusBarText( item->item()->getStatusBarInfo() );
m_pBrowserView->emitMouseOver( item->item() );
- vp.setY( itemRect( item ).y() );
+ vp.setY( tqitemRect( item ).y() );
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() ) );
@@ -551,9 +551,9 @@ void KonqBaseListViewWidget::drawRubber( TQPainter *p )
TQPoint pt( m_rubber->x(), m_rubber->y() );
pt = contentsToViewport( pt );
- style().drawPrimitive( TQStyle::PE_RubberBand, p,
+ tqstyle().tqdrawPrimitive( TQStyle::PE_RubberBand, p,
TQRect( pt.x(), pt.y(), m_rubber->width(), m_rubber->height() ),
- colorGroup(), TQStyle::Style_Default, colorGroup().base() );
+ tqcolorGroup(), TQStyle::Style_Default, tqcolorGroup().base() );
}
@@ -591,9 +591,9 @@ void KonqBaseListViewWidget::slotAutoScroll()
{
TQRect rect;
if ( allColumnsShowFocus() )
- rect = itemRect( cur );
+ rect = tqitemRect( cur );
else {
- rect = itemRect( cur );
+ rect = tqitemRect( cur );
rect.setWidth( executeArea( cur ) );
}
@@ -623,7 +623,7 @@ void KonqBaseListViewWidget::slotAutoScroll()
{
setSelected( cur, true );
changed = TRUE;
- rr = rr.unite( itemRect( cur ) );
+ rr = rr.unite( tqitemRect( cur ) );
}
}
else
@@ -631,10 +631,10 @@ void KonqBaseListViewWidget::slotAutoScroll()
if ( cur->isSelected() )
{
changed = TRUE;
- rr = rr.unite( itemRect( cur ) );
+ rr = rr.unite( tqitemRect( cur ) );
}
- if ( !m_selected || !m_selected->contains( (KonqBaseListViewItem*)cur ) )
+ if ( !m_selected || !m_selected->tqcontains( (KonqBaseListViewItem*)cur ) )
{
setSelected( cur, false );
}
@@ -659,7 +659,7 @@ void KonqBaseListViewWidget::slotAutoScroll()
{
setSelected( cur, true );
changed = TRUE;
- rr = rr.unite( itemRect( cur ) );
+ rr = rr.unite( tqitemRect( cur ) );
}
}
else
@@ -667,10 +667,10 @@ void KonqBaseListViewWidget::slotAutoScroll()
if ( cur->isSelected() )
{
changed = TRUE;
- rr = rr.unite( itemRect( cur ) );
+ rr = rr.unite( tqitemRect( cur ) );
}
- if ( !m_selected || !m_selected->contains( (KonqBaseListViewItem*)cur ) )
+ if ( !m_selected || !m_selected->tqcontains( (KonqBaseListViewItem*)cur ) )
{
setSelected( cur, false );
}
@@ -718,7 +718,7 @@ void KonqBaseListViewWidget::slotAutoScroll()
if ( !TQRect( scroll_margin, scroll_margin,
viewport()->width() - 2*scroll_margin,
- viewport()->height() - 2*scroll_margin ).contains( pos ) )
+ viewport()->height() - 2*scroll_margin ).tqcontains( pos ) )
{
if ( !m_scrollTimer )
{
@@ -762,7 +762,7 @@ void KonqBaseListViewWidget::viewportDragMoveEvent( TQDragMoveEvent *_ev )
// Unselect previous drag-over-item
if ( m_dragOverItem && m_dragOverItem != item )
- if ( !m_selected || !m_selected->contains( m_dragOverItem ) )
+ if ( !m_selected || !m_selected->tqcontains( m_dragOverItem ) )
setSelected( m_dragOverItem, false );
if ( !item )
@@ -900,7 +900,7 @@ void KonqBaseListViewWidget::slotSelectionChanged()
void KonqBaseListViewWidget::slotMouseButtonClicked2( int _button,
TQListViewItem *_item, const TQPoint& pos, int )
{
- if ( _button == MidButton )
+ if ( _button == Qt::MidButton )
{
if ( _item && isExecuteArea( viewport()->mapFromGlobal(pos) ) )
m_pBrowserView->mmbClicked( static_cast<KonqBaseListViewItem *>(_item)->item() );
@@ -985,17 +985,17 @@ void KonqBaseListViewWidget::slotReturnPressed( TQListViewItem *_item )
if (_item->pixmap(0) != 0)
{
// Rect of the QListViewItem's pixmap area.
- TQRect rect = _item->listView()->itemRect(_item);
+ TQRect rect = _item->listView()->tqitemRect(_item);
// calculate nesting depth
int nestingDepth = 0;
- for (TQListViewItem *currentItem = _item->parent();
+ for (TQListViewItem *currentItem = _item->tqparent();
currentItem != 0;
- currentItem = currentItem->parent())
+ currentItem = currentItem->tqparent())
nestingDepth++;
// no parent no indent
- if (_item->parent() == 0)
+ if (_item->tqparent() == 0)
nestingDepth = 0;
// Root decoration means additional indent
@@ -1111,7 +1111,7 @@ bool KonqBaseListViewWidget::openURL( const KURL &url )
args.yOffset = contentsY();
m_pBrowserView->extension()->setURLArgs( args );
- if ( currentItem() && itemRect( currentItem() ).isValid() )
+ if ( currentItem() && tqitemRect( currentItem() ).isValid() )
m_itemToGoTo = currentItem()->text(0);
m_pBrowserView->m_filesToSelect.clear();
@@ -1255,7 +1255,7 @@ void KonqBaseListViewWidget::slotNewItems( const KFileItemList & entries )
m_itemFound = true;
}
if ( !m_itemsToSelect.isEmpty() ) {
- TQStringList::Iterator tsit = m_itemsToSelect.find( (*kit)->name() );
+ TQStringList::Iterator tsit = m_itemsToSelect.tqfind( (*kit)->name() );
if ( tsit != m_itemsToSelect.end() ) {
m_itemsToSelect.remove( tsit );
setSelected( tmp, true );
@@ -1371,13 +1371,13 @@ KonqBaseListViewWidget::iterator& KonqBaseListViewWidget::iterator::operator++()
m_p = i;
return *this;
}
- m_p = (KonqBaseListViewItem *)m_p->parent();
+ m_p = (KonqBaseListViewItem *)m_p->tqparent();
while ( m_p )
{
if ( m_p->nextSibling() )
break;
- m_p = (KonqBaseListViewItem *)m_p->parent();
+ m_p = (KonqBaseListViewItem *)m_p->tqparent();
}
if ( m_p )
@@ -1402,13 +1402,13 @@ KonqBaseListViewWidget::iterator KonqBaseListViewWidget::iterator::operator++(in
m_p = i;
return it;
}
- m_p = (KonqBaseListViewItem *)m_p->parent();
+ m_p = (KonqBaseListViewItem *)m_p->tqparent();
while ( m_p )
{
if ( m_p->nextSibling() )
break;
- m_p = (KonqBaseListViewItem *)m_p->parent();
+ m_p = (KonqBaseListViewItem *)m_p->tqparent();
}
if ( m_p )
@@ -1418,7 +1418,7 @@ KonqBaseListViewWidget::iterator KonqBaseListViewWidget::iterator::operator++(in
void KonqBaseListViewWidget::paintEmptyArea( TQPainter *p, const TQRect &r )
{
- const TQPixmap *pm = viewport()->paletteBackgroundPixmap();
+ const TQPixmap *pm = TQT_TQPIXMAP_CONST(viewport()->paletteBackgroundPixmap());
if (!pm || pm->isNull())
p->fillRect(r, viewport()->backgroundColor());
diff --git a/konqueror/listview/konq_listviewwidget.h b/konqueror/listview/konq_listviewwidget.h
index d6123c11f..7d57c202f 100644
--- a/konqueror/listview/konq_listviewwidget.h
+++ b/konqueror/listview/konq_listviewwidget.h
@@ -81,7 +81,7 @@ class KonqBaseListViewWidget : public KListView
Q_OBJECT
public:
- KonqBaseListViewWidget( KonqListView *parent, TQWidget *parentWidget );
+ KonqBaseListViewWidget( KonqListView *parent, TQWidget *tqparentWidget );
virtual ~KonqBaseListViewWidget();
unsigned int NumberOfAtoms;
@@ -176,7 +176,7 @@ protected slots:
virtual void slotRedirection( const KURL & );
void slotPopupMenu( TQListViewItem *, const TQPoint&, int );
- // forces a repaint on column size changes / branch expansion
+ // forces a tqrepaint on column size changes / branch expansion
// when there is a background pixmap
void slotUpdateBackground();
diff --git a/konqueror/listview/konq_textviewitem.cc b/konqueror/listview/konq_textviewitem.cc
index 8e03e171e..0d40ecfce 100644
--- a/konqueror/listview/konq_textviewitem.cc
+++ b/konqueror/listview/konq_textviewitem.cc
@@ -200,7 +200,7 @@ void KonqTextViewItem::updateContents()
};
}
-void KonqTextViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _alignment )
+void KonqTextViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _tqalignment )
{
TQColorGroup cg( _cg );
cg.setColor(TQColorGroup::Text, static_cast<KonqTextViewWidget *>(listView())->colors[type]);
@@ -208,7 +208,7 @@ void KonqTextViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg,
// cg.setColor(TQColorGroup::HighlightedText, static_cast<KonqTextViewWidget *>(listView())->highlight[type]);
// cg.setColor(TQColorGroup::Highlight, Qt::darkGray);
- KListViewItem::paintCell( _painter, cg, _column, _width, _alignment );
+ KListViewItem::paintCell( _painter, cg, _column, _width, _tqalignment );
}
/*void KonqTextViewItem::paintFocus( TQPainter *_p, const TQColorGroup &_cg, const TQRect &_r )
diff --git a/konqueror/listview/konq_textviewitem.h b/konqueror/listview/konq_textviewitem.h
index f091781e2..02a534688 100644
--- a/konqueror/listview/konq_textviewitem.h
+++ b/konqueror/listview/konq_textviewitem.h
@@ -57,7 +57,7 @@ class KonqTextViewItem : public KonqBaseListViewItem
// virtual TQString key( int _column, bool asc) const;
/** Call this before destroying the text view (decreases reference count
* on the view)*/
- virtual void paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _alignment );
+ virtual void paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _tqalignment );
// virtual void paintFocus( TQPainter *_painter, const TQColorGroup & _cg, const TQRect & r );
virtual void updateContents();
diff --git a/konqueror/listview/konq_textviewwidget.cc b/konqueror/listview/konq_textviewwidget.cc
index 32de25351..f3e9140d3 100644
--- a/konqueror/listview/konq_textviewwidget.cc
+++ b/konqueror/listview/konq_textviewwidget.cc
@@ -29,8 +29,8 @@
#include <assert.h>
-KonqTextViewWidget::KonqTextViewWidget( KonqListView *parent, TQWidget *parentWidget )
-:KonqBaseListViewWidget(parent,parentWidget)
+KonqTextViewWidget::KonqTextViewWidget( KonqListView *parent, TQWidget *tqparentWidget )
+:KonqBaseListViewWidget(parent,tqparentWidget)
{
kdDebug(1202) << "+KonqTextViewWidget" << endl;
m_filenameColumn=1;
@@ -88,7 +88,7 @@ void KonqTextViewWidget::slotNewItems( const KFileItemList & entries )
m_itemFound = true;
}
if ( !m_itemsToSelect.isEmpty() ) {
- TQStringList::Iterator tsit = m_itemsToSelect.find( (*kit)->name() );
+ TQStringList::Iterator tsit = m_itemsToSelect.tqfind( (*kit)->name() );
if ( tsit != m_itemsToSelect.end() ) {
m_itemsToSelect.remove( tsit );
setSelected( tmp, true );
diff --git a/konqueror/listview/konq_textviewwidget.h b/konqueror/listview/konq_textviewwidget.h
index 06a5cbbb5..5596e4d23 100644
--- a/konqueror/listview/konq_textviewwidget.h
+++ b/konqueror/listview/konq_textviewwidget.h
@@ -34,7 +34,7 @@ class KonqTextViewWidget : public KonqBaseListViewWidget
friend class KonqTextViewItem;
Q_OBJECT
public:
- KonqTextViewWidget( KonqListView *parent, TQWidget *parentWidget );
+ KonqTextViewWidget( KonqListView *parent, TQWidget *tqparentWidget );
~KonqTextViewWidget();
virtual bool isExecuteArea( const TQPoint& point );
diff --git a/konqueror/listview/konq_treeviewwidget.cc b/konqueror/listview/konq_treeviewwidget.cc
index 4d04f2fa4..5fefc8133 100644
--- a/konqueror/listview/konq_treeviewwidget.cc
+++ b/konqueror/listview/konq_treeviewwidget.cc
@@ -27,8 +27,8 @@
template class TQDict<KonqListViewDir>;
-KonqTreeViewWidget::KonqTreeViewWidget( KonqListView *parent, TQWidget *parentWidget)
- : KonqBaseListViewWidget( parent, parentWidget )
+KonqTreeViewWidget::KonqTreeViewWidget( KonqListView *parent, TQWidget *tqparentWidget)
+ : KonqBaseListViewWidget( parent, tqparentWidget )
{
kdDebug(1202) << "+KonqTreeViewWidget" << endl;
@@ -246,7 +246,7 @@ void KonqTreeViewWidget::slotNewItems( const KFileItemList &entries )
}
if ( !m_itemsToSelect.isEmpty() ) {
- TQStringList::Iterator tsit = m_itemsToSelect.find( (*kit)->name() );
+ TQStringList::Iterator tsit = m_itemsToSelect.tqfind( (*kit)->name() );
if ( tsit != m_itemsToSelect.end() ) {
m_itemsToSelect.remove( tsit );
setSelected( fileItem ? fileItem : dirItem, true );
diff --git a/konqueror/listview/konq_treeviewwidget.h b/konqueror/listview/konq_treeviewwidget.h
index 3f08cc3d5..8ced17e6b 100644
--- a/konqueror/listview/konq_treeviewwidget.h
+++ b/konqueror/listview/konq_treeviewwidget.h
@@ -34,7 +34,7 @@ class KonqTreeViewWidget : public KonqBaseListViewWidget
Q_OBJECT
public:
- KonqTreeViewWidget( KonqListView *parent, TQWidget *parentWidget );
+ KonqTreeViewWidget( KonqListView *parent, TQWidget *tqparentWidget );
virtual ~KonqTreeViewWidget();
virtual bool openURL( const KURL &url );