[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
gramps
gramps at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 05:40:57 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit d7a39408b74a419945038526da33a7e61d6a6386
Author: gramps <gramps at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Aug 30 07:43:16 2001 +0000
More compilation fixes and anal-retentive tweaks
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/kwq/KWQCString.h b/WebCore/kwq/KWQCString.h
index e48a5b2..097c45c 100644
--- a/WebCore/kwq/KWQCString.h
+++ b/WebCore/kwq/KWQCString.h
@@ -26,6 +26,9 @@
#ifndef QCSTRING_H_
#define QCSTRING_H_
+// FIXME: does our implementation of QCString really need to inherit from
+// QByteArray and QArray?
+
// added to help in compilation of khtml/khtml_part.h:811
#include "qarray.h"
@@ -36,9 +39,10 @@ class QCString : public QByteArray {
public:
QCString();
QCString(uint);
+ QCString(const char *, uint);
};
-bool operator!=(const char *s1, const QCString &s2);
-bool operator!=(const QCString &s1, const char *s2);
+bool operator!=(const char *, const QCString &);
+bool operator!=(const QCString &, const char *);
#endif
diff --git a/WebCore/kwq/KWQKGlobal.h b/WebCore/kwq/KWQKGlobal.h
index 20cbe9c..fe179b4 100644
--- a/WebCore/kwq/KWQKGlobal.h
+++ b/WebCore/kwq/KWQKGlobal.h
@@ -26,6 +26,10 @@
#ifndef KGLOBAL_H_
#define KGLOBAL_H_
+// FIXME: should we use the CF MIN/MAX macros here or typesafe C++ functions?
+#define kMin(a, b) ((a) < (b) ? (a) : (b))
+#define kMax(a, b) ((a) > (b) ? (a) : (b))
+
class KCharsets;
class KInstance;
diff --git a/WebCore/kwq/KWQObject.h b/WebCore/kwq/KWQObject.h
index 9c4d172..64955ec 100644
--- a/WebCore/kwq/KWQObject.h
+++ b/WebCore/kwq/KWQObject.h
@@ -37,13 +37,17 @@
#define SIGNAL(x) x
#define emit
#define Q_OBJECT
-#define connect(arg1,arg2,arg3,arg4)
+//#define connect(arg1, arg2, arg3, arg4)
class QObject {
public:
QObject(QObject *parent=0, const char *name=0);
const char *name() const;
virtual void setName(const char *);
+ bool inherits(const char *) const;
+ static bool connect(const QObject *, const char *, const QObject *, const
+ char *);
+ bool connect(const QObject *, const char *, const char *) const;
};
#endif
diff --git a/WebCore/kwq/KWQScrollView.h b/WebCore/kwq/KWQScrollView.h
index 2e5f285..3bdaf6d 100644
--- a/WebCore/kwq/KWQScrollView.h
+++ b/WebCore/kwq/KWQScrollView.h
@@ -30,11 +30,12 @@
class QScrollView : public QWidget {
public:
- typedef int ScrollBarMode;
int visibleWidth() const;
int visibleHeight() const;
int contentsX() const;
int contentsY() const;
+ // NOTE: alphabetical order
+ enum ScrollBarMode { AlwaysOff, AlwaysOn, Auto };
};
#endif
diff --git a/WebCore/kwq/KWQString.h b/WebCore/kwq/KWQString.h
index a330f45..524ebed 100644
--- a/WebCore/kwq/KWQString.h
+++ b/WebCore/kwq/KWQString.h
@@ -46,6 +46,8 @@ public:
bool isDigit() const;
bool isSpace() const;
bool isLetterOrNumber() const;
+ uchar cell() const;
+ uchar row() const;
friend inline int operator==(QChar, char);
friend inline int operator==(QChar, QChar);
friend inline int operator!=(QChar, QChar);
@@ -65,42 +67,41 @@ public:
class QString {
public:
-
- static QString fromLatin1(const char*, int len=-1);
-
+ static QString fromLatin1(const char*, int len = -1);
QString();
QString(const QChar *, uint);
- QString(const char *s);
+ QString(const char *);
int toInt() const;
int toInt(bool *) const;
- uint toUInt(bool *ok=0, int base=10) const;
+ uint toUInt(bool *ok = 0, int base = 10) const;
+ QString &setNum(int, int base = 10 );
bool isNull() const;
const QChar *unicode() const;
- bool contains(const char *s, bool b) const;
+ bool contains(const char *, bool) const;
uint length() const;
- QString &sprintf(const char *format, ...);
+ QString &sprintf(const char *, ...);
QString lower() const;
QString stripWhiteSpace() const;
QString simplifyWhiteSpace() const;
bool isEmpty() const;
int contains(const char *) const;
- int find(char c, int index=0) const;
- int find(const char *s, int index=0, bool b=0) const;
- int find(const QRegExp ®exp, int index=0, bool b=0) const;
- int findRev(char c, int index=0) const;
- int findRev(const char *s, int index=0) const;
- QString left(uint len) const;
- QString &remove(uint index, uint len);
+ int find(char, int index=0) const;
+ int find(const char *, int index = 0, bool b = 0) const;
+ int find(const QRegExp &, int index = 0, bool b = 0) const;
+ int findRev(char, int index = 0) const;
+ int findRev(const char *, int index = 0) const;
+ QString left(uint) const;
+ QString &remove(uint, uint);
QString &replace(const QRegExp &, const QString &);
QString &insert(uint, char);
void truncate(uint pos);
- QString arg(const QString& a, int fieldwidth=0) const;
+ QString arg(const QString&, int fieldwidth = 0) const;
- QString mid(int index, int len=0xffffffff) const;
- void fill(QChar c, int len = -1);
+ QString mid(int, int len = 0xffffffff) const;
+ void fill(QChar, int len = -1);
- float toFloat(bool *b=0) const;
+ float toFloat(bool *b = 0) const;
const char* latin1() const;
const char *ascii() const;
@@ -118,22 +119,24 @@ public:
QCString utf8() const;
QCString local8Bit() const;
+ QString &setUnicode(const QChar *, uint);
+ void compose();
static const QString null;
- static QString number(long n, int base=10);
+ static QString number(long, int base = 10);
// FIXME: bogus constructor hack for "conversion from int to non-scalar
// type" error in "Node::toHTML()" function in "dom/dom_node.cpp"
QString(int);
};
-QString &operator+(const char *s1, const QString &s2);
-QString &operator+(QChar c1, const QString &s2);
-bool operator!=(const QString &s1, QChar c2);
-bool operator!=(const QString &s1, const QString &s2);
-bool operator!=(const QString &s1, const char *s2);
-bool operator!=(const char *s1, const QString &s2);
+QString &operator+(const char *, const QString &);
+QString &operator+(QChar, const QString &);
+bool operator!=(const QString &, QChar);
+bool operator!=(const QString &, const QString &);
+bool operator!=(const QString &, const char *);
+bool operator!=(const char *, const QString &);
class QConstString {
public:
diff --git a/WebCore/kwq/KWQWidget.h b/WebCore/kwq/KWQWidget.h
index 535790a..568cb34 100644
--- a/WebCore/kwq/KWQWidget.h
+++ b/WebCore/kwq/KWQWidget.h
@@ -33,6 +33,7 @@
class QWidget : public QObject, public QPaintDevice {
public:
+ // FIXME: do any of these methods need to be virtual?
int winId() const;
int x() const;
int y() const;
@@ -41,10 +42,12 @@ public:
QSize size() const;
void resize(const QSize &);
QPoint pos() const;
- virtual void move(const QPoint&);
+ virtual void move(const QPoint &);
void move(int, int);
QWidget *topLevelWidget() const;
QPoint mapToGlobal(const QPoint &) const;
+ void setFocus();
+ void clearFocus();
};
#endif
diff --git a/WebCore/kwq/kdecore/kglobal.h b/WebCore/kwq/kdecore/kglobal.h
index 20cbe9c..fe179b4 100644
--- a/WebCore/kwq/kdecore/kglobal.h
+++ b/WebCore/kwq/kdecore/kglobal.h
@@ -26,6 +26,10 @@
#ifndef KGLOBAL_H_
#define KGLOBAL_H_
+// FIXME: should we use the CF MIN/MAX macros here or typesafe C++ functions?
+#define kMin(a, b) ((a) < (b) ? (a) : (b))
+#define kMax(a, b) ((a) > (b) ? (a) : (b))
+
class KCharsets;
class KInstance;
diff --git a/WebCore/kwq/qt/qcstring.h b/WebCore/kwq/qt/qcstring.h
index e48a5b2..097c45c 100644
--- a/WebCore/kwq/qt/qcstring.h
+++ b/WebCore/kwq/qt/qcstring.h
@@ -26,6 +26,9 @@
#ifndef QCSTRING_H_
#define QCSTRING_H_
+// FIXME: does our implementation of QCString really need to inherit from
+// QByteArray and QArray?
+
// added to help in compilation of khtml/khtml_part.h:811
#include "qarray.h"
@@ -36,9 +39,10 @@ class QCString : public QByteArray {
public:
QCString();
QCString(uint);
+ QCString(const char *, uint);
};
-bool operator!=(const char *s1, const QCString &s2);
-bool operator!=(const QCString &s1, const char *s2);
+bool operator!=(const char *, const QCString &);
+bool operator!=(const QCString &, const char *);
#endif
diff --git a/WebCore/kwq/qt/qobject.h b/WebCore/kwq/qt/qobject.h
index 9c4d172..64955ec 100644
--- a/WebCore/kwq/qt/qobject.h
+++ b/WebCore/kwq/qt/qobject.h
@@ -37,13 +37,17 @@
#define SIGNAL(x) x
#define emit
#define Q_OBJECT
-#define connect(arg1,arg2,arg3,arg4)
+//#define connect(arg1, arg2, arg3, arg4)
class QObject {
public:
QObject(QObject *parent=0, const char *name=0);
const char *name() const;
virtual void setName(const char *);
+ bool inherits(const char *) const;
+ static bool connect(const QObject *, const char *, const QObject *, const
+ char *);
+ bool connect(const QObject *, const char *, const char *) const;
};
#endif
diff --git a/WebCore/kwq/qt/qscrollview.h b/WebCore/kwq/qt/qscrollview.h
index 2e5f285..3bdaf6d 100644
--- a/WebCore/kwq/qt/qscrollview.h
+++ b/WebCore/kwq/qt/qscrollview.h
@@ -30,11 +30,12 @@
class QScrollView : public QWidget {
public:
- typedef int ScrollBarMode;
int visibleWidth() const;
int visibleHeight() const;
int contentsX() const;
int contentsY() const;
+ // NOTE: alphabetical order
+ enum ScrollBarMode { AlwaysOff, AlwaysOn, Auto };
};
#endif
diff --git a/WebCore/kwq/qt/qstring.h b/WebCore/kwq/qt/qstring.h
index a330f45..524ebed 100644
--- a/WebCore/kwq/qt/qstring.h
+++ b/WebCore/kwq/qt/qstring.h
@@ -46,6 +46,8 @@ public:
bool isDigit() const;
bool isSpace() const;
bool isLetterOrNumber() const;
+ uchar cell() const;
+ uchar row() const;
friend inline int operator==(QChar, char);
friend inline int operator==(QChar, QChar);
friend inline int operator!=(QChar, QChar);
@@ -65,42 +67,41 @@ public:
class QString {
public:
-
- static QString fromLatin1(const char*, int len=-1);
-
+ static QString fromLatin1(const char*, int len = -1);
QString();
QString(const QChar *, uint);
- QString(const char *s);
+ QString(const char *);
int toInt() const;
int toInt(bool *) const;
- uint toUInt(bool *ok=0, int base=10) const;
+ uint toUInt(bool *ok = 0, int base = 10) const;
+ QString &setNum(int, int base = 10 );
bool isNull() const;
const QChar *unicode() const;
- bool contains(const char *s, bool b) const;
+ bool contains(const char *, bool) const;
uint length() const;
- QString &sprintf(const char *format, ...);
+ QString &sprintf(const char *, ...);
QString lower() const;
QString stripWhiteSpace() const;
QString simplifyWhiteSpace() const;
bool isEmpty() const;
int contains(const char *) const;
- int find(char c, int index=0) const;
- int find(const char *s, int index=0, bool b=0) const;
- int find(const QRegExp ®exp, int index=0, bool b=0) const;
- int findRev(char c, int index=0) const;
- int findRev(const char *s, int index=0) const;
- QString left(uint len) const;
- QString &remove(uint index, uint len);
+ int find(char, int index=0) const;
+ int find(const char *, int index = 0, bool b = 0) const;
+ int find(const QRegExp &, int index = 0, bool b = 0) const;
+ int findRev(char, int index = 0) const;
+ int findRev(const char *, int index = 0) const;
+ QString left(uint) const;
+ QString &remove(uint, uint);
QString &replace(const QRegExp &, const QString &);
QString &insert(uint, char);
void truncate(uint pos);
- QString arg(const QString& a, int fieldwidth=0) const;
+ QString arg(const QString&, int fieldwidth = 0) const;
- QString mid(int index, int len=0xffffffff) const;
- void fill(QChar c, int len = -1);
+ QString mid(int, int len = 0xffffffff) const;
+ void fill(QChar, int len = -1);
- float toFloat(bool *b=0) const;
+ float toFloat(bool *b = 0) const;
const char* latin1() const;
const char *ascii() const;
@@ -118,22 +119,24 @@ public:
QCString utf8() const;
QCString local8Bit() const;
+ QString &setUnicode(const QChar *, uint);
+ void compose();
static const QString null;
- static QString number(long n, int base=10);
+ static QString number(long, int base = 10);
// FIXME: bogus constructor hack for "conversion from int to non-scalar
// type" error in "Node::toHTML()" function in "dom/dom_node.cpp"
QString(int);
};
-QString &operator+(const char *s1, const QString &s2);
-QString &operator+(QChar c1, const QString &s2);
-bool operator!=(const QString &s1, QChar c2);
-bool operator!=(const QString &s1, const QString &s2);
-bool operator!=(const QString &s1, const char *s2);
-bool operator!=(const char *s1, const QString &s2);
+QString &operator+(const char *, const QString &);
+QString &operator+(QChar, const QString &);
+bool operator!=(const QString &, QChar);
+bool operator!=(const QString &, const QString &);
+bool operator!=(const QString &, const char *);
+bool operator!=(const char *, const QString &);
class QConstString {
public:
diff --git a/WebCore/kwq/qt/qwidget.h b/WebCore/kwq/qt/qwidget.h
index 535790a..568cb34 100644
--- a/WebCore/kwq/qt/qwidget.h
+++ b/WebCore/kwq/qt/qwidget.h
@@ -33,6 +33,7 @@
class QWidget : public QObject, public QPaintDevice {
public:
+ // FIXME: do any of these methods need to be virtual?
int winId() const;
int x() const;
int y() const;
@@ -41,10 +42,12 @@ public:
QSize size() const;
void resize(const QSize &);
QPoint pos() const;
- virtual void move(const QPoint&);
+ virtual void move(const QPoint &);
void move(int, int);
QWidget *topLevelWidget() const;
QPoint mapToGlobal(const QPoint &) const;
+ void setFocus();
+ void clearFocus();
};
#endif
diff --git a/WebCore/src/kwq/kdecore/kglobal.h b/WebCore/src/kwq/kdecore/kglobal.h
index 20cbe9c..fe179b4 100644
--- a/WebCore/src/kwq/kdecore/kglobal.h
+++ b/WebCore/src/kwq/kdecore/kglobal.h
@@ -26,6 +26,10 @@
#ifndef KGLOBAL_H_
#define KGLOBAL_H_
+// FIXME: should we use the CF MIN/MAX macros here or typesafe C++ functions?
+#define kMin(a, b) ((a) < (b) ? (a) : (b))
+#define kMax(a, b) ((a) > (b) ? (a) : (b))
+
class KCharsets;
class KInstance;
diff --git a/WebCore/src/kwq/qt/qcstring.h b/WebCore/src/kwq/qt/qcstring.h
index e48a5b2..097c45c 100644
--- a/WebCore/src/kwq/qt/qcstring.h
+++ b/WebCore/src/kwq/qt/qcstring.h
@@ -26,6 +26,9 @@
#ifndef QCSTRING_H_
#define QCSTRING_H_
+// FIXME: does our implementation of QCString really need to inherit from
+// QByteArray and QArray?
+
// added to help in compilation of khtml/khtml_part.h:811
#include "qarray.h"
@@ -36,9 +39,10 @@ class QCString : public QByteArray {
public:
QCString();
QCString(uint);
+ QCString(const char *, uint);
};
-bool operator!=(const char *s1, const QCString &s2);
-bool operator!=(const QCString &s1, const char *s2);
+bool operator!=(const char *, const QCString &);
+bool operator!=(const QCString &, const char *);
#endif
diff --git a/WebCore/src/kwq/qt/qobject.h b/WebCore/src/kwq/qt/qobject.h
index 9c4d172..64955ec 100644
--- a/WebCore/src/kwq/qt/qobject.h
+++ b/WebCore/src/kwq/qt/qobject.h
@@ -37,13 +37,17 @@
#define SIGNAL(x) x
#define emit
#define Q_OBJECT
-#define connect(arg1,arg2,arg3,arg4)
+//#define connect(arg1, arg2, arg3, arg4)
class QObject {
public:
QObject(QObject *parent=0, const char *name=0);
const char *name() const;
virtual void setName(const char *);
+ bool inherits(const char *) const;
+ static bool connect(const QObject *, const char *, const QObject *, const
+ char *);
+ bool connect(const QObject *, const char *, const char *) const;
};
#endif
diff --git a/WebCore/src/kwq/qt/qscrollview.h b/WebCore/src/kwq/qt/qscrollview.h
index 2e5f285..3bdaf6d 100644
--- a/WebCore/src/kwq/qt/qscrollview.h
+++ b/WebCore/src/kwq/qt/qscrollview.h
@@ -30,11 +30,12 @@
class QScrollView : public QWidget {
public:
- typedef int ScrollBarMode;
int visibleWidth() const;
int visibleHeight() const;
int contentsX() const;
int contentsY() const;
+ // NOTE: alphabetical order
+ enum ScrollBarMode { AlwaysOff, AlwaysOn, Auto };
};
#endif
diff --git a/WebCore/src/kwq/qt/qstring.h b/WebCore/src/kwq/qt/qstring.h
index a330f45..524ebed 100644
--- a/WebCore/src/kwq/qt/qstring.h
+++ b/WebCore/src/kwq/qt/qstring.h
@@ -46,6 +46,8 @@ public:
bool isDigit() const;
bool isSpace() const;
bool isLetterOrNumber() const;
+ uchar cell() const;
+ uchar row() const;
friend inline int operator==(QChar, char);
friend inline int operator==(QChar, QChar);
friend inline int operator!=(QChar, QChar);
@@ -65,42 +67,41 @@ public:
class QString {
public:
-
- static QString fromLatin1(const char*, int len=-1);
-
+ static QString fromLatin1(const char*, int len = -1);
QString();
QString(const QChar *, uint);
- QString(const char *s);
+ QString(const char *);
int toInt() const;
int toInt(bool *) const;
- uint toUInt(bool *ok=0, int base=10) const;
+ uint toUInt(bool *ok = 0, int base = 10) const;
+ QString &setNum(int, int base = 10 );
bool isNull() const;
const QChar *unicode() const;
- bool contains(const char *s, bool b) const;
+ bool contains(const char *, bool) const;
uint length() const;
- QString &sprintf(const char *format, ...);
+ QString &sprintf(const char *, ...);
QString lower() const;
QString stripWhiteSpace() const;
QString simplifyWhiteSpace() const;
bool isEmpty() const;
int contains(const char *) const;
- int find(char c, int index=0) const;
- int find(const char *s, int index=0, bool b=0) const;
- int find(const QRegExp ®exp, int index=0, bool b=0) const;
- int findRev(char c, int index=0) const;
- int findRev(const char *s, int index=0) const;
- QString left(uint len) const;
- QString &remove(uint index, uint len);
+ int find(char, int index=0) const;
+ int find(const char *, int index = 0, bool b = 0) const;
+ int find(const QRegExp &, int index = 0, bool b = 0) const;
+ int findRev(char, int index = 0) const;
+ int findRev(const char *, int index = 0) const;
+ QString left(uint) const;
+ QString &remove(uint, uint);
QString &replace(const QRegExp &, const QString &);
QString &insert(uint, char);
void truncate(uint pos);
- QString arg(const QString& a, int fieldwidth=0) const;
+ QString arg(const QString&, int fieldwidth = 0) const;
- QString mid(int index, int len=0xffffffff) const;
- void fill(QChar c, int len = -1);
+ QString mid(int, int len = 0xffffffff) const;
+ void fill(QChar, int len = -1);
- float toFloat(bool *b=0) const;
+ float toFloat(bool *b = 0) const;
const char* latin1() const;
const char *ascii() const;
@@ -118,22 +119,24 @@ public:
QCString utf8() const;
QCString local8Bit() const;
+ QString &setUnicode(const QChar *, uint);
+ void compose();
static const QString null;
- static QString number(long n, int base=10);
+ static QString number(long, int base = 10);
// FIXME: bogus constructor hack for "conversion from int to non-scalar
// type" error in "Node::toHTML()" function in "dom/dom_node.cpp"
QString(int);
};
-QString &operator+(const char *s1, const QString &s2);
-QString &operator+(QChar c1, const QString &s2);
-bool operator!=(const QString &s1, QChar c2);
-bool operator!=(const QString &s1, const QString &s2);
-bool operator!=(const QString &s1, const char *s2);
-bool operator!=(const char *s1, const QString &s2);
+QString &operator+(const char *, const QString &);
+QString &operator+(QChar, const QString &);
+bool operator!=(const QString &, QChar);
+bool operator!=(const QString &, const QString &);
+bool operator!=(const QString &, const char *);
+bool operator!=(const char *, const QString &);
class QConstString {
public:
diff --git a/WebCore/src/kwq/qt/qwidget.h b/WebCore/src/kwq/qt/qwidget.h
index 535790a..568cb34 100644
--- a/WebCore/src/kwq/qt/qwidget.h
+++ b/WebCore/src/kwq/qt/qwidget.h
@@ -33,6 +33,7 @@
class QWidget : public QObject, public QPaintDevice {
public:
+ // FIXME: do any of these methods need to be virtual?
int winId() const;
int x() const;
int y() const;
@@ -41,10 +42,12 @@ public:
QSize size() const;
void resize(const QSize &);
QPoint pos() const;
- virtual void move(const QPoint&);
+ virtual void move(const QPoint &);
void move(int, int);
QWidget *topLevelWidget() const;
QPoint mapToGlobal(const QPoint &) const;
+ void setFocus();
+ void clearFocus();
};
#endif
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list