diff options
Diffstat (limited to 'chalk')
76 files changed, 160 insertions, 160 deletions
diff --git a/chalk/HACKING b/chalk/HACKING index c6f4ba66..a48526b0 100644 --- a/chalk/HACKING +++ b/chalk/HACKING @@ -62,7 +62,7 @@ Variable/Parameter names Designer - Chalk has started to use designer. All dialogs and all widgets that have a tqlayout + Chalk has started to use designer. All dialogs and all widgets that have a layout manager must be done in designer. We don't add code nor add signal/slot connections in designer diff --git a/chalk/chalkcolor/kis_basic_histogram_producers.h b/chalk/chalkcolor/kis_basic_histogram_producers.h index 8b913ece..83222765 100644 --- a/chalk/chalkcolor/kis_basic_histogram_producers.h +++ b/chalk/chalkcolor/kis_basic_histogram_producers.h @@ -60,7 +60,7 @@ protected: /** * The order in which channels() returns is not the same as the internal representation, * that of the pixel internally. This method converts external usage to internal usage. - * This method uses some basic assumtpions about the tqlayout of the pixel, so _extremely_ + * This method uses some basic assumtpions about the layout of the pixel, so _extremely_ * exotic spaces might want to override this (see makeExternalToInternal source for * those assumptions) **/ diff --git a/chalk/colorspaces/wet/kis_wet_palette_widget.cc b/chalk/colorspaces/wet/kis_wet_palette_widget.cc index 901f2909..7c115325 100644 --- a/chalk/colorspaces/wet/kis_wet_palette_widget.cc +++ b/chalk/colorspaces/wet/kis_wet_palette_widget.cc @@ -50,7 +50,7 @@ KisWetPaletteWidget::KisWetPaletteWidget(TQWidget *parent, const char *name) : s { m_subject = 0; - TQVBoxLayout * vl = new TQVBoxLayout(this, 0, -1, "main tqlayout"); + TQVBoxLayout * vl = new TQVBoxLayout(this, 0, -1, "main layout"); TQGridLayout * l = new TQGridLayout(vl, 2, 8, 2, "color wells grid"); diff --git a/chalk/doc/doc-outline b/chalk/doc/doc-outline index 081f9ed7..88722a45 100644 --- a/chalk/doc/doc-outline +++ b/chalk/doc/doc-outline @@ -85,7 +85,7 @@ The current outline (working towards 1.6): - [TODO] properties, usage, converting, ... - Commands - - General tqlayout + - General layout - Menus - Toolbars - Palettes @@ -142,7 +142,7 @@ Outline for the 1.5 manual (final as of 2006-05-31): - Available colorspaces - Commands ([TODO] make up-to-date) - - General tqlayout + - General layout - Menus - Toolbars - Palettes diff --git a/chalk/doc/the preview widget b/chalk/doc/the preview widget index cc06b9de..a403da86 100644 --- a/chalk/doc/the preview widget +++ b/chalk/doc/the preview widget @@ -2,7 +2,7 @@ On Tuesday 21 June 2005 14:16, Casper Boemann wrote: > Hi > -> As you might have noticed I have changed the tqlayout of the preview, to lo= +> As you might have noticed I have changed the layout of the preview, to lo= ok > more like digikam. > diff --git a/chalk/plugins/filters/blur/wdgblur.ui b/chalk/plugins/filters/blur/wdgblur.ui index 56f9e1c7..8cd89f63 100644 --- a/chalk/plugins/filters/blur/wdgblur.ui +++ b/chalk/plugins/filters/blur/wdgblur.ui @@ -58,7 +58,7 @@ </spacer> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout17</cstring> + <cstring>layout17</cstring> </property> <grid> <property name="name"> diff --git a/chalk/plugins/filters/colorify/WdgColorifyBase.ui b/chalk/plugins/filters/colorify/WdgColorifyBase.ui index c3c5afc6..90337f22 100644 --- a/chalk/plugins/filters/colorify/WdgColorifyBase.ui +++ b/chalk/plugins/filters/colorify/WdgColorifyBase.ui @@ -38,7 +38,7 @@ </spacer> <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> diff --git a/chalk/plugins/filters/colors/wdgcolortoalphabase.ui b/chalk/plugins/filters/colors/wdgcolortoalphabase.ui index ba89fd8f..70ff3071 100644 --- a/chalk/plugins/filters/colors/wdgcolortoalphabase.ui +++ b/chalk/plugins/filters/colors/wdgcolortoalphabase.ui @@ -38,7 +38,7 @@ </spacer> <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> diff --git a/chalk/plugins/filters/colorsfilters/wdg_brightness_contrast.ui b/chalk/plugins/filters/colorsfilters/wdg_brightness_contrast.ui index 8cd59c00..3382102c 100644 --- a/chalk/plugins/filters/colorsfilters/wdg_brightness_contrast.ui +++ b/chalk/plugins/filters/colorsfilters/wdg_brightness_contrast.ui @@ -32,7 +32,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <grid> <property name="name"> @@ -169,7 +169,7 @@ </widget> <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <grid> <property name="name"> diff --git a/chalk/plugins/filters/colorsfilters/wdg_perchannel.ui b/chalk/plugins/filters/colorsfilters/wdg_perchannel.ui index c2955071..7f413abc 100644 --- a/chalk/plugins/filters/colorsfilters/wdg_perchannel.ui +++ b/chalk/plugins/filters/colorsfilters/wdg_perchannel.ui @@ -24,7 +24,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -47,7 +47,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <grid> <property name="name"> diff --git a/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_base_widget.ui b/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_base_widget.ui index 9426d92c..860595e2 100644 --- a/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_base_widget.ui +++ b/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_base_widget.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <vbox> <property name="name"> @@ -34,7 +34,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -80,7 +80,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> diff --git a/chalk/plugins/filters/fastcolortransfer/wdgfastcolortransfer.ui b/chalk/plugins/filters/fastcolortransfer/wdgfastcolortransfer.ui index 78259420..97379cea 100644 --- a/chalk/plugins/filters/fastcolortransfer/wdgfastcolortransfer.ui +++ b/chalk/plugins/filters/fastcolortransfer/wdgfastcolortransfer.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> diff --git a/chalk/plugins/filters/levelfilter/wdg_level.ui b/chalk/plugins/filters/levelfilter/wdg_level.ui index 6ce5874b..f365e3d1 100644 --- a/chalk/plugins/filters/levelfilter/wdg_level.ui +++ b/chalk/plugins/filters/levelfilter/wdg_level.ui @@ -60,7 +60,7 @@ </widget> <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <vbox> <property name="name"> @@ -88,7 +88,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <vbox> <property name="name"> @@ -107,7 +107,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <hbox> <property name="name"> @@ -194,7 +194,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <vbox> <property name="name"> @@ -213,7 +213,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> diff --git a/chalk/plugins/paintops/defaultpaintops/kis_dlgbrushcurvecontrol.ui b/chalk/plugins/paintops/defaultpaintops/kis_dlgbrushcurvecontrol.ui index bca19dce..e88ecbe3 100644 --- a/chalk/plugins/paintops/defaultpaintops/kis_dlgbrushcurvecontrol.ui +++ b/chalk/plugins/paintops/defaultpaintops/kis_dlgbrushcurvecontrol.ui @@ -39,7 +39,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <vbox> <property name="name"> @@ -83,7 +83,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <vbox> <property name="name"> @@ -127,7 +127,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <vbox> <property name="name"> diff --git a/chalk/plugins/tools/defaulttools/wdgcolorpicker.ui b/chalk/plugins/tools/defaulttools/wdgcolorpicker.ui index 0da52d4e..5463d3e3 100644 --- a/chalk/plugins/tools/defaulttools/wdgcolorpicker.ui +++ b/chalk/plugins/tools/defaulttools/wdgcolorpicker.ui @@ -70,7 +70,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -101,7 +101,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cc index 4a59c384..d6c8dd23 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cc +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cc @@ -152,7 +152,7 @@ TQWidget* KisToolSelectBrush::createOptionWidget(TQWidget* parent) Q_CHECK_PTR(m_optWidget); m_optWidget->setCaption(i18n("Selection Brush")); - TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->tqlayout()); + TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->layout()); l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding)); return m_optWidget; diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cc index cc164680..94c28e01 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cc +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cc @@ -189,7 +189,7 @@ TQWidget* KisToolSelectContiguous::createOptionWidget(TQWidget* parent) Q_CHECK_PTR(m_optWidget); m_optWidget->setCaption(i18n("Contiguous Area Selection")); - TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->tqlayout()); + TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->layout()); l->setSpacing( 6 ); connect (m_optWidget, TQT_SIGNAL(actionChanged(int)), this, TQT_SLOT(slotSetAction(int))); diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc index 3028d121..c499f48a 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc @@ -305,7 +305,7 @@ TQWidget* KisToolSelectElliptical::createOptionWidget(TQWidget* parent) connect (m_optWidget, TQT_SIGNAL(actionChanged(int)), this, TQT_SLOT(slotSetAction(int))); - TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->tqlayout()); + TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->layout()); l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding)); return m_optWidget; diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cc index 118281e1..de5b92f1 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cc +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cc @@ -139,7 +139,7 @@ TQWidget* KisToolSelectEraser::createOptionWidget(TQWidget* parent) Q_CHECK_PTR(m_optWidget); m_optWidget->setCaption(i18n("Selection Eraser")); - TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->tqlayout()); + TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->layout()); l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding)); return m_optWidget; diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cc index 8bac379c..a21b731e 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cc +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cc @@ -275,7 +275,7 @@ TQWidget* KisToolSelectOutline::createOptionWidget(TQWidget* parent) connect (m_optWidget, TQT_SIGNAL(actionChanged(int)), this, TQT_SLOT(slotSetAction(int))); - TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->tqlayout()); + TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->layout()); l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding)); return m_optWidget; diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cc index 85a53c94..39f306ac 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cc +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cc @@ -294,7 +294,7 @@ TQWidget* KisToolSelectPolygonal::createOptionWidget(TQWidget* parent) connect (m_optWidget, TQT_SIGNAL(actionChanged(int)), this, TQT_SLOT(slotSetAction(int))); - TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->tqlayout()); + TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->layout()); l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding)); return m_optWidget; diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cc index 54bfbdd6..3d580f89 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cc +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cc @@ -306,7 +306,7 @@ TQWidget* KisToolSelectRectangular::createOptionWidget(TQWidget* parent) connect (m_optWidget, TQT_SIGNAL(actionChanged(int)), this, TQT_SLOT(slotSetAction(int))); - TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->tqlayout()); + TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->layout()); l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding)); return m_optWidget; diff --git a/chalk/plugins/tools/tool_crop/wdg_tool_crop.ui b/chalk/plugins/tools/tool_crop/wdg_tool_crop.ui index 7f929231..5cbcd476 100644 --- a/chalk/plugins/tools/tool_crop/wdg_tool_crop.ui +++ b/chalk/plugins/tools/tool_crop/wdg_tool_crop.ui @@ -27,7 +27,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <grid> <property name="name"> @@ -138,7 +138,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <hbox> <property name="name"> diff --git a/chalk/plugins/tools/tool_curves/kis_tool_curve.cc b/chalk/plugins/tools/tool_curves/kis_tool_curve.cc index d4a8605d..16d238fc 100644 --- a/chalk/plugins/tools/tool_curves/kis_tool_curve.cc +++ b/chalk/plugins/tools/tool_curves/kis_tool_curve.cc @@ -576,7 +576,7 @@ TQWidget* KisToolCurve::createSelectionOptionWidget(TQWidget* parent) connect (m_optWidget, TQT_SIGNAL(actionChanged(int)), this, TQT_SLOT(slotSetAction(int))); - TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->tqlayout()); + TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->layout()); l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding)); return m_optWidget; diff --git a/chalk/plugins/tools/tool_curves/kis_tool_moutline.cc b/chalk/plugins/tools/tool_curves/kis_tool_moutline.cc index 42806771..28545a50 100644 --- a/chalk/plugins/tools/tool_curves/kis_tool_moutline.cc +++ b/chalk/plugins/tools/tool_curves/kis_tool_moutline.cc @@ -762,7 +762,7 @@ void KisToolMagnetic::slotSetDistance (int dist) TQWidget* KisToolMagnetic::createOptionWidget(TQWidget* parent) { m_optWidget = super::createOptionWidget(parent); - TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->tqlayout()); + TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->layout()); TQGridLayout *box = new TQGridLayout(l, 2, 2, 3); box->setColStretch(0, 1); box->setColStretch(1, 1); diff --git a/chalk/plugins/tools/tool_curves/wdg_tool_example.ui b/chalk/plugins/tools/tool_curves/wdg_tool_example.ui index 035eff3b..1384ff58 100644 --- a/chalk/plugins/tools/tool_curves/wdg_tool_example.ui +++ b/chalk/plugins/tools/tool_curves/wdg_tool_example.ui @@ -24,7 +24,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <hbox> <property name="name"> @@ -59,7 +59,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <hbox> <property name="name"> diff --git a/chalk/plugins/tools/tool_star/wdg_tool_star.ui b/chalk/plugins/tools/tool_star/wdg_tool_star.ui index 3f4f30f5..a6395037 100644 --- a/chalk/plugins/tools/tool_star/wdg_tool_star.ui +++ b/chalk/plugins/tools/tool_star/wdg_tool_star.ui @@ -24,7 +24,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <hbox> <property name="name"> @@ -59,7 +59,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <hbox> <property name="name"> diff --git a/chalk/plugins/tools/tool_transform/wdg_tool_transform.ui b/chalk/plugins/tools/tool_transform/wdg_tool_transform.ui index 8be9071b..5375d564 100644 --- a/chalk/plugins/tools/tool_transform/wdg_tool_transform.ui +++ b/chalk/plugins/tools/tool_transform/wdg_tool_transform.ui @@ -27,7 +27,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout11</cstring> + <cstring>layout11</cstring> </property> <hbox> <property name="name"> @@ -35,7 +35,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <vbox> <property name="name"> @@ -43,7 +43,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -72,7 +72,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -103,7 +103,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <vbox> <property name="name"> @@ -111,7 +111,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -140,7 +140,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> diff --git a/chalk/plugins/viewplugins/colorrange/wdg_colorrange.ui b/chalk/plugins/viewplugins/colorrange/wdg_colorrange.ui index 4655a4d9..876f0319 100644 --- a/chalk/plugins/viewplugins/colorrange/wdg_colorrange.ui +++ b/chalk/plugins/viewplugins/colorrange/wdg_colorrange.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <hbox> <property name="name"> @@ -29,7 +29,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <vbox> <property name="name"> @@ -37,7 +37,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <hbox> <property name="name"> @@ -144,7 +144,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <vbox> <property name="name"> diff --git a/chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cc b/chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cc index bdda9901..e0bec7ec 100644 --- a/chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cc +++ b/chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cc @@ -67,7 +67,7 @@ KisDlgFiltersGallery::KisDlgFiltersGallery(KisView* view, TQWidget* parent,const resize( minimumSizeHint()); m_widget->previewWidget->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::MinimumExpanding); m_labelNoCW = new TQLabel(i18n("No configuration options are available for this filter."), m_widget->configWidgetHolder); - m_widget->configWidgetHolder->tqlayout()->add(m_labelNoCW); + m_widget->configWidgetHolder->layout()->add(m_labelNoCW); m_labelNoCW->hide(); } @@ -81,7 +81,7 @@ void KisDlgFiltersGallery::selectionHasChanged ( TQIconViewItem * item ) m_currentFilter = kisitem->filter(); if(m_currentConfigWidget != 0) { - m_widget->configWidgetHolder->tqlayout()->remove(m_currentConfigWidget); + m_widget->configWidgetHolder->layout()->remove(m_currentConfigWidget); delete m_currentConfigWidget; m_currentConfigWidget = 0; } else { @@ -95,7 +95,7 @@ void KisDlgFiltersGallery::selectionHasChanged ( TQIconViewItem * item ) if(m_currentConfigWidget != 0) { //m_currentConfigWidget->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); - m_widget->configWidgetHolder->tqlayout()->add(m_currentConfigWidget); + m_widget->configWidgetHolder->layout()->add(m_currentConfigWidget); m_currentConfigWidget->show(); connect(m_currentConfigWidget, TQT_SIGNAL(sigPleaseUpdatePreview()), this, TQT_SLOT(slotConfigChanged())); } diff --git a/chalk/plugins/viewplugins/histogram/wdghistogram.ui b/chalk/plugins/viewplugins/histogram/wdghistogram.ui index 0c5c5a9d..be6f9552 100644 --- a/chalk/plugins/viewplugins/histogram/wdghistogram.ui +++ b/chalk/plugins/viewplugins/histogram/wdghistogram.ui @@ -133,7 +133,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> diff --git a/chalk/plugins/viewplugins/performancetest/wdg_perftest.ui b/chalk/plugins/viewplugins/performancetest/wdg_perftest.ui index 20f66825..b019e9e1 100644 --- a/chalk/plugins/viewplugins/performancetest/wdg_perftest.ui +++ b/chalk/plugins/viewplugins/performancetest/wdg_perftest.ui @@ -233,7 +233,7 @@ </widget> <widget class="TQLayoutWidget" row="18" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <hbox> <property name="name"> diff --git a/chalk/plugins/viewplugins/rotateimage/wdg_rotateimage.ui b/chalk/plugins/viewplugins/rotateimage/wdg_rotateimage.ui index 841341f7..af18881a 100644 --- a/chalk/plugins/viewplugins/rotateimage/wdg_rotateimage.ui +++ b/chalk/plugins/viewplugins/rotateimage/wdg_rotateimage.ui @@ -32,7 +32,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <hbox> <property name="name"> @@ -177,7 +177,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> diff --git a/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp b/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp index 2a4c5029..32e825ee 100644 --- a/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp +++ b/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp @@ -162,7 +162,7 @@ bool KSnapshot::save( const KURL& url ) void KSnapshot::slotCopy() { - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); cb->setPixmap( snapshot ); } diff --git a/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp b/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp index 374033d6..c3675590 100644 --- a/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp +++ b/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp @@ -161,7 +161,7 @@ void RegionGrabber::drawRubber() p.setPen( TQPen( color0, 1 ) ); p.setBrush( NoBrush ); - tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, grabRect, colorGroup(), + style().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, grabRect, colorGroup(), TQStyle::Style_Default, TQStyleOption( colorGroup().base() ) ); p.end(); diff --git a/chalk/plugins/viewplugins/shearimage/dlg_shearimage.cc b/chalk/plugins/viewplugins/shearimage/dlg_shearimage.cc index afaedeeb..ea387c45 100644 --- a/chalk/plugins/viewplugins/shearimage/dlg_shearimage.cc +++ b/chalk/plugins/viewplugins/shearimage/dlg_shearimage.cc @@ -46,7 +46,7 @@ DlgShearImage::DlgShearImage( TQWidget * parent, m_lock = false; m_page = new WdgShearImage(this, "shear_image"); - m_page->tqlayout()->setMargin(0); + m_page->layout()->setMargin(0); Q_CHECK_PTR(m_page); setMainWidget(m_page); diff --git a/chalk/plugins/viewplugins/substrate/wdgsubstrate.ui b/chalk/plugins/viewplugins/substrate/wdgsubstrate.ui index 3382fe1f..de5850d6 100644 --- a/chalk/plugins/viewplugins/substrate/wdgsubstrate.ui +++ b/chalk/plugins/viewplugins/substrate/wdgsubstrate.ui @@ -29,7 +29,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <grid> <property name="name"> @@ -92,7 +92,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <grid> <property name="name"> diff --git a/chalk/plugins/viewplugins/variations/wdg_variations.ui b/chalk/plugins/viewplugins/variations/wdg_variations.ui index 45795b42..a9c7adea 100644 --- a/chalk/plugins/viewplugins/variations/wdg_variations.ui +++ b/chalk/plugins/viewplugins/variations/wdg_variations.ui @@ -228,7 +228,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <property name="geometry"> <rect> diff --git a/chalk/ui/kis_brush_chooser.cc b/chalk/ui/kis_brush_chooser.cc index 894db607..0e06a781 100644 --- a/chalk/ui/kis_brush_chooser.cc +++ b/chalk/ui/kis_brush_chooser.cc @@ -41,7 +41,7 @@ KisBrushChooser::KisBrushChooser(TQWidget *parent, const char *name) m_lbName = new TQLabel(this); - TQVBoxLayout *mainLayout = new TQVBoxLayout(this, 2, -1, "main tqlayout"); + TQVBoxLayout *mainLayout = new TQVBoxLayout(this, 2, -1, "main layout"); mainLayout->addWidget(m_lbName); mainLayout->addWidget(chooserWidget(), 10); diff --git a/chalk/ui/kis_clipboard.cc b/chalk/ui/kis_clipboard.cc index 702ec210..0c3f65e7 100644 --- a/chalk/ui/kis_clipboard.cc +++ b/chalk/ui/kis_clipboard.cc @@ -52,7 +52,7 @@ KisClipboard::KisClipboard() clipboardDataChanged(); // Make sure we are notified when clipboard changes - connect( TQApplication::tqclipboard(), TQT_SIGNAL( dataChanged() ), + connect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ), this, TQT_SLOT( clipboardDataChanged() ) ); } @@ -132,14 +132,14 @@ void KisClipboard::setClip(KisPaintDeviceSP selection) multiDrag->addDragObject( storeDrag ); - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); cb->setData(multiDrag); m_pushedClipboard = true; } KisPaintDeviceSP KisClipboard::clip() { - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); TQCString mimeType("application/x-chalk-selection"); TQMimeSource *cbData = cb->data(); @@ -211,7 +211,7 @@ void KisClipboard::clipboardDataChanged() { if (!m_pushedClipboard) { m_hasClip = false; - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); TQImage qimg = cb->image(); TQMimeSource *cbData = cb->data(); TQCString mimeType("application/x-chalk-selection"); @@ -235,7 +235,7 @@ bool KisClipboard::hasClip() TQSize KisClipboard::clipSize() { - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); TQCString mimeType("application/x-chalk-selection"); TQMimeSource *cbData = cb->data(); diff --git a/chalk/ui/kis_color_cup.cc b/chalk/ui/kis_color_cup.cc index b691295c..fe2b93fd 100644 --- a/chalk/ui/kis_color_cup.cc +++ b/chalk/ui/kis_color_cup.cc @@ -83,25 +83,25 @@ void KisColorCup::slotClicked() TQSize KisColorCup::sizeHint() const { - return tqstyle().tqsizeFromContents(TQStyle::CT_PushButton, this, TQSize(24, 24)). + return style().tqsizeFromContents(TQStyle::CT_PushButton, this, TQSize(24, 24)). expandedTo(TQApplication::globalStrut()); } void KisColorCup::drawButtonLabel( TQPainter *painter ) { int x, y, w, h; - TQRect r = tqstyle().subRect( TQStyle::SR_PushButtonContents, this ); + TQRect r = style().subRect( TQStyle::SR_PushButtonContents, this ); r.rect(&x, &y, &w, &h); - int margin = 2; //tqstyle().pixelMetric( TQStyle::PM_ButtonMargin, this ); + int margin = 2; //style().pixelMetric( TQStyle::PM_ButtonMargin, this ); x += margin; y += margin; w -= 2*margin; h -= 2*margin; if (isOn() || isDown()) { - x += tqstyle().pixelMetric( TQStyle::PM_ButtonShiftHorizontal, this ); - y += tqstyle().pixelMetric( TQStyle::PM_ButtonShiftVertical, this ); + x += style().pixelMetric( TQStyle::PM_ButtonShiftHorizontal, this ); + y += style().pixelMetric( TQStyle::PM_ButtonShiftVertical, this ); } qDrawShadePanel( painter, x, y, w, h, colorGroup(), true, 1, NULL); @@ -109,8 +109,8 @@ void KisColorCup::drawButtonLabel( TQPainter *painter ) painter->fillRect( x+1, y+1, w-2, h-2, m_color ); if ( hasFocus() ) { - TQRect focusRect = tqstyle().subRect( TQStyle::SR_PushButtonFocusRect, this ); - tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, painter, focusRect, colorGroup() ); + TQRect focusRect = style().subRect( TQStyle::SR_PushButtonFocusRect, this ); + style().tqdrawPrimitive( TQStyle::PE_FocusRect, painter, focusRect, colorGroup() ); } } diff --git a/chalk/ui/kis_controlframe.cc b/chalk/ui/kis_controlframe.cc index fab8c4bb..74f3cd0a 100644 --- a/chalk/ui/kis_controlframe.cc +++ b/chalk/ui/kis_controlframe.cc @@ -218,7 +218,7 @@ void KisControlFrame::createBrushesChooser(KisView * view) m_brushChooserPopup = new KisPopupFrame(m_brushWidget, "brush_chooser_popup"); - TQHBoxLayout * l = new TQHBoxLayout(m_brushChooserPopup, 2, 2, "brushpopuptqlayout"); + TQHBoxLayout * l = new TQHBoxLayout(m_brushChooserPopup, 2, 2, "brushpopuplayout"); TQTabWidget * m_brushesTab = new TQTabWidget(m_brushChooserPopup, "brushestab"); m_brushesTab->setTabShape(TQTabWidget::Triangular); @@ -270,7 +270,7 @@ void KisControlFrame::createPatternsChooser(KisView * view) { m_patternChooserPopup = new KisPopupFrame(m_patternWidget, "pattern_chooser_popup"); - TQHBoxLayout * l2 = new TQHBoxLayout(m_patternChooserPopup, 2, 2, "patternpopuptqlayout"); + TQHBoxLayout * l2 = new TQHBoxLayout(m_patternChooserPopup, 2, 2, "patternpopuplayout"); TQTabWidget * m_patternsTab = new TQTabWidget(m_patternChooserPopup, "patternstab"); m_patternsTab->setTabShape(TQTabWidget::Triangular); @@ -311,7 +311,7 @@ void KisControlFrame::createGradientsChooser(KisView * view) { m_gradientChooserPopup = new KisPopupFrame(m_gradientWidget, "gradient_chooser_popup"); - TQHBoxLayout * l2 = new TQHBoxLayout(m_gradientChooserPopup, 2, 2, "gradientpopuptqlayout"); + TQHBoxLayout * l2 = new TQHBoxLayout(m_gradientChooserPopup, 2, 2, "gradientpopuplayout"); TQTabWidget * m_gradientTab = new TQTabWidget(m_gradientChooserPopup, "gradientstab"); m_gradientTab->setTabShape(TQTabWidget::Triangular); diff --git a/chalk/ui/kis_dlg_adj_layer_props.cc b/chalk/ui/kis_dlg_adj_layer_props.cc index f5227eee..159d966f 100644 --- a/chalk/ui/kis_dlg_adj_layer_props.cc +++ b/chalk/ui/kis_dlg_adj_layer_props.cc @@ -85,16 +85,16 @@ KisDlgAdjLayerProps::KisDlgAdjLayerProps(KisAdjustmentLayerSP layer, } setCaption(caption); TQWidget * page = new TQWidget(this, "page widget"); - TQHBoxLayout * tqlayout = new TQHBoxLayout(page, 0, 6); + TQHBoxLayout * layout = new TQHBoxLayout(page, 0, 6); setMainWidget(page); m_preview = new KisPreviewWidget(page, "dlgadjustment.preview"); m_preview->slotSetDevice( dev ); connect( m_preview, TQT_SIGNAL(updated()), this, TQT_SLOT(refreshPreview())); - tqlayout->addWidget(m_preview, 1, 1); + layout->addWidget(m_preview, 1, 1); - TQVBoxLayout *v1 = new TQVBoxLayout( tqlayout ); + TQVBoxLayout *v1 = new TQVBoxLayout( layout ); TQHBoxLayout *hl = new TQHBoxLayout( v1 ); TQLabel * lblName = new TQLabel(i18n("Layer name:"), page, "lblName"); diff --git a/chalk/ui/kis_dlg_adjustment_layer.cc b/chalk/ui/kis_dlg_adjustment_layer.cc index 0594659b..9819228e 100644 --- a/chalk/ui/kis_dlg_adjustment_layer.cc +++ b/chalk/ui/kis_dlg_adjustment_layer.cc @@ -102,7 +102,7 @@ KisDlgAdjustmentLayer::KisDlgAdjustmentLayer(KisImage * img, m_labelNoConfigWidget = new TQLabel(i18n("No configuration options are available for this filter"), m_configWidgetHolder); - m_configWidgetHolder->tqlayout()->add(m_labelNoConfigWidget); + m_configWidgetHolder->layout()->add(m_labelNoConfigWidget); m_labelNoConfigWidget->hide(); resize( TQSize(600, 480).expandedTo(minimumSizeHint()) ); @@ -156,7 +156,7 @@ void KisDlgAdjustmentLayer::selectionHasChanged ( TQIconViewItem * item ) if ( m_currentConfigWidget != 0 ) { - m_configWidgetHolder->tqlayout()->remove(m_currentConfigWidget); + m_configWidgetHolder->layout()->remove(m_currentConfigWidget); delete m_currentConfigWidget; m_currentConfigWidget = 0; @@ -173,7 +173,7 @@ void KisDlgAdjustmentLayer::selectionHasChanged ( TQIconViewItem * item ) if (m_currentConfigWidget != 0) { - m_configWidgetHolder->tqlayout()->add(m_currentConfigWidget); + m_configWidgetHolder->layout()->add(m_currentConfigWidget); m_currentConfigWidget->show(); connect(m_currentConfigWidget, TQT_SIGNAL(sigPleaseUpdatePreview()), this, TQT_SLOT(slotConfigChanged())); } else { diff --git a/chalk/ui/kis_dlg_layer_properties.cc b/chalk/ui/kis_dlg_layer_properties.cc index 7742969b..500d29a1 100644 --- a/chalk/ui/kis_dlg_layer_properties.cc +++ b/chalk/ui/kis_dlg_layer_properties.cc @@ -43,7 +43,7 @@ KisDlgLayerProperties::KisDlgLayerProperties(const TQString& deviceName, : super(parent, name, f, name, Ok | Cancel) { m_page = new WdgLayerProperties(this); - m_page->tqlayout()->setMargin(0); + m_page->layout()->setMargin(0); opacity = int((opacity * 100.0) / 255 + 0.5); diff --git a/chalk/ui/kis_dlg_new_layer.cc b/chalk/ui/kis_dlg_new_layer.cc index 154dbf2c..4eb5a409 100644 --- a/chalk/ui/kis_dlg_new_layer.cc +++ b/chalk/ui/kis_dlg_new_layer.cc @@ -48,7 +48,7 @@ NewLayerDialog::NewLayerDialog(const KisID colorSpaceID, : super(parent, name, true, "", Ok | Cancel) { m_page = new WdgLayerProperties(this); - m_page->tqlayout()->setMargin(0); + m_page->layout()->setMargin(0); setCaption(i18n("New Layer")); diff --git a/chalk/ui/kis_double_widget.cc b/chalk/ui/kis_double_widget.cc index 6c03b3e9..a966691d 100644 --- a/chalk/ui/kis_double_widget.cc +++ b/chalk/ui/kis_double_widget.cc @@ -53,7 +53,7 @@ void KisDoubleWidget::init(double min, double max) connect(m_slider, TQT_SIGNAL(sliderPressed()), TQT_SIGNAL(sliderPressed())); connect(m_slider, TQT_SIGNAL(sliderReleased()), TQT_SIGNAL(sliderReleased())); - m_layout = new TQHBoxLayout(this, 0, -1, "hbox tqlayout"); + m_layout = new TQHBoxLayout(this, 0, -1, "hbox layout"); m_layout->addWidget(m_slider); m_layout->addSpacing(5); diff --git a/chalk/ui/kis_gradient_chooser.cc b/chalk/ui/kis_gradient_chooser.cc index 203f0718..098efb55 100644 --- a/chalk/ui/kis_gradient_chooser.cc +++ b/chalk/ui/kis_gradient_chooser.cc @@ -49,7 +49,7 @@ KisGradientChooser::KisGradientChooser(KisView * view, TQWidget *parent, const c KisCustomGradientDialog * autogradient = new KisCustomGradientDialog(view, this, "autogradient"); connect(m_customGradient, TQT_SIGNAL(clicked()), autogradient, TQT_SLOT(show())); - TQVBoxLayout *mainLayout = new TQVBoxLayout(this, 2, -1, "main tqlayout"); + TQVBoxLayout *mainLayout = new TQVBoxLayout(this, 2, -1, "main layout"); mainLayout->addWidget(m_lbName); mainLayout->addWidget(chooserWidget(), 10); diff --git a/chalk/ui/kis_int_spinbox.cc b/chalk/ui/kis_int_spinbox.cc index 108d60fe..92573c9f 100644 --- a/chalk/ui/kis_int_spinbox.cc +++ b/chalk/ui/kis_int_spinbox.cc @@ -98,7 +98,7 @@ void KisIntSpinbox::init(int val) d->m_prevValue = val; setValue(val); setFocusProxy(d->m_numinput); - tqlayout(); + layout(); connect(d->m_numinput, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(spinboxValueChanged(int))); connect(d->m_slider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(sliderValueChanged(int))); @@ -128,7 +128,7 @@ void KisIntSpinbox::setRange(int lower, int upper, int /*step*/) lower = kMin(upper, lower); d->m_slider->setRange(lower, upper); - tqlayout(); + layout(); } void KisIntSpinbox::setMinValue(int min) diff --git a/chalk/ui/kis_palette_widget.cc b/chalk/ui/kis_palette_widget.cc index 892686b3..5511ae09 100644 --- a/chalk/ui/kis_palette_widget.cc +++ b/chalk/ui/kis_palette_widget.cc @@ -67,14 +67,14 @@ KisPaletteWidget::KisPaletteWidget( TQWidget *parent, int minWidth, int cols) m_currentPalette = 0; - TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); + TQVBoxLayout *layout = new TQVBoxLayout( this ); combo = new TQComboBox( false, this ); combo->setFocusPolicy( TQ_ClickFocus ); - tqlayout->addWidget(combo); + layout->addWidget(combo); m_view = new KisPaletteView(this, 0, minWidth, cols); - tqlayout->addWidget( m_view ); + layout->addWidget( m_view ); //setFixedSize(sizeHint()); diff --git a/chalk/ui/kis_pattern_chooser.cc b/chalk/ui/kis_pattern_chooser.cc index 9dd99023..b05f62a0 100644 --- a/chalk/ui/kis_pattern_chooser.cc +++ b/chalk/ui/kis_pattern_chooser.cc @@ -30,7 +30,7 @@ KisPatternChooser::KisPatternChooser(TQWidget *parent, const char *name) : super { m_lbName = new TQLabel(this); - TQVBoxLayout *mainLayout = new TQVBoxLayout(this, 2, -1, "main tqlayout"); + TQVBoxLayout *mainLayout = new TQVBoxLayout(this, 2, -1, "main layout"); mainLayout->addWidget(m_lbName); mainLayout->addWidget(chooserWidget(), 10); diff --git a/chalk/ui/kis_previewdialog.cc b/chalk/ui/kis_previewdialog.cc index e2857c19..d67d5e58 100644 --- a/chalk/ui/kis_previewdialog.cc +++ b/chalk/ui/kis_previewdialog.cc @@ -28,14 +28,14 @@ KisPreviewDialog::KisPreviewDialog( TQWidget * parent, const char * name, bool modal, const TQString &caption) : super (parent, name, modal, caption, Ok | Cancel, Ok) { - TQHBox* tqlayout = new TQHBox(this); - tqlayout->setSpacing( 6 ); + TQHBox* layout = new TQHBox(this); + layout->setSpacing( 6 ); - m_containerFrame = new TQFrame( tqlayout, "container" ); + m_containerFrame = new TQFrame( layout, "container" ); - m_preview = new KisPreviewWidget( tqlayout, "previewWidget" ); + m_preview = new KisPreviewWidget( layout, "previewWidget" ); - setMainWidget(tqlayout); + setMainWidget(layout); } KisPreviewDialog::~KisPreviewDialog() diff --git a/chalk/ui/kis_previewwidgetbase.ui b/chalk/ui/kis_previewwidgetbase.ui index 8e7bf40a..6ba86353 100644 --- a/chalk/ui/kis_previewwidgetbase.ui +++ b/chalk/ui/kis_previewwidgetbase.ui @@ -73,7 +73,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -122,7 +122,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <vbox> <property name="name"> @@ -130,7 +130,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> diff --git a/chalk/ui/kis_selection_manager.cc b/chalk/ui/kis_selection_manager.cc index 0655b834..5d7a31d1 100644 --- a/chalk/ui/kis_selection_manager.cc +++ b/chalk/ui/kis_selection_manager.cc @@ -236,7 +236,7 @@ void KisSelectionManager::setup(KActionCollection * collection) // this, TQT_SLOT(save()), // collection, "save_selection"); - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); connect(cb, TQT_SIGNAL(dataChanged()), TQT_SLOT(clipboardDataChanged())); } diff --git a/chalk/ui/kis_tool_paint.cc b/chalk/ui/kis_tool_paint.cc index 9d37dae6..995a3fe4 100644 --- a/chalk/ui/kis_tool_paint.cc +++ b/chalk/ui/kis_tool_paint.cc @@ -161,12 +161,12 @@ TQWidget* KisToolPaint::optionWidget() return m_optionWidget; } -void KisToolPaint::addOptionWidgetLayout(TQLayout *tqlayout) +void KisToolPaint::addOptionWidgetLayout(TQLayout *layout) { Q_ASSERT(m_optionWidget != 0); Q_ASSERT(m_optionWidgetLayout != 0); int rowCount = m_optionWidgetLayout->numRows(); - m_optionWidgetLayout->addMultiCellLayout(tqlayout, rowCount, rowCount, 0, 1); + m_optionWidgetLayout->addMultiCellLayout(layout, rowCount, rowCount, 0, 1); } void KisToolPaint::addOptionWidgetOption(TQWidget *control, TQWidget *label) diff --git a/chalk/ui/kis_tool_paint.h b/chalk/ui/kis_tool_paint.h index 7fb4b819..565d1476 100644 --- a/chalk/ui/kis_tool_paint.h +++ b/chalk/ui/kis_tool_paint.h @@ -88,8 +88,8 @@ public slots: protected: void notifyModified() const; - // Add the tool-specific tqlayout to the default option widget's tqlayout. - void addOptionWidgetLayout(TQLayout *tqlayout); + // Add the tool-specific layout to the default option widget's layout. + void addOptionWidgetLayout(TQLayout *layout); private: void updateCompositeOpComboBox(); diff --git a/chalk/ui/kis_view.cc b/chalk/ui/kis_view.cc index 629072ff..decc9eca 100644 --- a/chalk/ui/kis_view.cc +++ b/chalk/ui/kis_view.cc @@ -694,7 +694,7 @@ void KisView::resizeEvent(TQResizeEvent *) } KisImageSP img = currentImg(); - TQ_INT32 scrollBarExtent = tqstyle().pixelMetric(TQStyle::PM_ScrollBarExtent); + TQ_INT32 scrollBarExtent = style().pixelMetric(TQStyle::PM_ScrollBarExtent); TQ_INT32 drawH; TQ_INT32 drawW; TQ_INT32 docW; diff --git a/chalk/ui/layerlist.cpp b/chalk/ui/layerlist.cpp index 58d28358..19f49200 100644 --- a/chalk/ui/layerlist.cpp +++ b/chalk/ui/layerlist.cpp @@ -1277,7 +1277,7 @@ void LayerItem::paintCell( TQPainter *painter, const TQColorGroup &cg, int colum p.setFont( font() ); - const TQColorGroup cg_ = isEnabled() ? listView()->tqpalette().active() : listView()->tqpalette().disabled(); + const TQColorGroup cg_ = isEnabled() ? listView()->palette().active() : listView()->palette().disabled(); const TQColor bg = isSelected() ? cg_.highlight() : isAlternate() ? listView()->alternateBackground() diff --git a/chalk/ui/squeezedcombobox.cpp b/chalk/ui/squeezedcombobox.cpp index 31a044f2..d0cd8825 100644 --- a/chalk/ui/squeezedcombobox.cpp +++ b/chalk/ui/squeezedcombobox.cpp @@ -98,7 +98,7 @@ TQSize SqueezedComboBox::sizeHint() const int maxW = count() ? 18 : 7 * fm.width(TQChar('x')) + 18; int maxH = TQMAX( fm.lineSpacing(), 14 ) + 2; - return tqstyle().tqsizeFromContents(TQStyle::CT_ComboBox, this, + return style().tqsizeFromContents(TQStyle::CT_ComboBox, this, TQSize(maxW, maxH)). expandedTo(TQApplication::globalStrut()); } diff --git a/chalk/ui/wdgautobrush.ui b/chalk/ui/wdgautobrush.ui index 632a0398..6d3a572d 100644 --- a/chalk/ui/wdgautobrush.ui +++ b/chalk/ui/wdgautobrush.ui @@ -26,7 +26,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <vbox> <property name="name"> @@ -48,7 +48,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout21</cstring> + <cstring>layout21</cstring> </property> <grid> <property name="name"> @@ -169,7 +169,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout23</cstring> + <cstring>layout23</cstring> </property> <grid> <property name="name"> @@ -273,7 +273,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <vbox> <property name="name"> diff --git a/chalk/ui/wdgautogradient.ui b/chalk/ui/wdgautogradient.ui index 3a2ca629..aec6907d 100644 --- a/chalk/ui/wdgautogradient.ui +++ b/chalk/ui/wdgautogradient.ui @@ -57,7 +57,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout11</cstring> + <cstring>layout11</cstring> </property> <property name="font"> <font> @@ -71,7 +71,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <property name="font"> <font> @@ -95,7 +95,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <property name="font"> <font> @@ -150,7 +150,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <property name="font"> <font> @@ -207,7 +207,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <property name="font"> <font> @@ -287,7 +287,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout11_2</cstring> + <cstring>layout11_2</cstring> </property> <property name="font"> <font> diff --git a/chalk/ui/wdgbirdeye.ui b/chalk/ui/wdgbirdeye.ui index d0078c8b..506e2803 100644 --- a/chalk/ui/wdgbirdeye.ui +++ b/chalk/ui/wdgbirdeye.ui @@ -39,7 +39,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -53,7 +53,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <vbox> <property name="name"> @@ -195,7 +195,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> diff --git a/chalk/ui/wdgcolorsettings.ui b/chalk/ui/wdgcolorsettings.ui index 10346895..f4a0f695 100644 --- a/chalk/ui/wdgcolorsettings.ui +++ b/chalk/ui/wdgcolorsettings.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <hbox> <property name="name"> @@ -266,7 +266,7 @@ The different rendering intent methods will affect only what is shown on screen, </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <vbox> <property name="name"> diff --git a/chalk/ui/wdgcustombrush.ui b/chalk/ui/wdgcustombrush.ui index bc6f898a..f1c67ffa 100644 --- a/chalk/ui/wdgcustombrush.ui +++ b/chalk/ui/wdgcustombrush.ui @@ -18,7 +18,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <grid> <property name="name"> @@ -103,7 +103,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <hbox> <property name="name"> @@ -169,7 +169,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <vbox> <property name="name"> diff --git a/chalk/ui/wdgcustompattern.ui b/chalk/ui/wdgcustompattern.ui index 4783a4a1..5b03a7f0 100644 --- a/chalk/ui/wdgcustompattern.ui +++ b/chalk/ui/wdgcustompattern.ui @@ -18,7 +18,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -49,7 +49,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <hbox> <property name="name"> @@ -115,7 +115,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <vbox> <property name="name"> diff --git a/chalk/ui/wdgdisplaysettings.ui b/chalk/ui/wdgdisplaysettings.ui index 3a32af21..757b6b27 100644 --- a/chalk/ui/wdgdisplaysettings.ui +++ b/chalk/ui/wdgdisplaysettings.ui @@ -49,7 +49,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <vbox> <property name="name"> diff --git a/chalk/ui/wdggeneralsettings.ui b/chalk/ui/wdggeneralsettings.ui index 9dfd1ff4..9383fbfd 100644 --- a/chalk/ui/wdggeneralsettings.ui +++ b/chalk/ui/wdggeneralsettings.ui @@ -18,7 +18,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <vbox> <property name="name"> @@ -26,7 +26,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -112,7 +112,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> diff --git a/chalk/ui/wdggridsettings.ui b/chalk/ui/wdggridsettings.ui index 23ba8ba7..dbb90e0a 100644 --- a/chalk/ui/wdggridsettings.ui +++ b/chalk/ui/wdggridsettings.ui @@ -214,7 +214,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <hbox> <property name="name"> @@ -222,7 +222,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <grid> <property name="name"> @@ -320,7 +320,7 @@ </widget> <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <hbox> <property name="name"> diff --git a/chalk/ui/wdglayerbox.ui b/chalk/ui/wdglayerbox.ui index d276a2cf..02c15129 100644 --- a/chalk/ui/wdglayerbox.ui +++ b/chalk/ui/wdglayerbox.ui @@ -24,7 +24,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -74,7 +74,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <hbox> <property name="name"> diff --git a/chalk/ui/wdgnewimage.ui b/chalk/ui/wdgnewimage.ui index b1b607ef..82548e11 100644 --- a/chalk/ui/wdgnewimage.ui +++ b/chalk/ui/wdgnewimage.ui @@ -316,7 +316,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> diff --git a/chalk/ui/wdgpalettechooser.ui b/chalk/ui/wdgpalettechooser.ui index 3f8797d1..c4de4e1d 100644 --- a/chalk/ui/wdgpalettechooser.ui +++ b/chalk/ui/wdgpalettechooser.ui @@ -29,7 +29,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> diff --git a/chalk/ui/wdgperformancesettings.ui b/chalk/ui/wdgperformancesettings.ui index 1d3110d5..82deb5b9 100644 --- a/chalk/ui/wdgperformancesettings.ui +++ b/chalk/ui/wdgperformancesettings.ui @@ -18,7 +18,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -72,7 +72,7 @@ Note that this number is only a guideline for Chalk, and is not guaranteed to be </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <hbox> <property name="name"> diff --git a/chalk/ui/wdgselectionoptions.ui b/chalk/ui/wdgselectionoptions.ui index ca71ee01..f6f02f39 100644 --- a/chalk/ui/wdgselectionoptions.ui +++ b/chalk/ui/wdgselectionoptions.ui @@ -24,7 +24,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> diff --git a/chalk/ui/wdgtabletdevicesettings.ui b/chalk/ui/wdgtabletdevicesettings.ui index 091997bf..44a43e94 100644 --- a/chalk/ui/wdgtabletdevicesettings.ui +++ b/chalk/ui/wdgtabletdevicesettings.ui @@ -49,7 +49,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -72,7 +72,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4_4</cstring> + <cstring>layout4_4</cstring> </property> <hbox> <property name="name"> @@ -95,7 +95,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4_2</cstring> + <cstring>layout4_2</cstring> </property> <hbox> <property name="name"> @@ -118,7 +118,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4_3</cstring> + <cstring>layout4_3</cstring> </property> <hbox> <property name="name"> @@ -141,7 +141,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4_6</cstring> + <cstring>layout4_6</cstring> </property> <hbox> <property name="name"> @@ -164,7 +164,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4_5</cstring> + <cstring>layout4_5</cstring> </property> <hbox> <property name="name"> diff --git a/chalk/ui/wdgtabletsettings.ui b/chalk/ui/wdgtabletsettings.ui index 34688d5d..41be6f39 100644 --- a/chalk/ui/wdgtabletsettings.ui +++ b/chalk/ui/wdgtabletsettings.ui @@ -32,7 +32,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -55,7 +55,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <hbox> <property name="name"> diff --git a/chalk/ui/wdgtextbrush.ui b/chalk/ui/wdgtextbrush.ui index 114c4baa..e51a4d6c 100644 --- a/chalk/ui/wdgtextbrush.ui +++ b/chalk/ui/wdgtextbrush.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <vbox> <property name="name"> @@ -29,7 +29,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <hbox> <property name="name"> @@ -65,7 +65,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <hbox> <property name="name"> |