12 files changed, 19 insertions, 19 deletions
diff --git a/digikam/libs/widgets/common/curveswidget.cpp b/digikam/libs/widgets/common/curveswidget.cpp
index d4641164..ac70ee39 100644
--- a/digikam/libs/widgets/common/curveswidget.cpp
+++ b/digikam/libs/widgets/common/curveswidget.cpp
@@ -148,7 +148,7 @@ void CurvesWidget::setup(int w, int h, bool readOnly)
     m_imageHistogram = 0;
 
     setMouseTracking(true);
-    setPaletteBackgroundColor(tqcolorGroup().background());
+    setPaletteBackgroundColor(colorGroup().background());
     setMinimumSize(w, h);
 
     d->blinkTimer = new TQTimer( this );
diff --git a/digikam/libs/widgets/common/dcursortracker.cpp b/digikam/libs/widgets/common/dcursortracker.cpp
index fc820603..2e3ae53a 100644
--- a/digikam/libs/widgets/common/dcursortracker.cpp
+++ b/digikam/libs/widgets/common/dcursortracker.cpp
@@ -103,7 +103,7 @@ DTipTracker::DTipTracker(const TQString& txt, TQWidget *parent)
     setPalette(TQToolTip::palette());
     setFrameStyle(TQFrame::Plain | TQFrame::Box);
     setLineWidth(1);
-    tqsetAlignment(AlignAuto | AlignTop);
+    setAlignment(AlignAuto | AlignTop);
 }
 
 } // namespace Digikam
diff --git a/digikam/libs/widgets/common/dlogoaction.cpp b/digikam/libs/widgets/common/dlogoaction.cpp
index de82a75f..5d0e4008 100644
--- a/digikam/libs/widgets/common/dlogoaction.cpp
+++ b/digikam/libs/widgets/common/dlogoaction.cpp
@@ -62,7 +62,7 @@ int DLogoAction::plug(TQWidget *widget, int index)
         KURLLabel *pixmapLogo = new KURLLabel(Digikam::webProjectUrl(), TQString(), bar);
         pixmapLogo->setMargin(0);
         pixmapLogo->setScaledContents(false);
-        pixmapLogo->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum));
+        pixmapLogo->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum));
         TQToolTip::add(pixmapLogo, i18n("Visit digiKam project website"));
         KGlobal::dirs()->addResourceType("banner-digikam", KGlobal::dirs()->kde_default("data") + "digikam/data");
         TQString directory = KGlobal::dirs()->findResourceDir("banner-digikam", "banner-digikam.png");
