diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-01-04 10:30:32 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-01-04 12:36:03 +0900 |
| commit | c0332621bc998c9786f4841e86a62b7711fe4abf (patch) | |
| tree | 38b3ab6688de7a9396a1c5993a8ec265f5f33b64 /karbon | |
| parent | 6c81ff8d61ec679e735d3fbd875583b12f0ef0a5 (diff) | |
| download | koffice-c0332621bc998c9786f4841e86a62b7711fe4abf.tar.gz koffice-c0332621bc998c9786f4841e86a62b7711fe4abf.zip | |
Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'karbon')
40 files changed, 256 insertions, 256 deletions
diff --git a/karbon/commands/vcommand.cpp b/karbon/commands/vcommand.cpp index fe5e9ada..1738e5f1 100644 --- a/karbon/commands/vcommand.cpp +++ b/karbon/commands/vcommand.cpp @@ -31,8 +31,8 @@ VCommandHistory::VCommandHistory( KarbonPart* part ) { m_commands.setAutoDelete( true ); - m_undo = KStdAction::undo( this, TQT_SLOT( undo() ), m_part->actionCollection(), "koffice_undo" ); - m_redo = KStdAction::redo( this, TQT_SLOT( redo() ), m_part->actionCollection(), "koffice_redo" ); + m_undo = KStdAction::undo( this, TQ_SLOT( undo() ), m_part->actionCollection(), "koffice_undo" ); + m_redo = KStdAction::redo( this, TQ_SLOT( redo() ), m_part->actionCollection(), "koffice_redo" ); clear(); } diff --git a/karbon/dialogs/vcolortab.cpp b/karbon/dialogs/vcolortab.cpp index fc8f4eac..78b89cba 100644 --- a/karbon/dialogs/vcolortab.cpp +++ b/karbon/dialogs/vcolortab.cpp @@ -44,7 +44,7 @@ VColorTab::VColorTab( const VColor &c, TQWidget* parent, const char* name ) mColorSelector = new KHSSelector( mRGBWidget ); mColorSelector->setMinimumHeight( 165 ); mColorSelector->setMinimumWidth( 165 ); - connect( mColorSelector, TQT_SIGNAL( valueChanged( int, int ) ), this, TQT_SLOT( slotHSChanged( int, int ) ) ); + connect( mColorSelector, TQ_SIGNAL( valueChanged( int, int ) ), this, TQ_SLOT( slotHSChanged( int, int ) ) ); mainLayout->addMultiCellWidget(mColorSelector, 0, 2, 0, 0 ); //Selector @@ -52,7 +52,7 @@ VColorTab::VColorTab( const VColor &c, TQWidget* parent, const char* name ) mSelector->setColors( TQColor( "white" ), TQColor( "black" ) ); mSelector->setMinimumWidth( 20 ); //TODO: Make it autochange color if the solid-filled object is selected (also for TQSpinBoxes) - connect( mSelector, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( slotVChanged( int ) ) ); + connect( mSelector, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( slotVChanged( int ) ) ); mainLayout->addMultiCellWidget( mSelector, 0, 2, 1, 1 ); //Reference @@ -77,9 +77,9 @@ VColorTab::VColorTab( const VColor &c, TQWidget* parent, const char* name ) mRed = new KIntSpinBox( 0, 255, 1, 0, 10, cgroupbox ); mGreen = new KIntSpinBox( 0, 255, 1, 0, 10, cgroupbox ); mBlue = new KIntSpinBox( 0, 255, 1, 0, 10, cgroupbox ); - connect( mRed, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( slotUpdateFromRGBSpinBoxes() ) ); - connect( mGreen, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( slotUpdateFromRGBSpinBoxes() ) ); - connect( mBlue, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( slotUpdateFromRGBSpinBoxes() ) ); + connect( mRed, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT( slotUpdateFromRGBSpinBoxes() ) ); + connect( mGreen, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT( slotUpdateFromRGBSpinBoxes() ) ); + connect( mBlue, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT( slotUpdateFromRGBSpinBoxes() ) ); //--->HSV new TQLabel( i18n( "Hue:", "H:" ), cgroupbox ); @@ -88,9 +88,9 @@ VColorTab::VColorTab( const VColor &c, TQWidget* parent, const char* name ) mHue = new KIntSpinBox( 0, 359, 1, 0, 10, cgroupbox ); mSaturation = new KIntSpinBox( 0, 255, 1, 0, 10, cgroupbox ); mValue = new KIntSpinBox( 0, 255, 1, 0, 10, cgroupbox ); - connect( mHue, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( slotUpdateFromHSVSpinBoxes() ) ); - connect( mSaturation, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( slotUpdateFromHSVSpinBoxes() ) ); - connect( mValue, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( slotUpdateFromHSVSpinBoxes() ) ); + connect( mHue, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT( slotUpdateFromHSVSpinBoxes() ) ); + connect( mSaturation, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT( slotUpdateFromHSVSpinBoxes() ) ); + connect( mValue, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT( slotUpdateFromHSVSpinBoxes() ) ); mainLayout->addWidget( cgroupbox, 1, 2 ); //--->Opacity diff --git a/karbon/dialogs/vconfiguredlg.cpp b/karbon/dialogs/vconfiguredlg.cpp index 3736f738..5870139d 100644 --- a/karbon/dialogs/vconfiguredlg.cpp +++ b/karbon/dialogs/vconfiguredlg.cpp @@ -67,14 +67,14 @@ VConfigureDlg::VConfigureDlg( KarbonView* parent ) m_gridPage = new VConfigGridPage( parent, page ); - connect( m_miscPage, TQT_SIGNAL( unitChanged( int ) ), m_gridPage, TQT_SLOT( slotUnitChanged( int ) ) ); + connect( m_miscPage, TQ_SIGNAL( unitChanged( int ) ), m_gridPage, TQ_SLOT( slotUnitChanged( int ) ) ); page = addVBoxPage( i18n( "Document" ), i18n( "Document Settings" ), BarIcon( "text-x-generic", TDEIcon::SizeMedium ) ); m_defaultDocPage = new VConfigDefaultPage( parent, page ); - connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotApply() ) ); + connect( this, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( slotApply() ) ); } void VConfigureDlg::slotApply() @@ -249,7 +249,7 @@ VConfigMiscPage::VConfigMiscPage( KarbonView* view, TQVBox* box, char* name ) grid->addWidget( m_unit, 1, 1 ); m_oldUnit = KoUnit::unit( unitType ); m_unit->setCurrentItem( m_oldUnit ); - connect( m_unit, TQT_SIGNAL( activated( int ) ), TQT_SIGNAL( unitChanged( int ) ) ); + connect( m_unit, TQ_SIGNAL( activated( int ) ), TQ_SIGNAL( unitChanged( int ) ) ); } void VConfigMiscPage::apply() @@ -328,8 +328,8 @@ VConfigGridPage::VConfigGridPage( KarbonView* view, TQVBox* page, char* name ) gl->addMultiCellWidget( snapGrp, 4, 4, 0, 2 ); gl->addMultiCell( new TQSpacerItem( 0, 0 ), 5, 5, 0, 2 ); - connect( m_spaceHorizUSpin, TQT_SIGNAL( valueChanged( double ) ), TQT_SLOT( setMaxHorizSnap( double ) ) ); - connect( m_spaceVertUSpin, TQT_SIGNAL( valueChanged( double ) ), TQT_SLOT( setMaxVertSnap( double ) ) ) ; + connect( m_spaceHorizUSpin, TQ_SIGNAL( valueChanged( double ) ), TQ_SLOT( setMaxHorizSnap( double ) ) ); + connect( m_spaceVertUSpin, TQ_SIGNAL( valueChanged( double ) ), TQ_SLOT( setMaxVertSnap( double ) ) ) ; } void VConfigGridPage::setMaxHorizSnap( double v ) diff --git a/karbon/dialogs/vstrokedlg.cpp b/karbon/dialogs/vstrokedlg.cpp index 27009bf2..5611beaf 100644 --- a/karbon/dialogs/vstrokedlg.cpp +++ b/karbon/dialogs/vstrokedlg.cpp @@ -71,7 +71,7 @@ VStrokeDlg::VStrokeDlg( KarbonPart* part, TQWidget* parent, const char* name ) m_typeOption->insert( button ); m_typeOption->setTitle( i18n( "Type" ) ); mainLayout->addWidget( m_typeOption ); - connect( m_typeOption, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotTypeChanged( int ) ) ); + connect( m_typeOption, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( slotTypeChanged( int ) ) ); m_capOption = new TQVButtonGroup ( mainWidget ); //button = new TQRadioButton ( i18n( "Butt" ), m_capOption ); @@ -86,7 +86,7 @@ VStrokeDlg::VStrokeDlg( KarbonPart* part, TQWidget* parent, const char* name ) m_capOption->insert( button ); m_capOption->setTitle( i18n( "Cap" ) ); mainLayout->addWidget( m_capOption ); - connect( m_capOption, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotCapChanged( int ) ) ); + connect( m_capOption, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( slotCapChanged( int ) ) ); m_joinOption = new TQVButtonGroup ( mainWidget ); button = new TQRadioButton ( m_joinOption ); @@ -100,7 +100,7 @@ VStrokeDlg::VStrokeDlg( KarbonPart* part, TQWidget* parent, const char* name ) m_joinOption->insert( button ); m_joinOption->setTitle( i18n( "Join" ) ); mainLayout->addWidget( m_joinOption ); - connect( m_joinOption, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotJoinChanged( int ) ) ); + connect( m_joinOption, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( slotJoinChanged( int ) ) ); VSelection *sel = part->document().selection(); if( sel && sel->objects().count() > 0 ) // there is a selection, so take the stroke of first selected object @@ -126,7 +126,7 @@ VStrokeDlg::VStrokeDlg( KarbonPart* part, TQWidget* parent, const char* name ) setMainWidget( m_colortab ); disableResize(); - connect (this, TQT_SIGNAL( okClicked( void ) ), this, TQT_SLOT( slotOKClicked ( void ) ) ); + connect (this, TQ_SIGNAL( okClicked( void ) ), this, TQ_SLOT( slotOKClicked ( void ) ) ); } void VStrokeDlg::slotTypeChanged( int ID ) diff --git a/karbon/dockers/vcolordocker.cpp b/karbon/dockers/vcolordocker.cpp index 328f4f3f..0c77a88d 100644 --- a/karbon/dockers/vcolordocker.cpp +++ b/karbon/dockers/vcolordocker.cpp @@ -66,32 +66,32 @@ VColorDocker::VColorDocker( KarbonPart* part, KarbonView* parent, const char* /* /* ##### HSV WIDGET ##### */ mHSVWidget = new KoHSVWidget( mTabWidget ); - connect( mHSVWidget, TQT_SIGNAL( sigFgColorChanged( const TQColor &) ), this, TQT_SLOT( updateFgColor( const TQColor &) ) ); - connect( mHSVWidget, TQT_SIGNAL( sigBgColorChanged( const TQColor &) ), this, TQT_SLOT( updateBgColor( const TQColor &) ) ); - connect(this, TQT_SIGNAL(fgColorChanged(const TQColor &)), mHSVWidget, TQT_SLOT(setFgColor(const TQColor &))); - connect(this, TQT_SIGNAL(bgColorChanged(const TQColor &)), mHSVWidget, TQT_SLOT(setBgColor(const TQColor &))); - connect( mHSVWidget, TQT_SIGNAL( sigModeChanged(KDualColorButton::DualColor) ), this, TQT_SLOT( updateMode( KDualColorButton::DualColor ) ) ); + connect( mHSVWidget, TQ_SIGNAL( sigFgColorChanged( const TQColor &) ), this, TQ_SLOT( updateFgColor( const TQColor &) ) ); + connect( mHSVWidget, TQ_SIGNAL( sigBgColorChanged( const TQColor &) ), this, TQ_SLOT( updateBgColor( const TQColor &) ) ); + connect(this, TQ_SIGNAL(fgColorChanged(const TQColor &)), mHSVWidget, TQ_SLOT(setFgColor(const TQColor &))); + connect(this, TQ_SIGNAL(bgColorChanged(const TQColor &)), mHSVWidget, TQ_SLOT(setBgColor(const TQColor &))); + connect( mHSVWidget, TQ_SIGNAL( sigModeChanged(KDualColorButton::DualColor) ), this, TQ_SLOT( updateMode( KDualColorButton::DualColor ) ) ); mTabWidget->addTab( mHSVWidget, i18n( "HSV" ) ); /* ##### RGB WIDGET ##### */ mRGBWidget = new KoRGBWidget( mTabWidget ); - connect( mRGBWidget, TQT_SIGNAL( sigFgColorChanged( const TQColor &) ), this, TQT_SLOT( updateFgColor( const TQColor &) ) ); - connect( mRGBWidget, TQT_SIGNAL( sigBgColorChanged( const TQColor &) ), this, TQT_SLOT( updateBgColor( const TQColor &) ) ); - connect(this, TQT_SIGNAL(fgColorChanged(const TQColor &)), mRGBWidget, TQT_SLOT(setFgColor(const TQColor &))); - connect(this, TQT_SIGNAL(bgColorChanged(const TQColor &)), mRGBWidget, TQT_SLOT(setBgColor(const TQColor &))); - connect( mRGBWidget, TQT_SIGNAL( sigModeChanged(KDualColorButton::DualColor) ), this, TQT_SLOT( updateMode( KDualColorButton::DualColor ) ) ); + connect( mRGBWidget, TQ_SIGNAL( sigFgColorChanged( const TQColor &) ), this, TQ_SLOT( updateFgColor( const TQColor &) ) ); + connect( mRGBWidget, TQ_SIGNAL( sigBgColorChanged( const TQColor &) ), this, TQ_SLOT( updateBgColor( const TQColor &) ) ); + connect(this, TQ_SIGNAL(fgColorChanged(const TQColor &)), mRGBWidget, TQ_SLOT(setFgColor(const TQColor &))); + connect(this, TQ_SIGNAL(bgColorChanged(const TQColor &)), mRGBWidget, TQ_SLOT(setBgColor(const TQColor &))); + connect( mRGBWidget, TQ_SIGNAL( sigModeChanged(KDualColorButton::DualColor) ), this, TQ_SLOT( updateMode( KDualColorButton::DualColor ) ) ); mTabWidget->addTab( mRGBWidget, i18n( "RGB" ) ); /* ##### CMYK WIDGET ##### */ /*mCMYKWidget = new KoCMYKWidget( mTabWidget ); - connect( mCMYKWidget, TQT_SIGNAL( sigFgColorChanged( const TQColor &) ), this, TQT_SLOT( updateFgColor( const TQColor &) ) ); - connect( mCMYKWidget, TQT_SIGNAL( sigBgColorChanged( const TQColor &) ), this, TQT_SLOT( updateBgColor( const TQColor &) ) ); + connect( mCMYKWidget, TQ_SIGNAL( sigFgColorChanged( const TQColor &) ), this, TQ_SLOT( updateFgColor( const TQColor &) ) ); + connect( mCMYKWidget, TQ_SIGNAL( sigBgColorChanged( const TQColor &) ), this, TQ_SLOT( updateBgColor( const TQColor &) ) ); mTabWidget->addTab( mCMYKWidget, i18n( "CMYK" ) );*/ //Opacity mOpacity = new VColorSlider( i18n( "Opacity:" ), TQColor( "white" ), TQColor( "black" ), 0, 100, 100, this ); //TODO: Make "white" a transparent color - connect( mOpacity, TQT_SIGNAL( valueChanged ( int ) ), this, TQT_SLOT( updateOpacity() ) ); + connect( mOpacity, TQ_SIGNAL( valueChanged ( int ) ), this, TQ_SLOT( updateOpacity() ) ); TQToolTip::add( mOpacity, i18n( "Alpha (opacity)" ) ); TQVBoxLayout *mainWidgetLayout = new TQVBoxLayout( this, 3 ); diff --git a/karbon/dockers/vdocumentdocker.cpp b/karbon/dockers/vdocumentdocker.cpp index c999a059..c54dd337 100644 --- a/karbon/dockers/vdocumentdocker.cpp +++ b/karbon/dockers/vdocumentdocker.cpp @@ -252,10 +252,10 @@ VDocumentTab::VDocumentTab( KarbonView* view, TQWidget* parent ) m_layers->setAlignment( AlignRight ); m_format->setAlignment( AlignRight ); - connect( view->part()->commandHistory(), TQT_SIGNAL( commandAdded( VCommand* ) ), this, TQT_SLOT( slotCommandAdded( VCommand* ) ) ); - connect( view->part()->commandHistory(), TQT_SIGNAL( commandExecuted() ), this, TQT_SLOT( slotCommandExecuted() ) ); - connect( view, TQT_SIGNAL( pageLayoutChanged() ), this, TQT_SLOT( slotCommandExecuted() ) ); - connect( view->canvasWidget(), TQT_SIGNAL( viewportChanged() ), this, TQT_SLOT( slotViewportChanged() ) ); + connect( view->part()->commandHistory(), TQ_SIGNAL( commandAdded( VCommand* ) ), this, TQ_SLOT( slotCommandAdded( VCommand* ) ) ); + connect( view->part()->commandHistory(), TQ_SIGNAL( commandExecuted() ), this, TQ_SLOT( slotCommandExecuted() ) ); + connect( view, TQ_SIGNAL( pageLayoutChanged() ), this, TQ_SLOT( slotCommandExecuted() ) ); + connect( view->canvasWidget(), TQ_SIGNAL( viewportChanged() ), this, TQ_SLOT( slotViewportChanged() ) ); updateDocumentInfo(); } // VDocumentTab::VDocumentTab @@ -490,12 +490,12 @@ VLayersTab::VLayersTab( KarbonView* view, TQWidget* parent ) m_layersListView->setRootIsDecorated( true ); m_layersListView->setSelectionMode( TQListView::Extended ); - connect( m_layersListView, TQT_SIGNAL( clicked( TQListViewItem*, const TQPoint&, int ) ), this, TQT_SLOT( itemClicked( TQListViewItem*, const TQPoint&, int ) ) ); - connect( m_layersListView, TQT_SIGNAL( rightButtonClicked( TQListViewItem*, const TQPoint&, int ) ), this, TQT_SLOT( renameItem( TQListViewItem*, const TQPoint&, int ) ) ); - connect( m_layersListView, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( selectionChangedFromList() ) ); - connect( m_view, TQT_SIGNAL( selectionChange() ), this, TQT_SLOT( selectionChangedFromTool() ) ); - connect( m_buttonGroup, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotButtonClicked( int ) ) ); - connect( view->part()->commandHistory(), TQT_SIGNAL( commandExecuted( VCommand*) ), this, TQT_SLOT( slotCommandExecuted( VCommand* ) ) ); + connect( m_layersListView, TQ_SIGNAL( clicked( TQListViewItem*, const TQPoint&, int ) ), this, TQ_SLOT( itemClicked( TQListViewItem*, const TQPoint&, int ) ) ); + connect( m_layersListView, TQ_SIGNAL( rightButtonClicked( TQListViewItem*, const TQPoint&, int ) ), this, TQ_SLOT( renameItem( TQListViewItem*, const TQPoint&, int ) ) ); + connect( m_layersListView, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( selectionChangedFromList() ) ); + connect( m_view, TQ_SIGNAL( selectionChange() ), this, TQ_SLOT( selectionChangedFromTool() ) ); + connect( m_buttonGroup, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( slotButtonClicked( int ) ) ); + connect( view->part()->commandHistory(), TQ_SIGNAL( commandExecuted( VCommand*) ), this, TQ_SLOT( slotCommandExecuted( VCommand* ) ) ); layout->activate(); updateLayers(); @@ -1243,17 +1243,17 @@ VHistoryTab::VHistoryTab( KarbonPart* part, TQWidget* parent ) } m_history->sort(); - connect( m_history, TQT_SIGNAL( mouseButtonClicked( int, TQListViewItem*, const TQPoint&, int ) ), this, TQT_SLOT( commandClicked( int, TQListViewItem*, const TQPoint&, int ) ) ); - connect( m_groupCommands, TQT_SIGNAL( stateChanged( int ) ), this, TQT_SLOT( groupingChanged( int ) ) ); - connect( part->commandHistory(), TQT_SIGNAL( historyCleared() ), this, TQT_SLOT( historyCleared() ) ); - connect( part->commandHistory(), TQT_SIGNAL( commandAdded( VCommand* ) ), this, TQT_SLOT( slotCommandAdded( VCommand* ) ) ); - connect( part->commandHistory(), TQT_SIGNAL( commandExecuted( VCommand* ) ), this, TQT_SLOT( commandExecuted( VCommand* ) ) ); - connect( part->commandHistory(), TQT_SIGNAL( firstCommandRemoved() ), this, TQT_SLOT( removeFirstCommand() ) ); - connect( part->commandHistory(), TQT_SIGNAL( lastCommandRemoved() ), this, TQT_SLOT( removeLastCommand() ) ); - connect( this, TQT_SIGNAL( undoCommand( VCommand* ) ), part->commandHistory(), TQT_SLOT( undo( VCommand* ) ) ); - connect( this, TQT_SIGNAL( redoCommand( VCommand* ) ), part->commandHistory(), TQT_SLOT( redo( VCommand* ) ) ); - connect( this, TQT_SIGNAL( undoCommandsTo( VCommand* ) ), part->commandHistory(), TQT_SLOT( undoAllTo( VCommand* ) ) ); - connect( this, TQT_SIGNAL( redoCommandsTo( VCommand* ) ), part->commandHistory(), TQT_SLOT( redoAllTo( VCommand* ) ) ); + connect( m_history, TQ_SIGNAL( mouseButtonClicked( int, TQListViewItem*, const TQPoint&, int ) ), this, TQ_SLOT( commandClicked( int, TQListViewItem*, const TQPoint&, int ) ) ); + connect( m_groupCommands, TQ_SIGNAL( stateChanged( int ) ), this, TQ_SLOT( groupingChanged( int ) ) ); + connect( part->commandHistory(), TQ_SIGNAL( historyCleared() ), this, TQ_SLOT( historyCleared() ) ); + connect( part->commandHistory(), TQ_SIGNAL( commandAdded( VCommand* ) ), this, TQ_SLOT( slotCommandAdded( VCommand* ) ) ); + connect( part->commandHistory(), TQ_SIGNAL( commandExecuted( VCommand* ) ), this, TQ_SLOT( commandExecuted( VCommand* ) ) ); + connect( part->commandHistory(), TQ_SIGNAL( firstCommandRemoved() ), this, TQ_SLOT( removeFirstCommand() ) ); + connect( part->commandHistory(), TQ_SIGNAL( lastCommandRemoved() ), this, TQ_SLOT( removeLastCommand() ) ); + connect( this, TQ_SIGNAL( undoCommand( VCommand* ) ), part->commandHistory(), TQ_SLOT( undo( VCommand* ) ) ); + connect( this, TQ_SIGNAL( redoCommand( VCommand* ) ), part->commandHistory(), TQ_SLOT( redo( VCommand* ) ) ); + connect( this, TQ_SIGNAL( undoCommandsTo( VCommand* ) ), part->commandHistory(), TQ_SLOT( undoAllTo( VCommand* ) ) ); + connect( this, TQ_SIGNAL( redoCommandsTo( VCommand* ) ), part->commandHistory(), TQ_SLOT( redoAllTo( VCommand* ) ) ); } // VHistoryTab::VHistoryTab VHistoryTab::~VHistoryTab() diff --git a/karbon/dockers/vstrokedocker.cpp b/karbon/dockers/vstrokedocker.cpp index 13fe44c1..ea2ec0e1 100644 --- a/karbon/dockers/vstrokedocker.cpp +++ b/karbon/dockers/vstrokedocker.cpp @@ -55,7 +55,7 @@ VStrokeDocker::VStrokeDocker( KarbonPart* part, KarbonView* parent, const char* m_setLineWidth->setUnit( part->unit() ); TQToolTip::add( m_setLineWidth, i18n( "Set line width of actual selection" ) ); mainLayout->addWidget ( m_setLineWidth, 0, 1 ); - connect( m_setLineWidth, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( widthChanged() ) ); + connect( m_setLineWidth, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( widthChanged() ) ); TQLabel* capLabel = new TQLabel( i18n ( "Cap:" ), this ); mainLayout->addWidget( capLabel, 1, 0 ); @@ -79,7 +79,7 @@ VStrokeDocker::VStrokeDocker( KarbonPart* part, KarbonView* parent, const char* TQToolTip::add( button, i18n( "Square cap" ) ); m_capGroup->insert( button ); mainLayout->addWidget( m_capGroup, 1, 1 ); - connect( m_capGroup, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotCapChanged( int ) ) ); + connect( m_capGroup, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( slotCapChanged( int ) ) ); TQLabel* joinLabel = new TQLabel( i18n ( "Join:" ), this ); mainLayout->addWidget( joinLabel, 2, 0 ); @@ -104,7 +104,7 @@ VStrokeDocker::VStrokeDocker( KarbonPart* part, KarbonView* parent, const char* TQToolTip::add( button, i18n( "Bevel join" ) ); m_joinGroup->insert( button ); mainLayout->addWidget( m_joinGroup, 2, 1 ); - connect( m_joinGroup, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotJoinChanged( int ) ) ); + connect( m_joinGroup, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( slotJoinChanged( int ) ) ); mainLayout->setRowStretch( 3, 1 ); mainLayout->setColStretch( 1, 1 ); @@ -149,9 +149,9 @@ void VStrokeDocker::slotJoinChanged( int ID ) void VStrokeDocker::updateDocker() { - disconnect( m_setLineWidth, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( widthChanged() ) ); - disconnect( m_capGroup, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotCapChanged( int ) ) ); - disconnect( m_joinGroup, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotJoinChanged( int ) ) ); + disconnect( m_setLineWidth, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( widthChanged() ) ); + disconnect( m_capGroup, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( slotCapChanged( int ) ) ); + disconnect( m_joinGroup, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( slotJoinChanged( int ) ) ); switch( m_stroke.lineCap() ) { @@ -175,9 +175,9 @@ void VStrokeDocker::updateDocker() m_setLineWidth->changeValue( m_stroke.lineWidth() ); - connect( m_setLineWidth, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( widthChanged() ) ); - connect( m_capGroup, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotCapChanged( int ) ) ); - connect( m_joinGroup, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotJoinChanged( int ) ) ); + connect( m_setLineWidth, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( widthChanged() ) ); + connect( m_capGroup, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( slotCapChanged( int ) ) ); + connect( m_joinGroup, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( slotJoinChanged( int ) ) ); } void VStrokeDocker::widthChanged() @@ -197,15 +197,15 @@ void VStrokeDocker::setStroke( const VStroke &stroke ) void VStrokeDocker::setUnit( KoUnit::Unit unit ) { - disconnect( m_setLineWidth, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( widthChanged() ) ); - disconnect( m_capGroup, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotCapChanged( int ) ) ); - disconnect( m_joinGroup, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotJoinChanged( int ) ) ); + disconnect( m_setLineWidth, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( widthChanged() ) ); + disconnect( m_capGroup, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( slotCapChanged( int ) ) ); + disconnect( m_joinGroup, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( slotJoinChanged( int ) ) ); m_setLineWidth->setUnit( unit ); - connect( m_setLineWidth, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( widthChanged() ) ); - connect( m_capGroup, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotCapChanged( int ) ) ); - connect( m_joinGroup, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotJoinChanged( int ) ) ); + connect( m_setLineWidth, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( widthChanged() ) ); + connect( m_capGroup, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( slotCapChanged( int ) ) ); + connect( m_joinGroup, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( slotJoinChanged( int ) ) ); } #include "vstrokedocker.moc" diff --git a/karbon/dockers/vstyledocker.cpp b/karbon/dockers/vstyledocker.cpp index 9f3d12e6..ff41f72d 100644 --- a/karbon/dockers/vstyledocker.cpp +++ b/karbon/dockers/vstyledocker.cpp @@ -83,9 +83,9 @@ VStyleDocker::VStyleDocker( KarbonPart* part, KarbonView* parent, const char* /* KoPatternChooser *pPatternChooser = new KoPatternChooser( KarbonFactory::rServer()->patterns(), mTabWidget ); pPatternChooser->setCaption( i18n( "Patterns" ) ); - connect( pPatternChooser, TQT_SIGNAL(selected( KoIconItem * ) ), this, TQT_SLOT( slotItemSelected( KoIconItem * ))); - connect( KarbonFactory::rServer(), TQT_SIGNAL( patternAdded( KoIconItem * )), pPatternChooser, TQT_SLOT( addPattern( KoIconItem * ))); - connect( KarbonFactory::rServer(), TQT_SIGNAL( patternRemoved( KoIconItem * )), pPatternChooser, TQT_SLOT( removePattern( KoIconItem * ))); + connect( pPatternChooser, TQ_SIGNAL(selected( KoIconItem * ) ), this, TQ_SLOT( slotItemSelected( KoIconItem * ))); + connect( KarbonFactory::rServer(), TQ_SIGNAL( patternAdded( KoIconItem * )), pPatternChooser, TQ_SLOT( addPattern( KoIconItem * ))); + connect( KarbonFactory::rServer(), TQ_SIGNAL( patternRemoved( KoIconItem * )), pPatternChooser, TQ_SLOT( removePattern( KoIconItem * ))); mTabWidget->addTab( pPatternChooser, i18n( "Patterns" ) ); //Clipart @@ -147,9 +147,9 @@ ClipartWidget::ClipartWidget( TQPtrList<VClipartIconItem>* clipartItems, KarbonP //setFrameStyle( Box | Sunken ); layout->setMargin( 3 ); - connect( m_buttonGroup, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotButtonClicked( int ) ) ); - //connect( m_deleteClipartButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( deleteClipart() ) ); - connect( m_clipartChooser, TQT_SIGNAL( selected( KoIconItem* ) ), this, TQT_SLOT( clipartSelected( KoIconItem* ) ) ); + connect( m_buttonGroup, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( slotButtonClicked( int ) ) ); + //connect( m_deleteClipartButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( deleteClipart() ) ); + connect( m_clipartChooser, TQ_SIGNAL( selected( KoIconItem* ) ), this, TQ_SLOT( clipartSelected( KoIconItem* ) ) ); m_clipartChooser->setAutoDelete( false ); VClipartIconItem* item = 0L; diff --git a/karbon/dockers/vtransformdocker.cpp b/karbon/dockers/vtransformdocker.cpp index 69c9a87c..d3a5514f 100644 --- a/karbon/dockers/vtransformdocker.cpp +++ b/karbon/dockers/vtransformdocker.cpp @@ -106,23 +106,23 @@ VTransformDocker::enableSignals( bool enable ) { if( enable ) { - connect( m_x, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( translate() ) ); - connect( m_y, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( translate() ) ); - connect( m_width, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( scale() ) ); - connect( m_height, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( scale() ) ); - connect( m_shearX, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( shearX() ) ); - connect( m_shearY, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( shearY() ) ); - connect( m_rotate, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( rotate() ) ); + connect( m_x, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( translate() ) ); + connect( m_y, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( translate() ) ); + connect( m_width, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( scale() ) ); + connect( m_height, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( scale() ) ); + connect( m_shearX, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( shearX() ) ); + connect( m_shearY, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( shearY() ) ); + connect( m_rotate, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( rotate() ) ); } else { - disconnect( m_x, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( translate() ) ); - disconnect( m_y, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( translate() ) ); - disconnect( m_width, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( scale() ) ); - disconnect( m_height, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( scale() ) ); - disconnect( m_shearX, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( shearX() ) ); - disconnect( m_shearY, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( shearY() ) ); - disconnect( m_rotate, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( rotate() ) ); + disconnect( m_x, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( translate() ) ); + disconnect( m_y, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( translate() ) ); + disconnect( m_width, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( scale() ) ); + disconnect( m_height, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( scale() ) ); + disconnect( m_shearX, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( shearX() ) ); + disconnect( m_shearY, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( shearY() ) ); + disconnect( m_rotate, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( rotate() ) ); } } @@ -220,9 +220,9 @@ VTransformDocker::shearX() VShearCmd *cmd = new VShearCmd( &m_view->part()->document(), rect.center(), shear, 0 ); m_view->part()->addCommand( cmd ); m_part->repaintAllViews( true ); - disconnect( m_shearX, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( shearX() ) ); + disconnect( m_shearX, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( shearX() ) ); m_shearX->changeValue(0.0); - connect( m_shearX, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( shearX() ) ); + connect( m_shearX, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( shearX() ) ); } } @@ -238,9 +238,9 @@ VTransformDocker::shearY() VShearCmd *cmd = new VShearCmd( &m_view->part()->document(), rect.center(), 0, shear ); m_view->part()->addCommand( cmd ); m_part->repaintAllViews( true ); - disconnect( m_shearY, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( shearY() ) ); + disconnect( m_shearY, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( shearY() ) ); m_shearY->changeValue(0.0); - connect( m_shearY, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( shearY() ) ); + connect( m_shearY, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( shearY() ) ); } } @@ -255,9 +255,9 @@ VTransformDocker::rotate() VRotateCmd *cmd = new VRotateCmd( &m_view->part()->document(), center, angle ); m_view->part()->addCommand( cmd ); m_part->repaintAllViews( true ); - disconnect( m_rotate, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( rotate() ) ); + disconnect( m_rotate, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( rotate() ) ); m_rotate->setValue(0.0); - connect( m_rotate, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( rotate() ) ); + connect( m_rotate, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( rotate() ) ); } } diff --git a/karbon/karbon_part.cpp b/karbon/karbon_part.cpp index e3abb201..527a80f0 100644 --- a/karbon/karbon_part.cpp +++ b/karbon/karbon_part.cpp @@ -67,8 +67,8 @@ KarbonPart::KarbonPart( TQWidget* parentWidget, const char* widgetName, dcop = 0L; m_commandHistory = new VCommandHistory( this ); - connect( m_commandHistory, TQT_SIGNAL( documentRestored() ), this, TQT_SLOT( slotDocumentRestored() ) ); - connect( m_commandHistory, TQT_SIGNAL( commandExecuted( VCommand * ) ), this, TQT_SLOT( slotCommandExecuted( VCommand * ) ) ); + connect( m_commandHistory, TQ_SIGNAL( documentRestored() ), this, TQ_SLOT( slotDocumentRestored() ) ); + connect( m_commandHistory, TQ_SIGNAL( commandExecuted( VCommand * ) ), this, TQ_SLOT( slotCommandExecuted( VCommand * ) ) ); initConfig(); @@ -659,7 +659,7 @@ KarbonPart::mergeNativeFormat( const TQString &file ) void KarbonPart::addShell( KoMainWindow *shell ) { - connect( shell, TQT_SIGNAL( documentSaved() ), m_commandHistory, TQT_SLOT( documentSaved() ) ); + connect( shell, TQ_SIGNAL( documentSaved() ), m_commandHistory, TQ_SLOT( documentSaved() ) ); KoDocument::addShell( shell ); } diff --git a/karbon/karbon_view.cpp b/karbon/karbon_view.cpp index c5c02d66..a9535429 100644 --- a/karbon/karbon_view.cpp +++ b/karbon/karbon_view.cpp @@ -159,19 +159,19 @@ KarbonView::KarbonView( KarbonPart* p, TQWidget* parent, const char* name ) reorganizeGUI(); - connect( p, TQT_SIGNAL( unitChanged( KoUnit::Unit ) ), this, TQT_SLOT( setUnit( KoUnit::Unit ) ) ); + connect( p, TQ_SIGNAL( unitChanged( KoUnit::Unit ) ), this, TQ_SLOT( setUnit( KoUnit::Unit ) ) ); // widgets: m_horizRuler = new VRuler( TQt::Horizontal, this ); m_horizRuler->setUnit(p->unit()); - connect( p, TQT_SIGNAL( unitChanged( KoUnit::Unit ) ), m_horizRuler, TQT_SLOT( setUnit( KoUnit::Unit ) ) ); + connect( p, TQ_SIGNAL( unitChanged( KoUnit::Unit ) ), m_horizRuler, TQ_SLOT( setUnit( KoUnit::Unit ) ) ); m_vertRuler = new VRuler( TQt::Vertical, this ); m_vertRuler->setUnit(p->unit()); - connect( p, TQT_SIGNAL( unitChanged( KoUnit::Unit ) ), m_vertRuler, TQT_SLOT( setUnit( KoUnit::Unit ) ) ); + connect( p, TQ_SIGNAL( unitChanged( KoUnit::Unit ) ), m_vertRuler, TQ_SLOT( setUnit( KoUnit::Unit ) ) ); m_canvas = new VCanvas( this, this, p ); - connect( m_canvas, TQT_SIGNAL( contentsMoving( int, int ) ), this, TQT_SLOT( canvasContentsMoving( int, int ) ) ); + connect( m_canvas, TQ_SIGNAL( contentsMoving( int, int ) ), this, TQ_SLOT( canvasContentsMoving( int, int ) ) ); m_canvas->show(); @@ -262,27 +262,27 @@ KarbonView::createContainer( TQWidget *parent, int index, const TQDomElement &el mainWindow()->addDockWindow( m_toolbox, dock, false); mainWindow()->moveDockWindow( m_toolbox, dock, false, 0, 0 ); - //connect( m_toolbox, TQT_SIGNAL( activeToolChanged( VTool * ) ), this, TQT_SLOT( slotActiveToolChanged( VTool * ) ) ); + //connect( m_toolbox, TQ_SIGNAL( activeToolChanged( VTool * ) ), this, TQ_SLOT( slotActiveToolChanged( VTool * ) ) ); if( shell() ) { m_strokeFillPreview = new VStrokeFillPreview( part(), m_toolbox ); m_typeButtonBox = new VTypeButtonBox( part(), m_toolbox ); - connect( m_strokeFillPreview, TQT_SIGNAL( fillSelected() ), m_typeButtonBox, TQT_SLOT( setFill() ) ); - connect( m_strokeFillPreview, TQT_SIGNAL( strokeSelected() ), m_typeButtonBox, TQT_SLOT( setStroke() ) ); + connect( m_strokeFillPreview, TQ_SIGNAL( fillSelected() ), m_typeButtonBox, TQ_SLOT( setFill() ) ); + connect( m_strokeFillPreview, TQ_SIGNAL( strokeSelected() ), m_typeButtonBox, TQ_SLOT( setStroke() ) ); - connect( m_strokeFillPreview, TQT_SIGNAL( strokeChanged( const VStroke & ) ), this, TQT_SLOT( slotStrokeChanged( const VStroke & ) ) ); - connect( m_strokeFillPreview, TQT_SIGNAL( fillChanged( const VFill & ) ), this, TQT_SLOT( slotFillChanged( const VFill & ) ) ); + connect( m_strokeFillPreview, TQ_SIGNAL( strokeChanged( const VStroke & ) ), this, TQ_SLOT( slotStrokeChanged( const VStroke & ) ) ); + connect( m_strokeFillPreview, TQ_SIGNAL( fillChanged( const VFill & ) ), this, TQ_SLOT( slotFillChanged( const VFill & ) ) ); - connect( m_strokeFillPreview, TQT_SIGNAL( strokeSelected() ), m_ColorManager, TQT_SLOT( setStrokeDocker() ) ); - connect( m_strokeFillPreview, TQT_SIGNAL( fillSelected( ) ), m_ColorManager, TQT_SLOT( setFillDocker() ) ); + connect( m_strokeFillPreview, TQ_SIGNAL( strokeSelected() ), m_ColorManager, TQ_SLOT( setStrokeDocker() ) ); + connect( m_strokeFillPreview, TQ_SIGNAL( fillSelected( ) ), m_ColorManager, TQ_SLOT( setFillDocker() ) ); - connect( m_part->commandHistory(), TQT_SIGNAL( commandExecuted( VCommand* ) ), this, TQT_SLOT( commandExecuted( VCommand* ) ) ); + connect( m_part->commandHistory(), TQ_SIGNAL( commandExecuted( VCommand* ) ), this, TQ_SLOT( commandExecuted( VCommand* ) ) ); - connect( m_ColorManager, TQT_SIGNAL(modeChanged( KDualColorButton::DualColor)), this, TQT_SLOT( strokeFillSelectionChanged(KDualColorButton::DualColor) ) ); - connect( m_ColorManager, TQT_SIGNAL(bgColorChanged( const TQColor & )), this, TQT_SLOT(colorChanged( const TQColor & )) ); - connect( m_ColorManager, TQT_SIGNAL(fgColorChanged( const TQColor & )), this, TQT_SLOT(colorChanged( const TQColor & )) ); + connect( m_ColorManager, TQ_SIGNAL(modeChanged( KDualColorButton::DualColor)), this, TQ_SLOT( strokeFillSelectionChanged(KDualColorButton::DualColor) ) ); + connect( m_ColorManager, TQ_SIGNAL(bgColorChanged( const TQColor & )), this, TQ_SLOT(colorChanged( const TQColor & )) ); + connect( m_ColorManager, TQ_SIGNAL(fgColorChanged( const TQColor & )), this, TQ_SLOT(colorChanged( const TQColor & )) ); selectionChanged(); //create toolbars @@ -303,10 +303,10 @@ KarbonView::removeContainer( TQWidget *container, TQWidget *parent, if( shell() && container == m_toolbox ) { - disconnect( m_part->commandHistory(), TQT_SIGNAL( commandExecuted( VCommand* ) ), this, TQT_SLOT( commandExecuted( VCommand* ) ) ); - disconnect( m_ColorManager, TQT_SIGNAL(modeChanged( KDualColorButton::DualColor)), this, TQT_SLOT( strokeFillSelectionChanged(KDualColorButton::DualColor) ) ); - disconnect( m_ColorManager, TQT_SIGNAL(bgColorChanged( const TQColor & )), this, TQT_SLOT(colorChanged( const TQColor & )) ); - disconnect( m_ColorManager, TQT_SIGNAL(fgColorChanged( const TQColor & )), this, TQT_SLOT(colorChanged( const TQColor & )) ); + disconnect( m_part->commandHistory(), TQ_SIGNAL( commandExecuted( VCommand* ) ), this, TQ_SLOT( commandExecuted( VCommand* ) ) ); + disconnect( m_ColorManager, TQ_SIGNAL(modeChanged( KDualColorButton::DualColor)), this, TQ_SLOT( strokeFillSelectionChanged(KDualColorButton::DualColor) ) ); + disconnect( m_ColorManager, TQ_SIGNAL(bgColorChanged( const TQColor & )), this, TQ_SLOT(colorChanged( const TQColor & )) ); + disconnect( m_ColorManager, TQ_SIGNAL(fgColorChanged( const TQColor & )), this, TQ_SLOT(colorChanged( const TQColor & )) ); delete m_toolbox; m_toolbox = 0L; m_toolController->youAintGotNoToolBox(); @@ -941,11 +941,11 @@ KarbonView::initActions() // view -----> m_viewAction = new TDESelectAction( i18n( "View &Mode" ), 0, this, - TQT_SLOT( viewModeChanged() ), actionCollection(), "view_mode" ); + TQ_SLOT( viewModeChanged() ), actionCollection(), "view_mode" ); m_zoomAction = new TDESelectAction( i18n( "&Zoom" ), "viewmag", 0, this, - TQT_SLOT( zoomChanged() ), actionCollection(), "view_zoom" ); + TQ_SLOT( zoomChanged() ), actionCollection(), "view_zoom" ); TQStringList mstl; mstl << i18n( "Normal" ) << i18n( "Wireframe" ); @@ -975,11 +975,11 @@ KarbonView::initActions() m_zoomAction->setEditable( true ); m_zoomAction->setCurrentItem( 7 ); - KStdAction::zoomIn( this, TQT_SLOT( viewZoomIn() ), actionCollection(), "view_zoom_in" ); - KStdAction::zoomOut( this, TQT_SLOT( viewZoomOut() ), actionCollection(), "view_zoom_out" ); + KStdAction::zoomIn( this, TQ_SLOT( viewZoomIn() ), actionCollection(), "view_zoom_in" ); + KStdAction::zoomOut( this, TQ_SLOT( viewZoomOut() ), actionCollection(), "view_zoom_out" ); m_showPageMargins = new TDEToggleAction( i18n("Show Page Margins"), "view_margins", 0, actionCollection(), "view_show_margins" ); - connect( m_showPageMargins, TQT_SIGNAL(toggled(bool)), TQT_SLOT(togglePageMargins(bool))); + connect( m_showPageMargins, TQ_SIGNAL(toggled(bool)), TQ_SLOT(togglePageMargins(bool))); #if KDE_IS_VERSION(3,2,90) m_showPageMargins->setCheckedState(i18n("Hide Page Margins")); #endif @@ -990,132 +990,132 @@ KarbonView::initActions() // edit -----> KStdAction::cut( this, - TQT_SLOT( editCut() ), actionCollection(), "edit_cut" ); + TQ_SLOT( editCut() ), actionCollection(), "edit_cut" ); KStdAction::copy( this, - TQT_SLOT( editCopy() ), actionCollection(), "edit_copy" ); + TQ_SLOT( editCopy() ), actionCollection(), "edit_copy" ); KStdAction::paste( this, - TQT_SLOT( editPaste() ), actionCollection(), "edit_paste" ); - KStdAction::selectAll( this, TQT_SLOT( editSelectAll() ), actionCollection(), "edit_select_all" ); - KStdAction::deselect( this, TQT_SLOT( editDeselectAll() ), actionCollection(), "edit_deselect_all" ); + TQ_SLOT( editPaste() ), actionCollection(), "edit_paste" ); + KStdAction::selectAll( this, TQ_SLOT( editSelectAll() ), actionCollection(), "edit_select_all" ); + KStdAction::deselect( this, TQ_SLOT( editDeselectAll() ), actionCollection(), "edit_deselect_all" ); new TDEAction( i18n( "&Import Graphic..." ), 0, 0, this, - TQT_SLOT( fileImportGraphic() ), actionCollection(), "file_import" ); + TQ_SLOT( fileImportGraphic() ), actionCollection(), "file_import" ); m_deleteSelectionAction = new TDEAction( i18n( "D&elete" ), "edit-delete", TQKeySequence( "Del" ), this, - TQT_SLOT( editDeleteSelection() ), actionCollection(), "edit_delete" ); + TQ_SLOT( editDeleteSelection() ), actionCollection(), "edit_delete" ); new TDEAction( i18n( "&History" ), 0, 0, this, - TQT_SLOT( editPurgeHistory() ), actionCollection(), "edit_purge_history" ); + TQ_SLOT( editPurgeHistory() ), actionCollection(), "edit_purge_history" ); // edit <----- // object -----> new TDEAction( i18n( "&Duplicate" ), "duplicate", TQKeySequence( "Ctrl+D" ), this, - TQT_SLOT( selectionDuplicate() ), actionCollection(), "object_duplicate" ); + TQ_SLOT( selectionDuplicate() ), actionCollection(), "object_duplicate" ); new TDEAction( i18n( "Bring to &Front" ), "bring_forward", TQKeySequence( "Ctrl+Shift+]" ), this, - TQT_SLOT( selectionBringToFront() ), actionCollection(), "object_move_totop" ); + TQ_SLOT( selectionBringToFront() ), actionCollection(), "object_move_totop" ); new TDEAction( i18n( "&Raise" ), "raise", TQKeySequence( "Ctrl+]" ), this, - TQT_SLOT( selectionMoveUp() ), actionCollection(), "object_move_up" ); + TQ_SLOT( selectionMoveUp() ), actionCollection(), "object_move_up" ); new TDEAction( i18n( "&Lower" ), "lower", TQKeySequence( "Ctrl+[" ), this, - TQT_SLOT( selectionMoveDown() ), actionCollection(), "object_move_down" ); + TQ_SLOT( selectionMoveDown() ), actionCollection(), "object_move_down" ); new TDEAction( i18n( "Send to &Back" ), "send_backward", TQKeySequence( "Ctrl+Shift+[" ), this, - TQT_SLOT( selectionSendToBack() ), actionCollection(), "object_move_tobottom" ); + TQ_SLOT( selectionSendToBack() ), actionCollection(), "object_move_tobottom" ); new TDEAction( i18n( "Align Left" ), "aoleft", 0, this, - TQT_SLOT( selectionAlignHorizontalLeft() ), + TQ_SLOT( selectionAlignHorizontalLeft() ), actionCollection(), "object_align_horizontal_left" ); new TDEAction( i18n( "Align Center (Horizontal)" ), "aocenterh", 0, this, - TQT_SLOT( selectionAlignHorizontalCenter() ), + TQ_SLOT( selectionAlignHorizontalCenter() ), actionCollection(), "object_align_horizontal_center" ); new TDEAction( i18n( "Align Right" ), "aoright", 0, this, - TQT_SLOT( selectionAlignHorizontalRight() ), + TQ_SLOT( selectionAlignHorizontalRight() ), actionCollection(), "object_align_horizontal_right" ); new TDEAction( i18n( "Align Top" ), "aotop", 0, this, - TQT_SLOT( selectionAlignVerticalTop() ), + TQ_SLOT( selectionAlignVerticalTop() ), actionCollection(), "object_align_vertical_top" ); new TDEAction( i18n( "Align Middle (Vertical)" ), "aocenterv", 0, this, - TQT_SLOT( selectionAlignVerticalCenter() ), + TQ_SLOT( selectionAlignVerticalCenter() ), actionCollection(), "object_align_vertical_center" ); new TDEAction( i18n( "Align Bottom" ), "aobottom", 0, this, - TQT_SLOT( selectionAlignVerticalBottom() ), + TQ_SLOT( selectionAlignVerticalBottom() ), actionCollection(), "object_align_vertical_bottom" ); new TDEAction( i18n( "Distribute Center (Horizontal)" ), "", 0, this, - TQT_SLOT( selectionDistributeHorizontalCenter() ), + TQ_SLOT( selectionDistributeHorizontalCenter() ), actionCollection(), "object_distribute_horizontal_center" ); new TDEAction( i18n( "Distribute Gaps (Horizontal)" ), "", 0, this, - TQT_SLOT( selectionDistributeHorizontalGap() ), + TQ_SLOT( selectionDistributeHorizontalGap() ), actionCollection(), "object_distribute_horizontal_gap" ); new TDEAction( i18n( "Distribute Left Borders" ), "", 0, this, - TQT_SLOT( selectionDistributeHorizontalLeft() ), + TQ_SLOT( selectionDistributeHorizontalLeft() ), actionCollection(), "object_distribute_horizontal_left" ); new TDEAction( i18n( "Distribute Right Borders" ), "", 0, this, - TQT_SLOT( selectionDistributeHorizontalRight() ), + TQ_SLOT( selectionDistributeHorizontalRight() ), actionCollection(), "object_distribute_horizontal_right" ); new TDEAction( i18n( "Distribute Center (Vertical)" ), "", 0, this, - TQT_SLOT( selectionDistributeVerticalCenter() ), + TQ_SLOT( selectionDistributeVerticalCenter() ), actionCollection(), "object_distribute_vertical_center" ); new TDEAction( i18n( "Distribute Gaps (Vertical)" ), "", 0, this, - TQT_SLOT( selectionDistributeVerticalGap() ), + TQ_SLOT( selectionDistributeVerticalGap() ), actionCollection(), "object_distribute_vertical_gap" ); new TDEAction( i18n( "Distribute Bottom Borders" ), "", 0, this, - TQT_SLOT( selectionDistributeVerticalBottom() ), + TQ_SLOT( selectionDistributeVerticalBottom() ), actionCollection(), "object_distribute_vertical_bottom" ); new TDEAction( i18n( "Distribute Top Borders" ), "", 0, this, - TQT_SLOT( selectionDistributeVerticalTop() ), + TQ_SLOT( selectionDistributeVerticalTop() ), actionCollection(), "object_distribute_vertical_top" ); - m_showRulerAction = new TDEToggleAction( i18n( "Show Rulers" ), 0, this, TQT_SLOT( showRuler() ), actionCollection(), "view_show_ruler" ); + m_showRulerAction = new TDEToggleAction( i18n( "Show Rulers" ), 0, this, TQ_SLOT( showRuler() ), actionCollection(), "view_show_ruler" ); #if KDE_IS_VERSION(3,2,90) m_showRulerAction->setCheckedState(i18n("Hide Rulers")); #endif m_showRulerAction->setToolTip( i18n( "Shows or hides rulers." ) ); m_showRulerAction->setChecked( false ); - m_showGridAction = new TDEToggleAction( i18n( "Show Grid" ), "view_grid", this, TQT_SLOT( showGrid() ), actionCollection(), "view_show_grid" ); + m_showGridAction = new TDEToggleAction( i18n( "Show Grid" ), "view_grid", this, TQ_SLOT( showGrid() ), actionCollection(), "view_show_grid" ); #if KDE_IS_VERSION(3,2,90) m_showGridAction->setCheckedState(i18n("Hide Grid")); #endif m_showGridAction->setToolTip( i18n( "Shows or hides grid." ) ); //m_showGridAction->setChecked( true ); - m_snapGridAction = new TDEToggleAction( i18n( "Snap to Grid" ), 0, this, TQT_SLOT( snapToGrid() ), actionCollection(), "view_snap_to_grid" ); + m_snapGridAction = new TDEToggleAction( i18n( "Snap to Grid" ), 0, this, TQ_SLOT( snapToGrid() ), actionCollection(), "view_snap_to_grid" ); m_snapGridAction->setToolTip( i18n( "Snaps to grid." ) ); //m_snapGridAction->setChecked( true ); m_groupObjects = new TDEAction( i18n( "&Group Objects" ), "group", TQKeySequence( "Ctrl+G" ), this, - TQT_SLOT( groupSelection() ), actionCollection(), "selection_group" ); + TQ_SLOT( groupSelection() ), actionCollection(), "selection_group" ); m_ungroupObjects = new TDEAction( i18n( "&Ungroup Objects" ), "ungroup", TQKeySequence( "Ctrl+Shift+G" ), this, - TQT_SLOT( ungroupSelection() ), actionCollection(), "selection_ungroup" ); + TQ_SLOT( ungroupSelection() ), actionCollection(), "selection_ungroup" ); m_closePath = new TDEAction( i18n( "&Close Path" ), TQKeySequence( "Ctrl+U" ), this, - TQT_SLOT( closePath() ), actionCollection(), "close_path" ); + TQ_SLOT( closePath() ), actionCollection(), "close_path" ); // object <----- // line style (dashes) - m_lineStyleAction = new KoLineStyleAction( i18n( "Line Style" ), "linestyle", this, TQT_SLOT( setLineStyle( int ) ), actionCollection(), "setLineStyle" ); + m_lineStyleAction = new KoLineStyleAction( i18n( "Line Style" ), "linestyle", this, TQ_SLOT( setLineStyle( int ) ), actionCollection(), "setLineStyle" ); // line width m_setLineWidth = new KoUnitDoubleSpinComboBox( this, 0.0, 1000.0, 0.5, 1.0, KoUnit::U_PT, 1 ); - new KWidgetAction( m_setLineWidth, i18n( "Set Line Width" ), 0, this, TQT_SLOT( setLineWidth() ), actionCollection(), "setLineWidth" ); + new KWidgetAction( m_setLineWidth, i18n( "Set Line Width" ), 0, this, TQ_SLOT( setLineWidth() ), actionCollection(), "setLineWidth" ); m_setLineWidth->insertItem( 0.25 ); m_setLineWidth->insertItem( 0.5 ); m_setLineWidth->insertItem( 0.75 ); @@ -1126,14 +1126,14 @@ KarbonView::initActions() m_setLineWidth->insertItem( 5.0 ); m_setLineWidth->insertItem( 10.0 ); m_setLineWidth->insertItem( 20.0 ); - connect( m_setLineWidth, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( setLineWidth() ) ); + connect( m_setLineWidth, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( setLineWidth() ) ); m_configureAction = new TDEAction( i18n( "Configure Karbon..." ), "configure", 0, this, - TQT_SLOT( configure() ), actionCollection(), "configure" ); + TQ_SLOT( configure() ), actionCollection(), "configure" ); new TDEAction( i18n( "Page &Layout..." ), 0, this, - TQT_SLOT( pageLayout() ), actionCollection(), "page_layout" ); + TQ_SLOT( pageLayout() ), actionCollection(), "page_layout" ); m_contextHelpAction = new KoContextHelpAction( actionCollection(), this ); } @@ -1470,7 +1470,7 @@ void KarbonView::createDocumentTabDock() m_DocumentTab = new VDocumentTab(this, this); m_DocumentTab->setCaption(i18n("Document")); paletteManager()->addWidget(m_DocumentTab, "DocumentTabDock", "DocumentPanel"); - connect( m_part, TQT_SIGNAL( unitChanged( KoUnit::Unit ) ), m_DocumentTab, TQT_SLOT( updateDocumentInfo() ) ); + connect( m_part, TQ_SIGNAL( unitChanged( KoUnit::Unit ) ), m_DocumentTab, TQ_SLOT( updateDocumentInfo() ) ); } void KarbonView::createLayersTabDock() @@ -1493,7 +1493,7 @@ void KarbonView::createStrokeDock() m_strokeDocker->setCaption(i18n("Stroke Properties")); paletteManager()->addWidget(m_strokeDocker, "StrokeTabDock", "StrokePanel"); - connect( part(), TQT_SIGNAL( unitChanged( KoUnit::Unit ) ), m_strokeDocker, TQT_SLOT( setUnit( KoUnit::Unit ) ) ); + connect( part(), TQ_SIGNAL( unitChanged( KoUnit::Unit ) ), m_strokeDocker, TQ_SLOT( setUnit( KoUnit::Unit ) ) ); } void KarbonView::createColorDock() @@ -1502,7 +1502,7 @@ void KarbonView::createColorDock() //m_ColorManager->setCaption(i18n("Stroke Properties")); paletteManager()->addWidget(m_ColorManager, "ColorTabDock", "ColorPanel"); - connect( this, TQT_SIGNAL( selectionChange() ), m_ColorManager, TQT_SLOT( update() ) ); + connect( this, TQ_SIGNAL( selectionChange() ), m_ColorManager, TQ_SLOT( update() ) ); } void KarbonView::createTransformDock() @@ -1511,8 +1511,8 @@ void KarbonView::createTransformDock() m_TransformDocker->setCaption(i18n("Transform")); paletteManager()->addWidget(m_TransformDocker, "TransformTabDock", "TransformPanel"); - connect( this, TQT_SIGNAL( selectionChange() ), m_TransformDocker, TQT_SLOT( update() ) ); - connect( part(), TQT_SIGNAL( unitChanged( KoUnit::Unit ) ), m_TransformDocker, TQT_SLOT( setUnit( KoUnit::Unit ) ) ); + connect( this, TQ_SIGNAL( selectionChange() ), m_TransformDocker, TQ_SLOT( update() ) ); + connect( part(), TQ_SIGNAL( unitChanged( KoUnit::Unit ) ), m_TransformDocker, TQ_SLOT( setUnit( KoUnit::Unit ) ) ); } void KarbonView::createResourceDock() diff --git a/karbon/plugins/flattenpath/flattenpathplugin.cpp b/karbon/plugins/flattenpath/flattenpathplugin.cpp index 4dbb2b5e..a19b3f2f 100644 --- a/karbon/plugins/flattenpath/flattenpathplugin.cpp +++ b/karbon/plugins/flattenpath/flattenpathplugin.cpp @@ -38,7 +38,7 @@ FlattenPathPlugin::FlattenPathPlugin( KarbonView *parent, const char* name, cons { new TDEAction( i18n( "&Flatten Path..." ), "14_flatten", 0, this, - TQT_SLOT( slotFlattenPath() ), actionCollection(), "path_flatten" ); + TQ_SLOT( slotFlattenPath() ), actionCollection(), "path_flatten" ); m_flattenPathDlg = new VFlattenDlg(); m_flattenPathDlg->setFlatness( 0.2 ); @@ -62,8 +62,8 @@ VFlattenDlg::VFlattenDlg( TQWidget* parent, const char* name ) group->setMinimumWidth( 300 ); // signals and slots: - connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( accept() ) ); - connect( this, TQT_SIGNAL( cancelClicked() ), this, TQT_SLOT( reject() ) ); + connect( this, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( accept() ) ); + connect( this, TQ_SIGNAL( cancelClicked() ), this, TQ_SLOT( reject() ) ); setMainWidget( group ); setFixedSize( baseSize() ); diff --git a/karbon/plugins/imagetool/vimagetool.cpp b/karbon/plugins/imagetool/vimagetool.cpp index 749e07a1..000aa776 100644 --- a/karbon/plugins/imagetool/vimagetool.cpp +++ b/karbon/plugins/imagetool/vimagetool.cpp @@ -123,7 +123,7 @@ VImageTool::setup( TDEActionCollection *collection ) if( m_action == 0 ) { - m_action = new TDERadioAction( i18n( "Image Tool" ), "14_image", TQt::SHIFT+TQt::Key_H, this, TQT_SLOT( activate() ), collection, name() ); + m_action = new TDERadioAction( i18n( "Image Tool" ), "14_image", TQt::SHIFT+TQt::Key_H, this, TQ_SLOT( activate() ), collection, name() ); m_action->setToolTip( i18n( "Image" ) ); m_action->setExclusiveGroup( "misc" ); //m_ownAction = true; diff --git a/karbon/plugins/insertknots/insertknotsplugin.cpp b/karbon/plugins/insertknots/insertknotsplugin.cpp index a40b65da..dcf8ef85 100644 --- a/karbon/plugins/insertknots/insertknotsplugin.cpp +++ b/karbon/plugins/insertknots/insertknotsplugin.cpp @@ -37,7 +37,7 @@ InsertKnotsPlugin::InsertKnotsPlugin( KarbonView *parent, const char* name, cons { new TDEAction( i18n( "&Insert Knots..." ), "14_insertknots", 0, this, - TQT_SLOT( slotInsertKnots() ), actionCollection(), "path_insert_knots" ); + TQ_SLOT( slotInsertKnots() ), actionCollection(), "path_insert_knots" ); m_insertKnotsDlg = new VInsertKnotsDlg(); } @@ -62,8 +62,8 @@ VInsertKnotsDlg::VInsertKnotsDlg( TQWidget* parent, const char* name ) group->setMinimumWidth( 300 ); // signals and slots: - connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( accept() ) ); - connect( this, TQT_SIGNAL( cancelClicked() ), this, TQT_SLOT( reject() ) ); + connect( this, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( accept() ) ); + connect( this, TQ_SIGNAL( cancelClicked() ), this, TQ_SLOT( reject() ) ); setMainWidget( group ); setFixedSize( baseSize() ); diff --git a/karbon/plugins/roundcorners/roundcornersplugin.cpp b/karbon/plugins/roundcorners/roundcornersplugin.cpp index f703728f..fc435a43 100644 --- a/karbon/plugins/roundcorners/roundcornersplugin.cpp +++ b/karbon/plugins/roundcorners/roundcornersplugin.cpp @@ -36,7 +36,7 @@ VRoundCornersPlugin::VRoundCornersPlugin( KarbonView *parent, const char* name, { new TDEAction( i18n( "&Round Corners..." ), "14_roundcorners", 0, this, - TQT_SLOT( slotRoundCorners() ), actionCollection(), "path_round_corners" ); + TQ_SLOT( slotRoundCorners() ), actionCollection(), "path_round_corners" ); m_roundCornersDlg = new VRoundCornersDlg(); m_roundCornersDlg->setRadius( 10.0 ); @@ -66,8 +66,8 @@ VRoundCornersDlg::VRoundCornersDlg( TQWidget* parent, const char* name ) group->setMinimumWidth( 300 ); // signals and slots: - connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( accept() ) ); - connect( this, TQT_SIGNAL( cancelClicked() ), this, TQT_SLOT( reject() ) ); + connect( this, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( accept() ) ); + connect( this, TQ_SIGNAL( cancelClicked() ), this, TQ_SLOT( reject() ) ); setMainWidget( group ); setFixedSize( baseSize() ); diff --git a/karbon/plugins/shadoweffect/shadoweffectplugin.cpp b/karbon/plugins/shadoweffect/shadoweffectplugin.cpp index 04d6ae68..25920691 100644 --- a/karbon/plugins/shadoweffect/shadoweffectplugin.cpp +++ b/karbon/plugins/shadoweffect/shadoweffectplugin.cpp @@ -42,7 +42,7 @@ ShadowEffectPlugin::ShadowEffectPlugin( KarbonView *parent, const char* name, co { new TDEAction( i18n( "&Shadow Effect..." ), "shadowRB", 0, this, - TQT_SLOT( slotShadowEffect() ), actionCollection(), "object_shadow" ); + TQ_SLOT( slotShadowEffect() ), actionCollection(), "object_shadow" ); m_shadowEffectDlg = new VShadowEffectDlg(); m_shadowEffectDlg->setDistance( 2 ); @@ -78,8 +78,8 @@ VShadowEffectDlg::VShadowEffectDlg( TQWidget* parent, const char* name ) m_opacity->setSuffix(i18n("%")); // signals and slots: - connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( accept() ) ); - connect( this, TQT_SIGNAL( cancelClicked() ), this, TQT_SLOT( reject() ) ); + connect( this, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( accept() ) ); + connect( this, TQ_SIGNAL( cancelClicked() ), this, TQ_SLOT( reject() ) ); setMainWidget( group ); } diff --git a/karbon/plugins/whirlpinch/whirlpinchplugin.cpp b/karbon/plugins/whirlpinch/whirlpinchplugin.cpp index d4565752..13b2afe5 100644 --- a/karbon/plugins/whirlpinch/whirlpinchplugin.cpp +++ b/karbon/plugins/whirlpinch/whirlpinchplugin.cpp @@ -42,7 +42,7 @@ WhirlPinchPlugin::WhirlPinchPlugin( KarbonView *parent, const char* name, const { new TDEAction( i18n( "&Whirl/Pinch..." ), "14_whirl", 0, this, - TQT_SLOT( slotWhirlPinch() ), actionCollection(), "path_whirlpinch" ); + TQ_SLOT( slotWhirlPinch() ), actionCollection(), "path_whirlpinch" ); m_whirlPinchDlg = new VWhirlPinchDlg(); m_whirlPinchDlg->setAngle( 20.0 ); @@ -73,8 +73,8 @@ VWhirlPinchDlg::VWhirlPinchDlg( TQWidget* parent, const char* name ) group->setMinimumWidth( 300 ); // signals and slots: - connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( accept() ) ); - connect( this, TQT_SIGNAL( cancelClicked() ), this, TQT_SLOT( reject() ) ); + connect( this, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( accept() ) ); + connect( this, TQ_SIGNAL( cancelClicked() ), this, TQ_SLOT( reject() ) ); setMainWidget( group ); setFixedSize( baseSize() ); diff --git a/karbon/plugins/zoomtool/vzoomtool.cpp b/karbon/plugins/zoomtool/vzoomtool.cpp index 1cecb94a..cbd15d17 100644 --- a/karbon/plugins/zoomtool/vzoomtool.cpp +++ b/karbon/plugins/zoomtool/vzoomtool.cpp @@ -161,7 +161,7 @@ VZoomTool::setup( TDEActionCollection *collection ) if( m_action == 0 ) { - m_action = new TDERadioAction( i18n( "Zoom Tool" ), "14_zoom", TQt::SHIFT+TQt::Key_H, this, TQT_SLOT( activate() ), collection, name() ); + m_action = new TDERadioAction( i18n( "Zoom Tool" ), "14_zoom", TQt::SHIFT+TQt::Key_H, this, TQ_SLOT( activate() ), collection, name() ); m_action->setToolTip( i18n( "Zoom" ) ); m_action->setExclusiveGroup( "misc" ); //m_ownAction = true; diff --git a/karbon/tools/vellipsetool.cpp b/karbon/tools/vellipsetool.cpp index a22e28b7..624c6d91 100644 --- a/karbon/tools/vellipsetool.cpp +++ b/karbon/tools/vellipsetool.cpp @@ -44,7 +44,7 @@ VEllipseOptionsWidget::VEllipseOptionsWidget( KarbonPart *part, TQWidget *parent m_type->insertItem( i18n( "Section" ), VEllipse::section ); m_type->insertItem( i18n( "Pie" ), VEllipse::cut ); m_type->insertItem( i18n( "Arc" ), VEllipse::arc ); - connect( m_type, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( typeChanged( int ) ) ); + connect( m_type, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( typeChanged( int ) ) ); // add width/height-input: m_widthLabel = new TQLabel( i18n( "object width", "Width:" ), group ); @@ -268,7 +268,7 @@ VEllipseTool::setup( TDEActionCollection *collection ) if( m_action == 0 ) { - m_action = new TDERadioAction( i18n( "Ellipse Tool" ), "14_ellipse", TQt::SHIFT+TQt::Key_H, this, TQT_SLOT( activate() ), collection, name() ); + m_action = new TDERadioAction( i18n( "Ellipse Tool" ), "14_ellipse", TQt::SHIFT+TQt::Key_H, this, TQ_SLOT( activate() ), collection, name() ); m_action->setToolTip( i18n( "Ellipse" ) ); m_action->setExclusiveGroup( "shapes" ); //m_ownAction = true; diff --git a/karbon/tools/vgradienttool.cpp b/karbon/tools/vgradienttool.cpp index e7d2db3c..eeebd7ae 100644 --- a/karbon/tools/vgradienttool.cpp +++ b/karbon/tools/vgradienttool.cpp @@ -75,8 +75,8 @@ VGradientTool::activate() VStrokeFillPreview* preview = view()->strokeFillPreview(); if( preview ) { - connect( preview, TQT_SIGNAL( fillSelected() ), this, TQT_SLOT( targetChanged() ) ); - connect( preview, TQT_SIGNAL( strokeSelected() ), this, TQT_SLOT( targetChanged() ) ); + connect( preview, TQ_SIGNAL( fillSelected() ), this, TQ_SLOT( targetChanged() ) ); + connect( preview, TQ_SIGNAL( strokeSelected() ), this, TQ_SLOT( targetChanged() ) ); } view()->repaintAll( view()->part()->document().selection()->boundingBox() ); } @@ -94,8 +94,8 @@ VGradientTool::deactivate() VStrokeFillPreview* preview = view()->strokeFillPreview(); if( preview ) { - disconnect( preview, TQT_SIGNAL( fillSelected() ), this, TQT_SLOT( targetChanged() ) ); - disconnect( preview, TQT_SIGNAL( strokeSelected() ), this, TQT_SLOT( targetChanged() ) ); + disconnect( preview, TQ_SIGNAL( fillSelected() ), this, TQ_SLOT( targetChanged() ) ); + disconnect( preview, TQ_SIGNAL( strokeSelected() ), this, TQ_SLOT( targetChanged() ) ); } view()->repaintAll( view()->part()->document().selection()->boundingBox() ); } @@ -476,7 +476,7 @@ VGradientTool::setup( TDEActionCollection *collection ) if( m_action == 0 ) { - m_action = new TDERadioAction( i18n( "Gradient Tool" ), "14_gradient", TQt::Key_G, this, TQT_SLOT( activate() ), collection, name() ); + m_action = new TDERadioAction( i18n( "Gradient Tool" ), "14_gradient", TQt::Key_G, this, TQ_SLOT( activate() ), collection, name() ); m_action->setToolTip( i18n( "Gradient" ) ); m_action->setExclusiveGroup( "misc" ); //m_ownAction = true; diff --git a/karbon/tools/vpatterntool.cpp b/karbon/tools/vpatterntool.cpp index 8c42d5e0..d6d0e2fd 100644 --- a/karbon/tools/vpatterntool.cpp +++ b/karbon/tools/vpatterntool.cpp @@ -67,8 +67,8 @@ VPatternWidget::VPatternWidget( TQPtrList<KoIconItem>* patterns, VTool*, TQWidge //setFrameStyle( Box | Sunken ); layout->setMargin( 3 ); - connect( m_buttonGroup, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotButtonClicked( int ) ) ); - connect( m_patternChooser, TQT_SIGNAL( selected( KoIconItem* ) ), this, TQT_SLOT( patternSelected( KoIconItem* ) ) ); + connect( m_buttonGroup, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( slotButtonClicked( int ) ) ); + connect( m_patternChooser, TQ_SIGNAL( selected( KoIconItem* ) ), this, TQ_SLOT( patternSelected( KoIconItem* ) ) ); KoIconItem* item; for( item = patterns->first(); item; item = patterns->next() ) @@ -150,8 +150,8 @@ VPatternTool::activate() VStrokeFillPreview* preview = view()->strokeFillPreview(); if( preview ) { - connect( preview, TQT_SIGNAL( fillSelected() ), this, TQT_SLOT( targetChanged() ) ); - connect( preview, TQT_SIGNAL( strokeSelected() ), this, TQT_SLOT( targetChanged() ) ); + connect( preview, TQ_SIGNAL( fillSelected() ), this, TQ_SLOT( targetChanged() ) ); + connect( preview, TQ_SIGNAL( strokeSelected() ), this, TQ_SLOT( targetChanged() ) ); } view()->repaintAll( view()->part()->document().selection()->boundingBox() ); } @@ -169,8 +169,8 @@ VPatternTool::deactivate() VStrokeFillPreview* preview = view()->strokeFillPreview(); if( preview ) { - disconnect( preview, TQT_SIGNAL( fillSelected() ), this, TQT_SLOT( targetChanged() ) ); - disconnect( preview, TQT_SIGNAL( strokeSelected() ), this, TQT_SLOT( targetChanged() ) ); + disconnect( preview, TQ_SIGNAL( fillSelected() ), this, TQ_SLOT( targetChanged() ) ); + disconnect( preview, TQ_SIGNAL( strokeSelected() ), this, TQ_SLOT( targetChanged() ) ); } view()->repaintAll( view()->part()->document().selection()->boundingBox() ); } @@ -459,7 +459,7 @@ VPatternTool::setup( TDEActionCollection *collection ) if( m_action == 0 ) { - m_action = new TDERadioAction( i18n( "Pattern Tool" ), "14_pattern", TQt::SHIFT+TQt::Key_H, this, TQT_SLOT( activate() ), collection, name() ); + m_action = new TDERadioAction( i18n( "Pattern Tool" ), "14_pattern", TQt::SHIFT+TQt::Key_H, this, TQ_SLOT( activate() ), collection, name() ); m_action->setToolTip( i18n( "Pattern" ) ); m_action->setExclusiveGroup( "misc" ); //m_ownAction = true; diff --git a/karbon/tools/vpenciltool.cpp b/karbon/tools/vpenciltool.cpp index ea9da2f3..f8faebe3 100644 --- a/karbon/tools/vpenciltool.cpp +++ b/karbon/tools/vpenciltool.cpp @@ -93,7 +93,7 @@ VPencilOptionsWidget::VPencilOptionsWidget( KarbonView*view, TQWidget* parent, c group3->setInsideMargin( 4 ); group3->setInsideSpacing( 2 ); - connect( m_combo, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( selectMode() ) ); + connect( m_combo, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( selectMode() ) ); //Set the default settings m_mode = VPencilTool::CURVE; @@ -402,7 +402,7 @@ VPencilTool::setup( TDEActionCollection *collection ) if( m_action == 0 ) { - m_action = new TDERadioAction( i18n( "Pencil Tool" ), "14_pencil", TQt::SHIFT+TQt::Key_P, this, TQT_SLOT( activate() ), collection, name() ); + m_action = new TDERadioAction( i18n( "Pencil Tool" ), "14_pencil", TQt::SHIFT+TQt::Key_P, this, TQ_SLOT( activate() ), collection, name() ); m_action->setToolTip( i18n( "Pencil" ) ); m_action->setExclusiveGroup( "freehand" ); //m_ownAction = true; diff --git a/karbon/tools/vpolygontool.cpp b/karbon/tools/vpolygontool.cpp index 20263c53..f6e3ed65 100644 --- a/karbon/tools/vpolygontool.cpp +++ b/karbon/tools/vpolygontool.cpp @@ -156,7 +156,7 @@ VPolygonTool::setup( TDEActionCollection *collection ) { TDEShortcut shortcut( TQt::Key_Plus ); shortcut.append(TDEShortcut( TQt::Key_F9 ) ); - m_action = new TDERadioAction( i18n( "Polygon Tool" ), "14_polygon", shortcut, this, TQT_SLOT( activate() ), collection, name() ); + m_action = new TDERadioAction( i18n( "Polygon Tool" ), "14_polygon", shortcut, this, TQ_SLOT( activate() ), collection, name() ); m_action->setToolTip( i18n( "Polygon" ) ); m_action->setExclusiveGroup( "shapes" ); //m_ownAction = true; diff --git a/karbon/tools/vpolylinetool.cpp b/karbon/tools/vpolylinetool.cpp index 38ac9d25..8e533416 100644 --- a/karbon/tools/vpolylinetool.cpp +++ b/karbon/tools/vpolylinetool.cpp @@ -76,7 +76,7 @@ VPolylineTool::activate() m_bezierPoints.clear(); m_close = false; - connect( view()->part()->commandHistory(), TQT_SIGNAL(commandExecuted()), this, TQT_SLOT(commandExecuted()) ); + connect( view()->part()->commandHistory(), TQ_SIGNAL(commandExecuted()), this, TQ_SLOT(commandExecuted()) ); } void @@ -145,7 +145,7 @@ VPolylineTool::deactivate() createObject(); - disconnect( view()->part()->commandHistory(), TQT_SIGNAL(commandExecuted()), this, TQT_SLOT(commandExecuted()) ); + disconnect( view()->part()->commandHistory(), TQ_SIGNAL(commandExecuted()), this, TQ_SLOT(commandExecuted()) ); } void @@ -488,7 +488,7 @@ VPolylineTool::setup( TDEActionCollection *collection ) { TDEShortcut shortcut( TQt::Key_Plus ); shortcut.append( TDEShortcut( TQt::Key_F9 ) ); - m_action = new TDERadioAction( i18n( "Polyline Tool" ), "14_polyline", shortcut, this, TQT_SLOT( activate() ), collection, name() ); + m_action = new TDERadioAction( i18n( "Polyline Tool" ), "14_polyline", shortcut, this, TQ_SLOT( activate() ), collection, name() ); m_action->setToolTip( i18n( "Polyline" ) ); m_action->setExclusiveGroup( "freehand" ); //m_ownAction = true; diff --git a/karbon/tools/vrectangletool.cpp b/karbon/tools/vrectangletool.cpp index 819883cf..1196636c 100644 --- a/karbon/tools/vrectangletool.cpp +++ b/karbon/tools/vrectangletool.cpp @@ -134,7 +134,7 @@ VRectangleTool::setup( TDEActionCollection *collection ) if( m_action == 0 ) { - m_action = new TDERadioAction( i18n( "Rectangle Tool" ), "14_rectangle", TQt::Key_Plus+TQt::Key_F9, this, TQT_SLOT( activate() ), collection, name() ); + m_action = new TDERadioAction( i18n( "Rectangle Tool" ), "14_rectangle", TQt::Key_Plus+TQt::Key_F9, this, TQ_SLOT( activate() ), collection, name() ); m_action->setToolTip( i18n( "Rectangle" ) ); m_action->setExclusiveGroup( "shapes" ); //m_ownAction = true; diff --git a/karbon/tools/vrotatetool.cpp b/karbon/tools/vrotatetool.cpp index 4230cac7..0a01a451 100644 --- a/karbon/tools/vrotatetool.cpp +++ b/karbon/tools/vrotatetool.cpp @@ -166,7 +166,7 @@ VRotateTool::setup( TDEActionCollection *collection ) if( m_action == 0 ) { - m_action = new TDERadioAction( i18n( "Rotate Tool" ), "14_rotate", TQt::SHIFT+TQt::Key_H, this, TQT_SLOT( activate() ), collection, name() ); + m_action = new TDERadioAction( i18n( "Rotate Tool" ), "14_rotate", TQt::SHIFT+TQt::Key_H, this, TQ_SLOT( activate() ), collection, name() ); m_action->setToolTip( i18n( "Rotate" ) ); m_action->setExclusiveGroup( "manipulation" ); //m_ownAction = true; diff --git a/karbon/tools/vroundrecttool.cpp b/karbon/tools/vroundrecttool.cpp index 79d721f6..85668bb2 100644 --- a/karbon/tools/vroundrecttool.cpp +++ b/karbon/tools/vroundrecttool.cpp @@ -170,7 +170,7 @@ VRoundRectTool::setup( TDEActionCollection *collection ) if( m_action == 0 ) { - m_action = new TDERadioAction( i18n( "Round Rectangle Tool" ), "14_roundrect", TQt::SHIFT+TQt::Key_H, this, TQT_SLOT( activate() ), collection, name() ); + m_action = new TDERadioAction( i18n( "Round Rectangle Tool" ), "14_roundrect", TQt::SHIFT+TQt::Key_H, this, TQ_SLOT( activate() ), collection, name() ); m_action->setToolTip( i18n( "Round Rectangle" ) ); m_action->setExclusiveGroup( "shapes" ); //m_ownAction = true; diff --git a/karbon/tools/vselectnodestool.cpp b/karbon/tools/vselectnodestool.cpp index 2a3c38bb..fb2b46aa 100644 --- a/karbon/tools/vselectnodestool.cpp +++ b/karbon/tools/vselectnodestool.cpp @@ -428,7 +428,7 @@ VSelectNodesTool::setup( TDEActionCollection *collection ) if( m_action == 0 ) { - m_action = new TDERadioAction( i18n( "Select Nodes Tool" ), "14_selectnodes", TQt::SHIFT+TQt::Key_H, this, TQT_SLOT( activate() ), collection, name() ); + m_action = new TDERadioAction( i18n( "Select Nodes Tool" ), "14_selectnodes", TQt::SHIFT+TQt::Key_H, this, TQ_SLOT( activate() ), collection, name() ); m_action->setToolTip( i18n( "Select Nodes" ) ); m_action->setExclusiveGroup( "select" ); //m_ownAction = true; diff --git a/karbon/tools/vselecttool.cpp b/karbon/tools/vselecttool.cpp index dae170b0..d6ea9938 100644 --- a/karbon/tools/vselecttool.cpp +++ b/karbon/tools/vselecttool.cpp @@ -52,7 +52,7 @@ VSelectOptionsWidget::VSelectOptionsWidget( KarbonPart *part ) group->setRadioButtonExclusive( true ); group->setButton( part->document().selectionMode() ); - connect( group, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( modeChange( int ) ) ); + connect( group, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( modeChange( int ) ) ); group->setInsideMargin( 4 ); group->setInsideSpacing( 2 ); @@ -74,7 +74,7 @@ VSelectTool::VSelectTool( KarbonView *view ) m_objects.setAutoDelete( true ); m_optionsWidget = new VSelectOptionsWidget( view->part() ); registerTool( this ); - connect( view, TQT_SIGNAL( selectionChange() ), this, TQT_SLOT( updateStatusBar() ) ); + connect( view, TQ_SIGNAL( selectionChange() ), this, TQ_SLOT( updateStatusBar() ) ); } VSelectTool::~VSelectTool() @@ -603,7 +603,7 @@ VSelectTool::setup( TDEActionCollection *collection ) if( m_action == 0 ) { - m_action = new TDERadioAction( i18n( "Select Tool" ), "14_select", TQt::SHIFT+TQt::Key_H, this, TQT_SLOT( activate() ), collection, name() ); + m_action = new TDERadioAction( i18n( "Select Tool" ), "14_select", TQt::SHIFT+TQt::Key_H, this, TQ_SLOT( activate() ), collection, name() ); m_action->setToolTip( i18n( "Select" ) ); m_action->setExclusiveGroup( "select" ); //m_ownAction = true; diff --git a/karbon/tools/vsheartool.cpp b/karbon/tools/vsheartool.cpp index 4bc80810..7209ae8d 100644 --- a/karbon/tools/vsheartool.cpp +++ b/karbon/tools/vsheartool.cpp @@ -210,7 +210,7 @@ VShearTool::setup( TDEActionCollection *collection ) if( m_action == 0 ) { - m_action = new TDERadioAction( i18n( "Shear Tool" ), "14_shear", TQt::SHIFT+TQt::Key_H, this, TQT_SLOT( activate() ), collection, name() ); + m_action = new TDERadioAction( i18n( "Shear Tool" ), "14_shear", TQt::SHIFT+TQt::Key_H, this, TQ_SLOT( activate() ), collection, name() ); m_action->setToolTip( i18n( "Shear" ) ); m_action->setExclusiveGroup( "manipulation" ); //m_ownAction = true; diff --git a/karbon/tools/vsinustool.cpp b/karbon/tools/vsinustool.cpp index 3bfdfedc..26327b31 100644 --- a/karbon/tools/vsinustool.cpp +++ b/karbon/tools/vsinustool.cpp @@ -153,7 +153,7 @@ VSinusTool::setup( TDEActionCollection *collection ) if( m_action == 0 ) { - m_action = new TDERadioAction( i18n( "Sinus Tool" ), "14_sinus", TQt::SHIFT+TQt::Key_S, this, TQT_SLOT( activate() ), collection, name() ); + m_action = new TDERadioAction( i18n( "Sinus Tool" ), "14_sinus", TQt::SHIFT+TQt::Key_S, this, TQ_SLOT( activate() ), collection, name() ); m_action->setToolTip( i18n( "Sinus" ) ); m_action->setExclusiveGroup( "shapes" ); //m_ownAction = true; diff --git a/karbon/tools/vspiraltool.cpp b/karbon/tools/vspiraltool.cpp index 90b3b470..5dc321e0 100644 --- a/karbon/tools/vspiraltool.cpp +++ b/karbon/tools/vspiraltool.cpp @@ -204,7 +204,7 @@ VSpiralTool::setup( TDEActionCollection *collection ) if( m_action == 0 ) { - m_action = new TDERadioAction( i18n( "Spiral Tool" ), "14_spiral", TQt::SHIFT+TQt::Key_H, this, TQT_SLOT( activate() ), collection, name() ); + m_action = new TDERadioAction( i18n( "Spiral Tool" ), "14_spiral", TQt::SHIFT+TQt::Key_H, this, TQ_SLOT( activate() ), collection, name() ); m_action->setToolTip( i18n( "Spiral" ) ); m_action->setExclusiveGroup( "shapes" ); //m_ownAction = true; diff --git a/karbon/tools/vstartool.cpp b/karbon/tools/vstartool.cpp index 7b503ff6..caf30efd 100644 --- a/karbon/tools/vstartool.cpp +++ b/karbon/tools/vstartool.cpp @@ -44,12 +44,12 @@ VStarOptionsWidget::VStarOptionsWidget( KarbonPart *part, TQWidget* parent, cons m_type->insertItem( i18n( "Framed Star" ), VStar::framed_star); m_type->insertItem( i18n( "Star" ), VStar::star ); m_type->insertItem( i18n( "Gear" ), VStar::gear ); - connect( m_type, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( typeChanged( int ) ) ); + connect( m_type, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( typeChanged( int ) ) ); // add width/height-input: m_outerRLabel = new TQLabel( i18n( "Outer radius:" ), group ); m_outerR = new KoUnitDoubleSpinBox( group, 0.0, 1000.0, 0.5, 50.0, KoUnit::U_MM ); - connect( m_outerR, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( setOuterRadius( double ) ) ); + connect( m_outerR, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( setOuterRadius( double ) ) ); m_innerRLabel = new TQLabel( i18n( "Inner radius:" ), group ); m_innerR = new KoUnitDoubleSpinBox( group, 0.0, 1000.0, 0.5, 25.0, KoUnit::U_MM ); @@ -59,7 +59,7 @@ VStarOptionsWidget::VStarOptionsWidget( KarbonPart *part, TQWidget* parent, cons new TQLabel( i18n( "Edges:" ), group ); m_edges = new KIntSpinBox( group ); m_edges->setMinValue( 3 ); - connect( m_edges, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( setEdges( int ) ) ); + connect( m_edges, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( setEdges( int ) ) ); new TQLabel( i18n( "Inner angle:" ), group ); m_innerAngle = new KIntSpinBox( group ); @@ -239,7 +239,7 @@ VStarTool::setup( TDEActionCollection *collection ) { TDEShortcut shortcut( TQt::Key_Plus ); shortcut.append(TDEShortcut( TQt::Key_F9 ) ); - m_action = new TDERadioAction( i18n( "Star Tool" ), "14_star", shortcut, this, TQT_SLOT( activate() ), collection, name() ); + m_action = new TDERadioAction( i18n( "Star Tool" ), "14_star", shortcut, this, TQ_SLOT( activate() ), collection, name() ); m_action->setToolTip( i18n( "Draw a star" ) ); m_action->setExclusiveGroup( "shapes" ); //m_ownAction = true; diff --git a/karbon/tools/vtexttool.cpp b/karbon/tools/vtexttool.cpp index e64a4cf9..bfee6410 100644 --- a/karbon/tools/vtexttool.cpp +++ b/karbon/tools/vtexttool.cpp @@ -74,7 +74,7 @@ ShadowPreview::ShadowPreview( ShadowWidget* parent ) setBackgroundMode( TQt::NoBackground ); setMinimumSize( 60, 60 ); - connect( this, TQT_SIGNAL( changed( int, int, bool ) ), m_parent, TQT_SLOT( setShadowValues( int, int, bool ) ) ); + connect( this, TQ_SIGNAL( changed( int, int, bool ) ), m_parent, TQ_SLOT( setShadowValues( int, int, bool ) ) ); } ShadowPreview::~ShadowPreview() @@ -227,10 +227,10 @@ ShadowWidget::ShadowWidget( TQWidget* parent, const char* name, int angle, int d m_distance->setValue( distance ); m_translucent->setChecked( translucent ); - connect( m_angle, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( updatePreview( int ) ) ); - connect( m_distance, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( updatePreview( int ) ) ); - connect( m_useShadow, TQT_SIGNAL( clicked() ), this, TQT_SLOT( updatePreview() ) ); - connect( m_translucent, TQT_SIGNAL( clicked() ), this, TQT_SLOT( updatePreview() ) ); + connect( m_angle, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( updatePreview( int ) ) ); + connect( m_distance, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( updatePreview( int ) ) ); + connect( m_useShadow, TQ_SIGNAL( clicked() ), this, TQ_SLOT( updatePreview() ) ); + connect( m_translucent, TQ_SIGNAL( clicked() ), this, TQ_SLOT( updatePreview() ) ); updatePreview(); } @@ -397,18 +397,18 @@ VTextOptionsWidget::VTextOptionsWidget( VTextTool* tool, TQWidget *parent ) m_textOffset->setRange( 0.0, 100.0, 1.0, true ); - connect( m_fontCombo, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( valueChanged( int ) ) ); - connect( m_boldCheck, TQT_SIGNAL( stateChanged( int ) ), this, TQT_SLOT( valueChanged( int ) ) ); - connect( m_italicCheck, TQT_SIGNAL( stateChanged( int ) ), this, TQT_SLOT( valueChanged( int ) ) ); - connect( m_fontSize, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( valueChanged( int ) ) ); - connect( m_textPosition, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( valueChanged( int ) ) ); - connect( m_textAlignment, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( valueChanged( int ) ) ); - connect( m_textOffset, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( valueChanged( double ) ) ); - connect( m_textEditor, TQT_SIGNAL( returnPressed() ), this, TQT_SLOT( accept() ) ); - connect( m_textEditor, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( textChanged( const TQString& ) ) ); - connect( m_editBasePath, TQT_SIGNAL( clicked() ), this, TQT_SLOT( editBasePath() ) ); - connect( m_convertToShapes, TQT_SIGNAL( clicked() ), this, TQT_SLOT( convertToShapes() ) ); - connect( this, TQT_SIGNAL( cancelClicked() ), this, TQT_SLOT( cancel() ) ); + connect( m_fontCombo, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( valueChanged( int ) ) ); + connect( m_boldCheck, TQ_SIGNAL( stateChanged( int ) ), this, TQ_SLOT( valueChanged( int ) ) ); + connect( m_italicCheck, TQ_SIGNAL( stateChanged( int ) ), this, TQ_SLOT( valueChanged( int ) ) ); + connect( m_fontSize, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( valueChanged( int ) ) ); + connect( m_textPosition, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( valueChanged( int ) ) ); + connect( m_textAlignment, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( valueChanged( int ) ) ); + connect( m_textOffset, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( valueChanged( double ) ) ); + connect( m_textEditor, TQ_SIGNAL( returnPressed() ), this, TQ_SLOT( accept() ) ); + connect( m_textEditor, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( textChanged( const TQString& ) ) ); + connect( m_editBasePath, TQ_SIGNAL( clicked() ), this, TQ_SLOT( editBasePath() ) ); + connect( m_convertToShapes, TQ_SIGNAL( clicked() ), this, TQ_SLOT( convertToShapes() ) ); + connect( this, TQ_SIGNAL( cancelClicked() ), this, TQ_SLOT( cancel() ) ); setMainWidget( base ); setFixedSize( baseSize() ); @@ -1148,7 +1148,7 @@ VTextTool::setup( TDEActionCollection *collection ) if( m_action == 0 ) { - m_action = new TDERadioAction( i18n( "Text Tool" ), "14_text", TQt::SHIFT+TQt::Key_T, this, TQT_SLOT( activate() ), collection, name() ); + m_action = new TDERadioAction( i18n( "Text Tool" ), "14_text", TQt::SHIFT+TQt::Key_T, this, TQ_SLOT( activate() ), collection, name() ); m_action->setToolTip( i18n( "Text Tool" ) ); m_action->setExclusiveGroup( "misc" ); //m_ownAction = true; diff --git a/karbon/widgets/vcanvas.cpp b/karbon/widgets/vcanvas.cpp index 9fa94327..081f9b07 100644 --- a/karbon/widgets/vcanvas.cpp +++ b/karbon/widgets/vcanvas.cpp @@ -97,7 +97,7 @@ VCanvas::VCanvas( TQWidget *parent, KarbonView* view, KarbonPart* part ) : TQScrollView( parent, "canvas", WStaticContents/*WNorthWestGravity*/ | WResizeNoErase | WRepaintNoErase ), m_part( part ), m_view( view ) { - connect(this, TQT_SIGNAL( contentsMoving( int, int ) ), this, TQT_SLOT( slotContentsMoving( int, int ) ) ); + connect(this, TQ_SIGNAL( contentsMoving( int, int ) ), this, TQ_SLOT( slotContentsMoving( int, int ) ) ); viewport()->setFocusPolicy( TQWidget::StrongFocus ); viewport()->setMouseTracking( true ); diff --git a/karbon/widgets/vcolorslider.cpp b/karbon/widgets/vcolorslider.cpp index 53f90786..0e5e2786 100644 --- a/karbon/widgets/vcolorslider.cpp +++ b/karbon/widgets/vcolorslider.cpp @@ -67,8 +67,8 @@ void VColorSlider::init() setMinValue( 0 ); setMaxValue( 255 ); - connect( m_spinBox, TQT_SIGNAL( valueChanged ( int ) ), this, TQT_SLOT( updateFrom_spinBox( int ) ) ); - connect( m_gradientSelect, TQT_SIGNAL( valueChanged ( int ) ), this, TQT_SLOT( updateFrom_gradientSelect( int ) ) ); + connect( m_spinBox, TQ_SIGNAL( valueChanged ( int ) ), this, TQ_SLOT( updateFrom_spinBox( int ) ) ); + connect( m_gradientSelect, TQ_SIGNAL( valueChanged ( int ) ), this, TQ_SLOT( updateFrom_gradientSelect( int ) ) ); m_gradientSelect->installEventFilter( this ); @@ -114,9 +114,9 @@ void VColorSlider::updateFrom_spinBox( int value ) { if ( value != m_gradientSelect->value() ) { - disconnect( m_gradientSelect, TQT_SIGNAL( valueChanged ( int ) ), this, TQT_SLOT( updateFrom_gradientSelect( int ) ) ); + disconnect( m_gradientSelect, TQ_SIGNAL( valueChanged ( int ) ), this, TQ_SLOT( updateFrom_gradientSelect( int ) ) ); m_gradientSelect->setValue( (m_maxValue - value) + m_minValue ); - connect( m_gradientSelect, TQT_SIGNAL( valueChanged ( int ) ), this, TQT_SLOT( updateFrom_gradientSelect( int ) ) ); + connect( m_gradientSelect, TQ_SIGNAL( valueChanged ( int ) ), this, TQ_SLOT( updateFrom_gradientSelect( int ) ) ); emit valueChanged( value ); } } @@ -126,9 +126,9 @@ void VColorSlider::updateFrom_gradientSelect( int value ) value = (m_maxValue - value) + m_minValue; if ( value != m_spinBox->value() ) { - disconnect( m_spinBox, TQT_SIGNAL( valueChanged ( int ) ), this, TQT_SLOT( updateFrom_spinBox( int ) ) ); + disconnect( m_spinBox, TQ_SIGNAL( valueChanged ( int ) ), this, TQ_SLOT( updateFrom_spinBox( int ) ) ); m_spinBox->setValue( value ); - connect( m_spinBox, TQT_SIGNAL( valueChanged ( int ) ), this, TQT_SLOT( updateFrom_spinBox( int ) ) ); + connect( m_spinBox, TQ_SIGNAL( valueChanged ( int ) ), this, TQ_SLOT( updateFrom_spinBox( int ) ) ); emit valueChanged( value ); } } diff --git a/karbon/widgets/vgradienttabwidget.cpp b/karbon/widgets/vgradienttabwidget.cpp index 1416262d..86e674da 100644 --- a/karbon/widgets/vgradienttabwidget.cpp +++ b/karbon/widgets/vgradienttabwidget.cpp @@ -224,13 +224,13 @@ void VGradientTabWidget::setupUI() void VGradientTabWidget::setupConnections() { - connect( m_gradientType, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( combosChange( int ) ) ); - connect( m_gradientRepeat, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( combosChange( int ) ) ); - connect( m_gradientWidget, TQT_SIGNAL( changed() ), m_gradientPreview, TQT_SLOT( update() ) ); - connect( m_addToPredefs, TQT_SIGNAL( clicked() ), this, TQT_SLOT( addGradientToPredefs() ) ); - connect( m_predefGradientsView, TQT_SIGNAL( doubleClicked( TQListBoxItem *, const TQPoint & ) ), this, TQT_SLOT( changeToPredef( TQListBoxItem* ) ) ); - connect( m_predefDelete, TQT_SIGNAL( clicked() ), this, TQT_SLOT( deletePredef() ) ); - connect( m_opacity, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( opacityChanged( int ) ) ); + connect( m_gradientType, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( combosChange( int ) ) ); + connect( m_gradientRepeat, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( combosChange( int ) ) ); + connect( m_gradientWidget, TQ_SIGNAL( changed() ), m_gradientPreview, TQ_SLOT( update() ) ); + connect( m_addToPredefs, TQ_SIGNAL( clicked() ), this, TQ_SLOT( addGradientToPredefs() ) ); + connect( m_predefGradientsView, TQ_SIGNAL( doubleClicked( TQListBoxItem *, const TQPoint & ) ), this, TQ_SLOT( changeToPredef( TQListBoxItem* ) ) ); + connect( m_predefDelete, TQ_SIGNAL( clicked() ), this, TQ_SLOT( deletePredef() ) ); + connect( m_opacity, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( opacityChanged( int ) ) ); } // VGradientTabWidget::setupConnection void VGradientTabWidget::initUI() diff --git a/karbon/widgets/vreference.cpp b/karbon/widgets/vreference.cpp index 596c822e..b4ff5770 100644 --- a/karbon/widgets/vreference.cpp +++ b/karbon/widgets/vreference.cpp @@ -50,8 +50,8 @@ VReference::VReference( TQWidget *parent, const char *name ) : TQFrame ( parent, mButtonGroup->insert( radio, BottomRight ); connect( - mButtonGroup, TQT_SIGNAL( clicked( int ) ), - this, TQT_SLOT( setReferencePoint( int ) ) ); + mButtonGroup, TQ_SIGNAL( clicked( int ) ), + this, TQ_SLOT( setReferencePoint( int ) ) ); mButtonGroup->setButton( Center ); layout->addWidget( mButtonGroup ); diff --git a/karbon/widgets/vselecttoolbar.cpp b/karbon/widgets/vselecttoolbar.cpp index b0dc9a7c..9c8d1de1 100644 --- a/karbon/widgets/vselecttoolbar.cpp +++ b/karbon/widgets/vselecttoolbar.cpp @@ -39,27 +39,27 @@ VSelectToolBar::VSelectToolBar( KarbonView *view, const char* name ) : TDEToolBa TQLabel *x_label = new TQLabel( i18n( "X:" ), this, "tde toolbar widget" ); insertWidget( 0, x_label->width(), x_label ); m_x = new KoUnitDoubleSpinBox( this, 0.0, 1000.0, 0.5 ); - connect( m_x, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( slotXChanged( double ) ) ); + connect( m_x, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( slotXChanged( double ) ) ); insertWidget( 1, m_x->width(), m_x ); TQLabel *y_label = new TQLabel( i18n( "Y:" ), this, "tde toolbar widget" ); insertWidget( 2, y_label->width(), y_label ); m_y = new KoUnitDoubleSpinBox( this, 0.0, 1000.0, 0.5 ); - connect( m_y, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( slotYChanged( double ) ) ); + connect( m_y, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( slotYChanged( double ) ) ); insertWidget( 3, m_y->width(), m_y ); insertSeparator( 4 ); TQLabel *w_label = new TQLabel( i18n( "selection width", "Width:" ), this, "tde toolbar widget" ); insertWidget( 5, w_label->width(), w_label ); m_width = new KoUnitDoubleSpinBox( this, 0.0, 1000.0, 0.5 ); - connect( m_width, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( slotWidthChanged( double ) ) ); + connect( m_width, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( slotWidthChanged( double ) ) ); insertWidget( 6, m_width->width(), m_width ); TQLabel *h_label = new TQLabel( i18n( "Height:" ), this, "tde toolbar widget" ); insertWidget( 7, h_label->width(), h_label ); m_height = new KoUnitDoubleSpinBox( this, 0.0, 1000.0, 0.5 ); - connect( m_height, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( slotHeightChanged( double ) ) ); + connect( m_height, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( slotHeightChanged( double ) ) ); insertWidget( 8, m_height->width(), m_height ); - connect( m_view, TQT_SIGNAL( selectionChange() ), this, TQT_SLOT( slotSelectionChanged() ) ); + connect( m_view, TQ_SIGNAL( selectionChange() ), this, TQ_SLOT( slotSelectionChanged() ) ); } VSelectToolBar::~VSelectToolBar() diff --git a/karbon/widgets/vtypebuttonbox.cpp b/karbon/widgets/vtypebuttonbox.cpp index 9a98a125..a7c9f0f9 100644 --- a/karbon/widgets/vtypebuttonbox.cpp +++ b/karbon/widgets/vtypebuttonbox.cpp @@ -257,8 +257,8 @@ VTypeButtonBox::VTypeButtonBox( KarbonPart *part, setInsideMargin( 1 ); setInsideSpacing( 1 ); - connect( this, TQT_SIGNAL( clicked( int ) ), - this, TQT_SLOT( slotButtonPressed( int ) ) ); + connect( this, TQ_SIGNAL( clicked( int ) ), + this, TQ_SLOT( slotButtonPressed( int ) ) ); } void |