[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/trinity/applications/digikam/digikam
From:       Timothy Pearson <kb9vqf () pearsoncomputing ! net>
Date:       2011-07-31 21:39:20
Message-ID: 20110731213920.5F55EAC86C () svn ! kde ! org
[Download RAW message or body]

SVN commit 1244228 by tpearson:

Fix digikam FTBFS under gcc4.6


 M  +2 -2      imageplugins/border/bordertool.cpp  
 M  +2 -2      imageplugins/border/imageeffect_border.cpp  
 M  +2 -2      imageplugins/superimpose/dirselectwidget.cpp  
 M  +1 -1      libs/dimg/dcolor.cpp  


--- branches/trinity/applications/digikam/digikam/imageplugins/border/bordertool.cpp \
#1244227:1244228 @@ -144,9 +144,9 @@
     // -------------------------------------------------------------------
 
     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() );  
     // -------------------------------------------------------------------
 
--- branches/trinity/applications/digikam/digikam/imageplugins/border/imageeffect_border.cpp \
#1244227:1244228 @@ -148,9 +148,9 @@
     // -------------------------------------------------------------------
 
     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 );  
     // -------------------------------------------------------------------
 
--- branches/trinity/applications/digikam/digikam/imageplugins/superimpose/dirselectwidget.cpp \
#1244227:1244228 @@ -61,7 +61,7 @@
     if ( headerLabel.isNull() )
         header()->hide();
         
-    setAlternateBackground(TQColor::TQColor());
+    setAlternateBackground(TQColor());
 }
 
 DirSelectWidget::DirSelectWidget(KURL rootUrl, KURL currentUrl, 
@@ -75,7 +75,7 @@
     if ( headerLabel.isNull() )
         header()->hide();
         
-    setAlternateBackground(TQColor::TQColor());
+    setAlternateBackground(TQColor());
     setRootPath(rootUrl, currentUrl);
 }
 
--- branches/trinity/applications/digikam/digikam/libs/dimg/dcolor.cpp \
#1244227:1244228 @@ -83,7 +83,7 @@
         return eightBit.getTQColor();
     }
 
-    return (TQColor::TQColor(m_red, m_green, m_blue));
+    return (TQColor(m_red, m_green, m_blue));
 }
 
 void DColor::convertToSixteenBit()


[prev in list] [next in list] [prev in thread] [next in thread]