diff options
Diffstat (limited to 'chalk/ui/kis_view.cc')
-rw-r--r-- | chalk/ui/kis_view.cc | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/chalk/ui/kis_view.cc b/chalk/ui/kis_view.cc index 629072ff..4455f17d 100644 --- a/chalk/ui/kis_view.cc +++ b/chalk/ui/kis_view.cc @@ -313,8 +313,8 @@ KisView::KisView(KisDoc *doc, KisUndoAdapter *adapter, TQWidget *parent, const c m_brushesAndStuffToolBar = new KisControlFrame(mainWindow(), this); // Load all plugins - KTrader::OfferList offers = KTrader::self()->query(TQString::fromLatin1("Chalk/ViewPlugin"), - TQString::fromLatin1("(Type == 'Service') and " + KTrader::OfferList offers = KTrader::self()->query(TQString::tqfromLatin1("Chalk/ViewPlugin"), + TQString::tqfromLatin1("(Type == 'Service') and " "([X-Chalk-Version] == 2)")); KTrader::OfferList::ConstIterator iter; for(iter = offers.begin(); iter != offers.end(); ++iter) @@ -494,11 +494,11 @@ void KisView::setupRulers() void KisView::updateStatusBarZoomLabel () { if (zoom() < 1 - EPSILON) { - m_statusBarZoomLabel->setText(i18n("Zoom %1%").arg(zoom() * 100, 0, 'g', 4)); + m_statusBarZoomLabel->setText(i18n("Zoom %1%").tqarg(zoom() * 100, 0, 'g', 4)); } else { - m_statusBarZoomLabel->setText(i18n("Zoom %1%").arg(zoom() * 100, 0, 'f', 0)); + m_statusBarZoomLabel->setText(i18n("Zoom %1%").tqarg(zoom() * 100, 0, 'f', 0)); } - m_statusBarZoomLabel->setMaximumWidth(m_statusBarZoomLabel->fontMetrics().width(i18n("Zoom %1%").arg("0.8888 "))); + m_statusBarZoomLabel->setMaximumWidth(m_statusBarZoomLabel->fontMetrics().width(i18n("Zoom %1%").tqarg("0.8888 "))); } void KisView::updateStatusBarSelectionLabel() @@ -513,7 +513,7 @@ void KisView::updateStatusBarSelectionLabel() if (dev) { if (dev->hasSelection()) { TQRect r = dev->selection()->selectedExactRect(); - m_statusBarSelectionLabel->setText( i18n("Selection Active: x = %1 y = %2 width = %3 height = %4").arg(r.x()).arg(r.y()).arg( r.width()).arg( r.height())); + m_statusBarSelectionLabel->setText( i18n("Selection Active: x = %1 y = %2 width = %3 height = %4").tqarg(r.x()).tqarg(r.y()).tqarg( r.width()).tqarg( r.height())); return; } } @@ -682,7 +682,7 @@ void KisView::setupActions() new KAction(i18n("Edit Palette..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditPalette()), actionCollection(), "edit_palette"); - // XXX: This triggers a repaint of the image, but way too early + // XXX: This triggers a tqrepaint of the image, but way too early //showRuler(); } @@ -694,7 +694,7 @@ void KisView::resizeEvent(TQResizeEvent *) } KisImageSP img = currentImg(); - TQ_INT32 scrollBarExtent = tqstyle().pixelMetric(TQStyle::PM_ScrollBarExtent); + TQ_INT32 scrollBarExtent = tqstyle().tqpixelMetric(TQStyle::PM_ScrollBarExtent); TQ_INT32 drawH; TQ_INT32 drawW; TQ_INT32 docW; @@ -858,7 +858,7 @@ void KisView::resizeEvent(TQResizeEvent *) if (!m_canvasPixmap.isNull() && !exposedRegion.isEmpty()) { - TQMemArray<TQRect> rects = exposedRegion.rects(); + TQMemArray<TQRect> rects = exposedRegion.tqrects(); for (unsigned int i = 0; i < rects.count(); i++) { TQRect r = rects[i]; @@ -958,11 +958,11 @@ void KisView::updateTQPaintDeviceCanvas(const TQRect& imageRect) TQRegion rg(vr); rg -= TQRegion(windowToView(TQRect(0, 0, img->width(), img->height()))); - TQMemArray<TQRect> rects = rg.rects(); + TQMemArray<TQRect> rects = rg.tqrects(); for (unsigned int i = 0; i < rects.count(); i++) { TQRect er = rects[i]; - gc.fillRect(er, colorGroup().mid()); + gc.fillRect(er, tqcolorGroup().mid()); } wr &= TQRect(0, 0, img->width(), img->height()); } @@ -1014,7 +1014,7 @@ void KisView::updateTQPaintDeviceCanvas(const TQRect& imageRect) } // paintGuides(); } else { - gc.fillRect(vr, colorGroup().mid()); + gc.fillRect(vr, tqcolorGroup().mid()); } } } @@ -1025,7 +1025,7 @@ void KisView::paintTQPaintDeviceView(const TQRegion& canvasRegion) Q_ASSERT(m_canvas->TQPaintDeviceWidget() != 0); if (m_canvas->TQPaintDeviceWidget() != 0 && !m_canvasPixmap.isNull()) { - TQMemArray<TQRect> rects = canvasRegion.rects(); + TQMemArray<TQRect> rects = canvasRegion.tqrects(); for (unsigned int i = 0; i < rects.count(); i++) { TQRect r = rects[i]; @@ -1066,7 +1066,7 @@ void KisView::paintOpenGLView(const TQRect& canvasRect) glDrawBuffer(GL_BACK); - TQColor widgetBackgroundColor = colorGroup().mid(); + TQColor widgetBackgroundColor = tqcolorGroup().mid(); glClearColor(widgetBackgroundColor.red() / 255.0, widgetBackgroundColor.green() / 255.0, widgetBackgroundColor.blue() / 255.0, 1.0); glClear(GL_COLOR_BUFFER_BIT); @@ -1226,7 +1226,7 @@ void KisView::updateCanvas(const TQRect& imageRect) } else { updateTQPaintDeviceCanvas(imageRect); //m_canvas->update(windowToView(imageRect)); - m_canvas->repaint(windowToView(imageRect)); + m_canvas->tqrepaint(windowToView(imageRect)); } } @@ -1241,7 +1241,7 @@ void KisView::refreshKisCanvas() updateCanvas(imageRect); // Enable this if updateCanvas does an m_canvas->update() - //m_canvas->repaint(); + //m_canvas->tqrepaint(); } void KisView::selectionDisplayToggled(bool displaySelection) @@ -2965,7 +2965,7 @@ void KisView::layerDuplicate() return; KisLayerSP dup = active->clone(); - dup->setName(i18n("Duplicate of '%1'").arg(active->name())); + dup->setName(i18n("Duplicate of '%1'").tqarg(active->name())); img->addLayer(dup, active->parent().data(), active); if (dup) { img->activate( dup ); @@ -3086,7 +3086,7 @@ void KisView::scrollH(int value) bitBlt(&m_canvasPixmap, xShift, 0, &m_canvasPixmap, 0, 0, m_canvasPixmap.width() - xShift, m_canvasPixmap.height()); updateTQPaintDeviceCanvas(viewToWindow(drawRect)); - m_canvas->repaint(); + m_canvas->tqrepaint(); } } else if (xShift < 0) { @@ -3098,7 +3098,7 @@ void KisView::scrollH(int value) bitBlt(&m_canvasPixmap, 0, 0, &m_canvasPixmap, -xShift, 0, m_canvasPixmap.width() + xShift, m_canvasPixmap.height()); updateTQPaintDeviceCanvas(viewToWindow(drawRect)); - m_canvas->repaint(); + m_canvas->tqrepaint(); } } if (m_oldTool) { @@ -3131,7 +3131,7 @@ void KisView::scrollV(int value) bitBlt(&m_canvasPixmap, 0, yShift, &m_canvasPixmap, 0, 0, m_canvasPixmap.width(), m_canvasPixmap.height() - yShift); updateTQPaintDeviceCanvas(viewToWindow(drawRect)); - m_canvas->repaint(); + m_canvas->tqrepaint(); } } else if (yShift < 0) { @@ -3143,7 +3143,7 @@ void KisView::scrollV(int value) bitBlt(&m_canvasPixmap, 0, 0, &m_canvasPixmap, 0, -yShift, m_canvasPixmap.width(), m_canvasPixmap.height() + yShift); updateTQPaintDeviceCanvas(viewToWindow(drawRect)); - m_canvas->repaint(); + m_canvas->tqrepaint(); } } if (m_oldTool) { @@ -3470,7 +3470,7 @@ bool KisView::eventFilter(TQObject *o, TQEvent *e) // We ignore device change due to mouse events for a short duration // after a tablet event, since these are almost certainly mouse events - // sent to receivers that don't accept the tablet event. + // sent to tqreceivers that don't accept the tablet event. m_tabletEventTimer.start(); break; } @@ -3544,7 +3544,7 @@ bool KisView::eventFilter(TQObject *o, TQEvent *e) mgr = img->guides(); if (e->type() == TQEvent::MouseMove && (me->state() & Qt::LeftButton)) { - bool flag = geometry().contains(pt); + bool flag = tqgeometry().contains(pt); KisGuideSP gd; if (m_currentGuide == 0 && flag) { |