Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-12 00:00:44 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

removed CIRCLES-related dead code from friendlist

Browse source
This commit is contained in:
csoler 2019-06-20 22:07:08 +02:00
parent 805f753727
commit 6114d97c36
No known key found for this signature in database
GPG key ID: 7BCA522266C0804C
2 changed files with 1 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

8
retroshare-gui/src/gui/FriendsDialog.cpp
View file

@ -44,16 +44,12 @@
#include "NetworkView.h" #include "NetworkView.h"
#include "NetworkDialog.h" #include "NetworkDialog.h"
#include "gui/Identity/IdDialog.h" #include "gui/Identity/IdDialog.h"
#ifdef RS_USE_CIRCLES
#include "gui/Circles/CirclesDialog.h"
#endif
/* Images for Newsfeed icons */ /* Images for Newsfeed icons */
//#define IMAGE_NEWSFEED "" //#define IMAGE_NEWSFEED ""
//#define IMAGE_NEWSFEED_NEW ":/images/message-state-new.png" //#define IMAGE_NEWSFEED_NEW ":/images/message-state-new.png"
#define IMAGE_NETWORK2 ":/icons/png/netgraph.png" #define IMAGE_NETWORK2 ":/icons/png/netgraph.png"
#define IMAGE_PEERS ":/icons/png/keyring.png" #define IMAGE_PEERS ":/icons/png/keyring.png"
#define IMAGE_IDENTITY ":/images/identity/identities_32.png" #define IMAGE_IDENTITY ":/images/identity/identities_32.png"
//#define IMAGE_CIRCLES ":/icons/png/circles.png"
/****** /******
* #define FRIENDS_DEBUG 1 * #define FRIENDS_DEBUG 1
@ -192,10 +188,6 @@ void FriendsDialog::activatePage(FriendsDialog::Page page)
{ {
case FriendsDialog::IdTab: ui.tabWidget->setCurrentWidget(idDialog) ; case FriendsDialog::IdTab: ui.tabWidget->setCurrentWidget(idDialog) ;
break ; break ;
#ifdef RS_USE_CIRCLES
case FriendsDialog::CirclesTab: ui.tabWidget->setCurrentWidget(circlesDialog) ;
break ;
#endif
case FriendsDialog::NetworkTab: ui.tabWidget->setCurrentWidget(networkDialog) ; case FriendsDialog::NetworkTab: ui.tabWidget->setCurrentWidget(networkDialog) ;
break ; break ;
case FriendsDialog::BroadcastTab: ui.tabWidget->setCurrentWidget(networkDialog) ; case FriendsDialog::BroadcastTab: ui.tabWidget->setCurrentWidget(networkDialog) ;

7
retroshare-gui/src/gui/FriendsDialog.h
View file

@ -41,9 +41,7 @@ public:
enum Page { enum Page {
/* Fixed numbers for load and save the last page */ /* Fixed numbers for load and save the last page */
IdTab = 0, /** Identities page. */ IdTab = 0, /** Identities page. */
#ifdef RS_USE_CIRCLES // CirclesTab = 1, /** Circles page - DEPRECATED - please keep the numbering. */
CirclesTab = 1, /** Circles page. */
#endif
NetworkTab = 2, /** Network page. */ NetworkTab = 2, /** Network page. */
NetworkViewTab = 3, /** Network new graph. */ NetworkViewTab = 3, /** Network new graph. */
BroadcastTab = 4 /** Old group chat page. */ BroadcastTab = 4 /** Old group chat page. */
@ -71,9 +69,6 @@ public:
NetworkDialog *networkDialog ; NetworkDialog *networkDialog ;
NetworkView *networkView ; NetworkView *networkView ;
#ifdef RS_USE_CIRCLES
CirclesDialog *circlesDialog;
#endif
IdDialog *idDialog; IdDialog *idDialog;
protected: protected: