diff options
| author | Michele Calgaro <[email protected]> | 2024-01-04 10:30:32 +0900 |
|---|---|---|
| committer | Michele Calgaro <[email protected]> | 2024-01-04 12:36:03 +0900 |
| commit | c0332621bc998c9786f4841e86a62b7711fe4abf (patch) | |
| tree | 38b3ab6688de7a9396a1c5993a8ec265f5f33b64 /kpresenter | |
| 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 <[email protected]>
Diffstat (limited to 'kpresenter')
33 files changed, 698 insertions, 698 deletions
diff --git a/kpresenter/KPrBackDia.cpp b/kpresenter/KPrBackDia.cpp index a92d5990..012f7eaa 100644 --- a/kpresenter/KPrBackDia.cpp +++ b/kpresenter/KPrBackDia.cpp @@ -99,8 +99,8 @@ KPrBackDialog::KPrBackDialog( TQWidget* parent, const char* name, if ( !m_page->isMasterPage() ) { m_useMasterBackground = new TQCheckBox( i18n( "Use slide master background" ), page ); - connect( m_useMasterBackground, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( updateConfiguration() ) ); + connect( m_useMasterBackground, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( updateConfiguration() ) ); m_useMasterBackground->setChecked( m_page->useMasterBackground() ); vbox->addWidget( m_useMasterBackground ); } @@ -110,8 +110,8 @@ KPrBackDialog::KPrBackDialog( TQWidget* parent, const char* name, backCombo->insertItem( i18n( "Color/Gradient" ) ); backCombo->insertItem( i18n( "Picture" ) ); backCombo->setCurrentItem( (int)backType ); - connect( backCombo, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( changeComboText(int) ) ); + connect( backCombo, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( changeComboText(int) ) ); vbox->addWidget( backCombo ); @@ -135,34 +135,34 @@ KPrBackDialog::KPrBackDialog( TQWidget* parent, const char* name, cType->insertItem( i18n( "PipeCross Gradient" ) ); cType->insertItem( i18n( "Pyramid Gradient" ) ); cType->setCurrentItem( _bcType ); - connect( cType, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( updateConfiguration() ) ); + connect( cType, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( updateConfiguration() ) ); color1Choose = new KColorButton( backColor1, colorTab ); - connect( color1Choose, TQT_SIGNAL( changed( const TQColor& ) ), - this, TQT_SLOT( updateConfiguration() ) ); + connect( color1Choose, TQ_SIGNAL( changed( const TQColor& ) ), + this, TQ_SLOT( updateConfiguration() ) ); color2Choose = new KColorButton( backColor2, colorTab ); - connect( color2Choose, TQT_SIGNAL( changed( const TQColor& ) ), - this, TQT_SLOT( updateConfiguration() ) ); + connect( color2Choose, TQ_SIGNAL( changed( const TQColor& ) ), + this, TQ_SLOT( updateConfiguration() ) ); unbalanced = new TQCheckBox( i18n( "Unbalanced" ), colorTab ); - connect( unbalanced, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( updateConfiguration() ) ); + connect( unbalanced, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( updateConfiguration() ) ); unbalanced->setChecked( _unbalanced ); labXFactor =new TQLabel( i18n( "X-factor:" ), colorTab ); xfactor = new TQSlider( -200, 200, 1, 100, TQt::Horizontal, colorTab ); - connect( xfactor, TQT_SIGNAL( valueChanged( int ) ), - this, TQT_SLOT( updateConfiguration() ) ); + connect( xfactor, TQ_SIGNAL( valueChanged( int ) ), + this, TQ_SLOT( updateConfiguration() ) ); xfactor->setValue( _xfactor ); labYFactor=new TQLabel( i18n( "Y-factor:" ), colorTab ); yfactor = new TQSlider( -200, 200, 1, 100, TQt::Horizontal, colorTab ); - connect( yfactor, TQT_SIGNAL( valueChanged( int ) ), - this, TQT_SLOT( updateConfiguration() ) ); + connect( yfactor, TQ_SIGNAL( valueChanged( int ) ), + this, TQ_SLOT( updateConfiguration() ) ); yfactor->setValue( _yfactor ); tabWidget->addTab( colorTab, i18n( "Color/Gradient" ) ); @@ -181,8 +181,8 @@ KPrBackDialog::KPrBackDialog( TQWidget* parent, const char* name, picView->insertItem( i18n( "Centered" ) ); picView->insertItem( i18n( "Tiled" ) ); picView->setCurrentItem( (int)backPicView ); - connect( picView, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( updateConfiguration() ) ); + connect( picView, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( updateConfiguration() ) ); picChooseLabel = new TQLabel( i18n("&Location:"), picTab ); picChooseLabel->setFixedHeight( picChooseLabel->sizeHint().height() ); @@ -190,10 +190,10 @@ KPrBackDialog::KPrBackDialog( TQWidget* parent, const char* name, picChoose = new KURLRequester( picTab, "picChoose" ); picChoose->setFixedHeight( picChoose->sizeHint().height() ); picChoose->setMode( KFile::ExistingOnly ); - connect( picChoose, TQT_SIGNAL( openFileDialog( KURLRequester * ) ), - TQT_SLOT( aboutToSelectPic() ) ); - connect( picChoose, TQT_SIGNAL( urlSelected( const TQString & ) ), - TQT_SLOT( afterSelectPic( const TQString & ) ) ); + connect( picChoose, TQ_SIGNAL( openFileDialog( KURLRequester * ) ), + TQ_SLOT( aboutToSelectPic() ) ); + connect( picChoose, TQ_SIGNAL( urlSelected( const TQString & ) ), + TQ_SLOT( afterSelectPic( const TQString & ) ) ); picChooseLabel->setBuddy( picChoose ); @@ -208,18 +208,18 @@ KPrBackDialog::KPrBackDialog( TQWidget* parent, const char* name, // ------------------------ buttons - connect( this, TQT_SIGNAL( okClicked() ), - this, TQT_SLOT( Ok() ) ); - connect( this, TQT_SIGNAL( applyClicked() ), - this, TQT_SLOT( Apply() ) ); - connect( this, TQT_SIGNAL( user1Clicked() ), - this, TQT_SLOT( ApplyGlobal() ) ); + connect( this, TQ_SIGNAL( okClicked() ), + this, TQ_SLOT( Ok() ) ); + connect( this, TQ_SIGNAL( applyClicked() ), + this, TQ_SLOT( Apply() ) ); + connect( this, TQ_SIGNAL( user1Clicked() ), + this, TQ_SLOT( ApplyGlobal() ) ); - connect( this, TQT_SIGNAL( user2Clicked() ), - this, TQT_SLOT( slotReset() ) ); + connect( this, TQ_SIGNAL( user2Clicked() ), + this, TQ_SLOT( slotReset() ) ); - connect( this, TQT_SIGNAL( okClicked() ), - this, TQT_SLOT( accept() ) ); + connect( this, TQ_SIGNAL( okClicked() ), + this, TQ_SLOT( accept() ) ); setButtonText(KDialogBase::User1,i18n( "Apply &Global" )); setButtonText(KDialogBase::User2,i18n( "&Reset" )); picChanged = true; diff --git a/kpresenter/KPrBrushProperty.cpp b/kpresenter/KPrBrushProperty.cpp index d69479e0..1d7a2d6a 100644 --- a/kpresenter/KPrBrushProperty.cpp +++ b/kpresenter/KPrBrushProperty.cpp @@ -52,8 +52,8 @@ KPrBrushProperty::KPrBrushProperty( TQWidget *parent, const char *name, const KP m_stack = new TQWidgetStack( this ); layout->addMultiCellWidget( m_stack, 1, 1, 0, 1 ); - connect( m_typeCombo, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotTypeChanged( int ) ) ); + connect( m_typeCombo, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotTypeChanged( int ) ) ); m_brushUI = new BrushPropertyUI( m_stack ); @@ -77,10 +77,10 @@ KPrBrushProperty::KPrBrushProperty( TQWidget *parent, const char *name, const KP TQWhatsThis::add(m_preview_color, i18n( "This displays a preview of your choices." ) ); hbox->addWidget(m_preview_color); - connect( m_brushUI->styleCombo, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotBrushChanged() ) ); - connect( m_brushUI->colorChooser, TQT_SIGNAL( changed( const TQColor& ) ), - this, TQT_SLOT( slotBrushChanged() ) ); + connect( m_brushUI->styleCombo, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotBrushChanged() ) ); + connect( m_brushUI->colorChooser, TQ_SIGNAL( changed( const TQColor& ) ), + this, TQ_SLOT( slotBrushChanged() ) ); m_stack->addWidget( m_brushUI, 0 ); @@ -98,18 +98,18 @@ KPrBrushProperty::KPrBrushProperty( TQWidget *parent, const char *name, const KP hbox = new TQHBoxLayout( m_gradientUI->previewPanel ); hbox->addWidget(m_preview_gradient); - connect( m_gradientUI->styleCombo, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotBackColorTypeChanged() ) ); - connect( m_gradientUI->color1Chooser, TQT_SIGNAL( changed( const TQColor& ) ), - this, TQT_SLOT( slotColor1Changed() ) ); - connect( m_gradientUI->color2Chooser, TQT_SIGNAL( changed( const TQColor& ) ), - this, TQT_SLOT( slotColor2Changed() ) ); - connect( m_gradientUI->unbalancedCheckBox, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotUnbalancedChanged() ) ); - connect( m_gradientUI->xSlider, TQT_SIGNAL( valueChanged( int ) ), - this, TQT_SLOT( slotXFactorChanged() ) ); - connect( m_gradientUI->ySlider, TQT_SIGNAL( valueChanged( int ) ), - this, TQT_SLOT( slotYFactorChanged() ) ); + connect( m_gradientUI->styleCombo, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotBackColorTypeChanged() ) ); + connect( m_gradientUI->color1Chooser, TQ_SIGNAL( changed( const TQColor& ) ), + this, TQ_SLOT( slotColor1Changed() ) ); + connect( m_gradientUI->color2Chooser, TQ_SIGNAL( changed( const TQColor& ) ), + this, TQ_SLOT( slotColor2Changed() ) ); + connect( m_gradientUI->unbalancedCheckBox, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotUnbalancedChanged() ) ); + connect( m_gradientUI->xSlider, TQ_SIGNAL( valueChanged( int ) ), + this, TQ_SLOT( slotXFactorChanged() ) ); + connect( m_gradientUI->ySlider, TQ_SIGNAL( valueChanged( int ) ), + this, TQ_SLOT( slotYFactorChanged() ) ); m_stack->addWidget( m_gradientUI, 1 ); m_stack->addWidget( new TQFrame(), 2 ); // the transparent case diff --git a/kpresenter/KPrCanvas.cpp b/kpresenter/KPrCanvas.cpp index 05c9923b..ab8e1543 100644 --- a/kpresenter/KPrCanvas.cpp +++ b/kpresenter/KPrCanvas.cpp @@ -163,14 +163,14 @@ KPrCanvas::KPrCanvas( TQWidget *parent, const char *name, KPrView *_view ) if( m_view) { m_activePage=m_view->kPresenterDoc()->pageList().getFirst(); - connect( m_view->kPresenterDoc(), TQT_SIGNAL( sig_terminateEditing( KPrTextObject * ) ), - this, TQT_SLOT( terminateEditing( KPrTextObject * ) ) ); - connect( m_view, TQT_SIGNAL( autoScroll( const TQPoint & )), this, TQT_SLOT( slotAutoScroll( const TQPoint &))); + connect( m_view->kPresenterDoc(), TQ_SIGNAL( sig_terminateEditing( KPrTextObject * ) ), + this, TQ_SLOT( terminateEditing( KPrTextObject * ) ) ); + connect( m_view, TQ_SIGNAL( autoScroll( const TQPoint & )), this, TQ_SLOT( slotAutoScroll( const TQPoint &))); } if ( kospeaker ) - connect( kospeaker, TQT_SIGNAL( customSpeakWidget(TQWidget*, const TQPoint&, uint) ), - this, TQT_SLOT( speakTextUnderMouse(TQWidget*, const TQPoint&, uint) ) ); + connect( kospeaker, TQ_SIGNAL( customSpeakWidget(TQWidget*, const TQPoint&, uint) ), + this, TQ_SLOT( speakTextUnderMouse(TQWidget*, const TQPoint&, uint) ) ); } KPrCanvas::~KPrCanvas() @@ -2310,12 +2310,12 @@ void KPrCanvas::setupMenus() TQ_CHECK_PTR( m_presMenu ); m_presMenu->setCheckable( true ); m_presMenu->insertTitle( i18n( "Slide Show" ) ); - m_presMenu->insertItem( i18n( "&Continue" ), this, TQT_SLOT( setSwitchingMode() ) ); - PM_DM = m_presMenu->insertItem( i18n( "&Drawing Mode" ), this, TQT_SLOT( setDrawingMode() ) ); + m_presMenu->insertItem( i18n( "&Continue" ), this, TQ_SLOT( setSwitchingMode() ) ); + PM_DM = m_presMenu->insertItem( i18n( "&Drawing Mode" ), this, TQ_SLOT( setDrawingMode() ) ); m_presMenu->insertSeparator(); - m_presMenu->insertItem( SmallIcon("goto"), i18n( "&Goto Slide..." ), this, TQT_SLOT( slotGotoPage() ) ); + m_presMenu->insertItem( SmallIcon("goto"), i18n( "&Goto Slide..." ), this, TQ_SLOT( slotGotoPage() ) ); m_presMenu->insertSeparator(); - m_presMenu->insertItem( i18n( "&End" ), this, TQT_SLOT( slotExitPres() ) ); + m_presMenu->insertItem( i18n( "&End" ), this, TQ_SLOT( slotExitPres() ) ); m_presMenu->setItemChecked( PM_DM, false ); m_presMenu->setMouseTracking( true ); } @@ -3117,7 +3117,7 @@ bool KPrCanvas::pNext( bool gotoNextPage ) } else { - connect( &m_pageEffectTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotDoPageEffect() ) ); + connect( &m_pageEffectTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotDoPageEffect() ) ); m_pageEffectTimer.start( 50, true ); } @@ -3390,7 +3390,7 @@ void KPrCanvas::doObjEffects( bool isAllreadyPainted ) if ( m_effectHandler ) { m_effectTimer.stop(); - TQObject::disconnect( &m_effectTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotDoEffect() ) ); + TQObject::disconnect( &m_effectTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotDoEffect() ) ); m_effectHandler->finish(); delete m_effectHandler; @@ -3446,7 +3446,7 @@ void KPrCanvas::doObjEffects( bool isAllreadyPainted ) } else { - connect( &m_effectTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotDoEffect() ) ); + connect( &m_effectTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotDoEffect() ) ); m_effectTimer.start( 50, true ); } @@ -3457,7 +3457,7 @@ void KPrCanvas::slotDoEffect() if ( m_effectHandler->doEffect() ) { m_effectTimer.stop(); - TQObject::disconnect( &m_effectTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotDoEffect() ) ); + TQObject::disconnect( &m_effectTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotDoEffect() ) ); delete m_effectHandler; m_effectHandler = 0; } @@ -3473,7 +3473,7 @@ void KPrCanvas::slotDoPageEffect() if ( m_pageEffect->doEffect() ) { m_pageEffectTimer.stop(); - TQObject::disconnect( &m_pageEffectTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotDoPageEffect() ) ); + TQObject::disconnect( &m_pageEffectTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotDoPageEffect() ) ); delete m_pageEffect; m_pageEffect = 0; @@ -3500,7 +3500,7 @@ bool KPrCanvas::finishObjectEffects() if ( m_effectHandler ) { m_effectTimer.stop(); - TQObject::disconnect( &m_effectTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotDoEffect() ) ); + TQObject::disconnect( &m_effectTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotDoEffect() ) ); m_effectHandler->finish(); delete m_effectHandler; m_effectHandler = 0; @@ -3516,7 +3516,7 @@ bool KPrCanvas::finishPageEffect( bool cancel ) if ( m_pageEffect ) { m_pageEffectTimer.stop(); - TQObject::disconnect( &m_pageEffectTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotDoPageEffect() ) ); + TQObject::disconnect( &m_pageEffectTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotDoPageEffect() ) ); if ( !cancel ) m_pageEffect->finish(); delete m_pageEffect; diff --git a/kpresenter/KPrConfig.cpp b/kpresenter/KPrConfig.cpp index b3dbf495..050b08b6 100644 --- a/kpresenter/KPrConfig.cpp +++ b/kpresenter/KPrConfig.cpp @@ -122,7 +122,7 @@ KPrConfig::KPrConfig( KPrView* parent ) m_ttsPage=new KPrConfigureTTSPage(parent, page); } else m_ttsPage = 0; - connect( this, TQT_SIGNAL( okClicked() ),this, TQT_SLOT( slotApply() ) ); + connect( this, TQ_SIGNAL( okClicked() ),this, TQ_SLOT( slotApply() ) ); } void KPrConfig::openPage(int flags) @@ -630,7 +630,7 @@ KPrConfigureDefaultDocPage::KPrConfigureDefaultDocPage(KPrView *_view, TQWidget TQPushButton *chooseButton = new TQPushButton(i18n("Choose..."), fontContainer); TQWhatsThis::add(chooseButton, i18n( "Click here if you want to set a new font. The TDE default Select Font dialog will then be displayed." ) ); - connect(chooseButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(selectNewDefaultFont())); + connect(chooseButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(selectNewDefaultFont())); fontLayout->addWidget(fontTitle, 0, 0); fontLayout->addWidget(fontName, 0, 1); @@ -949,11 +949,11 @@ KPrConfigurePathPage::KPrConfigurePathPage( KPrView *_view, TQWidget *parent, ch box->addWidget(m_pPathView); m_modifyPath = new TQPushButton( i18n("Modify Path..."), this); - connect( m_modifyPath, TQT_SIGNAL( clicked ()), this, TQT_SLOT( slotModifyPath())); - connect( m_pPathView, TQT_SIGNAL( doubleClicked (TQListViewItem *, const TQPoint &, int )), - this, TQT_SLOT( slotModifyPath())); - connect( m_pPathView, TQT_SIGNAL( selectionChanged ( TQListViewItem * )), - this, TQT_SLOT( slotSelectionChanged(TQListViewItem * ))); + connect( m_modifyPath, TQ_SIGNAL( clicked ()), this, TQ_SLOT( slotModifyPath())); + connect( m_pPathView, TQ_SIGNAL( doubleClicked (TQListViewItem *, const TQPoint &, int )), + this, TQ_SLOT( slotModifyPath())); + connect( m_pPathView, TQ_SIGNAL( selectionChanged ( TQListViewItem * )), + this, TQ_SLOT( slotSelectionChanged(TQListViewItem * ))); slotSelectionChanged(m_pPathView->currentItem()); TQWhatsThis::add(m_modifyPath, i18n( "When you click this button, a small dialog will appear and, if Default path is unchecked, you can either enter a path yourself or choose one using the standard TDE file dialog." ) ); box->addWidget(m_modifyPath); @@ -1086,9 +1086,9 @@ KPrConfigureTTSPage::KPrConfigureTTSPage( KPrView *_view, TQWidget *parent, char m_iniPollingInterval->setValue(config->readNumEntry("PollingInterval", 600)); screenReaderOptionChanged(); - connect(m_cbSpeakPointerWidget, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(screenReaderOptionChanged())); - connect(m_cbSpeakFocusWidget, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(screenReaderOptionChanged())); - connect(m_cbSpeakAccelerators, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(screenReaderOptionChanged())); + connect(m_cbSpeakPointerWidget, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(screenReaderOptionChanged())); + connect(m_cbSpeakFocusWidget, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(screenReaderOptionChanged())); + connect(m_cbSpeakAccelerators, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(screenReaderOptionChanged())); } void KPrConfigureTTSPage::slotDefault() diff --git a/kpresenter/KPrCustomSlideShowDia.cpp b/kpresenter/KPrCustomSlideShowDia.cpp index 8caa45d6..d8ab6bae 100644 --- a/kpresenter/KPrCustomSlideShowDia.cpp +++ b/kpresenter/KPrCustomSlideShowDia.cpp @@ -64,16 +64,16 @@ KPrCustomSlideShowDia::KPrCustomSlideShowDia( KPrView* _view, KPrDocument *_doc, grid1->addWidget(m_pTest,5,2); - connect( m_pRemove, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotRemove() ) ); - connect( m_pAdd, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAdd() ) ); - connect( m_pModify, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotModify() ) ); - connect( m_pCopy, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotCopy() ) ); - connect( m_pTest, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotTest() ) ); + connect( m_pRemove, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotRemove() ) ); + connect( m_pAdd, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAdd() ) ); + connect( m_pModify, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotModify() ) ); + connect( m_pCopy, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotCopy() ) ); + connect( m_pTest, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotTest() ) ); - connect( list, TQT_SIGNAL(doubleClicked(TQListBoxItem *)),this,TQT_SLOT(slotDoubleClicked(TQListBoxItem *))); - connect( list, TQT_SIGNAL(clicked ( TQListBoxItem * )),this,TQT_SLOT(slotTextClicked(TQListBoxItem * ))); + connect( list, TQ_SIGNAL(doubleClicked(TQListBoxItem *)),this,TQ_SLOT(slotDoubleClicked(TQListBoxItem *))); + connect( list, TQ_SIGNAL(clicked ( TQListBoxItem * )),this,TQ_SLOT(slotTextClicked(TQListBoxItem * ))); - connect( m_view, TQT_SIGNAL( presentationFinished() ), this, TQT_SLOT( slotPresentationFinished() ) ); + connect( m_view, TQ_SIGNAL( presentationFinished() ), this, TQ_SLOT( slotPresentationFinished() ) ); init(); updateButton(); @@ -334,15 +334,15 @@ void KPrDefineCustomSlideShow::init() m_name->setFocus(); - connect( m_insertSlide, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotMoveInsertSlide() ) ); - connect( m_removeSlide, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotMoveRemoveSlide()) ); - connect( m_moveUpSlide, TQT_SIGNAL(clicked()), this, TQT_SLOT( slotMoveUpSlide() ) ); - connect( m_moveDownSlide, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotMoveDownSlide()) ); - connect( m_name, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slideNameChanged( const TQString & ) ) ); - connect( listSlideShow, TQT_SIGNAL( clicked ( TQListBoxItem * ) ), this, TQT_SLOT( updateButton() ) ); - connect( listSlide, TQT_SIGNAL( clicked ( TQListBoxItem * ) ), this, TQT_SLOT( updateButton() ) ); - connect( listSlide, TQT_SIGNAL( doubleClicked ( TQListBoxItem * ) ), this, TQT_SLOT( slotMoveInsertSlide() ) ); - connect( listSlideShow, TQT_SIGNAL( doubleClicked( TQListBoxItem * ) ), this, TQT_SLOT( slotMoveRemoveSlide() ) ); + connect( m_insertSlide, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotMoveInsertSlide() ) ); + connect( m_removeSlide, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotMoveRemoveSlide()) ); + connect( m_moveUpSlide, TQ_SIGNAL(clicked()), this, TQ_SLOT( slotMoveUpSlide() ) ); + connect( m_moveDownSlide, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotMoveDownSlide()) ); + connect( m_name, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slideNameChanged( const TQString & ) ) ); + connect( listSlideShow, TQ_SIGNAL( clicked ( TQListBoxItem * ) ), this, TQ_SLOT( updateButton() ) ); + connect( listSlide, TQ_SIGNAL( clicked ( TQListBoxItem * ) ), this, TQ_SLOT( updateButton() ) ); + connect( listSlide, TQ_SIGNAL( doubleClicked ( TQListBoxItem * ) ), this, TQ_SLOT( slotMoveInsertSlide() ) ); + connect( listSlideShow, TQ_SIGNAL( doubleClicked( TQListBoxItem * ) ), this, TQ_SLOT( slotMoveRemoveSlide() ) ); m_insertSlide->setIconSet( SmallIconSet( ( TQApplication::reverseLayout() ? "back" : "forward" ) ) ); m_removeSlide->setIconSet( SmallIconSet( ( TQApplication::reverseLayout() ? "forward" : "back") ) ); m_moveUpSlide->setIconSet( SmallIconSet( "go-up" ) ); diff --git a/kpresenter/KPrDocument.cpp b/kpresenter/KPrDocument.cpp index ed6a32f6..9540771c 100644 --- a/kpresenter/KPrDocument.cpp +++ b/kpresenter/KPrDocument.cpp @@ -272,14 +272,14 @@ KPrDocument::KPrDocument( TQWidget *parentWidget, const char *widgetName, TQObje saveOnlyPage = -1; m_maxRecentFiles = 10; - connect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ), - this, TQT_SLOT( clipboardDataChanged() ) ); + connect( TQApplication::clipboard(), TQ_SIGNAL( dataChanged() ), + this, TQ_SLOT( clipboardDataChanged() ) ); m_commandHistory = new KoCommandHistory( actionCollection(), true ) ; initConfig(); - connect( m_commandHistory, TQT_SIGNAL( documentRestored() ), this, TQT_SLOT( slotDocumentRestored() ) ); - connect( m_commandHistory, TQT_SIGNAL( commandExecuted() ), this, TQT_SLOT( slotCommandExecuted() ) ); + connect( m_commandHistory, TQ_SIGNAL( documentRestored() ), this, TQ_SLOT( slotDocumentRestored() ) ); + connect( m_commandHistory, TQ_SIGNAL( commandExecuted() ), this, TQ_SLOT( slotCommandExecuted() ) ); dcopObject(); } @@ -3203,7 +3203,7 @@ bool KPrDocument::completeLoading( KoStore* _store ) recalcVariables( VT_FIELD ); emit sigProgress( -1 ); - connect( documentInfo(), TQT_SIGNAL( sigDocumentInfoModifed()),this,TQT_SLOT(slotDocumentInfoModifed() ) ); + connect( documentInfo(), TQ_SIGNAL( sigDocumentInfoModifed()),this,TQ_SLOT(slotDocumentInfoModifed() ) ); //desactivate bgspellchecking //attributes isReadWrite is not placed at the beginning ! if ( !isReadWrite()) @@ -3902,7 +3902,7 @@ TQPixmap KPrDocument::generatePreview( const TQSize& size ) void KPrDocument::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/kpresenter/KPrEffectDia.cpp b/kpresenter/KPrEffectDia.cpp index ec1579dd..9ef5020c 100644 --- a/kpresenter/KPrEffectDia.cpp +++ b/kpresenter/KPrEffectDia.cpp @@ -98,7 +98,7 @@ KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList< cEffect->setCurrentItem( static_cast<int>( obj->getEffect() ) ); upperRow->addWidget(cEffect, 1, 1); - connect( cEffect, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( appearEffectChanged( int ) ) ); + connect( cEffect, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( appearEffectChanged( int ) ) ); lAppearSpeed = new TQLabel( i18n( "Speed:" ), grp1 ); lAppearSpeed->setAlignment( AlignVCenter ); @@ -160,7 +160,7 @@ KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList< appearSoundEffect->setChecked( obj->getAppearSoundEffect() ); upperRow->addWidget( appearSoundEffect, 5, 0 ); - connect( appearSoundEffect, TQT_SIGNAL( clicked() ), this, TQT_SLOT( appearSoundEffectChanged() ) ); + connect( appearSoundEffect, TQ_SIGNAL( clicked() ), this, TQ_SLOT( appearSoundEffectChanged() ) ); lSoundEffect1 = new TQLabel( i18n( "File name:" ), grp1 ); lSoundEffect1->setAlignment( AlignVCenter ); @@ -170,25 +170,25 @@ KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList< requester1->setURL( obj->getAppearSoundEffectFileName() ); upperRow->addWidget( requester1, 6, 1 ); - connect( requester1, TQT_SIGNAL( openFileDialog( KURLRequester * ) ), - this, TQT_SLOT( slotRequesterClicked( KURLRequester * ) ) ); + connect( requester1, TQ_SIGNAL( openFileDialog( KURLRequester * ) ), + this, TQ_SLOT( slotRequesterClicked( KURLRequester * ) ) ); - connect( requester1, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( slotAppearFileChanged( const TQString& ) ) ); + connect( requester1, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( slotAppearFileChanged( const TQString& ) ) ); buttonTestPlaySoundEffect1 = new TQPushButton( grp1 ); buttonTestPlaySoundEffect1->setIconSet( SmallIconSet("1rightarrow") ); TQToolTip::add( buttonTestPlaySoundEffect1, i18n("Play") ); upperRow->addWidget( buttonTestPlaySoundEffect1, 6, 2 ); - connect( buttonTestPlaySoundEffect1, TQT_SIGNAL( clicked() ), this, TQT_SLOT( playSound1() ) ); + connect( buttonTestPlaySoundEffect1, TQ_SIGNAL( clicked() ), this, TQ_SLOT( playSound1() ) ); buttonTestStopSoundEffect1 = new TQPushButton( grp1 ); buttonTestStopSoundEffect1->setIconSet( SmallIconSet("media-playback-stop") ); TQToolTip::add( buttonTestStopSoundEffect1, i18n("Stop") ); upperRow->addWidget( buttonTestStopSoundEffect1, 6, 3 ); - connect( buttonTestStopSoundEffect1, TQT_SIGNAL( clicked() ), this, TQT_SLOT( stopSound1() ) ); + connect( buttonTestStopSoundEffect1, TQ_SIGNAL( clicked() ), this, TQ_SLOT( stopSound1() ) ); disappear = new TQCheckBox( i18n( "Disappear" ), page ); @@ -230,7 +230,7 @@ KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList< cDisappear->setCurrentItem( static_cast<int>( obj->getEffect3() ) ); lowerRow->addWidget(cDisappear, 1, 1); - connect( cDisappear, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( disappearEffectChanged( int ) ) ); + connect( cDisappear, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( disappearEffectChanged( int ) ) ); lDisappearSpeed = new TQLabel( i18n( "Speed:" ), grp2 ); lDisappearSpeed->setAlignment( AlignVCenter ); @@ -264,7 +264,7 @@ KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList< lowerRow->addWidget( disappearSoundEffect, 4, 0 ); disappearSoundEffect->setEnabled( disappear->isChecked() ); - connect( disappearSoundEffect, TQT_SIGNAL( clicked() ), this, TQT_SLOT( disappearSoundEffectChanged() ) ); + connect( disappearSoundEffect, TQ_SIGNAL( clicked() ), this, TQ_SLOT( disappearSoundEffectChanged() ) ); lSoundEffect2 = new TQLabel( i18n( "File name:" ), grp2 ); lSoundEffect2->setAlignment( AlignVCenter ); @@ -274,32 +274,32 @@ KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList< requester2->setURL( obj->getDisappearSoundEffectFileName() ); lowerRow->addWidget( requester2, 5, 1 ); - connect( requester2, TQT_SIGNAL( openFileDialog( KURLRequester * ) ), - this, TQT_SLOT( slotRequesterClicked( KURLRequester * ) ) ); + connect( requester2, TQ_SIGNAL( openFileDialog( KURLRequester * ) ), + this, TQ_SLOT( slotRequesterClicked( KURLRequester * ) ) ); - connect( requester2, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( slotDisappearFileChanged( const TQString& ) ) ); + connect( requester2, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( slotDisappearFileChanged( const TQString& ) ) ); buttonTestPlaySoundEffect2 = new TQPushButton( grp2 ); buttonTestPlaySoundEffect2->setIconSet( SmallIconSet("1rightarrow") ); TQToolTip::add( buttonTestPlaySoundEffect2, i18n("Play") ); lowerRow->addWidget( buttonTestPlaySoundEffect2, 5, 2 ); - connect( buttonTestPlaySoundEffect2, TQT_SIGNAL( clicked() ), this, TQT_SLOT( playSound2() ) ); + connect( buttonTestPlaySoundEffect2, TQ_SIGNAL( clicked() ), this, TQ_SLOT( playSound2() ) ); buttonTestStopSoundEffect2 = new TQPushButton( grp2 ); buttonTestStopSoundEffect2->setIconSet( SmallIconSet("media-playback-stop") ); TQToolTip::add( buttonTestStopSoundEffect2, i18n("Stop") ); lowerRow->addWidget( buttonTestStopSoundEffect2, 5, 3 ); - connect( buttonTestStopSoundEffect2, TQT_SIGNAL( clicked() ), this, TQT_SLOT( stopSound2() ) ); + connect( buttonTestStopSoundEffect2, TQ_SIGNAL( clicked() ), this, TQ_SLOT( stopSound2() ) ); topLayout->activate(); - connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotEffectDiaOk() ) ); - connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( accept() ) ); - connect( disappear, TQT_SIGNAL( clicked() ), this, TQT_SLOT( disappearChanged() ) ); + connect( this, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( slotEffectDiaOk() ) ); + connect( this, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( accept() ) ); + connect( disappear, TQ_SIGNAL( clicked() ), this, TQ_SLOT( disappearChanged() ) ); disappearChanged(); appearSoundEffectChanged(); } diff --git a/kpresenter/KPrGeneralProperty.cpp b/kpresenter/KPrGeneralProperty.cpp index 04c7140f..02e67355 100644 --- a/kpresenter/KPrGeneralProperty.cpp +++ b/kpresenter/KPrGeneralProperty.cpp @@ -54,8 +54,8 @@ KPrGeneralProperty::KPrGeneralProperty( TQWidget *parent, const char *name, Gene m_ui->positionGroup->setTitle( i18n( "Position" ) ); - connect( m_ui->protect, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotProtectToggled( bool ) ) ); - connect( m_ui->keepRatio, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotKeepRatioToggled( bool ) ) ); + connect( m_ui->protect, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotProtectToggled( bool ) ) ); + connect( m_ui->keepRatio, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotKeepRatioToggled( bool ) ) ); double dStep = KoUnit::fromUserValue( 0.5, m_unit ); double dMax = KoUnit::fromUserValue( 9999, m_unit ); @@ -67,11 +67,11 @@ KPrGeneralProperty::KPrGeneralProperty( TQWidget *parent, const char *name, Gene m_ui->widthInput->setUnit( m_unit ); m_ui->widthInput->setMinMaxStep( 0, dMax, dStep ); - connect( m_ui->widthInput, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( slotWidthChanged( double ) ) ); + connect( m_ui->widthInput, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( slotWidthChanged( double ) ) ); m_ui->heightInput->setUnit( m_unit ); m_ui->heightInput->setMinMaxStep( 0, dMax, dStep ); - connect( m_ui->heightInput, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( slotHeightChanged( double ) ) ); + connect( m_ui->heightInput, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( slotHeightChanged( double ) ) ); slotReset(); } diff --git a/kpresenter/KPrGotoPage.cpp b/kpresenter/KPrGotoPage.cpp index ce598acc..bcf46775 100644 --- a/kpresenter/KPrGotoPage.cpp +++ b/kpresenter/KPrGotoPage.cpp @@ -44,10 +44,10 @@ KPrGotoPage::KPrGotoPage( const KPrDocument *doc, TQLabel *label = new TQLabel( i18n( "Go to slide:" ), page ); ml->addWidget( label ); spinbox = new TQListBox( page ); - connect( spinbox, TQT_SIGNAL(doubleClicked( TQListBoxItem* )), - this, TQT_SLOT(accept()) ); - connect( spinbox, TQT_SIGNAL(returnPressed( TQListBoxItem* )), - this, TQT_SLOT(accept()) ); + connect( spinbox, TQ_SIGNAL(doubleClicked( TQListBoxItem* )), + this, TQ_SLOT(accept()) ); + connect( spinbox, TQ_SIGNAL(returnPressed( TQListBoxItem* )), + this, TQ_SLOT(accept()) ); ml->addWidget( spinbox ); TQPtrList<KPrPage> pageList = doc->getPageList(); // because of const doc, we can't do doc->pageList()->at() diff --git a/kpresenter/KPrImageEffectDia.cpp b/kpresenter/KPrImageEffectDia.cpp index 99512131..d565cbf8 100644 --- a/kpresenter/KPrImageEffectDia.cpp +++ b/kpresenter/KPrImageEffectDia.cpp @@ -47,11 +47,11 @@ KPrImageEffectDia::KPrImageEffectDia(TQWidget * parent, const char * name): setupSignals(); - connect((TQWidget *)base->m_effectCombo, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(effectChanged(int))); + connect((TQWidget *)base->m_effectCombo, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(effectChanged(int))); - connect(this, TQT_SIGNAL(okClicked()), - this, TQT_SLOT(okClicked())); + connect(this, TQ_SIGNAL(okClicked()), + this, TQ_SLOT(okClicked())); } KPrImageEffectDia::~KPrImageEffectDia() @@ -333,74 +333,74 @@ void KPrImageEffectDia::showEvent(TQShowEvent * e) void KPrImageEffectDia::setupSignals() { - connect((TQWidget *)base->chanInt_value, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(effectParamChanged())); - connect((TQWidget *)base->chanInt_component, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(effectParamChanged())); + connect((TQWidget *)base->chanInt_value, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(effectParamChanged())); + connect((TQWidget *)base->chanInt_component, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(effectParamChanged())); - connect((TQWidget *)base->fade_value, TQT_SIGNAL(valueChanged(double)), - this, TQT_SLOT(effectParamChanged())); - connect((TQWidget *)base->fade_color, TQT_SIGNAL(changed(const TQColor&)), - this, TQT_SLOT(effectParamChanged())); + connect((TQWidget *)base->fade_value, TQ_SIGNAL(valueChanged(double)), + this, TQ_SLOT(effectParamChanged())); + connect((TQWidget *)base->fade_color, TQ_SIGNAL(changed(const TQColor&)), + this, TQ_SLOT(effectParamChanged())); - connect((TQWidget *)base->flatten_color1, TQT_SIGNAL(changed(const TQColor&)), - this, TQT_SLOT(effectParamChanged())); - connect((TQWidget *)base->flatten_color2, TQT_SIGNAL(changed(const TQColor&)), - this, TQT_SLOT(effectParamChanged())); + connect((TQWidget *)base->flatten_color1, TQ_SIGNAL(changed(const TQColor&)), + this, TQ_SLOT(effectParamChanged())); + connect((TQWidget *)base->flatten_color2, TQ_SIGNAL(changed(const TQColor&)), + this, TQ_SLOT(effectParamChanged())); - connect((TQWidget *)base->intensity_value, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(effectParamChanged())); + connect((TQWidget *)base->intensity_value, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(effectParamChanged())); - connect((TQWidget *)base->desaturate_value, TQT_SIGNAL(valueChanged(double)), - this, TQT_SLOT(effectParamChanged())); + connect((TQWidget *)base->desaturate_value, TQ_SIGNAL(valueChanged(double)), + this, TQ_SLOT(effectParamChanged())); - connect((TQWidget *)base->contrast_value, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(effectParamChanged())); + connect((TQWidget *)base->contrast_value, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(effectParamChanged())); - connect((TQWidget *)base->threshold_value, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(effectParamChanged())); + connect((TQWidget *)base->threshold_value, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(effectParamChanged())); - connect((TQWidget *)base->solarize_value, TQT_SIGNAL(valueChanged(double)), - this, TQT_SLOT(effectParamChanged())); + connect((TQWidget *)base->solarize_value, TQ_SIGNAL(valueChanged(double)), + this, TQ_SLOT(effectParamChanged())); - connect((TQWidget *)base->charcoal_value, TQT_SIGNAL(valueChanged(double)), - this, TQT_SLOT(effectParamChanged())); + connect((TQWidget *)base->charcoal_value, TQ_SIGNAL(valueChanged(double)), + this, TQ_SLOT(effectParamChanged())); - connect((TQWidget *)base->noise_type, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(effectParamChanged())); + connect((TQWidget *)base->noise_type, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(effectParamChanged())); - connect((TQWidget *)base->blur_value, TQT_SIGNAL(valueChanged(double)), - this, TQT_SLOT(effectParamChanged())); + connect((TQWidget *)base->blur_value, TQ_SIGNAL(valueChanged(double)), + this, TQ_SLOT(effectParamChanged())); - connect((TQWidget *)base->edge_value, TQT_SIGNAL(valueChanged(double)), - this, TQT_SLOT(effectParamChanged())); + connect((TQWidget *)base->edge_value, TQ_SIGNAL(valueChanged(double)), + this, TQ_SLOT(effectParamChanged())); - connect((TQWidget *)base->implode_value, TQT_SIGNAL(valueChanged(double)), - this, TQT_SLOT(effectParamChanged())); + connect((TQWidget *)base->implode_value, TQ_SIGNAL(valueChanged(double)), + this, TQ_SLOT(effectParamChanged())); - connect((TQWidget *)base->oilPaint_radius, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(effectParamChanged())); + connect((TQWidget *)base->oilPaint_radius, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(effectParamChanged())); - connect((TQWidget *)base->sharpen_value, TQT_SIGNAL(valueChanged(double)), - this, TQT_SLOT(effectParamChanged())); + connect((TQWidget *)base->sharpen_value, TQ_SIGNAL(valueChanged(double)), + this, TQ_SLOT(effectParamChanged())); - connect((TQWidget *)base->spread_value, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(effectParamChanged())); + connect((TQWidget *)base->spread_value, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(effectParamChanged())); - connect((TQWidget *)base->shade_color, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(effectParamChanged())); - connect((TQWidget *)base->shade_elevation, TQT_SIGNAL(valueChanged(double)), - this, TQT_SLOT(effectParamChanged())); - connect((TQWidget *)base->shade_azimuth, TQT_SIGNAL(valueChanged(double)), - this, TQT_SLOT(effectParamChanged())); + connect((TQWidget *)base->shade_color, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(effectParamChanged())); + connect((TQWidget *)base->shade_elevation, TQ_SIGNAL(valueChanged(double)), + this, TQ_SLOT(effectParamChanged())); + connect((TQWidget *)base->shade_azimuth, TQ_SIGNAL(valueChanged(double)), + this, TQ_SLOT(effectParamChanged())); - connect((TQWidget *)base->swirl_value, TQT_SIGNAL(valueChanged(double)), - this, TQT_SLOT(effectParamChanged())); + connect((TQWidget *)base->swirl_value, TQ_SIGNAL(valueChanged(double)), + this, TQ_SLOT(effectParamChanged())); - connect((TQWidget *)base->wave_amplitude, TQT_SIGNAL(valueChanged(double)), - this, TQT_SLOT(effectParamChanged())); - connect((TQWidget *)base->wave_length, TQT_SIGNAL(valueChanged(double)), - this, TQT_SLOT(effectParamChanged())); + connect((TQWidget *)base->wave_amplitude, TQ_SIGNAL(valueChanged(double)), + this, TQ_SLOT(effectParamChanged())); + connect((TQWidget *)base->wave_length, TQ_SIGNAL(valueChanged(double)), + this, TQ_SLOT(effectParamChanged())); } void KPrImageEffectDia::effectParamChanged() diff --git a/kpresenter/KPrMSPresentationSetup.cpp b/kpresenter/KPrMSPresentationSetup.cpp index 40343fb1..0436a7f3 100644 --- a/kpresenter/KPrMSPresentationSetup.cpp +++ b/kpresenter/KPrMSPresentationSetup.cpp @@ -312,10 +312,10 @@ KPrMSPresentationSetup::KPrMSPresentationSetup( KPrDocument *_doc, KPrView *_vie pathLayout->addWidget(lable2); pathLayout->addWidget(path); - connect( path, TQT_SIGNAL( textChanged(const TQString&) ), - this, TQT_SLOT( slotChoosePath(const TQString&) ) ); - connect( path, TQT_SIGNAL( urlSelected( const TQString&) ), - this, TQT_SLOT( slotChoosePath(const TQString&) ) ); + connect( path, TQ_SIGNAL( textChanged(const TQString&) ), + this, TQ_SLOT( slotChoosePath(const TQString&) ) ); + connect( path, TQ_SIGNAL( urlSelected( const TQString&) ), + this, TQ_SLOT( slotChoosePath(const TQString&) ) ); TQLabel *lable1 = new TQLabel( i18n("Title:"), this, "lable1" ); @@ -331,7 +331,7 @@ KPrMSPresentationSetup::KPrMSPresentationSetup( KPrDocument *_doc, KPrView *_vie TQHBox *moreBox = new TQHBox( this ); TQPushButton *showColourButton = new TQPushButton( i18n("&Set Colors"), moreBox ); showColourButton->setToggleButton( true ); - connect( showColourButton, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( showColourGroup(bool) ) ); + connect( showColourButton, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( showColourGroup(bool) ) ); TQVBoxLayout *topLayout = new TQVBoxLayout; topLayout->addWidget( helptext ); @@ -388,9 +388,9 @@ KPrMSPresentationSetup::KPrMSPresentationSetup( KPrDocument *_doc, KPrView *_vie mainLayout->setResizeMode( TQLayout::Fixed ); mainLayout->setGeometry( TQRect( 0, 0, 300, 220 ) ); - connect( helpButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT ( helpMe() ) ); - connect( cancelButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( reject() ) ); - connect( createButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( finish() ) ); + connect( helpButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT ( helpMe() ) ); + connect( cancelButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( reject() ) ); + connect( createButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( finish() ) ); } KPrMSPresentationSetup::~KPrMSPresentationSetup() @@ -605,7 +605,7 @@ void KPrMSPresentationCreateDialog::setupGUI() bDone->setEnabled( false ); - connect( bDone, TQT_SIGNAL( clicked() ), this, TQT_SLOT( accept() ) ); + connect( bDone, TQ_SIGNAL( clicked() ), this, TQ_SLOT( accept() ) ); } void KPrMSPresentationCreateDialog::resizeEvent( TQResizeEvent *e ) diff --git a/kpresenter/KPrMarginWidget.cpp b/kpresenter/KPrMarginWidget.cpp index a8aa403e..6be911e9 100644 --- a/kpresenter/KPrMarginWidget.cpp +++ b/kpresenter/KPrMarginWidget.cpp @@ -61,14 +61,14 @@ KPrMarginWidget::KPrMarginWidget( TQWidget *parent, const char *name, const KoUn m_ui->bottomInput->setUnit( unit ); m_ui->bottomInput->setMinMaxStep( 0, dMax, dStep ); - connect( m_ui->leftInput, TQT_SIGNAL( valueChanged( double ) ), - this, TQT_SLOT( slotValueChanged( double ) ) ); - connect( m_ui->rightInput, TQT_SIGNAL( valueChanged( double ) ), - this, TQT_SLOT( slotValueChanged( double ) ) ); - connect( m_ui->topInput, TQT_SIGNAL( valueChanged( double ) ), - this, TQT_SLOT( slotValueChanged( double ) ) ); - connect( m_ui->bottomInput, TQT_SIGNAL( valueChanged( double ) ), - this, TQT_SLOT( slotValueChanged( double ) ) ); + connect( m_ui->leftInput, TQ_SIGNAL( valueChanged( double ) ), + this, TQ_SLOT( slotValueChanged( double ) ) ); + connect( m_ui->rightInput, TQ_SIGNAL( valueChanged( double ) ), + this, TQ_SLOT( slotValueChanged( double ) ) ); + connect( m_ui->topInput, TQ_SIGNAL( valueChanged( double ) ), + this, TQ_SLOT( slotValueChanged( double ) ) ); + connect( m_ui->bottomInput, TQ_SIGNAL( valueChanged( double ) ), + this, TQ_SLOT( slotValueChanged( double ) ) ); } diff --git a/kpresenter/KPrMoveHelpLineDia.cpp b/kpresenter/KPrMoveHelpLineDia.cpp index 0a0dd2c6..0fd25e52 100644 --- a/kpresenter/KPrMoveHelpLineDia.cpp +++ b/kpresenter/KPrMoveHelpLineDia.cpp @@ -47,7 +47,7 @@ KPrMoveHelpLineDia::KPrMoveHelpLineDia( TQWidget *parent, double value, double l position= new KoUnitDoubleSpinBox( page, TQMAX(0.00, limitTop), TQMAX(0.00, limitBottom), 1, TQMAX(0.00, value)); position->setUnit(m_doc->unit() ); - connect( this, TQT_SIGNAL( user1Clicked() ), this ,TQT_SLOT( slotRemoveHelpLine() )); + connect( this, TQ_SIGNAL( user1Clicked() ), this ,TQ_SLOT( slotRemoveHelpLine() )); resize( 300,100 ); } @@ -77,7 +77,7 @@ KPrInsertHelpLineDia::KPrInsertHelpLineDia( TQWidget *parent, const KoRect & _pa m_rbHoriz = new TQRadioButton( i18n("Horizontal"), group ); m_rbVert = new TQRadioButton( i18n("Vertical"), group ); - connect( group , TQT_SIGNAL( clicked( int) ), this, TQT_SLOT( slotRadioButtonClicked() )); + connect( group , TQ_SIGNAL( clicked( int) ), this, TQ_SLOT( slotRadioButtonClicked() )); new TQLabel(i18n("Position:"), page); @@ -133,7 +133,7 @@ KPrInsertHelpPointDia::KPrInsertHelpPointDia( TQWidget *parent, const KoRect & _ showButton( KDialogBase::User1, (posX!=0.0 || posY!=0.0) ); - connect( this, TQT_SIGNAL( user1Clicked() ), this ,TQT_SLOT( slotRemoveHelpPoint() )); + connect( this, TQ_SIGNAL( user1Clicked() ), this ,TQ_SLOT( slotRemoveHelpPoint() )); resize( 300,100 ); } diff --git a/kpresenter/KPrNoteBar.cpp b/kpresenter/KPrNoteBar.cpp index bb248a0d..db690957 100644 --- a/kpresenter/KPrNoteBar.cpp +++ b/kpresenter/KPrNoteBar.cpp @@ -56,20 +56,20 @@ KPrNoteBar::KPrNoteBar( TQWidget *_parent, KPrView *_view ) text = view->kPresenterDoc()->pageList().at(currentPageNum - 1)->noteText( ); textEdit->setText( text ); - connect( textEdit, TQT_SIGNAL( textChanged() ), - this, TQT_SLOT( slotTextChanged() ) ); + connect( textEdit, TQ_SIGNAL( textChanged() ), + this, TQ_SLOT( slotTextChanged() ) ); - connect( textEdit, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( slotSelectionChanged() ) ); + connect( textEdit, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( slotSelectionChanged() ) ); - connect( textEdit, TQT_SIGNAL( copyAvailable( bool ) ), - this, TQT_SLOT( slotSelectionChanged() ) ); + connect( textEdit, TQ_SIGNAL( copyAvailable( bool ) ), + this, TQ_SLOT( slotSelectionChanged() ) ); - connect( textEdit, TQT_SIGNAL( undoAvailable( bool ) ), - this, TQT_SLOT( slotUndoAvailable( bool ) ) ); + connect( textEdit, TQ_SIGNAL( undoAvailable( bool ) ), + this, TQ_SLOT( slotUndoAvailable( bool ) ) ); - connect( textEdit, TQT_SIGNAL( redoAvailable( bool ) ), - this, TQT_SLOT( slotRedoAvailable( bool ) ) ); + connect( textEdit, TQ_SIGNAL( redoAvailable( bool ) ), + this, TQ_SLOT( slotRedoAvailable( bool ) ) ); topLayout->addWidget( label ); topLayout->addWidget( textEdit ); diff --git a/kpresenter/KPrPenStyleWidget.cpp b/kpresenter/KPrPenStyleWidget.cpp index 032c6734..4e370995 100644 --- a/kpresenter/KPrPenStyleWidget.cpp +++ b/kpresenter/KPrPenStyleWidget.cpp @@ -42,8 +42,8 @@ KPrPenStyleWidget::KPrPenStyleWidget( TQWidget *parent, const char *name, const TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); layout->addItem( spacer ); - connect( m_ui->colorChooser, TQT_SIGNAL( changed( const TQColor& ) ), - this, TQT_SLOT( slotPenChanged() ) ); + connect( m_ui->colorChooser, TQ_SIGNAL( changed( const TQColor& ) ), + this, TQ_SLOT( slotPenChanged() ) ); m_ui->styleCombo->insertItem( i18n( "No Outline" ) ); m_ui->styleCombo->insertItem( "__________" ); @@ -54,11 +54,11 @@ KPrPenStyleWidget::KPrPenStyleWidget( TQWidget *parent, const char *name, const m_ui->widthInput->setRange( 1, 10, 1, false); - connect( m_ui->styleCombo, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotPenChanged() ) ); + connect( m_ui->styleCombo, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotPenChanged() ) ); - connect( m_ui->widthInput, TQT_SIGNAL( valueChanged( double ) ), - this, TQT_SLOT( slotPenChanged() ) ); + connect( m_ui->widthInput, TQ_SIGNAL( valueChanged( double ) ), + this, TQ_SLOT( slotPenChanged() ) ); m_ui->lineBeginCombo->insertItem( i18n("Normal") ); m_ui->lineBeginCombo->insertItem( i18n("Arrow") ); @@ -69,8 +69,8 @@ KPrPenStyleWidget::KPrPenStyleWidget( TQWidget *parent, const char *name, const m_ui->lineBeginCombo->insertItem( i18n("Double Arrow") ); m_ui->lineBeginCombo->insertItem( i18n("Double Line Arrow") ); - connect( m_ui->lineBeginCombo, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotLineBeginChanged() ) ); + connect( m_ui->lineBeginCombo, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotLineBeginChanged() ) ); m_ui->lineEndCombo->insertItem( i18n("Normal") ); m_ui->lineEndCombo->insertItem( i18n("Arrow") ); @@ -81,8 +81,8 @@ KPrPenStyleWidget::KPrPenStyleWidget( TQWidget *parent, const char *name, const m_ui->lineEndCombo->insertItem( i18n("Double Arrow") ); m_ui->lineEndCombo->insertItem( i18n("Double Line Arrow") ); - connect( m_ui->lineEndCombo, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotLineEndChanged() ) ); + connect( m_ui->lineEndCombo, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotLineEndChanged() ) ); if ( !configureLineEnds ) m_ui->arrowGroup->hide(); diff --git a/kpresenter/KPrPgConfDia.cpp b/kpresenter/KPrPgConfDia.cpp index 314ab03f..118a5365 100644 --- a/kpresenter/KPrPgConfDia.cpp +++ b/kpresenter/KPrPgConfDia.cpp @@ -55,8 +55,8 @@ KPrPgConfDia::KPrPgConfDia( TQWidget* parent, KPrDocument* doc ) setupPageGeneral(); setupPageSlides(); - connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( confDiaOk() ) ); - connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( accept() ) ); + connect( this, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( confDiaOk() ) ); + connect( this, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( accept() ) ); } void KPrPgConfDia::setupPageGeneral() @@ -98,8 +98,8 @@ void KPrPgConfDia::setupPageGeneral() "useful if you are running a promotional display.</p>") ); infiniteLoop->setEnabled( !m_doc->spManualSwitch() ); - connect( m_autoButton, TQT_SIGNAL( toggled(bool) ), infiniteLoop, TQT_SLOT( setEnabled(bool) ) ); - connect( m_autoButton, TQT_SIGNAL( toggled(bool) ), infiniteLoop, TQT_SLOT( setChecked(bool) ) ); + connect( m_autoButton, TQ_SIGNAL( toggled(bool) ), infiniteLoop, TQ_SLOT( setEnabled(bool) ) ); + connect( m_autoButton, TQ_SIGNAL( toggled(bool) ), infiniteLoop, TQ_SLOT( setChecked(bool) ) ); endOfPresentationSlide = new TQCheckBox( i18n( "&Show 'End of presentation' slide" ), generalPage ); generalLayout->addWidget( endOfPresentationSlide ); @@ -109,7 +109,7 @@ void KPrPgConfDia::setupPageGeneral() "be shown.") ); endOfPresentationSlide->setChecked( m_doc->spShowEndOfPresentationSlide() ); endOfPresentationSlide->setDisabled( infiniteLoop->isEnabled() && getInfiniteLoop() ); - connect( infiniteLoop, TQT_SIGNAL( toggled(bool) ), endOfPresentationSlide, TQT_SLOT( setDisabled(bool) ) ); + connect( infiniteLoop, TQ_SIGNAL( toggled(bool) ), endOfPresentationSlide, TQ_SLOT( setDisabled(bool) ) ); presentationDuration = new TQCheckBox( i18n( "Measure presentation &duration" ), generalPage ); generalLayout->addWidget( presentationDuration ); @@ -169,7 +169,7 @@ void KPrPgConfDia::setupPageSlides() m_customSlide = new TQRadioButton( i18n( "Custom slide show" ), group, "customslide" ); - connect( m_customSlide, TQT_SIGNAL( clicked () ), this, TQT_SLOT( radioButtonClicked() ) ); + connect( m_customSlide, TQ_SIGNAL( clicked () ), this, TQ_SLOT( radioButtonClicked() ) ); TQHBox *box = new TQHBox( group ); @@ -180,7 +180,7 @@ void KPrPgConfDia::setupPageSlides() m_selectedSlide = new TQRadioButton( i18n( "Selected pages:" ), group, "selectedslide" ); slidesLayout->addMultiCellWidget( group, 0,2,0,1 ); - connect( m_selectedSlide, TQT_SIGNAL( clicked () ), this, TQT_SLOT( radioButtonClicked() ) ); + connect( m_selectedSlide, TQ_SIGNAL( clicked () ), this, TQ_SLOT( radioButtonClicked() ) ); slides = new TQListView( slidesPage ); slidesLayout->addMultiCellWidget( slides, 3, 3, 0, 1 ); @@ -202,10 +202,10 @@ void KPrPgConfDia::setupPageSlides() buttonGroup->setSpacing( KDialog::spacingHint() ); TQPushButton* selectAllButton = new TQPushButton( i18n( "Select &All" ), buttonGroup ); - connect( selectAllButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( selectAllSlides() ) ); + connect( selectAllButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( selectAllSlides() ) ); TQPushButton* deselectAllButton = new TQPushButton( i18n( "&Deselect All" ), buttonGroup ); - connect( deselectAllButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( deselectAllSlides() ) ); + connect( deselectAllButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( deselectAllSlides() ) ); TQWidget* spacer = new TQWidget( buttonGroup ); diff --git a/kpresenter/KPrPictureProperty.cpp b/kpresenter/KPrPictureProperty.cpp index 7d77e4ce..ed65a639 100644 --- a/kpresenter/KPrPictureProperty.cpp +++ b/kpresenter/KPrPictureProperty.cpp @@ -35,17 +35,17 @@ KPrPictureProperty::KPrPictureProperty( TQWidget *parent, const char *name, cons TQVBoxLayout *layout = new TQVBoxLayout( this ); layout->addWidget( m_ui = new PicturePropertyUI( this ) ); - connect( m_ui->depth0, TQT_SIGNAL( clicked() ), m_ui->picturePreview, TQT_SLOT( slotPictureDepth0() ) ); - connect( m_ui->depth1, TQT_SIGNAL( clicked() ), m_ui->picturePreview, TQT_SLOT( slotPictureDepth1() ) ); - connect( m_ui->depth8, TQT_SIGNAL( clicked() ), m_ui->picturePreview, TQT_SLOT( slotPictureDepth8() ) ); - connect( m_ui->depth16, TQT_SIGNAL( clicked() ), m_ui->picturePreview, TQT_SLOT( slotPictureDepth16() ) ); - connect( m_ui->depth32, TQT_SIGNAL( clicked() ), m_ui->picturePreview, TQT_SLOT( slotPictureDepth32() ) ); + connect( m_ui->depth0, TQ_SIGNAL( clicked() ), m_ui->picturePreview, TQ_SLOT( slotPictureDepth0() ) ); + connect( m_ui->depth1, TQ_SIGNAL( clicked() ), m_ui->picturePreview, TQ_SLOT( slotPictureDepth1() ) ); + connect( m_ui->depth8, TQ_SIGNAL( clicked() ), m_ui->picturePreview, TQ_SLOT( slotPictureDepth8() ) ); + connect( m_ui->depth16, TQ_SIGNAL( clicked() ), m_ui->picturePreview, TQ_SLOT( slotPictureDepth16() ) ); + connect( m_ui->depth32, TQ_SIGNAL( clicked() ), m_ui->picturePreview, TQ_SLOT( slotPictureDepth32() ) ); - connect( m_ui->swapRGB, TQT_SIGNAL( toggled( bool ) ), m_ui->picturePreview, TQT_SLOT( slotSwapRGBPicture( bool ) ) ); + connect( m_ui->swapRGB, TQ_SIGNAL( toggled( bool ) ), m_ui->picturePreview, TQ_SLOT( slotSwapRGBPicture( bool ) ) ); - connect( m_ui->grayscale, TQT_SIGNAL( toggled( bool ) ), m_ui->picturePreview, TQT_SLOT( slotGrayscalPicture( bool ) ) ); + connect( m_ui->grayscale, TQ_SIGNAL( toggled( bool ) ), m_ui->picturePreview, TQ_SLOT( slotGrayscalPicture( bool ) ) ); - connect( m_ui->brightnessInput, TQT_SIGNAL( valueChanged( int ) ), m_ui->picturePreview, TQT_SLOT( slotBrightValue( int ) ) ); + connect( m_ui->brightnessInput, TQ_SIGNAL( valueChanged( int ) ), m_ui->picturePreview, TQ_SLOT( slotBrightValue( int ) ) ); m_ui->picturePreview->setPicturePixmap( pixmap ); diff --git a/kpresenter/KPrPieProperty.cpp b/kpresenter/KPrPieProperty.cpp index c98a6cbf..2b38effa 100644 --- a/kpresenter/KPrPieProperty.cpp +++ b/kpresenter/KPrPieProperty.cpp @@ -41,10 +41,10 @@ KPrPieProperty::KPrPieProperty( TQWidget *parent, const char *name, KPrPieValueC m_ui->typeCombo->insertItem( i18n( "Arc" ) ); m_ui->typeCombo->insertItem( i18n( "Chord" ) ); - connect( m_ui->typeCombo, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotTypeChanged( int ) ) ); + connect( m_ui->typeCombo, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotTypeChanged( int ) ) ); - connect( m_ui->angleInput, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( slotAngleChanged( int ) ) ); - connect( m_ui->lengthInput, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( slotLengthChanged( int ) ) ); + connect( m_ui->angleInput, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( slotAngleChanged( int ) ) ); + connect( m_ui->lengthInput, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( slotLengthChanged( int ) ) ); slotReset(); } diff --git a/kpresenter/KPrPolygonProperty.cpp b/kpresenter/KPrPolygonProperty.cpp index 94b13fd6..cfd134e7 100644 --- a/kpresenter/KPrPolygonProperty.cpp +++ b/kpresenter/KPrPolygonProperty.cpp @@ -38,13 +38,13 @@ KPrPolygonProperty::KPrPolygonProperty( TQWidget *parent, const char *name, KPrP m_ui->typeCombo->insertItem( i18n( "Polygon" ) ); m_ui->typeCombo->insertItem( i18n( "Convex/Concave" ) ); - connect( m_ui->typeCombo, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT(slotTypeChanged( int ) ) ); + connect( m_ui->typeCombo, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT(slotTypeChanged( int ) ) ); - connect( m_ui->cornersInput, TQT_SIGNAL( valueChanged( int ) ), - m_ui->polygonPreview, TQT_SLOT( slotCornersValue( int ) ) ); - connect( m_ui->sharpnessInput, TQT_SIGNAL( valueChanged( int ) ), - m_ui->polygonPreview, TQT_SLOT( slotSharpnessValue( int ) ) ); + connect( m_ui->cornersInput, TQ_SIGNAL( valueChanged( int ) ), + m_ui->polygonPreview, TQ_SLOT( slotCornersValue( int ) ) ); + connect( m_ui->sharpnessInput, TQ_SIGNAL( valueChanged( int ) ), + m_ui->polygonPreview, TQ_SLOT( slotSharpnessValue( int ) ) ); slotReset(); } diff --git a/kpresenter/KPrPresDurationDia.cpp b/kpresenter/KPrPresDurationDia.cpp index 6fcdddad..a2e7b22c 100644 --- a/kpresenter/KPrPresDurationDia.cpp +++ b/kpresenter/KPrPresDurationDia.cpp @@ -51,7 +51,7 @@ KPrPresDurationDia::KPrPresDurationDia( TQWidget *parent, const char *name, topLayout->addWidget( label ); setMinimumSize( 600, 400 ); - connect( this, TQT_SIGNAL( closeClicked() ), this, TQT_SLOT( slotCloseDialog() ) ); + connect( this, TQ_SIGNAL( closeClicked() ), this, TQ_SLOT( slotCloseDialog() ) ); } diff --git a/kpresenter/KPrPrinterDlg.cpp b/kpresenter/KPrPrinterDlg.cpp index 284b2eed..8735a77b 100644 --- a/kpresenter/KPrPrinterDlg.cpp +++ b/kpresenter/KPrPrinterDlg.cpp @@ -45,8 +45,8 @@ txtColumns->setMinValue(1); txtColumns->setMaxValue(5); txtColumns->setValue(1); - connect( txtRows, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( txtRows_valueChanged( int ) ) ); - connect( txtColumns, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( txtColumns_valueChanged( int ) ) ); + connect( txtRows, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( txtRows_valueChanged( int ) ) ); + connect( txtColumns, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( txtColumns_valueChanged( int ) ) ); TQLabel *caption = new TQLabel(i18n("Slides in the pages:"), this ); TQToolTip::add( caption, i18n("Choose how many rows and columns with slides you want to have on all pages") ); diff --git a/kpresenter/KPrPropertyEditor.cpp b/kpresenter/KPrPropertyEditor.cpp index 4d82b0b3..3445bc17 100644 --- a/kpresenter/KPrPropertyEditor.cpp +++ b/kpresenter/KPrPropertyEditor.cpp @@ -54,7 +54,7 @@ KPrPropertyEditor::KPrPropertyEditor( TQWidget *parent, const char *name, KPrPag setOkButton( KStdGuiItem::ok().text() ); setApplyButton( KStdGuiItem::apply().text() ); - connect( this, TQT_SIGNAL( applyButtonPressed() ), this, TQT_SLOT( slotDone() ) ); + connect( this, TQ_SIGNAL( applyButtonPressed() ), this, TQ_SLOT( slotDone() ) ); m_objectProperties = new KPrObjectProperties( m_objects ); diff --git a/kpresenter/KPrRectProperty.cpp b/kpresenter/KPrRectProperty.cpp index 5608a323..5e6dc5c2 100644 --- a/kpresenter/KPrRectProperty.cpp +++ b/kpresenter/KPrRectProperty.cpp @@ -38,9 +38,9 @@ KPrRectProperty::KPrRectProperty( TQWidget *parent, const char *name, KPrRectVal KoImageResource kir; m_ui->combineButton->setPixmap(kir.chain()); - connect( m_ui->xRndInput, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( slotRndChanged() ) ); - connect( m_ui->yRndInput, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( slotRndChanged() ) ); - connect( m_ui->combineButton, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( combineToggled( bool ) ) ); + connect( m_ui->xRndInput, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( slotRndChanged() ) ); + connect( m_ui->yRndInput, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( slotRndChanged() ) ); + connect( m_ui->combineButton, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( combineToggled( bool ) ) ); slotReset(); } @@ -126,17 +126,17 @@ void KPrRectProperty::combineToggled( bool on) if( on ) { formerVerticalValue = getYRnd(); m_ui->yRndInput->setValue( getXRnd() ); - connect(m_ui->yRndInput, TQT_SIGNAL( valueChanged ( int ) ), - m_ui->xRndInput, TQT_SLOT( setValue ( int ) )); - connect(m_ui->xRndInput, TQT_SIGNAL( valueChanged ( int ) ), - m_ui->yRndInput, TQT_SLOT( setValue ( int ) )); + connect(m_ui->yRndInput, TQ_SIGNAL( valueChanged ( int ) ), + m_ui->xRndInput, TQ_SLOT( setValue ( int ) )); + connect(m_ui->xRndInput, TQ_SIGNAL( valueChanged ( int ) ), + m_ui->yRndInput, TQ_SLOT( setValue ( int ) )); m_ui->combineButton->setPixmap(kir.chain()); } else { - disconnect(m_ui->yRndInput, TQT_SIGNAL( valueChanged ( int ) ), - m_ui->xRndInput, TQT_SLOT( setValue ( int ) )); - disconnect(m_ui->xRndInput, TQT_SIGNAL( valueChanged ( int ) ), - m_ui->yRndInput, TQT_SLOT( setValue ( int ) )); + disconnect(m_ui->yRndInput, TQ_SIGNAL( valueChanged ( int ) ), + m_ui->xRndInput, TQ_SLOT( setValue ( int ) )); + disconnect(m_ui->xRndInput, TQ_SIGNAL( valueChanged ( int ) ), + m_ui->yRndInput, TQ_SLOT( setValue ( int ) )); if(formerVerticalValue != 0) m_ui->yRndInput->setValue( formerVerticalValue ); m_ui->combineButton->setPixmap(kir.chainBroken()); diff --git a/kpresenter/KPrRotationDialogImpl.cpp b/kpresenter/KPrRotationDialogImpl.cpp index 8e845dc7..42ba825c 100644 --- a/kpresenter/KPrRotationDialogImpl.cpp +++ b/kpresenter/KPrRotationDialogImpl.cpp @@ -66,13 +66,13 @@ KPrRotationDialogImpl::KPrRotationDialogImpl( TQWidget *parent, const char* name circleLayout->addWidget(r90, 1, 3); circleLayout->addWidget(r270, 1, 1); - connect( m_angleGroup, TQT_SIGNAL (clicked (int)), - this, TQT_SLOT( angleMode( int ) ) ); - connect (m_dialog->angleSlider, TQT_SIGNAL( valueChanged (int ) ), - this, TQT_SLOT( angleMode( int ) ) ); - connect (m_dialog->angleSpinbox, TQT_SIGNAL (valueChanged (double) ), - this, TQT_SLOT( angleChanged( double ) ) ); - connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOk() ) ); + connect( m_angleGroup, TQ_SIGNAL (clicked (int)), + this, TQ_SLOT( angleMode( int ) ) ); + connect (m_dialog->angleSlider, TQ_SIGNAL( valueChanged (int ) ), + this, TQ_SLOT( angleMode( int ) ) ); + connect (m_dialog->angleSpinbox, TQ_SIGNAL (valueChanged (double) ), + this, TQ_SLOT( angleChanged( double ) ) ); + connect( this, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( slotOk() ) ); setMainWidget( m_dialog ); } @@ -157,7 +157,7 @@ void KPrCircleGroup::setAngle(int angle) { } void KPrCircleGroup::add(KPrCircleToggle *button) { - connect (button, TQT_SIGNAL(clicked (int)), this, TQT_SLOT (selectionChanged (int)) ); + connect (button, TQ_SIGNAL(clicked (int)), this, TQ_SLOT (selectionChanged (int)) ); m_buttons.append(button); } diff --git a/kpresenter/KPrShadowDialogImpl.cpp b/kpresenter/KPrShadowDialogImpl.cpp index 20ebe105..d229da34 100644 --- a/kpresenter/KPrShadowDialogImpl.cpp +++ b/kpresenter/KPrShadowDialogImpl.cpp @@ -25,8 +25,8 @@ KPrShadowDialogImpl::KPrShadowDialogImpl( TQWidget *parent, const char* name ) lbButton->setPixmap( BarIcon( "shadowLB" ) ); lButton->setPixmap( BarIcon( "shadowL" ) ); - connect( colorButton, TQT_SIGNAL( changed( const TQColor& ) ), - TQT_SLOT( colorChanged( const TQColor& ) ) ); + connect( colorButton, TQ_SIGNAL( changed( const TQColor& ) ), + TQ_SLOT( colorChanged( const TQColor& ) ) ); } void KPrShadowDialogImpl::setShadowDirection( ShadowDirection d ) diff --git a/kpresenter/KPrSideBar.cpp b/kpresenter/KPrSideBar.cpp index 5d2a6e75..9917f97d 100644 --- a/kpresenter/KPrSideBar.cpp +++ b/kpresenter/KPrSideBar.cpp @@ -151,20 +151,20 @@ KPrSideBar::KPrSideBar(TQWidget *parent, KPrDocument *d, KPrView *v) //TODO find a better way - connect(m_outline, TQT_SIGNAL(showPage(int)), - this, TQT_SIGNAL(showPage(int))); + connect(m_outline, TQ_SIGNAL(showPage(int)), + this, TQ_SIGNAL(showPage(int))); - connect(m_thb, TQT_SIGNAL(showPage(int)), - this, TQT_SIGNAL(showPage(int))); + connect(m_thb, TQ_SIGNAL(showPage(int)), + this, TQ_SIGNAL(showPage(int))); - connect(m_outline, TQT_SIGNAL(movePage(int,int)), - this, TQT_SIGNAL(movePage(int,int))); + connect(m_outline, TQ_SIGNAL(movePage(int,int)), + this, TQ_SIGNAL(movePage(int,int))); - connect(m_outline, TQT_SIGNAL(selectPage(int,bool)), - this, TQT_SIGNAL(selectPage(int,bool))); + connect(m_outline, TQ_SIGNAL(selectPage(int,bool)), + this, TQ_SIGNAL(selectPage(int,bool))); - connect(this, TQT_SIGNAL(currentChanged(TQWidget *)), - this, TQT_SLOT(currentChanged(TQWidget *))); + connect(this, TQ_SIGNAL(currentChanged(TQWidget *)), + this, TQ_SLOT(currentChanged(TQWidget *))); } @@ -247,10 +247,10 @@ KPrThumbBar::KPrThumbBar(TQWidget *parent, KPrDocument *d, KPrView *v) m_thumbTip = new ThumbToolTip(this); - connect(this, TQT_SIGNAL(currentChanged(TQIconViewItem *)), - this, TQT_SLOT(itemClicked(TQIconViewItem *))); - connect(this, TQT_SIGNAL(contentsMoving(int, int)), - this, TQT_SLOT(slotContentsMoving(int, int))); + connect(this, TQ_SIGNAL(currentChanged(TQIconViewItem *)), + this, TQ_SLOT(itemClicked(TQIconViewItem *))); + connect(this, TQ_SIGNAL(contentsMoving(int, int)), + this, TQ_SLOT(slotContentsMoving(int, int))); } KPrThumbBar::~KPrThumbBar() @@ -347,7 +347,7 @@ void KPrThumbBar::rebuildItems() item->setDragEnabled(false); //no dragging for now } - TQTimer::singleShot( 10, this, TQT_SLOT( slotRefreshItems() ) ); + TQTimer::singleShot( 10, this, TQ_SLOT( slotRefreshItems() ) ); } uptodate = true; @@ -763,16 +763,16 @@ KPrOutline::KPrOutline( TQWidget *parent, KPrDocument *d, KPrView *v ) addColumn( i18n( "Slide" ) ); setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ) ); - connect( this, TQT_SIGNAL( currentChanged( TQListViewItem * ) ), this, TQT_SLOT( itemClicked( TQListViewItem * ) ) ); - connect( this, TQT_SIGNAL( rightButtonPressed( TQListViewItem *, const TQPoint &, int ) ), - this, TQT_SLOT( rightButtonPressed( TQListViewItem *, const TQPoint &, int ) ) ); - connect( this, TQT_SIGNAL( contextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ), - this, TQT_SLOT( slotContextMenu( TDEListView*, TQListViewItem*, const TQPoint&) ) ); + connect( this, TQ_SIGNAL( currentChanged( TQListViewItem * ) ), this, TQ_SLOT( itemClicked( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( rightButtonPressed( TQListViewItem *, const TQPoint &, int ) ), + this, TQ_SLOT( rightButtonPressed( TQListViewItem *, const TQPoint &, int ) ) ); + connect( this, TQ_SIGNAL( contextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ), + this, TQ_SLOT( slotContextMenu( TDEListView*, TQListViewItem*, const TQPoint&) ) ); - connect( this, TQT_SIGNAL( doubleClicked ( TQListViewItem * )), - this, TQT_SLOT(renamePageTitle())); - connect( this, TQT_SIGNAL( dropped( TQDropEvent*, TQListViewItem*, TQListViewItem* ) ), - this, TQT_SLOT( slotDropped( TQDropEvent*, TQListViewItem*, TQListViewItem* ) )); + connect( this, TQ_SIGNAL( doubleClicked ( TQListViewItem * )), + this, TQ_SLOT(renamePageTitle())); + connect( this, TQ_SIGNAL( dropped( TQDropEvent*, TQListViewItem*, TQListViewItem* ) ), + this, TQ_SLOT( slotDropped( TQDropEvent*, TQListViewItem*, TQListViewItem* ) )); setItemsMovable( false ); setDragEnabled( true ); @@ -998,9 +998,9 @@ void KPrOutline::setCurrentPage( int pg ) void KPrOutline::contentsDropEvent( TQDropEvent *e ) { - disconnect( this, TQT_SIGNAL( currentChanged( TQListViewItem * ) ), this, TQT_SLOT( itemClicked( TQListViewItem * ) ) ); + disconnect( this, TQ_SIGNAL( currentChanged( TQListViewItem * ) ), this, TQ_SLOT( itemClicked( TQListViewItem * ) ) ); TDEListView::contentsDropEvent( e ); - connect( this, TQT_SIGNAL( currentChanged( TQListViewItem * ) ), this, TQT_SLOT( itemClicked( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( currentChanged( TQListViewItem * ) ), this, TQ_SLOT( itemClicked( TQListViewItem * ) ) ); } void KPrOutline::moveItem( TQListViewItem *i, TQListViewItem *, TQListViewItem *newAfter ) diff --git a/kpresenter/KPrSlideTransitionDia.cpp b/kpresenter/KPrSlideTransitionDia.cpp index fe8a132a..cf9172b4 100644 --- a/kpresenter/KPrSlideTransitionDia.cpp +++ b/kpresenter/KPrSlideTransitionDia.cpp @@ -128,7 +128,7 @@ KPrSlideTransitionDia::KPrSlideTransitionDia( TQWidget *parent, const char *name if( m_effect == PEF_RANDOM ) m_dialog->effectCombo->setCurrentItem( m_dialog->effectCombo->count()-1 ); - connect( m_dialog->effectCombo, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( effectChanged( int ) ) ); + connect( m_dialog->effectCombo, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( effectChanged( int ) ) ); // setup speed combo m_dialog->speedCombo->insertItem( i18n("Slow") ); @@ -137,7 +137,7 @@ KPrSlideTransitionDia::KPrSlideTransitionDia( TQWidget *parent, const char *name m_dialog->speedCombo->setCurrentItem( m_effectSpeed ); - connect( m_dialog->speedCombo, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( effectChanged( int ) ) ); + connect( m_dialog->speedCombo, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( effectChanged( int ) ) ); // set up sound m_dialog->soundCheckBox->setChecked( m_soundEffect ); @@ -145,24 +145,24 @@ KPrSlideTransitionDia::KPrSlideTransitionDia( TQWidget *parent, const char *name soundEffectChanged(); m_dialog->playButton->setIconSet( SmallIconSet( "media-playback-start" ) ); m_dialog->stopButton->setIconSet( SmallIconSet( "media-playback-stop" ) ); - connect( m_dialog->playButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( playSound() ) ); - connect( m_dialog->stopButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( stopSound() ) ); + connect( m_dialog->playButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( playSound() ) ); + connect( m_dialog->stopButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( stopSound() ) ); - connect( m_dialog->soundCheckBox, TQT_SIGNAL( clicked()), this, TQT_SLOT( soundEffectChanged() ) ); - connect( m_dialog->soundRequester, TQT_SIGNAL( openFileDialog( KURLRequester * ) ), this, TQT_SLOT( slotRequesterClicked( KURLRequester * ) ) ); - connect( m_dialog->soundRequester, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( slotSoundFileChanged( const TQString& ) ) ); + connect( m_dialog->soundCheckBox, TQ_SIGNAL( clicked()), this, TQ_SLOT( soundEffectChanged() ) ); + connect( m_dialog->soundRequester, TQ_SIGNAL( openFileDialog( KURLRequester * ) ), this, TQ_SLOT( slotRequesterClicked( KURLRequester * ) ) ); + connect( m_dialog->soundRequester, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( slotSoundFileChanged( const TQString& ) ) ); // set up automatic tansition m_dialog->automaticTransitionInput->setRange( 1, 600, 1 ); m_dialog->automaticTransitionInput->setValue( m_slideTime ); // set up preview button - connect( m_dialog->previewButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( preview() ) ); + connect( m_dialog->previewButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( preview() ) ); setButtonText(KDialogBase::User1,i18n( "Apply &Global" )); - connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOk() ) ); - connect( this, TQT_SIGNAL( user1Clicked() ), this, TQT_SLOT( slotUser1() ) ); + connect( this, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( slotOk() ) ); + connect( this, TQ_SIGNAL( user1Clicked() ), this, TQ_SLOT( slotUser1() ) ); setMainWidget( m_dialog ); } @@ -191,7 +191,7 @@ void KPrSlideTransitionDia::preview() if ( m_pageEffect ) { m_pageEffectTimer.stop(); - TQObject::disconnect( &m_pageEffectTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotDoPageEffect() ) ); + TQObject::disconnect( &m_pageEffectTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotDoPageEffect() ) ); m_pageEffect->finish(); @@ -209,7 +209,7 @@ void KPrSlideTransitionDia::preview() } else { - connect( &m_pageEffectTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotDoPageEffect() ) ); + connect( &m_pageEffectTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotDoPageEffect() ) ); m_pageEffectTimer.start( 50, true ); } } @@ -220,7 +220,7 @@ void KPrSlideTransitionDia::slotDoPageEffect() if ( m_pageEffect->doEffect() ) { m_pageEffectTimer.stop(); - TQObject::disconnect( &m_pageEffectTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotDoPageEffect() ) ); + TQObject::disconnect( &m_pageEffectTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotDoPageEffect() ) ); delete m_pageEffect; m_pageEffect = 0; m_dialog->previewPixmap->update(); diff --git a/kpresenter/KPrTextObject.cpp b/kpresenter/KPrTextObject.cpp index 6a7f4440..18844e43 100644 --- a/kpresenter/KPrTextObject.cpp +++ b/kpresenter/KPrTextObject.cpp @@ -131,22 +131,22 @@ KPrTextObject::KPrTextObject( KPrDocument *doc ) bbottom = 0.0; alignVertical = 0.0; - connect( m_textobj, TQT_SIGNAL( newCommand( KCommand * ) ), - TQT_SLOT( slotNewCommand( KCommand * ) ) ); - connect( m_textobj, TQT_SIGNAL( availableHeightNeeded() ), - TQT_SLOT( slotAvailableHeightNeeded() ) ); - connect( m_textobj, TQT_SIGNAL( repaintChanged( KoTextObject* ) ), - TQT_SLOT( slotRepaintChanged() ) ); + connect( m_textobj, TQ_SIGNAL( newCommand( KCommand * ) ), + TQ_SLOT( slotNewCommand( KCommand * ) ) ); + connect( m_textobj, TQ_SIGNAL( availableHeightNeeded() ), + TQ_SLOT( slotAvailableHeightNeeded() ) ); + connect( m_textobj, TQ_SIGNAL( repaintChanged( KoTextObject* ) ), + TQ_SLOT( slotRepaintChanged() ) ); // Send our "repaintChanged" signals to the document. - connect( this, TQT_SIGNAL( repaintChanged( KPrTextObject * ) ), - m_doc, TQT_SLOT( slotRepaintChanged( KPrTextObject * ) ) ); - connect(m_textobj, TQT_SIGNAL( showFormatObject(const KoTextFormat &) ), - TQT_SLOT( slotFormatChanged(const KoTextFormat &)) ); - connect( m_textobj, TQT_SIGNAL( afterFormatting( int, KoTextParag*, bool* ) ), - TQT_SLOT( slotAfterFormatting( int, KoTextParag*, bool* ) ) ); - connect( m_textobj, TQT_SIGNAL( paragraphDeleted( KoTextParag*) ), - TQT_SLOT( slotParagraphDeleted(KoTextParag*) )); + connect( this, TQ_SIGNAL( repaintChanged( KPrTextObject * ) ), + m_doc, TQ_SLOT( slotRepaintChanged( KPrTextObject * ) ) ); + connect(m_textobj, TQ_SIGNAL( showFormatObject(const KoTextFormat &) ), + TQ_SLOT( slotFormatChanged(const KoTextFormat &)) ); + connect( m_textobj, TQ_SIGNAL( afterFormatting( int, KoTextParag*, bool* ) ), + TQ_SLOT( slotAfterFormatting( int, KoTextParag*, bool* ) ) ); + connect( m_textobj, TQ_SIGNAL( paragraphDeleted( KoTextParag*) ), + TQ_SLOT( slotParagraphDeleted(KoTextParag*) )); } @@ -1778,12 +1778,12 @@ KPrTextView::KPrTextView( KPrTextObject * txtObj, KPrCanvas *_canvas, bool temp m_kptextobj=txtObj; if (temp) return; - connect( txtObj->textObject(), TQT_SIGNAL( selectionChanged(bool) ), - m_canvas, TQT_SIGNAL( selectionChanged(bool) ) ); + connect( txtObj->textObject(), TQ_SIGNAL( selectionChanged(bool) ), + m_canvas, TQ_SIGNAL( selectionChanged(bool) ) ); KoTextView::setReadWrite( txtObj->kPresenterDocument()->isReadWrite() ); - connect( textView(), TQT_SIGNAL( cut() ), TQT_SLOT( cut() ) ); - connect( textView(), TQT_SIGNAL( copy() ), TQT_SLOT( copy() ) ); - connect( textView(), TQT_SIGNAL( paste() ), TQT_SLOT( paste() ) ); + connect( textView(), TQ_SIGNAL( cut() ), TQ_SLOT( cut() ) ); + connect( textView(), TQ_SIGNAL( copy() ), TQ_SLOT( copy() ) ); + connect( textView(), TQ_SIGNAL( paste() ), TQ_SLOT( paste() ) ); updateUI( true, true ); txtObj->setEditingTextObj( true ); @@ -1803,8 +1803,8 @@ KoTextViewIface* KPrTextView::dcopObject() void KPrTextView::terminate(bool removeSelection) { - disconnect( textView()->textObject(), TQT_SIGNAL( selectionChanged(bool) ), - m_canvas, TQT_SIGNAL( selectionChanged(bool) ) ); + disconnect( textView()->textObject(), TQ_SIGNAL( selectionChanged(bool) ), + m_canvas, TQ_SIGNAL( selectionChanged(bool) ) ); textView()->terminate(removeSelection); } diff --git a/kpresenter/KPrTextProperty.cpp b/kpresenter/KPrTextProperty.cpp index e10fd701..3ce94531 100644 --- a/kpresenter/KPrTextProperty.cpp +++ b/kpresenter/KPrTextProperty.cpp @@ -41,8 +41,8 @@ KPrTextProperty::KPrTextProperty( TQWidget *parent, const char *name, const Marg layout->addWidget( m_protectContentCheck = new TQCheckBox( i18n( "Protect content" ), this ), 0, 0 ); layout->addWidget( m_margins = new KPrMarginWidget( this, name, m_unit ), 1, 0 ); - connect( m_protectContentCheck, TQT_SIGNAL( toggled ( bool ) ), - this, TQT_SLOT( slotProtectContentChanged( bool ) ) ); + connect( m_protectContentCheck, TQ_SIGNAL( toggled ( bool ) ), + this, TQ_SLOT( slotProtectContentChanged( bool ) ) ); resize( TQSize( 301, 217 ).expandedTo( minimumSizeHint() ) ); diff --git a/kpresenter/KPrTransEffectDia.cpp b/kpresenter/KPrTransEffectDia.cpp index d409f620..52bab259 100644 --- a/kpresenter/KPrTransEffectDia.cpp +++ b/kpresenter/KPrTransEffectDia.cpp @@ -99,7 +99,7 @@ void KPrEffectPreview::run( PageEffect effect, EffectSpeed speed ) if ( m_pageEffect ) { m_pageEffectTimer.stop(); - TQObject::disconnect( &m_pageEffectTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotDoPageEffect() ) ); + TQObject::disconnect( &m_pageEffectTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotDoPageEffect() ) ); m_pageEffect->finish(); @@ -117,7 +117,7 @@ void KPrEffectPreview::run( PageEffect effect, EffectSpeed speed ) } else { - connect( &m_pageEffectTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotDoPageEffect() ) ); + connect( &m_pageEffectTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotDoPageEffect() ) ); m_pageEffectTimer.start( 50, true ); } @@ -130,7 +130,7 @@ void KPrEffectPreview::slotDoPageEffect() if ( m_pageEffect->doEffect() ) { m_pageEffectTimer.stop(); - TQObject::disconnect( &m_pageEffectTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotDoPageEffect() ) ); + TQObject::disconnect( &m_pageEffectTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotDoPageEffect() ) ); delete m_pageEffect; m_pageEffect = 0; TQLabel::update(); @@ -232,8 +232,8 @@ KPrTransEffectDia::KPrTransEffectDia( TQWidget *parent, const char *name, if( pageEffect == PEF_RANDOM ) effectList->setCurrentItem( effectList->count()-1 ); - connect( effectList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(effectChanged(int)) ); - connect( effectList, TQT_SIGNAL( doubleClicked ( TQListBoxItem *) ), this, TQT_SLOT( effectChanged()) ); + connect( effectList, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(effectChanged(int)) ); + connect( effectList, TQ_SIGNAL( doubleClicked ( TQListBoxItem *) ), this, TQ_SLOT( effectChanged()) ); new TQLabel( i18n("Speed:"), leftpart ); @@ -249,7 +249,7 @@ KPrTransEffectDia::KPrTransEffectDia( TQWidget *parent, const char *name, speedCombo->setCurrentItem( speed ); - connect( speedCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(speedChanged(int)) ); + connect( speedCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(speedChanged(int)) ); TQWidget* previewgrp = new TQWidget( leftpart ); @@ -265,7 +265,7 @@ KPrTransEffectDia::KPrTransEffectDia( TQWidget *parent, const char *name, previewButton = new TQPushButton( previewgrp ); previewButton->setText( i18n("Preview") ); - connect( previewButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(preview()) ); + connect( previewButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(preview()) ); TQFrame* line = new TQFrame( leftpart ); line->setFrameStyle( TQFrame::HLine | TQFrame::Sunken ); @@ -275,7 +275,7 @@ KPrTransEffectDia::KPrTransEffectDia( TQWidget *parent, const char *name, checkSoundEffect = new TQCheckBox( i18n( "Sound effect" ), leftpart ); checkSoundEffect->setChecked( soundEffect ); - connect( checkSoundEffect, TQT_SIGNAL( clicked() ), this, TQT_SLOT( soundEffectChanged() ) ); + connect( checkSoundEffect, TQ_SIGNAL( clicked() ), this, TQ_SLOT( soundEffectChanged() ) ); TQWidget* soundgrp = new TQWidget( leftpart ); TQBoxLayout* soundLayout = new TQHBoxLayout( soundgrp, KDialog::marginHint(), KDialog::spacingHint() ); @@ -284,22 +284,22 @@ KPrTransEffectDia::KPrTransEffectDia( TQWidget *parent, const char *name, lSoundEffect = new TQLabel( i18n( "File name:" ), soundgrp ); requester = new KURLRequester( soundgrp ); requester->setURL( soundFileName ); - connect( requester, TQT_SIGNAL( openFileDialog( KURLRequester * ) ), - this, TQT_SLOT( slotRequesterClicked( KURLRequester * ) ) ); - connect( requester, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( slotSoundFileChanged( const TQString& ) ) ); + connect( requester, TQ_SIGNAL( openFileDialog( KURLRequester * ) ), + this, TQ_SLOT( slotRequesterClicked( KURLRequester * ) ) ); + connect( requester, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( slotSoundFileChanged( const TQString& ) ) ); buttonTestPlaySoundEffect = new TQPushButton( soundgrp ); buttonTestPlaySoundEffect->setPixmap( BarIcon("1rightarrow", TDEIcon::SizeSmall) ); TQToolTip::add( buttonTestPlaySoundEffect, i18n("Play") ); - connect( buttonTestPlaySoundEffect, TQT_SIGNAL( clicked() ), this, TQT_SLOT( playSound() ) ); + connect( buttonTestPlaySoundEffect, TQ_SIGNAL( clicked() ), this, TQ_SLOT( playSound() ) ); buttonTestStopSoundEffect = new TQPushButton( soundgrp ); buttonTestStopSoundEffect->setPixmap( BarIcon("media-playback-stop", TDEIcon::SizeSmall) ); TQToolTip::add( buttonTestStopSoundEffect, i18n("Stop") ); - connect( buttonTestStopSoundEffect, TQT_SIGNAL( clicked() ), this, TQT_SLOT( stopSound() ) ); + connect( buttonTestStopSoundEffect, TQ_SIGNAL( clicked() ), this, TQ_SLOT( stopSound() ) ); soundEffect = pg->getPageSoundEffect(); setButtonText(KDialogBase::User1,i18n( "Apply &Global" )); @@ -311,7 +311,7 @@ KPrTransEffectDia::KPrTransEffectDia( TQWidget *parent, const char *name, timeSlider = new KIntNumInput( slideTime, rightpart ); timeSlider->setRange( 1, 600, 1 ); timeSlider->setSuffix( i18n( " seconds" ) ); - connect( timeSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(timeChanged(int)) ); + connect( timeSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(timeChanged(int)) ); TQWidget* rspacer = new TQWidget( rightpart ); rspacer->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ) ); diff --git a/kpresenter/KPrView.cpp b/kpresenter/KPrView.cpp index e43e3ce0..bc89df18 100644 --- a/kpresenter/KPrView.cpp +++ b/kpresenter/KPrView.cpp @@ -364,41 +364,41 @@ KPrView::KPrView( KPrDocument* _doc, TQWidget *_parent, const char *_name ) if ( shell() ) changeNbOfRecentFiles( m_pKPresenterDoc->maxRecentFiles() ); - connect(this, TQT_SIGNAL(embeddImage(const TQString &)), TQT_SLOT(insertPicture(const TQString &))); - connect( m_pKPresenterDoc, TQT_SIGNAL( sig_refreshMenuCustomVariable()), - this, TQT_SLOT( refreshCustomMenu())); + connect(this, TQ_SIGNAL(embeddImage(const TQString &)), TQ_SLOT(insertPicture(const TQString &))); + connect( m_pKPresenterDoc, TQ_SIGNAL( sig_refreshMenuCustomVariable()), + this, TQ_SLOT( refreshCustomMenu())); // Cut and copy are directly connected to the selectionChanged signal if ( m_pKPresenterDoc->isReadWrite() ) - connect( m_canvas, TQT_SIGNAL(selectionChanged(bool)), - this, TQT_SLOT(slotChangeCutState(bool )/*setEnabled(bool)*/) ); + connect( m_canvas, TQ_SIGNAL(selectionChanged(bool)), + this, TQ_SLOT(slotChangeCutState(bool )/*setEnabled(bool)*/) ); else actionEditCut->setEnabled( false ); - connect( m_canvas, TQT_SIGNAL(selectionChanged(bool)), - actionEditCopy, TQT_SLOT(setEnabled(bool)) ); + connect( m_canvas, TQ_SIGNAL(selectionChanged(bool)), + actionEditCopy, TQ_SLOT(setEnabled(bool)) ); - connect (m_canvas, TQT_SIGNAL(selectionChanged(bool)), - actionChangeCase, TQT_SLOT(setEnabled(bool))); - //connect (m_canvas, TQT_SIGNAL(selectionChanged(bool)), - // actionCreateStyleFromSelection, TQT_SLOT(setEnabled(bool))); + connect (m_canvas, TQ_SIGNAL(selectionChanged(bool)), + actionChangeCase, TQ_SLOT(setEnabled(bool))); + //connect (m_canvas, TQ_SIGNAL(selectionChanged(bool)), + // actionCreateStyleFromSelection, TQ_SLOT(setEnabled(bool))); - connect( m_canvas, TQT_SIGNAL( currentObjectEditChanged() ), this, TQT_SLOT( slotObjectEditChanged())); + connect( m_canvas, TQ_SIGNAL( currentObjectEditChanged() ), this, TQ_SLOT( slotObjectEditChanged())); - connect( h_ruler, TQT_SIGNAL( tabListChanged( const KoTabulatorList & ) ), this, - TQT_SLOT( tabListChanged( const KoTabulatorList & ) ) ); + connect( h_ruler, TQ_SIGNAL( tabListChanged( const KoTabulatorList & ) ), this, + TQ_SLOT( tabListChanged( const KoTabulatorList & ) ) ); //statusbar stuff - connect( m_pKPresenterDoc, TQT_SIGNAL( pageNumChanged() ), this, TQT_SLOT( pageNumChanged()) ); - connect( this, TQT_SIGNAL( currentPageChanged(int) ), this, TQT_SLOT( pageNumChanged()) ); - connect( m_canvas, TQT_SIGNAL( objectSizeChanged() ), this, TQT_SLOT( updateObjectStatusBarItem() )); - connect( m_canvas, TQT_SIGNAL( objectSelectedChanged() ), this, TQT_SLOT( updateObjectStatusBarItem() )); - connect (m_pKPresenterDoc, TQT_SIGNAL(sig_updateRuler()),this, TQT_SLOT( slotUpdateRuler())); - connect (m_pKPresenterDoc, TQT_SIGNAL(sig_updateRuler()),this, TQT_SLOT( slotUpdateScrollBarRanges())); - connect (m_pKPresenterDoc, TQT_SIGNAL(sig_updateMenuBar()),this, TQT_SLOT(updateSideBarMenu())); - connect (m_pKPresenterDoc, TQT_SIGNAL(unitChanged(KoUnit::Unit)),this, TQT_SLOT(slotUnitChanged(KoUnit::Unit))); - connect( m_pKPresenterDoc, TQT_SIGNAL( modified( bool ) ), this, TQT_SLOT( documentModified( bool )) ); - connect( m_pKPresenterDoc, TQT_SIGNAL(completed()), this, TQT_SLOT(loadingFinished())); + connect( m_pKPresenterDoc, TQ_SIGNAL( pageNumChanged() ), this, TQ_SLOT( pageNumChanged()) ); + connect( this, TQ_SIGNAL( currentPageChanged(int) ), this, TQ_SLOT( pageNumChanged()) ); + connect( m_canvas, TQ_SIGNAL( objectSizeChanged() ), this, TQ_SLOT( updateObjectStatusBarItem() )); + connect( m_canvas, TQ_SIGNAL( objectSelectedChanged() ), this, TQ_SLOT( updateObjectStatusBarItem() )); + connect (m_pKPresenterDoc, TQ_SIGNAL(sig_updateRuler()),this, TQ_SLOT( slotUpdateRuler())); + connect (m_pKPresenterDoc, TQ_SIGNAL(sig_updateRuler()),this, TQ_SLOT( slotUpdateScrollBarRanges())); + connect (m_pKPresenterDoc, TQ_SIGNAL(sig_updateMenuBar()),this, TQ_SLOT(updateSideBarMenu())); + connect (m_pKPresenterDoc, TQ_SIGNAL(unitChanged(KoUnit::Unit)),this, TQ_SLOT(slotUnitChanged(KoUnit::Unit))); + connect( m_pKPresenterDoc, TQ_SIGNAL( modified( bool ) ), this, TQ_SLOT( documentModified( bool )) ); + connect( m_pKPresenterDoc, TQ_SIGNAL(completed()), this, TQ_SLOT(loadingFinished())); KStatusBar * sb = statusBar(); m_sbPageLabel = 0L; @@ -1074,14 +1074,14 @@ void KPrView::toolsAutoform() afChoose->resize( 400, 300 ); afChoose->setCaption( i18n( "Insert Autoform" ) ); - TQObject::connect( afChoose, TQT_SIGNAL( formChosen( const TQString & ) ), - this, TQT_SLOT( afChooseOk( const TQString & ) ) ); - TQObject::connect( afChoose, TQT_SIGNAL( afchooseCanceled()), - this, TQT_SLOT(slotAfchooseCanceled())); + TQObject::connect( afChoose, TQ_SIGNAL( formChosen( const TQString & ) ), + this, TQ_SLOT( afChooseOk( const TQString & ) ) ); + TQObject::connect( afChoose, TQ_SIGNAL( afchooseCanceled()), + this, TQ_SLOT(slotAfchooseCanceled())); afChoose->exec(); - TQObject::disconnect( afChoose, TQT_SIGNAL( formChosen( const TQString & ) ), - this, TQT_SLOT( afChooseOk( const TQString & ) ) ); + TQObject::disconnect( afChoose, TQ_SIGNAL( formChosen( const TQString & ) ), + this, TQ_SLOT( afChooseOk( const TQString & ) ) ); delete afChoose; afChoose = 0; } @@ -1235,9 +1235,9 @@ void KPrView::extraProperties() m_propertyEditor = new KPrPropertyEditor( this, "KPrPropertyEditor", m_canvas->activePage(), m_pKPresenterDoc ); m_propertyEditor->setCaption( i18n( "Properties" ) ); - connect( m_propertyEditor, TQT_SIGNAL( propertiesOk() ), this, TQT_SLOT( propertiesOk() ) ); + connect( m_propertyEditor, TQ_SIGNAL( propertiesOk() ), this, TQ_SLOT( propertiesOk() ) ); m_propertyEditor->exec(); - disconnect( m_propertyEditor, TQT_SIGNAL( propertiesOk() ), this, TQT_SLOT( propertiesOk() ) ); + disconnect( m_propertyEditor, TQ_SIGNAL( propertiesOk() ), this, TQ_SLOT( propertiesOk() ) ); delete m_propertyEditor; m_propertyEditor = 0; @@ -1260,7 +1260,7 @@ void KPrView::extraRotate() if ( m_canvas->numberOfObjectSelected() > 0 ) { if ( !rotateDia ) { rotateDia = new KPrRotationDialogImpl( this ); - connect( rotateDia, TQT_SIGNAL( apply() ), this, TQT_SLOT( rotateOk() ) ); + connect( rotateDia, TQ_SIGNAL( apply() ), this, TQ_SLOT( rotateOk() ) ); } rotateDia->setAngle( m_canvas->getSelectedObj()->getAngle() ); m_canvas->setToolEditMode( TEM_MOUSE ); @@ -1275,7 +1275,7 @@ void KPrView::extraShadow() if ( !shadowDia ) { shadowDia = new KPrShadowDialogImpl( this ); shadowDia->resize( shadowDia->minimumSize() ); - connect( shadowDia, TQT_SIGNAL( apply() ), this, TQT_SLOT( shadowOk() ) ); + connect( shadowDia, TQ_SIGNAL( apply() ), this, TQ_SLOT( shadowOk() ) ); } KPrObject *object=m_canvas->getSelectedObj(); @@ -1305,10 +1305,10 @@ void KPrView::extraBackground() page->getBackYFactor( ), page ); backDia->setCaption( i18n( "Slide Background" ) ); - TQObject::connect( backDia, TQT_SIGNAL( backOk( KPrBackDialog*, bool ) ), this, TQT_SLOT( backOk( KPrBackDialog*, bool ) ) ) ; + TQObject::connect( backDia, TQ_SIGNAL( backOk( KPrBackDialog*, bool ) ), this, TQ_SLOT( backOk( KPrBackDialog*, bool ) ) ) ; backDia->exec(); - TQObject::disconnect( backDia, TQT_SIGNAL( backOk( KPrBackDialog*, bool ) ), this, TQT_SLOT( backOk( KPrBackDialog*, bool ) ) ); + TQObject::disconnect( backDia, TQ_SIGNAL( backOk( KPrBackDialog*, bool ) ), this, TQ_SLOT( backOk( KPrBackDialog*, bool ) ) ); delete backDia; } @@ -1453,10 +1453,10 @@ void KPrView::screenConfigPages() delete pgConfDia; pgConfDia = new KPrPgConfDia( this, kPresenterDoc() ); pgConfDia->setCaption( i18n( "Configure Slide Show" ) ); - TQObject::connect( pgConfDia, TQT_SIGNAL( pgConfDiaOk() ), this, TQT_SLOT( pgConfOk() ) ); + TQObject::connect( pgConfDia, TQ_SIGNAL( pgConfDiaOk() ), this, TQ_SLOT( pgConfOk() ) ); pgConfDia->exec(); - TQObject::disconnect( pgConfDia, TQT_SIGNAL( pgConfDiaOk() ), this, TQT_SLOT( pgConfOk() ) ); + TQObject::disconnect( pgConfDia, TQ_SIGNAL( pgConfDiaOk() ), this, TQ_SLOT( pgConfOk() ) ); delete pgConfDia; pgConfDia = 0; } @@ -1583,7 +1583,7 @@ void KPrView::startScreenPres( int pgNum /*1-based*/ ) m_pKPresenterDoc->repaint( false ); if ( ! m_autoPresTimerConnected ) { - connect( &m_autoPresTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( doAutomaticScreenPres() ) ); + connect( &m_autoPresTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( doAutomaticScreenPres() ) ); m_autoPresTimerConnected = true; } } @@ -1837,8 +1837,8 @@ void KPrView::mtextFont() , m_broker , this, 0 ); - connect( m_fontDlg, TQT_SIGNAL( applyFont() ), - this, TQT_SLOT( slotApplyFont() ) ); + connect( m_fontDlg, TQ_SIGNAL( applyFont() ), + this, TQ_SLOT( slotApplyFont() ) ); m_fontDlg->exec(); delete m_fontDlg; @@ -2159,12 +2159,12 @@ void KPrView::createGUI() && !m_pKPresenterDoc->isSingleViewMode() ) // No sidebar if the document is embedded { sidebar = new KPrSideBar( splitter, m_pKPresenterDoc, this ); - connect( sidebar, TQT_SIGNAL( movePage( int, int ) ), - m_pKPresenterDoc, TQT_SLOT( movePage( int, int ) ) ); - connect( sidebar, TQT_SIGNAL( selectPage( int, bool ) ), - m_pKPresenterDoc, TQT_SLOT( selectPage( int, bool ) ) ); - connect( sidebar, TQT_SIGNAL( showPage( int ) ), - this, TQT_SLOT( skipToPage( int ) ) ); + connect( sidebar, TQ_SIGNAL( movePage( int, int ) ), + m_pKPresenterDoc, TQ_SLOT( movePage( int, int ) ) ); + connect( sidebar, TQ_SIGNAL( selectPage( int, bool ) ), + m_pKPresenterDoc, TQ_SLOT( selectPage( int, bool ) ) ); + connect( sidebar, TQ_SIGNAL( showPage( int ) ), + this, TQ_SLOT( skipToPage( int ) ) ); // This sucks when resizing the window //splitter->setResizeMode( sidebar, TQSplitter::FollowSizeHint ); //splitter->setResizeMode( pageBase, TQSplitter::Stretch ); @@ -2179,16 +2179,16 @@ void KPrView::createGUI() m_canvas=new KPrCanvas( pageBase, "Canvas", this ); - TQObject::connect( m_canvas, TQT_SIGNAL( fontChanged( const TQFont & ) ), - this, TQT_SLOT( fontChanged( const TQFont & ) ) ); - TQObject::connect( m_canvas, TQT_SIGNAL( colorChanged( const TQColor & ) ), - this, TQT_SLOT( colorChanged( const TQColor & ) ) ); - TQObject::connect( m_canvas, TQT_SIGNAL( alignChanged( int ) ), - this, TQT_SLOT( alignChanged( int ) ) ); - TQObject::connect( m_canvas, TQT_SIGNAL( objectSelectedChanged()), - this, TQT_SLOT( objectSelectedChanged())); - TQObject::connect( m_canvas, TQT_SIGNAL( sigMouseWheelEvent( TQWheelEvent* ) ), - this, TQT_SLOT( getPageMouseWheelEvent( TQWheelEvent* ) ) ); + TQObject::connect( m_canvas, TQ_SIGNAL( fontChanged( const TQFont & ) ), + this, TQ_SLOT( fontChanged( const TQFont & ) ) ); + TQObject::connect( m_canvas, TQ_SIGNAL( colorChanged( const TQColor & ) ), + this, TQ_SLOT( colorChanged( const TQColor & ) ) ); + TQObject::connect( m_canvas, TQ_SIGNAL( alignChanged( int ) ), + this, TQ_SLOT( alignChanged( int ) ) ); + TQObject::connect( m_canvas, TQ_SIGNAL( objectSelectedChanged()), + this, TQ_SLOT( objectSelectedChanged())); + TQObject::connect( m_canvas, TQ_SIGNAL( sigMouseWheelEvent( TQWheelEvent* ) ), + this, TQ_SLOT( getPageMouseWheelEvent( TQWheelEvent* ) ) ); // setup notebar. @@ -2207,23 +2207,23 @@ void KPrView::createGUI() if ( m_pKPresenterDoc && m_canvas ) { - TQObject::connect( m_canvas, TQT_SIGNAL( stopAutomaticPresentation() ), this, TQT_SLOT( stopAutomaticPresentation() ) ); - TQObject::connect( m_canvas, TQT_SIGNAL( restartPresentation() ), this, TQT_SLOT( restartPresentation() ) ); - - connect( getVRuler(), TQT_SIGNAL( addGuide( const TQPoint &, bool, int ) ), - &( m_canvas->guideLines() ), TQT_SLOT( addGuide( const TQPoint &, bool, int ) ) ); - connect( getVRuler(), TQT_SIGNAL( moveGuide( const TQPoint &, bool, int ) ), - &( m_canvas->guideLines() ), TQT_SLOT( moveGuide( const TQPoint &, bool, int ) ) ); - connect( getHRuler(), TQT_SIGNAL( addGuide( const TQPoint &, bool, int ) ), - &( m_canvas->guideLines() ), TQT_SLOT( addGuide( const TQPoint &, bool, int ) ) ); - connect( getHRuler(), TQT_SIGNAL( moveGuide( const TQPoint &, bool, int ) ), - &( m_canvas->guideLines() ), TQT_SLOT( moveGuide( const TQPoint &, bool, int ) ) ); - connect( &( m_canvas->guideLines() ), TQT_SIGNAL( moveGuides( bool ) ), - m_canvas, TQT_SLOT( setPaintGuides( bool ) ) ); - connect( &( m_canvas->guideLines() ), TQT_SIGNAL( paintGuides( bool ) ), - m_canvas, TQT_SLOT( setPaintGuides( bool ) ) ); - connect( &( m_canvas->guideLines() ), TQT_SIGNAL( guideLinesChanged( KoView * ) ), - m_pKPresenterDoc, TQT_SLOT( slotGuideLinesChanged( KoView * ) ) ); + TQObject::connect( m_canvas, TQ_SIGNAL( stopAutomaticPresentation() ), this, TQ_SLOT( stopAutomaticPresentation() ) ); + TQObject::connect( m_canvas, TQ_SIGNAL( restartPresentation() ), this, TQ_SLOT( restartPresentation() ) ); + + connect( getVRuler(), TQ_SIGNAL( addGuide( const TQPoint &, bool, int ) ), + &( m_canvas->guideLines() ), TQ_SLOT( addGuide( const TQPoint &, bool, int ) ) ); + connect( getVRuler(), TQ_SIGNAL( moveGuide( const TQPoint &, bool, int ) ), + &( m_canvas->guideLines() ), TQ_SLOT( moveGuide( const TQPoint &, bool, int ) ) ); + connect( getHRuler(), TQ_SIGNAL( addGuide( const TQPoint &, bool, int ) ), + &( m_canvas->guideLines() ), TQ_SLOT( addGuide( const TQPoint &, bool, int ) ) ); + connect( getHRuler(), TQ_SIGNAL( moveGuide( const TQPoint &, bool, int ) ), + &( m_canvas->guideLines() ), TQ_SLOT( moveGuide( const TQPoint &, bool, int ) ) ); + connect( &( m_canvas->guideLines() ), TQ_SIGNAL( moveGuides( bool ) ), + m_canvas, TQ_SLOT( setPaintGuides( bool ) ) ); + connect( &( m_canvas->guideLines() ), TQ_SIGNAL( paintGuides( bool ) ), + m_canvas, TQ_SLOT( setPaintGuides( bool ) ) ); + connect( &( m_canvas->guideLines() ), TQ_SIGNAL( guideLinesChanged( KoView * ) ), + m_pKPresenterDoc, TQ_SLOT( slotGuideLinesChanged( KoView * ) ) ); m_canvas->guideLines().setGuideLines( m_pKPresenterDoc->horizontalGuideLines(), m_pKPresenterDoc->verticalGuideLines() ); } @@ -2250,7 +2250,7 @@ void KPrView::createGUI() } else actionViewShowNoteBar->setChecked(true); // HACK This is needed to be able to calculate a good initial size for the notebar - TQTimer::singleShot( 0, this, TQT_SLOT( initialLayoutOfSplitter() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( initialLayoutOfSplitter() ) ); } KPrPage *initPage=m_pKPresenterDoc->initialActivePage(); if ( !initPage ) @@ -2316,179 +2316,179 @@ void KPrView::guiActivateEvent( KParts::GUIActivateEvent *ev ) void KPrView::setupActions() { - actionEditCut = KStdAction::cut( this, TQT_SLOT( editCut() ), actionCollection(), "edit_cut" ); - actionEditCopy = KStdAction::copy( this, TQT_SLOT( editCopy() ), actionCollection(), "edit_copy" ); - actionEditPaste = KStdAction::paste( this, TQT_SLOT( editPaste() ), actionCollection(), "edit_paste" ); - connect( m_pKPresenterDoc, TQT_SIGNAL( enablePaste( bool ) ), - actionEditPaste, TQT_SLOT( setEnabled( bool ) ) ); + actionEditCut = KStdAction::cut( this, TQ_SLOT( editCut() ), actionCollection(), "edit_cut" ); + actionEditCopy = KStdAction::copy( this, TQ_SLOT( editCopy() ), actionCollection(), "edit_copy" ); + actionEditPaste = KStdAction::paste( this, TQ_SLOT( editPaste() ), actionCollection(), "edit_paste" ); + connect( m_pKPresenterDoc, TQ_SIGNAL( enablePaste( bool ) ), + actionEditPaste, TQ_SLOT( setEnabled( bool ) ) ); m_pKPresenterDoc->clipboardDataChanged(); // set paste's initial state actionEditDelete = new TDEAction( i18n( "&Delete" ), "edit-delete", CTRL + TQt::Key_Delete, - this, TQT_SLOT( editDelete() ), + this, TQ_SLOT( editDelete() ), actionCollection(), "edit_delete" ); - actionEditSelectAll = KStdAction::selectAll( this, TQT_SLOT( editSelectAll() ), actionCollection(), "edit_selectall" ); - actionEditDeSelectAll= KStdAction::deselect( this, TQT_SLOT( editDeSelectAll()), actionCollection(), "edit_deselectall"); + actionEditSelectAll = KStdAction::selectAll( this, TQ_SLOT( editSelectAll() ), actionCollection(), "edit_selectall" ); + actionEditDeSelectAll= KStdAction::deselect( this, TQ_SLOT( editDeSelectAll()), actionCollection(), "edit_deselectall"); actionEditCopyPage = new TDEAction( i18n( "Copy Slide" ), "edit-copy", - 0, this, TQT_SLOT( editCopyPage() ), + 0, this, TQ_SLOT( editCopyPage() ), actionCollection(), "edit_copypage" ); actionEditDuplicatePage = new TDEAction( i18n( "Duplicate Slide" ), "newslide", - 0, this, TQT_SLOT( editDuplicatePage() ), + 0, this, TQ_SLOT( editDuplicatePage() ), actionCollection(), "edit_duplicatepage" ); actionEditDelPage = new TDEAction( i18n( "Delete Slide" ), "delslide", 0, - this, TQT_SLOT( editDelPage() ), + this, TQ_SLOT( editDelPage() ), actionCollection(), "edit_delpage" ); - actionEditFind=KStdAction::find( this, TQT_SLOT( editFind() ), actionCollection(), "edit_find" ); - actionEditFindNext = KStdAction::findNext( this, TQT_SLOT( editFindNext() ), actionCollection(), "edit_findnext" ); - actionEditFindPrevious = KStdAction::findPrev( this, TQT_SLOT( editFindPrevious() ), actionCollection(), "edit_findprevious" ); - actionEditReplace=KStdAction::replace( this, TQT_SLOT( editReplace() ), actionCollection(), "edit_replace" ); + actionEditFind=KStdAction::find( this, TQ_SLOT( editFind() ), actionCollection(), "edit_find" ); + actionEditFindNext = KStdAction::findNext( this, TQ_SLOT( editFindNext() ), actionCollection(), "edit_findnext" ); + actionEditFindPrevious = KStdAction::findPrev( this, TQ_SLOT( editFindPrevious() ), actionCollection(), "edit_findprevious" ); + actionEditReplace=KStdAction::replace( this, TQ_SLOT( editReplace() ), actionCollection(), "edit_replace" ); // ---------------- View actions if ( !m_pKPresenterDoc->isEmbedded() ) { actionViewShowSideBar = new TDEToggleAction( i18n("Show Sidebar"), 0, - this, TQT_SLOT( viewShowSideBar() ), + this, TQ_SLOT( viewShowSideBar() ), actionCollection(), "view_showsidebar" ); actionViewShowSideBar->setCheckedState(i18n("Hide Sidebar")); actionViewShowNoteBar = new TDEToggleAction( i18n("Show Notebar"), 0, - this, TQT_SLOT( viewShowNoteBar() ), + this, TQ_SLOT( viewShowNoteBar() ), actionCollection(), "view_shownotebar" ); actionViewShowNoteBar->setCheckedState(i18n("Hide Notebar")); } actionViewFormattingChars = new TDEToggleAction( i18n( "&Formatting Characters" ), 0, - this, TQT_SLOT( slotViewFormattingChars() ), + this, TQ_SLOT( slotViewFormattingChars() ), actionCollection(), "view_formattingchars" ); actionViewFormattingChars->setToolTip( i18n( "Toggle the display of non-printing characters." ) ); actionViewFormattingChars->setWhatsThis( i18n( "Toggle the display of non-printing characters.<br><br>When this is enabled, KPresenter shows you tabs, spaces, carriage returns and other non-printing characters." ) ); actionViewSlideMaster = new TDEToggleAction( i18n( "Slide &Master" ), 0, - this, TQT_SLOT( viewSlideMaster() ), + this, TQ_SLOT( viewSlideMaster() ), actionCollection(), "view_master" ); actionViewShowGuideLine= new TDEToggleAction( i18n( "Guide Lines" ), 0, - this, TQT_SLOT( viewGuideLines() ), + this, TQ_SLOT( viewGuideLines() ), actionCollection(), "view_guidelines" ); actionViewShowGrid = new TDEToggleAction( i18n( "Show &Grid" ), 0, - this, TQT_SLOT( viewGrid() ), + this, TQ_SLOT( viewGrid() ), actionCollection(), "view_grid" ); actionViewShowGrid->setCheckedState(i18n("Hide &Grid")); actionViewSnapToGrid= new TDEToggleAction( i18n( "Snap to Grid" ), 0, - this, TQT_SLOT(viewSnapToGrid() ), + this, TQ_SLOT(viewSnapToGrid() ), actionCollection(), "view_snaptogrid" ); // ---------------- insert actions actionInsertPage = new TDEAction( i18n( "&Slide..." ), "slide", TQt::Key_F2, - this, TQT_SLOT( insertPage() ), + this, TQ_SLOT( insertPage() ), actionCollection(), "insert_page" ); new TDEAction( i18n( "Insert &Slide..." ), "newslide", 0, - this, TQT_SLOT( insertPage() ), + this, TQ_SLOT( insertPage() ), actionCollection(), "insert_page_popup" ); actionInsertPicture = new TDEAction( i18n( "P&icture..." ), "frame_image", TQt::SHIFT+TQt::Key_F5, - this, TQT_SLOT( insertPicture() ), + this, TQ_SLOT( insertPicture() ), actionCollection(), "insert_picture" ); // ----------------- tools actions actionToolsMouse = new TDEToggleAction( i18n( "Select" ), "select", 0, - this, TQT_SLOT( toolsMouse() ), + this, TQ_SLOT( toolsMouse() ), actionCollection(), "tools_mouse" ); actionToolsMouse->setExclusiveGroup( "tools" ); actionToolsMouse->setChecked( true ); actionToolsRotate = new TDEToggleAction( i18n( "&Rotate" ), "rotate", 0, - this, TQT_SLOT( toolsRotate() ), + this, TQ_SLOT( toolsRotate() ), actionCollection(), "tools_rotate" ); actionToolsRotate->setExclusiveGroup( "tools" ); actionToolsZoom = new TDEToggleAction( i18n( "&Zoom" ), "viewmag", 0, - this, TQT_SLOT( toolsZoom() ), + this, TQ_SLOT( toolsZoom() ), actionCollection(), "tools_zoom" ); actionToolsZoom->setExclusiveGroup( "tools" ); actionToolsShapePopup = new TDEActionMenu( i18n( "&Shape" ), "rectangle", actionCollection(), "tools_shapepopup" ); actionToolsShapePopup->setDelayed(true); - connect(actionToolsShapePopup, TQT_SIGNAL(activated()), this, TQT_SLOT(toolsShapePopup())); + connect(actionToolsShapePopup, TQ_SIGNAL(activated()), this, TQ_SLOT(toolsShapePopup())); actionToolsRectangle = new TDEToggleAction( i18n( "&Rectangle" ), "rectangle", - 0, this, TQT_SLOT( toolsRectangle() ), + 0, this, TQ_SLOT( toolsRectangle() ), actionCollection(), "tools_rectangle" ); actionToolsRectangle->setExclusiveGroup( "tools" ); actionToolsCircleOrEllipse = new TDEToggleAction( i18n( "&Circle/Ellipse" ), "circle", - 0, this, TQT_SLOT( toolsCircleOrEllipse() ), + 0, this, TQ_SLOT( toolsCircleOrEllipse() ), actionCollection(), "tools_circle" ); actionToolsCircleOrEllipse->setExclusiveGroup( "tools" ); actionToolsPie = new TDEToggleAction( i18n( "&Pie/Arc/Chord" ), "pie", 0, - this, TQT_SLOT( toolsPie() ), + this, TQ_SLOT( toolsPie() ), actionCollection(), "tools_pie" ); actionToolsPie->setExclusiveGroup( "tools" ); actionToolsText = new TDEToggleAction( i18n( "&Text" ), "frame_text", TQt::Key_F10, // same shortcut as KWord - this, TQT_SLOT( toolsText() ), + this, TQ_SLOT( toolsText() ), actionCollection(), "tools_text" ); actionToolsText->setExclusiveGroup( "tools" ); actionToolsAutoform = new TDEToggleAction( i18n( "&Arrows && Connections" ), "autoform", - 0, this, TQT_SLOT( toolsAutoform() ), + 0, this, TQ_SLOT( toolsAutoform() ), actionCollection(), "tools_autoform" ); actionToolsAutoform->setExclusiveGroup( "tools" ); actionToolsDiagramm = new TDEToggleAction( i18n( "&Chart" ), "frame_chart", 0, - this, TQT_SLOT( toolsDiagramm() ), + this, TQ_SLOT( toolsDiagramm() ), actionCollection(), "tools_diagramm" ); actionToolsDiagramm->setExclusiveGroup( "tools" ); actionToolsTable = new TDEToggleAction( i18n( "Ta&ble"), "frame_spreadsheet", TQt::Key_F5 /*same as kword*/, - this, TQT_SLOT( toolsTable() ), + this, TQ_SLOT( toolsTable() ), actionCollection(), "tools_table" ); actionToolsTable->setExclusiveGroup( "tools" ); actionToolsObject = new KoPartSelectAction( i18n( "&Object" ), "frame_query", - this, TQT_SLOT( toolsObject() ), + this, TQ_SLOT( toolsObject() ), actionCollection(), "tools_object" ); actionToolsLinePopup = new TDEActionMenu( i18n( "&Line" ), "line", actionCollection(), "tools_linepopup" ); actionToolsLinePopup->setDelayed(true); - connect(actionToolsLinePopup, TQT_SIGNAL(activated()), this, TQT_SLOT(toolsLinePopup())); + connect(actionToolsLinePopup, TQ_SIGNAL(activated()), this, TQ_SLOT(toolsLinePopup())); actionToolsLine = new TDEToggleAction( i18n( "&Line" ), "line", 0, - this, TQT_SLOT( toolsLine() ), + this, TQ_SLOT( toolsLine() ), actionCollection(), "tools_line" ); actionToolsLine->setExclusiveGroup( "tools" ); actionToolsFreehand = new TDEToggleAction( i18n( "&Freehand" ), "freehand", 0, - this, TQT_SLOT( toolsFreehand() ), + this, TQ_SLOT( toolsFreehand() ), actionCollection(), "tools_freehand" ); actionToolsFreehand->setExclusiveGroup( "tools" ); actionToolsPolyline = new TDEToggleAction( i18n( "Po&lyline" ), "polyline", 0, - this, TQT_SLOT( toolsPolyline() ), + this, TQ_SLOT( toolsPolyline() ), actionCollection(), "tools_polyline" ); actionToolsPolyline->setExclusiveGroup( "tools" ); actionToolsQuadricBezierCurve = new TDEToggleAction( i18n( "&Quadric Bezier Curve" ), "quadricbeziercurve", 0, - this, TQT_SLOT( toolsQuadricBezierCurve() ), + this, TQ_SLOT( toolsQuadricBezierCurve() ), actionCollection(), "tools_quadricbeziercurve" ); actionToolsQuadricBezierCurve->setExclusiveGroup( "tools" ); actionToolsCubicBezierCurve = new TDEToggleAction( i18n( "C&ubic Bezier Curve" ), "cubicbeziercurve", 0, - this, TQT_SLOT( toolsCubicBezierCurve() ), + this, TQ_SLOT( toolsCubicBezierCurve() ), actionCollection(), "tools_cubicbeziercurve" ); actionToolsCubicBezierCurve->setExclusiveGroup( "tools" ); actionToolsConvexOrConcavePolygon = new TDEToggleAction( i18n( "Co&nvex/Concave Polygon" ), "polygon", 0, - this, TQT_SLOT( toolsConvexOrConcavePolygon() ), + this, TQ_SLOT( toolsConvexOrConcavePolygon() ), actionCollection(), "tools_polygon" ); actionToolsConvexOrConcavePolygon->setExclusiveGroup( "tools" ); @@ -2496,39 +2496,39 @@ void KPrView::setupActions() actionToolsClosedLinePopup = new TDEActionMenu( i18n( "&Closed Line" ), "closed_freehand", actionCollection(), "tools_closed_linepopup" ); actionToolsClosedLinePopup->setDelayed(true); - connect(actionToolsClosedLinePopup, TQT_SIGNAL(activated()), this, TQT_SLOT(toolsClosedLinePopup())); + connect(actionToolsClosedLinePopup, TQ_SIGNAL(activated()), this, TQ_SLOT(toolsClosedLinePopup())); actionToolsClosedFreehand = new TDEToggleAction( i18n( "Closed &Freehand" ), "closed_freehand", 0, - this, TQT_SLOT( toolsClosedFreehand() ), + this, TQ_SLOT( toolsClosedFreehand() ), actionCollection(), "tools_closed_freehand" ); actionToolsClosedFreehand->setExclusiveGroup( "tools" ); actionToolsClosedPolyline = new TDEToggleAction( i18n( "Closed Po&lyline" ), "closed_polyline", 0, - this, TQT_SLOT( toolsClosedPolyline() ), + this, TQ_SLOT( toolsClosedPolyline() ), actionCollection(), "tools_closed_polyline" ); actionToolsClosedPolyline->setExclusiveGroup( "tools" ); actionToolsClosedQuadricBezierCurve = new TDEToggleAction( i18n( "Closed &Quadric Bezier Curve" ), "closed_quadricbeziercurve", 0, - this, TQT_SLOT( toolsClosedQuadricBezierCurve() ), + this, TQ_SLOT( toolsClosedQuadricBezierCurve() ), actionCollection(), "tools_closed_quadricbeziercurve" ); actionToolsClosedQuadricBezierCurve->setExclusiveGroup( "tools" ); actionToolsClosedCubicBezierCurve = new TDEToggleAction( i18n( "Closed C&ubic Bezier Curve" ), "closed_cubicbeziercurve", 0, - this, TQT_SLOT( toolsClosedCubicBezierCurve() ), + this, TQ_SLOT( toolsClosedCubicBezierCurve() ), actionCollection(), "tools_closed_cubicbeziercurve" ); actionToolsClosedCubicBezierCurve->setExclusiveGroup( "tools" ); // ----------------- text actions - actionTextFont = new TDEAction( i18n( "&Font..." ), 0, this, TQT_SLOT( mtextFont() ), + actionTextFont = new TDEAction( i18n( "&Font..." ), 0, this, TQ_SLOT( mtextFont() ), actionCollection(), "text_font" ); actionTextFontSize = new TDEFontSizeAction( i18n( "Font Size" ), 0, actionCollection(), "text_fontsize" ); - connect( actionTextFontSize, TQT_SIGNAL( fontSizeChanged( int ) ), - this, TQT_SLOT( sizeSelected( int ) ) ); + connect( actionTextFontSize, TQ_SIGNAL( fontSizeChanged( int ) ), + this, TQ_SLOT( sizeSelected( int ) ) ); #ifdef KFONTACTION_HAS_CRITERIA_ARG actionTextFontFamily = new TDEFontAction( TDEFontChooser::SmoothScalableFonts, @@ -2538,49 +2538,49 @@ void KPrView::setupActions() actionTextFontFamily = new TDEFontAction( i18n( "Font Family" ), 0, actionCollection(), "text_fontfamily" ); #endif - connect( actionTextFontFamily , TQT_SIGNAL( activated( const TQString & ) ), - this, TQT_SLOT( fontSelected( const TQString & ) ) ); + connect( actionTextFontFamily , TQ_SIGNAL( activated( const TQString & ) ), + this, TQ_SLOT( fontSelected( const TQString & ) ) ); actionTextBold = new TDEToggleAction( i18n( "&Bold" ), "format-text-bold", CTRL + TQt::Key_B, - this, TQT_SLOT( textBold() ), + this, TQ_SLOT( textBold() ), actionCollection(), "format-text-bold" ); actionTextItalic = new TDEToggleAction( i18n( "&Italic" ), "format-text-italic", CTRL + TQt::Key_I, - this, TQT_SLOT( textItalic() ), + this, TQ_SLOT( textItalic() ), actionCollection(), "format-text-italic" ); actionTextUnderline = new TDEToggleAction( i18n( "&Underline" ), "format-text-underline", CTRL + TQt::Key_U, - this, TQT_SLOT( textUnderline() ), + this, TQ_SLOT( textUnderline() ), actionCollection(), "text_underline" ); actionFormatStrikeOut = new TDEToggleAction( i18n( "&Strike Out" ), "format-text-strikethrough", 0 , - this, TQT_SLOT( textStrikeOut() ), + this, TQ_SLOT( textStrikeOut() ), actionCollection(), "format_strike" ); actionTextColor = new TTDESelectColorAction( i18n( "&Color..." ), TTDESelectColorAction::TextColor, actionCollection(), "text_color" ,true); - connect( actionTextColor, TQT_SIGNAL( activated() ), TQT_SLOT( textColor() ) ); + connect( actionTextColor, TQ_SIGNAL( activated() ), TQ_SLOT( textColor() ) ); actionTextColor->setDefaultColor(TQColor()); actionTextAlignLeft = new TDEToggleAction( i18n( "Align &Left" ), "format-text-direction-ltr", ALT + TQt::Key_L, - this, TQT_SLOT( textAlignLeft() ), + this, TQ_SLOT( textAlignLeft() ), actionCollection(), "text_alignleft" ); actionTextAlignLeft->setExclusiveGroup( "align" ); actionTextAlignLeft->setChecked( true ); actionTextAlignCenter = new TDEToggleAction( i18n( "Align &Center" ), "text_center", ALT + TQt::Key_C, - this, TQT_SLOT( textAlignCenter() ), + this, TQ_SLOT( textAlignCenter() ), actionCollection(), "text_aligncenter" ); actionTextAlignCenter->setExclusiveGroup( "align" ); actionTextAlignRight = new TDEToggleAction( i18n( "Align &Right" ), "format-text-direction-rtl", ALT + TQt::Key_R, - this, TQT_SLOT( textAlignRight() ), + this, TQ_SLOT( textAlignRight() ), actionCollection(), "text_alignright" ); actionTextAlignRight->setExclusiveGroup( "align" ); actionTextAlignBlock = new TDEToggleAction( i18n( "Align &Block" ), "text_block", CTRL + TQt::Key_J, - this, TQT_SLOT( textAlignBlock() ), + this, TQ_SLOT( textAlignBlock() ), actionCollection(), "text_alignblock" ); actionTextAlignBlock->setExclusiveGroup( "align" ); @@ -2596,7 +2596,7 @@ void KPrView::setupActions() // Dynamically create toggle-actions for each list style. // This approach allows to edit toolbars and extract separate actions from this menu TDEToggleAction* act = new TDEToggleAction( styleIt.current()->name(), /*TODO icon,*/ - 0, this, TQT_SLOT( slotCounterStyleSelected() ), + 0, this, TQ_SLOT( slotCounterStyleSelected() ), actionCollection(), TQString("counterstyle_%1").arg( styleIt.current()->style() ).latin1() ); act->setExclusiveGroup( "counterstyle" ); // Add to the right menu: both for "none", bullet for bullets, numbers otherwise @@ -2609,29 +2609,29 @@ void KPrView::setupActions() actionFormatNumber->insert( act ); } actionTextDepthPlus = new TDEAction( i18n( "&Increase Depth" ), TQApplication::reverseLayout() ?"format_decreaseindent" : "format_increaseindent", - CTRL + TQt::Key_Plus, this, TQT_SLOT( textDepthPlus() ), + CTRL + TQt::Key_Plus, this, TQ_SLOT( textDepthPlus() ), actionCollection(), "text_depthPlus" ); actionTextDepthMinus = new TDEAction( i18n( "&Decrease Depth" ), TQApplication::reverseLayout() ?"format_increaseindent" : "format_decreaseindent", - CTRL + TQt::Key_Minus, this, TQT_SLOT( textDepthMinus() ), + CTRL + TQt::Key_Minus, this, TQ_SLOT( textDepthMinus() ), actionCollection(), "text_depthMinus" ); actionTextExtentCont2Height = new TDEAction( i18n( "Extend Contents to Object &Height" ), 0, - this, TQT_SLOT( textContentsToHeight() ), + this, TQ_SLOT( textContentsToHeight() ), actionCollection(), "text_con2hei" ); actionTextExtendObj2Cont = new TDEAction( i18n( "&Extend Object to Fit Contents" ), 0, - this, TQT_SLOT( textObjectToContents() ), + this, TQ_SLOT( textObjectToContents() ), actionCollection(), "text_obj2cont" ); actionTextInsertPageNum = new TDEAction( i18n( "&Insert Slide Number" ), "pgnum", 0, - this, TQT_SLOT( textInsertPageNum() ), + this, TQ_SLOT( textInsertPageNum() ), actionCollection(), "text_inspgnum" ); // ----------------- format actions actionExtraProperties = new TDEAction( i18n( "&Properties" ), "penbrush", 0, - this, TQT_SLOT( extraProperties() ), + this, TQ_SLOT( extraProperties() ), actionCollection(), "extra_properties" ); actionExtraArrangePopup = new TDEActionMenu( i18n( "Arra&nge Objects" ), "arrange", @@ -2639,98 +2639,98 @@ void KPrView::setupActions() actionExtraArrangePopup->setDelayed( false ); actionExtraRaise = new TDEAction( i18n( "Ra&ise Objects" ), "raise", - CTRL+TQt::SHIFT+TQt::Key_R, this, TQT_SLOT( extraRaise() ), + CTRL+TQt::SHIFT+TQt::Key_R, this, TQ_SLOT( extraRaise() ), actionCollection(), "extra_raise" ); actionExtraLower = new TDEAction( i18n( "&Lower Objects" ), "lower", CTRL +TQt::SHIFT+ TQt::Key_L, - this, TQT_SLOT( extraLower() ), + this, TQ_SLOT( extraLower() ), actionCollection(), "extra_lower" ); actionExtraBringForward= new TDEAction( i18n( "Bring to Front" ), "bring_forward", - 0, this, TQT_SLOT( extraBringForward() ), + 0, this, TQ_SLOT( extraBringForward() ), actionCollection(), "extra_bring_forward" ); actionExtraSendBackward= new TDEAction( i18n( "Send to Back" ), "send_backward", - 0, this, TQT_SLOT( extraSendBackward() ), + 0, this, TQ_SLOT( extraSendBackward() ), actionCollection(), "extra_send_backward" ); actionExtraRotate = new TDEAction( i18n( "R&otate Objects..." ), "object-rotate-right", 0, - this, TQT_SLOT( extraRotate() ), + this, TQ_SLOT( extraRotate() ), actionCollection(), "extra_rotate" ); actionExtraShadow = new TDEAction( i18n( "&Shadow Objects..." ), "shadow", 0, - this, TQT_SLOT( extraShadow() ), + this, TQ_SLOT( extraShadow() ), actionCollection(), "extra_shadow" ); actionExtraAlignObjLeft = new TDEAction( i18n( "Align &Left" ), "aoleft", 0, - this, TQT_SLOT( extraAlignObjLeft() ), + this, TQ_SLOT( extraAlignObjLeft() ), actionCollection(), "extra_alignleft" ); actionExtraAlignObjCenterH = new TDEAction( i18n( "Align Center (&horizontally)" ), "aocenterh", 0, - this, TQT_SLOT( extraAlignObjCenterH() ), + this, TQ_SLOT( extraAlignObjCenterH() ), actionCollection(), "extra_aligncenterh" ); actionExtraAlignObjRight = new TDEAction( i18n( "Align &Right" ), "aoright", 0, - this, TQT_SLOT( extraAlignObjRight() ), + this, TQ_SLOT( extraAlignObjRight() ), actionCollection(), "extra_alignright" ); actionExtraAlignObjTop = new TDEAction( i18n( "Align &Top" ), "aotop", 0, - this, TQT_SLOT( extraAlignObjTop() ), + this, TQ_SLOT( extraAlignObjTop() ), actionCollection(), "extra_aligntop" ); actionExtraAlignObjCenterV = new TDEAction( i18n( "Align Center (&vertically)" ), "aocenterv", 0, - this, TQT_SLOT( extraAlignObjCenterV() ), + this, TQ_SLOT( extraAlignObjCenterV() ), actionCollection(), "extra_aligncenterv" ); actionExtraAlignObjBottom = new TDEAction( i18n( "Align &Bottom" ), "aobottom", 0, - this, TQT_SLOT( extraAlignObjBottom() ), + this, TQ_SLOT( extraAlignObjBottom() ), actionCollection(), "extra_alignbottom" ); actionExtraBackground = new TDEAction( i18n( "Slide Bac&kground..." ), "background", 0, - this, TQT_SLOT( extraBackground() ), + this, TQ_SLOT( extraBackground() ), actionCollection(), "extra_background" ); actionExtraLayout = new TDEAction( i18n( "Page &Layout..." ), 0, - this, TQT_SLOT( extraLayout() ), + this, TQ_SLOT( extraLayout() ), actionCollection(), "extra_layout" ); m_actionExtraHeader = new TDEToggleAction( i18n( "Enable Document &Header" ), 0, - this, TQT_SLOT( viewHeader() ), + this, TQ_SLOT( viewHeader() ), actionCollection(), "extra_header" ); m_actionExtraHeader->setCheckedState( i18n( "Disable Document &Header" ) ); m_actionExtraHeader->setToolTip( i18n( "Shows and hides header display for the current slide." ) ); m_actionExtraFooter = new TDEToggleAction( i18n( "Enable Document Foo&ter" ), 0, - this, TQT_SLOT( viewFooter() ), + this, TQ_SLOT( viewFooter() ), actionCollection(), "extra_footer" ); m_actionExtraFooter->setCheckedState( i18n( "Disable Document Foo&ter" ) ); m_actionExtraFooter->setToolTip( i18n( "Shows and hides footer display for the current slide." ) ); actionExtraConfigure = new TDEAction( i18n( "Configure KPresenter..." ), "configure", 0, - this, TQT_SLOT( extraConfigure() ), + this, TQ_SLOT( extraConfigure() ), actionCollection(), "extra_configure" ); actionExtraWebPres = new TDEAction( i18n( "Create &HTML Slideshow..." ), "webpres", 0, - this, TQT_SLOT( extraWebPres() ), + this, TQ_SLOT( extraWebPres() ), actionCollection(), "extra_webpres" ); actionExtraMSPres = new TDEAction( i18n( "Create Memor&y Stick Slideshow..." ), - 0, this, TQT_SLOT( extraMSPres() ), + 0, this, TQ_SLOT( extraMSPres() ), actionCollection(), "extra_mspres" ); actionExtraCreateTemplate = new TDEAction( i18n( "Template Manager" ), 0, - this, TQT_SLOT( extraCreateTemplate() ), + this, TQ_SLOT( extraCreateTemplate() ), actionCollection(), "extra_template" ); actionExtraDefaultTemplate = new TDEAction( i18n( "Use Current Slide as Default Template" ), 0, - this, TQT_SLOT( extraDefaultTemplate() ), + this, TQ_SLOT( extraDefaultTemplate() ), actionCollection(), "extra_defaulttemplate" ); actionExtraAlignObjsPopup = new TDEActionMenu( i18n("Align O&bjects"), "alignobjs", @@ -2738,207 +2738,207 @@ void KPrView::setupActions() actionExtraAlignObjsPopup->setDelayed( false ); actionExtraLineBegin = new TDEAction( i18n("Line Begin"), "line_begin", 0, - this, TQT_SLOT( extraLineBegin() ), + this, TQ_SLOT( extraLineBegin() ), actionCollection(), "extra_linebegin" ); actionExtraLineEnd = new TDEAction( i18n("Line End"), "line_end", 0, - this, TQT_SLOT( extraLineEnd() ), + this, TQ_SLOT( extraLineEnd() ), actionCollection(), "extra_lineend" ); actionExtraPenStyle = new KoLineStyleAction( i18n("Outline Style"), "pen_style", - this, TQT_SLOT( extraPenStyle(int) ), + this, TQ_SLOT( extraPenStyle(int) ), actionCollection(), "extra_penstyle" ); actionExtraPenStyle->setShowCurrentSelection(false); actionExtraPenWidth = new KoLineWidthAction( i18n("Outline Width"), "pen_width", - this, TQT_SLOT( extraPenWidth(double) ), + this, TQ_SLOT( extraPenWidth(double) ), actionCollection(), "extra_penwidth" ); actionExtraPenWidth->setUnit( kPresenterDoc()->unit() ); actionExtraPenWidth->setShowCurrentSelection(false); - connect( kPresenterDoc(), TQT_SIGNAL( unitChanged( KoUnit::Unit ) ), - actionExtraPenWidth, TQT_SLOT( setUnit( KoUnit::Unit ) ) ); + connect( kPresenterDoc(), TQ_SIGNAL( unitChanged( KoUnit::Unit ) ), + actionExtraPenWidth, TQ_SLOT( setUnit( KoUnit::Unit ) ) ); actionExtraGroup = new TDEAction( i18n( "&Group Objects" ), "group", TQKeySequence( "Ctrl+G" ), - this, TQT_SLOT( extraGroup() ), + this, TQ_SLOT( extraGroup() ), actionCollection(), "extra_group" ); actionExtraUnGroup = new TDEAction( i18n( "&Ungroup Objects" ), "ungroup", TQKeySequence( "Ctrl+Shift+G" ), - this, TQT_SLOT( extraUnGroup() ), + this, TQ_SLOT( extraUnGroup() ), actionCollection(), "extra_ungroup" ); // ----------------- slideshow actions actionScreenConfigPages = new TDEAction( i18n( "&Configure Slide Show..." ), "configure", 0, - this, TQT_SLOT( screenConfigPages() ), + this, TQ_SLOT( screenConfigPages() ), actionCollection(), "screen_configpages" ); actionScreenAssignEffect = new TDEAction( i18n( "Edit &Object Effect..." ), "effect", 0, - this, TQT_SLOT( screenAssignEffect() ), + this, TQ_SLOT( screenAssignEffect() ), actionCollection(), "screen_assigneffect"); actionScreenTransEffect = new TDEAction( i18n( "Edit Slide &Transition..." ), "slide_effect", 0, - this, TQT_SLOT( screenTransEffect() ), + this, TQ_SLOT( screenTransEffect() ), actionCollection(), "screen_transeffect"); actionScreenStart = new TDEAction( i18n( "&Start" ), "2rightarrow", TQt::Key_F12, - this, TQT_SLOT( screenStart() ), + this, TQ_SLOT( screenStart() ), actionCollection(), "screen_start" ); actionScreenStartFromFirst = new TDEAction( i18n( "Start From &First Slide" ), "1rightarrow", 0, - this, TQT_SLOT( screenStartFromFirst() ), + this, TQ_SLOT( screenStartFromFirst() ), actionCollection(), "screen_startfromfirst" ); actionScreenFirst = new TDEAction( i18n( "&Go to Start" ), "go-first", 0, - this, TQT_SLOT( screenFirst() ), + this, TQ_SLOT( screenFirst() ), actionCollection(), "screen_first" ); actionScreenPrev = new TDEAction( i18n( "&Previous Slide" ), "back", TQt::Key_Prior, - this, TQT_SLOT( screenPrev() ), + this, TQ_SLOT( screenPrev() ), actionCollection(), "screen_prev" ); actionScreenNext = new TDEAction( i18n( "&Next Slide" ), "forward", TQt::Key_Next, - this, TQT_SLOT( screenNext() ), + this, TQ_SLOT( screenNext() ), actionCollection(), "screen_next" ); actionScreenLast = new TDEAction( i18n( "Go to &End" ), "go-last", 0, - this, TQT_SLOT( screenLast() ), + this, TQ_SLOT( screenLast() ), actionCollection(), "screen_last" ); actionScreenSkip = new TDEAction( i18n( "Goto &Slide..." ), "goto", 0, - this, TQT_SLOT( screenSkip() ), + this, TQ_SLOT( screenSkip() ), actionCollection(), "screen_skip" ); // ----------------- colorbar(Brush and Pen) action actionBrushColor = new TTDESelectColorAction( i18n( "Fill Color..." ), TTDESelectColorAction::FillColor, actionCollection(), "brush_color" ,true); - connect( actionBrushColor, TQT_SIGNAL( activated() ), TQT_SLOT( brushChosen() ) ); + connect( actionBrushColor, TQ_SIGNAL( activated() ), TQ_SLOT( brushChosen() ) ); actionBrushColor->setDefaultColor(TQColor()); actionPenColor = new TTDESelectColorAction( i18n( "Outline Color..." ), TTDESelectColorAction::LineColor, actionCollection(), "pen_color" ); - connect( actionPenColor, TQT_SIGNAL( activated() ), TQT_SLOT( penChosen() ) ); + connect( actionPenColor, TQ_SIGNAL( activated() ), TQ_SLOT( penChosen() ) ); actionPenColor->setDefaultColor(TQColor()); - actionExtendObjectHeight = new TDEAction( i18n( "&Extend Contents to Object Height" ),0, this, TQT_SLOT( textContentsToHeight() ), + actionExtendObjectHeight = new TDEAction( i18n( "&Extend Contents to Object Height" ),0, this, TQ_SLOT( textContentsToHeight() ), actionCollection(), "extendobjectheight" ); - actionResizeTextObject = new TDEAction( i18n( "&Resize Object to Fit Contents" ),0, this, TQT_SLOT( textObjectToContents() ), + actionResizeTextObject = new TDEAction( i18n( "&Resize Object to Fit Contents" ),0, this, TQ_SLOT( textObjectToContents() ), actionCollection(), "resizetextobject" ); actionRenamePage=new TDEAction(i18n( "&Rename Slide..." ),0,this, - TQT_SLOT( renamePageTitle() ), + TQ_SLOT( renamePageTitle() ), actionCollection(), "rename_page" ); actionPicOriginalSize = new TDEAction( i18n( "Sca&le to Original Size" ), 0, this, - TQT_SLOT( picViewOriginalSize() ), + TQ_SLOT( picViewOriginalSize() ), actionCollection(), "pic_original_size" ); actionPic640x480=new TDEAction(i18n( "640x480" ),0,this, - TQT_SLOT( picViewOrig640x480() ), + TQ_SLOT( picViewOrig640x480() ), actionCollection(), "pic_640_480" ); actionPic800x600=new TDEAction(i18n( "800x600" ),0,this, - TQT_SLOT( picViewOrig800x600() ), + TQ_SLOT( picViewOrig800x600() ), actionCollection(), "pic_800_600" ); actionPic1024x768=new TDEAction(i18n( "1024x768" ),0,this, - TQT_SLOT( picViewOrig1024x768() ), + TQ_SLOT( picViewOrig1024x768() ), actionCollection(), "pic_1024_768" ); actionPic1280x1024=new TDEAction(i18n( "1280x1024" ),0,this, - TQT_SLOT( picViewOrig1280x1024() ), + TQ_SLOT( picViewOrig1280x1024() ), actionCollection(), "pic_1280_1024" ); actionPic1600x1200=new TDEAction(i18n( "1600x1200" ),0,this, - TQT_SLOT( picViewOrig1600x1200() ), + TQ_SLOT( picViewOrig1600x1200() ), actionCollection(), "pic_1600_1200" ); actionChangePic=new TDEAction( i18n( "&Change Picture..." ),"frame_image",0,this, - TQT_SLOT( chPic() ), actionCollection(), "change_picture" ); + TQ_SLOT( chPic() ), actionCollection(), "change_picture" ); actionImageEffect = new TDEAction( i18n("Image &Effect..."), 0, this, - TQT_SLOT(imageEffect()), actionCollection(), "image_effect"); + TQ_SLOT(imageEffect()), actionCollection(), "image_effect"); actionFormatSuper = new TDEToggleAction( i18n( "Superscript" ), "super", 0, - this, TQT_SLOT( textSuperScript() ), + this, TQ_SLOT( textSuperScript() ), actionCollection(), "format_super" ); actionFormatSuper->setExclusiveGroup( "valign" ); actionFormatSub = new TDEToggleAction( i18n( "Subscript" ), "sub", 0, - this, TQT_SLOT( textSubScript() ), + this, TQ_SLOT( textSubScript() ), actionCollection(), "format_sub" ); actionFormatSub->setExclusiveGroup( "valign" ); actionInsertSpecialChar = new TDEAction( i18n( "Sp&ecial Character..." ), "char", ALT + TQt::SHIFT + TQt::Key_C, - this, TQT_SLOT( insertSpecialChar() ), + this, TQ_SLOT( insertSpecialChar() ), actionCollection(), "insert_specialchar" ); actionInsertLink = new TDEAction( i18n( "Link..." ), 0, - this, TQT_SLOT( insertLink() ), + this, TQ_SLOT( insertLink() ), actionCollection(), "insert_link" ); #if 0 //code from page.cpp //not implemented picResizeMenu->insertSeparator(); - picResizeMenu->insertItem( i18n( "Enter Custom Factor..." ), this, TQT_SLOT( picViewOrigFactor() ) ); + picResizeMenu->insertItem( i18n( "Enter Custom Factor..." ), this, TQ_SLOT( picViewOrigFactor() ) ); #endif (void) new TDEAction( i18n( "Configure &Autocorrection..." ), 0, - this, TQT_SLOT( extraAutoFormat() ), + this, TQ_SLOT( extraAutoFormat() ), actionCollection(), "extra_autocorrection" ); - actionExtraSpellCheck = KStdAction::spelling( this, TQT_SLOT( slotSpellCheck() ), actionCollection(), "extra_spellcheck" ); + actionExtraSpellCheck = KStdAction::spelling( this, TQ_SLOT( slotSpellCheck() ), actionCollection(), "extra_spellcheck" ); actionFormatParag = new TDEAction( i18n( "&Paragraph..." ), ALT + CTRL + TQt::Key_P, - this, TQT_SLOT( formatParagraph() ), + this, TQ_SLOT( formatParagraph() ), actionCollection(), "format_paragraph" ); actionFormatDefault=new TDEAction( i18n( "Default Format" ), 0, - this, TQT_SLOT( textDefaultFormat() ), + this, TQ_SLOT( textDefaultFormat() ), actionCollection(), "text_default" ); actionOpenLink = new TDEAction( i18n( "Open Link" ), 0, - this, TQT_SLOT( openLink() ), + this, TQ_SLOT( openLink() ), actionCollection(), "open_link" ); actionChangeLink=new TDEAction( i18n("Change Link..."), 0, - this, TQT_SLOT(changeLink()), + this, TQ_SLOT(changeLink()), actionCollection(), "change_link"); actionCopyLink = new TDEAction( i18n( "Copy Link" ), 0, - this, TQT_SLOT( copyLink() ), + this, TQ_SLOT( copyLink() ), actionCollection(), "copy_link" ); actionRemoveLink = new TDEAction( i18n( "Remove Link" ), 0, - this, TQT_SLOT( removeLink() ), + this, TQ_SLOT( removeLink() ), actionCollection(), "remove_link" ); actionAddLinkToBookmak = new TDEAction( i18n( "Add to Bookmark" ), 0, - this, TQT_SLOT( addToBookmark() ), + this, TQ_SLOT( addToBookmark() ), actionCollection(), "add_to_bookmark" ); actionEditCustomVarsEdit = new TDEAction( i18n( "&Custom Variables..." ), 0, - this, TQT_SLOT( editCustomVars() ), + this, TQ_SLOT( editCustomVars() ), actionCollection(), "edit_vars" ); actionEditCustomVars = new TDEAction( i18n( "Edit Variable..." ), 0, - this, TQT_SLOT( editCustomVariable() ), + this, TQ_SLOT( editCustomVariable() ), actionCollection(), "edit_customvars" ); @@ -2960,31 +2960,31 @@ void KPrView::setupActions() actionInsertVariable->popupMenu()->insertSeparator(); actionRefreshAllVariable = new TDEAction( i18n( "&Refresh All Variables" ), 0, - this, TQT_SLOT( refreshAllVariable() ), + this, TQ_SLOT( refreshAllVariable() ), actionCollection(), "refresh_all_variable" ); actionInsertVariable->insert(actionRefreshAllVariable); actionIncreaseFontSize = new TDEAction( i18n("Increase Font Size"),"fontsizeup", 0, - this, TQT_SLOT( increaseFontSize() ), + this, TQ_SLOT( increaseFontSize() ), actionCollection(), "increaseFontSize" ); actionDecreaseFontSize = new TDEAction( i18n("Decrease Font Size"),"fontsizedown", 0, - this, TQT_SLOT( decreaseFontSize() ), + this, TQ_SLOT( decreaseFontSize() ), actionCollection(), "decreaseFontSize" ); actionChangeCase=new TDEAction( i18n( "Change Case..." ), 0, - this, TQT_SLOT( changeCaseOfText() ), + this, TQ_SLOT( changeCaseOfText() ), actionCollection(), "change_case" ); actionViewZoom = new TDESelectAction( i18n( "Zoom" ), "viewmag", 0, actionCollection(), "view_zoom" ); - connect( actionViewZoom, TQT_SIGNAL( activated( const TQString & ) ), - this, TQT_SLOT( viewZoom( const TQString & ) ) ); + connect( actionViewZoom, TQ_SIGNAL( activated( const TQString & ) ), + this, TQ_SLOT( viewZoom( const TQString & ) ) ); actionViewZoom->setEditable(true); changeZoomMenu( ); actionFormatStylist = new TDEAction( i18n( "&Style Manager" ), ALT + CTRL + TQt::Key_S, - this, TQT_SLOT( extraStylist() ), + this, TQ_SLOT( extraStylist() ), actionCollection(), "format_stylist" ); actionFormatStyleMenu = new TDEActionMenu( i18n( "St&yle" ), 0, @@ -2993,167 +2993,167 @@ void KPrView::setupActions() actionFormatStyle = new TDESelectAction( i18n( "St&yle" ), 0, actionCollection(), "format_style" ); - connect( actionFormatStyle, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( textStyleSelected( int ) ) ); + connect( actionFormatStyle, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( textStyleSelected( int ) ) ); actionFormatStyle->setMenuAccelsEnabled( true ); updateStyleList(); actionAllowAutoFormat = new TDEToggleAction( i18n( "Enable Autocorrection" ), 0, - this, TQT_SLOT( slotAllowAutoFormat() ), + this, TQ_SLOT( slotAllowAutoFormat() ), actionCollection(), "enable_autocorrection" ); actionAllowAutoFormat->setCheckedState(i18n("Disable Autocorrection")); // ------------------- Actions with a key binding and no GUI item new TDEAction( i18n( "Insert Non-Breaking Space" ), CTRL+TQt::Key_Space, - this, TQT_SLOT( slotNonbreakingSpace() ), actionCollection(), "nonbreaking_space" ); + this, TQ_SLOT( slotNonbreakingSpace() ), actionCollection(), "nonbreaking_space" ); new TDEAction( i18n( "Insert Non-Breaking Hyphen" ), CTRL+TQt::SHIFT+TQt::Key_Minus, - this, TQT_SLOT( slotNonbreakingHyphen() ), actionCollection(), "nonbreaking_hyphen" ); + this, TQ_SLOT( slotNonbreakingHyphen() ), actionCollection(), "nonbreaking_hyphen" ); new TDEAction( i18n( "Insert Soft Hyphen" ), CTRL+TQt::Key_Minus, - this, TQT_SLOT( slotSoftHyphen() ), actionCollection(), "soft_hyphen" ); + this, TQ_SLOT( slotSoftHyphen() ), actionCollection(), "soft_hyphen" ); new TDEAction( i18n( "Line Break" ), TQt::SHIFT+TQt::Key_Return, - this, TQT_SLOT( slotLineBreak() ), actionCollection(), "line_break" ); + this, TQ_SLOT( slotLineBreak() ), actionCollection(), "line_break" ); new TDEAction( i18n( "Completion" ), TDEStdAccel::shortcut(TDEStdAccel::TextCompletion), - this, TQT_SLOT( slotCompletion() ), actionCollection(), "completion" ); + this, TQ_SLOT( slotCompletion() ), actionCollection(), "completion" ); new TDEAction( i18n( "Increase Numbering Level" ), ALT+TQt::Key_Right, - this, TQT_SLOT( slotIncreaseNumberingLevel() ), actionCollection(), "increase_numbering_level" ); + this, TQ_SLOT( slotIncreaseNumberingLevel() ), actionCollection(), "increase_numbering_level" ); new TDEAction( i18n( "Decrease Numbering Level" ), ALT+TQt::Key_Left, - this, TQT_SLOT( slotDecreaseNumberingLevel() ), actionCollection(), "decrease_numbering_level" ); + this, TQ_SLOT( slotDecreaseNumberingLevel() ), actionCollection(), "decrease_numbering_level" ); actionInsertComment = new TDEAction( i18n( "Comment..." ), 0, - this, TQT_SLOT( insertComment() ), + this, TQ_SLOT( insertComment() ), actionCollection(), "insert_comment" ); actionEditComment = new TDEAction( i18n("Edit Comment..."), 0, - this, TQT_SLOT(editComment()), + this, TQ_SLOT(editComment()), actionCollection(), "edit_comment"); actionAddGuideLine = new TDEAction( i18n( "Add Guide Line..."), 0, - this, TQT_SLOT( addGuideLine()), + this, TQ_SLOT( addGuideLine()), actionCollection(), "add_guideline"); actionRemoveComment = new TDEAction( i18n("Remove Comment"), 0, - this, TQT_SLOT(removeComment()), + this, TQ_SLOT(removeComment()), actionCollection(), "remove_comment"); actionCopyTextOfComment = new TDEAction( i18n("Copy Text of Comment..."), 0, - this, TQT_SLOT(copyTextOfComment()), + this, TQ_SLOT(copyTextOfComment()), actionCollection(), "copy_text_comment"); actionConfigureCompletion = new TDEAction( i18n( "&Configure Completion..." ), 0, - this, TQT_SLOT( configureCompletion() ), + this, TQ_SLOT( configureCompletion() ), actionCollection(), "configure_completion" ); actionZoomMinus = new TDEAction( i18n( "Zoom Out" ), "zoom-out",0, - this, TQT_SLOT( zoomMinus() ), + this, TQ_SLOT( zoomMinus() ), actionCollection(), "zoom_minus" ); actionZoomPlus = new TDEAction( i18n( "Zoom In" ), "zoom-in",0, - this, TQT_SLOT( zoomPlus() ), + this, TQ_SLOT( zoomPlus() ), actionCollection(), "zoom_plus" ); actionZoomEntirePage = new TDEAction( i18n( "Zoom Entire Slide" ), 0, - this, TQT_SLOT( zoomEntirePage() ), + this, TQ_SLOT( zoomEntirePage() ), actionCollection(), "zoom_entire_page" ); actionZoomMinus = new TDEAction( i18n( "Zoom Slide Width" ), 0, - this, TQT_SLOT( zoomPageWidth() ), + this, TQ_SLOT( zoomPageWidth() ), actionCollection(), "zoom_page_width" ); actionZoomSelectedObject= new TDEAction( i18n( "Zoom Selected Objects" ), "zoom-fit-best",0, - this, TQT_SLOT( zoomSelectedObject() ), + this, TQ_SLOT( zoomSelectedObject() ), actionCollection(), "zoom_selected_object" ); actionZoomPageHeight= new TDEAction( i18n( "Zoom Slide Height" ), 0, - this, TQT_SLOT( zoomPageHeight() ), + this, TQ_SLOT( zoomPageHeight() ), actionCollection(), "zoom_page_height" ); actionZoomAllObject= new TDEAction( i18n( "Zoom All Objects" ), 0, - this, TQT_SLOT( zoomAllObject() ), + this, TQ_SLOT( zoomAllObject() ), actionCollection(), "zoom_all_object" ); actionFlipHorizontal= new TDEAction( i18n( "Horizontal Flip" ), 0, - this, TQT_SLOT( flipHorizontal() ), + this, TQ_SLOT( flipHorizontal() ), actionCollection(), "horizontal_flip" ); actionFlipVertical= new TDEAction( i18n( "Vertical Flip" ), 0, - this, TQT_SLOT( flipVertical() ), + this, TQ_SLOT( flipVertical() ), actionCollection(), "vertical_flip" ); actionDuplicateObj = new TDEAction( i18n( "Duplicate Object..." ), 0, - this, TQT_SLOT( duplicateObj() ), + this, TQ_SLOT( duplicateObj() ), actionCollection(), "duplicate_obj" ); actionApplyAutoFormat= new TDEAction( i18n( "Apply Autocorrection" ), 0, - this, TQT_SLOT( applyAutoFormat() ), + this, TQ_SLOT( applyAutoFormat() ), actionCollection(), "apply_autoformat" ); actionCreateStyleFromSelection = new TDEAction( i18n( "Create Style From Selection..." ), 0, - this, TQT_SLOT( createStyleFromSelection()), + this, TQ_SLOT( createStyleFromSelection()), actionCollection(), "create_style" ); actionCloseObject = new TDEAction( i18n( "Close Object" ), 0, - this, TQT_SLOT( closeObject()), + this, TQ_SLOT( closeObject()), actionCollection(), "close_object" ); actionAlignVerticalTop = new TDEToggleAction( i18n( "Align Top" ), 0, - this, TQT_SLOT( alignVerticalTop() ), + this, TQ_SLOT( alignVerticalTop() ), actionCollection(), "align_top" ); actionAlignVerticalTop->setExclusiveGroup( "vertical_alignment" ); actionAlignVerticalTop->setChecked( true ); actionAlignVerticalBottom = new TDEToggleAction( i18n( "Align Bottom" ), 0, - this, TQT_SLOT( alignVerticalBottom() ), + this, TQ_SLOT( alignVerticalBottom() ), actionCollection(), "align_bottom" ); actionAlignVerticalBottom->setExclusiveGroup( "vertical_alignment" ); actionAlignVerticalCenter = new TDEToggleAction( i18n( "Align Middle" ), 0, - this, TQT_SLOT( alignVerticalCenter() ), + this, TQ_SLOT( alignVerticalCenter() ), actionCollection(), "align_center" ); actionAlignVerticalCenter->setExclusiveGroup( "vertical_alignment" ); actionSavePicture= new TDEAction( i18n("Save Picture..."), 0, - this, TQT_SLOT( savePicture() ), + this, TQ_SLOT( savePicture() ), actionCollection(), "save_picture"); actionAllowBgSpellCheck = new TDEToggleAction( i18n( "Autospellcheck" ), 0, - this, TQT_SLOT( autoSpellCheck() ), + this, TQ_SLOT( autoSpellCheck() ), actionCollection(), "tool_auto_spellcheck" ); actionInsertFile= new TDEAction( i18n( "File..." ), 0, - this, TQT_SLOT( insertFile() ), + this, TQ_SLOT( insertFile() ), actionCollection(), "insert_file" ); actionImportStyle= new TDEAction( i18n( "Import Styles..." ), 0, - this, TQT_SLOT( importStyle() ), + this, TQ_SLOT( importStyle() ), actionCollection(), "import_style" ); actionSaveBackgroundPicture= new TDEAction( i18n( "Save Background Picture..." ), 0, - this, TQT_SLOT(backgroundPicture() ), + this, TQ_SLOT(backgroundPicture() ), actionCollection(), "save_bgpicture" ); #if 0 actionInsertDirectCursor = new TDEToggleAction( i18n( "Type Anywhere Cursor" ), 0, - this, TQT_SLOT( insertDirectCursor() ), + this, TQ_SLOT( insertDirectCursor() ), actionCollection(), "direct_cursor" ); #endif actionSpellIgnoreAll = new TDEAction( i18n( "Ignore All" ), 0, - this, TQT_SLOT( slotAddIgnoreAllWord() ), + this, TQ_SLOT( slotAddIgnoreAllWord() ), actionCollection(), "ignore_all" ); actionAddWordToPersonalDictionary=new TDEAction( i18n( "Add Word to Dictionary" ),0, - this, TQT_SLOT( addWordToDictionary() ), + this, TQ_SLOT( addWordToDictionary() ), actionCollection(), "add_word_to_dictionary" ); actionCustomSlideShow = new TDEAction( i18n( "Custom Slide Show..." ), 0, - this, TQT_SLOT( customSlideShow() ), + this, TQ_SLOT( customSlideShow() ), actionCollection(), "custom_slide_show" ); actionDisplayObjectFromMasterPage = new TDEToggleAction( i18n( "Hide Object From Slide Master" ), 0, - this, TQT_SLOT( displayObjectFromMasterPage() ), + this, TQ_SLOT( displayObjectFromMasterPage() ), actionCollection(), "display_object_from_master_page" ); actionDisplayObjectFromMasterPage->setCheckedState(i18n("Display Object From Slide Master")); actionDisplayBackgroundPage = new TDEToggleAction( i18n( "Hide Background" ), 0, - this, TQT_SLOT( displayBackground() ), + this, TQ_SLOT( displayBackground() ), actionCollection(), "display_background" ); actionDisplayBackgroundPage->setCheckedState(i18n("Display Background")); } @@ -3658,55 +3658,55 @@ void KPrView::setupPopupMenus() // create right button line begin rb_lbegin = new TQPopupMenu(); TQ_CHECK_PTR( rb_lbegin ); - rb_lbegin->insertItem( KPBarIcon("line_normal_begin" ), this, TQT_SLOT( extraLineBeginNormal() ) ); + rb_lbegin->insertItem( KPBarIcon("line_normal_begin" ), this, TQ_SLOT( extraLineBeginNormal() ) ); rb_lbegin->insertSeparator(); - rb_lbegin->insertItem( KPBarIcon("line_arrow_begin" ), this, TQT_SLOT( extraLineBeginArrow() ) ); + rb_lbegin->insertItem( KPBarIcon("line_arrow_begin" ), this, TQ_SLOT( extraLineBeginArrow() ) ); rb_lbegin->insertSeparator(); - rb_lbegin->insertItem( KPBarIcon("line_rect_begin" ), this, TQT_SLOT( extraLineBeginRect() ) ); + rb_lbegin->insertItem( KPBarIcon("line_rect_begin" ), this, TQ_SLOT( extraLineBeginRect() ) ); rb_lbegin->insertSeparator(); - rb_lbegin->insertItem( KPBarIcon("line_circle_begin" ), this, TQT_SLOT( extraLineBeginCircle() ) ); + rb_lbegin->insertItem( KPBarIcon("line_circle_begin" ), this, TQ_SLOT( extraLineBeginCircle() ) ); rb_lbegin->insertSeparator(); - rb_lbegin->insertItem( KPBarIcon("line_line_arrow_begin" ), this, TQT_SLOT( extraLineBeginLineArrow() ) ); + rb_lbegin->insertItem( KPBarIcon("line_line_arrow_begin" ), this, TQ_SLOT( extraLineBeginLineArrow() ) ); rb_lbegin->insertSeparator(); - rb_lbegin->insertItem( KPBarIcon("line_dimension_line_begin" ), this, TQT_SLOT( extraLineBeginDimensionLine() ) ); + rb_lbegin->insertItem( KPBarIcon("line_dimension_line_begin" ), this, TQ_SLOT( extraLineBeginDimensionLine() ) ); rb_lbegin->insertSeparator(); - rb_lbegin->insertItem( KPBarIcon("line_double_arrow_begin" ), this, TQT_SLOT( extraLineBeginDoubleArrow() ) ); + rb_lbegin->insertItem( KPBarIcon("line_double_arrow_begin" ), this, TQ_SLOT( extraLineBeginDoubleArrow() ) ); rb_lbegin->insertSeparator(); - rb_lbegin->insertItem( KPBarIcon("line_double_line_arrow_begin" ), this, TQT_SLOT( extraLineBeginDoubleLineArrow() ) ); + rb_lbegin->insertItem( KPBarIcon("line_double_line_arrow_begin" ), this, TQ_SLOT( extraLineBeginDoubleLineArrow() ) ); rb_lbegin->setMouseTracking( true ); rb_lbegin->setCheckable( false ); // create right button line end rb_lend = new TQPopupMenu(); TQ_CHECK_PTR( rb_lend ); - rb_lend->insertItem( KPBarIcon("line_normal_end" ), this, TQT_SLOT( extraLineEndNormal() ) ); + rb_lend->insertItem( KPBarIcon("line_normal_end" ), this, TQ_SLOT( extraLineEndNormal() ) ); rb_lend->insertSeparator(); - rb_lend->insertItem( KPBarIcon("line_arrow_end" ), this, TQT_SLOT( extraLineEndArrow() ) ); + rb_lend->insertItem( KPBarIcon("line_arrow_end" ), this, TQ_SLOT( extraLineEndArrow() ) ); rb_lend->insertSeparator(); - rb_lend->insertItem( KPBarIcon("line_rect_end" ), this, TQT_SLOT( extraLineEndRect() ) ); + rb_lend->insertItem( KPBarIcon("line_rect_end" ), this, TQ_SLOT( extraLineEndRect() ) ); rb_lend->insertSeparator(); - rb_lend->insertItem( KPBarIcon("line_circle_end" ), this, TQT_SLOT( extraLineEndCircle() ) ); + rb_lend->insertItem( KPBarIcon("line_circle_end" ), this, TQ_SLOT( extraLineEndCircle() ) ); rb_lend->insertSeparator(); - rb_lend->insertItem( KPBarIcon("line_line_arrow_end" ), this, TQT_SLOT( extraLineEndLineArrow() ) ); + rb_lend->insertItem( KPBarIcon("line_line_arrow_end" ), this, TQ_SLOT( extraLineEndLineArrow() ) ); rb_lend->insertSeparator(); - rb_lend->insertItem( KPBarIcon("line_dimension_line_end" ), this, TQT_SLOT( extraLineEndDimensionLine() ) ); + rb_lend->insertItem( KPBarIcon("line_dimension_line_end" ), this, TQ_SLOT( extraLineEndDimensionLine() ) ); rb_lend->insertSeparator(); - rb_lend->insertItem( KPBarIcon("line_double_arrow_end" ), this, TQT_SLOT( extraLineEndDoubleArrow() ) ); + rb_lend->insertItem( KPBarIcon("line_double_arrow_end" ), this, TQ_SLOT( extraLineEndDoubleArrow() ) ); rb_lend->insertSeparator(); - rb_lend->insertItem( KPBarIcon("line_double_line_arrow_end" ), this, TQT_SLOT( extraLineEndDoubleLineArrow() ) ); + rb_lend->insertItem( KPBarIcon("line_double_line_arrow_end" ), this, TQ_SLOT( extraLineEndDoubleLineArrow() ) ); rb_lend->setMouseTracking( true ); rb_lend->setCheckable( false ); // create arrange-objects popup m_arrangeObjectsPopup = new TQPopupMenu(); TQ_CHECK_PTR(m_arrangeObjectsPopup); - m_arrangeObjectsPopup->insertItem(KPBarIcon("lower"), this, TQT_SLOT(extraLower())); + m_arrangeObjectsPopup->insertItem(KPBarIcon("lower"), this, TQ_SLOT(extraLower())); m_arrangeObjectsPopup->insertSeparator(); - m_arrangeObjectsPopup->insertItem(KPBarIcon("send_backward"), this, TQT_SLOT(extraSendBackward())); + m_arrangeObjectsPopup->insertItem(KPBarIcon("send_backward"), this, TQ_SLOT(extraSendBackward())); m_arrangeObjectsPopup->insertSeparator(); - m_arrangeObjectsPopup->insertItem(KPBarIcon("bring_forward"), this, TQT_SLOT(extraBringForward())); + m_arrangeObjectsPopup->insertItem(KPBarIcon("bring_forward"), this, TQ_SLOT(extraBringForward())); m_arrangeObjectsPopup->insertSeparator(); - m_arrangeObjectsPopup->insertItem(KPBarIcon("raise"), this, TQT_SLOT(extraRaise())); + m_arrangeObjectsPopup->insertItem(KPBarIcon("raise"), this, TQ_SLOT(extraRaise())); m_arrangeObjectsPopup->setMouseTracking(true); m_arrangeObjectsPopup->setCheckable(false); @@ -3748,8 +3748,8 @@ void KPrView::setupScrollbars() horz = new TQScrollBar( TQt::Horizontal, pageBase ); vert->show(); horz->show(); - TQObject::connect( vert, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( scrollV( int ) ) ); - TQObject::connect( horz, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( scrollH( int ) ) ); + TQObject::connect( vert, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( scrollV( int ) ) ); + TQObject::connect( horz, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( scrollH( int ) ) ); vert->setValue(vert->maxValue()); horz->setValue(horz->maxValue()); vert->setValue(vert->minValue()); @@ -3758,12 +3758,12 @@ void KPrView::setupScrollbars() pgNext->setPixmap( TQPixmap( pagedown_xpm ) ); pgNext->setAutoRepeat( TRUE ); TQToolTip::add( pgNext, i18n( "Next slide" ) ); - connect( pgNext, TQT_SIGNAL( clicked() ), this, TQT_SLOT( nextPage() ) ); + connect( pgNext, TQ_SIGNAL( clicked() ), this, TQ_SLOT( nextPage() ) ); pgPrev = new TQToolButton( pageBase ); pgPrev->setPixmap( TQPixmap( pageup_xpm ) ); pgPrev->setAutoRepeat( TRUE ); TQToolTip::add( pgPrev, i18n( "Previous slide" ) ); - connect( pgPrev, TQT_SIGNAL( clicked() ), this, TQT_SLOT( prevPage() ) ); + connect( pgPrev, TQ_SIGNAL( clicked() ), this, TQ_SLOT( prevPage() ) ); } void KPrView::setupRulers() @@ -3786,26 +3786,26 @@ void KPrView::setupRulers() h_ruler->setGeometry( hSpace, 0, m_canvas->width(), vSpace ); v_ruler->setGeometry( 0, vSpace, hSpace, m_canvas->height() ); - TQObject::connect( h_ruler, TQT_SIGNAL( unitChanged( KoUnit::Unit ) ), - this, TQT_SLOT( unitChanged( KoUnit::Unit ) ) ); - TQObject::connect( h_ruler, TQT_SIGNAL( newPageLayout( const KoPageLayout & ) ), - this, TQT_SLOT( newPageLayout( const KoPageLayout & ) ) ); + TQObject::connect( h_ruler, TQ_SIGNAL( unitChanged( KoUnit::Unit ) ), + this, TQ_SLOT( unitChanged( KoUnit::Unit ) ) ); + TQObject::connect( h_ruler, TQ_SIGNAL( newPageLayout( const KoPageLayout & ) ), + this, TQ_SLOT( newPageLayout( const KoPageLayout & ) ) ); - connect( h_ruler, TQT_SIGNAL( doubleClicked() ), this, - TQT_SLOT( slotHRulerDoubleClicked() ) ); - connect( h_ruler, TQT_SIGNAL( doubleClicked(double) ), this, - TQT_SLOT( slotHRulerDoubleClicked(double) ) ); + connect( h_ruler, TQ_SIGNAL( doubleClicked() ), this, + TQ_SLOT( slotHRulerDoubleClicked() ) ); + connect( h_ruler, TQ_SIGNAL( doubleClicked(double) ), this, + TQ_SLOT( slotHRulerDoubleClicked(double) ) ); - TQObject::connect( v_ruler, TQT_SIGNAL( unitChanged( KoUnit::Unit ) ), - this, TQT_SLOT( unitChanged( KoUnit::Unit ) ) ); - TQObject::connect( v_ruler, TQT_SIGNAL( newPageLayout( const KoPageLayout & ) ), - this, TQT_SLOT( newPageLayout( const KoPageLayout & ) ) ); - TQObject::connect( v_ruler, TQT_SIGNAL( doubleClicked() ), - this, TQT_SLOT( openPageLayoutDia() ) ); + TQObject::connect( v_ruler, TQ_SIGNAL( unitChanged( KoUnit::Unit ) ), + this, TQ_SLOT( unitChanged( KoUnit::Unit ) ) ); + TQObject::connect( v_ruler, TQ_SIGNAL( newPageLayout( const KoPageLayout & ) ), + this, TQ_SLOT( newPageLayout( const KoPageLayout & ) ) ); + TQObject::connect( v_ruler, TQ_SIGNAL( doubleClicked() ), + this, TQ_SLOT( openPageLayoutDia() ) ); - connect( h_ruler, TQT_SIGNAL( newLeftIndent( double ) ), this, TQT_SLOT( newLeftIndent( double ) ) ); - connect( h_ruler, TQT_SIGNAL( newFirstIndent( double ) ), this, TQT_SLOT( newFirstIndent( double ) ) ); - connect( h_ruler, TQT_SIGNAL( newRightIndent( double ) ), this, TQT_SLOT( newRightIndent( double ) ) ); + connect( h_ruler, TQ_SIGNAL( newLeftIndent( double ) ), this, TQ_SLOT( newLeftIndent( double ) ) ); + connect( h_ruler, TQ_SIGNAL( newFirstIndent( double ) ), this, TQ_SLOT( newFirstIndent( double ) ) ); + connect( h_ruler, TQ_SIGNAL( newRightIndent( double ) ), this, TQ_SLOT( newRightIndent( double ) ) ); } void KPrView::unitChanged( KoUnit::Unit u ) @@ -4357,10 +4357,10 @@ void KPrView::insertSpecialChar() if (m_specialCharDlg==0) { m_specialCharDlg = new KoCharSelectDia( this, "insert special char", f, c, false ); - connect( m_specialCharDlg, TQT_SIGNAL(insertChar(TQChar,const TQString &)), - this, TQT_SLOT(slotSpecialChar(TQChar,const TQString &))); - connect( m_specialCharDlg, TQT_SIGNAL( finished() ), - this, TQT_SLOT( slotSpecialCharDlgClosed() ) ); + connect( m_specialCharDlg, TQ_SIGNAL(insertChar(TQChar,const TQString &)), + this, TQ_SLOT(slotSpecialChar(TQChar,const TQString &))); + connect( m_specialCharDlg, TQ_SIGNAL( finished() ), + this, TQ_SLOT( slotSpecialCharDlgClosed() ) ); } m_specialCharDlg->show(); } @@ -4369,10 +4369,10 @@ void KPrView::slotSpecialCharDlgClosed() { if ( m_specialCharDlg) { - disconnect( m_specialCharDlg, TQT_SIGNAL(insertChar(TQChar,const TQString &)), - this, TQT_SLOT(slotSpecialChar(TQChar,const TQString &))); - disconnect( m_specialCharDlg, TQT_SIGNAL( finished() ), - this, TQT_SLOT( slotSpecialCharDlgClosed() ) ); + disconnect( m_specialCharDlg, TQ_SIGNAL(insertChar(TQChar,const TQString &)), + this, TQ_SLOT(slotSpecialChar(TQChar,const TQString &))); + disconnect( m_specialCharDlg, TQ_SIGNAL( finished() ), + this, TQ_SLOT( slotSpecialCharDlgClosed() ) ); m_specialCharDlg->deleteLater(); m_specialCharDlg = 0L; } @@ -4593,16 +4593,16 @@ void KPrView::startKSpell() delete m_spell.dlg; m_spell.dlg = new KSpell2::Dialog( m_spell.kospell, this ); m_spell.dlg->activeAutoCorrect( true ); - TQObject::connect( m_spell.dlg, TQT_SIGNAL(misspelling(const TQString&, int)), - this, TQT_SLOT(spellCheckerMisspelling(const TQString&, int)) ); - TQObject::connect( m_spell.dlg, TQT_SIGNAL(replace(const TQString&, int, const TQString&)), - this, TQT_SLOT(spellCheckerCorrected(const TQString&, int, const TQString&)) ); - TQObject::connect( m_spell.dlg, TQT_SIGNAL(done(const TQString&) ), - this, TQT_SLOT(spellCheckerDone(const TQString&)) ); - TQObject::connect( m_spell.dlg, TQT_SIGNAL(cancel() ), - this, TQT_SLOT( spellCheckerCancel() ) ); - TQObject::connect( m_spell.dlg, TQT_SIGNAL(autoCorrect(const TQString &, const TQString & ) ), - this, TQT_SLOT( spellAddAutoCorrect (const TQString &, const TQString &) ) ); + TQObject::connect( m_spell.dlg, TQ_SIGNAL(misspelling(const TQString&, int)), + this, TQ_SLOT(spellCheckerMisspelling(const TQString&, int)) ); + TQObject::connect( m_spell.dlg, TQ_SIGNAL(replace(const TQString&, int, const TQString&)), + this, TQ_SLOT(spellCheckerCorrected(const TQString&, int, const TQString&)) ); + TQObject::connect( m_spell.dlg, TQ_SIGNAL(done(const TQString&) ), + this, TQ_SLOT(spellCheckerDone(const TQString&)) ); + TQObject::connect( m_spell.dlg, TQ_SIGNAL(cancel() ), + this, TQ_SLOT( spellCheckerCancel() ) ); + TQObject::connect( m_spell.dlg, TQ_SIGNAL(autoCorrect(const TQString &, const TQString & ) ), + this, TQ_SLOT( spellAddAutoCorrect (const TQString &, const TQString &) ) ); m_spell.dlg->show(); } @@ -4759,7 +4759,7 @@ void KPrView::showParagraphDialog(int initialPage, double initialTabPos) if ( initialPage == KoParagDia::PD_TABS ) m_paragDlg->tabulatorsWidget()->setCurrentTab( initialTabPos ); } - connect( m_paragDlg, TQT_SIGNAL( applyParagStyle() ), this, TQT_SLOT( slotApplyParag() ) ); + connect( m_paragDlg, TQ_SIGNAL( applyParagStyle() ), this, TQ_SLOT( slotApplyParag() ) ); m_paragDlg->exec(); delete m_paragDlg; @@ -4837,7 +4837,7 @@ void KPrView::addVariableActions( int type, const TQStringList & texts, VariableDef v; v.type = type; v.subtype = i; - TDEAction * act = new TDEAction( (*it), 0, this, TQT_SLOT( insertVariable() ), + TDEAction * act = new TDEAction( (*it), 0, this, TQ_SLOT( insertVariable() ), actionCollection(), "var-action" ); m_variableDefMap.insert( act, v ); parentMenu->insert( act ); @@ -4883,7 +4883,7 @@ void KPrView::refreshCustomMenu() lst.append( varName ); TQCString name = TQString("custom-action_%1").arg(i).latin1(); act = new TDEAction( varName, shortCuts[varName], this, - TQT_SLOT( insertCustomVariable() ), actionCollection(), name ); + TQ_SLOT( insertCustomVariable() ), actionCollection(), name ); act->setGroup( "custom-variable-action" ); actionInsertCustom->insert( act ); @@ -4895,7 +4895,7 @@ void KPrView::refreshCustomMenu() if(state) actionInsertCustom->popupMenu()->insertSeparator(); - act = new TDEAction( i18n("New..."), 0, this, TQT_SLOT( insertNewCustomVariable() ), actionCollection(), + act = new TDEAction( i18n("New..."), 0, this, TQ_SLOT( insertNewCustomVariable() ), actionCollection(), TQString("custom-action_%1").arg(i).latin1() ); act->setGroup( "custom-variable-action" ); actionInsertCustom->insert( act ); @@ -5394,7 +5394,7 @@ void KPrView::openThePresentationDurationDialog() presDurationDia = new KPrPresDurationDia( this, "presDurationDia", kPresenterDoc(), presentationDurationStringList, presentationTotalDurationString ); presDurationDia->setCaption( i18n( "Presentation Duration" ) ); - TQObject::connect( presDurationDia, TQT_SIGNAL( presDurationDiaClosed() ), this, TQT_SLOT( pddClosed() ) ); + TQObject::connect( presDurationDia, TQ_SIGNAL( presDurationDiaClosed() ), this, TQ_SLOT( pddClosed() ) ); presDurationDia->exec(); delete presDurationDia; @@ -5488,7 +5488,7 @@ void KPrView::updateStyleList() { TQString name = "paragstyle_" + style->name(); TDEToggleAction* act = new TDEToggleAction( (*it), - shortCuts[name], this, TQT_SLOT( slotStyleSelected() ), + shortCuts[name], this, TQ_SLOT( slotStyleSelected() ), actionCollection(), name.utf8() ); act->setGroup( "styleList" ); act->setExclusiveGroup( "styleListAction" ); @@ -6377,7 +6377,7 @@ TQPtrList<TDEAction> KPrView::listOfResultOfCheckWord( const TQString &word ) if ( !(*it).isEmpty() ) // in case of removed subtypes or placeholders { TDEAction * act = new TDEAction( (*it)); - connect( act, TQT_SIGNAL(activated()), this, TQT_SLOT(slotCorrectWord()) ); + connect( act, TQ_SIGNAL(activated()), this, TQ_SLOT(slotCorrectWord()) ); listAction.append( act ); } } diff --git a/kpresenter/KPrWebPresentation.cpp b/kpresenter/KPrWebPresentation.cpp index 5d899847..5578b6b2 100644 --- a/kpresenter/KPrWebPresentation.cpp +++ b/kpresenter/KPrWebPresentation.cpp @@ -626,9 +626,9 @@ KPrWebPresentationWizard::KPrWebPresentationWizard( const TQString &_config, KPr setupPage4(); setupPage5(); - connect( nextButton(), TQT_SIGNAL( clicked() ), this, TQT_SLOT( pageChanged() ) ); - connect( backButton(), TQT_SIGNAL( clicked() ), this, TQT_SLOT( pageChanged() ) ); - connect( finishButton(), TQT_SIGNAL( clicked() ), this, TQT_SLOT( finish() ) ); + connect( nextButton(), TQ_SIGNAL( clicked() ), this, TQ_SLOT( pageChanged() ) ); + connect( backButton(), TQ_SIGNAL( clicked() ), this, TQ_SLOT( pageChanged() ) ); + connect( finishButton(), TQ_SIGNAL( clicked() ), this, TQ_SLOT( finish() ) ); } KPrWebPresentationWizard::~KPrWebPresentationWizard() @@ -734,10 +734,10 @@ void KPrWebPresentationWizard::setupPage1() TQSizePolicy::Minimum, TQSizePolicy::Expanding ); layout->addMultiCell( spacer, 6, 6, 0, 1 ); - connect(path, TQT_SIGNAL(textChanged(const TQString&)), - this,TQT_SLOT(slotChoosePath(const TQString&))); - connect(path, TQT_SIGNAL(urlSelected( const TQString& )), - this,TQT_SLOT(slotChoosePath(const TQString&))); + connect(path, TQ_SIGNAL(textChanged(const TQString&)), + this,TQ_SLOT(slotChoosePath(const TQString&))); + connect(path, TQ_SIGNAL(urlSelected( const TQString& )), + this,TQ_SLOT(slotChoosePath(const TQString&))); addPage( page1, i18n( "Step 1: General Information" ) ); @@ -928,15 +928,15 @@ void KPrWebPresentationWizard::setupPage4() slideTitle = new KLineEdit( canvas ); layout->addWidget( slideTitle, 1, 1 ); - connect( slideTitle, TQT_SIGNAL( textChanged( const TQString & ) ), this, - TQT_SLOT( slideTitleChanged( const TQString & ) ) ); + connect( slideTitle, TQ_SIGNAL( textChanged( const TQString & ) ), this, + TQ_SLOT( slideTitleChanged( const TQString & ) ) ); slideTitles = new TDEListView( canvas ); layout->addMultiCellWidget( slideTitles, 2, 2, 0, 1 ); slideTitles->addColumn( i18n( "No." ) ); slideTitles->addColumn( i18n( "Slide Title" ) ); - connect( slideTitles, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), this, - TQT_SLOT( slideTitleChanged( TQListViewItem * ) ) ); + connect( slideTitles, TQ_SIGNAL( selectionChanged( TQListViewItem * ) ), this, + TQ_SLOT( slideTitleChanged( TQListViewItem * ) ) ); slideTitles->setSorting( -1 ); slideTitles->setAllColumnsShowFocus( true ); slideTitles->setResizeMode( TQListView::LastColumn ); @@ -1269,8 +1269,8 @@ void KPrWebPresentationCreateDialog::setupGUI() bSave->setEnabled( false ); bDone->setEnabled( false ); - connect( bDone, TQT_SIGNAL( clicked() ), this, TQT_SLOT( accept() ) ); - connect( bSave, TQT_SIGNAL( clicked() ), this, TQT_SLOT( saveConfig() ) ); + connect( bDone, TQ_SIGNAL( clicked() ), this, TQ_SLOT( accept() ) ); + connect( bSave, TQ_SIGNAL( clicked() ), this, TQ_SLOT( saveConfig() ) ); } void KPrWebPresentationCreateDialog::resizeEvent( TQResizeEvent *e ) diff --git a/kpresenter/autoformEdit/AFChoose.cpp b/kpresenter/autoformEdit/AFChoose.cpp index 546ae35a..a9483b7e 100644 --- a/kpresenter/autoformEdit/AFChoose.cpp +++ b/kpresenter/autoformEdit/AFChoose.cpp @@ -42,8 +42,8 @@ AFChoose::AFChoose(TQWidget *parent, const TQString &caption, const char *name) groupList.setAutoDelete(true); getGroups(); setupTabs(); - connect(this,TQT_SIGNAL(applyButtonPressed()),this,TQT_SLOT(chosen())); - connect(this,TQT_SIGNAL(cancelButtonPressed()),this,TQT_SLOT(cancelClicked())); + connect(this,TQ_SIGNAL(applyButtonPressed()),this,TQ_SLOT(chosen())); + connect(this,TQ_SIGNAL(cancelButtonPressed()),this,TQ_SLOT(cancelClicked())); } AFChoose::~AFChoose() @@ -139,12 +139,12 @@ void AFChoose::setupTabs() grpPtr->loadWid->setBackgroundColor(colorGroup().base()); grpPtr->loadWid->setResizeMode(TQIconView::Adjust); grpPtr->loadWid->sort(); - connect(grpPtr->loadWid,TQT_SIGNAL(nameChanged(TQString)), - this,TQT_SLOT(nameChanged(TQString))); - connect(this, TQT_SIGNAL(currentChanged(TQWidget *)), this, - TQT_SLOT(tabChanged(TQWidget*))); - connect(grpPtr->loadWid,TQT_SIGNAL( doubleClicked ( TQIconViewItem *)),this, - TQT_SLOT(slotDoubleClick())); + connect(grpPtr->loadWid,TQ_SIGNAL(nameChanged(TQString)), + this,TQ_SLOT(nameChanged(TQString))); + connect(this, TQ_SIGNAL(currentChanged(TQWidget *)), this, + TQ_SLOT(tabChanged(TQWidget*))); + connect(grpPtr->loadWid,TQ_SIGNAL( doubleClicked ( TQIconViewItem *)),this, + TQ_SLOT(slotDoubleClick())); grpPtr->label = new TQLabel(grpPtr->tab); grpPtr->label->setText(" "); grpPtr->label->setMaximumHeight(grpPtr->label->sizeHint().height()); |