remove operators in QPIConfig::Entry
git-svn-id: svn://db.shs.com.ru/libs@946 a8b55f48-bf90-11e4-a774-851b48703e85
This commit is contained in:
@@ -15,7 +15,7 @@ int main(int argc, char * argv[]) {
|
||||
ConnectionEdit w;
|
||||
if (a.arguments().size() > 1) {
|
||||
QPIConfig cfg(a.arguments()[1]);
|
||||
QByteArray model = cfg.getValue("connectionmodel", QByteArray());
|
||||
QByteArray model = cfg.getValue("connectionmodel").toByteArray();
|
||||
if (!model.isEmpty()) w.setModel(model);
|
||||
}
|
||||
if (w.exec() == QDialog::Accepted) {
|
||||
|
||||
@@ -70,7 +70,7 @@ void QPIIntrospector::savingSession(QPIConfig & conf) {
|
||||
|
||||
|
||||
void QPIIntrospector::loadingSession(QPIConfig & conf) {
|
||||
treeStat->header()->restoreState(conf.getValue("treeStat_header", QByteArray()));
|
||||
treeStat->header()->restoreState(conf.getValue("treeStat_header").toByteArray());
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -11,9 +11,8 @@ QPIConnection::QPIConnection(const QString & name): QObject(), PIConnection(Q2PI
|
||||
bool QPIConnection::loadFromCMFile(const QString & file) {
|
||||
QPIConfig f(file, QIODevice::ReadOnly);
|
||||
if (!f.isOpen()) return false;
|
||||
QByteArray cd = f.getValue("config", QByteArray());
|
||||
PIString cs = Q2PIString(QString::fromLatin1(cd));
|
||||
configureFromString(&cs, Q2PIString(f.getValue("name", "")));
|
||||
PIString cs = Q2PIString(QString::fromLatin1(f.getValue("config").toByteArray()));
|
||||
configureFromString(&cs, Q2PIString(f.getValue("name").toString()));
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user