[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
kocienda
kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 05:51:33 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 9517e4ae938ac14231158ab9dab61b812d8eee94
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Nov 6 16:41:27 2001 +0000
A number of changes that help to get javascript up and running:
- Modified a number of Makefiles to include ecma directory
- Tweaked a bunch of kjs files that used 'id' as a local variable
name. Now that these files are included in .mm's there's a name
conflict with the Objective-C type. In each case, the 'id' local
variable name was changed to '_id'.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@409 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/src/kwq/KWQFrame.mm b/WebCore/kwq/KWQDCOPClient.mm
similarity index 63%
copy from WebCore/src/kwq/KWQFrame.mm
copy to WebCore/kwq/KWQDCOPClient.mm
index 473971d..f6160b5 100644
--- a/WebCore/src/kwq/KWQFrame.mm
+++ b/WebCore/kwq/KWQDCOPClient.mm
@@ -22,42 +22,51 @@
* (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 <KWQFrame.h>
-
#include <kwqdebug.h>
-QFrame::QFrame()
+#include <dcopclient.h>
+
+// class DCOPClient ======================================================
+
+DCOPClient::DCOPClient()
{
_logNeverImplemented();
}
-QFrame::QFrame(QWidget *parent)
+DCOPClient::~DCOPClient()
{
_logNeverImplemented();
}
-void QFrame::setFrameStyle(int)
+bool DCOPClient::call(const char *remApp, const char *remObj, const char *remFun,
+ const QByteArray &data, QCString& replyType, QByteArray &replyData,
+ bool useEventLoop=false, bool fast=false)
{
_logNeverImplemented();
+ return FALSE;
}
-
-int QFrame::frameWidth() const
+bool DCOPClient::call(const QCString &remApp, const QCString &remObj,
+ const QCString &remFun, const QByteArray &data, QCString& replyType,
+ QByteArray &replyData, bool useEventLoop=false, bool fast=false)
{
_logNeverImplemented();
+ return FALSE;
}
-
-QFrame::QFrame(const QFrame &)
+bool DCOPClient::send(const char *remApp, const char *remObj, const char *remFun,
+ const QByteArray &data, bool fast=false)
{
_logNeverImplemented();
+ return FALSE;
}
-
-QFrame &QFrame::operator=(const QFrame &)
+bool DCOPClient::send(const QCString &remApp, const QCString &remObj,
+ const QCString &remFun, const QByteArray &data, bool fast=false)
{
_logNeverImplemented();
+ return FALSE;
}
diff --git a/WebCore/kwq/KWQKScheduler.mm b/WebCore/kwq/KWQGuardedPtr.mm
similarity index 89%
copy from WebCore/kwq/KWQKScheduler.mm
copy to WebCore/kwq/KWQGuardedPtr.mm
index fe42291..b79580a 100644
--- a/WebCore/kwq/KWQKScheduler.mm
+++ b/WebCore/kwq/KWQGuardedPtr.mm
@@ -23,20 +23,17 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <scheduler.h>
+#include <qguardedptr.h>
-namespace KIO {
-
-
-void Scheduler::scheduleJob(SimpleJob *job)
+QGuardedPtrPrivate::QGuardedPtrPrivate(QObject* o)
+ : QObject(0, "_ptrpriv" ), p(o)
{
}
-Scheduler::~Scheduler()
+QGuardedPtrPrivate::~QGuardedPtrPrivate()
{
}
-} // namespace KIO
diff --git a/WebCore/src/kwq/KWQPaintDevice.mm b/WebCore/kwq/KWQInputDialog.mm
similarity index 89%
copy from WebCore/src/kwq/KWQPaintDevice.mm
copy to WebCore/kwq/KWQInputDialog.mm
index fa67428..bb06273 100644
--- a/WebCore/src/kwq/KWQPaintDevice.mm
+++ b/WebCore/kwq/KWQInputDialog.mm
@@ -22,15 +22,13 @@
* (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 <qpaintdevice.h>
#include <kwqdebug.h>
-#include <Cocoa/Cocoa.h>
+#include <qinputdialog.h>
-
-QPaintDevice::~QPaintDevice()
+QString QInputDialog::getText(const QString &, const QString &, const QString &, bool *,
+ QWidget *, const char *)
{
_logNeverImplemented();
+ return QString();
}
-
-
diff --git a/WebCore/src/kwq/KWQLabel.mm b/WebCore/kwq/KWQKPartsBrowserInterface.mm
similarity index 82%
copy from WebCore/src/kwq/KWQLabel.mm
copy to WebCore/kwq/KWQKPartsBrowserInterface.mm
index e3ff43b..519cc44 100644
--- a/WebCore/src/kwq/KWQLabel.mm
+++ b/WebCore/kwq/KWQKPartsBrowserInterface.mm
@@ -24,37 +24,28 @@
*/
#include <kwqdebug.h>
-#include <qlabel.h>
+#include <browserinterface.h>
-// class QLabel ================================================================
+namespace KParts {
-QLabel::QLabel(QWidget *parent)
-{
- _logNotYetImplemented();
-}
+// class BrowserInterface ======================================================
-
-QLabel::QLabel(const QString &, QWidget *)
+BrowserInterface::BrowserInterface(QObject *parent, const char *name)
{
_logNotYetImplemented();
}
-
-QLabel::~QLabel()
+BrowserInterface::~BrowserInterface()
{
_logNotYetImplemented();
}
-
-void QLabel::setText(const QString &)
+void BrowserInterface::callMethod(const char *name, const QVariant &argument)
{
_logNotYetImplemented();
}
+} // namespace KParts
-void QLabel::setAlignment(int)
-{
- _logNotYetImplemented();
-}
diff --git a/WebCore/src/kwq/KWQLabel.mm b/WebCore/kwq/KWQbrowserinterface.mm
similarity index 82%
copy from WebCore/src/kwq/KWQLabel.mm
copy to WebCore/kwq/KWQbrowserinterface.mm
index e3ff43b..519cc44 100644
--- a/WebCore/src/kwq/KWQLabel.mm
+++ b/WebCore/kwq/KWQbrowserinterface.mm
@@ -24,37 +24,28 @@
*/
#include <kwqdebug.h>
-#include <qlabel.h>
+#include <browserinterface.h>
-// class QLabel ================================================================
+namespace KParts {
-QLabel::QLabel(QWidget *parent)
-{
- _logNotYetImplemented();
-}
+// class BrowserInterface ======================================================
-
-QLabel::QLabel(const QString &, QWidget *)
+BrowserInterface::BrowserInterface(QObject *parent, const char *name)
{
_logNotYetImplemented();
}
-
-QLabel::~QLabel()
+BrowserInterface::~BrowserInterface()
{
_logNotYetImplemented();
}
-
-void QLabel::setText(const QString &)
+void BrowserInterface::callMethod(const char *name, const QVariant &argument)
{
_logNotYetImplemented();
}
+} // namespace KParts
-void QLabel::setAlignment(int)
-{
- _logNotYetImplemented();
-}
diff --git a/WebCore/src/kwq/qt/qcheckbox.h b/WebCore/kwq/qt/qdatastream.h
similarity index 74%
copy from WebCore/src/kwq/qt/qcheckbox.h
copy to WebCore/kwq/qt/qdatastream.h
index cafd2dc..c9cbf05 100644
--- a/WebCore/src/kwq/qt/qcheckbox.h
+++ b/WebCore/kwq/qt/qdatastream.h
@@ -23,18 +23,16 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef QCHECKBOX_H_
-#define QCHECKBOX_H_
+#ifndef QDATASTREAM_H_
+#define QDATASTREAM_H_
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
-#include <qbutton.h>
+// class QDataStream ===========================================================
-// class QCheckBox =============================================================
-
-class QCheckBox : public QButton {
+class QDataStream {
public:
// typedefs ----------------------------------------------------------------
@@ -43,29 +41,34 @@ public:
// static member functions -------------------------------------------------
// constructors, copy constructors, and destructors ------------------------
- QCheckBox(QWidget *);
-
-// add no-op destructor
-#ifdef _KWQ_PEDANTIC_
- ~QCheckBox() {}
-#endif
+ QDataStream();
+ virtual ~QDataStream();
+
// member functions --------------------------------------------------------
- void setChecked(bool);
-
// operators ---------------------------------------------------------------
-// protected -------------------------------------------------------------------
+ QDataStream &operator<<(Q_INT8 i);
+ QDataStream &operator<<(Q_INT16 i);
+ QDataStream &operator<<(Q_INT32 i);
+ QDataStream &operator<<(Q_INT64 i);
+// protected -------------------------------------------------------------------
// private ---------------------------------------------------------------------
-private:
- // no copying or assignment
- // note that these are "standard" (no pendantic stuff needed)
- QCheckBox(const QCheckBox &);
- QCheckBox &operator=(const QCheckBox &);
-
-}; // class QCheckBox ==========================================================
+}; // class QDataStream ========================================================
+
+inline QDataStream &QDataStream::operator<<( Q_UINT8 i )
+{ return *this << (Q_INT8)i; }
+
+inline QDataStream &QDataStream::operator<<( Q_UINT16 i )
+{ return *this << (Q_INT16)i; }
+
+inline QDataStream &QDataStream::operator<<( Q_UINT32 i )
+{ return *this << (Q_INT32)i; }
+
+inline QDataStream &QDataStream::operator<<( Q_UINT64 i )
+{ return *this << (Q_INT64)i; }
#endif
diff --git a/WebCore/src/kwq/KWQFrame.mm b/WebCore/src/kwq/KWQDCOPClient.mm
similarity index 63%
copy from WebCore/src/kwq/KWQFrame.mm
copy to WebCore/src/kwq/KWQDCOPClient.mm
index 473971d..f6160b5 100644
--- a/WebCore/src/kwq/KWQFrame.mm
+++ b/WebCore/src/kwq/KWQDCOPClient.mm
@@ -22,42 +22,51 @@
* (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 <KWQFrame.h>
-
#include <kwqdebug.h>
-QFrame::QFrame()
+#include <dcopclient.h>
+
+// class DCOPClient ======================================================
+
+DCOPClient::DCOPClient()
{
_logNeverImplemented();
}
-QFrame::QFrame(QWidget *parent)
+DCOPClient::~DCOPClient()
{
_logNeverImplemented();
}
-void QFrame::setFrameStyle(int)
+bool DCOPClient::call(const char *remApp, const char *remObj, const char *remFun,
+ const QByteArray &data, QCString& replyType, QByteArray &replyData,
+ bool useEventLoop=false, bool fast=false)
{
_logNeverImplemented();
+ return FALSE;
}
-
-int QFrame::frameWidth() const
+bool DCOPClient::call(const QCString &remApp, const QCString &remObj,
+ const QCString &remFun, const QByteArray &data, QCString& replyType,
+ QByteArray &replyData, bool useEventLoop=false, bool fast=false)
{
_logNeverImplemented();
+ return FALSE;
}
-
-QFrame::QFrame(const QFrame &)
+bool DCOPClient::send(const char *remApp, const char *remObj, const char *remFun,
+ const QByteArray &data, bool fast=false)
{
_logNeverImplemented();
+ return FALSE;
}
-
-QFrame &QFrame::operator=(const QFrame &)
+bool DCOPClient::send(const QCString &remApp, const QCString &remObj,
+ const QCString &remFun, const QByteArray &data, bool fast=false)
{
_logNeverImplemented();
+ return FALSE;
}
diff --git a/WebCore/kwq/KWQKScheduler.mm b/WebCore/src/kwq/KWQGuardedPtr.mm
similarity index 89%
copy from WebCore/kwq/KWQKScheduler.mm
copy to WebCore/src/kwq/KWQGuardedPtr.mm
index fe42291..b79580a 100644
--- a/WebCore/kwq/KWQKScheduler.mm
+++ b/WebCore/src/kwq/KWQGuardedPtr.mm
@@ -23,20 +23,17 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <scheduler.h>
+#include <qguardedptr.h>
-namespace KIO {
-
-
-void Scheduler::scheduleJob(SimpleJob *job)
+QGuardedPtrPrivate::QGuardedPtrPrivate(QObject* o)
+ : QObject(0, "_ptrpriv" ), p(o)
{
}
-Scheduler::~Scheduler()
+QGuardedPtrPrivate::~QGuardedPtrPrivate()
{
}
-} // namespace KIO
diff --git a/WebCore/src/kwq/KWQPaintDevice.mm b/WebCore/src/kwq/KWQInputDialog.mm
similarity index 89%
copy from WebCore/src/kwq/KWQPaintDevice.mm
copy to WebCore/src/kwq/KWQInputDialog.mm
index fa67428..bb06273 100644
--- a/WebCore/src/kwq/KWQPaintDevice.mm
+++ b/WebCore/src/kwq/KWQInputDialog.mm
@@ -22,15 +22,13 @@
* (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 <qpaintdevice.h>
#include <kwqdebug.h>
-#include <Cocoa/Cocoa.h>
+#include <qinputdialog.h>
-
-QPaintDevice::~QPaintDevice()
+QString QInputDialog::getText(const QString &, const QString &, const QString &, bool *,
+ QWidget *, const char *)
{
_logNeverImplemented();
+ return QString();
}
-
-
diff --git a/WebCore/src/kwq/KWQLabel.mm b/WebCore/src/kwq/KWQbrowserinterface.mm
similarity index 82%
copy from WebCore/src/kwq/KWQLabel.mm
copy to WebCore/src/kwq/KWQbrowserinterface.mm
index e3ff43b..519cc44 100644
--- a/WebCore/src/kwq/KWQLabel.mm
+++ b/WebCore/src/kwq/KWQbrowserinterface.mm
@@ -24,37 +24,28 @@
*/
#include <kwqdebug.h>
-#include <qlabel.h>
+#include <browserinterface.h>
-// class QLabel ================================================================
+namespace KParts {
-QLabel::QLabel(QWidget *parent)
-{
- _logNotYetImplemented();
-}
+// class BrowserInterface ======================================================
-
-QLabel::QLabel(const QString &, QWidget *)
+BrowserInterface::BrowserInterface(QObject *parent, const char *name)
{
_logNotYetImplemented();
}
-
-QLabel::~QLabel()
+BrowserInterface::~BrowserInterface()
{
_logNotYetImplemented();
}
-
-void QLabel::setText(const QString &)
+void BrowserInterface::callMethod(const char *name, const QVariant &argument)
{
_logNotYetImplemented();
}
+} // namespace KParts
-void QLabel::setAlignment(int)
-{
- _logNotYetImplemented();
-}
diff --git a/WebCore/src/kwq/qt/qcheckbox.h b/WebCore/src/kwq/qt/qdatastream.h
similarity index 74%
copy from WebCore/src/kwq/qt/qcheckbox.h
copy to WebCore/src/kwq/qt/qdatastream.h
index cafd2dc..c9cbf05 100644
--- a/WebCore/src/kwq/qt/qcheckbox.h
+++ b/WebCore/src/kwq/qt/qdatastream.h
@@ -23,18 +23,16 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef QCHECKBOX_H_
-#define QCHECKBOX_H_
+#ifndef QDATASTREAM_H_
+#define QDATASTREAM_H_
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
-#include <qbutton.h>
+// class QDataStream ===========================================================
-// class QCheckBox =============================================================
-
-class QCheckBox : public QButton {
+class QDataStream {
public:
// typedefs ----------------------------------------------------------------
@@ -43,29 +41,34 @@ public:
// static member functions -------------------------------------------------
// constructors, copy constructors, and destructors ------------------------
- QCheckBox(QWidget *);
-
-// add no-op destructor
-#ifdef _KWQ_PEDANTIC_
- ~QCheckBox() {}
-#endif
+ QDataStream();
+ virtual ~QDataStream();
+
// member functions --------------------------------------------------------
- void setChecked(bool);
-
// operators ---------------------------------------------------------------
-// protected -------------------------------------------------------------------
+ QDataStream &operator<<(Q_INT8 i);
+ QDataStream &operator<<(Q_INT16 i);
+ QDataStream &operator<<(Q_INT32 i);
+ QDataStream &operator<<(Q_INT64 i);
+// protected -------------------------------------------------------------------
// private ---------------------------------------------------------------------
-private:
- // no copying or assignment
- // note that these are "standard" (no pendantic stuff needed)
- QCheckBox(const QCheckBox &);
- QCheckBox &operator=(const QCheckBox &);
-
-}; // class QCheckBox ==========================================================
+}; // class QDataStream ========================================================
+
+inline QDataStream &QDataStream::operator<<( Q_UINT8 i )
+{ return *this << (Q_INT8)i; }
+
+inline QDataStream &QDataStream::operator<<( Q_UINT16 i )
+{ return *this << (Q_INT16)i; }
+
+inline QDataStream &QDataStream::operator<<( Q_UINT32 i )
+{ return *this << (Q_INT32)i; }
+
+inline QDataStream &QDataStream::operator<<( Q_UINT64 i )
+{ return *this << (Q_INT64)i; }
#endif
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list