From 63c25ca8e57d5a06e74ee451d95b59f8f3806ba1 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Sun, 31 Jul 2011 21:39:19 +0000
Subject: Fix digikam FTBFS under gcc4.6

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/digikam@1244228 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 digikam/imageplugins/border/bordertool.cpp           | 4 ++--
 digikam/imageplugins/border/imageeffect_border.cpp   | 4 ++--
 digikam/imageplugins/superimpose/dirselectwidget.cpp | 4 ++--
 digikam/libs/dimg/dcolor.cpp                         | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/digikam/imageplugins/border/bordertool.cpp b/digikam/imageplugins/border/bordertool.cpp
index c5218719..e37176b7 100644
--- a/digikam/imageplugins/border/bordertool.cpp
+++ b/digikam/imageplugins/border/bordertool.cpp
@@ -144,9 +144,9 @@ BorderTool::BorderTool(TQObject* tqparent)
     // -------------------------------------------------------------------
 
     m_labelForeground   = new TQLabel(m_gboxSettings->plainPage());
-    m_firstColorButton  = new KColorButton( TQColor::TQColor( 192, 192, 192 ), m_gboxSettings->plainPage() );
+    m_firstColorButton  = new KColorButton( TQColor( 192, 192, 192 ), m_gboxSettings->plainPage() );
     m_labelBackground   = new TQLabel(m_gboxSettings->plainPage());
-    m_secondColorButton = new KColorButton( TQColor::TQColor( 128, 128, 128 ), m_gboxSettings->plainPage() );
+    m_secondColorButton = new KColorButton( TQColor( 128, 128, 128 ), m_gboxSettings->plainPage() );
 
     // -------------------------------------------------------------------
 
diff --git a/digikam/imageplugins/border/imageeffect_border.cpp b/digikam/imageplugins/border/imageeffect_border.cpp
index 6330e79f..2e8dc7a4 100644
--- a/digikam/imageplugins/border/imageeffect_border.cpp
+++ b/digikam/imageplugins/border/imageeffect_border.cpp
@@ -148,9 +148,9 @@ ImageEffect_Border::ImageEffect_Border(TQWidget* tqparent)
     // -------------------------------------------------------------------
 
     m_labelForeground   = new TQLabel(gboxSettings);
-    m_firstColorButton  = new KColorButton( TQColor::TQColor( 192, 192, 192 ), gboxSettings );
+    m_firstColorButton  = new KColorButton( TQColor( 192, 192, 192 ), gboxSettings );
     m_labelBackground   = new TQLabel(gboxSettings);
-    m_secondColorButton = new KColorButton( TQColor::TQColor( 128, 128, 128 ), gboxSettings );
+    m_secondColorButton = new KColorButton( TQColor( 128, 128, 128 ), gboxSettings );
 
     // -------------------------------------------------------------------
 
diff --git a/digikam/imageplugins/superimpose/dirselectwidget.cpp b/digikam/imageplugins/superimpose/dirselectwidget.cpp
index 85770aff..45f479a8 100644
--- a/digikam/imageplugins/superimpose/dirselectwidget.cpp
+++ b/digikam/imageplugins/superimpose/dirselectwidget.cpp
@@ -61,7 +61,7 @@ DirSelectWidget::DirSelectWidget(TQWidget* tqparent, const char* name, TQString
     if ( headerLabel.isNull() )
         header()->hide();
         
-    setAlternateBackground(TQColor::TQColor());
+    setAlternateBackground(TQColor());
 }
 
 DirSelectWidget::DirSelectWidget(KURL rootUrl, KURL currentUrl, 
@@ -75,7 +75,7 @@ DirSelectWidget::DirSelectWidget(KURL rootUrl, KURL currentUrl,
     if ( headerLabel.isNull() )
         header()->hide();
         
-    setAlternateBackground(TQColor::TQColor());
+    setAlternateBackground(TQColor());
     setRootPath(rootUrl, currentUrl);
 }
 
diff --git a/digikam/libs/dimg/dcolor.cpp b/digikam/libs/dimg/dcolor.cpp
index 910748ad..5a363c78 100644
--- a/digikam/libs/dimg/dcolor.cpp
+++ b/digikam/libs/dimg/dcolor.cpp
@@ -83,7 +83,7 @@ TQColor DColor::getTQColor() const
         return eightBit.getTQColor();
     }
 
-    return (TQColor::TQColor(m_red, m_green, m_blue));
+    return (TQColor(m_red, m_green, m_blue));
 }
 
 void DColor::convertToSixteenBit()
-- 
cgit v1.2.3