Rename obsolete tq methods to standard names

16 files changed, 82 insertions, 82 deletions

diff --git a/digikam/libs/dialogs/deletedialogbase.ui b/digikam/libs/dialogs/deletedialogbase.ui
index 52bec31..576e836 100644
--- a/digikam/libs/dialogs/deletedialogbase.ui
+++ b/digikam/libs/dialogs/deletedialogbase.ui
@@ -38,7 +38,7 @@
 			</property>
 			<widget class="TQLayoutWidget">
 				<property name="name">
-					<cstring>tqlayout4</cstring>
+					<cstring>layout4</cstring>
 				</property>
 				<hbox>
 					<property name="name">
@@ -62,7 +62,7 @@
 					</widget>
 					<widget class="TQLayoutWidget">
 						<property name="name">
-							<cstring>tqlayout3</cstring>
+							<cstring>layout3</cstring>
 						</property>
 						<vbox>
 							<property name="name">
diff --git a/digikam/libs/dialogs/imagedlgbase.cpp b/digikam/libs/dialogs/imagedlgbase.cpp
index 5a1463d..cb9ee35 100644
--- a/digikam/libs/dialogs/imagedlgbase.cpp
+++ b/digikam/libs/dialogs/imagedlgbase.cpp
@@ -5,7 +5,7 @@
  *
  * Date        : 2005-07-23
  * Description : simple plugins dialog without threadable
- *               filter interface. The dialog tqlayout is
+ *               filter interface. The dialog layout is
  *               designed to accept custom widgets in
  *               preview and settings area.
  *
diff --git a/digikam/libs/dialogs/imagedlgbase.h b/digikam/libs/dialogs/imagedlgbase.h
index 5c4d871..9a244cf 100644
--- a/digikam/libs/dialogs/imagedlgbase.h
+++ b/digikam/libs/dialogs/imagedlgbase.h
@@ -5,7 +5,7 @@
  *
  * Date        : 2005-07-23
  * Description : simple plugins dialog without threadable 
- *               filter interface. The dialog tqlayout is 
+ *               filter interface. The dialog layout is 
  *               designed to accept custom widgets in 
  *               preview and settings area.
  * 
diff --git a/digikam/libs/dimg/README b/digikam/libs/dimg/README
index b0ad1fd..8b79bde 100644
--- a/digikam/libs/dimg/README
+++ b/digikam/libs/dimg/README
@@ -60,7 +60,7 @@ the image)
 format. In QImage/Imlib2 the pixel data is stored as unsigned ints and to 
 access the individual colors you need to use bit-shifting to ensure 
 endian correctness. in DImg, the pixel data is stored as unsigned char. 
-the color tqlayout is B,G,R,A (blue, green, red, alpha)
+the color layout is B,G,R,A (blue, green, red, alpha)
 
 for 8bit images: you can access individual color components like this:
 
diff --git a/digikam/libs/imageproperties/cameraitempropertiestab.cpp b/digikam/libs/imageproperties/cameraitempropertiestab.cpp
index 473de22..f4f77f7 100644
--- a/digikam/libs/imageproperties/cameraitempropertiestab.cpp
+++ b/digikam/libs/imageproperties/cameraitempropertiestab.cpp
@@ -170,7 +170,7 @@ CameraItemPropertiesTab::CameraItemPropertiesTab(TQWidget* parent, bool navBar)
 
     d->settingsArea = new TQFrame(sv->viewport());
     d->settingsArea->setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken );
-    d->settingsArea->setLineWidth( tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth, this) );
+    d->settingsArea->setLineWidth( style().pixelMetric(TQStyle::PM_DefaultFrameWidth, this) );
 
     sv->addChild(d->settingsArea);
     m_navigateBarLayout->addWidget(sv);
diff --git a/digikam/libs/imageproperties/imagepropertiestab.cpp b/digikam/libs/imageproperties/imagepropertiestab.cpp
index ee2545e..454bdc5 100644
--- a/digikam/libs/imageproperties/imagepropertiestab.cpp
+++ b/digikam/libs/imageproperties/imagepropertiestab.cpp
@@ -183,7 +183,7 @@ ImagePropertiesTab::ImagePropertiesTab(TQWidget* parent, bool navBar)
 
     d->settingsArea = new TQFrame(sv->viewport());
     d->settingsArea->setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken );
