[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

rjw rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 05:50:10 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit 1b0d0a9fcc6e86d47769c62473760e42c8f5f499
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 11 23:29:35 2001 +0000

    Added support for QButton.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@311 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/kwq/KWQButton.mm b/WebCore/kwq/KWQButton.mm
index 0b7aad7..5e4241f 100644
--- a/WebCore/kwq/KWQButton.mm
+++ b/WebCore/kwq/KWQButton.mm
@@ -25,28 +25,29 @@
 
 #include <qbutton.h>
 
+#include <KWQView.h>
 #include <kwqdebug.h>
 
 QButton::QButton(QWidget *parent)
 {
-    _logNotYetImplemented();
+    setView ([[[KWQNSButton alloc] initWithFrame: NSMakeRect (0,0,0,0) widget: this] autorelease]);
 }
 
 
 QButton::~QButton()
 {
-    _logNotYetImplemented();
 }
 
 
-void QButton::setText(const QString &)
+void QButton::setText(const QString &s)
 {
-    _logNotYetImplemented();
+    [(KWQNSButton *)getView() setTitle: QSTRING_TO_NSSTRING (s)];
 }
 
 
 QString QButton::text() const
 {
-    _logNotYetImplemented();
+    KWQNSButton *button = (KWQNSButton *)getView();
+    return NSSTRING_TO_QSTRING([button title]);
 }
 
diff --git a/WebCore/kwq/KWQScrollView.mm b/WebCore/kwq/KWQScrollView.mm
index 08c6ac0..51d0783 100644
--- a/WebCore/kwq/KWQScrollView.mm
+++ b/WebCore/kwq/KWQScrollView.mm
@@ -117,15 +117,24 @@ void QScrollView::setHScrollBarMode(ScrollBarMode)
 }
 
 
-void QScrollView::addChild(QWidget* child, int x=0, int y=0)
+void QScrollView::addChild(QWidget* child, int x, int y)
 {
-    _logNotYetImplemented();
+    NSView *thisView, *subView;
+    
+    child->move (x, y);
+    
+    thisView = getView();
+    subView = child->getView();
+    [thisView addSubview: subView];
 }
 
 
 void QScrollView::removeChild(QWidget* child)
 {
-    _logNeverImplemented();
+    NSView *subView;
+
+    subView = child->getView();
+    [subView removeFromSuperview];
 }
 
 
diff --git a/WebCore/kwq/KWQView.h b/WebCore/kwq/KWQView.h
index 978770a..6c9eeb1 100644
--- a/WebCore/kwq/KWQView.h
+++ b/WebCore/kwq/KWQView.h
@@ -9,3 +9,10 @@ class QWidget;
 }
 - initWithFrame: (NSRect)r widget: (QWidget *)w; 
 @end
+
+ at interface KWQNSButton : NSButton
+{
+    QWidget *widget;
+}
+- initWithFrame: (NSRect)r widget: (QWidget *)w; 
+ at end
diff --git a/WebCore/kwq/KWQView.mm b/WebCore/kwq/KWQView.mm
index 8887988..7a0e12f 100644
--- a/WebCore/kwq/KWQView.mm
+++ b/WebCore/kwq/KWQView.mm
@@ -11,6 +11,7 @@
 }
 
 
+// This should eventually be removed.
 - (void)drawRect:(NSRect)rect {
     widget->paint((void *)0);
 }
@@ -22,3 +23,13 @@
 }
 
 @end
+
+ at implementation KWQNSButton
+
+- initWithFrame: (NSRect) r widget: (QWidget *)w 
+{
+    [super initWithFrame: r];
+    widget = w;
+}
+
+ at end
\ No newline at end of file
diff --git a/WebCore/kwq/KWQWidget.h b/WebCore/kwq/KWQWidget.h
index 2f3e009..e75bcb4 100644
--- a/WebCore/kwq/KWQWidget.h
+++ b/WebCore/kwq/KWQWidget.h
@@ -48,8 +48,6 @@
 
 #import <Cocoa/Cocoa.h>
 
-#import "KWQView.h"
-
 #undef Fixed
 #undef Rect
 #undef Boolean
