[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 08:01:48 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 405f9894de34e300bfb32f2442fba6d61b87d849
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Oct 15 16:18:17 2003 +0000
Reviewed by Ken.
- change "volatile X * volatile" to "X * volatile" in cases where the
pointer needs to be volatile but the object pointed to do does not
* kwq/KWQKConfigBase.mm: (KConfig::readEntry):
* kwq/KWQKCursor.mm: (+[NSCursor _WebCore_cursorWithName:hotSpot:]):
* kwq/KWQKLocale.mm:
(inputElementAltText):
(resetButtonDefaultLabel):
(searchableIndexIntroduction):
(submitButtonDefaultLabel):
(KLocale::language):
* kwq/KWQLineEdit.mm: (QLineEdit::text):
* kwq/KWQScrollView.mm:
(QScrollView::setContentsPos):
(QScrollView::addChild):
(QScrollView::updateContents):
(QScrollView::contentsToViewport):
(QScrollView::viewportToContents):
(QScrollView::getDocumentView):
* kwq/KWQTextEdit.mm:
(QTextEdit::text):
(QTextEdit::textWithHardLineBreaks):
* kwq/KWQWidget.mm: (QWidget::getOuterView):
Removed the excess volatiles and excess casts that go with them.
* kwq/KWQKCookieJar.mm: (KWQKCookieJar::cookie): Do the same, but also
remove an unnecessary nil check that is the same as QString::fromNSString's
default behavior.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5186 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 2166f5d..44c1928 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,36 @@
+2003-10-15 Darin Adler <darin at apple.com>
+
+ Reviewed by Ken.
+
+ - change "volatile X * volatile" to "X * volatile" in cases where the
+ pointer needs to be volatile but the object pointed to do does not
+
+ * kwq/KWQKConfigBase.mm: (KConfig::readEntry):
+ * kwq/KWQKCursor.mm: (+[NSCursor _WebCore_cursorWithName:hotSpot:]):
+ * kwq/KWQKLocale.mm:
+ (inputElementAltText):
+ (resetButtonDefaultLabel):
+ (searchableIndexIntroduction):
+ (submitButtonDefaultLabel):
+ (KLocale::language):
+ * kwq/KWQLineEdit.mm: (QLineEdit::text):
+ * kwq/KWQScrollView.mm:
+ (QScrollView::setContentsPos):
+ (QScrollView::addChild):
+ (QScrollView::updateContents):
+ (QScrollView::contentsToViewport):
+ (QScrollView::viewportToContents):
+ (QScrollView::getDocumentView):
+ * kwq/KWQTextEdit.mm:
+ (QTextEdit::text):
+ (QTextEdit::textWithHardLineBreaks):
+ * kwq/KWQWidget.mm: (QWidget::getOuterView):
+ Removed the excess volatiles and excess casts that go with them.
+
+ * kwq/KWQKCookieJar.mm: (KWQKCookieJar::cookie): Do the same, but also
+ remove an unnecessary nil check that is the same as QString::fromNSString's
+ default behavior.
+
2003-10-15 Maciej Stachowiak <mjs at apple.com>
Reviewed by Dave.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 2166f5d..44c1928 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,36 @@
+2003-10-15 Darin Adler <darin at apple.com>
+
+ Reviewed by Ken.
+
+ - change "volatile X * volatile" to "X * volatile" in cases where the
+ pointer needs to be volatile but the object pointed to do does not
+
+ * kwq/KWQKConfigBase.mm: (KConfig::readEntry):
+ * kwq/KWQKCursor.mm: (+[NSCursor _WebCore_cursorWithName:hotSpot:]):
+ * kwq/KWQKLocale.mm:
+ (inputElementAltText):
+ (resetButtonDefaultLabel):
+ (searchableIndexIntroduction):
+ (submitButtonDefaultLabel):
+ (KLocale::language):
+ * kwq/KWQLineEdit.mm: (QLineEdit::text):
+ * kwq/KWQScrollView.mm:
+ (QScrollView::setContentsPos):
+ (QScrollView::addChild):
+ (QScrollView::updateContents):
+ (QScrollView::contentsToViewport):
+ (QScrollView::viewportToContents):
+ (QScrollView::getDocumentView):
+ * kwq/KWQTextEdit.mm:
+ (QTextEdit::text):
+ (QTextEdit::textWithHardLineBreaks):
+ * kwq/KWQWidget.mm: (QWidget::getOuterView):
+ Removed the excess volatiles and excess casts that go with them.
+
+ * kwq/KWQKCookieJar.mm: (KWQKCookieJar::cookie): Do the same, but also
+ remove an unnecessary nil check that is the same as QString::fromNSString's
+ default behavior.
+
2003-10-15 Maciej Stachowiak <mjs at apple.com>
Reviewed by Dave.
diff --git a/WebCore/kwq/KWQKConfigBase.mm b/WebCore/kwq/KWQKConfigBase.mm
index 30d257a..ec68a88 100644
--- a/WebCore/kwq/KWQKConfigBase.mm
+++ b/WebCore/kwq/KWQKConfigBase.mm
@@ -70,13 +70,13 @@ void KConfig::writeEntry(const QString &pKey, const QStringList &rValue,
QString KConfig::readEntry(const char *pKey, const QString& aDefault) const
{
if (impl->isPluginInfo) {
- volatile NSString * volatile result = @"";
+ NSString * volatile result = @"";
KWQ_BLOCK_NS_EXCEPTIONS;
id <WebCorePluginInfo> plugin = [[[WebCoreViewFactory sharedFactory] pluginsInfo] objectAtIndex:impl->pluginIndex];
if (strcmp(pKey, "name") == 0) {
- result =[plugin name];
+ result = [plugin name];
} else if (strcmp(pKey, "file") == 0) {
result = [plugin filename];
} else if (strcmp(pKey, "description") == 0) {
@@ -106,11 +106,11 @@ QString KConfig::readEntry(const char *pKey, const QString& aDefault) const
KWQ_UNBLOCK_NS_EXCEPTIONS;
- return QString::fromNSString((NSString *)result);
+ return QString::fromNSString(result);
}
ERROR("not yet implemented");
- return QString::null;
+ return QString();
}
int KConfig::readNumEntry(const char *pKey, int nDefault) const
diff --git a/WebCore/kwq/KWQKCookieJar.mm b/WebCore/kwq/KWQKCookieJar.mm
index ac3a103..60b4c1a 100644
--- a/WebCore/kwq/KWQKCookieJar.mm
+++ b/WebCore/kwq/KWQKCookieJar.mm
@@ -32,17 +32,13 @@
QString KWQKCookieJar::cookie(const KURL &url)
{
- volatile NSString * volatile result = nil;
+ NSString * volatile result = nil;
KWQ_BLOCK_NS_EXCEPTIONS;
result = [[WebCoreCookieAdapter sharedAdapter] cookiesForURL:url.url().getNSString()];
KWQ_UNBLOCK_NS_EXCEPTIONS;
- if (result != nil) {
- return QString::fromNSString((NSString *)result);
- } else {
- return QString();
- }
+ return QString::fromNSString(result);
}
void KWQKCookieJar::setCookie(const KURL &url, const KURL &policyBaseURL, const QString &cookie)
diff --git a/WebCore/kwq/KWQKCursor.mm b/WebCore/kwq/KWQKCursor.mm
index 250d15e..dcd87ed 100644
--- a/WebCore/kwq/KWQKCursor.mm
+++ b/WebCore/kwq/KWQKCursor.mm
@@ -48,7 +48,7 @@
nameToCursor = [[NSMutableDictionary alloc] init];
}
- volatile NSCursor * volatile cursor = [nameToCursor objectForKey:name];
+ NSCursor * volatile cursor = [nameToCursor objectForKey:name];
if (!cursor) {
KWQ_BLOCK_NS_EXCEPTIONS;
NSImage *cursorImage = [[NSImage alloc] initWithContentsOfFile:
@@ -57,13 +57,13 @@
if (cursorImage) {
cursor = [[NSCursor alloc] initWithImage:cursorImage hotSpot:hotSpot];
[cursorImage release];
- [nameToCursor setObject:(NSCursor *)cursor forKey:name];
- [(NSCursor *)cursor release];
+ [nameToCursor setObject:cursor forKey:name];
+ [cursor release];
}
KWQ_UNBLOCK_NS_EXCEPTIONS;
}
- return (NSCursor *)cursor;
+ return cursor;
}
@end
diff --git a/WebCore/kwq/KWQKLocale.mm b/WebCore/kwq/KWQKLocale.mm
index f5f8f8d..f3df94c 100644
--- a/WebCore/kwq/KWQKLocale.mm
+++ b/WebCore/kwq/KWQKLocale.mm
@@ -32,54 +32,54 @@
QString inputElementAltText()
{
- volatile NSString * volatile altText = @"";
+ NSString * volatile altText = @"";
KWQ_BLOCK_NS_EXCEPTIONS;
altText = [[WebCoreViewFactory sharedFactory] inputElementAltText];
KWQ_UNBLOCK_NS_EXCEPTIONS;
- return QString::fromNSString((NSString *)altText);
+ return QString::fromNSString(altText);
}
QString resetButtonDefaultLabel()
{
- volatile NSString * volatile defaultLabel = @"";
+ NSString * volatile defaultLabel = @"";
KWQ_BLOCK_NS_EXCEPTIONS;
defaultLabel = [[WebCoreViewFactory sharedFactory] resetButtonDefaultLabel];
KWQ_UNBLOCK_NS_EXCEPTIONS;
- return QString::fromNSString((NSString *)defaultLabel);
+ return QString::fromNSString(defaultLabel);
}
QString searchableIndexIntroduction()
{
- volatile NSString * volatile introduction = @"";
+ NSString * volatile introduction = @"";
KWQ_BLOCK_NS_EXCEPTIONS;
introduction = [[WebCoreViewFactory sharedFactory] searchableIndexIntroduction];
KWQ_UNBLOCK_NS_EXCEPTIONS;
- return QString::fromNSString((NSString *)introduction);
+ return QString::fromNSString(introduction);
}
QString submitButtonDefaultLabel()
{
- volatile NSString * volatile defaultLabel = @"";
+ NSString * volatile defaultLabel = @"";
KWQ_BLOCK_NS_EXCEPTIONS;
defaultLabel = [[WebCoreViewFactory sharedFactory] submitButtonDefaultLabel];
KWQ_UNBLOCK_NS_EXCEPTIONS;
- return QString::fromNSString((NSString *)defaultLabel);
+ return QString::fromNSString(defaultLabel);
}
QString KLocale::language()
{
- volatile NSString * volatile code = @"";
+ NSString * volatile code = @"";
KWQ_BLOCK_NS_EXCEPTIONS;
code = [[WebCoreViewFactory sharedFactory] defaultLanguageCode];
KWQ_UNBLOCK_NS_EXCEPTIONS;
- return QString::fromNSString((NSString *)code);
+ return QString::fromNSString(code);
}
diff --git a/WebCore/kwq/KWQLineEdit.mm b/WebCore/kwq/KWQLineEdit.mm
index d87752d..7b912b8 100644
--- a/WebCore/kwq/KWQLineEdit.mm
+++ b/WebCore/kwq/KWQLineEdit.mm
@@ -95,7 +95,7 @@ void QLineEdit::setText(const QString &s)
QString QLineEdit::text()
{
KWQTextField *textField = (KWQTextField *)getView();
- volatile NSString * volatile result = @"";
+ NSString * volatile result = @"";
KWQ_BLOCK_NS_EXCEPTIONS;
NSMutableString *text = [[[textField stringValue] mutableCopy] autorelease];
@@ -104,7 +104,7 @@ QString QLineEdit::text()
[text replaceOccurrencesOfString:@"\r" withString:@"\n" options:NSLiteralSearch range:NSMakeRange(0, [text length])];
KWQ_UNBLOCK_NS_EXCEPTIONS;
- return QString::fromNSString((NSString *)result);
+ return QString::fromNSString(result);
}
void QLineEdit::setMaxLength(int len)
diff --git a/WebCore/kwq/KWQScrollView.mm b/WebCore/kwq/KWQScrollView.mm
index 1c082f8..bea639d 100644
--- a/WebCore/kwq/KWQScrollView.mm
+++ b/WebCore/kwq/KWQScrollView.mm
@@ -180,7 +180,7 @@ void QScrollView::scrollBy(int dx, int dy)
void QScrollView::setContentsPos(int x, int y)
{
NSView *docView;
- volatile NSView * volatile view = getView();
+ NSView * volatile view = getView();
docView = getDocumentView();
if (docView)
view = docView;
@@ -303,7 +303,7 @@ void QScrollView::suppressScrollBars(bool suppressed, bool repaintOnUnsuppress)
void QScrollView::addChild(QWidget* child, int x, int y)
{
- volatile NSView * volatile thisView;
+ NSView * volatile thisView;
NSView *thisDocView, *subview;
ASSERT(child != this);
@@ -368,7 +368,7 @@ void QScrollView::updateContents(int x, int y, int w, int h, bool now)
void QScrollView::updateContents(const QRect &rect, bool now)
{
- volatile NSView * volatile view = getView();
+ NSView * volatile view = getView();
KWQ_BLOCK_NS_EXCEPTIONS;
if ([view _KWQ_isScrollView])
@@ -396,7 +396,7 @@ QPoint QScrollView::contentsToViewport(const QPoint &p)
void QScrollView::contentsToViewport(int x, int y, int& vx, int& vy)
{
NSView *docView;
- volatile NSView * volatile view = getView();
+ NSView * volatile view = getView();
docView = getDocumentView();
if (docView)
@@ -414,7 +414,7 @@ void QScrollView::contentsToViewport(int x, int y, int& vx, int& vy)
void QScrollView::viewportToContents(int vx, int vy, int& x, int& y)
{
NSView *docView;
- volatile NSView * volatile view = getView();
+ NSView * volatile view = getView();
docView = getDocumentView();
if (docView)
@@ -459,12 +459,12 @@ void QScrollView::ensureVisible(int x, int y, int w, int h)
NSView *QScrollView::getDocumentView() const
{
id view = getView();
- volatile NSView * volatile result = nil;
+ NSView * volatile result = nil;
KWQ_BLOCK_NS_EXCEPTIONS;
if ([view respondsToSelector:@selector(documentView)])
result = [view documentView];
KWQ_UNBLOCK_NS_EXCEPTIONS;
- return (NSView *)result;
+ return result;
}
diff --git a/WebCore/kwq/KWQTextEdit.mm b/WebCore/kwq/KWQTextEdit.mm
index f52fcd6..221ec9a 100644
--- a/WebCore/kwq/KWQTextEdit.mm
+++ b/WebCore/kwq/KWQTextEdit.mm
@@ -51,25 +51,25 @@ void QTextEdit::setText(const QString &string)
QString QTextEdit::text() const
{
KWQTextArea *textView = (KWQTextArea *)getView();
- volatile NSString * volatile text = @"";
+ NSString * volatile text = @"";
KWQ_BLOCK_NS_EXCEPTIONS;
text = [textView text];
KWQ_UNBLOCK_NS_EXCEPTIONS;
- return QString::fromNSString((NSString *)text);
+ return QString::fromNSString(text);
}
QString QTextEdit::textWithHardLineBreaks() const
{
KWQTextArea *textView = (KWQTextArea *)getView();
- volatile NSString * volatile text = @"";
+ NSString * volatile text = @"";
KWQ_BLOCK_NS_EXCEPTIONS;
text = [textView textWithHardLineBreaks];
KWQ_UNBLOCK_NS_EXCEPTIONS;
- return QString::fromNSString((NSString *)text);
+ return QString::fromNSString(text);
}
void QTextEdit::getCursorPosition(int *paragraph, int *index) const
diff --git a/WebCore/kwq/KWQWidget.mm b/WebCore/kwq/KWQWidget.mm
index 9ab9625..54a3c4d 100644
--- a/WebCore/kwq/KWQWidget.mm
+++ b/WebCore/kwq/KWQWidget.mm
@@ -443,7 +443,7 @@ NSView *QWidget::getOuterView() const
// A QScrollView is a widget normally used to represent a frame.
// If this widget's view is a WebCoreFrameView the we resize its containing view, a WebFrameView.
// The scroll view contained by the WebFrameView will be autosized.
- volatile NSView * volatile view = data->view;
+ NSView * volatile view = data->view;
ASSERT(view);
KWQ_BLOCK_NS_EXCEPTIONS;
@@ -453,7 +453,7 @@ NSView *QWidget::getOuterView() const
}
KWQ_UNBLOCK_NS_EXCEPTIONS;
- return (NSView *)view;
+ return view;
}
void QWidget::lockDrawingFocus()
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list