diff options
Diffstat (limited to 'chalk/ui')
33 files changed, 111 insertions, 111 deletions
diff --git a/chalk/ui/kcurve.cc b/chalk/ui/kcurve.cc index c7f9e0ad8..1d7932cb4 100644 --- a/chalk/ui/kcurve.cc +++ b/chalk/ui/kcurve.cc @@ -73,21 +73,21 @@ void KCurve::reset(void) { m_grab_point = NULL; m_guideVisible = false; - tqrepaint(false); + repaint(false); } void KCurve::setCurveGuide(TQColor color) { m_guideVisible = true; m_colorGuide = color; - tqrepaint(false); + repaint(false); } void KCurve::setPixmap(TQPixmap pix) { if (m_pix) delete m_pix; m_pix = new TQPixmap(pix); - tqrepaint(false); + repaint(false); } void KCurve::keyPressEvent(TQKeyEvent *e) @@ -113,7 +113,7 @@ void KCurve::keyPressEvent(TQKeyEvent *e) m_points.remove(m_grab_point); } m_grab_point = closest_point; - tqrepaint(false); + repaint(false); } else TQWidget::keyPressEvent(e); @@ -133,7 +133,7 @@ void KCurve::paintEvent(TQPaintEvent *) TQPixmap pm(size()); TQPainter p1; - p1.tqbegin(TQT_TQPAINTDEVICE(&pm), this); + p1.begin(TQT_TQPAINTDEVICE(&pm), this); // draw background if(m_pix) @@ -281,7 +281,7 @@ void KCurve::mousePressEvent ( TQMouseEvent * e ) } p = m_points.next(); } - tqrepaint(false); + repaint(false); } void KCurve::mouseReleaseEvent ( TQMouseEvent * e ) @@ -293,7 +293,7 @@ void KCurve::mouseReleaseEvent ( TQMouseEvent * e ) setCursor( KCursor::arrowCursor() ); m_dragging = false; - tqrepaint(false); + repaint(false); emit modified(); } @@ -304,7 +304,7 @@ void KCurve::mouseMoveEvent ( TQMouseEvent * e ) double x = e->pos().x() / (float)width(); double y = 1.0 - e->pos().y() / (float)height(); - if (m_dragging == false) // If no point is selected set the the cursor tqshape if on top + if (m_dragging == false) // If no point is selected set the the cursor shape if on top { double distance = 1000; double ydistance = 1000; @@ -349,7 +349,7 @@ void KCurve::mouseMoveEvent ( TQMouseEvent * e ) emit modified(); } - tqrepaint(false); + repaint(false); } double KCurve::getCurveValue(double x) diff --git a/chalk/ui/kis_autogradient.cc b/chalk/ui/kis_autogradient.cc index 318bf3055..bd5b80fb4 100644 --- a/chalk/ui/kis_autogradient.cc +++ b/chalk/ui/kis_autogradient.cc @@ -113,7 +113,7 @@ void KisAutogradient::slotChangedRightColor( const TQColor& color) KisGradientSegment* segment = gradientSlider->selectedSegment(); if(segment) segment->setEndColor( Color( color, segment->endColor().alpha() ) ); - gradientSlider->tqrepaint(); + gradientSlider->repaint(); paramChanged(); } @@ -123,7 +123,7 @@ void KisAutogradient::slotChangedLeftOpacity( int value ) KisGradientSegment* segment = gradientSlider->selectedSegment(); if(segment) segment->setStartColor( Color( segment->startColor().color(), (double)value / 100 ) ); - gradientSlider->tqrepaint(false); + gradientSlider->repaint(false); paramChanged(); } @@ -133,7 +133,7 @@ void KisAutogradient::slotChangedRightOpacity( int value ) KisGradientSegment* segment = gradientSlider->selectedSegment(); if(segment) segment->setEndColor( Color( segment->endColor().color(), (double)value / 100 ) ); - gradientSlider->tqrepaint(false); + gradientSlider->repaint(false); paramChanged(); } diff --git a/chalk/ui/kis_brush_chooser.cc b/chalk/ui/kis_brush_chooser.cc index 20de3c5b7..894db607e 100644 --- a/chalk/ui/kis_brush_chooser.cc +++ b/chalk/ui/kis_brush_chooser.cc @@ -89,7 +89,7 @@ void KisBrushChooser::update(KoIconItem *item) if (kisItem) { KisBrush *brush = static_cast<KisBrush *>(kisItem->resource()); - TQString text = TQString("%1 (%2 x %3)").tqarg(brush->name()).tqarg(brush->width()).tqarg(brush->height()); + TQString text = TQString("%1 (%2 x %3)").arg(brush->name()).arg(brush->width()).arg(brush->height()); m_lbName->setText(text); m_slSpacing->setValue(brush->spacing()); diff --git a/chalk/ui/kis_canvas.cc b/chalk/ui/kis_canvas.cc index 168724186..d38c7ea10 100644 --- a/chalk/ui/kis_canvas.cc +++ b/chalk/ui/kis_canvas.cc @@ -1235,34 +1235,34 @@ void KisCanvas::update(int x, int y, int width, int height) dynamic_cast<TQWidget *>(m_canvasWidget)->update(x, y, width, height); } -void KisCanvas::tqrepaint() +void KisCanvas::repaint() { Q_ASSERT(m_canvasWidget); - dynamic_cast<TQWidget *>(m_canvasWidget)->tqrepaint(); + dynamic_cast<TQWidget *>(m_canvasWidget)->repaint(); } -void KisCanvas::tqrepaint(bool erase) +void KisCanvas::repaint(bool erase) { Q_ASSERT(m_canvasWidget); - dynamic_cast<TQWidget *>(m_canvasWidget)->tqrepaint(erase); + dynamic_cast<TQWidget *>(m_canvasWidget)->repaint(erase); } -void KisCanvas::tqrepaint(int x, int y, int width, int height, bool erase) +void KisCanvas::repaint(int x, int y, int width, int height, bool erase) { Q_ASSERT(m_canvasWidget); - dynamic_cast<TQWidget *>(m_canvasWidget)->tqrepaint(x, y, width, height, erase); + dynamic_cast<TQWidget *>(m_canvasWidget)->repaint(x, y, width, height, erase); } -void KisCanvas::tqrepaint(const TQRect& r, bool erase) +void KisCanvas::repaint(const TQRect& r, bool erase) { Q_ASSERT(m_canvasWidget); - dynamic_cast<TQWidget *>(m_canvasWidget)->tqrepaint(r, erase); + dynamic_cast<TQWidget *>(m_canvasWidget)->repaint(r, erase); } -void KisCanvas::tqrepaint(const TQRegion& r, bool erase) +void KisCanvas::repaint(const TQRegion& r, bool erase) { Q_ASSERT(m_canvasWidget); - dynamic_cast<TQWidget *>(m_canvasWidget)->tqrepaint(r, erase); + dynamic_cast<TQWidget *>(m_canvasWidget)->repaint(r, erase); } bool KisCanvas::isUpdatesEnabled() const diff --git a/chalk/ui/kis_canvas.h b/chalk/ui/kis_canvas.h index 4d92a4ce9..5f7174688 100644 --- a/chalk/ui/kis_canvas.h +++ b/chalk/ui/kis_canvas.h @@ -313,11 +313,11 @@ public: void update(); void update(const TQRect& r); void update(int x, int y, int width, int height); - void tqrepaint(); - void tqrepaint(bool erase); - void tqrepaint(int x, int y, int width, int height, bool erase = true); - void tqrepaint(const TQRect& r, bool erase = true); - void tqrepaint(const TQRegion& r, bool erase = true); + void repaint(); + void repaint(bool erase); + void repaint(int x, int y, int width, int height, bool erase = true); + void repaint(const TQRect& r, bool erase = true); + void repaint(const TQRegion& r, bool erase = true); void updateGeometry(); diff --git a/chalk/ui/kis_custom_palette.cc b/chalk/ui/kis_custom_palette.cc index f84bf24d1..ac762953e 100644 --- a/chalk/ui/kis_custom_palette.cc +++ b/chalk/ui/kis_custom_palette.cc @@ -136,7 +136,7 @@ void KisCustomPalette::slotAddPredefined() { if (!m_palette->save()) { KMessageBox::error(0, i18n("Cannot write to palette file %1. Maybe it is read-only.") - .tqarg(m_palette->filename()), i18n("Palette")); + .arg(m_palette->filename()), i18n("Palette")); return; } diff --git a/chalk/ui/kis_dlg_preferences.cc b/chalk/ui/kis_dlg_preferences.cc index f898b497b..14b19c8bb 100644 --- a/chalk/ui/kis_dlg_preferences.cc +++ b/chalk/ui/kis_dlg_preferences.cc @@ -383,7 +383,7 @@ TabletSettingsTab::TabletDeviceSettingsDialog::TabletDeviceSettingsDialog(const TQWidget *parent, const char *name) : super(parent, name, true, "", Ok | Cancel) { - setCaption(i18n("Configure %1").tqarg(deviceName)); + setCaption(i18n("Configure %1").arg(deviceName)); m_page = new WdgTabletDeviceSettings(this); diff --git a/chalk/ui/kis_doc.cc b/chalk/ui/kis_doc.cc index 6bae7e781..70141dead 100644 --- a/chalk/ui/kis_doc.cc +++ b/chalk/ui/kis_doc.cc @@ -347,7 +347,7 @@ bool KisDoc::loadXML(TQIODevice *, const TQDomDocument& doc) } bool KisDoc::loadChildren(KoStore* store) { - TQPtrListIterator<KoDocumentChild> it(tqchildren()); + TQPtrListIterator<KoDocumentChild> it(children()); for( ; it.current(); ++it ) { if (!it.current()->loadDocument(store)) { return false; diff --git a/chalk/ui/kis_filter_manager.cc b/chalk/ui/kis_filter_manager.cc index dc5beadf1..24569402f 100644 --- a/chalk/ui/kis_filter_manager.cc +++ b/chalk/ui/kis_filter_manager.cc @@ -168,7 +168,7 @@ void KisFilterManager::setup(KActionCollection * ac) // Create action KAction * a = new KAction(f->menuEntry(), 0, m_filterMapper, TQT_SLOT(map()), ac, - TQString("chalk_filter_%1").tqarg((*it) . id()).ascii()); + TQString("chalk_filter_%1").arg((*it) . id()).ascii()); // Add action to the right submenu KActionMenu * m = m_filterActionMenus.find( f->menuCategory() ); @@ -320,8 +320,8 @@ void KisFilterManager::slotApplyFilter(int i) if (m_lastFilter->colorSpaceIndependence() == TO_LAB16) { if (KMessageBox::warningContinueCancel(m_view, i18n("The %1 filter will convert your %2 data to 16-bit L*a*b* and vice versa. ") - .tqarg(m_lastFilter->id().name()) - .tqarg(dev->colorSpace()->id().name()), + .arg(m_lastFilter->id().name()) + .arg(dev->colorSpace()->id().name()), i18n("Filter Will Convert Your Layer Data"), KGuiItem(i18n("Continue")), "lab16degradation") != KMessageBox::Continue) return; @@ -330,8 +330,8 @@ void KisFilterManager::slotApplyFilter(int i) else if (m_lastFilter->colorSpaceIndependence() == TO_RGBA8) { if (KMessageBox::warningContinueCancel(m_view, i18n("The %1 filter will convert your %2 data to 8-bit RGBA and vice versa. ") - .tqarg(m_lastFilter->id().name()) - .tqarg(dev->colorSpace()->id().name()), + .arg(m_lastFilter->id().name()) + .arg(dev->colorSpace()->id().name()), i18n("Filter Will Convert Your Layer Data"), KGuiItem(i18n("Continue")), "rgba8degradation") != KMessageBox::Continue) return; diff --git a/chalk/ui/kis_gradient_slider_widget.cc b/chalk/ui/kis_gradient_slider_widget.cc index 10d20796d..a8fdf71e7 100644 --- a/chalk/ui/kis_gradient_slider_widget.cc +++ b/chalk/ui/kis_gradient_slider_widget.cc @@ -155,7 +155,7 @@ void KisGradientSliderWidget::mousePressEvent( TQMouseEvent * e ) emit sigSelectedSegment( m_selectedSegment ); } } - tqrepaint(false); + repaint(false); } void KisGradientSliderWidget::mouseReleaseEvent ( TQMouseEvent * e ) @@ -186,7 +186,7 @@ void KisGradientSliderWidget::mouseMoveEvent( TQMouseEvent * e ) if ( m_drag != NO_DRAG) emit sigChangedSegment( m_currentSegment ); - tqrepaint(false); + repaint(false); } void KisGradientSliderWidget::contextMenuEvent( TQContextMenuEvent * e ) @@ -213,7 +213,7 @@ void KisGradientSliderWidget::slotMenuAction( int id ) break; } emit sigSelectedSegment( m_selectedSegment ); - tqrepaint(false); + repaint(false); } #include "kis_gradient_slider_widget.moc" diff --git a/chalk/ui/kis_layerbox.cc b/chalk/ui/kis_layerbox.cc index e9a1bf2dd..28235e8bc 100644 --- a/chalk/ui/kis_layerbox.cc +++ b/chalk/ui/kis_layerbox.cc @@ -594,7 +594,7 @@ TQPixmap KisLayerBox::loadPixmap(const TQString& filename, const KIconLoader& TQPixmap pixmap = il.loadIcon(filename, KIcon::NoGroup, size); if (pixmap.isNull()) - KMessageBox::error(0, i18n("Cannot find %1").tqarg(filename), + KMessageBox::error(0, i18n("Cannot find %1").arg(filename), i18n("Canvas")); return pixmap; @@ -626,7 +626,7 @@ void KisLayerBox::printChalkLayers() const return; TQString s = root->name(); if( dynamic_cast<KisGroupLayer*>( root ) ) - s = TQString("[%1]").tqarg( s ); + s = TQString("[%1]").arg( s ); if( m_image->activeLayer().data() == root ) s.prepend("*"); kdDebug() << (TQString().fill(' ', indent) + s) << endl; @@ -658,7 +658,7 @@ void KisLayerBox::printLayerboxLayers() const } TQString s = root->displayName(); if( root->isFolder() ) - s = TQString("[%1]").tqarg( s ); + s = TQString("[%1]").arg( s ); if( list()->activeLayer() == root ) s.prepend("*"); kdDebug() << (TQString().fill(' ', indent) + s) << endl; diff --git a/chalk/ui/kis_layerlist.cc b/chalk/ui/kis_layerlist.cc index 985bd0c69..24ae27382 100644 --- a/chalk/ui/kis_layerlist.cc +++ b/chalk/ui/kis_layerlist.cc @@ -181,16 +181,16 @@ TQString KisLayerItem::tooltip() const TQString text = super::tooltip(); text = text.left( text.length() - 8 ); //HACK -- strip the </table> TQString row = "<tr><td>%1</td><td>%2</td></tr>"; - text += row.tqarg( i18n( "Opacity:" ) ).tqarg( "%1%" ).tqarg( int( float( m_layer->opacity() * 100 ) / 255 + 0.5 ) ); - text += row.tqarg( i18n( "Composite mode:" ) ).tqarg( m_layer->compositeOp().id().name() ); + text += row.arg( i18n( "Opacity:" ) ).arg( "%1%" ).arg( int( float( m_layer->opacity() * 100 ) / 255 + 0.5 ) ); + text += row.arg( i18n( "Composite mode:" ) ).arg( m_layer->compositeOp().id().name() ); if( KisPaintLayer *player = dynamic_cast<KisPaintLayer*>( m_layer ) ) { - text += row.tqarg( i18n( "Colorspace:" ) ).tqarg( player->paintDevice()->colorSpace()->id().name() ); + text += row.arg( i18n( "Colorspace:" ) ).arg( player->paintDevice()->colorSpace()->id().name() ); if( KisProfile *profile = player->paintDevice()->colorSpace()->getProfile() ) - text += row.tqarg( i18n( "Profile:" ) ).tqarg( profile->productName() ); + text += row.arg( i18n( "Profile:" ) ).arg( profile->productName() ); } if( KisAdjustmentLayer *alayer = dynamic_cast<KisAdjustmentLayer*>( m_layer ) ) - text += row.tqarg( i18n( "Filter: " ) ).tqarg( KisFilterRegistry::instance()->get( alayer->filter()->name() )->id().name() ); + text += row.arg( i18n( "Filter: " ) ).arg( KisFilterRegistry::instance()->get( alayer->filter()->name() )->id().name() ); if( KisPartLayerImpl *player = dynamic_cast<KisPartLayerImpl*>( m_layer ) ) { TQString type = player->docType(); @@ -198,7 +198,7 @@ TQString KisLayerItem::tooltip() const type = player->childDoc()->document()->instance()->aboutData()->programName(); } - text += row.tqarg( i18n( "Document type: " ) ).tqarg( type ); + text += row.arg( i18n( "Document type: " ) ).arg( type ); } text += "</table>"; diff --git a/chalk/ui/kis_paintop_box.cc b/chalk/ui/kis_paintop_box.cc index 20197dd26..30c2c8e95 100644 --- a/chalk/ui/kis_paintop_box.cc +++ b/chalk/ui/kis_paintop_box.cc @@ -180,7 +180,7 @@ void KisPaintopBox::updateOptionWidget() if (m_optionWidget != 0) { m_layout->remove(m_optionWidget); m_optionWidget->hide(); - m_layout->tqinvalidate(); + m_layout->invalidate(); } const KisPaintOpSettings *settings = paintopSettings(currentPaintop(), m_canvasController->currentInputDevice()); diff --git a/chalk/ui/kis_part_layer.cc b/chalk/ui/kis_part_layer.cc index ace299654..5846a67b3 100644 --- a/chalk/ui/kis_part_layer.cc +++ b/chalk/ui/kis_part_layer.cc @@ -94,19 +94,19 @@ void KisPartLayerImpl::childActivated(KoDocumentChild* child) // Called when another layer is made inactive void KisPartLayerImpl::childDeactivated(bool activated) { - // We probably changed, notify the image that it needs to tqrepaint where we currently updated - // We use the original tqgeometry + // We probably changed, notify the image that it needs to repaint where we currently updated + // We use the original geometry 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))); m_activated = false; - setDirty(m_doc->tqgeometry()); + setDirty(m_doc->geometry()); } } void KisPartLayerImpl::setX(TQ_INT32 x) { - TQRect rect = m_doc->tqgeometry(); + TQRect rect = m_doc->geometry(); // KisPaintDevice::move moves to absolute coordinates, not relative. Work around that here, // since the part is not necesarily started at (0,0) @@ -115,7 +115,7 @@ void KisPartLayerImpl::setX(TQ_INT32 x) { } void KisPartLayerImpl::setY(TQ_INT32 y) { - TQRect rect = m_doc->tqgeometry(); + TQRect rect = m_doc->geometry(); // KisPaintDevice::move moves to absolute coordinates, not relative. Work around that here, // since the part is not necesarily started at (0,0) @@ -125,7 +125,7 @@ void KisPartLayerImpl::setY(TQ_INT32 y) { void KisPartLayerImpl::paintSelection(TQImage &img, TQ_INT32 x, TQ_INT32 y, TQ_INT32 w, TQ_INT32 h) { uchar *j = img.bits(); - TQRect rect = m_doc->tqgeometry(); + TQRect rect = m_doc->geometry(); for (int y2 = y; y2 < h + y; ++y2) { for (int x2 = x; x2 < w + x; ++x2) { diff --git a/chalk/ui/kis_part_layer.h b/chalk/ui/kis_part_layer.h index d2ff10eb2..377b37a08 100644 --- a/chalk/ui/kis_part_layer.h +++ b/chalk/ui/kis_part_layer.h @@ -95,10 +95,10 @@ public: virtual void setX(TQ_INT32 x); virtual void setY(TQ_INT32 y); - virtual TQ_INT32 x() const { return m_doc->tqgeometry() . x(); } - virtual TQ_INT32 y() const { return m_doc->tqgeometry() . y(); } //m_paintLayer->y(); } - virtual TQRect extent() const { return m_doc->tqgeometry(); } - virtual TQRect exactBounds() const { return m_doc->tqgeometry(); } + virtual TQ_INT32 x() const { return m_doc->geometry() . x(); } + virtual TQ_INT32 y() const { return m_doc->geometry() . y(); } //m_paintLayer->y(); } + virtual TQRect extent() const { return m_doc->geometry(); } + virtual TQRect exactBounds() const { return m_doc->geometry(); } virtual TQImage createThumbnail(TQ_INT32 w, TQ_INT32 h); @@ -113,7 +113,7 @@ public: virtual bool saveToXML(TQDomDocument doc, TQDomElement elem); private slots: /// Repaints our device with the data from the embedded part - //void tqrepaint(); + //void repaint(); /// When we activate the embedding, we clear ourselves void childActivated(KoDocumentChild* child); void childDeactivated(bool activated); diff --git a/chalk/ui/kis_pattern_chooser.cc b/chalk/ui/kis_pattern_chooser.cc index 70484b0a3..9dd990230 100644 --- a/chalk/ui/kis_pattern_chooser.cc +++ b/chalk/ui/kis_pattern_chooser.cc @@ -47,7 +47,7 @@ void KisPatternChooser::update(KoIconItem *item) if (item) { KisPattern *pattern = static_cast<KisPattern *>(kisItem->resource()); - TQString text = TQString("%1 (%2 x %3)").tqarg(pattern->name()).tqarg(pattern->width()).tqarg(pattern->height()); + TQString text = TQString("%1 (%2 x %3)").arg(pattern->name()).arg(pattern->width()).arg(pattern->height()); m_lbName->setText(text); } diff --git a/chalk/ui/kis_qpaintdevice_canvas_painter.cc b/chalk/ui/kis_qpaintdevice_canvas_painter.cc index 6de1aac33..5bf891ac7 100644 --- a/chalk/ui/kis_qpaintdevice_canvas_painter.cc +++ b/chalk/ui/kis_qpaintdevice_canvas_painter.cc @@ -38,7 +38,7 @@ bool KisTQPaintDeviceCanvasPainter::begin(KisCanvasWidget *canvasWidget, bool un TQWidget *widget = dynamic_cast<TQWidget *>(canvasWidget); if (widget != 0) { - return m_painter.tqbegin(TQT_TQPAINTDEVICE(widget), unclipped); + return m_painter.begin(TQT_TQPAINTDEVICE(widget), unclipped); } else { return false; } @@ -46,7 +46,7 @@ bool KisTQPaintDeviceCanvasPainter::begin(KisCanvasWidget *canvasWidget, bool un bool KisTQPaintDeviceCanvasPainter::begin(const TQPaintDevice* paintDevice, bool unclipped) { - return m_painter.tqbegin(const_cast<TQPaintDevice*>(paintDevice), unclipped); + return m_painter.begin(const_cast<TQPaintDevice*>(paintDevice), unclipped); } bool KisTQPaintDeviceCanvasPainter::end() diff --git a/chalk/ui/kis_ruler.cc b/chalk/ui/kis_ruler.cc index 327f09d7b..8a8929a74 100644 --- a/chalk/ui/kis_ruler.cc +++ b/chalk/ui/kis_ruler.cc @@ -131,7 +131,7 @@ void KisRuler::updatePointer(TQ_INT32 x, TQ_INT32 y) if (m_pixmapBuffer) { if (m_orientation == Qt::Horizontal) { if (m_currentPosition != -1) - tqrepaint(m_currentPosition, 1, MARKER_WIDTH, MARKER_HEIGHT); + repaint(m_currentPosition, 1, MARKER_WIDTH, MARKER_HEIGHT); if (x != -1) { bitBlt(this, x, 1, &m_pixmapMarker, 0, 0, MARKER_WIDTH, MARKER_HEIGHT); @@ -139,7 +139,7 @@ void KisRuler::updatePointer(TQ_INT32 x, TQ_INT32 y) } } else { if (m_currentPosition != -1) - tqrepaint(1, m_currentPosition, MARKER_HEIGHT, MARKER_WIDTH); + repaint(1, m_currentPosition, MARKER_HEIGHT, MARKER_WIDTH); if (y != -1) { bitBlt(this, 1, y, &m_pixmapMarker, 0, 0, MARKER_HEIGHT, MARKER_WIDTH); diff --git a/chalk/ui/kis_save_visitor.h b/chalk/ui/kis_save_visitor.h index 1205632b0..de98548cd 100644 --- a/chalk/ui/kis_save_visitor.h +++ b/chalk/ui/kis_save_visitor.h @@ -50,7 +50,7 @@ public: //connect(*layer->paintDevice(), TQT_SIGNAL(ioProgress(TQ_INT8)), m_img, TQT_SLOT(slotIOProgress(TQ_INT8))); TQString location = m_external ? TQString() : m_uri; - location += m_img->name() + TQString("/layers/layer%1").tqarg(m_count); + location += m_img->name() + TQString("/layers/layer%1").arg(m_count); // Layer data if (m_store->open(location)) { @@ -70,7 +70,7 @@ public: if (annotation) { // save layer profile location = m_external ? TQString() : m_uri; - location += m_img->name() + TQString("/layers/layer%1").tqarg(m_count) + ".icc"; + location += m_img->name() + TQString("/layers/layer%1").arg(m_count) + ".icc"; if (m_store->open(location)) { m_store->write(annotation->annotation()); @@ -85,7 +85,7 @@ public: if (mask) { // save layer profile location = m_external ? TQString() : m_uri; - location += m_img->name() + TQString("/layers/layer%1").tqarg(m_count) + ".mask"; + location += m_img->name() + TQString("/layers/layer%1").arg(m_count) + ".mask"; if (m_store->open(location)) { if (!mask->write(m_store)) { @@ -130,7 +130,7 @@ public: if (layer->selection()) { TQString location = m_external ? TQString() : m_uri; - location += m_img->name() + TQString("/layers/layer%1").tqarg(m_count) + ".selection"; + location += m_img->name() + TQString("/layers/layer%1").arg(m_count) + ".selection"; // Layer data if (m_store->open(location)) { @@ -147,7 +147,7 @@ public: if (layer->filter()) { TQString location = m_external ? TQString() : m_uri; location = m_external ? TQString() : m_uri; - location += m_img->name() + TQString("/layers/layer%1").tqarg(m_count) + ".filterconfig"; + location += m_img->name() + TQString("/layers/layer%1").arg(m_count) + ".filterconfig"; if (m_store->open(location)) { TQString s = layer->filter()->toString(); diff --git a/chalk/ui/kis_savexml_visitor.h b/chalk/ui/kis_savexml_visitor.h index 155807523..b5e3d9308 100644 --- a/chalk/ui/kis_savexml_visitor.h +++ b/chalk/ui/kis_savexml_visitor.h @@ -54,7 +54,7 @@ public: layerElement.setAttribute("visible", layer->visible()); layerElement.setAttribute("locked", layer->locked()); layerElement.setAttribute("layertype", "paintlayer"); - layerElement.setAttribute("filename", TQString("layer%1").tqarg(m_count)); + layerElement.setAttribute("filename", TQString("layer%1").arg(m_count)); layerElement.setAttribute("colorspacename", layer->paintDevice()->colorSpace()->id().id()); layerElement.setAttribute("hasmask", layer->hasMask()); m_elem.appendChild(layerElement); @@ -124,7 +124,7 @@ public: layerElement.setAttribute("visible", layer->visible()); layerElement.setAttribute("locked", layer->locked()); layerElement.setAttribute("layertype", "adjustmentlayer"); - layerElement.setAttribute("filename", TQString("layer%1").tqarg(m_count)); + layerElement.setAttribute("filename", TQString("layer%1").arg(m_count)); layerElement.setAttribute("x", layer->x()); layerElement.setAttribute("y", layer->y()); m_elem.appendChild(layerElement); diff --git a/chalk/ui/kis_text_brush.cc b/chalk/ui/kis_text_brush.cc index ad681c75d..b2ae9f365 100644 --- a/chalk/ui/kis_text_brush.cc +++ b/chalk/ui/kis_text_brush.cc @@ -63,7 +63,7 @@ void KisTextBrush::getFont() void KisTextBrush::rebuildTextBrush() { - lblFont->setText(TQString(m_font.family() + ", %1").tqarg(m_font.pointSize())); + lblFont->setText(TQString(m_font.family() + ", %1").arg(m_font.pointSize())); lblFont->setFont(m_font); m_textBrushResource->setFont(m_font); m_textBrushResource->setText(lineEdit->text()); diff --git a/chalk/ui/kis_tool.cc b/chalk/ui/kis_tool.cc index 039e41905..807b8ffcc 100644 --- a/chalk/ui/kis_tool.cc +++ b/chalk/ui/kis_tool.cc @@ -56,7 +56,7 @@ KisTool::~KisTool() TQWidget* KisTool::createOptionWidget(TQWidget* parent) { - d->optionWidget = new TQLabel(i18n("No options for %1.").tqarg(d->uiname), parent); + d->optionWidget = new TQLabel(i18n("No options for %1.").arg(d->uiname), parent); d->optionWidget->setCaption(d->uiname); d->optionWidget->setAlignment(TQt::AlignCenter); return d->optionWidget; diff --git a/chalk/ui/kis_tool.h b/chalk/ui/kis_tool.h index b9abdc75d..bda3b7e74 100644 --- a/chalk/ui/kis_tool.h +++ b/chalk/ui/kis_tool.h @@ -47,7 +47,7 @@ class KisMoveEvent; class KisCanvasPainter; enum enumToolType { - TOOL_SHAPE = 0, // Geometric tqshapes like ellipses and lines + TOOL_SHAPE = 0, // Geometric shapes like ellipses and lines TOOL_FREEHAND = 1, // Freehand drawing tools TOOL_TRANSFORM = 2, // Tools that transform the layer TOOL_FILL = 3, // Tools that fill parts of the canvas diff --git a/chalk/ui/kis_tool_freehand.cc b/chalk/ui/kis_tool_freehand.cc index adbf9b8ab..32ef617d9 100644 --- a/chalk/ui/kis_tool_freehand.cc +++ b/chalk/ui/kis_tool_freehand.cc @@ -318,7 +318,7 @@ void KisToolFreehand::paintOutline(const KisPoint& point) { } KisCanvas *canvas = controller->kiscanvas(); - canvas->tqrepaint(); + canvas->repaint(); KisBrush *brush = m_subject->currentBrush(); // There may not be a brush present, and we shouldn't crash in that case diff --git a/chalk/ui/kis_tool_shape.cc b/chalk/ui/kis_tool_shape.cc index 9e76f1596..7aba5a495 100644 --- a/chalk/ui/kis_tool_shape.cc +++ b/chalk/ui/kis_tool_shape.cc @@ -29,7 +29,7 @@ KisToolShape::KisToolShape(const TQString& UIName) : super(UIName) { - m_tqshapeOptionsWidget = 0; + m_shapeOptionsWidget = 0; m_optionLayout = 0; } @@ -41,23 +41,23 @@ TQWidget* KisToolShape::createOptionWidget(TQWidget* parent) { TQWidget *widget = super::createOptionWidget(parent); - m_tqshapeOptionsWidget = new WdgGeometryOptions(0); - Q_CHECK_PTR(m_tqshapeOptionsWidget); + m_shapeOptionsWidget = new WdgGeometryOptions(0); + Q_CHECK_PTR(m_shapeOptionsWidget); m_optionLayout = new TQGridLayout(widget, 2, 1); // super::addOptionWidgetLayout(m_optionLayout); - m_tqshapeOptionsWidget->cmbFill->reparent(widget, TQPoint(0,0), true); - m_tqshapeOptionsWidget->textLabel3->reparent(widget, TQPoint(0,0), true); - addOptionWidgetOption(m_tqshapeOptionsWidget->cmbFill, m_tqshapeOptionsWidget->textLabel3); + m_shapeOptionsWidget->cmbFill->reparent(widget, TQPoint(0,0), true); + m_shapeOptionsWidget->textLabel3->reparent(widget, TQPoint(0,0), true); + addOptionWidgetOption(m_shapeOptionsWidget->cmbFill, m_shapeOptionsWidget->textLabel3); return widget; } KisPainter::FillStyle KisToolShape::fillStyle(void) { - if (m_tqshapeOptionsWidget) { - return static_cast<KisPainter::FillStyle>(m_tqshapeOptionsWidget->cmbFill->currentItem()); + if (m_shapeOptionsWidget) { + return static_cast<KisPainter::FillStyle>(m_shapeOptionsWidget->cmbFill->currentItem()); } else { return KisPainter::FillStyleNone; } diff --git a/chalk/ui/kis_tool_shape.h b/chalk/ui/kis_tool_shape.h index e8974c791..45767fe4c 100644 --- a/chalk/ui/kis_tool_shape.h +++ b/chalk/ui/kis_tool_shape.h @@ -46,7 +46,7 @@ protected: private: TQGridLayout *m_optionLayout; - WdgGeometryOptions *m_tqshapeOptionsWidget; + WdgGeometryOptions *m_shapeOptionsWidget; }; #endif // KIS_TOOL_SHAPE_H_ diff --git a/chalk/ui/kis_view.cc b/chalk/ui/kis_view.cc index eecfa659e..629072ffe 100644 --- a/chalk/ui/kis_view.cc +++ b/chalk/ui/kis_view.cc @@ -494,11 +494,11 @@ void KisView::setupRulers() void KisView::updateStatusBarZoomLabel () { if (zoom() < 1 - EPSILON) { - m_statusBarZoomLabel->setText(i18n("Zoom %1%").tqarg(zoom() * 100, 0, 'g', 4)); + m_statusBarZoomLabel->setText(i18n("Zoom %1%").arg(zoom() * 100, 0, 'g', 4)); } else { - m_statusBarZoomLabel->setText(i18n("Zoom %1%").tqarg(zoom() * 100, 0, 'f', 0)); + m_statusBarZoomLabel->setText(i18n("Zoom %1%").arg(zoom() * 100, 0, 'f', 0)); } - m_statusBarZoomLabel->setMaximumWidth(m_statusBarZoomLabel->fontMetrics().width(i18n("Zoom %1%").tqarg("0.8888 "))); + m_statusBarZoomLabel->setMaximumWidth(m_statusBarZoomLabel->fontMetrics().width(i18n("Zoom %1%").arg("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").tqarg(r.x()).tqarg(r.y()).tqarg( r.width()).tqarg( r.height())); + 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())); 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 tqrepaint of the image, but way too early + // XXX: This triggers a repaint of the image, but way too early //showRuler(); } @@ -858,7 +858,7 @@ void KisView::resizeEvent(TQResizeEvent *) if (!m_canvasPixmap.isNull() && !exposedRegion.isEmpty()) { - TQMemArray<TQRect> rects = exposedRegion.tqrects(); + TQMemArray<TQRect> rects = exposedRegion.rects(); for (unsigned int i = 0; i < rects.count(); i++) { TQRect r = rects[i]; @@ -958,7 +958,7 @@ void KisView::updateTQPaintDeviceCanvas(const TQRect& imageRect) TQRegion rg(vr); rg -= TQRegion(windowToView(TQRect(0, 0, img->width(), img->height()))); - TQMemArray<TQRect> rects = rg.tqrects(); + TQMemArray<TQRect> rects = rg.rects(); for (unsigned int i = 0; i < rects.count(); i++) { TQRect er = rects[i]; @@ -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.tqrects(); + TQMemArray<TQRect> rects = canvasRegion.rects(); for (unsigned int i = 0; i < rects.count(); i++) { TQRect r = rects[i]; @@ -1226,7 +1226,7 @@ void KisView::updateCanvas(const TQRect& imageRect) } else { updateTQPaintDeviceCanvas(imageRect); //m_canvas->update(windowToView(imageRect)); - m_canvas->tqrepaint(windowToView(imageRect)); + m_canvas->repaint(windowToView(imageRect)); } } @@ -1241,7 +1241,7 @@ void KisView::refreshKisCanvas() updateCanvas(imageRect); // Enable this if updateCanvas does an m_canvas->update() - //m_canvas->tqrepaint(); + //m_canvas->repaint(); } void KisView::selectionDisplayToggled(bool displaySelection) @@ -2965,7 +2965,7 @@ void KisView::layerDuplicate() return; KisLayerSP dup = active->clone(); - dup->setName(i18n("Duplicate of '%1'").tqarg(active->name())); + dup->setName(i18n("Duplicate of '%1'").arg(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->tqrepaint(); + m_canvas->repaint(); } } 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->tqrepaint(); + m_canvas->repaint(); } } 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->tqrepaint(); + m_canvas->repaint(); } } 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->tqrepaint(); + m_canvas->repaint(); } } 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 tqreceivers that don't accept the tablet event. + // sent to receivers 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 = tqgeometry().contains(pt); + bool flag = geometry().contains(pt); KisGuideSP gd; if (m_currentGuide == 0 && flag) { diff --git a/chalk/ui/kobirdeyepanel.cpp b/chalk/ui/kobirdeyepanel.cpp index 771e1ff87..033e0c19f 100644 --- a/chalk/ui/kobirdeyepanel.cpp +++ b/chalk/ui/kobirdeyepanel.cpp @@ -194,8 +194,8 @@ void KoBirdEyePanel::sliderChanged( int v ) void KoBirdEyePanel::cursorPosChanged(TQ_INT32 xpos, TQ_INT32 ypos) { - m_page->txtX->setText(TQString("%L1").tqarg(xpos, 5)); - m_page->txtY->setText(TQString("%L1").tqarg(ypos, 5)); + m_page->txtX->setText(TQString("%L1").arg(xpos, 5)); + m_page->txtY->setText(TQString("%L1").arg(ypos, 5)); } void KoBirdEyePanel::setThumbnailProvider(KoThumbnailAdapter * thumbnailProvider) diff --git a/chalk/ui/layerlist.cpp b/chalk/ui/layerlist.cpp index 8393ccff9..58d283588 100644 --- a/chalk/ui/layerlist.cpp +++ b/chalk/ui/layerlist.cpp @@ -1219,15 +1219,15 @@ TQString LayerItem::tooltip() const { TQString tip; tip += "<table cellspacing=\"0\" cellpadding=\"0\">"; - tip += TQString("<tr><td colspan=\"2\" align=\"center\"><b>%1</b></td></tr>").tqarg( displayName() ); + tip += TQString("<tr><td colspan=\"2\" align=\"center\"><b>%1</b></td></tr>").arg( displayName() ); TQString row = "<tr><td>%1</td><td>%2</td></tr>"; for( int i = 0, n = listView()->d->properties.count(); i < n; ++i ) if( !isFolder() || listView()->d->properties[i].validForFolders ) { if( d->properties[i] ) - tip += row.tqarg( i18n( "%1:" ).tqarg( listView()->d->properties[i].displayName ) ).tqarg( i18n( "Yes" ) ); + tip += row.arg( i18n( "%1:" ).arg( listView()->d->properties[i].displayName ) ).arg( i18n( "Yes" ) ); else - tip += row.tqarg( i18n( "%1:" ).tqarg( listView()->d->properties[i].displayName ) ).tqarg( i18n( "No" ) ); + tip += row.arg( i18n( "%1:" ).arg( listView()->d->properties[i].displayName ) ).arg( i18n( "No" ) ); } tip += "</table>"; return tip; diff --git a/chalk/ui/wdgapplyprofile.ui b/chalk/ui/wdgapplyprofile.ui index 5227d7fb9..39de910a8 100644 --- a/chalk/ui/wdgapplyprofile.ui +++ b/chalk/ui/wdgapplyprofile.ui @@ -71,7 +71,7 @@ <property name="text"> <string>The image data you want to paste does not have an ICM profile associated with it. If you do not select a profile, Chalk will assume that the image data is encoded in the import profile defined in the Settings dialog.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> diff --git a/chalk/ui/wdgcolorsettings.ui b/chalk/ui/wdgcolorsettings.ui index b9912a79c..10346895a 100644 --- a/chalk/ui/wdgcolorsettings.ui +++ b/chalk/ui/wdgcolorsettings.ui @@ -228,7 +228,7 @@ The different rendering intent methods will affect only what is shown on screen, <property name="text"> <string><p>Select what color profile to add when pasting from external applications that do not use a color profile.</p></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> diff --git a/chalk/ui/wdggeneralsettings.ui b/chalk/ui/wdggeneralsettings.ui index 217329221..9dfd1ff49 100644 --- a/chalk/ui/wdggeneralsettings.ui +++ b/chalk/ui/wdggeneralsettings.ui @@ -37,7 +37,7 @@ <cstring>textLabel1</cstring> </property> <property name="text"> - <string>&Cursor tqshape:</string> + <string>&Cursor shape:</string> </property> <property name="buddy" stdset="0"> <cstring>m_cmbCursorShape</cstring> diff --git a/chalk/ui/wdgnewimage.ui b/chalk/ui/wdgnewimage.ui index 197401609..b1b607ef5 100644 --- a/chalk/ui/wdgnewimage.ui +++ b/chalk/ui/wdgnewimage.ui @@ -230,7 +230,7 @@ <property name="text"> <string>Description:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop</set> </property> <property name="buddy" stdset="0"> |