- Removed not used function RsDirUtil::createBackup.

- Moved ProfileView and ProfileEdit to the folder unfinished.
- Removed "location:" before the ssl name in FriendsDialog and MessengerWindow.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4567 b45a01b8-16f6-495d-af2f-9b41ad6348cc

libretroshare/src/util/rsdir.cc

@@ -675,6 +675,8 @@ bool RsDirUtil::renameFile(const std::string& from, const std::string& to)
 	return true ;
 }
 
+#ifdef UNUSED_CODE
+// not used
 bool RsDirUtil::createBackup (const std::string& sFilename, unsigned int nCount)
 {
 #ifdef WINDOWS_SYS
@@ -732,6 +734,7 @@ bool RsDirUtil::createBackup (const std::string& sFilename, unsigned int nCount)
 #endif
     return true;
 }
+#endif
 
 FILE *RsDirUtil::rs_fopen(const char* filename, const char* mode)
 {

libretroshare/src/util/rsdir.h

@@ -46,7 +46,7 @@ std::string 	removeRootDirs(const std::string& path, const std::string& root);
 // Renames file from to file to. Files should be on the same file system.
 //	returns true if succeed, false otherwise.
 bool		renameFile(const std::string& from,const std::string& to) ;
-bool		createBackup (const std::string& sFilename, unsigned int nCount = 5);
+//bool		createBackup (const std::string& sFilename, unsigned int nCount = 5);
 
 // returns the CRC32 of the data of length len
 //

retroshare-gui/src/RetroShare.pro

@@ -257,8 +257,6 @@ HEADERS +=  rshare.h \
             util/log.h \
             util/misc.h \
             gui/bwgraph/bwgraph.h \
-            gui/profile/ProfileView.h \
-            gui/profile/ProfileEdit.h \
             gui/profile/ProfileWidget.h \
             gui/profile/StatusMessage.h \
             gui/chat/PopupChatWindow.h \
@@ -383,8 +381,6 @@ FORMS +=    gui/StartDialog.ui \
             gui/InfoDialog.ui \
             gui/DetailsDialog.ui \
             gui/bwgraph/bwgraph.ui \
-            gui/profile/ProfileView.ui \
-            gui/profile/ProfileEdit.ui \
             gui/profile/ProfileWidget.ui \
             gui/profile/StatusMessage.ui \
             gui/channels/CreateChannel.ui \
@@ -508,8 +504,6 @@ SOURCES +=  main.cpp \
             util/log.cpp \
             util/misc.cpp \
             gui/bwgraph/bwgraph.cpp \
-            gui/profile/ProfileView.cpp \
-            gui/profile/ProfileEdit.cpp \
             gui/profile/ProfileWidget.cpp \
             gui/profile/StatusMessage.cpp \
             gui/channels/CreateChannel.cpp \
@@ -701,8 +695,9 @@ HEADERS += gui/unfinished/ApplicationWindow.h \
            gui/unfinished/GamesDialog.h \
            gui/unfinished/PhotoDialog.h \
            gui/unfinished/PhotoShow.h \
-           gui/unfinished/StatisticDialog.h
-
+           gui/unfinished/StatisticDialog.h \
+           gui/unfinished/profile/ProfileView.h \
+           gui/unfinished/profile/ProfileEdit.h
 
 FORMS += gui/unfinished/ApplicationWindow.ui \
          gui/unfinished/CalDialog.ui \
@@ -710,7 +705,9 @@ FORMS += gui/unfinished/ApplicationWindow.ui \
          gui/unfinished/GamesDialog.ui \
          gui/unfinished/PhotoDialog.ui \
          gui/unfinished/PhotoShow.ui \
-         gui/unfinished/StatisticDialog.ui
+         gui/unfinished/StatisticDialog.ui \
+         gui/unfinished/profile/ProfileView.ui \
+         gui/unfinished/profile/ProfileEdit.ui
 
 SOURCES += gui/unfinished/ApplicationWindow.cpp \
            gui/unfinished/CalDialog.cpp \
@@ -718,7 +715,9 @@ SOURCES += gui/unfinished/ApplicationWindow.cpp \
            gui/unfinished/GamesDialog.cpp \
            gui/unfinished/PhotoDialog.cpp \
            gui/unfinished/PhotoShow.cpp \
-           gui/unfinished/StatisticDialog.cpp
+           gui/unfinished/StatisticDialog.cpp \
+           gui/unfinished/profile/ProfileView.cpp \
+           gui/unfinished/profile/ProfileEdit.cpp
 
           DEFINES *= UNFINISHED
 }

