Rename old tq methods that no longer need a unique name

52 files changed, 155 insertions, 155 deletions

diff --git a/chalk/ui/imageviewer.cc b/chalk/ui/imageviewer.cc
index cfe6905d..09955e9e 100644
--- a/chalk/ui/imageviewer.cc
+++ b/chalk/ui/imageviewer.cc
@@ -35,7 +35,7 @@ ImageViewer::ImageViewer(TQWidget *widget, const char * name)
     , m_image(TQPixmap())
 {
     m_label = new TQLabel( viewport());
-    tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
+    setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
     setCursor(KisCursor::handCursor());
     addChild(m_label);
 }
diff --git a/chalk/ui/kis_birdeye_box.cc b/chalk/ui/kis_birdeye_box.cc
index 0bc9ae08..2ef11147 100644
--- a/chalk/ui/kis_birdeye_box.cc
+++ b/chalk/ui/kis_birdeye_box.cc
@@ -203,7 +203,7 @@ KisBirdEyeBox::KisBirdEyeBox(KisView * view, TQWidget* parent, const char* name)
     hl->addWidget(m_exposureLabel);
 
     m_exposureDoubleWidget = new KisDoubleWidget(-10, 10, this);
-    m_exposureDoubleWidget->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed);
+    m_exposureDoubleWidget->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed);
     hl->addWidget(m_exposureDoubleWidget);
     TQToolTip::add(m_exposureDoubleWidget, i18n("Select the exposure (stops) for HDR images"));
     l->addItem(new TQSpacerItem(0, 1, TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding));
diff --git a/chalk/ui/kis_canvas_painter.cc b/chalk/ui/kis_canvas_painter.cc
index ed5be01d..9b3666e8 100644
--- a/chalk/ui/kis_canvas_painter.cc
+++ b/chalk/ui/kis_canvas_painter.cc
@@ -184,7 +184,7 @@ void KisCanvasWidgetPainter::setWorldXForm(bool /*enable*/)
 {
 }
 
-const TQWMatrix& KisCanvasWidgetPainter::tqworldMatrix() const
+const TQWMatrix& KisCanvasWidgetPainter::worldMatrix() const
 {
     return m_defaultWorldMatrix;
 }
@@ -501,11 +501,11 @@ void KisCanvasWidgetPainter::drawText(const TQRect& /*r*/, int /*flags*/, const
 {
 }
 
-void KisCanvasWidgetPainter::tqdrawTextItem(int /*x*/, int /*y*/, const TQTextItem& /*ti*/, int /*textflags*/)
+void KisCanvasWidgetPainter::drawTextItem(int /*x*/, int /*y*/, const TQTextItem& /*ti*/, int /*textflags*/)
 {
 }
 
-void KisCanvasWidgetPainter::tqdrawTextItem(const TQPoint& /*p*/, const TQTextItem& /*ti*/, int /*textflags*/)
+void KisCanvasWidgetPainter::drawTextItem(const TQPoint& /*p*/, const TQTextItem& /*ti*/, int /*textflags*/)
 {
 }
 
@@ -833,10 +833,10 @@ void KisCanvasPainter::setWorldXForm(bool enable)
     }
 }
 
-const TQWMatrix& KisCanvasPainter::tqworldMatrix() const
+const TQWMatrix& KisCanvasPainter::worldMatrix() const
 {
     if (m_canvasWidgetPainter != 0) {
-        return m_canvasWidgetPainter->tqworldMatrix();
+        return m_canvasWidgetPainter->worldMatrix();
     }
     return m_defaultWorldMatrix;
 }
@@ -1378,17 +1378,17 @@ void KisCanvasPainter::drawText(const TQRect& r, int flags, const TQString& text
     }
 }
 
-void KisCanvasPainter::tqdrawTextItem(int x, int y, const TQTextItem& ti, int textflags)
+void KisCanvasPainter::drawTextItem(int x, int y, const TQTextItem& ti, int textflags)
 {
     if (m_canvasWidgetPainter != 0) {
-        m_canvasWidgetPainter->tqdrawTextItem(x, y, ti, textflags);
+        m_canvasWidgetPainter->drawTextItem(x, y, ti, textflags);
     }
 }
 
-void KisCanvasPainter::tqdrawTextItem(const TQPoint& p, const TQTextItem& ti, int textflags)
+void KisCanvasPainter::drawTextItem(const TQPoint& p, const TQTextItem& ti, int textflags)
 {
     if (m_canvasWidgetPainter != 0) {
-        m_canvasWidgetPainter->tqdrawTextItem(p, ti, textflags);
+        m_canvasWidgetPainter->drawTextItem(p, ti, textflags);
     }
 }
 
diff --git a/chalk/ui/kis_canvas_painter.h b/chalk/ui/kis_canvas_painter.h
index 9a719eea..a5ad2d84 100644
--- a/chalk/ui/kis_canvas_painter.h
+++ b/chalk/ui/kis_canvas_painter.h
@@ -78,7 +78,7 @@ public:
     virtual void setViewport(int x, int y, int w, int h);
 
     virtual void setWorldXForm(bool);
-    virtual const TQWMatrix&tqworldMatrix() const;
+    virtual const TQWMatrix&worldMatrix() const;
     virtual void setWorldMatrix(const TQWMatrix&, bool combine=FALSE);
 
     virtual void saveWorldMatrix();
@@ -168,8 +168,8 @@ public:
     virtual void drawText(int x, int y, int w, int h, int flags, const TQString&, int len = -1, TQRect *br=0, TQTextParag **intern=0);
     virtual void drawText(const TQRect&, int flags, const TQString&, int len = -1, TQRect *br=0, TQTextParag **intern=0);
 
-    virtual void tqdrawTextItem(int x, int y, const TQTextItem&ti, int textflags = 0);
-    virtual void tqdrawTextItem(const TQPoint& p, const TQTextItem&ti, int textflags = 0);
+    virtual void drawTextItem(int x, int y, const TQTextItem&ti, int textflags = 0);
+    virtual void drawTextItem(const TQPoint& p, const TQTextItem&ti, int textflags = 0);
 
     virtual TQRect boundingRect(int x, int y, int w, int h, int flags, const TQString&, int len = -1, TQTextParag **intern=0);
     virtual TQRect boundingRect(const TQRect&, int flags, const TQString&, int len = -1, TQTextParag **intern=0);
@@ -241,7 +241,7 @@ public:
     void setViewport(int x, int y, int w, int h);
 
     void setWorldXForm(bool);
-    const TQWMatrix&tqworldMatrix() const;
+    const TQWMatrix&worldMatrix() const;
     void setWorldMatrix(const TQWMatrix&, bool combine=FALSE);
 
     void saveWorldMatrix();
@@ -331,8 +331,8 @@ public:
     void drawText(int x, int y, int w, int h, int flags, const TQString&, int len = -1, TQRect *br=0, TQTextParag **intern=0);
     void drawText(const TQRect&, int flags, const TQString&, int len = -1, TQRect *br=0, TQTextParag **intern=0);
 
