mirror of https://github.com/stella-emu/stella.git
Fixed compile error and warnings from g++.
This commit is contained in:
parent
9274a72d51
commit
2db6ab7d16
|
@ -27,12 +27,14 @@ class ContextMenu;
|
|||
class TiaZoomWidget : public Widget, public CommandSender
|
||||
{
|
||||
public:
|
||||
using Widget::setPos;
|
||||
|
||||
TiaZoomWidget(GuiObject *boss, const GUI::Font& font,
|
||||
int x, int y, int w, int h);
|
||||
~TiaZoomWidget() override = default;
|
||||
|
||||
void loadConfig() override;
|
||||
void setPos(int x, int y);
|
||||
void setPos(int x, int y) override;
|
||||
|
||||
string getToolTip(const Common::Point& pos) const override;
|
||||
bool changedToolTip(const Common::Point& oldPos, const Common::Point& newPos) const override;
|
||||
|
|
|
@ -75,7 +75,7 @@ void FileListWidget::setLocation(const FilesystemNode& node,
|
|||
{
|
||||
progress().resetProgress();
|
||||
progress().open();
|
||||
class FilesystemNode::CancelCheck isCancelled = []() {
|
||||
FilesystemNode::CancelCheck isCancelled = []() {
|
||||
return myProgressDialog->isCancelled();
|
||||
};
|
||||
|
||||
|
@ -255,7 +255,7 @@ string FileListWidget::getToolTip(const Common::Point& pos) const
|
|||
if(idx < 0)
|
||||
return EmptyString;
|
||||
|
||||
if(_includeSubDirs && _dirList.size() > idx)
|
||||
if(_includeSubDirs && static_cast<int>(_dirList.size()) > idx)
|
||||
return _toolTipText + _dirList[idx];
|
||||
|
||||
const string value = _list[idx];
|
||||
|
|
|
@ -71,7 +71,6 @@ class FileListWidget : public StringListWidget
|
|||
@param node The directory to display. If this is a file, its parent
|
||||
will instead be used, and the file will be selected
|
||||
@param select An optional entry to select (if applicable)
|
||||
@param recursive Recursively list sub-directories too
|
||||
*/
|
||||
void setDirectory(const FilesystemNode& node,
|
||||
const string& select = EmptyString);
|
||||
|
|
Loading…
Reference in New Issue