[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:52 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 1d5a529da7c81468c477cd9ddd018334faaaabd2
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Oct 6 02:04:48 2001 +0000
More stubs.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@299 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/kwq/KWQGuardedPtr.h b/WebCore/kwq/KWQGuardedPtr.h
index ac779bf..2f58885 100644
--- a/WebCore/kwq/KWQGuardedPtr.h
+++ b/WebCore/kwq/KWQGuardedPtr.h
@@ -44,21 +44,21 @@ public:
// constructors, copy constructors, and destructors ------------------------
- QGuardedPtr();
- QGuardedPtr(T *o);
- QGuardedPtr(const QGuardedPtr<T> &);
+ QGuardedPtr() {}
+ QGuardedPtr(T *o) {}
+ QGuardedPtr(const QGuardedPtr<T> &) {}
- ~QGuardedPtr();
+ ~QGuardedPtr() {}
// member functions --------------------------------------------------------
- bool isNull() const;
+ bool isNull() const {}
// operators ---------------------------------------------------------------
- QGuardedPtr &operator=(const QGuardedPtr &);
- operator T *() const;
- T *operator->() const;
+ QGuardedPtr &operator=(const QGuardedPtr &) {}
+ operator T *() const {}
+ T *operator->() const {}
// protected -------------------------------------------------------------------
// private ---------------------------------------------------------------------
diff --git a/WebCore/kwq/KWQKMimeType.h b/WebCore/kwq/KWQKMimeType.h
index 120cc53..a06f79d 100644
--- a/WebCore/kwq/KWQKMimeType.h
+++ b/WebCore/kwq/KWQKMimeType.h
@@ -50,15 +50,15 @@ public:
// constructors, copy constructors, and destructors ------------------------
KSharedPtr() {}
- KSharedPtr(const KSharedPtr &);
+ KSharedPtr(const KSharedPtr &) {}
~KSharedPtr() {}
// member functions --------------------------------------------------------
// operators ---------------------------------------------------------------
- KSharedPtr &operator=(const KSharedPtr &);
- T *operator->();
+ KSharedPtr &operator=(const KSharedPtr &) {}
+ T *operator->() {}
// protected -------------------------------------------------------------------
diff --git a/WebCore/kwq/KWQKGlobalSettings.mm b/WebCore/kwq/KWQKStandardDirs.mm
similarity index 84%
copy from WebCore/kwq/KWQKGlobalSettings.mm
copy to WebCore/kwq/KWQKStandardDirs.mm
index e040e4d..7bd197d 100644
--- a/WebCore/kwq/KWQKGlobalSettings.mm
+++ b/WebCore/kwq/KWQKStandardDirs.mm
@@ -23,27 +23,17 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <qfont.h>
+#include <kstddirs.h>
-#include <kglobalsettings.h>
-
-QFont KGlobalSettings::generalFont()
-{
-}
-
-
-QFont KGlobalSettings::windowTitleFont()
-{
-}
-
-
-QFont KGlobalSettings::menuFont()
+QString locate(const char *type, const QString& filename,
+ const KInstance* instance=KGlobal::instance())
{
}
-int KGlobalSettings::contrast()
+QString locateLocal(const char *type, const QString &filename,
+ const KInstance *instance=KGlobal::instance())
{
}
diff --git a/WebCore/kwq/KWQKGlobalSettings.mm b/WebCore/kwq/KWQKstddirs.mm
similarity index 84%
copy from WebCore/kwq/KWQKGlobalSettings.mm
copy to WebCore/kwq/KWQKstddirs.mm
index e040e4d..7bd197d 100644
--- a/WebCore/kwq/KWQKGlobalSettings.mm
+++ b/WebCore/kwq/KWQKstddirs.mm
@@ -23,27 +23,17 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <qfont.h>
+#include <kstddirs.h>
-#include <kglobalsettings.h>
-
-QFont KGlobalSettings::generalFont()
-{
-}
-
-
-QFont KGlobalSettings::windowTitleFont()
-{
-}
-
-
-QFont KGlobalSettings::menuFont()
+QString locate(const char *type, const QString& filename,
+ const KInstance* instance=KGlobal::instance())
{
}
-int KGlobalSettings::contrast()
+QString locateLocal(const char *type, const QString &filename,
+ const KInstance *instance=KGlobal::instance())
{
}
diff --git a/WebCore/kwq/KWQKPrinter.mm b/WebCore/kwq/KWQSignalStubs.mm
similarity index 72%
copy from WebCore/kwq/KWQKPrinter.mm
copy to WebCore/kwq/KWQSignalStubs.mm
index 003f79f..4eedd55 100644
--- a/WebCore/kwq/KWQKPrinter.mm
+++ b/WebCore/kwq/KWQSignalStubs.mm
@@ -22,36 +22,37 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
+#include <khtmlview.h>
+#include <misc/loader.h>
+#include <java/kjavaappletcontext.h>
+#include <java/kjavaprocess.h>
-#include <kprinter.h>
-
-bool KPrinter::setup(QWidget *parent=0)
+void KHTMLView::cleared()
{
}
-
-bool KPrinter::newPage()
+void KJavaAppletContext::showStatus ( const QString& txt )
{
}
-void KPrinter::setDocName(const QString &)
+void KJavaAppletContext::showDocument( const QString& url, const QString& target )
{
}
-void KPrinter::setCreator(const QString &)
+void KJavaProcess::received( const QByteArray& )
{
}
-void KPrinter::setFullPage(bool)
+void khtml::Loader::requestDone( const DOM::DOMString &baseURL, khtml::CachedObject *obj )
{
}
-QSize KPrinter::margins() const
+void khtml::Loader::requestFailed( const DOM::DOMString &baseURL, khtml::CachedObject *obj )
{
}
-
diff --git a/WebCore/kwq/KWQKCompletionBox.mm b/WebCore/kwq/KWQTimer.mm
similarity index 94%
copy from WebCore/kwq/KWQKCompletionBox.mm
copy to WebCore/kwq/KWQTimer.mm
index bd1d113..52e507f 100644
--- a/WebCore/kwq/KWQKCompletionBox.mm
+++ b/WebCore/kwq/KWQTimer.mm
@@ -23,9 +23,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <kcompletionbox.h>
-
-KCompletionBox::KCompletionBox()
+#include <qtimer.h>
+
+void QTimer::singleShot(int, QObject *, const char *)
{
}
diff --git a/WebCore/kwq/KWQKPrinter.mm b/WebCore/kwq/KWQsignals.mm
similarity index 72%
copy from WebCore/kwq/KWQKPrinter.mm
copy to WebCore/kwq/KWQsignals.mm
index 003f79f..4eedd55 100644
--- a/WebCore/kwq/KWQKPrinter.mm
+++ b/WebCore/kwq/KWQsignals.mm
@@ -22,36 +22,37 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
+#include <khtmlview.h>
+#include <misc/loader.h>
+#include <java/kjavaappletcontext.h>
+#include <java/kjavaprocess.h>
-#include <kprinter.h>
-
-bool KPrinter::setup(QWidget *parent=0)
+void KHTMLView::cleared()
{
}
-
-bool KPrinter::newPage()
+void KJavaAppletContext::showStatus ( const QString& txt )
{
}
-void KPrinter::setDocName(const QString &)
+void KJavaAppletContext::showDocument( const QString& url, const QString& target )
{
}
-void KPrinter::setCreator(const QString &)
+void KJavaProcess::received( const QByteArray& )
{
}
-void KPrinter::setFullPage(bool)
+void khtml::Loader::requestDone( const DOM::DOMString &baseURL, khtml::CachedObject *obj )
{
}
-QSize KPrinter::margins() const
+void khtml::Loader::requestFailed( const DOM::DOMString &baseURL, khtml::CachedObject *obj )
{
}
-
diff --git a/WebCore/kwq/Makefile.in b/WebCore/kwq/Makefile.in
index 3914386..4241804 100644
--- a/WebCore/kwq/Makefile.in
+++ b/WebCore/kwq/Makefile.in
@@ -25,6 +25,7 @@ MMOBJECTS = \
_KWQOwner.o \
KWQasyncimageio.o \
KWQasyncio.o \
+ KWQsignals.o \
KWQtextcodec.o \
KWQtextstream.o \
KWQApplication.o \
@@ -48,6 +49,7 @@ MMOBJECTS = \
KWQImage.o \
KWQKjobclasses.o \
KWQKnetaccess.o \
+ KWQKstddirs.o \
KWQKApplication.o \
KWQKCharsets.o \
KWQKComboBox.o \
@@ -99,6 +101,7 @@ MMOBJECTS = \
KWQScrollView.o \
KWQStyle.o \
KWQTextEdit.o \
+ KWQTimer.o \
KWQToolTip.o \
KWQView.o \
KWQWMatrix.o \
@@ -127,6 +130,8 @@ CMMFLAGS = $(BASECMMFLAGS) \
-g \
-I$(TOPSRCDIR) \
-I$(TOPSRCDIR)/src/kdelibs/khtml \
+ -I$(TOPSRCDIR)/src/kdelibs/khtml/misc \
+ -I$(TOPSRCDIR)/src/kdelibs/khtml/dom \
-I$(TOPSRCDIR)/src/kwq \
-I$(TOPSRCDIR)/src/kwq/dcop \
-I$(TOPSRCDIR)/src/kwq/qt \
diff --git a/WebCore/kwq/kio/kmimetype.h b/WebCore/kwq/kio/kmimetype.h
index 120cc53..a06f79d 100644
--- a/WebCore/kwq/kio/kmimetype.h
+++ b/WebCore/kwq/kio/kmimetype.h
@@ -50,15 +50,15 @@ public:
// constructors, copy constructors, and destructors ------------------------
KSharedPtr() {}
- KSharedPtr(const KSharedPtr &);
+ KSharedPtr(const KSharedPtr &) {}
~KSharedPtr() {}
// member functions --------------------------------------------------------
// operators ---------------------------------------------------------------
- KSharedPtr &operator=(const KSharedPtr &);
- T *operator->();
+ KSharedPtr &operator=(const KSharedPtr &) {}
+ T *operator->() {}
// protected -------------------------------------------------------------------
diff --git a/WebCore/kwq/qt/_qregion.cpp b/WebCore/kwq/qt/_qregion.cpp
index 8765785..6c991a4 100644
--- a/WebCore/kwq/qt/_qregion.cpp
+++ b/WebCore/kwq/qt/_qregion.cpp
@@ -113,6 +113,12 @@
/*****************************************************************************
QRegion member functions
*****************************************************************************/
+QRegion::QRegion( const QRect &r, RegionType type )
+{
+ fprintf (stderr,"WARNING %s:%s:%d (NOT YET IMPLEMENTED)\n", __FILE__, __FUNCTION__, __LINE__);
+}
+
+
QRegion::QRegion( const QPointArray &a, bool winding )
{
fprintf (stderr,"WARNING %s:%s:%d (NOT YET IMPLEMENTED)\n", __FILE__, __FUNCTION__, __LINE__);
@@ -123,6 +129,12 @@ QRegion::QRegion()
fprintf (stderr,"WARNING %s:%s:%d (NOT YET IMPLEMENTED)\n", __FILE__, __FUNCTION__, __LINE__);
}
+QRegion::QRegion( const QRegion & )
+{
+ fprintf (stderr,"WARNING %s:%s:%d (NOT YET IMPLEMENTED)\n", __FILE__, __FUNCTION__, __LINE__);
+}
+
+
QRegion::QRegion( bool is_null )
{
fprintf (stderr,"WARNING %s:%s:%d (NOT YET IMPLEMENTED)\n", __FILE__, __FUNCTION__, __LINE__);
@@ -408,6 +420,12 @@ QRegion& QRegion::operator^=( const QRegion &r )
{ return *this = *this ^ r; }
+QRegion &QRegion::operator=( const QRegion &r )
+{
+ fprintf (stderr,"WARNING %s:%s:%d (NOT YET IMPLEMENTED)\n", __FILE__, __FUNCTION__, __LINE__);
+}
+
+
bool QRegion::operator==( const QRegion &r ) const
{
fprintf (stderr,"WARNING %s:%s:%d (NOT YET IMPLEMENTED)\n", __FILE__, __FUNCTION__, __LINE__);
diff --git a/WebCore/kwq/qt/qguardedptr.h b/WebCore/kwq/qt/qguardedptr.h
index ac779bf..2f58885 100644
--- a/WebCore/kwq/qt/qguardedptr.h
+++ b/WebCore/kwq/qt/qguardedptr.h
@@ -44,21 +44,21 @@ public:
// constructors, copy constructors, and destructors ------------------------
- QGuardedPtr();
- QGuardedPtr(T *o);
- QGuardedPtr(const QGuardedPtr<T> &);
+ QGuardedPtr() {}
+ QGuardedPtr(T *o) {}
+ QGuardedPtr(const QGuardedPtr<T> &) {}
- ~QGuardedPtr();
+ ~QGuardedPtr() {}
// member functions --------------------------------------------------------
- bool isNull() const;
+ bool isNull() const {}
// operators ---------------------------------------------------------------
- QGuardedPtr &operator=(const QGuardedPtr &);
- operator T *() const;
- T *operator->() const;
+ QGuardedPtr &operator=(const QGuardedPtr &) {}
+ operator T *() const {}
+ T *operator->() const {}
// protected -------------------------------------------------------------------
// private ---------------------------------------------------------------------
diff --git a/WebCore/kwq/KWQKGlobalSettings.mm b/WebCore/src/kwq/KWQKstddirs.mm
similarity index 84%
copy from WebCore/kwq/KWQKGlobalSettings.mm
copy to WebCore/src/kwq/KWQKstddirs.mm
index e040e4d..7bd197d 100644
--- a/WebCore/kwq/KWQKGlobalSettings.mm
+++ b/WebCore/src/kwq/KWQKstddirs.mm
@@ -23,27 +23,17 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <qfont.h>
+#include <kstddirs.h>
-#include <kglobalsettings.h>
-
-QFont KGlobalSettings::generalFont()
-{
-}
-
-
-QFont KGlobalSettings::windowTitleFont()
-{
-}
-
-
-QFont KGlobalSettings::menuFont()
+QString locate(const char *type, const QString& filename,
+ const KInstance* instance=KGlobal::instance())
{
}
-int KGlobalSettings::contrast()
+QString locateLocal(const char *type, const QString &filename,
+ const KInstance *instance=KGlobal::instance())
{
}
diff --git a/WebCore/kwq/KWQKCompletionBox.mm b/WebCore/src/kwq/KWQTimer.mm
similarity index 94%
copy from WebCore/kwq/KWQKCompletionBox.mm
copy to WebCore/src/kwq/KWQTimer.mm
index bd1d113..52e507f 100644
--- a/WebCore/kwq/KWQKCompletionBox.mm
+++ b/WebCore/src/kwq/KWQTimer.mm
@@ -23,9 +23,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <kcompletionbox.h>
-
-KCompletionBox::KCompletionBox()
+#include <qtimer.h>
+
+void QTimer::singleShot(int, QObject *, const char *)
{
}
diff --git a/WebCore/kwq/KWQKPrinter.mm b/WebCore/src/kwq/KWQsignals.mm
similarity index 72%
copy from WebCore/kwq/KWQKPrinter.mm
copy to WebCore/src/kwq/KWQsignals.mm
index 003f79f..4eedd55 100644
--- a/WebCore/kwq/KWQKPrinter.mm
+++ b/WebCore/src/kwq/KWQsignals.mm
@@ -22,36 +22,37 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
+#include <khtmlview.h>
+#include <misc/loader.h>
+#include <java/kjavaappletcontext.h>
+#include <java/kjavaprocess.h>
-#include <kprinter.h>
-
-bool KPrinter::setup(QWidget *parent=0)
+void KHTMLView::cleared()
{
}
-
-bool KPrinter::newPage()
+void KJavaAppletContext::showStatus ( const QString& txt )
{
}
-void KPrinter::setDocName(const QString &)
+void KJavaAppletContext::showDocument( const QString& url, const QString& target )
{
}
-void KPrinter::setCreator(const QString &)
+void KJavaProcess::received( const QByteArray& )
{
}
-void KPrinter::setFullPage(bool)
+void khtml::Loader::requestDone( const DOM::DOMString &baseURL, khtml::CachedObject *obj )
{
}
-QSize KPrinter::margins() const
+void khtml::Loader::requestFailed( const DOM::DOMString &baseURL, khtml::CachedObject *obj )
{
}
-
diff --git a/WebCore/src/kwq/Makefile.in b/WebCore/src/kwq/Makefile.in
index 3914386..4241804 100644
--- a/WebCore/src/kwq/Makefile.in
+++ b/WebCore/src/kwq/Makefile.in
@@ -25,6 +25,7 @@ MMOBJECTS = \
_KWQOwner.o \
KWQasyncimageio.o \
KWQasyncio.o \
+ KWQsignals.o \
KWQtextcodec.o \
KWQtextstream.o \
KWQApplication.o \
@@ -48,6 +49,7 @@ MMOBJECTS = \
KWQImage.o \
KWQKjobclasses.o \
KWQKnetaccess.o \
+ KWQKstddirs.o \
KWQKApplication.o \
KWQKCharsets.o \
KWQKComboBox.o \
@@ -99,6 +101,7 @@ MMOBJECTS = \
KWQScrollView.o \
KWQStyle.o \
KWQTextEdit.o \
+ KWQTimer.o \
KWQToolTip.o \
KWQView.o \
KWQWMatrix.o \
@@ -127,6 +130,8 @@ CMMFLAGS = $(BASECMMFLAGS) \
-g \
-I$(TOPSRCDIR) \
-I$(TOPSRCDIR)/src/kdelibs/khtml \
+ -I$(TOPSRCDIR)/src/kdelibs/khtml/misc \
+ -I$(TOPSRCDIR)/src/kdelibs/khtml/dom \
-I$(TOPSRCDIR)/src/kwq \
-I$(TOPSRCDIR)/src/kwq/dcop \
-I$(TOPSRCDIR)/src/kwq/qt \
diff --git a/WebCore/src/kwq/kio/kmimetype.h b/WebCore/src/kwq/kio/kmimetype.h
index 120cc53..a06f79d 100644
--- a/WebCore/src/kwq/kio/kmimetype.h
+++ b/WebCore/src/kwq/kio/kmimetype.h
@@ -50,15 +50,15 @@ public:
// constructors, copy constructors, and destructors ------------------------
KSharedPtr() {}
- KSharedPtr(const KSharedPtr &);
+ KSharedPtr(const KSharedPtr &) {}
~KSharedPtr() {}
// member functions --------------------------------------------------------
// operators ---------------------------------------------------------------
- KSharedPtr &operator=(const KSharedPtr &);
- T *operator->();
+ KSharedPtr &operator=(const KSharedPtr &) {}
+ T *operator->() {}
// protected -------------------------------------------------------------------
diff --git a/WebCore/src/kwq/qt/_qregion.cpp b/WebCore/src/kwq/qt/_qregion.cpp
index 8765785..6c991a4 100644
--- a/WebCore/src/kwq/qt/_qregion.cpp
+++ b/WebCore/src/kwq/qt/_qregion.cpp
@@ -113,6 +113,12 @@
/*****************************************************************************
QRegion member functions
*****************************************************************************/
+QRegion::QRegion( const QRect &r, RegionType type )
+{
+ fprintf (stderr,"WARNING %s:%s:%d (NOT YET IMPLEMENTED)\n", __FILE__, __FUNCTION__, __LINE__);
+}
+
+
QRegion::QRegion( const QPointArray &a, bool winding )
{
fprintf (stderr,"WARNING %s:%s:%d (NOT YET IMPLEMENTED)\n", __FILE__, __FUNCTION__, __LINE__);
@@ -123,6 +129,12 @@ QRegion::QRegion()
fprintf (stderr,"WARNING %s:%s:%d (NOT YET IMPLEMENTED)\n", __FILE__, __FUNCTION__, __LINE__);
}
+QRegion::QRegion( const QRegion & )
+{
+ fprintf (stderr,"WARNING %s:%s:%d (NOT YET IMPLEMENTED)\n", __FILE__, __FUNCTION__, __LINE__);
+}
+
+
QRegion::QRegion( bool is_null )
{
fprintf (stderr,"WARNING %s:%s:%d (NOT YET IMPLEMENTED)\n", __FILE__, __FUNCTION__, __LINE__);
@@ -408,6 +420,12 @@ QRegion& QRegion::operator^=( const QRegion &r )
{ return *this = *this ^ r; }
+QRegion &QRegion::operator=( const QRegion &r )
+{
+ fprintf (stderr,"WARNING %s:%s:%d (NOT YET IMPLEMENTED)\n", __FILE__, __FUNCTION__, __LINE__);
+}
+
+
bool QRegion::operator==( const QRegion &r ) const
{
fprintf (stderr,"WARNING %s:%s:%d (NOT YET IMPLEMENTED)\n", __FILE__, __FUNCTION__, __LINE__);
diff --git a/WebCore/src/kwq/qt/qguardedptr.h b/WebCore/src/kwq/qt/qguardedptr.h
index ac779bf..2f58885 100644
--- a/WebCore/src/kwq/qt/qguardedptr.h
+++ b/WebCore/src/kwq/qt/qguardedptr.h
@@ -44,21 +44,21 @@ public:
// constructors, copy constructors, and destructors ------------------------
- QGuardedPtr();
- QGuardedPtr(T *o);
- QGuardedPtr(const QGuardedPtr<T> &);
+ QGuardedPtr() {}
+ QGuardedPtr(T *o) {}
+ QGuardedPtr(const QGuardedPtr<T> &) {}
- ~QGuardedPtr();
+ ~QGuardedPtr() {}
// member functions --------------------------------------------------------
- bool isNull() const;
+ bool isNull() const {}
// operators ---------------------------------------------------------------
- QGuardedPtr &operator=(const QGuardedPtr &);
- operator T *() const;
- T *operator->() const;
+ QGuardedPtr &operator=(const QGuardedPtr &) {}
+ operator T *() const {}
+ T *operator->() const {}
// protected -------------------------------------------------------------------
// private ---------------------------------------------------------------------
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list