diff --git a/CMakeLists.txt b/CMakeLists.txt index 16e8a92..4e21949 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,3 +1,6 @@ cmake_minimum_required(VERSION 3.0) +if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-long-long -pedantic") +endif() add_subdirectory(lib) add_subdirectory(test) diff --git a/lib/src/DosQObjectImpl.cpp b/lib/src/DosQObjectImpl.cpp index 323beba..1df6652 100644 --- a/lib/src/DosQObjectImpl.cpp +++ b/lib/src/DosQObjectImpl.cpp @@ -54,6 +54,8 @@ int DosQObjectImpl::qt_metacall(QMetaObject::Call callType, int index, void **ar case QMetaObject::WriteProperty: writeProperty(index, args); break; + default: + return -1; } return -1; diff --git a/test/test_dotherside.cpp b/test/test_dotherside.cpp index 254f2d4..34d923b 100644 --- a/test/test_dotherside.cpp +++ b/test/test_dotherside.cpp @@ -48,10 +48,12 @@ private slots: { bool quit = false; dos_qguiapplication_create(); - QTimer::singleShot(100, [&quit]() { + QTimer timer; + QObject::connect(&timer, &QTimer::timeout, [&quit]() { quit = true; dos_qguiapplication_quit(); }); + timer.start(100); dos_qguiapplication_exec(); QVERIFY(quit); dos_qguiapplication_delete(); @@ -70,10 +72,12 @@ private slots: { bool quit = false; dos_qapplication_create(); - QTimer::singleShot(100, [&quit]() { + QTimer timer; + QObject::connect(&timer, &QTimer::timeout, [&quit]() { quit = true; dos_qapplication_quit(); }); + timer.start(100); dos_qapplication_exec(); QVERIFY(quit); dos_qapplication_delete(); @@ -303,13 +307,13 @@ private slots: void *dPointer = nullptr; - RowCountCallback rcc; - ColumnCountCallback ccc; - DataCallback dc; - SetDataCallback sdc; - RoleNamesCallback rnc; - FlagsCallback fc; - HeaderDataCallback hdc; + RowCountCallback rcc = nullptr; + ColumnCountCallback ccc = nullptr; + DataCallback dc = nullptr; + SetDataCallback sdc = nullptr; + RoleNamesCallback rnc = nullptr; + FlagsCallback fc = nullptr; + HeaderDataCallback hdc = nullptr; DosQAbstractListModel testObject(dPointer, moh->data(), ose, rcc, ccc, dc, sdc, rnc, fc, hdc); testObject.setObjectName("testObject");