mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-02-04 17:15:31 -05:00
removed CIRCLES-related dead code from friendlist
This commit is contained in:
parent
805f753727
commit
6114d97c36
@ -44,16 +44,12 @@
|
||||
#include "NetworkView.h"
|
||||
#include "NetworkDialog.h"
|
||||
#include "gui/Identity/IdDialog.h"
|
||||
#ifdef RS_USE_CIRCLES
|
||||
#include "gui/Circles/CirclesDialog.h"
|
||||
#endif
|
||||
/* Images for Newsfeed icons */
|
||||
//#define IMAGE_NEWSFEED ""
|
||||
//#define IMAGE_NEWSFEED_NEW ":/images/message-state-new.png"
|
||||
#define IMAGE_NETWORK2 ":/icons/png/netgraph.png"
|
||||
#define IMAGE_PEERS ":/icons/png/keyring.png"
|
||||
#define IMAGE_IDENTITY ":/images/identity/identities_32.png"
|
||||
//#define IMAGE_CIRCLES ":/icons/png/circles.png"
|
||||
|
||||
/******
|
||||
* #define FRIENDS_DEBUG 1
|
||||
@ -192,10 +188,6 @@ void FriendsDialog::activatePage(FriendsDialog::Page page)
|
||||
{
|
||||
case FriendsDialog::IdTab: ui.tabWidget->setCurrentWidget(idDialog) ;
|
||||
break ;
|
||||
#ifdef RS_USE_CIRCLES
|
||||
case FriendsDialog::CirclesTab: ui.tabWidget->setCurrentWidget(circlesDialog) ;
|
||||
break ;
|
||||
#endif
|
||||
case FriendsDialog::NetworkTab: ui.tabWidget->setCurrentWidget(networkDialog) ;
|
||||
break ;
|
||||
case FriendsDialog::BroadcastTab: ui.tabWidget->setCurrentWidget(networkDialog) ;
|
||||
|
@ -41,9 +41,7 @@ public:
|
||||
enum Page {
|
||||
/* Fixed numbers for load and save the last page */
|
||||
IdTab = 0, /** Identities page. */
|
||||
#ifdef RS_USE_CIRCLES
|
||||
CirclesTab = 1, /** Circles page. */
|
||||
#endif
|
||||
// CirclesTab = 1, /** Circles page - DEPRECATED - please keep the numbering. */
|
||||
NetworkTab = 2, /** Network page. */
|
||||
NetworkViewTab = 3, /** Network new graph. */
|
||||
BroadcastTab = 4 /** Old group chat page. */
|
||||
@ -71,9 +69,6 @@ public:
|
||||
NetworkDialog *networkDialog ;
|
||||
NetworkView *networkView ;
|
||||
|
||||
#ifdef RS_USE_CIRCLES
|
||||
CirclesDialog *circlesDialog;
|
||||
#endif
|
||||
IdDialog *idDialog;
|
||||
|
||||
protected:
|
||||
|
Loading…
x
Reference in New Issue
Block a user