diff options
Diffstat (limited to 'chalk')
-rw-r--r-- | chalk/plugins/filters/levelfilter/kgradientslider.cpp | 2 | ||||
-rw-r--r-- | chalk/plugins/viewplugins/colorrange/dlg_colorrange.cpp | 2 | ||||
-rw-r--r-- | chalk/plugins/viewplugins/screenshot/ksnapshot.cpp | 2 | ||||
-rw-r--r-- | chalk/ui/kcurve.cpp | 2 | ||||
-rw-r--r-- | chalk/ui/kis_canvas.cpp | 2 | ||||
-rw-r--r-- | chalk/ui/kis_canvas.h | 2 | ||||
-rw-r--r-- | chalk/ui/kis_color_cup.cpp | 2 | ||||
-rw-r--r-- | chalk/ui/kis_controlframe.cpp | 8 | ||||
-rw-r--r-- | chalk/ui/kis_layerlist.cpp | 2 | ||||
-rw-r--r-- | chalk/ui/kis_palette_widget.cpp | 2 | ||||
-rw-r--r-- | chalk/ui/kis_previewwidget.cpp | 4 | ||||
-rw-r--r-- | chalk/ui/kis_view.cpp | 4 | ||||
-rw-r--r-- | chalk/ui/layerlist.cpp | 4 |
13 files changed, 19 insertions, 19 deletions
diff --git a/chalk/plugins/filters/levelfilter/kgradientslider.cpp b/chalk/plugins/filters/levelfilter/kgradientslider.cpp index b36e5ce9..ca5725bd 100644 --- a/chalk/plugins/filters/levelfilter/kgradientslider.cpp +++ b/chalk/plugins/filters/levelfilter/kgradientslider.cpp @@ -47,7 +47,7 @@ KGradientSlider::KGradientSlider(TQWidget *parent, const char *name, WFlags f) m_whitecursor = 255; m_gamma = 1.0; m_gammaEnabled = false; - setFocusPolicy(TQ_StrongFocus); + setFocusPolicy(TQWidget::StrongFocus); } KGradientSlider::~KGradientSlider() diff --git a/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cpp b/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cpp index 82748f4c..b6b52860 100644 --- a/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cpp +++ b/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cpp @@ -239,7 +239,7 @@ void DlgColorRange::updatePreview() TQ_INT32 x, y, w, h; m_dev->exactBounds(x, y, w, h); - TQPixmap pix = TQPixmap(m_selection->maskImage().smoothScale(350, 350, TQ_ScaleMin)); + TQPixmap pix = TQPixmap(m_selection->maskImage().smoothScale(350, 350, TQImage::ScaleMin)); m_subject->canvasController()->updateCanvas(); m_page->pixSelection->setPixmap(pix); } diff --git a/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp b/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp index 7fb3668f..783e2a1d 100644 --- a/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp +++ b/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp @@ -236,7 +236,7 @@ void KSnapshot::slotPrint() neww = newh/h*w; } - img = img.smoothScale( int(neww), int(newh), TQ_ScaleMin ); + img = img.smoothScale( int(neww), int(newh), TQImage::ScaleMin ); tqApp->processEvents(); int x = (metrics.width()-img.width())/2; diff --git a/chalk/ui/kcurve.cpp b/chalk/ui/kcurve.cpp index b6bd5162..086bcb55 100644 --- a/chalk/ui/kcurve.cpp +++ b/chalk/ui/kcurve.cpp @@ -61,7 +61,7 @@ KCurve::KCurve(TQWidget *parent, const char *name, WFlags f) p->first = 1.0; p->second=1.0; m_points.append(p); m_points.setAutoDelete(true); - setFocusPolicy(TQ_StrongFocus); + setFocusPolicy(TQWidget::StrongFocus); } KCurve::~KCurve() diff --git a/chalk/ui/kis_canvas.cpp b/chalk/ui/kis_canvas.cpp index 63ae4ab0..f001c5bd 100644 --- a/chalk/ui/kis_canvas.cpp +++ b/chalk/ui/kis_canvas.cpp @@ -1284,7 +1284,7 @@ void KisCanvas::updateGeometry() dynamic_cast<TQWidget *>(m_canvasWidget)->updateGeometry(); } -void KisCanvas::setFocusPolicy(TQ_FocusPolicy focusPolicy) +void KisCanvas::setFocusPolicy(TQWidget::FocusPolicy focusPolicy) { Q_ASSERT(m_canvasWidget); dynamic_cast<TQWidget *>(m_canvasWidget)->setFocusPolicy(focusPolicy); diff --git a/chalk/ui/kis_canvas.h b/chalk/ui/kis_canvas.h index 6ab2c680..737ca5d8 100644 --- a/chalk/ui/kis_canvas.h +++ b/chalk/ui/kis_canvas.h @@ -362,7 +362,7 @@ protected: void setUpdatesEnabled(bool updatesEnabled); bool isUpdatesEnabled() const; - void setFocusPolicy(TQ_FocusPolicy focusPolicy); + void setFocusPolicy(TQWidget::FocusPolicy focusPolicy); const TQCursor& cursor() const; void setCursor(const TQCursor& cursor); diff --git a/chalk/ui/kis_color_cup.cpp b/chalk/ui/kis_color_cup.cpp index ae0ddfac..198cb01f 100644 --- a/chalk/ui/kis_color_cup.cpp +++ b/chalk/ui/kis_color_cup.cpp @@ -48,7 +48,7 @@ KisColorPopup::KisColorPopup(TQColor c, TQWidget * parent, const char * name) { m_color = c; setMargin(4); - setFocusPolicy(TQ_StrongFocus); + setFocusPolicy(TQWidget::StrongFocus); TQHBoxLayout * l = new TQHBoxLayout(this); l->add(m_khsSelector = new KHSSelector(this)); m_khsSelector->setMinimumSize(140, 7); diff --git a/chalk/ui/kis_controlframe.cpp b/chalk/ui/kis_controlframe.cpp index e5a8ce1b..85f30454 100644 --- a/chalk/ui/kis_controlframe.cpp +++ b/chalk/ui/kis_controlframe.cpp @@ -63,7 +63,7 @@ KisPopupFrame::KisPopupFrame(TQWidget * parent, const char* name) : TQPopupMenu(parent, name) { - setFocusPolicy(TQ_StrongFocus); + setFocusPolicy(TQWidget::StrongFocus); } void KisPopupFrame::keyPressEvent(TQKeyEvent * e) @@ -222,7 +222,7 @@ void KisControlFrame::createBrushesChooser(KisView * view) TQTabWidget * m_brushesTab = new TQTabWidget(m_brushChooserPopup, "brushestab"); m_brushesTab->setTabShape(TQTabWidget::Triangular); - m_brushesTab->setFocusPolicy(TQ_NoFocus); + m_brushesTab->setFocusPolicy(TQWidget::NoFocus); m_brushesTab->setFont(m_font); m_brushesTab->setMargin(1); @@ -274,7 +274,7 @@ void KisControlFrame::createPatternsChooser(KisView * view) TQTabWidget * m_patternsTab = new TQTabWidget(m_patternChooserPopup, "patternstab"); m_patternsTab->setTabShape(TQTabWidget::Triangular); - m_patternsTab->setFocusPolicy(TQ_NoFocus); + m_patternsTab->setFocusPolicy(TQWidget::NoFocus); m_patternsTab->setFont(m_font); m_patternsTab->setMargin(1); l2->add( m_patternsTab ); @@ -315,7 +315,7 @@ void KisControlFrame::createGradientsChooser(KisView * view) TQTabWidget * m_gradientTab = new TQTabWidget(m_gradientChooserPopup, "gradientstab"); m_gradientTab->setTabShape(TQTabWidget::Triangular); - m_gradientTab->setFocusPolicy(TQ_NoFocus); + m_gradientTab->setFocusPolicy(TQWidget::NoFocus); m_gradientTab->setFont(m_font); m_gradientTab->setMargin(1); diff --git a/chalk/ui/kis_layerlist.cpp b/chalk/ui/kis_layerlist.cpp index bfae8282..5839634d 100644 --- a/chalk/ui/kis_layerlist.cpp +++ b/chalk/ui/kis_layerlist.cpp @@ -212,7 +212,7 @@ TQImage KisLayerItem::tooltipPreview() const return img; //so TQt doesn't complain img.setAlphaBuffer( true ); const int size = kMin( 200, kMax( img.width(), img.height() ) ); - return img.smoothScale( size, size, TQ_ScaleMin ); + return img.smoothScale( size, size, TQImage::ScaleMin ); } //void KisLayerItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int align ); diff --git a/chalk/ui/kis_palette_widget.cpp b/chalk/ui/kis_palette_widget.cpp index e04b0494..4fe899e2 100644 --- a/chalk/ui/kis_palette_widget.cpp +++ b/chalk/ui/kis_palette_widget.cpp @@ -70,7 +70,7 @@ KisPaletteWidget::KisPaletteWidget( TQWidget *parent, int minWidth, int cols) TQVBoxLayout *layout = new TQVBoxLayout( this ); combo = new TQComboBox( false, this ); - combo->setFocusPolicy( TQ_ClickFocus ); + combo->setFocusPolicy( TQWidget::ClickFocus ); layout->addWidget(combo); m_view = new KisPaletteView(this, 0, minWidth, cols); diff --git a/chalk/ui/kis_previewwidget.cpp b/chalk/ui/kis_previewwidget.cpp index f60755a1..a95c4920 100644 --- a/chalk/ui/kis_previewwidget.cpp +++ b/chalk/ui/kis_previewwidget.cpp @@ -169,7 +169,7 @@ void KisPreviewWidget::updateZoom() int sh = int(ceil(m_zoom * h / m_filterZoom)); m_dirtyPreview = false; m_scaledPreview = m_previewDevice->convertToTQImage(m_profile, 0, 0, w, h); - m_scaledPreview = m_scaledPreview.scale(sw,sh, TQ_ScaleMax); // Use scale instead of smoothScale for speed up + m_scaledPreview = m_scaledPreview.scale(sw,sh, TQImage::ScaleMax); // Use scale instead of smoothScale for speed up } m_preview->setImage(m_scaledPreview); } else @@ -182,7 +182,7 @@ void KisPreviewWidget::updateZoom() int sh = int(ceil(m_zoom * h)); m_dirtyOriginal = false; m_scaledOriginal = m_origDevice->convertToTQImage(m_profile, 0, 0, w, h); - m_scaledOriginal = m_scaledOriginal.scale(sw,sh, TQ_ScaleMax); // Use scale instead of smoothScale for speed up + m_scaledOriginal = m_scaledOriginal.scale(sw,sh, TQImage::ScaleMax); // Use scale instead of smoothScale for speed up } m_preview->setImage(m_scaledOriginal); } diff --git a/chalk/ui/kis_view.cpp b/chalk/ui/kis_view.cpp index bf029fb1..439423c7 100644 --- a/chalk/ui/kis_view.cpp +++ b/chalk/ui/kis_view.cpp @@ -244,7 +244,7 @@ KisView::KisView(KisDoc *doc, KisUndoAdapter *adapter, TQWidget *parent, const c KisConfig cfg; m_currentColorChooserDisplay = KisID("BLA"); - setFocusPolicy( TQ_StrongFocus ); + setFocusPolicy( TQWidget::StrongFocus ); // Must come before input devices are referenced as this detects them. #ifdef Q_WS_X11 @@ -3161,7 +3161,7 @@ void KisView::scrollV(int value) void KisView::setupCanvas() { m_canvas = new KisCanvas(this, "kis_canvas"); - m_canvas->setFocusPolicy( TQ_StrongFocus ); + m_canvas->setFocusPolicy( TQWidget::StrongFocus ); TQObject::connect(m_canvas, TQT_SIGNAL(sigGotButtonPressEvent(KisButtonPressEvent*)), TQT_TQOBJECT(this), TQT_SLOT(canvasGotButtonPressEvent(KisButtonPressEvent*))); TQObject::connect(m_canvas, TQT_SIGNAL(sigGotButtonReleaseEvent(KisButtonReleaseEvent*)), TQT_TQOBJECT(this), TQT_SLOT(canvasGotButtonReleaseEvent(KisButtonReleaseEvent*))); TQObject::connect(m_canvas, TQT_SIGNAL(sigGotDoubleClickEvent(KisDoubleClickEvent*)), TQT_TQOBJECT(this), TQT_SLOT(canvasGotDoubleClickEvent(KisDoubleClickEvent*))); diff --git a/chalk/ui/layerlist.cpp b/chalk/ui/layerlist.cpp index c7e97305..c15c6d5e 100644 --- a/chalk/ui/layerlist.cpp +++ b/chalk/ui/layerlist.cpp @@ -179,7 +179,7 @@ public: if( !m_img.isNull() ) { if( m_img.width() > MAX_SIZE || m_img.height() > MAX_SIZE ) - m_img = m_img.scale( MAX_SIZE, MAX_SIZE, TQ_ScaleMin ); + m_img = m_img.scale( MAX_SIZE, MAX_SIZE, TQImage::ScaleMin ); int y = 0; if( m_img.height() < text.height() ) y = text.height()/2 - m_img.height()/2; @@ -1128,7 +1128,7 @@ void LayerItem::drawPreview( TQPainter *p, const TQColorGroup &/*cg*/, const TQR if( d->previewChanged || r.size() != d->previewSize ) { //TODO handle width() != height() const int size = kMin( r.width(), kMax( previewImage()->width(), previewImage()->height() ) ); - const TQImage i = previewImage()->smoothScale( size, size, TQ_ScaleMin ); + const TQImage i = previewImage()->smoothScale( size, size, TQImage::ScaleMin ); d->scaledPreview.convertFromImage( i ); d->previewOffset.setX( r.width()/2 - i.width()/2 ); d->previewOffset.setY( r.height()/2 - i.height()/2 ); |