[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-04 14:54:02
Message-ID: 1154703242.280246.31466.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 569640 by wildfox:

Some more helpers (QSize <-> IntSize conversion), and DeprecatedString <-> QString


 M  +1 -0      CMakeLists.txt  
 M  +9 -0      platform/IntSize.h  
 M  +6 -0      platform/qt/HelperQt.h  
 A             platform/qt/IntSizeQt.cpp   [License: UNKNOWN]


--- branches/work/unity/WebKit/WebCore/CMakeLists.txt #569639:569640
@@ -783,6 +783,7 @@
     platform/qt/FloatRectQt.cpp
     platform/qt/IntPointQt.cpp
     platform/qt/IntRectQt.cpp
+    platform/qt/IntSizeQt.cpp
     platform/qt/PageQt.cpp
     platform/qt/PathQt.cpp
     platform/qt/ImageQt.cpp
--- branches/work/unity/WebKit/WebCore/platform/IntSize.h #569639:569640
@@ -42,6 +42,10 @@
 typedef struct tagSIZE SIZE;
 #endif
 
+#if PLATFORM(QT)
+class QSize;
+#endif
+
 namespace WebCore {
 
 class IntSize {
@@ -91,6 +95,11 @@
     operator SIZE() const;
 #endif
 
+#if PLATFORM(QT)
+    IntSize(const QSize&);
+    operator QSize() const;
+#endif
+
 private:
     int m_width, m_height;
 };
--- branches/work/unity/WebKit/WebCore/platform/qt/HelperQt.h #569639:569640
@@ -29,6 +29,7 @@
 #include "Font.h"
 #include "AtomicString.h"
 #include "PlatformString.h"
+#include "DeprecatedString.h"
 
 #define notImplemented() do { fprintf(stderr, "FIXME: UNIMPLEMENTED: %s:%d\n", \
__FILE__, __LINE__); } while(0)  
@@ -44,6 +45,11 @@
     {
         return QString(reinterpret_cast<const QChar *>(str.characters()), \
str.length());  }
+    
+    inline QString toQString(const DeprecatedString& str)
+    {
+        return QString(str.unicode(), str.length());
+    }
 
     inline WebCore::String fromQString(const QString& str)
     {


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