[webkit-changes] cvs commit: WebCore/kwq KWQApplication.h
KWQApplication.mm KWQButton.h KWQKCursor.h KWQLineEdit.h
KWQLineEdit.mm KWQListBox.h KWQPainter.h KWQPainter.mm
KWQPixmap.h KWQTextEdit.h KWQTextEdit.mm KWQWidget.h KWQWidget.mm
Maciej
mjs at opensource.apple.com
Tue Aug 30 02:30:27 PDT 2005
mjs 05/08/30 02:30:27
Modified: . ChangeLog
khtml/rendering font.h render_box.cpp render_image.cpp
render_line.cpp render_list.cpp render_object.cpp
render_text.cpp
kwq KWQApplication.h KWQApplication.mm KWQButton.h
KWQKCursor.h KWQLineEdit.h KWQLineEdit.mm
KWQListBox.h KWQPainter.h KWQPainter.mm KWQPixmap.h
KWQTextEdit.h KWQTextEdit.mm KWQWidget.h
KWQWidget.mm
Added: ForwardingHeaders qpen.h
Log:
Reviewed by Eric.
- http://bugzilla.opendarwin.org/show_bug.cgi?id=4749
(Reduce header dependencies);
Test cases added: None, no functional change.
* ForwardingHeaders/qpen.h: Added.
* khtml/rendering/font.h:
* khtml/rendering/render_box.cpp:
* khtml/rendering/render_image.cpp:
* khtml/rendering/render_line.cpp:
* khtml/rendering/render_list.cpp:
* khtml/rendering/render_object.cpp:
* khtml/rendering/render_text.cpp:
* kwq/KWQApplication.h:
* kwq/KWQApplication.mm:
* kwq/KWQButton.h:
* kwq/KWQKCursor.h:
* kwq/KWQLineEdit.h:
* kwq/KWQLineEdit.mm:
* kwq/KWQListBox.h:
* kwq/KWQPainter.h:
* kwq/KWQPainter.mm:
(QPainter::setCompositeOperation):
(QPainter::compositeOperatorFromString):
* kwq/KWQPixmap.h:
* kwq/KWQTextEdit.h:
* kwq/KWQTextEdit.mm:
* kwq/KWQWidget.h:
* kwq/KWQWidget.mm:
Revision Changes Path
1.39 +34 -0 WebCore/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebCore/ChangeLog,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- ChangeLog 30 Aug 2005 03:46:36 -0000 1.38
+++ ChangeLog 30 Aug 2005 09:30:19 -0000 1.39
@@ -1,3 +1,37 @@
+2005-08-30 Maciej Stachowiak <mjs at apple.com>
+
+ Reviewed by Eric.
+
+ - http://bugzilla.opendarwin.org/show_bug.cgi?id=4749
+ (Reduce header dependencies);
+
+ Test cases added: None, no functional change.
+
+ * ForwardingHeaders/qpen.h: Added.
+ * khtml/rendering/font.h:
+ * khtml/rendering/render_box.cpp:
+ * khtml/rendering/render_image.cpp:
+ * khtml/rendering/render_line.cpp:
+ * khtml/rendering/render_list.cpp:
+ * khtml/rendering/render_object.cpp:
+ * khtml/rendering/render_text.cpp:
+ * kwq/KWQApplication.h:
+ * kwq/KWQApplication.mm:
+ * kwq/KWQButton.h:
+ * kwq/KWQKCursor.h:
+ * kwq/KWQLineEdit.h:
+ * kwq/KWQLineEdit.mm:
+ * kwq/KWQListBox.h:
+ * kwq/KWQPainter.h:
+ * kwq/KWQPainter.mm:
+ (QPainter::setCompositeOperation):
+ (QPainter::compositeOperatorFromString):
+ * kwq/KWQPixmap.h:
+ * kwq/KWQTextEdit.h:
+ * kwq/KWQTextEdit.mm:
+ * kwq/KWQWidget.h:
+ * kwq/KWQWidget.mm:
+
2005-08-29 Maciej Stachowiak <mjs at apple.com>
- make the JS tests that weren't already doing so dump as text, and remove
1.3 +1 -1 WebCore/ForwardingHeaders/qpen.h
1.34 +1 -0 WebCore/khtml/rendering/font.h
Index: font.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/font.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- font.h 15 Aug 2005 04:31:06 -0000 1.33
+++ font.h 30 Aug 2005 09:30:20 -0000 1.34
@@ -26,6 +26,7 @@
#ifndef KHTMLFONT_H
#define KHTMLFONT_H
+#include <qcolor.h>
#include <qfont.h>
#include <qfontmetrics.h>
#include <qpainter.h>
1.165 +1 -0 WebCore/khtml/rendering/render_box.cpp
Index: render_box.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_box.cpp,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- render_box.cpp 27 Aug 2005 00:14:20 -0000 1.164
+++ render_box.cpp 30 Aug 2005 09:30:20 -0000 1.165
@@ -26,6 +26,7 @@
#include <qpainter.h>
+#include <qpen.h>
#include "rendering/render_box.h"
#include "rendering/render_replaced.h"
1.86 +1 -0 WebCore/khtml/rendering/render_image.cpp
Index: render_image.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_image.cpp,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- render_image.cpp 25 Aug 2005 17:47:15 -0000 1.85
+++ render_image.cpp 30 Aug 2005 09:30:20 -0000 1.86
@@ -29,6 +29,7 @@
#include <qdrawutil.h>
#include <qpainter.h>
+#include <qpen.h>
#include <qwmatrix.h>
#include <kapplication.h>
1.50 +1 -0 WebCore/khtml/rendering/render_line.cpp
Index: render_line.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_line.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- render_line.cpp 29 Aug 2005 21:29:21 -0000 1.49
+++ render_line.cpp 30 Aug 2005 09:30:20 -0000 1.50
@@ -23,6 +23,7 @@
#include <kdebug.h>
#include <assert.h>
#include <qpainter.h>
+#include <qpen.h>
#include <kglobal.h>
#include "rendering/render_flow.h"
1.69 +1 -0 WebCore/khtml/rendering/render_list.cpp
Index: render_list.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_list.cpp,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- render_list.cpp 25 Aug 2005 23:13:54 -0000 1.68
+++ render_list.cpp 30 Aug 2005 09:30:21 -0000 1.69
@@ -30,6 +30,7 @@
#include "htmlnames.h"
#include <qpainter.h>
+#include <qpen.h>
#include "misc/helper.h"
1.209 +1 -0 WebCore/khtml/rendering/render_object.cpp
Index: render_object.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_object.cpp,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -r1.208 -r1.209
--- render_object.cpp 28 Aug 2005 04:10:13 -0000 1.208
+++ render_object.cpp 30 Aug 2005 09:30:21 -0000 1.209
@@ -36,6 +36,7 @@
#include "css/cssstyleselector.h"
#include <kdebug.h>
#include <qpainter.h>
+#include <qpen.h>
#include "khtmlview.h"
#include "khtml_part.h"
#include "render_arena.h"
1.192 +1 -0 WebCore/khtml/rendering/render_text.cpp
Index: render_text.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_text.cpp,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -r1.191 -r1.192
--- render_text.cpp 29 Aug 2005 18:00:45 -0000 1.191
+++ render_text.cpp 30 Aug 2005 09:30:21 -0000 1.192
@@ -40,6 +40,7 @@
#include "khtml_part.h"
#include <qpainter.h>
+#include <qpen.h>
#include <kdebug.h>
#include <assert.h>
1.24 +1 -0 WebCore/kwq/KWQApplication.h
Index: KWQApplication.h
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQApplication.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- KWQApplication.h 23 Jun 2005 21:25:49 -0000 1.23
+++ KWQApplication.h 30 Aug 2005 09:30:23 -0000 1.24
@@ -26,6 +26,7 @@
#ifndef QAPPLICATION_H_
#define QAPPLICATION_H_
+#include "KWQPalette.h"
#include "KWQWidget.h"
class QDesktopWidget;
1.44 +1 -0 WebCore/kwq/KWQApplication.mm
Index: KWQApplication.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQApplication.mm,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- KWQApplication.mm 1 Jun 2005 23:49:49 -0000 1.43
+++ KWQApplication.mm 30 Aug 2005 09:30:23 -0000 1.44
@@ -24,6 +24,7 @@
*/
#import "KWQApplication.h"
+#import "KWQStyle.h"
// The NSScreen Cocoa calls in this file should never throw, so
// there's no need to block exceptions.
1.27 +1 -0 WebCore/kwq/KWQButton.h
Index: KWQButton.h
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQButton.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- KWQButton.h 19 Mar 2005 00:34:07 -0000 1.26
+++ KWQButton.h 30 Aug 2005 09:30:23 -0000 1.27
@@ -29,6 +29,7 @@
#include "KWQWidget.h"
#include "KWQString.h"
#include "KWQSignal.h"
+#include "KWQPainter.h"
class QButton : public QWidget {
public:
1.14 +2 -0 WebCore/kwq/KWQKCursor.h
Index: KWQKCursor.h
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQKCursor.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- KWQKCursor.h 1 Oct 2003 23:27:11 -0000 1.13
+++ KWQKCursor.h 30 Aug 2005 09:30:23 -0000 1.14
@@ -28,6 +28,8 @@
#include "KWQCursor.h"
+class QWidget;
+
class KCursor {
public:
1.34 +1 -0 WebCore/kwq/KWQLineEdit.h
Index: KWQLineEdit.h
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQLineEdit.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- KWQLineEdit.h 24 Jun 2005 05:53:28 -0000 1.33
+++ KWQLineEdit.h 30 Aug 2005 09:30:23 -0000 1.34
@@ -28,6 +28,7 @@
#include "KWQString.h"
#include "KWQWidget.h"
+#include "KWQPainter.h"
#ifdef __OBJC__
@class KWQTextFieldController;
1.70 +1 -0 WebCore/kwq/KWQLineEdit.mm
Index: KWQLineEdit.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQLineEdit.mm,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- KWQLineEdit.mm 14 Jul 2005 02:22:12 -0000 1.69
+++ KWQLineEdit.mm 30 Aug 2005 09:30:24 -0000 1.70
@@ -29,6 +29,7 @@
#import "KWQExceptions.h"
#import "KWQKHTMLPart.h"
#import "KWQLogging.h"
+#import "KWQPalette.h"
#import "KWQTextField.h"
#import "WebCoreBridge.h"
#import "WebCoreTextRenderer.h"
1.24 +1 -0 WebCore/kwq/KWQListBox.h
Index: KWQListBox.h
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQListBox.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- KWQListBox.h 12 Aug 2005 01:30:35 -0000 1.23
+++ KWQListBox.h 30 Aug 2005 09:30:24 -0000 1.24
@@ -27,6 +27,7 @@
#define KWQLISTBOX_H_
#include "KWQScrollView.h"
+#include "KWQPainter.h"
struct KWQListBoxItem
{
1.79 +8 -10 WebCore/kwq/KWQPainter.h
Index: KWQPainter.h
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQPainter.h,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- KWQPainter.h 27 Aug 2005 00:14:22 -0000 1.78
+++ KWQPainter.h 30 Aug 2005 09:30:24 -0000 1.79
@@ -26,23 +26,21 @@
#ifndef QPAINTER_H_
#define QPAINTER_H_
+#include "KWQFontMetrics.h"
#include "KWQNamespace.h"
-#include "KWQPaintDevice.h"
-#include "KWQColor.h"
-#include "KWQPen.h"
-#include "KWQBrush.h"
#include "KWQRect.h"
-#include "KWQRegion.h"
-#include "KWQPointArray.h"
-#include "KWQString.h"
-#include "KWQFontMetrics.h"
#include <ApplicationServices/ApplicationServices.h>
+class QBrush;
class QFont;
+class QPaintDevice;
class QPixmap;
+class QPen;
+class QPointArray;
class QWidget;
class QPainterPrivate;
+class QString;
class QPainter : public Qt {
public:
@@ -138,9 +136,9 @@
CGContextRef currentContext();
- static int compositeOperatorFromString (QString aString);
+ static int compositeOperatorFromString (const QString &aString);
static int getCompositeOperation(CGContextRef context);
- static void setCompositeOperation (CGContextRef context, QString operation);
+ static void setCompositeOperation (CGContextRef context, const QString &operation);
static void setCompositeOperation (CGContextRef context, int operation);
private:
1.134 +6 -7 WebCore/kwq/KWQPainter.mm
Index: KWQPainter.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQPainter.mm,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- KWQPainter.mm 27 Aug 2005 00:14:22 -0000 1.133
+++ KWQPainter.mm 30 Aug 2005 09:30:24 -0000 1.134
@@ -26,16 +26,15 @@
#import "KWQPainter.h"
#import "KWQAssertions.h"
+#import "KWQBrush.h"
#import "KWQExceptions.h"
-#import "KWQFontMetrics.h"
-#import "KWQKHTMLPart.h"
+#import "KWQFoundationExtras.h"
#import "KWQPaintDevice.h"
+#import "KWQPen.h"
#import "KWQPixmap.h"
-#import "KWQPointArray.h"
#import "KWQPrinter.h"
#import "KWQPtrStack.h"
-#import "KWQWidget.h"
-#import "KWQFoundationExtras.h"
+#import "KWQRegion.h"
#import "WebCoreGraphicsBridge.h"
#import "WebCoreImageRenderer.h"
#import "WebCoreImageRendererFactory.h"
@@ -461,7 +460,7 @@
return (int)[[WebCoreImageRendererFactory sharedFactory] CGCompositeOperationInContext:context];
}
-void QPainter::setCompositeOperation (CGContextRef context, QString op)
+void QPainter::setCompositeOperation (CGContextRef context, const QString &op)
{
[[WebCoreImageRendererFactory sharedFactory] setCGCompositeOperationFromString:op.getNSString() inContext:context];
}
@@ -471,7 +470,7 @@
[[WebCoreImageRendererFactory sharedFactory] setCGCompositeOperation:op inContext:context];
}
-int QPainter::compositeOperatorFromString (QString aString)
+int QPainter::compositeOperatorFromString (const QString &aString)
{
NSCompositingOperation op = NSCompositeSourceOver;
1.43 +4 -1 WebCore/kwq/KWQPixmap.h
Index: KWQPixmap.h
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQPixmap.h,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- KWQPixmap.h 27 Aug 2005 00:14:22 -0000 1.42
+++ KWQPixmap.h 30 Aug 2005 09:30:24 -0000 1.43
@@ -33,7 +33,8 @@
#include "KWQImage.h"
#include "KWQSize.h"
#include "KWQRect.h"
-#include "KWQPainter.h"
+
+#include <ApplicationServices/ApplicationServices.h>
#ifdef __OBJC__
@protocol WebCoreImageRenderer;
@@ -46,6 +47,8 @@
#endif
class QWMatrix;
+class QPainter;
+class QPixmap;
namespace khtml
{
1.26 +1 -0 WebCore/kwq/KWQTextEdit.h
Index: KWQTextEdit.h
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQTextEdit.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- KWQTextEdit.h 24 Jun 2005 05:53:29 -0000 1.25
+++ KWQTextEdit.h 30 Aug 2005 09:30:24 -0000 1.26
@@ -29,6 +29,7 @@
#include "KWQScrollView.h"
#include "KWQSignal.h"
+#include "KWQPainter.h"
class QTextEdit : public QScrollView
{
1.50 +1 -0 WebCore/kwq/KWQTextEdit.mm
Index: KWQTextEdit.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQTextEdit.mm,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- KWQTextEdit.mm 16 Aug 2005 19:03:19 -0000 1.49
+++ KWQTextEdit.mm 30 Aug 2005 09:30:24 -0000 1.50
@@ -28,6 +28,7 @@
#import "KWQAssertions.h"
#import "KWQExceptions.h"
#import "KWQLineEdit.h"
+#import "KWQPalette.h"
#import "KWQTextArea.h"
QTextEdit::QTextEdit(QWidget *parent)
1.66 +4 -5 WebCore/kwq/KWQWidget.h
Index: KWQWidget.h
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQWidget.h,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- KWQWidget.h 24 Jan 2005 20:48:26 -0000 1.65
+++ KWQWidget.h 30 Aug 2005 09:30:25 -0000 1.66
@@ -28,14 +28,9 @@
#include "KWQObject.h"
#include "KWQPaintDevice.h"
-#include "KWQPainter.h"
-#include "KWQPointArray.h"
#include "KWQSize.h"
-#include "KWQPalette.h"
#include "KWQFont.h"
#include "KWQCursor.h"
-#include "KWQEvent.h"
-#include "KWQStyle.h"
#ifdef __OBJC__
@class NSView;
@@ -44,6 +39,10 @@
#endif
class KWQWidgetPrivate;
+class QEvent;
+class QPalette;
+class QPainter;
+class QStyle;
class QWidget : public QObject, public QPaintDevice {
public:
1.109 +1 -0 WebCore/kwq/KWQWidget.mm
Index: KWQWidget.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQWidget.mm,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- KWQWidget.mm 14 Jul 2005 02:32:33 -0000 1.108
+++ KWQWidget.mm 30 Aug 2005 09:30:25 -0000 1.109
@@ -29,6 +29,7 @@
#import "KWQFoundationExtras.h"
#import "KWQKHTMLPart.h"
#import "KWQLogging.h"
+#import "KWQStyle.h"
#import "KWQView.h"
#import "KWQWindowWidget.h"
#import "WebCoreBridge.h"
More information about the webkit-changes
mailing list