-    void tqdrawTextItem(int x, int y, const TQTextItem&ti, int textflags = 0);
-    void tqdrawTextItem(const TQPoint& p, const TQTextItem&ti, int textflags = 0);
+    void drawTextItem(int x, int y, const TQTextItem&ti, int textflags = 0);
+    void drawTextItem(const TQPoint& p, const TQTextItem&ti, int textflags = 0);
 
     TQRect boundingRect(int x, int y, int w, int h, int flags, const TQString&, int len = -1, TQTextParag **intern=0);
     TQRect boundingRect(const TQRect&, int flags, const TQString&, int len = -1, TQTextParag **intern=0);
diff --git a/chalk/ui/kis_clipboard.cc b/chalk/ui/kis_clipboard.cc
index d52f5ec9..702ec210 100644
--- a/chalk/ui/kis_clipboard.cc
+++ b/chalk/ui/kis_clipboard.cc
@@ -145,7 +145,7 @@ KisPaintDeviceSP KisClipboard::clip()
 
     if(cbData && cbData->provides(mimeType))
     {
-        TQBuffer buffer(cbData->tqencodedData(mimeType));
+        TQBuffer buffer(cbData->encodedData(mimeType));
         KoStore* store = KoStore::createStore( TQT_TQIODEVICE(&buffer), KoStore::Read, mimeType );
         KisProfile *profile=0;
 
@@ -243,7 +243,7 @@ TQSize KisClipboard::clipSize()
     
     if(cbData && cbData->provides(mimeType)) {
         
-        TQBuffer buffer(cbData->tqencodedData(mimeType));
+        TQBuffer buffer(cbData->encodedData(mimeType));
         KoStore* store = KoStore::createStore( TQT_TQIODEVICE(&buffer), KoStore::Read, mimeType );
         KisProfile *profile=0;
 
diff --git a/chalk/ui/kis_color_cup.cc b/chalk/ui/kis_color_cup.cc
index 4d2103d8..b691295c 100644
--- a/chalk/ui/kis_color_cup.cc
+++ b/chalk/ui/kis_color_cup.cc
@@ -81,7 +81,7 @@ void KisColorCup::slotClicked()
     emit changed(m_color);
 }
 
-TQSize KisColorCup::tqsizeHint() const
+TQSize KisColorCup::sizeHint() const
 {
     return tqstyle().tqsizeFromContents(TQStyle::CT_PushButton, this, TQSize(24, 24)).
             expandedTo(TQApplication::globalStrut());
@@ -93,24 +93,24 @@ void KisColorCup::drawButtonLabel( TQPainter *painter )
     TQRect r = tqstyle().subRect( TQStyle::SR_PushButtonContents, this );
     r.rect(&x, &y, &w, &h);
 
-    int margin = 2; //tqstyle().tqpixelMetric( TQStyle::PM_ButtonMargin, this );
+    int margin = 2; //tqstyle().pixelMetric( TQStyle::PM_ButtonMargin, this );
     x += margin;
     y += margin;
     w -= 2*margin;
     h -= 2*margin;
 
     if (isOn() || isDown()) {
-        x += tqstyle().tqpixelMetric( TQStyle::PM_ButtonShiftHorizontal, this );
-        y += tqstyle().tqpixelMetric( TQStyle::PM_ButtonShiftVertical, this );
+        x += tqstyle().pixelMetric( TQStyle::PM_ButtonShiftHorizontal, this );
+        y += tqstyle().pixelMetric( TQStyle::PM_ButtonShiftVertical, this );
     }
 
-    qDrawShadePanel( painter, x, y, w, h, tqcolorGroup(), true, 1, NULL);
+    qDrawShadePanel( painter, x, y, w, h, colorGroup(), true, 1, NULL);
     if ( m_color.isValid() )
         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, tqcolorGroup() );
+        tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, painter, focusRect, colorGroup() );
     }
 
 }
diff --git a/chalk/ui/kis_color_cup.h b/chalk/ui/kis_color_cup.h
index 2cf9ddef..8c7fd2b5 100644
--- a/chalk/ui/kis_color_cup.h
+++ b/chalk/ui/kis_color_cup.h
@@ -72,7 +72,7 @@ signals:
 
 public:
 
-    TQSize tqsizeHint() const;
+    TQSize sizeHint() const;
 
 public slots:
 
diff --git a/chalk/ui/kis_dlg_adj_layer_props.cc b/chalk/ui/kis_dlg_adj_layer_props.cc
index 1cdd309c..f5227eee 100644
--- a/chalk/ui/kis_dlg_adj_layer_props.cc
+++ b/chalk/ui/kis_dlg_adj_layer_props.cc
@@ -102,7 +102,7 @@ KisDlgAdjLayerProps::KisDlgAdjLayerProps(KisAdjustmentLayerSP layer,
 
     m_layerName = new KLineEdit(page, "m_layerName");
     m_layerName->setText(layerName);
-    m_layerName->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed);
+    m_layerName->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed);
     hl->addWidget(m_layerName, 0, 1);
     connect( m_layerName, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotNameChanged( const TQString & ) ) );
 
