From 39d35731a1fc0a7408ed8154bea35e829d900792 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=91=D1=8B=D1=87=D0=BA=D0=BE=D0=B2=20=D0=90=D0=BD=D0=B4?=
 =?UTF-8?q?=D1=80=D0=B5=D0=B9?= <andrey@signalmodelling.ru>
Date: Fri, 22 Dec 2017 14:49:04 +0000
Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@586
 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

---
 src_main/code/picodeparser.cpp       | 2 +-
 src_main/console/piscreenconsole.cpp | 2 +-
 src_main/console/piscreenconsole.h   | 4 ++--
 src_main/io/pibinarylog.h            | 8 ++++----
 src_main/io/piethernet.cpp           | 1 -
 src_main/io/piiomodule.h             | 3 ++-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src_main/code/picodeparser.cpp b/src_main/code/picodeparser.cpp
index fef6aa95..d78ba260 100755
--- a/src_main/code/picodeparser.cpp
+++ b/src_main/code/picodeparser.cpp
@@ -846,7 +846,7 @@ PIString PICodeParser::procMacros(PIString fc) {
 				nfc.clear();
 			} else {
 				if (!parseDirective(line.cutLeft(1).trim()))
-					;//return false; /// WARNING
+					;//return false; /// WARNING: now skip errors
 			}
 		} else {
 			if (grab) nfc << line << "\n";
diff --git a/src_main/console/piscreenconsole.cpp b/src_main/console/piscreenconsole.cpp
index 6092c502..c0bf9440 100644
--- a/src_main/console/piscreenconsole.cpp
+++ b/src_main/console/piscreenconsole.cpp
@@ -17,7 +17,7 @@ void TileVars::drawEvent(PIScreenDrawer *d) {
 }
 
 
-PIScreenConsole::PIScreenConsole() {
+PIScreenConsoleTile::PIScreenConsoleTile() {
 
 }
 
diff --git a/src_main/console/piscreenconsole.h b/src_main/console/piscreenconsole.h
index 1b424cac..2bb0ff81 100644
--- a/src_main/console/piscreenconsole.h
+++ b/src_main/console/piscreenconsole.h
@@ -68,10 +68,10 @@ protected:
 
 
 
-class PIScreenConsole : public PIScreenTile
+class PIScreenConsoleTile : public PIScreenTile
 {
 public:
-	PIScreenConsole();
+	PIScreenConsoleTile();
 };
 
 #endif // PISCREENCONSOLE_H
diff --git a/src_main/io/pibinarylog.h b/src_main/io/pibinarylog.h
index d8b47b66..836c2e52 100644
--- a/src_main/io/pibinarylog.h
+++ b/src_main/io/pibinarylog.h
@@ -31,7 +31,7 @@ static const uchar binlog_sig[] = {'B','I','N','L','O','G'};
 }
 #define PIBINARYLOG_SIGNATURE_SIZE sizeof(__S__PIBinaryLog::binlog_sig)
 
-/// TODO: Create static functions to split and join binlog files
+/// TODO: Create static functions to join binlog files
 /// TODO: Create functions to insert and delete records
 class PIBinaryLog: public PIIODevice
 {
@@ -223,7 +223,7 @@ public:
 	BinLogInfo logInfo() const {if (is_indexed) return binfo; return getLogInfo(path());}
 
 	//! Get binlog index \a BinLogIndex, need \a createIndex before getting index
-	const PIVector<BinLogIndex> & logIndex() const {return index;} /// TODO: Think about index positions
+	const PIVector<BinLogIndex> & logIndex() const {return index;}
 	
 	//! Create index of current binlog file
 	bool createIndex();
@@ -238,7 +238,7 @@ public:
 	bool seek(llong filepos);
 
 	//! Get current record index (position record in file)
-	int pos() const {if (is_indexed) return current_index; return -1;} /// TODO: Think about index positions
+	int pos() const {if (is_indexed) return current_index; return -1;}
 
 	//! \handlers
 	//! \{
@@ -266,7 +266,7 @@ public:
 	EVENT(fileEnd)
 	EVENT(fileError)
 	EVENT1(newFile, const PIString &, filename)
-	EVENT1(posChanged, int, pos) /// TODO: Think about index positions
+	EVENT1(posChanged, int, pos)
 
 	//! Get binlog info and statistic
 	static BinLogInfo getLogInfo(const PIString & path);
diff --git a/src_main/io/piethernet.cpp b/src_main/io/piethernet.cpp
index 63f54976..1e601b55 100755
--- a/src_main/io/piethernet.cpp
+++ b/src_main/io/piethernet.cpp
@@ -526,7 +526,6 @@ bool PIEthernet::leaveMulticastGroup(const PIString & group) {
 		return false;
 	}
 	PIFlags<Parameters> params = parameters();
-	/// TODO windows
 	addr_r.set(path());
 	struct ip_mreqn mreq;
 	memset(&mreq, 0, sizeof(mreq));
diff --git a/src_main/io/piiomodule.h b/src_main/io/piiomodule.h
index 986fd870..3d4332c6 100644
--- a/src_main/io/piiomodule.h
+++ b/src_main/io/piiomodule.h
@@ -29,13 +29,14 @@
 #include "pidir.h"
 #include "pibinarylog.h"
 #include "pifiletransfer.h"
+#include "pidatatransfer.h"
 #include "piiostring.h"
 #include "piiobytearray.h"
 #include "pitransparentdevice.h"
 #include "pipeer.h"
 #include "pipacketextractor.h"
-#include "piprotocol.h"
 #include "piconnection.h"
 #include "pisharedmemory.h"
+#include "pispi.h"
 
 #endif // PIIOMODULE_H