[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75
eric at webkit.org
eric at webkit.org
Thu Oct 29 20:39:58 UTC 2009
The following commit has been merged in the webkit-1.1 branch:
commit 3049feeaf9d3f338bc992cb9902bc463da68800d
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Oct 6 11:49:55 2009 +0000
2009-10-06 José Millán Soto <fid at gpul.org>
Reviewed by Xan Lopez.
Header files of WebKitGTK do not comply with WebKit coding style (Patch attached)
https://bugs.webkit.org/show_bug.cgi?id=30076
Solves various issues in header files.
* WebCoreSupport/DocumentLoaderGtk.h: Added "headed guards"
* webkit/webkitdefines.h:
* webkit/webkitdownload.h:
* webkit/webkiterror.h:
* webkit/webkithittestresult.h:
* webkit/webkitnetworkrequest.h:
* webkit/webkitnetworkresponse.h:
* webkit/webkitprivate.h:
* webkit/webkitsecurityorigin.h:
* webkit/webkitsoupauthdialog.h:
* webkit/webkitversion.h.in:
* webkit/webkitwebbackforwardlist.h:
* webkit/webkitwebdatabase.h:
* webkit/webkitwebdatasource.h:
* webkit/webkitwebframe.h:
* webkit/webkitwebhistoryitem.h:
* webkit/webkitwebinspector.h:
* webkit/webkitwebnavigationaction.h:
* webkit/webkitwebpolicydecision.h:
* webkit/webkitwebresource.h:
* webkit/webkitwebsettings.h:
* webkit/webkitwebview.h:
* webkit/webkitwebwindowfeatures.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49168 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index a9ef344..f6210ed 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,36 @@
+2009-10-06 José Millán Soto <fid at gpul.org>
+
+ Reviewed by Xan Lopez.
+
+ Header files of WebKitGTK do not comply with WebKit coding style (Patch attached)
+ https://bugs.webkit.org/show_bug.cgi?id=30076
+
+ Solves various issues in header files.
+
+ * WebCoreSupport/DocumentLoaderGtk.h: Added "headed guards"
+ * webkit/webkitdefines.h:
+ * webkit/webkitdownload.h:
+ * webkit/webkiterror.h:
+ * webkit/webkithittestresult.h:
+ * webkit/webkitnetworkrequest.h:
+ * webkit/webkitnetworkresponse.h:
+ * webkit/webkitprivate.h:
+ * webkit/webkitsecurityorigin.h:
+ * webkit/webkitsoupauthdialog.h:
+ * webkit/webkitversion.h.in:
+ * webkit/webkitwebbackforwardlist.h:
+ * webkit/webkitwebdatabase.h:
+ * webkit/webkitwebdatasource.h:
+ * webkit/webkitwebframe.h:
+ * webkit/webkitwebhistoryitem.h:
+ * webkit/webkitwebinspector.h:
+ * webkit/webkitwebnavigationaction.h:
+ * webkit/webkitwebpolicydecision.h:
+ * webkit/webkitwebresource.h:
+ * webkit/webkitwebsettings.h:
+ * webkit/webkitwebview.h:
+ * webkit/webkitwebwindowfeatures.h:
+
2009-10-03 Adam Barth <abarth at webkit.org>
More build fixing.
diff --git a/WebKit/gtk/WebCoreSupport/DocumentLoaderGtk.h b/WebKit/gtk/WebCoreSupport/DocumentLoaderGtk.h
index 8ef1905..c601bc5 100644
--- a/WebKit/gtk/WebCoreSupport/DocumentLoaderGtk.h
+++ b/WebKit/gtk/WebCoreSupport/DocumentLoaderGtk.h
@@ -27,6 +27,9 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#ifndef DocumentLoaderGtk_h
+#define DocumentLoaderGtk_h
+
#include "DocumentLoader.h"
#include "webkitdefines.h"
#include "wtf/HashSet.h"
@@ -67,3 +70,5 @@ private:
};
} // end namespace WebKit
+
+#endif
diff --git a/WebKit/gtk/webkit/webkitdefines.h b/WebKit/gtk/webkit/webkitdefines.h
index 5b9fa3f..a5884f3 100644
--- a/WebKit/gtk/webkit/webkitdefines.h
+++ b/WebKit/gtk/webkit/webkitdefines.h
@@ -18,8 +18,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef WEBKIT_DEFINES_H
-#define WEBKIT_DEFINES_H
+#ifndef webkitdefines_h
+#define webkitdefines_h
#include <glib.h>
diff --git a/WebKit/gtk/webkit/webkitdownload.h b/WebKit/gtk/webkit/webkitdownload.h
index 7c86c65..6e7f38b 100644
--- a/WebKit/gtk/webkit/webkitdownload.h
+++ b/WebKit/gtk/webkit/webkitdownload.h
@@ -18,8 +18,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef WEBKIT_DOWNLOAD_H
-#define WEBKIT_DOWNLOAD_H
+#ifndef webkitdownload_h
+#define webkitdownload_h
#include <webkit/webkitdefines.h>
diff --git a/WebKit/gtk/webkit/webkiterror.h b/WebKit/gtk/webkit/webkiterror.h
index 512bc7d..8fec949 100644
--- a/WebKit/gtk/webkit/webkiterror.h
+++ b/WebKit/gtk/webkit/webkiterror.h
@@ -17,8 +17,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef WEBKIT_ERROR_H
-#define WEBKIT_ERROR_H
+#ifndef webkiterror_h
+#define webkiterror_h
#include <glib.h>
diff --git a/WebKit/gtk/webkit/webkithittestresult.h b/WebKit/gtk/webkit/webkithittestresult.h
index 4852027..6caa84e 100644
--- a/WebKit/gtk/webkit/webkithittestresult.h
+++ b/WebKit/gtk/webkit/webkithittestresult.h
@@ -18,8 +18,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef WEBKIT_HIT_TEST_RESULT_H
-#define WEBKIT_HIT_TEST_RESULT_H
+#ifndef webkithittestresult_h
+#define webkithittestresult_h
#include <glib-object.h>
diff --git a/WebKit/gtk/webkit/webkitnetworkrequest.h b/WebKit/gtk/webkit/webkitnetworkrequest.h
index 78e04a1..825ca9e 100644
--- a/WebKit/gtk/webkit/webkitnetworkrequest.h
+++ b/WebKit/gtk/webkit/webkitnetworkrequest.h
@@ -17,8 +17,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef WEBKIT_NETWORK_REQUEST_H
-#define WEBKIT_NETWORK_REQUEST_H
+#ifndef webkitnetworkrequest_h
+#define webkitnetworkrequest_h
#include <glib-object.h>
#include <libsoup/soup.h>
diff --git a/WebKit/gtk/webkit/webkitnetworkresponse.h b/WebKit/gtk/webkit/webkitnetworkresponse.h
index eb233b5..a00308d 100644
--- a/WebKit/gtk/webkit/webkitnetworkresponse.h
+++ b/WebKit/gtk/webkit/webkitnetworkresponse.h
@@ -17,8 +17,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef WEBKIT_NETWORK_RESPONSE_H
-#define WEBKIT_NETWORK_RESPONSE_H
+#ifndef webkitnewtorkresponse_h
+#define webkitnewtorkresponse_h
#include <glib-object.h>
#include <libsoup/soup.h>
diff --git a/WebKit/gtk/webkit/webkitprivate.h b/WebKit/gtk/webkit/webkitprivate.h
index 07ff11d..44dac04 100644
--- a/WebKit/gtk/webkit/webkitprivate.h
+++ b/WebKit/gtk/webkit/webkitprivate.h
@@ -19,8 +19,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef WEBKIT_PRIVATE_H
-#define WEBKIT_PRIVATE_H
+#ifndef webkitprivate_h
+#define webkitprivate_h
/*
* This file knows the shared secret of WebKitWebView, WebKitWebFrame,
diff --git a/WebKit/gtk/webkit/webkitsecurityorigin.h b/WebKit/gtk/webkit/webkitsecurityorigin.h
index eefc7ec..57bcd19 100644
--- a/WebKit/gtk/webkit/webkitsecurityorigin.h
+++ b/WebKit/gtk/webkit/webkitsecurityorigin.h
@@ -17,8 +17,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef WEBKIT_SECURITY_ORIGIN_H
-#define WEBKIT_SECURITY_ORIGIN_H
+#ifndef webkitsecurityorigin_h
+#define webkitsecurityorigin_h
#include "webkitsecurityorigin.h"
#include "webkitwebdatabase.h"
diff --git a/WebKit/gtk/webkit/webkitsoupauthdialog.h b/WebKit/gtk/webkit/webkitsoupauthdialog.h
index 9721c72..01ccfc8 100644
--- a/WebKit/gtk/webkit/webkitsoupauthdialog.h
+++ b/WebKit/gtk/webkit/webkitsoupauthdialog.h
@@ -22,8 +22,8 @@
#include <webkit/webkitdefines.h>
-#ifndef WEBKIT_SOUP_AUTH_DIALOG_H
-#define WEBKIT_SOUP_AUTH_DIALOG_H 1
+#ifndef webkitsoupauthdialog_h
+#define webkitsoupauthdialog_h
G_BEGIN_DECLS
@@ -49,4 +49,4 @@ webkit_soup_auth_dialog_get_type (void);
G_END_DECLS
-#endif /* WEBKIT_SOUP_AUTH_DIALOG_H */
+#endif /* webkitsoupauthdialog_h */
diff --git a/WebKit/gtk/webkit/webkitversion.h.in b/WebKit/gtk/webkit/webkitversion.h.in
index 9f1b818..5eb9426 100644
--- a/WebKit/gtk/webkit/webkitversion.h.in
+++ b/WebKit/gtk/webkit/webkitversion.h.in
@@ -17,8 +17,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef WEBKIT_VERSION_H
-#define WEBKIT_VERSION_H
+#ifndef webkitversion_h
+#define webkitversion_h
#include <glib.h>
#include <webkit/webkitdefines.h>
diff --git a/WebKit/gtk/webkit/webkitwebbackforwardlist.h b/WebKit/gtk/webkit/webkitwebbackforwardlist.h
index a44cbcd..d08566e 100644
--- a/WebKit/gtk/webkit/webkitwebbackforwardlist.h
+++ b/WebKit/gtk/webkit/webkitwebbackforwardlist.h
@@ -17,8 +17,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef WEBKIT_WEB_BACK_FORWARD_LIST_H
-#define WEBKIT_WEB_BACK_FORWARD_LIST_H
+#ifndef webkitwebbackforwardlist_h
+#define webkitwebbackforwardlist_h
#include <glib.h>
#include <glib-object.h>
@@ -114,4 +114,4 @@ webkit_web_back_forward_list_add_item (WebKitWebBackForwardLi
G_END_DECLS
-#endif /* WEBKIT_WEB_BACK_FORWARD_LIST_H */
+#endif /* webkitwebbackforwardlist_h */
diff --git a/WebKit/gtk/webkit/webkitwebdatabase.h b/WebKit/gtk/webkit/webkitwebdatabase.h
index f971dbc..8a9a151 100644
--- a/WebKit/gtk/webkit/webkitwebdatabase.h
+++ b/WebKit/gtk/webkit/webkitwebdatabase.h
@@ -17,8 +17,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef WEBKIT_WEB_DATABASE_H
-#define WEBKIT_WEB_DATABASE_H
+#ifndef webkitwebdatabase_h
+#define webkitwebdatabase_h
#include <glib-object.h>
@@ -93,4 +93,4 @@ webkit_set_default_web_database_quota (guint64 defaultQuota);
G_END_DECLS
-#endif /* __WEBKIT_WEB_DATABASE_H__ */
+#endif /* webkitwebdatabase_h */
diff --git a/WebKit/gtk/webkit/webkitwebdatasource.h b/WebKit/gtk/webkit/webkitwebdatasource.h
index f6e52aa..df83118 100644
--- a/WebKit/gtk/webkit/webkitwebdatasource.h
+++ b/WebKit/gtk/webkit/webkitwebdatasource.h
@@ -17,8 +17,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef WEBKIT_WEB_DATA_SOURCE_H
-#define WEBKIT_WEB_DATA_SOURCE_H
+#ifndef webkitwebdatasource_h
+#define webkitwebdatasource_h
#include <glib.h>
#include <glib-object.h>
@@ -93,4 +93,4 @@ webkit_web_data_source_get_subresources (WebKitWebDataSource *data_source
G_END_DECLS
-#endif /* WEBKIT_WEB_DATA_SOURCE_H */
+#endif /* webkitwebdatasource_h */
diff --git a/WebKit/gtk/webkit/webkitwebframe.h b/WebKit/gtk/webkit/webkitwebframe.h
index 620c4d3..7a95545 100644
--- a/WebKit/gtk/webkit/webkitwebframe.h
+++ b/WebKit/gtk/webkit/webkitwebframe.h
@@ -18,8 +18,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef WEBKIT_WEB_FRAME_H
-#define WEBKIT_WEB_FRAME_H
+#ifndef webkitwebframe_h
+#define webkitwebframe_h
#include <glib-object.h>
#include <gtk/gtk.h>
diff --git a/WebKit/gtk/webkit/webkitwebhistoryitem.h b/WebKit/gtk/webkit/webkitwebhistoryitem.h
index c8a754a..cafeb36 100644
--- a/WebKit/gtk/webkit/webkitwebhistoryitem.h
+++ b/WebKit/gtk/webkit/webkitwebhistoryitem.h
@@ -17,8 +17,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef WEBKIT_WEB_HISTORY_ITEM_H
-#define WEBKIT_WEB_HISTORY_ITEM_H
+#ifndef webkitwebhistoryitem_h
+#define webkitwebhistoryitem_h
#include <glib.h>
#include <glib-object.h>
@@ -84,4 +84,4 @@ webkit_web_history_item_get_last_visited_time (WebKitWebHistoryItem *web_history
G_END_DECLS
-#endif /* WEBKIT_WEB_HISTORY_ITEM_H */
+#endif /* webkitwebhistoryitem_h */
diff --git a/WebKit/gtk/webkit/webkitwebinspector.h b/WebKit/gtk/webkit/webkitwebinspector.h
index 41ccf92..9010e26 100644
--- a/WebKit/gtk/webkit/webkitwebinspector.h
+++ b/WebKit/gtk/webkit/webkitwebinspector.h
@@ -17,8 +17,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef __WEBKIT_WEB_INSPECTOR_H__
-#define __WEBKIT_WEB_INSPECTOR_H__
+#ifndef webkitwebinspector_h
+#define webkitwebinspector_h
#include <glib-object.h>
@@ -62,4 +62,4 @@ webkit_web_inspector_get_inspected_uri(WebKitWebInspector* web_inspector);
G_END_DECLS
-#endif /* __WEBKIT_WEB_INSPECTOR_H__ */
+#endif /* webkitwebinspector_h */
diff --git a/WebKit/gtk/webkit/webkitwebnavigationaction.h b/WebKit/gtk/webkit/webkitwebnavigationaction.h
index c437c50..dbb47a8 100644
--- a/WebKit/gtk/webkit/webkitwebnavigationaction.h
+++ b/WebKit/gtk/webkit/webkitwebnavigationaction.h
@@ -17,8 +17,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef WEBKIT_WEB_NAVIGATION_ACTION_H
-#define WEBKIT_WEB_NAVIGATION_ACTION_H
+#ifndef webkitwebnavigationaction_h
+#define webkitwebnavigationaction_h
#include <glib-object.h>
diff --git a/WebKit/gtk/webkit/webkitwebpolicydecision.h b/WebKit/gtk/webkit/webkitwebpolicydecision.h
index f1ec963..2b61837 100644
--- a/WebKit/gtk/webkit/webkitwebpolicydecision.h
+++ b/WebKit/gtk/webkit/webkitwebpolicydecision.h
@@ -17,8 +17,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef WEBKIT_WEB_POLICY_DECISION_H
-#define WEBKIT_WEB_POLICY_DECISION_H
+#ifndef webkitwebpolicydecision_h
+#define webkitwebpolicydecision_h
#include <glib-object.h>
#include <stdint.h>
diff --git a/WebKit/gtk/webkit/webkitwebresource.h b/WebKit/gtk/webkit/webkitwebresource.h
index 26a0458..05f6066 100644
--- a/WebKit/gtk/webkit/webkitwebresource.h
+++ b/WebKit/gtk/webkit/webkitwebresource.h
@@ -17,8 +17,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef WEBKIT_WEB_RESOURCE_H
-#define WEBKIT_WEB_RESOURCE_H
+#ifndef webkitwebresource_h
+#define webkitwebresource_h
#include <glib.h>
#include <glib-object.h>
@@ -81,4 +81,4 @@ webkit_web_resource_get_frame_name (WebKitWebResource *web_resource);
G_END_DECLS
-#endif /* WEBKIT_WEB_RESOURCE_H */
+#endif /* webkitwebresource_h */
diff --git a/WebKit/gtk/webkit/webkitwebsettings.h b/WebKit/gtk/webkit/webkitwebsettings.h
index 7cd6054..d8dafd9 100644
--- a/WebKit/gtk/webkit/webkitwebsettings.h
+++ b/WebKit/gtk/webkit/webkitwebsettings.h
@@ -18,8 +18,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef __WEBKIT_WEB_SETTINGS_H__
-#define __WEBKIT_WEB_SETTINGS_H__
+#ifndef webkitwebsettings_h
+#define webkitwebsettings_h
#include <glib-object.h>
@@ -72,4 +72,4 @@ webkit_web_settings_get_user_agent (WebKitWebSettings *web_settings);
G_END_DECLS
-#endif /* __WEBKIT_WEB_SETTINGS_H__ */
+#endif /* webkitwebsettings_h */
diff --git a/WebKit/gtk/webkit/webkitwebview.h b/WebKit/gtk/webkit/webkitwebview.h
index 04fd15b..1297695 100644
--- a/WebKit/gtk/webkit/webkitwebview.h
+++ b/WebKit/gtk/webkit/webkitwebview.h
@@ -19,8 +19,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef WEBKIT_WEB_VIEW_H
-#define WEBKIT_WEB_VIEW_H
+#ifndef webkitwebview_h
+#define webkitwebview_h
#include <gtk/gtk.h>
#include <libsoup/soup.h>
diff --git a/WebKit/gtk/webkit/webkitwebwindowfeatures.h b/WebKit/gtk/webkit/webkitwebwindowfeatures.h
index cd28988..a79119d 100644
--- a/WebKit/gtk/webkit/webkitwebwindowfeatures.h
+++ b/WebKit/gtk/webkit/webkitwebwindowfeatures.h
@@ -17,8 +17,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef WEBKIT_WEB_WINDOW_FEATURES_H
-#define WEBKIT_WEB_WINDOW_FEATURES_H
+#ifndef webkitwebwindowfeatures_h
+#define webkitwebwindowfeatures_h
#include <glib-object.h>
@@ -65,4 +65,4 @@ webkit_web_window_features_equal (WebKitWebWindowFeatures* feature
G_END_DECLS
-#endif /* WEBKIT_WEB_WINDOW_FEATURES_H */
+#endif /* webkitwebwindowfeatures_h */
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list