[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
darin
darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:20:12 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 1bd92ea068b8e5e725ff030374f0de4f828641b9
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Jan 17 17:04:38 2003 +0000
Reviewed by Ken.
- removed unused KWQDrawUtil code
* ForwardingHeaders/qdrawutil.h: Emptied this file out.
* kwq/KWQDrawUtil.h: Removed.
* kwq/KWQDrawUtil.mm: Removed.
* WebCore.pbproj/project.pbxproj: Removed KWQDrawUtil.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3348 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 8eb418b..9deb2dc 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,17 @@
2003-01-17 Darin Adler <darin at apple.com>
+ Reviewed by Ken.
+
+ - removed unused KWQDrawUtil code
+
+ * ForwardingHeaders/qdrawutil.h: Emptied this file out.
+
+ * kwq/KWQDrawUtil.h: Removed.
+ * kwq/KWQDrawUtil.mm: Removed.
+ * WebCore.pbproj/project.pbxproj: Removed KWQDrawUtil.
+
+2003-01-17 Darin Adler <darin at apple.com>
+
Reviewed by John.
- updated copyright to include expat copyrights
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 8eb418b..9deb2dc 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,17 @@
2003-01-17 Darin Adler <darin at apple.com>
+ Reviewed by Ken.
+
+ - removed unused KWQDrawUtil code
+
+ * ForwardingHeaders/qdrawutil.h: Emptied this file out.
+
+ * kwq/KWQDrawUtil.h: Removed.
+ * kwq/KWQDrawUtil.mm: Removed.
+ * WebCore.pbproj/project.pbxproj: Removed KWQDrawUtil.
+
+2003-01-17 Darin Adler <darin at apple.com>
+
Reviewed by John.
- updated copyright to include expat copyrights
diff --git a/WebCore/ForwardingHeaders/qdrawutil.h b/WebCore/ForwardingHeaders/qdrawutil.h
index 9cbc9ab..e69de29 100644
--- a/WebCore/ForwardingHeaders/qdrawutil.h
+++ b/WebCore/ForwardingHeaders/qdrawutil.h
@@ -1 +0,0 @@
-#include "KWQDrawUtil.h"
diff --git a/WebCore/WebCore.pbproj/project.pbxproj b/WebCore/WebCore.pbproj/project.pbxproj
index 630648a..2c5bd35 100644
--- a/WebCore/WebCore.pbproj/project.pbxproj
+++ b/WebCore/WebCore.pbproj/project.pbxproj
@@ -270,7 +270,6 @@
F58786D502DE3B8601EA4122,
F58786D602DE3B8601EA4122,
F58786D702DE3B8601EA4122,
- F58786D802DE3B8601EA4122,
F58786D902DE3B8601EA4122,
F58786DA02DE3B8601EA4122,
F58786DB02DE3B8601EA4122,
@@ -517,7 +516,6 @@
F587856802DE375901EA4122,
F587856902DE375901EA4122,
F587856E02DE375901EA4122,
- F587856F02DE375901EA4122,
F587857002DE375901EA4122,
F587857102DE375901EA4122,
F587857202DE375901EA4122,
@@ -4851,12 +4849,6 @@
path = KWQDictImpl.mm;
refType = 4;
};
- F58784DD02DE375901EA4122 = {
- fileEncoding = 30;
- isa = PBXFileReference;
- path = KWQDrawUtil.mm;
- refType = 4;
- };
F58784DE02DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
@@ -5601,12 +5593,6 @@
settings = {
};
};
- F587856F02DE375901EA4122 = {
- fileRef = F58784DD02DE375901EA4122;
- isa = PBXBuildFile;
- settings = {
- };
- };
F587857002DE375901EA4122 = {
fileRef = F58784DE02DE375901EA4122;
isa = PBXBuildFile;
@@ -7110,12 +7096,6 @@
path = KWQDict.h;
refType = 4;
};
- F587868702DE3B8601EA4122 = {
- fileEncoding = 30;
- isa = PBXFileReference;
- path = KWQDrawUtil.h;
- refType = 4;
- };
F587868802DE3B8601EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
@@ -7518,12 +7498,6 @@
settings = {
};
};
- F58786D802DE3B8601EA4122 = {
- fileRef = F587868702DE3B8601EA4122;
- isa = PBXBuildFile;
- settings = {
- };
- };
F58786D902DE3B8601EA4122 = {
fileRef = F587868802DE3B8601EA4122;
isa = PBXBuildFile;
@@ -7872,8 +7846,6 @@
F587868602DE3B8601EA4122,
F58784DB02DE375901EA4122,
F58784DC02DE375901EA4122,
- F587868702DE3B8601EA4122,
- F58784DD02DE375901EA4122,
F587868802DE3B8601EA4122,
F58784DE02DE375901EA4122,
F587868902DE3B8601EA4122,
diff --git a/WebCore/kwq/KWQDrawUtil.h b/WebCore/kwq/KWQDrawUtil.h
deleted file mode 100644
index 8544787..0000000
--- a/WebCore/kwq/KWQDrawUtil.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2001 Apple Computer, Inc. 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 QDRAWUTIL_H_
-#define QDRAWUTIL_H_
-
-#include "KWQPainter.h"
-#include "KWQPalette.h"
-#include "KWQBrush.h"
-
-void qDrawShadePanel(QPainter *, int, int, int, int, const QColorGroup &, bool
- sunken = FALSE, int lineWidth = 1, const QBrush *fill = 0);
-
-#endif
diff --git a/WebCore/kwq/KWQDrawUtil.mm b/WebCore/kwq/KWQDrawUtil.mm
deleted file mode 100644
index 0a2e4b1..0000000
--- a/WebCore/kwq/KWQDrawUtil.mm
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright (C) 2001 Apple Computer, Inc. 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.
- */
-
-#import "KWQDrawUtil.h"
-
-void qDrawShadePanel(QPainter *p, int x, int y, int w, int h, const QColorGroup &g, bool
- sunken, int lineWidth, const QBrush *fill)
-{
- if ( w == 0 || h == 0 ) {
- return;
- }
-
- QPen oldPen = p->pen(); // save pen
- QPointArray a(4 * lineWidth);
-
- if (sunken) {
- p->setPen(g.dark());
- }
- else {
- p->setPen(g.light());
- }
-
- int x1, y1, x2, y2;
- int i;
- int n = 0;
- x1 = x;
- y1 = y2 = y;
- x2 = x+w-2;
-
- for (i = 0; i < lineWidth; i++) { // top shadow
- a.setPoint(n++, x1, y1++);
- a.setPoint(n++, x2--, y2++);
- }
-
- x2 = x1;
- y1 = y+h-2;
-
- for (i = 0; i < lineWidth; i++) { // left shadow
- a.setPoint(n++, x1++, y1);
- a.setPoint(n++, x2++, y2--);
- }
-
- p->drawLineSegments(a);
- n = 0;
-
- if (sunken) {
- p->setPen(g.light());
- }
- else {
- p->setPen(g.dark());
- }
-
- x1 = x;
- y1 = y2 = y+h-1;
- x2 = x+w-1;
-
- for (i = 0; i < lineWidth; i++) { // bottom shadow
- a.setPoint(n++, x1++, y1--);
- a.setPoint(n++, x2, y2--);
- }
-
- x1 = x2;
- y1 = y;
- y2 = y+h-lineWidth-1;
-
- for (i = 0; i < lineWidth; i++) { // right shadow
- a.setPoint(n++, x1--, y1++);
- a.setPoint(n++, x2--, y2);
- }
-
- p->drawLineSegments(a);
- if (fill) { // fill with fill color
- QBrush oldBrush = p->brush();
- p->setPen(Qt::NoPen);
- p->setBrush(*fill);
- p->drawRect(x+lineWidth, y+lineWidth, w-lineWidth*2, h-lineWidth*2);
- p->setBrush(oldBrush);
- }
- p->setPen(oldPen); // restore pen
-}
-
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list