diff --git a/chalk/ui/kis_dlg_adjustment_layer.cc b/chalk/ui/kis_dlg_adjustment_layer.cc
index 13caff98..0594659b 100644
--- a/chalk/ui/kis_dlg_adjustment_layer.cc
+++ b/chalk/ui/kis_dlg_adjustment_layer.cc
@@ -105,7 +105,7 @@ KisDlgAdjustmentLayer::KisDlgAdjustmentLayer(KisImage * img,
     m_configWidgetHolder->tqlayout()->add(m_labelNoConfigWidget);
     m_labelNoConfigWidget->hide();
 
-    resize( TQSize(600, 480).expandedTo(tqminimumSizeHint()) );
+    resize( TQSize(600, 480).expandedTo(minimumSizeHint()) );
 
     m_currentConfigWidget = 0;
 
diff --git a/chalk/ui/kis_dlg_apply_profile.cc b/chalk/ui/kis_dlg_apply_profile.cc
index 5c136738..2d5e8a90 100644
--- a/chalk/ui/kis_dlg_apply_profile.cc
+++ b/chalk/ui/kis_dlg_apply_profile.cc
@@ -42,7 +42,7 @@ KisDlgApplyProfile::KisDlgApplyProfile(TQWidget *parent, const char *name)
     m_page = new WdgApplyProfile(this);
 
     setMainWidget(m_page);
-    resize(m_page->tqsizeHint());
+    resize(m_page->sizeHint());
 
     // XXX: This is BAD! (bsar)
     fillCmbProfiles(KisID("RGBA", ""));
diff --git a/chalk/ui/kis_dlg_image_properties.cc b/chalk/ui/kis_dlg_image_properties.cc
index ca6a1b72..ac8e14a3 100644
--- a/chalk/ui/kis_dlg_image_properties.cc
+++ b/chalk/ui/kis_dlg_image_properties.cc
@@ -58,7 +58,7 @@ KisDlgImageProperties::KisDlgImageProperties(KisImageSP image, TQWidget *parent,
     m_image = image;
 
     setMainWidget(m_page);
-    resize(m_page->tqsizeHint());
+    resize(m_page->sizeHint());
 
     m_page->txtName->setText(image->name());
     m_page->m_createButton->hide();
diff --git a/chalk/ui/kis_dlg_preferences.cc b/chalk/ui/kis_dlg_preferences.cc
index a19edebe..f898b497 100644
--- a/chalk/ui/kis_dlg_preferences.cc
+++ b/chalk/ui/kis_dlg_preferences.cc
@@ -77,7 +77,7 @@ GeneralTab::GeneralTab( TQWidget *_parent, const char *_name )
 
     KisConfig cfg;
 
-    m_cmbtqCursorShape->setCurrentItem(cfg.cursorStyle());
+    m_cmbCursorShape->setCurrentItem(cfg.cursorStyle());
     grpDockability->setButton(cfg.dockability());
     numDockerFontSize->setValue((int)cfg.dockerFontSize());
 }
@@ -86,14 +86,14 @@ void GeneralTab::setDefault()
 {
     KisConfig cfg;
 
-    m_cmbtqCursorShape->setCurrentItem( cfg.getDefaultCursorStyle());
+    m_cmbCursorShape->setCurrentItem( cfg.getDefaultCursorStyle());
     grpDockability->setButton(cfg.getDefaultDockability());
     numDockerFontSize->setValue((int)(cfg.getDefaultDockerFontSize()));
 }
 
 enumCursorStyle GeneralTab::cursorStyle()
 {
-    return (enumCursorStyle)m_cmbtqCursorShape->currentItem();
+    return (enumCursorStyle)m_cmbCursorShape->currentItem();
 }
 
 enumKoDockability GeneralTab::dockability()
@@ -388,7 +388,7 @@ TabletSettingsTab::TabletDeviceSettingsDialog::TabletDeviceSettingsDialog(const
     m_page = new WdgTabletDeviceSettings(this);
 
     setMainWidget(m_page);
-    resize(m_page->tqsizeHint());
+    resize(m_page->sizeHint());
 
     for (TQ_INT32 axis = 0; axis < settings.numAxes(); axis++) {
         TQString axisString;
diff --git a/chalk/ui/kis_filter_manager.cc b/chalk/ui/kis_filter_manager.cc
index e8bf5ba8..dc5beadf 100644
--- a/chalk/ui/kis_filter_manager.cc
+++ b/chalk/ui/kis_filter_manager.cc
@@ -359,7 +359,7 @@ void KisFilterManager::slotApplyFilter(int i)
 
         widgetLayout->addWidget(m_lastWidget, 0 , 0);
 
-        m_lastDialog->container()->setMinimumSize(m_lastWidget->tqminimumSize());
+        m_lastDialog->container()->setMinimumSize(m_lastWidget->minimumSize());
 
         refreshPreview();
 
diff --git a/chalk/ui/kis_filters_listview.cc b/chalk/ui/kis_filters_listview.cc
index f2d63cc3..0112ceb0 100644
--- a/chalk/ui/kis_filters_listview.cc
+++ b/chalk/ui/kis_filters_listview.cc
@@ -154,7 +154,7 @@ void KisFiltersListView::init()
     setCaption(i18n("Filters List"));
     setItemsMovable(false);
     setSelectionMode(TQIconView::Single);
-    tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Expanding ));
+    setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Expanding ));
     setMinimumWidth(160);
 
 }
diff --git a/chalk/ui/kis_gradient_slider_widget.cc b/chalk/ui/kis_gradient_slider_widget.cc
index cda77d68..10d20796 100644
--- a/chalk/ui/kis_gradient_slider_widget.cc
+++ b/chalk/ui/kis_gradient_slider_widget.cc
@@ -57,7 +57,7 @@ void KisGradientSliderWidget::paintEvent ( TQPaintEvent* pe )
 {
     TQWidget::paintEvent( pe );
     TQPixmap pixmap( width(), height() );
-    pixmap.fill( tqcolorGroup().background() );
+    pixmap.fill( colorGroup().background() );
     TQPainter painter( &pixmap );
     painter.setPen( TQt::black );
     painter.drawRect( MARGIN, MARGIN, width() - 2 * MARGIN, height()- 2 * MARGIN - HANDLE_SIZE );
@@ -77,7 +77,7 @@ void KisGradientSliderWidget::paintEvent ( TQPaintEvent* pe )
                     height()- HANDLE_SIZE - MARGIN,
                     tqRound( ( m_selectedSegment->endOffset() - m_selectedSegment->startOffset() )*(double)(width()-12) ),
                     HANDLE_SIZE );
-            painter.fillRect( selection, TQBrush( tqcolorGroup().highlight() ) );
+            painter.fillRect( selection, TQBrush( colorGroup().highlight() ) );
         }
 
         TQPointArray triangle(3);
diff --git a/chalk/ui/kis_int_spinbox.cc b/chalk/ui/kis_int_spinbox.cc
index 1375cacc..108d60fe 100644
--- a/chalk/ui/kis_int_spinbox.cc
+++ b/chalk/ui/kis_int_spinbox.cc
@@ -81,7 +81,7 @@ void KisIntSpinbox::init(int val)
     l->insertStretch(0, 1);
     d->m_numinput = new KIntSpinBox(0, 100, 1, val, 10, this, "KisIntSpinbox::KIntSpinBox");
 
-    d->m_numinput->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed);
+    d->m_numinput->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed);
     d->m_numinput->setSuffix("%");
     l->addWidget( d->m_numinput );
 
