summaryrefslogtreecommitdiffstats
path: root/chalk/ui/layerlist.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'chalk/ui/layerlist.cpp')
-rw-r--r--chalk/ui/layerlist.cpp70
1 files changed, 35 insertions, 35 deletions
diff --git a/chalk/ui/layerlist.cpp b/chalk/ui/layerlist.cpp
index 6f7cb4e2..96e1e032 100644
--- a/chalk/ui/layerlist.cpp
+++ b/chalk/ui/layerlist.cpp
@@ -83,7 +83,7 @@ public:
KPopupMenu contextMenu;
LayerToolTip *tooltip;
- Private( TQWidget *tqparent, LayerList *list );
+ Private( TQWidget *parent, LayerList *list );
~Private();
};
@@ -113,8 +113,8 @@ class LayerToolTip: public TQToolTip, public TQFrame
TQImage m_img;
public:
- LayerToolTip( TQWidget *tqparent, LayerList *list )
- : TQToolTip( tqparent ),
+ LayerToolTip( TQWidget *parent, LayerList *list )
+ : TQToolTip( parent ),
TQFrame( 0, 0, WStyle_Customize | WStyle_NoBorder | WStyle_Tool | WStyle_StaysOnTop | WX11BypassWM | WNoAutoErase ),
m_list( list )
{
@@ -257,9 +257,9 @@ public:
}
};
-LayerList::Private::Private( TQWidget *tqparent, LayerList *list )
+LayerList::Private::Private( TQWidget *parent, LayerList *list )
: activeLayer( 0 ), foldersCanBeActive( false ), previewsShown( false ), itemHeight( 32 ),
- tooltip( new LayerToolTip( tqparent, list ) ) { }
+ tooltip( new LayerToolTip( parent, list ) ) { }
LayerList::Private::~Private()
{
@@ -280,8 +280,8 @@ static TQSize iconSize() { return TQIconSet::iconSize( TQIconSet::Small ); }
// LayerList //
///////////////
-LayerList::LayerList( TQWidget *tqparent, const char *name )
- : super( tqparent, name ), d( new Private( viewport(), this ) )
+LayerList::LayerList( TQWidget *parent, const char *name )
+ : super( parent, name ), d( new Private( viewport(), this ) )
{
setSelectionMode( TQListView::Extended );
setRootIsDecorated( true );
@@ -609,10 +609,10 @@ LayerItem *LayerList::addLayer( const TQString &displayName, int afterID, int id
}
//SLOT
-LayerItem *LayerList::addLayerToParent( const TQString &displayName, LayerItem *tqparent, LayerItem *after, int id )
+LayerItem *LayerList::addLayerToParent( const TQString &displayName, LayerItem *parent, LayerItem *after, int id )
{
- if( tqparent && tqparent->isFolder() )
- return tqparent->addLayer( displayName, after, id );
+ if( parent && parent->isFolder() )
+ return parent->addLayer( displayName, after, id );
else
return 0;
}
@@ -622,23 +622,23 @@ LayerItem *LayerList::addLayerToParent( const TQString &displayName, int parentI
return addLayerToParent( displayName, folder( parentID ), layer( afterID ), id );
}
-void LayerList::moveLayer( LayerItem *layer, LayerItem *tqparent, LayerItem *after ) //SLOT
+void LayerList::moveLayer( LayerItem *layer, LayerItem *parent, LayerItem *after ) //SLOT
{
if( !layer )
return;
- if( tqparent && !tqparent->isFolder() )
- tqparent = 0;
+ if( parent && !parent->isFolder() )
+ parent = 0;
- if( layer->tqparent() == tqparent && layer->prevSibling() == after )
+ if( layer->parent() == parent && layer->prevSibling() == after )
return;
TQListViewItem *current = currentItem();
- moveItem( layer, tqparent, after );
+ moveItem( layer, parent, after );
- emit layerMoved( layer, tqparent, after );
- emit layerMoved( layer->id(), tqparent ? tqparent->id() : -1, after ? after->id() : -1 );
+ emit layerMoved( layer, parent, after );
+ emit layerMoved( layer->id(), parent ? parent->id() : -1, after ? after->id() : -1 );
setCurrentItem( current ); //HACK, sometimes TQt changes this under us
}
@@ -694,16 +694,16 @@ void LayerList::contentsMouseDoubleClickEvent( TQMouseEvent *e )
}
}
-void LayerList::findDrop( const TQPoint &pos, TQListViewItem *&tqparent, TQListViewItem *&after )
+void LayerList::findDrop( const TQPoint &pos, TQListViewItem *&parent, TQListViewItem *&after )
{
LayerItem *item = static_cast<LayerItem*>( itemAt( contentsToViewport( pos ) ) );
if( item && item->isFolder() )
{
- tqparent = item;
+ parent = item;
after = 0;
}
else
- super::findDrop( pos, tqparent, after );
+ super::findDrop( pos, parent, after );
}
void LayerList::showContextMenu()
@@ -748,22 +748,22 @@ void LayerList::menuActivated( int id, LayerItem *layer )
{
const TQValueList<LayerItem*> selected = selectedLayers();
- LayerItem *tqparent = ( layer && layer->isFolder() ) ? layer : 0;
+ LayerItem *parent = ( layer && layer->isFolder() ) ? layer : 0;
LayerItem *after = 0;
- if( layer && !tqparent )
+ if( layer && !parent )
{
- tqparent = layer->tqparent();
+ parent = layer->parent();
after = layer->prevSibling();
}
switch( id )
{
case MenuItems::NewLayer:
- emit requestNewLayer( tqparent, after );
- emit requestNewLayer( tqparent ? tqparent->id() : -1, after ? after->id() : -1 );
+ emit requestNewLayer( parent, after );
+ emit requestNewLayer( parent ? parent->id() : -1, after ? after->id() : -1 );
break;
case MenuItems::NewFolder:
- emit requestNewFolder( tqparent, after );
- emit requestNewFolder( tqparent ? tqparent->id() : -1, after ? after->id() : -1 );
+ emit requestNewFolder( parent, after );
+ emit requestNewFolder( parent ? parent->id() : -1, after ? after->id() : -1 );
break;
case MenuItems::RemoveLayer:
{
@@ -810,11 +810,11 @@ void LayerList::slotItemMoved( TQPtrList<TQListViewItem> &items, TQPtrList<TQLis
if( !l )
continue;
- if( l->tqparent() )
- l->tqparent()->setOpen( true );
+ if( l->parent() )
+ l->parent()->setOpen( true );
- emit layerMoved( l, l->tqparent(), a );
- emit layerMoved( l->id(), l->tqparent() ? l->tqparent()->id() : -1, a ? a->id() : -1 );
+ emit layerMoved( l, l->parent(), a );
+ emit layerMoved( l->id(), l->parent() ? l->parent()->id() : -1, a ? a->id() : -1 );
}
}
@@ -861,8 +861,8 @@ void LayerItem::init()
for( int i = 0, n = listView()->d->properties.count(); i < n; ++i )
d->properties.append( listView()->d->properties[i].defaultValue );
- if( tqparent())
- tqparent()->setOpen( true );
+ if( parent())
+ parent()->setOpen( true );
}
LayerItem::~LayerItem()
@@ -996,7 +996,7 @@ LayerItem *LayerItem::addLayer( const TQString &displayName, LayerItem *after, i
LayerItem *LayerItem::prevSibling() const
{
- LayerItem *item = tqparent() ? tqparent()->firstChild() : listView()->firstChild();
+ LayerItem *item = parent() ? parent()->firstChild() : listView()->firstChild();
if( !item || this == item )
return 0;
for(; item && this != item->nextSibling(); item = item->nextSibling() );
@@ -1319,7 +1319,7 @@ LayerList *LayerItem::listView() const { return static_cast<LayerList*>( super::
void LayerItem::update() const { listView()->repaintItem( this ); }
LayerItem *LayerItem::firstChild() const { return static_cast<LayerItem*>( super::firstChild() ); }
LayerItem *LayerItem::nextSibling() const { return static_cast<LayerItem*>( super::nextSibling() ); }
-LayerItem *LayerItem::tqparent() const { return static_cast<LayerItem*>( super::tqparent() ); }
+LayerItem *LayerItem::parent() const { return static_cast<LayerItem*>( super::parent() ); }
#include "layerlist.moc"