diff --git a/piqt_utils/piconnedit/piconnedit_main.cpp b/piqt_utils/piconnedit/piconnedit_main.cpp index f8d3f70..d229c04 100644 --- a/piqt_utils/piconnedit/piconnedit_main.cpp +++ b/piqt_utils/piconnedit/piconnedit_main.cpp @@ -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) { diff --git a/piqt_utils/piintrospector/piintrospector.cpp b/piqt_utils/piintrospector/piintrospector.cpp index d28ad1a..1ee6ee0 100644 --- a/piqt_utils/piintrospector/piintrospector.cpp +++ b/piqt_utils/piintrospector/piintrospector.cpp @@ -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()); } diff --git a/piqt_utils/qpiconnection.cpp b/piqt_utils/qpiconnection.cpp index 2a6c3a5..190e224 100644 --- a/piqt_utils/qpiconnection.cpp +++ b/piqt_utils/qpiconnection.cpp @@ -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; } diff --git a/qad/CMakeLists.txt b/qad/CMakeLists.txt index f956892..a143c5d 100644 --- a/qad/CMakeLists.txt +++ b/qad/CMakeLists.txt @@ -2,9 +2,9 @@ cmake_minimum_required(VERSION 3.0) cmake_policy(SET CMP0017 NEW) # need include() with .cmake project(qad) set(_QAD_MAJOR 1) -set(_QAD_MINOR 0) +set(_QAD_MINOR 1) set(_QAD_REVISION 0) -set(_QAD_SUFFIX ) +set(_QAD_SUFFIX alpha) set(_QAD_COMPANY SHS) set(_QAD_DOMAIN org.SHS) diff --git a/qad/graphic/qpicalculator/mainwindow.cpp b/qad/graphic/qpicalculator/mainwindow.cpp index 3ebdf57..db6dd80 100644 --- a/qad/graphic/qpicalculator/mainwindow.cpp +++ b/qad/graphic/qpicalculator/mainwindow.cpp @@ -81,7 +81,7 @@ void MainWindow::redrawGraphics() { void MainWindow::loading(QPIConfig & conf) { active_ = false; - QStringList vars = conf.getValue("variables", QStringList()); + QStringList vars = conf.getValue("variables").toStringList(); int vc = vars.size() / 2; for (int i = 0; i < vc; ++i) { QTreeWidgetItem * ti = new QTreeWidgetItem(treeVariables); @@ -91,7 +91,8 @@ void MainWindow::loading(QPIConfig & conf) { treeVariables->addTopLevelItem(ti); } buttonVarClear->setEnabled(treeVariables->topLevelItemCount() > 0); - QByteArray ba = QString2QByteArray(conf.getValue("graphics")); QDataStream s(ba); + QByteArray ba = conf.getValue("graphics").toByteArray(); + QDataStream s(ba); QVector g; if (!ba.isEmpty()) s >> g; graphic->setAllGraphics(g); @@ -105,8 +106,8 @@ void MainWindow::loading(QPIConfig & conf) { treeGraphics->addTopLevelItem(ti); } buttonGraphicClear->setEnabled(treeGraphics->topLevelItemCount() > 0); - graphic->setVisualRect(conf.getValue("graphicRect", QRectF(-1., -1., 2., 2.))); - ba = conf.getValue("graphic_state", QByteArray()); + graphic->setVisualRect(conf.getValue("graphicRect", QRectF(-1., -1., 2., 2.)).toRectF()); + ba = conf.getValue("graphic_state").toByteArray(); if (!ba.isEmpty()) graphic->load(ba); on_tabWidget_currentChanged(0); diff --git a/qad/sql_table/sql_table_widget.cpp b/qad/sql_table/sql_table_widget.cpp index faede53..7aae643 100644 --- a/qad/sql_table/sql_table_widget.cpp +++ b/qad/sql_table/sql_table_widget.cpp @@ -989,15 +989,15 @@ bool SQLTableWidget::connectToDatabase(const QString & config, const QString & c if (!conf.isOpen()) ok = false; else { - QSqlDatabase base = QSqlDatabase::addDatabase(conf.getValue("driver", "QMYSQL").stringValue(), conn_name); + QSqlDatabase base = QSqlDatabase::addDatabase(conf.getValue("driver", "QMYSQL").toString(), conn_name); if (!base.isValid()) { qDebug() << "[QSqlDatabase::addDatabase] Error:" << base.lastError(); ok = false; } else { - base.setHostName(conf.getValue("host", "").stringValue()); - base.setPort(conf.getValue("port", -1)); - base.setDatabaseName(conf.getValue("database", "").stringValue()); - if (!base.open(conf.getValue("login", "").stringValue(), conf.getValue("password", "").stringValue())) { + base.setHostName(conf.getValue("host").toString()); + base.setPort(conf.getValue("port", -1).toInt()); + base.setDatabaseName(conf.getValue("database").toString()); + if (!base.open(conf.getValue("login").toString(), conf.getValue("password").toString())) { qDebug() << "[QSqlDatabase::open] Error:" << base.lastError(); ok = false; } diff --git a/qad/utils/qpiconfig.cpp b/qad/utils/qpiconfig.cpp index 52c474f..785b3cb 100644 --- a/qad/utils/qpiconfig.cpp +++ b/qad/utils/qpiconfig.cpp @@ -243,7 +243,6 @@ QPIConfig::QPIConfig(const QString & path, QIODevice::OpenMode mode, QPIConfig:: type = type_; if (!path.isEmpty()) { open(mode); - //stream.setDevice(this); parse(); } } @@ -254,7 +253,6 @@ QPIConfig::QPIConfig(const QString & path, QIODevice::OpenMode mode): QFile(path type = Config; if (!path.isEmpty()) { open(mode); - //stream.setDevice(this); parse(); } } @@ -265,7 +263,6 @@ QPIConfig::QPIConfig(const QString & path, QPIConfig::FileType type_): QFile(pat type = type_; if (!path.isEmpty()) { open(QIODevice::ReadWrite); - //stream.setDevice(this); parse(); } } @@ -275,7 +272,6 @@ QPIConfig::QPIConfig(QString * str, QPIConfig::FileType type_) { init(); type = type_; buffer = str; - //stream.setDevice(this); parse(); } @@ -565,7 +561,6 @@ void QPIConfig::removeEntry(Branch & b, QPIConfig::Entry * e) { if (e->isLeaf()) other.removeAt(e->_line); if (!e->isLeaf() && !e->_value.isEmpty()) { e->_value.clear(); - //leaf = false; } else { int cc = e->_children.size(); for (int i = 0; i < cc; ++i) @@ -598,14 +593,12 @@ void QPIConfig::writeAll() { buffer->clear(); } stream.seek(0); - //writeEntry(&root); buildFullNames(&root); Branch b = allLeaves(); QString prefix, tprefix; bool isPrefix; int j = 0; for (int i = 0; i < other.size(); ++i) { - //cout << j << endl; if (j >= 0 && j < b.size()) { if (b[j]->_line == i) { b[j]->buildLine(); @@ -657,12 +650,10 @@ QString QPIConfig::getPrefixFromLine(QString line, bool * exists) { QString QPIConfig::writeAllToString() { QString str; QTextStream s(&str); - //writeEntry(&root); buildFullNames(&root); Branch b = allLeaves(); int j = 0; for (int i = 0; i < other.size(); ++i) { - //cout << j << endl; if (j >= 0 && j < b.size()) { if (b[j]->_line == i) { b[j]->buildLine(); @@ -803,7 +794,6 @@ void QPIConfig::parse(QString content) { type = "s"; comm = ""; } - //name = str.left(ind).trimmed(); tree = (prefix + str.left(ind).trimmed()).split(delim); if (tree.front() == "include") { name = str.right(str.length() - ind - 1).trimmed(); @@ -815,7 +805,6 @@ void QPIConfig::parse(QString content) { includes << iconf << iconf->includes; updateIncludes(); } - //piCout << "includes" << includes; other.back() = src; } else { name = tree.back(); @@ -858,5 +847,4 @@ void QPIConfig::parse(QString content) { } setEntryDelim(&root, delim); buildFullNames(&root); - //if (content.isEmpty()) stream.setDevice(this); } diff --git a/qad/utils/qpiconfig.h b/qad/utils/qpiconfig.h index bac24b1..00ccd9c 100644 --- a/qad/utils/qpiconfig.h +++ b/qad/utils/qpiconfig.h @@ -88,8 +88,6 @@ public: bool isEntryExists(const QString & name) const {foreach (const Entry * i, *this) if (entryExists(i, name)) return true; return false;} int indexOf(const Entry * e) {for (int i = 0; i < size(); ++i) if (at(i) == e) return i; return -1;} - //void clear() {foreach (Entry * i, *this) delete i; QVector::clear();} - private: bool entryExists(const Entry * e, const QString & name) const; void allLeaves(Branch & b, Entry * e) {foreach (Entry * i, e->_children) {if (i->isLeaf()) b << i; else allLeaves(b, i);}} @@ -150,27 +148,26 @@ public: Branch getValues(const QString & vname); bool isEntryExists(const QString & name) const {return entryExists(this, name);} - const QString & stringValue() const {return _value;} - operator bool() {return (_value.toLower().trimmed() == "true" || _value.toLower().trimmed() == "yes" || _value.toLower().trimmed() == "on" || _value.toInt() > 0);} - operator char() {return (_value.isEmpty() ? 0 : _value[0].toLatin1());} - operator short() {return _value.toShort();} - operator int() {return QString2int(_value);} - operator long() {return QString2int(_value);} - operator uchar() {return QString2int(_value);} - operator ushort() {return QString2int(_value);} - operator uint() {return QString2int(_value);} - operator ulong() {return QString2int(_value);} - operator float() {return _value.toFloat();} - operator double() {return _value.toDouble();} - operator QString() {return _value;} - operator QStringList() {return _value.split("%|%");} - operator QColor() {return QString2QColor(_value);} - operator QRect() {return QString2QRect(_value);} - operator QRectF() {return QString2QRectF(_value);} - operator QPoint() {return QString2QPoint(_value);} - operator QPointF() {return QString2QPointF(_value);} - operator QByteArray() {return QString2QByteArray(_value);} + bool toBool() const {return (_value.toLower().trimmed() == "true" || _value.toLower().trimmed() == "yes" || _value.toLower().trimmed() == "on" || _value.toInt() > 0);} + char toChar() const {return (_value.isEmpty() ? 0 : _value[0].toLatin1());} + short toShort() const {return _value.toShort();} + int toInt() const {return QString2int(_value);} + long toLong() const {return QString2int(_value);} + uchar toUChar() const {return QString2int(_value);} + ushort toUShort() const {return QString2int(_value);} + uint toUInt() const {return QString2int(_value);} + ulong toULong() const {return QString2int(_value);} + float toFloat() const {return _value.toFloat();} + double toDouble() const {return _value.toDouble();} + QString toString() const {return _value;} + QStringList toStringList() const {return _value.split("%|%");} + QColor toColor() const {return QString2QColor(_value);} + QRect toRect() const {return QString2QRect(_value);} + QRectF toRectF() const {return QString2QRectF(_value);} + QPoint toPoint() const {return QString2QPoint(_value);} + QPointF toPointF() const {return QString2QPointF(_value);} + QByteArray toByteArray() const {return QString2QByteArray(_value);} private: static bool compare(const QPIConfig::Entry * f, const QPIConfig::Entry * s) {return f->_line < s->_line;} @@ -228,7 +225,7 @@ public: int entryIndex(const QString & name); QString getName(uint number) {return entryByIndex(number)._name;} - QString getValue(uint number) {return entryByIndex(number)._value;} + QString getValueByIndex(uint number) {return entryByIndex(number)._value;} QChar getType(uint number) {return entryByIndex(number)._type[0];} QString getComment(uint number) {return entryByIndex(number)._comment;} diff --git a/qad/widgets/session_manager.cpp b/qad/widgets/session_manager.cpp index d027c36..065bcdb 100644 --- a/qad/widgets/session_manager.cpp +++ b/qad/widgets/session_manager.cpp @@ -109,10 +109,9 @@ void SessionManager::save() { void restoreWindowState(QWidget * w, QPIConfig & sr, QString name) { - int wstate = (int)sr.getValue(name + " window state", 0); - QByteArray ba0 = sr.getValue(name + " geometry 0", QByteArray()); + int wstate = sr.getValue(name + " window state").toInt(); w->setWindowState(Qt::WindowNoState); - w->restoreGeometry(ba0); + w->restoreGeometry(sr.getValue(name + " geometry 0").toByteArray()); if (wstate == Qt::WindowMaximized) w->setWindowState((Qt::WindowState)wstate); bool wnd_ok = false; @@ -156,12 +155,12 @@ void SessionManager::load(bool onlyMainwindow) { for (int i = 0; i < mwindows.size(); ++i) { QMainWindow * mw = mwindows[i].second; tsc << mw; - QByteArray ba = sr.getValue(mwindows[i].first + " state", QByteArray()); + QByteArray ba = sr.getValue(mwindows[i].first + " state").toByteArray(); if (!ba.isEmpty()) mw->restoreState(ba); QList sp = mw->findChildren(); foreach (QSplitter * s, sp) { - ba = sr.getValue(mwindows[i].first + " splitter " + s->objectName(), QByteArray()); + ba = sr.getValue(mwindows[i].first + " splitter " + s->objectName()).toByteArray(); if (!ba.isEmpty()) s->restoreState(ba); } @@ -174,49 +173,49 @@ void SessionManager::load(bool onlyMainwindow) { } if (onlyMainwindow) return; for (int i = 0; i < checks.size(); ++i) - checks[i].second->setChecked(sr.getValue(checks[i].first, checks[i].second->isChecked())); + checks[i].second->setChecked(sr.getValue(checks[i].first, checks[i].second->isChecked()).toBool()); for (int i = 0; i < lines.size(); ++i) - lines[i].second->setText(sr.getValue(lines[i].first, lines[i].second->text())); + lines[i].second->setText(sr.getValue(lines[i].first, lines[i].second->text()).toString()); for (int i = 0; i < combos.size(); ++i) { QComboBox * c = combos[i].second; - int v = sr.getValue(combos[i].first, c->currentIndex()); + int v = sr.getValue(combos[i].first, c->currentIndex()).toInt(); if (v >= 0 && v < c->count()) c->setCurrentIndex(v); } for (int i = 0; i < dspins.size(); ++i) - dspins[i].second->setValue(sr.getValue(dspins[i].first, dspins[i].second->value())); + dspins[i].second->setValue(sr.getValue(dspins[i].first, dspins[i].second->value()).toDouble()); for (int i = 0; i < spins.size(); ++i) - spins[i].second->setValue(sr.getValue(spins[i].first, spins[i].second->value())); + spins[i].second->setValue(sr.getValue(spins[i].first, spins[i].second->value()).toInt()); for (int i = 0; i < spinsliders.size(); ++i) - spinsliders[i].second->setValue(sr.getValue(spinsliders[i].first, spinsliders[i].second->value())); + spinsliders[i].second->setValue(sr.getValue(spinsliders[i].first, spinsliders[i].second->value()).toDouble()); for (int i = 0; i < evals.size(); ++i) - evals[i].second->setExpression(sr.getValue(evals[i].first, evals[i].second->expression())); + evals[i].second->setExpression(sr.getValue(evals[i].first, evals[i].second->expression()).toString()); for (int i = 0; i < tabs.size(); ++i) { QTabWidget * t = tabs[i].second; - int v = sr.getValue(tabs[i].first, t->currentIndex()); + int v = sr.getValue(tabs[i].first, t->currentIndex()).toDouble(); if (v >= 0 && v < t->count()) t->setCurrentIndex(v); } for (int i = 0; i < groups.size(); ++i) - groups[i].second->setChecked(sr.getValue(groups[i].first, groups[i].second->isChecked())); + groups[i].second->setChecked(sr.getValue(groups[i].first, groups[i].second->isChecked()).toBool()); for (int i = 0; i < buttons.size(); ++i) - buttons[i].second->setChecked(sr.getValue(buttons[i].first, buttons[i].second->isChecked())); + buttons[i].second->setChecked(sr.getValue(buttons[i].first, buttons[i].second->isChecked()).toBool()); for (int i = 0; i < stacks.size(); ++i) - stacks[i].second->setCurrentIndex(qMin((int)sr.getValue(stacks[i].first, stacks[i].second->currentIndex()), stacks[i].second->count())); + stacks[i].second->setCurrentIndex(qMin(sr.getValue(stacks[i].first, stacks[i].second->currentIndex()).toBool(), stacks[i].second->count())); for (int i = 0; i < actions.size(); ++i) - actions[i].second->setChecked(sr.getValue(actions[i].first, actions[i].second->isChecked())); + actions[i].second->setChecked(sr.getValue(actions[i].first, actions[i].second->isChecked()).toBool()); for (int i = 0; i < stringlists.size(); ++i) - *stringlists[i].second = sr.getValue(stringlists[i].first, *stringlists[i].second); + *stringlists[i].second = sr.getValue(stringlists[i].first, *stringlists[i].second).toStringList(); for (int i = 0; i < strings.size(); ++i) - *strings[i].second = sr.getValue(strings[i].first, *strings[i].second).stringValue(); + *strings[i].second = sr.getValue(strings[i].first, *strings[i].second).toString(); for (int i = 0; i < colors.size(); ++i) - *colors[i].second = sr.getValue(colors[i].first, *colors[i].second); + *colors[i].second = sr.getValue(colors[i].first, *colors[i].second).toColor(); for (int i = 0; i < bools.size(); ++i) - *bools[i].second = sr.getValue(bools[i].first, *bools[i].second); + *bools[i].second = sr.getValue(bools[i].first, *bools[i].second).toBool(); for (int i = 0; i < ints.size(); ++i) - *ints[i].second = sr.getValue(ints[i].first, *ints[i].second); + *ints[i].second = sr.getValue(ints[i].first, *ints[i].second).toInt(); for (int i = 0; i < floats.size(); ++i) - *floats[i].second = sr.getValue(floats[i].first, *floats[i].second); + *floats[i].second = sr.getValue(floats[i].first, *floats[i].second).toFloat(); QSet all_list; foreach (QObject * c, tsc) { all_list |= QSet::fromList(c->findChildren()); @@ -227,7 +226,7 @@ void SessionManager::load(bool onlyMainwindow) { const QMetaObject * mo = o->metaObject(); QByteArray fn = funcs.value(mo); if (!mo || fn.isEmpty()) continue; - QByteArray value = sr.getValue(o->objectName(), QByteArray()); + QByteArray value = sr.getValue(o->objectName()).toByteArray(); //qDebug() << "load" << o->objectName(); mo->invokeMethod(o, fn.constData(), Q_ARG(QByteArray*, &value)); } diff --git a/qcd_utils/pult/cdpultwindow.cpp b/qcd_utils/pult/cdpultwindow.cpp index e4acefa..ce58fb3 100644 --- a/qcd_utils/pult/cdpultwindow.cpp +++ b/qcd_utils/pult/cdpultwindow.cpp @@ -126,25 +126,25 @@ bool CDPultWindow::load(const QString & path) { QPIConfig conf(path, QIODevice::ReadOnly); QAD::File f = editFileK->value().value(); checkSyncFiles->setChecked(false); - editFileK->setValue(QVariant::fromValue(QAD::File(conf.getValue("file_k").value(), f.filter))); - editFileX->setValue(QVariant::fromValue(QAD::File(conf.getValue("file_x").value(), f.filter))); - editFileC->setValue(QVariant::fromValue(QAD::File(conf.getValue("file_c").value(), f.filter))); - editFileM->setValue(QVariant::fromValue(QAD::File(conf.getValue("file_m").value(), f.filter))); - checkSyncFiles->setChecked(conf.getValue("sync_files")); - lineSessionName->setText(conf.getValue("session_name")); - last_icon = conf.getValue("icon_path", "").value(); - setAppIcon(conf.getValue("icon", QByteArray())); - checkHasK->setChecked(conf.getValue("has_k")); - checkHasX->setChecked(conf.getValue("has_x")); - checkHasC->setChecked(conf.getValue("has_c")); - checkHasM->setChecked(conf.getValue("has_m")); - checkDefaultConfig->setChecked(conf.getValue("default_config")); - codeConfig->setText(QByteArray2QString(conf.getValue("config", QByteArray()))); + editFileK->setValue(QVariant::fromValue(QAD::File(conf.getValue("file_k").toString(), f.filter))); + editFileX->setValue(QVariant::fromValue(QAD::File(conf.getValue("file_x").toString(), f.filter))); + editFileC->setValue(QVariant::fromValue(QAD::File(conf.getValue("file_c").toString(), f.filter))); + editFileM->setValue(QVariant::fromValue(QAD::File(conf.getValue("file_m").toString(), f.filter))); + checkSyncFiles->setChecked(conf.getValue("sync_files").toBool()); + lineSessionName->setText(conf.getValue("session_name").toString()); + last_icon = conf.getValue("icon_path").toString(); + setAppIcon(conf.getValue("icon").toByteArray()); + checkHasK->setChecked(conf.getValue("has_k").toBool()); + checkHasX->setChecked(conf.getValue("has_x").toBool()); + checkHasC->setChecked(conf.getValue("has_c").toBool()); + checkHasM->setChecked(conf.getValue("has_m").toBool()); + checkDefaultConfig->setChecked(conf.getValue("default_config").toBool()); + codeConfig->setText(QByteArray2QString(conf.getValue("config").toByteArray())); if (codeConfig->text().isEmpty()) codeConfig->setText(def_config); - session_gr = conf.getValue("session_gr", QByteArray()); - session_dk = conf.getValue("session_dk", QByteArray()); - session_mw = conf.getValue("session_mw", QByteArray()); + session_gr = conf.getValue("session_gr").toByteArray(); + session_dk = conf.getValue("session_dk").toByteArray(); + session_mw = conf.getValue("session_mw").toByteArray(); setChanged(false); file_name = path; apply(true); @@ -185,7 +185,7 @@ bool CDPultWindow::save(const QString & path) { void CDPultWindow::loadingSession(QPIConfig & conf) { - setRecentFiles(conf.getValue("recent files", QStringList())); + setRecentFiles(conf.getValue("recent files").toStringList()); }