Rename a number of old tq methods that are no longer tq specific

88 files changed, 344 insertions, 344 deletions

diff --git a/digikam/imageplugins/adjustcurves/adjustcurves.cpp b/digikam/imageplugins/adjustcurves/adjustcurves.cpp
index ed8aeab5..f5ef5a5d 100644
--- a/digikam/imageplugins/adjustcurves/adjustcurves.cpp
+++ b/digikam/imageplugins/adjustcurves/adjustcurves.cpp
@@ -27,7 +27,7 @@
 
 // TQt includes.
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcolor.h>
 #include <tqgroupbox.h>
 #include <tqhgroupbox.h>
@@ -39,7 +39,7 @@
 #include <tqwhatsthis.h>
 #include <tqtooltip.h>
 #include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqframe.h>
 #include <tqtimer.h>
 #include <tqhbuttongroup.h> 
@@ -127,7 +127,7 @@ AdjustCurveDialog::AdjustCurveDialog(TQWidget* parent)
     TQGridLayout* grid     = new TQGridLayout( gboxSettings, 5, 5, spacingHint());
 
     TQLabel *label1 = new TQLabel(i18n("Channel:"), gboxSettings);
-    label1->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter );
+    label1->setAlignment ( TQt::AlignRight | TQt::AlignVCenter );
     m_channelCB = new TQComboBox( false, gboxSettings );
     m_channelCB->insertItem( i18n("Luminosity") );
     m_channelCB->insertItem( i18n("Red") );
@@ -402,7 +402,7 @@ void AdjustCurveDialog::slotSpotColorChanged(const Digikam::DColor &color)
     for (int i = Digikam::ImageHistogram::ValueChannel ; i <= Digikam::ImageHistogram::BlueChannel ; i++)
        m_curves->curvesCalculateCurve(i);
     
-    m_curvesWidget->tqrepaint(false);
+    m_curvesWidget->repaint(false);
     
     // restore previous rendering mode.
     m_previewWidget->setRenderingPreviewMode(m_currentPreviewMode);
@@ -522,16 +522,16 @@ void AdjustCurveDialog::slotChannelChanged(int channel)
 
     m_curveType->setButton(m_curves->getCurveType(channel));
                 
-    m_curvesWidget->tqrepaint(false);
-    m_histogramWidget->tqrepaint(false);
+    m_curvesWidget->repaint(false);
+    m_histogramWidget->repaint(false);
 }
 
 void AdjustCurveDialog::slotScaleChanged(int scale)
 {
     m_curvesWidget->m_scaleType = scale;
     m_histogramWidget->m_scaleType = scale;
-    m_histogramWidget->tqrepaint(false);
-    m_curvesWidget->tqrepaint(false);
+    m_histogramWidget->repaint(false);
+    m_curvesWidget->repaint(false);
 }
 
 void AdjustCurveDialog::slotCurveTypeChanged(int type)
@@ -569,13 +569,13 @@ void AdjustCurveDialog::readUserSettings()
     for (int i = 0 ; i < 5 ; i++)
     {
         m_curves->curvesChannelReset(i);
-        m_curves->setCurveType(i, (Digikam::ImageCurves::CurveType)config->readNumEntry(TQString("CurveTypeChannel%1").tqarg(i),
+        m_curves->setCurveType(i, (Digikam::ImageCurves::CurveType)config->readNumEntry(TQString("CurveTypeChannel%1").arg(i),
                                                                                         Digikam::ImageCurves::CURVE_SMOOTH));
 
         for (int j = 0 ; j < 17 ; j++)
         {
             TQPoint disable(-1, -1);
-            TQPoint p = config->readPointEntry(TQString("CurveAjustmentChannel%1Point%2").tqarg(i).tqarg(j), &disable);
+            TQPoint p = config->readPointEntry(TQString("CurveAjustmentChannel%1Point%2").arg(i).arg(j), &disable);
     
             if (m_originalImage.sixteenBit() && p.x() != -1)
             {
@@ -602,7 +602,7 @@ void AdjustCurveDialog::writeUserSettings()
 
     for (int i = 0 ; i < 5 ; i++)
     {
-        config->writeEntry(TQString("CurveTypeChannel%1").tqarg(i), m_curves->getCurveType(i));
+        config->writeEntry(TQString("CurveTypeChannel%1").arg(i), m_curves->getCurveType(i));
         
         for (int j = 0 ; j < 17 ; j++)
         {
@@ -614,7 +614,7 @@ void AdjustCurveDialog::writeUserSettings()
                 p.setY(p.y()/255);
             }
     
-            config->writeEntry(TQString("CurveAjustmentChannel%1Point%2").tqarg(i).tqarg(j), p);
+            config->writeEntry(TQString("CurveAjustmentChannel%1Point%2").arg(i).arg(j), p);
         }
     }
 
diff --git a/digikam/imageplugins/adjustcurves/adjustcurvestool.cpp b/digikam/imageplugins/adjustcurves/adjustcurvestool.cpp
index d1190738..fbfb4de9 100644
--- a/digikam/imageplugins/adjustcurves/adjustcurvestool.cpp
+++ b/digikam/imageplugins/adjustcurves/adjustcurvestool.cpp
@@ -27,7 +27,7 @@
 
 // TQt includes.
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcolor.h>
 #include <tqgroupbox.h>
 #include <tqhgroupbox.h>
@@ -39,7 +39,7 @@
 #include <tqwhatsthis.h>
 #include <tqtooltip.h>
 #include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqframe.h>
 #include <tqtimer.h>
 #include <tqhbuttongroup.h>
@@ -118,7 +118,7 @@ AdjustCurvesTool::AdjustCurvesTool(TQObject* parent)
     TQGridLayout* grid = new TQGridLayout(m_gboxSettings->plainPage(), 5, 5);
 
     TQLabel *label1 = new TQLabel(i18n("Channel:"), m_gboxSettings->plainPage());
-    label1->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter );
+    label1->setAlignment ( TQt::AlignRight | TQt::AlignVCenter );
     m_channelCB = new TQComboBox( false, m_gboxSettings->plainPage() );
     m_channelCB->insertItem( i18n("Luminosity") );
     m_channelCB->insertItem( i18n("Red") );
@@ -384,7 +384,7 @@ void AdjustCurvesTool::slotSpotColorChanged(const DColor &color)
     for (int i = ImageHistogram::ValueChannel ; i <= ImageHistogram::BlueChannel ; i++)
        m_curvesWidget->curves()->curvesCalculateCurve(i);
 
-    m_curvesWidget->tqrepaint(false);
+    m_curvesWidget->repaint(false);
 
     // restore previous rendering mode.
     m_previewWidget->setRenderingPreviewMode(m_currentPreviewMode);
@@ -401,7 +401,7 @@ void AdjustCurvesTool::slotResetCurrentChannel()
 {
     m_curvesWidget->curves()->curvesChannelReset(m_channelCB->currentItem());
 
-    m_curvesWidget->tqrepaint();
+    m_curvesWidget->repaint();
     slotEffect();
     m_histogramWidget->reset();
 }
@@ -503,16 +503,16 @@ void AdjustCurvesTool::slotChannelChanged(int channel)
 
     m_curveType->setButton(m_curvesWidget->curves()->getCurveType(channel));
 
-    m_curvesWidget->tqrepaint(false);
-    m_histogramWidget->tqrepaint(false);
+    m_curvesWidget->repaint(false);
+    m_histogramWidget->repaint(false);
 }
 
 void AdjustCurvesTool::slotScaleChanged(int scale)
 {
     m_curvesWidget->m_scaleType    = scale;
     m_histogramWidget->m_scaleType = scale;
-    m_histogramWidget->tqrepaint(false);
-    m_curvesWidget->tqrepaint(false);
+    m_histogramWidget->repaint(false);
+    m_curvesWidget->repaint(false);
 }
 
 void AdjustCurvesTool::slotCurveTypeChanged(int type)
@@ -550,13 +550,13 @@ void AdjustCurvesTool::readSettings()
     for (int i = 0 ; i < 5 ; i++)
     {
         m_curvesWidget->curves()->curvesChannelReset(i);
-        m_curvesWidget->curves()->setCurveType(i, (ImageCurves::CurveType)config->readNumEntry(TQString("CurveTypeChannel%1").tqarg(i),
+        m_curvesWidget->curves()->setCurveType(i, (ImageCurves::CurveType)config->readNumEntry(TQString("CurveTypeChannel%1").arg(i),
                                                                                         ImageCurves::CURVE_SMOOTH));
 
         for (int j = 0 ; j < 17 ; j++)
         {
             TQPoint disable(-1, -1);
-            TQPoint p = config->readPointEntry(TQString("CurveAjustmentChannel%1Point%2").tqarg(i).tqarg(j), &disable);
+            TQPoint p = config->readPointEntry(TQString("CurveAjustmentChannel%1Point%2").arg(i).arg(j), &disable);
 
             if (m_originalImage->sixteenBit() && p.x() != -1)
             {
@@ -585,7 +585,7 @@ void AdjustCurvesTool::writeSettings()
 
     for (int i = 0 ; i < 5 ; i++)
     {
-        config->writeEntry(TQString("CurveTypeChannel%1").tqarg(i), m_curvesWidget->curves()->getCurveType(i));
+        config->writeEntry(TQString("CurveTypeChannel%1").arg(i), m_curvesWidget->curves()->getCurveType(i));
 
         for (int j = 0 ; j < 17 ; j++)
         {
@@ -597,7 +597,7 @@ void AdjustCurvesTool::writeSettings()
                 p.setY(p.y()/255);
             }
 
-            config->writeEntry(TQString("CurveAjustmentChannel%1Point%2").tqarg(i).tqarg(j), p);
+            config->writeEntry(TQString("CurveAjustmentChannel%1Point%2").arg(i).arg(j), p);
         }
     }
 
diff --git a/digikam/imageplugins/adjustlevels/adjustlevels.cpp b/digikam/imageplugins/adjustlevels/adjustlevels.cpp
index c827e35d..0ae9dc9d 100644
--- a/digikam/imageplugins/adjustlevels/adjustlevels.cpp
+++ b/digikam/imageplugins/adjustlevels/adjustlevels.cpp
@@ -27,7 +27,7 @@
 
 // TQt includes.
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcolor.h>
 #include <tqgroupbox.h>
 #include <tqhgroupbox.h>
@@ -39,7 +39,7 @@
 #include <tqwhatsthis.h>
 #include <tqtooltip.h>
 #include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqframe.h>
 #include <tqtimer.h>
 #include <tqhbuttongroup.h> 
@@ -126,7 +126,7 @@ AdjustLevelDialog::AdjustLevelDialog(TQWidget* parent)
     TQGridLayout* grid     = new TQGridLayout(gboxSettings, 16, 8, spacingHint(), 0);
 
     TQLabel *label1 = new TQLabel(i18n("Channel:"), gboxSettings);
-    label1->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter );
+    label1->setAlignment ( TQt::AlignRight | TQt::AlignVCenter );
     m_channelCB = new TQComboBox( false, gboxSettings );
     m_channelCB->insertItem( i18n("Luminosity") );
     m_channelCB->insertItem( i18n("Red") );
@@ -676,16 +676,16 @@ void AdjustLevelDialog::slotChannelChanged(int channel)
                   m_levels->getLevelLowOutputValue(channel),
                   m_levels->getLevelHighOutputValue(channel));
 
-    m_levelsHistogramWidget->tqrepaint(false);
-    m_histogramWidget->tqrepaint(false);    
+    m_levelsHistogramWidget->repaint(false);
+    m_histogramWidget->repaint(false);    
 }
 
 void AdjustLevelDialog::slotScaleChanged(int scale)
 {
     m_levelsHistogramWidget->m_scaleType = scale;
     m_histogramWidget->m_scaleType       = scale;
-    m_histogramWidget->tqrepaint(false);
-    m_levelsHistogramWidget->tqrepaint(false);
+    m_histogramWidget->repaint(false);
+    m_levelsHistogramWidget->repaint(false);
 }
 
 void AdjustLevelDialog::readUserSettings()
@@ -700,11 +700,11 @@ void AdjustLevelDialog::readUserSettings()
     {
         bool sb        = m_originalImage.sixteenBit();
         int max        = sb ? 65535 : 255;
-        double gamma   = config->readDoubleNumEntry(TQString("GammaChannel%1").tqarg(i), 1.0);
-        int lowInput   = config->readNumEntry(TQString("LowInputChannel%1").tqarg(i), 0);
-        int lowOutput  = config->readNumEntry(TQString("LowOutputChannel%1").tqarg(i), 0);
-        int highInput  = config->readNumEntry(TQString("HighInputChannel%1").tqarg(i), max);
-        int highOutput = config->readNumEntry(TQString("HighOutputChannel%1").tqarg(i), max);
+        double gamma   = config->readDoubleNumEntry(TQString("GammaChannel%1").arg(i), 1.0);
+        int lowInput   = config->readNumEntry(TQString("LowInputChannel%1").arg(i), 0);
+        int lowOutput  = config->readNumEntry(TQString("LowOutputChannel%1").arg(i), 0);
+        int highInput  = config->readNumEntry(TQString("HighInputChannel%1").arg(i), max);
+        int highOutput = config->readNumEntry(TQString("HighOutputChannel%1").arg(i), max);
     
         m_levels->setLevelGammaValue(i, gamma);
         m_levels->setLevelLowInputValue(i, sb ? lowInput*255 : lowInput);
@@ -742,11 +742,11 @@ void AdjustLevelDialog::writeUserSettings()
         int highInput  = m_levels->getLevelHighInputValue(i);
         int highOutput = m_levels->getLevelHighOutputValue(i);
 
-        config->writeEntry(TQString("GammaChannel%1").tqarg(i), gamma);
-        config->writeEntry(TQString("LowInputChannel%1").tqarg(i), sb ? lowInput/255 : lowInput);
-        config->writeEntry(TQString("LowOutputChannel%1").tqarg(i), sb ? lowOutput/255 : lowOutput);
-        config->writeEntry(TQString("HighInputChannel%1").tqarg(i), sb ? highInput/255 : highInput);
-        config->writeEntry(TQString("HighOutputChannel%1").tqarg(i), sb ? highOutput/255 : highOutput);
+        config->writeEntry(TQString("GammaChannel%1").arg(i), gamma);
+        config->writeEntry(TQString("LowInputChannel%1").arg(i), sb ? lowInput/255 : lowInput);
+        config->writeEntry(TQString("LowOutputChannel%1").arg(i), sb ? lowOutput/255 : lowOutput);
+        config->writeEntry(TQString("HighInputChannel%1").arg(i), sb ? highInput/255 : highInput);
+        config->writeEntry(TQString("HighOutputChannel%1").arg(i), sb ? highOutput/255 : highOutput);
     }
 
     config->sync();
diff --git a/digikam/imageplugins/adjustlevels/adjustlevelstool.cpp b/digikam/imageplugins/adjustlevels/adjustlevelstool.cpp
index 68c79c20..b13cbe63 100644
--- a/digikam/imageplugins/adjustlevels/adjustlevelstool.cpp
+++ b/digikam/imageplugins/adjustlevels/adjustlevelstool.cpp
@@ -34,8 +34,8 @@
 #include <tqhbuttongroup.h>
 #include <tqhgroupbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
-#include <tqlayout.h>
+#include <layout.h>
+#include <layout.h>
 #include <tqpainter.h>
 #include <tqpixmap.h>
 #include <tqpushbutton.h>
@@ -119,7 +119,7 @@ AdjustLevelsTool::AdjustLevelsTool(TQObject* parent)
     TQGridLayout* grid = new TQGridLayout(m_gboxSettings->plainPage(), 20, 6);
 
     TQLabel *label1 = new TQLabel(i18n("Channel:"), m_gboxSettings->plainPage());
-    label1->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter );
+    label1->setAlignment ( TQt::AlignRight | TQt::AlignVCenter );
     m_channelCB = new TQComboBox( false, m_gboxSettings->plainPage() );
     m_channelCB->insertItem( i18n("Luminosity") );
     m_channelCB->insertItem( i18n("Red") );
@@ -658,16 +658,16 @@ void AdjustLevelsTool::slotChannelChanged(int channel)
                   m_levels->getLevelLowOutputValue(channel),
                   m_levels->getLevelHighOutputValue(channel));
 
-    m_levelsHistogramWidget->tqrepaint(false);
-    m_histogramWidget->tqrepaint(false);
+    m_levelsHistogramWidget->repaint(false);
+    m_histogramWidget->repaint(false);
 }
 
 void AdjustLevelsTool::slotScaleChanged(int scale)
 {
     m_levelsHistogramWidget->m_scaleType = scale;
     m_histogramWidget->m_scaleType       = scale;
-    m_histogramWidget->tqrepaint(false);
-    m_levelsHistogramWidget->tqrepaint(false);
+    m_histogramWidget->repaint(false);
+    m_levelsHistogramWidget->repaint(false);
 }
 
 void AdjustLevelsTool::readSettings()
