Reviewed/landed by Adam.
authoraroben <aroben@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 25 Aug 2006 16:46:35 +0000 (16:46 +0000)
committeraroben <aroben@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 25 Aug 2006 16:46:35 +0000 (16:46 +0000)
Fixes: http://bugzilla.opendarwin.org/show_bug.cgi?id=10559
        Confirm to WebKit style guide - last fixes :-)

        * platform/ResourceLoaderClient.h:
        * platform/qt/ComboBoxQt.cpp:
        * platform/qt/FrameQt.cpp:
        (WebCore::doScroll):
        (WebCore::FrameQt::FrameQt):
        (WebCore::FrameQt::openURL):
        (WebCore::FrameQt::submitForm):
        (WebCore::FrameQt::setTitle):
        (WebCore::FrameQt::passSubframeEventToSubframe):
        (WebCore::FrameQt::registerCommandForUndo):
        (WebCore::FrameQt::registerCommandForRedo):
        (WebCore::FrameQt::keyEvent):
        (WebCore::FrameQt::setFrameGeometry):
        * platform/qt/GlyphMapQt.cpp:
        (WebCore::GlyphMap::fillPage):
        * platform/qt/GraphicsContextQt.cpp:
        (WebCore::toQtCompositionMode):
        (WebCore::toQtLineCap):
        (WebCore::toQtLineJoin):
        (WebCore::TextShadow::TextShadow):
        (WebCore::GraphicsContextPlatformPrivate::p):
        * platform/qt/ImageQt.cpp:
        (WebCore::FrameData::clear):
        (WebCore::Image::supportsType):
        * platform/qt/IntSizeQt.cpp:
        * platform/qt/LineEditQt.cpp:
        * platform/qt/ListBoxQt.cpp:
        * platform/qt/PageQt.cpp:
        (WebCore::Page::windowRect):
        * platform/qt/PathQt.cpp:
        (WebCore::Path::~Path):
        * platform/qt/ResourceLoaderCurl.cpp:
        (WebCore::ResourceLoader::assembleResponseHeaders):
        (WebCore::ResourceLoader::retrieveCharset):
        (WebCore::ResourceLoader::receivedResponse):
        * platform/qt/ResourceLoaderManager.cpp:
        (WebCore::headerCallback):
        (WebCore::ResourceLoaderManager::downloadTimerCallback):
        (WebCore::ResourceLoaderManager::add):
        * platform/qt/ScreenQt.cpp:
        (WebCore::screenRect):
        (WebCore::usableScreenRect):
        * platform/qt/ScrollViewQt.cpp:
        (WebCore::ScrollView::ScrollView):
        (WebCore::ScrollView::~ScrollView):
        (WebCore::ScrollView::setParentWidget):
        (WebCore::ScrollView::addChild):
        * platform/qt/SharedTimerQt.cpp:
        (WebCore::setSharedTimerFiredFunction):
        * platform/qt/SharedTimerQt.h:
        (WebCore::SharedTimerQt::SharedTimerQt):
        (WebCore::SharedTimerQt::fire):
        * platform/qt/SystemTimeQt.cpp:
        (WebCore::currentTime):
        * platform/qt/TextEditQt.cpp:
        (WebCore::PlatformTextEdit::setParentWidget):
        (WebCore::PlatformTextEdit::text):
        (WebCore::PlatformTextEdit::sizeWithColumnsAndRows):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@16033 268f45cc-cd09-0410-ab3c-d52691b4dbfc

20 files changed:
WebCore/ChangeLog
WebCore/platform/ResourceLoaderClient.h
WebCore/platform/qt/ComboBoxQt.cpp
WebCore/platform/qt/FrameQt.cpp
WebCore/platform/qt/GlyphMapQt.cpp
WebCore/platform/qt/GraphicsContextQt.cpp
WebCore/platform/qt/ImageQt.cpp
WebCore/platform/qt/IntSizeQt.cpp
WebCore/platform/qt/LineEditQt.cpp
WebCore/platform/qt/ListBoxQt.cpp
WebCore/platform/qt/PageQt.cpp
WebCore/platform/qt/PathQt.cpp
WebCore/platform/qt/ResourceLoaderCurl.cpp
WebCore/platform/qt/ResourceLoaderManager.cpp
WebCore/platform/qt/ScreenQt.cpp
WebCore/platform/qt/ScrollViewQt.cpp
WebCore/platform/qt/SharedTimerQt.cpp
WebCore/platform/qt/SharedTimerQt.h
WebCore/platform/qt/SystemTimeQt.cpp
WebCore/platform/qt/TextEditQt.cpp

