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

List:       kde-commits
Subject:    branches/work/unity/WebKit/WebCore
From:       Nikolas Zimmermann <wildfox () kde ! org>
Date:       2006-08-10 20:20:39
Message-ID: 1155241239.535699.12022.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 571830 by wildfox:

Enable ColorQt - need it for svg stuff


 M  +1 -0      CMakeLists.txt  
 M  +0 -4      platform/Color.h  
 M  +3 -4      platform/qt/ColorQt.cpp  


--- branches/work/unity/WebKit/WebCore/CMakeLists.txt #571829:571830
@@ -763,6 +763,7 @@
     platform/StringImpl.cpp
     platform/FloatRect.cpp
     platform/TransferJob.cpp
+    platform/qt/ColorQt.cpp
     platform/qt/GlyphMapQt.cpp
     platform/qt/BrowserExtensionQt.cpp
     platform/qt/CookieJarQt.cpp
--- branches/work/unity/WebKit/WebCore/platform/Color.h #571829:571830
@@ -39,10 +39,8 @@
 typedef struct CGColor* CGColorRef;
 
 #elif PLATFORM(QT)
-#if 0
 #include <QColor>
 #endif
-#endif
 
 namespace WebCore {
 
@@ -95,11 +93,9 @@
     static const RGBA32 transparent = 0x00000000;
 
 #if PLATFORM(QT)
-#if 0
     Color(const QColor&);
     operator QColor() const;
 #endif
-#endif
 
 private:
     RGBA32 color;
--- branches/work/unity/WebKit/WebCore/platform/qt/ColorQt.cpp #571829:571830
@@ -23,15 +23,14 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 #include "config.h"
 #include "Color.h"
 
-#undef QColor
-
 #include <QColor>
 
 namespace WebCore {
-#if 0
+
 Color::Color(const QColor &c)
     : color(makeRGBA(c.red(), c.green(), c.blue(), c.alpha()))
 {
@@ -42,7 +41,7 @@
 {
     return QColor(red(), green(), blue(), alpha());
 }
-#endif
+
 }
 
 // vim: ts=4 sw=4 et
[prev in list] [next in list] [prev in thread] [next in thread]