@@ -682,11 +682,11 @@ void AdjustLevelsTool::readSettings()
     {
         bool sb        = m_originalImage->sixteenBit();
         int max        = sb ? 65535 : 255;
-        double gamma   = config->readDoubleNumEntry(TQString("GammaChannel%1").tqarg(i), 1.0);
-        int lowInput   = config->readNumEntry(TQString("LowInputChannel%1").tqarg(i), 0);
-        int lowOutput  = config->readNumEntry(TQString("LowOutputChannel%1").tqarg(i), 0);
-        int highInput  = config->readNumEntry(TQString("HighInputChannel%1").tqarg(i), max);
-        int highOutput = config->readNumEntry(TQString("HighOutputChannel%1").tqarg(i), max);
+        double gamma   = config->readDoubleNumEntry(TQString("GammaChannel%1").arg(i), 1.0);
+        int lowInput   = config->readNumEntry(TQString("LowInputChannel%1").arg(i), 0);
+        int lowOutput  = config->readNumEntry(TQString("LowOutputChannel%1").arg(i), 0);
+        int highInput  = config->readNumEntry(TQString("HighInputChannel%1").arg(i), max);
+        int highOutput = config->readNumEntry(TQString("HighOutputChannel%1").arg(i), max);
 
         m_levels->setLevelGammaValue(i, gamma);
         m_levels->setLevelLowInputValue(i, sb ? lowInput*255 : lowInput);
@@ -724,11 +724,11 @@ void AdjustLevelsTool::writeSettings()
         int highInput  = m_levels->getLevelHighInputValue(i);
         int highOutput = m_levels->getLevelHighOutputValue(i);
 
-        config->writeEntry(TQString("GammaChannel%1").tqarg(i), gamma);
-        config->writeEntry(TQString("LowInputChannel%1").tqarg(i), sb ? lowInput/255 : lowInput);
-        config->writeEntry(TQString("LowOutputChannel%1").tqarg(i), sb ? lowOutput/255 : lowOutput);
-        config->writeEntry(TQString("HighInputChannel%1").tqarg(i), sb ? highInput/255 : highInput);
-        config->writeEntry(TQString("HighOutputChannel%1").tqarg(i), sb ? highOutput/255 : highOutput);
+        config->writeEntry(TQString("GammaChannel%1").arg(i), gamma);
+        config->writeEntry(TQString("LowInputChannel%1").arg(i), sb ? lowInput/255 : lowInput);
+        config->writeEntry(TQString("LowOutputChannel%1").arg(i), sb ? lowOutput/255 : lowOutput);
+        config->writeEntry(TQString("HighInputChannel%1").arg(i), sb ? highInput/255 : highInput);
+        config->writeEntry(TQString("HighOutputChannel%1").arg(i), sb ? highOutput/255 : highOutput);
     }
 
     m_previewWidget->writeSettings();
diff --git a/digikam/imageplugins/antivignetting/antivignettingtool.cpp b/digikam/imageplugins/antivignetting/antivignettingtool.cpp
index f6fafe63..b29d0b3d 100644
--- a/digikam/imageplugins/antivignetting/antivignettingtool.cpp
+++ b/digikam/imageplugins/antivignetting/antivignettingtool.cpp
@@ -26,7 +26,7 @@
 
 #include <tqlabel.h>
 #include <tqwhatsthis.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqimage.h>
 #include <tqpixmap.h>
 #include <tqpainter.h>
@@ -86,7 +86,7 @@ AntiVignettingTool::AntiVignettingTool(TQObject* parent)
     TQGridLayout* grid = new TQGridLayout(m_gboxSettings->plainPage(), 14, 2);
 
     m_maskPreviewLabel = new TQLabel( m_gboxSettings->plainPage() );
-    m_maskPreviewLabel->tqsetAlignment ( TQt::AlignHCenter | TQt::AlignVCenter );
+    m_maskPreviewLabel->setAlignment ( TQt::AlignHCenter | TQt::AlignVCenter );
     TQWhatsThis::add( m_maskPreviewLabel, i18n("<p>You can see here a thumbnail preview of the anti-vignetting "
                                               "mask applied to the image.") );
 
diff --git a/digikam/imageplugins/antivignetting/imageeffect_antivignetting.cpp b/digikam/imageplugins/antivignetting/imageeffect_antivignetting.cpp
index 364ad8bf..d48bdc6e 100644
--- a/digikam/imageplugins/antivignetting/imageeffect_antivignetting.cpp
+++ b/digikam/imageplugins/antivignetting/imageeffect_antivignetting.cpp
@@ -26,7 +26,7 @@
  
 #include <tqlabel.h>
 #include <tqwhatsthis.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqimage.h>
 #include <tqpixmap.h>
 #include <tqpainter.h>
@@ -89,7 +89,7 @@ ImageEffect_AntiVignetting::ImageEffect_AntiVignetting(TQWidget* parent)
     TQGridLayout* gridSettings = new TQGridLayout( gboxSettings, 13, 2, spacingHint());
 
     m_maskPreviewLabel = new TQLabel( gboxSettings );
-    m_maskPreviewLabel->tqsetAlignment ( TQt::AlignHCenter | TQt::AlignVCenter );
+    m_maskPreviewLabel->setAlignment ( TQt::AlignHCenter | TQt::AlignVCenter );
     TQWhatsThis::add( m_maskPreviewLabel, i18n("<p>You can see here a thumbnail preview of the anti-vignetting "
                                               "mask applied to the image.") );
     gridSettings->addMultiCellWidget(m_maskPreviewLabel, 0, 0, 0, 2);
diff --git a/digikam/imageplugins/blurfx/blurfx.cpp b/digikam/imageplugins/blurfx/blurfx.cpp
index a299fcc6..ec5ff30e 100644
--- a/digikam/imageplugins/blurfx/blurfx.cpp
+++ b/digikam/imageplugins/blurfx/blurfx.cpp
@@ -1050,7 +1050,7 @@ void BlurFX::frostGlass(Digikam::DImg *orgImage, Digikam::DImg *destImage, int F
 
     // Randomize.
 
-    TQDateTime dt = TQDateTime::tqcurrentDateTime();
+    TQDateTime dt = TQDateTime::currentDateTime();
     TQDateTime Y2000( TQDate(2000, 1, 1), TQTime(0, 0, 0) );
     uint seed = dt.secsTo(Y2000);
 
diff --git a/digikam/imageplugins/blurfx/blurfxtool.cpp b/digikam/imageplugins/blurfx/blurfxtool.cpp
index 0f6aa41c..83b925bf 100644
--- a/digikam/imageplugins/blurfx/blurfxtool.cpp
+++ b/digikam/imageplugins/blurfx/blurfxtool.cpp
@@ -27,7 +27,7 @@
 #include <tqdatetime.h>
 #include <tqimage.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqslider.h>
 #include <tqwhatsthis.h>
 
diff --git a/digikam/imageplugins/blurfx/imageeffect_blurfx.cpp b/digikam/imageplugins/blurfx/imageeffect_blurfx.cpp
index 0c6bbf2c..32f58dca 100644
--- a/digikam/imageplugins/blurfx/imageeffect_blurfx.cpp
+++ b/digikam/imageplugins/blurfx/imageeffect_blurfx.cpp
@@ -26,7 +26,7 @@
  
 #include <tqlabel.h>
 #include <tqwhatsthis.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqslider.h>
 #include <tqimage.h>
 #include <tqcombobox.h>
diff --git a/digikam/imageplugins/border/bordertool.cpp b/digikam/imageplugins/border/bordertool.cpp
index 5f3d40ed..5a938c9b 100644
--- a/digikam/imageplugins/border/bordertool.cpp
+++ b/digikam/imageplugins/border/bordertool.cpp
@@ -27,7 +27,7 @@
 
 #include <tqcheckbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqwhatsthis.h>
 
 // KDE includes.
diff --git a/digikam/imageplugins/border/imageeffect_border.cpp b/digikam/imageplugins/border/imageeffect_border.cpp
index a2963e43..60679bb3 100644
--- a/digikam/imageplugins/border/imageeffect_border.cpp
+++ b/digikam/imageplugins/border/imageeffect_border.cpp
@@ -27,7 +27,7 @@
  
 #include <tqlabel.h>
 #include <tqwhatsthis.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcombobox.h>
 #include <tqcheckbox.h>
 
diff --git a/digikam/imageplugins/channelmixer/channelmixer.cpp b/digikam/imageplugins/channelmixer/channelmixer.cpp
index ca40bb09..7d48b19f 100644
--- a/digikam/imageplugins/channelmixer/channelmixer.cpp
+++ b/digikam/imageplugins/channelmixer/channelmixer.cpp
@@ -47,7 +47,7 @@
 #include <tqvbox.h>
 #include <tqwhatsthis.h>
 #include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqframe.h>
 #include <tqtimer.h>
 #include <tqcheckbox.h>
@@ -124,7 +124,7 @@ ChannelMixerDialog::ChannelMixerDialog(TQWidget* parent)
     TQGridLayout* grid = new TQGridLayout( gboxSettings, 9, 4, spacingHint());
 
     TQLabel *label1 = new TQLabel(i18n("Channel:"), gboxSettings);
-    label1->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter );
+    label1->setAlignment ( TQt::AlignRight | TQt::AlignVCenter );
     m_channelCB = new TQComboBox( false, gboxSettings );
     m_channelCB->insertItem( i18n("Red") );
     m_channelCB->insertItem( i18n("Green") );
@@ -512,7 +512,7 @@ void ChannelMixerDialog::slotChannelChanged(int channel)
           break;
     }
 
-    m_histogramWidget->tqrepaint(false);
+    m_histogramWidget->repaint(false);
     adjustSliders();
     slotEffect();
 }
@@ -520,7 +520,7 @@ void ChannelMixerDialog::slotChannelChanged(int channel)
 void ChannelMixerDialog::slotScaleChanged(int scale)
 {
     m_histogramWidget->m_scaleType = scale;
-    m_histogramWidget->tqrepaint(false);
+    m_histogramWidget->repaint(false);
 }
 
 void ChannelMixerDialog::readUserSettings()
diff --git a/digikam/imageplugins/channelmixer/channelmixertool.cpp b/digikam/imageplugins/channelmixer/channelmixertool.cpp
index b1d63a4b..ae0fd109 100644
--- a/digikam/imageplugins/channelmixer/channelmixertool.cpp
+++ b/digikam/imageplugins/channelmixer/channelmixertool.cpp
@@ -40,7 +40,7 @@
 #include <tqhbuttongroup.h>
 #include <tqhgroupbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpainter.h>
 #include <tqpushbutton.h>
 #include <tqspinbox.h>
@@ -118,7 +118,7 @@ ChannelMixerTool::ChannelMixerTool(TQObject* parent)
     TQGridLayout* grid = new TQGridLayout(m_gboxSettings->plainPage(), 9, 4);
 
     TQLabel *label1 = new TQLabel(i18n("Channel:"), m_gboxSettings->plainPage());
-    label1->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter );
+    label1->setAlignment ( TQt::AlignRight | TQt::AlignVCenter );
     m_channelCB    = new TQComboBox( false, m_gboxSettings->plainPage() );
     m_channelCB->insertItem( i18n("Red") );
     m_channelCB->insertItem( i18n("Green") );
@@ -504,7 +504,7 @@ void ChannelMixerTool::slotChannelChanged(int channel)
           break;
     }
 
-    m_histogramWidget->tqrepaint(false);
+    m_histogramWidget->repaint(false);
     adjustSliders();
     slotEffect();
 }
@@ -512,7 +512,7 @@ void ChannelMixerTool::slotChannelChanged(int channel)
 void ChannelMixerTool::slotScaleChanged(int scale)
 {
     m_histogramWidget->m_scaleType = scale;
-    m_histogramWidget->tqrepaint(false);
+    m_histogramWidget->repaint(false);
 }
 
 void ChannelMixerTool::readSettings()
diff --git a/digikam/imageplugins/charcoal/charcoaltool.cpp b/digikam/imageplugins/charcoal/charcoaltool.cpp
index 712c252f..cd1f2cac 100644
--- a/digikam/imageplugins/charcoal/charcoaltool.cpp
+++ b/digikam/imageplugins/charcoal/charcoaltool.cpp
@@ -26,7 +26,7 @@
 
 #include <tqlabel.h>
 #include <tqwhatsthis.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 // KDE includes.
 
diff --git a/digikam/imageplugins/charcoal/imageeffect_charcoal.cpp b/digikam/imageplugins/charcoal/imageeffect_charcoal.cpp
index cbfd0467..e6733f0c 100644
--- a/digikam/imageplugins/charcoal/imageeffect_charcoal.cpp
+++ b/digikam/imageplugins/charcoal/imageeffect_charcoal.cpp
@@ -26,7 +26,7 @@
 
 #include <tqlabel.h>
 #include <tqwhatsthis.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 // KDE includes.
 
diff --git a/digikam/imageplugins/colorfx/colorfxtool.cpp b/digikam/imageplugins/colorfx/colorfxtool.cpp
index 7be43586..89d97bd3 100644
--- a/digikam/imageplugins/colorfx/colorfxtool.cpp
+++ b/digikam/imageplugins/colorfx/colorfxtool.cpp
@@ -30,7 +30,7 @@
 #include <tqhbuttongroup.h>
 #include <tqhgroupbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpushbutton.h>
 #include <tqtooltip.h>
 #include <tqvbox.h>
@@ -101,7 +101,7 @@ ColorFXTool::ColorFXTool(TQObject* parent)
     TQGridLayout* gridSettings = new TQGridLayout(gboxSettings->plainPage(), 9, 4);
 
     TQLabel *label1 = new TQLabel(i18n("Channel:"), gboxSettings->plainPage());
-    label1->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter);
+    label1->setAlignment(TQt::AlignRight | TQt::AlignVCenter);
     m_channelCB = new TQComboBox(false, gboxSettings->plainPage());
     m_channelCB->insertItem(i18n("Luminosity"));
     m_channelCB->insertItem(i18n("Red"));
@@ -300,13 +300,13 @@ void ColorFXTool::slotChannelChanged(int channel)
             break;
     }
 
-    m_histogramWidget->tqrepaint(false);
+    m_histogramWidget->repaint(false);
 }
 
 void ColorFXTool::slotScaleChanged(int scale)
 {
     m_histogramWidget->m_scaleType = scale;
-    m_histogramWidget->tqrepaint(false);
+    m_histogramWidget->repaint(false);
 }
 
 void ColorFXTool::slotColorSelectedFromTarget(const DColor &color)
diff --git a/digikam/imageplugins/colorfx/imageeffect_colorfx.cpp b/digikam/imageplugins/colorfx/imageeffect_colorfx.cpp
index 17eadbfc..acdf3dd9 100644
--- a/digikam/imageplugins/colorfx/imageeffect_colorfx.cpp
+++ b/digikam/imageplugins/colorfx/imageeffect_colorfx.cpp
@@ -32,7 +32,7 @@
 #include <tqlabel.h>
 #include <tqpushbutton.h>
 #include <tqwhatsthis.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqframe.h>
 #include <tqvbox.h>
 #include <tqtooltip.h>
@@ -107,7 +107,7 @@ ImageEffect_ColorFX::ImageEffect_ColorFX(TQWidget* parent)
     TQGridLayout* gridSettings = new TQGridLayout( gboxSettings, 9, 4, spacingHint());
 
     TQLabel *label1 = new TQLabel(i18n("Channel:"), gboxSettings);
-    label1->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter );
+    label1->setAlignment ( TQt::AlignRight | TQt::AlignVCenter );
     m_channelCB = new TQComboBox( false, gboxSettings );
     m_channelCB->insertItem( i18n("Luminosity") );
     m_channelCB->insertItem( i18n("Red") );
@@ -290,13 +290,13 @@ void ImageEffect_ColorFX::slotChannelChanged(int channel)
             break;
     }
 
-    m_histogramWidget->tqrepaint(false);
+    m_histogramWidget->repaint(false);
 }
 
 void ImageEffect_ColorFX::slotScaleChanged(int scale)
 {
     m_histogramWidget->m_scaleType = scale;
-    m_histogramWidget->tqrepaint(false);
+    m_histogramWidget->repaint(false);
 }
 
 void ImageEffect_ColorFX::slotColorSelectedFromTarget( const Digikam::DColor &color )
diff --git a/digikam/imageplugins/coreplugin/autocorrectiontool.cpp b/digikam/imageplugins/coreplugin/autocorrectiontool.cpp
index 3928cf36..fd0bcaf0 100644
--- a/digikam/imageplugins/coreplugin/autocorrectiontool.cpp
+++ b/digikam/imageplugins/coreplugin/autocorrectiontool.cpp
@@ -31,7 +31,7 @@
 #include <tqhbuttongroup.h>
 #include <tqhgroupbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlistbox.h>
 #include <tqpushbutton.h>
 #include <tqradiobutton.h>
@@ -101,7 +101,7 @@ AutoCorrectionTool::AutoCorrectionTool(TQObject* parent)
     TQGridLayout* gridSettings = new TQGridLayout(gboxSettings->plainPage(), 2, 4);
 
     TQLabel *label1 = new TQLabel(i18n("Channel:"), gboxSettings->plainPage());
-    label1->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter );
+    label1->setAlignment ( TQt::AlignRight | TQt::AlignVCenter );
     m_channelCB = new TQComboBox( false, gboxSettings->plainPage() );
     m_channelCB->insertItem( i18n("Luminosity") );
     m_channelCB->insertItem( i18n("Red") );
@@ -276,13 +276,13 @@ void AutoCorrectionTool::slotChannelChanged(int channel)
             break;
     }
 
-    m_histogramWidget->tqrepaint(false);
+    m_histogramWidget->repaint(false);
 }
 
 void AutoCorrectionTool::slotScaleChanged(int scale)
 {
     m_histogramWidget->m_scaleType = scale;
-    m_histogramWidget->tqrepaint(false);
+    m_histogramWidget->repaint(false);
 }
 
 void AutoCorrectionTool::slotColorSelectedFromTarget(const DColor& color)
diff --git a/digikam/imageplugins/coreplugin/bcgtool.cpp b/digikam/imageplugins/coreplugin/bcgtool.cpp
index dd944ac9..389cb334 100644
--- a/digikam/imageplugins/coreplugin/bcgtool.cpp
+++ b/digikam/imageplugins/coreplugin/bcgtool.cpp
@@ -33,7 +33,7 @@
 #include <tqhbuttongroup.h>
 #include <tqhgroupbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpushbutton.h>
 #include <tqtooltip.h>
 #include <tqvbox.h>
@@ -100,7 +100,7 @@ BCGTool::BCGTool(TQObject* parent)
     TQGridLayout* gridSettings = new TQGridLayout(m_gboxSettings->plainPage(), 9, 4);
 
     TQLabel *label1 = new TQLabel(i18n("Channel:"), m_gboxSettings->plainPage());
-    label1->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter);
+    label1->setAlignment(TQt::AlignRight | TQt::AlignVCenter);
     m_channelCB = new TQComboBox(false, m_gboxSettings->plainPage());
     m_channelCB->insertItem(i18n("Luminosity"));
     m_channelCB->insertItem(i18n("Red"));
@@ -250,13 +250,13 @@ void BCGTool::slotChannelChanged(int channel)
             break;
     }
 
-    m_histogramWidget->tqrepaint(false);
+    m_histogramWidget->repaint(false);
 }
 
 void BCGTool::slotScaleChanged(int scale)
 {
     m_histogramWidget->m_scaleType = scale;
-    m_histogramWidget->tqrepaint(false);
+    m_histogramWidget->repaint(false);
 }
 
 void BCGTool::slotColorSelectedFromTarget(const DColor &color)
diff --git a/digikam/imageplugins/coreplugin/blurtool.cpp b/digikam/imageplugins/coreplugin/blurtool.cpp
index d9a9d446..ccf4b020 100644
--- a/digikam/imageplugins/coreplugin/blurtool.cpp
+++ b/digikam/imageplugins/coreplugin/blurtool.cpp
@@ -23,7 +23,7 @@
 
 // TQt includes.
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqwhatsthis.h>
 
diff --git a/digikam/imageplugins/coreplugin/bwsepiatool.cpp b/digikam/imageplugins/coreplugin/bwsepiatool.cpp
index 3e7a3e6a..c223eb51 100644
--- a/digikam/imageplugins/coreplugin/bwsepiatool.cpp
+++ b/digikam/imageplugins/coreplugin/bwsepiatool.cpp
@@ -33,10 +33,10 @@
 #include <tqhgroupbox.h>
 #include <tqintdict.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlistbox.h>
 #include <tqpushbutton.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqtimer.h>
 #include <tqtooltip.h>
 #include <tqvbox.h>
@@ -92,7 +92,7 @@ public:
 
     PreviewPixmapFactory(BWSepiaTool* bwSepia);
 
-    void tqinvalidate() { m_previewPixmapMap.clear(); }
+    void invalidate() { m_previewPixmapMap.clear(); }
 
     const TQPixmap* pixmap(int id);
 
@@ -191,7 +191,7 @@ BWSepiaTool::BWSepiaTool(TQObject* parent)
     TQGridLayout* gridSettings = new TQGridLayout(gboxSettings->plainPage(), 4, 4);
 
     TQLabel *label1 = new TQLabel(i18n("Channel:"), gboxSettings->plainPage());
-    label1->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter);
+    label1->setAlignment(TQt::AlignRight | TQt::AlignVCenter);
     m_channelCB = new TQComboBox(false, gboxSettings->plainPage());
     m_channelCB->insertItem(i18n("Luminosity"));
     m_channelCB->insertItem(i18n("Red"));
@@ -607,15 +607,15 @@ void BWSepiaTool::slotChannelChanged(int channel)
             break;
     }
 
-    m_histogramWidget->tqrepaint(false);
+    m_histogramWidget->repaint(false);
 }
 
 void BWSepiaTool::slotScaleChanged(int scale)
 {
     m_histogramWidget->m_scaleType = scale;
-    m_histogramWidget->tqrepaint(false);
+    m_histogramWidget->repaint(false);
     m_curvesWidget->m_scaleType = scale;
-    m_curvesWidget->tqrepaint(false);
+    m_curvesWidget->repaint(false);
 }
 
 void BWSepiaTool::slotSpotColorChanged(const DColor &color)
@@ -651,7 +651,7 @@ void BWSepiaTool::readSettings()
     for (int j = 0 ; j < 17 ; j++)
     {
         TQPoint disable(-1, -1);
-        TQPoint p = config->readPointEntry(TQString("CurveAjustmentPoint%1").tqarg(j), &disable);
+        TQPoint p = config->readPointEntry(TQString("CurveAjustmentPoint%1").arg(j), &disable);
 
         if (m_originalImage->sixteenBit() && p.x() != -1)
         {
@@ -694,7 +694,7 @@ void BWSepiaTool::writeSettings()
             p.setY(p.y()/255);
         }
 
-        config->writeEntry(TQString("CurveAjustmentPoint%1").tqarg(j), p);
+        config->writeEntry(TQString("CurveAjustmentPoint%1").arg(j), p);
     }
 
     m_previewWidget->writeSettings();
@@ -733,7 +733,7 @@ void BWSepiaTool::slotResetSettings()
     m_strengthInput->blockSignals(false);
 
     m_histogramWidget->reset();
-    m_previewPixmapFactory->tqinvalidate();
+    m_previewPixmapFactory->invalidate();
     m_bwFilters->triggerUpdate(false);
     m_bwTone->triggerUpdate(false);
 
@@ -1079,7 +1079,7 @@ void BWSepiaTool::slotLoadSettings()
         {
            KMessageBox::error(kapp->activeWindow(),
                               i18n("\"%1\" is not a Black & White settings text file.")
-                              .tqarg(loadFile.fileName()));
+                              .arg(loadFile.fileName()));
            file.close();
            return;
         }
@@ -1122,7 +1122,7 @@ void BWSepiaTool::slotLoadSettings()
         m_cInput->blockSignals(false);
 
         m_histogramWidget->reset();
-        m_previewPixmapFactory->tqinvalidate();
+        m_previewPixmapFactory->invalidate();
         m_bwFilters->triggerUpdate(false);
         m_bwTone->triggerUpdate(false);
 
diff --git a/digikam/imageplugins/coreplugin/hsl/hsltool.cpp b/digikam/imageplugins/coreplugin/hsl/hsltool.cpp
index b3f610f0..7e5b5da9 100644
--- a/digikam/imageplugins/coreplugin/hsl/hsltool.cpp
+++ b/digikam/imageplugins/coreplugin/hsl/hsltool.cpp
@@ -31,7 +31,7 @@
 #include <tqhbuttongroup.h>
 #include <tqhgroupbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpushbutton.h>
 #include <tqtimer.h>
 #include <tqtooltip.h>
@@ -104,7 +104,7 @@ HSLTool::HSLTool(TQObject* parent)
     TQGridLayout* gridSettings = new TQGridLayout(m_gboxSettings->plainPage(), 11, 4);
 
     TQLabel *label1 = new TQLabel(i18n("Channel:"), m_gboxSettings->plainPage());
-    label1->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter);
+    label1->setAlignment(TQt::AlignRight | TQt::AlignVCenter);
     m_channelCB = new TQComboBox(false, m_gboxSettings->plainPage());
     m_channelCB->insertItem(i18n("Luminosity"));
     m_channelCB->insertItem(i18n("Red"));
@@ -275,13 +275,13 @@ void HSLTool::slotChannelChanged(int channel)
             break;
     }
 
-    m_histogramWidget->tqrepaint(false);
+    m_histogramWidget->repaint(false);
 }
 
 void HSLTool::slotScaleChanged(int scale)
 {
     m_histogramWidget->m_scaleType = scale;
-    m_histogramWidget->tqrepaint(false);
+    m_histogramWidget->repaint(false);
 }
 
 void HSLTool::slotColorSelectedFromTarget( const DColor &color )
diff --git a/digikam/imageplugins/coreplugin/hsl/imageeffect_hsl.cpp b/digikam/imageplugins/coreplugin/hsl/imageeffect_hsl.cpp
index 28cce254..d91d5024 100644
--- a/digikam/imageplugins/coreplugin/hsl/imageeffect_hsl.cpp
+++ b/digikam/imageplugins/coreplugin/hsl/imageeffect_hsl.cpp
@@ -31,7 +31,7 @@
 #include <tqvbox.h>
 #include <tqhbuttongroup.h> 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqframe.h>
 #include <tqlabel.h>
 #include <tqpushbutton.h>
@@ -87,7 +87,7 @@ ImageEffect_HSL::ImageEffect_HSL(TQWidget* parent)
     TQGridLayout* gridSettings = new TQGridLayout(gboxSettings, 11, 4, spacingHint());
 
     TQLabel *label1 = new TQLabel(i18n("Channel:"), gboxSettings);
-    label1->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter );
+    label1->setAlignment ( TQt::AlignRight | TQt::AlignVCenter );
     m_channelCB = new TQComboBox( false, gboxSettings );
     m_channelCB->insertItem( i18n("Luminosity") );
     m_channelCB->insertItem( i18n("Red") );
@@ -262,13 +262,13 @@ void ImageEffect_HSL::slotChannelChanged(int channel)
             break;
     }
 
-    m_histogramWidget->tqrepaint(false);
+    m_histogramWidget->repaint(false);
 }
 
 void ImageEffect_HSL::slotScaleChanged(int scale)
 {
     m_histogramWidget->m_scaleType = scale;
-    m_histogramWidget->tqrepaint(false);
+    m_histogramWidget->repaint(false);
 }
 
 void ImageEffect_HSL::slotColorSelectedFromTarget( const Digikam::DColor &color )
diff --git a/digikam/imageplugins/coreplugin/iccprooftool.cpp b/digikam/imageplugins/coreplugin/iccprooftool.cpp
index 373896db..4175bda4 100644
--- a/digikam/imageplugins/coreplugin/iccprooftool.cpp
+++ b/digikam/imageplugins/coreplugin/iccprooftool.cpp
@@ -34,11 +34,11 @@
 #include <tqhbox.h>
 #include <tqhbuttongroup.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpoint.h>
 #include <tqpushbutton.h>
 #include <tqradiobutton.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqtoolbox.h>
 #include <tqtooltip.h>
 #include <tqvbox.h>
@@ -128,7 +128,7 @@ ICCProofTool::ICCProofTool(TQObject* parent)
     TQGridLayout *gridSettings = new TQGridLayout(m_gboxSettings->plainPage(), 3, 2);
 
     TQLabel *label1 = new TQLabel(i18n("Channel: "), m_gboxSettings->plainPage());
-    label1->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter);
+    label1->setAlignment(TQt::AlignRight | TQt::AlignVCenter);
     m_channelCB = new TQComboBox(false, m_gboxSettings->plainPage());
     m_channelCB->insertItem(i18n("Luminosity"));
     m_channelCB->insertItem(i18n("Red"));
@@ -267,7 +267,7 @@ ICCProofTool::ICCProofTool(TQObject* parent)
                 "specific color.</li></ul>"));
 
     KURLLabel *lcmsLogoLabel = new KURLLabel(generalOptions);
-    lcmsLogoLabel->tqsetAlignment(AlignTop | AlignRight);
+    lcmsLogoLabel->setAlignment(AlignTop | AlignRight);
     lcmsLogoLabel->setText(TQString());
     lcmsLogoLabel->setURL("http://www.littlecms.com");
     KGlobal::dirs()->addResourceType("logo-lcms", KGlobal::dirs()->kde_default("data") + "digikam/data");
@@ -594,7 +594,7 @@ void ICCProofTool::readSettings()
     for (int j = 0 ; j < 17 ; j++)
     {
         TQPoint disable(-1, -1);
-        TQPoint p = config->readPointEntry(TQString("CurveAjustmentPoint%1").tqarg(j), &disable);
+        TQPoint p = config->readPointEntry(TQString("CurveAjustmentPoint%1").arg(j), &disable);
 
         if (m_originalImage->sixteenBit() && p.x() != -1)
         {
@@ -643,7 +643,7 @@ void ICCProofTool::writeSettings()
             p.setY(p.y() / 255);
         }
 
-        config->writeEntry(TQString("CurveAjustmentPoint%1").tqarg(j), p);
+        config->writeEntry(TQString("CurveAjustmentPoint%1").arg(j), p);
     }
 
     m_previewWidget->writeSettings();
@@ -690,13 +690,13 @@ void ICCProofTool::slotChannelChanged( int channel )
         break;
     }
 
-    m_histogramWidget->tqrepaint(false);
+    m_histogramWidget->repaint(false);
 }
 
 void ICCProofTool::slotScaleChanged(int scale)
 {
     m_histogramWidget->m_scaleType = scale;
-    m_histogramWidget->tqrepaint(false);
+    m_histogramWidget->repaint(false);
 }
 
 void ICCProofTool::slotResetSettings()
@@ -1202,7 +1202,7 @@ void ICCProofTool::slotLoadSettings()
         {
             KMessageBox::error(kapp->activeWindow(),
                                i18n("\"%1\" is not a Color Management settings text file.")
-                               .tqarg(loadColorManagementFile.fileName()));
+                               .arg(loadColorManagementFile.fileName()));
             file.close();
             return;
         }
diff --git a/digikam/imageplugins/coreplugin/imageeffect_autocorrection.cpp b/digikam/imageplugins/coreplugin/imageeffect_autocorrection.cpp
index ba1a7323..3b055994 100644
--- a/digikam/imageplugins/coreplugin/imageeffect_autocorrection.cpp
+++ b/digikam/imageplugins/coreplugin/imageeffect_autocorrection.cpp
@@ -32,7 +32,7 @@
 #include <tqvgroupbox.h>
 #include <tqhbuttongroup.h> 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqframe.h>
 #include <tqtimer.h>
 #include <tqvbox.h>
@@ -94,7 +94,7 @@ ImageEffect_AutoCorrection::ImageEffect_AutoCorrection(TQWidget* parent)
     TQGridLayout* gridSettings = new TQGridLayout( gboxSettings, 4, 4, spacingHint());
 
     TQLabel *label1 = new TQLabel(i18n("Channel:"), gboxSettings);
-    label1->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter );
+    label1->setAlignment ( TQt::AlignRight | TQt::AlignVCenter );
     m_channelCB = new TQComboBox( false, gboxSettings );
     m_channelCB->insertItem( i18n("Luminosity") );
     m_channelCB->insertItem( i18n("Red") );
@@ -272,13 +272,13 @@ void ImageEffect_AutoCorrection::slotChannelChanged(int channel)
             break;
     }
 
-    m_histogramWidget->tqrepaint(false);
+    m_histogramWidget->repaint(false);
 }
 
 void ImageEffect_AutoCorrection::slotScaleChanged(int scale)
 {
     m_histogramWidget->m_scaleType = scale;
-    m_histogramWidget->tqrepaint(false);
+    m_histogramWidget->repaint(false);
 }
 
 void ImageEffect_AutoCorrection::slotColorSelectedFromTarget( const Digikam::DColor &color )
diff --git a/digikam/imageplugins/coreplugin/imageeffect_bcg.cpp b/digikam/imageplugins/coreplugin/imageeffect_bcg.cpp
index ee4e293c..6c896c64 100644
--- a/digikam/imageplugins/coreplugin/imageeffect_bcg.cpp
+++ b/digikam/imageplugins/coreplugin/imageeffect_bcg.cpp
@@ -32,7 +32,7 @@
 #include <tqhbuttongroup.h> 
 #include <tqlabel.h>
 #include <tqvbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqframe.h>
 #include <tqlabel.h>
 #include <tqpushbutton.h>
@@ -87,7 +87,7 @@ ImageEffect_BCG::ImageEffect_BCG(TQWidget* parent)
     TQGridLayout* gridSettings = new TQGridLayout( gboxSettings, 9, 4, spacingHint());
 
     TQLabel *label1 = new TQLabel(i18n("Channel:"), gboxSettings);
-    label1->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter );
+    label1->setAlignment ( TQt::AlignRight | TQt::AlignVCenter );
     m_channelCB = new TQComboBox( false, gboxSettings );
     m_channelCB->insertItem( i18n("Luminosity") );
     m_channelCB->insertItem( i18n("Red") );
@@ -240,13 +240,13 @@ void ImageEffect_BCG::slotChannelChanged(int channel)
             break;
     }
 
-    m_histogramWidget->tqrepaint(false);
+    m_histogramWidget->repaint(false);
 }
 
 void ImageEffect_BCG::slotScaleChanged(int scale)
 {
     m_histogramWidget->m_scaleType = scale;
-    m_histogramWidget->tqrepaint(false);
+    m_histogramWidget->repaint(false);
 }
 
 void ImageEffect_BCG::slotColorSelectedFromTarget( const Digikam::DColor &color )
diff --git a/digikam/imageplugins/coreplugin/imageeffect_blur.cpp b/digikam/imageplugins/coreplugin/imageeffect_blur.cpp
index 233dc46e..4a8572a8 100644
--- a/digikam/imageplugins/coreplugin/imageeffect_blur.cpp
+++ b/digikam/imageplugins/coreplugin/imageeffect_blur.cpp
@@ -23,7 +23,7 @@
 
 // TQt includes.
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqwhatsthis.h>
 
diff --git a/digikam/imageplugins/coreplugin/imageeffect_bwsepia.cpp b/digikam/imageplugins/coreplugin/imageeffect_bwsepia.cpp
index 2dcff0b2..3c9df3ec 100644
--- a/digikam/imageplugins/coreplugin/imageeffect_bwsepia.cpp
+++ b/digikam/imageplugins/coreplugin/imageeffect_bwsepia.cpp
@@ -31,7 +31,7 @@
 #include <tqhbuttongroup.h> 
 #include <tqlistbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqframe.h>
 #include <tqlabel.h>
 #include <tqpushbutton.h>
@@ -40,7 +40,7 @@
 #include <tqwhatsthis.h>
 #include <tqtooltip.h>
 #include <tqintdict.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqfile.h>
 #include <tqvbox.h>
 
@@ -85,7 +85,7 @@ public:
 
     PreviewPixmapFactory(ImageEffect_BWSepia* bwSepia);
 
-    void tqinvalidate() { m_previewPixmapMap.clear(); }
+    void invalidate() { m_previewPixmapMap.clear(); }
 
     const TQPixmap* pixmap(int id);
 
@@ -189,7 +189,7 @@ ImageEffect_BWSepia::ImageEffect_BWSepia(TQWidget* parent)
     TQGridLayout* gridSettings = new TQGridLayout( gboxSettings, 4, 4, spacingHint());
 
     TQLabel *label1 = new TQLabel(i18n("Channel:"), gboxSettings);