@@ -156,9 +154,11 @@ public:
     virtual void paint (void *);
     
 #if (defined(__APPLE__) && defined(__OBJC__) && defined(__cplusplus))
-    KWQView 	*getView();
+    NSView 	*getView() const;
+    void 	setView(NSView *aView);
 #else
-    void 	*getView();
+    void 	*getView() const;
+    void 	setView(void *aView);
 #endif
 
 #endif _KWQ_
@@ -175,7 +175,7 @@ private:
     QWidget &operator=(const QWidget &);
 
     void setCRect( const QRect &r );
-    void internalSetGeometry( int x, int y, int w, int h, bool isMove );
+    void internalSetGeometry( int x, int y, int w, int h, bool updateView );
 
     void _initialize();
 
@@ -188,7 +188,7 @@ private:
         QCursor	*cursor;
         QPalette pal;
 #if (defined(__APPLE__) && defined(__OBJC__) && defined(__cplusplus))
-        KWQView	*view;
+        NSView	*view;
 #else
         void 	*view;
 #endif
diff --git a/WebCore/kwq/KWQWidget.mm b/WebCore/kwq/KWQWidget.mm
index 7f125bb..b55f706 100644
--- a/WebCore/kwq/KWQWidget.mm
+++ b/WebCore/kwq/KWQWidget.mm
@@ -83,7 +83,7 @@ QSize QWidget::sizeHint() const
 
 void QWidget::resize(int w, int h) 
 {
-    internalSetGeometry( data->rect.x(), data->rect.y(), w, h, FALSE );
+    internalSetGeometry( data->rect.x(), data->rect.y(), w, h, TRUE );
 }
 
 void QWidget::setActiveWindow() 
@@ -226,9 +226,9 @@ void QWidget::setFocusPolicy(FocusPolicy fp)
 }
 
 
-void QWidget::setFocusProxy( QWidget * )
+void QWidget::setFocusProxy( QWidget *w)
 {
-    _logNeverImplemented();
+    data->focusPolicy = w->focusPolicy();
 }
 
 
@@ -271,7 +271,7 @@ void QWidget::setStyle(QStyle *style)
 
 QFont QWidget::font() const
 {
-    _logNotYetImplemented();
+    return *data->font;
 }
 
 
@@ -361,7 +361,7 @@ void QWidget::setCRect( const QRect &r )
     data->rect = r;
 }
 
-void QWidget::internalSetGeometry( int x, int y, int w, int h, bool isMove )
+void QWidget::internalSetGeometry( int x, int y, int w, int h, bool updateView )
 {
     if ( w < 1 )				// invalid size
 	w = 1;
@@ -379,12 +379,11 @@ void QWidget::internalSetGeometry( int x, int y, int w, int h, bool isMove )
 
     setCRect( r );
 
-    bool isResize = size() != oldSize;
-
-    // FIXME!  First approximation.  May need to translate coordinates.
-    [data->view setFrame: NSMakeRect (data->rect.x(), data->rect.y(), data->rect.width(), data->rect.height())];
+    if (updateView != FALSE)
+        [data->view setFrame: NSMakeRect (data->rect.x(), data->rect.y(), data->rect.width(), data->rect.height())];
 }
 
+
 void QWidget::showEvent(QShowEvent *)
 {
     _logNeverImplemented();
@@ -460,15 +459,36 @@ void QWidget::paint (void *)
 }
 
 #if (defined(__APPLE__) && defined(__OBJC__) && defined(__cplusplus))
-NSView *QWidget::getView()
+NSView *QWidget::getView() const
 {
     return data->view;
 }
+
+
+void QWidget::setView(NSView *view)
+{
+    if (data->view)
+        [data->view release];
+    data->view = [view retain];
+        
+    NSRect frame = [data->view frame];
+    internalSetGeometry (frame.origin.x, frame.origin.y, frame.size.width, frame.size.height, FALSE);
+}
 #else
-void *QWidget::getView()
+void *QWidget::getView() const
 {
     return data->view;
 }
+
+void QWidget::setView(void *view)
+{
+    if (data->view)
+        [data->view release];
+    data->view = [view retain];
+        
+    NSRect frame = [data->view frame];
+    internalSetGeometry (frame.x, frame.y, frame.width, frame.height, FALSE);
+}
 #endif
 
 #endif _KWQ_
diff --git a/WebCore/kwq/qt/qwidget.h b/WebCore/kwq/qt/qwidget.h
index 2f3e009..e75bcb4 100644
--- a/WebCore/kwq/qt/qwidget.h
+++ b/WebCore/kwq/qt/qwidget.h
@@ -48,8 +48,6 @@
 
 #import <Cocoa/Cocoa.h>
 
-#import "KWQView.h"
-
 #undef Fixed
 #undef Rect
 #undef Boolean
@@ -156,9 +154,11 @@ public:
     virtual void paint (void *);
     
 #if (defined(__APPLE__) && defined(__OBJC__) && defined(__cplusplus))
-    KWQView 	*getView();
+    NSView 	*getView() const;
+    void 	setView(NSView *aView);
 #else
-    void 	*getView();
+    void 	*getView() const;
+    void 	setView(void *aView);
 #endif
 
 #endif _KWQ_
@@ -175,7 +175,7 @@ private:
     QWidget &operator=(const QWidget &);
 
     void setCRect( const QRect &r );
-    void internalSetGeometry( int x, int y, int w, int h, bool isMove );
+    void internalSetGeometry( int x, int y, int w, int h, bool updateView );
 
     void _initialize();
 
@@ -188,7 +188,7 @@ private:
         QCursor	*cursor;
         QPalette pal;
 #if (defined(__APPLE__) && defined(__OBJC__) && defined(__cplusplus))
-        KWQView	*view;
+        NSView	*view;
 #else
         void 	*view;
 #endif
diff --git a/WebCore/kwq/tests/draw/drawApp/drawApp.pbproj/project.pbxproj b/WebCore/kwq/tests/draw/drawApp/drawApp.pbproj/project.pbxproj
index d5fa309..f9d4fde 100644
--- a/WebCore/kwq/tests/draw/drawApp/drawApp.pbproj/project.pbxproj
+++ b/WebCore/kwq/tests/draw/drawApp/drawApp.pbproj/project.pbxproj
@@ -148,7 +148,7 @@
 		};
 		29B97315FDCFA39411CA2CEA = {
 			children = (
-				9C00349001601F7F0ECA16EA,
+				9C05E99F017653320ECA16EA,
 			);
 			isa = PBXGroup;
 			name = "Other Sources";
@@ -159,9 +159,9 @@
 			children = (
 				29B97318FDCFA39411CA2CEA,
 				089C165CFE840E0CC02AAC07,
-				9C00349401627E910ECA16EA,
-				9C00349501627E910ECA16EA,
-				9C00349601627E910ECA16EA,
+				9C05E999017653110ECA16EA,
+				9C05E99A017653110ECA16EA,
+				9C05E99B017653110ECA16EA,
 			);
 			isa = PBXGroup;
 			name = Resources;
@@ -270,9 +270,9 @@
 			files = (
 				080E96DCFE201CFB7F000001,
 				089C165EFE840E0CC02AAC07,
-				9C00349701627E910ECA16EA,
-				9C00349801627E910ECA16EA,
-				9C00349901627E910ECA16EA,
+				9C05E99C017653110ECA16EA,
+				9C05E99D017653110ECA16EA,
+				9C05E99E017653110ECA16EA,
 			);
 			isa = PBXResourcesBuildPhase;
 			name = "Bundle Resources";
@@ -280,7 +280,7 @@
 		29B9732BFDCFA39411CA2CEA = {
 			buildActionMask = 2147483647;
 			files = (
-				9C00349101601F7F0ECA16EA,
+				9C05E9A0017653320ECA16EA,
 			);
 			isa = PBXSourcesBuildPhase;
 			name = Sources;
@@ -332,50 +332,50 @@
 //9C2
 //9C3
 //9C4
-		9C00349001601F7F0ECA16EA = {
-			isa = PBXFileReference;
-			name = draw.mm;
-			path = /Network/Servers/abel/homes/gimli/rjw/src/Labyrinth/WebPageView/src/kwq/tests/draw/draw.mm;
-			refType = 0;
-		};
-		9C00349101601F7F0ECA16EA = {
-			fileRef = 9C00349001601F7F0ECA16EA;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		9C00349401627E910ECA16EA = {
+		9C05E999017653110ECA16EA = {
 			isa = PBXFileReference;
 			name = powermac.jpg;
-			path = /Network/Servers/abel/homes/gimli/rjw/src/Labyrinth/WebPageView/src/kwq/tests/draw/powermac.jpg;
-			refType = 0;
+			path = ../powermac.jpg;
+			refType = 2;
 		};
-		9C00349501627E910ECA16EA = {
+		9C05E99A017653110ECA16EA = {
 			isa = PBXFileReference;
 			name = qt.png;
-			path = /Network/Servers/abel/homes/gimli/rjw/src/Labyrinth/WebPageView/src/kwq/tests/draw/qt.png;
-			refType = 0;
+			path = ../qt.png;
+			refType = 2;
 		};
-		9C00349601627E910ECA16EA = {
+		9C05E99B017653110ECA16EA = {
 			isa = PBXFileReference;
 			name = yahoo.gif;
-			path = /Network/Servers/abel/homes/gimli/rjw/src/Labyrinth/WebPageView/src/kwq/tests/draw/yahoo.gif;
-			refType = 0;
+			path = ../yahoo.gif;
+			refType = 2;
+		};
+		9C05E99C017653110ECA16EA = {
+			fileRef = 9C05E999017653110ECA16EA;
+			isa = PBXBuildFile;
+			settings = {
+			};
 		};
-		9C00349701627E910ECA16EA = {
-			fileRef = 9C00349401627E910ECA16EA;
+		9C05E99D017653110ECA16EA = {
+			fileRef = 9C05E99A017653110ECA16EA;
 			isa = PBXBuildFile;
 			settings = {
 			};
 		};
-		9C00349801627E910ECA16EA = {
-			fileRef = 9C00349501627E910ECA16EA;
+		9C05E99E017653110ECA16EA = {
+			fileRef = 9C05E99B017653110ECA16EA;
 			isa = PBXBuildFile;
 			settings = {
 			};
 		};
-		9C00349901627E910ECA16EA = {
-			fileRef = 9C00349601627E910ECA16EA;
+		9C05E99F017653320ECA16EA = {
+			isa = PBXFileReference;
+			name = draw.mm;
+			path = /Volumes/General/users/rjw/src/Labyrinth/WebCore/src/kwq/tests/draw/draw.mm;
+			refType = 0;
+		};
+		9C05E9A0017653320ECA16EA = {
+			fileRef = 9C05E99F017653320ECA16EA;
 			isa = PBXBuildFile;
 			settings = {
 			};
diff --git a/WebCore/src/kwq/KWQButton.mm b/WebCore/src/kwq/KWQButton.mm
index 0b7aad7..5e4241f 100644
--- a/WebCore/src/kwq/KWQButton.mm
+++ b/WebCore/src/kwq/KWQButton.mm
@@ -25,28 +25,29 @@
 
 #include <qbutton.h>
 
+#include <KWQView.h>
 #include <kwqdebug.h>
 
 QButton::QButton(QWidget *parent)
 {
-    _logNotYetImplemented();
+    setView ([[[KWQNSButton alloc] initWithFrame: NSMakeRect (0,0,0,0) widget: this] autorelease]);
 }
 
 
 QButton::~QButton()
 {
-    _logNotYetImplemented();
 }
 
 
-void QButton::setText(const QString &)
+void QButton::setText(const QString &s)
 {
-    _logNotYetImplemented();
+    [(KWQNSButton *)getView() setTitle: QSTRING_TO_NSSTRING (s)];
 }
 
 
 QString QButton::text() const
 {
-    _logNotYetImplemented();
+    KWQNSButton *button = (KWQNSButton *)getView();
+    return NSSTRING_TO_QSTRING([button title]);
 }
 
diff --git a/WebCore/src/kwq/KWQScrollView.mm b/WebCore/src/kwq/KWQScrollView.mm
index 08c6ac0..51d0783 100644
--- a/WebCore/src/kwq/KWQScrollView.mm
+++ b/WebCore/src/kwq/KWQScrollView.mm
@@ -117,15 +117,24 @@ void QScrollView::setHScrollBarMode(ScrollBarMode)
 }
 
 
-void QScrollView::addChild(QWidget* child, int x=0, int y=0)
+void QScrollView::addChild(QWidget* child, int x, int y)
 {
-    _logNotYetImplemented();
+    NSView *thisView, *subView;
+    
+    child->move (x, y);
+    
+    thisView = getView();
+    subView = child->getView();
+    [thisView addSubview: subView];
 }
 
 
 void QScrollView::removeChild(QWidget* child)
 {
-    _logNeverImplemented();
+    NSView *subView;
+
+    subView = child->getView();
+    [subView removeFromSuperview];
 }
 
 
diff --git a/WebCore/src/kwq/KWQView.h b/WebCore/src/kwq/KWQView.h
index 978770a..6c9eeb1 100644
--- a/WebCore/src/kwq/KWQView.h
+++ b/WebCore/src/kwq/KWQView.h
@@ -9,3 +9,10 @@ class QWidget;
 }
 - initWithFrame: (NSRect)r widget: (QWidget *)w; 
 @end
+
+ at interface KWQNSButton : NSButton
+{
+    QWidget *widget;
+}
+- initWithFrame: (NSRect)r widget: (QWidget *)w; 
+ at end
diff --git a/WebCore/src/kwq/KWQView.mm b/WebCore/src/kwq/KWQView.mm
index 8887988..7a0e12f 100644
--- a/WebCore/src/kwq/KWQView.mm
+++ b/WebCore/src/kwq/KWQView.mm
@@ -11,6 +11,7 @@
 }
 
 
+// This should eventually be removed.
 - (void)drawRect:(NSRect)rect {
     widget->paint((void *)0);
 }
@@ -22,3 +23,13 @@
 }
 
 @end
+
+ at implementation KWQNSButton
+
+- initWithFrame: (NSRect) r widget: (QWidget *)w 
+{
+    [super initWithFrame: r];
+    widget = w;
+}
+
+ at end
\ No newline at end of file
diff --git a/WebCore/src/kwq/KWQWidget.mm b/WebCore/src/kwq/KWQWidget.mm
index 7f125bb..b55f706 100644
--- a/WebCore/src/kwq/KWQWidget.mm
+++ b/WebCore/src/kwq/KWQWidget.mm
@@ -83,7 +83,7 @@ QSize QWidget::sizeHint() const
 
 void QWidget::resize(int w, int h) 
 {
-    internalSetGeometry( data->rect.x(), data->rect.y(), w, h, FALSE );
+    internalSetGeometry( data->rect.x(), data->rect.y(), w, h, TRUE );
 }
 
 void QWidget::setActiveWindow() 
@@ -226,9 +226,9 @@ void QWidget::setFocusPolicy(FocusPolicy fp)
 }
 
 
-void QWidget::setFocusProxy( QWidget * )
+void QWidget::setFocusProxy( QWidget *w)
 {
-    _logNeverImplemented();
+    data->focusPolicy = w->focusPolicy();
 }
 
 
@@ -271,7 +271,7 @@ void QWidget::setStyle(QStyle *style)
 
 QFont QWidget::font() const
 {
-    _logNotYetImplemented();
+    return *data->font;
 }
 
 
@@ -361,7 +361,7 @@ void QWidget::setCRect( const QRect &r )
     data->rect = r;
 }
 
-void QWidget::internalSetGeometry( int x, int y, int w, int h, bool isMove )
+void QWidget::internalSetGeometry( int x, int y, int w, int h, bool updateView )
 {
     if ( w < 1 )				// invalid size
 	w = 1;
@@ -379,12 +379,11 @@ void QWidget::internalSetGeometry( int x, int y, int w, int h, bool isMove )
 
     setCRect( r );
 
-    bool isResize = size() != oldSize;
-
-    // FIXME!  First approximation.  May need to translate coordinates.
-    [data->view setFrame: NSMakeRect (data->rect.x(), data->rect.y(), data->rect.width(), data->rect.height())];
+    if (updateView != FALSE)
+        [data->view setFrame: NSMakeRect (data->rect.x(), data->rect.y(), data->rect.width(), data->rect.height())];
 }
 
+
 void QWidget::showEvent(QShowEvent *)
 {
     _logNeverImplemented();
@@ -460,15 +459,36 @@ void QWidget::paint (void *)
 }
 
 #if (defined(__APPLE__) && defined(__OBJC__) && defined(__cplusplus))
-NSView *QWidget::getView()
+NSView *QWidget::getView() const
 {
     return data->view;
 }
+
+
+void QWidget::setView(NSView *view)
+{
+    if (data->view)
+        [data->view release];
+    data->view = [view retain];
+        
+    NSRect frame = [data->view frame];
+    internalSetGeometry (frame.origin.x, frame.origin.y, frame.size.width, frame.size.height, FALSE);
+}
 #else
-void *QWidget::getView()
+void *QWidget::getView() const
 {
     return data->view;
 }
+
+void QWidget::setView(void *view)
+{
+    if (data->view)
+        [data->view release];
+    data->view = [view retain];
+        
+    NSRect frame = [data->view frame];
+    internalSetGeometry (frame.x, frame.y, frame.width, frame.height, FALSE);
+}
 #endif
 
 #endif _KWQ_
diff --git a/WebCore/src/kwq/qt/qwidget.h b/WebCore/src/kwq/qt/qwidget.h
index 2f3e009..e75bcb4 100644
--- a/WebCore/src/kwq/qt/qwidget.h
+++ b/WebCore/src/kwq/qt/qwidget.h
@@ -48,8 +48,6 @@
 
 #import <Cocoa/Cocoa.h>
 
-#import "KWQView.h"
-
 #undef Fixed
 #undef Rect
 #undef Boolean
@@ -156,9 +154,11 @@ public:
     virtual void paint (void *);
     
 #if (defined(__APPLE__) && defined(__OBJC__) && defined(__cplusplus))
-    KWQView 	*getView();
+    NSView 	*getView() const;
+    void 	setView(NSView *aView);
 #else
-    void 	*getView();
+    void 	*getView() const;
+    void 	setView(void *aView);
 #endif
 
 #endif _KWQ_
@@ -175,7 +175,7 @@ private:
     QWidget &operator=(const QWidget &);
 
     void setCRect( const QRect &r );
-    void internalSetGeometry( int x, int y, int w, int h, bool isMove );
+    void internalSetGeometry( int x, int y, int w, int h, bool updateView );
 
     void _initialize();
 
@@ -188,7 +188,7 @@ private:
         QCursor	*cursor;
         QPalette pal;
 #if (defined(__APPLE__) && defined(__OBJC__) && defined(__cplusplus))
-        KWQView	*view;
+        NSView	*view;
 #else
         void 	*view;
 #endif
diff --git a/WebCore/src/kwq/tests/draw/drawApp/drawApp.pbproj/project.pbxproj b/WebCore/src/kwq/tests/draw/drawApp/drawApp.pbproj/project.pbxproj
index d5fa309..f9d4fde 100644
--- a/WebCore/src/kwq/tests/draw/drawApp/drawApp.pbproj/project.pbxproj
+++ b/WebCore/src/kwq/tests/draw/drawApp/drawApp.pbproj/project.pbxproj
@@ -148,7 +148,7 @@
 		};
 		29B97315FDCFA39411CA2CEA = {
 			children = (
-				9C00349001601F7F0ECA16EA,
+				9C05E99F017653320ECA16EA,
 			);
 			isa = PBXGroup;
 			name = "Other Sources";
@@ -159,9 +159,9 @@
 			children = (
 				29B97318FDCFA39411CA2CEA,
 				089C165CFE840E0CC02AAC07,
-				9C00349401627E910ECA16EA,
-				9C00349501627E910ECA16EA,
-				9C00349601627E910ECA16EA,
+				9C05E999017653110ECA16EA,
+				9C05E99A017653110ECA16EA,
+				9C05E99B017653110ECA16EA,
 			);
 			isa = PBXGroup;
 			name = Resources;
@@ -270,9 +270,9 @@
 			files = (
 				080E96DCFE201CFB7F000001,
 				089C165EFE840E0CC02AAC07,
-				9C00349701627E910ECA16EA,
-				9C00349801627E910ECA16EA,
-				9C00349901627E910ECA16EA,
+				9C05E99C017653110ECA16EA,
+				9C05E99D017653110ECA16EA,
+				9C05E99E017653110ECA16EA,
 			);
 			isa = PBXResourcesBuildPhase;
 			name = "Bundle Resources";
@@ -280,7 +280,7 @@
 		29B9732BFDCFA39411CA2CEA = {
 			buildActionMask = 2147483647;
 			files = (
-				9C00349101601F7F0ECA16EA,
+				9C05E9A0017653320ECA16EA,
 			);
 			isa = PBXSourcesBuildPhase;
 			name = Sources;
@@ -332,50 +332,50 @@
 //9C2
 //9C3
 //9C4
-		9C00349001601F7F0ECA16EA = {
-			isa = PBXFileReference;
-			name = draw.mm;
-			path = /Network/Servers/abel/homes/gimli/rjw/src/Labyrinth/WebPageView/src/kwq/tests/draw/draw.mm;
-			refType = 0;
-		};
-		9C00349101601F7F0ECA16EA = {
-			fileRef = 9C00349001601F7F0ECA16EA;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		9C00349401627E910ECA16EA = {
+		9C05E999017653110ECA16EA = {
 			isa = PBXFileReference;
 			name = powermac.jpg;
-			path = /Network/Servers/abel/homes/gimli/rjw/src/Labyrinth/WebPageView/src/kwq/tests/draw/powermac.jpg;
-			refType = 0;
+			path = ../powermac.jpg;
+			refType = 2;
 		};
-		9C00349501627E910ECA16EA = {
+		9C05E99A017653110ECA16EA = {
 			isa = PBXFileReference;
 			name = qt.png;
-			path = /Network/Servers/abel/homes/gimli/rjw/src/Labyrinth/WebPageView/src/kwq/tests/draw/qt.png;
-			refType = 0;
+			path = ../qt.png;
+			refType = 2;
 		};
-		9C00349601627E910ECA16EA = {
+		9C05E99B017653110ECA16EA = {
 			isa = PBXFileReference;
 			name = yahoo.gif;
-			path = /Network/Servers/abel/homes/gimli/rjw/src/Labyrinth/WebPageView/src/kwq/tests/draw/yahoo.gif;
-			refType = 0;
+			path = ../yahoo.gif;
+			refType = 2;
+		};
+		9C05E99C017653110ECA16EA = {
+			fileRef = 9C05E999017653110ECA16EA;
+			isa = PBXBuildFile;
+			settings = {
+			};
 		};
-		9C00349701627E910ECA16EA = {
-			fileRef = 9C00349401627E910ECA16EA;
+		9C05E99D017653110ECA16EA = {
+			fileRef = 9C05E99A017653110ECA16EA;
 			isa = PBXBuildFile;
 			settings = {
 			};
 		};
-		9C00349801627E910ECA16EA = {
-			fileRef = 9C00349501627E910ECA16EA;
+		9C05E99E017653110ECA16EA = {
+			fileRef = 9C05E99B017653110ECA16EA;
 			isa = PBXBuildFile;
 			settings = {
 			};
 		};
-		9C00349901627E910ECA16EA = {
-			fileRef = 9C00349601627E910ECA16EA;
+		9C05E99F017653320ECA16EA = {
+			isa = PBXFileReference;
+			name = draw.mm;
+			path = /Volumes/General/users/rjw/src/Labyrinth/WebCore/src/kwq/tests/draw/draw.mm;
+			refType = 0;
+		};
+		9C05E9A0017653320ECA16EA = {
+			fileRef = 9C05E99F017653320ECA16EA;
 			isa = PBXBuildFile;
 			settings = {
 			};

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list