From 3b6a746644a60d9589e09e7efbf5ec2c87025d15 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?= Date: Tue, 23 Aug 2016 17:31:29 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@238 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5 --- src/io/pifile.cpp | 2 +- src/io/piiodevice.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/io/pifile.cpp b/src/io/pifile.cpp index de80cf33..e1701ffc 100755 --- a/src/io/pifile.cpp +++ b/src/io/pifile.cpp @@ -339,7 +339,7 @@ char PIFile::readChar() { void PIFile::setPath(const PIString & path) { PIIODevice::setPath(path); - if (isOpened()) openDevice(); + if (isOpened()) open(); } diff --git a/src/io/piiodevice.h b/src/io/piiodevice.h index 16390f55..8ebb8135 100755 --- a/src/io/piiodevice.h +++ b/src/io/piiodevice.h @@ -285,7 +285,7 @@ protected: //! Reimplement to configure device from entries "e_main" and "e_parent", cast arguments to \a PIConfig::Entry* virtual bool configureDevice(const void * e_main, const void * e_parent = 0) {return true;} - //! Reimplement to open device, return value will be set to "opened_" variable + //! Reimplement to open device, return value will be set to "opened_" variable; don't call this function in subclass, use open() virtual bool openDevice() = 0; // use path_, type_, opened_, init_ variables //! Reimplement to close device, inverse return value will be set to "opened_" variable