From 597a6024f468e97d26a22105791b21bc05bdfca6 Mon Sep 17 00:00:00 2001
From: "Thiago A. Correa" <thiago.correa@gmail.com>
Date: Wed, 14 Nov 2012 00:40:22 -0200
Subject: Fix msvc2010 compiler warnings of switch with default but no case
 labels

Change-Id: I5de4d7405131314c4e2bdb1222d2bb1a2d34a993
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
---
 src/sql/drivers/db2/qsql_db2.cpp         | 5 +----
 src/sql/drivers/mysql/qsql_mysql.cpp     | 5 +----
 src/sql/drivers/oci/qsql_oci.cpp         | 5 +----
 src/sql/drivers/odbc/qsql_odbc.cpp       | 5 +----
 src/sql/drivers/psql/qsql_psql.cpp       | 5 +----
 src/sql/drivers/sqlite/qsql_sqlite.cpp   | 5 +----
 src/sql/drivers/sqlite2/qsql_sqlite2.cpp | 5 +----
 src/sql/kernel/qsqlcachedresult.cpp      | 5 +----
 8 files changed, 8 insertions(+), 32 deletions(-)

(limited to 'src')

diff --git a/src/sql/drivers/db2/qsql_db2.cpp b/src/sql/drivers/db2/qsql_db2.cpp
index ac3489f675..0d5c52a36c 100644
--- a/src/sql/drivers/db2/qsql_db2.cpp
+++ b/src/sql/drivers/db2/qsql_db2.cpp
@@ -1119,10 +1119,7 @@ bool QDB2Result::nextResult()
 
 void QDB2Result::virtual_hook(int id, void *data)
 {
-    switch (id) {
-    default:
-        QSqlResult::virtual_hook(id, data);
-    }
+    QSqlResult::virtual_hook(id, data);
 }
 
 void QDB2Result::detachFromResultSet()
diff --git a/src/sql/drivers/mysql/qsql_mysql.cpp b/src/sql/drivers/mysql/qsql_mysql.cpp
index 182b0a4dd3..6a5d67f80b 100644
--- a/src/sql/drivers/mysql/qsql_mysql.cpp
+++ b/src/sql/drivers/mysql/qsql_mysql.cpp
@@ -838,10 +838,7 @@ bool QMYSQLResult::nextResult()
 
 void QMYSQLResult::virtual_hook(int id, void *data)
 {
-    switch (id) {
-    default:
-        QSqlResult::virtual_hook(id, data);
-    }
+    QSqlResult::virtual_hook(id, data);
 }
 
 
diff --git a/src/sql/drivers/oci/qsql_oci.cpp b/src/sql/drivers/oci/qsql_oci.cpp
index f0f77339e5..385a68840d 100644
--- a/src/sql/drivers/oci/qsql_oci.cpp
+++ b/src/sql/drivers/oci/qsql_oci.cpp
@@ -2048,10 +2048,7 @@ void QOCIResult::virtual_hook(int id, void *data)
 {
     Q_ASSERT(data);
 
-    switch (id) {
-    default:
-        QSqlCachedResult::virtual_hook(id, data);
-    }
+    QSqlCachedResult::virtual_hook(id, data);
 }
 
 ////////////////////////////////////////////////////////////////////////////
diff --git a/src/sql/drivers/odbc/qsql_odbc.cpp b/src/sql/drivers/odbc/qsql_odbc.cpp
index 2cb8fcc100..0eb078b0e4 100644
--- a/src/sql/drivers/odbc/qsql_odbc.cpp
+++ b/src/sql/drivers/odbc/qsql_odbc.cpp
@@ -1723,10 +1723,7 @@ bool QODBCResult::nextResult()
 
 void QODBCResult::virtual_hook(int id, void *data)
 {
-    switch (id) {
-    default:
-        QSqlResult::virtual_hook(id, data);
-    }
+    QSqlResult::virtual_hook(id, data);
 }
 
 void QODBCResult::detachFromResultSet()
diff --git a/src/sql/drivers/psql/qsql_psql.cpp b/src/sql/drivers/psql/qsql_psql.cpp
index 6211f25cca..8a0e2b86ea 100644
--- a/src/sql/drivers/psql/qsql_psql.cpp
+++ b/src/sql/drivers/psql/qsql_psql.cpp
@@ -512,10 +512,7 @@ void QPSQLResult::virtual_hook(int id, void *data)
 {
     Q_ASSERT(data);
 
-    switch (id) {
-    default:
-        QSqlResult::virtual_hook(id, data);
-    }
+    QSqlResult::virtual_hook(id, data);
 }
 
 static QString qReplacePlaceholderMarkers(const QString &query)
diff --git a/src/sql/drivers/sqlite/qsql_sqlite.cpp b/src/sql/drivers/sqlite/qsql_sqlite.cpp
index debc304a80..595ef496ec 100644
--- a/src/sql/drivers/sqlite/qsql_sqlite.cpp
+++ b/src/sql/drivers/sqlite/qsql_sqlite.cpp
@@ -333,10 +333,7 @@ QSQLiteResult::~QSQLiteResult()
 
 void QSQLiteResult::virtual_hook(int id, void *data)
 {
-    switch (id) {
-    default:
-        QSqlCachedResult::virtual_hook(id, data);
-    }
+    QSqlCachedResult::virtual_hook(id, data);
 }
 
 bool QSQLiteResult::reset(const QString &query)
diff --git a/src/sql/drivers/sqlite2/qsql_sqlite2.cpp b/src/sql/drivers/sqlite2/qsql_sqlite2.cpp
index 5dc292c39b..9dce21e9bd 100644
--- a/src/sql/drivers/sqlite2/qsql_sqlite2.cpp
+++ b/src/sql/drivers/sqlite2/qsql_sqlite2.cpp
@@ -266,10 +266,7 @@ QSQLite2Result::~QSQLite2Result()
 
 void QSQLite2Result::virtual_hook(int id, void *data)
 {
-    switch (id) {
-    default:
-        QSqlCachedResult::virtual_hook(id, data);
-    }
+    QSqlCachedResult::virtual_hook(id, data);
 }
 
 /*
diff --git a/src/sql/kernel/qsqlcachedresult.cpp b/src/sql/kernel/qsqlcachedresult.cpp
index 103fb0aeab..9a817da8ea 100644
--- a/src/sql/kernel/qsqlcachedresult.cpp
+++ b/src/sql/kernel/qsqlcachedresult.cpp
@@ -304,10 +304,7 @@ QSqlCachedResult::ValueCache &QSqlCachedResult::cache()
 
 void QSqlCachedResult::virtual_hook(int id, void *data)
 {
-    switch (id) {
-    default:
-        QSqlResult::virtual_hook(id, data);
-    }
+    QSqlResult::virtual_hook(id, data);
 }
 
 void QSqlCachedResult::detachFromResultSet()
-- 
cgit v1.2.3