diff --git a/chalk/ui/kis_layerbox.cc b/chalk/ui/kis_layerbox.cc
index 424c405d..e9a1bf2d 100644
--- a/chalk/ui/kis_layerbox.cc
+++ b/chalk/ui/kis_layerbox.cc
@@ -68,7 +68,7 @@ KisLayerBox::KisLayerBox(KisCanvasSubject *subject, TQWidget *parent, const char
     vbox->setAutoAdd(true);
 
     m_lst = new WdgLayerBox(this);
-    setMinimumSize(m_lst->tqminimumSizeHint());
+    setMinimumSize(m_lst->minimumSizeHint());
 
     TQToolTip::add(m_lst->bnAdd, i18n("Create new layer"));
 
diff --git a/chalk/ui/kis_matrix_widget.ui b/chalk/ui/kis_matrix_widget.ui
index ca238b60..2b866c2f 100644
--- a/chalk/ui/kis_matrix_widget.ui
+++ b/chalk/ui/kis_matrix_widget.ui
@@ -104,7 +104,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>41</height>
@@ -121,7 +121,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>21</width>
                     <height>20</height>
diff --git a/chalk/ui/kis_opengl_canvas_painter.cc b/chalk/ui/kis_opengl_canvas_painter.cc
index 6ae12305..e6551f81 100644
--- a/chalk/ui/kis_opengl_canvas_painter.cc
+++ b/chalk/ui/kis_opengl_canvas_painter.cc
@@ -317,7 +317,7 @@ void KisOpenGLCanvasPainter::setWorldXForm(bool /*enable*/)
 {
 }
 
-const TQWMatrix& KisOpenGLCanvasPainter::tqworldMatrix() const
+const TQWMatrix& KisOpenGLCanvasPainter::worldMatrix() const
 {
     return m_defaultWorldMatrix;
 }
@@ -809,11 +809,11 @@ void KisOpenGLCanvasPainter::drawText(const TQRect& /*r*/, int /*flags*/, const
 {
 }
 
-void KisOpenGLCanvasPainter::tqdrawTextItem(int /*x*/, int /*y*/, const TQTextItem& /*ti*/, int /*textflags*/)
+void KisOpenGLCanvasPainter::drawTextItem(int /*x*/, int /*y*/, const TQTextItem& /*ti*/, int /*textflags*/)
 {
 }
 
-void KisOpenGLCanvasPainter::tqdrawTextItem(const TQPoint& /*p*/, const TQTextItem& /*ti*/, int /*textflags*/)
+void KisOpenGLCanvasPainter::drawTextItem(const TQPoint& /*p*/, const TQTextItem& /*ti*/, int /*textflags*/)
 {
 }
 
diff --git a/chalk/ui/kis_opengl_canvas_painter.h b/chalk/ui/kis_opengl_canvas_painter.h
index 47983ce2..24f2e2e2 100644
--- a/chalk/ui/kis_opengl_canvas_painter.h
+++ b/chalk/ui/kis_opengl_canvas_painter.h
@@ -85,7 +85,7 @@ public:
     virtual void setViewport(int x, int y, int w, int h);
 
     virtual void setWorldXForm(bool);
-    virtual const TQWMatrix&tqworldMatrix() const;
+    virtual const TQWMatrix&worldMatrix() const;
     virtual void setWorldMatrix(const TQWMatrix&, bool combine=FALSE);
 
     virtual void saveWorldMatrix();
@@ -175,8 +175,8 @@ public:
     virtual void drawText(int x, int y, int w, int h, int flags, const TQString&, int len = -1, TQRect *br=0, TQTextParag **intern=0);
     virtual void drawText(const TQRect&, int flags, const TQString&, int len = -1, TQRect *br=0, TQTextParag **intern=0);
 
-    virtual void tqdrawTextItem(int x, int y, const TQTextItem&ti, int textflags = 0);
-    virtual void tqdrawTextItem(const TQPoint& p, const TQTextItem&ti, int textflags = 0);
+    virtual void drawTextItem(int x, int y, const TQTextItem&ti, int textflags = 0);
+    virtual void drawTextItem(const TQPoint& p, const TQTextItem&ti, int textflags = 0);
 
     virtual TQRect boundingRect(int x, int y, int w, int h, int flags, const TQString&, int len = -1, TQTextParag **intern=0);
     virtual TQRect boundingRect(const TQRect&, int flags, const TQString&, int len = -1, TQTextParag **intern=0);
diff --git a/chalk/ui/kis_palette_view.cc b/chalk/ui/kis_palette_view.cc
index a424d9ac..63766599 100644
--- a/chalk/ui/kis_palette_view.cc
+++ b/chalk/ui/kis_palette_view.cc
@@ -78,7 +78,7 @@ KisPaletteView::KisPaletteView(TQWidget *parent, const char* name, int minWidth,
     minSize += TQSize(cellSize);
 
     setMinimumSize(minSize);
-    tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored));
+    setSizePolicy(TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored));
 }
 
 KisPaletteView::~KisPaletteView()
diff --git a/chalk/ui/kis_palette_widget.cc b/chalk/ui/kis_palette_widget.cc
index 2feb74c8..892686b3 100644
--- a/chalk/ui/kis_palette_widget.cc
+++ b/chalk/ui/kis_palette_widget.cc
@@ -76,7 +76,7 @@ KisPaletteWidget::KisPaletteWidget( TQWidget *parent, int minWidth, int cols)
     m_view = new KisPaletteView(this, 0, minWidth, cols);
     tqlayout->addWidget( m_view );
 
-    //setFixedSize(tqsizeHint());
+    //setFixedSize(sizeHint());
 
     connect(combo, TQT_SIGNAL(activated(const TQString &)),
             this, TQT_SLOT(slotSetPalette(const TQString &)));
diff --git a/chalk/ui/kis_previewwidgetbase.ui b/chalk/ui/kis_previewwidgetbase.ui
index f1b52244..8e7bf40a 100644
--- a/chalk/ui/kis_previewwidgetbase.ui
+++ b/chalk/ui/kis_previewwidgetbase.ui
@@ -20,7 +20,7 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="tqminimumSize">
+    <property name="minimumSize">
         <size>
             <width>0</width>
             <height>0</height>
@@ -56,13 +56,13 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>200</width>
                             <height>150</height>
                         </size>
                     </property>
-                    <property name="tqmaximumSize">
+                    <property name="maximumSize">
                         <size>
                             <width>1000</width>
                             <height>1000</height>
diff --git a/chalk/ui/kis_qpaintdevice_canvas_painter.cc b/chalk/ui/kis_qpaintdevice_canvas_painter.cc
index 4233bc11..6de1aac3 100644
--- a/chalk/ui/kis_qpaintdevice_canvas_painter.cc
+++ b/chalk/ui/kis_qpaintdevice_canvas_painter.cc
@@ -224,9 +224,9 @@ void KisTQPaintDeviceCanvasPainter::setWorldXForm(bool enable)
     m_painter.setWorldXForm(enable);
 }
 
-const TQWMatrix& KisTQPaintDeviceCanvasPainter::tqworldMatrix() const
+const TQWMatrix& KisTQPaintDeviceCanvasPainter::worldMatrix() const
 {
-    return m_painter.tqworldMatrix();
+    return m_painter.worldMatrix();
 }
 
 void KisTQPaintDeviceCanvasPainter::setWorldMatrix(const TQWMatrix& matrix, bool combine)
