[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
darin
darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:16:33 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit ae944f55e0d3e8e17926602cc55a0e3299a89bea
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Jun 4 05:23:40 2002 +0000
* LICENSE: Add 2002.
* kwq/KWQApplication.mm:
* kwq/kdecore/kapplication.h:
* kwq/qt/qapplication.h:
Found a way to simplify the application objects by making more of
the functions static so we don't need to actually allocate an object.
* kwq/Makefile.am:
* kwq/KWQKApplication.mm: Removed.
* kwq/kdecore/kapp.h: Removed.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1260 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 6bbdad8..bd375b0 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,19 @@
2002-06-03 Darin Adler <darin at apple.com>
+ * LICENSE: Add 2002.
+
+ * kwq/KWQApplication.mm:
+ * kwq/kdecore/kapplication.h:
+ * kwq/qt/qapplication.h:
+ Found a way to simplify the application objects by making more of
+ the functions static so we don't need to actually allocate an object.
+
+ * kwq/Makefile.am:
+ * kwq/KWQKApplication.mm: Removed.
+ * kwq/kdecore/kapp.h: Removed.
+
+2002-06-03 Darin Adler <darin at apple.com>
+
A few more unused things.
* kwq/Makefile.am: Removed KWQKProcess.mm
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 6bbdad8..bd375b0 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,19 @@
2002-06-03 Darin Adler <darin at apple.com>
+ * LICENSE: Add 2002.
+
+ * kwq/KWQApplication.mm:
+ * kwq/kdecore/kapplication.h:
+ * kwq/qt/qapplication.h:
+ Found a way to simplify the application objects by making more of
+ the functions static so we don't need to actually allocate an object.
+
+ * kwq/Makefile.am:
+ * kwq/KWQKApplication.mm: Removed.
+ * kwq/kdecore/kapp.h: Removed.
+
+2002-06-03 Darin Adler <darin at apple.com>
+
A few more unused things.
* kwq/Makefile.am: Removed KWQKProcess.mm
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 6bbdad8..bd375b0 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,19 @@
2002-06-03 Darin Adler <darin at apple.com>
+ * LICENSE: Add 2002.
+
+ * kwq/KWQApplication.mm:
+ * kwq/kdecore/kapplication.h:
+ * kwq/qt/qapplication.h:
+ Found a way to simplify the application objects by making more of
+ the functions static so we don't need to actually allocate an object.
+
+ * kwq/Makefile.am:
+ * kwq/KWQKApplication.mm: Removed.
+ * kwq/kdecore/kapp.h: Removed.
+
+2002-06-03 Darin Adler <darin at apple.com>
+
A few more unused things.
* kwq/Makefile.am: Removed KWQKProcess.mm
diff --git a/WebCore/LICENSE b/WebCore/LICENSE
index 0dca559..a2e1678 100644
--- a/WebCore/LICENSE
+++ b/WebCore/LICENSE
@@ -1,4 +1,4 @@
-Copyright (C) 2001 Apple Computer, Inc. All rights reserved.
+Copyright (C) 2001, 2002 Apple Computer, Inc. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
diff --git a/WebCore/kwq/KWQApplication.h b/WebCore/kwq/KWQApplication.h
index b9564be..768ed8d 100644
--- a/WebCore/kwq/KWQApplication.h
+++ b/WebCore/kwq/KWQApplication.h
@@ -36,25 +36,24 @@ class QDesktopWidget;
class QApplication : public QObject {
public:
static QPalette palette(const QWidget *p=0);
- static QDesktopWidget *desktop();
- static int startDragDistance();
+ static QDesktopWidget *desktop() { return 0; }
+ static int startDragDistance() { return 2; }
static QSize globalStrut();
static void setOverrideCursor(const QCursor &);
static void restoreOverrideCursor();
- static bool sendEvent(QObject *, QEvent *);
- static void sendPostedEvents(QObject *receiver, int event_type);
-
- QStyle &style() const;
+ static bool sendEvent(QObject *o, QEvent *e) { return o->event(e); }
+ static void sendPostedEvents(QObject *receiver, int event_type) { }
+ static QStyle &style();
};
-extern QApplication *qApp;
+QApplication * const qApp = 0;
class QDesktopWidget : public QWidget {
public:
- int screenNumber(QWidget *) const;
- QRect screenGeometry(int screenNumber);
- int width() const;
- int height() const;
+ static int screenNumber(QWidget *);
+ static QRect screenGeometry(int screenNumber);
+ static int width();
+ static int height();
};
#endif
diff --git a/WebCore/kwq/KWQApplication.mm b/WebCore/kwq/KWQApplication.mm
index 4ccf27d..2439178 100644
--- a/WebCore/kwq/KWQApplication.mm
+++ b/WebCore/kwq/KWQApplication.mm
@@ -32,19 +32,19 @@ QPalette QApplication::palette(const QWidget *p)
return pal;
}
-// FIXME: Do we need to handle multiple screens?
-
-int QDesktopWidget::width() const
+int QDesktopWidget::width()
{
return (int)[[NSScreen mainScreen] frame].size.width;
}
-int QDesktopWidget::height() const
+int QDesktopWidget::height()
{
return (int)[[NSScreen mainScreen] frame].size.height;
}
-int QDesktopWidget::screenNumber(QWidget *) const
+// FIXME: Do we need to handle multiple screens?
+
+int QDesktopWidget::screenNumber(QWidget *)
{
return 0;
}
@@ -55,17 +55,6 @@ QRect QDesktopWidget::screenGeometry(int screenNumber)
return QRect((int)rect.origin.x, (int)rect.origin.y, (int)rect.size.width, (int)rect.size.height);
}
-QDesktopWidget *QApplication::desktop()
-{
- static QDesktopWidget desktopWidget;
- return &desktopWidget;
-}
-
-int QApplication::startDragDistance()
-{
- return 2;
-}
-
QSize QApplication::globalStrut()
{
_logNotYetImplemented();
@@ -82,19 +71,7 @@ void QApplication::restoreOverrideCursor()
_logNotYetImplemented();
}
-bool QApplication::sendEvent(QObject *o, QEvent *e)
-{
- return o ? o->event(e) : false;
-}
-
-void QApplication::sendPostedEvents(QObject *receiver, int event_type)
-{
- _logNotYetImplemented();
-}
-
-QApplication *qApp = NULL;
-
-QStyle &QApplication::style() const
+QStyle &QApplication::style()
{
static QStyle style;
return style;
diff --git a/WebCore/kwq/KWQKApplication.h b/WebCore/kwq/KWQKApplication.h
index e33cce5..e83aebb 100644
--- a/WebCore/kwq/KWQKApplication.h
+++ b/WebCore/kwq/KWQKApplication.h
@@ -1,2 +1,40 @@
+/*
+ * Copyright (C) 2001, 2002 Apple Computer, Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (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 <kapp.h>
+#ifndef KAPP_H_
+#define KAPP_H_
+
+#include <kglobal.h>
+#include <kglobalsettings.h>
+#include <dcopclient.h>
+#include <qapplication.h>
+#include <qpalette.h>
+#include <qregexp.h>
+
+class KApplication : public QApplication { };
+
+KApplication * const kapp = 0;
+
+#endif
diff --git a/WebCore/kwq/KWQKApplication.mm b/WebCore/kwq/KWQKApplication.mm
deleted file mode 100644
index be59cc4..0000000
--- a/WebCore/kwq/KWQKApplication.mm
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2001 Apple Computer, Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (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 <kwqdebug.h>
-#include <kapp.h>
-
-
-KApplication *KApplication::KApp;
-
-
-KApplication::KApplication()
-{
- _logNotYetImplemented();
-}
-
-
-KApplication::~KApplication()
-{
- _logNotYetImplemented();
-}
-
-
-DCOPClient *KApplication::dcopClient()
-{
- _logNotYetImplemented();
- return 0L;
-}
-
diff --git a/WebCore/kwq/Makefile.am b/WebCore/kwq/Makefile.am
index ef68c4c..ffc8a65 100644
--- a/WebCore/kwq/Makefile.am
+++ b/WebCore/kwq/Makefile.am
@@ -37,7 +37,6 @@ libkwq_o_SOURCES = \
KWQSize.mm \
KWQHBox.mm \
KWQInputDialog.mm \
- KWQKApplication.mm \
KWQKCharsets.mm \
KWQKComboBox.mm \
KWQKConfigBase.mm \
diff --git a/WebCore/kwq/kdecore/kapp.h b/WebCore/kwq/kdecore/kapp.h
deleted file mode 100644
index 743108c..0000000
--- a/WebCore/kwq/kdecore/kapp.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (C) 2001 Apple Computer, Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef KAPP_H_
-#define KAPP_H_
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <kglobal.h>
-#include <kglobalsettings.h>
-#include <dcopclient.h>
-#include <qapplication.h>
-#include <qpalette.h>
-#include <qregexp.h>
-
-#define kapp KApplication::kApplication()
-
-// class KApplication ==========================================================
-
-class KApplication : public QApplication {
-public:
-
- // structs -----------------------------------------------------------------
- // typedefs ----------------------------------------------------------------
- // enums -------------------------------------------------------------------
- // constants ---------------------------------------------------------------
-
- // static member functions -------------------------------------------------
-
- static KApplication* kApplication() { return KApp; }
-
- // constructors, copy constructors, and destructors ------------------------
-
- KApplication();
- virtual ~KApplication();
-
- // member functions --------------------------------------------------------
-
- virtual DCOPClient *dcopClient();
-
- // operators ---------------------------------------------------------------
-
-// protected -------------------------------------------------------------------
-
-protected:
- static KApplication *KApp;
-
-// private ---------------------------------------------------------------------
-
-private:
- // no copying or assignment
- // note that these are "standard" (no pendantic stuff needed)
- KApplication(const KApplication &);
- KApplication &operator=(const KApplication &);
-
-}; // class KApplication =======================================================
-
-#endif
diff --git a/WebCore/kwq/kdecore/kapplication.h b/WebCore/kwq/kdecore/kapplication.h
index e33cce5..e83aebb 100644
--- a/WebCore/kwq/kdecore/kapplication.h
+++ b/WebCore/kwq/kdecore/kapplication.h
@@ -1,2 +1,40 @@
+/*
+ * Copyright (C) 2001, 2002 Apple Computer, Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (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 <kapp.h>
+#ifndef KAPP_H_
+#define KAPP_H_
+
+#include <kglobal.h>
+#include <kglobalsettings.h>
+#include <dcopclient.h>
+#include <qapplication.h>
+#include <qpalette.h>
+#include <qregexp.h>
+
+class KApplication : public QApplication { };
+
+KApplication * const kapp = 0;
+
+#endif
diff --git a/WebCore/kwq/qt/qapplication.h b/WebCore/kwq/qt/qapplication.h
index b9564be..768ed8d 100644
--- a/WebCore/kwq/qt/qapplication.h
+++ b/WebCore/kwq/qt/qapplication.h
@@ -36,25 +36,24 @@ class QDesktopWidget;
class QApplication : public QObject {
public:
static QPalette palette(const QWidget *p=0);
- static QDesktopWidget *desktop();
- static int startDragDistance();
+ static QDesktopWidget *desktop() { return 0; }
+ static int startDragDistance() { return 2; }
static QSize globalStrut();
static void setOverrideCursor(const QCursor &);
static void restoreOverrideCursor();
- static bool sendEvent(QObject *, QEvent *);
- static void sendPostedEvents(QObject *receiver, int event_type);
-
- QStyle &style() const;
+ static bool sendEvent(QObject *o, QEvent *e) { return o->event(e); }
+ static void sendPostedEvents(QObject *receiver, int event_type) { }
+ static QStyle &style();
};
-extern QApplication *qApp;
+QApplication * const qApp = 0;
class QDesktopWidget : public QWidget {
public:
- int screenNumber(QWidget *) const;
- QRect screenGeometry(int screenNumber);
- int width() const;
- int height() const;
+ static int screenNumber(QWidget *);
+ static QRect screenGeometry(int screenNumber);
+ static int width();
+ static int height();
};
#endif
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list