index 8e06c299b6833b8ff1cdcfd221cda46f1f1bd67f..c01f994b7f48cd032be4b364816f31f60cd947c7 100644 (file)
@@ -1,3 +1,69 @@
+2006-08-25  Nikolas Zimmermann  <zimmermann@kde.org>
+
+        Reviewed/landed by Adam.
+
+        Fixes: http://bugzilla.opendarwin.org/show_bug.cgi?id=10559
+        Confirm to WebKit style guide - last fixes :-)
+
+        * platform/ResourceLoaderClient.h:
+        * platform/qt/ComboBoxQt.cpp:
+        * platform/qt/FrameQt.cpp:
+        (WebCore::doScroll):
+        (WebCore::FrameQt::FrameQt):
+        (WebCore::FrameQt::openURL):
+        (WebCore::FrameQt::submitForm):
+        (WebCore::FrameQt::setTitle):
+        (WebCore::FrameQt::passSubframeEventToSubframe):
+        (WebCore::FrameQt::registerCommandForUndo):
+        (WebCore::FrameQt::registerCommandForRedo):
+        (WebCore::FrameQt::keyEvent):
+        (WebCore::FrameQt::setFrameGeometry):
+        * platform/qt/GlyphMapQt.cpp:
+        (WebCore::GlyphMap::fillPage):
+        * platform/qt/GraphicsContextQt.cpp:
+        (WebCore::toQtCompositionMode):
+        (WebCore::toQtLineCap):
+        (WebCore::toQtLineJoin):
+        (WebCore::TextShadow::TextShadow):
+        (WebCore::GraphicsContextPlatformPrivate::p):
+        * platform/qt/ImageQt.cpp:
+        (WebCore::FrameData::clear):
+        (WebCore::Image::supportsType):
+        * platform/qt/IntSizeQt.cpp:
+        * platform/qt/LineEditQt.cpp:
+        * platform/qt/ListBoxQt.cpp:
+        * platform/qt/PageQt.cpp:
+        (WebCore::Page::windowRect):
+        * platform/qt/PathQt.cpp:
+        (WebCore::Path::~Path):
+        * platform/qt/ResourceLoaderCurl.cpp:
+        (WebCore::ResourceLoader::assembleResponseHeaders):
+        (WebCore::ResourceLoader::retrieveCharset):
+        (WebCore::ResourceLoader::receivedResponse):
+        * platform/qt/ResourceLoaderManager.cpp:
+        (WebCore::headerCallback):
+        (WebCore::ResourceLoaderManager::downloadTimerCallback):
+        (WebCore::ResourceLoaderManager::add):
+        * platform/qt/ScreenQt.cpp:
+        (WebCore::screenRect):
+        (WebCore::usableScreenRect):
+        * platform/qt/ScrollViewQt.cpp:
+        (WebCore::ScrollView::ScrollView):
+        (WebCore::ScrollView::~ScrollView):
+        (WebCore::ScrollView::setParentWidget):
+        (WebCore::ScrollView::addChild):
+        * platform/qt/SharedTimerQt.cpp:
+        (WebCore::setSharedTimerFiredFunction):
+        * platform/qt/SharedTimerQt.h:
+        (WebCore::SharedTimerQt::SharedTimerQt):
+        (WebCore::SharedTimerQt::fire):
+        * platform/qt/SystemTimeQt.cpp:
+        (WebCore::currentTime):
+        * platform/qt/TextEditQt.cpp:
+        (WebCore::PlatformTextEdit::setParentWidget):
+        (WebCore::PlatformTextEdit::text):
+        (WebCore::PlatformTextEdit::sizeWithColumnsAndRows):
+
 2006-08-24  David Harrison  <harrison@apple.com>
 
         Reviewed by Justin.
index 92c1d1d9671a7ca406faef9daf3d3b1eb664ebe0..3f646260383b9aaadfa792f1e7fd1f8c76b6348f 100644 (file)
@@ -36,6 +36,10 @@ class NSURLResponse;
 #endif
 #endif
 
+#if PLATFORM(QT)
+#include <QString>
+#endif
+
 namespace WebCore {
 
 #if PLATFORM(MAC)
@@ -43,7 +47,7 @@ namespace WebCore {
     typedef NSURLResponse* PlatformResponse;
 #elif PLATFORM(QT)
     typedef void* PlatformData;
-    typedef char* PlatformResponse;
+    typedef QString PlatformResponse;
 #else
     // Not sure what the strategy for this will be on other platforms.
     typedef struct PlatformDataStruct *PlatformData;
index 44ebffe6064ee04afab1e3857e0f31f2259c1b74..c957ee8124cc2b3cbba1226c43cad4d204f191e9 100644 (file)
@@ -26,6 +26,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
+#include "config.h"
+
 #include <QComboBox>
 
 #include "PlatformComboBox.h"
index 0e0bb6cd9d3e598247b17ef2623ec68877191d2b..201d92aef8621e665b9640173d3d0a278c0114fd 100644 (file)
@@ -67,18 +67,18 @@ static void doScroll(const RenderObject* r, bool isHorizontal, int multiplier)
 {
     // FIXME: The scrolling done here should be done in the default handlers
     // of the elements rather than here in the part.
-    if(!r)
+    if (!r)
         return;
 
     //broken since it calls scroll on scrollbars
     //and we have none now
     //r->scroll(direction, KWQScrollWheel, multiplier);
-    if(!r->layer())
+    if (!r->layer())
         return;
 
     int x = r->layer()->scrollXOffset();
     int y = r->layer()->scrollYOffset();
-    if(isHorizontal)
+    if (isHorizontal)
         x += multiplier;
     else
         y += multiplier;
@@ -94,7 +94,6 @@ bool FrameView::isFrameView() const
 FrameQt::FrameQt()
     : Frame(new Page, 0)
 {
-    qDebug("FrameQt::FrameQt");
     init();
 
     page()->setMainFrame(this);
@@ -141,7 +140,6 @@ FrameQt::~FrameQt()
 
 bool FrameQt::openURL(const KURL& url)
 {
-    qDebug("openURL(%s)", url.url().latin1());
     didOpenURL(url);
 
     // FIXME: Use mimetype logic from KIO!
@@ -157,16 +155,14 @@ bool FrameQt::openURL(const KURL& url)
 
 void FrameQt::submitForm(const ResourceRequest& request)
 {
-    qDebug("FrameQt::submitForm()");
-
     // FIXME: this is a hack inherited from FrameMac, and should be pushed into Frame
-    if(d->m_submittedFormURL == request.url())
+    if (d->m_submittedFormURL == request.url())
         return;
 
     d->m_submittedFormURL = request.url();
 
     /* FIXME: Once we have a KPart - named "FramePartQt" - we can let that inherit from FrameQtClient and implement the functions...)
-    if(m_client)
+    if (m_client)
         m_client->submitForm(request.doPost() ? "POST" : "GET", request.url(), &request.postData);
     */
 
@@ -212,7 +208,7 @@ bool FrameQt::locationbarVisible()
 
 void FrameQt::setTitle(const String& title)
 {
-    if(view() && view()->parentWidget())
+    if (view() && view()->parentWidget())
         view()->parentWidget()->setWindowTitle(title);
 }
 
@@ -230,7 +226,7 @@ bool FrameQt::passWheelEventToChildWidget(Node*)
 
 bool FrameQt::passSubframeEventToSubframe(MouseEventWithHitTestResults& mev, Frame*)
 {
-    if(mev.targetNode() == 0)
+    if (mev.targetNode() == 0)
         return true;
  
     return false;
@@ -381,12 +377,12 @@ KJS::Bindings::Instance* FrameQt::getAppletInstanceForWidget(Widget*)
     return 0;
 }
 
-void FrameQt::registerCommandForUndo(const EditCommandPtr&)
+void FrameQt::registerCommandForUndo(PassRefPtr<EditCommand>)
 {
     notImplemented();
 }
 
-void FrameQt::registerCommandForRedo(const EditCommandPtr&)
+void FrameQt::registerCommandForRedo(PassRefPtr<EditCommand>)
 {
     notImplemented();
 }
@@ -499,21 +495,21 @@ bool FrameQt::keyEvent(const PlatformKeyboardEvent& keyEvent)
     // Check for cases where we are too early for events -- possible unmatched key up
     // from pressing return in the location bar.
     Document* doc = document();
-    if(!doc)
+    if (!doc)
         return false;
 
     Node* node = doc->focusNode();
-    if(!node) {
+    if (!node) {
         if (doc->isHTMLDocument())
             node = doc->body();
         else
             node = doc->documentElement();
 
-        if(!node)
+        if (!node)
             return false;
     }
 
-    if(!keyEvent.isKeyUp())
+    if (!keyEvent.isKeyUp())
         prepareForUserAction();
 
     result = !EventTargetNodeCast(node)->dispatchKeyEvent(keyEvent);
@@ -539,7 +535,7 @@ void FrameQt::receivedAllData(ResourceLoader* job, PlatformData data)
 
 void FrameQt::setFrameGeometry(const IntRect& r)
 {
-    setFrameGeometry((QRect) r);
+    setFrameGeometry(QRect(r));
 }
 
 }
index ad22ab3e1739a24a1c7b47f875a48aca23af0221..85420925ed731ade600dea552c63ae16bfd6aa0b 100644 (file)
@@ -36,9 +36,8 @@ namespace WebCore {
 
 bool GlyphMap::fillPage(GlyphPage* page, UChar* buffer, unsigned bufferLength, const FontData* fontData)
 {
-    for (unsigned i = 0; i < bufferLength; i++) {
+    for (unsigned i = 0; i < bufferLength; i++)
         page->setGlyphDataForIndex(i, buffer[i], fontData);
-    }
 
     return true;
 }
index 617befde91af53dbdfb6bbc4789997748edf7921..952aa2bc4d0532e68de2190da249a89845820209 100644 (file)
@@ -30,6 +30,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "config.h"
+
 #include "GraphicsContext.h"
 #include "Path.h"
 
@@ -53,34 +55,34 @@ namespace WebCore {
 static QPainter::CompositionMode toQtCompositionMode(CompositeOperator op)
 {
     switch (op) {
-    case CompositeClear:
-        return QPainter::CompositionMode_Clear;
-    case CompositeCopy:
-        return QPainter::CompositionMode_Source;
-    case CompositeSourceOver:
-        return QPainter::CompositionMode_SourceOver;
-    case CompositeSourceIn:
-        return QPainter::CompositionMode_SourceIn;
-    case CompositeSourceOut:
-        return QPainter::CompositionMode_SourceOut;
-    case CompositeSourceAtop:
-        return QPainter::CompositionMode_SourceAtop;
-    case CompositeDestinationOver:
-        return QPainter::CompositionMode_DestinationOver;
-    case CompositeDestinationIn:
-        return QPainter::CompositionMode_DestinationIn;
-    case CompositeDestinationOut:
-        return QPainter::CompositionMode_DestinationOut;
-    case CompositeDestinationAtop:
-        return QPainter::CompositionMode_DestinationAtop;
-    case CompositeXOR:
-        return QPainter::CompositionMode_Xor;
-    case CompositePlusDarker:
-        return QPainter::CompositionMode_SourceOver;
-    case CompositeHighlight:
-        return QPainter::CompositionMode_SourceOver;
-    case CompositePlusLighter:
-        return QPainter::CompositionMode_SourceOver;
+        case CompositeClear:
+            return QPainter::CompositionMode_Clear;
+        case CompositeCopy:
+            return QPainter::CompositionMode_Source;
+        case CompositeSourceOver:
+            return QPainter::CompositionMode_SourceOver;
+        case CompositeSourceIn:
+            return QPainter::CompositionMode_SourceIn;
+        case CompositeSourceOut:
+            return QPainter::CompositionMode_SourceOut;
+        case CompositeSourceAtop:
+            return QPainter::CompositionMode_SourceAtop;
+        case CompositeDestinationOver:
+            return QPainter::CompositionMode_DestinationOver;
+        case CompositeDestinationIn:
+            return QPainter::CompositionMode_DestinationIn;
+        case CompositeDestinationOut:
+            return QPainter::CompositionMode_DestinationOut;
+        case CompositeDestinationAtop:
+            return QPainter::CompositionMode_DestinationAtop;
+        case CompositeXOR:
+            return QPainter::CompositionMode_Xor;
+        case CompositePlusDarker:
+            return QPainter::CompositionMode_SourceOver;
+        case CompositeHighlight:
+            return QPainter::CompositionMode_SourceOver;
+        case CompositePlusLighter:
+            return QPainter::CompositionMode_SourceOver;
     }
 
     return QPainter::CompositionMode_SourceOver;
@@ -89,12 +91,12 @@ static QPainter::CompositionMode toQtCompositionMode(CompositeOperator op)
 static Qt::PenCapStyle toQtLineCap(LineCap lc)
 {
     switch (lc) {
-    case ButtCap:
-        return Qt::FlatCap;
-    case RoundCap:
-        return Qt::RoundCap;
-    case SquareCap:
-        return Qt::SquareCap;
+        case ButtCap:
+            return Qt::FlatCap;
+        case RoundCap:
+            return Qt::RoundCap;
+        case SquareCap:
+            return Qt::SquareCap;
     }
 
     return Qt::FlatCap;
@@ -103,12 +105,12 @@ static Qt::PenCapStyle toQtLineCap(LineCap lc)
 static Qt::PenJoinStyle toQtLineJoin(LineJoin lj)
 {
     switch (lj) {
-    case MiterJoin:
-        return Qt::SvgMiterJoin;
-    case RoundJoin:
-        return Qt::RoundJoin;
-    case BevelJoin:
-        return Qt::BevelJoin;
+        case MiterJoin:
+            return Qt::SvgMiterJoin;
+        case RoundJoin:
+            return Qt::RoundJoin;
+        case BevelJoin:
+            return Qt::BevelJoin;
     }
 
     return Qt::MiterJoin;
@@ -144,9 +146,9 @@ struct TransparencyLayer
 struct TextShadow
 {
     TextShadow()
-    : x(0)
-    , y(0)
-    , blur(0)
+        : x(0)
+        , y(0)
+        , blur(0)
     {
     }
 
@@ -165,7 +167,7 @@ public:
     GraphicsContextPlatformPrivate(QPainter* painter);
     ~GraphicsContextPlatformPrivate();
 
-    inline QPainter& p()
+    QPainter& p()
     {
         if (layers.isEmpty()) {
             if (redirect)
index 18aa014dbf9aec897af46f39ba7389348f22160b..53a92ee64e3ae3e844199f6e30e58ff5795abb6d 100644 (file)
@@ -51,7 +51,7 @@ void FrameData::clear()
 {
     if (m_frame) {
         m_frame = 0;
-        m_duration = 0.;
+        m_duration = 0.0f;
         m_hasAlpha = true;
     }
 }
@@ -82,8 +82,6 @@ Image* Image::loadResource(const char* name)
 
 bool Image::supportsType(const String& type)
 {
-    qDebug() << "does support image format? "<< type;
-
     QList<QByteArray> formats = QImageReader::supportedImageFormats();
     foreach(QByteArray format, formats) {
         if (format == (QString) type)
index e164208e5882121ae8a65e7238203171f6e83630..4f2bf357add3e07d437dbcfc6cdf02003a66aabf 100644 (file)
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "config.h"
+
 #include <QSize>
 
-#include "config.h"
 #include "IntSize.h"
 
 namespace WebCore {
index 424f993818e1299926d6ee89bf329aad8416ae7c..b07c671500ed1251c5af379ad6d06ba0708b373e 100644 (file)
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
+#include "config.h"
+
 #include <QLineEdit>
 
-#include <config.h>
 #include "GraphicsTypes.h"
 #include "TextDirection.h"
 #include "Widget.h"
index 5502b8f56d38580a65731f5e4da5e2807b8887b7..4707b4cf0cbc19fa29d84e0a2544bc90610dc4bf 100644 (file)
@@ -26,6 +26,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
+#include "config.h"
+
 #include <QScrollBar>
 #include <QListWidget>
 
index b534bbcbc056819409ab98772ee5936c423abaf0..80a1824a1a9ffb30b8079e8adbb0c3bed2349a4f 100644 (file)
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
+#include "config.h"
+
 #include <QWidget>
 
-#include "config.h"
 #include "Page.h"
-
 #include "IntRect.h"
 #include "FloatRect.h"
 #include "Frame.h"
@@ -54,7 +54,7 @@ FloatRect Page::windowRect() const
     if (!widget)
         return FloatRect();
 
-    return (IntRect) widget->geometry();
+    return IntRect(widget->geometry());
 }
 
 void Page::setWindowRect(const FloatRect& r)
index 01314f097999dce4ee34cd847955fdf3661dff18..41ba37fcf044ae76805fb08795e1a7266dc12875 100644 (file)
@@ -44,7 +44,6 @@ Path::Path()
 Path::~Path()
 {
     delete m_path;
-    m_path = 0;
 }
 
 Path::Path(const Path& other)
index 0aeafef26b21e3ffcc7d4e4b88022cb230d7183d..9e8de771cf9337189e49ecd4d6500ab077660787 100644 (file)
@@ -27,7 +27,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#include <QDebug>
 #include "config.h"
 #include "ResourceLoader.h"
 
@@ -67,9 +66,8 @@ void ResourceLoader::assembleResponseHeaders() const
  
         // FIXME: Move the client activation to receivedResponse(), once
         // we use KIO, and receivedResponse() is called only once.
-        if (d->client) {
-            d->client->receivedResponse(const_cast<ResourceLoader *>(this), (char *) d->response.data());
-        }
+        if (d->client)
+            d->client->receivedResponse(const_cast<ResourceLoader*>(this), d->response);
 
         d->response = QString(); // Reset
     }
@@ -77,9 +75,8 @@ void ResourceLoader::assembleResponseHeaders() const
 
 void ResourceLoader::retrieveCharset() const
 {
-    if (!d->retrievedCharset) {
+    if (!d->retrievedCharset)
         d->retrievedCharset = true;
-    }
 
     // FIXME: We can just parse the headers here, but once we use KIO
     // we can set the response parameter to sth. else than a "char*".
@@ -87,7 +84,7 @@ void ResourceLoader::retrieveCharset() const
     notImplemented();
 }
 
-void ResourceLoader::receivedResponse(char* response)
+void ResourceLoader::receivedResponse(QString response)
 {
     Q_ASSERT(method() == "POST");
 
@@ -102,7 +99,7 @@ void ResourceLoader::receivedResponse(char* response)
     //
     // Anyway, let's collect the response data here, as the ResourceLoaderManager
     // calls us for every line of the header it receives.
-    d->response += QString::fromLatin1(response);
+    d->response += response;
 }
 
 } // namespace WebCore
index bb03095291aba2289dd5ad0f2eb3a21f44d4b31c..d5207bfc39c128340524b65a4523acace1ce069c 100644 (file)
@@ -74,9 +74,8 @@ static size_t headerCallback(char* ptr, size_t size, size_t nmemb, void* obj)
     ResourceLoader* job = static_cast<ResourceLoader*>(obj);
     ResourceLoaderInternal* d = job->getInternal();
  
-    if (job->method() == "POST") {
+    if (job->method() == "POST")
         job->receivedResponse(ptr);
-    }
     
     int totalSize = size * nmemb;
     return totalSize;
@@ -140,12 +139,12 @@ void ResourceLoaderManager::downloadTimerCallback(Timer<ResourceLoaderManager>*
                 // find the node which has same d->m_handle as completed transfer
                 CURL* chandle = msg->easy_handle;
                 assert(chandle);
-                ResourceLoader *job;
+                ResourceLoaderjob;
                 curl_easy_getinfo(chandle, CURLINFO_PRIVATE, &job);
                 assert(job); //fixme: assert->if ?
                 // if found, delete it
                 if (job) {
-                    ResourceLoaderInternal *d = job->getInternal();
+                    ResourceLoaderInternald = job->getInternal();
                     switch (msg->data.result) {
                         case CURLE_OK: {
                             // use this to authenticate
@@ -211,7 +210,7 @@ void ResourceLoaderManager::add(ResourceLoader* job)
     if (job->method() == "POST") {
         DeprecatedString postData = job->postData().flattenToString();
 
-        char *postDataString = (char *) malloc(postData.length() + 1);
+        char* postDataString = (char*)malloc(postData.length() + 1);
         strncpy(postDataString, postData.ascii(), postData.length());
         postDataString[postData.length()] = '\0';
 
index 391ab6a1362201e4569d04072c4dc1ed3375aac2..bec308d2b8644c88a890e921bedd3822fd939228 100644 (file)
@@ -49,7 +49,7 @@ FloatRect screenRect(Widget* widget)
     if (!dw)
         return FloatRect();
 
-    return (IntRect) dw->screenGeometry(qw);
+    return IntRect(dw->screenGeometry(qw));
 }
 
 int screenDepth(Widget* widget)
@@ -72,7 +72,7 @@ FloatRect usableScreenRect(Widget* widget)
     if (!dw)
         return FloatRect();
 
-    return (IntRect) dw->availableGeometry(qw);
+    return IntRect(dw->availableGeometry(qw));
 }
 
 }
index 166173f48b51cc38a608e4250f7d314167e6a62e..01a0ece705e4261d23dd47fdde9e5a2be136682e 100644 (file)
@@ -47,17 +47,14 @@ namespace WebCore {
 ScrollView::ScrollView()
     : m_area(new QScrollArea(0))
 {
-    qDebug("ScrollView::ScrollView()");
 }
 
 ScrollView::~ScrollView()
 {
-    qDebug("ScrollView::~ScrollView()");
 }
 
 void ScrollView::setParentWidget(QWidget* parent)
 {
-    qDebug("ScrollView::setParentWidget(), parent=%p", parent);
     Widget::setParentWidget(parent);
 
     // 'isFrameView()' can not be called yet in the constructor!
@@ -229,7 +226,6 @@ void ScrollView::setStaticBackground(bool flag)
 
 void ScrollView::addChild(Widget* child, int x, int y)
 {
-    qDebug("ScrollView::addChild(), child=%p, x=%i, y=%i", child, x, y);
     Q_ASSERT(child != 0);
     Q_ASSERT(m_area && m_area->widget());
 
index 8ef421b44f301926e9c1d1c4babc23bdc6c25551..cceb05a5d530aa5395449ee851e7e64a2e4691f3 100644 (file)
@@ -34,7 +34,7 @@ SharedTimerQt* SharedTimerQt::s_self = 0; // FIXME: staticdeleter
 
 void setSharedTimerFiredFunction(void (*f)())
 {
-    SharedTimerQt::inst()->_timerFunction = f;
+    SharedTimerQt::inst()->m_timerFunction = f;
 }
 
 void setSharedTimerFireTime(double fireTime)
index cda9c4e2778fdc3caccfdeba7c9b99576bb48487..ac40324edd7d934df8bcde49a3b6a7c9812ed891 100644 (file)
@@ -38,11 +38,12 @@ namespace WebCore {
 class SharedTimerQt : public QTimer {
 Q_OBJECT
 protected:
-    SharedTimerQt() : QTimer()
+    SharedTimerQt()
+        : QTimer()
+        , m_timerFunction(0)
     {
         connect(this, SIGNAL(timeout()), this, SLOT(fire()));
         setSingleShot(true);
-        _timerFunction = 0;
     }
 
     ~SharedTimerQt()
@@ -58,13 +59,13 @@ public:
         return s_self;
     }
 
-    void (*_timerFunction)();
+    void (*m_timerFunction)();
 
 public Q_SLOTS:
     void fire()
     {
-        if (_timerFunction)
-            (_timerFunction)();
+        if (m_timerFunction)
+            (m_timerFunction)();
     }
 
 private:
index bb55d57746f85a54e3341e05404a458f463a8d39..5a32316d1cdbf559eaf6a57a89bf259945feaec8 100644 (file)
@@ -36,7 +36,7 @@ double currentTime()
 {
     time_t ttime;
     time(&ttime);
-    return (double) ttime;
+    return (double)ttime;
 }
 
 }
index 023905c60c212071237b5ca0b7709017d76b071c..fd003aa5550e8587b28176515e72510466274618 100644 (file)
@@ -52,7 +52,7 @@ void PlatformTextEdit::setParentWidget(QWidget* parent)
 {
     Widget::setParentWidget(parent);
 
-    QTextEdit *widget = new QTextEdit(parent, "");
+    QTextEditwidget = new QTextEdit(parent, "");
     setQWidget(widget);
 }
 
@@ -122,6 +122,7 @@ void PlatformTextEdit::setText(const String&)
 String PlatformTextEdit::text() const
 {
     notImplemented();
+    return String();
 }
 
 String PlatformTextEdit::textWithHardLineBreaks() const
@@ -189,6 +190,7 @@ void PlatformTextEdit::setSelectionRange(int, int)
 IntSize PlatformTextEdit::sizeWithColumnsAndRows(int numColumns, int numRows) const
 {
     notImplemented();
+    return IntSize();
 }
 
 bool PlatformTextEdit::checksDescendantsForFocus() const