Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-22 07:41:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed flags conflicts

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-FileSharingPermissions@5758 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2012-11-02 13:52:29 +00:00
parent dc82cee700
commit e753f22909
43 changed files with 383 additions and 386 deletions
Download patch file Download diff file Expand all files Collapse all files

9
retroshare-gui/src/gui/common/GroupFlagsWidget.h
View file

@ -3,16 +3,17 @@
#include <stdint.h>
#include <QPushButton>
#include <QWidget>
#include <retroshare/rsflags.h>
class GroupFlagsWidget: public QWidget
{
Q_OBJECT
public:
GroupFlagsWidget(QWidget *parent,uint32_t flags) ;
GroupFlagsWidget(QWidget *parent,FileStorageFlags flags) ;
virtual ~GroupFlagsWidget() ;
uint32_t flags() const ;
FileStorageFlags flags() const ;
public slots:
void updated() ;
@ -24,7 +25,7 @@ class GroupFlagsWidget: public QWidget
void update_OB_button(bool) ;
signals:
void flagsChanged(uint32_t) const ;
void flagsChanged(FileStorageFlags) const ;
private:
void update_button_state(bool b,int id) ;
@ -33,7 +34,7 @@ class GroupFlagsWidget: public QWidget
QLayout *_layout ;
QIcon *_icons[6] ;
uint32_t _flags[4] ;
FileStorageFlags _flags[4] ;
static QString _tooltips_on[4] ;
static QString _tooltips_off[4] ;