Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
LEFEBVREJP email
radix
Commits
2ce6ce48
Commit
2ce6ce48
authored
Feb 26, 2020
by
LEFEBVREJP email
Browse files
Merge branch 'fortify_updates' into 'master'
Fortify changes. See merge request
!90
parents
a0323e63
6fd2ff34
Pipeline
#91337
passed with stages
in 18 minutes and 25 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
radixwidgets/numberpadwidget.cc
View file @
2ce6ce48
...
...
@@ -47,6 +47,7 @@ NumberPadWidget::NumberPadWidget(QWidget *parent, bool toggle)
{
mToggle
=
toggle
;
mMapper
=
new
QSignalMapper
(
this
);
mButton
=
new
QPushButton
(
this
);
connect
(
mMapper
,
SIGNAL
(
mapped
(
int
)),
SLOT
(
buttonClicked
(
int
)));
// add widget containing
...
...
@@ -70,8 +71,8 @@ NumberPadWidget::NumberPadWidget(QWidget *parent, bool toggle)
col
=
0
;
continue
;
}
QPushButton
*
button
=
new
QPushButton
(
this
);
int
colSpan
=
1
;
int
colSpan
=
1
;
switch
(
keyboardLayout
[
i
].
key
)
{
case
Qt
::
Key_Delete
:
...
...
@@ -81,28 +82,28 @@ NumberPadWidget::NumberPadWidget(QWidget *parent, bool toggle)
case
Qt
::
Key_3
:
case
Qt
::
Key_6
:
case
Qt
::
Key_9
:
b
utton
->
setObjectName
(
"number_pad_button_wide"
);
mB
utton
->
setObjectName
(
"number_pad_button_wide"
);
colSpan
=
2
;
break
;
default:
b
utton
->
setObjectName
(
"number_pad_button"
);
mB
utton
->
setObjectName
(
"number_pad_button"
);
break
;
}
b
utton
->
setText
(
QString
::
fromLatin1
(
keyboardLayout
[
i
].
label
));
mB
utton
->
setText
(
QString
::
fromLatin1
(
keyboardLayout
[
i
].
label
));
if
(
mToggle
&&
keyboardLayout
[
i
].
key
==
Qt
::
Key_Plus
)
connect
(
b
utton
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
makePositive
()));
connect
(
mB
utton
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
makePositive
()));
else
if
(
mToggle
&&
keyboardLayout
[
i
].
key
==
Qt
::
Key_Minus
)
connect
(
b
utton
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
makeNegative
()));
connect
(
mB
utton
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
makeNegative
()));
else
{
mMapper
->
setMapping
(
b
utton
,
keyboardLayout
[
i
].
key
);
connect
(
b
utton
,
SIGNAL
(
clicked
()),
mMapper
,
SLOT
(
map
()));
mMapper
->
setMapping
(
mB
utton
,
keyboardLayout
[
i
].
key
);
connect
(
mB
utton
,
SIGNAL
(
clicked
()),
mMapper
,
SLOT
(
map
()));
}
mNumLayout
->
addWidget
(
b
utton
,
row
,
col
,
1
,
colSpan
);
mNumLayout
->
addWidget
(
mB
utton
,
row
,
col
,
1
,
colSpan
);
col
++
;
}
}
...
...
radixwidgets/numberpadwidget.hh
View file @
2ce6ce48
...
...
@@ -14,6 +14,7 @@ class RADIX_PUBLIC NumberPadWidget : public QLineEdit
{
Q_OBJECT
QPushButton
*
mButton
;
QSignalMapper
*
mMapper
;
QWidget
*
mNumberWidget
;
QGridLayout
*
mNumLayout
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment