From 4ae4fc675e352148ba71f3be027c6c6a13d67468 Mon Sep 17 00:00:00 2001 From: Maarten ter Huurne Date: Fri, 23 Dec 2011 15:49:09 +0100 Subject: [PATCH] Mark Link::run() as pure virtual. This is better than providing an empty default implementation, since it forces subclasses to override the method. --- src/link.cpp | 2 -- src/link.h | 2 +- src/linkapp.h | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/link.cpp b/src/link.cpp index 0ddfee5..65258c7 100644 --- a/src/link.cpp +++ b/src/link.cpp @@ -44,8 +44,6 @@ Link::Link(GMenu2X *gmenu2x_, Touchscreen &ts) updateSurfaces(); } -void Link::run() {} - void Link::paint() { iconSurface->blit(gmenu2x->s, iconX, rect.y+padding, 32,32); gmenu2x->s->write( gmenu2x->font, getTitle(), iconX+16, rect.y+gmenu2x->skinConfInt["linkHeight"]-padding, ASFont::HAlignCenter, ASFont::VAlignBottom ); diff --git a/src/link.h b/src/link.h index 28606e9..74476d7 100644 --- a/src/link.h +++ b/src/link.h @@ -69,7 +69,7 @@ public: const std::string &getIconPath(); void setIconPath(const std::string &icon); - virtual void run(); + virtual void run() = 0; }; #endif diff --git a/src/linkapp.h b/src/linkapp.h index f9ab734..3d8a403 100644 --- a/src/linkapp.h +++ b/src/linkapp.h @@ -53,6 +53,7 @@ public: LinkApp(GMenu2X *gmenu2x, Touchscreen &ts, InputManager &inputMgr, const char* linkfile); virtual const std::string &searchIcon(); + virtual void run(); const std::string &getExec(); void setExec(const std::string &exec); @@ -78,7 +79,6 @@ public: void setClock(int mhz); bool save(); - void run(); void showManual(); void selector(int startSelection=0, const std::string &selectorDir=""); void launch(const std::string &selectedFile="",