Rename obsolete tq methods to standard names

14 files changed, 24 insertions, 24 deletions

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">