diff options
Diffstat (limited to 'kig/modes/popup.cpp')
| -rw-r--r-- | kig/modes/popup.cpp | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/kig/modes/popup.cpp b/kig/modes/popup.cpp index 05dc5d24..0a7e0265 100644 --- a/kig/modes/popup.cpp +++ b/kig/modes/popup.cpp @@ -190,7 +190,7 @@ NormalModePopupObjects::NormalModePopupObjects( KigPart& part, { bool empty = objs.empty(); bool single = objs.size() == 1; - connect( this, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( toplevelMenuSlot( int ) ) ); + connect( this, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( toplevelMenuSlot( int ) ) ); TQString title; if ( empty ) @@ -246,24 +246,24 @@ NormalModePopupObjects::NormalModePopupObjects( KigPart& part, for ( uint i = 0; i < NumberOfMenus; ++i ) mmenus[i] = new TQPopupMenu( this ); - connect( mmenus[TransformMenu], TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( transformMenuSlot( int ) ) ); - connect( mmenus[TestMenu], TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( testMenuSlot( int ) ) ); - connect( mmenus[ConstructMenu], TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( constructMenuSlot( int ) ) ); - connect( mmenus[StartMenu], TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( startMenuSlot( int ) ) ); - connect( mmenus[ShowMenu], TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( showMenuSlot( int ) ) ); - connect( mmenus[SetColorMenu], TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( setColorMenuSlot( int ) ) ); - connect( mmenus[SetSizeMenu], TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( setSizeMenuSlot( int ) ) ); - connect( mmenus[SetStyleMenu], TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( setStyleMenuSlot( int ) ) ); - connect( mmenus[SetCoordinateSystemMenu], TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( setCoordinateSystemMenuSlot( int ) ) ); + connect( mmenus[TransformMenu], TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( transformMenuSlot( int ) ) ); + connect( mmenus[TestMenu], TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( testMenuSlot( int ) ) ); + connect( mmenus[ConstructMenu], TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( constructMenuSlot( int ) ) ); + connect( mmenus[StartMenu], TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( startMenuSlot( int ) ) ); + connect( mmenus[ShowMenu], TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( showMenuSlot( int ) ) ); + connect( mmenus[SetColorMenu], TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( setColorMenuSlot( int ) ) ); + connect( mmenus[SetSizeMenu], TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( setSizeMenuSlot( int ) ) ); + connect( mmenus[SetStyleMenu], TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( setStyleMenuSlot( int ) ) ); + connect( mmenus[SetCoordinateSystemMenu], TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( setCoordinateSystemMenuSlot( int ) ) ); for ( int i = 0; i <= NumberOfMenus; ++i ) { @@ -470,23 +470,23 @@ void BuiltinObjectActionsProvider::fillUpMenu( NormalModePopupObjects& popup, in TQPixmap p( 20, 20 ); p.fill( popup.eraseColor() ); ScreenInfo si( Rect( -1, -1, 2, 2 ), p.rect() ); - KigPainter ptr( si, TQT_TQPAINTDEVICE(&p), popup.part().document(), false ); + KigPainter ptr( si, &p, popup.part().document(), false ); PointImp pt( Coordinate( 0, 0 ) ); - ObjectDrawer d( color, -1, true, Qt::SolidLine, i ); + ObjectDrawer d( color, -1, true, TQt::SolidLine, i ); d.draw( pt, ptr, false ); popup.addAction( menu, p, nextfree++ ); } else { - Qt::PenStyle penstyles[] = {Qt::SolidLine, Qt::DashLine, Qt::DashDotLine, Qt::DashDotDotLine, Qt::DotLine}; - for ( int i = 0; i < (int) ( sizeof( penstyles ) / sizeof( Qt::PenStyle ) ); ++i ) + TQt::PenStyle penstyles[] = {TQt::SolidLine, TQt::DashLine, TQt::DashDotLine, TQt::DashDotDotLine, TQt::DotLine}; + for ( int i = 0; i < (int) ( sizeof( penstyles ) / sizeof( TQt::PenStyle ) ); ++i ) { TQPixmap p( 50, 20 ); p.fill( popup.eraseColor() ); ScreenInfo si( Rect( -2.5, -1, 5, 2 ), p.rect() ); - KigPainter ptr( si, TQT_TQPAINTDEVICE(&p), popup.part().document(), false ); + KigPainter ptr( si, &p, popup.part().document(), false ); LineImp line( Coordinate( -1, 0 ), Coordinate( 1, 0 ) ); - Qt::PenStyle ps = penstyles[i]; + TQt::PenStyle ps = penstyles[i]; ObjectDrawer d( color, -1, true, ps, 1 ); d.draw( line, ptr, false ); popup.addAction( menu, p, nextfree++ ); @@ -712,9 +712,9 @@ bool BuiltinObjectActionsProvider::executeAction( } else { - Qt::PenStyle penstyles[] = {Qt::SolidLine, Qt::DashLine, Qt::DashDotLine, Qt::DashDotDotLine, Qt::DotLine}; - assert( id < (int)( sizeof( penstyles ) / sizeof( Qt::PenStyle ) ) ); - Qt::PenStyle p = penstyles[id]; + TQt::PenStyle penstyles[] = {TQt::SolidLine, TQt::DashLine, TQt::DashDotLine, TQt::DashDotDotLine, TQt::DotLine}; + assert( id < (int)( sizeof( penstyles ) / sizeof( TQt::PenStyle ) ) ); + TQt::PenStyle p = penstyles[id]; KigCommand* kc = new KigCommand( doc, i18n( "Change Object Style" ) ); for ( std::vector<ObjectHolder*>::const_iterator i = os.begin(); i != os.end(); ++i ) if ( ! (*i)->imp()->inherits( PointImp::stype() ) ) @@ -1187,7 +1187,7 @@ ObjectChooserPopup::ObjectChooserPopup( const TQPoint& p, KigWidget& view, i ); } - connect( this, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( actionActivatedSlot( int ) ) ); + connect( this, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( actionActivatedSlot( int ) ) ); } ObjectChooserPopup::~ObjectChooserPopup() |