Rename obsolete tq methods to standard names

10 files changed, 17 insertions, 17 deletions

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>