diff options
Diffstat (limited to 'tqtinterface/qt4/tools/designer/designer/formwindow.cpp')
| -rw-r--r-- | tqtinterface/qt4/tools/designer/designer/formwindow.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/tqtinterface/qt4/tools/designer/designer/formwindow.cpp b/tqtinterface/qt4/tools/designer/designer/formwindow.cpp index f3155ee..8c5bc46 100644 --- a/tqtinterface/qt4/tools/designer/designer/formwindow.cpp +++ b/tqtinterface/qt4/tools/designer/designer/formwindow.cpp @@ -135,8 +135,8 @@ static void flickerfree_update( TQWidget *w ) event filter which is implemented in MainWindow::eventFilter(). */ -FormWindow::FormWindow( FormFile *f, MainWindow *mw, TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name, TQt::WDestructiveClose ), mainwindow( mw ), +FormWindow::FormWindow( FormFile *f, MainWindow *mw, TQWidget *parent, const char *name ) + : TQWidget( parent, name, TQt::WDestructiveClose ), mainwindow( mw ), commands( 100 ), pixInline( TRUE ), pixProject( FALSE ) { ff = f; @@ -144,8 +144,8 @@ FormWindow::FormWindow( FormFile *f, MainWindow *mw, TQWidget *tqparent, const c initSlots(); } -FormWindow::FormWindow( FormFile *f, TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name, TQt::WDestructiveClose ), mainwindow( 0 ), +FormWindow::FormWindow( FormFile *f, TQWidget *parent, const char *name ) + : TQWidget( parent, name, TQt::WDestructiveClose ), mainwindow( 0 ), commands( 100 ), pixInline( TRUE ) { ff = f; @@ -259,16 +259,16 @@ void FormWindow::paintGrid( TQWidget *w, TQPaintEvent *e ) if( !TQPixmapCache::find( grid_name, grid ) ) { grid = TQPixmap( 350 + ( 350 % mainWindow()->grid().x() ), 350 + ( 350 % mainWindow()->grid().y() ) ); grid.fill( tqcolorGroup().color( TQColorGroup::Foreground ) ); - TQBitmap tqmask( grid.width(), grid.height() ); - tqmask.fill( Qt::color0 ); - TQPainter p( &tqmask ); + TQBitmap mask( grid.width(), grid.height() ); + mask.fill( Qt::color0 ); + TQPainter p( &mask ); p.setPen( Qt::color1 ); for ( int y = 0; y < grid.width(); y += mainWindow()->grid().y()) { for ( int x = 0; x < grid.height(); x += mainWindow()->grid().x() ) { p.drawPoint( x, y ); } } - grid.setMask( tqmask ); + grid.setMask( mask ); TQPixmapCache::insert( grid_name, grid ); } TQPainter p( w ); @@ -452,7 +452,7 @@ void FormWindow::insertWidget() np.append( pos ); } - MoveCommand *mv = new MoveCommand( tr( "Retqparent Widgets" ), this, + MoveCommand *mv = new MoveCommand( tr( "Reparent Widgets" ), this, lst, op, np, insertParent, pw ); if ( !toolFixed ) @@ -689,14 +689,14 @@ void FormWindow::handleMousePress( TQMouseEvent *e, TQWidget *w ) break; default: // any insert widget tool if ( e->button() == Qt::LeftButton ) { - insertParent = WidgetFactory::containerOfWidget( mainContainer() ); // default tqparent for new widget is the formwindow - if ( !isMainContainer( w ) ) { // press was not on formwindow, check if we can find another tqparent + insertParent = WidgetFactory::containerOfWidget( mainContainer() ); // default parent for new widget is the formwindow + if ( !isMainContainer( w ) ) { // press was not on formwindow, check if we can find another parent TQWidget *wid = w; for (;;) { int id = WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( wid ) ); if ( ( WidgetDatabase::isContainer( id ) || wid == mainContainer() ) && !::tqqt_cast<TQLayoutWidget*>(wid) && !::tqqt_cast<TQSplitter*>(wid) ) { - insertParent = WidgetFactory::containerOfWidget( wid ); // found another tqparent, store it + insertParent = WidgetFactory::containerOfWidget( wid ); // found another parent, store it break; } else { wid = wid->parentWidget(); @@ -804,7 +804,7 @@ void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w ) checkSelectionsForMove( w ); } - // check whether we would have to reparent the selection and highlight the possible new tqparent container + // check whether we would have to reparent the selection and highlight the possible new parent container TQMapConstIterator<TQWidget*, TQPoint> it = moving.begin(); TQWidget* wa = containerAt( e->globalPos(), it.key() ); if ( wa && !isMainContainer( wa ) && !isCentralWidget( wa ) ) { @@ -1630,7 +1630,7 @@ TQWidget *FormWindow::designerWidget( TQT_BASE_OBJECT_NAME *o ) const return 0; TQWidget *w = (TQWidget*)o; while ( (w && !isMainContainer( w ) && !insertedWidgets[ (void*)w ]) || isCentralWidget( w ) ) - w = (TQWidget*)w->tqparent(); + w = (TQWidget*)w->parent(); return w; } @@ -1962,12 +1962,12 @@ void FormWindow::raiseWidgets() commandHistory()->addCommand( cmd ); } -void FormWindow::paste( const TQString &cb, TQWidget *tqparent ) +void FormWindow::paste( const TQString &cb, TQWidget *parent ) { CHECK_MAINWINDOW; Resource resource( mainWindow() ); resource.setWidget( this ); - resource.paste( cb, tqparent ); + resource.paste( cb, parent ); } void FormWindow::selectAll() |