Skip to content

Commit 44208f7

Browse files
committed
Use add_enum for the Qt enums, and add mouse and keyboard enums.
1 parent c7f9920 commit 44208f7

File tree

3 files changed

+245
-38
lines changed

3 files changed

+245
-38
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.16.0)
22

33
project(JlQML)
44

5-
set(JlQML_VERSION 0.7.1)
5+
set(JlQML_VERSION 0.8.0)
66
message(STATUS "Project version: v${JlQML_VERSION}")
77

88
set(CMAKE_MACOSX_RPATH 1)

julia_itemmodel.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ QVariant JuliaItemModel::data(const QModelIndex& index, int role) const
6060
QVariant JuliaItemModel::headerData(int section, Qt::Orientation orientation, int role) const
6161
{
6262
static const jlcxx::JuliaFunction headerdata_f(jl_get_function(m_qml_mod, "headerdata"));
63-
return safe_unbox<QVariant&>(headerdata_f(m_data, section+1, orientation, role));
63+
return safe_unbox<QVariant&>(headerdata_f(m_data, section+1, static_cast<Qt::Orientation>(orientation), static_cast<int>(role)));
6464
}
6565

6666
bool JuliaItemModel::setData(const QModelIndex& index, const QVariant& value, int role)
@@ -72,7 +72,7 @@ bool JuliaItemModel::setData(const QModelIndex& index, const QVariant& value, in
7272
bool JuliaItemModel::setHeaderData(int section, Qt::Orientation orientation, const QVariant& value, int role)
7373
{
7474
static const jlcxx::JuliaFunction setheaderdata_f(jl_get_function(m_qml_mod, "setheaderdata!"));
75-
return safe_unbox<bool>(setheaderdata_f(this, section+1, orientation, value, role));
75+
return safe_unbox<bool>(setheaderdata_f(this, section+1, static_cast<Qt::Orientation>(orientation), value, static_cast<int>(role)));
7676
}
7777

7878
Qt::ItemFlags JuliaItemModel::flags(const QModelIndex& index) const
@@ -110,13 +110,13 @@ void JuliaItemModel::insertRow(int rowIndex, const QVariant& row)
110110
void JuliaItemModel::moveRow(int fromRowIndex, int toRowIndex, int rows)
111111
{
112112
static const jlcxx::JuliaFunction move_row_f(jl_get_function(m_qml_mod, "move_rows!"));
113-
move_row_f(this, fromRowIndex+1, toRowIndex+1, rows);
113+
move_row_f(this, fromRowIndex+1, toRowIndex+1, static_cast<int>(rows));
114114
}
115115

116116
void JuliaItemModel::removeRow(int rowIndex, int rows)
117117
{
118118
static const jlcxx::JuliaFunction remove_row_f(jl_get_function(m_qml_mod, "remove_rows!"));
119-
remove_row_f(this, rowIndex+1, rows);
119+
remove_row_f(this, rowIndex+1, static_cast<int>(rows));
120120
}
121121

122122
void JuliaItemModel::setRow(int rowIndex, const QVariant& row)
@@ -140,13 +140,13 @@ void JuliaItemModel::insertColumn(int columnIndex, const QVariant& column)
140140
void JuliaItemModel::moveColumn(int fromColumnIndex, int toColumnIndex, int columns)
141141
{
142142
static const jlcxx::JuliaFunction move_column_f(jl_get_function(m_qml_mod, "move_columns!"));
143-
move_column_f(this, fromColumnIndex+1, toColumnIndex+1, columns);
143+
move_column_f(this, fromColumnIndex+1, toColumnIndex+1, static_cast<int>(columns));
144144
}
145145

146146
void JuliaItemModel::removeColumn(int columnIndex, int columns)
147147
{
148148
static const jlcxx::JuliaFunction remove_column_f(jl_get_function(m_qml_mod, "remove_columns!"));
149-
remove_column_f(this, columnIndex+1, columns);
149+
remove_column_f(this, columnIndex+1, static_cast<int>(columns));
150150
}
151151

152152
void JuliaItemModel::setColumn(int columnIndex, const QVariant& column)

0 commit comments

Comments
 (0)