summaryrefslogtreecommitdiffstats
path: root/kommander/editor/layout.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kommander/editor/layout.cpp')
-rw-r--r--kommander/editor/layout.cpp78
1 files changed, 39 insertions, 39 deletions
diff --git a/kommander/editor/layout.cpp b/kommander/editor/layout.cpp
index 8c35f8e6..84e4dabb 100644
--- a/kommander/editor/layout.cpp
+++ b/kommander/editor/layout.cpp
@@ -116,7 +116,7 @@ void Layout::setup()
// we leave here.
if ( !lastList || ( lastList->count() < 2 &&
( !layoutBase ||
- ( !WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf(TQT_TQOBJECT( layoutBase )) ) ) &&
+ ( !WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( layoutBase ) ) ) &&
layoutBase != formWindow->mainContainer() ) )
) ) {
widgets.clear();
@@ -134,8 +134,8 @@ void Layout::setup()
// widgets to get informed if one gets deleted to be able to
// handle that and do not crash in this case
for ( w = widgets.first(); w; w = widgets.next() ) {
- connect( w, TQT_SIGNAL( destroyed() ),
- this, TQT_SLOT( widgetDestroyed() ) );
+ connect( w, TQ_SIGNAL( destroyed() ),
+ this, TQ_SLOT( widgetDestroyed() ) );
startPoint = TQPoint( TQMIN( startPoint.x(), w->x() ),
TQMIN( startPoint.y(), w->y() ) );
geometries.insert( w, TQRect( w->pos(), w->size() ) );
@@ -159,13 +159,13 @@ bool Layout::prepareLayout( bool &needMove, bool &needReparent )
for ( TQWidget *w = widgets.first(); w; w = widgets.next() )
w->raise();
needMove = !layoutBase;
- needReparent = needMove || layoutBase->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) || layoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING );
+ needReparent = needMove || layoutBase->inherits( "TQLayoutWidget" ) || layoutBase->inherits( "TQSplitter" );
if ( !layoutBase ) {
if ( !useSplitter )
- layoutBase = WidgetFactory::create( WidgetDatabase::idFromClassName( TQLAYOUTWIDGET_OBJECT_NAME_STRING ),
+ layoutBase = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQLayoutWidget" ),
WidgetFactory::containerOfWidget( parent ) );
else
- layoutBase = WidgetFactory::create( WidgetDatabase::idFromClassName( TQSPLITTER_OBJECT_NAME_STRING ),
+ layoutBase = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQSplitter" ),
WidgetFactory::containerOfWidget( parent ) );
} else {
WidgetFactory::deleteLayout( layoutBase );
@@ -187,11 +187,11 @@ void Layout::finishLayout( bool needMove, TQLayout *layout )
layoutBase->show();
layout->activate();
formWindow->insertWidget( layoutBase );
- formWindow->selectWidget( TQT_TQOBJECT(layoutBase) );
+ formWindow->selectWidget( layoutBase );
TQString n = layoutBase->name();
if ( n.find( "qt_dead_widget_" ) != -1 ) {
n.remove( 0, TQString( "qt_dead_widget_" ).length() );
- layoutBase->setName( n );
+ layoutBase->setName( n.utf8() );
}
}
@@ -206,20 +206,20 @@ void Layout::undoLayout()
it.key()->reparent( WidgetFactory::containerOfWidget( parent ), 0, ( *it ).topLeft(), it.key()->isVisibleTo( formWindow ) );
it.key()->resize( ( *it ).size() );
}
- formWindow->selectWidget( TQT_TQOBJECT(layoutBase), false );
+ formWindow->selectWidget( layoutBase, false );
WidgetFactory::deleteLayout( layoutBase );
- if ( parent != layoutBase && !layoutBase->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) {
+ if ( parent != layoutBase && !layoutBase->inherits( "TQMainWindow" ) ) {
layoutBase->hide();
TQString n = layoutBase->name();
n.prepend( "qt_dead_widget_" );
- layoutBase->setName( n );
+ layoutBase->setName( n.utf8() );
} else {
layoutBase->setGeometry( oldGeometry );
}
if ( widgets.first() )
- formWindow->selectWidget( TQT_TQOBJECT(widgets.first()) );
+ formWindow->selectWidget( widgets.first() );
else
- formWindow->selectWidget( TQT_TQOBJECT(formWindow) );
+ formWindow->selectWidget( formWindow );
}
void Layout::breakLayout()
@@ -231,11 +231,11 @@ void Layout::breakLayout()
rects.insert( w, w->geometry() );
}
WidgetFactory::deleteLayout( layoutBase );
- bool needReparent = qstrcmp( layoutBase->className(), TQLAYOUTWIDGET_OBJECT_NAME_STRING ) == 0 ||
- qstrcmp( layoutBase->className(), TQSPLITTER_OBJECT_NAME_STRING ) == 0 ||
- ( !WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf(TQT_TQOBJECT( layoutBase )) ) ) &&
+ bool needReparent = qstrcmp( layoutBase->className(), "TQLayoutWidget" ) == 0 ||
+ qstrcmp( layoutBase->className(), "TQSplitter" ) == 0 ||
+ ( !WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( layoutBase ) ) ) &&
layoutBase != formWindow->mainContainer() );
- bool needResize = qstrcmp( layoutBase->className(), TQSPLITTER_OBJECT_NAME_STRING ) == 0;
+ bool needResize = qstrcmp( layoutBase->className(), "TQSplitter" ) == 0;
bool add = geometries.isEmpty();
for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) {
if ( needReparent )
@@ -254,14 +254,14 @@ void Layout::breakLayout()
parent = layoutBase->parentWidget();
TQString n = layoutBase->name();
n.prepend( "qt_dead_widget_" );
- layoutBase->setName( n );
+ layoutBase->setName( n.utf8() );
} else {
parent = layoutBase;
}
if ( widgets.first() && widgets.first()->isVisibleTo( formWindow ) )
- formWindow->selectWidget( TQT_TQOBJECT(widgets.first()) );
+ formWindow->selectWidget( widgets.first() );
else
- formWindow->selectWidget( TQT_TQOBJECT(formWindow) );
+ formWindow->selectWidget( formWindow );
}
class HorizontalLayoutList : public TQWidgetList
@@ -306,21 +306,21 @@ void HorizontalLayout::doLayout()
TQHBoxLayout *layout = (TQHBoxLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::HBox );
for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) {
- if ( needReparent && TQT_BASE_OBJECT(w->parent()) != TQT_BASE_OBJECT(layoutBase) )
+ if ( needReparent && w->parent() != layoutBase )
w->reparent( layoutBase, 0, TQPoint( 0, 0 ), false );
if ( !useSplitter ) {
if ( qstrcmp( w->className(), "Spacer" ) == 0 )
layout->addWidget( w, 0, ( (Spacer*)w )->alignment() );
else
layout->addWidget( w );
- if ( w->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) )
+ if ( w->inherits( "TQLayoutWidget" ) )
( (TQLayoutWidget*)w )->updateSizePolicy();
}
w->show();
}
- if ( layoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) )
- ( (TQSplitter*)layoutBase )->setOrientation( Qt::Horizontal );
+ if ( layoutBase->inherits( "TQSplitter" ) )
+ ( (TQSplitter*)layoutBase )->setOrientation( TQt::Horizontal );
finishLayout( needMove, layout );
}
@@ -370,21 +370,21 @@ void VerticalLayout::doLayout()
TQVBoxLayout *layout = (TQVBoxLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::VBox );
for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) {
- if ( needReparent && TQT_BASE_OBJECT(w->parent()) != TQT_BASE_OBJECT(layoutBase) )
+ if ( needReparent && w->parent() != layoutBase )
w->reparent( layoutBase, 0, TQPoint( 0, 0 ), false );
if ( !useSplitter ) {
if ( qstrcmp( w->className(), "Spacer" ) == 0 )
layout->addWidget( w, 0, ( (Spacer*)w )->alignment() );
else
layout->addWidget( w );
- if ( w->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) )
+ if ( w->inherits( "TQLayoutWidget" ) )
( (TQLayoutWidget*)w )->updateSizePolicy();
}
w->show();
}
- if ( layoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) )
- ( (TQSplitter*)layoutBase )->setOrientation( Qt::Vertical );
+ if ( layoutBase->inherits( "TQSplitter" ) )
+ ( (TQSplitter*)layoutBase )->setOrientation( TQt::Vertical );
finishLayout( needMove, layout );
}
@@ -742,14 +742,14 @@ void GridLayout::doLayout()
int r, c, rs, cs;
for ( w = widgets.first(); w; w = widgets.next() ) {
if ( grid->locateWidget( w, r, c, rs, cs) ) {
- if ( needReparent && TQT_BASE_OBJECT(w->parent()) != TQT_BASE_OBJECT(layoutBase) )
+ if ( needReparent && w->parent() != layoutBase )
w->reparent( layoutBase, 0, TQPoint( 0, 0 ), false );
if ( rs * cs == 1 ) {
layout->addWidget( w, r, c, w->inherits( "Spacer" ) ? ( (Spacer*)w )->alignment() : 0 );
} else {
layout->addMultiCellWidget( w, r, r+rs-1, c, c+cs-1, w->inherits( "Spacer" ) ? ( (Spacer*)w )->alignment() : 0 );
}
- if ( w->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) )
+ if ( w->inherits( "TQLayoutWidget" ) )
( (TQLayoutWidget*)w )->updateSizePolicy();
w->show();
} else {
@@ -803,7 +803,7 @@ void GridLayout::buildGrid()
Spacer::Spacer( TQWidget *parent, const char *name )
: TQWidget( parent, name, WMouseNoMask ),
- orient(Qt::Vertical ), interactive(true), sh( TQSize(20,20) )
+ orient(TQt::Vertical ), interactive(true), sh( TQSize(20,20) )
{
setSizeType( Expanding );
setAutoMask( true );
@@ -814,7 +814,7 @@ void Spacer::paintEvent( TQPaintEvent * )
TQPainter p( this );
p.setPen( TQt::blue );
- if ( orient ==Qt::Horizontal ) {
+ if ( orient ==TQt::Horizontal ) {
const int dist = 3;
const int amplitude = TQMIN( 3, height() / 3 );
const int base = height() / 2;
@@ -853,7 +853,7 @@ void Spacer::resizeEvent( TQResizeEvent* e)
void Spacer::updateMask()
{
TQRegion r( rect() );
- if ( orient ==Qt::Horizontal ) {
+ if ( orient ==TQt::Horizontal ) {
const int amplitude = TQMIN( 3, height() / 3 );
const int base = height() / 2;
r = r.subtract( TQRect(1, 0, width() - 2, base - amplitude ) );
@@ -870,7 +870,7 @@ void Spacer::updateMask()
void Spacer::setSizeType( SizeType t )
{
TQSizePolicy sizeP;
- if ( orient ==Qt::Vertical )
+ if ( orient ==TQt::Vertical )
sizeP = TQSizePolicy( TQSizePolicy::Minimum, (TQSizePolicy::SizeType)t );
else
sizeP = TQSizePolicy( (TQSizePolicy::SizeType)t, TQSizePolicy::Minimum );
@@ -880,14 +880,14 @@ void Spacer::setSizeType( SizeType t )
Spacer::SizeType Spacer::sizeType() const
{
- if ( orient ==Qt::Vertical )
+ if ( orient ==TQt::Vertical )
return (SizeType)sizePolicy().verData();
return (SizeType)sizePolicy().horData();
}
int Spacer::alignment() const
{
- if ( orient ==Qt::Vertical )
+ if ( orient ==TQt::Vertical )
return AlignHCenter;
return AlignVCenter;
}
@@ -901,7 +901,7 @@ TQSize Spacer::sizeHint() const
{
TQSize s = sh.expandedTo( TQSize(0,0) );
if ( sizeType() == Expanding )
- if ( orient ==Qt::Horizontal )
+ if ( orient ==TQt::Horizontal )
s.rheight() = 0;
else
s.rwidth() = 0;
@@ -917,12 +917,12 @@ void Spacer::setSizeHint( const TQSize &s )
updateGeometry();
}
-Qt::Orientation Spacer::orientation() const
+TQt::Orientation Spacer::orientation() const
{
return orient;
}
-void Spacer::setOrientation( Qt::Orientation o )
+void Spacer::setOrientation( TQt::Orientation o )
{
if ( orient == o )
return;