summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2018-04-30 21:52:29 +0000
committerAndrei Karas <akaras@inbox.ru>2018-04-30 21:56:50 +0300
commitfcfc0bfbcc57c09f0f20e77dc0dee335ae736135 (patch)
treea96de85a85dd8f964771c68c94241f5c62b1748c
parenta946678bc7f37475ecef5b4282a77bc4e0f1afa7 (diff)
downloadplus-fcfc0bfbcc57c09f0f20e77dc0dee335ae736135.tar.gz
plus-fcfc0bfbcc57c09f0f20e77dc0dee335ae736135.tar.bz2
plus-fcfc0bfbcc57c09f0f20e77dc0dee335ae736135.tar.xz
plus-fcfc0bfbcc57c09f0f20e77dc0dee335ae736135.zip
fix warnings on sunon compilation.
-rw-r--r--src/gui/widgets/dropdown.cpp6
-rw-r--r--src/gui/widgets/popuplist.cpp4
-rw-r--r--src/utils/process.cpp8
3 files changed, 10 insertions, 8 deletions
diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp
index eba9ab9dd..be1fbbb7c 100644
--- a/src/gui/widgets/dropdown.cpp
+++ b/src/gui/widgets/dropdown.cpp
@@ -54,7 +54,7 @@ static std::string const dropdownFiles[2] =
DropDown::DropDown(const Widget2 *const widget,
ListModel *const listModel,
- const bool extended,
+ const bool isExtended,
const Modal modal,
ActionListener *const listener,
const std::string &eventId) :
@@ -64,7 +64,7 @@ DropDown::DropDown(const Widget2 *const widget,
MouseListener(),
FocusListener(),
SelectionListener(),
- mPopup(CREATEWIDGETR(PopupList, this, listModel, extended, modal)),
+ mPopup(CREATEWIDGETR(PopupList, this, listModel, isExtended, modal)),
mShadowColor(getThemeColor(ThemeColorId::DROPDOWN_SHADOW, 255U)),
mHighlightColor(getThemeColor(ThemeColorId::HIGHLIGHT, 255U)),
mPadding(1),
@@ -72,7 +72,7 @@ DropDown::DropDown(const Widget2 *const widget,
mSpacing(0),
mFoldedUpHeight(0),
mSelectionListeners(),
- mExtended(extended),
+ mExtended(isExtended),
mDroppedDown(false),
mPushed(false),
mIsDragged(false)
diff --git a/src/gui/widgets/popuplist.cpp b/src/gui/widgets/popuplist.cpp
index 627a6cfe6..c6412a69b 100644
--- a/src/gui/widgets/popuplist.cpp
+++ b/src/gui/widgets/popuplist.cpp
@@ -33,12 +33,12 @@
PopupList::PopupList(DropDown *const widget,
ListModel *const listModel,
- const bool extended,
+ const bool isExtended,
const Modal modal) :
Popup("PopupList", "popuplist.xml"),
FocusListener(),
mListModel(listModel),
- mListBox(extended ? CREATEWIDGETR(ExtendedListBox,
+ mListBox(isExtended ? CREATEWIDGETR(ExtendedListBox,
widget, listModel, "extendedlistbox.xml", 0) :
CREATEWIDGETR(ListBox,
widget, listModel, "popuplistbox.xml")),
diff --git a/src/utils/process.cpp b/src/utils/process.cpp
index b669a3a64..ffe56c25e 100644
--- a/src/utils/process.cpp
+++ b/src/utils/process.cpp
@@ -35,9 +35,11 @@ PRAGMA48(GCC diagnostic pop)
#include "debug.h"
-#ifndef __native_client__
+#if defined(WIN32) || defined(__linux__) || \
+ defined(__linux) || defined(__APPLE__)
const int timeOut = 10;
-#endif // __native_client__
+#endif // defined(WIN32) || defined(__linux__) ||
+ // defined(__linux) || defined(__APPLE__)
#ifdef WIN32
@@ -304,7 +306,7 @@ bool openBrowser(std::string url)
return true;
}
#else // OTHER
-bool openBrowser(std::string url)
+bool openBrowser(std::string url A_UNUSED)
{
return false;
}