summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorAndras Becsi <andras.becsi@digia.com>2013-07-25 17:32:29 +0200
committerAndras Becsi <andras.becsi@digia.com>2013-07-26 10:57:55 +0200
commit0c6e6d63d93882c3d682cdcf15f96c3d682c338d (patch)
treed7f3f702d3ded145d669cdbc8ba5b00710e4b972 /lib
parent38e34792d9b414d666304bf48b96488a7321d999 (diff)
Silence compiler warnings
Remove unused variables, add missing return and avoid comparing unsigned integers with signed ones. Change-Id: I9b295a5dc10927ec89471a424c93cf3b168cf078 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'lib')
-rw-r--r--lib/backing_store_qt.cpp2
-rw-r--r--lib/render_widget_host_view_qt.cpp1
-rw-r--r--lib/resource_bundle_qt.cpp2
3 files changed, 2 insertions, 3 deletions
diff --git a/lib/backing_store_qt.cpp b/lib/backing_store_qt.cpp
index 5c23734cf..bd33a0a4b 100644
--- a/lib/backing_store_qt.cpp
+++ b/lib/backing_store_qt.cpp
@@ -84,8 +84,6 @@ void BackingStoreQt::PaintToBackingStore(content::RenderProcessHost *process,
gfx::Rect pixel_bitmap_rect = bitmap_rect;
uint8_t* bitmapData = static_cast<uint8_t*>(dib->memory());
- int width = m_pixelBuffer.size().width();
- int height = m_pixelBuffer.size().height();
const QImage img(bitmapData, pixel_bitmap_rect.width(), pixel_bitmap_rect.height(), QImage::Format_ARGB32);
QPainter painter(&m_pixelBuffer);
diff --git a/lib/render_widget_host_view_qt.cpp b/lib/render_widget_host_view_qt.cpp
index 276ae9b4d..849b13c7d 100644
--- a/lib/render_widget_host_view_qt.cpp
+++ b/lib/render_widget_host_view_qt.cpp
@@ -252,6 +252,7 @@ GdkEventButton* RenderWidgetHostViewQt::GetLastMouseDown()
gfx::NativeView RenderWidgetHostViewQt::BuildInputMethodsGtkMenu()
{
+ return 0;
}
#endif // defined(TOOLKIT_GTK)
diff --git a/lib/resource_bundle_qt.cpp b/lib/resource_bundle_qt.cpp
index 5fb62370f..af26a488a 100644
--- a/lib/resource_bundle_qt.cpp
+++ b/lib/resource_bundle_qt.cpp
@@ -88,7 +88,7 @@ class UI_EXPORT DataPackQt : public DataPack {
{
m_data = data;
- if (kHeaderLength > m_data.size())
+ if (kHeaderLength > static_cast<size_t>(m_data.size()))
return false;
const uint32* ptr = reinterpret_cast<const uint32*>(m_data.data());