summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-03-09 14:52:19 +0300
committerAndrei Karas <akaras@inbox.ru>2014-03-09 14:52:19 +0300
commitf661878450acdd32ebac6ee8c7680a09dbf8b9ec (patch)
tree3c2723a1333324edc5b8f4c08df16f10ca27050e
parentc66e0863ecc24145c57261987eb8e25776c303ce (diff)
downloadmv-f661878450acdd32ebac6ee8c7680a09dbf8b9ec.tar.gz
mv-f661878450acdd32ebac6ee8c7680a09dbf8b9ec.tar.bz2
mv-f661878450acdd32ebac6ee8c7680a09dbf8b9ec.tar.xz
mv-f661878450acdd32ebac6ee8c7680a09dbf8b9ec.zip
fix compilation warnings.
-rw-r--r--src/actionmanager.cpp4
-rw-r--r--src/gui/viewport.cpp6
-rw-r--r--src/gui/viewport.h2
3 files changed, 6 insertions, 6 deletions
diff --git a/src/actionmanager.cpp b/src/actionmanager.cpp
index 1eb1da4e3..e8bdc7511 100644
--- a/src/actionmanager.cpp
+++ b/src/actionmanager.cpp
@@ -723,12 +723,12 @@ static bool showHelpPage(const std::string &page)
impHandler0(helpWindowShow)
{
- showHelpPage("index");
+ return showHelpPage("index");
}
impHandler0(aboutWindowShow)
{
- showHelpPage("about");
+ return showHelpPage("about");
}
static void showHideWindow(Window *const window)
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 9b31d6e13..cc0aa8778 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -405,7 +405,7 @@ bool Viewport::openContextMenu(MouseEvent &event)
return false;
}
-bool Viewport::leftMouseAction(MouseEvent &event)
+bool Viewport::leftMouseAction()
{
// Interact with some being
if (mHoverBeing)
@@ -518,7 +518,7 @@ void Viewport::mousePressed(MouseEvent &event)
// Left click can cause different actions
if (!mLongMouseClick && eventButton == MouseEvent::LEFT)
{
- if (leftMouseAction(event))
+ if (leftMouseAction())
return;
}
else if (eventButton == MouseEvent::MIDDLE)
@@ -683,7 +683,7 @@ void Viewport::mouseReleased(MouseEvent &event)
}
else
{
- if (leftMouseAction(event))
+ if (leftMouseAction())
return;
if (event.getSource() != this)
return;
diff --git a/src/gui/viewport.h b/src/gui/viewport.h
index 50a79ee15..8febd4fe5 100644
--- a/src/gui/viewport.h
+++ b/src/gui/viewport.h
@@ -300,7 +300,7 @@ class Viewport final : public WindowContainer,
void _drawPath(Graphics *const graphics, const Path &path,
const Color &color = Color(255, 0, 0)) const;
- bool leftMouseAction(MouseEvent &event);
+ bool leftMouseAction();
bool openContextMenu(MouseEvent &event);