-    d->settingsArea->setLineWidth( tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth, this) );
+    d->settingsArea->setLineWidth( style().pixelMetric(TQStyle::PM_DefaultFrameWidth, this) );
 
     sv->addChild(d->settingsArea);
     m_navigateBarLayout->addWidget(sv);
diff --git a/digikam/libs/widgets/common/colorgradientwidget.cpp b/digikam/libs/widgets/common/colorgradientwidget.cpp
index 04426dc..9270fd5 100644
--- a/digikam/libs/widgets/common/colorgradientwidget.cpp
+++ b/digikam/libs/widgets/common/colorgradientwidget.cpp
@@ -92,8 +92,8 @@ void ColorGradientWidget::drawContents(TQPainter *p)
     // Widget is disable : drawing grayed frame.
     if ( !isEnabled() )
     {
-       color1 = tqpalette().disabled().foreground();
-       color2 = tqpalette().disabled().background();
+       color1 = palette().disabled().foreground();
+       color2 = palette().disabled().background();
     }
     else 
     {
diff --git a/digikam/libs/widgets/common/curveswidget.cpp b/digikam/libs/widgets/common/curveswidget.cpp
index 30065e2..7f168ea 100644
--- a/digikam/libs/widgets/common/curveswidget.cpp
+++ b/digikam/libs/widgets/common/curveswidget.cpp
@@ -313,11 +313,11 @@ void CurvesWidget::paintEvent(TQPaintEvent*)
        TQPixmap anim(asize, asize);
        TQPainter p2;
        p2.begin(TQT_TQPAINTDEVICE(&anim), this);
-       p2.fillRect(0, 0, asize, asize, tqpalette().active().background());
+       p2.fillRect(0, 0, asize, asize, palette().active().background());
        p2.translate(asize/2, asize/2);
 
        d->pos = (d->pos + 10) % 360;
-       p2.setPen(TQPen(tqpalette().active().text()));
+       p2.setPen(TQPen(palette().active().text()));
        p2.rotate(d->pos);
        for ( int i=0 ; i<12 ; i++ )
        {
@@ -331,11 +331,11 @@ void CurvesWidget::paintEvent(TQPaintEvent*)
        TQPixmap pm(size());
        TQPainter p1;
        p1.begin(TQT_TQPAINTDEVICE(&pm), this);
-       p1.fillRect(0, 0, width(), height(), tqpalette().active().background());
-       p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine));
+       p1.fillRect(0, 0, width(), height(), palette().active().background());
+       p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
        p1.drawRect(0, 0, width(), height());
        p1.drawPixmap(width()/2 - asize /2, asize, anim);
-       p1.setPen(TQPen(tqpalette().active().text()));
+       p1.setPen(TQPen(palette().active().text()));
 
        if (d->clearFlag == CurvesWidgetPriv::HistogramDataLoading)
            p1.drawText(0, 0, width(), height(), TQt::AlignCenter,
@@ -354,10 +354,10 @@ void CurvesWidget::paintEvent(TQPaintEvent*)
        TQPixmap pm(size());
        TQPainter p1;
        p1.begin(TQT_TQPAINTDEVICE(&pm), this);
-       p1.fillRect(0, 0, width(), height(), tqpalette().active().background());
-       p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine));
+       p1.fillRect(0, 0, width(), height(), palette().active().background());
+       p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
        p1.drawRect(0, 0, width(), height());
-       p1.setPen(TQPen(tqpalette().active().text()));
+       p1.setPen(TQPen(palette().active().text()));
        p1.drawText(0, 0, width(), height(), TQt::AlignCenter,
                    i18n("Histogram\ncalculation\nfailed."));
        p1.end();
@@ -483,14 +483,14 @@ void CurvesWidget::paintEvent(TQPaintEvent*)
 
       // Drawing histogram
 
-      p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine));
+      p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
       p1.drawLine(x, wHeight, x, wHeight - y);
-      p1.setPen(TQPen(tqpalette().active().background(), 1, TQt::SolidLine));
+      p1.setPen(TQPen(palette().active().background(), 1, TQt::SolidLine));
       p1.drawLine(x, wHeight - y, x, 0);
 
       // Drawing curves.
 
-      p1.setPen(TQPen(tqpalette().active().link(), 2, TQt::SolidLine));
+      p1.setPen(TQPen(palette().active().link(), 2, TQt::SolidLine));
       p1.drawLine(x - 1, wHeight - ((curvePrevVal * wHeight) / histogram->getHistogramSegment()),
                   x,     wHeight - ((curveVal * wHeight) / histogram->getHistogramSegment()));
 
@@ -518,7 +518,7 @@ void CurvesWidget::paintEvent(TQPaintEvent*)
 
    // Drawing black/middle/highlight tone grid separators.
 
-   p1.setPen(TQPen(tqpalette().active().base(), 1, TQt::SolidLine));
+   p1.setPen(TQPen(palette().active().base(), 1, TQt::SolidLine));
    p1.drawLine(wWidth/4, 0, wWidth/4, wHeight);
    p1.drawLine(wWidth/2, 0, wWidth/2, wHeight);
    p1.drawLine(3*wWidth/4, 0, 3*wWidth/4, wHeight);
@@ -601,7 +601,7 @@ void CurvesWidget::paintEvent(TQPaintEvent*)
 
    // Drawing frame.
 
-   p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine));
+   p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
    p1.drawRect(0, 0, width(), height());
 
    p1.end();
diff --git a/digikam/libs/widgets/common/dpopupmenu.cpp b/digikam/libs/widgets/common/dpopupmenu.cpp
index 04b0a5a..e611591 100644
--- a/digikam/libs/widgets/common/dpopupmenu.cpp
+++ b/digikam/libs/widgets/common/dpopupmenu.cpp
@@ -93,8 +93,8 @@ TQRect DPopupMenu::sideImageRect() const
 TQColor DPopupMenu::calcPixmapColor()
 {
     TQColor color;
-    TQColor activeTitle   = TQApplication::tqpalette().active().background();
-    TQColor inactiveTitle = TQApplication::tqpalette().inactive().background();
+    TQColor activeTitle   = TQApplication::palette().active().background();
+    TQColor inactiveTitle = TQApplication::palette().inactive().background();
 
     // figure out which color is most suitable for recoloring to
     int h1, s1, v1, h2, s2, v2, h3, s3, v3;
@@ -188,7 +188,7 @@ void DPopupMenu::paintEvent(TQPaintEvent* e)
 
     drawContents(&p);
 
-    tqstyle().tqdrawPrimitive(TQStyle::PE_PanelPopup, &p,
+    style().tqdrawPrimitive(TQStyle::PE_PanelPopup, &p,
                           TQRect(0, 0, width(), height()),
                           colorGroup(), TQStyle::Style_Default,
                           TQStyleOption( frameWidth(), 0));
diff --git a/digikam/libs/widgets/common/histogramwidget.cpp b/digikam/libs/widgets/common/histogramwidget.cpp
index d64391a..8cd9dd2 100644
--- a/digikam/libs/widgets/common/histogramwidget.cpp
+++ b/digikam/libs/widgets/common/histogramwidget.cpp
@@ -385,9 +385,9 @@ void HistogramWidget::paintEvent(TQPaintEvent*)
        TQPainter p1;
        p1.begin(TQT_TQPAINTDEVICE(&pm), TQT_TQOBJECT(this));
        p1.fillRect(0, 0, size().width(), size().height(),  tqpalette().disabled().background());
-       p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine));
+       p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
        p1.drawRect(0, 0, width(), height());
-       p1.setPen(TQPen(tqpalette().disabled().foreground(), 1, TQt::SolidLine));
+       p1.setPen(TQPen(palette().disabled().foreground(), 1, TQt::SolidLine));
        p1.drawRect(0, 0, width(), height());
        p1.end();
        bitBlt(this, 0, 0, &pm);
@@ -406,11 +406,11 @@ void HistogramWidget::paintEvent(TQPaintEvent*)
        TQPixmap anim(asize, asize);
        TQPainter p2;
        p2.begin(TQT_TQPAINTDEVICE(&anim), TQT_TQOBJECT(this));
-       p2.fillRect(0, 0, asize, asize, tqpalette().active().background());
+       p2.fillRect(0, 0, asize, asize, palette().active().background());
        p2.translate(asize/2, asize/2);
 
        d->pos = (d->pos + 10) % 360;