@@ -481,17 +481,17 @@ void KisTQPaintDeviceCanvasPainter::drawLineSegments(const TQPointArray& pointAr
 
 void KisTQPaintDeviceCanvasPainter::drawPolyline(const TQPointArray& pointArray, int index, int npoints)
 {
-    m_painter.tqdrawPolyline(pointArray, index, npoints);
+    m_painter.drawPolyline(pointArray, index, npoints);
 }
 
 void KisTQPaintDeviceCanvasPainter::drawPolygon(const TQPointArray& pointArray, bool winding, int index, int npoints)
 {
-    m_painter.tqdrawPolygon(pointArray, winding, index, npoints);
+    m_painter.drawPolygon(pointArray, winding, index, npoints);
 }
 
 void KisTQPaintDeviceCanvasPainter::drawConvexPolygon(const TQPointArray& pointArray, int index, int npoints)
 {
-    m_painter.tqdrawConvexPolygon(pointArray, index, npoints);
+    m_painter.drawConvexPolygon(pointArray, index, npoints);
 }
 
 void KisTQPaintDeviceCanvasPainter::drawCubicBezier(const TQPointArray& pointArray, int index)
@@ -614,14 +614,14 @@ void KisTQPaintDeviceCanvasPainter::drawText(const TQRect& r, int flags, const T
 #endif // USE_QT4
 }
 
-void KisTQPaintDeviceCanvasPainter::tqdrawTextItem(int x, int y, const TQTextItem& ti, int textflags)
+void KisTQPaintDeviceCanvasPainter::drawTextItem(int x, int y, const TQTextItem& ti, int textflags)
 {
-    m_painter.tqdrawTextItem(x, y, ti, textflags);
+    m_painter.drawTextItem(x, y, ti, textflags);
 }
 
-void KisTQPaintDeviceCanvasPainter::tqdrawTextItem(const TQPoint& p, const TQTextItem& ti, int textflags)
+void KisTQPaintDeviceCanvasPainter::drawTextItem(const TQPoint& p, const TQTextItem& ti, int textflags)
 {
-    m_painter.tqdrawTextItem(p, ti, textflags);
+    m_painter.drawTextItem(p, ti, textflags);
 }
 
 TQRect KisTQPaintDeviceCanvasPainter::boundingRect(int x, int y, int w, int h, int flags, const TQString& text, int len, TQTextParag **intern)
diff --git a/chalk/ui/kis_qpaintdevice_canvas_painter.h b/chalk/ui/kis_qpaintdevice_canvas_painter.h
index 0dca7322..cef260b4 100644
--- a/chalk/ui/kis_qpaintdevice_canvas_painter.h
+++ b/chalk/ui/kis_qpaintdevice_canvas_painter.h
@@ -80,7 +80,7 @@ public:
     virtual void setViewport(int x, int y, int w, int h);
 
     virtual void setWorldXForm(bool);
-    virtual const TQWMatrix&tqworldMatrix() const;
+    virtual const TQWMatrix&worldMatrix() const;
     virtual void setWorldMatrix(const TQWMatrix&, bool combine=FALSE);
 
     virtual void saveWorldMatrix();
@@ -170,8 +170,8 @@ public:
     virtual void drawText(int x, int y, int w, int h, int flags, const TQString&, int len = -1, TQRect *br=0, TQTextParag **intern=0);
     virtual void drawText(const TQRect&, int flags, const TQString&, int len = -1, TQRect *br=0, TQTextParag **intern=0);
 
-    virtual void tqdrawTextItem(int x, int y, const TQTextItem&ti, int textflags = 0);
-    virtual void tqdrawTextItem(const TQPoint& p, const TQTextItem&ti, int textflags = 0);
+    virtual void drawTextItem(int x, int y, const TQTextItem&ti, int textflags = 0);
+    virtual void drawTextItem(const TQPoint& p, const TQTextItem&ti, int textflags = 0);
 
     virtual TQRect boundingRect(int x, int y, int w, int h, int flags, const TQString&, int len = -1, TQTextParag **intern=0);
     virtual TQRect boundingRect(const TQRect&, int flags, const TQString&, int len = -1, TQTextParag **intern=0);
diff --git a/chalk/ui/kis_ruler.cc b/chalk/ui/kis_ruler.cc
index 44e86cae..327f09d7 100644
--- a/chalk/ui/kis_ruler.cc
+++ b/chalk/ui/kis_ruler.cc
@@ -184,8 +184,8 @@ void KisRuler::drawRuler()
         return;
 
     p.begin(m_pixmapBuffer);
-    p.setPen(tqcolorGroup().text());
-    p.setBackgroundColor(tqcolorGroup().base());
+    p.setPen(colorGroup().text());
+    p.setBackgroundColor(colorGroup().base());
     p.eraseRect(0, 0, m_pixmapBuffer->width(), m_pixmapBuffer->height());
 
     switch (m_unit) {
diff --git a/chalk/ui/kis_tool.cc b/chalk/ui/kis_tool.cc
index d6e600af..039e4190 100644
--- a/chalk/ui/kis_tool.cc
+++ b/chalk/ui/kis_tool.cc
@@ -58,7 +58,7 @@ TQWidget* KisTool::createOptionWidget(TQWidget* parent)
     
     d->optionWidget = new TQLabel(i18n("No options for %1.").tqarg(d->uiname), parent);
     d->optionWidget->setCaption(d->uiname);
-    d->optionWidget->tqsetAlignment(TQt::AlignCenter);
+    d->optionWidget->setAlignment(TQt::AlignCenter);
     return d->optionWidget;
 }
 
diff --git a/chalk/ui/kis_tool_dummy.cc b/chalk/ui/kis_tool_dummy.cc
index 51eb1407..bc478d4e 100644
--- a/chalk/ui/kis_tool_dummy.cc
+++ b/chalk/ui/kis_tool_dummy.cc
@@ -98,7 +98,7 @@ TQWidget* KisToolDummy::createOptionWidget(TQWidget* parent)
 {
     m_optionWidget = new TQLabel(i18n("Layer is locked or invisible."), parent);
     m_optionWidget->setCaption(i18n("No Active Tool"));
-    m_optionWidget->tqsetAlignment(TQt::AlignCenter);
+    m_optionWidget->setAlignment(TQt::AlignCenter);
     return m_optionWidget;
 }
 
diff --git a/chalk/ui/kis_tool_registry.cc b/chalk/ui/kis_tool_registry.cc
index e7696f0b..045b43f9 100644
--- a/chalk/ui/kis_tool_registry.cc
+++ b/chalk/ui/kis_tool_registry.cc
@@ -37,8 +37,8 @@ KisToolRegistry *KisToolRegistry::m_singleton = 0;
 KisToolRegistry::KisToolRegistry()
 {
     // Load all modules: color models, paintops, filters
-    KTrader::OfferList offers = KTrader::self()->query(TQString::tqfromLatin1("Chalk/Tool"),
-                                                         TQString::tqfromLatin1("(Type == 'Service') and "
+    KTrader::OfferList offers = KTrader::self()->query(TQString::fromLatin1("Chalk/Tool"),
+                                                         TQString::fromLatin1("(Type == 'Service') and "
                                                                              "([X-Chalk-Version] == 2)"));
 
     KTrader::OfferList::ConstIterator iter;
diff --git a/chalk/ui/kis_view.cc b/chalk/ui/kis_view.cc
index 4455f17d..eecfa659 100644
--- a/chalk/ui/kis_view.cc
+++ b/chalk/ui/kis_view.cc
@@ -313,8 +313,8 @@ KisView::KisView(KisDoc *doc, KisUndoAdapter *adapter, TQWidget *parent, const c
     m_brushesAndStuffToolBar = new KisControlFrame(mainWindow(), this);
 
     // Load all plugins
-    KTrader::OfferList offers = KTrader::self()->query(TQString::tqfromLatin1("Chalk/ViewPlugin"),
-                                                         TQString::tqfromLatin1("(Type == 'Service') and "
+    KTrader::OfferList offers = KTrader::self()->query(TQString::fromLatin1("Chalk/ViewPlugin"),
+                                                         TQString::fromLatin1("(Type == 'Service') and "
                                                                              "([X-Chalk-Version] == 2)"));
     KTrader::OfferList::ConstIterator iter;
     for(iter = offers.begin(); iter != offers.end(); ++iter)
@@ -694,7 +694,7 @@ void KisView::resizeEvent(TQResizeEvent *)
     }
 
     KisImageSP img = currentImg();
-    TQ_INT32 scrollBarExtent = tqstyle().tqpixelMetric(TQStyle::PM_ScrollBarExtent);
+    TQ_INT32 scrollBarExtent = tqstyle().pixelMetric(TQStyle::PM_ScrollBarExtent);
     TQ_INT32 drawH;
     TQ_INT32 drawW;
     TQ_INT32 docW;
@@ -962,7 +962,7 @@ void KisView::updateTQPaintDeviceCanvas(const TQRect& imageRect)
 
                     for (unsigned int i = 0; i < rects.count(); i++) {
                         TQRect er = rects[i];
-                        gc.fillRect(er, tqcolorGroup().mid());
+                        gc.fillRect(er, colorGroup().mid());
                     }
                     wr &= TQRect(0, 0, img->width(), img->height());
                 }
@@ -1014,7 +1014,7 @@ void KisView::updateTQPaintDeviceCanvas(const TQRect& imageRect)
                 }
 //                    paintGuides();
             } else {
-                gc.fillRect(vr, tqcolorGroup().mid());
+                gc.fillRect(vr, colorGroup().mid());
             }
         }
     }
@@ -1066,7 +1066,7 @@ void KisView::paintOpenGLView(const TQRect& canvasRect)
 
     glDrawBuffer(GL_BACK);
 
-    TQColor widgetBackgroundColor = tqcolorGroup().mid();
+    TQColor widgetBackgroundColor = colorGroup().mid();
 
     glClearColor(widgetBackgroundColor.red() / 255.0, widgetBackgroundColor.green() / 255.0, widgetBackgroundColor.blue() / 255.0, 1.0);
     glClear(GL_COLOR_BUFFER_BIT);
diff --git a/chalk/ui/kobirdeyepanel.cpp b/chalk/ui/kobirdeyepanel.cpp
index 542e257d..771e1ff8 100644
--- a/chalk/ui/kobirdeyepanel.cpp
+++ b/chalk/ui/kobirdeyepanel.cpp
@@ -238,7 +238,7 @@ void KoBirdEyePanel::slotUpdate(const TQRect & r)
 
                 TQPainter painter(&m_thumbnail);
 
-                painter.fillRect(thumbnailRect, tqcolorGroup().mid());
+                painter.fillRect(thumbnailRect, colorGroup().mid());
                 painter.drawImage(thumbnailRect.x(), thumbnailRect.y(), thumbnailImage);
             }
         }
