Commit c35957b2 authored by mjs's avatar mjs

* src/kdelibs/kjs/Makefile.am: Fix testkjs build.

	Fix a couple more static initialization problems:
	* src/kwq/KWQKHTMLPart.mm: (KHTMLPart::urlCursor):
	* src/kwq/KWQRegion.mm: (QRegion::QRegion), (QRegion::operator=):

	* src/.cvsignore, src/kdelibs/.cvsignore,
	src/kdelibs/khtml/css/.cvsignore,
	src/kdelibs/khtml/misc/.cvsignore, src/kdelibs/kjs/.cvsignore:
	Ignore stamp files.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@550 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 10143820
NULL =
noinst_LIBRARIES = libkjs.o
LDFLAGS = -Wl,-r -nostdlib
libkjs_o_AR = $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o
libkjs_o_LDFLAGS = -Wl,-r -nostdlib
libkjs_o_AR = $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) $(libkjs_o_LDFLAGS) -o
libkjs_o_SOURCES = \
array_object.cpp \
......
2002-01-19 Maciej Stachowiak <mjs@apple.com>
* src/kdelibs/kjs/Makefile.am: Fix testkjs build.
Fix a couple more static initialization problems:
* src/kwq/KWQKHTMLPart.mm: (KHTMLPart::urlCursor):
* src/kwq/KWQRegion.mm: (QRegion::QRegion), (QRegion::operator=):
* src/.cvsignore, src/kdelibs/.cvsignore,
src/kdelibs/khtml/css/.cvsignore,
src/kdelibs/khtml/misc/.cvsignore, src/kdelibs/kjs/.cvsignore:
Ignore stamp files.
2002-01-18 Richard Williamson <rjw@apple.com>
First pass at new view/datasource/controller API.
......
2002-01-19 Maciej Stachowiak <mjs@apple.com>
* src/kdelibs/kjs/Makefile.am: Fix testkjs build.
Fix a couple more static initialization problems:
* src/kwq/KWQKHTMLPart.mm: (KHTMLPart::urlCursor):
* src/kwq/KWQRegion.mm: (QRegion::QRegion), (QRegion::operator=):
* src/.cvsignore, src/kdelibs/.cvsignore,
src/kdelibs/khtml/css/.cvsignore,
src/kdelibs/khtml/misc/.cvsignore, src/kdelibs/kjs/.cvsignore:
Ignore stamp files.
2002-01-18 Richard Williamson <rjw@apple.com>
First pass at new view/datasource/controller API.
......
2002-01-19 Maciej Stachowiak <mjs@apple.com>
* src/kdelibs/kjs/Makefile.am: Fix testkjs build.
Fix a couple more static initialization problems:
* src/kwq/KWQKHTMLPart.mm: (KHTMLPart::urlCursor):
* src/kwq/KWQRegion.mm: (QRegion::QRegion), (QRegion::operator=):
* src/.cvsignore, src/kdelibs/.cvsignore,
src/kdelibs/khtml/css/.cvsignore,
src/kdelibs/khtml/misc/.cvsignore, src/kdelibs/kjs/.cvsignore:
Ignore stamp files.
2002-01-18 Richard Williamson <rjw@apple.com>
First pass at new view/datasource/controller API.
......
......@@ -8,6 +8,4 @@ cssproperties.c
cssproperties.strip
cssproperties.h
.deps
.libs
*.lo
*.la
\ No newline at end of file
*-stamp
......@@ -8,6 +8,4 @@ htmlattrs.c
htmlattrs.h
htmlattrs.gperf
.deps
.libs
*.lo
*.la
*-stamp
......@@ -732,11 +732,15 @@ void KHTMLPart::setURLCursor( const QCursor &c )
}
// FIXME: this should be removed
static const QCursor staticURLCursor = QCursor();
static const QCursor *staticURLCursor = NULL;
const QCursor& KHTMLPart::urlCursor() const
{
_logNeverImplemented();
return staticURLCursor;
if (staticURLCursor == NULL) {
staticURLCursor = new QCursor();
}
return *staticURLCursor;
}
......
......@@ -732,11 +732,15 @@ void KHTMLPart::setURLCursor( const QCursor &c )
}
// FIXME: this should be removed
static const QCursor staticURLCursor = QCursor();
static const QCursor *staticURLCursor = NULL;
const QCursor& KHTMLPart::urlCursor() const
{
_logNeverImplemented();
return staticURLCursor;
if (staticURLCursor == NULL) {
staticURLCursor = new QCursor();
}
return *staticURLCursor;
}
......
......@@ -37,8 +37,9 @@ void QRegion::_initialize() {
QRegion::QRegion()
{
_initialize();
// Create lazily - RJW
//data->path = [[NSBezierPath bezierPath] retain];
//data->path = [[NSBezierPath alloc] init];
}
QRegion::QRegion(const QRect &rect)
......@@ -78,7 +79,7 @@ QRegion::QRegion(const QPointArray &arr)
QRegion::QRegion(const QRegion &other)
{
_initialize();
data->path = [[NSBezierPath bezierPath] retain];
data->path = [[NSBezierPath alloc] init];
[data->path appendBezierPath:other.data->path];
}
......@@ -118,7 +119,7 @@ QRegion &QRegion::operator=(const QRegion &other)
if (data->path) {
[data->path release];
}
data->path = [[NSBezierPath bezierPath] retain];
data->path = [[NSBezierPath alloc] init];
[data->path appendBezierPath:other.data->path];
return *this;
}
Makefile.in
Makefile
.deps
.libs
*.dylib
*-stamp
......@@ -8,6 +8,4 @@ cssproperties.c
cssproperties.strip
cssproperties.h
.deps
.libs
*.lo
*.la
\ No newline at end of file
*-stamp
......@@ -8,6 +8,4 @@ htmlattrs.c
htmlattrs.h
htmlattrs.gperf
.deps
.libs
*.lo
*.la
*-stamp
......@@ -5,6 +5,4 @@ grammar.cpp
grammar.cpp.h
grammar.h
.deps
.libs
*.lo
*.la
\ No newline at end of file
*-stamp
NULL =
noinst_LIBRARIES = libkjs.o
LDFLAGS = -Wl,-r -nostdlib
libkjs_o_AR = $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o
libkjs_o_LDFLAGS = -Wl,-r -nostdlib
libkjs_o_AR = $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) $(libkjs_o_LDFLAGS) -o
libkjs_o_SOURCES = \
array_object.cpp \
......
......@@ -732,11 +732,15 @@ void KHTMLPart::setURLCursor( const QCursor &c )
}
// FIXME: this should be removed
static const QCursor staticURLCursor = QCursor();
static const QCursor *staticURLCursor = NULL;
const QCursor& KHTMLPart::urlCursor() const
{
_logNeverImplemented();
return staticURLCursor;
if (staticURLCursor == NULL) {
staticURLCursor = new QCursor();
}
return *staticURLCursor;
}
......
......@@ -37,8 +37,9 @@ void QRegion::_initialize() {
QRegion::QRegion()
{
_initialize();
// Create lazily - RJW
//data->path = [[NSBezierPath bezierPath] retain];
//data->path = [[NSBezierPath alloc] init];
}
QRegion::QRegion(const QRect &rect)
......@@ -78,7 +79,7 @@ QRegion::QRegion(const QPointArray &arr)
QRegion::QRegion(const QRegion &other)
{
_initialize();
data->path = [[NSBezierPath bezierPath] retain];
data->path = [[NSBezierPath alloc] init];
[data->path appendBezierPath:other.data->path];
}
......@@ -118,7 +119,7 @@ QRegion &QRegion::operator=(const QRegion &other)
if (data->path) {
[data->path release];
}
data->path = [[NSBezierPath bezierPath] retain];
data->path = [[NSBezierPath alloc] init];
[data->path appendBezierPath:other.data->path];
return *this;
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment