From ccf81822cffd099a7df68684a1738c804573e630 Mon Sep 17 00:00:00 2001
From: Christian Ehrlicher <ch.ehrlicher@gmx.de>
Date: Fri, 6 Jun 2025 20:21:05 +0200
Subject: SQL/DB2 & ODBC: avoid some code duplication

Avoid some code duplication by using a template parameter for
qMakeError() and qSqlWarning().

Pick-to: 6.10
Change-Id: I698ab063fce6c7be1cb3debdb9e83978eac10409
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
---
 src/plugins/sqldrivers/odbc/qsql_odbc.cpp | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'src/plugins/sqldrivers/odbc/qsql_odbc.cpp')

diff --git a/src/plugins/sqldrivers/odbc/qsql_odbc.cpp b/src/plugins/sqldrivers/odbc/qsql_odbc.cpp
index e09e65f223a..18289f93b54 100644
--- a/src/plugins/sqldrivers/odbc/qsql_odbc.cpp
+++ b/src/plugins/sqldrivers/odbc/qsql_odbc.cpp
@@ -329,16 +329,10 @@ static void qSqlWarning(const QString &message, T &&val)
         qCWarning(lcOdbc) << message << "\tError:" << addMsg;
 }
 
+template <typename T>
 static QSqlError qMakeError(const QString &err,
                             QSqlError::ErrorType type,
-                            const QODBCResultPrivate *p)
-{
-    return errorFromDiagRecords(err, type, qODBCWarn(p));
-}
-
-static QSqlError qMakeError(const QString &err,
-                            QSqlError::ErrorType type,
-                            const QODBCDriverPrivate *p)
+                            const T *p)
 {
     return errorFromDiagRecords(err, type, qODBCWarn(p));
 }
-- 
cgit v1.2.3