Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed windows compilation removing warnings #104

Merged
merged 2 commits into from
Dec 27, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
strategy:
matrix:
include:
- qt: 5.12.11
- qt: 5.12.12
arch: win64_msvc2017_64
config: Release
toolset: v141
Expand Down
4 changes: 2 additions & 2 deletions lib/include/DOtherSide/DosQAbstractItemModelWrapper.h
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ int DosQAbstractItemModelWrapper<T, N, M>::qt_metacall(QMetaObject::Call call, i
}

template<typename T, int N, int M>
bool DosQAbstractItemModelWrapper<T, N, M>::emitSignal(QObject */*emitter*/, const QString &name, const std::vector<QVariant> &argumentsValues)
bool DosQAbstractItemModelWrapper<T, N, M>::emitSignal(QObject *, const QString &name, const std::vector<QVariant> &argumentsValues)
{
Q_ASSERT(m_impl);
return m_dosImpl->emitSignal(this, name, argumentsValues);
Expand Down Expand Up @@ -381,7 +381,7 @@ template<typename T, int N>
using RegisterSingletonTypeQObject = DosQAbstractItemModelWrapper<T, N, 1>;

template<typename T, int N>
QObject *singletontype_provider(QQmlEngine */*engine*/, QJSEngine */*scriptEngine*/)
QObject *singletontype_provider(QQmlEngine *, QJSEngine *)
{
return new RegisterSingletonTypeQObject<T, N>();
}
Expand Down
4 changes: 2 additions & 2 deletions lib/include/DOtherSide/DosQObjectWrapper.h
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ int DosQObjectWrapper<N, M>::qt_metacall(QMetaObject::Call call, int index, void
}

template<int N, int M>
bool DosQObjectWrapper<N, M>::emitSignal(QObject */*emitter*/, const QString &name, const std::vector<QVariant> &argumentsValues)
bool DosQObjectWrapper<N, M>::emitSignal(QObject *, const QString &name, const std::vector<QVariant> &argumentsValues)
{
Q_ASSERT(m_impl);
return m_impl->emitSignal(this, name, argumentsValues);
Expand Down Expand Up @@ -175,7 +175,7 @@ template<int N>
using RegisterSingletonTypeQObject = DosQObjectWrapper<N, 1>;

template<int N>
QObject *singletontype_provider(QQmlEngine */*engine*/, QJSEngine */*scriptEngine*/)
QObject *singletontype_provider(QQmlEngine *, QJSEngine *)
{
return new RegisterSingletonTypeQObject<N>();
}
Expand Down
10 changes: 5 additions & 5 deletions lib/src/DOtherSide.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -807,7 +807,7 @@ DosQModelIndex *dos_qabstracttablemodel_index(DosQAbstractTableModel *vptr, int
return static_cast<DosQModelIndex *>(result);
}

DosQModelIndex *dos_qabstracttablemodel_parent(DosQAbstractTableModel */*vptr*/, DosQModelIndex */*dosChild*/)
DosQModelIndex *dos_qabstracttablemodel_parent(DosQAbstractTableModel *, DosQModelIndex *)
{
return static_cast<DosQModelIndex *>(new QModelIndex());
}
Expand Down Expand Up @@ -840,12 +840,12 @@ DosQModelIndex *dos_qabstractlistmodel_index(DosQAbstractListModel *vptr, int ro
return static_cast<DosQModelIndex *>(result);
}

DosQModelIndex *dos_qabstractlistmodel_parent(DosQAbstractListModel */*vptr*/, DosQModelIndex */*dosChild*/)
DosQModelIndex *dos_qabstractlistmodel_parent(DosQAbstractListModel *, DosQModelIndex *)
{
return static_cast<DosQModelIndex *>(new QModelIndex());
}

int dos_qabstractlistmodel_columnCount(DosQAbstractListModel */*vptr*/, DosQModelIndex *dosParent)
int dos_qabstractlistmodel_columnCount(DosQAbstractListModel *, DosQModelIndex *dosParent)
{
auto parent = static_cast<QModelIndex *>(dosParent);
return parent->isValid() ? 0 : 1;
Expand Down Expand Up @@ -1094,12 +1094,12 @@ void dos_qcoreapplication_process_events_timed(DosQEventLoopProcessEventFlag fla

char *dos_slot_macro(const char *str)
{
return ::strdup((std::string("1") + str).c_str());
return qstrdup((std::string("1") + str).c_str());
}

char *dos_signal_macro(const char *str)
{
return ::strdup((std::string("2") + str).c_str());
return qstrdup((std::string("2") + str).c_str());
}

DosQPointer *dos_qpointer_create(DosQObject *object)
Expand Down
8 changes: 4 additions & 4 deletions lib/src/DosQMetaObject.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ QList<QByteArray> createParameterNames(const DOS::SignalDefinition &signal)
{
QList<QByteArray> result;
const auto &parameters = signal.parameters;
result.reserve(parameters.size());
result.reserve(static_cast<int>(parameters.size()));
for (size_t i = 0; i < parameters.size(); ++i)
result << parameters[i].name.toUtf8();
return result;
Expand Down Expand Up @@ -100,17 +100,17 @@ const QMetaObject *BaseDosQMetaObject::metaObject() const
return m_metaObject;
}

QMetaMethod BaseDosQMetaObject::signal(const QString &/*signalName*/) const
QMetaMethod BaseDosQMetaObject::signal(const QString &) const
{
return QMetaMethod();
}

QMetaMethod BaseDosQMetaObject::readSlot(const char */*propertyName*/) const
QMetaMethod BaseDosQMetaObject::readSlot(const char *) const
{
return QMetaMethod();
}

QMetaMethod BaseDosQMetaObject::writeSlot(const char */*propertyName*/) const
QMetaMethod BaseDosQMetaObject::writeSlot(const char *) const
{
return QMetaMethod();
}
Expand Down
2 changes: 1 addition & 1 deletion lib/src/DosQObjectImpl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ QVariant DosQObjectImpl::executeSlot(const QString &name, const std::vector<QVar
argumentsAsVoidPointers.emplace_back((void *)(&args[i]));

// send them to the binding handler
m_dObjectCallback(m_dObjectPointer, &slotName, argumentsAsVoidPointers.size(), &argumentsAsVoidPointers[0]);
m_dObjectCallback(m_dObjectPointer, &slotName, static_cast<int>(argumentsAsVoidPointers.size()), &argumentsAsVoidPointers[0]);

return result;
}
Expand Down