ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed compile error and warnings from g++.

This commit is contained in:
Stephen Anthony 2020-11-24 10:01:27 -03:30
parent 9274a72d51
commit 2db6ab7d16
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/debugger/gui/TiaZoomWidget.hxx
View File

@ -27,12 +27,14 @@ class ContextMenu;
class TiaZoomWidget : public Widget, public CommandSender class TiaZoomWidget : public Widget, public CommandSender
{ {
public: public:
using Widget::setPos;
TiaZoomWidget(GuiObject *boss, const GUI::Font& font, TiaZoomWidget(GuiObject *boss, const GUI::Font& font,
int x, int y, int w, int h); int x, int y, int w, int h);
~TiaZoomWidget() override = default; ~TiaZoomWidget() override = default;
void loadConfig() override; void loadConfig() override;
void setPos(int x, int y); void setPos(int x, int y) override;
string getToolTip(const Common::Point& pos) const override; string getToolTip(const Common::Point& pos) const override;
bool changedToolTip(const Common::Point& oldPos, const Common::Point& newPos) const override; bool changedToolTip(const Common::Point& oldPos, const Common::Point& newPos) const override;

4
src/gui/FileListWidget.cxx
View File

@ -75,7 +75,7 @@ void FileListWidget::setLocation(const FilesystemNode& node,
{ {
progress().resetProgress(); progress().resetProgress();
progress().open(); progress().open();
class FilesystemNode::CancelCheck isCancelled = []() { FilesystemNode::CancelCheck isCancelled = []() {
return myProgressDialog->isCancelled(); return myProgressDialog->isCancelled();
}; };
@ -255,7 +255,7 @@ string FileListWidget::getToolTip(const Common::Point& pos) const
if(idx < 0) if(idx < 0)
return EmptyString; return EmptyString;
if(_includeSubDirs && _dirList.size() > idx) if(_includeSubDirs && static_cast<int>(_dirList.size()) > idx)
return _toolTipText + _dirList[idx]; return _toolTipText + _dirList[idx];
const string value = _list[idx]; const string value = _list[idx];

1
src/gui/FileListWidget.hxx
View File

@ -71,7 +71,6 @@ class FileListWidget : public StringListWidget
@param node The directory to display. If this is a file, its parent @param node The directory to display. If this is a file, its parent
will instead be used, and the file will be selected will instead be used, and the file will be selected
@param select An optional entry to select (if applicable) @param select An optional entry to select (if applicable)
@param recursive Recursively list sub-directories too
*/ */
void setDirectory(const FilesystemNode& node, void setDirectory(const FilesystemNode& node,
const string& select = EmptyString); const string& select = EmptyString);