-    label1->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter );
+    label1->setAlignment ( TQt::AlignRight | TQt::AlignVCenter );
     m_channelCB = new TQComboBox( false, gboxSettings );
     m_channelCB->insertItem( i18n("Luminosity") );
     m_channelCB->insertItem( i18n("Red") );
@@ -611,15 +611,15 @@ void ImageEffect_BWSepia::slotChannelChanged(int channel)
             break;
     }
 
-    m_histogramWidget->tqrepaint(false);
+    m_histogramWidget->repaint(false);
 }
 
 void ImageEffect_BWSepia::slotScaleChanged(int scale)
 {
     m_histogramWidget->m_scaleType = scale;
-    m_histogramWidget->tqrepaint(false);
+    m_histogramWidget->repaint(false);
     m_curvesWidget->m_scaleType = scale;
-    m_curvesWidget->tqrepaint(false);
+    m_curvesWidget->repaint(false);
 }
 
 void ImageEffect_BWSepia::slotSpotColorChanged(const Digikam::DColor &color)
@@ -655,7 +655,7 @@ void ImageEffect_BWSepia::readUserSettings()
     for (int j = 0 ; j < 17 ; j++)
     {
         TQPoint disable(-1, -1);
-        TQPoint p = config->readPointEntry(TQString("CurveAjustmentPoint%1").tqarg(j), &disable);
+        TQPoint p = config->readPointEntry(TQString("CurveAjustmentPoint%1").arg(j), &disable);
 
         if (m_originalImage->sixteenBit() && p.x() != -1)
         {
@@ -697,7 +697,7 @@ void ImageEffect_BWSepia::writeUserSettings()
             p.setY(p.y()/255);
         }
 
-        config->writeEntry(TQString("CurveAjustmentPoint%1").tqarg(j), p);
+        config->writeEntry(TQString("CurveAjustmentPoint%1").arg(j), p);
     }
 
     config->sync();
@@ -729,7 +729,7 @@ void ImageEffect_BWSepia::resetValues()
     m_strengthInput->blockSignals(false);
 
     m_histogramWidget->reset();
-    m_previewPixmapFactory->tqinvalidate();
+    m_previewPixmapFactory->invalidate();
     m_bwFilters->triggerUpdate(false);
     m_bwTone->triggerUpdate(false);
 }
@@ -791,7 +791,7 @@ void ImageEffect_BWSepia::slotTimer()
     Digikam::ImageDlgBase::slotTimer();
     if (m_previewPixmapFactory && m_bwFilters && m_bwTone) 
     {
-        m_previewPixmapFactory->tqinvalidate();
+        m_previewPixmapFactory->invalidate();
         m_bwFilters->triggerUpdate(false);
         m_bwTone->triggerUpdate(false);
     }
@@ -1085,7 +1085,7 @@ void ImageEffect_BWSepia::slotUser3()
         {
            KMessageBox::error(this, 
                         i18n("\"%1\" is not a Black & White settings text file.")
-                        .tqarg(loadFile.fileName()));
+                        .arg(loadFile.fileName()));
            file.close();            
            return;
         }
@@ -1128,7 +1128,7 @@ void ImageEffect_BWSepia::slotUser3()
         m_cInput->blockSignals(false);
 
         m_histogramWidget->reset();
-        m_previewPixmapFactory->tqinvalidate();
+        m_previewPixmapFactory->invalidate();
         m_bwFilters->triggerUpdate(false);
         m_bwTone->triggerUpdate(false);     
 
diff --git a/digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp b/digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp
index a1dd583c..6f252a57 100644
--- a/digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp
+++ b/digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp
@@ -31,7 +31,7 @@
 #include <tqhbuttongroup.h>
 #include <tqvbuttongroup.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqframe.h>
 #include <tqpoint.h>
 #include <tqvbox.h>
@@ -44,7 +44,7 @@
 #include <tqradiobutton.h>
 #include <tqfile.h>
 #include <tqtoolbox.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 // KDE includes.
 
@@ -115,7 +115,7 @@ ImageEffect_ICCProof::ImageEffect_ICCProof(TQWidget* parent)
     TQGridLayout *gridSettings = new TQGridLayout( gboxSettings, 3, 2, spacingHint());
 
     TQLabel *label1 = new TQLabel(i18n("Channel: "), gboxSettings);
-    label1->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter);
+    label1->setAlignment(TQt::AlignRight | TQt::AlignVCenter);
     m_channelCB = new TQComboBox(false, gboxSettings);
     m_channelCB->insertItem(i18n("Luminosity"));
     m_channelCB->insertItem(i18n("Red"));
@@ -253,7 +253,7 @@ ImageEffect_ICCProof::ImageEffect_ICCProof(TQWidget* parent)
                 "specific color.</li></ul>"));
 
     KURLLabel *lcmsLogoLabel = new KURLLabel(generalOptions);
-    lcmsLogoLabel->tqsetAlignment( AlignTop | AlignRight );
+    lcmsLogoLabel->setAlignment( AlignTop | AlignRight );
     lcmsLogoLabel->setText(TQString());
     lcmsLogoLabel->setURL("http://www.littlecms.com");
     KGlobal::dirs()->addResourceType("logo-lcms", KGlobal::dirs()->kde_default("data") + "digikam/data");
@@ -584,7 +584,7 @@ void ImageEffect_ICCProof::readUserSettings()
     for (int j = 0 ; j < 17 ; j++)
     {
         TQPoint disable(-1, -1);
-        TQPoint p = config->readPointEntry(TQString("CurveAjustmentPoint%1").tqarg(j), &disable);
+        TQPoint p = config->readPointEntry(TQString("CurveAjustmentPoint%1").arg(j), &disable);
 
         if (m_originalImage->sixteenBit() && p.x() != -1)
         {
@@ -632,7 +632,7 @@ void ImageEffect_ICCProof::writeUserSettings()
             p.setY(p.y()/255);
         }
 
-        config->writeEntry(TQString("CurveAjustmentPoint%1").tqarg(j), p);
+        config->writeEntry(TQString("CurveAjustmentPoint%1").arg(j), p);
     }
 
     config->sync();
@@ -678,13 +678,13 @@ void ImageEffect_ICCProof::slotChannelChanged( int channel )
             break;
     }
 
-    m_histogramWidget->tqrepaint(false);
+    m_histogramWidget->repaint(false);
 }
 
 void ImageEffect_ICCProof::slotScaleChanged( int scale )
 {
     m_histogramWidget->m_scaleType = scale;
-    m_histogramWidget->tqrepaint(false);
+    m_histogramWidget->repaint(false);
 }
 
 void ImageEffect_ICCProof::resetValues()
@@ -1178,7 +1178,7 @@ void ImageEffect_ICCProof::slotUser3()
         {
            KMessageBox::error(this, 
                         i18n("\"%1\" is not a Color Management settings text file.")
-                        .tqarg(loadColorManagementFile.fileName()));
+                        .arg(loadColorManagementFile.fileName()));
            file.close();
            return;
         }
diff --git a/digikam/imageplugins/coreplugin/imageeffect_redeye.cpp b/digikam/imageplugins/coreplugin/imageeffect_redeye.cpp
index 230ae63a..c9439d06 100644
--- a/digikam/imageplugins/coreplugin/imageeffect_redeye.cpp
+++ b/digikam/imageplugins/coreplugin/imageeffect_redeye.cpp
@@ -31,7 +31,7 @@
 #include <tqhbuttongroup.h> 
 #include <tqvbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqframe.h>
 #include <tqlabel.h>
 #include <tqpushbutton.h>
@@ -86,7 +86,7 @@ ImageEffect_RedEye::ImageEffect_RedEye(TQWidget* parent)
     TQGridLayout* gridSettings = new TQGridLayout(gboxSettings, 11, 4, spacingHint());
 
     TQLabel *label1 = new TQLabel(i18n("Channel:"), gboxSettings);
-    label1->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter );
+    label1->setAlignment ( TQt::AlignRight | TQt::AlignVCenter );
     m_channelCB = new TQComboBox( false, gboxSettings );
     m_channelCB->insertItem( i18n("Luminosity") );
     m_channelCB->insertItem( i18n("Red") );
@@ -236,7 +236,7 @@ void ImageEffect_RedEye::slotHSChanged(int h, int s)
     m_VSelector->setHue(h);
     m_VSelector->setSaturation(s);
     m_VSelector->updateContents();
-    m_VSelector->tqrepaint(false);
+    m_VSelector->repaint(false);
     m_VSelector->blockSignals(false);
     slotTimer();
 }
@@ -266,13 +266,13 @@ void ImageEffect_RedEye::slotChannelChanged(int channel)
             break;
     }
 
-    m_histogramWidget->tqrepaint(false);
+    m_histogramWidget->repaint(false);
 }
 
 void ImageEffect_RedEye::slotScaleChanged(int scale)
 {
     m_histogramWidget->m_scaleType = scale;
-    m_histogramWidget->tqrepaint(false);
+    m_histogramWidget->repaint(false);
 }
 
 void ImageEffect_RedEye::slotColorSelectedFromTarget(const Digikam::DColor& color)
diff --git a/digikam/imageplugins/coreplugin/imageeffect_rgb.cpp b/digikam/imageplugins/coreplugin/imageeffect_rgb.cpp
index f8364789..51c17991 100644
--- a/digikam/imageplugins/coreplugin/imageeffect_rgb.cpp
+++ b/digikam/imageplugins/coreplugin/imageeffect_rgb.cpp
@@ -31,7 +31,7 @@
 #include <tqvgroupbox.h>
 #include <tqhbuttongroup.h> 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqframe.h>
 #include <tqvbox.h>
 #include <tqlabel.h>
@@ -85,7 +85,7 @@ ImageEffect_RGB::ImageEffect_RGB(TQWidget* parent)
     TQGridLayout* gridSettings = new TQGridLayout( gboxSettings, 7, 4, spacingHint());
 
     TQLabel *label1 = new TQLabel(i18n("Channel:"), gboxSettings);
-    label1->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter );
+    label1->setAlignment ( TQt::AlignRight | TQt::AlignVCenter );
     m_channelCB = new TQComboBox( false, gboxSettings );
     m_channelCB->insertItem( i18n("Luminosity") );
     m_channelCB->insertItem( i18n("Red") );
@@ -147,13 +147,13 @@ ImageEffect_RGB::ImageEffect_RGB(TQWidget* parent)
     // -------------------------------------------------------------
     
     TQLabel *labelLeft = new TQLabel(i18n("Cyan"), gboxSettings);
-    labelLeft->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter );
+    labelLeft->setAlignment ( TQt::AlignRight | TQt::AlignVCenter );
     m_rSlider = new TQSlider(-100, 100, 1, 0, Qt::Horizontal, gboxSettings, "m_rSlider");
     m_rSlider->setTickmarks(TQSlider::Below);
     m_rSlider->setTickInterval(20);
     TQWhatsThis::add( m_rSlider, i18n("<p>Set here the cyan/red color adjustment of the image."));
     TQLabel *labelRight = new TQLabel(i18n("Red"), gboxSettings);
-    labelRight->tqsetAlignment ( TQt::AlignLeft | TQt::AlignVCenter );
+    labelRight->setAlignment ( TQt::AlignLeft | TQt::AlignVCenter );
     m_rInput = new TQSpinBox(-100, 100, 1, gboxSettings, "m_rInput");
     
     gridSettings->addMultiCellWidget(labelLeft, 3, 3, 0, 0);
@@ -164,13 +164,13 @@ ImageEffect_RGB::ImageEffect_RGB(TQWidget* parent)
     // -------------------------------------------------------------
         
     labelLeft = new TQLabel(i18n("Magenta"), gboxSettings);
-    labelLeft->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter );
+    labelLeft->setAlignment ( TQt::AlignRight | TQt::AlignVCenter );
     m_gSlider = new TQSlider(-100, 100, 1, 0, Qt::Horizontal, gboxSettings, "m_gSlider");
     m_gSlider->setTickmarks(TQSlider::Below);
     m_gSlider->setTickInterval(20);
     TQWhatsThis::add( m_gSlider, i18n("<p>Set here the magenta/green color adjustment of the image."));
     labelRight = new TQLabel(i18n("Green"), gboxSettings);
-    labelRight->tqsetAlignment ( TQt::AlignLeft | TQt::AlignVCenter );
+    labelRight->setAlignment ( TQt::AlignLeft | TQt::AlignVCenter );
     m_gInput = new TQSpinBox(-100, 100, 1, gboxSettings, "m_gInput");
 
     gridSettings->addMultiCellWidget(labelLeft, 4, 4, 0, 0);
@@ -181,13 +181,13 @@ ImageEffect_RGB::ImageEffect_RGB(TQWidget* parent)
     // -------------------------------------------------------------
         
     labelLeft = new TQLabel(i18n("Yellow"), gboxSettings);
-    labelLeft->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter );
+    labelLeft->setAlignment ( TQt::AlignRight | TQt::AlignVCenter );
     m_bSlider = new TQSlider(-100, 100, 1, 0, Qt::Horizontal, gboxSettings, "m_bSlider");
     m_bSlider->setTickmarks(TQSlider::Below);
     m_bSlider->setTickInterval(20);
     TQWhatsThis::add( m_bSlider, i18n("<p>Set here the yellow/blue color adjustment of the image."));
     labelRight = new TQLabel(i18n("Blue"), gboxSettings);
-    labelRight->tqsetAlignment ( TQt::AlignLeft | TQt::AlignVCenter );
+    labelRight->setAlignment ( TQt::AlignLeft | TQt::AlignVCenter );
     m_bInput = new TQSpinBox(-100, 100, 1, gboxSettings, "m_bInput");
     
     gridSettings->addMultiCellWidget(labelLeft, 5, 5, 0, 0);
@@ -278,13 +278,13 @@ void ImageEffect_RGB::slotChannelChanged(int channel)
             break;
     }
 
-    m_histogramWidget->tqrepaint(false);
+    m_histogramWidget->repaint(false);
 }
 
 void ImageEffect_RGB::slotScaleChanged(int scale)
 {
     m_histogramWidget->m_scaleType = scale;
-    m_histogramWidget->tqrepaint(false);
+    m_histogramWidget->repaint(false);
 }
 
 void ImageEffect_RGB::slotColorSelectedFromTarget( const Digikam::DColor &color )
diff --git a/digikam/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.cpp b/digikam/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.cpp
index 553cf869..0e8f1b54 100644
--- a/digikam/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.cpp
+++ b/digikam/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.cpp
@@ -25,7 +25,7 @@
 
 // TQt includes.
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqframe.h>
 #include <tqrect.h>
 #include <tqvgroupbox.h>
@@ -140,11 +140,11 @@ ImageEffect_RatioCrop::ImageEffect_RatioCrop(TQWidget* parent)
     // -------------------------------------------------------------
 
     m_customLabel1 = new TQLabel(i18n("Custom ratio:"), cropSelection);
-    m_customLabel1->tqsetAlignment(AlignLeft|AlignVCenter);
+    m_customLabel1->setAlignment(AlignLeft|AlignVCenter);
     m_customRatioNInput = new KIntSpinBox(1, 10000, 1, 1, 10, cropSelection);
     TQWhatsThis::add( m_customRatioNInput, i18n("<p>Set here the desired custom aspect numerator value."));
     m_customLabel2 = new TQLabel(" : ", cropSelection);
-    m_customLabel2->tqsetAlignment(AlignCenter|AlignVCenter);
+    m_customLabel2->setAlignment(AlignCenter|AlignVCenter);
     m_customRatioDInput = new KIntSpinBox(1, 10000, 1, 1, 10, cropSelection);
     TQWhatsThis::add( m_customRatioDInput, i18n("<p>Set here the desired custom aspect denominator value."));
 
diff --git a/digikam/imageplugins/coreplugin/ratiocrop/imageselectionwidget.cpp b/digikam/imageplugins/coreplugin/ratiocrop/imageselectionwidget.cpp
index c87ef44c..9858ab16 100644
--- a/digikam/imageplugins/coreplugin/ratiocrop/imageselectionwidget.cpp
+++ b/digikam/imageplugins/coreplugin/ratiocrop/imageselectionwidget.cpp
@@ -47,7 +47,7 @@
 #include <tqregion.h>
 #include <tqcolor.h>
 #include <tqpainter.h>
-#include <tqbrush.h>
+#include <brush.h>
 #include <tqpixmap.h>
 #include <tqimage.h>
 #include <tqpen.h>
@@ -332,7 +332,7 @@ void ImageSelectionWidget::setCenterSelection(int centerType)
 
     // Repaint
     updatePixmap();
-    tqrepaint(false);
+    repaint(false);
     regionSelectionChanged();
 }
 
@@ -363,21 +363,21 @@ void ImageSelectionWidget::slotGuideLines(int guideLinesType)
 {
     d->guideLinesType = guideLinesType;
     updatePixmap();
-    tqrepaint(false);
+    repaint(false);
 }
 
 void ImageSelectionWidget::slotChangeGuideColor(const TQColor &color)
 {
     d->guideColor = color;
     updatePixmap();
-    tqrepaint(false);
+    repaint(false);
 }
 
 void ImageSelectionWidget::slotChangeGuideSize(int size)
 {
     d->guideSize = size;
     updatePixmap();
-    tqrepaint(false);
+    repaint(false);
 }
 
 void ImageSelectionWidget::setSelectionOrientation(int orient)
@@ -647,7 +647,7 @@ void ImageSelectionWidget::applyAspectRatio(bool useHeight, bool repaintWidget)
     if (repaintWidget)
     {
         updatePixmap();
-        tqrepaint(false);
+        repaint(false);
     }
 }
 
@@ -673,7 +673,7 @@ void ImageSelectionWidget::regionSelectionMoved()
     normalizeRegion();
 
     updatePixmap();
-    tqrepaint(false);
+    repaint(false);
 
     emit signalSelectionMoved( d->regionSelection );
 }
@@ -717,7 +717,7 @@ void ImageSelectionWidget::updatePixmap()
                                       d->localRegionSelection.bottom() - 7, 8, 8);
 
     // Drawing background and image.
