[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:49:46 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit b75f1abc4397d91172e6aac8c13317e10996002c
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Oct 6 01:03:58 2001 +0000
More stubs.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@296 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/src/kwq/KWQKGlobal.mm b/WebCore/kwq/KWQBitmap.mm
similarity index 85%
copy from WebCore/src/kwq/KWQKGlobal.mm
copy to WebCore/kwq/KWQBitmap.mm
index e1e3848..9311fac 100644
--- a/WebCore/src/kwq/KWQKGlobal.mm
+++ b/WebCore/kwq/KWQBitmap.mm
@@ -23,37 +23,34 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <kglobal.h>
+#include <qbitmap.h>
-
-
-KInstance *KGlobal::instance()
+QBitmap::QBitmap()
{
}
-KCharsets *KGlobal::charsets()
+QBitmap::QBitmap(int,int)
{
}
-KLocale *KGlobal::locale()
+QBitmap::QBitmap(const QBitmap &)
{
}
-KStandardDirs *KGlobal::dirs()
+QBitmap &QBitmap::operator=(const QBitmap &)
{
}
-KConfig KGlobal::*config()
+QBitmap &QBitmap::operator=(const QPixmap &)
{
}
-
-const QString &KGlobal::staticQString(const QString &)
+QBitmap &QBitmap::operator=(const QImage &)
{
}
diff --git a/WebCore/kwq/KWQColorGroup.mm b/WebCore/kwq/KWQColorGroup.mm
index f829f6a..74b1171 100644
--- a/WebCore/kwq/KWQColorGroup.mm
+++ b/WebCore/kwq/KWQColorGroup.mm
@@ -45,7 +45,7 @@ const QBrush &QColorGroup::brush(QColorGroup::ColorRole cr) const
{
}
-const QColor &color(QColorGroup::ColorRole cr)
+const QColor &QColorGroup::color(QColorGroup::ColorRole cr) const
{
}
diff --git a/WebCore/kwq/KWQDrawUtil.h b/WebCore/kwq/KWQDrawUtil.mm
similarity index 90%
copy from WebCore/kwq/KWQDrawUtil.h
copy to WebCore/kwq/KWQDrawUtil.mm
index 20ca608..88c9198 100644
--- a/WebCore/kwq/KWQDrawUtil.h
+++ b/WebCore/kwq/KWQDrawUtil.mm
@@ -23,18 +23,11 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef QDRAWUTIL_H_
-#define QDRAWUTIL_H_
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "qpainter.h"
-#include "qpalette.h"
-#include "qbrush.h"
+#include <qdrawutil.h>
void qDrawShadePanel(QPainter *, int, int, int, int, const QColorGroup &, bool
- sunken = FALSE, int lineWidth = 1, const QBrush *fill = 0);
+ sunken = FALSE, int lineWidth = 1, const QBrush *fill = 0)
+{
+ NSLog (@"WARNING %s:%s:%d (NOT YET IMPLEMENTED)\n", __FILE__, __FUNCTION__, __LINE__);
+}
-#endif
diff --git a/WebCore/kwq/KWQKApplication.mm b/WebCore/kwq/KWQKApplication.mm
index aae4a91..c1b858f 100644
--- a/WebCore/kwq/KWQKApplication.mm
+++ b/WebCore/kwq/KWQKApplication.mm
@@ -26,6 +26,7 @@
#include <kapp.h>
+KApplication *KApplication::KApp;
KApplication::KApplication()
diff --git a/WebCore/kwq/KWQKHTMLFactory.h b/WebCore/kwq/KWQKHTMLFactory.h
index 6cbd3fa..a5846cc 100644
--- a/WebCore/kwq/KWQKHTMLFactory.h
+++ b/WebCore/kwq/KWQKHTMLFactory.h
@@ -34,6 +34,7 @@ public:
KHTMLFactory( bool clone = false );
virtual ~KHTMLFactory();
+ virtual KParts::Part *createPartObject( QWidget *parentWidget, const char *widgetName, QObject *parent, const char *name, const char *className, const QStringList &args );
static KInstance *instance();
@@ -42,7 +43,8 @@ public:
return KParts::HistoryProvider::self();
}
-
+private:
+ static QList<KHTMLPart> *s_parts;
};
#endif
diff --git a/WebCore/kwq/KWQKHTMLFactory.mm b/WebCore/kwq/KWQKHTMLFactory.mm
index 37e026e..9a8a512 100644
--- a/WebCore/kwq/KWQKHTMLFactory.mm
+++ b/WebCore/kwq/KWQKHTMLFactory.mm
@@ -19,6 +19,8 @@
*/
#include <khtml_factory.h>
+QList<KHTMLPart> *KHTMLFactory::s_parts;
+
KHTMLFactory::KHTMLFactory( bool clone = false )
{
@@ -29,6 +31,10 @@ KHTMLFactory::~KHTMLFactory()
{
}
+KParts::Part *KHTMLFactory::createPartObject( QWidget *parentWidget, const char *widgetName, QObject *parent, const char *name, const char *className, const QStringList &args )
+{
+}
+
KInstance *KHTMLFactory::instance()
{
diff --git a/WebCore/kwq/KWQKGlobal.mm b/WebCore/kwq/KWQLabel.mm
similarity index 83%
copy from WebCore/kwq/KWQKGlobal.mm
copy to WebCore/kwq/KWQLabel.mm
index e1e3848..b23d655 100644
--- a/WebCore/kwq/KWQKGlobal.mm
+++ b/WebCore/kwq/KWQLabel.mm
@@ -23,37 +23,31 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <kglobal.h>
+#include <qlabel.h>
+// class QLabel ================================================================
-
-KInstance *KGlobal::instance()
-{
-}
-
-
-KCharsets *KGlobal::charsets()
+QLabel::QLabel(QWidget *parent)
{
}
-KLocale *KGlobal::locale()
+QLabel::QLabel(const QString &, QWidget *)
{
}
-KStandardDirs *KGlobal::dirs()
+QLabel::~QLabel()
{
}
-KConfig KGlobal::*config()
+void QLabel::setText(const QString &)
{
}
-
-const QString &KGlobal::staticQString(const QString &)
+void QLabel::setAlignment(int)
{
}
diff --git a/WebCore/src/kwq/KWQKFactory.mm b/WebCore/kwq/KWQStyle.mm
similarity index 92%
copy from WebCore/src/kwq/KWQKFactory.mm
copy to WebCore/kwq/KWQStyle.mm
index d5c7b64..9bc7f14 100644
--- a/WebCore/src/kwq/KWQKFactory.mm
+++ b/WebCore/kwq/KWQStyle.mm
@@ -23,20 +23,19 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <factory.h>
+#include <KWQStyle.h>
-namespace KParts {
-
-Factory::Factory()
+QStyle::QStyle()
{
}
-Factory::~Factory()
+QStyle::~QStyle()
{
}
-} // namespace KParts
-
+Qt::GUIStyle QStyle::guiStyle() const
+{
+}
diff --git a/WebCore/kwq/Makefile.in b/WebCore/kwq/Makefile.in
index 7c81ac1..3914386 100644
--- a/WebCore/kwq/Makefile.in
+++ b/WebCore/kwq/Makefile.in
@@ -28,6 +28,7 @@ MMOBJECTS = \
KWQtextcodec.o \
KWQtextstream.o \
KWQApplication.o \
+ KWQBitmap.o \
KWQBrush.o \
KWQButton.o \
KWQCheckBox.o \
@@ -36,6 +37,7 @@ MMOBJECTS = \
KWQComboBox.o \
KWQCompletion.o \
KWQCursor.o \
+ KWQDrawUtil.o \
KWQEvent.o \
KWQFont.o \
KWQFontDatabase.o \
@@ -79,6 +81,7 @@ MMOBJECTS = \
KWQKStringHandler.o \
KWQKWin.o \
KWQKWinModule.o \
+ KWQLabel.o \
KWQListBox.o \
KWQLineEdit.o \
KWQMovie.o \
@@ -94,6 +97,7 @@ MMOBJECTS = \
KWQPushButton.o \
KWQRadioButton.o \
KWQScrollView.o \
+ KWQStyle.o \
KWQTextEdit.o \
KWQToolTip.o \
KWQView.o \
diff --git a/WebCore/kwq/khtml/khtml_factory.h b/WebCore/kwq/khtml/khtml_factory.h
index 6cbd3fa..a5846cc 100644
--- a/WebCore/kwq/khtml/khtml_factory.h
+++ b/WebCore/kwq/khtml/khtml_factory.h
@@ -34,6 +34,7 @@ public:
KHTMLFactory( bool clone = false );
virtual ~KHTMLFactory();
+ virtual KParts::Part *createPartObject( QWidget *parentWidget, const char *widgetName, QObject *parent, const char *name, const char *className, const QStringList &args );
static KInstance *instance();
@@ -42,7 +43,8 @@ public:
return KParts::HistoryProvider::self();
}
-
+private:
+ static QList<KHTMLPart> *s_parts;
};
#endif
diff --git a/WebCore/kwq/qt/_qregion.cpp b/WebCore/kwq/qt/_qregion.cpp
index b755bc7..8765785 100644
--- a/WebCore/kwq/qt/_qregion.cpp
+++ b/WebCore/kwq/qt/_qregion.cpp
@@ -145,6 +145,12 @@ QRegion QRegion::subtract( const QRegion &r ) const
}
+QRegion QRegion::intersect( const QRegion &) const
+{
+ fprintf (stderr,"WARNING %s:%s:%d (NOT YET IMPLEMENTED)\n", __FILE__, __FUNCTION__, __LINE__);
+}
+
+
QRegion QRegion::unite( const QRegion &r ) const
{
fprintf (stderr,"WARNING %s:%s:%d (NOT YET IMPLEMENTED)\n", __FILE__, __FUNCTION__, __LINE__);
@@ -401,6 +407,13 @@ QRegion& QRegion::operator-=( const QRegion &r )
QRegion& QRegion::operator^=( const QRegion &r )
{ return *this = *this ^ r; }
+
+bool QRegion::operator==( const QRegion &r ) const
+{
+ fprintf (stderr,"WARNING %s:%s:%d (NOT YET IMPLEMENTED)\n", __FILE__, __FUNCTION__, __LINE__);
+}
+
+
// KWQ hacks ---------------------------------------------------------------
#endif // USING_BORROWED_QREGION
diff --git a/WebCore/src/kwq/KWQKGlobal.mm b/WebCore/src/kwq/KWQBitmap.mm
similarity index 85%
copy from WebCore/src/kwq/KWQKGlobal.mm
copy to WebCore/src/kwq/KWQBitmap.mm
index e1e3848..9311fac 100644
--- a/WebCore/src/kwq/KWQKGlobal.mm
+++ b/WebCore/src/kwq/KWQBitmap.mm
@@ -23,37 +23,34 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <kglobal.h>
+#include <qbitmap.h>
-
-
-KInstance *KGlobal::instance()
+QBitmap::QBitmap()
{
}
-KCharsets *KGlobal::charsets()
+QBitmap::QBitmap(int,int)
{
}
-KLocale *KGlobal::locale()
+QBitmap::QBitmap(const QBitmap &)
{
}
-KStandardDirs *KGlobal::dirs()
+QBitmap &QBitmap::operator=(const QBitmap &)
{
}
-KConfig KGlobal::*config()
+QBitmap &QBitmap::operator=(const QPixmap &)
{
}
-
-const QString &KGlobal::staticQString(const QString &)
+QBitmap &QBitmap::operator=(const QImage &)
{
}
diff --git a/WebCore/src/kwq/KWQColorGroup.mm b/WebCore/src/kwq/KWQColorGroup.mm
index f829f6a..74b1171 100644
--- a/WebCore/src/kwq/KWQColorGroup.mm
+++ b/WebCore/src/kwq/KWQColorGroup.mm
@@ -45,7 +45,7 @@ const QBrush &QColorGroup::brush(QColorGroup::ColorRole cr) const
{
}
-const QColor &color(QColorGroup::ColorRole cr)
+const QColor &QColorGroup::color(QColorGroup::ColorRole cr) const
{
}
diff --git a/WebCore/kwq/KWQDrawUtil.h b/WebCore/src/kwq/KWQDrawUtil.mm
similarity index 90%
copy from WebCore/kwq/KWQDrawUtil.h
copy to WebCore/src/kwq/KWQDrawUtil.mm
index 20ca608..88c9198 100644
--- a/WebCore/kwq/KWQDrawUtil.h
+++ b/WebCore/src/kwq/KWQDrawUtil.mm
@@ -23,18 +23,11 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef QDRAWUTIL_H_
-#define QDRAWUTIL_H_
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "qpainter.h"
-#include "qpalette.h"
-#include "qbrush.h"
+#include <qdrawutil.h>
void qDrawShadePanel(QPainter *, int, int, int, int, const QColorGroup &, bool
- sunken = FALSE, int lineWidth = 1, const QBrush *fill = 0);
+ sunken = FALSE, int lineWidth = 1, const QBrush *fill = 0)
+{
+ NSLog (@"WARNING %s:%s:%d (NOT YET IMPLEMENTED)\n", __FILE__, __FUNCTION__, __LINE__);
+}
-#endif
diff --git a/WebCore/src/kwq/KWQKApplication.mm b/WebCore/src/kwq/KWQKApplication.mm
index aae4a91..c1b858f 100644
--- a/WebCore/src/kwq/KWQKApplication.mm
+++ b/WebCore/src/kwq/KWQKApplication.mm
@@ -26,6 +26,7 @@
#include <kapp.h>
+KApplication *KApplication::KApp;
KApplication::KApplication()
diff --git a/WebCore/src/kwq/KWQKHTMLFactory.mm b/WebCore/src/kwq/KWQKHTMLFactory.mm
index 37e026e..9a8a512 100644
--- a/WebCore/src/kwq/KWQKHTMLFactory.mm
+++ b/WebCore/src/kwq/KWQKHTMLFactory.mm
@@ -19,6 +19,8 @@
*/
#include <khtml_factory.h>
+QList<KHTMLPart> *KHTMLFactory::s_parts;
+
KHTMLFactory::KHTMLFactory( bool clone = false )
{
@@ -29,6 +31,10 @@ KHTMLFactory::~KHTMLFactory()
{
}
+KParts::Part *KHTMLFactory::createPartObject( QWidget *parentWidget, const char *widgetName, QObject *parent, const char *name, const char *className, const QStringList &args )
+{
+}
+
KInstance *KHTMLFactory::instance()
{
diff --git a/WebCore/kwq/KWQKGlobal.mm b/WebCore/src/kwq/KWQLabel.mm
similarity index 83%
copy from WebCore/kwq/KWQKGlobal.mm
copy to WebCore/src/kwq/KWQLabel.mm
index e1e3848..b23d655 100644
--- a/WebCore/kwq/KWQKGlobal.mm
+++ b/WebCore/src/kwq/KWQLabel.mm
@@ -23,37 +23,31 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <kglobal.h>
+#include <qlabel.h>
+// class QLabel ================================================================
-
-KInstance *KGlobal::instance()
-{
-}
-
-
-KCharsets *KGlobal::charsets()
+QLabel::QLabel(QWidget *parent)
{
}
-KLocale *KGlobal::locale()
+QLabel::QLabel(const QString &, QWidget *)
{
}
-KStandardDirs *KGlobal::dirs()
+QLabel::~QLabel()
{
}
-KConfig KGlobal::*config()
+void QLabel::setText(const QString &)
{
}
-
-const QString &KGlobal::staticQString(const QString &)
+void QLabel::setAlignment(int)
{
}
diff --git a/WebCore/src/kwq/KWQKFactory.mm b/WebCore/src/kwq/KWQStyle.mm
similarity index 92%
copy from WebCore/src/kwq/KWQKFactory.mm
copy to WebCore/src/kwq/KWQStyle.mm
index d5c7b64..9bc7f14 100644
--- a/WebCore/src/kwq/KWQKFactory.mm
+++ b/WebCore/src/kwq/KWQStyle.mm
@@ -23,20 +23,19 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <factory.h>
+#include <KWQStyle.h>
-namespace KParts {
-
-Factory::Factory()
+QStyle::QStyle()
{
}
-Factory::~Factory()
+QStyle::~QStyle()
{
}
-} // namespace KParts
-
+Qt::GUIStyle QStyle::guiStyle() const
+{
+}
diff --git a/WebCore/src/kwq/Makefile.in b/WebCore/src/kwq/Makefile.in
index 7c81ac1..3914386 100644
--- a/WebCore/src/kwq/Makefile.in
+++ b/WebCore/src/kwq/Makefile.in
@@ -28,6 +28,7 @@ MMOBJECTS = \
KWQtextcodec.o \
KWQtextstream.o \
KWQApplication.o \
+ KWQBitmap.o \
KWQBrush.o \
KWQButton.o \
KWQCheckBox.o \
@@ -36,6 +37,7 @@ MMOBJECTS = \
KWQComboBox.o \
KWQCompletion.o \
KWQCursor.o \
+ KWQDrawUtil.o \
KWQEvent.o \
KWQFont.o \
KWQFontDatabase.o \
@@ -79,6 +81,7 @@ MMOBJECTS = \
KWQKStringHandler.o \
KWQKWin.o \
KWQKWinModule.o \
+ KWQLabel.o \
KWQListBox.o \
KWQLineEdit.o \
KWQMovie.o \
@@ -94,6 +97,7 @@ MMOBJECTS = \
KWQPushButton.o \
KWQRadioButton.o \
KWQScrollView.o \
+ KWQStyle.o \
KWQTextEdit.o \
KWQToolTip.o \
KWQView.o \
diff --git a/WebCore/src/kwq/khtml/khtml_factory.h b/WebCore/src/kwq/khtml/khtml_factory.h
index 6cbd3fa..a5846cc 100644
--- a/WebCore/src/kwq/khtml/khtml_factory.h
+++ b/WebCore/src/kwq/khtml/khtml_factory.h
@@ -34,6 +34,7 @@ public:
KHTMLFactory( bool clone = false );
virtual ~KHTMLFactory();
+ virtual KParts::Part *createPartObject( QWidget *parentWidget, const char *widgetName, QObject *parent, const char *name, const char *className, const QStringList &args );
static KInstance *instance();
@@ -42,7 +43,8 @@ public:
return KParts::HistoryProvider::self();
}
-
+private:
+ static QList<KHTMLPart> *s_parts;
};
#endif
diff --git a/WebCore/src/kwq/qt/_qregion.cpp b/WebCore/src/kwq/qt/_qregion.cpp
index b755bc7..8765785 100644
--- a/WebCore/src/kwq/qt/_qregion.cpp
+++ b/WebCore/src/kwq/qt/_qregion.cpp
@@ -145,6 +145,12 @@ QRegion QRegion::subtract( const QRegion &r ) const
}
+QRegion QRegion::intersect( const QRegion &) const
+{
+ fprintf (stderr,"WARNING %s:%s:%d (NOT YET IMPLEMENTED)\n", __FILE__, __FUNCTION__, __LINE__);
+}
+
+
QRegion QRegion::unite( const QRegion &r ) const
{
fprintf (stderr,"WARNING %s:%s:%d (NOT YET IMPLEMENTED)\n", __FILE__, __FUNCTION__, __LINE__);
@@ -401,6 +407,13 @@ QRegion& QRegion::operator-=( const QRegion &r )
QRegion& QRegion::operator^=( const QRegion &r )
{ return *this = *this ^ r; }
+
+bool QRegion::operator==( const QRegion &r ) const
+{
+ fprintf (stderr,"WARNING %s:%s:%d (NOT YET IMPLEMENTED)\n", __FILE__, __FUNCTION__, __LINE__);
+}
+
+
// KWQ hacks ---------------------------------------------------------------
#endif // USING_BORROWED_QREGION
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list