WebCore:
2009-07-20 Kenneth Rohde Christiansen <kenneth@webkit.org>
Reviewed by Eric Seidel.
Fix Qt code to follow the WebKit Coding Style.
* platform/graphics/qt/FontQt.cpp:
(WebCore::qstring):
(WebCore::fixSpacing):
* platform/graphics/qt/FontQt43.cpp:
(WebCore::generateComponents):
(WebCore::Font::offsetForPositionForComplexText):
(WebCore::cursorToX):
* platform/graphics/qt/GradientQt.cpp:
(WebCore::Gradient::platformGradient):
* platform/graphics/qt/GraphicsContextQt.cpp:
(WebCore::toQtFillRule):
(WebCore::GraphicsContextPlatformPrivate::GraphicsContextPlatformPrivate):
(WebCore::GraphicsContext::~GraphicsContext):
(WebCore::GraphicsContext::getCTM):
(WebCore::GraphicsContext::concatCTM):
(WebCore::GraphicsContext::getWindowsContext):
* platform/graphics/qt/IconQt.cpp:
(WebCore::Icon::paint):
* platform/graphics/qt/ImageDecoderQt.cpp:
(WebCore::ImageDecoderQt::ReadContext::read):
(WebCore::ImageDecoderQt::ReadContext::readImageLines):
(WebCore::ImageDecoderQt::setData):
* platform/graphics/qt/ImageQt.cpp:
(WebCore::Image::drawPattern):
(WebCore::BitmapImage::draw):
* platform/graphics/qt/ImageSourceQt.cpp:
(WebCore::ImageSource::frameDurationAtIndex):
(WebCore::ImageSource::frameHasAlphaAtIndex):
(WebCore::ImageSource::frameIsCompleteAtIndex):
* platform/graphics/qt/MediaPlayerPrivatePhonon.cpp:
(WebCore::MediaPlayerPrivate::MediaPlayerPrivate):
(WebCore::MediaPlayerPrivate::create):
(WebCore::MediaPlayerPrivate::bytesLoaded):
(WebCore::MediaPlayerPrivate::updateStates):
* platform/graphics/qt/PathQt.cpp:
(WebCore::Path::addArcTo):
(WebCore::Path::isEmpty):
* platform/graphics/qt/TransformationMatrixQt.cpp:
(WebCore::TransformationMatrix::operator QTransform):
* platform/qt/ClipboardQt.cpp:
(WebCore::ClipboardQt::ClipboardQt):
(WebCore::ClipboardQt::clearData):
(WebCore::ClipboardQt::clearAllData):
(WebCore::ClipboardQt::getData):
(WebCore::ClipboardQt::setData):
(WebCore::ClipboardQt::setDragImage):
(WebCore::getCachedImage):
(WebCore::ClipboardQt::declareAndWriteDragImage):
(WebCore::ClipboardQt::writeURL):
(WebCore::ClipboardQt::writeRange):
(WebCore::ClipboardQt::hasData):
* platform/qt/ClipboardQt.h:
* platform/qt/ContextMenuItemQt.cpp:
(WebCore::ContextMenuItem::action):
(WebCore::ContextMenuItem::title):
* platform/qt/CursorQt.cpp:
(WebCore::westPanningCursor):
(WebCore::notAllowedCursor):
* platform/qt/DragDataQt.cpp:
(WebCore::DragData::containsFiles):
(WebCore::DragData::asFilenames):
(WebCore::DragData::asPlainText):
(WebCore::DragData::asFragment):
* platform/qt/DragImageQt.cpp:
(WebCore::createDragImageIconForCachedImage):
* platform/qt/FileSystemQt.cpp:
(WebCore::getFileSize):
(WebCore::unloadModule):
* platform/qt/Localizations.cpp:
(WebCore::contextMenuItemTagShowSpellingPanel):
* platform/qt/MIMETypeRegistryQt.cpp:
(WebCore::):
* platform/qt/PasteboardQt.cpp:
(WebCore::Pasteboard::Pasteboard):
(WebCore::Pasteboard::writeSelection):
(WebCore::Pasteboard::plainText):
* platform/qt/PlatformKeyboardEventQt.cpp:
(WebCore::PlatformKeyboardEvent::PlatformKeyboardEvent):
* platform/qt/PlatformMouseEventQt.cpp:
(WebCore::PlatformMouseEvent::PlatformMouseEvent):
* platform/qt/PopupMenuQt.cpp:
(WebCore::PopupMenu::populate):
* platform/qt/RenderThemeQt.cpp:
(WebCore::RenderThemeQt::fallbackStyle):
(WebCore::inflateButtonRect):
(WebCore::RenderThemeQt::computeSizeBasedOnStyle):
(WebCore::RenderThemeQt::paintButton):
(WebCore::RenderThemeQt::paintMenuList):
(WebCore::RenderThemeQt::applyTheme):
(WebCore::WorldMatrixTransformer::WorldMatrixTransformer):
(WebCore::RenderThemeQt::paintMediaBackground):
(WebCore::RenderThemeQt::paintMediaFullscreenButton):
* platform/qt/RenderThemeQt.h:
* platform/qt/ScreenQt.cpp:
(WebCore::screenRect):
(WebCore::usableScreenRect):
* platform/qt/ScrollbarQt.cpp:
(WebCore::Scrollbar::contextMenu):
* platform/qt/ScrollbarThemeQt.cpp:
(WebCore::scPart):
(WebCore::scrollbarPart):
* platform/qt/ScrollbarThemeQt.h:
* platform/qt/SharedBufferQt.cpp:
(WebCore::SharedBuffer::createWithContentsOfFile):
* platform/qt/TemporaryLinkStubs.cpp:
(PluginDatabase::defaultPluginDirectories):
(PluginDatabase::getPluginPathsInDirectories):
(PluginDatabase::isPreferredPluginDirectory):
(WebCore::getSupportedKeySizes):
(WebCore::signedPublicKeyAndChallengeString):
(WebCore::userIdleTime):
(WebCore::prefetchDNS):
* platform/text/qt/StringQt.cpp:
(WebCore::String::String):
* platform/text/qt/TextBoundaries.cpp:
* platform/text/qt/TextBreakIteratorQt.cpp:
(WebCore::TextBreakIterator::following):
(WebCore::TextBreakIterator::preceding):
(WebCore::WordBreakIteratorQt::first):
(WebCore::WordBreakIteratorQt::next):
(WebCore::WordBreakIteratorQt::previous):
(WebCore::CharBreakIteratorQt::first):
(WebCore::CharBreakIteratorQt::next):
(WebCore::CharBreakIteratorQt::previous):
(WebCore::characterBreakIterator):
* plugins/qt/PluginPackageQt.cpp:
(WebCore::PluginPackage::fetchInfo):
* plugins/qt/PluginViewQt.cpp:
(WebCore::PluginView::userAgentStatic):
(WebCore::PluginView::handlePostReadFile):
(WebCore::PluginView::init):
WebKit/qt:
2009-07-20 Kenneth Rohde Christiansen <kenneth@webkit.org>
Reviewed by Eric Seidel.
Fix Qt code to follow the WebKit Coding Style.
* Api/qcookiejar.cpp:
(QCookieJar::setCookieJar):
(QCookieJar::cookieJar):
* Api/qcookiejar.h:
* Api/qwebdatabase.cpp:
(QWebDatabase::QWebDatabase):
(QWebDatabase::removeDatabase):
* Api/qwebdatabase.h:
* Api/qwebdatabase_p.h:
* Api/qwebelement.h:
* Api/qwebframe.cpp:
(QWebFrame::title):
(QWebFrame::print):
* Api/qwebframe.h:
* Api/qwebframe_p.h:
* Api/qwebhistory.cpp:
(QWebHistory::clear):
* Api/qwebhistory.h:
* Api/qwebhistory_p.h:
* Api/qwebhistoryinterface.cpp:
(gCleanupInterface):
(QWebHistoryInterface::setDefaultInterface):
(QWebHistoryInterface::defaultInterface):
(QWebHistoryInterface::QWebHistoryInterface):
* Api/qwebhistoryinterface.h:
* Api/qwebnetworkinterface.cpp:
(QWebNetworkManager::started):
(QWebNetworkManager::finished):
(QWebNetworkInterfacePrivate::parseDataUrl):
(QWebNetworkInterface::addJob):
(WebCoreHttp::onResponseHeaderReceived):
(WebCoreHttp::onReadyRead):
* Api/qwebnetworkinterface.h:
* Api/qwebnetworkinterface_p.h:
* Api/qwebpage.cpp:
(QWebPagePrivate::editorCommandForWebActions):
(QWebPagePrivate::createContextMenu):
(QWebPagePrivate::focusInEvent):
(QWebPage::fixedContentsSize):
(QWebPage::setContentEditable):
(QWebPage::swallowContextMenuEvent):
(QWebPage::findText):
* Api/qwebpage.h:
* Api/qwebpage_p.h:
* Api/qwebpluginfactory.h:
* Api/qwebsecurityorigin.h:
* Api/qwebsecurityorigin_p.h:
* Api/qwebsettings.cpp:
(QWebSettingsPrivate::QWebSettingsPrivate):
(QWebSettingsPrivate::apply):
(QWebSettings::globalSettings):
(QWebSettings::QWebSettings):
(QWebSettings::fontSize):
(QWebSettings::setUserStyleSheetUrl):
(QWebSettings::setDefaultTextEncoding):
(QWebSettings::setIconDatabasePath):
(QWebSettings::iconDatabasePath):
(QWebSettings::iconForUrl):
(QWebSettings::setWebGraphic):
(QWebSettings::setFontFamily):
(QWebSettings::fontFamily):
(QWebSettings::testAttribute):
(qt_websettings_setLocalStorageDatabasePath):
* Api/qwebsettings.h:
* Api/qwebview.cpp:
(QWebView::setPage):
(QWebView::event):
* Api/qwebview.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@46170 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/platform/graphics/qt/ImageQt.cpp b/WebCore/platform/graphics/qt/ImageQt.cpp
index a2e96f3..5d40e26 100644
--- a/WebCore/platform/graphics/qt/ImageQt.cpp
+++ b/WebCore/platform/graphics/qt/ImageQt.cpp
@@ -83,7 +83,6 @@
}
-
// ================================================
// Image Class
// ================================================
@@ -93,7 +92,6 @@
return StillImage::create(loadResourcePixmap(name));
}
-
void Image::drawPattern(GraphicsContext* ctxt, const FloatRect& tileRect, const TransformationMatrix& patternTransform,
const FloatPoint& phase, CompositeOperator op, const FloatRect& destRect)
{
@@ -103,9 +101,8 @@
QPixmap pixmap = *framePixmap;
QRect tr = QRectF(tileRect).toRect();
- if (tr.x() || tr.y() || tr.width() != pixmap.width() || tr.height() != pixmap.height()) {
+ if (tr.x() || tr.y() || tr.width() != pixmap.width() || tr.height() != pixmap.height())
pixmap = pixmap.copy(tr);
- }
QBrush b(pixmap);
b.setTransform(patternTransform);
@@ -129,7 +126,7 @@
void BitmapImage::invalidatePlatformData()
{
}
-
+
// Drawing Routines
void BitmapImage::draw(GraphicsContext* ctxt, const FloatRect& dst,
const FloatRect& src, CompositeOperator op)
@@ -139,7 +136,7 @@
QPixmap* image = nativeImageForCurrentFrame();
if (!image)
return;
-
+
if (mayFillWithSolidColor()) {
fillWithSolidColor(ctxt, dst, solidColor(), op);
return;
@@ -158,7 +155,7 @@
painter->setCompositionMode(QPainter::CompositionMode_Source);
// Test using example site at
- // http://www.meyerweb.com/eric/css/edge/complexspiral/demo.html
+ // http://www.meyerweb.com/eric/css/edge/complexspiral/demo.html
painter->drawPixmap(dst, *image, src);
ctxt->restore();