@@ -583,7 +583,7 @@ void KoBirdEyePanel::renderView()
 
         TQPainter painter(&m_viewBuffer);
 
-        painter.fillRect(0, 0, m_viewBuffer.width(), m_viewBuffer.height(), tqcolorGroup().mid());
+        painter.fillRect(0, 0, m_viewBuffer.width(), m_viewBuffer.height(), colorGroup().mid());
 
         if (!m_thumbnail.isNull()) {
 
diff --git a/chalk/ui/layerlist.cpp b/chalk/ui/layerlist.cpp
index 96e1e032..8393ccff 100644
--- a/chalk/ui/layerlist.cpp
+++ b/chalk/ui/layerlist.cpp
@@ -142,9 +142,9 @@ public:
     {
         m_img = m_item->tooltipPreview();
         m_timer.start( 15000, true );
-        if( !isVisible() || tqsizeHint() != size() )
+        if( !isVisible() || sizeHint() != size() )
         {
-            resize( tqsizeHint() );
+            resize( sizeHint() );
             position();
         }
         if( !isVisible() )
@@ -168,8 +168,8 @@ public:
     {
         TQPixmap buf( width(), height() );
         TQPainter p( &buf );
-        buf.fill( tqcolorGroup().background() );
-        p.setPen( tqcolorGroup().foreground() );
+        buf.fill( colorGroup().background() );
+        p.setPen( colorGroup().foreground() );
         p.drawRect( buf.rect() );
 
         TQSimpleRichText text( m_item->tooltip(), TQToolTip::font() );
@@ -188,12 +188,12 @@ public:
             p.translate( m_img.width() + 10, 0 );
         }
 
-        text.draw( &p, 0, 0, rect(), tqcolorGroup() );
+        text.draw( &p, 0, 0, rect(), colorGroup() );
 
         painter->drawPixmap( 0, 0, buf );
     }
 
-    virtual TQSize tqsizeHint() const
+    virtual TQSize sizeHint() const
     {
         if( !m_item )
             return TQSize( 0, 0 );
@@ -217,7 +217,7 @@ public:
     void position()
     {
         const TQRect drect = TQApplication::desktop()->availableGeometry( TQToolTip::parentWidget() );
-        const TQSize size = tqsizeHint();
+        const TQSize size = sizeHint();
         const int width = size.width(), height = size.height();
         const TQRect tmp = m_item->rect();
         const TQRect irect( m_list->viewport()->mapToGlobal( m_list->contentsToViewport(tmp.topLeft()) ), tmp.size() );
diff --git a/chalk/ui/squeezedcombobox.cpp b/chalk/ui/squeezedcombobox.cpp
index 6b957a26..31a044f2 100644
--- a/chalk/ui/squeezedcombobox.cpp
+++ b/chalk/ui/squeezedcombobox.cpp
@@ -50,7 +50,7 @@ void SqueezedComboBoxTip::maybeTip( const TQPoint &pos )
     TQListBoxItem* selectedItem = listBox->itemAt( pos );
     if (selectedItem)
     {
-        TQRect positionToolTip = listBox->tqitemRect( selectedItem );
+        TQRect positionToolTip = listBox->itemRect( selectedItem );
         TQString toolTipText = m_originalWidget->itemHighlighted();
         if (!toolTipText.isNull())
             tip(positionToolTip, toolTipText);
@@ -90,7 +90,7 @@ bool SqueezedComboBox::contains( const TQString& _text ) const
     return false;
 }
 
-TQSize SqueezedComboBox::tqsizeHint() const
+TQSize SqueezedComboBox::sizeHint() const
 {
     constPolish();
     TQFontMetrics fm = fontMetrics();
diff --git a/chalk/ui/squeezedcombobox.h b/chalk/ui/squeezedcombobox.h
index 03a1cdb9..50f4bc77 100644
--- a/chalk/ui/squeezedcombobox.h
+++ b/chalk/ui/squeezedcombobox.h
@@ -117,9 +117,9 @@ public:
     TQString itemHighlighted( );
 
     /**
-     * Sets the tqsizeHint() of this widget.
+     * Sets the sizeHint() of this widget.
      */
-    virtual TQSize tqsizeHint() const;
+    virtual TQSize sizeHint() const;
 
 private slots:
     void slotTimeOut();
diff --git a/chalk/ui/wdgautobrush.ui b/chalk/ui/wdgautobrush.ui
index 00683ca9..632a0398 100644
--- a/chalk/ui/wdgautobrush.ui
+++ b/chalk/ui/wdgautobrush.ui
@@ -129,13 +129,13 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="tqminimumSize">
+                            <property name="minimumSize">
                                 <size>
                                     <width>16</width>
                                     <height>0</height>
                                 </size>
                             </property>
-                            <property name="tqmaximumSize">
+                            <property name="maximumSize">
                                 <size>
                                     <width>16</width>
                                     <height>32767</height>
@@ -242,13 +242,13 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="tqminimumSize">
+                            <property name="minimumSize">
                                 <size>
                                     <width>16</width>
                                     <height>0</height>
                                 </size>
                             </property>
-                            <property name="tqmaximumSize">
+                            <property name="maximumSize">
                                 <size>
                                     <width>16</width>
                                     <height>32767</height>
@@ -291,7 +291,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>95</width>
                             <height>95</height>
@@ -332,7 +332,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>0</height>
diff --git a/chalk/ui/wdgautogradient.ui b/chalk/ui/wdgautogradient.ui
index 94a8a137..3a2ca629 100644
--- a/chalk/ui/wdgautogradient.ui
+++ b/chalk/ui/wdgautogradient.ui
@@ -45,7 +45,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqmaximumSize">
+                    <property name="maximumSize">
                         <size>
                             <width>32767</width>
                             <height>30</height>
@@ -129,7 +129,7 @@
                                                     <verstretch>0</verstretch>
                                                 </sizepolicy>
                                             </property>
-                                            <property name="tqmaximumSize">
+                                            <property name="maximumSize">
                                                 <size>
                                                     <width>30</width>
                                                     <height>30</height>
@@ -184,7 +184,7 @@
                                                     <verstretch>0</verstretch>
                                                 </sizepolicy>
                                             </property>
-                                            <property name="tqmaximumSize">
+                                            <property name="maximumSize">
                                                 <size>
                                                     <width>30</width>
                                                     <height>30</height>
diff --git a/chalk/ui/wdgbirdeye.ui b/chalk/ui/wdgbirdeye.ui
index 2b2b7910..d0078c8b 100644
--- a/chalk/ui/wdgbirdeye.ui
+++ b/chalk/ui/wdgbirdeye.ui
@@ -71,13 +71,13 @@
                             <property name="name">
                                 <cstring>txtX</cstring>
                             </property>
-                            <property name="tqminimumSize">
+                            <property name="minimumSize">
                                 <size>
                                     <width>50</width>
                                     <height>0</height>
                                 </size>
                             </property>
-                            <property name="tqmaximumSize">
+                            <property name="maximumSize">
                                 <size>
                                     <width>50</width>
                                     <height>32767</height>
@@ -105,13 +105,13 @@
                             <property name="name">
                                 <cstring>txtY</cstring>
                             </property>
-                            <property name="tqminimumSize">
+                            <property name="minimumSize">
                                 <size>
                                     <width>50</width>
                                     <height>0</height>
                                 </size>
                             </property>
-                            <property name="tqmaximumSize">
+                            <property name="maximumSize">
                                 <size>
                                     <width>50</width>
                                     <height>32767</height>
@@ -137,7 +137,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -158,13 +158,13 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>75</width>
                             <height>75</height>
                         </size>
                     </property>
-                    <property name="tqmaximumSize">
+                    <property name="maximumSize">
                         <size>
                             <width>200</width>
                             <height>75</height>
@@ -186,7 +186,7 @@
             <property name="name">
                 <cstring>toolbar</cstring>
             </property>
-            <property name="tqmaximumSize">
+            <property name="maximumSize">
                 <size>
                     <width>32767</width>
                     <height>32</height>
diff --git a/chalk/ui/wdgcolorsettings.ui b/chalk/ui/wdgcolorsettings.ui
index 6f9e41e6..b9912a79 100644
--- a/chalk/ui/wdgcolorsettings.ui
+++ b/chalk/ui/wdgcolorsettings.ui
@@ -47,7 +47,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>0</width>
                             <height>20</height>
@@ -295,7 +295,7 @@ The different rendering intent methods will affect only what is shown on screen,
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
diff --git a/chalk/ui/wdgcustombrush.ui b/chalk/ui/wdgcustombrush.ui
index dba17dac..bc6f898a 100644
--- a/chalk/ui/wdgcustombrush.ui
+++ b/chalk/ui/wdgcustombrush.ui
@@ -119,7 +119,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -138,7 +138,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>50</width>
                             <height>50</height>
@@ -158,7 +158,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
diff --git a/chalk/ui/wdgcustompattern.ui b/chalk/ui/wdgcustompattern.ui
index 7936f20b..4783a4a1 100644
--- a/chalk/ui/wdgcustompattern.ui
+++ b/chalk/ui/wdgcustompattern.ui
@@ -65,7 +65,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -84,7 +84,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>50</width>
                             <height>50</height>
@@ -104,7 +104,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
diff --git a/chalk/ui/wdgdisplaysettings.ui b/chalk/ui/wdgdisplaysettings.ui
index 64b33f16..3a32af21 100644
--- a/chalk/ui/wdgdisplaysettings.ui
+++ b/chalk/ui/wdgdisplaysettings.ui
@@ -29,7 +29,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>50</height>
@@ -75,7 +75,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>121</width>
                             <height>31</height>
diff --git a/chalk/ui/wdggeneralsettings.ui b/chalk/ui/wdggeneralsettings.ui
index 53f3ef90..21732922 100644
--- a/chalk/ui/wdggeneralsettings.ui
+++ b/chalk/ui/wdggeneralsettings.ui
@@ -40,7 +40,7 @@
                                 <string>&amp;Cursor tqshape:</string>
                             </property>
                             <property name="buddy" stdset="0">
-                                <cstring>m_cmbtqCursorShape</cstring>
+                                <cstring>m_cmbCursorShape</cstring>
                             </property>
                         </widget>
                         <widget class="TQComboBox">
@@ -65,7 +65,7 @@
                                 </property>
                             </item>
                             <property name="name">
-                                <cstring>m_cmbtqCursorShape</cstring>
+                                <cstring>m_cmbCursorShape</cstring>
                             </property>
                         </widget>
                     </hbox>
@@ -148,7 +148,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>41</width>
                     <height>20</height>
@@ -165,7 +165,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>41</height>
diff --git a/chalk/ui/wdggridsettings.ui b/chalk/ui/wdggridsettings.ui
index 18c1f528..23ba8ba7 100644
--- a/chalk/ui/wdggridsettings.ui
+++ b/chalk/ui/wdggridsettings.ui
@@ -29,7 +29,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>31</height>
@@ -57,7 +57,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>16</width>
                             <height>20</height>
@@ -192,7 +192,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>34</width>
                             <height>20</height>
@@ -294,13 +294,13 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="tqminimumSize">
+                            <property name="minimumSize">
                                 <size>
                                     <width>16</width>
                                     <height>0</height>
                                 </size>
                             </property>
-                            <property name="tqmaximumSize">
+                            <property name="maximumSize">
                                 <size>
                                     <width>16</width>
                                     <height>32767</height>
@@ -357,7 +357,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>41</width>
                             <height>20</height>
@@ -427,7 +427,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/chalk/ui/wdglayerbox.ui b/chalk/ui/wdglayerbox.ui
index d977802e..d276a2cf 100644
--- a/chalk/ui/wdglayerbox.ui
+++ b/chalk/ui/wdglayerbox.ui
@@ -42,7 +42,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>0</width>
                             <height>10</height>
@@ -84,13 +84,13 @@
                     <property name="name">
                         <cstring>bnAdd</cstring>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>22</width>
                             <height>22</height>
                         </size>
                     </property>
-                    <property name="tqmaximumSize">
+                    <property name="maximumSize">
                         <size>
                             <width>18</width>
                             <height>18</height>
@@ -110,13 +110,13 @@
                     <property name="name">
                         <cstring>bnLower</cstring>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>22</width>
                             <height>22</height>
                         </size>
                     </property>
-                    <property name="tqmaximumSize">
+                    <property name="maximumSize">
                         <size>
                             <width>18</width>
                             <height>18</height>
@@ -136,13 +136,13 @@
                     <property name="name">
                         <cstring>bnRaise</cstring>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>22</width>
                             <height>22</height>
                         </size>
                     </property>
-                    <property name="tqmaximumSize">
+                    <property name="maximumSize">
                         <size>
                             <width>18</width>
                             <height>18</height>
@@ -162,13 +162,13 @@
                     <property name="name">
                         <cstring>bnProperties</cstring>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>22</width>
                             <height>22</height>
                         </size>
                     </property>
-                    <property name="tqmaximumSize">
+                    <property name="maximumSize">
                         <size>
                             <width>18</width>
                             <height>18</height>
@@ -191,7 +191,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -202,13 +202,13 @@
                     <property name="name">
                         <cstring>bnDelete</cstring>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>22</width>
                             <height>22</height>
                         </size>
                     </property>
-                    <property name="tqmaximumSize">
+                    <property name="maximumSize">
                         <size>
                             <width>18</width>
                             <height>18</height>
diff --git a/chalk/ui/wdgnewimage.ui b/chalk/ui/wdgnewimage.ui
index dd310483..19740160 100644
--- a/chalk/ui/wdgnewimage.ui
+++ b/chalk/ui/wdgnewimage.ui
@@ -137,7 +137,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>131</width>
                             <height>61</height>
@@ -332,7 +332,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>480</width>
                             <height>21</height>
@@ -359,7 +359,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>21</width>
                     <height>0</height>
diff --git a/chalk/ui/wdgpalettechooser.ui b/chalk/ui/wdgpalettechooser.ui
index 3654031b..3f8797d1 100644
--- a/chalk/ui/wdgpalettechooser.ui
+++ b/chalk/ui/wdgpalettechooser.ui
@@ -45,7 +45,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>255</width>
                             <height>20</height>
diff --git a/chalk/ui/wdgperformancesettings.ui b/chalk/ui/wdgperformancesettings.ui
index c8e4404b..1d3110d5 100644
--- a/chalk/ui/wdgperformancesettings.ui
+++ b/chalk/ui/wdgperformancesettings.ui
@@ -61,7 +61,7 @@ Note that this number is only a guideline for Chalk, and is not guaranteed to be
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>81</width>
                             <height>20</height>
@@ -93,7 +93,7 @@ Note that this number is only a guideline for Chalk, and is not guaranteed to be
                     <property name="name">
                         <cstring>m_swappiness</cstring>
                     </property>
-                    <property name="tqmaximumSize">
+                    <property name="maximumSize">
                         <size>
                             <width>600</width>
                             <height>32767</height>
@@ -127,7 +127,7 @@ Note that this number is only a guideline for Chalk, and is not guaranteed to be
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>139</height>
diff --git a/chalk/ui/wdgpressuresettings.ui b/chalk/ui/wdgpressuresettings.ui
index 90f59a33..2a21e377 100644
--- a/chalk/ui/wdgpressuresettings.ui
+++ b/chalk/ui/wdgpressuresettings.ui
@@ -26,7 +26,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>21</width>
                     <height>89</height>
diff --git a/chalk/ui/wdgshapeoptions.ui b/chalk/ui/wdgshapeoptions.ui
index 563c7dbc..2c485c4d 100644
--- a/chalk/ui/wdgshapeoptions.ui
+++ b/chalk/ui/wdgshapeoptions.ui
@@ -35,7 +35,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -85,7 +85,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>21</width>
                     <height>20</height>
diff --git a/chalk/ui/wdgtabletdevicesettings.ui b/chalk/ui/wdgtabletdevicesettings.ui
index f9dfaac6..091997bf 100644
--- a/chalk/ui/wdgtabletdevicesettings.ui
+++ b/chalk/ui/wdgtabletdevicesettings.ui
@@ -29,7 +29,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>21</width>
                     <height>90</height>
diff --git a/chalk/ui/wdgtabletsettings.ui b/chalk/ui/wdgtabletsettings.ui
index 29ff9dbb..34688d5d 100644
--- a/chalk/ui/wdgtabletsettings.ui
+++ b/chalk/ui/wdgtabletsettings.ui
@@ -91,7 +91,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>21</width>
                     <height>90</height>
diff --git a/chalk/ui/wdgtextbrush.ui b/chalk/ui/wdgtextbrush.ui
index 5e5d5dac..114c4baa 100644
--- a/chalk/ui/wdgtextbrush.ui
+++ b/chalk/ui/wdgtextbrush.ui
@@ -47,7 +47,7 @@
                             <property name="name">
                                 <cstring>lineEdit</cstring>
                             </property>
-                            <property name="tqminimumSize">
+                            <property name="minimumSize">
                                 <size>
                                     <width>120</width>
                                     <height>0</height>
@@ -120,7 +120,7 @@
             <property name="sizeType">
                 <enum>Minimum</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>121</width>
                     <height>20</height>
@@ -137,7 +137,7 @@
             <property name="sizeType">
                 <enum>Minimum</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>31</height>