-    d->pixmap->fill(tqcolorGroup().background());
+    d->pixmap->fill(colorGroup().background());
 
     if (d->preview.isNull())
         return;
@@ -1236,7 +1236,7 @@ void ImageSelectionWidget::placeSelection(TQPoint pm, bool symmetric, TQPoint ce
 
     // Repaint
     updatePixmap();
-    tqrepaint(false);
+    repaint(false);
 }
 
 void ImageSelectionWidget::mousePressEvent ( TQMouseEvent * e )
@@ -1302,7 +1302,7 @@ void ImageSelectionWidget::mousePressEvent ( TQMouseEvent * e )
                     d->regionSelection.moveCenter( pmVirtual );
                     normalizeRegion();
                     updatePixmap();
-                    tqrepaint(false);
+                    repaint(false);
                 }
             }
         }
@@ -1346,7 +1346,7 @@ void ImageSelectionWidget::mouseMoveEvent ( TQMouseEvent * e )
             normalizeRegion();
 
             updatePixmap();
-            tqrepaint(false);
+            repaint(false);
         }
         else
         {
diff --git a/digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp b/digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp
index f8a2e383..0ee9fa5b 100644
--- a/digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp
+++ b/digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp
@@ -29,7 +29,7 @@
 #include <tqframe.h>
 #include <tqimage.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqrect.h>
 #include <tqspinbox.h>
 #include <tqtimer.h>
@@ -159,14 +159,14 @@ RatioCropTool::RatioCropTool(TQObject* parent)
     // -------------------------------------------------------------
 
     m_customLabel1 = new TQLabel(i18n("Custom:"), cropSelection);
-    m_customLabel1->tqsetAlignment(AlignLeft|AlignVCenter);
+    m_customLabel1->setAlignment(AlignLeft|AlignVCenter);
     m_customRatioNInput = new RIntNumInput(cropSelection);
     m_customRatioNInput->input()->setRange(1, 10000, 1, false);
     m_customRatioNInput->setDefaultValue(1);
     TQWhatsThis::add( m_customRatioNInput, i18n("<p>Set here the desired custom aspect numerator value."));
 
     m_customLabel2 = new TQLabel(" : ", cropSelection);
-    m_customLabel2->tqsetAlignment(AlignCenter|AlignVCenter);
+    m_customLabel2->setAlignment(AlignCenter|AlignVCenter);
     m_customRatioDInput = new RIntNumInput(cropSelection);
     m_customRatioDInput->input()->setRange(1, 10000, 1, false);
     m_customRatioDInput->setDefaultValue(1);
diff --git a/digikam/imageplugins/coreplugin/redeyetool.cpp b/digikam/imageplugins/coreplugin/redeyetool.cpp
index 563d776e..02f615cc 100644
--- a/digikam/imageplugins/coreplugin/redeyetool.cpp
+++ b/digikam/imageplugins/coreplugin/redeyetool.cpp
@@ -31,7 +31,7 @@
 #include <tqhbuttongroup.h>
 #include <tqvbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqframe.h>
 #include <tqlabel.h>
 #include <tqpushbutton.h>
@@ -101,7 +101,7 @@ RedEyeTool::RedEyeTool(TQObject* parent)
     TQGridLayout* gridSettings = new TQGridLayout(gboxSettings->plainPage(), 11, 4);
 
     TQLabel *label1 = new TQLabel(i18n("Channel:"), gboxSettings->plainPage());
-    label1->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter);
+    label1->setAlignment(TQt::AlignRight | TQt::AlignVCenter);
     m_channelCB = new TQComboBox(false, gboxSettings->plainPage());
     m_channelCB->insertItem(i18n("Luminosity"));
     m_channelCB->insertItem(i18n("Red"));
@@ -248,7 +248,7 @@ void RedEyeTool::slotHSChanged(int h, int s)
     m_VSelector->setHue(h);
     m_VSelector->setSaturation(s);
     m_VSelector->updateContents();
-    m_VSelector->tqrepaint(false);
+    m_VSelector->repaint(false);
     m_VSelector->blockSignals(false);
     slotTimer();
 }
@@ -278,13 +278,13 @@ void RedEyeTool::slotChannelChanged(int channel)
             break;
     }
 
-    m_histogramWidget->tqrepaint(false);
+    m_histogramWidget->repaint(false);
 }
 
 void RedEyeTool::slotScaleChanged(int scale)
 {
     m_histogramWidget->m_scaleType = scale;
-    m_histogramWidget->tqrepaint(false);
+    m_histogramWidget->repaint(false);
 }
 
 void RedEyeTool::slotColorSelectedFromTarget(const DColor& color)
diff --git a/digikam/imageplugins/coreplugin/rgbtool.cpp b/digikam/imageplugins/coreplugin/rgbtool.cpp
index df69f9d7..49f4f4b1 100644
--- a/digikam/imageplugins/coreplugin/rgbtool.cpp
+++ b/digikam/imageplugins/coreplugin/rgbtool.cpp
@@ -31,7 +31,7 @@
 #include <tqhbuttongroup.h>
 #include <tqhgroupbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpushbutton.h>
 #include <tqslider.h>
 #include <tqtooltip.h>
@@ -98,7 +98,7 @@ RGBTool::RGBTool(TQObject* parent)
     TQGridLayout* gridSettings = new TQGridLayout(m_gboxSettings->plainPage(), 7, 4);
 
     TQLabel *label1 = new TQLabel(i18n("Channel:"), m_gboxSettings->plainPage());
-    label1->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter);
+    label1->setAlignment(TQt::AlignRight | TQt::AlignVCenter);
     m_channelCB = new TQComboBox(false, m_gboxSettings->plainPage());
     m_channelCB->insertItem(i18n("Luminosity"));
     m_channelCB->insertItem(i18n("Red"));
@@ -160,13 +160,13 @@ RGBTool::RGBTool(TQObject* parent)
     // -------------------------------------------------------------
 
     TQLabel *labelLeft = new TQLabel(i18n("Cyan"), m_gboxSettings->plainPage());
-    labelLeft->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter );
+    labelLeft->setAlignment ( TQt::AlignRight | TQt::AlignVCenter );
     m_rSlider = new TQSlider(-100, 100, 1, 0, Qt::Horizontal, m_gboxSettings->plainPage(), "m_rSlider");
     m_rSlider->setTickmarks(TQSlider::Below);
     m_rSlider->setTickInterval(20);
     TQWhatsThis::add( m_rSlider, i18n("<p>Set here the cyan/red color adjustment of the image."));
     TQLabel *labelRight = new TQLabel(i18n("Red"), m_gboxSettings->plainPage());
-    labelRight->tqsetAlignment ( TQt::AlignLeft | TQt::AlignVCenter );
+    labelRight->setAlignment ( TQt::AlignLeft | TQt::AlignVCenter );
     m_rInput = new RIntNumInput(m_gboxSettings->plainPage());
     m_rInput->setDefaultValue(0);
     m_rInput->input()->setRange(-100, 100, 1, false);
@@ -179,13 +179,13 @@ RGBTool::RGBTool(TQObject* parent)
     // -------------------------------------------------------------
 
     labelLeft = new TQLabel(i18n("Magenta"), m_gboxSettings->plainPage());
-    labelLeft->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter);
+    labelLeft->setAlignment(TQt::AlignRight | TQt::AlignVCenter);
     m_gSlider = new TQSlider(-100, 100, 1, 0, Qt::Horizontal, m_gboxSettings->plainPage(), "m_gSlider");
     m_gSlider->setTickmarks(TQSlider::Below);
     m_gSlider->setTickInterval(20);
     TQWhatsThis::add( m_gSlider, i18n("<p>Set here the magenta/green color adjustment of the image."));
     labelRight = new TQLabel(i18n("Green"), m_gboxSettings->plainPage());
-    labelRight->tqsetAlignment(TQt::AlignLeft | TQt::AlignVCenter);
+    labelRight->setAlignment(TQt::AlignLeft | TQt::AlignVCenter);
     m_gInput = new RIntNumInput(m_gboxSettings->plainPage());
     m_gInput->setDefaultValue(0);
     m_gInput->input()->setRange(-100, 100, 1, false);
@@ -198,13 +198,13 @@ RGBTool::RGBTool(TQObject* parent)
     // -------------------------------------------------------------
 
     labelLeft = new TQLabel(i18n("Yellow"), m_gboxSettings->plainPage());
-    labelLeft->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter );
+    labelLeft->setAlignment ( TQt::AlignRight | TQt::AlignVCenter );
     m_bSlider = new TQSlider(-100, 100, 1, 0, Qt::Horizontal, m_gboxSettings->plainPage(), "m_bSlider");
     m_bSlider->setTickmarks(TQSlider::Below);
     m_bSlider->setTickInterval(20);
     TQWhatsThis::add( m_bSlider, i18n("<p>Set here the yellow/blue color adjustment of the image."));
     labelRight = new TQLabel(i18n("Blue"), m_gboxSettings->plainPage());
-    labelRight->tqsetAlignment(TQt::AlignLeft | TQt::AlignVCenter);
+    labelRight->setAlignment(TQt::AlignLeft | TQt::AlignVCenter);
     m_bInput = new RIntNumInput(m_gboxSettings->plainPage());
     m_bInput->setDefaultValue(0);
     m_bInput->input()->setRange(-100, 100, 1, false);
@@ -293,13 +293,13 @@ void RGBTool::slotChannelChanged(int channel)
             break;
     }
 
-    m_histogramWidget->tqrepaint(false);
+    m_histogramWidget->repaint(false);
 }
 
 void RGBTool::slotScaleChanged(int scale)
 {
     m_histogramWidget->m_scaleType = scale;
-    m_histogramWidget->tqrepaint(false);
+    m_histogramWidget->repaint(false);
 }
 
 void RGBTool::slotColorSelectedFromTarget(const DColor &color)
diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.cpp b/digikam/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.cpp
index 360eb913..911b00a7 100644
--- a/digikam/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.cpp
+++ b/digikam/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.cpp
@@ -29,7 +29,7 @@
 
 // TQt includes.
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqwhatsthis.h>
 #include <tqcombobox.h>
@@ -648,7 +648,7 @@ void ImageEffect_Sharpen::slotUser3()
         {
             KMessageBox::error(this,
                                i18n("\"%1\" is not a Photograph Refocus settings text file.")
-                               .tqarg(loadRestorationFile.fileName()));
+                               .arg(loadRestorationFile.fileName()));
             file.close();
             return;
         }
diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/sharpentool.cpp b/digikam/imageplugins/coreplugin/sharpnesseditor/sharpentool.cpp
index 68d4ace8..41606698 100644
--- a/digikam/imageplugins/coreplugin/sharpnesseditor/sharpentool.cpp
+++ b/digikam/imageplugins/coreplugin/sharpnesseditor/sharpentool.cpp
@@ -29,7 +29,7 @@
 
 // TQt includes.
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqwhatsthis.h>
 #include <tqwidgetstack.h>
@@ -693,7 +693,7 @@ void SharpenTool::slotLoadSettings()
         {
             KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()),
                                i18n("\"%1\" is not a Photograph Refocus settings text file.")
-                               .tqarg(loadRestorationFile.fileName()));
+                               .arg(loadRestorationFile.fileName()));
             file.close();
             return;
         }
