diff options
Diffstat (limited to 'kdevdesigner/designer/formwindow.cpp')
| -rw-r--r-- | kdevdesigner/designer/formwindow.cpp | 16 | 
1 files changed, 8 insertions, 8 deletions
| diff --git a/kdevdesigner/designer/formwindow.cpp b/kdevdesigner/designer/formwindow.cpp index fbd7e1ad..7da756de 100644 --- a/kdevdesigner/designer/formwindow.cpp +++ b/kdevdesigner/designer/formwindow.cpp @@ -260,7 +260,7 @@ void FormWindow::paintGrid( TQWidget *w, TQPaintEvent *e )      grid_name.sprintf("FormWindowGrid_%d_%d", mainWindow()->grid().x(), mainWindow()->grid().y());      if( !TQPixmapCache::find( grid_name, grid ) ) {  	grid = TQPixmap( 350 + ( 350 % mainWindow()->grid().x() ), 350 + ( 350 % mainWindow()->grid().y() ) ); -	grid.fill( tqcolorGroup().color( TQColorGroup::Foreground ) ); +	grid.fill( colorGroup().color( TQColorGroup::Foreground ) );  	TQBitmap mask( grid.width(), grid.height() );  	mask.fill( color0 );  	TQPainter p( &mask ); @@ -321,7 +321,7 @@ TQPoint FormWindow::gridPoint( const TQPoint &p )  void FormWindow::drawSizePreview( const TQPoint &pos, const TQString& text )  {      unclippedPainter->save(); -    unclippedPainter->setPen( TQPen( tqcolorGroup().foreground(), 1  )); +    unclippedPainter->setPen( TQPen( colorGroup().foreground(), 1  ));      unclippedPainter->setRasterOp( CopyROP );      if ( !sizePreviewPixmap.isNull() )  	unclippedPainter->drawPixmap( sizePreviewPos, sizePreviewPixmap ); @@ -416,8 +416,8 @@ void FormWindow::insertWidget()  		r.setHeight( 20 );  	    }  	} else { -	    r.setWidth( w->tqsizeHint().width() ); -	    r.setHeight( w->tqsizeHint().height() ); +	    r.setWidth( w->sizeHint().width() ); +	    r.setHeight( w->sizeHint().height() );  	}      } @@ -824,7 +824,7 @@ void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w )  			targetContainer = wa;  			hadOwnPalette = wa->ownPalette();  			restorePalette = wa->palette(); -			wa->setPaletteBackgroundColor( wa->tqcolorGroup().midlight() ); +			wa->setPaletteBackgroundColor( wa->colorGroup().midlight() );  		    }  		}  		else if ( targetContainer ) { @@ -1910,11 +1910,11 @@ void FormWindow::checkAccels()  		 insertedWidgets[ (void*)o ] ) {  		TQWidget *w = (TQWidget*)o;  		const TQMetaProperty* text = -		    w->tqmetaObject()->property( w->tqmetaObject()->findProperty( "text", TRUE ), TRUE ); +		    w->metaObject()->property( w->metaObject()->findProperty( "text", TRUE ), TRUE );  		const TQMetaProperty* title = -		    w->tqmetaObject()->property( w->tqmetaObject()->findProperty( "title", TRUE ), TRUE ); +		    w->metaObject()->property( w->metaObject()->findProperty( "title", TRUE ), TRUE );  		const TQMetaProperty* pageTitle = -		    w->tqmetaObject()->property( w->tqmetaObject()->findProperty( "pageTitle", TRUE ), TRUE ); +		    w->metaObject()->property( w->metaObject()->findProperty( "pageTitle", TRUE ), TRUE );  		if ( text )  		    find_accel( w->property( "text" ).toString(), accels, w );  		if ( title ) | 
