[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 07:27:23 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit ec9e5a9b591e40dcf79c315011014477a9051e41
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Mar 5 00:42:00 2003 +0000
Reviewed by Maciej.
- got rid of some framework initialization (working on bug 3188781)
* khtml/khtml_part.cpp:
(KHTMLPart::setZoomFactor): Put some waitCursor use inside #if !APPLE_CHANGES.
(KHTMLPart::reparseConfiguration): Put some waitCursor use inside #if !APPLE_CHANGES.
* khtml/rendering/render_frames.cpp: (RenderFrameSet::userResize): Use KCursor cursors
instead of Qt cursors.
* kwq/KWQNamespace.h: Remove Qt cursors.
* kwq/KWQCursor.mm: Remove Qt cursors.
* kwq/KWQKCursor.h: Remove waitCursor.
* kwq/KWQKCursor.mm: Remove waitCursor.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3746 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 826af90..8200913 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,23 @@
2003-03-04 Darin Adler <darin at apple.com>
+ Reviewed by Maciej.
+
+ - got rid of some framework initialization (working on bug 3188781)
+
+ * khtml/khtml_part.cpp:
+ (KHTMLPart::setZoomFactor): Put some waitCursor use inside #if !APPLE_CHANGES.
+ (KHTMLPart::reparseConfiguration): Put some waitCursor use inside #if !APPLE_CHANGES.
+
+ * khtml/rendering/render_frames.cpp: (RenderFrameSet::userResize): Use KCursor cursors
+ instead of Qt cursors.
+
+ * kwq/KWQNamespace.h: Remove Qt cursors.
+ * kwq/KWQCursor.mm: Remove Qt cursors.
+ * kwq/KWQKCursor.h: Remove waitCursor.
+ * kwq/KWQKCursor.mm: Remove waitCursor.
+
+2003-03-04 Darin Adler <darin at apple.com>
+
Reviewed by John.
- fixed build rules for parser.cpp so we don't rebuild it every time
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 826af90..8200913 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,23 @@
2003-03-04 Darin Adler <darin at apple.com>
+ Reviewed by Maciej.
+
+ - got rid of some framework initialization (working on bug 3188781)
+
+ * khtml/khtml_part.cpp:
+ (KHTMLPart::setZoomFactor): Put some waitCursor use inside #if !APPLE_CHANGES.
+ (KHTMLPart::reparseConfiguration): Put some waitCursor use inside #if !APPLE_CHANGES.
+
+ * khtml/rendering/render_frames.cpp: (RenderFrameSet::userResize): Use KCursor cursors
+ instead of Qt cursors.
+
+ * kwq/KWQNamespace.h: Remove Qt cursors.
+ * kwq/KWQCursor.mm: Remove Qt cursors.
+ * kwq/KWQKCursor.h: Remove waitCursor.
+ * kwq/KWQKCursor.mm: Remove waitCursor.
+
+2003-03-04 Darin Adler <darin at apple.com>
+
Reviewed by John.
- fixed build rules for parser.cpp so we don't rebuild it every time
diff --git a/WebCore/khtml/khtml_part.cpp b/WebCore/khtml/khtml_part.cpp
index 623748e..1efdaa8 100644
--- a/WebCore/khtml/khtml_part.cpp
+++ b/WebCore/khtml/khtml_part.cpp
@@ -3894,11 +3894,15 @@ void KHTMLPart::setZoomFactor (int percent)
d->m_zoomFactor = percent;
if(d->m_doc) {
+#if !APPLE_CHANGES
QApplication::setOverrideCursor( waitCursor );
+#endif
if (d->m_doc->styleSelector())
d->m_doc->styleSelector()->computeFontSizes(d->m_doc->paintDeviceMetrics(), d->m_zoomFactor);
d->m_doc->recalcStyle( NodeImpl::Force );
+#if !APPLE_CHANGES
QApplication::restoreOverrideCursor();
+#endif
}
ConstFrameIt it = d->m_frames.begin();
@@ -3997,9 +4001,13 @@ void KHTMLPart::reparseConfiguration()
else
setUserStyleSheet( QString::null );
+#if !APPLE_CHANGES
QApplication::setOverrideCursor( waitCursor );
+#endif
if(d->m_doc) d->m_doc->updateStyleSelector();
+#if !APPLE_CHANGES
QApplication::restoreOverrideCursor();
+#endif
}
QStringList KHTMLPart::frameNames() const
diff --git a/WebCore/khtml/rendering/render_frames.cpp b/WebCore/khtml/rendering/render_frames.cpp
index 00cd51d..049d12f 100644
--- a/WebCore/khtml/rendering/render_frames.cpp
+++ b/WebCore/khtml/rendering/render_frames.cpp
@@ -37,6 +37,7 @@
#include "khtml_part.h"
#include <kapplication.h>
+#include <kcursor.h>
#include <kmessagebox.h>
#include <kmimetype.h>
#include <klocale.h>
@@ -44,7 +45,6 @@
#include <kglobal.h>
#include <qtimer.h>
#include <qpainter.h>
-#include <qcursor.h>
#include <assert.h>
#include <iostream.h>
@@ -385,15 +385,15 @@ bool RenderFrameSet::userResize( MouseEventImpl *evt )
QCursor cursor;
if(m_hSplit != -1 && m_vSplit != -1)
{
- cursor = Qt::sizeAllCursor;
+ cursor = KCursor::sizeAllCursor();
}
else if( m_vSplit != -1 )
{
- cursor = Qt::sizeHorCursor;
+ cursor = KCursor::sizeHorCursor();
}
else if( m_hSplit != -1 )
{
- cursor = Qt::sizeVerCursor;
+ cursor = KCursor::sizeVerCursor();
}
if(evt->id() == EventImpl::MOUSEDOWN_EVENT)
diff --git a/WebCore/kwq/KWQCursor.mm b/WebCore/kwq/KWQCursor.mm
index 2ff2fe5..eb7b9bf 100644
--- a/WebCore/kwq/KWQCursor.mm
+++ b/WebCore/kwq/KWQCursor.mm
@@ -26,12 +26,6 @@
#import "KWQCursor.h"
#import "KWQLogging.h"
-const QCursor Qt::sizeAllCursor;
-const QCursor Qt::splitHCursor;
-const QCursor Qt::splitVCursor;
-const QCursor Qt::sizeHorCursor;
-const QCursor Qt::sizeVerCursor;
-
QCursor::QCursor()
: cursor(nil)
{
diff --git a/WebCore/kwq/KWQKCursor.h b/WebCore/kwq/KWQKCursor.h
index e72a511..22deb83 100644
--- a/WebCore/kwq/KWQKCursor.h
+++ b/WebCore/kwq/KWQKCursor.h
@@ -47,6 +47,4 @@ public:
};
-extern const QCursor &waitCursor;
-
#endif
diff --git a/WebCore/kwq/KWQKCursor.mm b/WebCore/kwq/KWQKCursor.mm
index 3d9c28c..2596e60 100644
--- a/WebCore/kwq/KWQKCursor.mm
+++ b/WebCore/kwq/KWQKCursor.mm
@@ -53,8 +53,6 @@
@end
-const QCursor &waitCursor = KCursor::waitCursor();
-
void KCursor::setAutoHideCursor(QWidget *w, bool enable) {}
QCursor KCursor::arrowCursor() { return QCursor(); }
diff --git a/WebCore/kwq/KWQNamespace.h b/WebCore/kwq/KWQNamespace.h
index fe9faba..605ef60 100644
--- a/WebCore/kwq/KWQNamespace.h
+++ b/WebCore/kwq/KWQNamespace.h
@@ -232,12 +232,6 @@ public:
static const QColor cyan;
static const QColor magenta;
static const QColor yellow;
-
- static const QCursor sizeAllCursor;
- static const QCursor splitHCursor;
- static const QCursor splitVCursor;
- static const QCursor sizeHorCursor;
- static const QCursor sizeVerCursor;
};
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list