[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[kenneth at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 0cc26e303d9966407bd4a4616d31280be09160c1
Author: kenneth at webkit.org <kenneth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Jan 23 21:40:32 2010 +0000

    Rubberstamped by Simon Hausmann.
    
    [Qt] Move the WebInspector class to it's own header file.
    
    * QtLauncher/main.cpp:
    * QtLauncher/webinspector.h: Added.
    (WebInspector::WebInspector):
    (WebInspector::showEvent):
    (WebInspector::hideEvent):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53771 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 20c1a93..ab013f3 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2010-01-23  Kenneth Rohde Christiansen  <kenneth at webkit.org>
+
+        Rubberstamped by Simon Hausmann.
+
+        [Qt] Move the WebInspector class to it's own header file.
+
+        * QtLauncher/main.cpp:
+        * QtLauncher/webinspector.h: Added.
+        (WebInspector::WebInspector):
+        (WebInspector::showEvent):
+        (WebInspector::hideEvent):
+
 2010-01-23  Robert Hogan  <robert at roberthogan.net>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebKitTools/QtLauncher/main.cpp b/WebKitTools/QtLauncher/main.cpp
index b020267..1fd37f5 100644
--- a/WebKitTools/QtLauncher/main.cpp
+++ b/WebKitTools/QtLauncher/main.cpp
@@ -51,10 +51,10 @@
 #include <qwebelement.h>
 #include <qwebframe.h>
 #include <qwebinspector.h>
-#include "webpage.h"
 #include <qwebsettings.h>
 #include <qwebview.h>
-
+#include "webinspector.h"
+#include "webpage.h"
 
 #ifndef NDEBUG
 void QWEBKIT_EXPORT qt_drt_garbageCollector_collect();
@@ -101,24 +101,6 @@ protected:
 
 };
 
-class WebInspector : public QWebInspector {
-    Q_OBJECT
-public:
-    WebInspector(QWidget* parent) : QWebInspector(parent) {}
-signals:
-    void visibleChanged(bool nowVisible);
-protected:
-    void showEvent(QShowEvent* event)
-    {
-        QWebInspector::showEvent(event);
-        emit visibleChanged(true);
-    }
-    void hideEvent(QHideEvent* event)
-    {
-        QWebInspector::hideEvent(event);
-        emit visibleChanged(false);
-    }
-};
 
 class MainWindow : public QMainWindow {
     Q_OBJECT
diff --git a/WebKitTools/QtLauncher/webinspector.h b/WebKitTools/QtLauncher/webinspector.h
new file mode 100644
index 0000000..c99eff8
--- /dev/null
+++ b/WebKitTools/QtLauncher/webinspector.h
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies)
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef webinspector_h
+#define webinspector_h
+
+#include <QtGui>
+
+class WebInspector : public QWebInspector {
+    Q_OBJECT
+
+public:
+    WebInspector(QWidget* parent) : QWebInspector(parent) {}
+
+signals:
+    void visibleChanged(bool nowVisible);
+
+protected:
+    void showEvent(QShowEvent* event)
+    {
+        QWebInspector::showEvent(event);
+        emit visibleChanged(true);
+    }
+    void hideEvent(QHideEvent* event)
+    {
+        QWebInspector::hideEvent(event);
+        emit visibleChanged(false);
+    }
+};
+
+#endif

-- 
WebKit Debian packaging