Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
OpenWalnut
OpenWalnut Core
Commits
d842f31e
Commit
d842f31e
authored
May 03, 2011
by
Sebastian Eichelbaum
Browse files
[FIX] - fixed some warnings
parent
96e2dfdf
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
4 deletions
+6
-4
src/gui/qt4/WQtCombinerActionList.cpp
src/gui/qt4/WQtCombinerActionList.cpp
+5
-3
src/gui/qt4/networkEditor/WQtNetworkEditor.cpp
src/gui/qt4/networkEditor/WQtNetworkEditor.cpp
+1
-1
No files found.
src/gui/qt4/WQtCombinerActionList.cpp
View file @
d842f31e
...
@@ -56,10 +56,12 @@ WQtCombinerActionList::WQtCombinerActionList( QWidget* parent, WIconManager* ico
...
@@ -56,10 +56,12 @@ WQtCombinerActionList::WQtCombinerActionList( QWidget* parent, WIconManager* ico
for
(
WCombinerTypes
::
WCompatiblesList
::
iterator
groups
=
compatibles
.
begin
();
groups
!=
compatibles
.
end
();
++
groups
)
for
(
WCombinerTypes
::
WCompatiblesList
::
iterator
groups
=
compatibles
.
begin
();
groups
!=
compatibles
.
end
();
++
groups
)
{
{
// check current prototype against whitelist and blacklist
// check current prototype against whitelist and blacklist
if
(
!
ignoreWhiteList
&&
// ignore the whitelist?
if
(
!
ignoreWhiteList
&&
// ignore the whitelist?
moduleWhiteList
.
size
()
&&
// whitelist empty?
moduleWhiteList
.
size
()
&&
// whitelist empty?
std
::
find
(
moduleWhiteList
.
begin
(),
moduleWhiteList
.
end
(),
groups
->
first
->
getName
()
)
==
moduleWhiteList
.
end
()
(
(
std
::
find
(
moduleWhiteList
.
begin
(),
moduleWhiteList
.
end
(),
groups
->
first
->
getName
()
)
==
moduleWhiteList
.
end
()
)
||
||
std
::
find
(
moduleBlackList
.
begin
(),
moduleBlackList
.
end
(),
groups
->
first
->
getName
()
)
!=
moduleBlackList
.
end
()
)
(
std
::
find
(
moduleBlackList
.
begin
(),
moduleBlackList
.
end
(),
groups
->
first
->
getName
()
)
!=
moduleBlackList
.
end
()
)
)
)
{
{
continue
;
continue
;
}
}
...
...
src/gui/qt4/networkEditor/WQtNetworkEditor.cpp
View file @
d842f31e
...
@@ -494,7 +494,7 @@ void WQtNetworkEditor::itemMoved()
...
@@ -494,7 +494,7 @@ void WQtNetworkEditor::itemMoved()
timerId
=
startTimer
(
1000
/
25
);
timerId
=
startTimer
(
1000
/
25
);
}
}
void
WQtNetworkEditor
::
timerEvent
(
QTimerEvent
*
event
)
void
WQtNetworkEditor
::
timerEvent
(
QTimerEvent
*
/
*event
*/
)
{
{
//Q_UNUSED( event );
//Q_UNUSED( event );
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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