[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:55 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 847347d4f2cc37a2c29965ec9725de60841e0625
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Oct 8 20:25:50 2001 +0000
More stubs.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@301 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/khtml/html/htmltokenizer.h b/WebCore/khtml/html/htmltokenizer.h
index 0a3a551..274b1c8 100644
--- a/WebCore/khtml/html/htmltokenizer.h
+++ b/WebCore/khtml/html/htmltokenizer.h
@@ -133,7 +133,8 @@ public:
virtual void setOnHold(bool /*_onHold*/) {}
signals:
- void finishedParsing();
+ // temporary implementation here to get test to link
+ void finishedParsing() {};
};
diff --git a/WebCore/kwq/KWQKPartsEvent.mm b/WebCore/kwq/KWQKFileDialog.mm
similarity index 86%
copy from WebCore/kwq/KWQKPartsEvent.mm
copy to WebCore/kwq/KWQKFileDialog.mm
index be139ae..03a92a0 100644
--- a/WebCore/kwq/KWQKPartsEvent.mm
+++ b/WebCore/kwq/KWQKFileDialog.mm
@@ -23,23 +23,20 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <event.h>
+#include <kfiledialog.h>
-class QPainter;
-
-namespace KParts {
-
-bool Event::test(const QEvent *)
+QString KFileDialog::getOpenFileName(const QString &startDir,
+ const QString &filter, QWidget *parent, const QString &caption)
{
}
-bool Event::test(const QEvent *, const char *)
+
+KFileDialog::KFileDialog()
{
}
-Event::Event(const char *)
+KFileDialog::~KFileDialog()
{
}
-} // namespace KParts
diff --git a/WebCore/kwq/KWQKGlobal.mm b/WebCore/kwq/KWQKGlobal.mm
index e1e3848..1672b0f 100644
--- a/WebCore/kwq/KWQKGlobal.mm
+++ b/WebCore/kwq/KWQKGlobal.mm
@@ -47,7 +47,7 @@ KStandardDirs *KGlobal::dirs()
}
-KConfig KGlobal::*config()
+KConfig *KGlobal::config()
{
}
diff --git a/WebCore/kwq/KWQHBox.mm b/WebCore/kwq/KWQKHTMLPartBrowserExtension.mm
similarity index 88%
copy from WebCore/kwq/KWQHBox.mm
copy to WebCore/kwq/KWQKHTMLPartBrowserExtension.mm
index 6f3aa24..ca55b0d 100644
--- a/WebCore/kwq/KWQHBox.mm
+++ b/WebCore/kwq/KWQKHTMLPartBrowserExtension.mm
@@ -23,24 +23,14 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <qhbox.h>
+#include <khtml_ext.h>
-QHBox::QHBox()
-{
-}
-
-
-QHBox::QHBox(QWidget *)
-{
-}
-
-QHBox::~QHBox()
+void KHTMLPartBrowserExtension::editableWidgetFocused( QWidget *widget )
{
}
-bool QHBox::setStretchFactor(QWidget*, int stretch)
+void KHTMLPartBrowserExtension::editableWidgetBlurred( QWidget *widget )
{
}
-
diff --git a/WebCore/src/kwq/KWQTimer.mm b/WebCore/kwq/KWQKLocale.mm
similarity index 94%
copy from WebCore/src/kwq/KWQTimer.mm
copy to WebCore/kwq/KWQKLocale.mm
index 52e507f..a7692d8 100644
--- a/WebCore/src/kwq/KWQTimer.mm
+++ b/WebCore/kwq/KWQKLocale.mm
@@ -23,9 +23,11 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <qtimer.h>
+#include <qstring.h>
-void QTimer::singleShot(int, QObject *, const char *)
+#include <klocale.h>
+
+QString i18n(const char* text)
{
}
diff --git a/WebCore/kwq/KWQKStaticDeleter.h b/WebCore/kwq/KWQKStaticDeleter.h
index 0997cfb..eb8b77f 100644
--- a/WebCore/kwq/KWQKStaticDeleter.h
+++ b/WebCore/kwq/KWQKStaticDeleter.h
@@ -52,7 +52,7 @@ public:
// member functions --------------------------------------------------------
- T *setObject(T *, bool isArray=false);
+ T *setObject(T *, bool isArray=false) {}
// operators ---------------------------------------------------------------
diff --git a/WebCore/kwq/KWQKProcess.mm b/WebCore/kwq/KWQVariant.mm
similarity index 79%
copy from WebCore/kwq/KWQKProcess.mm
copy to WebCore/kwq/KWQVariant.mm
index 9505adc..cb68b45 100644
--- a/WebCore/kwq/KWQKProcess.mm
+++ b/WebCore/kwq/KWQVariant.mm
@@ -23,51 +23,55 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <kprocess.h>
+#include <qvariant.h>
-KProcess::KProcess()
+
+QVariant::QVariant()
{
}
-KProcess::~KProcess()
+QVariant::QVariant(bool, int)
{
}
-QStrList *KProcess::args()
+QVariant::QVariant(double)
{
}
-bool KProcess::isRunning() const
+QVariant::QVariant(const QString &)
{
}
-bool KProcess::writeStdin(const char *buffer, int buflen)
+QVariant::QVariant(const QVariant &)
{
}
-bool KProcess::start(RunMode runmode, Communication comm)
+QVariant::~QVariant()
{
}
-bool KProcess::kill(int signo=SIGTERM)
+QVariant::Type QVariant::type() const
{
}
-void KProcess::resume()
+bool QVariant::toBool() const
{
}
-KProcess &KProcess::operator<<(const QString& arg)
+uint QVariant::toUInt() const
{
}
+QVariant &QVariant::operator=(const QVariant &)
+{
+}
diff --git a/WebCore/src/kwq/KWQKHistoryProvider.mm b/WebCore/kwq/KWQbrowserextension.mm
similarity index 76%
copy from WebCore/src/kwq/KWQKHistoryProvider.mm
copy to WebCore/kwq/KWQbrowserextension.mm
index 07aaed8..0a96783 100644
--- a/WebCore/src/kwq/KWQKHistoryProvider.mm
+++ b/WebCore/kwq/KWQbrowserextension.mm
@@ -23,26 +23,35 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <historyprovider.h>
+#include <browserextension.h>
namespace KParts {
-HistoryProvider *HistoryProvider::self()
+// class BrowserExtension ======================================================
+
+BrowserExtension::~BrowserExtension()
+{
+}
+
+
+BrowserInterface *BrowserExtension::browserInterface() const
{
}
-HistoryProvider::HistoryProvider()
+void BrowserExtension::createNewWindow(const KURL &)
{
}
-HistoryProvider::~HistoryProvider()
+// class BrowserHostExtension ==================================================
+
+BrowserHostExtension::BrowserHostExtension()
{
}
-bool HistoryProvider::contains(const QString &) const
+BrowserHostExtension::~BrowserHostExtension()
{
}
diff --git a/WebCore/kwq/Makefile.in b/WebCore/kwq/Makefile.in
index 4241804..3f1c11b 100644
--- a/WebCore/kwq/Makefile.in
+++ b/WebCore/kwq/Makefile.in
@@ -25,6 +25,7 @@ MMOBJECTS = \
_KWQOwner.o \
KWQasyncimageio.o \
KWQasyncio.o \
+ KWQbrowserextension.o \
KWQsignals.o \
KWQtextcodec.o \
KWQtextstream.o \
@@ -59,10 +60,12 @@ MMOBJECTS = \
KWQKDebug.o \
KWQKFactory.o \
KWQKFileItem.o \
+ KWQKFileDialog.o \
KWQKGlobal.o \
KWQKGlobalSettings.o \
KWQKHistoryProvider.o \
KWQKHTMLPart.o \
+ KWQKHTMLPartBrowserExtension.o \
KWQKHTMLFactory.o \
KWQKHTMLSettings.o \
KWQKIconLoader.o \
@@ -70,6 +73,7 @@ MMOBJECTS = \
KWQKInstance.o \
KWQKJavaEmbed.o \
KWQKJob.o \
+ KWQKLocale.o \
KWQKLineEdit.o \
KWQKListBox.o \
KWQKMimeType.o \
@@ -103,6 +107,7 @@ MMOBJECTS = \
KWQTextEdit.o \
KWQTimer.o \
KWQToolTip.o \
+ KWQVariant.o \
KWQView.o \
KWQWMatrix.o \
KWQWidget.o \
@@ -138,6 +143,7 @@ CMMFLAGS = $(BASECMMFLAGS) \
-I$(TOPSRCDIR)/src/kwq/kde \
-I$(TOPSRCDIR)/src/kwq/kdecore \
-I$(TOPSRCDIR)/src/kwq/kdeui \
+ -I$(TOPSRCDIR)/src/kwq/kfile \
-I$(TOPSRCDIR)/src/kwq/khtml \
-I$(TOPSRCDIR)/src/kwq/khtml/java \
-I$(TOPSRCDIR)/src/kwq/kio \
diff --git a/WebCore/kwq/kdecore/kstaticdeleter.h b/WebCore/kwq/kdecore/kstaticdeleter.h
index 0997cfb..eb8b77f 100644
--- a/WebCore/kwq/kdecore/kstaticdeleter.h
+++ b/WebCore/kwq/kdecore/kstaticdeleter.h
@@ -52,7 +52,7 @@ public:
// member functions --------------------------------------------------------
- T *setObject(T *, bool isArray=false);
+ T *setObject(T *, bool isArray=false) {}
// operators ---------------------------------------------------------------
diff --git a/WebCore/src/kdelibs/khtml/html/htmltokenizer.h b/WebCore/src/kdelibs/khtml/html/htmltokenizer.h
index 0a3a551..274b1c8 100644
--- a/WebCore/src/kdelibs/khtml/html/htmltokenizer.h
+++ b/WebCore/src/kdelibs/khtml/html/htmltokenizer.h
@@ -133,7 +133,8 @@ public:
virtual void setOnHold(bool /*_onHold*/) {}
signals:
- void finishedParsing();
+ // temporary implementation here to get test to link
+ void finishedParsing() {};
};
diff --git a/WebCore/kwq/KWQKPartsEvent.mm b/WebCore/src/kwq/KWQKFileDialog.mm
similarity index 86%
copy from WebCore/kwq/KWQKPartsEvent.mm
copy to WebCore/src/kwq/KWQKFileDialog.mm
index be139ae..03a92a0 100644
--- a/WebCore/kwq/KWQKPartsEvent.mm
+++ b/WebCore/src/kwq/KWQKFileDialog.mm
@@ -23,23 +23,20 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <event.h>
+#include <kfiledialog.h>
-class QPainter;
-
-namespace KParts {
-
-bool Event::test(const QEvent *)
+QString KFileDialog::getOpenFileName(const QString &startDir,
+ const QString &filter, QWidget *parent, const QString &caption)
{
}
-bool Event::test(const QEvent *, const char *)
+
+KFileDialog::KFileDialog()
{
}
-Event::Event(const char *)
+KFileDialog::~KFileDialog()
{
}
-} // namespace KParts
diff --git a/WebCore/src/kwq/KWQKGlobal.mm b/WebCore/src/kwq/KWQKGlobal.mm
index e1e3848..1672b0f 100644
--- a/WebCore/src/kwq/KWQKGlobal.mm
+++ b/WebCore/src/kwq/KWQKGlobal.mm
@@ -47,7 +47,7 @@ KStandardDirs *KGlobal::dirs()
}
-KConfig KGlobal::*config()
+KConfig *KGlobal::config()
{
}
diff --git a/WebCore/kwq/KWQHBox.mm b/WebCore/src/kwq/KWQKHTMLPartBrowserExtension.mm
similarity index 88%
copy from WebCore/kwq/KWQHBox.mm
copy to WebCore/src/kwq/KWQKHTMLPartBrowserExtension.mm
index 6f3aa24..ca55b0d 100644
--- a/WebCore/kwq/KWQHBox.mm
+++ b/WebCore/src/kwq/KWQKHTMLPartBrowserExtension.mm
@@ -23,24 +23,14 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <qhbox.h>
+#include <khtml_ext.h>
-QHBox::QHBox()
-{
-}
-
-
-QHBox::QHBox(QWidget *)
-{
-}
-
-QHBox::~QHBox()
+void KHTMLPartBrowserExtension::editableWidgetFocused( QWidget *widget )
{
}
-bool QHBox::setStretchFactor(QWidget*, int stretch)
+void KHTMLPartBrowserExtension::editableWidgetBlurred( QWidget *widget )
{
}
-
diff --git a/WebCore/src/kwq/KWQTimer.mm b/WebCore/src/kwq/KWQKLocale.mm
similarity index 94%
copy from WebCore/src/kwq/KWQTimer.mm
copy to WebCore/src/kwq/KWQKLocale.mm
index 52e507f..a7692d8 100644
--- a/WebCore/src/kwq/KWQTimer.mm
+++ b/WebCore/src/kwq/KWQKLocale.mm
@@ -23,9 +23,11 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <qtimer.h>
+#include <qstring.h>
-void QTimer::singleShot(int, QObject *, const char *)
+#include <klocale.h>
+
+QString i18n(const char* text)
{
}
diff --git a/WebCore/kwq/KWQKProcess.mm b/WebCore/src/kwq/KWQVariant.mm
similarity index 79%
copy from WebCore/kwq/KWQKProcess.mm
copy to WebCore/src/kwq/KWQVariant.mm
index 9505adc..cb68b45 100644
--- a/WebCore/kwq/KWQKProcess.mm
+++ b/WebCore/src/kwq/KWQVariant.mm
@@ -23,51 +23,55 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <kprocess.h>
+#include <qvariant.h>
-KProcess::KProcess()
+
+QVariant::QVariant()
{
}
-KProcess::~KProcess()
+QVariant::QVariant(bool, int)
{
}
-QStrList *KProcess::args()
+QVariant::QVariant(double)
{
}
-bool KProcess::isRunning() const
+QVariant::QVariant(const QString &)
{
}
-bool KProcess::writeStdin(const char *buffer, int buflen)
+QVariant::QVariant(const QVariant &)
{
}
-bool KProcess::start(RunMode runmode, Communication comm)
+QVariant::~QVariant()
{
}
-bool KProcess::kill(int signo=SIGTERM)
+QVariant::Type QVariant::type() const
{
}
-void KProcess::resume()
+bool QVariant::toBool() const
{
}
-KProcess &KProcess::operator<<(const QString& arg)
+uint QVariant::toUInt() const
{
}
+QVariant &QVariant::operator=(const QVariant &)
+{
+}
diff --git a/WebCore/src/kwq/KWQKHistoryProvider.mm b/WebCore/src/kwq/KWQbrowserextension.mm
similarity index 76%
copy from WebCore/src/kwq/KWQKHistoryProvider.mm
copy to WebCore/src/kwq/KWQbrowserextension.mm
index 07aaed8..0a96783 100644
--- a/WebCore/src/kwq/KWQKHistoryProvider.mm
+++ b/WebCore/src/kwq/KWQbrowserextension.mm
@@ -23,26 +23,35 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <historyprovider.h>
+#include <browserextension.h>
namespace KParts {
-HistoryProvider *HistoryProvider::self()
+// class BrowserExtension ======================================================
+
+BrowserExtension::~BrowserExtension()
+{
+}
+
+
+BrowserInterface *BrowserExtension::browserInterface() const
{
}
-HistoryProvider::HistoryProvider()
+void BrowserExtension::createNewWindow(const KURL &)
{
}
-HistoryProvider::~HistoryProvider()
+// class BrowserHostExtension ==================================================
+
+BrowserHostExtension::BrowserHostExtension()
{
}
-bool HistoryProvider::contains(const QString &) const
+BrowserHostExtension::~BrowserHostExtension()
{
}
diff --git a/WebCore/src/kwq/Makefile.in b/WebCore/src/kwq/Makefile.in
index 4241804..3f1c11b 100644
--- a/WebCore/src/kwq/Makefile.in
+++ b/WebCore/src/kwq/Makefile.in
@@ -25,6 +25,7 @@ MMOBJECTS = \
_KWQOwner.o \
KWQasyncimageio.o \
KWQasyncio.o \
+ KWQbrowserextension.o \
KWQsignals.o \
KWQtextcodec.o \
KWQtextstream.o \
@@ -59,10 +60,12 @@ MMOBJECTS = \
KWQKDebug.o \
KWQKFactory.o \
KWQKFileItem.o \
+ KWQKFileDialog.o \
KWQKGlobal.o \
KWQKGlobalSettings.o \
KWQKHistoryProvider.o \
KWQKHTMLPart.o \
+ KWQKHTMLPartBrowserExtension.o \
KWQKHTMLFactory.o \
KWQKHTMLSettings.o \
KWQKIconLoader.o \
@@ -70,6 +73,7 @@ MMOBJECTS = \
KWQKInstance.o \
KWQKJavaEmbed.o \
KWQKJob.o \
+ KWQKLocale.o \
KWQKLineEdit.o \
KWQKListBox.o \
KWQKMimeType.o \
@@ -103,6 +107,7 @@ MMOBJECTS = \
KWQTextEdit.o \
KWQTimer.o \
KWQToolTip.o \
+ KWQVariant.o \
KWQView.o \
KWQWMatrix.o \
KWQWidget.o \
@@ -138,6 +143,7 @@ CMMFLAGS = $(BASECMMFLAGS) \
-I$(TOPSRCDIR)/src/kwq/kde \
-I$(TOPSRCDIR)/src/kwq/kdecore \
-I$(TOPSRCDIR)/src/kwq/kdeui \
+ -I$(TOPSRCDIR)/src/kwq/kfile \
-I$(TOPSRCDIR)/src/kwq/khtml \
-I$(TOPSRCDIR)/src/kwq/khtml/java \
-I$(TOPSRCDIR)/src/kwq/kio \
diff --git a/WebCore/src/kwq/kdecore/kstaticdeleter.h b/WebCore/src/kwq/kdecore/kstaticdeleter.h
index 0997cfb..eb8b77f 100644
--- a/WebCore/src/kwq/kdecore/kstaticdeleter.h
+++ b/WebCore/src/kwq/kdecore/kstaticdeleter.h
@@ -52,7 +52,7 @@ public:
// member functions --------------------------------------------------------
- T *setObject(T *, bool isArray=false);
+ T *setObject(T *, bool isArray=false) {}
// operators ---------------------------------------------------------------
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list