[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:42:33 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 1222fffbbf261c86b66bc6e0ff1e46655af8f1f0
Author: gramps <gramps at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Sep 4 03:42:10 2001 +0000
Still more changes to get this beast to compile
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/kwq/KWQKFileItem.h b/WebCore/kwq/KWQKFileItem.h
index 3cc76ee..20abe2b 100644
--- a/WebCore/kwq/KWQKFileItem.h
+++ b/WebCore/kwq/KWQKFileItem.h
@@ -26,4 +26,13 @@
#ifndef KFILEITEM_H_
#define KFILEITEM_H_
+#include <netaccess.h>
+
+class KFileItem {
+public:
+ KFileItem(const KIO::UDSEntry &, const KURL &, bool foo = false, bool bar =
+ false);
+ bool isDir() const;
+};
+
#endif
diff --git a/WebCore/kwq/KWQKIONetAccess.h b/WebCore/kwq/KWQKIONetAccess.h
index 248d398..b270e47 100644
--- a/WebCore/kwq/KWQKIONetAccess.h
+++ b/WebCore/kwq/KWQKIONetAccess.h
@@ -26,4 +26,24 @@
#ifndef NETACCESS_H_
#define NETACCESS_H_
+#include <qvaluelist.h>
+#include <kurl.h>
+
+namespace KIO {
+
+class UDSAtom {
+};
+
+typedef QValueList<UDSAtom> UDSEntry;
+
+class NetAccess {
+public:
+ static bool stat(const KURL &, KIO::UDSEntry &);
+ static QString lastErrorString();
+ static bool download(const KURL &, QString &);
+ static void removeTempFile(const QString &);
+};
+
+}
+
#endif
diff --git a/WebCore/kwq/KWQKPartsPart.h b/WebCore/kwq/KWQKPartsPart.h
index c62e633..b4cc3f5 100644
--- a/WebCore/kwq/KWQKPartsPart.h
+++ b/WebCore/kwq/KWQKPartsPart.h
@@ -55,6 +55,7 @@ namespace KParts {
class Part : public QObject {
public:
QWidget *widget();
+ void setWindowCaption(const QString &);
};
class ReadOnlyPart : public Part {
diff --git a/WebCore/kwq/KWQKStringHandler.h b/WebCore/kwq/KWQKStringHandler.h
index 1061b49..6150191 100644
--- a/WebCore/kwq/KWQKStringHandler.h
+++ b/WebCore/kwq/KWQKStringHandler.h
@@ -26,4 +26,11 @@
#ifndef KSTRINGHANDLER_H_
#define KSTRINGHANDLER_H_
+#include <qstring.h>
+
+class KStringHandler {
+public:
+ static QString csqueeze(const QString &, uint maxlen = 40);
+};
+
#endif
diff --git a/WebCore/kwq/KWQKWin.h b/WebCore/kwq/KWQKWin.h
index bab24a5..a17db64 100644
--- a/WebCore/kwq/KWQKWin.h
+++ b/WebCore/kwq/KWQKWin.h
@@ -27,6 +27,7 @@
#define KWIN_H_
#include <qobjectdefs.h>
+#include <qrect.h>
#include <qstring.h>
class KWin {
diff --git a/WebCore/kwq/KWQMemArray.h b/WebCore/kwq/KWQMemArray.h
index 2e94025..f6e3f88 100644
--- a/WebCore/kwq/KWQMemArray.h
+++ b/WebCore/kwq/KWQMemArray.h
@@ -36,6 +36,7 @@ public:
T *data() const;
uint size() const;
+ uint count() const;
bool resize(uint size);
QArray<T>& duplicate(const T*, int);
diff --git a/WebCore/kwq/KWQPixmap.h b/WebCore/kwq/KWQPixmap.h
index 85d7eb4..70d5af6 100644
--- a/WebCore/kwq/KWQPixmap.h
+++ b/WebCore/kwq/KWQPixmap.h
@@ -30,6 +30,7 @@
#include "qcolor.h"
#include "qstring.h"
#include "qnamespace.h"
+#include "qimage.h"
class QBitmap;
@@ -49,6 +50,7 @@ public:
int height() const;
bool isNull() const;
void resize(const QSize &);
+ QImage convertToImage() const;
};
#endif
diff --git a/WebCore/kwq/KWQPtrVector.h b/WebCore/kwq/KWQPtrVector.h
index d61ee85..d743447 100644
--- a/WebCore/kwq/KWQPtrVector.h
+++ b/WebCore/kwq/KWQPtrVector.h
@@ -26,9 +26,14 @@
#ifndef QVECTOR_H_
#define QVECTOR_H_
+#include <kwqdef.h>
+
typedef void *Item;
-template<class type> class QVector {
+template<class T> class QVector {
+public:
+ QVector();
+ QVector(uint);
};
#endif
diff --git a/WebCore/kwq/KWQRegion.h b/WebCore/kwq/KWQRegion.h
index 00aa47b..86962ef 100644
--- a/WebCore/kwq/KWQRegion.h
+++ b/WebCore/kwq/KWQRegion.h
@@ -26,10 +26,19 @@
#ifndef QREGION_H_
#define QREGION_H_
-#include "qobjectdefs.h"
+#include "qpoint.h"
+
+// FIXME: workaround for error on line 58 of khtml/html/html_imageimpl.h
+#include "qimage.h"
+
+// FIXME: workaround for error on line 62 of khtml/java/kjavaappletcontext.cpp
#include "qrect.h"
class QRegion {
+public:
+ QRegion();
+ QRegion(int, int, int, int);
+ bool contains(const QPoint &) const;
};
#endif
diff --git a/WebCore/kwq/KWQString.h b/WebCore/kwq/KWQString.h
index 320bf46..42c6474 100644
--- a/WebCore/kwq/KWQString.h
+++ b/WebCore/kwq/KWQString.h
@@ -77,17 +77,19 @@ public:
int toInt() const;
int toInt(bool *, int base=10) const;
uint toUInt(bool *ok = 0, int base = 10) const;
+ long toLong(bool *ok = 0, int base = 10) const;
QString &setNum(int, int base = 10 );
bool isNull() const;
const QChar *unicode() const;
- bool contains(const char *, bool) const;
+ int contains(const char *, bool) const;
+ int contains(const char *) const;
+ int contains(char) const;
uint length() const;
QString &sprintf(const char *, ...);
QString lower() const;
QString stripWhiteSpace() const;
QString simplifyWhiteSpace() const;
bool isEmpty() const;
- int contains(const char *) const;
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;
@@ -112,6 +114,7 @@ public:
const char *ascii() const;
// FIXME: is there a standard parameter type for overloaded operators?
QChar operator[](int) const;
+ QString &operator+(char);
QString &operator+(QChar);
QString &operator+(const QString &);
QString &operator+=(char);
@@ -127,6 +130,8 @@ public:
QString &setUnicode(const QChar *, uint);
void compose();
+ QString visual(int index = 0, int len = -1);
+
static const QString null;
static QString number(long, int base = 10);
diff --git a/WebCore/kwq/kdecore/kstringhandler.h b/WebCore/kwq/kdecore/kstringhandler.h
index 1061b49..6150191 100644
--- a/WebCore/kwq/kdecore/kstringhandler.h
+++ b/WebCore/kwq/kdecore/kstringhandler.h
@@ -26,4 +26,11 @@
#ifndef KSTRINGHANDLER_H_
#define KSTRINGHANDLER_H_
+#include <qstring.h>
+
+class KStringHandler {
+public:
+ static QString csqueeze(const QString &, uint maxlen = 40);
+};
+
#endif
diff --git a/WebCore/kwq/kdecore/kwin.h b/WebCore/kwq/kdecore/kwin.h
index bab24a5..a17db64 100644
--- a/WebCore/kwq/kdecore/kwin.h
+++ b/WebCore/kwq/kdecore/kwin.h
@@ -27,6 +27,7 @@
#define KWIN_H_
#include <qobjectdefs.h>
+#include <qrect.h>
#include <qstring.h>
class KWin {
diff --git a/WebCore/kwq/kdeui/kmessagebox.h b/WebCore/kwq/kdeui/kmessagebox.h
index 397861d..4443873 100644
--- a/WebCore/kwq/kdeui/kmessagebox.h
+++ b/WebCore/kwq/kdeui/kmessagebox.h
@@ -31,11 +31,16 @@ class QWidget;
class KMessageBox {
public:
enum { Ok = 1, Cancel = 2, Yes = 3, No = 4, Continue = 5 };
- static void error(QWidget *parent, const QString &text, const QString &caption = QString::null, bool notify=true);
- static int warningYesNo(QWidget *parent, const QString &text, const QString &caption = QString::null,
- const QString &buttonYes = QString::null, const QString &buttonNo = QString::null, bool notify=true);
- static int questionYesNo(QWidget *parent, const QString &text, const QString &caption = QString::null,
- const QString &buttonYes = QString::null, const QString &buttonNo = QString::null, bool notify=true);
+ static void error(QWidget *, const QString &, const QString &caption =
+ QString::null, bool notify = true);
+ static int warningYesNo(QWidget *, const QString &, const QString &caption
+ = QString::null, const QString &buttonYes = QString::null, const
+ QString &buttonNo = QString::null, bool notify = true);
+ static int questionYesNo(QWidget *, const QString &, const QString &caption
+ = QString::null, const QString &buttonYes = QString::null, const
+ QString &buttonNo = QString::null, bool notify = true);
+ static void sorry(QWidget *, const QString &, const QString &caption =
+ QString::null, bool notify = true);
};
#endif
diff --git a/WebCore/kwq/kio/kfileitem.h b/WebCore/kwq/kio/kfileitem.h
index 3cc76ee..20abe2b 100644
--- a/WebCore/kwq/kio/kfileitem.h
+++ b/WebCore/kwq/kio/kfileitem.h
@@ -26,4 +26,13 @@
#ifndef KFILEITEM_H_
#define KFILEITEM_H_
+#include <netaccess.h>
+
+class KFileItem {
+public:
+ KFileItem(const KIO::UDSEntry &, const KURL &, bool foo = false, bool bar =
+ false);
+ bool isDir() const;
+};
+
#endif
diff --git a/WebCore/kwq/kio/netaccess.h b/WebCore/kwq/kio/netaccess.h
index 248d398..b270e47 100644
--- a/WebCore/kwq/kio/netaccess.h
+++ b/WebCore/kwq/kio/netaccess.h
@@ -26,4 +26,24 @@
#ifndef NETACCESS_H_
#define NETACCESS_H_
+#include <qvaluelist.h>
+#include <kurl.h>
+
+namespace KIO {
+
+class UDSAtom {
+};
+
+typedef QValueList<UDSAtom> UDSEntry;
+
+class NetAccess {
+public:
+ static bool stat(const KURL &, KIO::UDSEntry &);
+ static QString lastErrorString();
+ static bool download(const KURL &, QString &);
+ static void removeTempFile(const QString &);
+};
+
+}
+
#endif
diff --git a/WebCore/kwq/kparts/part.h b/WebCore/kwq/kparts/part.h
index c62e633..b4cc3f5 100644
--- a/WebCore/kwq/kparts/part.h
+++ b/WebCore/kwq/kparts/part.h
@@ -55,6 +55,7 @@ namespace KParts {
class Part : public QObject {
public:
QWidget *widget();
+ void setWindowCaption(const QString &);
};
class ReadOnlyPart : public Part {
diff --git a/WebCore/kwq/qt/qarray.h b/WebCore/kwq/qt/qarray.h
index 2e94025..f6e3f88 100644
--- a/WebCore/kwq/qt/qarray.h
+++ b/WebCore/kwq/qt/qarray.h
@@ -36,6 +36,7 @@ public:
T *data() const;
uint size() const;
+ uint count() const;
bool resize(uint size);
QArray<T>& duplicate(const T*, int);
diff --git a/WebCore/kwq/qt/qpixmap.h b/WebCore/kwq/qt/qpixmap.h
index 85d7eb4..70d5af6 100644
--- a/WebCore/kwq/qt/qpixmap.h
+++ b/WebCore/kwq/qt/qpixmap.h
@@ -30,6 +30,7 @@
#include "qcolor.h"
#include "qstring.h"
#include "qnamespace.h"
+#include "qimage.h"
class QBitmap;
@@ -49,6 +50,7 @@ public:
int height() const;
bool isNull() const;
void resize(const QSize &);
+ QImage convertToImage() const;
};
#endif
diff --git a/WebCore/kwq/qt/qregion.h b/WebCore/kwq/qt/qregion.h
index 00aa47b..86962ef 100644
--- a/WebCore/kwq/qt/qregion.h
+++ b/WebCore/kwq/qt/qregion.h
@@ -26,10 +26,19 @@
#ifndef QREGION_H_
#define QREGION_H_
-#include "qobjectdefs.h"
+#include "qpoint.h"
+
+// FIXME: workaround for error on line 58 of khtml/html/html_imageimpl.h
+#include "qimage.h"
+
+// FIXME: workaround for error on line 62 of khtml/java/kjavaappletcontext.cpp
#include "qrect.h"
class QRegion {
+public:
+ QRegion();
+ QRegion(int, int, int, int);
+ bool contains(const QPoint &) const;
};
#endif
diff --git a/WebCore/kwq/qt/qstring.h b/WebCore/kwq/qt/qstring.h
index 320bf46..42c6474 100644
--- a/WebCore/kwq/qt/qstring.h
+++ b/WebCore/kwq/qt/qstring.h
@@ -77,17 +77,19 @@ public:
int toInt() const;
int toInt(bool *, int base=10) const;
uint toUInt(bool *ok = 0, int base = 10) const;
+ long toLong(bool *ok = 0, int base = 10) const;
QString &setNum(int, int base = 10 );
bool isNull() const;
const QChar *unicode() const;
- bool contains(const char *, bool) const;
+ int contains(const char *, bool) const;
+ int contains(const char *) const;
+ int contains(char) const;
uint length() const;
QString &sprintf(const char *, ...);
QString lower() const;
QString stripWhiteSpace() const;
QString simplifyWhiteSpace() const;
bool isEmpty() const;
- int contains(const char *) const;
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;
@@ -112,6 +114,7 @@ public:
const char *ascii() const;
// FIXME: is there a standard parameter type for overloaded operators?
QChar operator[](int) const;
+ QString &operator+(char);
QString &operator+(QChar);
QString &operator+(const QString &);
QString &operator+=(char);
@@ -127,6 +130,8 @@ public:
QString &setUnicode(const QChar *, uint);
void compose();
+ QString visual(int index = 0, int len = -1);
+
static const QString null;
static QString number(long, int base = 10);
diff --git a/WebCore/kwq/qt/qvector.h b/WebCore/kwq/qt/qvector.h
index d61ee85..d743447 100644
--- a/WebCore/kwq/qt/qvector.h
+++ b/WebCore/kwq/qt/qvector.h
@@ -26,9 +26,14 @@
#ifndef QVECTOR_H_
#define QVECTOR_H_
+#include <kwqdef.h>
+
typedef void *Item;
-template<class type> class QVector {
+template<class T> class QVector {
+public:
+ QVector();
+ QVector(uint);
};
#endif
diff --git a/WebCore/src/kwq/kdecore/kstringhandler.h b/WebCore/src/kwq/kdecore/kstringhandler.h
index 1061b49..6150191 100644
--- a/WebCore/src/kwq/kdecore/kstringhandler.h
+++ b/WebCore/src/kwq/kdecore/kstringhandler.h
@@ -26,4 +26,11 @@
#ifndef KSTRINGHANDLER_H_
#define KSTRINGHANDLER_H_
+#include <qstring.h>
+
+class KStringHandler {
+public:
+ static QString csqueeze(const QString &, uint maxlen = 40);
+};
+
#endif
diff --git a/WebCore/src/kwq/kdecore/kwin.h b/WebCore/src/kwq/kdecore/kwin.h
index bab24a5..a17db64 100644
--- a/WebCore/src/kwq/kdecore/kwin.h
+++ b/WebCore/src/kwq/kdecore/kwin.h
@@ -27,6 +27,7 @@
#define KWIN_H_
#include <qobjectdefs.h>
+#include <qrect.h>
#include <qstring.h>
class KWin {
diff --git a/WebCore/src/kwq/kdeui/kmessagebox.h b/WebCore/src/kwq/kdeui/kmessagebox.h
index 397861d..4443873 100644
--- a/WebCore/src/kwq/kdeui/kmessagebox.h
+++ b/WebCore/src/kwq/kdeui/kmessagebox.h
@@ -31,11 +31,16 @@ class QWidget;
class KMessageBox {
public:
enum { Ok = 1, Cancel = 2, Yes = 3, No = 4, Continue = 5 };
- static void error(QWidget *parent, const QString &text, const QString &caption = QString::null, bool notify=true);
- static int warningYesNo(QWidget *parent, const QString &text, const QString &caption = QString::null,
- const QString &buttonYes = QString::null, const QString &buttonNo = QString::null, bool notify=true);
- static int questionYesNo(QWidget *parent, const QString &text, const QString &caption = QString::null,
- const QString &buttonYes = QString::null, const QString &buttonNo = QString::null, bool notify=true);
+ static void error(QWidget *, const QString &, const QString &caption =
+ QString::null, bool notify = true);
+ static int warningYesNo(QWidget *, const QString &, const QString &caption
+ = QString::null, const QString &buttonYes = QString::null, const
+ QString &buttonNo = QString::null, bool notify = true);
+ static int questionYesNo(QWidget *, const QString &, const QString &caption
+ = QString::null, const QString &buttonYes = QString::null, const
+ QString &buttonNo = QString::null, bool notify = true);
+ static void sorry(QWidget *, const QString &, const QString &caption =
+ QString::null, bool notify = true);
};
#endif
diff --git a/WebCore/src/kwq/kio/kfileitem.h b/WebCore/src/kwq/kio/kfileitem.h
index 3cc76ee..20abe2b 100644
--- a/WebCore/src/kwq/kio/kfileitem.h
+++ b/WebCore/src/kwq/kio/kfileitem.h
@@ -26,4 +26,13 @@
#ifndef KFILEITEM_H_
#define KFILEITEM_H_
+#include <netaccess.h>
+
+class KFileItem {
+public:
+ KFileItem(const KIO::UDSEntry &, const KURL &, bool foo = false, bool bar =
+ false);
+ bool isDir() const;
+};
+
#endif
diff --git a/WebCore/src/kwq/kio/netaccess.h b/WebCore/src/kwq/kio/netaccess.h
index 248d398..b270e47 100644
--- a/WebCore/src/kwq/kio/netaccess.h
+++ b/WebCore/src/kwq/kio/netaccess.h
@@ -26,4 +26,24 @@
#ifndef NETACCESS_H_
#define NETACCESS_H_
+#include <qvaluelist.h>
+#include <kurl.h>
+
+namespace KIO {
+
+class UDSAtom {
+};
+
+typedef QValueList<UDSAtom> UDSEntry;
+
+class NetAccess {
+public:
+ static bool stat(const KURL &, KIO::UDSEntry &);
+ static QString lastErrorString();
+ static bool download(const KURL &, QString &);
+ static void removeTempFile(const QString &);
+};
+
+}
+
#endif
diff --git a/WebCore/src/kwq/kparts/part.h b/WebCore/src/kwq/kparts/part.h
index c62e633..b4cc3f5 100644
--- a/WebCore/src/kwq/kparts/part.h
+++ b/WebCore/src/kwq/kparts/part.h
@@ -55,6 +55,7 @@ namespace KParts {
class Part : public QObject {
public:
QWidget *widget();
+ void setWindowCaption(const QString &);
};
class ReadOnlyPart : public Part {
diff --git a/WebCore/src/kwq/qt/qarray.h b/WebCore/src/kwq/qt/qarray.h
index 2e94025..f6e3f88 100644
--- a/WebCore/src/kwq/qt/qarray.h
+++ b/WebCore/src/kwq/qt/qarray.h
@@ -36,6 +36,7 @@ public:
T *data() const;
uint size() const;
+ uint count() const;
bool resize(uint size);
QArray<T>& duplicate(const T*, int);
diff --git a/WebCore/src/kwq/qt/qpixmap.h b/WebCore/src/kwq/qt/qpixmap.h
index 85d7eb4..70d5af6 100644
--- a/WebCore/src/kwq/qt/qpixmap.h
+++ b/WebCore/src/kwq/qt/qpixmap.h
@@ -30,6 +30,7 @@
#include "qcolor.h"
#include "qstring.h"
#include "qnamespace.h"
+#include "qimage.h"
class QBitmap;
@@ -49,6 +50,7 @@ public:
int height() const;
bool isNull() const;
void resize(const QSize &);
+ QImage convertToImage() const;
};
#endif
diff --git a/WebCore/src/kwq/qt/qregion.h b/WebCore/src/kwq/qt/qregion.h
index 00aa47b..86962ef 100644
--- a/WebCore/src/kwq/qt/qregion.h
+++ b/WebCore/src/kwq/qt/qregion.h
@@ -26,10 +26,19 @@
#ifndef QREGION_H_
#define QREGION_H_
-#include "qobjectdefs.h"
+#include "qpoint.h"
+
+// FIXME: workaround for error on line 58 of khtml/html/html_imageimpl.h
+#include "qimage.h"
+
+// FIXME: workaround for error on line 62 of khtml/java/kjavaappletcontext.cpp
#include "qrect.h"
class QRegion {
+public:
+ QRegion();
+ QRegion(int, int, int, int);
+ bool contains(const QPoint &) const;
};
#endif
diff --git a/WebCore/src/kwq/qt/qstring.h b/WebCore/src/kwq/qt/qstring.h
index 320bf46..42c6474 100644
--- a/WebCore/src/kwq/qt/qstring.h
+++ b/WebCore/src/kwq/qt/qstring.h
@@ -77,17 +77,19 @@ public:
int toInt() const;
int toInt(bool *, int base=10) const;
uint toUInt(bool *ok = 0, int base = 10) const;
+ long toLong(bool *ok = 0, int base = 10) const;
QString &setNum(int, int base = 10 );
bool isNull() const;
const QChar *unicode() const;
- bool contains(const char *, bool) const;
+ int contains(const char *, bool) const;
+ int contains(const char *) const;
+ int contains(char) const;
uint length() const;
QString &sprintf(const char *, ...);
QString lower() const;
QString stripWhiteSpace() const;
QString simplifyWhiteSpace() const;
bool isEmpty() const;
- int contains(const char *) const;
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;
@@ -112,6 +114,7 @@ public:
const char *ascii() const;
// FIXME: is there a standard parameter type for overloaded operators?
QChar operator[](int) const;
+ QString &operator+(char);
QString &operator+(QChar);
QString &operator+(const QString &);
QString &operator+=(char);
@@ -127,6 +130,8 @@ public:
QString &setUnicode(const QChar *, uint);
void compose();
+ QString visual(int index = 0, int len = -1);
+
static const QString null;
static QString number(long, int base = 10);
diff --git a/WebCore/src/kwq/qt/qvector.h b/WebCore/src/kwq/qt/qvector.h
index d61ee85..d743447 100644
--- a/WebCore/src/kwq/qt/qvector.h
+++ b/WebCore/src/kwq/qt/qvector.h
@@ -26,9 +26,14 @@
#ifndef QVECTOR_H_
#define QVECTOR_H_
+#include <kwqdef.h>
+
typedef void *Item;
-template<class type> class QVector {
+template<class T> class QVector {
+public:
+ QVector();
+ QVector(uint);
};
#endif
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list