-       p2.setPen(TQPen(tqpalette().active().text()));
+       p2.setPen(TQPen(palette().active().text()));
        p2.rotate(d->pos);
        for ( int i=0 ; i<12 ; i++ )
        {
@@ -424,11 +424,11 @@ void HistogramWidget::paintEvent(TQPaintEvent*)
        TQPixmap pm(size());
        TQPainter p1;
        p1.begin(TQT_TQPAINTDEVICE(&pm), TQT_TQOBJECT(this));
-       p1.fillRect(0, 0, width(), height(), tqpalette().active().background());
-       p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine));
+       p1.fillRect(0, 0, width(), height(), palette().active().background());
+       p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
        p1.drawRect(0, 0, width(), height());
        p1.drawPixmap(width()/2 - asize /2, asize, anim);
-       p1.setPen(TQPen(tqpalette().active().text()));
+       p1.setPen(TQPen(palette().active().text()));
 
        if (d->clearFlag == HistogramWidgetPriv::HistogramDataLoading)
            p1.drawText(0, 0, width(), height(), TQt::AlignCenter,
@@ -448,10 +448,10 @@ void HistogramWidget::paintEvent(TQPaintEvent*)
        TQPixmap pm(size());
        TQPainter p1;
        p1.begin(TQT_TQPAINTDEVICE(&pm), TQT_TQOBJECT(this));
-       p1.fillRect(0, 0, width(), height(), tqpalette().active().background());
-       p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine));
+       p1.fillRect(0, 0, width(), height(), palette().active().background());
+       p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
        p1.drawRect(0, 0, width(), height());
-       p1.setPen(TQPen(tqpalette().active().text()));
+       p1.setPen(TQPen(palette().active().text()));
        p1.drawText(0, 0, width(), height(), TQt::AlignCenter,
                    i18n("Histogram\ncalculation\nfailed."));
        p1.end();
@@ -525,7 +525,7 @@ void HistogramWidget::paintEvent(TQPaintEvent*)
     TQPixmap pm(size());
     TQPainter p1;
     p1.begin(TQT_TQPAINTDEVICE(&pm), TQT_TQOBJECT(this));
-    p1.fillRect(0, 0, width(), height(), tqpalette().active().background());
+    p1.fillRect(0, 0, width(), height(), palette().active().background());
 
     // Drawing selection or all histogram values.
 
@@ -645,35 +645,35 @@ void HistogramWidget::paintEvent(TQPaintEvent*)
          {
             if ( x >= (int)(d->xmin * wWidth) && x <= (int)(d->xmax * wWidth) )
             {
-               p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine));
+               p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
                p1.drawLine(x, wHeight, x, 0);
-               p1.setPen(TQPen(tqpalette().active().background(), 1, TQt::SolidLine));
+               p1.setPen(TQPen(palette().active().background(), 1, TQt::SolidLine));
                p1.drawLine(x, wHeight, x, wHeight - y);
             }
             else 
             {
-               p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine));
+               p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
                p1.drawLine(x, wHeight, x, wHeight - y);
-               p1.setPen(TQPen(tqpalette().active().background(), 1, TQt::SolidLine));
+               p1.setPen(TQPen(palette().active().background(), 1, TQt::SolidLine));
                p1.drawLine(x, wHeight - y, x, 0);
 
                if ( x == wWidth/4 || x == wWidth/2 || x == 3*wWidth/4 )
                {
-                  p1.setPen(TQPen(tqpalette().active().base(), 1, TQt::SolidLine));
+                  p1.setPen(TQPen(palette().active().base(), 1, TQt::SolidLine));
                   p1.drawLine(x, wHeight, x, 0);
                }
             }
          }
          else
          {
-            p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine));
+            p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
             p1.drawLine(x, wHeight, x, wHeight - y);
-            p1.setPen(TQPen(tqpalette().active().background(), 1, TQt::SolidLine));
+            p1.setPen(TQPen(palette().active().background(), 1, TQt::SolidLine));
             p1.drawLine(x, wHeight - y, x, 0);
 
             if ( x == wWidth/4 || x == wWidth/2 || x == 3*wWidth/4 )
             {
-               p1.setPen(TQPen(tqpalette().active().base(), 1, TQt::SolidLine));
+               p1.setPen(TQPen(palette().active().base(), 1, TQt::SolidLine));
                p1.drawLine(x, wHeight, x, 0);
             }
          }
