BIG deep clean

utils/system_daemon/daemon.cpp

@@ -6,7 +6,6 @@
 const char self_name[] = "__self__";
 extern PIScreen * screen;
 extern PISystemMonitor sys_mon;
-//bool Daemon::inited__ = false;
 
 Daemon::Remote::Remote(const PIString & n): PIThread() {
 	setName(n);
@@ -279,10 +278,6 @@ Daemon::Daemon(): PIPeer(pisd_prefix + PISystemInfo::instance()->hostname + "_"
 	dtimer.addDelimiter(5);
 	dtimer.start(200);
 	
-	//CONNECTU(&console, keyPressed, this, keyEvent)
-	//dir.setDir("/home/peri4/Documents");
-	//TileSimple * tl;
-	
 	tile_root = new PIScreenTile();
 	tile_root->direction = Vertical;
 	
@@ -406,13 +401,6 @@ void Daemon::showTile(PIScreenTile * t, const PIString & header) {
 	lock();
 	if (!conn_name.isEmpty())
 		tile_header->content[0].first.insert(0, PIString("Daemon \"") + connectedDaemon() + "\": ");
-	/*PIString s;
-	if (!conn_name.isEmpty())
-		s = "Daemon \"" + connectedDaemon() + "\": ";
-	s += header;
-	tile_header->content.resize(1);
-	tile_header->content[0].first = s;
-	tile_header->content[0].second.flags = Bold;*/
 	unlock();
 }
 
@@ -481,7 +469,6 @@ void Daemon::keyEvent(PIKbdListener::KeyEvent key) {
 
 void Daemon::fmKeyEvent(PIKbdListener::KeyEvent key) {
 	PIMutexLocker ml(remote_mutex);
-	//Remote * r = remotes.value(conn_name);
 //	piCoutObj << key.key << key.modifiers;
 	switch (key.key) {
 	case PIKbdListener::Return:
@@ -619,17 +606,11 @@ PIString Daemon::connectedDaemon() const {
 
 void Daemon::peerConnected(const PIString & p_name) {
 	while (!inited__) piMSleep(PIP_MIN_MSLEEP*5);
-//	PIMutexLocker ml(peers_mutex);
-	/*piCout << "connected" << name;
-	mode = 2;
-	conn_name = name;*/
 	if (!p_name.startsWith(pisd_prefix)) return;
 	Remote * r = new Remote(p_name);
 	piCoutObj << "peer connected" << p_name;
-//	piCout << r->methodsEH() << this->methodsEH();
 	CONNECTU(r, sendRequest, this, sendRequest)
 	CONNECTU(r, receiveFinished, this, filesReceived)
-	//CONNECTU(r, receiveFinished, this, closeFileDialog)
 	CONNECTU(r, sendFinished, this, filesSended)
 	CONNECTU(r, changeDirFinished, this, dirChanged)
 	PIMutexLocker ml2(remote_mutex);
@@ -661,9 +642,6 @@ void Daemon::filesReceived(const PIString & p_name, bool ok) {
 	} else {
 		piCout << "warning, files not received fromsended" << p_name;
 	}
-//	piCout << "try lock in filesReceived, now mutex is" << remote_mutex.isLocked();
-//	PIMutexLocker ml(remote_mutex);
-//	piCout << "lock reached";
 	closeFileDialog(p_name, ok);
 	Remote * r = remotes.value(p_name, 0);
 	if (!r) return;
@@ -710,22 +688,19 @@ void Daemon::closeFileDialog(const PIString & p_name, bool ok) {
 	//piCout << "file transfer with" << p_name << (ok ? "success" : "failure");
 	if (tile_file_progress->conn_name != p_name) return;
 	tile_file_progress->close(ok);
-//	if (ok) {
-		if (tile_file_progress->rec) {
-			fm.remoteTile()->setFocus();
-			fm.clearSelectionRemote();
-			fm.updateLocalDir();
-		} else {
-			fm.localTile()->setFocus();
-			fm.clearSelectionLocal();
-			requestChDir(".");
-		}
-//	}
+	if (tile_file_progress->rec) {
+		fm.remoteTile()->setFocus();
+		fm.clearSelectionRemote();
+		fm.updateLocalDir();
+	} else {
+		fm.localTile()->setFocus();
+		fm.clearSelectionLocal();
+		requestChDir(".");
+	}
 }
 
 
 void Daemon::dataReceived(const PIString & from, const PIByteArray & data) {
-	//if (conn_name != from) return;
 //	piCout << "rec" << data.size();
 	if (data.size() < 4) return;
 	PIMutexLocker ml(remote_mutex);
@@ -748,7 +723,6 @@ void Daemon::dataReceived(const PIString & from, const PIByteArray & data) {
 		//piCout << "store to" << r->dir_my.absolutePath();
 		piCoutObj << "cd to" << r->dir_my.absolutePath();
 		r->updateDir();
-//		sendDirToRemote(r);
 		break;
 	case ReplyHostInfo:
 		ba >> info_other;
@@ -760,7 +734,6 @@ void Daemon::dataReceived(const PIString & from, const PIByteArray & data) {
 		{
 		PIVector<PIFile::FileInfo> fil;
 		ba >> dir >> fil;
-//		r->dir_remote.setDir(dir);
 		fm.setRemoteDir(dir);
 		fm.setRemoteContent(fil);
 		fm.remoteRestoreDir();
@@ -784,7 +757,6 @@ void Daemon::dataReceived(const PIString & from, const PIByteArray & data) {
 		ba >> files;
 		//piCout << "send" << files << "from" << r->dir_my.absolutePath();
 		r->removeFiles(files);
-		//answer_dirs = true;
 		}
 		break;
 	case MkDir:
@@ -910,6 +882,4 @@ void Daemon::requestChDir(const PIString & d) {
 	PIByteArray ba;
 	ba << int(RequestChangeDir) << d;
 	send(conn_name, ba);
-//	bool ok = send(conn_name, ba);
-//	piCout << "request chdir" << d << conn_name << r << ok;
 }