Leahnaya/porymap
1
0
Fork 0
mirror of https://github.com/huderlem/porymap.git synced 2026-08-24 09:36:11 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

silence compiler warnings

Browse Source
This commit is contained in:
garak
2019-08-06 23:35:02 -04:00
parent e87d669e1d
commit f89804dd16
16 changed files with 41 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/ui/citymappixmapitem.h
View File

@@ -9,6 +9,10 @@
class CityMapPixmapItem : public QObject, public QGraphicsPixmapItem {
Q_OBJECT
private:
using QGraphicsPixmapItem::paint;
public:
CityMapPixmapItem(QString fname, TilemapTileSelector *tile_selector) {
this->file = fname;
@@ -25,7 +29,7 @@ public:
void init();
void save();
void create(QString);
virtual void paint(QGraphicsSceneMouseEvent*);
virtual void paint(QGraphicsSceneMouseEvent *);
virtual void draw();
int getIndexAt(int, int);
int width();

3
include/ui/collisionpixmapitem.h
View File

@@ -35,6 +35,9 @@ protected:
void mousePressEvent(QGraphicsSceneMouseEvent*);
void mouseMoveEvent(QGraphicsSceneMouseEvent*);
void mouseReleaseEvent(QGraphicsSceneMouseEvent*);
//private:
// using MapPixmapItem::paint;
};
#endif // COLLISIONPIXMAPITEM_H

3
include/ui/cursortilerect.h
View File

@@ -27,8 +27,7 @@ public:
height + penWidth * 2);
}
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
QWidget *widget) override
void paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *) override
{
if (!(*enabled)) return;
int width = this->width;

4
include/ui/mappixmapitem.h
View File

@@ -8,6 +8,10 @@
class MapPixmapItem : public QObject, public QGraphicsPixmapItem {
Q_OBJECT
private:
using QGraphicsPixmapItem::paint;
public:
MapPixmapItem(Map *map_, MetatileSelector *metatileSelector, Settings *settings) {
this->map = map_;

3
include/ui/movablerect.h
View File

@@ -18,8 +18,7 @@ public:
20 * 8 + penWidth * 2);
}
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
QWidget *widget) override
void paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *) override
{
painter->setPen(this->color);
painter->drawRect(-2, -2, this->width + 3, this->height + 3);

18
include/ui/regionmappixmapitem.h
View File

@@ -7,6 +7,10 @@
class RegionMapPixmapItem : public QObject, public QGraphicsPixmapItem {
Q_OBJECT
private:
using QGraphicsPixmapItem::paint;
public:
RegionMapPixmapItem(RegionMap *rmap, TilemapTileSelector *tile_selector) {
this->region_map = rmap;
@@ -16,8 +20,8 @@ public:
RegionMap *region_map;
TilemapTileSelector *tile_selector;
virtual void paint(QGraphicsSceneMouseEvent*);
virtual void select(QGraphicsSceneMouseEvent*);
virtual void paint(QGraphicsSceneMouseEvent *);
virtual void select(QGraphicsSceneMouseEvent *);
virtual void draw();
signals:
@@ -26,11 +30,11 @@ signals:
void hoveredRegionMapTileCleared();
protected:
void hoverMoveEvent(QGraphicsSceneHoverEvent*);
void hoverLeaveEvent(QGraphicsSceneHoverEvent*);
void mousePressEvent(QGraphicsSceneMouseEvent*);
void mouseMoveEvent(QGraphicsSceneMouseEvent*);
void mouseReleaseEvent(QGraphicsSceneMouseEvent*);
void hoverMoveEvent(QGraphicsSceneHoverEvent *);
void hoverLeaveEvent(QGraphicsSceneHoverEvent *);
void mousePressEvent(QGraphicsSceneMouseEvent *);
void mouseMoveEvent(QGraphicsSceneMouseEvent *);
void mouseReleaseEvent(QGraphicsSceneMouseEvent *);
};
#endif // REGIONMAPPIXMAPITEM_H

2
include/ui/tilemaptileselector.h
View File

@@ -34,7 +34,7 @@ protected:
private:
int numTilesWide;
int numTiles;
size_t numTiles;
void updateSelectedTile();
unsigned getTileId(int x, int y);
QPoint getTileIdCoords(unsigned);