@@ -684,9 +684,9 @@ void HistogramWidget::paintEvent(TQPaintEvent*)
          {
              if ( x >= (int)(d->xmin * wWidth) && x <= (int)(d->xmax * wWidth) )
             {
-               p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine));
+               p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
                p1.drawLine(x, wHeight, x, 0);
-               p1.setPen(TQPen(tqpalette().active().background(), 1, TQt::SolidLine));
+               p1.setPen(TQPen(palette().active().background(), 1, TQt::SolidLine));
 
                // Witch color must be used on the foreground with all colors channel mode?
                switch (m_colorType) 
@@ -717,16 +717,16 @@ void HistogramWidget::paintEvent(TQPaintEvent*)
                     p1.setPen(TQPen(TQt::red, 1, TQt::SolidLine));
                     p1.drawLine(x, wHeight, x, wHeight - yr);
 
-                    p1.setPen(TQPen(tqpalette().active().background(), 1, TQt::SolidLine));
+                    p1.setPen(TQPen(palette().active().background(), 1, TQt::SolidLine));
                     p1.drawLine(x, wHeight - TQMAX(TQMAX(yr, yg), yb), x, 0);
-                    p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine));
+                    p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
                     p1.drawLine(x, wHeight - yg -1, x, wHeight - yg);
                     p1.drawLine(x, wHeight - yb -1, x, wHeight - yb);
                     p1.drawLine(x, wHeight - yr -1, x, wHeight - yr);
 
                     if ( x == wWidth/4 || x == wWidth/2 || x == 3*wWidth/4 )
                     {
-                       p1.setPen(TQPen(tqpalette().active().base(), 1, TQt::SolidLine));
+                       p1.setPen(TQPen(palette().active().base(), 1, TQt::SolidLine));
                        p1.drawLine(x, wHeight, x, 0);
                     }
 
@@ -740,16 +740,16 @@ void HistogramWidget::paintEvent(TQPaintEvent*)
                     p1.setPen(TQPen(TQt::green, 1, TQt::SolidLine));
                     p1.drawLine(x, wHeight, x, wHeight - yg);
 
-                    p1.setPen(TQPen(tqpalette().active().background(), 1, TQt::SolidLine));
+                    p1.setPen(TQPen(palette().active().background(), 1, TQt::SolidLine));
                     p1.drawLine(x, wHeight - TQMAX(TQMAX(yr, yg), yb), x, 0);
-                    p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine));
+                    p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
                     p1.drawLine(x, wHeight - yb -1, x, wHeight - yb);
                     p1.drawLine(x, wHeight - yr -1, x, wHeight - yr);
                     p1.drawLine(x, wHeight - yg -1, x, wHeight - yg);
 
                     if ( x == wWidth/4 || x == wWidth/2 || x == 3*wWidth/4 )
                     {
-                       p1.setPen(TQPen(tqpalette().active().base(), 1, TQt::SolidLine));
+                       p1.setPen(TQPen(palette().active().base(), 1, TQt::SolidLine));
                        p1.drawLine(x, wHeight, x, 0);
                     }
 
@@ -763,16 +763,16 @@ void HistogramWidget::paintEvent(TQPaintEvent*)
                     p1.setPen(TQPen(TQt::blue, 1, TQt::SolidLine));
                     p1.drawLine(x, wHeight, x, wHeight - yb);
 
-                    p1.setPen(TQPen(tqpalette().active().background(), 1, TQt::SolidLine));
+                    p1.setPen(TQPen(palette().active().background(), 1, TQt::SolidLine));
                     p1.drawLine(x, wHeight - TQMAX(TQMAX(yr, yg), yb), x, 0);
-                    p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine));
+                    p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
                     p1.drawLine(x, wHeight - yr -1, x, wHeight - yr);
                     p1.drawLine(x, wHeight - yg -1, x, wHeight - yg);
                     p1.drawLine(x, wHeight - yb -1, x, wHeight - yb);
 
                     if ( x == wWidth/4 || x == wWidth/2 || x == 3*wWidth/4 )
                     {
-                       p1.setPen(TQPen(tqpalette().active().base(), 1, TQt::SolidLine));
+                       p1.setPen(TQPen(palette().active().base(), 1, TQt::SolidLine));
                        p1.drawLine(x, wHeight, x, 0);
                     }
 
