diff options
Diffstat (limited to 'chalk/ui')
42 files changed, 85 insertions, 85 deletions
diff --git a/chalk/ui/kis_canvas.cc b/chalk/ui/kis_canvas.cc index 01ca372e..8ad09df3 100644 --- a/chalk/ui/kis_canvas.cc +++ b/chalk/ui/kis_canvas.cc @@ -304,23 +304,23 @@ void KisCanvasWidget::initX11Support() Display *x11Display = TQApplication::desktop()->x11Display(); - // Look at the modifier mapping and get the correct tqmasks for alt/meta + // Look at the modifier mapping and get the correct masks for alt/meta XModifierKeymap *map = XGetModifierMapping(x11Display); if (map) { int mapIndex = 0; - for (int tqmaskIndex = 0; tqmaskIndex < 8; tqmaskIndex++) { + for (int maskIndex = 0; maskIndex < 8; maskIndex++) { for (int i = 0; i < map->max_keypermod; i++) { if (map->modifiermap[mapIndex]) { KeySym sym = XKeycodeToKeysym(x11Display, map->modifiermap[mapIndex], 0); if (X11AltMask == 0 && (sym == XK_Alt_L || sym == XK_Alt_R)) { - X11AltMask = 1 << tqmaskIndex; + X11AltMask = 1 << maskIndex; } if (X11MetaMask == 0 && (sym == XK_Meta_L || sym == XK_Meta_R)) { - X11MetaMask = 1 << tqmaskIndex; + X11MetaMask = 1 << maskIndex; } } diff --git a/chalk/ui/kis_canvas.h b/chalk/ui/kis_canvas.h index ea36f8a9..be698ae2 100644 --- a/chalk/ui/kis_canvas.h +++ b/chalk/ui/kis_canvas.h @@ -140,7 +140,7 @@ protected: static bool X11SupportInitialised; - // Modifier tqmasks for alt/meta - detected at run-time + // Modifier masks for alt/meta - detected at run-time static long X11AltMask; static long X11MetaMask; diff --git a/chalk/ui/kis_cursor.cc b/chalk/ui/kis_cursor.cc index 33c6ae04..ca899da8 100644 --- a/chalk/ui/kis_cursor.cc +++ b/chalk/ui/kis_cursor.cc @@ -344,7 +344,7 @@ TQCursor KisCursor::load(const TQString & iconName, int hotspotX, int hotspotY) TQBitmap tqmask(cursorImage.width(), cursorImage.height()); TQPainter bitmapPainter(&bitmap); - TQPainter tqmaskPainter(&tqmask); + TQPainter maskPainter(&tqmask); for (TQ_INT32 x = 0; x < cursorImage.width(); ++x) { for (TQ_INT32 y = 0; y < cursorImage.height(); ++y) { @@ -353,9 +353,9 @@ TQCursor KisCursor::load(const TQString & iconName, int hotspotX, int hotspotY) if (tqAlpha(pixel) < 128) { bitmapPainter.setPen(TQt::color0); - tqmaskPainter.setPen(TQt::color0); + maskPainter.setPen(TQt::color0); } else { - tqmaskPainter.setPen(TQt::color1); + maskPainter.setPen(TQt::color1); if (tqGray(pixel) < 128) { bitmapPainter.setPen(TQt::color1); @@ -365,7 +365,7 @@ TQCursor KisCursor::load(const TQString & iconName, int hotspotX, int hotspotY) } bitmapPainter.drawPoint(x, y); - tqmaskPainter.drawPoint(x, y); + maskPainter.drawPoint(x, y); } } diff --git a/chalk/ui/kis_doc.cc b/chalk/ui/kis_doc.cc index e60e6524..1fc1c9c9 100644 --- a/chalk/ui/kis_doc.cc +++ b/chalk/ui/kis_doc.cc @@ -137,8 +137,8 @@ namespace { } -KisDoc::KisDoc(TQWidget *tqparentWidget, const char *widgetName, TQObject *tqparent, const char *name, bool singleViewMode) : - super(tqparentWidget, widgetName, tqparent, name, singleViewMode) +KisDoc::KisDoc(TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name, bool singleViewMode) : + super(parentWidget, widgetName, tqparent, name, singleViewMode) { m_undo = false; @@ -182,7 +182,7 @@ DCOPObject *KisDoc::dcopObject() return m_dcop; } -bool KisDoc::initDoc(InitDocFlags flags, TQWidget* tqparentWidget) +bool KisDoc::initDoc(InitDocFlags flags, TQWidget* parentWidget) { if (!init()) return false; @@ -203,7 +203,7 @@ bool KisDoc::initDoc(InitDocFlags flags, TQWidget* tqparentWidget) file, dlgtype, "chalk_template", - tqparentWidget); + parentWidget); setUndo(false); if (ret == KoTemplateChooseDia::Template) { diff --git a/chalk/ui/kis_doc.h b/chalk/ui/kis_doc.h index 47eeaa0f..222e9da6 100644 --- a/chalk/ui/kis_doc.h +++ b/chalk/ui/kis_doc.h @@ -53,7 +53,7 @@ class KRITACORE_EXPORT KisDoc : public KoDocument, private KisUndoAdapter { TQ_OBJECT public: - KisDoc(TQWidget *tqparentWidget = 0, const char *widgetName = 0, TQObject* tqparent = 0, const char* name = 0, bool singleViewMode = false); + KisDoc(TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject* tqparent = 0, const char* name = 0, bool singleViewMode = false); virtual ~KisDoc(); public: @@ -62,7 +62,7 @@ public: virtual bool completeLoading(KoStore *store); virtual bool completeSaving(KoStore*); virtual DCOPObject* dcopObject(); - virtual bool initDoc(InitDocFlags flags, TQWidget* tqparentWidget=0); + virtual bool initDoc(InitDocFlags flags, TQWidget* parentWidget=0); virtual bool loadOasis( const TQDomDocument&, KoOasisStyles&, const TQDomDocument&, KoStore* ); virtual bool saveOasis( KoStore*, KoXmlWriter* ); virtual bool loadChildren( KoStore* store); diff --git a/chalk/ui/kis_factory.cc b/chalk/ui/kis_factory.cc index 0924420d..aa84aa61 100644 --- a/chalk/ui/kis_factory.cc +++ b/chalk/ui/kis_factory.cc @@ -78,13 +78,13 @@ KisFactory::~KisFactory() /** * Create the document */ -KParts::Part* KisFactory::createPartObject( TQWidget *tqparentWidget, +KParts::Part* KisFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject* tqparent, const char* name, const char* classname, const TQStringList & ) { bool bWantKoDocument = ( strcmp( classname, "KoDocument" ) == 0 ); - KisDoc *doc = new KisDoc( tqparentWidget, + KisDoc *doc = new KisDoc( parentWidget, widgetName, tqparent, name, !bWantKoDocument ); Q_CHECK_PTR(doc); diff --git a/chalk/ui/kis_factory.h b/chalk/ui/kis_factory.h index d20070c5..da9d3e40 100644 --- a/chalk/ui/kis_factory.h +++ b/chalk/ui/kis_factory.h @@ -41,7 +41,7 @@ public: KisFactory( TQObject* tqparent = 0, const char* name = 0 ); ~KisFactory(); - virtual KParts::Part *createPartObject(TQWidget *tqparentWidget = 0, + virtual KParts::Part *createPartObject(TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *tqparent = 0, const char *name = 0, diff --git a/chalk/ui/kis_filter_manager.cc b/chalk/ui/kis_filter_manager.cc index a21f49aa..a5b145da 100644 --- a/chalk/ui/kis_filter_manager.cc +++ b/chalk/ui/kis_filter_manager.cc @@ -289,7 +289,7 @@ bool KisFilterManager::apply() return false; } else { - if (dev->tqparentLayer()) dev->tqparentLayer()->setDirty(rect); + if (dev->parentLayer()) dev->parentLayer()->setDirty(rect); m_doc->setModified(true); if (img->undo() && cmd) img->undoAdapter()->addCommand(cmd); return true; diff --git a/chalk/ui/kis_layerbox.cc b/chalk/ui/kis_layerbox.cc index 703fd3be..e257e2b0 100644 --- a/chalk/ui/kis_layerbox.cc +++ b/chalk/ui/kis_layerbox.cc @@ -229,15 +229,15 @@ void KisLayerBox::slotLayerRemoved(KisLayerSP layer, KisGroupLayerSP wasParent, void KisLayerBox::slotLayerMoved(KisLayerSP layer, KisGroupLayerSP wasParent, KisLayerSP) { - int tqparentID = layer->tqparent()->id(); + int parentID = layer->tqparent()->id(); if (layer->tqparent() == m_image->rootLayer()) - tqparentID = -1; + parentID = -1; int siblingID = -1; if (layer->prevSibling()) siblingID = layer->prevSibling()->id(); - list()->moveLayer(layer->id(), tqparentID, siblingID); + list()->moveLayer(layer->id(), parentID, siblingID); markModified(layer->tqparent()); markModified(wasParent); diff --git a/chalk/ui/kis_layerlist.h b/chalk/ui/kis_layerlist.h index f0c587dd..5b74acea 100644 --- a/chalk/ui/kis_layerlist.h +++ b/chalk/ui/kis_layerlist.h @@ -35,9 +35,9 @@ class KisLayerList: public LayerList signals: void requestNewObjectLayer( LayerItem *tqparent, LayerItem *after, const KoDocumentEntry &entry ); - void requestNewObjectLayer( int tqparentID, int afterID, const KoDocumentEntry &entry ); + void requestNewObjectLayer( int parentID, int afterID, const KoDocumentEntry &entry ); void requestNewAdjustmentLayer( LayerItem *tqparent, LayerItem *after ); - void requestNewAdjustmentLayer( int tqparentID, int afterID ); + void requestNewAdjustmentLayer( int parentID, int afterID ); public: KisLayerList( TQWidget *tqparent = 0, const char *name = 0 ); diff --git a/chalk/ui/kis_matrix_widget.ui b/chalk/ui/kis_matrix_widget.ui index b989df12..ca238b60 100644 --- a/chalk/ui/kis_matrix_widget.ui +++ b/chalk/ui/kis_matrix_widget.ui @@ -206,5 +206,5 @@ <Q_SLOTS> <slot access="private">spinboxValueChanged()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/chalk/ui/kis_opengl_image_context.h b/chalk/ui/kis_opengl_image_context.h index 03833cd2..2798f0f8 100644 --- a/chalk/ui/kis_opengl_image_context.h +++ b/chalk/ui/kis_opengl_image_context.h @@ -141,7 +141,7 @@ private: int m_numImageTextureTileColumns; // We create a single OpenGL context and share it between all views - // in the process. Aptqparently with some OpenGL implementations, only + // in the process. Apparently with some OpenGL implementations, only // one context will be hardware accelerated. static TQGLWidget *SharedContextWidget; static int SharedContextWidgetRefCount; diff --git a/chalk/ui/kis_part_layer.cc b/chalk/ui/kis_part_layer.cc index 401721b5..459770d1 100644 --- a/chalk/ui/kis_part_layer.cc +++ b/chalk/ui/kis_part_layer.cc @@ -83,7 +83,7 @@ void KisPartLayerImpl::childActivated(KoDocumentChild* child) TQRect rect = extent(); m_activated = true; setDirty(rect); - TQPtrList<KoView> views = child->tqparentDocument()->views(); + TQPtrList<KoView> views = child->parentDocument()->views(); Q_ASSERT(views.count()); // XXX iterate over views connect(views.at(0), TQT_SIGNAL(activated(bool)), @@ -97,7 +97,7 @@ 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 if (m_activated && !activated /* no clue, but debugging suggests it is false here */) { - TQPtrList<KoView> views = m_doc->tqparentDocument()->views(); + TQPtrList<KoView> views = m_doc->parentDocument()->views(); Q_ASSERT(views.count()); views.at(0)->disconnect(TQT_SIGNAL(activated(bool))); m_activated = false; diff --git a/chalk/ui/kis_previewwidget.cc b/chalk/ui/kis_previewwidget.cc index c9c2a766..c534384a 100644 --- a/chalk/ui/kis_previewwidget.cc +++ b/chalk/ui/kis_previewwidget.cc @@ -333,8 +333,8 @@ void KisPreviewWidget::runFilterHelper() { if (m_origDevice->image()) { m_scaledImage = new KisImage(*m_origDevice->image()); - if(!m_origDevice->tqparentLayer()) return; - TQString layerName = m_origDevice->tqparentLayer()->name(); + if(!m_origDevice->parentLayer()) return; + TQString layerName = m_origDevice->parentLayer()->name(); KisPaintLayerSP pl = ::tqqt_cast<KisPaintLayer*>(m_scaledImage->findLayer(layerName)); if(!pl) return; scaledDevice = pl->paintDevice(); @@ -356,7 +356,7 @@ void KisPreviewWidget::runFilterHelper() { 0.0, 0.0, 0.0, 0, 0, NULL, &strategy); tw.run(); scaledDevice->setSelection(select); - select->setParentLayer(scaledDevice->tqparentLayer()); + select->setParentLayer(scaledDevice->parentLayer()); } // Crop by the zoom value instead of cropping by rectangle. It gives better results diff --git a/chalk/ui/kis_previewwidgetbase.ui b/chalk/ui/kis_previewwidgetbase.ui index 6ee64019..f1b52244 100644 --- a/chalk/ui/kis_previewwidgetbase.ui +++ b/chalk/ui/kis_previewwidgetbase.ui @@ -260,7 +260,7 @@ <data format="XBM.GZ" length="79">789c534e494dcbcc4b554829cdcdad8c2fcf4c29c95030e0524611cd48cd4ccf28010a1797249664262b2467241641a592324b8aa363156c15aab914146aadb90067111b1f</data> </image> </images> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>imageviewer.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/chalk/ui/kis_tool_freehand.cc b/chalk/ui/kis_tool_freehand.cc index fe30eb50..5885c433 100644 --- a/chalk/ui/kis_tool_freehand.cc +++ b/chalk/ui/kis_tool_freehand.cc @@ -255,9 +255,9 @@ void KisToolFreehand::endPaint() m_dirtyRect.width(), m_dirtyRect.height()); KisLayerSupportsIndirectPainting* layer = - dynamic_cast<KisLayerSupportsIndirectPainting*>(m_source->tqparentLayer()); + dynamic_cast<KisLayerSupportsIndirectPainting*>(m_source->parentLayer()); layer->setTemporaryTarget(0); - m_source->tqparentLayer()->setDirty(m_dirtyRect); + m_source->parentLayer()->setDirty(m_dirtyRect); if (m_currentImage->undo()) { m_currentImage->undoAdapter()->addCommand(painter.endTransaction()); diff --git a/chalk/ui/kis_view.cc b/chalk/ui/kis_view.cc index 61966928..e3500f97 100644 --- a/chalk/ui/kis_view.cc +++ b/chalk/ui/kis_view.cc @@ -646,11 +646,11 @@ void KisView::setupActions() m_createMask = new KAction(i18n("Create Mask"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotCreateMask()), actionCollection(), "create_tqmask"); - m_tqmaskFromSelection = new KAction(i18n("Mask From Selection"), 0, TQT_TQOBJECT(this), + m_maskFromSelection = new KAction(i18n("Mask From Selection"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotMaskFromSelection()), actionCollection(), - "tqmask_fromsel"); - m_tqmaskToSelection = new KAction(i18n("Mask to Selection"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotMaskToSelection()), actionCollection(), "tqmask_tosel"); + "mask_fromsel"); + m_maskToSelection = new KAction(i18n("Mask to Selection"), 0, TQT_TQOBJECT(this), + TQT_SLOT(slotMaskToSelection()), actionCollection(), "mask_tosel"); m_applyMask = new KAction(i18n("Apply Mask"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotApplyMask()), actionCollection(), "apply_tqmask"); m_removeMask = new KAction(i18n("Remove Mask"), 0, TQT_TQOBJECT(this), @@ -3185,7 +3185,7 @@ void KisView::connectCurrentImg() 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(tqmaskUpdated())); + 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())); @@ -3198,7 +3198,7 @@ void KisView::connectCurrentImg() connect(m_image, TQT_SIGNAL(sigLayerAdded(KisLayerSP)), TQT_SLOT(handlePartLayerAdded(KisLayerSP))); - tqmaskUpdated(); + maskUpdated(); #ifdef HAVE_GL if (m_OpenGLImageContext != 0) { connect(m_OpenGLImageContext, TQT_SIGNAL(sigImageUpdated(TQRect)), TQT_SLOT(slotOpenGLImageUpdated(TQRect))); @@ -3933,7 +3933,7 @@ void KisView::slotMaskFromSelection() { if (!layer) return; - KNamedCommand *cmd = layer->tqmaskFromSelectionCommand(); + KNamedCommand *cmd = layer->maskFromSelectionCommand(); cmd->execute(); if (undoAdapter() && undoAdapter()->undo()) { undoAdapter()->addCommand(cmd); @@ -3945,7 +3945,7 @@ void KisView::slotMaskToSelection() { if (!layer) return; - KNamedCommand *cmd = layer->tqmaskToSelectionCommand(); + KNamedCommand *cmd = layer->maskToSelectionCommand(); cmd->execute(); if (undoAdapter() && undoAdapter()->undo()) { undoAdapter()->addCommand(cmd); @@ -3992,7 +3992,7 @@ void KisView::slotShowMask() { layer->setRenderMask(m_showMask->isChecked()); } -void KisView::tqmaskUpdated() { +void KisView::maskUpdated() { KisPaintLayer* layer = dynamic_cast<KisPaintLayer*>(currentImg()->activeLayer().data()); if (!layer) { m_createMask->setEnabled(false); @@ -4003,8 +4003,8 @@ void KisView::tqmaskUpdated() { return; } m_createMask->setEnabled(!layer->hasMask()); - m_tqmaskFromSelection->setEnabled(true); // Perhaps also update this to false when no selection? - m_tqmaskToSelection->setEnabled(layer->hasMask()); + m_maskFromSelection->setEnabled(true); // Perhaps also update this to false when no selection? + m_maskToSelection->setEnabled(layer->hasMask()); m_applyMask->setEnabled(layer->hasMask()); m_removeMask->setEnabled(layer->hasMask()); diff --git a/chalk/ui/kis_view.h b/chalk/ui/kis_view.h index 1f197f87..71bb9065 100644 --- a/chalk/ui/kis_view.h +++ b/chalk/ui/kis_view.h @@ -428,7 +428,7 @@ private: private slots: void layersUpdated(); // Used in the channel separation to notify the view that we have added a few layers. - void tqmaskUpdated(); // To update the enabled or disabled status of the tqmask entries + void maskUpdated(); // To update the enabled or disabled status of the tqmask entries void slotSetFGQColor(const TQColor & c); void slotSetBGQColor(const TQColor & c); @@ -560,8 +560,8 @@ private: KAction *m_layerTop; KAction *m_createMask; - KAction *m_tqmaskFromSelection; - KAction *m_tqmaskToSelection; + KAction *m_maskFromSelection; + KAction *m_maskToSelection; KAction *m_applyMask; KAction *m_removeMask; KToggleAction *m_editMask; diff --git a/chalk/ui/layerlist.cpp b/chalk/ui/layerlist.cpp index 886b27e4..059d4e35 100644 --- a/chalk/ui/layerlist.cpp +++ b/chalk/ui/layerlist.cpp @@ -128,7 +128,7 @@ public: m_pos = pos; LayerItem *prev = m_item; m_item = static_cast<LayerItem*>(m_list->itemAt( m_pos )); - if( TQToolTip::tqparentWidget() && m_list->showToolTips() && m_item ) + if( TQToolTip::parentWidget() && m_list->showToolTips() && m_item ) { if( m_item != prev ) hideTip(); @@ -216,7 +216,7 @@ public: void position() { - const TQRect drect = TQApplication::desktop()->availableGeometry( TQToolTip::tqparentWidget() ); + const TQRect drect = TQApplication::desktop()->availableGeometry( TQToolTip::parentWidget() ); const TQSize size = tqsizeHint(); const int width = size.width(), height = size.height(); const TQRect tmp = m_item->rect(); @@ -228,7 +228,7 @@ public: else y = kMax( drect.top(), irect.top() - height ); - int x = kMax( drect.x(), TQToolTip::tqparentWidget()->mapToGlobal( m_pos ).x() - width/2 ); + int x = kMax( drect.x(), TQToolTip::parentWidget()->mapToGlobal( m_pos ).x() - width/2 ); if( x + width > drect.right() ) x = drect.right() - width; @@ -617,9 +617,9 @@ LayerItem *LayerList::addLayerToParent( const TQString &displayName, LayerItem * return 0; } -LayerItem *LayerList::addLayerToParent( const TQString &displayName, int tqparentID, int afterID, int id ) //SLOT +LayerItem *LayerList::addLayerToParent( const TQString &displayName, int parentID, int afterID, int id ) //SLOT { - return addLayerToParent( displayName, folder( tqparentID ), layer( afterID ), id ); + return addLayerToParent( displayName, folder( parentID ), layer( afterID ), id ); } void LayerList::moveLayer( LayerItem *layer, LayerItem *tqparent, LayerItem *after ) //SLOT @@ -643,9 +643,9 @@ void LayerList::moveLayer( LayerItem *layer, LayerItem *tqparent, LayerItem *aft setCurrentItem( current ); //HACK, sometimes TQt changes this under us } -void LayerList::moveLayer( int id, int tqparentID, int afterID ) //SLOT +void LayerList::moveLayer( int id, int parentID, int afterID ) //SLOT { - moveLayer( layer( id ), folder( tqparentID ), layer( afterID ) ); + moveLayer( layer( id ), folder( parentID ), layer( afterID ) ); } void LayerList::removeLayer( LayerItem *layer ) //SLOT @@ -723,7 +723,7 @@ void LayerList::hideTip() void LayerList::maybeTip() { - d->tooltip->maybeTip( d->tooltip->TQToolTip::tqparentWidget()->mapFromGlobal( TQCursor::pos() ) ); + d->tooltip->maybeTip( d->tooltip->TQToolTip::parentWidget()->mapFromGlobal( TQCursor::pos() ) ); } void LayerList::constructMenu( LayerItem *layer ) diff --git a/chalk/ui/layerlist.h b/chalk/ui/layerlist.h index 129baa7c..58c2a4bb 100644 --- a/chalk/ui/layerlist.h +++ b/chalk/ui/layerlist.h @@ -98,10 +98,10 @@ public slots: LayerItem *addLayer( const TQString &displayName, int afterID, int id = -1 ); LayerItem *addLayerToParent( const TQString &displayName, LayerItem *tqparent, LayerItem *after = 0, int id = -1 ); - LayerItem *addLayerToParent( const TQString &displayName, int tqparentID, int afterID = -1, int id = -1 ); + LayerItem *addLayerToParent( const TQString &displayName, int parentID, int afterID = -1, int id = -1 ); void moveLayer( LayerItem *layer, LayerItem *tqparent, LayerItem *after ); - void moveLayer( int id, int tqparentID, int afterID ); + void moveLayer( int id, int parentID, int afterID ); void removeLayer( LayerItem *layer ); void removeLayer( int id ); @@ -117,13 +117,13 @@ signals: void propertyChanged( int id, const TQString &name, bool on ); void layerMoved( LayerItem *layer, LayerItem *tqparent, LayerItem *after ); - void layerMoved( int id, int tqparentID, int afterID ); + void layerMoved( int id, int parentID, int afterID ); void requestNewLayer( LayerItem *tqparent, LayerItem *after ); - void requestNewLayer( int tqparentID, int afterID ); + void requestNewLayer( int parentID, int afterID ); void requestNewFolder( LayerItem *tqparent, LayerItem *after ); - void requestNewFolder( int tqparentID, int afterID ); + void requestNewFolder( int parentID, int afterID ); void requestRemoveLayer( LayerItem *layer ); void requestRemoveLayer( int id ); diff --git a/chalk/ui/wdgapplyprofile.ui b/chalk/ui/wdgapplyprofile.ui index 35674162..5227d7fb 100644 --- a/chalk/ui/wdgapplyprofile.ui +++ b/chalk/ui/wdgapplyprofile.ui @@ -168,5 +168,5 @@ <tabstops> <tabstop>cmbProfile</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/chalk/ui/wdgautobrush.ui b/chalk/ui/wdgautobrush.ui index a8aa02e0..00683ca9 100644 --- a/chalk/ui/wdgautobrush.ui +++ b/chalk/ui/wdgautobrush.ui @@ -351,5 +351,5 @@ <data format="PNG" length="242">89504e470d0a1a0a0000000d49484452000000190000001a0806000000427df7cd000000b9494441544889dd95410ec4200845b1e9ba78ff538a176056260c5181569bccfca590ff2a204da510ecd601008078ed8778953372cec8db20d23c0a72417aa611900999997941a795500a256d2acf7a434354bf212d4927ebc488a417518d4dd75d0dcbb5f2ed983d59f101af94eb7f20d39e3c1963136299f7e2b361f89d9e8c6ed16efc4ee3892a205ecb9adc24fdcc176ffd4b9839e9b896592eb9d623b1106464e605b821da340200086e61afb91ea2a377e89577e57f00357f504513c00b590000000049454e44ae426082</data> </image> </images> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/chalk/ui/wdgautogradient.ui b/chalk/ui/wdgautogradient.ui index 59875f87..94a8a137 100644 --- a/chalk/ui/wdgautogradient.ui +++ b/chalk/ui/wdgautogradient.ui @@ -392,7 +392,7 @@ <data format="PNG" length="1002">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b149444154388dad945f4c5b551cc73fe7dc4b7b4bcba0762d45c43114323599ee6192609c51d883892ce083f1718b3ebb185f8dc91e972cf39d2d2a2f1af664b6f1e0fe3863a0718969700eb0c52142da0242a1bd6d696f7bcff101585203ceb8fd9ece39f99dcff9fe7edf939f88c562ec465f5f9fe609442c161362173c3e3eae7b7a7ac8e7f36432196cdbfe4f907c3e4f2291201e8fe338cec3737357e9e8e828aded1e229d650e1f2d51754b082110124c13a4dc5ea341eb9dc284c0558a853f3ce8cb0677ef500fde7d39d2596679e326597b8e9abb85d7a770ab16ab6983ec5a05b487a70e36f0f4e10afe408d6a558310980108478dba4a1e8233990c5d474b64ed39aa3a8fe5f3317fbf81dbd70bccfeb205947632fd74f6589c1c6ea2f70d03a58ba0c1f2c9bdc1b66de3b8256a6e11cbe7e3ee1d181b590124fe2693aeee08d223c82c3a2c24b7b874bec8f26288774f7bd054504aef0dde6e99c0eb83f9fb266323cb80a27fb0958141836044605a2ee5523393371cc646fee2da37195aa35d0c0c5b4859ac03d7e91712dcaac5adab3650a3ff9d08ef7dd8404bb48869e5d958b5b87dadc4c9a1464e9f0d0326df7ebd86bd2e310cb1bf62d384d59441f2d70a070e1c60e09489929b988681bdd9cc97170bcc4c65595f71f8e0e3301337fc24a7732467831875a47f289652b0be5e4151e6d07316c1b0c0340d8ab92023e76d66a6b2840e36d2fb7a13fee632475e6edc367ea98a90fb98b7dd6310ca0328a44761582e1bab41befabcc0ec940d28bc5e93b68e064cab84e1d9beaeb48934eac1f53b01c1b000fca496aa54b61a99fcde61662a4b4b4b23d1680be9d426173e4df3602a48ea411989a4fd590f52a8fd156b05ed9d350e3defe3cfdf4b4c7ce770ea7d3fb9f520afbe1620daeee5c26735d20b9b9cfb6811a754a439e4e5c5639a4caa1e5caf586bfc0197b78702005cb9b4cae4cd3267ce8638fe964bd72b393e39d74928d242617303a756a37f284447770dcdbffc6384a05a85de1306e9a52057c7527c7131c3c42d3f475eb2303c82d4fc3276d6811db37efeb148723082d9b08f79f97c1e5729109a9a28307cc622d2d6cdf52b2b24efe548dedb00142009862cfa879ee1a71f6cec928353511472fbf4389148b0b0e0c108081412458dfe21c9f11351e67e7358595468246d1d1e5e38a6e9e851bc39d84ab502a669331dafec0d8ec7e3e8cb06e1a881d727d1ae40180a434a8c9db129a54126ad48a7358c2b4c5352c8c374bcccdab2bb37d8719cba79fab8211f9df218e0582c261e95f8bfc04f1a1e8bc5c4dfe0a190172af6a9690000000049454e44ae426082</data> </image> </images> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcolorbutton.h</includehint> </includehints> diff --git a/chalk/ui/wdgbirdeye.ui b/chalk/ui/wdgbirdeye.ui index 77f03131..2b2b7910 100644 --- a/chalk/ui/wdgbirdeye.ui +++ b/chalk/ui/wdgbirdeye.ui @@ -23,9 +23,9 @@ <property name="caption"> <string>Overview</string> </property> - <property name="tqlayoutMargin" stdset="0"> + <property name="layoutMargin" stdset="0"> </property> - <property name="tqlayoutSpacing" stdset="0"> + <property name="layoutSpacing" stdset="0"> </property> <vbox> <property name="name"> @@ -296,7 +296,7 @@ <slot>zoomPlus()</slot> </Q_SLOTS> <pixmapfunction>BarIcon</pixmapfunction> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>ktoolbar.h</includehint> <includehint>knuminput.h</includehint> diff --git a/chalk/ui/wdgcolorsettings.ui b/chalk/ui/wdgcolorsettings.ui index 3d2def86..6f9e41e6 100644 --- a/chalk/ui/wdgcolorsettings.ui +++ b/chalk/ui/wdgcolorsettings.ui @@ -346,7 +346,7 @@ The different rendering intent methods will affect only what is shown on screen, <data format="PNG" length="1003">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b249444154388db5944d4c5c5518869f73ce9db9cc40f929cc30300e18129a50685268a28291982e1a2175212eaab1c49d3f8971e7aec6aedb54a32b435dd8685cb8c0c4b8b0feb421b7bd8186a069d23209144b18cb0c02f3732ff3c3ccbdd705a571941213f1dd9d93739ef37e6fbeef08d334d9d5d0d090c701c8344d2176c1a6697a5d5d5dd8b64d2a95c2b2ac7f05b12c8b783c8e6118d8b6fd685fdb753a39394928e2a7c55724d693a7e214104220242805520a84d8b9e4790f0b1302c7751958f1e30534be9fa41a0c60db362dbe227f64af91b6e7719c2dfc0117a71c603da591de2882a7d3d4ec27122b10acad50aeb88044d542b84de3af7ab44aa55274f4e449dbf354bc347aa096fbf37e7efa2ecbad1b36907d78b289de8120232f37726250c3f52cf0a026a0f6065b9645d929e038167aa096d91b307171059034b5f8e9e9eb44fa052b4b25eeccd9dc99cb71f6ad082fbea2e351c075bdbdc13b9109fc01b83fef63e2e232e03076b68393231a0dcd024daf502c1e66e67a89cb971ef0e5a74bb4b61e6378248094b92ab0ac024b70ca017ef8360394187b2dc6d8b89ffa500e4d4f93d9083275d5e6f9913ade3dd70ee87c7d25c95646a25415aadab152b09ed4f8c5cc130a853839eac3951b684a61e70ef3f9c739668c24eba912afbfddc6d4d506e6a6d7b8b7d082aa8eb8dab19482cdcd220e36dd3dc19df23545de0a71f952861923493456cfd3cf36123c54a0b7bf0e8064621b21f7712c040857071ca4eea0f40a99f510573ec971cb48030e811a1faded3e94be85f2fb00703d1ff26f96ab9f011a5b04d0c4f26fdb948a754c1b25668c2491483d5d5d611617d6b8f0fe32cb779b492ce65168b4c774a4701eefd8f3a02d56e6e8f13aeefe9a63fa5a89d1970e91d908f3d46003e1480d173e28b37827c9b977348ab92ce16890237d1ec907ee3e8e3d8f60d0e1f4583d009f7d9860662acff89bad1c1faad0717493f7ce7713ed8cb0995c255f2a317a26427b67198f6a70f51c0a41b902279ed1187f23cc17130b7c74de65eac77a7a8f05517e41e2deefa4930576db60fa7a8ee1535134df3e93e7b82e0817476439fd6a9070a49f6fbe4a3077739db99b15c001146dd13a46cf1cc1f83943c62e51de76b0738fc9381e8f3390f0236b252e124999e11724fd833196164bacadb87848224fe874f779b43fe9f2dca928956d505a96dbb3f9bdc18661e00534c26d1a7a40e13912a11c9454280da41048a9915c75585df500074d53d816dc9edd229528ef0db66dbbea3ffdaffa471f1f28d8344df1bf800f1a6e9aa6f813c39885bc050f269c0000000049454e44ae426082</data> </image> </images> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kis_cmb_idlist.h</includehint> <includehint>kcombobox.h</includehint> diff --git a/chalk/ui/wdgcustombrush.ui b/chalk/ui/wdgcustombrush.ui index 78c77be3..6dca8768 100644 --- a/chalk/ui/wdgcustombrush.ui +++ b/chalk/ui/wdgcustombrush.ui @@ -195,5 +195,5 @@ </widget> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/chalk/ui/wdgcustompalette.ui b/chalk/ui/wdgcustompalette.ui index c5cbe9dc..ec0881bc 100644 --- a/chalk/ui/wdgcustompalette.ui +++ b/chalk/ui/wdgcustompalette.ui @@ -81,7 +81,7 @@ <data format="PNG" length="1003">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b249444154388db5944d4c5c5518869f73ce9db9cc40f929cc30300e18129a50685268a28291982e1a2175212eaab1c49d3f8971e7aec6aedb54a32b435dd8685cb8c0c4b8b0feb421b7bd8186a069d23209144b18cb0c02f3732ff3c3ccbdd705a571941213f1dd9d93739ef37e6fbeef08d334d9d5d0d090c701c8344d2176c1a6697a5d5d5dd8b64d2a95c2b2ac7f05b12c8b783c8e6118d8b6fd685fdb753a39394928e2a7c55724d693a7e214104220242805520a84d8b9e4790f0b1302c7751958f1e30534be9fa41a0c60db362dbe227f64af91b6e7719c2dfc0117a71c603da591de2882a7d3d4ec27122b10acad50aeb88044d542b84de3af7ab44aa55274f4e449dbf354bc347aa096fbf37e7efa2ecbad1b36907d78b289de8120232f37726250c3f52cf0a026a0f6065b9645d929e038167aa096d91b307171059034b5f8e9e9eb44fa052b4b25eeccd9dc99cb71f6ad082fbea2e351c075bdbdc13b9109fc01b83fef63e2e232e03076b68393231a0dcd024daf502c1e66e67a89cb971ef0e5a74bb4b61e6378248094b92ab0ac024b70ca017ef8360394187b2dc6d8b89ffa500e4d4f93d9083275d5e6f9913ade3dd70ee87c7d25c95646a25415aadab152b09ed4f8c5cc130a853839eac3951b684a61e70ef3f9c739668c24eba912afbfddc6d4d506e6a6d7b8b7d082aa8eb8dab19482cdcd220e36dd3dc19df23545de0a71f952861923493456cfd3cf36123c54a0b7bf0e8064621b21f7712c040857071ca4eea0f40a99f510573ec971cb48030e811a1faded3e94be85f2fb00703d1ff26f96ab9f011a5b04d0c4f26fdb948a754c1b25668c2491483d5d5d611617d6b8f0fe32cb779b492ce65168b4c774a4701eefd8f3a02d56e6e8f13aeefe9a63fa5a89d1970e91d908f3d46003e1480d173e28b37827c9b977348ab92ce16890237d1ec907ee3e8e3d8f60d0e1f4583d009f7d9860662acff89bad1c1faad0717493f7ce7713ed8cb0995c255f2a317a26427b67198f6a70f51c0a41b902279ed1187f23cc17130b7c74de65eac77a7a8f05517e41e2deefa4930576db60fa7a8ee1535134df3e93e7b82e0817476439fd6a9070a49f6fbe4a3077739db99b15c001146dd13a46cf1cc1f83943c62e51de76b0738fc9381e8f3390f0236b252e124999e11724fd833196164bacadb87848224fe874f779b43fe9f2dca928956d505a96dbb3f9bdc18661e00534c26d1a7a40e13912a11c9454280da41048a9915c75585df500074d53d816dc9edd229528ef0db66dbbea3ffdaffa471f1f28d8344df1bf800f1a6e9aa6f813c39885bc050f269c0000000049454e44ae426082</data> </image> </images> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kis_palette_view.h</includehint> </includehints> diff --git a/chalk/ui/wdgcustompattern.ui b/chalk/ui/wdgcustompattern.ui index d195f670..7936f20b 100644 --- a/chalk/ui/wdgcustompattern.ui +++ b/chalk/ui/wdgcustompattern.ui @@ -152,5 +152,5 @@ </widget> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/chalk/ui/wdgdisplaysettings.ui b/chalk/ui/wdgdisplaysettings.ui index 990f316b..64b33f16 100644 --- a/chalk/ui/wdgdisplaysettings.ui +++ b/chalk/ui/wdgdisplaysettings.ui @@ -86,5 +86,5 @@ </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/chalk/ui/wdggeneralsettings.ui b/chalk/ui/wdggeneralsettings.ui index 051cf795..53f3ef90 100644 --- a/chalk/ui/wdggeneralsettings.ui +++ b/chalk/ui/wdggeneralsettings.ui @@ -176,7 +176,7 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> </includehints> diff --git a/chalk/ui/wdggridsettings.ui b/chalk/ui/wdggridsettings.ui index a89574d1..18c1f528 100644 --- a/chalk/ui/wdggridsettings.ui +++ b/chalk/ui/wdggridsettings.ui @@ -448,7 +448,7 @@ <data format="PNG" length="242">89504e470d0a1a0a0000000d49484452000000190000001a0806000000427df7cd000000b9494441544889dd95410ec4200845b1e9ba78ff538a176056260c5181569bccfca590ff2a204da510ecd601008078ed8778953372cec8db20d23c0a72417aa611900999997941a795500a256d2acf7a434354bf212d4927ebc488a417518d4dd75d0dcbb5f2ed983d59f101af94eb7f20d39e3c1963136299f7e2b361f89d9e8c6ed16efc4ee3892a205ecb9adc24fdcc176ffd4b9839e9b896592eb9d623b1106464e605b821da340200086e61afb91ea2a377e89577e57f00357f504513c00b590000000049454e44ae426082</data> </image> </images> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcolorbutton.h</includehint> <includehint>kcolorbutton.h</includehint> diff --git a/chalk/ui/wdglayerbox.ui b/chalk/ui/wdglayerbox.ui index 9bfe5760..d977802e 100644 --- a/chalk/ui/wdglayerbox.ui +++ b/chalk/ui/wdglayerbox.ui @@ -295,5 +295,5 @@ <data format="PNG" length="1002">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b149444154388dad945f4c5b551cc73fe7dc4b7b4bcba0762d45c43114323599ee6192609c51d883892ce083f1718b3ebb185f8dc91e972cf39d2d2a2f1af664b6f1e0fe3863a0718969700eb0c52142da0242a1bd6d696f7bcff101585203ceb8fd9ece39f99dcff9fe7edf939f88c562ec465f5f9fe609442c161362173c3e3eae7b7a7ac8e7f36432196cdbfe4f907c3e4f2291201e8fe338cec3737357e9e8e828aded1e229d650e1f2d51754b082110124c13a4dc5ea341eb9dc284c0558a853f3ce8cb0677ef500fde7d39d2596679e326597b8e9abb85d7a770ab16ab6983ec5a05b487a70e36f0f4e10afe408d6a558310980108478dba4a1e8233990c5d474b64ed39aa3a8fe5f3317fbf81dbd70bccfeb205947632fd74f6589c1c6ea2f70d03a58ba0c1f2c9bdc1b66de3b8256a6e11cbe7e3ee1d181b590124fe2693aeee08d223c82c3a2c24b7b874bec8f26288774f7bd054504aef0dde6e99c0eb83f9fb266323cb80a27fb0958141836044605a2ee5523393371cc646fee2da37195aa35d0c0c5b4859ac03d7e91712dcaac5adab3650a3ff9d08ef7dd8404bb48869e5d958b5b87dadc4c9a1464e9f0d0326df7ebd86bd2e310cb1bf62d384d59441f2d70a070e1c60e09489929b988681bdd9cc97170bcc4c65595f71f8e0e3301337fc24a7732467831875a47f289652b0be5e4151e6d07316c1b0c0340d8ab92023e76d66a6b2840e36d2fb7a13fee632475e6edc367ea98a90fb98b7dd6310ca0328a44761582e1bab41befabcc0ec940d28bc5e93b68e064cab84e1d9beaeb48934eac1f53b01c1b000fca496aa54b61a99fcde61662a4b4b4b23d1680be9d426173e4df3602a48ea411989a4fd590f52a8fd156b05ed9d350e3defe3cfdf4b4c7ce770ea7d3fb9f520afbe1620daeee5c26735d20b9b9cfb6811a754a439e4e5c5639a4caa1e5caf586bfc0197b78702005cb9b4cae4cd3267ce8638fe964bd72b393e39d74928d242617303a756a37f284447770dcdbffc6384a05a85de1306e9a52057c7527c7131c3c42d3f475eb2303c82d4fc3276d6811db37efeb148723082d9b08f79f97c1e5729109a9a28307cc622d2d6cdf52b2b24efe548dedb00142009862cfa879ee1a71f6cec928353511472fbf4389148b0b0e0c108081412458dfe21c9f11351e67e7358595468246d1d1e5e38a6e9e851bc39d84ab502a669331dafec0d8ec7e3e8cb06e1a881d727d1ae40180a434a8c9db129a54126ad48a7358c2b4c5352c8c374bcccdab2bb37d8719cba79fab8211f9df218e0582c261e95f8bfc04f1a1e8bc5c4dfe0a190172af6a9690000000049454e44ae426082</data> </image> </images> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/chalk/ui/wdglayerproperties.ui b/chalk/ui/wdglayerproperties.ui index 35eb01ad..bfbcc0ce 100644 --- a/chalk/ui/wdglayerproperties.ui +++ b/chalk/ui/wdglayerproperties.ui @@ -166,5 +166,5 @@ <data format="PNG" length="1003">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b249444154388db5944d4c5c5518869f73ce9db9cc40f929cc30300e18129a50685268a28291982e1a2175212eaab1c49d3f8971e7aec6aedb54a32b435dd8685cb8c0c4b8b0feb421b7bd8186a069d23209144b18cb0c02f3732ff3c3ccbdd705a571941213f1dd9d93739ef37e6fbeef08d334d9d5d0d090c701c8344d2176c1a6697a5d5d5dd8b64d2a95c2b2ac7f05b12c8b783c8e6118d8b6fd685fdb753a39394928e2a7c55724d693a7e214104220242805520a84d8b9e4790f0b1302c7751958f1e30534be9fa41a0c60db362dbe227f64af91b6e7719c2dfc0117a71c603da591de2882a7d3d4ec27122b10acad50aeb88044d542b84de3af7ab44aa55274f4e449dbf354bc347aa096fbf37e7efa2ecbad1b36907d78b289de8120232f37726250c3f52cf0a026a0f6065b9645d929e038167aa096d91b307171059034b5f8e9e9eb44fa052b4b25eeccd9dc99cb71f6ad082fbea2e351c075bdbdc13b9109fc01b83fef63e2e232e03076b68393231a0dcd024daf502c1e66e67a89cb971ef0e5a74bb4b61e6378248094b92ab0ac024b70ca017ef8360394187b2dc6d8b89ffa500e4d4f93d9083275d5e6f9913ade3dd70ee87c7d25c95646a25415aadab152b09ed4f8c5cc130a853839eac3951b684a61e70ef3f9c739668c24eba912afbfddc6d4d506e6a6d7b8b7d082aa8eb8dab19482cdcd220e36dd3dc19df23545de0a71f952861923493456cfd3cf36123c54a0b7bf0e8064621b21f7712c040857071ca4eea0f40a99f510573ec971cb48030e811a1faded3e94be85f2fb00703d1ff26f96ab9f011a5b04d0c4f26fdb948a754c1b25668c2491483d5d5d611617d6b8f0fe32cb779b492ce65168b4c774a4701eefd8f3a02d56e6e8f13aeefe9a63fa5a89d1970e91d908f3d46003e1480d173e28b37827c9b977348ab92ce16890237d1ec907ee3e8e3d8f60d0e1f4583d009f7d9860662acff89bad1c1faad0717493f7ce7713ed8cb0995c255f2a317a26427b67198f6a70f51c0a41b902279ed1187f23cc17130b7c74de65eac77a7a8f05517e41e2deefa4930576db60fa7a8ee1535134df3e93e7b82e0817476439fd6a9070a49f6fbe4a3077739db99b15c001146dd13a46cf1cc1f83943c62e51de76b0738fc9381e8f3390f0236b252e124999e11724fd833196164bacadb87848224fe874f779b43fe9f2dca928956d505a96dbb3f9bdc18661e00534c26d1a7a40e13912a11c9454280da41048a9915c75585df500074d53d816dc9edd229528ef0db66dbbea3ffdaffa471f1f28d8344df1bf800f1a6e9aa6f813c39885bc050f269c0000000049454e44ae426082</data> </image> </images> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/chalk/ui/wdgnewimage.ui b/chalk/ui/wdgnewimage.ui index 5e3b89a6..dd310483 100644 --- a/chalk/ui/wdgnewimage.ui +++ b/chalk/ui/wdgnewimage.ui @@ -421,7 +421,7 @@ <tabstop>sliderOpacity</tabstop> <tabstop>txtDescription</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint> diff --git a/chalk/ui/wdgpalettechooser.ui b/chalk/ui/wdgpalettechooser.ui index 553cd62b..3654031b 100644 --- a/chalk/ui/wdgpalettechooser.ui +++ b/chalk/ui/wdgpalettechooser.ui @@ -101,5 +101,5 @@ <slot>reject()</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/chalk/ui/wdgperformancesettings.ui b/chalk/ui/wdgperformancesettings.ui index 0bce88e9..c8e4404b 100644 --- a/chalk/ui/wdgperformancesettings.ui +++ b/chalk/ui/wdgperformancesettings.ui @@ -138,7 +138,7 @@ Note that this number is only a guideline for Chalk, and is not guaranteed to be </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint> diff --git a/chalk/ui/wdgpressuresettings.ui b/chalk/ui/wdgpressuresettings.ui index 41ead6a9..90f59a33 100644 --- a/chalk/ui/wdgpressuresettings.ui +++ b/chalk/ui/wdgpressuresettings.ui @@ -62,5 +62,5 @@ </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/chalk/ui/wdgselectionoptions.ui b/chalk/ui/wdgselectionoptions.ui index 39846fa3..ca71ee01 100644 --- a/chalk/ui/wdgselectionoptions.ui +++ b/chalk/ui/wdgselectionoptions.ui @@ -60,5 +60,5 @@ </widget> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/chalk/ui/wdgshapeoptions.ui b/chalk/ui/wdgshapeoptions.ui index c0e6338b..563c7dbc 100644 --- a/chalk/ui/wdgshapeoptions.ui +++ b/chalk/ui/wdgshapeoptions.ui @@ -94,5 +94,5 @@ </spacer> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/chalk/ui/wdgtabletdevicesettings.ui b/chalk/ui/wdgtabletdevicesettings.ui index 59cad307..f9dfaac6 100644 --- a/chalk/ui/wdgtabletdevicesettings.ui +++ b/chalk/ui/wdgtabletdevicesettings.ui @@ -189,5 +189,5 @@ </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/chalk/ui/wdgtabletsettings.ui b/chalk/ui/wdgtabletsettings.ui index ad4dc7bf..29ff9dbb 100644 --- a/chalk/ui/wdgtabletsettings.ui +++ b/chalk/ui/wdgtabletsettings.ui @@ -100,5 +100,5 @@ </spacer> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/chalk/ui/wdgtextbrush.ui b/chalk/ui/wdgtextbrush.ui index 562a62f9..5e5d5dac 100644 --- a/chalk/ui/wdgtextbrush.ui +++ b/chalk/ui/wdgtextbrush.ui @@ -151,7 +151,7 @@ <Q_SLOTS> <slot access="private">boldButtonClicked()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> </includehints> |