From 6055c3083281872df56a9a3ed8b911af0c6c521a Mon Sep 17 00:00:00 2001
From: joss17 <joss17@users.sourceforge.net>
Date: Wed, 13 Jan 2010 21:03:36 +0000
Subject: [PATCH] code cleaning

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2006 b45a01b8-16f6-495d-af2f-9b41ad6348cc
---
 libretroshare/src/pqi/p3connmgr.cc     |  6 +---
 libretroshare/src/rsserver/rsinit.cc   |  2 --
 retroshare-gui/src/gui/StartDialog.cpp | 50 --------------------------
 3 files changed, 1 insertion(+), 57 deletions(-)

diff --git a/libretroshare/src/pqi/p3connmgr.cc b/libretroshare/src/pqi/p3connmgr.cc
index 4c2538e79..6829fbacb 100644
--- a/libretroshare/src/pqi/p3connmgr.cc
+++ b/libretroshare/src/pqi/p3connmgr.cc
@@ -282,8 +282,6 @@ void p3ConnectMgr::setOwnNetConfig(uint32_t netMode, uint32_t visState)
 
 void p3ConnectMgr::netReset()
 {
-
-	std::cerr << "p3ConnectMgr::netReset()" << std::endl;
 	//don't do a net reset if the MIN_TIME_BETWEEN_NET_RESET is not reached
 	time_t delta = time(NULL) - mNetInitTS;
 	#ifdef CONN_DEBUG
@@ -307,14 +305,12 @@ void p3ConnectMgr::netReset()
 	// Will initiate a new call for determining the external ip.
 	mExtAddrFinder->reset() ;
 
-	std::cerr << "p3ConnectMgr::netReset() reset NetStatus" << std::endl;
 	{
 		RsStackMutex stack(connMtx); /****** STACK LOCK MUTEX *******/
         	mNetStatus = RS_NET_UNKNOWN;
 		netStatusReset();
 	}
 
-	std::cerr << "p3ConnectMgr::netReset() checkNetAddress" << std::endl;
 	/* check Network Address */
 	checkNetAddress();
 
@@ -710,7 +706,7 @@ void p3ConnectMgr::networkConsistencyCheck()
         std::cerr << "p3ConnectMgr::networkConsistencyCheck() time since last reset : " << delta << std::endl;
 #endif
 
-	bool doNetReset = false;
+        bool doNetReset = false;
 	//if one of the flag is degrated from true to false during last tick, let's do a reset
 	#ifdef CONN_DEBUG
 		std::cerr << "p3ConnectMgr::networkConsistencyCheck() net flags : " << std::endl;
diff --git a/libretroshare/src/rsserver/rsinit.cc b/libretroshare/src/rsserver/rsinit.cc
index 92415e070..526ab396b 100644
--- a/libretroshare/src/rsserver/rsinit.cc
+++ b/libretroshare/src/rsserver/rsinit.cc
@@ -735,7 +735,6 @@ static bool checkAccount(std::string accountdir, accountId &id)
 	LoadCheckX509andGetName(cert_name.c_str(), id.sslName, id.sslId);
 	std::cerr << "sslName: " << id.sslName << " id: " << id.sslId << std::endl;
 
-    #ifndef PQI_USE_SSLONLY
 		std::string tmpid;
 		if (LoadCheckX509andGetIssuerName(cert_name.c_str(), id.pgpId, tmpid))
 		{
@@ -751,7 +750,6 @@ static bool checkAccount(std::string accountdir, accountId &id)
 			ret = false;
 		}
 
-    #endif
 	return ret;
 }
 
diff --git a/retroshare-gui/src/gui/StartDialog.cpp b/retroshare-gui/src/gui/StartDialog.cpp
index f2250687c..4642e5735 100644
--- a/retroshare-gui/src/gui/StartDialog.cpp
+++ b/retroshare-gui/src/gui/StartDialog.cpp
@@ -41,12 +41,6 @@ StartDialog::StartDialog(QWidget *parent, Qt::WFlags flags)
   /* Invoke Qt Designer generated QObject setup routine */
   ui.setupUi(this);
 
-/**
-#if (QT_VERSION >= 040300)
-  skinobject = new QSkinObject(this);
-  skinobject->startSkinning();
-#endif**/
-
   RshareSettings config;
   config.loadWidgetInformation(this);
  
@@ -71,8 +65,6 @@ StartDialog::StartDialog(QWidget *parent, Qt::WFlags flags)
   /* load the Certificate File name */
   std::string userName;
 
-#ifdef RS_USE_PGPSSL
-
 #ifndef WINDOWS_SYS /* UNIX */
 	//hide autologin because it's not functionnal on other than windows system
 	ui.autoBox->hide();
@@ -123,48 +115,6 @@ StartDialog::StartDialog(QWidget *parent, Qt::WFlags flags)
 	{
 		ui.loadName->setCurrentIndex(pidx);
 	}
-
-#if 0
-	std::list<std::string> pgpIds;
-	std::list<std::string>::iterator it;
-	if (RsInit::GetPGPLogins(pgpIds))
-	{
-		for(it = pgpIds.begin(); it != pgpIds.end(); it++)
-		{
-			const QVariant & userData = QVariant(QString::fromStdString(*it));
-			std::string name, email;
-			RsInit::GetPGPLoginDetails(*it, name, email);
-       			ui.loadName->addItem(QString::fromStdString(name), userData);
-		}
-	}
-#endif
-
-#else
-
-  if (RsInit::ValidateCertificate(userName))
-  {
-  	/* just need to enter password */
-        ui.loadName->addItem(QString::fromStdString(userName));
-	//ui.loadName->setText(QString::fromStdString(userName));
-	ui.loadPasswd->setFocus(Qt::OtherFocusReason);
-	ui.loadButton -> setEnabled(true);
-  }
-  else
-  {
-  	/* need to generate new user */
-        ui.loadName->addItem("<No Existing User>");
-	//ui.loadName->setText("<No Existing User>");
-	ui.loadButton -> setEnabled(false);
-	//ui.genName->setFocus(Qt::OtherFocusReason);
-  }
-#ifndef Q_WS_WIN
-	ui.autoBox->setChecked(false) ;
-	ui.autoBox->setEnabled(false) ;
-#endif
-#endif
-
-  //ui.genFriend -> setText("<None Selected>");
-
 }