From: konrad Date: Wed, 5 May 2010 18:21:48 +0000 (+0000) Subject: minor adjustments (remove obsolete stuff) X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=1be64638f5dc5d67ac4d2f0884b667a8cc4d3310;p=konrad%2Fsmoke.git minor adjustments (remove obsolete stuff) git-svn-id: https://silmor.de/svn/softmagic/smoke/trunk@446 6e3c4bff-ac9f-4ac1-96c5-d2ea494d3e33 --- diff --git a/src/iface/msinterface.h b/src/iface/msinterface.h index fd2aacc..dbe0b19 100644 --- a/src/iface/msinterface.h +++ b/src/iface/msinterface.h @@ -41,8 +41,7 @@ class MSInterface:public MInterface QString hostName()const{return m_host;} /**returns whether the user is part of this role*/ - //TODO: return actual role membership! - bool hasRole(QString)const{return false;} + bool hasRole(QString s)const{return userroles.contains(s);} /**returns whether the user has a particular right*/ bool hasRight(Right)const; diff --git a/src/wext/MOEvent.cpp b/src/wext/MOEvent.cpp index d8413eb..e95a90b 100644 --- a/src/wext/MOEvent.cpp +++ b/src/wext/MOEvent.cpp @@ -55,13 +55,3 @@ QString MOEvent::endTimeString()const { return QDateTime::fromTime_t(end()).toString(QCoreApplication::translate("MOEvent","yyyy-MM-dd hh:mm ap","date/time format")); } - -void MOEvent::setdefaultprice(QString str) -{ - /*TODO: we have multiple prices now! - QStringList ps=str.split(QCoreApplication::translate("MOEvent",".","price decimal dot")); - qint64 prc=0; - if(ps.size()>=1)prc=ps[0].toInt()*100; - if(ps.size()>=2)prc+=ps[1].toInt(); - setdefaultprice(prc);*/ -} diff --git a/src/wext/MOEvent.h b/src/wext/MOEvent.h index 7f981a8..3abc028 100644 --- a/src/wext/MOEvent.h +++ b/src/wext/MOEvent.h @@ -40,9 +40,6 @@ class MOEvent:public MOEventAbstract /**returns the local regular expression for prices*/ QRegExp priceRegExp()const; - /**set the price as string*/ - void setdefaultprice(QString); - /**returns whether the event is valid. an event can be invalid if it is uninitialized (negative ID) or the server request failed*/ bool isValid()const{return !eventid().isNull() && eventid().value()>0;} }; diff --git a/www/inc/wext/template.php b/www/inc/wext/template.php index 6492645..3b3dd0a 100644 --- a/www/inc/wext/template.php +++ b/www/inc/wext/template.php @@ -16,7 +16,6 @@ class WOTemplate extends WOTemplateAbstract /**called by the TemplateList transaction*/ static public function getList($trans) { - //TODO: filter by flags $trans->settemplates(WOTemplateInfo::fromTableArraytemplate(WTtemplate::selectFromDB())); }