Move the "*Client classes to WebKitQt/WebCoreSupport. Uptil

now they were all scattered around the Qt platform build dirs,
this cleans it up.

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

diff --git a/ChangeLog b/ChangeLog
index 1efb14b1596251ff5be805ddf8f4a2661f3d4791..48d31882c32221bf3d19023a3782e1cc59d52e6c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-12-10  Zack Rusin  <zack@kde.org>
+
+        Client classes have been moved to WebKitQt/WebCoreSupport so
+        adjusting the pri file.
+
+        * WebKit.pri:
+
 2006-12-10  George Staikos  <staikos@kde.org>
 
         Reviewed by Zack.

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 2dfbca792d11f4bff3fd9da66add6dd539738272..41b74b77997e421b0561930f7b344eea788e8f6a 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2006-12-10  Zack Rusin  <zack@kde.org>
+
+        Move the client classes to WebKitQt/WebCoreSupport.
+
+        * WebCore.pro:
+        * loader/qt/FrameLoaderClientQt.cpp: Removed.
+        * loader/qt/FrameLoaderClientQt.h: Removed.
+        * platform/qt/ChromeClientQt.cpp: Removed.
+        * platform/qt/ChromeClientQt.h: Removed.
+        * platform/qt/ContextMenuClientQt.cpp: Removed.
+        * platform/qt/ContextMenuClientQt.h: Removed.
+        * platform/qt/EditorClientQt.cpp: Removed.
+        * platform/qt/EditorClientQt.h: Removed.
+
 2006-12-10  Lars Knoll <lars@trolltech.com>
 
         Reviewed by Zack.

diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index 8222d6c094cc8f0e35f4bbf97451a55363f22f8b..4f4e6f6869207c6233bb0cc4d92c64092e9205c0 100644 (file)
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -63,6 +63,7 @@ INCLUDEPATH +=  $$PWD \
                 $$PWD/kcanvas $$PWD/kcanvas/device $$PWD/kcanvas/device/qt \
                 $$PWD/ksvg2 $$PWD/ksvg2/css $$PWD/ksvg2/svg $$PWD/ksvg2/misc $$PWD/ksvg2/events \
                 $$PWD/platform/image-decoders \
+                $$PWD/../WebKit/WebCoreSupport \
                 $$PWD/WebCore+SVG
 QT += network
 !mac:CONFIG += link_pkgconfig
@@ -497,7 +498,6 @@ SOURCES += \
     loader/icon/SQLStatement.cpp \
     loader/icon/SQLDatabase.cpp \
     loader/qt/FrameLoaderQt.cpp \
-    loader/qt/FrameLoaderClientQt.cpp \
     loader/qt/DocumentLoaderQt.cpp \
     loader/qt/NavigationActionQt.cpp \
     loader/qt/ResourceLoaderQt.cpp \
@@ -537,7 +537,6 @@ SOURCES += \
     platform/graphics/Path.cpp \
     platform/MimeTypeRegistry.cpp \
     platform/qt/MimeTypeRegistryQt.cpp \
-    platform/qt/EditorClientQt.cpp \
     platform/qt/SoundQt.cpp \
     platform/qt/LoaderFunctionsQt.cpp \
     platform/qt/FileChooserQt.cpp \
@@ -557,10 +556,8 @@ SOURCES += \
     platform/qt/FontDataQt.cpp \
     platform/qt/SharedTimerQt.cpp \
     platform/qt/PopupMenuQt.cpp \
-    platform/qt/ChromeClientQt.cpp \
     platform/qt/ContextMenuQt.cpp \
     platform/qt/ContextMenuItemQt.cpp \
-    platform/qt/ContextMenuClientQt.cpp \
     platform/qt/PasteboardQt.cpp \
     platform/ContextMenu.cpp \
     platform/network/FormData.cpp \
@@ -659,7 +656,11 @@ SOURCES += \
     rendering/RenderBR.cpp \
     rendering/InlineTextBox.cpp \
     rendering/RenderFlow.cpp \