diff --git a/digikam/libs/widgets/common/dpopupmenu.cpp b/digikam/libs/widgets/common/dpopupmenu.cpp
index 10bcef09..04b0a5a6 100644
--- a/digikam/libs/widgets/common/dpopupmenu.cpp
+++ b/digikam/libs/widgets/common/dpopupmenu.cpp
@@ -84,7 +84,7 @@ int DPopupMenu::sidePixmapWidth() const
 
 TQRect DPopupMenu::sideImageRect() const
 {
-    return TQStyle::tqvisualRect(TQRect(frameWidth(), frameWidth(),
+    return TQStyle::visualRect(TQRect(frameWidth(), frameWidth(),
                                     s_dpopupmenu_sidePixmap.width(),
                                     height() - 2*frameWidth()),
                               this);
@@ -153,7 +153,7 @@ void DPopupMenu::resizeEvent(TQResizeEvent * e)
 {
     KPopupMenu::resizeEvent(e);
 
-    setFrameRect(TQStyle::tqvisualRect(TQRect(s_dpopupmenu_sidePixmap.width(), 0,
+    setFrameRect(TQStyle::visualRect(TQRect(s_dpopupmenu_sidePixmap.width(), 0,
                                           width() - s_dpopupmenu_sidePixmap.width(), height()), 
                  this ) );
 }
@@ -161,7 +161,7 @@ void DPopupMenu::resizeEvent(TQResizeEvent * e)
 //Workaround TQt3.3.x sizing bug, by ensuring we're always wide enough.
 void DPopupMenu::resize(int width, int height)
 {
-    width = kMax(width, tqmaximumSize().width());
+    width = kMax(width, maximumSize().width());
     KPopupMenu::resize(width, height);
 }
 
@@ -190,7 +190,7 @@ void DPopupMenu::paintEvent(TQPaintEvent* e)
 
     tqstyle().tqdrawPrimitive(TQStyle::PE_PanelPopup, &p,
                           TQRect(0, 0, width(), height()),
-                          tqcolorGroup(), TQStyle::Style_Default,
+                          colorGroup(), TQStyle::Style_Default,
                           TQStyleOption( frameWidth(), 0));
 }
 
diff --git a/digikam/libs/widgets/common/paniconwidget.cpp b/digikam/libs/widgets/common/paniconwidget.cpp
index 7f7fcc3d..cd917f69 100644
--- a/digikam/libs/widgets/common/paniconwidget.cpp
+++ b/digikam/libs/widgets/common/paniconwidget.cpp
@@ -192,7 +192,7 @@ void PanIconWidget::regionSelectionMoved(bool targetDone)
 void PanIconWidget::updatePixmap()
 {
     // Drawing background and image.
-    m_pixmap->fill(tqcolorGroup().background());
+    m_pixmap->fill(colorGroup().background());
     bitBlt(m_pixmap, m_rect.x(), m_rect.y(), &d->image, 0, 0);
     
     TQPainter p(m_pixmap);
diff --git a/digikam/libs/widgets/common/searchtextbar.cpp b/digikam/libs/widgets/common/searchtextbar.cpp
index e7f9e733..30c0c7be 100644
--- a/digikam/libs/widgets/common/searchtextbar.cpp
+++ b/digikam/libs/widgets/common/searchtextbar.cpp
@@ -172,7 +172,7 @@ SearchTextBar::SearchTextBar(TQWidget *parent, const char* name, const TQString
     kcom->setOrder(KCompletion::Sorted);
     d->searchEdit->setCompletionObject(kcom, true);
     d->searchEdit->setAutoDeleteCompletionObject(true);
-    d->searchEdit->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum));
+    d->searchEdit->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum));
 
     hlay->setSpacing(0);
     hlay->setMargin(0);
diff --git a/digikam/libs/widgets/common/splashscreen.cpp b/digikam/libs/widgets/common/splashscreen.cpp
index 8294d974..05ae6206 100644
--- a/digikam/libs/widgets/common/splashscreen.cpp
+++ b/digikam/libs/widgets/common/splashscreen.cpp
@@ -93,7 +93,7 @@ void SplashScreen::setColor(const TQColor& color)
 {
     d->color = color;
 }
-void SplashScreen::tqsetAlignment(int tqalignment)
+void SplashScreen::setAlignment(int tqalignment)
 {
     d->tqalignment = tqalignment;
 }
diff --git a/digikam/libs/widgets/common/splashscreen.h b/digikam/libs/widgets/common/splashscreen.h
index 9845c818..294b360c 100644
--- a/digikam/libs/widgets/common/splashscreen.h
+++ b/digikam/libs/widgets/common/splashscreen.h
@@ -52,7 +52,7 @@ public:
     SplashScreen(const TQString& splash, WFlags f=0);
     virtual ~SplashScreen();
 
-    void tqsetAlignment(int tqalignment);
+    void setAlignment(int tqalignment);
     void setColor(const TQColor& color);
 
 protected:
diff --git a/digikam/libs/widgets/common/squeezedcombobox.cpp b/digikam/libs/widgets/common/squeezedcombobox.cpp
index 470f40f3..ab8163d2 100644
--- a/digikam/libs/widgets/common/squeezedcombobox.cpp
+++ b/digikam/libs/widgets/common/squeezedcombobox.cpp
@@ -89,7 +89,7 @@ SqueezedComboBox::~SqueezedComboBox()
     delete d;
 }
 
-TQSize SqueezedComboBox::tqsizeHint() const
+TQSize SqueezedComboBox::sizeHint() const
 {
     constPolish();
     TQFontMetrics fm = fontMetrics();
@@ -188,7 +188,7 @@ void SqueezedComboBoxTip::maybeTip(const TQPoint &pos)
     TQListBoxItem* selectedItem = listBox->itemAt( pos );
     if (selectedItem)
     {
-        TQRect positionToolTip = listBox->tqitemRect(selectedItem);
+        TQRect positionToolTip = listBox->itemRect(selectedItem);
         TQString toolTipText = m_originalWidget->itemHighlighted();
         if (!toolTipText.isNull())
             tip(positionToolTip, toolTipText);
diff --git a/digikam/libs/widgets/common/squeezedcombobox.h b/digikam/libs/widgets/common/squeezedcombobox.h
index d85b81dc..87bd6910 100644
--- a/digikam/libs/widgets/common/squeezedcombobox.h
+++ b/digikam/libs/widgets/common/squeezedcombobox.h
@@ -100,9 +100,9 @@ public:
     TQString itemHighlighted();
 
     /**
-     * Sets the tqsizeHint() of this widget.
+     * Sets the sizeHint() of this widget.
      */
-    virtual TQSize tqsizeHint() const;
+    virtual TQSize sizeHint() const;
 
 private slots:
 
diff --git a/digikam/libs/widgets/common/statusprogressbar.cpp b/digikam/libs/widgets/common/statusprogressbar.cpp
index 52d33b33..31bcbd53 100644
--- a/digikam/libs/widgets/common/statusprogressbar.cpp
+++ b/digikam/libs/widgets/common/statusprogressbar.cpp
@@ -86,7 +86,7 @@ StatusProgressBar::StatusProgressBar(TQWidget *parent)
     setProgressTotalSteps(100);
     d->cancelButton = new TQPushButton(d->progressWidget);
     d->cancelButton->setFocusPolicy(TQ_NoFocus);
-    d->cancelButton->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) );
+    d->cancelButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) );
     d->cancelButton->setPixmap(SmallIcon("cancel"));
 
     // Parent widget will probably have the wait cursor set.
@@ -115,9 +115,9 @@ void StatusProgressBar::setText(const TQString& text)
     d->textLabel->setText(text);
 }
 
-void StatusProgressBar::tqsetAlignment(int a)
+void StatusProgressBar::setAlignment(int a)
 {
-    d->textLabel->tqsetAlignment(a);
+    d->textLabel->setAlignment(a);
 }
 
 int StatusProgressBar::progressValue()
diff --git a/digikam/libs/widgets/common/statusprogressbar.h b/digikam/libs/widgets/common/statusprogressbar.h
index f4292bbf..0b0866bc 100644
--- a/digikam/libs/widgets/common/statusprogressbar.h
+++ b/digikam/libs/widgets/common/statusprogressbar.h
@@ -58,7 +58,7 @@ public:
     StatusProgressBar(TQWidget *parent=0);
     ~StatusProgressBar();
 
-    void tqsetAlignment(int a);
+    void setAlignment(int a);
 
     void progressBarMode(int mode, const TQString& text=TQString());