diff --git a/digikam/imageplugins/distortionfx/distortionfx.cpp b/digikam/imageplugins/distortionfx/distortionfx.cpp
index 79f7195d..f1616af9 100644
--- a/digikam/imageplugins/distortionfx/distortionfx.cpp
+++ b/digikam/imageplugins/distortionfx/distortionfx.cpp
@@ -815,7 +815,7 @@ void DistortionFX::tile(Digikam::DImg *orgImage, Digikam::DImg *destImage,
     int Width       = orgImage->width();
     int Height      = orgImage->height();
 
-    TQDateTime dt = TQDateTime::tqcurrentDateTime();
+    TQDateTime dt = TQDateTime::currentDateTime();
     TQDateTime Y2000( TQDate(2000, 1, 1), TQTime(0, 0, 0) );
     uint seed = dt.secsTo(Y2000);
 
diff --git a/digikam/imageplugins/distortionfx/distortionfxtool.cpp b/digikam/imageplugins/distortionfx/distortionfxtool.cpp
index 8dc0fcd8..6299d2f4 100644
--- a/digikam/imageplugins/distortionfx/distortionfxtool.cpp
+++ b/digikam/imageplugins/distortionfx/distortionfxtool.cpp
@@ -30,7 +30,7 @@
 #include <tqframe.h>
 #include <tqimage.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqspinbox.h>
 #include <tqwhatsthis.h>
 
@@ -113,7 +113,7 @@ DistortionFXTool::DistortionFXTool(TQObject* parent)
     m_effectType->insertItem(i18n("Tile"));
     m_effectType->setDefaultItem(DistortionFX::FishEye);
     TQWhatsThis::add( m_effectType, i18n("<p>Here, select the type of effect to apply to the image.<p>"
-                                        "<b>Fish Eyes</b>: warps the photograph around a 3D spherical tqshape to "
+                                        "<b>Fish Eyes</b>: warps the photograph around a 3D spherical shape to "
                                         "reproduce the common photograph 'Fish Eyes' effect.<p>"
                                         "<b>Twirl</b>: spins the photograph to produce a Twirl pattern.<p>"
                                         "<b>Cylinder Hor.</b>: warps the photograph around a horizontal cylinder.<p>"
diff --git a/digikam/imageplugins/distortionfx/imageeffect_distortionfx.cpp b/digikam/imageplugins/distortionfx/imageeffect_distortionfx.cpp
index 926b4672..c88fbdb8 100644
--- a/digikam/imageplugins/distortionfx/imageeffect_distortionfx.cpp
+++ b/digikam/imageplugins/distortionfx/imageeffect_distortionfx.cpp
@@ -29,7 +29,7 @@
  
 #include <tqlabel.h>
 #include <tqwhatsthis.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqframe.h>
 #include <tqimage.h>
 #include <tqspinbox.h>
@@ -117,7 +117,7 @@ ImageEffect_DistortionFX::ImageEffect_DistortionFX(TQWidget* parent)
     m_effectType->insertItem( i18n("Unpolar Coordinates") );    
     m_effectType->insertItem( i18n("Tile") );    
     TQWhatsThis::add( m_effectType, i18n("<p>Here, select the type of effect to apply to the image.<p>"
-                                        "<b>Fish Eyes</b>: warps the photograph around a 3D spherical tqshape to "
+                                        "<b>Fish Eyes</b>: warps the photograph around a 3D spherical shape to "
                                         "reproduce the common photograph 'Fish Eyes' effect.<p>"
                                         "<b>Twirl</b>: spins the photograph to produce a Twirl pattern.<p>"
                                         "<b>Cylinder Hor.</b>: warps the photograph around a horizontal cylinder.<p>"
diff --git a/digikam/imageplugins/emboss/embosstool.cpp b/digikam/imageplugins/emboss/embosstool.cpp
index a73176c3..9e99dc0b 100644
--- a/digikam/imageplugins/emboss/embosstool.cpp
+++ b/digikam/imageplugins/emboss/embosstool.cpp
@@ -26,7 +26,7 @@
 // TQt includes.
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqwhatsthis.h>
 
 // KDE includes.
diff --git a/digikam/imageplugins/emboss/imageeffect_emboss.cpp b/digikam/imageplugins/emboss/imageeffect_emboss.cpp
index 3722d501..620b0bee 100644
--- a/digikam/imageplugins/emboss/imageeffect_emboss.cpp
+++ b/digikam/imageplugins/emboss/imageeffect_emboss.cpp
@@ -27,7 +27,7 @@
 
 #include <tqlabel.h>
 #include <tqwhatsthis.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 // KDE includes.
 
diff --git a/digikam/imageplugins/filmgrain/filmgrain.cpp b/digikam/imageplugins/filmgrain/filmgrain.cpp
index 02bbca8c..57616eb9 100644
--- a/digikam/imageplugins/filmgrain/filmgrain.cpp
+++ b/digikam/imageplugins/filmgrain/filmgrain.cpp
@@ -92,7 +92,7 @@ void FilmGrain::filmgrainImage(Digikam::DImg *orgImage, int Sensibility)
     else
         Shade = 52;
 
-    TQDateTime dt = TQDateTime::tqcurrentDateTime();
+    TQDateTime dt = TQDateTime::currentDateTime();
     TQDateTime Y2000( TQDate(2000, 1, 1), TQTime(0, 0, 0) );
     uint seed = (uint) dt.secsTo(Y2000);
 
diff --git a/digikam/imageplugins/filmgrain/filmgraintool.cpp b/digikam/imageplugins/filmgrain/filmgraintool.cpp
index 46ebea44..f5c31292 100644
--- a/digikam/imageplugins/filmgrain/filmgraintool.cpp
+++ b/digikam/imageplugins/filmgrain/filmgraintool.cpp
@@ -29,7 +29,7 @@
 #include <tqwhatsthis.h>
 #include <tqlcdnumber.h>
 #include <tqslider.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqimage.h>
 
 // KDE includes.
diff --git a/digikam/imageplugins/filmgrain/imageeffect_filmgrain.cpp b/digikam/imageplugins/filmgrain/imageeffect_filmgrain.cpp
index e49ff453..039a1ff4 100644
--- a/digikam/imageplugins/filmgrain/imageeffect_filmgrain.cpp
+++ b/digikam/imageplugins/filmgrain/imageeffect_filmgrain.cpp
@@ -29,7 +29,7 @@
 #include <tqwhatsthis.h>
 #include <tqlcdnumber.h>
 #include <tqslider.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqimage.h>
 
 // KDE includes.
diff --git a/digikam/imageplugins/freerotation/freerotationtool.cpp b/digikam/imageplugins/freerotation/freerotationtool.cpp
index b11c128d..a0e3a011 100644
--- a/digikam/imageplugins/freerotation/freerotationtool.cpp
+++ b/digikam/imageplugins/freerotation/freerotationtool.cpp
@@ -27,7 +27,7 @@
 #include <tqcheckbox.h>
 #include <tqimage.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqwhatsthis.h>
 
 // KDE includes.
@@ -95,11 +95,11 @@ FreeRotationTool::FreeRotationTool(TQObject* parent)
 
     TQLabel *label1  = new TQLabel(i18n("New width:"), m_gboxSettings->plainPage());
     m_newWidthLabel = new TQLabel(temp.setNum( iface.originalWidth()) + i18n(" px"), m_gboxSettings->plainPage());
-    m_newWidthLabel->tqsetAlignment( AlignBottom | AlignRight );
+    m_newWidthLabel->setAlignment( AlignBottom | AlignRight );
 
     TQLabel *label2   = new TQLabel(i18n("New height:"), m_gboxSettings->plainPage());
     m_newHeightLabel = new TQLabel(temp.setNum( iface.originalHeight()) + i18n(" px"), m_gboxSettings->plainPage());
-    m_newHeightLabel->tqsetAlignment( AlignBottom | AlignRight );
+    m_newHeightLabel->setAlignment( AlignBottom | AlignRight );
 
     KSeparator *line = new KSeparator(Qt::Horizontal, m_gboxSettings->plainPage());
 
diff --git a/digikam/imageplugins/freerotation/imageeffect_freerotation.cpp b/digikam/imageplugins/freerotation/imageeffect_freerotation.cpp
index ea2a67f7..08c3ac90 100644
--- a/digikam/imageplugins/freerotation/imageeffect_freerotation.cpp
+++ b/digikam/imageplugins/freerotation/imageeffect_freerotation.cpp
@@ -27,7 +27,7 @@
 #include <tqlabel.h>
 #include <tqcheckbox.h>
 #include <tqwhatsthis.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqimage.h>
 #include <tqcombobox.h>
 
@@ -101,11 +101,11 @@ ImageEffect_FreeRotation::ImageEffect_FreeRotation(TQWidget* parent)
 
     TQLabel *label1 = new TQLabel(i18n("New width:"), gboxSettings);
     m_newWidthLabel = new TQLabel(temp.setNum( iface.originalWidth()) + i18n(" px"), gboxSettings);
-    m_newWidthLabel->tqsetAlignment( AlignBottom | AlignRight );
+    m_newWidthLabel->setAlignment( AlignBottom | AlignRight );
 
     TQLabel *label2 = new TQLabel(i18n("New height:"), gboxSettings);
     m_newHeightLabel = new TQLabel(temp.setNum( iface.originalHeight()) + i18n(" px"), gboxSettings);
-    m_newHeightLabel->tqsetAlignment( AlignBottom | AlignRight );
+    m_newHeightLabel->setAlignment( AlignBottom | AlignRight );
 
     gridSettings->addMultiCellWidget(label1, 0, 0, 0, 0);
     gridSettings->addMultiCellWidget(m_newWidthLabel, 0, 0, 1, 2);
diff --git a/digikam/imageplugins/hotpixels/blackframelistview.cpp b/digikam/imageplugins/hotpixels/blackframelistview.cpp
index 77fd86f1..35fa8f78 100644
--- a/digikam/imageplugins/hotpixels/blackframelistview.cpp
+++ b/digikam/imageplugins/hotpixels/blackframelistview.cpp
@@ -91,7 +91,7 @@ TQString BlackFrameListViewItem::text(int column)const
         {
             // The image size.
             if (!m_imageSize.isEmpty())
-                return (TQString("%1x%2").tqarg(m_imageSize.width()).tqarg(m_imageSize.height())); 
+                return (TQString("%1x%2").arg(m_imageSize.width()).arg(m_imageSize.height())); 
             break;
         }
         case 2:
@@ -122,7 +122,7 @@ void BlackFrameListViewItem::slotParsed(TQValueList<HotPixel> hotPixels)
     m_blackFrameDesc = TQString("<p><b>" + m_blackFrameURL.fileName() + "</b>:<p>");
     TQValueList <HotPixel>::Iterator end(m_hotPixels.end());
     for (TQValueList <HotPixel>::Iterator it = m_hotPixels.begin() ; it != end ; ++it)
-        m_blackFrameDesc.append( TQString("[%1,%2] ").tqarg((*it).x()).tqarg((*it).y()) );
+        m_blackFrameDesc.append( TQString("[%1,%2] ").arg((*it).x()).arg((*it).y()) );
 
     emit parsed(m_hotPixels, m_blackFrameURL);
 }
diff --git a/digikam/imageplugins/hotpixels/hotpixelstool.cpp b/digikam/imageplugins/hotpixels/hotpixelstool.cpp
index 1aece33b..4679fa5b 100644
--- a/digikam/imageplugins/hotpixels/hotpixelstool.cpp
+++ b/digikam/imageplugins/hotpixels/hotpixelstool.cpp
@@ -27,7 +27,7 @@
 
 #include <tqcombobox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqwhatsthis.h>
 #include <tqpushbutton.h>
 #include <tqpointarray.h>
diff --git a/digikam/imageplugins/hotpixels/imageeffect_hotpixels.cpp b/digikam/imageplugins/hotpixels/imageeffect_hotpixels.cpp
index 468a9d3b..4c2ed22e 100644
--- a/digikam/imageplugins/hotpixels/imageeffect_hotpixels.cpp
+++ b/digikam/imageplugins/hotpixels/imageeffect_hotpixels.cpp
@@ -27,7 +27,7 @@
 
 #include <tqcombobox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqwhatsthis.h>
 #include <tqpushbutton.h>
 #include <tqpointarray.h>
diff --git a/digikam/imageplugins/infrared/imageeffect_infrared.cpp b/digikam/imageplugins/infrared/imageeffect_infrared.cpp
index 3ad5f44e..be24ec6d 100644
--- a/digikam/imageplugins/infrared/imageeffect_infrared.cpp
+++ b/digikam/imageplugins/infrared/imageeffect_infrared.cpp
@@ -30,7 +30,7 @@
 #include <tqwhatsthis.h>
 #include <tqlcdnumber.h>
 #include <tqslider.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqdatetime.h> 
 #include <tqcheckbox.h>
 
diff --git a/digikam/imageplugins/infrared/infrared.cpp b/digikam/imageplugins/infrared/infrared.cpp
index 4874df94..fa2983d5 100644
--- a/digikam/imageplugins/infrared/infrared.cpp
+++ b/digikam/imageplugins/infrared/infrared.cpp
@@ -162,7 +162,7 @@ void Infrared::infraredImage(Digikam::DImg *orgImage, int Sensibility, bool Grai
 
         // Create gray grain mask.
 
-        TQDateTime dt = TQDateTime::tqcurrentDateTime();
+        TQDateTime dt = TQDateTime::currentDateTime();
         TQDateTime Y2000( TQDate(2000, 1, 1), TQTime(0, 0, 0) );
         uint seed = ((uint) dt.secsTo(Y2000));
 
diff --git a/digikam/imageplugins/infrared/infraredtool.cpp b/digikam/imageplugins/infrared/infraredtool.cpp
index 0e9de024..37a8fcd2 100644
--- a/digikam/imageplugins/infrared/infraredtool.cpp
+++ b/digikam/imageplugins/infrared/infraredtool.cpp
@@ -30,7 +30,7 @@
 #include <tqwhatsthis.h>
 #include <tqlcdnumber.h>
 #include <tqslider.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqdatetime.h>
 #include <tqcheckbox.h>
 
diff --git a/digikam/imageplugins/inpainting/imageeffect_inpainting.cpp b/digikam/imageplugins/inpainting/imageeffect_inpainting.cpp
index 35e477cd..991cf0b0 100644
--- a/digikam/imageplugins/inpainting/imageeffect_inpainting.cpp
+++ b/digikam/imageplugins/inpainting/imageeffect_inpainting.cpp
@@ -35,7 +35,7 @@
 #include <tqpushbutton.h>
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqframe.h>
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
@@ -44,7 +44,7 @@
 #include <tqevent.h>
 #include <tqpixmap.h>
 #include <tqpainter.h>
-#include <tqbrush.h>
+#include <brush.h>
 #include <tqfile.h>
 
 // KDE includes.
@@ -173,7 +173,7 @@ ImageEffect_InPainting_Dialog::ImageEffect_InPainting_Dialog(TQWidget* parent)
     TQToolTip::add(cimgLogoLabel, i18n("Visit CImg library website"));
 
     TQLabel *typeLabel = new TQLabel(i18n("Filtering type:"), firstPage);
-    typeLabel->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter);
+    typeLabel->setAlignment ( TQt::AlignRight | TQt::AlignVCenter);
     m_inpaintingTypeCB = new TQComboBox( false, firstPage );
     m_inpaintingTypeCB->insertItem( i18n("None") );
     m_inpaintingTypeCB->insertItem( i18n("Remove Small Artefact") );
@@ -429,7 +429,7 @@ void ImageEffect_InPainting_Dialog::slotUser3()
         {
            KMessageBox::error(this,
                         i18n("\"%1\" is not a Photograph Inpainting settings text file.")
-                        .tqarg(loadInpaintingFile.fileName()));
+                        .arg(loadInpaintingFile.fileName()));
            file.close();
            return;
         }
diff --git a/digikam/imageplugins/inpainting/inpaintingtool.cpp b/digikam/imageplugins/inpainting/inpaintingtool.cpp
index 94f69b4c..091ba5f7 100644
--- a/digikam/imageplugins/inpainting/inpaintingtool.cpp
+++ b/digikam/imageplugins/inpainting/inpaintingtool.cpp
@@ -30,14 +30,14 @@
 
 // TQt includes.
 
-#include <tqbrush.h>
+#include <brush.h>
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
 #include <tqevent.h>
 #include <tqfile.h>
 #include <tqframe.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpainter.h>
 #include <tqpixmap.h>
 #include <tqpushbutton.h>
@@ -121,7 +121,7 @@ InPaintingTool::InPaintingTool(TQObject* parent)
     TQToolTip::add(cimgLogoLabel, i18n("Visit CImg library website"));
 
     TQLabel *typeLabel = new TQLabel(i18n("Filtering type:"), firstPage);
-    typeLabel->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter);
+    typeLabel->setAlignment ( TQt::AlignRight | TQt::AlignVCenter);
     m_inpaintingTypeCB = new TQComboBox( false, firstPage );
     m_inpaintingTypeCB->insertItem( i18n("None") );
     m_inpaintingTypeCB->insertItem( i18n("Remove Small Artefact") );
@@ -394,7 +394,7 @@ void InPaintingTool::slotLoadSettings()
         {
            KMessageBox::error(kapp->activeWindow(),
                         i18n("\"%1\" is not a Photograph Inpainting settings text file.")
-                        .tqarg(loadInpaintingFile.fileName()));
+                        .arg(loadInpaintingFile.fileName()));
            file.close();
            return;
         }
diff --git a/digikam/imageplugins/inserttext/fontchooserwidget.cpp b/digikam/imageplugins/inserttext/fontchooserwidget.cpp
index 8f13082f..bd089fd5 100644
--- a/digikam/imageplugins/inserttext/fontchooserwidget.cpp
+++ b/digikam/imageplugins/inserttext/fontchooserwidget.cpp
@@ -33,7 +33,7 @@
 #include <tqfontdatabase.h>
 #include <tqgroupbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqscrollbar.h>
 #include <tqspinbox.h>
 #include <tqstringlist.h>
@@ -301,8 +301,8 @@ FontChooserWidget::FontChooserWidget(TQWidget *parent, const char *name,
         setSizeIsRelative( *sizeIsRelativeState );
 
     KConfig *config = KGlobal::config();
-    KConfigGroupSaver saver(config, TQString::tqfromLatin1("General"));
-    showXLFDArea(config->readBoolEntry(TQString::tqfromLatin1("fontSelectorShowXLFD"), false));
+    KConfigGroupSaver saver(config, TQString::fromLatin1("General"));
+    showXLFDArea(config->readBoolEntry(TQString::fromLatin1("fontSelectorShowXLFD"), false));
 }
 
 FontChooserWidget::~FontChooserWidget()
@@ -326,7 +326,7 @@ int FontChooserWidget::minimumListWidth( const TQListBox *list )
     }
 
     w += list->frameWidth() * 2;
-    w += list->verticalScrollBar()->tqsizeHint().width();
+    w += list->verticalScrollBar()->sizeHint().width();
     return w;
 }
 
@@ -405,9 +405,9 @@ TQButton::ToggleState FontChooserWidget::sizeIsRelative() const
         : TQButton::NoChange;
 }
 
-TQSize FontChooserWidget::tqsizeHint( void ) const
+TQSize FontChooserWidget::sizeHint( void ) const
 {
-    return tqminimumSizeHint();
+    return minimumSizeHint();
 }
 
 void FontChooserWidget::enableColumn( int column, bool state )
@@ -696,13 +696,13 @@ void FontChooserWidget::addFont( TQStringList &list, const char *xfont )
     if ( !ptr )
         return;
 
-    TQString font = TQString::tqfromLatin1(ptr + 1);
+    TQString font = TQString::fromLatin1(ptr + 1);
 
     int pos;
     if ( ( pos = font.find( '-' ) ) > 0 ) {
         font.truncate( pos );
 
-        if ( font.find( TQString::tqfromLatin1("open look"), 0, false ) >= 0 )
+        if ( font.find( TQString::fromLatin1("open look"), 0, false ) >= 0 )
             return;
 
         TQStringList::Iterator it = list.begin();
diff --git a/digikam/imageplugins/inserttext/fontchooserwidget.h b/digikam/imageplugins/inserttext/fontchooserwidget.h
index b39b7c94..59710465 100644
--- a/digikam/imageplugins/inserttext/fontchooserwidget.h
+++ b/digikam/imageplugins/inserttext/fontchooserwidget.h
@@ -97,7 +97,7 @@ public:
 
     int fontDiffFlags();
     void enableColumn( int column, bool state );
-    virtual TQSize tqsizeHint( void ) const;
+    virtual TQSize sizeHint( void ) const;
 
 signals:
 
diff --git a/digikam/imageplugins/inserttext/imageeffect_inserttext.cpp b/digikam/imageplugins/inserttext/imageeffect_inserttext.cpp
index aa5ed908..9c0a7576 100644
--- a/digikam/imageplugins/inserttext/imageeffect_inserttext.cpp
+++ b/digikam/imageplugins/inserttext/imageeffect_inserttext.cpp
@@ -28,13 +28,13 @@
 #include <tqlabel.h>
 #include <tqpushbutton.h>
 #include <tqwhatsthis.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqframe.h>
 #include <tqcombobox.h>
 #include <tqcheckbox.h>
 #include <tqpixmap.h>
 #include <tqpainter.h>
-#include <tqbrush.h>
+#include <brush.h>
 #include <tqpen.h>
 #include <tqfont.h>
 #include <tqtimer.h> 
@@ -299,19 +299,19 @@ void ImageEffect_InsertText::slotAlignModeChanged(int mode)
     switch (m_alignTextMode)
         {
         case ALIGN_LEFT:
-           m_textEdit->tqsetAlignment( TQt::AlignLeft );
+           m_textEdit->setAlignment( TQt::AlignLeft );
            break;
         
         case ALIGN_RIGHT:
-           m_textEdit->tqsetAlignment( TQt::AlignRight );
+           m_textEdit->setAlignment( TQt::AlignRight );
            break;
 
         case ALIGN_CENTER:
-           m_textEdit->tqsetAlignment( TQt::AlignHCenter );
+           m_textEdit->setAlignment( TQt::AlignHCenter );
            break;
 
         case ALIGN_BLOCK:
-           m_textEdit->tqsetAlignment( TQt::AlignJustify );
+           m_textEdit->setAlignment( TQt::AlignJustify );
            break;
         }
         
diff --git a/digikam/imageplugins/inserttext/inserttexttool.cpp b/digikam/imageplugins/inserttext/inserttexttool.cpp
index d48690a1..71d6c270 100644
--- a/digikam/imageplugins/inserttext/inserttexttool.cpp
+++ b/digikam/imageplugins/inserttext/inserttexttool.cpp
@@ -24,13 +24,13 @@
 
 // TQt includes.
 
-#include <tqbrush.h>
+#include <brush.h>
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
 #include <tqframe.h>
 #include <tqhbuttongroup.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpainter.h>
 #include <tqpen.h>
 #include <tqpixmap.h>
@@ -289,19 +289,19 @@ void InsertTextTool::slotAlignModeChanged(int mode)
     switch (m_alignTextMode)
         {
         case ALIGN_LEFT:
-           m_textEdit->tqsetAlignment( TQt::AlignLeft );
+           m_textEdit->setAlignment( TQt::AlignLeft );
            break;
 
         case ALIGN_RIGHT:
-           m_textEdit->tqsetAlignment( TQt::AlignRight );
+           m_textEdit->setAlignment( TQt::AlignRight );
            break;
 
         case ALIGN_CENTER:
-           m_textEdit->tqsetAlignment( TQt::AlignHCenter );
+           m_textEdit->setAlignment( TQt::AlignHCenter );
            break;
 
         case ALIGN_BLOCK:
-           m_textEdit->tqsetAlignment( TQt::AlignJustify );
+           m_textEdit->setAlignment( TQt::AlignJustify );
            break;
         }
 
diff --git a/digikam/imageplugins/inserttext/inserttextwidget.cpp b/digikam/imageplugins/inserttext/inserttextwidget.cpp
index 82e0789e..0595d23b 100644
--- a/digikam/imageplugins/inserttext/inserttextwidget.cpp
+++ b/digikam/imageplugins/inserttext/inserttextwidget.cpp
@@ -61,7 +61,7 @@ InsertTextWidget::InsertTextWidget(int w, int h, TQWidget *parent)
     m_w      = m_iface->previewWidth();
     m_h      = m_iface->previewHeight();
     m_pixmap = new TQPixmap(w, h);
-    m_pixmap->fill(tqcolorGroup().background());
+    m_pixmap->fill(colorGroup().background());
 
     setBackgroundMode(TQt::NoBackground);
     setMinimumSize(w, h);
@@ -91,7 +91,7 @@ void InsertTextWidget::resetEdit()
     // signal this needs to be filled by makePixmap
     m_textRect = TQRect();
     makePixmap();
-    tqrepaint(false);
+    repaint(false);
 }
 
 void InsertTextWidget::setText(TQString text, TQFont font, TQColor color, int alignMode,
@@ -137,7 +137,7 @@ void InsertTextWidget::setText(TQString text, TQFont font, TQColor color, int al
     m_textFont = font;
 
     makePixmap();
-    tqrepaint(false);
+    repaint(false);
 }
 
 void InsertTextWidget::setPositionHint(TQRect hint)
@@ -146,10 +146,10 @@ void InsertTextWidget::setPositionHint(TQRect hint)
     m_positionHint = hint;
     if (m_textRect.isValid())
     {
-        // tqinvalidate current position so that hint is certainly interpreted
+        // invalidate current position so that hint is certainly interpreted
         m_textRect = TQRect();
         makePixmap();
-        tqrepaint();
+        repaint();
     }
 }
 