-    rendering/RenderSlider.cpp
+    rendering/RenderSlider.cpp \
+    ../WebKitQt/WebCoreSupport/FrameLoaderClientQt.cpp \
+    ../WebKitQt/WebCoreSupport/EditorClientQt.cpp \
+    ../WebKitQt/WebCoreSupport/ChromeClientQt.cpp \
+    ../WebKitQt/WebCoreSupport/ContextMenuClientQt.cpp
 
 contains(DEFINES, XPATH_SUPPORT=1) {
     FEATURE_DEFINES_JAVASCRIPT += XPATH_SUPPORT

diff --git a/WebKit.pri b/WebKit.pri
index 56b1d72855035200ebb6b637a394ea34ebe22f15..06686c6a8ed77c124a75724002c4c0285bb4dbc4 100644 (file)
--- a/WebKit.pri
+++ b/WebKit.pri
@@ -14,7 +14,8 @@ INCLUDEPATH += $$PWD/JavaScriptCore \
                $$PWD/WebCore/loader \
                $$PWD/WebCore/loader/qt \
                $$PWD/WebCore/css \
-               $$PWD/WebCore/bridge
+               $$PWD/WebCore/bridge \
+               $$PWD/WebKitQt/WebCoreSupport
 
 DEFINES += BUILDING_QT__=1
 

diff --git a/WebKitQt/ChangeLog b/WebKitQt/ChangeLog
index a76b9492a7fc14d1e8b9d7af7af8d88608f7b7b4..efc023594ecab1bd9de516b686ba9fc2058de2b7 100644 (file)
--- a/WebKitQt/ChangeLog
+++ b/WebKitQt/ChangeLog
@@ -1,3 +1,16 @@
+2006-12-10  Zack Rusin  <zack@kde.org>
+
+        Moving the clients from platform to their final location.
+
+        * WebCoreSupport/FrameLoaderClientQt.cpp: Added.
+        * WebCoreSupport/FrameLoaderClientQt.h: Added.
+        * WebCoreSupport/ChromeClientQt.cpp: Added.
+        * WebCoreSupport/ChromeClientQt.h: Added.
+        * WebCoreSupport/ContextMenuClientQt.cpp: Added.
+        * WebCoreSupport/ContextMenuClientQt.h: Added.
+        * WebCoreSupport/EditorClientQt.cpp: Added.
+        * WebCoreSupport/EditorClientQt.h: Added.
+
 2006-12-10  Zack Rusin  <zack@kde.org>
 
         Adjusting to the changes in platform/qt.

diff --git a/WebCore/platform/qt/ChromeClientQt.cpp b/WebKitQt/WebCoreSupport/ChromeClientQt.cpp
similarity index 100%
rename from WebCore/platform/qt/ChromeClientQt.cpp
rename to WebKitQt/WebCoreSupport/ChromeClientQt.cpp

diff --git a/WebCore/platform/qt/ChromeClientQt.h b/WebKitQt/WebCoreSupport/ChromeClientQt.h
similarity index 100%
rename from WebCore/platform/qt/ChromeClientQt.h
rename to WebKitQt/WebCoreSupport/ChromeClientQt.h

diff --git a/WebCore/platform/qt/ContextMenuClientQt.cpp b/WebKitQt/WebCoreSupport/ContextMenuClientQt.cpp
similarity index 100%
rename from WebCore/platform/qt/ContextMenuClientQt.cpp
rename to WebKitQt/WebCoreSupport/ContextMenuClientQt.cpp

diff --git a/WebCore/platform/qt/ContextMenuClientQt.h b/WebKitQt/WebCoreSupport/ContextMenuClientQt.h
similarity index 100%
rename from WebCore/platform/qt/ContextMenuClientQt.h
rename to WebKitQt/WebCoreSupport/ContextMenuClientQt.h

diff --git a/WebCore/platform/qt/EditorClientQt.cpp b/WebKitQt/WebCoreSupport/EditorClientQt.cpp
similarity index 100%
rename from WebCore/platform/qt/EditorClientQt.cpp
rename to WebKitQt/WebCoreSupport/EditorClientQt.cpp

diff --git a/WebCore/platform/qt/EditorClientQt.h b/WebKitQt/WebCoreSupport/EditorClientQt.h
similarity index 100%
rename from WebCore/platform/qt/EditorClientQt.h
rename to WebKitQt/WebCoreSupport/EditorClientQt.h

diff --git a/WebCore/loader/qt/FrameLoaderClientQt.cpp b/WebKitQt/WebCoreSupport/FrameLoaderClientQt.cpp
similarity index 100%
rename from WebCore/loader/qt/FrameLoaderClientQt.cpp
rename to WebKitQt/WebCoreSupport/FrameLoaderClientQt.cpp

diff --git a/WebCore/loader/qt/FrameLoaderClientQt.h b/WebKitQt/WebCoreSupport/FrameLoaderClientQt.h
similarity index 100%
rename from WebCore/loader/qt/FrameLoaderClientQt.h
rename to WebKitQt/WebCoreSupport/FrameLoaderClientQt.h