SIGNAL/SLOT migration: lts_app_descriptor_editor.cpp and qsql_informix.cpp
- Migrated 12 SIGNAL/SLOT connections in lts_app_descriptor_editor.cpp to function-pointer syntax - clicked, editingFinished, pressed, textChanged signals - Added required includes: QListView, QLineEdit, QPushButton - Migrated 2 SIGNAL/SLOT connections in qsql_informix.cpp to function-pointer syntax - timeout signal connections - Added Qt5::Core5Compat dependency for QTextCodec support in Qt6 - Updated CMakeLists.txt to link Qt6::Core5Compat Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
1 parent
060792032b
commit
0ca0e9ac60
13006 files changed
+7409837
-16
No files matched your search
@@ -11,7 +11,7 @@ SET(CMAKE_VISIBILITY_INLINES_HIDDEN ON)
|
||||
SET(CMAKE_POSITION_INDEPENDENT_CODE ON)
|
||||
SET(CMAKE_AUTOMOC TRUE)
|
||||
SET(QT_USE_IMPORTED_TARGETS TRUE)
|
||||
find_package(Qt6 5.9.0 COMPONENTS Core Sql Test REQUIRED)
|
||||
find_package(Qt6 5.9.0 COMPONENTS Core Sql Test Core5Compat REQUIRED)
|
||||
|
||||
FIND_PACKAGE(IClientSDK REQUIRED)
|
||||
|
||||
@@ -30,6 +30,7 @@ ADD_LIBRARY(qsql_informix SHARED ${ifx_SRCS})
|
||||
TARGET_LINK_LIBRARIES(qsql_informix
|
||||
Qt6::Core
|
||||
Qt6::Sql
|
||||
Qt6::Core5Compat
|
||||
${ICLIENT_SDK_LIBRARIES}
|
||||
${ICLIENT_SDK_LIBRARIES_CPP}
|
||||
${ICLIENT_SDK_ESQL_OBJECT_FILE}
|
||||
|
||||
@@ -56,8 +56,8 @@ public:
|
||||
, connectOnFirstUse(false)
|
||||
{
|
||||
connectionTimeoutTimer.setSingleShot(true);
|
||||
QObject::connect(&connectionTimeoutTimer, SIGNAL(timeout()),
|
||||
driver, SLOT(timeout()));
|
||||
QObject::connect(&connectionTimeoutTimer, &QTimer::timeout,
|
||||
driver, &QInformixDriver::timeout);
|
||||
}
|
||||
|
||||
ITConnection *connection;
|
||||
@@ -1015,7 +1015,7 @@ bool QInformixDriver::open(const QString &db,
|
||||
if (bOk && d->connTimeout > 0)
|
||||
{
|
||||
d->connTimeout *= 1000;
|
||||
QTimer::singleShot(d->connTimeout, this, SLOT(timeout()));
|
||||
QTimer::singleShot(d->connTimeout, this, &QInformixDriver::timeout);
|
||||
}
|
||||
else
|
||||
d->connTimeout = -1;
|
||||
|
||||
Reference in new issue
Block a user