diff options
Diffstat (limited to 'chalk/ui')
55 files changed, 416 insertions, 416 deletions
diff --git a/chalk/ui/kis_autobrush.cpp b/chalk/ui/kis_autobrush.cpp index c7127928..a652b468 100644 --- a/chalk/ui/kis_autobrush.cpp +++ b/chalk/ui/kis_autobrush.cpp @@ -36,18 +36,18 @@ KisAutobrush::KisAutobrush(TQWidget *parent, const char* name, const TQString& c linkFadeToggled(m_linkSize); linkSizeToggled(m_linkFade); - connect(bnLinkSize, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(linkSizeToggled( bool ))); - connect(bnLinkFade, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(linkFadeToggled( bool ))); + connect(bnLinkSize, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(linkSizeToggled( bool ))); + connect(bnLinkFade, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(linkFadeToggled( bool ))); - connect((TQObject*)comboBoxShape, TQT_SIGNAL(activated(int)), this, TQT_SLOT(paramChanged())); + connect((TQObject*)comboBoxShape, TQ_SIGNAL(activated(int)), this, TQ_SLOT(paramChanged())); spinBoxWidth->setMinValue(1); - connect(spinBoxWidth,TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(spinBoxWidthChanged(int))); + connect(spinBoxWidth,TQ_SIGNAL(valueChanged(int)),this,TQ_SLOT(spinBoxWidthChanged(int))); spinBoxHeight->setMinValue(1); - connect(spinBoxHeight,TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(spinBoxHeightChanged(int))); + connect(spinBoxHeight,TQ_SIGNAL(valueChanged(int)),this,TQ_SLOT(spinBoxHeightChanged(int))); spinBoxHorizontal->setMinValue(0); - connect(spinBoxHorizontal,TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(spinBoxHorizontalChanged(int))); + connect(spinBoxHorizontal,TQ_SIGNAL(valueChanged(int)),this,TQ_SLOT(spinBoxHorizontalChanged(int))); spinBoxVertical->setMinValue(0); - connect(spinBoxVertical,TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(spinBoxVerticalChanged(int))); + connect(spinBoxVertical,TQ_SIGNAL(valueChanged(int)),this,TQ_SLOT(spinBoxVerticalChanged(int))); m_brsh = new TQImage(1,1,32); TQ_CHECK_PTR(m_brsh); @@ -55,7 +55,7 @@ KisAutobrush::KisAutobrush(TQWidget *parent, const char* name, const TQString& c paramChanged(); - connect(brushPreview, TQT_SIGNAL(clicked()), TQT_SLOT(paramChanged())); + connect(brushPreview, TQ_SIGNAL(clicked()), TQ_SLOT(paramChanged())); } diff --git a/chalk/ui/kis_autogradient.cpp b/chalk/ui/kis_autogradient.cpp index bd5b80fb..e6ca9608 100644 --- a/chalk/ui/kis_autogradient.cpp +++ b/chalk/ui/kis_autogradient.cpp @@ -37,18 +37,18 @@ KisAutogradient::KisAutogradient(TQWidget *parent, const char* name, const TQStr setCaption(caption); m_autogradientResource = new KisAutogradientResource(); m_autogradientResource->createSegment( INTERP_LINEAR, COLOR_INTERP_RGB, 0.0, 1.0, 0.5, TQt::black, TQt::white ); - connect(gradientSlider, TQT_SIGNAL( sigSelectedSegment( KisGradientSegment* ) ), TQT_SLOT( slotSelectedSegment(KisGradientSegment*) )); - connect(gradientSlider, TQT_SIGNAL( sigChangedSegment(KisGradientSegment*) ), TQT_SLOT( slotChangedSegment(KisGradientSegment*) )); + connect(gradientSlider, TQ_SIGNAL( sigSelectedSegment( KisGradientSegment* ) ), TQ_SLOT( slotSelectedSegment(KisGradientSegment*) )); + connect(gradientSlider, TQ_SIGNAL( sigChangedSegment(KisGradientSegment*) ), TQ_SLOT( slotChangedSegment(KisGradientSegment*) )); gradientSlider->setGradientResource( m_autogradientResource ); - connect(comboBoxColorInterpolationType, TQT_SIGNAL( activated(int) ), TQT_SLOT( slotChangedColorInterpolation(int) )); - connect(comboBoxInterpolationType, TQT_SIGNAL( activated(int) ), TQT_SLOT( slotChangedInterpolation(int) )); - connect(leftColorButton, TQT_SIGNAL( changed(const TQColor&) ), TQT_SLOT( slotChangedLeftColor(const TQColor&) )); - connect(rightColorButton, TQT_SIGNAL( changed(const TQColor&) ), TQT_SLOT( slotChangedRightColor(const TQColor&) )); + connect(comboBoxColorInterpolationType, TQ_SIGNAL( activated(int) ), TQ_SLOT( slotChangedColorInterpolation(int) )); + connect(comboBoxInterpolationType, TQ_SIGNAL( activated(int) ), TQ_SLOT( slotChangedInterpolation(int) )); + connect(leftColorButton, TQ_SIGNAL( changed(const TQColor&) ), TQ_SLOT( slotChangedLeftColor(const TQColor&) )); + connect(rightColorButton, TQ_SIGNAL( changed(const TQColor&) ), TQ_SLOT( slotChangedRightColor(const TQColor&) )); // intNumInputLeftOpacity->setRange( 0, 100, false); - connect(intNumInputLeftOpacity, TQT_SIGNAL( valueChanged(int) ), TQT_SLOT( slotChangedLeftOpacity(int) )); + connect(intNumInputLeftOpacity, TQ_SIGNAL( valueChanged(int) ), TQ_SLOT( slotChangedLeftOpacity(int) )); // intNumInputRightOpacity->setRange( 0, 100, false); - connect(intNumInputRightOpacity, TQT_SIGNAL( valueChanged(int) ), TQT_SLOT( slotChangedRightOpacity(int) )); + connect(intNumInputRightOpacity, TQ_SIGNAL( valueChanged(int) ), TQ_SLOT( slotChangedRightOpacity(int) )); } diff --git a/chalk/ui/kis_birdeye_box.cpp b/chalk/ui/kis_birdeye_box.cpp index 2b816f9c..090bbfe9 100644 --- a/chalk/ui/kis_birdeye_box.cpp +++ b/chalk/ui/kis_birdeye_box.cpp @@ -192,8 +192,8 @@ KisBirdEyeBox::KisBirdEyeBox(KisView * view, TQWidget* parent, const char* name) m_birdEyePanel = new KoBirdEyePanel(m_zoomAdapter, ktp, kpc, this); - connect(view, TQT_SIGNAL(cursorPosition( TQ_INT32, TQ_INT32 )), m_birdEyePanel, TQT_SLOT(cursorPosChanged( TQ_INT32, TQ_INT32 ))); - connect(view, TQT_SIGNAL(viewTransformationsChanged()), m_birdEyePanel, TQT_SLOT(slotViewTransformationChanged())); + connect(view, TQ_SIGNAL(cursorPosition( TQ_INT32, TQ_INT32 )), m_birdEyePanel, TQ_SLOT(cursorPosChanged( TQ_INT32, TQ_INT32 ))); + connect(view, TQ_SIGNAL(viewTransformationsChanged()), m_birdEyePanel, TQ_SLOT(slotViewTransformationChanged())); l->addWidget(m_birdEyePanel); @@ -213,17 +213,17 @@ KisBirdEyeBox::KisBirdEyeBox(KisView * view, TQWidget* parent, const char* name) m_exposureDoubleWidget->setLineStep(0.1); m_exposureDoubleWidget->setPageStep(1); - connect(m_exposureDoubleWidget, TQT_SIGNAL(valueChanged(double)), TQT_SLOT(exposureValueChanged(double))); - connect(m_exposureDoubleWidget, TQT_SIGNAL(sliderPressed()), TQT_SLOT(exposureSliderPressed())); - connect(m_exposureDoubleWidget, TQT_SIGNAL(sliderReleased()), TQT_SLOT(exposureSliderReleased())); + connect(m_exposureDoubleWidget, TQ_SIGNAL(valueChanged(double)), TQ_SLOT(exposureValueChanged(double))); + connect(m_exposureDoubleWidget, TQ_SIGNAL(sliderPressed()), TQ_SLOT(exposureSliderPressed())); + connect(m_exposureDoubleWidget, TQ_SIGNAL(sliderReleased()), TQ_SLOT(exposureSliderReleased())); m_draggingExposureSlider = false; Q_ASSERT(m_subject->document() != 0); - connect(m_subject->document(), TQT_SIGNAL(sigCommandExecuted()), TQT_SLOT(slotDocCommandExecuted())); + connect(m_subject->document(), TQ_SIGNAL(sigCommandExecuted()), TQ_SLOT(slotDocCommandExecuted())); if (m_image) { - connect(m_image, TQT_SIGNAL(sigImageUpdated(TQRect)), TQT_SLOT(slotImageUpdated(TQRect))); + connect(m_image, TQ_SIGNAL(sigImageUpdated(TQRect)), TQ_SLOT(slotImageUpdated(TQRect))); } } @@ -245,9 +245,9 @@ void KisBirdEyeBox::setImage(KisImageSP image) m_birdEyePanel->setThumbnailProvider(ktp); if (m_image) { - connect(m_image, TQT_SIGNAL(sigImageUpdated(TQRect)), TQT_SLOT(slotImageUpdated(TQRect))); - connect(m_image, TQT_SIGNAL(sigSizeChanged(TQ_INT32, TQ_INT32)), TQT_SLOT(slotImageSizeChanged(TQ_INT32, TQ_INT32))); - connect(m_image, TQT_SIGNAL(sigColorSpaceChanged(KisColorSpace *)), TQT_SLOT(slotImageColorSpaceChanged(KisColorSpace *))); + connect(m_image, TQ_SIGNAL(sigImageUpdated(TQRect)), TQ_SLOT(slotImageUpdated(TQRect))); + connect(m_image, TQ_SIGNAL(sigSizeChanged(TQ_INT32, TQ_INT32)), TQ_SLOT(slotImageSizeChanged(TQ_INT32, TQ_INT32))); + connect(m_image, TQ_SIGNAL(sigColorSpaceChanged(KisColorSpace *)), TQ_SLOT(slotImageColorSpaceChanged(KisColorSpace *))); m_birdEyePanel->slotUpdate(m_image->bounds()); slotImageColorSpaceChanged(m_image->colorSpace()); } diff --git a/chalk/ui/kis_brush_chooser.cpp b/chalk/ui/kis_brush_chooser.cpp index db9aba98..95b52705 100644 --- a/chalk/ui/kis_brush_chooser.cpp +++ b/chalk/ui/kis_brush_chooser.cpp @@ -34,10 +34,10 @@ KisBrushChooser::KisBrushChooser(TQWidget *parent, const char *name) m_slSpacing = new KisDoubleWidget(0.0, 10, this, "double_widget"); m_slSpacing->setTickmarks(TQSlider::Below); m_slSpacing->setTickInterval(1); - TQObject::connect(m_slSpacing, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(slotSetItemSpacing(double))); + TQObject::connect(m_slSpacing, TQ_SIGNAL(valueChanged(double)), this, TQ_SLOT(slotSetItemSpacing(double))); m_chkColorMask = new TQCheckBox(i18n("Use color as mask"), this); - TQObject::connect(m_chkColorMask, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotSetItemUseColorAsMask(bool))); + TQObject::connect(m_chkColorMask, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotSetItemUseColorAsMask(bool))); m_lbName = new TQLabel(this); diff --git a/chalk/ui/kis_canvas.cpp b/chalk/ui/kis_canvas.cpp index 2ec1a044..38df814e 100644 --- a/chalk/ui/kis_canvas.cpp +++ b/chalk/ui/kis_canvas.cpp @@ -1118,18 +1118,18 @@ void KisCanvas::createCanvasWidget(bool useOpenGL) selectTabletDeviceEvents(); #endif - connect(m_canvasWidget, TQT_SIGNAL(sigGotPaintEvent(TQPaintEvent *)), TQT_SIGNAL(sigGotPaintEvent(TQPaintEvent *))); - connect(m_canvasWidget, TQT_SIGNAL(sigGotEnterEvent(TQEvent*)), TQT_SIGNAL(sigGotEnterEvent(TQEvent*))); - connect(m_canvasWidget, TQT_SIGNAL(sigGotLeaveEvent(TQEvent*)), TQT_SIGNAL(sigGotLeaveEvent(TQEvent*))); - connect(m_canvasWidget, TQT_SIGNAL(sigGotMouseWheelEvent(TQWheelEvent*)), TQT_SIGNAL(sigGotMouseWheelEvent(TQWheelEvent*))); - connect(m_canvasWidget, TQT_SIGNAL(sigGotKeyPressEvent(TQKeyEvent*)), TQT_SIGNAL(sigGotKeyPressEvent(TQKeyEvent*))); - connect(m_canvasWidget, TQT_SIGNAL(sigGotKeyReleaseEvent(TQKeyEvent*)), TQT_SIGNAL(sigGotKeyReleaseEvent(TQKeyEvent*))); - connect(m_canvasWidget, TQT_SIGNAL(sigGotDragEnterEvent(TQDragEnterEvent*)), TQT_SIGNAL(sigGotDragEnterEvent(TQDragEnterEvent*))); - connect(m_canvasWidget, TQT_SIGNAL(sigGotDropEvent(TQDropEvent*)), TQT_SIGNAL(sigGotDropEvent(TQDropEvent*))); - connect(m_canvasWidget, TQT_SIGNAL(sigGotMoveEvent(KisMoveEvent *)), TQT_SIGNAL(sigGotMoveEvent(KisMoveEvent *))); - connect(m_canvasWidget, TQT_SIGNAL(sigGotButtonPressEvent(KisButtonPressEvent *)), TQT_SIGNAL(sigGotButtonPressEvent(KisButtonPressEvent *))); - connect(m_canvasWidget, TQT_SIGNAL(sigGotButtonReleaseEvent(KisButtonReleaseEvent *)), TQT_SIGNAL(sigGotButtonReleaseEvent(KisButtonReleaseEvent *))); - connect(m_canvasWidget, TQT_SIGNAL(sigGotDoubleClickEvent(KisDoubleClickEvent *)), TQT_SIGNAL(sigGotDoubleClickEvent(KisDoubleClickEvent *))); + connect(m_canvasWidget, TQ_SIGNAL(sigGotPaintEvent(TQPaintEvent *)), TQ_SIGNAL(sigGotPaintEvent(TQPaintEvent *))); + connect(m_canvasWidget, TQ_SIGNAL(sigGotEnterEvent(TQEvent*)), TQ_SIGNAL(sigGotEnterEvent(TQEvent*))); + connect(m_canvasWidget, TQ_SIGNAL(sigGotLeaveEvent(TQEvent*)), TQ_SIGNAL(sigGotLeaveEvent(TQEvent*))); + connect(m_canvasWidget, TQ_SIGNAL(sigGotMouseWheelEvent(TQWheelEvent*)), TQ_SIGNAL(sigGotMouseWheelEvent(TQWheelEvent*))); + connect(m_canvasWidget, TQ_SIGNAL(sigGotKeyPressEvent(TQKeyEvent*)), TQ_SIGNAL(sigGotKeyPressEvent(TQKeyEvent*))); + connect(m_canvasWidget, TQ_SIGNAL(sigGotKeyReleaseEvent(TQKeyEvent*)), TQ_SIGNAL(sigGotKeyReleaseEvent(TQKeyEvent*))); + connect(m_canvasWidget, TQ_SIGNAL(sigGotDragEnterEvent(TQDragEnterEvent*)), TQ_SIGNAL(sigGotDragEnterEvent(TQDragEnterEvent*))); + connect(m_canvasWidget, TQ_SIGNAL(sigGotDropEvent(TQDropEvent*)), TQ_SIGNAL(sigGotDropEvent(TQDropEvent*))); + connect(m_canvasWidget, TQ_SIGNAL(sigGotMoveEvent(KisMoveEvent *)), TQ_SIGNAL(sigGotMoveEvent(KisMoveEvent *))); + connect(m_canvasWidget, TQ_SIGNAL(sigGotButtonPressEvent(KisButtonPressEvent *)), TQ_SIGNAL(sigGotButtonPressEvent(KisButtonPressEvent *))); + connect(m_canvasWidget, TQ_SIGNAL(sigGotButtonReleaseEvent(KisButtonReleaseEvent *)), TQ_SIGNAL(sigGotButtonReleaseEvent(KisButtonReleaseEvent *))); + connect(m_canvasWidget, TQ_SIGNAL(sigGotDoubleClickEvent(KisDoubleClickEvent *)), TQ_SIGNAL(sigGotDoubleClickEvent(KisDoubleClickEvent *))); } void KisCanvas::createTQPaintDeviceCanvas() diff --git a/chalk/ui/kis_clipboard.cpp b/chalk/ui/kis_clipboard.cpp index 1e8040ca..8ce675a9 100644 --- a/chalk/ui/kis_clipboard.cpp +++ b/chalk/ui/kis_clipboard.cpp @@ -52,8 +52,8 @@ KisClipboard::KisClipboard() clipboardDataChanged(); // Make sure we are notified when clipboard changes - connect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ), - this, TQT_SLOT( clipboardDataChanged() ) ); + connect( TQApplication::clipboard(), TQ_SIGNAL( dataChanged() ), + this, TQ_SLOT( clipboardDataChanged() ) ); } KisClipboard::~KisClipboard() diff --git a/chalk/ui/kis_cmb_composite.cpp b/chalk/ui/kis_cmb_composite.cpp index 631f602e..55053b81 100644 --- a/chalk/ui/kis_cmb_composite.cpp +++ b/chalk/ui/kis_cmb_composite.cpp @@ -28,8 +28,8 @@ KisCmbComposite::KisCmbComposite(TQWidget * parent, const char * name) : super( false, parent, name ) { - connect(this, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotOpActivated(int))); - connect(this, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotOpHighlighted(int))); + connect(this, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotOpActivated(int))); + connect(this, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(slotOpHighlighted(int))); } KisCmbComposite::~KisCmbComposite() diff --git a/chalk/ui/kis_cmb_idlist.cpp b/chalk/ui/kis_cmb_idlist.cpp index 39937752..1855087a 100644 --- a/chalk/ui/kis_cmb_idlist.cpp +++ b/chalk/ui/kis_cmb_idlist.cpp @@ -29,8 +29,8 @@ KisCmbIDList::KisCmbIDList(TQWidget * parent, const char * name) : super( false, parent, name ) { - connect(this, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotIDActivated(int))); - connect(this, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotIDHighlighted(int))); + connect(this, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotIDActivated(int))); + connect(this, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(slotIDHighlighted(int))); } KisCmbIDList::~KisCmbIDList() diff --git a/chalk/ui/kis_color_cup.cpp b/chalk/ui/kis_color_cup.cpp index 751cfdda..5b23ab59 100644 --- a/chalk/ui/kis_color_cup.cpp +++ b/chalk/ui/kis_color_cup.cpp @@ -64,8 +64,8 @@ KisColorCup::KisColorCup(TQWidget * parent, const char * name) { m_color = TQt::black; m_popup = new KisColorPopup(m_color, this, "colorpopup"); - connect(this, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClicked())); - connect(m_popup, TQT_SIGNAL(changed( const TQColor &)), this, TQT_SLOT(setColor(const TQColor &))); + connect(this, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotClicked())); + connect(m_popup, TQ_SIGNAL(changed( const TQColor &)), this, TQ_SLOT(setColor(const TQColor &))); } void KisColorCup::setColor(const TQColor & c) diff --git a/chalk/ui/kis_controlframe.cpp b/chalk/ui/kis_controlframe.cpp index 9c90c68f..67abd397 100644 --- a/chalk/ui/kis_controlframe.cpp +++ b/chalk/ui/kis_controlframe.cpp @@ -230,7 +230,7 @@ void KisControlFrame::createBrushesChooser(KisView * view) KisAutobrush * m_autobrush = new KisAutobrush(m_brushesTab, "autobrush", i18n("Autobrush")); m_brushesTab->addTab( m_autobrush, i18n("Autobrush")); - connect(m_autobrush, TQT_SIGNAL(activatedResource(KisResource*)), m_view, TQT_SLOT(brushActivated( KisResource* ))); + connect(m_autobrush, TQ_SIGNAL(activatedResource(KisResource*)), m_view, TQ_SLOT(brushActivated( KisResource* ))); KisBrushChooser * m_brushChooser = new KisBrushChooser(m_brushesTab, "brush_chooser"); m_brushesTab->addTab( m_brushChooser, i18n("Predefined Brushes")); @@ -238,19 +238,19 @@ void KisControlFrame::createBrushesChooser(KisView * view) KisCustomBrush* customBrushes = new KisCustomBrush(m_brushesTab, "custombrush", i18n("Custom Brush"), m_view); m_brushesTab->addTab( customBrushes, i18n("Custom Brush")); - connect(customBrushes, TQT_SIGNAL(activatedResource(KisResource*)), - m_view, TQT_SLOT(brushActivated(KisResource*))); + connect(customBrushes, TQ_SIGNAL(activatedResource(KisResource*)), + m_view, TQ_SLOT(brushActivated(KisResource*))); #ifdef HAVE_TEXT_BRUSH KisTextBrush* textBrushes = new KisTextBrush(m_brushesTab, "textbrush", i18n("Text Brush")/*, m_view*/); m_brushesTab->addTab( textBrushes, i18n("Text Brush")); - connect(textBrushes, TQT_SIGNAL(activatedResource(KisResource*)), - m_view, TQT_SLOT(brushActivated(KisResource*))); + connect(textBrushes, TQ_SIGNAL(activatedResource(KisResource*)), + m_view, TQ_SLOT(brushActivated(KisResource*))); #endif m_brushChooser->setFont(m_font); m_brushMediator = new KisResourceMediator( m_brushChooser, this); - connect(m_brushMediator, TQT_SIGNAL(activatedResource(KisResource*)), m_view, TQT_SLOT(brushActivated(KisResource*))); + connect(m_brushMediator, TQ_SIGNAL(activatedResource(KisResource*)), m_view, TQ_SLOT(brushActivated(KisResource*))); KisResourceServerBase* rServer; rServer = KisResourceServerRegistry::instance()->get("ImagePipeBrushServer"); @@ -258,7 +258,7 @@ void KisControlFrame::createBrushesChooser(KisView * view) rServer = KisResourceServerRegistry::instance()->get("BrushServer"); m_brushMediator->connectServer(rServer); - KisControlFrame::connect(view, TQT_SIGNAL(brushChanged(KisBrush *)), this, TQT_SLOT(slotBrushChanged( KisBrush *))); + KisControlFrame::connect(view, TQ_SIGNAL(brushChanged(KisBrush *)), this, TQ_SLOT(slotBrushChanged( KisBrush *))); m_brushChooser->setCurrent( 0 ); m_brushMediator->setActiveItem( m_brushChooser->currentItem() ); customBrushes->setResourceServer(rServer); @@ -291,15 +291,15 @@ void KisControlFrame::createPatternsChooser(KisView * view) m_patternMediator = new KisResourceMediator( chooser, view); - connect( m_patternMediator, TQT_SIGNAL(activatedResource(KisResource*)), view, TQT_SLOT(patternActivated(KisResource*))); - connect(customPatterns, TQT_SIGNAL(activatedResource(KisResource*)), - view, TQT_SLOT(patternActivated(KisResource*))); + connect( m_patternMediator, TQ_SIGNAL(activatedResource(KisResource*)), view, TQ_SLOT(patternActivated(KisResource*))); + connect(customPatterns, TQ_SIGNAL(activatedResource(KisResource*)), + view, TQ_SLOT(patternActivated(KisResource*))); KisResourceServerBase* rServer; rServer = KisResourceServerRegistry::instance()->get("PatternServer"); m_patternMediator->connectServer(rServer); - KisControlFrame::connect(view, TQT_SIGNAL(patternChanged(KisPattern *)), this, TQT_SLOT(slotPatternChanged( KisPattern *))); + KisControlFrame::connect(view, TQ_SIGNAL(patternChanged(KisPattern *)), this, TQ_SLOT(slotPatternChanged( KisPattern *))); chooser->setCurrent( 0 ); m_patternMediator->setActiveItem( chooser->currentItem() ); @@ -327,13 +327,13 @@ void KisControlFrame::createGradientsChooser(KisView * view) m_gradientTab->addTab( m_gradientChooser, i18n("Gradients")); m_gradientMediator = new KisResourceMediator( m_gradientChooser, view); - connect(m_gradientMediator, TQT_SIGNAL(activatedResource(KisResource*)), view, TQT_SLOT(gradientActivated(KisResource*))); + connect(m_gradientMediator, TQ_SIGNAL(activatedResource(KisResource*)), view, TQ_SLOT(gradientActivated(KisResource*))); KisResourceServerBase* rServer; rServer = KisResourceServerRegistry::instance()->get("GradientServer"); m_gradientMediator->connectServer(rServer); - connect(view, TQT_SIGNAL(gradientChanged(KisGradient *)), this, TQT_SLOT(slotGradientChanged( KisGradient *))); + connect(view, TQ_SIGNAL(gradientChanged(KisGradient *)), this, TQ_SLOT(slotGradientChanged( KisGradient *))); m_gradientChooser->setCurrent( 0 ); m_gradientMediator->setActiveItem( m_gradientChooser->currentItem() ); } diff --git a/chalk/ui/kis_custom_brush.cpp b/chalk/ui/kis_custom_brush.cpp index 1802e6cf..76f514e4 100644 --- a/chalk/ui/kis_custom_brush.cpp +++ b/chalk/ui/kis_custom_brush.cpp @@ -50,11 +50,11 @@ KisCustomBrush::KisCustomBrush(TQWidget *parent, const char* name, const TQStrin preview->setScaledContents(true); - connect(addButton, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotAddPredefined())); - connect(brushButton, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotUseBrush())); -// connect(exportButton, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotExport())); - connect(style, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotUpdateCurrentBrush(int))); - connect(colorAsMask, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(slotUpdateCurrentBrush(int))); + connect(addButton, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotAddPredefined())); + connect(brushButton, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotUseBrush())); +// connect(exportButton, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotExport())); + connect(style, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotUpdateCurrentBrush(int))); + connect(colorAsMask, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(slotUpdateCurrentBrush(int))); } KisCustomBrush::~KisCustomBrush() { diff --git a/chalk/ui/kis_custom_image_widget.cpp b/chalk/ui/kis_custom_image_widget.cpp index 93c82977..9f3b72e2 100644 --- a/chalk/ui/kis_custom_image_widget.cpp +++ b/chalk/ui/kis_custom_image_widget.cpp @@ -52,9 +52,9 @@ KisCustomImageWidget::KisCustomImageWidget(TQWidget *parent, KisDoc *doc, TQ_INT cmbColorSpaces->setIDList(KisMetaRegistry::instance()->csRegistry()->listKeys()); cmbColorSpaces->setCurrentText(defColorSpaceName); - connect(cmbColorSpaces, TQT_SIGNAL(activated(const KisID &)), - this, TQT_SLOT(fillCmbProfiles(const KisID &))); - connect (m_createButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT (buttonClicked()) ); + connect(cmbColorSpaces, TQ_SIGNAL(activated(const KisID &)), + this, TQ_SLOT(fillCmbProfiles(const KisID &))); + connect (m_createButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT (buttonClicked()) ); m_createButton -> setDefault(true); fillCmbProfiles(cmbColorSpaces->currentItem()); diff --git a/chalk/ui/kis_custom_palette.cpp b/chalk/ui/kis_custom_palette.cpp index 8fb2a9db..b6172529 100644 --- a/chalk/ui/kis_custom_palette.cpp +++ b/chalk/ui/kis_custom_palette.cpp @@ -52,9 +52,9 @@ KisCustomPalette::KisCustomPalette(TQWidget *parent, const char* name, const TQS m_ownPalette = true; this->view->setPalette(m_palette); - connect(addColor, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotAddNew())); - connect(removeColor, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotRemoveCurrent())); - connect(addPalette, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotAddPredefined())); + connect(addColor, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotAddNew())); + connect(removeColor, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotRemoveCurrent())); + connect(addPalette, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotAddPredefined())); } KisCustomPalette::~KisCustomPalette() { diff --git a/chalk/ui/kis_custom_pattern.cpp b/chalk/ui/kis_custom_pattern.cpp index edf92be1..e8b3a12a 100644 --- a/chalk/ui/kis_custom_pattern.cpp +++ b/chalk/ui/kis_custom_pattern.cpp @@ -47,9 +47,9 @@ KisCustomPattern::KisCustomPattern(TQWidget *parent, const char* name, const TQS preview->setScaledContents(true); - connect(addButton, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotAddPredefined())); - connect(patternButton, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotUsePattern())); - connect(exportButton, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotExport())); + connect(addButton, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotAddPredefined())); + connect(patternButton, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotUsePattern())); + connect(exportButton, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotExport())); } KisCustomPattern::~KisCustomPattern() { diff --git a/chalk/ui/kis_dlg_adj_layer_props.cpp b/chalk/ui/kis_dlg_adj_layer_props.cpp index f7d75310..efcfe10e 100644 --- a/chalk/ui/kis_dlg_adj_layer_props.cpp +++ b/chalk/ui/kis_dlg_adj_layer_props.cpp @@ -91,7 +91,7 @@ KisDlgAdjLayerProps::KisDlgAdjLayerProps(KisAdjustmentLayerSP layer, m_preview = new KisPreviewWidget(page, "dlgadjustment.preview"); m_preview->slotSetDevice( dev ); - connect( m_preview, TQT_SIGNAL(updated()), this, TQT_SLOT(refreshPreview())); + connect( m_preview, TQ_SIGNAL(updated()), this, TQ_SLOT(refreshPreview())); layout->addWidget(m_preview, 1, 1); TQVBoxLayout *v1 = new TQVBoxLayout( layout ); @@ -104,7 +104,7 @@ KisDlgAdjLayerProps::KisDlgAdjLayerProps(KisAdjustmentLayerSP layer, m_layerName->setText(layerName); m_layerName->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed); hl->addWidget(m_layerName, 0, 1); - connect( m_layerName, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotNameChanged( const TQString & ) ) ); + connect( m_layerName, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotNameChanged( const TQString & ) ) ); if ( m_currentFilter ) { m_currentConfigWidget = m_currentFilter->createConfigurationWidget(page, dev); @@ -118,7 +118,7 @@ KisDlgAdjLayerProps::KisDlgAdjLayerProps(KisAdjustmentLayerSP layer, } else { v1->addWidget( m_currentConfigWidget ); - connect(m_currentConfigWidget, TQT_SIGNAL(sigPleaseUpdatePreview()), this, TQT_SLOT(slotConfigChanged())); + connect(m_currentConfigWidget, TQ_SIGNAL(sigPleaseUpdatePreview()), this, TQ_SLOT(slotConfigChanged())); } refreshPreview(); diff --git a/chalk/ui/kis_dlg_adjustment_layer.cpp b/chalk/ui/kis_dlg_adjustment_layer.cpp index 34374356..74b08552 100644 --- a/chalk/ui/kis_dlg_adjustment_layer.cpp +++ b/chalk/ui/kis_dlg_adjustment_layer.cpp @@ -84,16 +84,16 @@ KisDlgAdjustmentLayer::KisDlgAdjustmentLayer(KisImage * img, m_layerName = new KLineEdit(page, "m_layerName"); grid->addWidget(m_layerName, 0, 1); - connect( m_layerName, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotNameChanged( const TQString & ) ) ); + connect( m_layerName, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotNameChanged( const TQString & ) ) ); m_filtersList = new KisFiltersListView(m_dev, page, true, "dlgadjustment.filtersList"); - connect(m_filtersList , TQT_SIGNAL(selectionChanged(TQIconViewItem*)), this, TQT_SLOT(selectionHasChanged(TQIconViewItem* ))); + connect(m_filtersList , TQ_SIGNAL(selectionChanged(TQIconViewItem*)), this, TQ_SLOT(selectionHasChanged(TQIconViewItem* ))); grid->addMultiCellWidget(m_filtersList, 1, 2, 0, 0); m_preview = new KisPreviewWidget(page, "dlgadjustment.preview"); m_preview->slotSetDevice( m_dev ); - connect( m_preview, TQT_SIGNAL(updated()), this, TQT_SLOT(refreshPreview())); + connect( m_preview, TQ_SIGNAL(updated()), this, TQ_SLOT(refreshPreview())); grid->addWidget(m_preview, 1, 1); m_configWidgetHolder = new TQGroupBox(i18n("Configuration"), page, "currentConfigWidget"); @@ -175,7 +175,7 @@ void KisDlgAdjustmentLayer::selectionHasChanged ( TQIconViewItem * item ) { m_configWidgetHolder->layout()->add(m_currentConfigWidget); m_currentConfigWidget->show(); - connect(m_currentConfigWidget, TQT_SIGNAL(sigPleaseUpdatePreview()), this, TQT_SLOT(slotConfigChanged())); + connect(m_currentConfigWidget, TQ_SIGNAL(sigPleaseUpdatePreview()), this, TQ_SLOT(slotConfigChanged())); } else { m_labelNoConfigWidget->show(); } diff --git a/chalk/ui/kis_dlg_image_properties.cpp b/chalk/ui/kis_dlg_image_properties.cpp index 00acde27..38cbacf2 100644 --- a/chalk/ui/kis_dlg_image_properties.cpp +++ b/chalk/ui/kis_dlg_image_properties.cpp @@ -96,8 +96,8 @@ KisDlgImageProperties::KisDlgImageProperties(KisImageSP image, TQWidget *parent, m_page->cmbColor->hide(); m_page->lblColor->hide(); - connect(m_page->cmbColorSpaces, TQT_SIGNAL(activated(const KisID &)), - this, TQT_SLOT(fillCmbProfiles(const KisID &))); + connect(m_page->cmbColorSpaces, TQ_SIGNAL(activated(const KisID &)), + this, TQ_SLOT(fillCmbProfiles(const KisID &))); } diff --git a/chalk/ui/kis_dlg_layer_properties.cpp b/chalk/ui/kis_dlg_layer_properties.cpp index 832102c6..e8d9b29b 100644 --- a/chalk/ui/kis_dlg_layer_properties.cpp +++ b/chalk/ui/kis_dlg_layer_properties.cpp @@ -51,7 +51,7 @@ KisDlgLayerProperties::KisDlgLayerProperties(const TQString& deviceName, setMainWidget(m_page); m_page->editName->setText(deviceName); - connect( m_page->editName, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotNameChanged( const TQString & ) ) ); + connect( m_page->editName, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotNameChanged( const TQString & ) ) ); m_page->cmbColorSpaces->setCurrent(colorSpace->id()); m_page->cmbColorSpaces->setEnabled(false); diff --git a/chalk/ui/kis_dlg_new_layer.cpp b/chalk/ui/kis_dlg_new_layer.cpp index 91f53a75..634ff9ab 100644 --- a/chalk/ui/kis_dlg_new_layer.cpp +++ b/chalk/ui/kis_dlg_new_layer.cpp @@ -64,10 +64,10 @@ NewLayerDialog::NewLayerDialog(const KisID colorSpaceID, // ColorSpace m_page->cmbColorSpaces->setIDList(KisMetaRegistry::instance()->csRegistry()->listKeys()); m_page->cmbColorSpaces->setCurrentText(colorSpaceID.id()); - connect(m_page->cmbColorSpaces, TQT_SIGNAL(activated(const KisID &)), - this, TQT_SLOT(fillCmbProfiles(const KisID &))); - connect(m_page->cmbColorSpaces, TQT_SIGNAL(activated(const KisID &)), - this, TQT_SLOT(fillCmbComposite(const KisID &))); + connect(m_page->cmbColorSpaces, TQ_SIGNAL(activated(const KisID &)), + this, TQ_SLOT(fillCmbProfiles(const KisID &))); + connect(m_page->cmbColorSpaces, TQ_SIGNAL(activated(const KisID &)), + this, TQ_SLOT(fillCmbComposite(const KisID &))); // Init profiles fillCmbProfiles(m_page->cmbColorSpaces->currentItem()); @@ -77,7 +77,7 @@ NewLayerDialog::NewLayerDialog(const KisID colorSpaceID, fillCmbComposite(m_page->cmbColorSpaces->currentItem()); /* - connect( m_page->editName, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotNameChanged( const TQString & ) ) ); + connect( m_page->editName, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotNameChanged( const TQString & ) ) ); slotNameChanged( m_page->editName->text() ); */ diff --git a/chalk/ui/kis_dlg_preferences.cpp b/chalk/ui/kis_dlg_preferences.cpp index e35477dc..c8396be2 100644 --- a/chalk/ui/kis_dlg_preferences.cpp +++ b/chalk/ui/kis_dlg_preferences.cpp @@ -138,8 +138,8 @@ ColorSettingsTab::ColorSettingsTab(TQWidget *parent, const char *name ) m_page->grpPasteBehaviour->setButton(cfg.pasteBehaviour()); m_page->cmbMonitorIntent->setCurrentItem(cfg.renderIntent()); - connect(m_page->cmbPrintingColorSpace, TQT_SIGNAL(activated(const KisID &)), - this, TQT_SLOT(refillPrintProfiles(const KisID &))); + connect(m_page->cmbPrintingColorSpace, TQ_SIGNAL(activated(const KisID &)), + this, TQ_SLOT(refillPrintProfiles(const KisID &))); } void ColorSettingsTab::setDefault() @@ -527,9 +527,9 @@ TabletSettingsTab::DeviceSettings TabletSettingsTab::TabletDeviceSettingsDialog: void TabletSettingsTab::initTabletDevices() { - connect(cbTabletDevice, TQT_SIGNAL(activated(int)), TQT_SLOT(slotActivateDevice(int))); - connect(chkEnableTabletDevice, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotSetDeviceEnabled(bool))); - connect(btnConfigureTabletDevice, TQT_SIGNAL(clicked()), TQT_SLOT(slotConfigureDevice())); + connect(cbTabletDevice, TQ_SIGNAL(activated(int)), TQ_SLOT(slotActivateDevice(int))); + connect(chkEnableTabletDevice, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotSetDeviceEnabled(bool))); + connect(btnConfigureTabletDevice, TQ_SIGNAL(clicked()), TQ_SLOT(slotConfigureDevice())); KisCanvasWidget::X11XIDTabletDeviceMap& tabletDevices = KisCanvasWidget::tabletDeviceMap(); @@ -630,7 +630,7 @@ DisplaySettingsTab::DisplaySettingsTab( TQWidget *parent, const char *name) //cbUseOpenGLShaders->setEnabled(false); #endif - connect(cbUseOpenGL, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotUseOpenGLToggled(bool))); + connect(cbUseOpenGL, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotUseOpenGLToggled(bool))); } void DisplaySettingsTab::setDefault() @@ -666,10 +666,10 @@ GridSettingsTab::GridSettingsTab(TQWidget* parent) : WdgGridSettingsBase(parent) intOffsetY->setValue( cfg.getGridOffsetY()); linkSpacingToggled(true); - connect(bnLinkSpacing, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(linkSpacingToggled( bool ))); + connect(bnLinkSpacing, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(linkSpacingToggled( bool ))); - connect(intHSpacing, TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(spinBoxHSpacingChanged(int))); - connect(intVSpacing, TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(spinBoxVSpacingChanged(int))); + connect(intHSpacing, TQ_SIGNAL(valueChanged(int)),this,TQ_SLOT(spinBoxHSpacingChanged(int))); + connect(intVSpacing, TQ_SIGNAL(valueChanged(int)),this,TQ_SLOT(spinBoxVSpacingChanged(int))); } diff --git a/chalk/ui/kis_doc.cpp b/chalk/ui/kis_doc.cpp index 60dbbfdd..5db84839 100644 --- a/chalk/ui/kis_doc.cpp +++ b/chalk/ui/kis_doc.cpp @@ -260,8 +260,8 @@ bool KisDoc::init() m_cmdHistory = new KoCommandHistory(actionCollection(), true); TQ_CHECK_PTR(m_cmdHistory); - connect(m_cmdHistory, TQT_SIGNAL(documentRestored()), this, TQT_SLOT(slotDocumentRestored())); - connect(m_cmdHistory, TQT_SIGNAL(commandExecuted(KCommand *)), this, TQT_SLOT(slotCommandExecuted(KCommand *))); + connect(m_cmdHistory, TQ_SIGNAL(documentRestored()), this, TQ_SLOT(slotDocumentRestored())); + connect(m_cmdHistory, TQ_SIGNAL(commandExecuted(KCommand *)), this, TQ_SLOT(slotCommandExecuted(KCommand *))); setUndo(true); m_nserver = new KisNameServer(i18n("Image %1"), 1); @@ -447,7 +447,7 @@ KisImageSP KisDoc::loadImage(const TQDomElement& element) img = new KisImage(this, width, height, cs, name); img->blockSignals(true); // Don't send out signals while we're building the image TQ_CHECK_PTR(img); - connect( img, TQT_SIGNAL( sigImageModified() ), this, TQT_SLOT( slotImageUpdated() )); + connect( img, TQ_SIGNAL( sigImageModified() ), this, TQ_SLOT( slotImageUpdated() )); img->setDescription(description); img->setResolution(xres, yres); @@ -859,7 +859,7 @@ KisImageSP KisDoc::newImage(const TQString& name, TQ_INT32 width, TQ_INT32 heigh KisImageSP img = new KisImage(this, width, height, colorstrategy, name); TQ_CHECK_PTR(img); - connect( img, TQT_SIGNAL( sigImageModified() ), this, TQT_SLOT( slotImageUpdated() )); + connect( img, TQ_SIGNAL( sigImageModified() ), this, TQ_SLOT( slotImageUpdated() )); KisPaintLayer *layer = new KisPaintLayer(img, img->nextLayerName(), OPACITY_OPAQUE,colorstrategy); TQ_CHECK_PTR(layer); @@ -898,7 +898,7 @@ bool KisDoc::newImage(const TQString& name, TQ_INT32 width, TQ_INT32 height, Kis img = new KisImage(this, width, height, cs, name); TQ_CHECK_PTR(img); - connect( img, TQT_SIGNAL( sigImageModified() ), this, TQT_SLOT( slotImageUpdated() )); + connect( img, TQ_SIGNAL( sigImageModified() ), this, TQ_SLOT( slotImageUpdated() )); img->setResolution(imgResolution, imgResolution); img->setDescription(imgDescription); img->setProfile(cs->getProfile()); diff --git a/chalk/ui/kis_double_widget.cpp b/chalk/ui/kis_double_widget.cpp index 37f2b862..3a84bf3c 100644 --- a/chalk/ui/kis_double_widget.cpp +++ b/chalk/ui/kis_double_widget.cpp @@ -46,12 +46,12 @@ KisDoubleWidget::~KisDoubleWidget() void KisDoubleWidget::init(double min, double max) { m_spinBox = new KDoubleSpinBox(min, max, 0.05, 0, 2, this, "spinbox"); - connect(m_spinBox, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(setSliderValue(double))); + connect(m_spinBox, TQ_SIGNAL(valueChanged(double)), this, TQ_SLOT(setSliderValue(double))); m_slider = new TQSlider(static_cast<int>(min * 100 + 0.5), static_cast<int>(max * 100 + 0.5), 1, 0, TQt::Horizontal, this, "sld"); - connect(m_slider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(sliderValueChanged(int))); - connect(m_slider, TQT_SIGNAL(sliderPressed()), TQT_SIGNAL(sliderPressed())); - connect(m_slider, TQT_SIGNAL(sliderReleased()), TQT_SIGNAL(sliderReleased())); + connect(m_slider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(sliderValueChanged(int))); + connect(m_slider, TQ_SIGNAL(sliderPressed()), TQ_SIGNAL(sliderPressed())); + connect(m_slider, TQ_SIGNAL(sliderReleased()), TQ_SIGNAL(sliderReleased())); m_layout = new TQHBoxLayout(this, 0, -1, "hbox layout"); diff --git a/chalk/ui/kis_filter_manager.cpp b/chalk/ui/kis_filter_manager.cpp index 848f99b7..2334acd1 100644 --- a/chalk/ui/kis_filter_manager.cpp +++ b/chalk/ui/kis_filter_manager.cpp @@ -66,7 +66,7 @@ KisFilterManager::KisFilterManager(KisView * view, KisDoc * doc) m_filterMapper = new TQSignalMapper(this); - connect(m_filterMapper, TQT_SIGNAL(mapped(int)), this, TQT_SLOT(slotApplyFilter(int))); + connect(m_filterMapper, TQ_SIGNAL(mapped(int)), this, TQ_SLOT(slotApplyFilter(int))); } @@ -154,7 +154,7 @@ void KisFilterManager::setup(TDEActionCollection * ac) m_reapplyAction = new TDEAction(i18n("Apply Filter Again"), "Ctrl+Shift+F", - this, TQT_SLOT(slotApply()), + this, TQ_SLOT(slotApply()), ac, "filter_apply_again"); m_reapplyAction->setEnabled(false); @@ -167,7 +167,7 @@ void KisFilterManager::setup(TDEActionCollection * ac) if (!f) break; // Create action - TDEAction * a = new TDEAction(f->menuEntry(), 0, m_filterMapper, TQT_SLOT(map()), ac, + TDEAction * a = new TDEAction(f->menuEntry(), 0, m_filterMapper, TQ_SLOT(map()), ac, TQString("chalk_filter_%1").arg((*it) . id()).ascii()); // Add action to the right submenu @@ -349,11 +349,11 @@ void KisFilterManager::slotApplyFilter(int i) if( m_lastWidget != 0) { - connect(m_lastWidget, TQT_SIGNAL(sigPleaseUpdatePreview()), this, TQT_SLOT(slotConfigChanged())); + connect(m_lastWidget, TQ_SIGNAL(sigPleaseUpdatePreview()), this, TQ_SLOT(slotConfigChanged())); m_lastDialog->previewWidget()->slotSetDevice( dev ); - connect(m_lastDialog->previewWidget(), TQT_SIGNAL(updated()), this, TQT_SLOT(refreshPreview())); + connect(m_lastDialog->previewWidget(), TQ_SIGNAL(updated()), this, TQ_SLOT(refreshPreview())); TQGridLayout *widgetLayout = new TQGridLayout((TQWidget *)m_lastDialog->container(), 1, 1); diff --git a/chalk/ui/kis_gradient_chooser.cpp b/chalk/ui/kis_gradient_chooser.cpp index 5022a28b..92752241 100644 --- a/chalk/ui/kis_gradient_chooser.cpp +++ b/chalk/ui/kis_gradient_chooser.cpp @@ -37,7 +37,7 @@ KisCustomGradientDialog::KisCustomGradientDialog(KisView * view, TQWidget * pare { m_page = new KisAutogradient(this, "autogradient", i18n("Custom Gradient")); setMainWidget(m_page); - connect(m_page, TQT_SIGNAL(activatedResource(KisResource *)), view, TQT_SLOT(gradientActivated(KisResource*))); + connect(m_page, TQ_SIGNAL(activatedResource(KisResource *)), view, TQ_SLOT(gradientActivated(KisResource*))); } KisGradientChooser::KisGradientChooser(KisView * view, TQWidget *parent, const char *name) : super(parent, name) @@ -47,7 +47,7 @@ KisGradientChooser::KisGradientChooser(KisView * view, TQWidget *parent, const c m_customGradient = new TQPushButton(i18n("Custom Gradient..."), this, "custom gradient button"); KisCustomGradientDialog * autogradient = new KisCustomGradientDialog(view, this, "autogradient"); - connect(m_customGradient, TQT_SIGNAL(clicked()), autogradient, TQT_SLOT(show())); + connect(m_customGradient, TQ_SIGNAL(clicked()), autogradient, TQ_SLOT(show())); TQVBoxLayout *mainLayout = new TQVBoxLayout(this, 2, -1, "main layout"); diff --git a/chalk/ui/kis_gradient_slider_widget.cpp b/chalk/ui/kis_gradient_slider_widget.cpp index 939c654e..365e64d8 100644 --- a/chalk/ui/kis_gradient_slider_widget.cpp +++ b/chalk/ui/kis_gradient_slider_widget.cpp @@ -43,7 +43,7 @@ KisGradientSliderWidget::KisGradientSliderWidget(TQWidget *parent, const char* n m_segmentMenu->insertItem(i18n("Duplicate Segment"), DUPLICATE_SEGMENT); m_segmentMenu->insertItem(i18n("Mirror Segment"), MIRROR_SEGMENT); m_segmentMenu->insertItem(i18n("Remove Segment"), REMOVE_SEGMENT); - connect( m_segmentMenu, TQT_SIGNAL( activated(int) ), TQT_SLOT( slotMenuAction(int) ) ); + connect( m_segmentMenu, TQ_SIGNAL( activated(int) ), TQ_SLOT( slotMenuAction(int) ) ); } void KisGradientSliderWidget::setGradientResource( KisAutogradientResource* agr) diff --git a/chalk/ui/kis_grid_manager.cpp b/chalk/ui/kis_grid_manager.cpp index 1852438d..71ed71bb 100644 --- a/chalk/ui/kis_grid_manager.cpp +++ b/chalk/ui/kis_grid_manager.cpp @@ -53,17 +53,17 @@ KisGridManager::~KisGridManager() void KisGridManager::setup(TDEActionCollection * collection) { - m_toggleGrid = new TDEToggleAction(i18n("Show Grid"), "", this, TQT_SLOT(toggleGrid()), collection, "view_toggle_grid"); + m_toggleGrid = new TDEToggleAction(i18n("Show Grid"), "", this, TQ_SLOT(toggleGrid()), collection, "view_toggle_grid"); m_toggleGrid->setCheckedState(KGuiItem(i18n("Hide Grid"))); m_toggleGrid->setChecked(false); // Fast grid config - m_gridFastConfig1x1 = new TDEAction(i18n("1x1"), 0, "", this, TQT_SLOT(fastConfig1x1()), collection, "view_fast_grid_1x1"); - m_gridFastConfig2x2 = new TDEAction(i18n("2x2"), 0, "", this, TQT_SLOT(fastConfig2x2()), collection, "view_fast_grid_2x2"); - m_gridFastConfig5x5 = new TDEAction(i18n("5x5"), 0, "", this, TQT_SLOT(fastConfig5x5()), collection, "view_fast_grid_5x5"); - m_gridFastConfig10x10 = new TDEAction(i18n("10x10"), 0, "", this, TQT_SLOT(fastConfig10x10()), collection, "view_fast_grid_10x10"); - m_gridFastConfig20x20 = new TDEAction(i18n("20x20"), 0, "", this, TQT_SLOT(fastConfig20x20()), collection, "view_fast_grid_20x20"); - m_gridFastConfig40x40 = new TDEAction(i18n("40x40"), 0, "", this, TQT_SLOT(fastConfig40x40()), collection, "view_fast_grid_40x40"); + m_gridFastConfig1x1 = new TDEAction(i18n("1x1"), 0, "", this, TQ_SLOT(fastConfig1x1()), collection, "view_fast_grid_1x1"); + m_gridFastConfig2x2 = new TDEAction(i18n("2x2"), 0, "", this, TQ_SLOT(fastConfig2x2()), collection, "view_fast_grid_2x2"); + m_gridFastConfig5x5 = new TDEAction(i18n("5x5"), 0, "", this, TQ_SLOT(fastConfig5x5()), collection, "view_fast_grid_5x5"); + m_gridFastConfig10x10 = new TDEAction(i18n("10x10"), 0, "", this, TQ_SLOT(fastConfig10x10()), collection, "view_fast_grid_10x10"); + m_gridFastConfig20x20 = new TDEAction(i18n("20x20"), 0, "", this, TQ_SLOT(fastConfig20x20()), collection, "view_fast_grid_20x20"); + m_gridFastConfig40x40 = new TDEAction(i18n("40x40"), 0, "", this, TQ_SLOT(fastConfig40x40()), collection, "view_fast_grid_40x40"); } void KisGridManager::updateGUI() diff --git a/chalk/ui/kis_import_catcher.cpp b/chalk/ui/kis_import_catcher.cpp index 26040309..23f11359 100644 --- a/chalk/ui/kis_import_catcher.cpp +++ b/chalk/ui/kis_import_catcher.cpp @@ -37,7 +37,7 @@ KisImportCatcher::KisImportCatcher(KURL url, KisImageSP image) slotLoadingFinished(); } else { - connect(m_doc, TQT_SIGNAL(loadingFinished()), this, TQT_SLOT(slotLoadingFinished())); + connect(m_doc, TQ_SIGNAL(loadingFinished()), this, TQ_SLOT(slotLoadingFinished())); } } diff --git a/chalk/ui/kis_int_spinbox.cpp b/chalk/ui/kis_int_spinbox.cpp index 9e561287..9a70eb94 100644 --- a/chalk/ui/kis_int_spinbox.cpp +++ b/chalk/ui/kis_int_spinbox.cpp @@ -100,12 +100,12 @@ void KisIntSpinbox::init(int val) setFocusProxy(d->m_numinput); layout(); - connect(d->m_numinput, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(spinboxValueChanged(int))); - connect(d->m_slider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(sliderValueChanged(int))); - connect(d->m_slider, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotAboutToShow())); - connect(d->m_slider, TQT_SIGNAL(aboutToHide()), TQT_SLOT(slotAboutToHide())); + connect(d->m_numinput, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(spinboxValueChanged(int))); + connect(d->m_slider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(sliderValueChanged(int))); + connect(d->m_slider, TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotAboutToShow())); + connect(d->m_slider, TQ_SIGNAL(aboutToHide()), TQ_SLOT(slotAboutToHide())); - connect(&(d->m_timer), TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeout())); + connect(&(d->m_timer), TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTimeout())); } void KisIntSpinbox::spinboxValueChanged(int val) diff --git a/chalk/ui/kis_int_spinbox.h b/chalk/ui/kis_int_spinbox.h index 939312fa..06db1870 100644 --- a/chalk/ui/kis_int_spinbox.h +++ b/chalk/ui/kis_int_spinbox.h @@ -44,7 +44,7 @@ public: m_slider = new TQSlider(minValue, maxValue, pageStep, value, orientation, this, name); //m_slider->setTracking(false); insertItem(m_slider); - connect(m_slider, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(valueChanged(int))); + connect(m_slider, TQ_SIGNAL(valueChanged(int)), TQ_SIGNAL(valueChanged(int))); } void setTickInterval(int i) { m_slider->setTickInterval(i); } void setRange(int minValue, int maxValue) { m_slider->setRange(minValue, maxValue); } diff --git a/chalk/ui/kis_itemchooser.cpp b/chalk/ui/kis_itemchooser.cpp index d33c3873..661ef284 100644 --- a/chalk/ui/kis_itemchooser.cpp +++ b/chalk/ui/kis_itemchooser.cpp @@ -30,7 +30,7 @@ KisItemChooser::KisItemChooser(TQWidget *parent, const char *name) : super(paren /* m_frame = new TQVBox(this); m_frame->setFrameStyle(TQFrame::Panel | TQFrame::Sunken);*/ m_chooser = new KoIconChooser(TQSize(30,30), this, "icon_chooser", true); - TQObject::connect(m_chooser, TQT_SIGNAL(selected(KoIconItem*)), this, TQT_SLOT(slotItemSelected(KoIconItem*))); + TQObject::connect(m_chooser, TQ_SIGNAL(selected(KoIconItem*)), this, TQ_SLOT(slotItemSelected(KoIconItem*))); } KisItemChooser::~KisItemChooser() diff --git a/chalk/ui/kis_label_progress.cpp b/chalk/ui/kis_label_progress.cpp index 0caadcbb..383b8254 100644 --- a/chalk/ui/kis_label_progress.cpp +++ b/chalk/ui/kis_label_progress.cpp @@ -58,7 +58,7 @@ KisLabelProgress::KisLabelProgress(TQWidget *parent, const char *name, WFlags f) m_cancelButton = new EscapeButton(this, "cancel_button"); m_cancelButton->setIconSet(cancelIconSet); TQToolTip::add(m_cancelButton, i18n("Cancel")); - connect(m_cancelButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(cancelPressed())); + connect(m_cancelButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(cancelPressed())); m_bar = new KProgress(100, this); } @@ -75,11 +75,11 @@ void KisLabelProgress::setSubject(KisProgressSubject *subject, bool modal, bool m_subject = subject; m_modal = modal; - connect(subject, TQT_SIGNAL(notifyProgress(int)), this, TQT_SLOT(update(int))); - connect(subject, TQT_SIGNAL(notifyProgressStage(const TQString&, int)), this, TQT_SLOT(updateStage(const TQString&, int))); - connect(subject, TQT_SIGNAL(notifyProgressDone()), this, TQT_SLOT(done())); - connect(subject, TQT_SIGNAL(notifyProgressError()), this, TQT_SLOT(error())); - connect(subject, TQT_SIGNAL(destroyed()), this, TQT_SLOT(subjectDestroyed())); + connect(subject, TQ_SIGNAL(notifyProgress(int)), this, TQ_SLOT(update(int))); + connect(subject, TQ_SIGNAL(notifyProgressStage(const TQString&, int)), this, TQ_SLOT(updateStage(const TQString&, int))); + connect(subject, TQ_SIGNAL(notifyProgressDone()), this, TQ_SLOT(done())); + connect(subject, TQ_SIGNAL(notifyProgressError()), this, TQ_SLOT(error())); + connect(subject, TQ_SIGNAL(destroyed()), this, TQ_SLOT(subjectDestroyed())); show(); diff --git a/chalk/ui/kis_layerbox.cpp b/chalk/ui/kis_layerbox.cpp index 7e924f5a..56462859 100644 --- a/chalk/ui/kis_layerbox.cpp +++ b/chalk/ui/kis_layerbox.cpp @@ -95,27 +95,27 @@ KisLayerBox::KisLayerBox(KisCanvasSubject *subject, TQWidget *parent, const char loadPixmap("unlocked.png", il, TDEIcon::SizeSmallMedium)); - connect(list()->contextMenu(), TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotAboutToShow())); - connect(list(), TQT_SIGNAL(activated(LayerItem*)), - TQT_SLOT(slotLayerActivated(LayerItem*))); - connect(list(), TQT_SIGNAL(displayNameChanged(LayerItem*, const TQString&)), - TQT_SLOT(slotLayerDisplayNameChanged(LayerItem*, const TQString&))); - connect(list(), TQT_SIGNAL(propertyChanged(LayerItem*, const TQString&, bool)), - TQT_SLOT(slotLayerPropertyChanged(LayerItem*, const TQString&, bool))); - connect(list(), TQT_SIGNAL(layerMoved(LayerItem*, LayerItem*, LayerItem*)), - TQT_SLOT(slotLayerMoved(LayerItem*, LayerItem*, LayerItem*))); - connect(list(), TQT_SIGNAL(requestNewLayer(LayerItem*, LayerItem*)), - TQT_SLOT(slotRequestNewLayer(LayerItem*, LayerItem*))); - connect(list(), TQT_SIGNAL(requestNewFolder(LayerItem*, LayerItem*)), - TQT_SLOT(slotRequestNewFolder(LayerItem*, LayerItem*))); - connect(list(), TQT_SIGNAL(requestNewAdjustmentLayer(LayerItem*, LayerItem*)), - TQT_SLOT(slotRequestNewAdjustmentLayer(LayerItem*, LayerItem*))); - connect(list(), TQT_SIGNAL(requestNewObjectLayer(LayerItem*, LayerItem*, const KoDocumentEntry&)), - TQT_SLOT(slotRequestNewObjectLayer(LayerItem*, LayerItem*, const KoDocumentEntry&))); - connect(list(), TQT_SIGNAL(requestRemoveLayer(LayerItem*)), - TQT_SLOT(slotRequestRemoveLayer(LayerItem*))); - connect(list(), TQT_SIGNAL(requestLayerProperties(LayerItem*)), - TQT_SLOT(slotRequestLayerProperties(LayerItem*))); + connect(list()->contextMenu(), TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotAboutToShow())); + connect(list(), TQ_SIGNAL(activated(LayerItem*)), + TQ_SLOT(slotLayerActivated(LayerItem*))); + connect(list(), TQ_SIGNAL(displayNameChanged(LayerItem*, const TQString&)), + TQ_SLOT(slotLayerDisplayNameChanged(LayerItem*, const TQString&))); + connect(list(), TQ_SIGNAL(propertyChanged(LayerItem*, const TQString&, bool)), + TQ_SLOT(slotLayerPropertyChanged(LayerItem*, const TQString&, bool))); + connect(list(), TQ_SIGNAL(layerMoved(LayerItem*, LayerItem*, LayerItem*)), + TQ_SLOT(slotLayerMoved(LayerItem*, LayerItem*, LayerItem*))); + connect(list(), TQ_SIGNAL(requestNewLayer(LayerItem*, LayerItem*)), + TQ_SLOT(slotRequestNewLayer(LayerItem*, LayerItem*))); + connect(list(), TQ_SIGNAL(requestNewFolder(LayerItem*, LayerItem*)), + TQ_SLOT(slotRequestNewFolder(LayerItem*, LayerItem*))); + connect(list(), TQ_SIGNAL(requestNewAdjustmentLayer(LayerItem*, LayerItem*)), + TQ_SLOT(slotRequestNewAdjustmentLayer(LayerItem*, LayerItem*))); + connect(list(), TQ_SIGNAL(requestNewObjectLayer(LayerItem*, LayerItem*, const KoDocumentEntry&)), + TQ_SLOT(slotRequestNewObjectLayer(LayerItem*, LayerItem*, const KoDocumentEntry&))); + connect(list(), TQ_SIGNAL(requestRemoveLayer(LayerItem*)), + TQ_SLOT(slotRequestRemoveLayer(LayerItem*))); + connect(list(), TQ_SIGNAL(requestLayerProperties(LayerItem*)), + TQ_SLOT(slotRequestLayerProperties(LayerItem*))); m_newLayerMenu = new TDEPopupMenu(this); m_lst->bnAdd->setPopup(m_newLayerMenu); @@ -125,22 +125,22 @@ KisLayerBox::KisLayerBox(KisCanvasSubject *subject, TQWidget *parent, const char m_newLayerMenu->insertItem( SmallIconSet( "tool_filter" ), i18n( "New &Adjustment Layer..." ), ADJUSTMENT_LAYER ); m_partLayerAction = new KoPartSelectAction( i18n( "New &Object Layer" ), "gear", this ); m_partLayerAction->plug( m_newLayerMenu ); - connect(m_partLayerAction, TQT_SIGNAL(activated()), this, TQT_SLOT(slotAddMenuActivated())); - connect(m_newLayerMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotAddMenuActivated(int))); + connect(m_partLayerAction, TQ_SIGNAL(activated()), this, TQ_SLOT(slotAddMenuActivated())); + connect(m_newLayerMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotAddMenuActivated(int))); - connect(m_lst->bnDelete, TQT_SIGNAL(clicked()), TQT_SLOT(slotRmClicked())); - connect(m_lst->bnRaise, TQT_SIGNAL(clicked()), TQT_SLOT(slotRaiseClicked())); - connect(m_lst->bnLower, TQT_SIGNAL(clicked()), TQT_SLOT(slotLowerClicked())); - connect(m_lst->bnProperties, TQT_SIGNAL(clicked()), TQT_SLOT(slotPropertiesClicked())); - connect(m_lst->intOpacity, TQT_SIGNAL(valueChanged(int, bool)), TQT_SIGNAL(sigOpacityChanged(int, bool))); - connect(m_lst->intOpacity, TQT_SIGNAL(finishedChanging(int, int)), TQT_SIGNAL(sigOpacityFinishedChanging(int, int))); - connect(m_lst->cmbComposite, TQT_SIGNAL(activated(const KisCompositeOp&)), TQT_SIGNAL(sigItemComposite(const KisCompositeOp&))); + connect(m_lst->bnDelete, TQ_SIGNAL(clicked()), TQ_SLOT(slotRmClicked())); + connect(m_lst->bnRaise, TQ_SIGNAL(clicked()), TQ_SLOT(slotRaiseClicked())); + connect(m_lst->bnLower, TQ_SIGNAL(clicked()), TQ_SLOT(slotLowerClicked())); + connect(m_lst->bnProperties, TQ_SIGNAL(clicked()), TQ_SLOT(slotPropertiesClicked())); + connect(m_lst->intOpacity, TQ_SIGNAL(valueChanged(int, bool)), TQ_SIGNAL(sigOpacityChanged(int, bool))); + connect(m_lst->intOpacity, TQ_SIGNAL(finishedChanging(int, int)), TQ_SIGNAL(sigOpacityFinishedChanging(int, int))); + connect(m_lst->cmbComposite, TQ_SIGNAL(activated(const KisCompositeOp&)), TQ_SIGNAL(sigItemComposite(const KisCompositeOp&))); Q_ASSERT(subject->document() != 0); if (subject->document()) { - connect(subject->document(), TQT_SIGNAL(sigCommandExecuted()), TQT_SLOT(updateThumbnails())); + connect(subject->document(), TQ_SIGNAL(sigCommandExecuted()), TQ_SLOT(updateThumbnails())); } } @@ -165,16 +165,16 @@ void KisLayerBox::setImage(KisImageSP img) if (img) { - connect(img, TQT_SIGNAL(sigLayerActivated(KisLayerSP)), this, TQT_SLOT(slotLayerActivated(KisLayerSP))); - connect(img, TQT_SIGNAL(sigLayerAdded(KisLayerSP)), this, TQT_SLOT(slotLayerAdded(KisLayerSP))); - connect(img, TQT_SIGNAL(sigLayerRemoved(KisLayerSP, KisGroupLayerSP, KisLayerSP)), - this, TQT_SLOT(slotLayerRemoved(KisLayerSP, KisGroupLayerSP, KisLayerSP))); - connect(img, TQT_SIGNAL(sigLayerPropertiesChanged(KisLayerSP)), - this, TQT_SLOT(slotLayerPropertiesChanged(KisLayerSP))); - connect(img, TQT_SIGNAL(sigLayerMoved(KisLayerSP, KisGroupLayerSP, KisLayerSP)), - this, TQT_SLOT(slotLayerMoved(KisLayerSP, KisGroupLayerSP, KisLayerSP))); - connect(img, TQT_SIGNAL(sigLayersChanged(KisGroupLayerSP)), this, TQT_SLOT(slotLayersChanged(KisGroupLayerSP))); - connect(img, TQT_SIGNAL(sigLayerUpdated(KisLayerSP, TQRect)), this, TQT_SLOT(slotLayerUpdated(KisLayerSP, TQRect))); + connect(img, TQ_SIGNAL(sigLayerActivated(KisLayerSP)), this, TQ_SLOT(slotLayerActivated(KisLayerSP))); + connect(img, TQ_SIGNAL(sigLayerAdded(KisLayerSP)), this, TQ_SLOT(slotLayerAdded(KisLayerSP))); + connect(img, TQ_SIGNAL(sigLayerRemoved(KisLayerSP, KisGroupLayerSP, KisLayerSP)), + this, TQ_SLOT(slotLayerRemoved(KisLayerSP, KisGroupLayerSP, KisLayerSP))); + connect(img, TQ_SIGNAL(sigLayerPropertiesChanged(KisLayerSP)), + this, TQ_SLOT(slotLayerPropertiesChanged(KisLayerSP))); + connect(img, TQ_SIGNAL(sigLayerMoved(KisLayerSP, KisGroupLayerSP, KisLayerSP)), + this, TQ_SLOT(slotLayerMoved(KisLayerSP, KisGroupLayerSP, KisLayerSP))); + connect(img, TQ_SIGNAL(sigLayersChanged(KisGroupLayerSP)), this, TQ_SLOT(slotLayersChanged(KisGroupLayerSP))); + connect(img, TQ_SIGNAL(sigLayerUpdated(KisLayerSP, TQRect)), this, TQ_SLOT(slotLayerUpdated(KisLayerSP, TQRect))); slotLayersChanged(img->rootLayer()); updateThumbnails(); } diff --git a/chalk/ui/kis_load_visitor.h b/chalk/ui/kis_load_visitor.h index bdac5e82..5a1d2eed 100644 --- a/chalk/ui/kis_load_visitor.h +++ b/chalk/ui/kis_load_visitor.h @@ -51,7 +51,7 @@ public: } virtual bool visit(KisPaintLayer *layer) - { //connect(*layer->paintDevice(), TQT_SIGNAL(ioProgress(TQ_INT8)), m_img, TQT_SLOT(slotIOProgress(TQ_INT8))); + { //connect(*layer->paintDevice(), TQ_SIGNAL(ioProgress(TQ_INT8)), m_img, TQ_SLOT(slotIOProgress(TQ_INT8))); TQString location = m_external ? TQString() : m_uri; location += m_img->name() + "/layers/" + m_layerFilenames[layer]; @@ -138,7 +138,7 @@ public: virtual bool visit(KisAdjustmentLayer* layer) { - //connect(*layer->paintDevice(), TQT_SIGNAL(ioProgress(TQ_INT8)), m_img, TQT_SLOT(slotIOProgress(TQ_INT8))); + //connect(*layer->paintDevice(), TQ_SIGNAL(ioProgress(TQ_INT8)), m_img, TQ_SLOT(slotIOProgress(TQ_INT8))); // The selection -- if present. If not, we simply cannot open the dratted thing. TQString location = m_external ? TQString() : m_uri; diff --git a/chalk/ui/kis_multi_bool_filter_widget.cpp b/chalk/ui/kis_multi_bool_filter_widget.cpp index e0269504..73152733 100644 --- a/chalk/ui/kis_multi_bool_filter_widget.cpp +++ b/chalk/ui/kis_multi_bool_filter_widget.cpp @@ -48,7 +48,7 @@ KisMultiBoolFilterWidget::KisMultiBoolFilterWidget(TQWidget * parent, const char m_boolWidgets[i] = new TQCheckBox( this, iwparam[i].name.ascii()); m_boolWidgets[i]->setChecked( iwparam[i].initvalue ); m_boolWidgets[i]->setText( iwparam[i].label ); - connect(m_boolWidgets[i], TQT_SIGNAL(toggled( bool ) ), TQT_SIGNAL(sigPleaseUpdatePreview())); + connect(m_boolWidgets[i], TQ_SIGNAL(toggled( bool ) ), TQ_SIGNAL(sigPleaseUpdatePreview())); widgetLayout->add( m_boolWidgets[i]); } // TQSpacerItem * sp = new TQSpacerItem(1, 1); diff --git a/chalk/ui/kis_multi_double_filter_widget.cpp b/chalk/ui/kis_multi_double_filter_widget.cpp index 9491f221..b8afe830 100644 --- a/chalk/ui/kis_multi_double_filter_widget.cpp +++ b/chalk/ui/kis_multi_double_filter_widget.cpp @@ -30,8 +30,8 @@ KisDelayedActionDoubleInput::KisDelayedActionDoubleInput(TQWidget * parent, cons : KDoubleNumInput(parent, name) { m_timer = new TQTimer(this, name); - connect(m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotValueChanged())); - connect(this, TQT_SIGNAL(valueChanged( double )), TQT_SLOT(slotTimeToUpdate())); + connect(m_timer, TQ_SIGNAL(timeout()), TQ_SLOT(slotValueChanged())); + connect(this, TQ_SIGNAL(valueChanged( double )), TQ_SLOT(slotTimeToUpdate())); } void KisDelayedActionDoubleInput::slotTimeToUpdate() @@ -78,7 +78,7 @@ KisMultiDoubleFilterWidget::KisMultiDoubleFilterWidget(TQWidget * parent, const m_doubleWidgets[i]->setValue( dwparam[i].initvalue ); m_doubleWidgets[i]->cancelDelayedSignal(); - connect(m_doubleWidgets[i], TQT_SIGNAL(valueChangedDelayed(double)), TQT_SIGNAL(sigPleaseUpdatePreview())); + connect(m_doubleWidgets[i], TQ_SIGNAL(valueChangedDelayed(double)), TQ_SIGNAL(sigPleaseUpdatePreview())); TQLabel* lbl = new TQLabel(dwparam[i].label+":", this); widgetLayout->addWidget( lbl, i , 0); diff --git a/chalk/ui/kis_multi_integer_filter_widget.cpp b/chalk/ui/kis_multi_integer_filter_widget.cpp index aef29d2c..b0289e6c 100644 --- a/chalk/ui/kis_multi_integer_filter_widget.cpp +++ b/chalk/ui/kis_multi_integer_filter_widget.cpp @@ -29,8 +29,8 @@ KisDelayedActionIntegerInput::KisDelayedActionIntegerInput(TQWidget * parent, co : KIntNumInput(parent, name) { m_timer = new TQTimer(this, name); - connect(m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotValueChanged())); - connect(this, TQT_SIGNAL(valueChanged( int )), TQT_SLOT(slotTimeToUpdate())); + connect(m_timer, TQ_SIGNAL(timeout()), TQ_SLOT(slotValueChanged())); + connect(this, TQ_SIGNAL(valueChanged( int )), TQ_SLOT(slotTimeToUpdate())); } void KisDelayedActionIntegerInput::slotTimeToUpdate() @@ -78,7 +78,7 @@ KisMultiIntegerFilterWidget::KisMultiIntegerFilterWidget(TQWidget * parent, m_integerWidgets[i]->setValue( iwparam[i].initvalue ); m_integerWidgets[i]->cancelDelayedSignal(); - connect(m_integerWidgets[i], TQT_SIGNAL(valueChangedDelayed( int )), TQT_SIGNAL(sigPleaseUpdatePreview())); + connect(m_integerWidgets[i], TQ_SIGNAL(valueChangedDelayed( int )), TQ_SIGNAL(sigPleaseUpdatePreview())); TQLabel* lbl = new TQLabel(iwparam[i].label+":", this); widgetLayout->addWidget( lbl, i , 0); diff --git a/chalk/ui/kis_opengl_image_context.cpp b/chalk/ui/kis_opengl_image_context.cpp index 6a302192..c016ab83 100644 --- a/chalk/ui/kis_opengl_image_context.cpp +++ b/chalk/ui/kis_opengl_image_context.cpp @@ -98,10 +98,10 @@ KisOpenGLImageContext::KisOpenGLImageContext(KisImageSP image, KisProfile *monit createImageTextureTiles(); - connect(m_image, TQT_SIGNAL(sigImageUpdated(TQRect)), - TQT_SLOT(slotImageUpdated(TQRect))); - connect(m_image, TQT_SIGNAL(sigSizeChanged(TQ_INT32, TQ_INT32)), - TQT_SLOT(slotImageSizeChanged(TQ_INT32, TQ_INT32))); + connect(m_image, TQ_SIGNAL(sigImageUpdated(TQRect)), + TQ_SLOT(slotImageUpdated(TQRect))); + connect(m_image, TQ_SIGNAL(sigSizeChanged(TQ_INT32, TQ_INT32)), + TQ_SLOT(slotImageSizeChanged(TQ_INT32, TQ_INT32))); updateImageTextureTiles(m_image->bounds()); } diff --git a/chalk/ui/kis_paintop_box.cpp b/chalk/ui/kis_paintop_box.cpp index 57ed7a73..e0aa9285 100644 --- a/chalk/ui/kis_paintop_box.cpp +++ b/chalk/ui/kis_paintop_box.cpp @@ -64,8 +64,8 @@ KisPaintopBox::KisPaintopBox (KisView * view, TQWidget *parent, const char * nam m_layout = new TQHBoxLayout(this, 1, 1); m_layout->addWidget(m_cmbPaintops); - connect(this, TQT_SIGNAL(selected(const KisID &, const KisPaintOpSettings *)), view, TQT_SLOT(paintopActivated(const KisID &, const KisPaintOpSettings *))); - connect(m_cmbPaintops, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotItemSelected(int))); + connect(this, TQ_SIGNAL(selected(const KisID &, const KisPaintOpSettings *)), view, TQ_SLOT(paintopActivated(const KisID &, const KisPaintOpSettings *))); + connect(m_cmbPaintops, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotItemSelected(int))); // XXX: Let's see... Are all paintops loaded and ready? KisIDList keys = KisPaintOpRegistry::instance()->listKeys(); @@ -74,10 +74,10 @@ KisPaintopBox::KisPaintopBox (KisView * view, TQWidget *parent, const char * nam addItem(*it); } - connect(view, TQT_SIGNAL(currentColorSpaceChanged(KisColorSpace*)), - this, TQT_SLOT(colorSpaceChanged(KisColorSpace*))); - connect(view, TQT_SIGNAL(sigInputDeviceChanged(const KisInputDevice&)), - this, TQT_SLOT(slotInputDeviceChanged(const KisInputDevice&))); + connect(view, TQ_SIGNAL(currentColorSpaceChanged(KisColorSpace*)), + this, TQ_SLOT(colorSpaceChanged(KisColorSpace*))); + connect(view, TQ_SIGNAL(sigInputDeviceChanged(const KisInputDevice&)), + this, TQ_SLOT(slotInputDeviceChanged(const KisInputDevice&))); setCurrentPaintop(defaultPaintop(m_canvasController->currentInputDevice())); } diff --git a/chalk/ui/kis_palette_view.cpp b/chalk/ui/kis_palette_view.cpp index 2e17f651..56b0e407 100644 --- a/chalk/ui/kis_palette_view.cpp +++ b/chalk/ui/kis_palette_view.cpp @@ -114,11 +114,11 @@ void KisPaletteView::setPalette(KisPalette* palette) m_cells->setColor( i, c ); } - connect(m_cells, TQT_SIGNAL(colorSelected(int)), - TQT_SLOT(slotColorCellSelected(int))); + connect(m_cells, TQ_SIGNAL(colorSelected(int)), + TQ_SLOT(slotColorCellSelected(int))); - connect(m_cells, TQT_SIGNAL(colorDoubleClicked(int)), - TQT_SLOT(slotColorCellDoubleClicked(int)) ); + connect(m_cells, TQ_SIGNAL(colorDoubleClicked(int)), + TQ_SLOT(slotColorCellDoubleClicked(int)) ); addChild( m_cells ); m_cells->show(); diff --git a/chalk/ui/kis_palette_widget.cpp b/chalk/ui/kis_palette_widget.cpp index 4fe899e2..e401e94f 100644 --- a/chalk/ui/kis_palette_widget.cpp +++ b/chalk/ui/kis_palette_widget.cpp @@ -78,14 +78,14 @@ KisPaletteWidget::KisPaletteWidget( TQWidget *parent, int minWidth, int cols) //setFixedSize(sizeHint()); - connect(combo, TQT_SIGNAL(activated(const TQString &)), - this, TQT_SLOT(slotSetPalette(const TQString &))); - connect(m_view, TQT_SIGNAL(colorSelected(const KisColor &)), - this, TQT_SIGNAL(colorSelected(const KisColor &))); - connect(m_view, TQT_SIGNAL(colorSelected(const TQColor &)), - this, TQT_SIGNAL(colorSelected(const TQColor &))); - connect(m_view, TQT_SIGNAL(colorDoubleClicked(const KisColor &, const TQString &)), - this, TQT_SIGNAL(colorDoubleClicked(const KisColor &, const TQString &))); + connect(combo, TQ_SIGNAL(activated(const TQString &)), + this, TQ_SLOT(slotSetPalette(const TQString &))); + connect(m_view, TQ_SIGNAL(colorSelected(const KisColor &)), + this, TQ_SIGNAL(colorSelected(const KisColor &))); + connect(m_view, TQ_SIGNAL(colorSelected(const TQColor &)), + this, TQ_SIGNAL(colorSelected(const TQColor &))); + connect(m_view, TQ_SIGNAL(colorDoubleClicked(const KisColor &, const TQString &)), + this, TQ_SIGNAL(colorDoubleClicked(const KisColor &, const TQString &))); } KisPaletteWidget::~KisPaletteWidget() diff --git a/chalk/ui/kis_part_layer.cpp b/chalk/ui/kis_part_layer.cpp index 4c05360e..167d5b3e 100644 --- a/chalk/ui/kis_part_layer.cpp +++ b/chalk/ui/kis_part_layer.cpp @@ -86,8 +86,8 @@ void KisPartLayerImpl::childActivated(KoDocumentChild* child) TQPtrList<KoView> views = child->parentDocument()->views(); Q_ASSERT(views.count()); // XXX iterate over views - connect(views.at(0), TQT_SIGNAL(activated(bool)), - this, TQT_SLOT(childDeactivated(bool))); + connect(views.at(0), TQ_SIGNAL(activated(bool)), + this, TQ_SLOT(childDeactivated(bool))); } } @@ -99,7 +99,7 @@ void KisPartLayerImpl::childDeactivated(bool activated) if (m_activated && !activated /* no clue, but debugging suggests it is false here */) { TQPtrList<KoView> views = m_doc->parentDocument()->views(); Q_ASSERT(views.count()); - views.at(0)->disconnect(TQT_SIGNAL(activated(bool))); + views.at(0)->disconnect(TQ_SIGNAL(activated(bool))); m_activated = false; setDirty(m_doc->geometry()); } @@ -240,10 +240,10 @@ bool KisConnectPartLayerVisitor::visit(KisGroupLayer *layer) { bool KisConnectPartLayerVisitor::visit(KisPartLayer *layer) { if (m_connect) { - TQObject::connect(m_view, TQT_SIGNAL(childActivated(KoDocumentChild*)), - layer, TQT_SLOT(childActivated(KoDocumentChild*))); + TQObject::connect(m_view, TQ_SIGNAL(childActivated(KoDocumentChild*)), + layer, TQ_SLOT(childActivated(KoDocumentChild*))); } else { - TQObject::disconnect(m_view, TQT_SIGNAL(childActivated(KoDocumentChild*)), layer, 0 ); + TQObject::disconnect(m_view, TQ_SIGNAL(childActivated(KoDocumentChild*)), layer, 0 ); } return true; diff --git a/chalk/ui/kis_perspective_grid_manager.cpp b/chalk/ui/kis_perspective_grid_manager.cpp index d128f220..91a21d55 100644 --- a/chalk/ui/kis_perspective_grid_manager.cpp +++ b/chalk/ui/kis_perspective_grid_manager.cpp @@ -57,10 +57,10 @@ void KisPerspectiveGridManager::updateGUI() void KisPerspectiveGridManager::setup(TDEActionCollection * collection) { kdDebug() << "KisPerspectiveGridManager::setup(TDEActionCollection * collection)" << endl; - m_toggleGrid = new TDEToggleAction(i18n("Show Perspective Grid"), "", this, TQT_SLOT(toggleGrid()), collection, "view_toggle_perspective_grid"); + m_toggleGrid = new TDEToggleAction(i18n("Show Perspective Grid"), "", this, TQ_SLOT(toggleGrid()), collection, "view_toggle_perspective_grid"); m_toggleGrid->setCheckedState(KGuiItem(i18n("Hide Perspective Grid"))); m_toggleGrid->setChecked(false); - m_gridClear = new TDEAction(i18n("Clear Perspective Grid"), 0, "", this, TQT_SLOT(clearPerspectiveGrid()), collection, "view_clear_perspective_grid"); + m_gridClear = new TDEAction(i18n("Clear Perspective Grid"), 0, "", this, TQ_SLOT(clearPerspectiveGrid()), collection, "view_clear_perspective_grid"); } void KisPerspectiveGridManager::setGridVisible(bool t) diff --git a/chalk/ui/kis_previewwidget.cpp b/chalk/ui/kis_previewwidget.cpp index f2fe0bb7..011d0b98 100644 --- a/chalk/ui/kis_previewwidget.cpp +++ b/chalk/ui/kis_previewwidget.cpp @@ -86,17 +86,17 @@ KisPreviewWidget::KisPreviewWidget( TQWidget* parent, const char* name ) , m_firstZoom(true) { btnZoomIn->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "zoom-in", TDEIcon::MainToolbar, 16 )); - connect(btnZoomIn, TQT_SIGNAL(clicked()), this, TQT_SLOT(zoomIn())); + connect(btnZoomIn, TQ_SIGNAL(clicked()), this, TQ_SLOT(zoomIn())); btnZoomOut->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "zoom-out", TDEIcon::MainToolbar, 16 )); - connect(btnZoomOut, TQT_SIGNAL(clicked()), this, TQT_SLOT(zoomOut())); + connect(btnZoomOut, TQ_SIGNAL(clicked()), this, TQ_SLOT(zoomOut())); btnUpdate->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "reload", TDEIcon::MainToolbar, 16 )); - connect(btnUpdate, TQT_SIGNAL(clicked()), this, TQT_SLOT(forceUpdate())); + connect(btnUpdate, TQ_SIGNAL(clicked()), this, TQ_SLOT(forceUpdate())); - connect(radioBtnPreview, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setPreviewDisplayed(bool))); + connect(radioBtnPreview, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setPreviewDisplayed(bool))); - connect(checkBoxAutoUpdate, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotSetAutoUpdate(bool))); + connect(checkBoxAutoUpdate, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotSetAutoUpdate(bool))); btnZoomOneToOne->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "zoom-original", TDEIcon::MainToolbar, 16 )); - connect(btnZoomOneToOne, TQT_SIGNAL(clicked()), this, TQT_SLOT(zoomOneToOne())); + connect(btnZoomOneToOne, TQ_SIGNAL(clicked()), this, TQ_SLOT(zoomOneToOne())); m_progress = new KisLabelProgress(frmProgress); m_progress->setMaximumHeight(fontMetrics().height() ); @@ -104,18 +104,18 @@ KisPreviewWidget::KisPreviewWidget( TQWidget* parent, const char* name ) vbox->addWidget(m_progress); m_progress->hide(); - connect(m_zoomTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateZoom())); - connect(m_filterTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(runFilterHelper())); + connect(m_zoomTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateZoom())); + connect(m_filterTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(runFilterHelper())); /* kToolBar1->insertLineSeparator(); kToolBar1->insertButton("reload",2, true, i18n("Update")); - connect(kToolBar1->getButton(2),TQT_SIGNAL(clicked()),this,TQT_SLOT(forceUpdate())); + connect(kToolBar1->getButton(2),TQ_SIGNAL(clicked()),this,TQ_SLOT(forceUpdate())); kToolBar1->insertButton("",3, true, i18n("Auto Update")); - connect(kToolBar1->getButton(3),TQT_SIGNAL(clicked()),this,TQT_SLOT(toggleAutoUpdate())); + connect(kToolBar1->getButton(3),TQ_SIGNAL(clicked()),this,TQ_SLOT(toggleAutoUpdate())); kToolBar1->insertButton("",4, true, i18n("Switch")); - connect(kToolBar1->getButton(4),TQT_SIGNAL(clicked()),this,TQT_SLOT(toggleImageDisplayed()));*/ + connect(kToolBar1->getButton(4),TQ_SIGNAL(clicked()),this,TQ_SLOT(toggleImageDisplayed()));*/ // these currently don't yet work, reenable when they do work :) (TZ-12-2005) // TODO reenable these // kToolBar1->insertButton("",5, true, i18n("Popup Original and Preview")); diff --git a/chalk/ui/kis_resource_mediator.cpp b/chalk/ui/kis_resource_mediator.cpp index ddecf85a..baea3e9e 100644 --- a/chalk/ui/kis_resource_mediator.cpp +++ b/chalk/ui/kis_resource_mediator.cpp @@ -32,7 +32,7 @@ KisResourceMediator::KisResourceMediator(KisItemChooser *chooser, Q_ASSERT(chooser); m_activeItem = 0; - connect(m_chooser, TQT_SIGNAL(selected(KoIconItem*)), TQT_SLOT(setActiveItem(KoIconItem*))); + connect(m_chooser, TQ_SIGNAL(selected(KoIconItem*)), TQ_SLOT(setActiveItem(KoIconItem*))); } KisResourceMediator::~KisResourceMediator() @@ -48,8 +48,8 @@ void KisResourceMediator::connectServer(KisResourceServerBase* rServer) rServerAddedResource( *it ); // And connect to the server permanently, so that we may recieve updates afterwards - connect(rServer, TQT_SIGNAL(resourceAdded(KisResource*)), - this, TQT_SLOT(rServerAddedResource(KisResource*))); + connect(rServer, TQ_SIGNAL(resourceAdded(KisResource*)), + this, TQ_SLOT(rServerAddedResource(KisResource*))); } KisResource *KisResourceMediator::currentResource() const diff --git a/chalk/ui/kis_save_visitor.h b/chalk/ui/kis_save_visitor.h index de98548c..e66cd3f0 100644 --- a/chalk/ui/kis_save_visitor.h +++ b/chalk/ui/kis_save_visitor.h @@ -47,7 +47,7 @@ public: virtual bool visit(KisPaintLayer *layer) { - //connect(*layer->paintDevice(), TQT_SIGNAL(ioProgress(TQ_INT8)), m_img, TQT_SLOT(slotIOProgress(TQ_INT8))); + //connect(*layer->paintDevice(), TQ_SIGNAL(ioProgress(TQ_INT8)), m_img, TQ_SLOT(slotIOProgress(TQ_INT8))); TQString location = m_external ? TQString() : m_uri; location += m_img->name() + TQString("/layers/layer%1").arg(m_count); diff --git a/chalk/ui/kis_selection_manager.cpp b/chalk/ui/kis_selection_manager.cpp index 7d001586..e01e36f2 100644 --- a/chalk/ui/kis_selection_manager.cpp +++ b/chalk/ui/kis_selection_manager.cpp @@ -102,142 +102,142 @@ void KisSelectionManager::setup(TDEActionCollection * collection) // XXX: setup shortcuts! m_cut = KStdAction::cut(this, - TQT_SLOT(cut()), + TQ_SLOT(cut()), collection, "cut"); m_copy = KStdAction::copy(this, - TQT_SLOT(copy()), + TQ_SLOT(copy()), collection, "copy"); m_paste = KStdAction::paste(this, - TQT_SLOT(paste()), + TQ_SLOT(paste()), collection, "paste"); m_pasteNew = new TDEAction(i18n("Paste into &New Image"), 0, 0, - this, TQT_SLOT(pasteNew()), + this, TQ_SLOT(pasteNew()), collection, "paste_new"); m_selectAll = KStdAction::selectAll(this, - TQT_SLOT(selectAll()), + TQ_SLOT(selectAll()), collection, "select_all"); m_deselect = KStdAction::deselect(this, - TQT_SLOT(deselect()), + TQ_SLOT(deselect()), collection, "deselect"); m_clear = KStdAction::clear(this, - TQT_SLOT(clear()), + TQ_SLOT(clear()), collection, "clear"); m_reselect = new TDEAction(i18n("&Reselect"), 0, "Ctrl+Shift+D", - this, TQT_SLOT(reselect()), + this, TQ_SLOT(reselect()), collection, "reselect"); m_invert = new TDEAction(i18n("&Invert"), 0, "Ctrl+I", - this, TQT_SLOT(invert()), + this, TQ_SLOT(invert()), collection, "invert"); m_toNewLayer = new TDEAction(i18n("Copy Selection to New Layer"), 0, "Ctrl+J", - this, TQT_SLOT(copySelectionToNewLayer()), + this, TQ_SLOT(copySelectionToNewLayer()), collection, "copy_selection_to_new_layer"); m_cutToNewLayer = new TDEAction(i18n("Cut Selection to New Layer"), 0, "Ctrl+Shift+J", - this, TQT_SLOT(cutToNewLayer()), + this, TQ_SLOT(cutToNewLayer()), collection, "cut_selection_to_new_layer"); m_feather = new TDEAction(i18n("Feather"), 0, "Ctrl+Alt+D", - this, TQT_SLOT(feather()), + this, TQ_SLOT(feather()), collection, "feather"); m_fillForegroundColor = new TDEAction(i18n("Fill with Foreground Color"), "Alt+backspace", this, - TQT_SLOT(fillForegroundColor()), + TQ_SLOT(fillForegroundColor()), collection, "fill_selection_foreground_color"); m_fillBackgroundColor = new TDEAction(i18n("Fill with Background Color"), "backspace", this, - TQT_SLOT(fillBackgroundColor()), + TQ_SLOT(fillBackgroundColor()), collection, "fill_selection_background_color"); m_fillPattern = new TDEAction(i18n("Fill with Pattern"), 0, this, - TQT_SLOT(fillPattern()), + TQ_SLOT(fillPattern()), collection, "fill_selection_pattern"); - m_toggleDisplaySelection = new TDEToggleAction(i18n("Display Selection"), "Ctrl+h", this, TQT_SLOT(toggleDisplaySelection()), collection, "toggle_display_selection"); + m_toggleDisplaySelection = new TDEToggleAction(i18n("Display Selection"), "Ctrl+h", this, TQ_SLOT(toggleDisplaySelection()), collection, "toggle_display_selection"); m_toggleDisplaySelection->setCheckedState(KGuiItem(i18n("Hide Selection"))); m_toggleDisplaySelection->setChecked(true); m_border = new TDEAction(i18n("Border..."), 0, 0, - this, TQT_SLOT(border()), + this, TQ_SLOT(border()), collection, "border"); m_expand = new TDEAction(i18n("Expand..."), 0, 0, - this, TQT_SLOT(expand()), + this, TQ_SLOT(expand()), collection, "expand"); m_smooth = new TDEAction(i18n("Smooth..."), 0, 0, - this, TQT_SLOT(smooth()), + this, TQ_SLOT(smooth()), collection, "smooth"); m_contract = new TDEAction(i18n("Contract..."), 0, 0, - this, TQT_SLOT(contract()), + this, TQ_SLOT(contract()), collection, "contract"); m_similar = new TDEAction(i18n("Similar"), 0, 0, - this, TQT_SLOT(similar()), + this, TQ_SLOT(similar()), collection, "similar"); m_transform = new TDEAction(i18n("Transform..."), 0, 0, - this, TQT_SLOT(transform()), + this, TQ_SLOT(transform()), collection, "transform_selection"); // m_load // = new TDEAction(i18n("Load..."), // 0, 0, -// this, TQT_SLOT(load()), +// this, TQ_SLOT(load()), // collection, "load_selection"); // // // m_save // = new TDEAction(i18n("Save As..."), // 0, 0, -// this, TQT_SLOT(save()), +// this, TQ_SLOT(save()), // collection, "save_selection"); TQClipboard *cb = TQApplication::clipboard(); - connect(cb, TQT_SIGNAL(dataChanged()), TQT_SLOT(clipboardDataChanged())); + connect(cb, TQ_SIGNAL(dataChanged()), TQ_SLOT(clipboardDataChanged())); } void KisSelectionManager::clipboardDataChanged() diff --git a/chalk/ui/kis_selection_options.cpp b/chalk/ui/kis_selection_options.cpp index 8593d22a..6c23b817 100644 --- a/chalk/ui/kis_selection_options.cpp +++ b/chalk/ui/kis_selection_options.cpp @@ -42,7 +42,7 @@ KisSelectionOptions::KisSelectionOptions(TQWidget *parent, KisCanvasSubject * su TQVBoxLayout * l = new TQVBoxLayout(this); l->addWidget(m_page); - connect(m_page->cmbAction, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(actionChanged(int))); + connect(m_page->cmbAction, TQ_SIGNAL(activated(int)), this, TQ_SIGNAL(actionChanged(int))); } KisSelectionOptions::~KisSelectionOptions() diff --git a/chalk/ui/kis_text_brush.cpp b/chalk/ui/kis_text_brush.cpp index 8666f1a1..1a156477 100644 --- a/chalk/ui/kis_text_brush.cpp +++ b/chalk/ui/kis_text_brush.cpp @@ -48,8 +48,8 @@ KisTextBrush::KisTextBrush(TQWidget *parent, const char* name, const TQString& c m_textBrushResource(new KisTextBrushResource()) { setCaption(caption); - connect((TQObject*)lineEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(rebuildTextBrush())); - connect((TQObject*)bnFont, TQT_SIGNAL(clicked()), this, TQT_SLOT(getFont())); + connect((TQObject*)lineEdit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(rebuildTextBrush())); + connect((TQObject*)bnFont, TQ_SIGNAL(clicked()), this, TQ_SLOT(getFont())); m_font = font(); rebuildTextBrush(); } diff --git a/chalk/ui/kis_tool_dummy.cpp b/chalk/ui/kis_tool_dummy.cpp index de4ac080..ed4f09fe 100644 --- a/chalk/ui/kis_tool_dummy.cpp +++ b/chalk/ui/kis_tool_dummy.cpp @@ -87,7 +87,7 @@ void KisToolDummy::setup(TDEActionCollection *collection) m_action = static_cast<TDERadioAction *>(collection->action(name())); if (m_action == 0) { - m_action = new TDERadioAction(i18n("&Dummy"), "tool_dummy", TQt::SHIFT+TQt::Key_H, this, TQT_SLOT(activate()), collection, name()); + m_action = new TDERadioAction(i18n("&Dummy"), "tool_dummy", TQt::SHIFT+TQt::Key_H, this, TQ_SLOT(activate()), collection, name()); m_action->setExclusiveGroup("tools"); m_ownAction = true; } diff --git a/chalk/ui/kis_tool_manager.cpp b/chalk/ui/kis_tool_manager.cpp index 04388058..3531370d 100644 --- a/chalk/ui/kis_tool_manager.cpp +++ b/chalk/ui/kis_tool_manager.cpp @@ -242,7 +242,7 @@ void KisToolManager::setToolForInputDevice(KisInputDevice oldDevice, KisInputDev for (vKisTool::iterator it = oldTools.begin(); it != oldTools.end(); ++it) { KisTool *tool = *it; TDEAction *toolAction = tool->action(); - toolAction->disconnect(TQT_SIGNAL(activated()), tool, TQT_SLOT(activate())); + toolAction->disconnect(TQ_SIGNAL(activated()), tool, TQ_SLOT(activate())); } } KisTool *oldTool = currentTool(); @@ -262,7 +262,7 @@ void KisToolManager::setToolForInputDevice(KisInputDevice oldDevice, KisInputDev for (vKisTool::iterator it = tools.begin(); it != tools.end(); ++it) { KisTool *tool = *it; TDEAction *toolAction = tool->action(); - connect(toolAction, TQT_SIGNAL(activated()), tool, TQT_SLOT(activate())); + connect(toolAction, TQ_SIGNAL(activated()), tool, TQ_SLOT(activate())); } } diff --git a/chalk/ui/kis_tool_paint.cpp b/chalk/ui/kis_tool_paint.cpp index 34fc7730..063021b3 100644 --- a/chalk/ui/kis_tool_paint.cpp +++ b/chalk/ui/kis_tool_paint.cpp @@ -124,11 +124,11 @@ TQWidget* KisToolPaint::createOptionWidget(TQWidget* parent) m_slOpacity = new KisIntSpinbox( m_optionWidget, "int_m_optionwidget"); m_slOpacity->setRange( 0, 100); m_slOpacity->setValue(m_opacity / OPACITY_OPAQUE * 100); - connect(m_slOpacity, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotSetOpacity(int))); + connect(m_slOpacity, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotSetOpacity(int))); m_lbComposite = new TQLabel(i18n("Mode:"), m_optionWidget); m_cmbComposite = new KisCmbComposite(m_optionWidget); - connect(m_cmbComposite, TQT_SIGNAL(activated(const KisCompositeOp&)), this, TQT_SLOT(slotSetCompositeMode(const KisCompositeOp&))); + connect(m_cmbComposite, TQ_SIGNAL(activated(const KisCompositeOp&)), this, TQ_SLOT(slotSetCompositeMode(const KisCompositeOp&))); TQVBoxLayout* verticalLayout = new TQVBoxLayout(m_optionWidget); verticalLayout->setMargin(0); @@ -146,7 +146,7 @@ TQWidget* KisToolPaint::createOptionWidget(TQWidget* parent) if (!quickHelp().isEmpty()) { TQPushButton* push = new TQPushButton(SmallIconSet( "help" ), "", m_optionWidget); - connect(push, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotPopupQuickHelp())); + connect(push, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotPopupQuickHelp())); TQHBoxLayout* hLayout = new TQHBoxLayout(m_optionWidget); hLayout->addWidget(push); diff --git a/chalk/ui/kis_view.cpp b/chalk/ui/kis_view.cpp index 08cbcd05..79246afc 100644 --- a/chalk/ui/kis_view.cpp +++ b/chalk/ui/kis_view.cpp @@ -257,7 +257,7 @@ KisView::KisView(KisDoc *doc, KisUndoAdapter *adapter, TQWidget *parent, const c m_tabletEventTimer.start(); m_inputDevice = KisInputDevice::mouse(); - connect(&m_initialZoomTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotInitialZoomTimeout())); + connect(&m_initialZoomTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotInitialZoomTimeout())); m_paletteManager = new KoPaletteManager(this, actionCollection(), "Chalk palette manager"); if (cfg.fixDockerWidth()) m_paletteManager->setFixedWidth( 360 ); @@ -288,7 +288,7 @@ KisView::KisView(KisDoc *doc, KisUndoAdapter *adapter, TQWidget *parent, const c else setXMLFile("chalk.rc"); - KStdAction::keyBindings( mainWindow()->guiFactory(), TQT_SLOT( configureShortcuts() ), actionCollection() ); + KStdAction::keyBindings( mainWindow()->guiFactory(), TQ_SLOT( configureShortcuts() ), actionCollection() ); createLayerBox(); @@ -302,7 +302,7 @@ KisView::KisView(KisDoc *doc, KisUndoAdapter *adapter, TQWidget *parent, const c dcopObject(); - connect(this, TQT_SIGNAL(autoScroll(const TQPoint &)), TQT_SLOT(slotAutoScroll(const TQPoint &))); + connect(this, TQ_SIGNAL(autoScroll(const TQPoint &)), TQ_SLOT(slotAutoScroll(const TQPoint &))); setMouseTracking(true); @@ -340,7 +340,7 @@ KisView::KisView(KisDoc *doc, KisUndoAdapter *adapter, TQWidget *parent, const c { slotLoadingFinished(); } else { - connect(doc, TQT_SIGNAL(loadingFinished()), this, TQT_SLOT(slotLoadingFinished())); + connect(doc, TQ_SIGNAL(loadingFinished()), this, TQ_SLOT(slotLoadingFinished())); } setFocus(); @@ -426,20 +426,20 @@ void KisView::createLayerBox() m_layerBox = new KisLayerBox(this); m_layerBox->setCaption(i18n("Layers")); - connect(m_layerBox, TQT_SIGNAL(sigRequestLayer(KisGroupLayerSP, KisLayerSP)), - this, TQT_SLOT(addLayer(KisGroupLayerSP, KisLayerSP))); - connect(m_layerBox, TQT_SIGNAL(sigRequestGroupLayer(KisGroupLayerSP, KisLayerSP)), - this, TQT_SLOT(addGroupLayer(KisGroupLayerSP, KisLayerSP))); - connect(m_layerBox, TQT_SIGNAL(sigRequestAdjustmentLayer(KisGroupLayerSP, KisLayerSP)), - this, TQT_SLOT(addAdjustmentLayer(KisGroupLayerSP, KisLayerSP))); - connect(m_layerBox, TQT_SIGNAL(sigRequestPartLayer(KisGroupLayerSP, KisLayerSP, const KoDocumentEntry&)), - this, TQT_SLOT(addPartLayer(KisGroupLayerSP, KisLayerSP, const KoDocumentEntry&))); - connect(m_layerBox, TQT_SIGNAL(sigRequestLayerProperties(KisLayerSP)), - this, TQT_SLOT(showLayerProperties(KisLayerSP))); - connect(m_layerBox, TQT_SIGNAL(sigOpacityChanged(int, bool)), this, TQT_SLOT(layerOpacity(int, bool))); - connect(m_layerBox, TQT_SIGNAL(sigOpacityFinishedChanging(int, int)), - this, TQT_SLOT(layerOpacityFinishedChanging(int, int))); - connect(m_layerBox, TQT_SIGNAL(sigItemComposite(const KisCompositeOp&)), this, TQT_SLOT(layerCompositeOp(const KisCompositeOp&))); + connect(m_layerBox, TQ_SIGNAL(sigRequestLayer(KisGroupLayerSP, KisLayerSP)), + this, TQ_SLOT(addLayer(KisGroupLayerSP, KisLayerSP))); + connect(m_layerBox, TQ_SIGNAL(sigRequestGroupLayer(KisGroupLayerSP, KisLayerSP)), + this, TQ_SLOT(addGroupLayer(KisGroupLayerSP, KisLayerSP))); + connect(m_layerBox, TQ_SIGNAL(sigRequestAdjustmentLayer(KisGroupLayerSP, KisLayerSP)), + this, TQ_SLOT(addAdjustmentLayer(KisGroupLayerSP, KisLayerSP))); + connect(m_layerBox, TQ_SIGNAL(sigRequestPartLayer(KisGroupLayerSP, KisLayerSP, const KoDocumentEntry&)), + this, TQ_SLOT(addPartLayer(KisGroupLayerSP, KisLayerSP, const KoDocumentEntry&))); + connect(m_layerBox, TQ_SIGNAL(sigRequestLayerProperties(KisLayerSP)), + this, TQ_SLOT(showLayerProperties(KisLayerSP))); + connect(m_layerBox, TQ_SIGNAL(sigOpacityChanged(int, bool)), this, TQ_SLOT(layerOpacity(int, bool))); + connect(m_layerBox, TQ_SIGNAL(sigOpacityFinishedChanging(int, int)), + this, TQ_SLOT(layerOpacityFinishedChanging(int, int))); + connect(m_layerBox, TQ_SIGNAL(sigItemComposite(const KisCompositeOp&)), this, TQ_SLOT(layerCompositeOp(const KisCompositeOp&))); paletteManager()->addWidget(m_layerBox, "layerbox", chalk::LAYERBOX, 0); @@ -468,8 +468,8 @@ void KisView::setupScrollBars() m_hScroll->setGeometry(20, height() - 16, width() - 36, 16); m_hScroll->setValue(0); m_vScroll->setValue(0); - TQObject::connect(m_vScroll, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(scrollV(int))); - TQObject::connect(m_hScroll, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(scrollH(int))); + TQObject::connect(m_vScroll, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(scrollV(int))); + TQObject::connect(m_hScroll, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(scrollH(int))); } void KisView::setupRulers() @@ -601,85 +601,85 @@ void KisView::setupActions() m_fullScreen = KStdAction::fullScreen( NULL, NULL, actionCollection(), this ); - connect( m_fullScreen, TQT_SIGNAL( toggled( bool )), this, TQT_SLOT( slotUpdateFullScreen( bool ))); + connect( m_fullScreen, TQ_SIGNAL( toggled( bool )), this, TQ_SLOT( slotUpdateFullScreen( bool ))); - m_imgProperties = new TDEAction(i18n("Image Properties"), 0, this, TQT_SLOT(slotImageProperties()), actionCollection(), "img_properties"); + m_imgProperties = new TDEAction(i18n("Image Properties"), 0, this, TQ_SLOT(slotImageProperties()), actionCollection(), "img_properties"); m_imgScan = 0; // How the hell do I get a TDEAction to the scan plug-in?!? - m_imgResizeToLayer = new TDEAction(i18n("Resize Image to Size of Current Layer"), 0, this, TQT_SLOT(imgResizeToActiveLayer()), actionCollection(), "resizeimgtolayer"); + m_imgResizeToLayer = new TDEAction(i18n("Resize Image to Size of Current Layer"), 0, this, TQ_SLOT(imgResizeToActiveLayer()), actionCollection(), "resizeimgtolayer"); // view actions - m_zoomIn = KStdAction::zoomIn(this, TQT_SLOT(slotZoomIn()), actionCollection(), "zoom_in"); - m_zoomOut = KStdAction::zoomOut(this, TQT_SLOT(slotZoomOut()), actionCollection(), "zoom_out"); - m_actualPixels = new TDEAction(i18n("Actual Pixels"), "Ctrl+0", this, TQT_SLOT(slotActualPixels()), actionCollection(), "actual_pixels"); - m_actualSize = KStdAction::actualSize(this, TQT_SLOT(slotActualSize()), actionCollection(), "actual_size"); + m_zoomIn = KStdAction::zoomIn(this, TQ_SLOT(slotZoomIn()), actionCollection(), "zoom_in"); + m_zoomOut = KStdAction::zoomOut(this, TQ_SLOT(slotZoomOut()), actionCollection(), "zoom_out"); + m_actualPixels = new TDEAction(i18n("Actual Pixels"), "Ctrl+0", this, TQ_SLOT(slotActualPixels()), actionCollection(), "actual_pixels"); + m_actualSize = KStdAction::actualSize(this, TQ_SLOT(slotActualSize()), actionCollection(), "actual_size"); m_actualSize->setEnabled(false); - m_fitToCanvas = KStdAction::fitToPage(this, TQT_SLOT(slotFitToCanvas()), actionCollection(), "fit_to_canvas"); + m_fitToCanvas = KStdAction::fitToPage(this, TQ_SLOT(slotFitToCanvas()), actionCollection(), "fit_to_canvas"); // layer actions - m_layerAdd = new TDEAction(i18n("&Add..."), "Ctrl+Shift+N", this, TQT_SLOT(layerAdd()), actionCollection(), "insert_layer"); + m_layerAdd = new TDEAction(i18n("&Add..."), "Ctrl+Shift+N", this, TQ_SLOT(layerAdd()), actionCollection(), "insert_layer"); m_actionPartLayer = new KoPartSelectAction( i18n( "&Object Layer" ), "frame_query", - this, TQT_SLOT( addPartLayer() ), + this, TQ_SLOT( addPartLayer() ), actionCollection(), "insert_part_layer" ); m_actionAdjustmentLayer = new TDEAction( i18n( "&Adjustment Layer" ), 0, - this, TQT_SLOT( addAdjustmentLayer() ), + this, TQ_SLOT( addAdjustmentLayer() ), actionCollection(), "insert_adjustment_layer" ); - m_layerRm = new TDEAction(i18n("&Remove"), 0, this, TQT_SLOT(layerRemove()), actionCollection(), "remove_layer"); - m_layerDup = new TDEAction(i18n("Duplicate"), 0, this, TQT_SLOT(layerDuplicate()), actionCollection(), "duplicate_layer"); - m_layerHide = new TDEToggleAction(i18n("&Hide"), 0, this, TQT_SLOT(layerToggleVisible()), actionCollection(), "hide_layer"); + m_layerRm = new TDEAction(i18n("&Remove"), 0, this, TQ_SLOT(layerRemove()), actionCollection(), "remove_layer"); + m_layerDup = new TDEAction(i18n("Duplicate"), 0, this, TQ_SLOT(layerDuplicate()), actionCollection(), "duplicate_layer"); + m_layerHide = new TDEToggleAction(i18n("&Hide"), 0, this, TQ_SLOT(layerToggleVisible()), actionCollection(), "hide_layer"); m_layerHide->setCheckedState(KGuiItem(i18n("&Show"))); m_layerHide->setChecked(false); - m_layerRaise = new TDEAction(i18n("Raise"), "raise", "Ctrl+]", this, TQT_SLOT(layerRaise()), actionCollection(), "raiselayer"); - m_layerLower = new TDEAction(i18n("Lower"), "lower", "Ctrl+[", this, TQT_SLOT(layerLower()), actionCollection(), "lowerlayer"); - m_layerTop = new TDEAction(i18n("To Top"), "bring_forward", "Ctrl+Shift+]", this, TQT_SLOT(layerFront()), actionCollection(), "toplayer"); - m_layerBottom = new TDEAction(i18n("To Bottom"), "send_backward", "Ctrl+Shift+[", this, TQT_SLOT(layerBack()), actionCollection(), "bottomlayer"); - m_layerProperties = new TDEAction(i18n("Properties"), 0, this, TQT_SLOT(layerProperties()), actionCollection(), "layer_properties"); - (void)new TDEAction(i18n("I&nsert Image as Layer..."), 0, this, TQT_SLOT(slotInsertImageAsLayer()), actionCollection(), "insert_image_as_layer"); - m_layerSaveAs = new TDEAction(i18n("Save Layer as Image..."), "document-save", this, TQT_SLOT(saveLayerAsImage()), actionCollection(), "save_layer_as_image"); - (void)new TDEAction(i18n("Flip on &X Axis"), "view_left_right", 0, this, TQT_SLOT(mirrorLayerX()), actionCollection(), "mirrorLayerX"); - (void)new TDEAction(i18n("Flip on &Y Axis"), "view_top_bottom", 0, this, TQT_SLOT(mirrorLayerY()), actionCollection(), "mirrorLayerY"); + m_layerRaise = new TDEAction(i18n("Raise"), "raise", "Ctrl+]", this, TQ_SLOT(layerRaise()), actionCollection(), "raiselayer"); + m_layerLower = new TDEAction(i18n("Lower"), "lower", "Ctrl+[", this, TQ_SLOT(layerLower()), actionCollection(), "lowerlayer"); + m_layerTop = new TDEAction(i18n("To Top"), "bring_forward", "Ctrl+Shift+]", this, TQ_SLOT(layerFront()), actionCollection(), "toplayer"); + m_layerBottom = new TDEAction(i18n("To Bottom"), "send_backward", "Ctrl+Shift+[", this, TQ_SLOT(layerBack()), actionCollection(), "bottomlayer"); + m_layerProperties = new TDEAction(i18n("Properties"), 0, this, TQ_SLOT(layerProperties()), actionCollection(), "layer_properties"); + (void)new TDEAction(i18n("I&nsert Image as Layer..."), 0, this, TQ_SLOT(slotInsertImageAsLayer()), actionCollection(), "insert_image_as_layer"); + m_layerSaveAs = new TDEAction(i18n("Save Layer as Image..."), "document-save", this, TQ_SLOT(saveLayerAsImage()), actionCollection(), "save_layer_as_image"); + (void)new TDEAction(i18n("Flip on &X Axis"), "view_left_right", 0, this, TQ_SLOT(mirrorLayerX()), actionCollection(), "mirrorLayerX"); + (void)new TDEAction(i18n("Flip on &Y Axis"), "view_top_bottom", 0, this, TQ_SLOT(mirrorLayerY()), actionCollection(), "mirrorLayerY"); m_createMask = new TDEAction(i18n("Create Mask"), 0, this, - TQT_SLOT(slotCreateMask()), actionCollection(), "create_mask"); + TQ_SLOT(slotCreateMask()), actionCollection(), "create_mask"); m_maskFromSelection = new TDEAction(i18n("Mask From Selection"), 0, this, - TQT_SLOT(slotMaskFromSelection()), actionCollection(), + TQ_SLOT(slotMaskFromSelection()), actionCollection(), "mask_fromsel"); m_maskToSelection = new TDEAction(i18n("Mask to Selection"), 0, this, - TQT_SLOT(slotMaskToSelection()), actionCollection(), "mask_tosel"); - m_applyMask = new TDEAction(i18n("Apply Mask"), 0, this, TQT_SLOT(slotApplyMask()), + TQ_SLOT(slotMaskToSelection()), actionCollection(), "mask_tosel"); + m_applyMask = new TDEAction(i18n("Apply Mask"), 0, this, TQ_SLOT(slotApplyMask()), actionCollection(), "apply_mask"); m_removeMask = new TDEAction(i18n("Remove Mask"), 0, this, - TQT_SLOT(slotRemoveMask()), actionCollection(), "remove_mask"); + TQ_SLOT(slotRemoveMask()), actionCollection(), "remove_mask"); m_showMask = new TDEToggleAction(i18n( "Show Mask" ), 0, this, - TQT_SLOT(slotShowMask()), actionCollection(), "show_mask"); + TQ_SLOT(slotShowMask()), actionCollection(), "show_mask"); m_editMask = new TDEToggleAction(i18n( "Edit Mask" ), 0, this, - TQT_SLOT(slotEditMask()), actionCollection(), "edit_mask"); + TQ_SLOT(slotEditMask()), actionCollection(), "edit_mask"); // image actions - m_imgFlatten = new TDEAction(i18n("&Flatten Image"), "Ctrl+Shift+E", this, TQT_SLOT(flattenImage()), actionCollection(), "flatten_image"); - m_imgMergeLayer = new TDEAction(i18n("&Merge with Layer Below"), "Ctrl+E", this, TQT_SLOT(mergeLayer()), actionCollection(), "merge_layer"); + m_imgFlatten = new TDEAction(i18n("&Flatten Image"), "Ctrl+Shift+E", this, TQ_SLOT(flattenImage()), actionCollection(), "flatten_image"); + m_imgMergeLayer = new TDEAction(i18n("&Merge with Layer Below"), "Ctrl+E", this, TQ_SLOT(mergeLayer()), actionCollection(), "merge_layer"); // setting actions - KStdAction::preferences(this, TQT_SLOT(preferences()), actionCollection(), "preferences"); + KStdAction::preferences(this, TQ_SLOT(preferences()), actionCollection(), "preferences"); - m_RulerAction = new TDEToggleAction( i18n( "Show Rulers" ), "Ctrl+R", this, TQT_SLOT( showRuler() ), actionCollection(), "view_ruler" ); + m_RulerAction = new TDEToggleAction( i18n( "Show Rulers" ), "Ctrl+R", this, TQ_SLOT( showRuler() ), actionCollection(), "view_ruler" ); m_RulerAction->setChecked(cfg.showRulers()); m_RulerAction->setCheckedState(i18n("Hide Rulers")); m_RulerAction->setWhatsThis( i18n("The rulers show the horizontal and vertical positions of the mouse on the image " "and can be used to position your mouse at the right place on the canvas. <p>Uncheck this to disable " "the rulers from being displayed." ) ); - //m_guideAction = new TDEToggleAction( i18n( "Guide Lines" ), 0, this, TQT_SLOT( viewGuideLines() ), actionCollection(), "view_guidelines" ); + //m_guideAction = new TDEToggleAction( i18n( "Guide Lines" ), 0, this, TQ_SLOT( viewGuideLines() ), actionCollection(), "view_guidelines" ); // Add new palette - new TDEAction(i18n("Add New Palette..."), 0, this, TQT_SLOT(slotAddPalette()), + new TDEAction(i18n("Add New Palette..."), 0, this, TQ_SLOT(slotAddPalette()), actionCollection(), "add_palette"); - new TDEAction(i18n("Edit Palette..."), 0, this, TQT_SLOT(slotEditPalette()), + new TDEAction(i18n("Edit Palette..."), 0, this, TQ_SLOT(slotEditPalette()), actionCollection(), "edit_palette"); // XXX: This triggers a repaint of the image, but way too early @@ -2788,26 +2788,26 @@ void KisView::addPartLayer(KisGroupLayerSP parent, KisLayerSP above, const KoDoc delete m_partHandler; // Only one at a time m_partHandler = new KisPartLayerHandler(this, entry, parent, above); - disconnect(m_canvas, TQT_SIGNAL(sigGotButtonPressEvent(KisButtonPressEvent*)), this, 0); - disconnect(m_canvas, TQT_SIGNAL(sigGotButtonReleaseEvent(KisButtonReleaseEvent*)), this, 0); - disconnect(m_canvas, TQT_SIGNAL(sigGotMoveEvent(KisMoveEvent*)), this, 0); - disconnect(m_canvas, TQT_SIGNAL(sigGotKeyPressEvent(TQKeyEvent*)), this, 0); + disconnect(m_canvas, TQ_SIGNAL(sigGotButtonPressEvent(KisButtonPressEvent*)), this, 0); + disconnect(m_canvas, TQ_SIGNAL(sigGotButtonReleaseEvent(KisButtonReleaseEvent*)), this, 0); + disconnect(m_canvas, TQ_SIGNAL(sigGotMoveEvent(KisMoveEvent*)), this, 0); + disconnect(m_canvas, TQ_SIGNAL(sigGotKeyPressEvent(TQKeyEvent*)), this, 0); - connect(m_canvas, TQT_SIGNAL(sigGotButtonPressEvent(KisButtonPressEvent*)), - m_partHandler, TQT_SLOT(gotButtonPressEvent(KisButtonPressEvent*))); - connect(m_canvas, TQT_SIGNAL(sigGotButtonReleaseEvent(KisButtonReleaseEvent*)), - m_partHandler, TQT_SLOT(gotButtonReleaseEvent(KisButtonReleaseEvent*))); - connect(m_canvas, TQT_SIGNAL(sigGotMoveEvent(KisMoveEvent*)), - m_partHandler, TQT_SLOT(gotMoveEvent(KisMoveEvent*))); - connect(m_canvas, TQT_SIGNAL(sigGotKeyPressEvent(TQKeyEvent*)), - m_partHandler, TQT_SLOT(gotKeyPressEvent(TQKeyEvent*))); + connect(m_canvas, TQ_SIGNAL(sigGotButtonPressEvent(KisButtonPressEvent*)), + m_partHandler, TQ_SLOT(gotButtonPressEvent(KisButtonPressEvent*))); + connect(m_canvas, TQ_SIGNAL(sigGotButtonReleaseEvent(KisButtonReleaseEvent*)), + m_partHandler, TQ_SLOT(gotButtonReleaseEvent(KisButtonReleaseEvent*))); + connect(m_canvas, TQ_SIGNAL(sigGotMoveEvent(KisMoveEvent*)), + m_partHandler, TQ_SLOT(gotMoveEvent(KisMoveEvent*))); + connect(m_canvas, TQ_SIGNAL(sigGotKeyPressEvent(TQKeyEvent*)), + m_partHandler, TQ_SLOT(gotKeyPressEvent(TQKeyEvent*))); - connect(m_partHandler, TQT_SIGNAL(sigGotMoveEvent(KisMoveEvent*)), - this, TQT_SLOT(canvasGotMoveEvent(KisMoveEvent*))); - connect(m_partHandler, TQT_SIGNAL(sigGotKeyPressEvent(TQKeyEvent*)), - this, TQT_SLOT(canvasGotKeyPressEvent(TQKeyEvent*))); - connect(m_partHandler, TQT_SIGNAL(handlerDone()), - this, TQT_SLOT(reconnectAfterPartInsert())); + connect(m_partHandler, TQ_SIGNAL(sigGotMoveEvent(KisMoveEvent*)), + this, TQ_SLOT(canvasGotMoveEvent(KisMoveEvent*))); + connect(m_partHandler, TQ_SIGNAL(sigGotKeyPressEvent(TQKeyEvent*)), + this, TQ_SLOT(canvasGotKeyPressEvent(TQKeyEvent*))); + connect(m_partHandler, TQ_SIGNAL(handlerDone()), + this, TQ_SLOT(reconnectAfterPartInsert())); } void KisView::insertPart(const TQRect& viewRect, const KoDocumentEntry& entry, @@ -2835,14 +2835,14 @@ void KisView::insertPart(const TQRect& viewRect, const KoDocumentEntry& entry, } void KisView::reconnectAfterPartInsert() { - connect(m_canvas, TQT_SIGNAL(sigGotButtonPressEvent(KisButtonPressEvent*)), - this, TQT_SLOT(canvasGotButtonPressEvent(KisButtonPressEvent*))); - connect(m_canvas, TQT_SIGNAL(sigGotButtonReleaseEvent(KisButtonReleaseEvent*)), - this, TQT_SLOT(canvasGotButtonReleaseEvent(KisButtonReleaseEvent*))); - connect(m_canvas, TQT_SIGNAL(sigGotMoveEvent(KisMoveEvent*)), - this, TQT_SLOT(canvasGotMoveEvent(KisMoveEvent*))); - connect(m_canvas, TQT_SIGNAL(sigGotKeyPressEvent(TQKeyEvent*)), - this, TQT_SLOT(canvasGotKeyPressEvent(TQKeyEvent*))); + connect(m_canvas, TQ_SIGNAL(sigGotButtonPressEvent(KisButtonPressEvent*)), + this, TQ_SLOT(canvasGotButtonPressEvent(KisButtonPressEvent*))); + connect(m_canvas, TQ_SIGNAL(sigGotButtonReleaseEvent(KisButtonReleaseEvent*)), + this, TQ_SLOT(canvasGotButtonReleaseEvent(KisButtonReleaseEvent*))); + connect(m_canvas, TQ_SIGNAL(sigGotMoveEvent(KisMoveEvent*)), + this, TQ_SLOT(canvasGotMoveEvent(KisMoveEvent*))); + connect(m_canvas, TQ_SIGNAL(sigGotKeyPressEvent(TQKeyEvent*)), + this, TQ_SLOT(canvasGotKeyPressEvent(TQKeyEvent*))); delete m_partHandler; m_partHandler = 0; @@ -3162,52 +3162,52 @@ void KisView::setupCanvas() { m_canvas = new KisCanvas(this, "kis_canvas"); m_canvas->setFocusPolicy( TQWidget::StrongFocus ); - TQObject::connect(m_canvas, TQT_SIGNAL(sigGotButtonPressEvent(KisButtonPressEvent*)), this, TQT_SLOT(canvasGotButtonPressEvent(KisButtonPressEvent*))); - TQObject::connect(m_canvas, TQT_SIGNAL(sigGotButtonReleaseEvent(KisButtonReleaseEvent*)), this, TQT_SLOT(canvasGotButtonReleaseEvent(KisButtonReleaseEvent*))); - TQObject::connect(m_canvas, TQT_SIGNAL(sigGotDoubleClickEvent(KisDoubleClickEvent*)), this, TQT_SLOT(canvasGotDoubleClickEvent(KisDoubleClickEvent*))); - TQObject::connect(m_canvas, TQT_SIGNAL(sigGotMoveEvent(KisMoveEvent*)), this, TQT_SLOT(canvasGotMoveEvent(KisMoveEvent*))); - TQObject::connect(m_canvas, TQT_SIGNAL(sigGotPaintEvent(TQPaintEvent*)), this, TQT_SLOT(canvasGotPaintEvent(TQPaintEvent*))); - TQObject::connect(m_canvas, TQT_SIGNAL(sigGotEnterEvent(TQEvent*)), this, TQT_SLOT(canvasGotEnterEvent(TQEvent*))); - TQObject::connect(m_canvas, TQT_SIGNAL(sigGotLeaveEvent(TQEvent*)), this, TQT_SLOT(canvasGotLeaveEvent(TQEvent*))); - TQObject::connect(m_canvas, TQT_SIGNAL(sigGotMouseWheelEvent(TQWheelEvent*)), this, TQT_SLOT(canvasGotMouseWheelEvent(TQWheelEvent*))); - TQObject::connect(m_canvas, TQT_SIGNAL(sigGotKeyPressEvent(TQKeyEvent*)), this, TQT_SLOT(canvasGotKeyPressEvent(TQKeyEvent*))); - TQObject::connect(m_canvas, TQT_SIGNAL(sigGotKeyReleaseEvent(TQKeyEvent*)), this, TQT_SLOT(canvasGotKeyReleaseEvent(TQKeyEvent*))); - TQObject::connect(m_canvas, TQT_SIGNAL(sigGotDragEnterEvent(TQDragEnterEvent*)), this, TQT_SLOT(canvasGotDragEnterEvent(TQDragEnterEvent*))); - TQObject::connect(m_canvas, TQT_SIGNAL(sigGotDropEvent(TQDropEvent*)), this, TQT_SLOT(canvasGotDropEvent(TQDropEvent*))); + TQObject::connect(m_canvas, TQ_SIGNAL(sigGotButtonPressEvent(KisButtonPressEvent*)), this, TQ_SLOT(canvasGotButtonPressEvent(KisButtonPressEvent*))); + TQObject::connect(m_canvas, TQ_SIGNAL(sigGotButtonReleaseEvent(KisButtonReleaseEvent*)), this, TQ_SLOT(canvasGotButtonReleaseEvent(KisButtonReleaseEvent*))); + TQObject::connect(m_canvas, TQ_SIGNAL(sigGotDoubleClickEvent(KisDoubleClickEvent*)), this, TQ_SLOT(canvasGotDoubleClickEvent(KisDoubleClickEvent*))); + TQObject::connect(m_canvas, TQ_SIGNAL(sigGotMoveEvent(KisMoveEvent*)), this, TQ_SLOT(canvasGotMoveEvent(KisMoveEvent*))); + TQObject::connect(m_canvas, TQ_SIGNAL(sigGotPaintEvent(TQPaintEvent*)), this, TQ_SLOT(canvasGotPaintEvent(TQPaintEvent*))); + TQObject::connect(m_canvas, TQ_SIGNAL(sigGotEnterEvent(TQEvent*)), this, TQ_SLOT(canvasGotEnterEvent(TQEvent*))); + TQObject::connect(m_canvas, TQ_SIGNAL(sigGotLeaveEvent(TQEvent*)), this, TQ_SLOT(canvasGotLeaveEvent(TQEvent*))); + TQObject::connect(m_canvas, TQ_SIGNAL(sigGotMouseWheelEvent(TQWheelEvent*)), this, TQ_SLOT(canvasGotMouseWheelEvent(TQWheelEvent*))); + TQObject::connect(m_canvas, TQ_SIGNAL(sigGotKeyPressEvent(TQKeyEvent*)), this, TQ_SLOT(canvasGotKeyPressEvent(TQKeyEvent*))); + TQObject::connect(m_canvas, TQ_SIGNAL(sigGotKeyReleaseEvent(TQKeyEvent*)), this, TQ_SLOT(canvasGotKeyReleaseEvent(TQKeyEvent*))); + TQObject::connect(m_canvas, TQ_SIGNAL(sigGotDragEnterEvent(TQDragEnterEvent*)), this, TQ_SLOT(canvasGotDragEnterEvent(TQDragEnterEvent*))); + TQObject::connect(m_canvas, TQ_SIGNAL(sigGotDropEvent(TQDropEvent*)), this, TQ_SLOT(canvasGotDropEvent(TQDropEvent*))); } void KisView::connectCurrentImg() { if (m_image) { - connect(m_image, TQT_SIGNAL(sigActiveSelectionChanged(KisImageSP)), m_selectionManager, TQT_SLOT(imgSelectionChanged(KisImageSP))); - connect(m_image, TQT_SIGNAL(sigActiveSelectionChanged(KisImageSP)), this, TQT_SLOT(updateCanvas())); - connect(m_image, TQT_SIGNAL(sigColorSpaceChanged(KisColorSpace *)), this, TQT_SLOT(updateStatusBarProfileLabel())); - connect(m_image, TQT_SIGNAL(sigProfileChanged(KisProfile * )), TQT_SLOT(profileChanged(KisProfile * ))); - - connect(m_image, TQT_SIGNAL(sigLayersChanged(KisGroupLayerSP)), TQT_SLOT(layersUpdated())); - connect(m_image, TQT_SIGNAL(sigMaskInfoChanged()), TQT_SLOT(maskUpdated())); - connect(m_image, TQT_SIGNAL(sigLayerAdded(KisLayerSP)), TQT_SLOT(layersUpdated())); - connect(m_image, TQT_SIGNAL(sigLayerRemoved(KisLayerSP, KisGroupLayerSP, KisLayerSP)), TQT_SLOT(layersUpdated())); - connect(m_image, TQT_SIGNAL(sigLayerMoved(KisLayerSP, KisGroupLayerSP, KisLayerSP)), TQT_SLOT(layersUpdated())); - connect(m_image, TQT_SIGNAL(sigLayerActivated(KisLayerSP)), TQT_SLOT(layersUpdated())); - connect(m_image, TQT_SIGNAL(sigLayerActivated(KisLayerSP)), TQT_SLOT(updateCanvas())); - connect(m_image, TQT_SIGNAL(sigLayerPropertiesChanged(KisLayerSP)), TQT_SLOT(layersUpdated())); + connect(m_image, TQ_SIGNAL(sigActiveSelectionChanged(KisImageSP)), m_selectionManager, TQ_SLOT(imgSelectionChanged(KisImageSP))); + connect(m_image, TQ_SIGNAL(sigActiveSelectionChanged(KisImageSP)), this, TQ_SLOT(updateCanvas())); + connect(m_image, TQ_SIGNAL(sigColorSpaceChanged(KisColorSpace *)), this, TQ_SLOT(updateStatusBarProfileLabel())); + connect(m_image, TQ_SIGNAL(sigProfileChanged(KisProfile * )), TQ_SLOT(profileChanged(KisProfile * ))); + + connect(m_image, TQ_SIGNAL(sigLayersChanged(KisGroupLayerSP)), TQ_SLOT(layersUpdated())); + connect(m_image, TQ_SIGNAL(sigMaskInfoChanged()), TQ_SLOT(maskUpdated())); + connect(m_image, TQ_SIGNAL(sigLayerAdded(KisLayerSP)), TQ_SLOT(layersUpdated())); + connect(m_image, TQ_SIGNAL(sigLayerRemoved(KisLayerSP, KisGroupLayerSP, KisLayerSP)), TQ_SLOT(layersUpdated())); + connect(m_image, TQ_SIGNAL(sigLayerMoved(KisLayerSP, KisGroupLayerSP, KisLayerSP)), TQ_SLOT(layersUpdated())); + connect(m_image, TQ_SIGNAL(sigLayerActivated(KisLayerSP)), TQ_SLOT(layersUpdated())); + connect(m_image, TQ_SIGNAL(sigLayerActivated(KisLayerSP)), TQ_SLOT(updateCanvas())); + connect(m_image, TQ_SIGNAL(sigLayerPropertiesChanged(KisLayerSP)), TQ_SLOT(layersUpdated())); KisConnectPartLayerVisitor v(m_image, this, true); m_image->rootLayer()->accept(v); - connect(m_image, TQT_SIGNAL(sigLayerAdded(KisLayerSP)), - TQT_SLOT(handlePartLayerAdded(KisLayerSP))); + connect(m_image, TQ_SIGNAL(sigLayerAdded(KisLayerSP)), + TQ_SLOT(handlePartLayerAdded(KisLayerSP))); maskUpdated(); #ifdef HAVE_GL if (m_OpenGLImageContext != 0) { - connect(m_OpenGLImageContext, TQT_SIGNAL(sigImageUpdated(TQRect)), TQT_SLOT(slotOpenGLImageUpdated(TQRect))); - connect(m_OpenGLImageContext, TQT_SIGNAL(sigSizeChanged(TQ_INT32, TQ_INT32)), TQT_SLOT(slotImageSizeChanged(TQ_INT32, TQ_INT32))); + connect(m_OpenGLImageContext, TQ_SIGNAL(sigImageUpdated(TQRect)), TQ_SLOT(slotOpenGLImageUpdated(TQRect))); + connect(m_OpenGLImageContext, TQ_SIGNAL(sigSizeChanged(TQ_INT32, TQ_INT32)), TQ_SLOT(slotImageSizeChanged(TQ_INT32, TQ_INT32))); } else #endif { - connect(m_image, TQT_SIGNAL(sigImageUpdated(TQRect)), TQT_SLOT(imgUpdated(TQRect))); - connect(m_image, TQT_SIGNAL(sigSizeChanged(TQ_INT32, TQ_INT32)), TQT_SLOT(slotImageSizeChanged(TQ_INT32, TQ_INT32))); + connect(m_image, TQ_SIGNAL(sigImageUpdated(TQRect)), TQ_SLOT(imgUpdated(TQRect))); + connect(m_image, TQ_SIGNAL(sigSizeChanged(TQ_INT32, TQ_INT32)), TQ_SLOT(slotImageSizeChanged(TQ_INT32, TQ_INT32))); } } @@ -3239,8 +3239,8 @@ void KisView::handlePartLayerAdded(KisLayerSP layer) if (!l) return; - connect(this, TQT_SIGNAL(childActivated(KoDocumentChild*)), - layer, TQT_SLOT(childActivated(KoDocumentChild*))); + connect(this, TQ_SIGNAL(childActivated(KoDocumentChild*)), + layer, TQ_SLOT(childActivated(KoDocumentChild*))); } void KisView::imgUpdated(TQRect rc) @@ -3811,26 +3811,26 @@ void KisView::createDockers() m_hsvwidget = new KoHSVWidget(this, "hsv"); m_hsvwidget->setCaption(i18n("HSV")); - connect(m_hsvwidget, TQT_SIGNAL(sigFgColorChanged(const TQColor &)), this, TQT_SLOT(slotSetFGQColor(const TQColor &))); - connect(m_hsvwidget, TQT_SIGNAL(sigBgColorChanged(const TQColor &)), this, TQT_SLOT(slotSetBGQColor(const TQColor &))); - connect(this, TQT_SIGNAL(sigFGQColorChanged(const TQColor &)), m_hsvwidget, TQT_SLOT(setFgColor(const TQColor &))); - connect(this, TQT_SIGNAL(sigBGQColorChanged(const TQColor &)), m_hsvwidget, TQT_SLOT(setBgColor(const TQColor &))); + connect(m_hsvwidget, TQ_SIGNAL(sigFgColorChanged(const TQColor &)), this, TQ_SLOT(slotSetFGQColor(const TQColor &))); + connect(m_hsvwidget, TQ_SIGNAL(sigBgColorChanged(const TQColor &)), this, TQ_SLOT(slotSetBGQColor(const TQColor &))); + connect(this, TQ_SIGNAL(sigFGQColorChanged(const TQColor &)), m_hsvwidget, TQ_SLOT(setFgColor(const TQColor &))); + connect(this, TQ_SIGNAL(sigBGQColorChanged(const TQColor &)), m_hsvwidget, TQ_SLOT(setBgColor(const TQColor &))); m_paletteManager->addWidget( m_hsvwidget, "hsvwidget", chalk::COLORBOX, 0, PALETTE_DOCKER, true); m_rgbwidget = new KoRGBWidget(this, "rgb"); m_rgbwidget->setCaption(i18n("RGB")); - connect(m_rgbwidget, TQT_SIGNAL(sigFgColorChanged(const TQColor &)), this, TQT_SLOT(slotSetFGQColor(const TQColor &))); - connect(m_rgbwidget, TQT_SIGNAL(sigBgColorChanged(const TQColor &)), this, TQT_SLOT(slotSetBGQColor(const TQColor &))); - connect(this, TQT_SIGNAL(sigFGQColorChanged(const TQColor &)), m_rgbwidget, TQT_SLOT(setFgColor(const TQColor &))); - connect(this, TQT_SIGNAL(sigBGQColorChanged(const TQColor &)), m_rgbwidget, TQT_SLOT(setBgColor(const TQColor &))); + connect(m_rgbwidget, TQ_SIGNAL(sigFgColorChanged(const TQColor &)), this, TQ_SLOT(slotSetFGQColor(const TQColor &))); + connect(m_rgbwidget, TQ_SIGNAL(sigBgColorChanged(const TQColor &)), this, TQ_SLOT(slotSetBGQColor(const TQColor &))); + connect(this, TQ_SIGNAL(sigFGQColorChanged(const TQColor &)), m_rgbwidget, TQ_SLOT(setFgColor(const TQColor &))); + connect(this, TQ_SIGNAL(sigBGQColorChanged(const TQColor &)), m_rgbwidget, TQ_SLOT(setBgColor(const TQColor &))); m_paletteManager->addWidget( m_rgbwidget, "rgbwidget", chalk::COLORBOX); m_graywidget = new KoGrayWidget(this, "gray"); m_graywidget->setCaption(i18n("Gray")); - connect(m_graywidget, TQT_SIGNAL(sigFgColorChanged(const TQColor &)), this, TQT_SLOT(slotSetFGQColor(const TQColor &))); - connect(m_graywidget, TQT_SIGNAL(sigBgColorChanged(const TQColor &)), this, TQT_SLOT(slotSetBGQColor(const TQColor &))); - connect(this, TQT_SIGNAL(sigFGQColorChanged(const TQColor &)), m_graywidget, TQT_SLOT(setFgColor(const TQColor &))); - connect(this, TQT_SIGNAL(sigBGQColorChanged(const TQColor &)), m_graywidget, TQT_SLOT(setBgColor(const TQColor &))); + connect(m_graywidget, TQ_SIGNAL(sigFgColorChanged(const TQColor &)), this, TQ_SLOT(slotSetFGQColor(const TQColor &))); + connect(m_graywidget, TQ_SIGNAL(sigBgColorChanged(const TQColor &)), this, TQ_SLOT(slotSetBGQColor(const TQColor &))); + connect(this, TQ_SIGNAL(sigFGQColorChanged(const TQColor &)), m_graywidget, TQ_SLOT(setFgColor(const TQColor &))); + connect(this, TQ_SIGNAL(sigBGQColorChanged(const TQColor &)), m_graywidget, TQ_SLOT(setBgColor(const TQColor &))); m_paletteManager->addWidget( m_graywidget, "graywidget", chalk::COLORBOX); //make sure the color chooser get right default values @@ -3839,8 +3839,8 @@ void KisView::createDockers() m_palettewidget = new KisPaletteWidget(this); m_palettewidget->setCaption(i18n("Palettes")); - connect(m_palettewidget, TQT_SIGNAL(colorSelected(const TQColor &)), - this, TQT_SLOT(slotSetFGQColor(const TQColor &))); + connect(m_palettewidget, TQ_SIGNAL(colorSelected(const TQColor &)), + this, TQ_SLOT(slotSetFGQColor(const TQColor &))); // No BGColor or reverse slotFGChanged->palette connections, since that's not useful here KisResourceServerBase* rServer; @@ -3850,7 +3850,7 @@ void KisView::createDockers() for ( it = resources.begin(); it != resources.end(); ++it ) { m_palettewidget->slotAddPalette( *it ); } - connect(m_palettewidget, TQT_SIGNAL(colorSelected(const KisColor &)), this, TQT_SLOT(slotSetFGColor(const KisColor &))); + connect(m_palettewidget, TQ_SIGNAL(colorSelected(const KisColor &)), this, TQ_SLOT(slotSetFGColor(const KisColor &))); m_paletteManager->addWidget( m_palettewidget, "palettewidget", chalk::COLORBOX, 10, PALETTE_DOCKER, true); } @@ -3880,7 +3880,7 @@ TQPoint KisView::reverseViewTransformations(const TQPoint& p) const { void KisView::canvasAddChild(KoViewChild *child) { super::canvasAddChild(child); - connect(this, TQT_SIGNAL(viewTransformationsChanged()), child, TQT_SLOT(reposition())); + connect(this, TQ_SIGNAL(viewTransformationsChanged()), child, TQ_SLOT(reposition())); m_vScroll->raise(); m_hScroll->raise(); m_vScroll->raise(); @@ -3894,7 +3894,7 @@ void KisView::slotLoadingFinished() setCurrentImage(document()->currentImage()); m_paletteManager->showWidget( "layerbox" ); m_canvas->show(); - disconnect(document(), TQT_SIGNAL(loadingFinished()), this, TQT_SLOT(slotLoadingFinished())); + disconnect(document(), TQ_SIGNAL(loadingFinished()), this, TQ_SLOT(slotLoadingFinished())); m_imageLoaded = true; startInitialZoomTimerIfReady(); diff --git a/chalk/ui/kobirdeyepanel.cpp b/chalk/ui/kobirdeyepanel.cpp index 683caeba..8087c15b 100644 --- a/chalk/ui/kobirdeyepanel.cpp +++ b/chalk/ui/kobirdeyepanel.cpp @@ -71,14 +71,14 @@ KoBirdEyePanel::KoBirdEyePanel( KoZoomAdapter * zoomListener, m_page->view->installEventFilter(this); m_page->view->setBackgroundMode(TQt::NoBackground); - m_zoomIn = new TDEAction( i18n("Zoom In"), "birdeye_zoom_plus", 0, this, TQT_SLOT(zoomPlus()), this, "zoomIn" ); - m_zoomOut = new TDEAction( i18n("Zoom Out"), "birdeye_zoom_minus", 0, this, TQT_SLOT(zoomMinus()), this, "zoomOut" ); + m_zoomIn = new TDEAction( i18n("Zoom In"), "birdeye_zoom_plus", 0, this, TQ_SLOT(zoomPlus()), this, "zoomIn" ); + m_zoomOut = new TDEAction( i18n("Zoom Out"), "birdeye_zoom_minus", 0, this, TQ_SLOT(zoomMinus()), this, "zoomOut" ); l->addWidget(m_page); - connect(m_page->zoom, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(zoomValueChanged(int))); - connect(m_page->bn100, TQT_SIGNAL(clicked()), TQT_SLOT(zoom100())); - connect(m_page->slZoom, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(sliderChanged( int ))); + connect(m_page->zoom, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(zoomValueChanged(int))); + connect(m_page->bn100, TQ_SIGNAL(clicked()), TQ_SLOT(zoom100())); + connect(m_page->slZoom, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(sliderChanged( int ))); } KoBirdEyePanel::~KoBirdEyePanel() diff --git a/chalk/ui/layerlist.cpp b/chalk/ui/layerlist.cpp index 9bcf12ce..56cf628c 100644 --- a/chalk/ui/layerlist.cpp +++ b/chalk/ui/layerlist.cpp @@ -119,7 +119,7 @@ public: m_list( list ) { TQFrame::setPalette( TQToolTip::palette() ); - connect( &m_timer, TQT_SIGNAL( timeout() ), m_list, TQT_SLOT( hideTip() ) ); + connect( &m_timer, TQ_SIGNAL( timeout() ), m_list, TQ_SLOT( hideTip() ) ); tqApp->installEventFilter( this ); } @@ -302,12 +302,12 @@ LayerList::LayerList( TQWidget *parent, const char *name ) setNumRows( 2 ); - connect( this, TQT_SIGNAL( itemRenamed( TQListViewItem*, const TQString&, int ) ), - TQT_SLOT( slotItemRenamed( TQListViewItem*, const TQString&, int ) ) ); - connect( this, TQT_SIGNAL( moved( TQPtrList<TQListViewItem>&, TQPtrList<TQListViewItem>&, TQPtrList<TQListViewItem>& ) ), - TQT_SLOT( slotItemMoved( TQPtrList<TQListViewItem>&, TQPtrList<TQListViewItem>&, TQPtrList<TQListViewItem>& ) ) ); - connect( this, TQT_SIGNAL( onItem( TQListViewItem* ) ), TQT_SLOT( hideTip() ) ); - connect( this, TQT_SIGNAL( onViewport() ), TQT_SLOT( hideTip() ) ); + connect( this, TQ_SIGNAL( itemRenamed( TQListViewItem*, const TQString&, int ) ), + TQ_SLOT( slotItemRenamed( TQListViewItem*, const TQString&, int ) ) ); + connect( this, TQ_SIGNAL( moved( TQPtrList<TQListViewItem>&, TQPtrList<TQListViewItem>&, TQPtrList<TQListViewItem>& ) ), + TQ_SLOT( slotItemMoved( TQPtrList<TQListViewItem>&, TQPtrList<TQListViewItem>&, TQPtrList<TQListViewItem>& ) ) ); + connect( this, TQ_SIGNAL( onItem( TQListViewItem* ) ), TQ_SLOT( hideTip() ) ); + connect( this, TQ_SIGNAL( onViewport() ), TQ_SLOT( hideTip() ) ); } LayerList::~LayerList() @@ -1174,7 +1174,7 @@ bool LayerItem::mousePressEvent( TQMouseEvent *e ) { if ( !(e->state() & TQt::ControlButton) && !(e->state() & TQt::ShiftButton) ) setActive(); - TQTimer::singleShot( 0, listView(), TQT_SLOT( showContextMenu() ) ); + TQTimer::singleShot( 0, listView(), TQ_SLOT( showContextMenu() ) ); return false; } diff --git a/chalk/ui/squeezedcombobox.cpp b/chalk/ui/squeezedcombobox.cpp index 6656e35d..0723fe63 100644 --- a/chalk/ui/squeezedcombobox.cpp +++ b/chalk/ui/squeezedcombobox.cpp @@ -64,10 +64,10 @@ SqueezedComboBox::SqueezedComboBox( TQWidget *parent, const char *name ) m_timer = new TQTimer(this); m_tooltip = new SqueezedComboBoxTip( listBox()->viewport(), this ); - connect(m_timer, TQT_SIGNAL(timeout()), - TQT_SLOT(slotTimeOut())); - connect(this, TQT_SIGNAL(activated( int )), - TQT_SLOT(slotUpdateToolTip( int ))); + connect(m_timer, TQ_SIGNAL(timeout()), + TQ_SLOT(slotTimeOut())); + connect(this, TQ_SIGNAL(activated( int )), + TQ_SLOT(slotUpdateToolTip( int ))); } SqueezedComboBox::~SqueezedComboBox() |