@@ -229,7 +229,7 @@ void InsertTextWidget::makePixmap(void)
 
     // paint pixmap for drawing this widget
     // First, fill with background color
-    m_pixmap->fill(tqcolorGroup().background());
+    m_pixmap->fill(colorGroup().background());
     TQPainter p(m_pixmap);
     // Convert image to pixmap and draw it
     TQPixmap imagePixmap = image.convertToPixmap();
@@ -368,7 +368,7 @@ TQRect InsertTextWidget::composeImage(Digikam::DImg *image, TQPainter *destPaint
                 y = TQMAX( (maxHeight - fontHeight) / 2, 0);
             }
 
-            // tqinvalidate position hint, use only once
+            // invalidate position hint, use only once
             m_positionHint = TQRect();
         }
         else
@@ -602,7 +602,7 @@ void InsertTextWidget::mouseMoveEvent ( TQMouseEvent * e )
             m_textRect.moveBy(newxpos - m_xpos, newypos - m_ypos);
 
             makePixmap();
-            tqrepaint(false);
+            repaint(false);
 
             m_xpos = newxpos;
             m_ypos = newypos;
diff --git a/digikam/imageplugins/lensdistortion/imageeffect_lensdistortion.cpp b/digikam/imageplugins/lensdistortion/imageeffect_lensdistortion.cpp
index e645b0a0..e95c50c1 100644
--- a/digikam/imageplugins/lensdistortion/imageeffect_lensdistortion.cpp
+++ b/digikam/imageplugins/lensdistortion/imageeffect_lensdistortion.cpp
@@ -32,10 +32,10 @@
  
 #include <tqlabel.h>
 #include <tqwhatsthis.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpixmap.h>
 #include <tqpainter.h>
-#include <tqbrush.h>
+#include <brush.h>
 #include <tqpen.h>
 
 // KDE includes.
@@ -96,7 +96,7 @@ ImageEffect_LensDistortion::ImageEffect_LensDistortion(TQWidget* parent)
     TQGridLayout* gridSettings = new TQGridLayout( gboxSettings, 8, 1, spacingHint());
     
     m_maskPreviewLabel = new TQLabel( gboxSettings );
-    m_maskPreviewLabel->tqsetAlignment ( TQt::AlignHCenter | TQt::AlignVCenter );
+    m_maskPreviewLabel->setAlignment ( TQt::AlignHCenter | TQt::AlignVCenter );
     TQWhatsThis::add( m_maskPreviewLabel, i18n("<p>You can see here a thumbnail preview of the distortion correction "
                                               "applied to a cross pattern.") );
     gridSettings->addMultiCellWidget(m_maskPreviewLabel, 0, 0, 0, 1);
diff --git a/digikam/imageplugins/lensdistortion/lensdistortiontool.cpp b/digikam/imageplugins/lensdistortion/lensdistortiontool.cpp
index 88e88e5a..7f42b450 100644
--- a/digikam/imageplugins/lensdistortion/lensdistortiontool.cpp
+++ b/digikam/imageplugins/lensdistortion/lensdistortiontool.cpp
@@ -30,9 +30,9 @@
 
 // TQt includes.
 
-#include <tqbrush.h>
+#include <brush.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpainter.h>
 #include <tqpen.h>
 #include <tqpixmap.h>
@@ -90,7 +90,7 @@ LensDistortionTool::LensDistortionTool(TQObject* parent)
     TQGridLayout* grid = new TQGridLayout(m_gboxSettings->plainPage(), 9, 1);
 
     m_maskPreviewLabel = new TQLabel( m_gboxSettings->plainPage() );
-    m_maskPreviewLabel->tqsetAlignment ( TQt::AlignHCenter | TQt::AlignVCenter );
+    m_maskPreviewLabel->setAlignment ( TQt::AlignHCenter | TQt::AlignVCenter );
     TQWhatsThis::add( m_maskPreviewLabel, i18n("<p>You can see here a thumbnail preview of the distortion correction "
                                               "applied to a cross pattern.") );
 
diff --git a/digikam/imageplugins/noisereduction/imageeffect_noisereduction.cpp b/digikam/imageplugins/noisereduction/imageeffect_noisereduction.cpp
index 87caaa3a..102c10d9 100644
--- a/digikam/imageplugins/noisereduction/imageeffect_noisereduction.cpp
+++ b/digikam/imageplugins/noisereduction/imageeffect_noisereduction.cpp
@@ -30,9 +30,9 @@
 #include <tqstring.h>
 #include <tqtabwidget.h>
 #include <tqimage.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 // KDE includes.
 
@@ -492,7 +492,7 @@ void ImageEffect_NoiseReduction::slotUser3()
         {
             KMessageBox::error(this,
                                i18n("\"%1\" is not a Photograph Noise Reduction settings text file.")
-                               .tqarg(loadRestorationFile.fileName()));
+                               .arg(loadRestorationFile.fileName()));
             file.close();
             return;
         }
diff --git a/digikam/imageplugins/noisereduction/noisereductiontool.cpp b/digikam/imageplugins/noisereduction/noisereductiontool.cpp
index c42ca451..042e4fff 100644
--- a/digikam/imageplugins/noisereduction/noisereductiontool.cpp
+++ b/digikam/imageplugins/noisereduction/noisereductiontool.cpp
@@ -27,10 +27,10 @@
 #include <tqfile.h>
 #include <tqimage.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqstring.h>
 #include <tqtabwidget.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
 
@@ -477,7 +477,7 @@ void NoiseReductionTool::slotLoadSettings()
         {
             KMessageBox::error(kapp->activeWindow(),
                                i18n("\"%1\" is not a Photograph Noise Reduction settings text file.")
-                               .tqarg(loadRestorationFile.fileName()));
+                               .arg(loadRestorationFile.fileName()));
             file.close();
             return;
         }
diff --git a/digikam/imageplugins/oilpaint/imageeffect_oilpaint.cpp b/digikam/imageplugins/oilpaint/imageeffect_oilpaint.cpp
index d1e79db1..8ec0672d 100644
--- a/digikam/imageplugins/oilpaint/imageeffect_oilpaint.cpp
+++ b/digikam/imageplugins/oilpaint/imageeffect_oilpaint.cpp
@@ -27,7 +27,7 @@
 #include <tqlabel.h>
 #include <tqwhatsthis.h>
 #include <tqimage.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 // KDE includes.
 
diff --git a/digikam/imageplugins/oilpaint/oilpainttool.cpp b/digikam/imageplugins/oilpaint/oilpainttool.cpp
index 0a280ed9..13b14bc4 100644
--- a/digikam/imageplugins/oilpaint/oilpainttool.cpp
+++ b/digikam/imageplugins/oilpaint/oilpainttool.cpp
@@ -26,7 +26,7 @@
 
 #include <tqimage.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqwhatsthis.h>
 
 // KDE includes.
diff --git a/digikam/imageplugins/perspective/imageeffect_perspective.cpp b/digikam/imageplugins/perspective/imageeffect_perspective.cpp
index 92de5e51..5c37b2c6 100644
--- a/digikam/imageplugins/perspective/imageeffect_perspective.cpp
+++ b/digikam/imageplugins/perspective/imageeffect_perspective.cpp
@@ -29,7 +29,7 @@
 #include <tqspinbox.h>
 #include <tqpushbutton.h>
 #include <tqwhatsthis.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqframe.h>
 #include <tqcheckbox.h>
 
@@ -108,11 +108,11 @@ ImageEffect_Perspective::ImageEffect_Perspective(TQWidget* parent)
 
     TQLabel *label1  = new TQLabel(i18n("New width:"), gbox2);
     m_newWidthLabel = new TQLabel(temp.setNum( iface.originalWidth()) + i18n(" px"), gbox2);
-    m_newWidthLabel->tqsetAlignment( AlignBottom | AlignRight );
+    m_newWidthLabel->setAlignment( AlignBottom | AlignRight );
 
     TQLabel *label2   = new TQLabel(i18n("New height:"), gbox2);
     m_newHeightLabel = new TQLabel(temp.setNum( iface.originalHeight()) + i18n(" px"), gbox2);
-    m_newHeightLabel->tqsetAlignment( AlignBottom | AlignRight );
+    m_newHeightLabel->setAlignment( AlignBottom | AlignRight );
     
     gridLayout->addMultiCellWidget(label1, 0, 0, 0, 0);
     gridLayout->addMultiCellWidget(m_newWidthLabel, 0, 0, 1, 2);
diff --git a/digikam/imageplugins/perspective/perspectivetool.cpp b/digikam/imageplugins/perspective/perspectivetool.cpp
index 714c7482..07497195 100644
--- a/digikam/imageplugins/perspective/perspectivetool.cpp
+++ b/digikam/imageplugins/perspective/perspectivetool.cpp
@@ -27,7 +27,7 @@
 #include <tqcheckbox.h>
 #include <tqframe.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpushbutton.h>
 #include <tqvgroupbox.h>
 #include <tqwhatsthis.h>
@@ -99,11 +99,11 @@ PerspectiveTool::PerspectiveTool(TQObject* parent)
 
     TQLabel *label1  = new TQLabel(i18n("New width:"), m_gboxSettings->plainPage());
     m_newWidthLabel = new TQLabel(temp.setNum( iface.originalWidth()) + i18n(" px"), m_gboxSettings->plainPage());
-    m_newWidthLabel->tqsetAlignment( AlignBottom | AlignRight );
+    m_newWidthLabel->setAlignment( AlignBottom | AlignRight );
 
     TQLabel *label2   = new TQLabel(i18n("New height:"), m_gboxSettings->plainPage());
     m_newHeightLabel = new TQLabel(temp.setNum( iface.originalHeight()) + i18n(" px"), m_gboxSettings->plainPage());
-    m_newHeightLabel->tqsetAlignment( AlignBottom | AlignRight );
+    m_newHeightLabel->setAlignment( AlignBottom | AlignRight );
 
     // -------------------------------------------------------------
 
diff --git a/digikam/imageplugins/perspective/perspectivewidget.cpp b/digikam/imageplugins/perspective/perspectivewidget.cpp
index e3cf6143..029dee4b 100644
--- a/digikam/imageplugins/perspective/perspectivewidget.cpp
+++ b/digikam/imageplugins/perspective/perspectivewidget.cpp
@@ -36,7 +36,7 @@
 #include <tqregion.h>
 #include <tqpainter.h>
 #include <tqpen.h>
-#include <tqbrush.h>
+#include <brush.h>
 #include <tqpixmap.h>
 #include <tqimage.h>
 #include <tqpointarray.h>
@@ -180,7 +180,7 @@ void PerspectiveWidget::reset(void)
 
     m_antiAlias = true;
     updatePixmap();
-    tqrepaint(false);
+    repaint(false);
 }
 
 void PerspectiveWidget::applyPerspectiveAdjustment(void)
@@ -210,7 +210,7 @@ void PerspectiveWidget::slotToggleAntiAliasing(bool a)
 {
     m_antiAlias = a; 
     updatePixmap();
-    tqrepaint(false);
+    repaint(false);
 }
 
 void PerspectiveWidget::slotToggleDrawWhileMoving(bool draw)
@@ -222,21 +222,21 @@ void PerspectiveWidget::slotToggleDrawGrid(bool grid)
 {
     m_drawGrid = grid;
     updatePixmap();
-    tqrepaint(false);
+    repaint(false);
 }
 
 void PerspectiveWidget::slotChangeGuideColor(const TQColor &color)
 {
     m_guideColor = color;
     updatePixmap();
-    tqrepaint(false);
+    repaint(false);
 }
 
 void PerspectiveWidget::slotChangeGuideSize(int size)
 {
     m_guideSize = size;
     updatePixmap();
-    tqrepaint(false);
+    repaint(false);
 }
 
 void PerspectiveWidget::updatePixmap(void)
@@ -270,7 +270,7 @@ void PerspectiveWidget::updatePixmap(void)
 
     // Draw background
 
-    m_pixmap->fill(tqcolorGroup().background());
+    m_pixmap->fill(colorGroup().background());
 
     // if we are resizing with the mouse, compute and draw only if drawWhileMoving is set
     if (m_currentResizing == ResizingNone || m_drawWhileMoving)
@@ -280,7 +280,7 @@ void PerspectiveWidget::updatePixmap(void)
         Digikam::DImg destImage(m_previewImage.width(), m_previewImage.height(),
                                 m_previewImage.sixteenBit(), m_previewImage.hasAlpha());
 
-        Digikam::DColor background(tqcolorGroup().background());
+        Digikam::DColor background(colorGroup().background());
 
         m_transformedCenter = buildPerspective(TQPoint(0, 0), TQPoint(m_w, m_h),
                                                m_topLeftPoint, m_topRightPoint,
@@ -705,7 +705,7 @@ void PerspectiveWidget::mouseReleaseEvent ( TQMouseEvent * e )
         if (!m_drawWhileMoving)
         {
             updatePixmap();
-            tqrepaint(false);
+            repaint(false);
         }
     }
     else
@@ -713,7 +713,7 @@ void PerspectiveWidget::mouseReleaseEvent ( TQMouseEvent * e )
         m_spot.setX(e->x()-m_rect.x());
         m_spot.setY(e->y()-m_rect.y());
         updatePixmap();
-        tqrepaint(false);
+        repaint(false);
     }
 }
 
@@ -818,7 +818,7 @@ void PerspectiveWidget::mouseMoveEvent ( TQMouseEvent * e )
             }
 
             updatePixmap();
-            tqrepaint(false);
+            repaint(false);
         }
     }
     else
diff --git a/digikam/imageplugins/perspective/triangle.cpp b/digikam/imageplugins/perspective/triangle.cpp
index da4fb2cf..84f80a07 100644
--- a/digikam/imageplugins/perspective/triangle.cpp
+++ b/digikam/imageplugins/perspective/triangle.cpp
@@ -4,7 +4,7 @@
  * http://www.digikam.org
  *
  * Date        : 2005-01-18
- * Description : triangle tqgeometry calculation class.
+ * Description : triangle geometry calculation class.
  * 
  * Copyright (C) 2005-2007 by Gilles Caulier <caulier dot gilles at gmail dot com>
  * 
diff --git a/digikam/imageplugins/perspective/triangle.h b/digikam/imageplugins/perspective/triangle.h
index 2754c4cd..27fcc087 100644
--- a/digikam/imageplugins/perspective/triangle.h
+++ b/digikam/imageplugins/perspective/triangle.h
@@ -4,7 +4,7 @@
  * http://www.digikam.org
  *
  * Date        : 2005-01-18
- * Description : triangle tqgeometry calculation class.
+ * Description : triangle geometry calculation class.
  * 
  * Copyright (C) 2005-2007 by Gilles Caulier <caulier dot gilles at gmail dot com>
  * 
diff --git a/digikam/imageplugins/raindrop/imageeffect_raindrop.cpp b/digikam/imageplugins/raindrop/imageeffect_raindrop.cpp
index 3ce021a6..fc33494b 100644
--- a/digikam/imageplugins/raindrop/imageeffect_raindrop.cpp
+++ b/digikam/imageplugins/raindrop/imageeffect_raindrop.cpp
@@ -26,7 +26,7 @@
  
 #include <tqlabel.h>
 #include <tqwhatsthis.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqframe.h>
 #include <tqimage.h>
 
diff --git a/digikam/imageplugins/raindrop/raindrop.cpp b/digikam/imageplugins/raindrop/raindrop.cpp
index bd466d32..db7c8ce6 100644
--- a/digikam/imageplugins/raindrop/raindrop.cpp
+++ b/digikam/imageplugins/raindrop/raindrop.cpp
@@ -164,7 +164,7 @@ void RainDrop::rainDropsImage(Digikam::DImg *orgImage, Digikam::DImg *destImage,
 
     // Randomize.
 
-    TQDateTime dt = TQDateTime::tqcurrentDateTime();
+    TQDateTime dt = TQDateTime::currentDateTime();
     TQDateTime Y2000( TQDate(2000, 1, 1), TQTime(0, 0, 0) );
     uint seed = dt.secsTo(Y2000);
 
diff --git a/digikam/imageplugins/raindrop/raindroptool.cpp b/digikam/imageplugins/raindrop/raindroptool.cpp
index cd89bd12..49e54ef1 100644
--- a/digikam/imageplugins/raindrop/raindroptool.cpp
+++ b/digikam/imageplugins/raindrop/raindroptool.cpp
@@ -27,7 +27,7 @@
 #include <tqframe.h>
 #include <tqimage.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqwhatsthis.h>
 
 // KDE includes.
diff --git a/digikam/imageplugins/restoration/imageeffect_restoration.cpp b/digikam/imageplugins/restoration/imageeffect_restoration.cpp
index 4472ee85..bb786363 100644
--- a/digikam/imageplugins/restoration/imageeffect_restoration.cpp
+++ b/digikam/imageplugins/restoration/imageeffect_restoration.cpp
@@ -27,7 +27,7 @@
 #include <tqlabel.h>
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcombobox.h>
 #include <tqtabwidget.h>
 #include <tqfile.h>
@@ -105,7 +105,7 @@ ImageEffect_Restoration::ImageEffect_Restoration(TQWidget* parent)
     TQToolTip::add(cimgLogoLabel, i18n("Visit CImg library website"));
     
     TQLabel *typeLabel   = new TQLabel(i18n("Filtering type:"), firstPage);
-    typeLabel->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter);
+    typeLabel->setAlignment ( TQt::AlignRight | TQt::AlignVCenter);
     m_restorationTypeCB = new TQComboBox( false, firstPage ); 
     m_restorationTypeCB->insertItem( i18n("None") );
     m_restorationTypeCB->insertItem( i18n("Reduce Uniform Noise") );