retroshare-gui/src/gui/FriendsDialog.cpp

@@ -47,7 +47,9 @@
 #include "chat/PopupChatDialog.h"
 #include "msgs/MessageComposer.h"
 #include "connect/ConfCertDialog.h"
-#include "profile/ProfileView.h"
+#ifdef UNFINISHED
+#include "unfinished/profile/ProfileView.h"
+#endif
 #include "profile/ProfileWidget.h"
 #include "profile/StatusMessage.h"
 
@@ -912,7 +914,7 @@ void  FriendsDialog::insertPeers()
                 if (sslDetail.state & RS_PEER_STATE_CONNECTED) {
                     customStateString = QString::fromUtf8(rsMsgs->getCustomStateString(sslDetail.id).c_str());
                 }
-                sText = tr("location") + " : " + QString::fromUtf8(sslDetail.location.c_str());
+                sText = QString::fromUtf8(sslDetail.location.c_str());
                 if (customStateString.isEmpty() == false) {
                     sText += " - " + customStateString;
                 }
@@ -1763,6 +1765,7 @@ void FriendsDialog::addSmileys()
     ui.lineEdit->textCursor().insertText(qobject_cast<QPushButton*>(sender())->toolTip().split("|").first());
 }
 
+#ifdef UNFINISHED
 /* GUI stuff -> don't do anything directly with Control */
 void FriendsDialog::viewprofile()
 {
@@ -1771,7 +1774,7 @@ void FriendsDialog::viewprofile()
 	QTreeWidgetItem *c = getCurrentPeer();
 
 
-	static ProfileView *profileview = new ProfileView();
+//	static ProfileView *profileview = new ProfileView();
 
 
 	if (!c)
@@ -1783,6 +1786,7 @@ void FriendsDialog::viewprofile()
 	profileview -> setPeerId(id);
 	profileview -> show();
 }
+#endif
 
 void FriendsDialog::updateAvatar()
 {

retroshare-gui/src/gui/FriendsDialog.h

@@ -131,7 +131,9 @@ private slots:
     void removeGroup();
 
     void configurefriend();
+#ifdef UNFINISHED
     void viewprofile();
+#endif
 
     /** RsServer Friend Calls */
     void connectfriend();
@@ -221,4 +223,4 @@ private:
 
 #endif // MINIMAL_RSGUI
 
-#endif
+#endif

retroshare-gui/src/gui/MessengerWindow.cpp

@@ -572,10 +572,10 @@ void  MessengerWindow::insertPeers()
             }
 #endif // MINIMAL_RSGUI
             if (sCustomString.isEmpty()) {
-                sslItem -> setText( COLUMN_NAME, tr("location") + " : " + QString::fromUtf8(sslDetail.location.c_str()) + " " + StatusDefs::connectStateString(sslDetail));
+                sslItem -> setText( COLUMN_NAME, QString::fromUtf8(sslDetail.location.c_str()) + " " + StatusDefs::connectStateString(sslDetail));
                 sslItem -> setToolTip( COLUMN_NAME, tr("location") + " : " + QString::fromUtf8(sslDetail.location.c_str()));
             } else {
-                sslItem -> setText( COLUMN_NAME, tr("location") + " : " + QString::fromUtf8(sslDetail.location.c_str()) + " " + StatusDefs::connectStateString(sslDetail));
+                sslItem -> setText( COLUMN_NAME, QString::fromUtf8(sslDetail.location.c_str()) + " " + StatusDefs::connectStateString(sslDetail));
                 sslItem -> setToolTip( COLUMN_NAME, tr("location") + " : " + QString::fromUtf8(sslDetail.location.c_str()) + " - " + sCustomString);
 
                 /* store custom state string */