@@ -793,16 +793,16 @@ void HistogramWidget::paintEvent(TQPaintEvent*)
                  p1.setPen(TQPen(TQt::red, 1, TQt::SolidLine));
                  p1.drawLine(x, wHeight, x, wHeight - yr);
 
-                 p1.setPen(TQPen(tqpalette().active().background(), 1, TQt::SolidLine));
+                 p1.setPen(TQPen(palette().active().background(), 1, TQt::SolidLine));
                  p1.drawLine(x, wHeight - TQMAX(TQMAX(yr, yg), yb), x, 0);
-                 p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine));
+                 p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
                  p1.drawLine(x, wHeight - yg -1, x, wHeight - yg);
                  p1.drawLine(x, wHeight - yb -1, x, wHeight - yb);
                  p1.drawLine(x, wHeight - yr -1, x, wHeight - yr);
 
                  if ( x == wWidth/4 || x == wWidth/2 || x == 3*wWidth/4 )
                  {
-                     p1.setPen(TQPen(tqpalette().active().base(), 1, TQt::SolidLine));
+                     p1.setPen(TQPen(palette().active().base(), 1, TQt::SolidLine));
                      p1.drawLine(x, wHeight, x, 0);
                  }
 
@@ -816,16 +816,16 @@ void HistogramWidget::paintEvent(TQPaintEvent*)
                  p1.setPen(TQPen(TQt::green, 1, TQt::SolidLine));
                  p1.drawLine(x, wHeight, x, wHeight - yg);
 
-                 p1.setPen(TQPen(tqpalette().active().background(), 1, TQt::SolidLine));
+                 p1.setPen(TQPen(palette().active().background(), 1, TQt::SolidLine));
                  p1.drawLine(x, wHeight - TQMAX(TQMAX(yr, yg), yb), x, 0);
-                 p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine));
+                 p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
                  p1.drawLine(x, wHeight - yb -1, x, wHeight - yb);
                  p1.drawLine(x, wHeight - yr -1, x, wHeight - yr);
                  p1.drawLine(x, wHeight - yg -1, x, wHeight - yg);
 
                  if ( x == wWidth/4 || x == wWidth/2 || x == 3*wWidth/4 )
                  {
-                     p1.setPen(TQPen(tqpalette().active().base(), 1, TQt::SolidLine));
+                     p1.setPen(TQPen(palette().active().base(), 1, TQt::SolidLine));
                      p1.drawLine(x, wHeight, x, 0);
                  }
 
@@ -839,16 +839,16 @@ void HistogramWidget::paintEvent(TQPaintEvent*)
                  p1.setPen(TQPen(TQt::blue, 1, TQt::SolidLine));
                  p1.drawLine(x, wHeight, x, wHeight - yb);
 
-                 p1.setPen(TQPen(tqpalette().active().background(), 1, TQt::SolidLine));
+                 p1.setPen(TQPen(palette().active().background(), 1, TQt::SolidLine));
                  p1.drawLine(x, wHeight - TQMAX(TQMAX(yr, yg), yb), x, 0);
-                 p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine));
+                 p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
                  p1.drawLine(x, wHeight - yr -1, x, wHeight - yr);
                  p1.drawLine(x, wHeight - yg -1, x, wHeight - yg);
                  p1.drawLine(x, wHeight - yb -1, x, wHeight - yb);
 
                  if ( x == wWidth/4 || x == wWidth/2 || x == 3*wWidth/4 )
                  {
-                     p1.setPen(TQPen(tqpalette().active().base(), 1, TQt::SolidLine));
+                     p1.setPen(TQPen(palette().active().base(), 1, TQt::SolidLine));
                      p1.drawLine(x, wHeight, x, 0);
                  }
 
@@ -973,7 +973,7 @@ void HistogramWidget::paintEvent(TQPaintEvent*)
        TQToolTip::add( this, tipText);
     }
 
-    p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine));
+    p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
     p1.drawRect(0, 0, width(), height());
     p1.end();
     bitBlt(this, 0, 0, &pm);
diff --git a/digikam/libs/widgets/common/squeezedcombobox.cpp b/digikam/libs/widgets/common/squeezedcombobox.cpp
index ab8163d..996b9cf 100644
--- a/digikam/libs/widgets/common/squeezedcombobox.cpp
+++ b/digikam/libs/widgets/common/squeezedcombobox.cpp
@@ -97,7 +97,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/digikam/libs/widgets/iccprofiles/cietonguewidget.cpp b/digikam/libs/widgets/iccprofiles/cietonguewidget.cpp
index 57a1686..53b11de 100644
--- a/digikam/libs/widgets/iccprofiles/cietonguewidget.cpp
+++ b/digikam/libs/widgets/iccprofiles/cietonguewidget.cpp
@@ -708,7 +708,7 @@ void CIETongueWidget::paintEvent(TQPaintEvent*)
     {
         d->painter.begin(&d->pixmap);
         d->painter.fillRect(0, 0, size().width(), size().height(), tqpalette().disabled().background());
-        d->painter.setPen(TQPen(tqpalette().disabled().foreground(), 1, TQt::SolidLine));
+        d->painter.setPen(TQPen(palette().disabled().foreground(), 1, TQt::SolidLine));
         d->painter.drawRect(0, 0, width(), height());
         d->painter.end();
         bitBlt(this, 0, 0, &d->pixmap);
@@ -725,11 +725,11 @@ void CIETongueWidget::paintEvent(TQPaintEvent*)
         TQPixmap anim(asize, asize);
         TQPainter p2;
         p2.begin(&anim, TQT_TQOBJECT(this));
-        p2.fillRect(0, 0, asize, asize, tqpalette().active().background());
+        p2.fillRect(0, 0, asize, asize, palette().active().background());
         p2.translate(asize/2, asize/2);
 
         d->pos = (d->pos + 10) % 360;
-        p2.setPen(TQPen(tqpalette().active().text()));
+        p2.setPen(TQPen(palette().active().text()));
         p2.rotate(d->pos);
         for ( int i=0 ; i<12 ; i++ )
         {
@@ -743,7 +743,7 @@ void CIETongueWidget::paintEvent(TQPaintEvent*)
         d->painter.begin(&d->pixmap);
         d->painter.fillRect(0, 0, size().width(), size().height(), tqpalette().active().background());
         d->painter.drawPixmap(width()/2 - asize /2, asize, anim);
-        d->painter.setPen(TQPen(tqpalette().active().text(), 1, TQt::SolidLine));
+        d->painter.setPen(TQPen(palette().active().text(), 1, TQt::SolidLine));
         d->painter.drawRect(0, 0, width(), height());
         d->painter.drawText(0, 0, size().width(), size().height(), TQt::AlignCenter,
                             i18n("Loading image..."));
@@ -759,7 +759,7 @@ void CIETongueWidget::paintEvent(TQPaintEvent*)
     {
         d->painter.begin(&d->pixmap);
         d->painter.fillRect(0, 0, size().width(), size().height(), tqpalette().active().background());
-        d->painter.setPen(TQPen(tqpalette().active().text(), 1, TQt::SolidLine));
+        d->painter.setPen(TQPen(palette().active().text(), 1, TQt::SolidLine));
         d->painter.drawRect(0, 0, width(), height());
         d->painter.drawText(0, 0, size().width(), size().height(), TQt::AlignCenter,
                             i18n("No profile available..."));
diff --git a/digikam/libs/widgets/iccprofiles/iccpreviewwidget.cpp b/digikam/libs/widgets/iccprofiles/iccpreviewwidget.cpp
index 76df5e8..3398b37 100644
--- a/digikam/libs/widgets/iccprofiles/iccpreviewwidget.cpp
+++ b/digikam/libs/widgets/iccprofiles/iccpreviewwidget.cpp
@@ -45,12 +45,12 @@ namespace Digikam
 ICCPreviewWidget::ICCPreviewWidget(TQWidget *parent)
                 : KPreviewWidgetBase( parent )
 {
-    TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
+    TQVBoxLayout *layout = new TQVBoxLayout( this );
     TQVGroupBox *box     = new TQVGroupBox( this );
     box->setInsideMargin(0);
     box->setFrameStyle(TQFrame::NoFrame|TQFrame::Plain);
     m_iccProfileWidget = new ICCProfileWidget(box);
-    tqlayout->addWidget( box );
+    layout->addWidget( box );
 }
 
 ICCPreviewWidget::~ICCPreviewWidget()
diff --git a/digikam/libs/widgets/metadata/gpswidget.cpp b/digikam/libs/widgets/metadata/gpswidget.cpp
index ae87d8a..9471bbd 100644
--- a/digikam/libs/widgets/metadata/gpswidget.cpp
+++ b/digikam/libs/widgets/metadata/gpswidget.cpp
@@ -105,7 +105,7 @@ GPSWidget::GPSWidget(TQWidget* parent, const char* name)
     // --------------------------------------------------------
             
     TQWidget *gpsInfo    = new TQWidget(this);
-    TQGridLayout *tqlayout = new TQGridLayout(gpsInfo, 3, 2);
+    TQGridLayout *layout = new TQGridLayout(gpsInfo, 3, 2);
     d->map              = new WorldMapWidget(256, 256, gpsInfo);
 
     // --------------------------------------------------------
@@ -114,7 +114,7 @@ GPSWidget::GPSWidget(TQWidget* parent, const char* name)
     box2->setInsideMargin(0);
     box2->setInsideSpacing(0);    
     box2->setFrameStyle( TQFrame::NoFrame );
-    TQGridLayout* box2Layout = new TQGridLayout( box2->tqlayout(), 0, 2, KDialog::spacingHint() );
+    TQGridLayout* box2Layout = new TQGridLayout( box2->layout(), 0, 2, KDialog::spacingHint() );
 
     d->detailsCombo  = new TQComboBox( false, box2 );
     d->detailsButton = new TQPushButton(i18n("More Info..."), box2);
@@ -129,12 +129,12 @@ GPSWidget::GPSWidget(TQWidget* parent, const char* name)
 
     // --------------------------------------------------------
     
-    tqlayout->addMultiCellWidget(d->map, 0, 0, 0, 2);
-    tqlayout->addMultiCell(new TQSpacerItem(KDialog::spacingHint(), KDialog::spacingHint(), 
+    layout->addMultiCellWidget(d->map, 0, 0, 0, 2);
+    layout->addMultiCell(new TQSpacerItem(KDialog::spacingHint(), KDialog::spacingHint(), 
                          TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding), 1, 1, 0, 2);
-    tqlayout->addMultiCellWidget(box2, 2, 2, 0, 0);
-    tqlayout->setColStretch(2, 10);
-    tqlayout->setRowStretch(3, 10);
+    layout->addMultiCellWidget(box2, 2, 2, 0, 0);
+    layout->setColStretch(2, 10);
+    layout->setRowStretch(3, 10);
 
     // --------------------------------------------------------
     
diff --git a/digikam/libs/widgets/metadata/metadatawidget.cpp b/digikam/libs/widgets/metadata/metadatawidget.cpp
index 7eaad1b..a1ec7fb 100644
--- a/digikam/libs/widgets/metadata/metadatawidget.cpp
+++ b/digikam/libs/widgets/metadata/metadatawidget.cpp
@@ -295,7 +295,7 @@ void MetadataWidget::slotCopy2Clipboard()
         ++it;
     }
 
-    TQApplication::tqclipboard()->setData(new TQTextDrag(textmetadata), TQClipboard::Clipboard);
+    TQApplication::clipboard()->setData(new TQTextDrag(textmetadata), TQClipboard::Clipboard);
 }
 
 void MetadataWidget::slotPrintMetadata()
diff --git a/digikam/libs/widgets/metadata/worldmapwidget.cpp b/digikam/libs/widgets/metadata/worldmapwidget.cpp
index ae3eeb9..2d3d694 100644
--- a/digikam/libs/widgets/metadata/worldmapwidget.cpp
+++ b/digikam/libs/widgets/metadata/worldmapwidget.cpp
@@ -170,7 +170,7 @@ void WorldMapWidget::drawContents(TQPainter *p, int x, int y, int w, int h)
     }
     else
     {
-        p->fillRect(x, y, w, h, tqpalette().disabled().background());
+        p->fillRect(x, y, w, h, palette().disabled().background());
     }
 }