@@ -310,7 +310,7 @@ void ImageEffect_Restoration::slotUser3()
         {
            KMessageBox::error(this, 
                         i18n("\"%1\" is not a Photograph Restoration settings text file.")
-                        .tqarg(loadRestorationFile.fileName()));
+                        .arg(loadRestorationFile.fileName()));
            file.close();            
            return;
         }
diff --git a/digikam/imageplugins/restoration/restorationtool.cpp b/digikam/imageplugins/restoration/restorationtool.cpp
index 0d679222..f0bd6a5b 100644
--- a/digikam/imageplugins/restoration/restorationtool.cpp
+++ b/digikam/imageplugins/restoration/restorationtool.cpp
@@ -27,7 +27,7 @@
 #include <tqlabel.h>
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcombobox.h>
 #include <tqtabwidget.h>
 #include <tqfile.h>
@@ -96,7 +96,7 @@ RestorationTool::RestorationTool(TQObject* parent)
     TQToolTip::add(cimgLogoLabel, i18n("Visit CImg library website"));
 
     TQLabel *typeLabel   = new TQLabel(i18n("Filtering type:"), firstPage);
-    typeLabel->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter);
+    typeLabel->setAlignment ( TQt::AlignRight | TQt::AlignVCenter);
     m_restorationTypeCB = new TQComboBox(false, firstPage);
     m_restorationTypeCB->insertItem( i18n("None") );
     m_restorationTypeCB->insertItem( i18n("Reduce Uniform Noise") );
@@ -317,7 +317,7 @@ void RestorationTool::slotLoadSettings()
         {
            KMessageBox::error(kapp->activeWindow(),
                         i18n("\"%1\" is not a Photograph Restoration settings text file.")
-                        .tqarg(loadRestorationFile.fileName()));
+                        .arg(loadRestorationFile.fileName()));
            file.close();
            return;
         }
diff --git a/digikam/imageplugins/sheartool/imageeffect_sheartool.cpp b/digikam/imageplugins/sheartool/imageeffect_sheartool.cpp
index ecd58493..f985f80b 100644
--- a/digikam/imageplugins/sheartool/imageeffect_sheartool.cpp
+++ b/digikam/imageplugins/sheartool/imageeffect_sheartool.cpp
@@ -26,7 +26,7 @@
 #include <tqlabel.h>
 #include <tqcheckbox.h>
 #include <tqwhatsthis.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqimage.h>
 
 // KDE includes.
@@ -101,11 +101,11 @@ ImageEffect_ShearTool::ImageEffect_ShearTool(TQWidget* parent)
     
     TQLabel *label1 = new TQLabel(i18n("New width:"), gboxSettings);
     m_newWidthLabel = new TQLabel(temp.setNum( iface.originalWidth()) + i18n(" px"), gboxSettings);
-    m_newWidthLabel->tqsetAlignment( AlignBottom | AlignRight );
+    m_newWidthLabel->setAlignment( AlignBottom | AlignRight );
     
     TQLabel *label2 = new TQLabel(i18n("New height:"), gboxSettings);
     m_newHeightLabel = new TQLabel(temp.setNum( iface.originalHeight()) + i18n(" px"), gboxSettings);
-    m_newHeightLabel->tqsetAlignment( AlignBottom | AlignRight );
+    m_newHeightLabel->setAlignment( AlignBottom | AlignRight );
 
     gridSettings->addMultiCellWidget(label1, 0, 0, 0, 0);
     gridSettings->addMultiCellWidget(m_newWidthLabel, 0, 0, 1, 2);
diff --git a/digikam/imageplugins/sheartool/sheartool.cpp b/digikam/imageplugins/sheartool/sheartool.cpp
index 95fc3e04..810553f6 100644
--- a/digikam/imageplugins/sheartool/sheartool.cpp
+++ b/digikam/imageplugins/sheartool/sheartool.cpp
@@ -26,7 +26,7 @@
 #include <tqcheckbox.h>
 #include <tqimage.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqwhatsthis.h>
 
 // KDE includes.
@@ -93,11 +93,11 @@ ShearTool::ShearTool(TQObject* parent)
 
     TQLabel *label1 = new TQLabel(i18n("New width:"), m_gboxSettings->plainPage());
     m_newWidthLabel = new TQLabel(temp.setNum( iface.originalWidth()) + i18n(" px"), m_gboxSettings->plainPage());
-    m_newWidthLabel->tqsetAlignment( AlignBottom | AlignRight );
+    m_newWidthLabel->setAlignment( AlignBottom | AlignRight );
 
     TQLabel *label2 = new TQLabel(i18n("New height:"), m_gboxSettings->plainPage());
     m_newHeightLabel = new TQLabel(temp.setNum( iface.originalHeight()) + i18n(" px"), m_gboxSettings->plainPage());
-    m_newHeightLabel->tqsetAlignment( AlignBottom | AlignRight );
+    m_newHeightLabel->setAlignment( AlignBottom | AlignRight );
 
     KSeparator *line = new KSeparator(Qt::Horizontal, m_gboxSettings->plainPage());
 
diff --git a/digikam/imageplugins/superimpose/dirselectwidget.cpp b/digikam/imageplugins/superimpose/dirselectwidget.cpp
index a4be4449..e83a6f3c 100644
--- a/digikam/imageplugins/superimpose/dirselectwidget.cpp
+++ b/digikam/imageplugins/superimpose/dirselectwidget.cpp
@@ -25,7 +25,7 @@
 
 // TQt includes.
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqheader.h>
 #include <tqlistview.h>
 #include <tqdir.h>
diff --git a/digikam/imageplugins/superimpose/imageeffect_superimpose.cpp b/digikam/imageplugins/superimpose/imageeffect_superimpose.cpp
index 6c500f0e..e8bf8faa 100644
--- a/digikam/imageplugins/superimpose/imageeffect_superimpose.cpp
+++ b/digikam/imageplugins/superimpose/imageeffect_superimpose.cpp
@@ -32,7 +32,7 @@
 #include <tqpixmap.h>
 #include <tqwhatsthis.h>
 #include <tqtooltip.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqframe.h>
 #include <tqdir.h>
 #include <tqfile.h>
diff --git a/digikam/imageplugins/superimpose/superimposetool.cpp b/digikam/imageplugins/superimpose/superimposetool.cpp
index 7e1f8a76..a81c692d 100644
--- a/digikam/imageplugins/superimpose/superimposetool.cpp
+++ b/digikam/imageplugins/superimpose/superimposetool.cpp
@@ -32,7 +32,7 @@
 #include <tqpixmap.h>
 #include <tqwhatsthis.h>
 #include <tqtooltip.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqframe.h>
 #include <tqdir.h>
 #include <tqfile.h>
diff --git a/digikam/imageplugins/superimpose/superimposewidget.cpp b/digikam/imageplugins/superimpose/superimposewidget.cpp
index 5f911158..7994db40 100644
--- a/digikam/imageplugins/superimpose/superimposewidget.cpp
+++ b/digikam/imageplugins/superimpose/superimposewidget.cpp
@@ -82,7 +82,7 @@ void SuperImposeWidget::resetEdit(void)
     m_currentSelection = TQRect(m_w/2 - m_rect.width()/2, m_h/2 - m_rect.height()/2, 
                                m_rect.width(), m_rect.height());
     makePixmap();
-    tqrepaint(false);
+    repaint(false);
 }
 
 void SuperImposeWidget::makePixmap(void)
@@ -91,7 +91,7 @@ void SuperImposeWidget::makePixmap(void)
     SuperImpose superimpose(iface.getOriginalImg(), &m_templateScaled, m_currentSelection);
     Digikam::DImg image = superimpose.getTargetImage();
 
-    m_pixmap->fill(tqcolorGroup().background());
+    m_pixmap->fill(colorGroup().background());
     TQPainter p(m_pixmap);
     TQPixmap imagePix = image.convertToPixmap();
     p.drawPixmap(m_rect.x(), m_rect.y(), imagePix, 0, 0, m_rect.width(), m_rect.height());
@@ -128,7 +128,7 @@ void SuperImposeWidget::resizeEvent(TQResizeEvent * e)
     else
     {
         m_rect = TQRect();
-        m_pixmap->fill(tqcolorGroup().background());
+        m_pixmap->fill(colorGroup().background());
     }
 
     blockSignals(false);
@@ -236,7 +236,7 @@ bool SuperImposeWidget::zoomSelection(float deltaZoomFactor)
     m_currentSelection = selection;
 
     makePixmap();
-    tqrepaint(false);
+    repaint(false);
 
     return true;
 }
@@ -297,7 +297,7 @@ void SuperImposeWidget::mouseMoveEvent ( TQMouseEvent * e )
 
                     moveSelection(newxpos - m_xpos, newypos - m_ypos);
                     makePixmap();
-                    tqrepaint(false);
+                    repaint(false);
 
                     m_xpos = newxpos;
                     m_ypos = newypos;
diff --git a/digikam/imageplugins/texture/imageeffect_texture.cpp b/digikam/imageplugins/texture/imageeffect_texture.cpp
index 12fb7c6f..257cc214 100644
--- a/digikam/imageplugins/texture/imageeffect_texture.cpp
+++ b/digikam/imageplugins/texture/imageeffect_texture.cpp
@@ -26,7 +26,7 @@
 
 #include <tqlabel.h>
 #include <tqwhatsthis.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcombobox.h>
 #include <tqimage.h>
 
diff --git a/digikam/imageplugins/texture/texture.cpp b/digikam/imageplugins/texture/texture.cpp
index a056c912..42477d5d 100644
--- a/digikam/imageplugins/texture/texture.cpp
+++ b/digikam/imageplugins/texture/texture.cpp
@@ -100,7 +100,7 @@ void Texture::filterImage(void)
     else
         blendGain = m_blendGain;
 
-    // Make textured transparent tqlayout.
+    // Make textured transparent layout.
 
     for (int x = 0; !m_cancel && x < w; x++)
     {
@@ -139,7 +139,7 @@ void Texture::filterImage(void)
             postProgress(progress);
     }
 
-    // Merge tqlayout and image using overlay method.
+    // Merge layout and image using overlay method.
 
     for (int x = 0; !m_cancel && x < w; x++)
     {
diff --git a/digikam/imageplugins/texture/texturetool.cpp b/digikam/imageplugins/texture/texturetool.cpp
index 0548813f..93180fd7 100644
--- a/digikam/imageplugins/texture/texturetool.cpp
+++ b/digikam/imageplugins/texture/texturetool.cpp
@@ -26,7 +26,7 @@
 
 #include <tqimage.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqwhatsthis.h>
 
 // KDE includes.
diff --git a/digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp b/digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp
index 31bb084a..e7517806 100644
--- a/digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp
+++ b/digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp
@@ -31,14 +31,14 @@
 #include <tqpushbutton.h>
 #include <tqhbuttongroup.h> 
 #include <tqwhatsthis.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqframe.h>
 #include <tqcombobox.h>
 #include <tqtimer.h>
 #include <tqtooltip.h>
 #include <tqpixmap.h>
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqvbox.h>
 
 // KDE includes.
@@ -119,11 +119,11 @@ ImageEffect_WhiteBalance::ImageEffect_WhiteBalance(TQWidget* parent)
     // -------------------------------------------------------------
 
     TQWidget *gboxSettings = new TQWidget(plainPage());
-    TQVBoxLayout* tqlayout2  = new TQVBoxLayout( gboxSettings, spacingHint() );
-    TQGridLayout *grid     = new TQGridLayout( tqlayout2, 2, 4, spacingHint());
+    TQVBoxLayout* layout2  = new TQVBoxLayout( gboxSettings, spacingHint() );
+    TQGridLayout *grid     = new TQGridLayout( layout2, 2, 4, spacingHint());
 
     TQLabel *label1 = new TQLabel(i18n("Channel:"), gboxSettings);
-    label1->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter );
+    label1->setAlignment ( TQt::AlignRight | TQt::AlignVCenter );
     m_channelCB = new TQComboBox( false, gboxSettings );
     m_channelCB->insertItem( i18n("Luminosity") );
     m_channelCB->insertItem( i18n("Red") );
@@ -185,7 +185,7 @@ ImageEffect_WhiteBalance::ImageEffect_WhiteBalance(TQWidget* parent)
     
     // -------------------------------------------------------------
 
-    TQGridLayout *grid2 = new TQGridLayout(tqlayout2, 13, 5, spacingHint());
+    TQGridLayout *grid2 = new TQGridLayout(layout2, 13, 5, spacingHint());
 
     m_temperatureLabel    = new KActiveLabel(i18n("<qt><a href='http://en.wikipedia.org/wiki/Color_temperature'>Color Temperature</a> "
                                                   " (K): </qt>"), gboxSettings);
@@ -563,7 +563,7 @@ void ImageEffect_WhiteBalance::slotColorSelectedFromTarget( const Digikam::DColo
 void ImageEffect_WhiteBalance::slotScaleChanged(int scale)
 {
     m_histogramWidget->m_scaleType = scale;
-    m_histogramWidget->tqrepaint(false);
+    m_histogramWidget->repaint(false);
 }
 
 void ImageEffect_WhiteBalance::slotChannelChanged(int channel)
@@ -591,7 +591,7 @@ void ImageEffect_WhiteBalance::slotChannelChanged(int channel)
           break;
     }
 
-    m_histogramWidget->tqrepaint(false);
+    m_histogramWidget->repaint(false);
 }
 
 void ImageEffect_WhiteBalance::slotAutoAdjustExposure()
@@ -784,7 +784,7 @@ void ImageEffect_WhiteBalance::slotUser3()
         {
            KMessageBox::error(this, 
                         i18n("\"%1\" is not a White Color Balance settings text file.")
-                        .tqarg(loadWhiteBalanceFile.fileName()));
+                        .arg(loadWhiteBalanceFile.fileName()));
            file.close();            
            return;
         }
diff --git a/digikam/imageplugins/whitebalance/whitebalancetool.cpp b/digikam/imageplugins/whitebalance/whitebalancetool.cpp
index 5f01d8a4..f7f25580 100644
--- a/digikam/imageplugins/whitebalance/whitebalancetool.cpp
+++ b/digikam/imageplugins/whitebalance/whitebalancetool.cpp
@@ -31,10 +31,10 @@
 #include <tqhbuttongroup.h>
 #include <tqhgroupbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpixmap.h>
 #include <tqpushbutton.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqtimer.h>
 #include <tqtooltip.h>
 #include <tqvbox.h>
@@ -115,11 +115,11 @@ WhiteBalanceTool::WhiteBalanceTool(TQObject* parent)
                                             EditorToolSettings::Ok|
                                             EditorToolSettings::Cancel);
 
-    TQVBoxLayout* tqlayout2  = new TQVBoxLayout(m_gboxSettings->plainPage(), m_gboxSettings->spacingHint());
-    TQGridLayout *grid     = new TQGridLayout(tqlayout2, 2, 4);
+    TQVBoxLayout* layout2  = new TQVBoxLayout(m_gboxSettings->plainPage(), m_gboxSettings->spacingHint());
+    TQGridLayout *grid     = new TQGridLayout(layout2, 2, 4);
 
     TQLabel *label1 = new TQLabel(i18n("Channel:"), m_gboxSettings->plainPage());
-    label1->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter );
+    label1->setAlignment ( TQt::AlignRight | TQt::AlignVCenter );
     m_channelCB = new TQComboBox( false, m_gboxSettings->plainPage() );
     m_channelCB->insertItem( i18n("Luminosity") );
     m_channelCB->insertItem( i18n("Red") );
@@ -182,7 +182,7 @@ WhiteBalanceTool::WhiteBalanceTool(TQObject* parent)
 
     // -------------------------------------------------------------
 
-    TQGridLayout *grid2 = new TQGridLayout(tqlayout2, 13, 5);
+    TQGridLayout *grid2 = new TQGridLayout(layout2, 13, 5);
 
     m_temperatureLabel    = new KActiveLabel(i18n("<qt><a href='http://en.wikipedia.org/wiki/Color_temperature'>Color Temperature</a> "
                                                   " (K): </qt>"), m_gboxSettings->plainPage());
@@ -568,7 +568,7 @@ void WhiteBalanceTool::slotColorSelectedFromTarget(const DColor& color)
 void WhiteBalanceTool::slotScaleChanged(int scale)
 {
     m_histogramWidget->m_scaleType = scale;
-    m_histogramWidget->tqrepaint(false);
+    m_histogramWidget->repaint(false);
 }
 
 void WhiteBalanceTool::slotChannelChanged(int channel)
@@ -596,7 +596,7 @@ void WhiteBalanceTool::slotChannelChanged(int channel)
           break;
     }
 
-    m_histogramWidget->tqrepaint(false);
+    m_histogramWidget->repaint(false);
 }
 
 void WhiteBalanceTool::slotAutoAdjustExposure()
@@ -794,7 +794,7 @@ void WhiteBalanceTool::slotLoadSettings()
         {
            KMessageBox::error(kapp->activeWindow(),
                         i18n("\"%1\" is not a White Color Balance settings text file.")
-                        .tqarg(loadWhiteBalanceFile.fileName()));
+                        .arg(loadWhiteBalanceFile.fileName()));
            file.close();
            return;
         }