From: <ibr...@us...> - 2014-03-03 17:58:34
|
Revision: 5089 http://sourceforge.net/p/tora/code/5089 Author: ibre5041 Date: 2014-03-03 17:58:29 +0000 (Mon, 03 Mar 2014) Log Message: ----------- few steps towards to new config system Modified Paths: -------------- trunk/tora/src/connection/tooracleextract.cpp trunk/tora/src/connection/tooraclesetting.cpp trunk/tora/src/connection/tooraclesetting.h trunk/tora/src/core/toconfiguration.cpp trunk/tora/src/core/toconfiguration.h trunk/tora/src/core/toconfiguration_new.h trunk/tora/src/core/toconfigurationpriv.cpp trunk/tora/src/core/toconfigurationpriv.h trunk/tora/src/core/todatabasesetting.cpp trunk/tora/src/core/toglobalsetting.cpp trunk/tora/src/core/toglobalsetting.h trunk/tora/src/core/tomainwindow.cpp trunk/tora/src/core/tomainwindow.h trunk/tora/src/core/tonewconnection.cpp trunk/tora/src/core/topreferences.cpp trunk/tora/src/core/toresultplan.cpp trunk/tora/src/core/totool.cpp trunk/tora/src/tools/toanalyze.cpp trunk/tora/src/tools/tosgastatement.cpp trunk/tora/src/tools/tostorage.cpp Modified: trunk/tora/src/connection/tooracleextract.cpp =================================================================== --- trunk/tora/src/connection/tooracleextract.cpp 2014-03-01 23:31:18 UTC (rev 5088) +++ trunk/tora/src/connection/tooracleextract.cpp 2014-03-03 17:58:29 UTC (rev 5089) @@ -4837,7 +4837,7 @@ toQColumnDescriptionList desc = query.describe(); int cols = query.columns(); bool first = true; - QString dateformat(toConfigurationSingle::Instance().dateFormat()); + QString dateformat(toConfigurationNewSingle::Instance().option(ToConfiguration::Oracle::ConfDateFormat).toString()); QString beg = QString("INSERT INTO %1%2 (").arg(schema).arg(QUOTE(name)); bool *dates = new bool[desc.size()]; Modified: trunk/tora/src/connection/tooraclesetting.cpp =================================================================== --- trunk/tora/src/connection/tooraclesetting.cpp 2014-03-01 23:31:18 UTC (rev 5088) +++ trunk/tora/src/connection/tooraclesetting.cpp 2014-03-03 17:58:29 UTC (rev 5089) @@ -66,21 +66,33 @@ } } +QString ToConfiguration::Oracle::planTable(QString const& schema) +{ + bool sharedPlan = toConfigurationNewSingle::Instance().option(SharedPlan).toBool(); + QString planTable = toConfigurationNewSingle::Instance().option(PlanTable).toString(); + + if(sharedPlan || planTable.contains('.') || schema.isNull()) + return PlanTable; + + return schema + '.' + planTable; +} + toOracleSetting::toOracleSetting(QWidget *parent) : QWidget(parent) , toSettingTab("database.html#oracle") { setupUi(this); - DefaultDate->setText(toConfigurationSingle::Instance().dateFormat()); - DefaultTimestamp->setText(toConfigurationSingle::Instance().timestampFormat()); + //DefaultDate->setText(toConfigurationSingle::Instance().dateFormat()); + //DefaultTimestamp->setText(toConfigurationSingle::Instance().timestampFormat()); //CheckPoint->setText(toConfigurationSingle::Instance().planCheckpoint()); - ExplainPlan->setText(toConfigurationSingle::Instance().planTable(NULL)); + //ExplainPlan->setText(toConfigurationSingle::Instance().planTable(NULL)); //OpenCursors->setValue(toConfigurationSingle::Instance().openCursors()); //KeepPlans->setChecked(toConfigurationSingle::Instance().keepPlans()); //VsqlPlans->setChecked(toConfigurationSingle::Instance().vsqlPlans()); //SharedPlan->setChecked(toConfigurationSingle::Instance().sharedPlan()); - int len = toConfigurationSingle::Instance().maxLong(); + //int len = toConfigurationSingle::Instance().maxLong(); + int len = toConfigurationNewSingle::Instance().option(ToConfiguration::Oracle::MaxLong).toInt(); if (len >= 0) { MaxLong->setText(QString::number(len)); Modified: trunk/tora/src/connection/tooraclesetting.h =================================================================== --- trunk/tora/src/connection/tooraclesetting.h 2014-03-01 23:31:18 UTC (rev 5088) +++ trunk/tora/src/connection/tooraclesetting.h 2014-03-03 17:58:29 UTC (rev 5089) @@ -71,6 +71,7 @@ , IncludePrompt // #define CONF_EXT_INC_PROMPT }; virtual QVariant defaultValue(int option) const; + static QString planTable(QString const& schema); }; }; Modified: trunk/tora/src/core/toconfiguration.cpp =================================================================== --- trunk/tora/src/core/toconfiguration.cpp 2014-03-01 23:31:18 UTC (rev 5088) +++ trunk/tora/src/core/toconfiguration.cpp 2014-03-03 17:58:29 UTC (rev 5089) @@ -874,16 +874,16 @@ d->m_recentFiles = v; } // tools -ToolsMap& toConfiguration::tools() -{ - Q_D(toConfiguration); - return d->m_tools; -} -void toConfiguration::setTools(ToolsMap &v) -{ - Q_D(toConfiguration); - d->m_tools = v; -} +//ToolsMap& toConfiguration::tools() +//{ +// Q_D(toConfiguration); +// return d->m_tools; +//} +//void toConfiguration::setTools(ToolsMap &v) +//{ +// Q_D(toConfiguration); +// d->m_tools = v; +//} // toresultlistformat //QString toConfiguration::csvSeparator() Modified: trunk/tora/src/core/toconfiguration.h =================================================================== --- trunk/tora/src/core/toconfiguration.h 2014-03-01 23:31:18 UTC (rev 5088) +++ trunk/tora/src/core/toconfiguration.h 2014-03-03 17:58:29 UTC (rev 5089) @@ -11,7 +11,6 @@ #include <QtCore/QVariant> #include <QtGui/QApplication> -typedef QMap<QString, bool> ToolsMap; typedef QMap<QString, QString> HelpsMap; typedef QMapIterator<QString, QString> HelpsMapIterator; typedef QMap<QString, QString> ChartsMap; @@ -367,8 +366,8 @@ QByteArray rightDockbarState(); // tools - ToolsMap& tools(); - void setTools(ToolsMap &v); +// ToolsMap& tools(); +// void setTools(ToolsMap &v); // toresultlistformat //QString csvSeparator(); Modified: trunk/tora/src/core/toconfiguration_new.h =================================================================== --- trunk/tora/src/core/toconfiguration_new.h 2014-03-01 23:31:18 UTC (rev 5088) +++ trunk/tora/src/core/toconfiguration_new.h 2014-03-03 17:58:29 UTC (rev 5089) @@ -31,7 +31,7 @@ QVariant option(int option); QVariant option(QString const& option); - template <class T> void setOption(int option, T const&); + template <class T> void setOption(int option, T const&) {}; /*! \brief Set the QSettings access strings. QSettings uses these. It's used in the main.cpp before Modified: trunk/tora/src/core/toconfigurationpriv.cpp =================================================================== --- trunk/tora/src/core/toconfigurationpriv.cpp 2014-03-01 23:31:18 UTC (rev 5088) +++ trunk/tora/src/core/toconfigurationpriv.cpp 2014-03-03 17:58:29 UTC (rev 5089) @@ -190,7 +190,7 @@ for (int i = 0; i < cnt; ++i) { s.setArrayIndex(i); - m_tools[s.value("ToolName").toString()] = s.value("Enabled").toBool(); + //m_tools[s.value("ToolName").toString()] = s.value("Enabled").toBool(); } s.endArray(); // toresultlistformat @@ -472,13 +472,13 @@ // tools s.beginWriteArray(CONF_TOOLS); - for (int i = 0; i < m_tools.count(); ++i) - { - s.setArrayIndex(i); - key = m_tools.keys().at(i); - s.setValue("ToolName", key); - s.setValue("Enabled", m_tools[key]); - } + //for (int i = 0; i < m_tools.count(); ++i) + //{ + // s.setArrayIndex(i); + // key = m_tools.keys().at(i); + // s.setValue("ToolName", key); + // s.setValue("Enabled", m_tools[key]); + //} s.endArray(); // toresultlistformat Modified: trunk/tora/src/core/toconfigurationpriv.h =================================================================== --- trunk/tora/src/core/toconfigurationpriv.h 2014-03-01 23:31:18 UTC (rev 5088) +++ trunk/tora/src/core/toconfigurationpriv.h 2014-03-03 17:58:29 UTC (rev 5089) @@ -142,7 +142,7 @@ QByteArray m_mainWindowState; // tools - ToolsMap m_tools; + //ToolsMap m_tools; QString m_defaultTool; // toresultlistformat Modified: trunk/tora/src/core/todatabasesetting.cpp =================================================================== --- trunk/tora/src/core/todatabasesetting.cpp 2014-03-01 23:31:18 UTC (rev 5088) +++ trunk/tora/src/core/todatabasesetting.cpp 2014-03-03 17:58:29 UTC (rev 5089) @@ -40,6 +40,7 @@ #include "core/tomainwindow.h" #include "core/tocache.h" #include "core/toqvalue.h" +#include "core/toconnection.h" #include <QtGui/QColorDialog> #include <QtCore/QString> Modified: trunk/tora/src/core/toglobalsetting.cpp =================================================================== --- trunk/tora/src/core/toglobalsetting.cpp 2014-03-01 23:31:18 UTC (rev 5088) +++ trunk/tora/src/core/toglobalsetting.cpp 2014-03-03 17:58:29 UTC (rev 5089) @@ -40,6 +40,7 @@ #include "core/tomainwindow.h" #include "core/tocache.h" #include "core/toqvalue.h" +#include "ts_log/ts_log_utils.h" #include <QtGui/QColorDialog> #include <QtCore/QString> @@ -102,6 +103,9 @@ case DefaultListFormat: return QVariant((int)0); case Style: return QVariant(QString("")); case Translation: return QVariant(QLocale().name()); + default: + Q_ASSERT_X( false, qPrintable(__QHERE__), qPrintable(QString("Context Editor un-registered enum value: %1").arg(option))); + return QVariant(); } }; @@ -111,11 +115,12 @@ { setupUi(this); - ConnectionColorsIterator it(toConfigurationNewSingle::Instance().option(ToConfiguration::Global::ColorizedConnectionsMap).toMap().begin()); + const QMap<QString, QVariant> ColorsMap(toConfigurationNewSingle::Instance().option(ToConfiguration::Global::ColorizedConnectionsMap).toMap()); + QMapIterator<QString, QVariant> it(ColorsMap); while (it.hasNext()) { it.next(); - newItem(it.key(), it.value()); + newItem(it.key(), it.value().toString()); } treeWidget->hideColumn(2); @@ -413,7 +418,8 @@ setupUi(this); Enabled->setSorting(0); - ToolsMap tMap(toConfigurationSingle::Instance().tools()); + QMap<QString, QVariant> tMap = toConfigurationNewSingle::Instance().option(ToConfiguration::Main::ToolsMap).toMap(); + // loop over all registered tool names and check if they are enabled for (ToolsRegistrySing::ObjectType::iterator i = ToolsRegistrySing::Instance().begin(); i != ToolsRegistrySing::Instance().end(); ++i) @@ -427,11 +433,11 @@ menuName, pTool->name(), i.key()); - item->setSelected(tMap[i.key()]); + item->setSelected(tMap[i.key()].toBool()); } } - // set the default tool to prevent overvritting when + // set the default tool to prevent overwriting when // user does not change this combo box QString defName(toConfigurationNewSingle::Instance().option(ToConfiguration::Main::DefaultTool).toString()); int currIx = -1; @@ -467,17 +473,14 @@ void toToolSetting::saveSetting(void) { - ToolsMap tMap(toConfigurationSingle::Instance().tools()); + QMap<QString, QVariant> tMap = toConfigurationNewSingle::Instance().option(ToConfiguration::Main::ToolsMap).toMap(); for (QTreeWidgetItemIterator it(Enabled); (*it); it++) { tMap[(*it)->text(2)] = (*it)->isSelected(); - /* QString str = (*it)->text(2).toLatin1(); - str += CONF_TOOL_ENABLE; - toConfigurationNewSingle::Instance().option(ToConfiguration::Global::globalSetConfig(str, (*it)->isSelected() ? "Yes" : ""); - */ if (DefaultTool->currentText() == (*it)->text(0)) toConfigurationNewSingle::Instance().setOption(ToConfiguration::Main::DefaultTool, (*it)->text(2)); } - toConfigurationSingle::Instance().setTools(tMap); + //toSettingTab::saveSettings(this); + toConfigurationNewSingle::Instance().setOption(ToConfiguration::Main::ToolsMap, tMap); } Modified: trunk/tora/src/core/toglobalsetting.h =================================================================== --- trunk/tora/src/core/toglobalsetting.h 2014-03-01 23:31:18 UTC (rev 5088) +++ trunk/tora/src/core/toglobalsetting.h 2014-03-03 17:58:29 UTC (rev 5089) @@ -43,7 +43,6 @@ #include "ui_connectioncolorsdialogui.h" typedef QMap<QString, QString> ConnectionColors; -typedef QMapIterator<QString, QString> ConnectionColorsIterator; class ConnectionColorsDialog : public QDialog, public Ui::ConnectionColorsDialog { Modified: trunk/tora/src/core/tomainwindow.cpp =================================================================== --- trunk/tora/src/core/tomainwindow.cpp 2014-03-01 23:31:18 UTC (rev 5088) +++ trunk/tora/src/core/tomainwindow.cpp 2014-03-03 17:58:29 UTC (rev 5089) @@ -33,6 +33,7 @@ * END_COMMON_COPYRIGHT_HEADER */ #include "core/tomainwindow.h" +#include "core/totool.h" #include "ts_log/ts_log_utils.h" #include <QtGui/QApplication> @@ -54,6 +55,22 @@ case StatusSave: return QVariant((int)10); case DontReread: return QVariant((bool)true); case EditDragDrop: return QVariant((bool)false); + case ToolsMap: + { + // by default all the tools (having menu item name) are enabled + QMap<QString, QVariant> retval; + for (ToolsRegistrySing::ObjectType::iterator i = ToolsRegistrySing::Instance().begin(); + i != ToolsRegistrySing::Instance().end(); + ++i) + { + toTool *pTool = i.value(); + if (pTool && pTool->menuItem()) + { + retval[i.key()] = QVariant((bool)true); + } + } + return retval; + } default: Q_ASSERT_X( false, qPrintable(__QHERE__), qPrintable(QString("Context Editor un-registered enum value: %1").arg(option))); return QVariant(); Modified: trunk/tora/src/core/tomainwindow.h =================================================================== --- trunk/tora/src/core/tomainwindow.h 2014-03-01 23:31:18 UTC (rev 5088) +++ trunk/tora/src/core/tomainwindow.h 2014-03-03 17:58:29 UTC (rev 5089) @@ -63,6 +63,7 @@ , StatusSave // #define CONF_STATUS_SAVE (Message history size) , DontReread // #define CONF_DONT_REREAD , EditDragDrop // #define CONF_EDIT_DRAG_DROP (toScintilla) + , ToolsMap }; virtual QVariant defaultValue(int option) const; }; Modified: trunk/tora/src/core/tonewconnection.cpp =================================================================== --- trunk/tora/src/core/tonewconnection.cpp 2014-03-01 23:31:18 UTC (rev 5088) +++ trunk/tora/src/core/tonewconnection.cpp 2014-03-03 17:58:29 UTC (rev 5089) @@ -68,11 +68,12 @@ setupUi(this); colorComboBox->addItem("None", ""); - ConnectionColorsIterator it(toConfigurationSingle::Instance().connectionColors()); + const QMap<QString, QVariant> ColorsMap(toConfigurationNewSingle::Instance().option(ToConfiguration::Global::ColorizedConnectionsMap).toMap()); + QMapIterator<QString, QVariant> it(ColorsMap); while (it.hasNext()) { it.next(); - colorComboBox->addItem(Utils::connectionColorPixmap(it.key()), it.value(), it.key()); + colorComboBox->addItem(Utils::connectionColorPixmap(it.key()), it.value().toString(), it.key()); } toHelp::connectDialog(this); Modified: trunk/tora/src/core/topreferences.cpp =================================================================== --- trunk/tora/src/core/topreferences.cpp 2014-03-01 23:31:18 UTC (rev 5088) +++ trunk/tora/src/core/topreferences.cpp 2014-03-03 17:58:29 UTC (rev 5089) @@ -34,6 +34,7 @@ #include "core/topreferences.h" #include "core/toglobalsetting.h" +#include "core/todatabasesetting.h" #include "core/toconfiguration.h" #include "core/toconnectionprovider.h" #include "core/tomainwindow.h" Modified: trunk/tora/src/core/toresultplan.cpp =================================================================== --- trunk/tora/src/core/toresultplan.cpp 2014-03-01 23:31:18 UTC (rev 5088) +++ trunk/tora/src/core/toresultplan.cpp 2014-03-03 17:58:29 UTC (rev 5089) @@ -36,7 +36,8 @@ #include "core/utils.h" #include "core/toeventquery.h" #include "core/toresultcombo.h" -#include "core/toconfiguration.h" +#include "core/toconfiguration_new.h" +#include "connection/tooraclesetting.h" //#include "core/tosqlparse.h" toResultPlan::toResultPlan(QWidget *parent, const char *name) @@ -162,7 +163,7 @@ // // Ident = QString::fromLatin1("TOra ") + QString::number((int)time(NULL) + rand()); // -// QString planTable(toConfigurationSingle::Instance().planTable(conn.user())); +// QString planTable(toConfigurationNewSingle::Instance().planTable(conn.user())); // // QString sql = Utils::toShift(Statements); // if (sql.isNull()) @@ -202,7 +203,7 @@ // Query = new toEventQuery(this // , conn // , toSQL::string(SQLViewPlan, conn). -// // arg(toConfigurationSingle::Instance().planTable()). +// // arg(toConfigurationNewSingle::Instance().planTable()). // // Since EXPLAIN PLAN is always to conn.user() plan_table // arg(explain).arg(Ident) // , toQueryParams() @@ -307,7 +308,7 @@ Ident = sql.mid(6); TopItem = new toResultViewItem(this, NULL, QString::fromLatin1("DML")); TopItem->setText(1, QString::fromLatin1("Saved plan")); - QString planTable(toConfigurationSingle::Instance().planTable(connection().user())); + QString planTable = ToConfiguration::Oracle::planTable(connection().user()); Query = new toEventQuery(this , connection() // NOTE: this is special case - plan table is defined as %1. table name can not use bind variable place holder @@ -351,7 +352,7 @@ TopItem = new toResultViewItem(this, NULL, QString::fromLatin1("EXPLAIN PLAN:")); TopItem->setText(1, sql.left(50).trimmed()); - QString planTable(toConfigurationSingle::Instance().planTable(conn.user())); + QString planTable = ToConfiguration::Oracle::planTable(connection().user()); QString explain = QString::fromLatin1("EXPLAIN PLAN SET STATEMENT_ID = '%1' INTO %2 FOR %3"). arg(Ident). @@ -553,10 +554,10 @@ Query = new toEventQuery(this , LockedConnection , toSQL::string(SQLViewPlan, conn). - // arg(toConfigurationSingle::Instance().planTable()). + // arg(toConfigurationNewSingle::Instance().planTable()). // Since EXPLAIN PLAN is always to conn.user() plan_table // and current_schema can be different - arg(toConfigurationSingle::Instance().planTable(conn.user())). + arg(ToConfiguration::Oracle::planTable(conn.user())). arg(Ident) , toQueryParams() , toEventQuery::READ_ALL); @@ -571,7 +572,7 @@ //if (!sql().startsWith(QString::fromLatin1("SAVED:"))) //{ // Utils::toStatusMessage("Not implemented yet toResultPlan::queryDone"); - // //if (!toConfigurationSingle::Instance().keepPlans()) + // //if (!toConfigurationNewSingle::Instance().keepPlans()) // // connection().execute(QString::fromLatin1("ROLLBACK TO SAVEPOINT %1").arg(chkPoint)); // //else // // toMainWidget()->setNeedCommit(connection()); @@ -592,7 +593,7 @@ { if (str.contains(QString::fromLatin1("ORA-02404"))) { - QString planTable(toConfigurationSingle::Instance().planTable(connection().user())); + QString planTable = ToConfiguration::Oracle::planTable(connection().user()); // if shared plan table does not exist, do not try to create it if(toConfigurationNewSingle::Instance().option(ToConfiguration::Oracle::SharedPlan).toBool()) Modified: trunk/tora/src/core/totool.cpp =================================================================== --- trunk/tora/src/core/totool.cpp 2014-03-01 23:31:18 UTC (rev 5088) +++ trunk/tora/src/core/totool.cpp 2014-03-03 17:58:29 UTC (rev 5089) @@ -159,7 +159,7 @@ Connection = &conn; // 1st change "registration" to toConnection oldConnection->delWidget(Widget); // then notify old connection about the change Connection->addWidget(Widget); - if (toConfigurationSingle::Instance().changeConnection()) + if (toConfigurationNewSingle::Instance().option(ToConfiguration::Global::ChangeConnectionBool).toBool()) toConnectionRegistrySing::Instance().changeConnection(conn); } @@ -385,7 +385,7 @@ void toToolWidget::toolActivated(toToolWidget *tool) { - if (tool == this && toConfigurationSingle::Instance().changeConnection()) + if (tool == this && toConfigurationNewSingle::Instance().option(ToConfiguration::Global::ChangeConnectionBool).toBool()) toConnectionRegistrySing::Instance().changeConnection(connection()); } @@ -508,7 +508,7 @@ try { int lastPriorityPix = 0; - ToolsMap &cfgTools = toConfigurationSingle::Instance().tools(); + QMap<QString, QVariant> cfgTools = toConfigurationNewSingle::Instance().option(ToConfiguration::Main::ToolsMap).toMap(); for (super::const_iterator i = super::begin(); i != super::end(); ++i) { @@ -518,9 +518,9 @@ // set the tools for the first run if (!cfgTools.contains(i.key())) - cfgTools[i.key()] = true; + cfgTools[i.key()] = QVariant((bool)true); // only enabled tools are set - if (cfgTools[i.key()] == false) + if (cfgTools[i.key()].toBool() == false) continue; int priority = pTool->priority(); @@ -534,6 +534,7 @@ toolbar->addAction(toolAct); } // for tools + toConfigurationNewSingle::Instance().setOption(ToConfiguration::Main::ToolsMap, cfgTools); } TOCATCH; return toolbar; @@ -548,7 +549,7 @@ { int lastPriorityMenu = 0; - ToolsMap &cfgTools = toConfigurationSingle::Instance().tools(); + QMap<QString, QVariant> cfgTools = toConfigurationNewSingle::Instance().option(ToConfiguration::Main::ToolsMap).toMap(); for (super::const_iterator i = super::begin(); i != super::end(); ++i) { @@ -559,9 +560,9 @@ // set the tools for the first run if (!cfgTools.contains(i.key())) - cfgTools[i.key()] = true; + cfgTools[i.key()] = QVariant((bool)true); // only enabled tools are set - if (cfgTools[i.key()] == false) + if (cfgTools[i.key()].toBool() == false) continue; int priority = pTool->priority(); @@ -574,6 +575,7 @@ if (menuName) menu->addAction(toolAct); } // for tools + toConfigurationNewSingle::Instance().setOption(ToConfiguration::Main::ToolsMap, cfgTools); } TOCATCH; return menu; Modified: trunk/tora/src/tools/toanalyze.cpp =================================================================== --- trunk/tora/src/tools/toanalyze.cpp 2014-03-01 23:31:18 UTC (rev 5088) +++ trunk/tora/src/tools/toanalyze.cpp 2014-03-03 17:58:29 UTC (rev 5089) @@ -40,7 +40,8 @@ #include "core/toresulttableview.h" #include "core/toresultplan.h" #include "tools/toworksheetstatistic.h" -#include "core/toconfiguration.h" +//#include "core/toconfiguration_new.h" +#include "connection/tooraclesetting.h" #include <QtGui/QComboBox> #include <QtGui/QSpinBox> @@ -373,7 +374,7 @@ Plans = new toResultTableView(false, false, splitter); try { - Plans->query(toSQL::string(SQLListPlans, connection).arg(toConfigurationSingle::Instance().planTable(connection.user())), toQueryParams()); + Plans->query(toSQL::string(SQLListPlans, connection).arg(ToConfiguration::Oracle::planTable(connection.user())), toQueryParams()); } TOCATCH; Modified: trunk/tora/src/tools/tosgastatement.cpp =================================================================== --- trunk/tora/src/tools/tosgastatement.cpp 2014-03-01 23:31:18 UTC (rev 5088) +++ trunk/tora/src/tools/tosgastatement.cpp 2014-03-03 17:58:29 UTC (rev 5089) @@ -39,9 +39,10 @@ #include "core/toresultresources.h" //#include "core/tosqlparse.h" #include "core/tosql.h" -#include "core/toconfiguration.h" +#include "core/toconfiguration_new.h" #include "core/utils.h" #include "editor/toscintilla.h" +#include "connection/tooraclesetting.h" void toSGAStatement::viewResources(void) { Modified: trunk/tora/src/tools/tostorage.cpp =================================================================== --- trunk/tora/src/tools/tostorage.cpp 2014-03-01 23:31:18 UTC (rev 5088) +++ trunk/tora/src/tools/tostorage.cpp 2014-03-03 17:58:29 UTC (rev 5089) @@ -42,7 +42,7 @@ #include "core/tohelp.h" #include "core/tomemoeditor.h" #include "core/toglobalevent.h" -#include "core/toconfiguration.h" +#include "core/toconfiguration_new.h" #include <QtGui/QTableView> #include <QtGui/QToolBar> @@ -93,19 +93,20 @@ : QWidget(parent), toSettingTab("storage.html"), Tool(tool) { setupUi(this); - - DispCoalesced->setChecked(toConfigurationSingle::Instance().dispCoalesced()); - DispExtents->setChecked(toConfigurationSingle::Instance().dispExtents()); - DispTablespaces->setChecked(toConfigurationSingle::Instance().dispTablespaces()); - DispAvailableGraph->setChecked(toConfigurationSingle::Instance().dispAvailableGraph()); + toSettingTab::loadSettings(this); + //DispCoalesced->setChecked(toConfigurationNewSingle::Instance().option(ToConfiguration::Storage::DispCoalesced).toBool()); + //DispExtents->setChecked(toConfigurationNewSingle::Instance().option(ToConfiguration::Storage::DispExtents).toBool()); + //DispTablespaces->setChecked(toConfigurationNewSingle::Instance().option(ToConfiguration::Storage::DispTablespaces).toBool()); + //DispAvailableGraph->setChecked(toConfigurationNewSingle::Instance().option(ToConfiguration::Storage::AvailableGraph).toBool()); } void toStoragePrefs::saveSetting(void) { - toConfigurationSingle::Instance().setDispCoalesced(DispCoalesced->isChecked()); - toConfigurationSingle::Instance().setDispExtents(DispExtents->isChecked()); - toConfigurationSingle::Instance().setDispTablespaces(DispTablespaces->isChecked()); - toConfigurationSingle::Instance().setDispAvailableGraph(DispAvailableGraph->isChecked()); + //toConfigurationNewSingle::Instance().setDispCoalesced(DispCoalesced->isChecked()); + //toConfigurationNewSingle::Instance().setDispExtents(DispExtents->isChecked()); + //toConfigurationNewSingle::Instance().setDispTablespaces(DispTablespaces->isChecked()); + //toConfigurationNewSingle::Instance().setDispAvailableGraph(DispAvailableGraph->isChecked()); + toSettingTab::saveSettings(this); } class toStorageTool : public toTool @@ -836,7 +837,7 @@ ExtentAct = new QAction(QPixmap(const_cast<const char**>(storageextents_xpm)), tr("Show extent view."), this); ExtentAct->setCheckable(true); - bool extents = toConfigurationSingle::Instance().dispExtents(); + bool extents = toConfigurationNewSingle::Instance().option(ToConfiguration::Storage::DispExtents).toBool(); if (extents) ExtentAct->setChecked(true); toolbar->addAction(ExtentAct); @@ -846,7 +847,7 @@ TablespaceAct = new QAction(QPixmap(const_cast<const char**>(tostorage_xpm)), tr("Show tablespaces or just datafiles."), this); TablespaceAct->setCheckable(true); - bool tablespaces = toConfigurationNewSingle::Instance().dispTablespaces(); + bool tablespaces = toConfigurationNewSingle::Instance().option(ToConfiguration::Storage::DispTablespaces).toBool(); if (tablespaces) TablespaceAct->setChecked(true); toolbar->addAction(TablespaceAct); @@ -938,7 +939,7 @@ splitter->setChildrenCollapsible(false); layout()->addWidget(splitter); - Storage = new toResultStorage(toConfigurationSingle::Instance().dispAvailableGraph(), + Storage = new toResultStorage(toConfigurationNewSingle::Instance().option(ToConfiguration::Storage::AvailableGraph).toBool(), splitter); ExtentParent = new QSplitter(Qt::Horizontal, splitter); Objects = new QTableView(ExtentParent); @@ -1027,7 +1028,7 @@ void toStorage::refresh(void) { - Storage->showCoalesced(toConfigurationSingle::Instance().dispCoalesced()); + Storage->showCoalesced(toConfigurationNewSingle::Instance().option(ToConfiguration::Storage::DispCoalesced).toBool()); Storage->query("", toQueryParams()); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ibr...@us...> - 2014-03-04 17:45:14
|
Revision: 5091 http://sourceforge.net/p/tora/code/5091 Author: ibre5041 Date: 2014-03-04 17:45:09 +0000 (Tue, 04 Mar 2014) Log Message: ----------- few steps towards to the new config system Modified Paths: -------------- trunk/tora/src/CMakeLists.txt trunk/tora/src/connection/tooracleconnection.cpp trunk/tora/src/connection/toqmysqlsetting.cpp trunk/tora/src/core/main.cpp trunk/tora/src/core/toconfiguration.cpp trunk/tora/src/core/toconfiguration.h trunk/tora/src/core/toconfiguration_new.cpp trunk/tora/src/core/toconfiguration_new.h trunk/tora/src/core/toconfigurationpriv.h trunk/tora/src/core/toconnection.cpp trunk/tora/src/core/toconnection.h trunk/tora/src/core/todatabasesetting.cpp trunk/tora/src/core/todatabasesetting.h trunk/tora/src/core/toeventqueryworker.cpp trunk/tora/src/core/toglobalsetting.cpp trunk/tora/src/core/toglobalsetting.h trunk/tora/src/core/tohelp.cpp trunk/tora/src/core/tohelp.h trunk/tora/src/core/tohelpsetup.cpp trunk/tora/src/core/tolinechart.cpp trunk/tora/src/core/tolistviewformattersql.cpp trunk/tora/src/core/tomain.cpp trunk/tora/src/core/tomainwindow.cpp trunk/tora/src/core/tomainwindow.h trunk/tora/src/core/topiechart.cpp trunk/tora/src/core/topreferences.cpp trunk/tora/src/core/toqvalue.cpp trunk/tora/src/core/toresulttableview.cpp trunk/tora/src/core/toresultview.cpp trunk/tora/src/core/totool.h trunk/tora/src/editor/toworksheettext.cpp trunk/tora/src/editor/toworksheettext.h trunk/tora/src/tools/tobrowser.cpp trunk/tora/src/tools/tooutput.cpp trunk/tora/src/tools/toresultstorage.cpp trunk/tora/src/tools/torollback.cpp trunk/tora/src/tools/toworksheet.cpp Added Paths: ----------- trunk/tora/src/core/toeditorsetting.cpp trunk/tora/src/core/toeditorsetting.h Modified: trunk/tora/src/CMakeLists.txt =================================================================== --- trunk/tora/src/CMakeLists.txt 2014-03-04 06:38:28 UTC (rev 5090) +++ trunk/tora/src/CMakeLists.txt 2014-03-04 17:45:09 UTC (rev 5091) @@ -193,23 +193,24 @@ core/tochangeconnection.h core/tocodemodel.h core/toconfenum.h - core/toconfiguration.h + #core/toconfiguration.h core/toconfiguration_new.h - core/toconfigurationpriv.h + #core/toconfigurationpriv.h core/toconnection.h core/toconnectionimport.h core/toconnectionmodel.h core/toconnectionregistry.h core/todescribe.h + core/todatabasesetting.h core/todockbar.h core/todocklet.h core/toeditablemenu.h core/toeditmenu.h + core/toeditorsetting.h core/toeventquery.h core/toeventqueryworker.h core/toglobalevent.h core/toglobalsetting.h - core/todatabasesetting.h core/tohelp.h core/tohelpsetup.h core/tolinechart.h @@ -412,9 +413,9 @@ core/tochangeconnection.cpp core/tocodemodel.cpp core/toconfenum.cpp - core/toconfiguration.cpp + #core/toconfiguration.cpp core/toconfiguration_new.cpp - core/toconfigurationpriv.cpp + #core/toconfigurationpriv.cpp core/toconnection.cpp core/toconnectionimport.cpp core/toconnectionmodel.cpp @@ -428,6 +429,7 @@ core/todocklet.cpp core/toeditablemenu.cpp core/toeditmenu.cpp + core/toeditorsetting.cpp core/toeditwidget.cpp core/toeventquery.cpp core/toeventqueryworker.cpp @@ -859,17 +861,17 @@ SET(TEST4_SOURCES tests/test4.cpp tests/test4window.cpp - core/moc_toconfiguration.cxx - core/moc_toconfigurationpriv.cxx + #core/moc_toconfiguration.cxx + #core/moc_toconfigurationpriv.cxx core/moc_toglobalevent.cxx core/moc_tomainwindow.cxx core/moc_topushbutton.cxx core/toconfenum.cpp core/moc_toconfenum.cxx - core/toconfiguration.cpp + #core/toconfiguration.cpp core/toconfiguration_new.cpp core/moc_toconfiguration_new.cxx - core/toconfigurationpriv.cpp + #core/toconfigurationpriv.cpp core/toglobalevent.cpp core/tomainwindow.cpp core/topushbutton.cpp @@ -934,9 +936,9 @@ core/moc_tobrowserbasewidget.cxx core/moc_tocache.cxx core/moc_tocodemodel.cxx - core/moc_toconfiguration.cxx + #core/moc_toconfiguration.cxx core/moc_toconfiguration_new.cxx - core/moc_toconfigurationpriv.cxx + #core/moc_toconfigurationpriv.cxx core/moc_toconnection.cxx core/moc_toconnectionregistry.cxx core/moc_todescribe.cxx @@ -979,9 +981,9 @@ core/tobrowserbasewidget.cpp core/tocache.cpp core/tocodemodel.cpp - core/toconfiguration.cpp + #core/toconfiguration.cpp core/toconfiguration_new.cpp - core/toconfigurationpriv.cpp + #core/toconfigurationpriv.cpp core/toconnection.cpp core/toconnectionoptions.cpp core/toconnectionprovider.cpp Modified: trunk/tora/src/connection/tooracleconnection.cpp =================================================================== --- trunk/tora/src/connection/tooracleconnection.cpp 2014-03-04 06:38:28 UTC (rev 5090) +++ trunk/tora/src/connection/tooracleconnection.cpp 2014-03-04 17:45:09 UTC (rev 5091) @@ -44,8 +44,10 @@ #include "connection/tooraclequery.h" #include "core/toconf.h" // TOAPPNAME +#include "core/toconfiguration_new.h" #include "core/toraversion.h" #include "core/tologger.h" +#include "connection/tooraclesetting.h" #include "trotl.h" #include "trotl_convertor.h" @@ -212,7 +214,7 @@ try { QString alterSessionSQL = QString::fromLatin1("ALTER SESSION SET NLS_DATE_FORMAT = '"); - alterSessionSQL += toConfigurationNewSingle::Instance().dateFormat(); + alterSessionSQL += toConfigurationNewSingle::Instance().option(ToConfiguration::Oracle::ConfDateFormat).toString(); alterSessionSQL += QString::fromLatin1("'"); oracleQuery::trotlQuery date(*conn, qPrintable(alterSessionSQL)); } @@ -220,16 +222,16 @@ { TLOG(5, toDecorator, __HERE__) << "Failed to set new default date format for session: " - << toConfigurationNewSingle::Instance().dateFormat() + << toConfigurationNewSingle::Instance().option(ToConfiguration::Oracle::ConfDateFormat).toString() << std::endl; Utils::toStatusMessage(QObject::tr("Failed to set new default date format for session: %1") - .arg(toConfigurationNewSingle::Instance().dateFormat())); + .arg(toConfigurationNewSingle::Instance().option(ToConfiguration::Oracle::ConfDateFormat).toString())); } try { QString alterSessionSQL = QString::fromLatin1("ALTER SESSION SET NLS_TIMESTAMP_FORMAT = '"); - alterSessionSQL += toConfigurationNewSingle::Instance().timestampFormat(); + alterSessionSQL += toConfigurationNewSingle::Instance().option(ToConfiguration::Oracle::ConfTimestampFormat).toString(); alterSessionSQL += QString::fromLatin1("'"); oracleQuery::trotlQuery timestmp(*conn, qPrintable(alterSessionSQL)); } @@ -237,20 +239,20 @@ { TLOG(5, toDecorator, __HERE__) << "Failed to set new default timestmp format for session: " - << toConfigurationNewSingle::Instance().timestampFormat() + << toConfigurationNewSingle::Instance().option(ToConfiguration::Oracle::ConfTimestampFormat).toString() << std::endl << e.what(); Utils::toStatusMessage(QObject::tr("Failed to set new default timestamp format for session: %1") - .arg(toConfigurationNewSingle::Instance().timestampFormat())); + .arg(toConfigurationNewSingle::Instance().option(ToConfiguration::Oracle::ConfTimestampFormat).toString())); } catch (...) { TLOG(5, toDecorator, __HERE__) << "Failed to set new default timestmp format for session: " - << toConfigurationNewSingle::Instance().timestampFormat() + << toConfigurationNewSingle::Instance().option(ToConfiguration::Oracle::ConfTimestampFormat).toString() << std::endl; Utils::toStatusMessage(QObject::tr("Failed to set new default timestamp format for session: %1") - .arg(toConfigurationNewSingle::Instance().timestampFormat())); + .arg(toConfigurationNewSingle::Instance().option(ToConfiguration::Oracle::ConfTimestampFormat).toString())); } try Modified: trunk/tora/src/connection/toqmysqlsetting.cpp =================================================================== --- trunk/tora/src/connection/toqmysqlsetting.cpp 2014-03-04 06:38:28 UTC (rev 5090) +++ trunk/tora/src/connection/toqmysqlsetting.cpp 2014-03-04 17:45:09 UTC (rev 5091) @@ -34,7 +34,7 @@ #include "connection/toqmysqlsetting.h" #include "connection/toqmysqlprovider.h" -#include "core/toconfiguration.h" +#include "core/toconfiguration_new.h" #include <QtGui/QVBoxLayout> #include <QtGui/QGroupBox> @@ -47,11 +47,13 @@ , toSettingTab("database.html#qsql") { setupUi(this); - BeforeCreateAction->setCurrentIndex(toConfigurationSingle::Instance().beforeCreateAction()); + //BeforeCreateAction->setCurrentIndex(toConfigurationNewSingle::Instance().option(ToConfiguration::MySQL::BeforeCreateAction).toInt()); + toSettingTab::loadSettings(this); } void toQMySqlSetting::saveSetting(void) { - toConfigurationSingle::Instance().setBeforeCreateAction(BeforeCreateAction->currentIndex()); + //toConfigurationSingle::Instance().setOption(ToConfiguration::MySQL::BeforeCreateAction, BeforeCreateAction->currentIndex()); + toSettingTab::saveSettings(this); } Modified: trunk/tora/src/core/main.cpp =================================================================== --- trunk/tora/src/core/main.cpp 2014-03-04 06:38:28 UTC (rev 5090) +++ trunk/tora/src/core/main.cpp 2014-03-04 17:45:09 UTC (rev 5091) @@ -34,7 +34,7 @@ #include "core/toconfiguration_new.h" #include "core/tosplash.h" -#include "core/toconnectionprovider.h" +//#include "core/toconnectionprovider.h" #include "core/tooracleconst.h" #include "core/tosql.h" #include "core/tocache.h" @@ -46,6 +46,7 @@ #include "core/utils.h" #include "core/tologger.h" #include "core/toglobalsetting.h" +#include "core/todatabasesetting.h" #ifndef Q_OS_WIN32 #include <unistd.h> Modified: trunk/tora/src/core/toconfiguration.cpp =================================================================== --- trunk/tora/src/core/toconfiguration.cpp 2014-03-04 06:38:28 UTC (rev 5090) +++ trunk/tora/src/core/toconfiguration.cpp 2014-03-04 17:45:09 UTC (rev 5091) @@ -47,7 +47,7 @@ : QObject(parent) , d_ptr(NULL) { - setQSettingsEnv(); + //setQSettingsEnv(); d_ptr = new toConfigurationPrivate(this); } @@ -57,6 +57,7 @@ delete d; } +//#if 0 // static one void toConfiguration::setQSettingsEnv() { @@ -1021,16 +1022,16 @@ } // tohelp -HelpsMap toConfiguration::additionalHelp() -{ - Q_D(toConfiguration); - return d->m_additionalHelp; -} -void toConfiguration::setAdditionalHelp(HelpsMap v) -{ - Q_D(toConfiguration); - d->m_additionalHelp = v; -} +//HelpsMap toConfiguration::additionalHelp() +//{ +// Q_D(toConfiguration); +// return d->m_additionalHelp; +//} +//void toConfiguration::setAdditionalHelp(HelpsMap v) +//{ +// Q_D(toConfiguration); +// d->m_additionalHelp = v; +//} #ifdef TORA3_CHARTS // tochartmanager @@ -1665,3 +1666,4 @@ return QString::fromAscii(SHARE_DIR); #endif } + Modified: trunk/tora/src/core/toconfiguration.h =================================================================== --- trunk/tora/src/core/toconfiguration.h 2014-03-04 06:38:28 UTC (rev 5090) +++ trunk/tora/src/core/toconfiguration.h 2014-03-04 17:45:09 UTC (rev 5091) @@ -11,13 +11,12 @@ #include <QtCore/QVariant> #include <QtGui/QApplication> -typedef QMap<QString, QString> HelpsMap; -typedef QMapIterator<QString, QString> HelpsMapIterator; typedef QMap<QString, QString> ChartsMap; typedef QMapIterator<QString, QString> ChartsMapIterator; typedef QMap<QString, QString> TemplatesMap; typedef QMapIterator<QString, QString> TemplatesMapIterator; +#if 0 class toConfigurationPrivate; class TORA_EXPORT toConfiguration: public QObject { @@ -106,7 +105,7 @@ // UNTIL_MANDATORY = 2, // NEVER = 3 // }; - +//#if 0 /*! \brief Set the QSettings access strings. QSettings uses these. It's used in the main.cpp before new QApplication instance init. @@ -409,8 +408,8 @@ void setFilterText(const QString & v); // tohelp - HelpsMap additionalHelp(); - void setAdditionalHelp(HelpsMap v); + //HelpsMap additionalHelp(); + //void setAdditionalHelp(HelpsMap v); #ifdef TORA3_CHARTS // tochartmanager @@ -583,6 +582,9 @@ // Aplication location paths QString sharePath(); + +//#endif + private: toConfigurationPrivate * d_ptr; Q_DECLARE_PRIVATE(toConfiguration); @@ -591,3 +593,5 @@ typedef Loki::SingletonHolder<toConfiguration> toConfigurationSingle; #endif + +#endif Modified: trunk/tora/src/core/toconfiguration_new.cpp =================================================================== --- trunk/tora/src/core/toconfiguration_new.cpp 2014-03-04 06:38:28 UTC (rev 5090) +++ trunk/tora/src/core/toconfiguration_new.cpp 2014-03-04 17:45:09 UTC (rev 5091) @@ -91,6 +91,11 @@ return option(opt); } +void toConfigurationNew::saveAll() +{ + +} + // a static one void toConfigurationNew::setQSettingsEnv() { Modified: trunk/tora/src/core/toconfiguration_new.h =================================================================== --- trunk/tora/src/core/toconfiguration_new.h 2014-03-04 06:38:28 UTC (rev 5090) +++ trunk/tora/src/core/toconfiguration_new.h 2014-03-04 17:45:09 UTC (rev 5091) @@ -33,6 +33,8 @@ QVariant option(QString const& option); template <class T> void setOption(int option, T const&) {}; + void saveAll(); + /*! \brief Set the QSettings access strings. QSettings uses these. It's used in the main.cpp before new QApplication instance init. Modified: trunk/tora/src/core/toconfigurationpriv.h =================================================================== --- trunk/tora/src/core/toconfigurationpriv.h 2014-03-04 06:38:28 UTC (rev 5090) +++ trunk/tora/src/core/toconfigurationpriv.h 2014-03-04 17:45:09 UTC (rev 5091) @@ -157,7 +157,7 @@ QString m_filterText; // tohelp - HelpsMap m_additionalHelp; + ////HelpsMap m_additionalHelp; #ifdef TORA3_CHARTS // tochartmanager Modified: trunk/tora/src/core/toconnection.cpp =================================================================== --- trunk/tora/src/core/toconnection.cpp 2014-03-04 06:38:28 UTC (rev 5090) +++ trunk/tora/src/core/toconnection.cpp 2014-03-04 17:45:09 UTC (rev 5091) @@ -48,28 +48,6 @@ #include <QtGui/QMenu> -QVariant ToConfiguration::Database::defaultValue(int option) const -{ - switch(option) - { - case ObjectCache: return QVariant((int)1); - case CacheTimeout: return QVariant((int)7); - case AutoCommit: return QVariant((bool)false); - case FirewallMode: return QVariant((bool)false); - case ConnectionTestInterval: return QVariant((int)900); //15min - case CachedConnections: return QVariant((int)4); - case MaxNumber: return QVariant((int)50); - case MaxContent: return QVariant((int)100); - case MaxColDisp: return QVariant((int)300); - case IndicateEmpty: return QVariant((bool)true); - case IndicateEmptyColor: return QVariant(QString("#f2ffbc")); - case NumberFormat: return QVariant((int)0); - case NumberDecimals: return QVariant((int)2); - default: - Q_ASSERT_X( false, qPrintable(__QHERE__), qPrintable(QString("Context Editor un-registered enum value: %1").arg(option))); - return QVariant(); - } -} toConnection::toConnection(const QString &provider, const QString &user, const QString &password, const QString &host, const QString &database, Modified: trunk/tora/src/core/toconnection.h =================================================================== --- trunk/tora/src/core/toconnection.h 2014-03-04 06:38:28 UTC (rev 5090) +++ trunk/tora/src/core/toconnection.h 2014-03-04 17:45:09 UTC (rev 5091) @@ -62,32 +62,6 @@ class QMenu; -namespace ToConfiguration { - class Database : public ConfigContext - { - Q_OBJECT; - Q_ENUMS(OptionTypeEnum); - public: - Database() : ConfigContext("Database", ENUM_REF(Database,OptionTypeEnum)) {}; - enum OptionTypeEnum { - ObjectCache = 4000 // #define CONF_OBJECT_CACHE - , CacheTimeout // #define CONF_CACHE_TIMEOUT - , AutoCommit // #define CONF_AUTO_COMMIT - , FirewallMode // #define CONF_FIREWALL_MODE - , ConnectionTestInterval // #define CONF_CONN_TEST_INTERVAL - , CachedConnections - , MaxNumber // #define CONF_MAX_NUMBER (InitialFetch) - , MaxContent // #define CONF_MAX_CONTENT (InitialEditorContent) - , MaxColDisp // #define CONF_MAX_COL_DISP - , IndicateEmpty // #define CONF_INDICATE_EMPTY - , IndicateEmptyColor // #define CONF_INDICATE_EMPTY_COLOR - , NumberFormat // #define CONF_NUMBER_FORMAT - , NumberDecimals // #define CONF_NUMBER_DECIMALS - }; - virtual QVariant defaultValue(int) const; - }; -}; - /** Represent a database connection in TOra. Observe that this can mean several actual * connections to the database as queries that are expected to run a long time are sometimes * executed in their own connection to make sure the interface doesn't lock up for a long time. Modified: trunk/tora/src/core/todatabasesetting.cpp =================================================================== --- trunk/tora/src/core/todatabasesetting.cpp 2014-03-04 06:38:28 UTC (rev 5090) +++ trunk/tora/src/core/todatabasesetting.cpp 2014-03-04 17:45:09 UTC (rev 5091) @@ -48,6 +48,29 @@ #include <QtCore/QDebug> +QVariant ToConfiguration::Database::defaultValue(int option) const +{ + switch(option) + { + case ObjectCache: return QVariant((int)1); + case CacheTimeout: return QVariant((int)7); + case AutoCommit: return QVariant((bool)false); + case FirewallMode: return QVariant((bool)false); + case ConnectionTestInterval: return QVariant((int)900); //15min + case CachedConnections: return QVariant((int)4); + case MaxNumber: return QVariant((int)50); + case MaxContent: return QVariant((int)100); + case MaxColDisp: return QVariant((int)300); + case IndicateEmpty: return QVariant((bool)true); + case IndicateEmptyColor: return QVariant(QString("#f2ffbc")); + case NumberFormat: return QVariant((int)0); + case NumberDecimals: return QVariant((int)2); + default: + Q_ASSERT_X( false, qPrintable(__QHERE__), qPrintable(QString("Context Editor un-registered enum value: %1").arg(option))); + return QVariant(); + } +} + void toDatabaseSetting::numberFormatChange() { Decimals->setEnabled(NumberFormat->currentIndex() == 2); Modified: trunk/tora/src/core/todatabasesetting.h =================================================================== --- trunk/tora/src/core/todatabasesetting.h 2014-03-04 06:38:28 UTC (rev 5090) +++ trunk/tora/src/core/todatabasesetting.h 2014-03-04 17:45:09 UTC (rev 5091) @@ -40,6 +40,32 @@ #include "ui_todatabasesettingui.h" +namespace ToConfiguration { + class Database : public ConfigContext + { + Q_OBJECT; + Q_ENUMS(OptionTypeEnum); + public: + Database() : ConfigContext("Database", ENUM_REF(Database,OptionTypeEnum)) {}; + enum OptionTypeEnum { + ObjectCache = 4000 // #define CONF_OBJECT_CACHE + , CacheTimeout // #define CONF_CACHE_TIMEOUT + , AutoCommit // #define CONF_AUTO_COMMIT + , FirewallMode // #define CONF_FIREWALL_MODE + , ConnectionTestInterval // #define CONF_CONN_TEST_INTERVAL + , CachedConnections + , MaxNumber // #define CONF_MAX_NUMBER (InitialFetch) + , MaxContent // #define CONF_MAX_CONTENT (InitialEditorContent) + , MaxColDisp // #define CONF_MAX_COL_DISP + , IndicateEmpty // #define CONF_INDICATE_EMPTY + , IndicateEmptyColor // #define CONF_INDICATE_EMPTY_COLOR + , NumberFormat // #define CONF_NUMBER_FORMAT + , NumberDecimals // #define CONF_NUMBER_DECIMALS + }; + virtual QVariant defaultValue(int) const; + }; +}; + class toDatabaseSetting : public QWidget , public Ui::toDatabaseSettingUI , public toSettingTab Copied: trunk/tora/src/core/toeditorsetting.cpp (from rev 5090, trunk/tora/src/core/toglobalsetting.cpp) =================================================================== --- trunk/tora/src/core/toeditorsetting.cpp (rev 0) +++ trunk/tora/src/core/toeditorsetting.cpp 2014-03-04 17:45:09 UTC (rev 5091) @@ -0,0 +1,90 @@ + +/* BEGIN_COMMON_COPYRIGHT_HEADER + * + * TOra - An Oracle Toolkit for DBA's and developers + * + * Shared/mixed copyright is held throughout files in this product + * + * Portions Copyright (C) 2000-2001 Underscore AB + * Portions Copyright (C) 2003-2005 Quest Software, Inc. + * Portions Copyright (C) 2004-2013 Numerous Other Contributors + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; only version 2 of + * the License is valid for this program. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program as the file COPYING.txt; if not, please see + * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. + * + * As a special exception, you have permission to link this program + * with the Oracle Client libraries and distribute executables, as long + * as you follow the requirements of the GNU GPL in regard to all of the + * software in the executable aside from Oracle client libraries. + * + * All trademarks belong to their respective owners. + * + * END_COMMON_COPYRIGHT_HEADER */ + +#include "core/toeditorsetting.h" +#include "editor/tostyle.h" +#include "parsing/tosyntaxanalyzer.h" +#include "ts_log/ts_log_utils.h" + +#include <QtCore/QDebug> + +QVariant ToConfiguration::Editor::defaultValue(int option) const +{ + switch(option) + { + case SyntaxHighlighting: return QVariant((int) 0); + case EditorType: return QVariant((int) 0); + case UseMaxTextWidthMarkBool: return QVariant((bool) false); + case MaxTextWidthMarkInt: return QVariant((int)75); + case KeywordUpperBool: return QVariant((bool) false); + case ObjectNamesUpperBool: return QVariant((bool) false); + case CodeCompleteBool: return QVariant((bool) true); + case CompleteSortBool: return QVariant((bool) true); + case UseEditorShortcutsBool: return QVariant((bool) false); + case EditorShortcutsMap: return QVariant(QMap<QString, QVariant>()); + case AutoIndentBool: return QVariant((bool) true); + case UseSpacesForIndentBool: return QVariant((bool) false); + case TabStopInt: return QVariant((int) 8); + case ConfTextFont: return QVariant(QString("")); + case ConfCodeFont: return QVariant(QString("")); + case ListTextFont: return QVariant(QString("")); + case Extensions: return QVariant(QString("SQL (*.sql *.pkg *.pkb), Text (*.txt), All (*)")); + case EditStyleMap: + { + toStylesMap retval; + QMetaEnum StyleNameEnum(ENUM_REF(toSyntaxAnalyzer,WordClassEnum)); + QsciLexerSQL *l = new QsciLexerSQL(NULL); + for (int idx = 0; idx < StyleNameEnum.keyCount(); idx++) + { + QString keyNameFg = QString::fromAscii("EditStyle") + StyleNameEnum.key(idx) + "Fg"; + QString keyNameBg = QString::fromAscii("EditStyle") + StyleNameEnum.key(idx) + "Bg"; + QString keyNameFo = QString::fromAscii("EditStyle") + StyleNameEnum.key(idx) + "Fo"; + QColor fg, bg; + QFont fo; + fg = l->color((int)StyleNameEnum.value(idx)); + bg = l->paper((int)StyleNameEnum.value(idx)); + fo = QFont(""); + + QString styleName = StyleNameEnum.key(idx); + int styleNameEnum = StyleNameEnum.value(idx); + retval.insert(styleNameEnum, toStyle(fg, bg, fo)); + } + delete l; + return QVariant::fromValue(retval); + } + default: + Q_ASSERT_X( false, qPrintable(__QHERE__), qPrintable(QString("Context Editor un-registered enum value: %1").arg(option))); + return QVariant(); + } +} Copied: trunk/tora/src/core/toeditorsetting.h (from rev 5090, trunk/tora/src/core/toglobalsetting.h) =================================================================== --- trunk/tora/src/core/toeditorsetting.h (rev 0) +++ trunk/tora/src/core/toeditorsetting.h 2014-03-04 17:45:09 UTC (rev 5091) @@ -0,0 +1,75 @@ + +/* BEGIN_COMMON_COPYRIGHT_HEADER + * + * TOra - An Oracle Toolkit for DBA's and developers + * + * Shared/mixed copyright is held throughout files in this product + * + * Portions Copyright (C) 2000-2001 Underscore AB + * Portions Copyright (C) 2003-2005 Quest Software, Inc. + * Portions Copyright (C) 2004-2013 Numerous Other Contributors + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; only version 2 of + * the License is valid for this program. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program as the file COPYING.txt; if not, please see + * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. + * + * As a special exception, you have permission to link this program + * with the Oracle Client libraries and distribute executables, as long + * as you follow the requirements of the GNU GPL in regard to all of the + * software in the executable aside from Oracle client libraries. + * + * All trademarks belong to their respective owners. + * + * END_COMMON_COPYRIGHT_HEADER */ + +#ifndef TOEDITORSETTING_H +#define TOEDITORSETTING_H + +#include "core/toconfenum.h" + +#include <QtCore/QVariant> + +namespace ToConfiguration +{ + class Editor : public ConfigContext + { + Q_OBJECT; + Q_ENUMS(OptionTypeEnum); + public: + Editor() : ConfigContext("Editor", ENUM_REF(Editor,OptionTypeEnum)) {}; + enum OptionTypeEnum { + SyntaxHighlighting = 3000 // #define CONF_HIGHLIGHT + , EditorType // #define CONF_EDITOR_TYPE + , UseMaxTextWidthMarkBool + , MaxTextWidthMarkInt + , KeywordUpperBool // #define CONF_KEYWORD_UPPER + , ObjectNamesUpperBool // #define CONF_OBJECT_NAMES_UPPER + , CodeCompleteBool // #define CONF_CODE_COMPLETION + , CompleteSortBool // #define CONF_COMPLETION_SORT + , UseEditorShortcutsBool + , EditorShortcutsMap + , AutoIndentBool // #define CONF_AUTO_INDENT + , UseSpacesForIndentBool// #define CONF_TAB_SPACES + , TabStopInt // #define CONF_TAB_STOP + , ConfTextFont // #define CONF_TEXT + , ConfCodeFont // #define CONF_CODE + , ListTextFont // #define CONF_LIST + , Extensions // #define CONF_EXTENSIONS + // 2nd tab + , EditStyleMap // #define CONF_EDIT_STYLE + }; + virtual QVariant defaultValue(int option) const; + }; +} + +#endif Modified: trunk/tora/src/core/toeventqueryworker.cpp =================================================================== --- trunk/tora/src/core/toeventqueryworker.cpp 2014-03-04 06:38:28 UTC (rev 5090) +++ trunk/tora/src/core/toeventqueryworker.cpp 2014-03-04 17:45:09 UTC (rev 5091) @@ -39,7 +39,7 @@ #include "core/toconf.h" //stat #include "core/toresultstats.h" #include "core/totool.h" -#include "core/toconfiguration.h" +#include "core/toconfiguration_new.h" #include "core/toquery.h" #include "core/toqvalue.h" @@ -159,7 +159,7 @@ return; } - unsigned maxRead = toConfigurationSingle::Instance().initialFetch(); + unsigned maxRead = toConfigurationNewSingle::Instance().option(ToConfiguration::Database::MaxNumber).toInt(); ValuesList values; for(unsigned row = 0; row < maxRead; row++) { Modified: trunk/tora/src/core/toglobalsetting.cpp =================================================================== --- trunk/tora/src/core/toglobalsetting.cpp 2014-03-04 06:38:28 UTC (rev 5090) +++ trunk/tora/src/core/toglobalsetting.cpp 2014-03-04 17:45:09 UTC (rev 5091) @@ -99,7 +99,7 @@ case ChartSamplesInt: return QVariant((int)100); case DisplaySamplesInt: return QVariant((int)-1); case SizeUnit: return QVariant(QString("MB")); - case RefreshIntervalInt: return QVariant((int)0); // None + case RefreshInterval: return QVariant(QString("None")); // None - 0 case DefaultListFormat: return QVariant((int)0); case Style: return QVariant(QString("")); case Translation: return QVariant(QLocale().name()); Modified: trunk/tora/src/core/toglobalsetting.h =================================================================== --- trunk/tora/src/core/toglobalsetting.h 2014-03-04 06:38:28 UTC (rev 5090) +++ trunk/tora/src/core/toglobalsetting.h 2014-03-04 17:45:09 UTC (rev 5091) @@ -94,7 +94,7 @@ , ChartSamplesInt // #define CONF_CHART_SAMPLES , DisplaySamplesInt // #define CONF_DISPLAY_SAMPLES , SizeUnit // #define CONF_SIZE_UNIT - , RefreshIntervalInt // #define CONF_REFRESH + , RefreshInterval // #define CONF_REFRESH , DefaultListFormat // #define CONF_DEFAULT_FORMAT , Style // #define CONF_STYLE , Translation // #define CONF_LOCALE (Translation) Modified: trunk/tora/src/core/tohelp.cpp =================================================================== --- trunk/tora/src/core/tohelp.cpp 2014-03-04 06:38:28 UTC (rev 5090) +++ trunk/tora/src/core/tohelp.cpp 2014-03-04 17:45:09 UTC (rev 5091) @@ -39,12 +39,25 @@ #include "core/tomainwindow.h" #include "core/totool.h" #include "core/tohelpsetup.h" -#include "core/toconfiguration.h" +#include "core/toconfiguration_new.h" +#include "ts_log/ts_log_utils.h" #include <QtGui/QMessageBox> #include <QtCore/QSettings> +QVariant ToConfiguration::Help::defaultValue(int option) const +{ + switch(option) + { + // Paths + case AdditionalHelpMap: return QVariant(QMap<QString, QVariant>()); + default: + Q_ASSERT_X( false, qPrintable(__QHERE__), qPrintable(QString("Context Editor un-registered enum value: %1").arg(option))); + return QVariant(); + } +} + toHelp *toHelp::Window; QWidget *toHelpTool::configurationTab(QWidget *parent) @@ -69,6 +82,8 @@ toHelp::displayHelp(); } +ToConfiguration::Help toHelpTool::s_helpConfig; + static toHelpTool HelpTool; toHelp::toHelp(QWidget *parent, QString name, bool modal) @@ -105,11 +120,12 @@ std::map<QString, QString> Dsc; Dsc[tr(TOAPPNAME " manual")] = QString("qrc:/help/toc.html"); - HelpsMapIterator i(toConfigurationSingle::Instance().additionalHelp()); + QMap<QString, QVariant> hMap = toConfigurationNewSingle::Instance().option(ToConfiguration::Help::AdditionalHelpMap).toMap(); + QMapIterator<QString, QVariant> i(hMap); while (i.hasNext()) { i.next(); - Dsc[i.key()] = i.value(); + Dsc[i.key()] = i.value().toString(); } splitter->setStretchFactor(splitter->indexOf(tabs), 0); Modified: trunk/tora/src/core/tohelp.h =================================================================== --- trunk/tora/src/core/tohelp.h 2014-03-04 06:38:28 UTC (rev 5090) +++ trunk/tora/src/core/tohelp.h 2014-03-04 17:45:09 UTC (rev 5091) @@ -37,6 +37,7 @@ #include "core/totool.h" +#include "core/toconfenum.h" #include "ui_tohelpui.h" @@ -44,6 +45,23 @@ #include <QtGui/QWidget> #include <QtGui/QTreeWidget> +namespace ToConfiguration { + class Help : public ConfigContext + { + Q_OBJECT; + Q_ENUMS(OptionTypeEnum); + public: + Help() : ConfigContext("Help", ENUM_REF(Help,OptionTypeEnum)) {}; + enum OptionTypeEnum { + // Paths + AdditionalHelpMap = 14000 + }; + virtual QVariant defaultValue(int) const; + }; +}; + + + class toHelpPrefs; /** @@ -69,6 +87,8 @@ virtual void closeWindow(toConnection &connection) {}; public slots: void displayHelp(void); +private: + static ToConfiguration::Help s_helpConfig; }; /** Modified: trunk/tora/src/core/tohelpsetup.cpp =================================================================== --- trunk/tora/src/core/tohelpsetup.cpp 2014-03-04 06:38:28 UTC (rev 5090) +++ trunk/tora/src/core/tohelpsetup.cpp 2014-03-04 17:45:09 UTC (rev 5091) @@ -36,7 +36,7 @@ #include "core/tohelp.h" #include "core/utils.h" #include "core/tohtml.h" -#include "core/toconfiguration.h" +#include "core/toconfiguration_new.h" #include "core/tomainwindow.h" toHelpAddFile::toHelpAddFile(QWidget *parent, const char *name) @@ -70,14 +70,16 @@ toHelpPrefs::toHelpPrefs(toTool *tool, QWidget *parent, const char *name) - : QWidget(parent), toSettingTab("additionalhelp.html"), Tool(tool) + : QWidget(parent) + , toSettingTab("additionalhelp.html") + , Tool(tool) { if (name) setObjectName(name); setupUi(this); - + toSettingTab::loadSettings(this); // int tot = Tool->config("Number", "-1").toInt(); // if (tot != -1) // { @@ -90,19 +92,21 @@ // new toTreeWidgetItem(FileList, root, file); // } // } - HelpsMapIterator i(toConfigurationSingle::Instance().additionalHelp()); + const QMap<QString, QVariant> hMap = toConfigurationNewSingle::Instance().option(ToConfiguration::Help::AdditionalHelpMap).toMap(); + QMapIterator<QString, QVariant> i(hMap); while (i.hasNext()) { i.next(); - new toTreeWidgetItem(FileList, i.key(), i.value()); + new toTreeWidgetItem(FileList, i.key(), i.value().toString()); } } void toHelpPrefs::saveSetting() { + toSettingTab::saveSettings(this); // int i = 0; - HelpsMap h; + QMap<QString, QVariant> hMap; for (toTreeWidgetItem *item = FileList->firstChild(); item; item = item->nextSibling()) { // QString nam = QString::number(i); @@ -110,10 +114,10 @@ // nam += QString::fromLatin1("file"); // Tool->setConfig(nam.toLatin1(), item->text(1)); // i++; - h[item->text(0)] = item->text(1); + hMap[item->text(0)] = QVariant(item->text(1)); } // Tool->setConfig("Number", QString::number(i)); - toConfigurationSingle::Instance().setAdditionalHelp(h); + toConfigurationNewSingle::Instance().setOption(ToConfiguration::Help::AdditionalHelpMap, hMap); delete toHelp::Window; } Modified: trunk/tora/src/core/tolinechart.cpp =================================================================== --- trunk/tora/src/core/tolinechart.cpp 2014-03-04 06:38:28 UTC (rev 5090) +++ trunk/tora/src/core/tolinechart.cpp 2014-03-04 17:45:09 UTC (rev 5091) @@ -36,7 +36,9 @@ #include "ui_tolinechartsetupui.h" #include "core/utils.h" #include "core/toconf.h" -#include "core/toconfiguration.h" +#include "core/toconfiguration_new.h" +#include "core/toglobalsetting.h" +#include "core/toeditorsetting.h" #include <QtGui/QPainter> #include <QtGui/QPrinter> @@ -112,16 +114,16 @@ Grid = 5; AxisText = true; MousePoint[0] = MousePoint[1] = QPoint( -1, -1); - DisplaySamples = toConfigurationSingle::Instance().displaySamples(); + DisplaySamples = toConfigurationNewSingle::Instance().option(ToConfiguration::Global::DisplaySamplesInt).toInt(); clearZoom(); - setSamples(toConfigurationSingle::Instance().chartSamples()); + setSamples(toConfigurationNewSingle::Instance().option(ToConfiguration::Global::ChartSamplesInt).toInt()); setMinimumSize(80, 50); // Use list font - QString str(toConfigurationSingle::Instance().listFontName()); + QString str(toConfigurationNewSingle::Instance().option(ToConfiguration::Editor::ListTextFont).toString()); if (!str.isEmpty()) { QFont font(Utils::toStringToFont(str)); @@ -875,7 +877,7 @@ connect(Horizontal, SIGNAL(valueChanged(int)), this, SLOT(horizontalChange(int))); // Use list font - QString str(toConfigurationSingle::Instance().listFontName()); + QString str(toConfigurationNewSingle::Instance().option(ToConfiguration::Editor::ListTextFont).toString()); if (!str.isEmpty()) { QFont font(Utils::toStringToFont(str)); Modified: trunk/tora/src/core/tolistviewformattersql.cpp =================================================================== --- trunk/tora/src/core/tolistviewformattersql.cpp 2014-03-04 06:38:28 UTC (rev 5090) +++ trunk/tora/src/core/tolistviewformattersql.cpp 2014-03-04 17:45:09 UTC (rev 5091) @@ -37,13 +37,14 @@ // #include "core/tolistviewformattersql.h" -#include "core/toconfiguration.h" #include "core/toconfiguration_new.h" +#include "core/toconfiguration_new.h" #include "core/tolistviewformatterfactory.h" #include "core/tolistviewformatteridentifier.h" #include "core/toresultmodel.h" #include "core/utils.h" #include "editor/toworksheettext.h" +#include "connection/tooraclesetting.h" namespace { @@ -143,7 +144,7 @@ values += "NULL"; else { - values += "TO_DATE(\'" + currVal + "\' ,\'" + toConfigurationSingle::Instance().dateFormat() + "\')"; + values += "TO_DATE(\'" + currVal + "\' ,\'" + toConfigurationNewSingle::Instance().option(ToConfiguration::Oracle::ConfDateFormat).toString() + "\')"; } } else if (h.contains("CHAR")) Modified: trunk/tora/src/core/tomain.cpp =================================================================== --- trunk/tora/src/core/tomain.cpp 2014-03-04 06:38:28 UTC (rev 5090) +++ trunk/tora/src/core/tomain.cpp 2014-03-04 17:45:09 UTC (rev 5091) @@ -51,8 +51,9 @@ #include "tools/toworksheet.h" #include "tools/toworksheeteditor.h" #include "tools/tobrowser.h" -#include "core/toconfiguration.h" +#include "core/toconfiguration_new.h" #include "core/toglobalevent.h" +#include "core/toglobalsetting.h" #include "core/utils.h" #include "core/tologger.h" #include "ts_log/toostream.h" @@ -114,19 +115,19 @@ setWindowTitle(TOAPPNAME " " TORAVERSION); setWindowIcon(QPixmap(const_cast<const char**>(tora_xpm))); - restoreGeometry(toConfigurationSingle::Instance().mainWindowGeometry()); - restoreState(toConfigurationSingle::Instance().mainWindowState()); + restoreGeometry(toConfigurationNewSingle::Instance().option(ToConfiguration::Main::MainWindowGeometry).toByteArray()); + restoreState(toConfigurationNewSingle::Instance().option(ToConfiguration::Main::MainWindowState).toByteArray()); //enableConnectionActions(false); - QString defName(toConfigurationSingle::Instance().defaultTool()); + QString defName(toConfigurationNewSingle::Instance().option(ToConfiguration::Main::DefaultTool).toString()); for (ToolsRegistrySing::ObjectType::iterator k = ToolsRegistrySing::Instance().begin(); k != ToolsRegistrySing::Instance().end(); ++k) { if(defName.isEmpty()) { - toConfigurationSingle::Instance().setDefaultTool(k.key()); + toConfigurationNewSingle::Instance().setOption(ToConfiguration::Main::DefaultTool, QVariant(k.key())); defName = k.key(); } k.value()->customSetup(); @@ -157,13 +158,13 @@ this, SLOT(slotActiveToolChaged(toToolWidget*))); #ifdef TORA3_SESSION - if (toConfigurationSingle::Instance().restoreSession()) + if (toConfigurationNewSingle::Instance().restoreSession()) { try { std::map<QString, QString> session; - toConfigurationSingle::Instance().loadMap( - toConfigurationSingle::Instance().defaultSession(), session); + toConfigurationNewSingle::Instance().loadMap( + toConfigurationNewSingle::Instance().defaultSession(), session); importData(session, "TOra"); } TOCATCH; @@ -565,8 +566,8 @@ SLOT(moveDocklet(toDocklet *, Qt::DockWidgetArea))); } - leftDockbar->restoreState(toConfigurationSingle::Instance().leftDockbarState()); - rightDockbar->restoreState(toConfigurationSingle::Instance().rightDockbarState()); + leftDockbar->restoreState(toConfigurationNewSingle::Instance().option(ToConfiguration::Main::LeftDockbarState).toByteArray()); + rightDockbar->restoreState(toConfigurationNewSingle::Instance().option(ToConfiguration::Main::RightDockbarState).toByteArray()); } void toMain::showFileMenu(void) @@ -577,7 +578,7 @@ stopAct->setEnabled(hascon); rollbackAct->setEnabled(hascon); // disable reread cache if use caching is disabled - refreshAct->setEnabled(hascon && toConfigurationSingle::Instance().cacheDisk()); + refreshAct->setEnabled(hascon && toConfigurationNewSingle::Instance().option(ToConfiguration::Global::CacheDiskBool).toBool()); closeConn->setEnabled(hascon); updateRecent(); @@ -585,7 +586,7 @@ void toMain::updateRecent() { - QStringList files(toConfigurationSingle::Instance().recentFiles()); + QStringList files(toConfigurationNewSingle::Instance().option(ToConfiguration::Main::RecentFiles).toStringList()); recentMenu->clear(); int index = 1; @@ -615,20 +616,20 @@ recentMenu->addAction(r); } - toConfigurationSingle::Instance().setRecentFiles(files); + toConfigurationNewSingle::Instance().setOption(ToConfiguration::Main::RecentFiles, QVariant(files)); } void toMain::addRecentFile(const QString &file) { - QStringList files(toConfigurationSingle::Instance().recentFiles()); - int maxnum = toConfigurationSingle::Instance().recentMax(); + QStringList files(toConfigurationNewSingle::Instance().option(ToConfiguration::Main::RecentFiles).toStringList()); + int maxnum = toConfigurationNewSingle::Instance().option(ToConfiguration::Main::RecentMax).toInt(); files.removeAll(file); if (files.count() >= maxnum) files.removeAt(0); files.append(file); - toConfigurationSingle::Instance().setRecentFiles(files); + toConfigurationNewSingle::Instance().setOption(ToConfiguration::Main::RecentFiles, QVariant(files)); } void toMain::updateWindowsMenu(void) @@ -918,8 +919,8 @@ try { std::map<QString, QString> session; - toConfigurationSingle::Instance().loadMap( - toConfigurationSingle::Instance().defaultSession(), session); + toConfigurationNewSingle::Instance().loadMap( + toConfigurationNewSingle::Instance().defaultSession(), session); importData(session, "TOra"); } TOCATCH; @@ -1012,25 +1013,25 @@ exportData(session, "TOra"); try { - toConfigurationSingle::Instance().saveMap( - toConfigurationSingle::Instance().defaultSession(), + toConfigurationNewSingle::Instance().saveMap( + toConfigurationNewSingle::Instance().defaultSession(), session); } TOCATCH; #endif - toConfigurationSingle::Instance().setMainWindowGeometry(saveGeometry()); - toConfigurationSingle::Instance().setMainWindowState(saveState()); + toConfigurationNewSingle::Instance().setOption(ToConfiguration::Main::MainWindowGeometry, QVariant(saveGeometry())); + toConfigurationNewSingle::Instance().setOption(ToConfiguration::Main::MainWindowState, QVariant(saveState())); - toConfigurationSingle::Instance().setLeftDockbarState(leftDockbar->saveState()); - toConfigurationSingle::Instance().setRightDockbarState(rightDockbar->saveState()); + toConfigurationNewSingle::Instance().setOption(ToConfiguration::Main::LeftDockbarState, QVariant(leftDockbar->saveState())); + toConfigurationNewSingle::Instance().setOption(ToConfiguration::Main::RightDockbarState, QVariant(rightDockbar->saveState())); - toConfigurationSingle::Instance().saveConfig(); + toConfigurationNewSingle::Instance().saveAll(); event->accept(); } void toMain::createDefault(void) { - QString defName(toConfigurationSingle::Instance().defaultTool()); + QString defName(toConfigurationNewSingle::Instance().option(ToConfiguration::Main::DefaultTool).toString()); toTool *DefaultTool = NULL; for (ToolsRegistrySing::ObjectType::iterator i = ToolsRegistrySing::Instance().begin(); @@ -1147,7 +1148,7 @@ { if (!str.isEmpty()) { - int sec = toConfigurationSingle::Instance().statusMessage(); + int sec = toConfigurationNewSingle::Instance().option(ToConfiguration::Global::StatusMessageInt).toInt(); if (save || sec == 0) statusBar()->showMessage(str.simplified()); else @@ -1156,11 +1157,11 @@ if (!save && log) { Utils::toPush(StatusMessages, str); - if ((int) StatusMessages.size() > toConfigurationSingle::Instance().historySize()) + if ((int) StatusMessages.size() > toConfigurationNewSingle::Instance().option(ToConfiguration::Global::HistorySizeInt).toInt()) Utils::toShift(StatusMessages); statusBar()->setToolTip(str); - if (!toConfigurationSingle::Instance().messageStatusbar()) + if (!toConfigurationNewSingle::Instance().option(ToConfiguration::Global::MessageStatusbarBool).toBool()) displayMessage(); } } @@ -1229,7 +1230,7 @@ foreach(toConnection * i, Connections) { QString key = prefix + ":Connection:" + QString::number(id); - if (toConfigurationSingle::Instance().savePassword()) + if (toConfigurationNewSingle::Instance().savePassword()) data[key + ":Password"] = toObfuscate(i->password()); data[key + ":User"] = i->user(); data[key + ":Host"] = i->host(); @@ -1312,7 +1313,7 @@ QString password = Utils::toUnobfuscate(data[key + ":Password"]); QString provider = data[key + ":Provider"]; bool ok = true; - if (toConfigurationSingle::Instance().defaultPassword() == password) + if (toConfigurationNewSingle::Instance().defaultPassword() == password) { password = QInputDialog::getText(this, tr("Input password"), @@ -1383,7 +1384,7 @@ exportData(session, "TOra"); try { - toConfigurationSingle::Instance().saveMap(fn, session); + toConfigurationNewSingle::Instance().saveMap(fn, session); } TOCATCH } @@ -1397,7 +1398,7 @@ try { std::map<QString, QString> session; - toConfigurationSingle::Instance().loadMap(filename, session); + toConfigurationNewSingle::Instance().loadMap(filename, session); importData(session, "TOra"); } TOCATCH @@ -1410,7 +1411,7 @@ exportData(session, "TOra"); try { - toConfigurationSingle::Instance().saveMap(toConfigurationSingle::Instance().defaultSession(), session); + toConfigurationNewSingle::Instance().saveMap(toConfigurationNewSingle::Instance().defaultSession(), session); } TOCATCH Modified: trunk/tora/src/core/tomainwindow.cpp =================================================================== --- trunk/tora/src/core/tomainwindow.cpp 2014-03-04 06:38:28 UTC (rev 5090) +++ trunk/tora/src/core/tomainwindow.cpp 2014-03-04 17:45:09 UTC (rev 5091) @@ -71,6 +71,10 @@ } return retval; } + case MainWindowGeometry: return QVariant(QByteArray()); + case MainWindowState: return QVariant(QByteArray()); + case LeftDockbarState: return QVariant(QByteArray()); + case RightDockbarState: return QVariant(QByteArray()); default: Q_ASSERT_X( false, qPrintable(__QHERE__), qPrintable(QString("Context Editor un-registered enum value: %1").arg(option))); return QVariant(); Modified: trunk/tora/src/core/tomainwindow.h =================================================================== --- trunk/tora/src/core/tomainwindow.h 2014-03-04 06:38:28 UTC (rev 5090) +++ trunk/tora/src/core/tomainwindow.h 2014-03-04 17:45:09 UTC (rev 5091) @@ -64,6 +64,10 @@ , DontReread // #define CONF_DONT_REREAD , EditDragDrop // #define CONF_EDIT_DRAG_DROP (toScintilla) , ToolsMap + , MainWindowGeometry + , MainWindowState + , LeftDockbarState + , RightDockbarState }; virtual QVariant defaultValue(int option) const; }; Modified: trunk/tora/src/core/topiechart.cpp =================================================================== --- trunk/tora/src/core/topiechart.cpp 2014-03-04 06:38:28 UTC (rev 5090) +++ trunk/tora/src/core/topiechart.cpp 2014-03-04 17:45:09 UTC (rev 5091) @@ -36,8 +36,9 @@ #include "core/utils.h" #include "core/tologger.h" #include "core/toconf.h" -#include "core/toconfiguration.h" +#include "core/toconfiguration_new.h" #include "core/toconnection.h" +#include "core/toeditorsetting.h" #include "core/tolinechart.h" #include "core/toresult.h" @@ -80,7 +81,7 @@ setMinimumSize(60, 60); // Use list font - QString str(toConfigurationSingle::Instance().listFontName()); + QString str(toConfigurationNewSingle::Instance().option(ToConfiguration::Editor::ListTextFont).toString()); if (!str.isEmpty()) { QFont font(Utils::toStringToFont(str)); @@ -152,7 +153,7 @@ setMinimumSize(60, 60); // Use list font - QString str(toConfigurationSingle::Instance().listFontName()); + QString str(toConfigurationNewSingle::Instance().option(ToConfiguration::Editor::ListTextFont).toString()); if (!str.isEmpty()) { QFont font(Utils::toStringToFont(str)); Modified: trunk/tora/src/core/topreferences.cpp =================================================================== --- trunk/tora/src/core/topreferences.cpp 2014-03-04 06:38:28 UTC (rev 5090) +++ trunk/tora/src/core/topreferences.cpp 2014-03-04 17:45:09 UTC (rev 5091) @@ -35,7 +35,7 @@ #include "core/topreferences.h" #include "core/toglobalsetting.h" #include "core/todatabasesetting.h" -#include "core/toconfiguration.h" +#include "core/toconfiguration_new.h" #include "core/toconnectionprovider.h" #include "core/tomainwindow.h" #include "core/utils.h" @@ -86,7 +86,7 @@ if (tab) tab->saveSetting(); } - toConfigurationSingle::Instance().saveConfig(); + toConfigurationNewSingle::Instance().saveAll(); } toPreferences::toPreferences(QWidget* parent, const char* name, bool modal, Qt::WFlags fl) Modified: trunk/tora/src/core/toqvalue.cpp =================================================================== --- trunk/tora/src/core/toqvalue.cpp 2014-03-04 06:38:28 UTC (rev 5090) +++ trunk/tora/src/core/toqvalue.cpp 2014-03-04 17:45:09 UTC (rev 5091) @@ -35,7 +35,8 @@ #include "core/toqvalue.h" #include "core/utils.h" #include "core/toconf.h" -#include "core/toconfiguration.h" +#include "core/toconfiguration_new.h" +#include "core/todatabasesetting.h" #include <QtCore/QVariant> #include <QtGui/QApplication> @@ -243,7 +244,7 @@ QString toQValue::displayData() const { - if( isNull() && toConfigurationSingle::Instance().indicateEmpty()) + if( isNull() && toConfigurationNewSingle::Instance().option(ToConfiguration::Database::IndicateEmpty).toBool()) { return QString::fromLatin1("{null}"); } Modified: trunk/tora/src/core/toresulttableview.cpp =================================================================== --- trunk/tora/src/core/toresulttableview.cpp 2014-03-04 06:38:28 UTC (rev 5090) +++ trunk/tora/src/core/toresulttableview.cpp 2014-03-04 17:45:09 UTC (rev 5091) @@ -38,7 +38,7 @@ #include "core/toeventquery.h" #include "core/toconf.h" #include "core/utils.h" -#include "core/toconfiguration.h" +#include "core/toconfiguration_new.h" #include "core/toconnection.h" #include "core/tomodeleditor.h" #include "core/tomainwindow.h" @@ -47,6 +47,7 @@ #include "core/tolistviewformatterfactory.h" //#include "core/tolistviewformatteridentifier.h" #include "core/toworkingwidget.h" +#include "core/toglobalsetting.h" #include <QtCore/QSize> #include <QtCore/QTimer> @@ -313,8 +314,8 @@ int hh = height(); int hhh = s.height(); int rows = hh / s.height() + 1; - if (rows < toConfigurationSingle::Instance().initialFetch()) - return toConfigurationSingle::Instance().initialFetch(); + if (rows < toConfigurationNewSingle::Instance().option(ToConfiguration::Database::MaxNumber).toInt()) + return toConfigurationNewSingle::Instance().option(ToConfiguration::Database::MaxNumber).toInt(); return rows; } @@ -459,7 +460,7 @@ ColumnsResized = false; slotResizeColumnsToContents(); - if (toConfigurationSingle::Instance().multiLineResults()) + if (toConfigurationNewSingle::Instance().option(ToConfiguration::Global::MultiLineResultsBool).toBool()) resizeRowsToContents(); if (ReadableColumns && VisibleColumns == 1) @@ -644,7 +645,7 @@ // After data model is set we need to connect to it's signal dataChanged. This signal // will be emitted after sorting on column and we need to resize Row's again then // because height of rows do not "move" together with their rows when sorting. - if (toConfigurationSingle::Instance().multiLineResults()) + if (toConfigurationNewSingle::Instance().option(ToConfiguration::Global::MultiLineResultsBool).toBool()) connect(model, SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &)), this, @@ -784,7 +785,7 @@ ColumnsResized = true; // After resizing columns it could happen that different amount of vertical // space is required to display all information therefore we resize Rows. - if (toConfigurationSingle::Instance().multiLineResults()) + if (toConfigurationNewSingle::Instance().option(ToConfiguration::Global::MultiLineResultsBool).toBool()) resizeRowsToContents(); } Modified: trunk/tora/src/core/toresultview.cpp =================================================================== --- trunk/tora/src/core/toresultview.cpp 2014-03-04 06:38:28 UTC (rev 5090) +++ trunk/tora/src/core/toresultview.cpp 2014-03-04 17:45:09 UTC (rev 5091) @@ -38,7 +38,7 @@ #include "core/tolistviewformatterfactory.h" #include "core/tomemoeditor.h" #include "core/toresultlistformat.h" -#include "core/toconfiguration.h" +#include "core/toconfiguration_new.h" #include "core/tomainwindow.h" #include <QtCore/QTimer> @@ -203,8 +203,8 @@ { if (!MaxColDisp) { - MaxColDisp = toConfigurationSingle::Instance().maxColDisp(); - Gridlines = toConfigurationSingle::Instance().displayGridlines(); + MaxColDisp = toConfigurationNewSingle::Instance().maxColDisp(); + Gridlines = toConfigurationNewSingle::Instance().displayGridlines(); } QString t = text(column); if (t.isNull()) @@ -236,8 +236,8 @@ { if (!MaxColDisp) { - MaxColDisp = toConfigurationSingle::Instance().maxColDisp(); - Gridlines = toConfigurationSingle::Instance().displayGridlines(); + MaxColDisp = toConfigurationNewSingle::Instance().maxColDisp(); + Gridlines = toConfigurationNewSingle::Instance().displayGridlines(); } QString t = text(column); if (t.isNull()) @@ -251,11 +251,11 @@ #if 0 // disabled, not overriding correct function anyhow // null related background handling QColorGroup colNull(cg); - if ((toConfigurationSingle::Instance().indicateEmpty() && text(column) == "{null}") + if ((toConfigurationNewSingle::Instance().indicateEmpty() && text(column) == "{null}") || text(column).isNull()) { QColor nullColor; - nullColor.setNamedColor(toConfigurationSingle::Instance().indicateEmptyColor()); + nullColor.setNamedColor(toConfigurationNewSingle::Instance().indicateEmptyColor()); colNull.setColor(QColorGroup::Base, nullColor); } @@ -396,8 +396,8 @@ { if (!MaxColDisp) { - MaxColDisp = toConfigurationSingle::Instance().maxColDisp(); - Gridlines = toConfigurationSingle::Instance().displayGridlines(); + MaxColDisp = toConfigurationNewSingle::Instance().maxColDisp(); + Gridlines = toConfigurationNewSingle::Instance().displayGridlines(); } QString t = text(column); if (t.isNull()) @@ -413,8 +413,8 @@ { if (!MaxColDisp) { - MaxColDisp = toConfigurationSingle::Instance().maxColDisp(); - Gridlines = toConfigurationSingle::Instance().displayGridlines(); + MaxColDisp = toConfigurationNewSingle::Instance().maxColDisp(); + Gridlines = toConfigurationNewSingle::Instance().displayGridlines(); } QString t = text(column); if (t.isNull()) @@ -490,7 +490,7 @@ SIGNAL(customContextMenuRequested(const QPoint &)), this, SLOT(displayMenu(const QPoint &))); - QString str(toConfigurationSingle::Instance().listFontName()); + QString str(toConfigurationNewSingle::Instance().listFontName()); if (!str.isEmpty()) { QFont font(Utils::toStringToFont(str)); @@ -1224,8 +1224,8 @@ void toResultView::slotAddItem(void) { - MaxColDisp = toConfigurationSingle::Instance().maxColDisp(); - Gridlines = toConfigurationSingle::Instance().displayGridlines(); + MaxColDisp = toConfigurationNewSingle::Instance().maxColDisp(); + Gridlines = toConfigurationNewSingle::Instance().displayGridlines(); try { @@ -1320,7 +1320,7 @@ else setSorting(Query->columns()); - int MaxNumber = toConfigurationSingle::Instance().initialFetch(); + int MaxNumber = toConfigurationNewSingle::Instance().initialFetch(); for (int j = 0; j < MaxNumber && !Query->eof(); j++) slotAddItem(); if (ReadAll || MaxNumber < 0) Modified: trunk/tora/src/core/totool.h =================================================================== --- trunk/tora/src/core/totool.h 2014-03-04 06:38:28 UTC (rev 5090) +++ trunk/tora/src/core/totool.h 2014-03-04 17:45:09 UTC (rev 5091) @@ -35,6 +35,8 @@ #ifndef TOTOOL_H #define TOTOOL_H +#include "core/tora_export.h" + #include <loki/Singleton.h> #include <QtCore/QMap> @@ -253,7 +255,7 @@ /** * Abstract baseclass for widgets defining tool settings. */ -class toSettingTab : public toHelpContext +class TORA_EXPORT toSettingTab : public toHelpContext { public: /** Modified: trunk/tora/src/editor/toworksheettext.cpp =================================================================== --- trunk/tora/src/editor/toworksheettext.cpp 2014-03-04 06:38:28 UTC (rev 5090) +++ trunk/tora/src/editor/toworksheettext.cpp 2014-03-04 17:45:09 UTC (rev 5091) @@ -35,62 +35,13 @@ #include "editor/toworksheettext.h" #include "core/toconfiguration.h" #include "core/toconfiguration_new.h" +#include "core/toeditorsetting.h" #include "core/toconnection.h" #include "core/tologger.h" -#include "editor/tostyle.h" +///#include "editor/tostyle.h" using namespace ToConfiguration; -QVariant ToConfiguration::Editor::defaultValue(int option) const -{ - switch(option) - { - case SyntaxHighlighting: return QVariant((int) 0); - case EditorType: return QVariant((int) 0); - case UseMaxTextWidthMarkBool: return QVariant((bool) false); - case MaxTextWidthMarkInt: return QVariant((int)75); - case KeywordUpperBool: return QVariant((bool) false); - case ObjectNamesUpperBool: return QVariant((bool) false); - case CodeCompleteBool: return QVariant((bool) true); - case CompleteSortBool: return QVariant((bool) true); - case UseEditorShortcutsBool: return QVariant((bool) false); - case EditorShortcutsMap: return QVariant(QMap<QString, QVariant>()); - case AutoIndentB... [truncated message content] |
From: <ibr...@us...> - 2014-03-05 15:09:46
|
Revision: 5093 http://sourceforge.net/p/tora/code/5093 Author: ibre5041 Date: 2014-03-05 15:09:40 +0000 (Wed, 05 Mar 2014) Log Message: ----------- few steps towards to the new config system - compiles but does not work Modified Paths: -------------- trunk/tora/src/connection/tooraclesetting.cpp trunk/tora/src/connection/tooraclesetting.h trunk/tora/src/connection/toqsqlconnection.h trunk/tora/src/core/toconf.h trunk/tora/src/core/toconfiguration.h trunk/tora/src/core/todatabasesetting.cpp trunk/tora/src/core/toeditorsetting.h trunk/tora/src/core/toglobalsetting.cpp trunk/tora/src/core/tohelp.cpp trunk/tora/src/core/tolistviewformatter.cpp trunk/tora/src/core/tomainwindow.cpp trunk/tora/src/core/tomainwindow.h trunk/tora/src/core/toresultlong.cpp trunk/tora/src/core/toresultmodel.cpp trunk/tora/src/core/toresulttableview.cpp trunk/tora/src/core/toresultview.cpp trunk/tora/src/core/tosyntaxsetup.cpp trunk/tora/src/core/tosyntaxsetup.h trunk/tora/src/core/utils.cpp trunk/tora/src/core/utils.h trunk/tora/src/core/utils_part.cpp trunk/tora/src/editor/toworksheettext.cpp trunk/tora/src/editor/toworksheettext.h trunk/tora/src/parsing/tolexeroracle.cpp trunk/tora/src/parsing/tosyntaxanalyzernl.cpp trunk/tora/src/result/totablemodel.cpp trunk/tora/src/result/totreemodel.cpp trunk/tora/src/shortcuteditor/shortcutmodel.cpp trunk/tora/src/templates/totemplate.cpp trunk/tora/src/tools/tobrowser.cpp trunk/tora/src/tools/tobrowser.h trunk/tora/src/tools/tooutput.cpp trunk/tora/src/tools/torollback.cpp trunk/tora/src/tools/torollback.h trunk/tora/src/tools/tosgatrace.cpp trunk/tora/src/tools/tosgatrace.h trunk/tora/src/tools/tostorage.cpp trunk/tora/src/tools/totemporary.cpp trunk/tora/src/tools/towaitevents.cpp trunk/tora/src/tools/toworksheet.cpp trunk/tora/src/tools/toworksheetstatistic.cpp Modified: trunk/tora/src/connection/tooraclesetting.cpp =================================================================== --- trunk/tora/src/connection/tooraclesetting.cpp 2014-03-04 20:24:31 UTC (rev 5092) +++ trunk/tora/src/connection/tooraclesetting.cpp 2014-03-05 15:09:40 UTC (rev 5093) @@ -61,7 +61,7 @@ case IncludeHeader: return QVariant((bool)true); case IncludePrompt: return QVariant((bool)true); default: - Q_ASSERT_X( false, qPrintable(__QHERE__), qPrintable(QString("Context Editor un-registered enum value: %1").arg(option))); + Q_ASSERT_X( false, qPrintable(__QHERE__), qPrintable(QString("Context Oracle un-registered enum value: %1").arg(option))); return QVariant(); } } @@ -183,3 +183,5 @@ TOCATCH; #endif } + +ToConfiguration::Oracle toOracleSetting::s_oracleConf; Modified: trunk/tora/src/connection/tooraclesetting.h =================================================================== --- trunk/tora/src/connection/tooraclesetting.h 2014-03-04 20:24:31 UTC (rev 5092) +++ trunk/tora/src/connection/tooraclesetting.h 2014-03-05 15:09:40 UTC (rev 5093) @@ -43,7 +43,6 @@ namespace ToConfiguration { - class Oracle : public ConfigContext { Q_OBJECT; @@ -98,7 +97,7 @@ void dbmsMetadataClicked(bool); private: - static ToConfiguration::Oracle _conf; + static ToConfiguration::Oracle s_oracleConf; }; #endif Modified: trunk/tora/src/connection/toqsqlconnection.h =================================================================== --- trunk/tora/src/connection/toqsqlconnection.h 2014-03-04 20:24:31 UTC (rev 5092) +++ trunk/tora/src/connection/toqsqlconnection.h 2014-03-05 15:09:40 UTC (rev 5093) @@ -62,7 +62,7 @@ { case BeforeCreateAction: return QVariant((int)0); default: - Q_ASSERT_X( false, qPrintable(__QHERE__), qPrintable(QString("Context Editor un-registered enum value: %1").arg(option))); + Q_ASSERT_X( false, qPrintable(__QHERE__), qPrintable(QString("Context MySQL un-registered enum value: %1").arg(option))); return QVariant(); } } Modified: trunk/tora/src/core/toconf.h =================================================================== --- trunk/tora/src/core/toconf.h 2014-03-04 20:24:31 UTC (rev 5092) +++ trunk/tora/src/core/toconf.h 2014-03-05 15:09:40 UTC (rev 5093) @@ -35,6 +35,7 @@ #ifndef TOCONF_H #define TOCONF_H +#if 0 #define CONF_SAVE_PWD "SavePassword" #define DEFAULT_SAVE_PWD false @@ -232,6 +233,8 @@ #define CONF_EXT_INC_PROMPT "IncludePrompt" #define DEFAULT_EXT_INC_PROMPT true +#endif + // Version of TOra, must also change rpm files #ifndef TOAPPNAME # define TOAPPNAME "TOra" Modified: trunk/tora/src/core/toconfiguration.h =================================================================== --- trunk/tora/src/core/toconfiguration.h 2014-03-04 20:24:31 UTC (rev 5092) +++ trunk/tora/src/core/toconfiguration.h 2014-03-05 15:09:40 UTC (rev 5093) @@ -13,8 +13,6 @@ typedef QMap<QString, QString> ChartsMap; typedef QMapIterator<QString, QString> ChartsMapIterator; -typedef QMap<QString, QString> TemplatesMap; -typedef QMapIterator<QString, QString> TemplatesMapIterator; #if 0 class toConfigurationPrivate; Modified: trunk/tora/src/core/todatabasesetting.cpp =================================================================== --- trunk/tora/src/core/todatabasesetting.cpp 2014-03-04 20:24:31 UTC (rev 5092) +++ trunk/tora/src/core/todatabasesetting.cpp 2014-03-05 15:09:40 UTC (rev 5093) @@ -64,7 +64,7 @@ case NumberFormat: return QVariant((int)0); case NumberDecimals: return QVariant((int)2); default: - Q_ASSERT_X( false, qPrintable(__QHERE__), qPrintable(QString("Context Editor un-registered enum value: %1").arg(option))); + Q_ASSERT_X( false, qPrintable(__QHERE__), qPrintable(QString("Context Database un-registered enum value: %1").arg(option))); return QVariant(); } } Modified: trunk/tora/src/core/toeditorsetting.h =================================================================== --- trunk/tora/src/core/toeditorsetting.h 2014-03-04 20:24:31 UTC (rev 5092) +++ trunk/tora/src/core/toeditorsetting.h 2014-03-05 15:09:40 UTC (rev 5093) @@ -38,6 +38,8 @@ #include "core/toconfenum.h" #include <QtCore/QVariant> +#include <QtGui/QColor> +#include <QtGui/QFont> namespace ToConfiguration { Modified: trunk/tora/src/core/toglobalsetting.cpp =================================================================== --- trunk/tora/src/core/toglobalsetting.cpp 2014-03-04 20:24:31 UTC (rev 5092) +++ trunk/tora/src/core/toglobalsetting.cpp 2014-03-05 15:09:40 UTC (rev 5093) @@ -104,7 +104,7 @@ case Style: return QVariant(QString("")); case Translation: return QVariant(QLocale().name()); default: - Q_ASSERT_X( false, qPrintable(__QHERE__), qPrintable(QString("Context Editor un-registered enum value: %1").arg(option))); + Q_ASSERT_X( false, qPrintable(__QHERE__), qPrintable(QString("Context Global un-registered enum value: %1").arg(option))); return QVariant(); } }; @@ -215,7 +215,7 @@ if (samples < 0) { UnlimitedSamples->setChecked(true); - ChartSamplesInt->setValue(DEFAULT_CHART_SAMPLES); + ChartSamplesInt->setValue(100); // 100 is the default value } else ChartSamplesInt->setValue(samples); Modified: trunk/tora/src/core/tohelp.cpp =================================================================== --- trunk/tora/src/core/tohelp.cpp 2014-03-04 20:24:31 UTC (rev 5092) +++ trunk/tora/src/core/tohelp.cpp 2014-03-05 15:09:40 UTC (rev 5093) @@ -52,7 +52,7 @@ // Paths case AdditionalHelpMap: return QVariant(QMap<QString, QVariant>()); default: - Q_ASSERT_X( false, qPrintable(__QHERE__), qPrintable(QString("Context Editor un-registered enum value: %1").arg(option))); + Q_ASSERT_X( false, qPrintable(__QHERE__), qPrintable(QString("Context Help un-registered enum value: %1").arg(option))); return QVariant(); } } Modified: trunk/tora/src/core/tolistviewformatter.cpp =================================================================== --- trunk/tora/src/core/tolistviewformatter.cpp 2014-03-04 20:24:31 UTC (rev 5092) +++ trunk/tora/src/core/tolistviewformatter.cpp 2014-03-05 15:09:40 UTC (rev 5093) @@ -35,20 +35,17 @@ #include "core/tolistviewformatter.h" #include "ts_log/ts_log_utils.h" -namespace ToConfiguration +QVariant ToConfiguration::Exporter::defaultValue(int option) const { -QVariant Exporter::defaultValue(int option) const -{ switch(option) { case CsvSeparator: return QVariant(QString(";")); case CsvDelimiter: return QVariant(QString("\"")); default: - Q_ASSERT_X( false, qPrintable(__QHERE__), qPrintable(QString("Context Editor un-registered enum value: %1").arg(option))); + Q_ASSERT_X( false, qPrintable(__QHERE__), qPrintable(QString("Context Exporter un-registered enum value: %1").arg(option))); return QVariant(); } } -} ToConfiguration::Exporter toExportSettings::s_Exporter; Modified: trunk/tora/src/core/tomainwindow.cpp =================================================================== --- trunk/tora/src/core/tomainwindow.cpp 2014-03-04 20:24:31 UTC (rev 5092) +++ trunk/tora/src/core/tomainwindow.cpp 2014-03-05 15:09:40 UTC (rev 5093) @@ -55,6 +55,7 @@ case StatusSave: return QVariant((int)10); case DontReread: return QVariant((bool)true); case EditDragDrop: return QVariant((bool)false); + case LineEnd: return QVariant(QString("Default")); case ToolsMap: { // by default all the tools (having menu item name) are enabled @@ -76,7 +77,7 @@ case LeftDockbarState: return QVariant(QByteArray()); case RightDockbarState: return QVariant(QByteArray()); default: - Q_ASSERT_X( false, qPrintable(__QHERE__), qPrintable(QString("Context Editor un-registered enum value: %1").arg(option))); + Q_ASSERT_X( false, qPrintable(__QHERE__), qPrintable(QString("Context Main un-registered enum value: %1").arg(option))); return QVariant(); } } Modified: trunk/tora/src/core/tomainwindow.h =================================================================== --- trunk/tora/src/core/tomainwindow.h 2014-03-04 20:24:31 UTC (rev 5092) +++ trunk/tora/src/core/tomainwindow.h 2014-03-05 15:09:40 UTC (rev 5093) @@ -63,6 +63,7 @@ , StatusSave // #define CONF_STATUS_SAVE (Message history size) , DontReread // #define CONF_DONT_REREAD , EditDragDrop // #define CONF_EDIT_DRAG_DROP (toScintilla) + , LineEnd , ToolsMap , MainWindowGeometry , MainWindowState Modified: trunk/tora/src/core/toresultlong.cpp =================================================================== --- trunk/tora/src/core/toresultlong.cpp 2014-03-04 20:24:31 UTC (rev 5092) +++ trunk/tora/src/core/toresultlong.cpp 2014-03-05 15:09:40 UTC (rev 5093) @@ -35,7 +35,8 @@ #include "core/toresultlong.h" #include "core/utils.h" #include "core/toeventquery.h" -#include "core/toconfiguration.h" +#include "core/toconfiguration_new.h" +#include "core/todatabasesetting.h" toResultLong::toResultLong(bool readable, bool dispCol, QWidget *parent, const char *name, Qt::WFlags f) @@ -103,7 +104,7 @@ //// Query->slotReadAll(); // indicate that all records should be fetched } else - MaxNumber = toConfigurationSingle::Instance().initialFetch(); + MaxNumber = toConfigurationNewSingle::Instance().option(ToConfiguration::Database::MaxNumber).toInt(); Query->start(); } catch (const toConnection::exception &str) Modified: trunk/tora/src/core/toresultmodel.cpp =================================================================== --- trunk/tora/src/core/toresultmodel.cpp 2014-03-04 20:24:31 UTC (rev 5092) +++ trunk/tora/src/core/toresultmodel.cpp 2014-03-05 15:09:40 UTC (rev 5093) @@ -40,6 +40,7 @@ #include "core/toqvalue.h" #include "core/toeventquery.h" #include "core/toconnectiontraits.h" +#include "core/todatabasesetting.h" #include <QtCore/QDebug> #include <QtCore/QMimeData> @@ -56,7 +57,7 @@ , SortedOnColumn(-1) , CurrRowKey(1) { - MaxRowsToAdd = MaxRows = toConfigurationNewSingle::Instance().initialFetch(); + MaxRowsToAdd = MaxRows = toConfigurationNewSingle::Instance().option(ToConfiguration::Database::MaxNumber).toInt(); Query = query; Query->setParent(this); // this will satisfy QObject's disposal @@ -96,7 +97,7 @@ , Query(NULL) , CurrRowKey(1) { - MaxRowsToAdd = MaxRows = toConfigurationNewSingle::Instance().initialFetch(); + MaxRowsToAdd = MaxRows = toConfigurationNewSingle::Instance().option(ToConfiguration::Database::MaxNumber).toInt(); setSupportedDragActions(Qt::CopyAction); @@ -539,8 +540,8 @@ return QVariant(rowDesc.key); return QVariant(data.displayData()); case Qt::BackgroundRole: - if (data.isNull() && toConfigurationNewSingle::Instance().indicateEmpty()) - return QVariant(QColor(toConfigurationNewSingle::Instance().indicateEmptyColor())); + if (data.isNull() && toConfigurationNewSingle::Instance().option(ToConfiguration::Database::IndicateEmpty).toBool()) + return QVariant(QColor(toConfigurationNewSingle::Instance().option(ToConfiguration::Database::IndicateEmptyColor).toString())); if (index.column() == 0) { return QPalette().color(QPalette::Window); } Modified: trunk/tora/src/core/toresulttableview.cpp =================================================================== --- trunk/tora/src/core/toresulttableview.cpp 2014-03-04 20:24:31 UTC (rev 5092) +++ trunk/tora/src/core/toresulttableview.cpp 2014-03-05 15:09:40 UTC (rev 5093) @@ -48,6 +48,7 @@ //#include "core/tolistviewformatteridentifier.h" #include "core/toworkingwidget.h" #include "core/toglobalsetting.h" +#include "core/todatabasesetting.h" #include <QtCore/QSize> #include <QtCore/QTimer> Modified: trunk/tora/src/core/toresultview.cpp =================================================================== --- trunk/tora/src/core/toresultview.cpp 2014-03-04 20:24:31 UTC (rev 5092) +++ trunk/tora/src/core/toresultview.cpp 2014-03-05 15:09:40 UTC (rev 5093) @@ -39,7 +39,10 @@ #include "core/tomemoeditor.h" #include "core/toresultlistformat.h" #include "core/toconfiguration_new.h" -#include "core/tomainwindow.h" +#include "core/toglobalsetting.h" +#include "core/todatabasesetting.h" +#include "core/toeditorsetting.h" +#include "core/toconfiguration_new.h" #include <QtCore/QTimer> #include <QtGui/QClipboard> @@ -203,8 +206,8 @@ { if (!MaxColDisp) { - MaxColDisp = toConfigurationNewSingle::Instance().maxColDisp(); - Gridlines = toConfigurationNewSingle::Instance().displayGridlines(); + MaxColDisp = toConfigurationNewSingle::Instance().option(ToConfiguration::Database::MaxColDisp).toInt(); + Gridlines = toConfigurationNewSingle::Instance().option(ToConfiguration::Global::DisplayGridlinesBool).toBool(); } QString t = text(column); if (t.isNull()) @@ -236,8 +239,8 @@ { if (!MaxColDisp) { - MaxColDisp = toConfigurationNewSingle::Instance().maxColDisp(); - Gridlines = toConfigurationNewSingle::Instance().displayGridlines(); + MaxColDisp = toConfigurationNewSingle::Instance().option(ToConfiguration::Database::MaxColDisp).toInt(); + Gridlines = toConfigurationNewSingle::Instance().option(ToConfiguration::Global::DisplayGridlinesBool).toBool(); } QString t = text(column); if (t.isNull()) @@ -396,8 +399,8 @@ { if (!MaxColDisp) { - MaxColDisp = toConfigurationNewSingle::Instance().maxColDisp(); - Gridlines = toConfigurationNewSingle::Instance().displayGridlines(); + MaxColDisp = toConfigurationNewSingle::Instance().option(ToConfiguration::Database::MaxColDisp).toInt(); + Gridlines = toConfigurationNewSingle::Instance().option(ToConfiguration::Global::DisplayGridlinesBool).toBool(); } QString t = text(column); if (t.isNull()) @@ -413,8 +416,8 @@ { if (!MaxColDisp) { - MaxColDisp = toConfigurationNewSingle::Instance().maxColDisp(); - Gridlines = toConfigurationNewSingle::Instance().displayGridlines(); + MaxColDisp = toConfigurationNewSingle::Instance().option(ToConfiguration::Database::MaxColDisp).toInt(); + Gridlines = toConfigurationNewSingle::Instance().option(ToConfiguration::Global::DisplayGridlinesBool).toBool(); } QString t = text(column); if (t.isNull()) @@ -490,7 +493,7 @@ SIGNAL(customContextMenuRequested(const QPoint &)), this, SLOT(displayMenu(const QPoint &))); - QString str(toConfigurationNewSingle::Instance().listFontName()); + QString str(toConfigurationNewSingle::Instance().option(ToConfiguration::Editor::ListTextFont).toString()); if (!str.isEmpty()) { QFont font(Utils::toStringToFont(str)); @@ -1224,8 +1227,8 @@ void toResultView::slotAddItem(void) { - MaxColDisp = toConfigurationNewSingle::Instance().maxColDisp(); - Gridlines = toConfigurationNewSingle::Instance().displayGridlines(); + MaxColDisp = toConfigurationNewSingle::Instance().option(ToConfiguration::Database::MaxColDisp).toInt(); + Gridlines = toConfigurationNewSingle::Instance().option(ToConfiguration::Global::DisplayGridlinesBool).toBool(); try { @@ -1320,7 +1323,7 @@ else setSorting(Query->columns()); - int MaxNumber = toConfigurationNewSingle::Instance().initialFetch(); + int MaxNumber = toConfigurationNewSingle::Instance().option(ToConfiguration::Database::MaxNumber).toInt(); for (int j = 0; j < MaxNumber && !Query->eof(); j++) slotAddItem(); if (ReadAll || MaxNumber < 0) Modified: trunk/tora/src/core/tosyntaxsetup.cpp =================================================================== --- trunk/tora/src/core/tosyntaxsetup.cpp 2014-03-04 20:24:31 UTC (rev 5092) +++ trunk/tora/src/core/tosyntaxsetup.cpp 2014-03-05 15:09:40 UTC (rev 5093) @@ -35,12 +35,12 @@ #include "core/tosyntaxsetup.h" #include "shortcuteditor/shortcuteditordialog.h" #include "core/totreewidget.h" -#include "core/toconfiguration.h" -#include "core/toconfiguration_new.h" #include "core/utils.h" #include "parsing/tosyntaxanalyzer.h" #include "editor/todebugtext.h" #include "editor/toworksheettext.h" +#include "core/toconfiguration_new.h" +#include "core/toeditorsetting.h" #include <QtGui/QFontDialog> #include <QtGui/QColorDialog> @@ -54,7 +54,7 @@ , toSettingTab("fonts.html") , ColorsEnum(ENUM_REF(toSyntaxAnalyzer,WordClassEnum)) , Current(NULL) - , Styles(toConfigurationSingle::Instance().styles()) + , Styles(toConfigurationNewSingle::Instance().option(ToConfiguration::Editor::EditStyleMap).value<toStylesMap>()) { using namespace ToConfiguration; @@ -62,25 +62,26 @@ setObjectName(name); setupUi(this); + Analyzer = new toSyntaxAnalyzerNL(Example->editor()); - SyntaxHighlighting->setCurrentIndex(toConfigurationSingle::Instance().syntaxHighlighting()); - //EditorType->setCurrentIndex(toConfigurationSingle::Instance().editorType()); - //KeywordUpper->setChecked(toConfigurationSingle::Instance().keywordUpper()); - //ObjectNamesUpper->setChecked(toConfigurationSingle::Instance().objectNamesUpper()); - CompletionSort->setChecked(toConfigurationSingle::Instance().completionSort()); + //SyntaxHighlighting->setCurrentIndex(toConfigurationNewSingle::Instance().syntaxHighlighting()); + //EditorType->setCurrentIndex(toConfigurationNewSingle::Instance().editorType()); + //KeywordUpper->setChecked(toConfigurationNewSingle::Instance().keywordUpper()); + //ObjectNamesUpper->setChecked(toConfigurationNewSingle::Instance().objectNamesUpper()); + //CompletionSort->setChecked(toConfigurationNewSingle::Instance().completionSort()); - UseMaxTextWidthMarkBool->setChecked(toConfigurationSingle::Instance().useMaxTextWidthMark()); - MaxTextWidthMark->setValue(toConfigurationSingle::Instance().maxTextWidthMark()); - CodeCompletionBool->setChecked(toConfigurationSingle::Instance().codeCompletion()); - EditorShortcuts->setChecked(toConfigurationNewSingle::Instance().option(Editor::UseEditorShortcutsBool).toBool()); + //UseMaxTextWidthMarkBool->setChecked(toConfigurationNewSingle::Instance().useMaxTextWidthMark()); + //MaxTextWidthMark->setValue(toConfigurationNewSingle::Instance().maxTextWidthMark()); + //CodeCompletionBool->setChecked(toConfigurationNewSingle::Instance().codeCompletion()); + //EditorShortcuts->setChecked(toConfigurationNewSingle::Instance().option(Editor::UseEditorShortcutsBool).toBool()); connect(EditorShortcutsEdit, SIGNAL(clicked()), this, SLOT(openEditorShortcutsDialog())); - //AutoIndentBool->setChecked(toConfigurationSingle::Instance().autoIndent()); - Extensions->setText(toConfigurationSingle::Instance().extensions()); - //TabStopInt->setValue(toConfigurationSingle::Instance().tabStop()); - //UseSpacesForIndentBool->setChecked(toConfigurationSingle::Instance().useSpacesForIndent()); + //AutoIndentBool->setChecked(toConfigurationNewSingle::Instance().autoIndent()); + //Extensions->setText(toConfigurationNewSingle::Instance().extensions()); + //TabStopInt->setValue(toConfigurationNewSingle::Instance().tabStop()); + //UseSpacesForIndentBool->setChecked(toConfigurationNewSingle::Instance().useSpacesForIndent()); { QFont font(Utils::toStringToFont(toConfigurationNewSingle::Instance().option(Editor::ConfCodeFont).toString())); @@ -91,12 +92,13 @@ TextExample->setFont(Utils::toStringToFont(toConfigurationNewSingle::Instance().option(Editor::ConfTextFont).toString())); { - QString str(toConfigurationSingle::Instance().listFontName()); + QString str(toConfigurationNewSingle::Instance().option(Editor::ListTextFont).toString()); QFont font; if (str.isEmpty()) { QWidget *wid = new toTreeWidget(this); font = qApp->font(wid); + delete wid; } else { @@ -249,32 +251,35 @@ void toSyntaxSetup::saveSetting(void) { - toConfigurationSingle::Instance().setSyntaxHighlighting(SyntaxHighlighting->currentIndex()); - toConfigurationSingle::Instance().setEditorType(EditorType->currentIndex()); + //toConfigurationNewSingle::Instance().setSyntaxHighlighting(SyntaxHighlighting->currentIndex()); + //toConfigurationNewSingle::Instance().setEditorType(EditorType->currentIndex()); - toConfigurationSingle::Instance().setTextFontName(Utils::toFontToString(TextExample->font())); - toConfigurationSingle::Instance().setCodeFontName(Utils::toFontToString(CodeExample->font())); - toConfigurationSingle::Instance().setListFontName(ListFontName); + //toConfigurationNewSingle::Instance().setTextFontName(Utils::toFontToString(TextExample->font())); + //toConfigurationNewSingle::Instance().setCodeFontName(Utils::toFontToString(CodeExample->font())); + //toConfigurationNewSingle::Instance().setListFontName(ListFontName); // TODO bool highlight = SyntaxHighlighting->isChecked(); - // TODO toConfigurationSingle::Instance().setHighlightType(highlight); - toConfigurationSingle::Instance().setUseMaxTextWidthMark(UseMaxTextWidthMarkBool->isChecked()); - toConfigurationSingle::Instance().setMaxTextWidthMark(MaxTextWidthMark->value()); - toConfigurationSingle::Instance().setKeywordUpper(KeywordUpper->isChecked()); - toConfigurationSingle::Instance().setObjectNamesUpper(ObjectNamesUpper->isChecked()); - // TODO toConfigurationSingle::Instance().setCodeCompletion(highlight && CodeCompletion->isChecked()); - toConfigurationSingle::Instance().setCompletionSort(CompletionSort->isChecked()); - toConfigurationSingle::Instance().setUseEditorShortcuts(EditorShortcuts->isChecked()); - toConfigurationSingle::Instance().setAutoIndent(AutoIndentBool->isChecked()); - toConfigurationSingle::Instance().setTabStop(TabStopInt->value()); - toConfigurationSingle::Instance().setUseSpacesForIndent(UseSpacesForIndentBool->isChecked()); + // TODO toConfigurationNewSingle::Instance().setHighlightType(highlight); + //toConfigurationNewSingle::Instance().setUseMaxTextWidthMark(UseMaxTextWidthMarkBool->isChecked()); + //toConfigurationNewSingle::Instance().setMaxTextWidthMark(MaxTextWidthMark->value()); + //toConfigurationNewSingle::Instance().setKeywordUpper(KeywordUpper->isChecked()); + //toConfigurationNewSingle::Instance().setObjectNamesUpper(ObjectNamesUpper->isChecked()); + // TODO toConfigurationNewSingle::Instance().setCodeCompletion(highlight && CodeCompletion->isChecked()); + //toConfigurationNewSingle::Instance().setCompletionSort(CompletionSort->isChecked()); + //toConfigurationNewSingle::Instance().setUseEditorShortcuts(EditorShortcuts->isChecked()); + //toConfigurationNewSingle::Instance().setAutoIndent(AutoIndentBool->isChecked()); + //toConfigurationNewSingle::Instance().setTabStop(TabStopInt->value()); + //toConfigurationNewSingle::Instance().setUseSpacesForIndent(UseSpacesForIndentBool->isChecked()); - toConfigurationSingle::Instance().setStyles(Styles); + //toConfigurationNewSingle::Instance().setStyles(Styles); //#define C2T(c) (Colors[Analyzer.typeString((c))]) -// toConfigurationSingle::Instance().setSyntaxDefaultBg(C2T(toSyntaxAnalyzer::DefaultBg)); -// toConfigurationSingle::Instance().setSyntaxDebugBg(C2T(toSyntaxAnalyzer::DebugBg)); -// toConfigurationSingle::Instance().setSyntaxErrorBg(C2T(toSyntaxAnalyzer::ErrorBg)); -// toConfigurationSingle::Instance().setSyntaxCurrentLineMarker(C2T(toSyntaxAnalyzer::CurrentLineMarker)); -// toConfigurationSingle::Instance().setSyntaxStaticBg(C2T(toSyntaxAnalyzer::StaticBg)); - toConfigurationSingle::Instance().setExtensions(Extensions->text()); +// toConfigurationNewSingle::Instance().setSyntaxDefaultBg(C2T(toSyntaxAnalyzer::DefaultBg)); +// toConfigurationNewSingle::Instance().setSyntaxDebugBg(C2T(toSyntaxAnalyzer::DebugBg)); +// toConfigurationNewSingle::Instance().setSyntaxErrorBg(C2T(toSyntaxAnalyzer::ErrorBg)); +// toConfigurationNewSingle::Instance().setSyntaxCurrentLineMarker(C2T(toSyntaxAnalyzer::CurrentLineMarker)); +// toConfigurationNewSingle::Instance().setSyntaxStaticBg(C2T(toSyntaxAnalyzer::StaticBg)); + //toConfigurationNewSingle::Instance().setExtensions(Extensions->text()); + toSettingTab::saveSettings(this); } + +ToConfiguration::Editor toSyntaxSetup::s_editorConfig; Modified: trunk/tora/src/core/tosyntaxsetup.h =================================================================== --- trunk/tora/src/core/tosyntaxsetup.h 2014-03-04 20:24:31 UTC (rev 5092) +++ trunk/tora/src/core/tosyntaxsetup.h 2014-03-05 15:09:40 UTC (rev 5093) @@ -39,6 +39,7 @@ #include "ui_tosyntaxsetupui.h" #include "core/totool.h" #include "editor/tostyle.h" +#include "core/toeditorsetting.h" #include <QtCore/QString> #include <QtCore/QMetaEnum> @@ -82,6 +83,7 @@ private: int wordClass() const; // returns enum toSyntaxAnalyzer::wordClass void checkFixedWidth(const QFont &fnt); + static ToConfiguration::Editor s_editorConfig; }; #endif Modified: trunk/tora/src/core/utils.cpp =================================================================== --- trunk/tora/src/core/utils.cpp 2014-03-04 20:24:31 UTC (rev 5092) +++ trunk/tora/src/core/utils.cpp 2014-03-05 15:09:40 UTC (rev 5093) @@ -673,7 +673,7 @@ { QString t = str; if (t.isEmpty()) - t = toConfigurationSingle::Instance().refresh(); + t = toConfigurationNewSingle::Instance().option(ToConfiguration::Global::RefreshInterval).toString(); if (t == qApp->translate("toRefreshCreate", "None") || t == "None") timer->stop(); @@ -986,7 +986,7 @@ if (!def.isNull()) str = def; else - str = toConfigurationSingle::Instance().refresh(); + str = toConfigurationNewSingle::Instance().option(ToConfiguration::Global::RefreshInterval).toString(); if (str == "2 seconds") refresh->setCurrentIndex(1); else if (str == "5 seconds") @@ -1247,4 +1247,96 @@ return true; } + +void toLoadMap(const QString &filename, std::map<QString, QString> &pairs) +{ + QByteArray data = Utils::toReadFile(filename).toUtf8(); + + int pos = 0; + int bol = 0; + int endtag = -1; + int wpos = 0; + int size = data.length(); + while (pos < size) + { + switch (data[pos]) + { + case '\n': + data[wpos] = 0; + if (endtag == -1) + throw QT_TRANSLATE_NOOP("toTool", "Malformed tag in config file. Missing = on row. (%1)").arg(QString(data.mid(bol, wpos - bol))); + { + QString tag = ((const char *)data) + bol; + QString val = ((const char *)data) + endtag + 1; + pairs[tag] = val; + } + bol = pos + 1; + endtag = -1; + wpos = pos; + break; + case '=': + if (endtag == -1) + { + endtag = pos; + data[wpos] = 0; + wpos = pos; + } + else + data[wpos] = data[pos]; + break; + case '\\': + pos++; + switch (data[pos]) + { + case 'n': + data[wpos] = '\n'; + break; + case '\\': + if (endtag >= 0) + data[wpos] = '\\'; + else + data[wpos] = ':'; + break; + default: + throw QT_TRANSLATE_NOOP("toTool", "Unknown escape character in string (Only \\\\ and \\n recognised)"); + } + break; + default: + data[wpos] = data[pos]; + break; + } + wpos++; + pos++; + } + + return; +} + + +bool toSaveMap(const QString &file, std::map<QString, QString> &pairs) +{ + QString data; + + { + // qt4 QRegExp newline(QString::fromLatin1("\n")); + // qt4 QRegExp backslash(QString::fromLatin1("\\")); + QString newline("\n"); + QString backslash("\\"); + for (std::map<QString, QString>::iterator i = pairs.begin(); i != pairs.end(); i++) + { + QString str = (*i).first; + str.append(QString::fromLatin1("=")); + str.replace(backslash, QString::fromLatin1("\\\\")); + str.replace(newline, QString::fromLatin1("\\n")); + QString line = (*i).second; + line.replace(backslash, QString::fromLatin1("\\\\")); + line.replace(newline, QString::fromLatin1("\\n")); + str += line.toUtf8(); + str += QString::fromLatin1("\n"); + data += str; + } + } + return Utils::toWriteFile(file, data); +} + } // namespace utils Modified: trunk/tora/src/core/utils.h =================================================================== --- trunk/tora/src/core/utils.h 2014-03-04 20:24:31 UTC (rev 5092) +++ trunk/tora/src/core/utils.h 2014-03-05 15:09:40 UTC (rev 5093) @@ -604,6 +604,9 @@ * */ unsigned toNextPowerOfTwo(unsigned len); +void toLoadMap(const QString &filename, std::map<QString, QString> &pairs); +bool toSaveMap(const QString &file, std::map<QString, QString> &pairs); + } #endif Modified: trunk/tora/src/core/utils_part.cpp =================================================================== --- trunk/tora/src/core/utils_part.cpp 2014-03-04 20:24:31 UTC (rev 5092) +++ trunk/tora/src/core/utils_part.cpp 2014-03-05 15:09:40 UTC (rev 5093) @@ -33,10 +33,10 @@ * END_COMMON_COPYRIGHT_HEADER */ #include "core/utils.h" -#include "core/toconf.h" -#include "core/toconfiguration.h" +#include "core/toconfiguration_new.h" #include "core/toglobalevent.h" #include "core/tomainwindow.h" +#include "core/toeditorsetting.h" #include <QtCore/QDir> #include <QtCore/QString> @@ -127,7 +127,7 @@ QString GetExtensions(void) { static QRegExp repl(QString::fromLatin1("\\s*,\\s*")); - QString t(toConfigurationSingle::Instance().extensions()); + QString t(toConfigurationNewSingle::Instance().option(ToConfiguration::Editor::Extensions).toString()); t.replace(repl, QString::fromLatin1(";;")); // multiple filters are separated by double semicolons return t; } @@ -138,7 +138,7 @@ if (t.isEmpty()) return t; - toConfigurationSingle::Instance().setLastDir(t); + toConfigurationNewSingle::Instance().setOption(ToConfiguration::Main::LastDir, QVariant(t)); if (hasext.indexIn(t) < 0) { @@ -162,8 +162,8 @@ */ QTextCodec * toGetCodec(void) { - QString codecConf = toConfigurationSingle::Instance().encoding(); - if (codecConf == DEFAULT_ENCODING) + QString codecConf = toConfigurationNewSingle::Instance().option(ToConfiguration::Main::Encoding).toString(); + if (codecConf == "Default") return QTextCodec::codecForLocale(); else return QTextCodec::codecForName(codecConf.toAscii()); @@ -216,17 +216,17 @@ retval = AddExt(TOFileDialog::getOpenFileName(parent, QObject::tr("Open File", "utils/toOpenFilename"), fi.absoluteFilePath(), t), t); else { - QString const& lastDir = toConfigurationSingle::Instance().lastDir(); + QString lastDir = toConfigurationNewSingle::Instance().option(ToConfiguration::Main::LastDir).toString(); retval = AddExt(TOFileDialog::getOpenFileName(parent, QObject::tr("Open File", "utils/toOpenFilename"), lastDir, t), t); } if (!retval.isEmpty()) - toConfigurationSingle::Instance().setLastDir(retval); + toConfigurationNewSingle::Instance().setOption(ToConfiguration::Main::LastDir, QVariant(retval)); return retval; } QString toOpenFilename(const QString &filter, QWidget *parent) { - QFileInfo fi(toConfigurationSingle::Instance().lastDir()); + QFileInfo fi(toConfigurationNewSingle::Instance().option(ToConfiguration::Main::LastDir).toString()); if ( fi.absoluteDir().exists()) return toOpenFilename( fi.absolutePath(), filter, parent); return toOpenFilename(QDir::currentPath(), filter, parent); @@ -240,7 +240,7 @@ QString dir = filename; if (dir.isNull()) - dir = toConfigurationSingle::Instance().lastDir(); + dir = toConfigurationNewSingle::Instance().option(ToConfiguration::Main::LastDir).toString(); return AddExt(TOFileDialog::getSaveFileName(parent, QObject::tr("Save File", "utils/toSaveFilename"), dir, t), t); } @@ -292,17 +292,17 @@ // Check if line end type should be changed to particular one // Note that line end type can be changed manually via menu - QString forceLineEndSetting = toConfigurationSingle::Instance().forceLineEnd(); - if (forceLineEndSetting == "Linux" || - forceLineEndSetting == "Windows" || - forceLineEndSetting == "Mac") + QString lineEndSetting = toConfigurationNewSingle::Instance().option(ToConfiguration::Main::LineEnd).toString(); + if (lineEndSetting == "Linux" || + lineEndSetting == "Windows" || + lineEndSetting == "Mac") { QByteArray ba = data; - if (toConfigurationSingle::Instance().forceLineEnd() == "Linux") + if (lineEndSetting == "Linux") changeLineEnds(&ba, T_EOL_LF); - else if (toConfigurationSingle::Instance().forceLineEnd() == "Windows") + else if (lineEndSetting == "Windows") changeLineEnds(&ba, T_EOL_CRLF); - else if (toConfigurationSingle::Instance().forceLineEnd() == "Mac") + else if (lineEndSetting == "Mac") changeLineEnds(&ba, T_EOL_CR); file.write(codec->fromUnicode(ba)); } Modified: trunk/tora/src/editor/toworksheettext.cpp =================================================================== --- trunk/tora/src/editor/toworksheettext.cpp 2014-03-04 20:24:31 UTC (rev 5092) +++ trunk/tora/src/editor/toworksheettext.cpp 2014-03-05 15:09:40 UTC (rev 5093) @@ -373,8 +373,6 @@ super::focusOutEvent(e); } -ToConfiguration::Editor toWorksheetText::s_EditorConfig; - #ifdef TORA3_SESSION void toWorksheetText::exportData(std::map<QString, QString> &data, const QString &prefix) { Modified: trunk/tora/src/editor/toworksheettext.h =================================================================== --- trunk/tora/src/editor/toworksheettext.h 2014-03-04 20:24:31 UTC (rev 5092) +++ trunk/tora/src/editor/toworksheettext.h 2014-03-05 15:09:40 UTC (rev 5093) @@ -121,8 +121,6 @@ int m_bookmarkMarginHandle; //! \brief Bookrmarks handler list used for navigation (next/prev) QList<int> m_bookmarks; - - static ToConfiguration::Editor s_EditorConfig; }; /** Modified: trunk/tora/src/parsing/tolexeroracle.cpp =================================================================== --- trunk/tora/src/parsing/tolexeroracle.cpp 2014-03-04 20:24:31 UTC (rev 5092) +++ trunk/tora/src/parsing/tolexeroracle.cpp 2014-03-05 15:09:40 UTC (rev 5093) @@ -35,7 +35,6 @@ #include "parsing/tolexeroracle.h" #include "parsing/tolexeroracleapis.h" #include "core/utils.h" -#include "core/toconfiguration.h" #include "core/toconfiguration_new.h" #include "editor/toworksheettext.h" @@ -73,33 +72,34 @@ mono = QFont(Utils::toStringToFont(toConfigurationNewSingle::Instance().option(Editor::ConfCodeFont).toString())); #endif + toStylesMap sMap = toConfigurationNewSingle::Instance().option(ToConfiguration::Editor::EditStyleMap).value<toStylesMap>(); declareStyle(Default, - toConfigurationSingle::Instance().styleFgColor(Default), - toConfigurationSingle::Instance().styleBgColor(Default), + sMap[Default].FGColor, + sMap[Default].BGColor, mono); declareStyle(Comment, - toConfigurationSingle::Instance().styleFgColor(Comment), - toConfigurationSingle::Instance().styleBgColor(Comment), + sMap[Comment].FGColor, + sMap[Comment].BGColor, mono); declareStyle(CommentMultiline, - toConfigurationSingle::Instance().styleFgColor(Comment), - toConfigurationSingle::Instance().styleBgColor(Comment), + sMap[Comment].FGColor, + sMap[Comment].BGColor, mono); declareStyle(Reserved, - toConfigurationSingle::Instance().styleFgColor(Reserved), - toConfigurationSingle::Instance().styleBgColor(Reserved), + sMap[Reserved].FGColor, + sMap[Reserved].BGColor, mono); declareStyle(Builtin, - toConfigurationSingle::Instance().styleFgColor(toSyntaxAnalyzer::KeywordSet5), - toConfigurationSingle::Instance().styleBgColor(toSyntaxAnalyzer::KeywordSet5), + sMap[toSyntaxAnalyzer::KeywordSet5].FGColor, + sMap[toSyntaxAnalyzer::KeywordSet5].BGColor, mono); declareStyle(Identifier, - toConfigurationSingle::Instance().styleFgColor(Identifier), - toConfigurationSingle::Instance().styleBgColor(Identifier), + sMap[Identifier].FGColor, + sMap[Identifier].BGColor, mono); declareStyle(OneLine, - toConfigurationSingle::Instance().styleFgColor(OneLine), - toConfigurationSingle::Instance().styleBgColor(OneLine), + sMap[OneLine].FGColor, + sMap[OneLine].BGColor, mono); declareStyle(Failure, QColor(Qt::black), Modified: trunk/tora/src/parsing/tosyntaxanalyzernl.cpp =================================================================== --- trunk/tora/src/parsing/tosyntaxanalyzernl.cpp 2014-03-04 20:24:31 UTC (rev 5092) +++ trunk/tora/src/parsing/tosyntaxanalyzernl.cpp 2014-03-05 15:09:40 UTC (rev 5093) @@ -32,8 +32,9 @@ * * END_COMMON_COPYRIGHT_HEADER */ -#include "core/toconfiguration.h" #include "parsing/tosyntaxanalyzer.h" +#include "core/toconfiguration_new.h" +#include "core/toeditorsetting.h" #include "editor/tosqltext.h" #include <QtCore/QString> @@ -144,29 +145,31 @@ retval->setFoldComments(true); retval->setFoldCompact(false); + toStylesMap sMap = toConfigurationNewSingle::Instance().option(ToConfiguration::Editor::EditStyleMap).value<toStylesMap>(); QMetaEnum StyleNameEnum(ENUM_REF(toSyntaxAnalyzer,WordClassEnum)); QsciLexerSQL *l = new QsciLexerSQL(NULL); for (int idx = 0; idx < StyleNameEnum.keyCount(); idx++) { int styleNameEnum = StyleNameEnum.value(idx); - retval->setColor(toConfigurationSingle::Instance().styleFgColor(styleNameEnum), styleNameEnum); - retval->setPaper(toConfigurationSingle::Instance().styleBgColor(styleNameEnum), styleNameEnum); - retval->setFont(toConfigurationSingle::Instance().codeFontName(), styleNameEnum); + retval->setColor(sMap.value(styleNameEnum).FGColor, styleNameEnum); + retval->setPaper(sMap.value(styleNameEnum).BGColor, styleNameEnum); + retval->setFont(toConfigurationNewSingle::Instance().option(ToConfiguration::Editor::ConfCodeFont).toString(), styleNameEnum); } - retval->setColor(toConfigurationSingle::Instance().styleFgColor(toSyntaxAnalyzer::Comment), QsciLexerSQL::CommentLine); - retval->setColor(toConfigurationSingle::Instance().styleFgColor(toSyntaxAnalyzer::Comment), QsciLexerSQL::CommentLineHash); - retval->setColor(toConfigurationSingle::Instance().styleFgColor(toSyntaxAnalyzer::Comment), QsciLexerSQL::PlusComment); - retval->setColor(toConfigurationSingle::Instance().styleFgColor(toSyntaxAnalyzer::Comment), QsciLexerSQL::CommentDocKeyword); - retval->setColor(toConfigurationSingle::Instance().styleFgColor(toSyntaxAnalyzer::Comment), QsciLexerSQL::CommentDocKeywordError); - retval->setPaper(toConfigurationSingle::Instance().styleBgColor(toSyntaxAnalyzer::Comment), QsciLexerSQL::CommentLine); - retval->setPaper(toConfigurationSingle::Instance().styleBgColor(toSyntaxAnalyzer::Comment), QsciLexerSQL::CommentLineHash); - retval->setPaper(toConfigurationSingle::Instance().styleBgColor(toSyntaxAnalyzer::Comment), QsciLexerSQL::PlusComment); - retval->setPaper(toConfigurationSingle::Instance().styleBgColor(toSyntaxAnalyzer::Comment), QsciLexerSQL::CommentDocKeyword); - retval->setPaper(toConfigurationSingle::Instance().styleBgColor(toSyntaxAnalyzer::Comment), QsciLexerSQL::CommentDocKeywordError); + retval->setColor(sMap.value(toSyntaxAnalyzer::Comment).FGColor, QsciLexerSQL::CommentLine); + retval->setColor(sMap.value(toSyntaxAnalyzer::Comment).FGColor, QsciLexerSQL::CommentLineHash); + retval->setColor(sMap.value(toSyntaxAnalyzer::Comment).FGColor, QsciLexerSQL::PlusComment); + retval->setColor(sMap.value(toSyntaxAnalyzer::Comment).FGColor, QsciLexerSQL::CommentDocKeyword); + retval->setColor(sMap.value(toSyntaxAnalyzer::Comment).FGColor, QsciLexerSQL::CommentDocKeywordError); - retval->setFont(toConfigurationSingle::Instance().codeFontName()); + retval->setPaper(sMap.value(toSyntaxAnalyzer::Comment).BGColor, QsciLexerSQL::CommentLine); + retval->setPaper(sMap.value(toSyntaxAnalyzer::Comment).BGColor, QsciLexerSQL::CommentLineHash); + retval->setPaper(sMap.value(toSyntaxAnalyzer::Comment).BGColor, QsciLexerSQL::PlusComment); + retval->setPaper(sMap.value(toSyntaxAnalyzer::Comment).BGColor, QsciLexerSQL::CommentDocKeyword); + retval->setPaper(sMap.value(toSyntaxAnalyzer::Comment).BGColor, QsciLexerSQL::CommentDocKeywordError); + retval->setFont(toConfigurationNewSingle::Instance().option(ToConfiguration::Editor::ConfCodeFont).toString()); + return retval; } Modified: trunk/tora/src/result/totablemodel.cpp =================================================================== --- trunk/tora/src/result/totablemodel.cpp 2014-03-04 20:24:31 UTC (rev 5092) +++ trunk/tora/src/result/totablemodel.cpp 2014-03-05 15:09:40 UTC (rev 5093) @@ -34,7 +34,8 @@ #include "result/totablemodel.h" -#include "core/toconfiguration.h" +#include "core/toconfiguration_new.h" +#include "core/todatabasesetting.h" #include "core/toqvalue.h" #include "ts_log/ts_log_utils.h" @@ -102,8 +103,8 @@ } return QVariant(data.displayData()); case Qt::BackgroundRole: - if (data.isNull() && toConfigurationSingle::Instance().indicateEmpty()) - return QVariant(QColor(toConfigurationSingle::Instance().indicateEmptyColor())); + if (data.isNull() && toConfigurationNewSingle::Instance().option(ToConfiguration::Database::IndicateEmpty).toBool()) + return QVariant(QColor(toConfigurationNewSingle::Instance().option(ToConfiguration::Database::IndicateEmptyColor).toString())); return QVariant(); // case Qt::TextAlignmentRole: // return (int) Headers.at(index.column()).align; Modified: trunk/tora/src/result/totreemodel.cpp =================================================================== --- trunk/tora/src/result/totreemodel.cpp 2014-03-04 20:24:31 UTC (rev 5092) +++ trunk/tora/src/result/totreemodel.cpp 2014-03-05 15:09:40 UTC (rev 5093) @@ -34,7 +34,8 @@ #include "result/totreemodel.h" -#include "core/toconfiguration.h" +#include "core/toconfiguration_new.h" +#include "core/todatabasesetting.h" #include "core/toqvalue.h" #include "ts_log/ts_log_utils.h" @@ -96,8 +97,8 @@ } return QVariant(data.displayData()); case Qt::BackgroundRole: - if (data.isNull() && toConfigurationSingle::Instance().indicateEmpty()) - return QVariant(QColor(toConfigurationSingle::Instance().indicateEmptyColor())); + if (data.isNull() && toConfigurationNewSingle::Instance().option(ToConfiguration::Database::IndicateEmpty).toBool()) + return QVariant(QColor(toConfigurationNewSingle::Instance().option(ToConfiguration::Database::IndicateEmptyColor).toString())); return QVariant(); // case Qt::TextAlignmentRole: // return (int) Headers.at(index.column()).align; Modified: trunk/tora/src/shortcuteditor/shortcutmodel.cpp =================================================================== --- trunk/tora/src/shortcuteditor/shortcutmodel.cpp 2014-03-04 20:24:31 UTC (rev 5092) +++ trunk/tora/src/shortcuteditor/shortcutmodel.cpp 2014-03-05 15:09:40 UTC (rev 5093) @@ -5,13 +5,13 @@ for which a new license (GPL+exception) is in place. */ #include "shortcuteditor/shortcutmodel.h" -#include "core/toconfiguration.h" +#include "core/toconfiguration_new.h" +#include "core/toeditorsetting.h" - ShortcutModel::ShortcutModel(QObject * /*parent*/) : QAbstractTableModel() { - EditorShortcutsMap map(toConfigurationSingle::Instance().editorShortcuts()); + EditorShortcutsMap map(toConfigurationNewSingle::Instance().option(ToConfiguration::Editor::EditorShortcutsMap).toMap()); EditorShortcutsMapIterator i(map); while (i.hasNext()) { @@ -131,5 +131,5 @@ foreach (p, m_values) ret[p.first] = p.second; - toConfigurationSingle::Instance().setEditorShortcuts(ret); + toConfigurationNewSingle::Instance().setOption(ToConfiguration::Editor::EditorShortcutsMap, QVariant(ret)); } Modified: trunk/tora/src/templates/totemplate.cpp =================================================================== --- trunk/tora/src/templates/totemplate.cpp 2014-03-04 20:24:31 UTC (rev 5092) +++ trunk/tora/src/templates/totemplate.cpp 2014-03-05 15:09:40 UTC (rev 5093) @@ -36,7 +36,7 @@ #include "core/utils.h" #include "core/tologger.h" -#include "core/toconfiguration.h" +#include "core/toconfiguration_new.h" #include "core/toconnection.h" #include "core/tohelp.h" #include "editor/toscintilla.h" @@ -61,14 +61,31 @@ #include "icons/totemplate.xpm" +typedef QMap<QString, QVariant> TemplatesMap; +typedef QMapIterator<QString, QVariant> TemplatesMapIterator; + +namespace ToConfiguration +{ + class Template : public ConfigContext + { + Q_OBJECT; + Q_ENUMS(OptionTypeEnum); + public: + Template() : ConfigContext("Template", ENUM_REF(Template,OptionTypeEnum)) {}; + enum OptionTypeEnum { + TemplateMap = 15000 + }; + }; +}; + static TemplatesMap DefaultText(void) { TemplatesMap def; #if !defined(TO_NO_ORACLE) - def["PL/SQL Functions"] = ":/templates/sqlfunctions.tpl"; - def["Optimizer Hints"] = ":/templates/hints.tpl"; - def["Log4PL/SQL"] = ":/templates/log4plsql.tpl"; + def["PL/SQL Functions"] = QVariant(":/templates/sqlfunctions.tpl"); + def["Optimizer Hints"] = QVariant(":/templates/hints.tpl"); + def["Log4PL/SQL"] = QVariant(":/templates/log4plsql.tpl"); #endif return def; @@ -339,17 +356,20 @@ toTemplatePrefs::toTemplatePrefs(toTool *tool, QWidget *parent, const char *name) - : QWidget(parent), toSettingTab("template.html#setup"), Tool(tool) + : QWidget(parent) + , toSettingTab("template.html#setup") + , Tool(tool) { setupUi(this); TemplatesMap def = DefaultText(); - TemplatesMapIterator i(toConfigurationSingle::Instance().templates()); + TemplatesMap tMap = toConfigurationNewSingle::Instance().option(ToConfiguration::Template::TemplateMap).toMap(); + TemplatesMapIterator i(tMap); while (i.hasNext()) { i.next(); - new toTreeWidgetItem(FileList, i.key(), i.value()); + new toTreeWidgetItem(FileList, i.key(), i.value().toString()); if (def.find(i.key()) != def.end()) def.erase(def.find(i.key())); } @@ -357,8 +377,9 @@ while (j.hasNext()) { j.next(); - new toTreeWidgetItem(FileList, j.key(), j.value()); + new toTreeWidgetItem(FileList, j.key(), j.value().toString()); } + toSettingTab::loadSettings(this); } @@ -373,7 +394,8 @@ m[item->text(0)] = item->text(1); } - toConfigurationSingle::Instance().setTemplates(m); + toConfigurationNewSingle::Instance().setOption(ToConfiguration::Template::TemplateMap, m); + toSettingTab::saveSettings(this); } @@ -396,7 +418,7 @@ std::map<QString, QString> pairs; try { - toConfigurationSingle::Instance().loadMap(file, pairs); + Utils::toLoadMap(file, pairs); } catch (...) { @@ -411,7 +433,7 @@ if (edit.exec()) { edit.changeSelection(); - if (!toConfigurationSingle::Instance().saveMap(file, pairs)) + if (!Utils::toSaveMap(file, pairs)) throw qApp->translate("toTemplatePrefs", "Couldn't write file"); } } @@ -753,11 +775,12 @@ { TemplatesMap def = DefaultText(); - TemplatesMapIterator i(toConfigurationSingle::Instance().templates()); + TemplatesMap tMap = toConfigurationNewSingle::Instance().option(ToConfiguration::Template::TemplateMap).toMap(); + TemplatesMapIterator i(tMap); while (i.hasNext()) { i.next(); - addFile(parent, i.key(), i.value()); + addFile(parent, i.key(), i.value().toString()); if (def.find(i.key()) != def.end()) def.erase(def.find(i.key())); } @@ -765,7 +788,7 @@ while (j.hasNext()) { j.next(); - addFile(parent, j.key(), j.value()); + addFile(parent, j.key(), j.value().toString()); } } @@ -774,7 +797,7 @@ std::map<QString, QString> pairs; try { - toConfigurationSingle::Instance().loadMap(file, pairs); + Utils::toLoadMap(file, pairs); toTemplateItem *last = new toTemplateItem(*this, parent, root); int lastLevel = 0; QStringList lstCtx; Modified: trunk/tora/src/tools/tobrowser.cpp =================================================================== --- trunk/tora/src/tools/tobrowser.cpp 2014-03-04 20:24:31 UTC (rev 5092) +++ trunk/tora/src/tools/tobrowser.cpp 2014-03-05 15:09:40 UTC (rev 5093) @@ -99,7 +99,7 @@ case FilterTablespaceType: return QVariant((int)0); case FilterText: return QVariant(QString("")); default: - Q_ASSERT_X( false, qPrintable(__QHERE__), qPrintable(QString("Context Editor un-registered enum value: %1").arg(option))); + Q_ASSERT_X( false, qPrintable(__QHERE__), qPrintable(QString("Context Browser un-registered enum value: %1").arg(option))); return QVariant(); } } @@ -192,7 +192,8 @@ " ORDER BY Tablespace_Name", "List the available tablespaces in a database."); -class toBrowserFilter : public toViewFilter +class toBrowserFilter + : public toViewFilter { enum FilterType // see toBrowserFilterSetup::ButtonsGroup { @@ -223,14 +224,15 @@ int tablespace, const std::list<QString> &tablespaces, bool onlyOwnSchema = false) - : Type(type), - IgnoreCase(cas), - Invert(invert), - Text(cas ? str.toUpper() : str), - TablespaceType(tablespace), - Tablespaces(tablespaces), - OnlyOwnSchema(onlyOwnSchema), - Empty(false) + : toViewFilter() + , Type(type) + , IgnoreCase(cas) + , Invert(invert) + , Text(cas ? str.toUpper() : str) + , TablespaceType(tablespace) + , Tablespaces(tablespaces) + , OnlyOwnSchema(onlyOwnSchema) + , Empty(false) { if (!str.isEmpty()) @@ -253,7 +255,7 @@ if (!empty) readFilterSettings(); else - toConfigurationNewSingle::Instance().setFilterType(FilterNone); // No filter type + toConfigurationNewSingle::Instance().setOption(ToConfiguration::Browser::FilterType, FilterNone); // No filter type } virtual ~toBrowserFilter() {}; @@ -265,12 +267,13 @@ virtual void storeFilterSettings(void) { - toConfigurationNewSingle::Instance().setFilterIgnoreCase(IgnoreCase); - toConfigurationNewSingle::Instance().setFilterInvert(Invert); - toConfigurationNewSingle::Instance().setFilterType(Type); - toConfigurationNewSingle::Instance().setFilterTablespaceType(TablespaceType); - toConfigurationNewSingle::Instance().setFilterText(Text); - toConfigurationNewSingle::Instance().saveConfig(); + using namespace ToConfiguration; + toConfigurationNewSingle::Instance().setOption(Browser::FilterIgnoreCase, IgnoreCase); + toConfigurationNewSingle::Instance().setOption(Browser::FilterInvert, Invert); + toConfigurationNewSingle::Instance().setOption(Browser::FilterType, Type); + toConfigurationNewSingle::Instance().setOption(Browser::FilterTablespaceType, TablespaceType); + toConfigurationNewSingle::Instance().setOption(Browser::FilterText, Text); + toConfigurationNewSingle::Instance().saveAll(); } virtual void readFilterSettings(void) @@ -464,7 +467,9 @@ friend class toBrowserFilterSetup; }; -class toBrowserFilterSetup : public QDialog, public Ui::toBrowserFilterUI +class toBrowserFilterSetup + : public QDialog + , public Ui::toBrowserFilterUI { private: QButtonGroup *ButtonsGroup; Modified: trunk/tora/src/tools/tobrowser.h =================================================================== --- trunk/tora/src/tools/tobrowser.h 2014-03-04 20:24:31 UTC (rev 5092) +++ trunk/tora/src/tools/tobrowser.h 2014-03-05 15:09:40 UTC (rev 5093) @@ -377,7 +377,7 @@ void addIndex(void); #endif private: - static ToConfiguration::Browser m_conf; + static ToConfiguration::Browser s_browserConf; }; Modified: trunk/tora/src/tools/tooutput.cpp =================================================================== --- trunk/tora/src/tools/tooutput.cpp 2014-03-04 20:24:31 UTC (rev 5092) +++ trunk/tora/src/tools/tooutput.cpp 2014-03-05 15:09:40 UTC (rev 5093) @@ -74,7 +74,7 @@ case LogType: return QVariant((int)0); case LogUser: return QVariant(QString("ULOG")); default: - Q_ASSERT_X( false, qPrintable(__QHERE__), qPrintable(QString("Context Editor un-registered enum value: %1").arg(option))); + Q_ASSERT_X( false, qPrintable(__QHERE__), qPrintable(QString("Context Output un-registered enum value: %1").arg(option))); return QVariant(); } } Modified: trunk/tora/src/tools/torollback.cpp =================================================================== --- trunk/tora/src/tools/torollback.cpp 2014-03-04 20:24:31 UTC (rev 5092) +++ trunk/tora/src/tools/torollback.cpp 2014-03-05 15:09:40 UTC (rev 5093) @@ -58,35 +58,20 @@ #include "icons/torollback.xpm" #include "icons/trash.xpm" -namespace ToConfiguration { - class Rollback : public ConfigContext + +QVariant ToConfiguration::Rollback::defaultValue(int option) const +{ + switch(option) { - Q_OBJECT; - Q_ENUMS(OptionTypeEnum); - public: - Rollback() : ConfigContext("Rollback", ENUM_REF(Rollback,OptionTypeEnum)) {}; - enum OptionTypeEnum { - NoExec = 10000 // #define CONF_NO_EXEC - , NeedRead // #define CONF_NEED_READ - , NeedTwo // #define CONF_NEED_TWO - , AlignLeft // #define CONF_ALIGN_LEFT - , OldEnable // #define CONF_OLD_ENABLE - }; - virtual QVariant defaultValue(int option) const - { - switch(option) - { - case NoExec: return QVariant((bool)true); - case NeedRead: return QVariant((bool)true); - case NeedTwo: return QVariant((bool)true); - case AlignLeft: return QVariant((bool)true); - case OldEnable: return QVariant((bool)false); - default: - Q_ASSERT_X( false, qPrintable(__QHERE__), qPrintable(QString("Context Editor un-registered enum value: %1").arg(option))); - return QVariant(); - } - } - }; + case NoExec: return QVariant((bool)true); + case NeedRead: return QVariant((bool)true); + case NeedTwo: return QVariant((bool)true); + case AlignLeft: return QVariant((bool)true); + case OldEnable: return QVariant((bool)false); + default: + Q_ASSERT_X( false, qPrintable(__QHERE__), qPrintable(QString("Context Rollback un-registered enum value: %1").arg(option))); + return QVariant(); + } } class toRollbackPrefs : public QGroupBox, public toSettingTab Modified: trunk/tora/src/tools/torollback.h =================================================================== --- trunk/tora/src/tools/torollback.h 2014-03-04 20:24:31 UTC (rev 5092) +++ trunk/tora/src/tools/torollback.h 2014-03-05 15:09:40 UTC (rev 5093) @@ -53,7 +53,25 @@ class toStorageDefinition; class toResultTableView; +namespace ToConfiguration { + class Rollback : public ConfigContext + { + Q_OBJECT; + Q_ENUMS(OptionTypeEnum); + public: + Rollback() : ConfigContext("Rollback", ENUM_REF(Rollback,OptionTypeEnum)) {}; + enum OptionTypeEnum { + NoExec = 10000 // #define CONF_NO_EXEC + , NeedRead // #define CONF_NEED_READ + , NeedTwo // #define CONF_NEED_TWO + , AlignLeft // #define CONF_ALIGN_LEFT + , OldEnable // #define CONF_OLD_ENABLE + }; + virtual QVariant defaultValue(int option) const; + }; +} + class toRollbackDialog : public QDialog, public Ui::toRollbackDialogUI { Q_OBJECT; Modified: trunk/tora/src/tools/tosgatrace.cpp =================================================================== --- trunk/tora/src/tools/tosgatrace.cpp 2014-03-04 20:24:31 UTC (rev 5092) +++ trunk/tora/src/tools/tosgatrace.cpp 2014-03-05 15:09:40 UTC (rev 5093) @@ -40,7 +40,8 @@ #include "core/toresulttableview.h" #include "core/utils.h" #include "core/totimer.h" -#include "core/toconfiguration.h" +#include "core/toconfiguration_new.h" +#include "core/toglobalsetting.h" #include <QtGui/QComboBox> #include <QtGui/QCheckBox> @@ -52,8 +53,6 @@ #include "icons/refresh.xpm" #include "icons/tosgatrace.xpm" -// #define CONF_AUTO_UPDATE "AutoUpdate" - class toSGATracePrefs : public QGroupBox, public toSettingTab { QCheckBox* AutoUpdate; @@ -61,7 +60,8 @@ public: toSGATracePrefs(toTool *tool, QWidget* parent = 0, const char* name = 0) - : QGroupBox(parent), toSettingTab("trace.html"), Tool(tool) + : QGroupBox(parent) + , toSettingTab("trace.html"), Tool(tool) { if (name) setObjectName(name); @@ -89,7 +89,8 @@ // if (!Tool->config(CONF_AUTO_UPDATE, "Yes").isEmpty()) // AutoUpdate->setChecked(true); - AutoUpdate->setChecked(toConfigurationSingle::Instance().autoUpdate()); + //AutoUpdate->setChecked(toConfigurationSingle::Instance().autoUpdate()); + toSettingTab::loadSettings(this); } virtual void saveSetting(void) { @@ -97,7 +98,8 @@ // Tool->setConfig(CONF_AUTO_UPDATE, "Yes"); // else // Tool->setConfig(CONF_AUTO_UPDATE, ""); - toConfigurationSingle::Instance().setAutoUpdate(AutoUpdate->isChecked()); + //toConfigurationSingle::Instance().setAutoUpdate(AutoUpdate->isChecked()); + toSettingTab::saveSettings(this); } }; @@ -124,6 +126,8 @@ return new toSGATracePrefs(this, parent); } virtual void closeWindow(toConnection &connection) {}; +private: + ToConfiguration::SgaTrace s_sgaTraconConf; }; static toSGATraceTool SGATraceTool; @@ -216,7 +220,7 @@ try { connect(timer(), SIGNAL(timeout(void)), this, SLOT(refresh(void))); - Utils::toRefreshParse(timer(), toConfigurationSingle::Instance().refresh()); + Utils::toRefreshParse(timer(), toConfigurationNewSingle::Instance().option(ToConfiguration::Global::RefreshInterval).toS... [truncated message content] |
From: <ibr...@us...> - 2014-03-06 13:17:47
|
Revision: 5095 http://sourceforge.net/p/tora/code/5095 Author: ibre5041 Date: 2014-03-06 13:17:43 +0000 (Thu, 06 Mar 2014) Log Message: ----------- few steps towards to the new config system - compiles but does not support load/save settings Modified Paths: -------------- trunk/tora/src/templates/totemplate.cpp trunk/tora/src/templates/totemplate.h trunk/tora/src/tools/tooutput.cpp trunk/tora/src/tools/tooutput.h Modified: trunk/tora/src/templates/totemplate.cpp =================================================================== --- trunk/tora/src/templates/totemplate.cpp 2014-03-05 19:13:33 UTC (rev 5094) +++ trunk/tora/src/templates/totemplate.cpp 2014-03-06 13:17:43 UTC (rev 5095) @@ -64,20 +64,6 @@ typedef QMap<QString, QVariant> TemplatesMap; typedef QMapIterator<QString, QVariant> TemplatesMapIterator; -namespace ToConfiguration -{ - class Template : public ConfigContext - { - Q_OBJECT; - Q_ENUMS(OptionTypeEnum); - public: - Template() : ConfigContext("Template", ENUM_REF(Template,OptionTypeEnum)) {}; - enum OptionTypeEnum { - TemplateMap = 15000 - }; - }; -}; - static TemplatesMap DefaultText(void) { TemplatesMap def; @@ -91,6 +77,21 @@ return def; } +QVariant ToConfiguration::Template::defaultValue(int option) const +{ + switch(option) + { + case TemplateMap: + { + QMap <QString, QVariant> retval; + return QVariant(retval); + } + default: + Q_ASSERT_X( false, qPrintable(__QHERE__), qPrintable(QString("Context Template un-registered enum value: %1").arg(option))); + return QVariant(); + } +}; + toTemplateEdit::toTemplateEdit(std::map<QString, QString> &pairs, QWidget *parent, const char *name) : QDialog(parent),//, name, true, Qt::WStyle_Maximize), @@ -515,8 +516,12 @@ return true; } virtual void closeWindow(toConnection &connection) {}; +private: + static ToConfiguration::Template s_templateConfig; }; +ToConfiguration::Template toTemplateTool::s_templateConfig; + static toTemplateTool TemplateTool; void toTemplate::hideEvent(QHideEvent *e) Modified: trunk/tora/src/templates/totemplate.h =================================================================== --- trunk/tora/src/templates/totemplate.h 2014-03-05 19:13:33 UTC (rev 5094) +++ trunk/tora/src/templates/totemplate.h 2014-03-06 13:17:43 UTC (rev 5095) @@ -62,9 +62,20 @@ class toTemplateProvider; class toEventQuery; -/** Not part of the API. - * @internal - */ +namespace ToConfiguration +{ + class Template : public ConfigContext + { + Q_OBJECT; + Q_ENUMS(OptionTypeEnum); + public: + Template() : ConfigContext("Template", ENUM_REF(Template,OptionTypeEnum)) {}; + enum OptionTypeEnum { + TemplateMap = 15000 + }; + QVariant defaultValue(int option) const; + }; +}; class toTemplate : public QWidget, public toHelpContext { Modified: trunk/tora/src/tools/tooutput.cpp =================================================================== --- trunk/tora/src/tools/tooutput.cpp 2014-03-05 19:13:33 UTC (rev 5094) +++ trunk/tora/src/tools/tooutput.cpp 2014-03-06 13:17:43 UTC (rev 5095) @@ -34,7 +34,6 @@ #include "tools/tooutput.h" #include "core/toconf.h" -#include "core/toconfenum.h" #include "core/toresultview.h" #include "core/totimer.h" #include "core/toglobalevent.h" @@ -53,32 +52,17 @@ #include "icons/refresh.xpm" #include "icons/tooutput.xpm" -namespace ToConfiguration +QVariant ToConfiguration::Output::defaultValue(int option) const { - class Output : public ConfigContext + switch(option) { - Q_OBJECT; - Q_ENUMS(OptionTypeEnum); - public: - Output() : ConfigContext("Output", ENUM_REF(Output,OptionTypeEnum)) {}; - enum OptionTypeEnum { - PollingInterval = 12000 // #define CONF_POLLING - , LogType // #define CONF_LOG_TYPE - , LogUser // #define CONF_LOG_USER - }; - QVariant defaultValue(int option) const - { - switch(option) - { - case PollingInterval: return QVariant(QString("10 seconds")); - case LogType: return QVariant((int)0); - case LogUser: return QVariant(QString("ULOG")); - default: - Q_ASSERT_X( false, qPrintable(__QHERE__), qPrintable(QString("Context Output un-registered enum value: %1").arg(option))); - return QVariant(); - } - } - }; + case PollingInterval: return QVariant(QString("10 seconds")); + case LogType: return QVariant((int)0); + case LogUser: return QVariant(QString("ULOG")); + default: + Q_ASSERT_X( false, qPrintable(__QHERE__), qPrintable(QString("Context Output un-registered enum value: %1").arg(option))); + return QVariant(); + } }; class toOutputPrefs : public QGroupBox, public toSettingTab @@ -199,8 +183,12 @@ { return new toOutputPrefs(this, parent); } +private: + static ToConfiguration::Output s_outputConf; }; +ToConfiguration::Output toOutputTool::s_outputConf; + static toOutputTool OutputTool; toOutput::toOutput(QWidget *main, toConnection &connection, bool enabled) Modified: trunk/tora/src/tools/tooutput.h =================================================================== --- trunk/tora/src/tools/tooutput.h 2014-03-05 19:13:33 UTC (rev 5094) +++ trunk/tora/src/tools/tooutput.h 2014-03-06 13:17:43 UTC (rev 5095) @@ -39,6 +39,7 @@ #include "core/totool.h" #include "editor/tomarkededitor.h" #include "core/tosql.h" +#include "core/toconfenum.h" #include <QtGui/QCloseEvent> #include <QtGui/QAction> @@ -49,6 +50,23 @@ class toConnection; class toResultView; +namespace ToConfiguration +{ + class Output : public ConfigContext + { + Q_OBJECT; + Q_ENUMS(OptionTypeEnum); + public: + Output() : ConfigContext("Output", ENUM_REF(Output,OptionTypeEnum)) {}; + enum OptionTypeEnum { + PollingInterval = 12000 // #define CONF_POLLING + , LogType // #define CONF_LOG_TYPE + , LogUser // #define CONF_LOG_USER + }; + QVariant defaultValue(int option) const; + }; +}; + class toOutput : public toToolWidget { Q_OBJECT; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ibr...@us...> - 2014-03-06 20:36:31
|
Revision: 5097 http://sourceforge.net/p/tora/code/5097 Author: ibre5041 Date: 2014-03-06 20:36:19 +0000 (Thu, 06 Mar 2014) Log Message: ----------- Options renamed Modified Paths: -------------- trunk/tora/src/connection/tooraclesetting.cpp trunk/tora/src/connection/tooraclesettingui.ui trunk/tora/src/core/main.cpp trunk/tora/src/core/tocache.cpp trunk/tora/src/core/toconfiguration_new.cpp trunk/tora/src/core/toconfiguration_new.h trunk/tora/src/core/toconnection.cpp trunk/tora/src/core/todatabasesetting.cpp trunk/tora/src/core/todatabasesetting.h trunk/tora/src/core/todatabasesettingui.ui trunk/tora/src/core/toeditorsetting.cpp trunk/tora/src/core/toeditorsetting.h trunk/tora/src/core/toeventqueryworker.cpp trunk/tora/src/core/toglobalsetting.cpp trunk/tora/src/core/toglobalsetting.h trunk/tora/src/core/toqvalue.cpp trunk/tora/src/core/toresultlistformat.cpp trunk/tora/src/core/toresultlong.cpp trunk/tora/src/core/toresultmodel.cpp trunk/tora/src/core/toresulttableview.cpp trunk/tora/src/core/toresultview.cpp trunk/tora/src/core/tosyntaxsetupui.ui trunk/tora/src/core/totool.cpp trunk/tora/src/result/totablemodel.cpp trunk/tora/src/result/totreemodel.cpp trunk/tora/src/tests/test2.cpp trunk/tora/src/tools/toworksheet.cpp Modified: trunk/tora/src/connection/tooraclesetting.cpp =================================================================== --- trunk/tora/src/connection/tooraclesetting.cpp 2014-03-06 17:06:41 UTC (rev 5096) +++ trunk/tora/src/connection/tooraclesetting.cpp 2014-03-06 20:36:19 UTC (rev 5097) @@ -95,9 +95,9 @@ int len = toConfigurationNewSingle::Instance().option(ToConfiguration::Oracle::MaxLong).toInt(); if (len >= 0) { - MaxLong->setText(QString::number(len)); - MaxLong->setValidator(new QIntValidator(MaxLong)); - Unlimited->setChecked(false); + MaxLongInt->setText(QString::number(len)); + MaxLongInt->setValidator(new QIntValidator(MaxLongInt)); + UnlimitedBool->setChecked(false); } // extractor group options //cbUseDbmsMetadata->setChecked(toConfigurationSingle::Instance().extractorUseDbmsMetadata()); @@ -109,8 +109,8 @@ //cbIncludeCode->setChecked(toConfigurationSingle::Instance().extractorIncludeCode()); //cbIncludeHeader->setChecked(toConfigurationSingle::Instance().extractorIncludeHeader()); //cbIncludePrompt->setChecked(toConfigurationSingle::Instance().extractorIncludePrompt()); - connect(cbUseDbmsMetadata, SIGNAL(toggled(bool)), this, SLOT(dbmsMetadataClicked(bool))); - dbmsMetadataClicked(cbUseDbmsMetadata->isChecked()); + connect(UseDbmsMetadataBool, SIGNAL(toggled(bool)), this, SLOT(dbmsMetadataClicked(bool))); + dbmsMetadataClicked(UseDbmsMetadataBool->isChecked()); try { // Check if connection exists @@ -139,7 +139,7 @@ //toConfigurationSingle::Instance().setPlanCheckpoint(CheckPoint->text()); //toConfigurationSingle::Instance().setPlanTable(ExplainPlan->text()); //toConfigurationSingle::Instance().setOpenCursors(OpenCursors->value()); - if (Unlimited->isChecked()) + if (UnlimitedBool->isChecked()) { //toConfigurationSingle::Instance().setMaxLong(-1); } @@ -161,14 +161,14 @@ void toOracleSetting::dbmsMetadataClicked(bool) { - cbIncludeStorage->setDisabled(cbUseDbmsMetadata->isChecked()); - cbSkipOrgMon->setDisabled(cbUseDbmsMetadata->isChecked()); - cbSkiptStorExTablespace->setDisabled(cbUseDbmsMetadata->isChecked()); - cbIncludeParallel->setDisabled(cbUseDbmsMetadata->isChecked()); - cbIncludePartition->setDisabled(cbUseDbmsMetadata->isChecked()); - cbIncludeCode->setDisabled(cbUseDbmsMetadata->isChecked()); - cbIncludeHeader->setDisabled(cbUseDbmsMetadata->isChecked()); - cbIncludePrompt->setDisabled(cbUseDbmsMetadata->isChecked()); + IncludeStorageBool->setDisabled(UseDbmsMetadataBool->isChecked()); + SkipOrgMonBool->setDisabled(UseDbmsMetadataBool->isChecked()); + SkiptStorExTablespaceBool->setDisabled(UseDbmsMetadataBool->isChecked()); + IncludeParallelBool->setDisabled(UseDbmsMetadataBool->isChecked()); + IncludePartitionBool->setDisabled(UseDbmsMetadataBool->isChecked()); + IncludeCodeBool->setDisabled(UseDbmsMetadataBool->isChecked()); + IncludeHeaderBool->setDisabled(UseDbmsMetadataBool->isChecked()); + IncludePromptBool->setDisabled(UseDbmsMetadataBool->isChecked()); } void toOracleSetting::createPlanTable() Modified: trunk/tora/src/connection/tooraclesettingui.ui =================================================================== --- trunk/tora/src/connection/tooraclesettingui.ui 2014-03-06 17:06:41 UTC (rev 5096) +++ trunk/tora/src/connection/tooraclesettingui.ui 2014-03-06 20:36:19 UTC (rev 5097) @@ -53,7 +53,7 @@ </widget> </item> <item row="2" column="2"> - <widget class="QCheckBox" name="Unlimited"> + <widget class="QCheckBox" name="UnlimitedBool"> <property name="text"> <string>Unlimited</string> </property> @@ -63,7 +63,7 @@ </widget> </item> <item row="4" column="2"> - <widget class="QCheckBox" name="VsqlPlans"> + <widget class="QCheckBox" name="VsqlPlansBool"> <property name="toolTip"> <string>Use V$SQL_PLAN when possible.</string> </property> @@ -89,7 +89,7 @@ </widget> </item> <item row="5" column="2"> - <widget class="QCheckBox" name="SharedPlan"> + <widget class="QCheckBox" name="SharedPlanBool"> <property name="enabled"> <bool>true</bool> </property> @@ -102,7 +102,7 @@ </widget> </item> <item row="3" column="2"> - <widget class="QCheckBox" name="KeepPlans"> + <widget class="QCheckBox" name="KeepPlansBool"> <property name="toolTip"> <string>Keep records for the plan explanations in the plan table.</string> </property> @@ -115,7 +115,7 @@ <widget class="QLineEdit" name="ExplainPlan"/> </item> <item row="2" column="1"> - <widget class="QLineEdit" name="MaxLong"/> + <widget class="QLineEdit" name="MaxLongInt"/> </item> <item row="2" column="0"> <widget class="QLabel" name="TextLabel6_3_2"> @@ -140,63 +140,63 @@ </property> <layout class="QVBoxLayout" name="verticalLayout" stretch="0,0,0,0,0,0,0,0,0"> <item> - <widget class="QCheckBox" name="cbUseDbmsMetadata"> + <widget class="QCheckBox" name="UseDbmsMetadataBool"> <property name="text"> <string>Use DBMS_METADATA</string> </property> </widget> </item> <item> - <widget class="QCheckBox" name="cbIncludeStorage"> + <widget class="QCheckBox" name="IncludeStorageBool"> <property name="text"> <string>Include storage information</string> </property> </widget> </item> <item> - <widget class="QCheckBox" name="cbSkipOrgMon"> + <widget class="QCheckBox" name="SkipOrgMonBool"> <property name="text"> <string> Skip organisation and monitoring</string> </property> </widget> </item> <item> - <widget class="QCheckBox" name="cbSkiptStorExTablespace"> + <widget class="QCheckBox" name="SkiptStorExTablespaceBool"> <property name="text"> <string> Skip storage except tablespace</string> </property> </widget> </item> <item> - <widget class="QCheckBox" name="cbIncludeParallel"> + <widget class="QCheckBox" name="IncludeParallelBool"> <property name="text"> <string>Include parallel information</string> </property> </widget> </item> <item> - <widget class="QCheckBox" name="cbIncludePartition"> + <widget class="QCheckBox" name="IncludePartitionBool"> <property name="text"> <string>Include partition information</string> </property> </widget> </item> <item> - <widget class="QCheckBox" name="cbIncludeCode"> + <widget class="QCheckBox" name="IncludeCodeBool"> <property name="text"> <string>Include code</string> </property> </widget> </item> <item> - <widget class="QCheckBox" name="cbIncludeHeader"> + <widget class="QCheckBox" name="IncludeHeaderBool"> <property name="text"> <string>Include header</string> </property> </widget> </item> <item> - <widget class="QCheckBox" name="cbIncludePrompt"> + <widget class="QCheckBox" name="IncludePromptBool"> <property name="text"> <string>Include prompt</string> </property> @@ -242,12 +242,12 @@ <tabstops> <tabstop>DefaultDate</tabstop> <tabstop>DefaultTimestamp</tabstop> - <tabstop>MaxLong</tabstop> - <tabstop>Unlimited</tabstop> + <tabstop>MaxLongInt</tabstop> + <tabstop>UnlimitedBool</tabstop> <tabstop>ExplainPlan</tabstop> - <tabstop>KeepPlans</tabstop> + <tabstop>KeepPlansBool</tabstop> <tabstop>CreatePlanTable</tabstop> - <tabstop>VsqlPlans</tabstop> + <tabstop>VsqlPlansBool</tabstop> </tabstops> <resources/> <connections> @@ -268,9 +268,9 @@ </hints> </connection> <connection> - <sender>Unlimited</sender> + <sender>UnlimitedBool</sender> <signal>toggled(bool)</signal> - <receiver>MaxLong</receiver> + <receiver>MaxLongInt</receiver> <slot>setDisabled(bool)</slot> <hints> <hint type="sourcelabel"> Modified: trunk/tora/src/core/main.cpp =================================================================== --- trunk/tora/src/core/main.cpp 2014-03-06 17:06:41 UTC (rev 5096) +++ trunk/tora/src/core/main.cpp 2014-03-06 20:36:19 UTC (rev 5097) @@ -298,8 +298,8 @@ toConfigurationNewSingle::Instance().setOption(ToConfiguration::Main::FirstInstall, QDateTime::currentDateTime().toString()); toQValue::setNumberFormat( - toConfigurationNewSingle::Instance().option(ToConfiguration::Database::NumberFormat).toInt() - , toConfigurationNewSingle::Instance().option(ToConfiguration::Database::NumberDecimals).toInt() + toConfigurationNewSingle::Instance().option(ToConfiguration::Database::NumberFormatInt).toInt() + , toConfigurationNewSingle::Instance().option(ToConfiguration::Database::NumberDecimalsInt).toInt() ); qRegisterMetaType<toQColumnDescriptionList>("toQColumnDescriptionList&"); Modified: trunk/tora/src/core/tocache.cpp =================================================================== --- trunk/tora/src/core/tocache.cpp 2014-03-06 17:06:41 UTC (rev 5096) +++ trunk/tora/src/core/tocache.cpp 2014-03-06 20:36:19 UTC (rev 5097) @@ -473,7 +473,7 @@ } void toCache::readCache() { - if (toConfigurationNewSingle::Instance().option(ToConfiguration::Database::ObjectCache).toInt() == NEVER) + if (toConfigurationNewSingle::Instance().option(ToConfiguration::Database::ObjectCacheInt).toInt() == NEVER) { QWriteLocker lock(&cacheLock); clearCache(); @@ -564,7 +564,7 @@ return; } - if (!toConfigurationNewSingle::Instance().option(ToConfiguration::Database::ObjectCache).toInt()) + if (!toConfigurationNewSingle::Instance().option(ToConfiguration::Database::ObjectCacheInt).toInt()) return; QFileInfo fileInfo(cacheFile()); @@ -613,7 +613,7 @@ } bool toCache::loadDiskCache() { - if (!toConfigurationNewSingle::Instance().option(ToConfiguration::Database::ObjectCache).toInt()) + if (!toConfigurationNewSingle::Instance().option(ToConfiguration::Database::ObjectCacheInt).toInt()) return false; QFileInfo fileInfo(cacheFile()); Modified: trunk/tora/src/core/toconfiguration_new.cpp =================================================================== --- trunk/tora/src/core/toconfiguration_new.cpp 2014-03-06 17:06:41 UTC (rev 5096) +++ trunk/tora/src/core/toconfiguration_new.cpp 2014-03-06 20:36:19 UTC (rev 5097) @@ -119,3 +119,65 @@ return QString::fromAscii(SHARE_DIR); #endif } + +template<> +void toConfigurationNew::setOption <QVariant>(int option, QVariant const& newVal) +{ +#ifdef QT_DEBUG + ToConfiguration::ConfigContext const* ctx = m_configContextPtrMap.value(option); + QVariant val = ctx->defaultValue(option); + Q_ASSERT_X(newVal.type() == val.type(), qPrintable(__QHERE__), qPrintable(QString("Option enum: %1 oldtype: %2 newtype %3") + .arg(option) + .arg(val.typeName()) + .arg(newVal.typeName()) + )); +#endif + m_configMap[option] = newVal; +} + +template<> TORA_EXPORT +void toConfigurationNew::setOption <QString>(int option, QString const& newVal) +{ +#ifdef QT_DEBUG + ToConfiguration::ConfigContext const* ctx = m_configContextPtrMap.value(option); + QVariant val = ctx->defaultValue(option); + Q_ASSERT_X(QVariant::String == val.type(), qPrintable(__QHERE__), qPrintable(QString("Option enum: %1 oldtype: %2 newtype QString") + .arg(option) + .arg(val.typeName()) + )); +#endif + m_configMap[option] = QVariant(newVal); +} + +template<> TORA_EXPORT +void toConfigurationNew::setOption <int>(int option, int const&newVal) +{ +#ifdef QT_DEBUG + ToConfiguration::ConfigContext const* ctx = m_configContextPtrMap.value(option); + QVariant val = ctx->defaultValue(option); + Q_ASSERT_X(QVariant::Int == val.type(), qPrintable(__QHERE__), qPrintable(QString("Option enum: %1 oldtype: %2 newtype int") + .arg(option) + .arg(val.typeName()) + )); +#endif + m_configMap[option] = QVariant(newVal); +} + +template<> TORA_EXPORT +void toConfigurationNew::setOption <bool>(int option, bool const&newVal) +{ +#ifdef QT_DEBUG + ToConfiguration::ConfigContext const* ctx = m_configContextPtrMap.value(option); + QVariant val = ctx->defaultValue(option); + Q_ASSERT_X(QVariant::Bool == val.type(), qPrintable(__QHERE__), qPrintable(QString("Option enum: %1 oldtype: %2 newtype bool") + .arg(option) + .arg(val.typeName()) + )); +#endif + m_configMap[option] = QVariant(newVal); +} + +void toConfigurationNew::logUnknownOption(QString const&) +{ + +} Modified: trunk/tora/src/core/toconfiguration_new.h =================================================================== --- trunk/tora/src/core/toconfiguration_new.h 2014-03-06 17:06:41 UTC (rev 5096) +++ trunk/tora/src/core/toconfiguration_new.h 2014-03-06 20:36:19 UTC (rev 5097) @@ -31,8 +31,21 @@ QVariant option(int option); QVariant option(QString const& option); - template <class T> void setOption(int option, T const&) {}; + template <class T> void setOption(QString const& optionName, T const& newVal) + { + if (m_optionToEnumMap.contains(optionName)) + { + setOption(m_optionToEnumMap.value(optionName), newVal); + } else { + logUnknownOption(optionName); + } + } + template <class T> void setOption(int option, T const&) + { + + }; + void saveAll(); /*! \brief Set the QSettings access strings. @@ -48,6 +61,8 @@ protected: void registerConfigContext(QString const& context, QMetaEnum const& fields, ToConfiguration::ConfigContext const*); private: + void logUnknownOption(QString const&); + QMap<unsigned, QVariant> m_configMap; QMap<unsigned, ToConfiguration::ConfigContext const*> m_configContextPtrMap; QMap<QString, QMetaEnum> m_contextMap; @@ -55,6 +70,18 @@ QMap<QString, int> m_optionToEnumMap; }; +template<> TORA_EXPORT +void toConfigurationNew::setOption <QVariant>(int option, QVariant const&); + +template<> TORA_EXPORT +void toConfigurationNew::setOption <QString>(int option, QString const&); + +template<> TORA_EXPORT +void toConfigurationNew::setOption <int>(int option, int const&); + +template<> TORA_EXPORT +void toConfigurationNew::setOption <bool>(int option, bool const&); + class TORA_EXPORT toConfigurationNewSingle: public ::Loki::SingletonHolder<toConfigurationNew> {}; #endif Modified: trunk/tora/src/core/toconnection.cpp =================================================================== --- trunk/tora/src/core/toconnection.cpp 2014-03-06 17:06:41 UTC (rev 5096) +++ trunk/tora/src/core/toconnection.cpp 2014-03-06 20:36:19 UTC (rev 5097) @@ -82,7 +82,7 @@ ////Version = connSub->version(); { QMutexLocker clock(&ConnectionLock); - if (toConfigurationNewSingle::Instance().option(ToConfiguration::Database::ObjectCache).toInt() == toCache::ON_CONNECT) + if (toConfigurationNewSingle::Instance().option(ToConfiguration::Database::ObjectCacheInt).toInt() == toCache::ON_CONNECT) pCache->readCache(); } @@ -117,7 +117,7 @@ ////Version = connSub->version(); { QMutexLocker clock(&ConnectionLock); - if (toConfigurationNewSingle::Instance().option(ToConfiguration::Database::ObjectCache) == toCache::ON_CONNECT) + if (toConfigurationNewSingle::Instance().option(ToConfiguration::Database::ObjectCacheInt) == toCache::ON_CONNECT) pCache->readCache(); } @@ -462,7 +462,7 @@ if(conn->isBroken()) { delete conn; - } else if(Connections.size() >= toConfigurationNewSingle::Instance().option(ToConfiguration::Database::CachedConnections).toInt()) { + } else if(Connections.size() >= toConfigurationNewSingle::Instance().option(ToConfiguration::Database::CachedConnectionsInt).toInt()) { delete conn; } else Modified: trunk/tora/src/core/todatabasesetting.cpp =================================================================== --- trunk/tora/src/core/todatabasesetting.cpp 2014-03-06 17:06:41 UTC (rev 5096) +++ trunk/tora/src/core/todatabasesetting.cpp 2014-03-06 20:36:19 UTC (rev 5097) @@ -50,19 +50,19 @@ { switch(option) { - case ObjectCache: return QVariant((int)1); + case ObjectCacheInt: return QVariant((int)1); case CacheTimeout: return QVariant((int)7); - case AutoCommit: return QVariant((bool)false); - case FirewallMode: return QVariant((bool)false); + case AutoCommitBool: return QVariant((bool)false); + case FirewallModeBool: return QVariant((bool)false); case ConnectionTestInterval: return QVariant((int)900); //15min - case CachedConnections: return QVariant((int)4); - case MaxNumber: return QVariant((int)50); - case MaxContent: return QVariant((int)100); - case MaxColDisp: return QVariant((int)300); - case IndicateEmpty: return QVariant((bool)true); + case CachedConnectionsInt: return QVariant((int)4); + case InitialFetchInt: return QVariant((int)50); + case MaxContentInt: return QVariant((int)100); + case MaxColDispInt: return QVariant((int)300); + case IndicateEmptyBool: return QVariant((bool)true); case IndicateEmptyColor: return QVariant(QString("#f2ffbc")); - case NumberFormat: return QVariant((int)0); - case NumberDecimals: return QVariant((int)2); + case NumberFormatInt: return QVariant((int)0); + case NumberDecimalsInt: return QVariant((int)2); default: Q_ASSERT_X( false, qPrintable(__QHERE__), qPrintable(QString("Context Database un-registered enum value: %1").arg(option))); return QVariant(); @@ -71,7 +71,7 @@ void toDatabaseSetting::numberFormatChange() { - Decimals->setEnabled(NumberFormat->currentIndex() == 2); + DecimalsInt->setEnabled(NumberFormatInt->currentIndex() == 2); } void toDatabaseSetting::IndicateEmptyColor_clicked() @@ -96,21 +96,21 @@ setObjectName(name); setupUi(this); - MaxColDisp->setValue(toConfigurationNewSingle::Instance().option(ToConfiguration::Database::MaxColDisp).toInt()); - int mxNumber = toConfigurationNewSingle::Instance().option(ToConfiguration::Database::MaxNumber).toInt(); + MaxColDispInt->setValue(toConfigurationNewSingle::Instance().option(ToConfiguration::Database::MaxColDispInt).toInt()); + int mxNumber = toConfigurationNewSingle::Instance().option(ToConfiguration::Database::InitialFetchInt).toInt(); if (mxNumber <= 0) - FetchAll->setChecked(true); + FetchAllBool->setChecked(true); else - InitialFetch->setValue(mxNumber); + InitialFetchInt->setValue(mxNumber); - int mxContent = toConfigurationNewSingle::Instance().option(ToConfiguration::Database::MaxContent).toInt(); + int mxContent = toConfigurationNewSingle::Instance().option(ToConfiguration::Database::MaxContentInt).toInt(); if (mxContent <= 0) { - MaxContent->setValue(InitialFetch->value()); - UnlimitedContent->setChecked(true); + MaxContentInt->setValue(InitialFetchInt->value()); + UnlimitedContentBool->setChecked(true); } else - MaxContent->setValue(mxContent); + MaxContentInt->setValue(mxContent); // MaxColDisp->setValidator(new QIntValidator(MaxColDisp)); // InitialFetch->setValidator(new QIntValidator(InitialFetch)); @@ -119,8 +119,8 @@ //NumberFormat->setCurrentIndex(toConfigurationNewSingle::Instance().option(ToConfiguration::Database::numberFormat()); //Decimals->setValue(toConfigurationNewSingle::Instance().option(ToConfiguration::Database::numberDecimals()); - if (NumberFormat->currentIndex() == 2) - Decimals->setEnabled(true); + if (NumberFormatInt->currentIndex() == 2) + DecimalsInt->setEnabled(true); //AutoCommit->setChecked(toConfigurationNewSingle::Instance().option(ToConfiguration::Database::autoCommit()); // DontReread->setChecked(toConfigurationNewSingle::Instance().option(ToConfiguration::Database::dontReread()); @@ -142,7 +142,7 @@ // MoveAfter->setValue(val); // KeepAlive->setChecked(toConfigurationNewSingle::Instance().option(ToConfiguration::Database::keepAlive()); - connect(IndicateEmpty, SIGNAL(clicked(bool)), + connect(IndicateEmptyBool, SIGNAL(clicked(bool)), IndicateEmptyColor, SLOT(setEnabled(bool))); } @@ -159,27 +159,27 @@ ///toConfigurationNewSingle::Instance().option(ToConfiguration::Database::setCachedConnections(CachedConnections->value()); - if (FetchAll->isChecked()) - toConfigurationNewSingle::Instance().setOption(ToConfiguration::Database::MaxNumber, -1); + if (FetchAllBool->isChecked()) + toConfigurationNewSingle::Instance().setOption(ToConfiguration::Database::InitialFetchInt, -1); else - toConfigurationNewSingle::Instance().setOption(ToConfiguration::Database::MaxNumber, InitialFetch->value()); + toConfigurationNewSingle::Instance().setOption(ToConfiguration::Database::InitialFetchInt, InitialFetchInt->value()); - if (UnlimitedContent->isChecked()) - toConfigurationNewSingle::Instance().setOption(ToConfiguration::Database::MaxContent, -1); + if (UnlimitedContentBool->isChecked()) + toConfigurationNewSingle::Instance().setOption(ToConfiguration::Database::MaxContentInt, -1); else { - int num = InitialFetch->value(); - int maxnum = MaxContent->value(); + int num = InitialFetchInt->value(); + int maxnum = MaxContentInt->value(); if (num < 0) maxnum = num; else if (num >= maxnum) maxnum = num + 1; - if (maxnum != MaxContent->text().toInt()) + if (maxnum != MaxContentInt->text().toInt()) TOMessageBox::information(this, tr("Invalid values"), tr("Doesn't make sense to have max content less than initial\n" "fetch size. Will adjust value to be higher."), tr("&Ok")); - toConfigurationNewSingle::Instance().setOption(ToConfiguration::Database::MaxContent, maxnum); + toConfigurationNewSingle::Instance().setOption(ToConfiguration::Database::MaxContentInt, maxnum); } ////toConfigurationNewSingle::Instance().option(ToConfiguration::Database::setMaxColDisp(MaxColDisp->value()); @@ -196,7 +196,7 @@ ////toConfigurationNewSingle::Instance().option(ToConfiguration::Database::setNumberFormat(NumberFormat->currentIndex()); ////toConfigurationNewSingle::Instance().option(ToConfiguration::Database::setNumberDecimals(Decimals->value()); - toQValue::setNumberFormat(NumberFormat->currentIndex(), Decimals->value()); + toQValue::setNumberFormat(NumberFormatInt->currentIndex(), DecimalsInt->value()); // toUpdateIndicateEmpty(); } Modified: trunk/tora/src/core/todatabasesetting.h =================================================================== --- trunk/tora/src/core/todatabasesetting.h 2014-03-06 17:06:41 UTC (rev 5096) +++ trunk/tora/src/core/todatabasesetting.h 2014-03-06 20:36:19 UTC (rev 5097) @@ -48,19 +48,19 @@ public: Database() : ConfigContext("Database", ENUM_REF(Database,OptionTypeEnum)) {}; enum OptionTypeEnum { - ObjectCache = 4000 // #define CONF_OBJECT_CACHE - , CacheTimeout // #define CONF_CACHE_TIMEOUT - , AutoCommit // #define CONF_AUTO_COMMIT - , FirewallMode // #define CONF_FIREWALL_MODE + ObjectCacheInt = 4000 // #define CONF_OBJECT_CACHE + , CacheTimeout // #define CONF_CACHE_TIMEOUT (invisible) + , AutoCommitBool // #define CONF_AUTO_COMMIT + , FirewallModeBool // #define CONF_FIREWALL_MODE , ConnectionTestInterval // #define CONF_CONN_TEST_INTERVAL - , CachedConnections - , MaxNumber // #define CONF_MAX_NUMBER (InitialFetch) - , MaxContent // #define CONF_MAX_CONTENT (InitialEditorContent) - , MaxColDisp // #define CONF_MAX_COL_DISP - , IndicateEmpty // #define CONF_INDICATE_EMPTY + , CachedConnectionsInt + , InitialFetchInt // #define CONF_MAX_NUMBER (InitialFetch) + , MaxContentInt // #define CONF_MAX_CONTENT (InitialEditorContent) + , MaxColDispInt // #define CONF_MAX_COL_DISP + , IndicateEmptyBool // #define CONF_INDICATE_EMPTY , IndicateEmptyColor // #define CONF_INDICATE_EMPTY_COLOR - , NumberFormat // #define CONF_NUMBER_FORMAT - , NumberDecimals // #define CONF_NUMBER_DECIMALS + , NumberFormatInt // #define CONF_NUMBER_FORMAT + , NumberDecimalsInt // #define CONF_NUMBER_DECIMALS }; virtual QVariant defaultValue(int) const; }; Modified: trunk/tora/src/core/todatabasesettingui.ui =================================================================== --- trunk/tora/src/core/todatabasesettingui.ui 2014-03-06 17:06:41 UTC (rev 5096) +++ trunk/tora/src/core/todatabasesettingui.ui 2014-03-06 20:36:19 UTC (rev 5097) @@ -68,12 +68,12 @@ <bool>false</bool> </property> <property name="buddy"> - <cstring>MaxColDisp</cstring> + <cstring>MaxColDispInt</cstring> </property> </widget> </item> <item row="2" column="1"> - <widget class="QSpinBox" name="MaxColDisp"> + <widget class="QSpinBox" name="MaxColDispInt"> <property name="enabled"> <bool>false</bool> </property> @@ -89,7 +89,7 @@ </widget> </item> <item row="1" column="1"> - <widget class="QSpinBox" name="MaxContent"> + <widget class="QSpinBox" name="MaxContentInt"> <property name="enabled"> <bool>false</bool> </property> @@ -116,7 +116,7 @@ <bool>false</bool> </property> <property name="buddy"> - <cstring>InitialFetch</cstring> + <cstring>InitialFetchInt</cstring> </property> </widget> </item> @@ -138,12 +138,12 @@ <bool>false</bool> </property> <property name="buddy"> - <cstring>MaxContent</cstring> + <cstring>MaxContentInt</cstring> </property> </widget> </item> <item row="0" column="1"> - <widget class="QSpinBox" name="InitialFetch"> + <widget class="QSpinBox" name="InitialFetchInt"> <property name="sizePolicy"> <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> <horstretch>1</horstretch> @@ -153,7 +153,7 @@ </widget> </item> <item row="1" column="2"> - <widget class="QCheckBox" name="UnlimitedContent"> + <widget class="QCheckBox" name="UnlimitedContentBool"> <property name="enabled"> <bool>false</bool> </property> @@ -163,7 +163,7 @@ </widget> </item> <item row="0" column="2"> - <widget class="QCheckBox" name="FetchAll"> + <widget class="QCheckBox" name="FetchAllBool"> <property name="text"> <string>&All</string> </property> @@ -201,7 +201,7 @@ </widget> </item> <item row="1" column="3"> - <widget class="QSpinBox" name="Decimals"> + <widget class="QSpinBox" name="DecimalsInt"> <property name="enabled"> <bool>false</bool> </property> @@ -214,14 +214,14 @@ </widget> </item> <item row="0" column="0" colspan="2"> - <widget class="QCheckBox" name="IndicateEmpty"> + <widget class="QCheckBox" name="IndicateEmptyBool"> <property name="text"> <string>Indicate empty values as '' instead of &NULL as {null}.</string> </property> </widget> </item> <item row="1" column="1"> - <widget class="QComboBox" name="NumberFormat"> + <widget class="QComboBox" name="NumberFormatInt"> <item> <property name="text"> <string>Default</string> @@ -258,7 +258,7 @@ <bool>false</bool> </property> <property name="buddy"> - <cstring>Decimals</cstring> + <cstring>DecimalsInt</cstring> </property> </widget> </item> @@ -285,7 +285,7 @@ </property> <layout class="QGridLayout"> <item row="1" column="0"> - <widget class="QCheckBox" name="FirewallMode"> + <widget class="QCheckBox" name="FirewallModeBool"> <property name="enabled"> <bool>false</bool> </property> @@ -323,7 +323,7 @@ </widget> </item> <item row="2" column="1"> - <widget class="QSpinBox" name="ConnTestInterval"> + <widget class="QSpinBox" name="ConnTestIntervalInt"> <property name="enabled"> <bool>false</bool> </property> @@ -349,7 +349,7 @@ </widget> </item> <item row="3" column="1"> - <widget class="QSpinBox" name="CachedConnections"> + <widget class="QSpinBox" name="CachedConnectionsInt"> <property name="sizePolicy"> <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> <horstretch>1</horstretch> @@ -359,7 +359,7 @@ </widget> </item> <item row="0" column="0"> - <widget class="QCheckBox" name="AutoCommit"> + <widget class="QCheckBox" name="AutoCommitBool"> <property name="enabled"> <bool>true</bool> </property> @@ -382,16 +382,16 @@ <layoutdefault spacing="6" margin="11"/> <tabstops> <tabstop>ObjectCache</tabstop> - <tabstop>FetchAll</tabstop> - <tabstop>UnlimitedContent</tabstop> - <tabstop>IndicateEmpty</tabstop> - <tabstop>NumberFormat</tabstop> - <tabstop>Decimals</tabstop> + <tabstop>FetchAllBool</tabstop> + <tabstop>UnlimitedContentBool</tabstop> + <tabstop>IndicateEmptyBool</tabstop> + <tabstop>NumberFormatInt</tabstop> + <tabstop>DecimalsInt</tabstop> </tabstops> <resources/> <connections> <connection> - <sender>NumberFormat</sender> + <sender>NumberFormatInt</sender> <signal>activated(QString)</signal> <receiver>toDatabaseSettingUI</receiver> <slot>numberFormatChange()</slot> Modified: trunk/tora/src/core/toeditorsetting.cpp =================================================================== --- trunk/tora/src/core/toeditorsetting.cpp 2014-03-06 17:06:41 UTC (rev 5096) +++ trunk/tora/src/core/toeditorsetting.cpp 2014-03-06 20:36:19 UTC (rev 5097) @@ -43,8 +43,8 @@ { switch(option) { - case SyntaxHighlighting: return QVariant((int) 0); - case EditorType: return QVariant((int) 0); + case SyntaxHighlightingInt: return QVariant((int) 0); + case EditorTypeInt: return QVariant((int) 0); case UseMaxTextWidthMarkBool: return QVariant((bool) false); case MaxTextWidthMarkInt: return QVariant((int)75); case KeywordUpperBool: return QVariant((bool) false); Modified: trunk/tora/src/core/toeditorsetting.h =================================================================== --- trunk/tora/src/core/toeditorsetting.h 2014-03-06 17:06:41 UTC (rev 5096) +++ trunk/tora/src/core/toeditorsetting.h 2014-03-06 20:36:19 UTC (rev 5097) @@ -50,8 +50,8 @@ public: Editor() : ConfigContext("Editor", ENUM_REF(Editor,OptionTypeEnum)) {}; enum OptionTypeEnum { - SyntaxHighlighting = 3000 // #define CONF_HIGHLIGHT - , EditorType // #define CONF_EDITOR_TYPE + SyntaxHighlightingInt = 3000 // #define CONF_HIGHLIGHT + , EditorTypeInt // #define CONF_EDITOR_TYPE , UseMaxTextWidthMarkBool , MaxTextWidthMarkInt , KeywordUpperBool // #define CONF_KEYWORD_UPPER Modified: trunk/tora/src/core/toeventqueryworker.cpp =================================================================== --- trunk/tora/src/core/toeventqueryworker.cpp 2014-03-06 17:06:41 UTC (rev 5096) +++ trunk/tora/src/core/toeventqueryworker.cpp 2014-03-06 20:36:19 UTC (rev 5097) @@ -159,7 +159,7 @@ return; } - unsigned maxRead = toConfigurationNewSingle::Instance().option(ToConfiguration::Database::MaxNumber).toInt(); + unsigned maxRead = toConfigurationNewSingle::Instance().option(ToConfiguration::Database::InitialFetchInt).toInt(); ValuesList values; for(unsigned row = 0; row < maxRead; row++) { Modified: trunk/tora/src/core/toglobalsetting.cpp =================================================================== --- trunk/tora/src/core/toglobalsetting.cpp 2014-03-06 17:06:41 UTC (rev 5096) +++ trunk/tora/src/core/toglobalsetting.cpp 2014-03-06 20:36:19 UTC (rev 5097) @@ -99,7 +99,7 @@ case DisplaySamplesInt: return QVariant((int)-1); case SizeUnit: return QVariant(QString("MB")); case RefreshInterval: return QVariant(QString("None")); // None - 0 - case DefaultListFormat: return QVariant((int)0); + case DefaultListFormatInt: return QVariant((int)0); case Style: return QVariant(QString("")); case Translation: return QVariant(QLocale().name()); default: @@ -235,7 +235,7 @@ // Refresh Utils::toRefreshCreate(OptionGroup, "toRefreshCreate", QString::null, RefreshIntervalInt); // DefaultFormat - DefaultListFormat->setCurrentIndex(toConfigurationNewSingle::Instance().option(ToConfiguration::Global::DefaultListFormat).toInt()); + DefaultListFormat->setCurrentIndex(toConfigurationNewSingle::Instance().option(ToConfiguration::Global::DefaultListFormatInt).toInt()); // style Style->addItems(Utils::toGetSessionTypes()); QString str = Utils::toGetSessionType(); Modified: trunk/tora/src/core/toglobalsetting.h =================================================================== --- trunk/tora/src/core/toglobalsetting.h 2014-03-06 17:06:41 UTC (rev 5096) +++ trunk/tora/src/core/toglobalsetting.h 2014-03-06 20:36:19 UTC (rev 5097) @@ -95,7 +95,7 @@ , DisplaySamplesInt // #define CONF_DISPLAY_SAMPLES , SizeUnit // #define CONF_SIZE_UNIT , RefreshInterval // #define CONF_REFRESH - , DefaultListFormat // #define CONF_DEFAULT_FORMAT + , DefaultListFormatInt // #define CONF_DEFAULT_FORMAT , Style // #define CONF_STYLE , Translation // #define CONF_LOCALE (Translation) }; Modified: trunk/tora/src/core/toqvalue.cpp =================================================================== --- trunk/tora/src/core/toqvalue.cpp 2014-03-06 17:06:41 UTC (rev 5096) +++ trunk/tora/src/core/toqvalue.cpp 2014-03-06 20:36:19 UTC (rev 5097) @@ -243,7 +243,7 @@ QString toQValue::displayData() const { - if( isNull() && toConfigurationNewSingle::Instance().option(ToConfiguration::Database::IndicateEmpty).toBool()) + if( isNull() && toConfigurationNewSingle::Instance().option(ToConfiguration::Database::IndicateEmptyBool).toBool()) { return QString::fromLatin1("{null}"); } Modified: trunk/tora/src/core/toresultlistformat.cpp =================================================================== --- trunk/tora/src/core/toresultlistformat.cpp 2014-03-06 17:06:41 UTC (rev 5096) +++ trunk/tora/src/core/toresultlistformat.cpp 2014-03-06 20:36:19 UTC (rev 5097) @@ -54,7 +54,7 @@ formatCombo->addItem(tr("HTML")); formatCombo->addItem(tr("SQL")); - int num = toConfigurationNewSingle::Instance().option(Global::DefaultListFormat).toInt(); + int num = toConfigurationNewSingle::Instance().option(Global::DefaultListFormatInt).toInt(); formatCombo->setCurrentIndex(num); formatChanged(num); @@ -109,6 +109,6 @@ void toResultListFormat::accept() { - toConfigurationNewSingle::Instance().setOption(ToConfiguration::Global::DefaultListFormat, formatCombo->currentIndex()); + toConfigurationNewSingle::Instance().setOption(ToConfiguration::Global::DefaultListFormatInt, formatCombo->currentIndex()); QDialog::accept(); } Modified: trunk/tora/src/core/toresultlong.cpp =================================================================== --- trunk/tora/src/core/toresultlong.cpp 2014-03-06 17:06:41 UTC (rev 5096) +++ trunk/tora/src/core/toresultlong.cpp 2014-03-06 20:36:19 UTC (rev 5097) @@ -104,7 +104,7 @@ //// Query->slotReadAll(); // indicate that all records should be fetched } else - MaxNumber = toConfigurationNewSingle::Instance().option(ToConfiguration::Database::MaxNumber).toInt(); + MaxNumber = toConfigurationNewSingle::Instance().option(ToConfiguration::Database::InitialFetchInt).toInt(); Query->start(); } catch (const toConnection::exception &str) Modified: trunk/tora/src/core/toresultmodel.cpp =================================================================== --- trunk/tora/src/core/toresultmodel.cpp 2014-03-06 17:06:41 UTC (rev 5096) +++ trunk/tora/src/core/toresultmodel.cpp 2014-03-06 20:36:19 UTC (rev 5097) @@ -56,7 +56,7 @@ , SortedOnColumn(-1) , CurrRowKey(1) { - MaxRowsToAdd = MaxRows = toConfigurationNewSingle::Instance().option(ToConfiguration::Database::MaxNumber).toInt(); + MaxRowsToAdd = MaxRows = toConfigurationNewSingle::Instance().option(ToConfiguration::Database::InitialFetchInt).toInt(); Query = query; Query->setParent(this); // this will satisfy QObject's disposal @@ -96,7 +96,7 @@ , Query(NULL) , CurrRowKey(1) { - MaxRowsToAdd = MaxRows = toConfigurationNewSingle::Instance().option(ToConfiguration::Database::MaxNumber).toInt(); + MaxRowsToAdd = MaxRows = toConfigurationNewSingle::Instance().option(ToConfiguration::Database::InitialFetchInt).toInt(); setSupportedDragActions(Qt::CopyAction); @@ -539,7 +539,7 @@ return QVariant(rowDesc.key); return QVariant(data.displayData()); case Qt::BackgroundRole: - if (data.isNull() && toConfigurationNewSingle::Instance().option(ToConfiguration::Database::IndicateEmpty).toBool()) + if (data.isNull() && toConfigurationNewSingle::Instance().option(ToConfiguration::Database::IndicateEmptyBool).toBool()) return QVariant(QColor(toConfigurationNewSingle::Instance().option(ToConfiguration::Database::IndicateEmptyColor).toString())); if (index.column() == 0) { return QPalette().color(QPalette::Window); Modified: trunk/tora/src/core/toresulttableview.cpp =================================================================== --- trunk/tora/src/core/toresulttableview.cpp 2014-03-06 17:06:41 UTC (rev 5096) +++ trunk/tora/src/core/toresulttableview.cpp 2014-03-06 20:36:19 UTC (rev 5097) @@ -314,8 +314,8 @@ int hh = height(); int hhh = s.height(); int rows = hh / s.height() + 1; - if (rows < toConfigurationNewSingle::Instance().option(ToConfiguration::Database::MaxNumber).toInt()) - return toConfigurationNewSingle::Instance().option(ToConfiguration::Database::MaxNumber).toInt(); + if (rows < toConfigurationNewSingle::Instance().option(ToConfiguration::Database::InitialFetchInt).toInt()) + return toConfigurationNewSingle::Instance().option(ToConfiguration::Database::InitialFetchInt).toInt(); return rows; } Modified: trunk/tora/src/core/toresultview.cpp =================================================================== --- trunk/tora/src/core/toresultview.cpp 2014-03-06 17:06:41 UTC (rev 5096) +++ trunk/tora/src/core/toresultview.cpp 2014-03-06 20:36:19 UTC (rev 5097) @@ -206,7 +206,7 @@ { if (!MaxColDisp) { - MaxColDisp = toConfigurationNewSingle::Instance().option(ToConfiguration::Database::MaxColDisp).toInt(); + MaxColDisp = toConfigurationNewSingle::Instance().option(ToConfiguration::Database::MaxColDispInt).toInt(); Gridlines = toConfigurationNewSingle::Instance().option(ToConfiguration::Global::DisplayGridlinesBool).toBool(); } QString t = text(column); @@ -239,7 +239,7 @@ { if (!MaxColDisp) { - MaxColDisp = toConfigurationNewSingle::Instance().option(ToConfiguration::Database::MaxColDisp).toInt(); + MaxColDisp = toConfigurationNewSingle::Instance().option(ToConfiguration::Database::MaxColDispInt).toInt(); Gridlines = toConfigurationNewSingle::Instance().option(ToConfiguration::Global::DisplayGridlinesBool).toBool(); } QString t = text(column); @@ -399,7 +399,7 @@ { if (!MaxColDisp) { - MaxColDisp = toConfigurationNewSingle::Instance().option(ToConfiguration::Database::MaxColDisp).toInt(); + MaxColDisp = toConfigurationNewSingle::Instance().option(ToConfiguration::Database::MaxColDispInt).toInt(); Gridlines = toConfigurationNewSingle::Instance().option(ToConfiguration::Global::DisplayGridlinesBool).toBool(); } QString t = text(column); @@ -416,7 +416,7 @@ { if (!MaxColDisp) { - MaxColDisp = toConfigurationNewSingle::Instance().option(ToConfiguration::Database::MaxColDisp).toInt(); + MaxColDisp = toConfigurationNewSingle::Instance().option(ToConfiguration::Database::MaxColDispInt).toInt(); Gridlines = toConfigurationNewSingle::Instance().option(ToConfiguration::Global::DisplayGridlinesBool).toBool(); } QString t = text(column); @@ -1227,7 +1227,7 @@ void toResultView::slotAddItem(void) { - MaxColDisp = toConfigurationNewSingle::Instance().option(ToConfiguration::Database::MaxColDisp).toInt(); + MaxColDisp = toConfigurationNewSingle::Instance().option(ToConfiguration::Database::MaxColDispInt).toInt(); Gridlines = toConfigurationNewSingle::Instance().option(ToConfiguration::Global::DisplayGridlinesBool).toBool(); try @@ -1323,7 +1323,7 @@ else setSorting(Query->columns()); - int MaxNumber = toConfigurationNewSingle::Instance().option(ToConfiguration::Database::MaxNumber).toInt(); + int MaxNumber = toConfigurationNewSingle::Instance().option(ToConfiguration::Database::InitialFetchInt).toInt(); for (int j = 0; j < MaxNumber && !Query->eof(); j++) slotAddItem(); if (ReadAll || MaxNumber < 0) Modified: trunk/tora/src/core/tosyntaxsetupui.ui =================================================================== --- trunk/tora/src/core/tosyntaxsetupui.ui 2014-03-06 17:06:41 UTC (rev 5096) +++ trunk/tora/src/core/tosyntaxsetupui.ui 2014-03-06 20:36:19 UTC (rev 5097) @@ -43,7 +43,7 @@ </widget> </item> <item> - <widget class="QComboBox" name="SyntaxHighlighting"> + <widget class="QComboBox" name="SyntaxHighlightingInt"> <item> <property name="text"> <string extracomment="Use Scintilla native SQL Lexer">QsciSQL</string> @@ -68,7 +68,7 @@ </widget> </item> <item> - <widget class="QComboBox" name="EditorType"> + <widget class="QComboBox" name="EditorTypeInt"> <item> <property name="text"> <string>Scintilla</string> Modified: trunk/tora/src/core/totool.cpp =================================================================== --- trunk/tora/src/core/totool.cpp 2014-03-06 17:06:41 UTC (rev 5096) +++ trunk/tora/src/core/totool.cpp 2014-03-06 20:36:19 UTC (rev 5097) @@ -137,7 +137,34 @@ void toSettingTab::saveSettings(QWidget *widget) { + static QRegExp any(".*"); + QList<QWidget*> lst = widget->findChildren<QWidget*>(any); + Q_FOREACH(QWidget *w, lst) + { + qDebug() << w->objectName(); + if (w->objectName() == "qt_spinbox_lineedit") // internal widget inside QSpinBox + continue; + if (QComboBox *combo = qobject_cast<QComboBox*>(w)) + { + if (combo->objectName().endsWith("Int")) + toConfigurationNewSingle::Instance().setOption(combo->objectName(), combo->currentIndex()); + else + toConfigurationNewSingle::Instance().setOption(combo->objectName(), combo->currentText()); + } else if (QSpinBox *spin = qobject_cast<QSpinBox*>(w)) + { + toConfigurationNewSingle::Instance().setOption(spin->objectName(), spin->value()); + } else if (QLineEdit *edit = qobject_cast<QLineEdit*>(w)) + { + if (edit->objectName().endsWith("Int")) + toConfigurationNewSingle::Instance().setOption(edit->objectName(), edit->text().toInt()); + else + toConfigurationNewSingle::Instance().setOption(edit->objectName(), edit->text()); + } else if (QCheckBox *checkbox = qobject_cast<QCheckBox*>(w)) + { + toConfigurationNewSingle::Instance().setOption(checkbox->objectName(), /*checkbox->isEnabled() &&*/ checkbox->isChecked()); + } + } } toConnectionWidget::toConnectionWidget(toConnection &conn, QWidget *widget) Modified: trunk/tora/src/result/totablemodel.cpp =================================================================== --- trunk/tora/src/result/totablemodel.cpp 2014-03-06 17:06:41 UTC (rev 5096) +++ trunk/tora/src/result/totablemodel.cpp 2014-03-06 20:36:19 UTC (rev 5097) @@ -103,7 +103,7 @@ } return QVariant(data.displayData()); case Qt::BackgroundRole: - if (data.isNull() && toConfigurationNewSingle::Instance().option(ToConfiguration::Database::IndicateEmpty).toBool()) + if (data.isNull() && toConfigurationNewSingle::Instance().option(ToConfiguration::Database::IndicateEmptyBool).toBool()) return QVariant(QColor(toConfigurationNewSingle::Instance().option(ToConfiguration::Database::IndicateEmptyColor).toString())); return QVariant(); // case Qt::TextAlignmentRole: Modified: trunk/tora/src/result/totreemodel.cpp =================================================================== --- trunk/tora/src/result/totreemodel.cpp 2014-03-06 17:06:41 UTC (rev 5096) +++ trunk/tora/src/result/totreemodel.cpp 2014-03-06 20:36:19 UTC (rev 5097) @@ -97,7 +97,7 @@ } return QVariant(data.displayData()); case Qt::BackgroundRole: - if (data.isNull() && toConfigurationNewSingle::Instance().option(ToConfiguration::Database::IndicateEmpty).toBool()) + if (data.isNull() && toConfigurationNewSingle::Instance().option(ToConfiguration::Database::IndicateEmptyBool).toBool()) return QVariant(QColor(toConfigurationNewSingle::Instance().option(ToConfiguration::Database::IndicateEmptyColor).toString())); return QVariant(); // case Qt::TextAlignmentRole: Modified: trunk/tora/src/tests/test2.cpp =================================================================== --- trunk/tora/src/tests/test2.cpp 2014-03-06 17:06:41 UTC (rev 5096) +++ trunk/tora/src/tests/test2.cpp 2014-03-06 20:36:19 UTC (rev 5097) @@ -89,8 +89,8 @@ try { toQValue::setNumberFormat( - toConfigurationNewSingle::Instance().option(ToConfiguration::Database::NumberFormat).toInt(), - toConfigurationNewSingle::Instance().option(ToConfiguration::Database::NumberDecimals).toInt() + toConfigurationNewSingle::Instance().option(ToConfiguration::Database::NumberFormatInt).toInt(), + toConfigurationNewSingle::Instance().option(ToConfiguration::Database::NumberDecimalsInt).toInt() ); qRegisterMetaType<toQColumnDescriptionList>("toQColumnDescriptionList&"); Modified: trunk/tora/src/tools/toworksheet.cpp =================================================================== --- trunk/tora/src/tools/toworksheet.cpp 2014-03-06 17:06:41 UTC (rev 5096) +++ trunk/tora/src/tools/toworksheet.cpp 2014-03-06 20:36:19 UTC (rev 5097) @@ -1398,7 +1398,7 @@ // TODO: move this into queryDone if (m_lastQuery.statementType == toSyntaxAnalyzer::DML) { - if (toConfigurationNewSingle::Instance().option(ToConfiguration::Database::AutoCommit).toBool()) + if (toConfigurationNewSingle::Instance().option(ToConfiguration::Database::AutoCommitBool).toBool()) { Q_ASSERT_X(LockedConnection, qPrintable(__QHERE__), "Connection was not lent for DML"); (*LockedConnection)->commit(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ibr...@us...> - 2014-03-07 13:26:43
|
Revision: 5100 http://sourceforge.net/p/tora/code/5100 Author: ibre5041 Date: 2014-03-07 13:26:35 +0000 (Fri, 07 Mar 2014) Log Message: ----------- few steps towards to new config system - cleanup Modified Paths: -------------- trunk/tora/src/connection/tooracleextract.cpp trunk/tora/src/connection/tooraclesetting.cpp trunk/tora/src/connection/tooraclesetting.h trunk/tora/src/connection/tooraclesettingui.ui trunk/tora/src/connection/toqmysqlsetting.cpp trunk/tora/src/connection/toqmysqlsetting.h trunk/tora/src/connection/toqmysqlsettingui.ui trunk/tora/src/connection/toqpsqlsettingui.ui trunk/tora/src/connection/toqsqlconnection.h trunk/tora/src/core/todatabasesetting.cpp trunk/tora/src/core/todatabasesetting.h trunk/tora/src/core/todatabasesettingui.ui trunk/tora/src/core/toglobalsetting.cpp trunk/tora/src/core/toglobalsettingui.ui trunk/tora/src/core/tohelp.cpp trunk/tora/src/core/tohelp.h trunk/tora/src/core/tohelpsetup.cpp trunk/tora/src/core/tohelpsetup.h trunk/tora/src/core/toresultcode.cpp trunk/tora/src/core/toresultplan.cpp trunk/tora/src/core/tosyntaxsetup.cpp trunk/tora/src/core/tosyntaxsetup.h trunk/tora/src/core/tosyntaxsetupui.ui trunk/tora/src/core/totoolsettingui.ui trunk/tora/src/core/toworksheetsetupui.ui trunk/tora/src/tools/torollbackdialogui.ui trunk/tora/src/tools/tosgastatement.cpp trunk/tora/src/tools/tostorage.cpp trunk/tora/src/tools/tostorage.h trunk/tora/src/tools/tostorageprefsui.ui trunk/tora/src/tools/toworksheet.cpp trunk/tora/src/tools/toworksheet.h Modified: trunk/tora/src/connection/tooracleextract.cpp =================================================================== --- trunk/tora/src/connection/tooracleextract.cpp 2014-03-07 00:38:35 UTC (rev 5099) +++ trunk/tora/src/connection/tooracleextract.cpp 2014-03-07 13:26:35 UTC (rev 5100) @@ -783,7 +783,7 @@ ret += QString(" USING TABLESPACE %2\n").arg(QUOTE(tablespace)); } ret += ")\n"; - if (!toConfigurationNewSingle::Instance().option(Oracle::SkipOrgMon).toBool()) + if (!toConfigurationNewSingle::Instance().option(Oracle::SkipOrgMonBool).toBool()) { if (CONNECTION.version() >= "0800" && ext.getStorage() && ! organization.isEmpty() ) { @@ -2378,7 +2378,7 @@ QString blocks = *i; i++; - if (!toConfigurationNewSingle::Instance().option(Oracle::SkipStorageExceptTablespace).toBool()) + if (!toConfigurationNewSingle::Instance().option(Oracle::SkipStorageExceptTablespaceBool).toBool()) { if (ext.getResize()) ext.initialNext(blocks, initial, next); @@ -7675,7 +7675,7 @@ using namespace ToConfiguration; clearFlags(ext); - if (toConfigurationNewSingle::Instance().option(Oracle::UseDbmsMetadata).toBool()) + if (toConfigurationNewSingle::Instance().option(Oracle::UseDbmsMetadataBool).toBool()) { stream << createMetadata(ext, owner, name, type); return; Modified: trunk/tora/src/connection/tooraclesetting.cpp =================================================================== --- trunk/tora/src/connection/tooraclesetting.cpp 2014-03-07 00:38:35 UTC (rev 5099) +++ trunk/tora/src/connection/tooraclesetting.cpp 2014-03-07 13:26:35 UTC (rev 5100) @@ -48,18 +48,18 @@ case ConfTimestampFormat: return QVariant(QString("YYYY-MM-DD HH24:MI:SSXFF")); case MaxLong: return QVariant((int)30000); case PlanTable: return QVariant(QString("PLAN_TABLE")); - case KeepPlans: return QVariant((bool)false); - case VSqlPlans: return QVariant((bool)true); - case SharedPlan: return QVariant((bool)false); - case UseDbmsMetadata: return QVariant((bool)true); - case IncludeStorage: return QVariant((bool)true); - case SkipOrgMon: return QVariant((bool)false); - case SkipStorageExceptTablespace: return QVariant((bool)false); - case IncludeParallel: return QVariant((bool)true); - case IncludePartition: return QVariant((bool)true); - case IncludeCode: return QVariant((bool)true); - case IncludeHeader: return QVariant((bool)true); - case IncludePrompt: return QVariant((bool)true); + case KeepPlansBool: return QVariant((bool)false); + case VSqlPlansBool: return QVariant((bool)true); + case SharedPlanBool: return QVariant((bool)false); + case UseDbmsMetadataBool: return QVariant((bool)true); + case IncludeStorageBool: return QVariant((bool)true); + case SkipOrgMonBool: return QVariant((bool)false); + case SkipStorageExceptTablespaceBool: return QVariant((bool)false); + case IncludeParallelBool: return QVariant((bool)true); + case IncludePartitionBool: return QVariant((bool)true); + case IncludeCodeBool: return QVariant((bool)true); + case IncludeHeaderBool: return QVariant((bool)true); + case IncludePromptBool: return QVariant((bool)true); default: Q_ASSERT_X( false, qPrintable(__QHERE__), qPrintable(QString("Context Oracle un-registered enum value: %1").arg(option))); return QVariant(); @@ -68,7 +68,7 @@ QString ToConfiguration::Oracle::planTable(QString const& schema) { - bool sharedPlan = toConfigurationNewSingle::Instance().option(SharedPlan).toBool(); + bool sharedPlan = toConfigurationNewSingle::Instance().option(SharedPlanBool).toBool(); QString planTable = toConfigurationNewSingle::Instance().option(PlanTable).toString(); if(sharedPlan || planTable.contains('.') || schema.isNull()) @@ -83,15 +83,7 @@ { setupUi(this); - //DefaultDate->setText(toConfigurationSingle::Instance().dateFormat()); - //DefaultTimestamp->setText(toConfigurationSingle::Instance().timestampFormat()); - //CheckPoint->setText(toConfigurationSingle::Instance().planCheckpoint()); - //ExplainPlan->setText(toConfigurationSingle::Instance().planTable(NULL)); - //OpenCursors->setValue(toConfigurationSingle::Instance().openCursors()); - //KeepPlans->setChecked(toConfigurationSingle::Instance().keepPlans()); - //VsqlPlans->setChecked(toConfigurationSingle::Instance().vsqlPlans()); - //SharedPlan->setChecked(toConfigurationSingle::Instance().sharedPlan()); - //int len = toConfigurationSingle::Instance().maxLong(); + toSettingTab::loadSettings(this); int len = toConfigurationNewSingle::Instance().option(ToConfiguration::Oracle::MaxLong).toInt(); if (len >= 0) { @@ -99,64 +91,31 @@ MaxLongInt->setValidator(new QIntValidator(MaxLongInt)); UnlimitedBool->setChecked(false); } - // extractor group options - //cbUseDbmsMetadata->setChecked(toConfigurationSingle::Instance().extractorUseDbmsMetadata()); - //cbIncludeStorage->setChecked(toConfigurationSingle::Instance().extractorIncludeSotrage()); - //cbSkipOrgMon->setChecked(toConfigurationSingle::Instance().extractorSkipOrgMonInformation()); - //cbSkiptStorExTablespace->setChecked(toConfigurationSingle::Instance().extractorSkipStorageExceptTablespaces()); - //cbIncludeParallel->setChecked(toConfigurationSingle::Instance().extractorIncludeParallel()); - //cbIncludePartition->setChecked(toConfigurationSingle::Instance().extractorIncludePartition()); - //cbIncludeCode->setChecked(toConfigurationSingle::Instance().extractorIncludeCode()); - //cbIncludeHeader->setChecked(toConfigurationSingle::Instance().extractorIncludeHeader()); - //cbIncludePrompt->setChecked(toConfigurationSingle::Instance().extractorIncludePrompt()); + UnlimitedBool->setEnabled(true); + connect(UseDbmsMetadataBool, SIGNAL(toggled(bool)), this, SLOT(dbmsMetadataClicked(bool))); dbmsMetadataClicked(UseDbmsMetadataBool->isChecked()); try { // Check if connection exists toConnectionRegistrySing::Instance().currentConnection(); - CreatePlanTable->setEnabled(true); + CreatePlanTable->setEnabled(true); } catch (...) { - TLOG(1, toDecorator, __HERE__) << " Ignored exception." << std::endl; + CreatePlanTable->setEnabled(false); } - toSettingTab::loadSettings(this); } void toOracleSetting::saveSetting() { toSettingTab::saveSettings(this); - //toConfigurationSingle::Instance().setKeepPlans(KeepPlans->isChecked()); - //toConfigurationSingle::Instance().setVsqlPlans(VsqlPlans->isChecked()); - //toConfigurationSingle::Instance().setSharedPlan(SharedPlan->isChecked()); - //toConfigurationSingle::Instance().setDateFormat(DefaultDate->text()); - //toConfigurationSingle::Instance().setTimestampFormat(DefaultTimestamp->text()); #pragma message WARN("TODO/FIXME: apply new NLS_DATE_FORMAT/NLS_TIMESTAMP_FORMAT here") - //toConfigurationSingle::Instance().setPlanCheckpoint(CheckPoint->text()); - //toConfigurationSingle::Instance().setPlanTable(ExplainPlan->text()); - //toConfigurationSingle::Instance().setOpenCursors(OpenCursors->value()); if (UnlimitedBool->isChecked()) - { - //toConfigurationSingle::Instance().setMaxLong(-1); - } - else - { - //toConfigurationSingle::Instance().setMaxLong(MaxLong->text().toInt()); - } - // extractor group options - //toConfigurationSingle::Instance().setExtractorUseDbmsMetadata(cbUseDbmsMetadata->isChecked()); - //toConfigurationSingle::Instance().setExtractorIncludeSotrage(cbIncludeStorage->isChecked()); - //toConfigurationSingle::Instance().setExtractorSkipOrgMonInformation(cbSkipOrgMon->isChecked()); - //toConfigurationSingle::Instance().setExtractorSkipStorageExceptTablespaces(cbSkiptStorExTablespace->isChecked()); - //toConfigurationSingle::Instance().setExtractorIncludeParallel(cbIncludeParallel->isChecked()); - //toConfigurationSingle::Instance().setExtractorIncludePartition(cbIncludePartition->isChecked()); - //toConfigurationSingle::Instance().setExtractorIncludeCode(cbIncludeCode->isChecked()); - //toConfigurationSingle::Instance().setExtractorIncludeHeader(cbIncludeHeader->isChecked()); - //toConfigurationSingle::Instance().setExtractorIncludePrompt(cbIncludePrompt->isChecked()); + toConfigurationNewSingle::Instance().setOption(ToConfiguration::Oracle::MaxLong, -1); } void toOracleSetting::dbmsMetadataClicked(bool) Modified: trunk/tora/src/connection/tooraclesetting.h =================================================================== --- trunk/tora/src/connection/tooraclesetting.h 2014-03-07 00:38:35 UTC (rev 5099) +++ trunk/tora/src/connection/tooraclesetting.h 2014-03-07 13:26:35 UTC (rev 5100) @@ -54,20 +54,20 @@ , ConfTimestampFormat // #define CONF_TIMESTAMP_FORMAT , MaxLong // #define CONF_MAX_LONG , PlanTable // #define CONF_PLAN_TABLE - , KeepPlans // #define CONF_KEEP_PLANS // default: false - , VSqlPlans // #define CONF_VSQL_PLANS // default: true - , SharedPlan // #define CONF_SHARED_PLAN // default: false + , KeepPlansBool // #define CONF_KEEP_PLANS // default: false + , VSqlPlansBool // #define CONF_VSQL_PLANS // default: true + , SharedPlanBool // #define CONF_SHARED_PLAN // default: false // Extractor. Controls the method used to produce database object extracts // as well as extraction settings (which information should be extracted). - , UseDbmsMetadata // #define CONF_USE_DBMS_METADATA - , IncludeStorage // #define CONF_EXT_INC_STORAGE - , SkipOrgMon // #define CONF_EXT_SKIP_ORGMON - , SkipStorageExceptTablespace // #define CONF_EXT_SKIP_STORAGE_EX_TABLESPACE - , IncludeParallel // #define CONF_EXT_INC_PARALLEL - , IncludePartition // #define CONF_EXT_INC_PARTITION - , IncludeCode // #define CONF_EXT_INC_CODE - , IncludeHeader // #define CONF_EXT_INC_HEADER - , IncludePrompt // #define CONF_EXT_INC_PROMPT + , UseDbmsMetadataBool // #define CONF_USE_DBMS_METADATA + , IncludeStorageBool // #define CONF_EXT_INC_STORAGE + , SkipOrgMonBool // #define CONF_EXT_SKIP_ORGMON + , SkipStorageExceptTablespaceBool // #define CONF_EXT_SKIP_STORAGE_EX_TABLESPACE + , IncludeParallelBool // #define CONF_EXT_INC_PARALLEL + , IncludePartitionBool // #define CONF_EXT_INC_PARTITION + , IncludeCodeBool // #define CONF_EXT_INC_CODE + , IncludeHeaderBool // #define CONF_EXT_INC_HEADER + , IncludePromptBool // #define CONF_EXT_INC_PROMPT }; virtual QVariant defaultValue(int option) const; static QString planTable(QString const& schema); Modified: trunk/tora/src/connection/tooraclesettingui.ui =================================================================== --- trunk/tora/src/connection/tooraclesettingui.ui 2014-03-07 00:38:35 UTC (rev 5099) +++ trunk/tora/src/connection/tooraclesettingui.ui 2014-03-07 13:26:35 UTC (rev 5100) @@ -6,10 +6,22 @@ <rect> <x>0</x> <y>0</y> - <width>631</width> + <width>600</width> <height>517</height> </rect> </property> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>600</width> + <height>0</height> + </size> + </property> <property name="windowTitle"> <string>Form1</string> </property> @@ -34,7 +46,7 @@ </widget> </item> <item row="0" column="1"> - <widget class="QLineEdit" name="DefaultDate"/> + <widget class="QLineEdit" name="ConfDateFormat"/> </item> <item row="1" column="0"> <widget class="QLabel" name="TextLabel6_2_2_3"> @@ -48,7 +60,7 @@ <bool>false</bool> </property> <property name="buddy"> - <cstring>DefaultTimestamp</cstring> + <cstring>ConfTimestampFormat</cstring> </property> </widget> </item> @@ -63,7 +75,7 @@ </widget> </item> <item row="4" column="2"> - <widget class="QCheckBox" name="VsqlPlansBool"> + <widget class="QCheckBox" name="VSqlPlansBool"> <property name="toolTip"> <string>Use V$SQL_PLAN when possible.</string> </property> @@ -84,7 +96,7 @@ <bool>false</bool> </property> <property name="buddy"> - <cstring>ExplainPlan</cstring> + <cstring>PlanTable</cstring> </property> </widget> </item> @@ -112,7 +124,7 @@ </widget> </item> <item row="3" column="1"> - <widget class="QLineEdit" name="ExplainPlan"/> + <widget class="QLineEdit" name="PlanTable"/> </item> <item row="2" column="1"> <widget class="QLineEdit" name="MaxLongInt"/> @@ -129,7 +141,7 @@ <bool>false</bool> </property> <property name="buddy"> - <cstring>ExplainPlan</cstring> + <cstring>PlanTable</cstring> </property> </widget> </item> @@ -217,12 +229,12 @@ <bool>false</bool> </property> <property name="buddy"> - <cstring>DefaultDate</cstring> + <cstring>ConfDateFormat</cstring> </property> </widget> </item> <item row="1" column="1"> - <widget class="QLineEdit" name="DefaultTimestamp"/> + <widget class="QLineEdit" name="ConfTimestampFormat"/> </item> <item row="7" column="0"> <spacer name="verticalSpacer"> @@ -240,14 +252,14 @@ </layout> </widget> <tabstops> - <tabstop>DefaultDate</tabstop> - <tabstop>DefaultTimestamp</tabstop> + <tabstop>ConfDateFormat</tabstop> + <tabstop>ConfTimestampFormat</tabstop> <tabstop>MaxLongInt</tabstop> <tabstop>UnlimitedBool</tabstop> - <tabstop>ExplainPlan</tabstop> + <tabstop>PlanTable</tabstop> <tabstop>KeepPlansBool</tabstop> <tabstop>CreatePlanTable</tabstop> - <tabstop>VsqlPlansBool</tabstop> + <tabstop>VSqlPlansBool</tabstop> </tabstops> <resources/> <connections> Modified: trunk/tora/src/connection/toqmysqlsetting.cpp =================================================================== --- trunk/tora/src/connection/toqmysqlsetting.cpp 2014-03-07 00:38:35 UTC (rev 5099) +++ trunk/tora/src/connection/toqmysqlsetting.cpp 2014-03-07 13:26:35 UTC (rev 5100) @@ -42,12 +42,13 @@ #include <QtGui/QComboBox> #include <QtGui/QLabel> +ToConfiguration::MySQL s_mystConf; + toQMySqlSetting::toQMySqlSetting(QWidget *parent) : QWidget(parent) , toSettingTab("database.html#qsql") { setupUi(this); - //BeforeCreateAction->setCurrentIndex(toConfigurationNewSingle::Instance().option(ToConfiguration::MySQL::BeforeCreateAction).toInt()); toSettingTab::loadSettings(this); } Modified: trunk/tora/src/connection/toqmysqlsetting.h =================================================================== --- trunk/tora/src/connection/toqmysqlsetting.h 2014-03-07 00:38:35 UTC (rev 5099) +++ trunk/tora/src/connection/toqmysqlsetting.h 2014-03-07 13:26:35 UTC (rev 5100) @@ -36,9 +36,36 @@ #define TOQMYSQLSETTING_H #include "core/totool.h" +#include "core/toconfenum.h" +#include "ts_log/ts_log_utils.h" #include "ui_toqmysqlsettingui.h" +namespace ToConfiguration { + class MySQL : public ConfigContext + { + Q_OBJECT; + Q_ENUMS(OptionTypeEnum); + public: + MySQL() : ConfigContext("MySQL", ENUM_REF(MySQL,OptionTypeEnum)) {}; + enum OptionTypeEnum { + BreakConnectionsBool = 6000 + , BeforeCreateActionInt // #define CONF_CREATE_ACTION + }; + virtual QVariant defaultValue(int option) const + { + switch(option) + { + case BreakConnectionsBool : return QVariant((bool)false); + case BeforeCreateActionInt: return QVariant((int)0); + default: + Q_ASSERT_X( false, qPrintable(__QHERE__), qPrintable(QString("Context MySQL un-registered enum value: %1").arg(option))); + return QVariant(); + } + } + }; +}; + class toQMySqlSetting : public QWidget , public Ui::toMySQLSettingUI Modified: trunk/tora/src/connection/toqmysqlsettingui.ui =================================================================== --- trunk/tora/src/connection/toqmysqlsettingui.ui 2014-03-07 00:38:35 UTC (rev 5099) +++ trunk/tora/src/connection/toqmysqlsettingui.ui 2014-03-07 13:26:35 UTC (rev 5100) @@ -6,10 +6,22 @@ <rect> <x>0</x> <y>0</y> - <width>730</width> + <width>600</width> <height>517</height> </rect> </property> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>600</width> + <height>0</height> + </size> + </property> <property name="windowTitle"> <string>Form1</string> </property> @@ -21,7 +33,7 @@ <number>6</number> </property> <item row="0" column="0" colspan="2"> - <widget class="QCheckBox" name="BreakConnections"> + <widget class="QCheckBox" name="BreakConnectionsBool"> <property name="text"> <string>Posibility to break MySQL queries (Can require more connections)</string> </property> @@ -41,7 +53,7 @@ </spacer> </item> <item row="1" column="2"> - <widget class="QComboBox" name="BeforeCreateAction"> + <widget class="QComboBox" name="BeforeCreateActionInt"> <item> <property name="text"> <string>Do nothing</string> Modified: trunk/tora/src/connection/toqpsqlsettingui.ui =================================================================== --- trunk/tora/src/connection/toqpsqlsettingui.ui 2014-03-07 00:38:35 UTC (rev 5099) +++ trunk/tora/src/connection/toqpsqlsettingui.ui 2014-03-07 13:26:35 UTC (rev 5100) @@ -6,10 +6,22 @@ <rect> <x>0</x> <y>0</y> - <width>630</width> + <width>600</width> <height>517</height> </rect> </property> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>600</width> + <height>0</height> + </size> + </property> <property name="windowTitle"> <string>Form1</string> </property> Modified: trunk/tora/src/connection/toqsqlconnection.h =================================================================== --- trunk/tora/src/connection/toqsqlconnection.h 2014-03-07 00:38:35 UTC (rev 5099) +++ trunk/tora/src/connection/toqsqlconnection.h 2014-03-07 13:26:35 UTC (rev 5100) @@ -37,8 +37,6 @@ #include "core/toconnection.h" #include "core/toconnectionsub.h" -#include "core/toconfenum.h" -#include "ts_log/ts_log_utils.h" #include <QtCore/QString> #include <QtSql/QSqlDatabase> @@ -46,29 +44,6 @@ class QSqlError; class toQSQLProvider; -namespace ToConfiguration { - class MySQL : public ConfigContext - { - Q_OBJECT; - Q_ENUMS(OptionTypeEnum); - public: - MySQL() : ConfigContext("MySQL", ENUM_REF(MySQL,OptionTypeEnum)) {}; - enum OptionTypeEnum { - BeforeCreateAction = 6000 // #define CONF_CREATE_ACTION - }; - virtual QVariant defaultValue(int option) const - { - switch(option) - { - case BeforeCreateAction: return QVariant((int)0); - default: - Q_ASSERT_X( false, qPrintable(__QHERE__), qPrintable(QString("Context MySQL un-registered enum value: %1").arg(option))); - return QVariant(); - } - } - }; -}; - // Utility class to lock QSqlDriver - TODO move it into Utils or completely remove // much thanks to: // http://www.ddj.com/cpp/184403766 Modified: trunk/tora/src/core/todatabasesetting.cpp =================================================================== --- trunk/tora/src/core/todatabasesetting.cpp 2014-03-07 00:38:35 UTC (rev 5099) +++ trunk/tora/src/core/todatabasesetting.cpp 2014-03-07 13:26:35 UTC (rev 5100) @@ -54,7 +54,7 @@ case CacheTimeout: return QVariant((int)7); case AutoCommitBool: return QVariant((bool)false); case FirewallModeBool: return QVariant((bool)false); - case ConnectionTestInterval: return QVariant((int)900); //15min + case ConnTestIntervalInt: return QVariant((int)900); //15min case CachedConnectionsInt: return QVariant((int)4); case InitialFetchInt: return QVariant((int)50); case MaxContentInt: return QVariant((int)100); @@ -71,7 +71,7 @@ void toDatabaseSetting::numberFormatChange() { - DecimalsInt->setEnabled(NumberFormatInt->currentIndex() == 2); + NumberDecimalsInt->setEnabled(NumberFormatInt->currentIndex() == 2); } void toDatabaseSetting::IndicateEmptyColor_clicked() @@ -96,12 +96,15 @@ setObjectName(name); setupUi(this); - MaxColDispInt->setValue(toConfigurationNewSingle::Instance().option(ToConfiguration::Database::MaxColDispInt).toInt()); + connect(IndicateEmptyBool, SIGNAL(clicked(bool)), + IndicateEmptyColor, SLOT(setEnabled(bool))); + + toSettingTab::loadSettings(this); + int mxNumber = toConfigurationNewSingle::Instance().option(ToConfiguration::Database::InitialFetchInt).toInt(); if (mxNumber <= 0) FetchAllBool->setChecked(true); - else - InitialFetchInt->setValue(mxNumber); + FetchAllBool->setEnabled(true); int mxContent = toConfigurationNewSingle::Instance().option(ToConfiguration::Database::MaxContentInt).toInt(); if (mxContent <= 0) @@ -109,57 +112,26 @@ MaxContentInt->setValue(InitialFetchInt->value()); UnlimitedContentBool->setChecked(true); } - else - MaxContentInt->setValue(mxContent); + UnlimitedContentBool->setEnabled(true); -// MaxColDisp->setValidator(new QIntValidator(MaxColDisp)); -// InitialFetch->setValidator(new QIntValidator(InitialFetch)); -// MaxContent->setValidator(new QIntValidator(InitialFetch));q - - //NumberFormat->setCurrentIndex(toConfigurationNewSingle::Instance().option(ToConfiguration::Database::numberFormat()); - - //Decimals->setValue(toConfigurationNewSingle::Instance().option(ToConfiguration::Database::numberDecimals()); if (NumberFormatInt->currentIndex() == 2) - DecimalsInt->setEnabled(true); + NumberDecimalsInt->setEnabled(true); + else + NumberDecimalsInt->setEnabled(false); - //AutoCommit->setChecked(toConfigurationNewSingle::Instance().option(ToConfiguration::Database::autoCommit()); -// DontReread->setChecked(toConfigurationNewSingle::Instance().option(ToConfiguration::Database::dontReread()); - ////ObjectCache->setCurrentIndex(toConfigurationNewSingle::Instance().option(ToConfiguration::Database::objectCache()); -// BkgndConnect->setChecked(toConfigurationNewSingle::Instance().option(ToConfiguration::Database::bkgndConnect()); - //CachedConnections->setValue(toConfigurationNewSingle::Instance().option(ToConfiguration::Database::cachedConnections()); - ////IndicateEmpty->setChecked(toConfigurationNewSingle::Instance().option(ToConfiguration::Database::indicateEmpty()); - //FirewallMode->setChecked(toConfigurationNewSingle::Instance().option(ToConfiguration::Database::firewallMode()); - //ConnTestInterval->setValue(toConfigurationNewSingle::Instance().option(ToConfiguration::Database::connTestInterval()); - QColor nullColor; nullColor.setNamedColor(toConfigurationNewSingle::Instance().option(ToConfiguration::Database::IndicateEmptyColor).toString()); QPalette palette = IndicateEmptyColor->palette(); palette.setColor(IndicateEmptyColor->backgroundRole(), nullColor); IndicateEmptyColor->setPalette(palette); -// int val = toConfigurationNewSingle::Instance().option(ToConfiguration::Database::autoLong(); -// AutoLong->setChecked(val); -// MoveAfter->setValue(val); -// KeepAlive->setChecked(toConfigurationNewSingle::Instance().option(ToConfiguration::Database::keepAlive()); - - connect(IndicateEmptyBool, SIGNAL(clicked(bool)), - IndicateEmptyColor, SLOT(setEnabled(bool))); } -// void toUpdateIndicateEmpty(void); - void toDatabaseSetting::saveSetting(void) { toSettingTab::saveSettings(this); - ////toConfigurationNewSingle::Instance().option(ToConfiguration::Database::setObjectCache((toConfiguration::ObjectCacheEnum)ObjectCache->currentIndex()); - ////toConfigurationNewSingle::Instance().option(ToConfiguration::Database::setAutoCommit(AutoCommit->isChecked()); - ////toConfigurationNewSingle::Instance().option(ToConfiguration::Database::setFirewallMode(FirewallMode->isChecked()); - ////toConfigurationNewSingle::Instance().option(ToConfiguration::Database::setConnTestInterval(ConnTestInterval->value()); - ///toConfigurationNewSingle::Instance().option(ToConfiguration::Database::setCachedConnections(CachedConnections->value()); - - - if (FetchAllBool->isChecked()) + if (FetchAllBool->isChecked()) toConfigurationNewSingle::Instance().setOption(ToConfiguration::Database::InitialFetchInt, -1); else toConfigurationNewSingle::Instance().setOption(ToConfiguration::Database::InitialFetchInt, InitialFetchInt->value()); @@ -182,23 +154,7 @@ toConfigurationNewSingle::Instance().setOption(ToConfiguration::Database::MaxContentInt, maxnum); } - ////toConfigurationNewSingle::Instance().option(ToConfiguration::Database::setMaxColDisp(MaxColDisp->value()); - -// toConfigurationNewSingle::Instance().option(ToConfiguration::Database::setDontReread(DontReread->isChecked()); - -// toConfigurationNewSingle::Instance().option(ToConfiguration::Database::setBkgndConnect(BkgndConnect->isChecked()); -// toConfigurationNewSingle::Instance().option(ToConfiguration::Database::setAutoLong(AutoLong->isChecked() ? MoveAfter->value() : 0); - ////toConfigurationNewSingle::Instance().option(ToConfiguration::Database::setIndicateEmpty(IndicateEmpty->isChecked()); - ////toConfigurationNewSingle::Instance().option(ToConfiguration::Database::setIndicateEmptyColor(IndicateEmptyColor->palette().color(IndicateEmptyColor->backgroundRole()).name()); -// toConfigurationNewSingle::Instance().option(ToConfiguration::Database::setKeepAlive(KeepAlive->isChecked() ? DEFAULT_KEEP_ALIVE : -1); //FIXME: there was "" - - - - ////toConfigurationNewSingle::Instance().option(ToConfiguration::Database::setNumberFormat(NumberFormat->currentIndex()); - ////toConfigurationNewSingle::Instance().option(ToConfiguration::Database::setNumberDecimals(Decimals->value()); - toQValue::setNumberFormat(NumberFormatInt->currentIndex(), DecimalsInt->value()); - -// toUpdateIndicateEmpty(); + toQValue::setNumberFormat(NumberFormatInt->currentIndex(), NumberDecimalsInt->value()); } ToConfiguration::Database toDatabaseSetting::s_databaseConfig; Modified: trunk/tora/src/core/todatabasesetting.h =================================================================== --- trunk/tora/src/core/todatabasesetting.h 2014-03-07 00:38:35 UTC (rev 5099) +++ trunk/tora/src/core/todatabasesetting.h 2014-03-07 13:26:35 UTC (rev 5100) @@ -52,7 +52,7 @@ , CacheTimeout // #define CONF_CACHE_TIMEOUT (invisible) , AutoCommitBool // #define CONF_AUTO_COMMIT , FirewallModeBool // #define CONF_FIREWALL_MODE - , ConnectionTestInterval // #define CONF_CONN_TEST_INTERVAL + , ConnTestIntervalInt // #define CONF_CONN_TEST_INTERVAL , CachedConnectionsInt , InitialFetchInt // #define CONF_MAX_NUMBER (InitialFetch) , MaxContentInt // #define CONF_MAX_CONTENT (InitialEditorContent) Modified: trunk/tora/src/core/todatabasesettingui.ui =================================================================== --- trunk/tora/src/core/todatabasesettingui.ui 2014-03-07 00:38:35 UTC (rev 5099) +++ trunk/tora/src/core/todatabasesettingui.ui 2014-03-07 13:26:35 UTC (rev 5100) @@ -6,10 +6,22 @@ <rect> <x>0</x> <y>0</y> - <width>449</width> + <width>600</width> <height>526</height> </rect> </property> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>600</width> + <height>0</height> + </size> + </property> <property name="windowTitle"> <string>toDatabaseSettingUI</string> </property> @@ -21,7 +33,7 @@ <number>6</number> </property> <item row="1" column="0"> - <widget class="QComboBox" name="ObjectCache"> + <widget class="QComboBox" name="ObjectCacheInt"> <item> <property name="text"> <string>Start read object cache when needed</string> @@ -74,9 +86,6 @@ </item> <item row="2" column="1"> <widget class="QSpinBox" name="MaxColDispInt"> - <property name="enabled"> - <bool>false</bool> - </property> <property name="sizePolicy"> <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> <horstretch>1</horstretch> @@ -90,9 +99,6 @@ </item> <item row="1" column="1"> <widget class="QSpinBox" name="MaxContentInt"> - <property name="enabled"> - <bool>false</bool> - </property> <property name="sizePolicy"> <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> <horstretch>1</horstretch> @@ -154,9 +160,6 @@ </item> <item row="1" column="2"> <widget class="QCheckBox" name="UnlimitedContentBool"> - <property name="enabled"> - <bool>false</bool> - </property> <property name="text"> <string>&All</string> </property> @@ -201,10 +204,7 @@ </widget> </item> <item row="1" column="3"> - <widget class="QSpinBox" name="DecimalsInt"> - <property name="enabled"> - <bool>false</bool> - </property> + <widget class="QSpinBox" name="NumberDecimalsInt"> <property name="maximum"> <number>20</number> </property> @@ -258,7 +258,7 @@ <bool>false</bool> </property> <property name="buddy"> - <cstring>DecimalsInt</cstring> + <cstring>NumberDecimalsInt</cstring> </property> </widget> </item> @@ -286,9 +286,6 @@ <layout class="QGridLayout"> <item row="1" column="0"> <widget class="QCheckBox" name="FirewallModeBool"> - <property name="enabled"> - <bool>false</bool> - </property> <property name="baseSize"> <size> <width>0</width> @@ -305,9 +302,6 @@ </item> <item row="2" column="0"> <widget class="QLabel" name="ConnTestIntervalLabel"> - <property name="enabled"> - <bool>false</bool> - </property> <property name="minimumSize"> <size> <width>160</width> @@ -324,9 +318,6 @@ </item> <item row="2" column="1"> <widget class="QSpinBox" name="ConnTestIntervalInt"> - <property name="enabled"> - <bool>false</bool> - </property> <property name="sizePolicy"> <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> <horstretch>1</horstretch> @@ -381,12 +372,12 @@ </widget> <layoutdefault spacing="6" margin="11"/> <tabstops> - <tabstop>ObjectCache</tabstop> + <tabstop>ObjectCacheInt</tabstop> <tabstop>FetchAllBool</tabstop> <tabstop>UnlimitedContentBool</tabstop> <tabstop>IndicateEmptyBool</tabstop> <tabstop>NumberFormatInt</tabstop> - <tabstop>DecimalsInt</tabstop> + <tabstop>NumberDecimalsInt</tabstop> </tabstops> <resources/> <connections> Modified: trunk/tora/src/core/toglobalsetting.cpp =================================================================== --- trunk/tora/src/core/toglobalsetting.cpp 2014-03-07 00:38:35 UTC (rev 5099) +++ trunk/tora/src/core/toglobalsetting.cpp 2014-03-07 13:26:35 UTC (rev 5100) @@ -55,11 +55,30 @@ switch(option) { // Paths - case CustomSQL: return QVariant(QDir::homePath() + QDir::separator() + ".torasql"); + case CustomSQL: + { + QFileInfo torasql(QDir::homePath(), ".torasql"); + return QVariant(torasql.absoluteFilePath()); + } case HelpDirectory: return QVariant(QString("qrc:/help/toc.html")); - case DefaultSession: return QVariant(QDir::homePath() + QDir::separator() + ".tora.tse" ); - case CacheDirectory: return QVariant(QString("")); - case OracleHomeDirectory: return QVariant(QString("")); + case DefaultSession: + { + QFileInfo toratse(QDir::homePath(), ".tora.tse"); + return QVariant(toratse.absoluteFilePath()); + } + case CacheDirectory: + { + QDir dirname; +#ifdef Q_OS_WIN32 + if (getenv("TEMP")) + dirname = QString(getenv("TEMP")); + else +#endif + dirname = QDir::homePath(); + QFileInfo toraCache(dirname, ".tora_cache"); + return QVariant(toraCache.absoluteFilePath()); + } + case OracleHomeDirectory: return QVariant(QString(getenv("ORACLE_HOME"))); case MysqlHomeDirectory: return QVariant(QString("")); case PgsqlHomeDirectory: return QVariant(QString("")); case GraphvizHomeDirectory: @@ -179,10 +198,15 @@ TabbedTools->setVisible(false); #endif - //CustomSQL->setText(toConfigurationNewSingle::Instance().option(ToConfiguration::Global::customSQL()); - //HelpDirectory->setText(toConfigurationNewSingle::Instance().option(ToConfiguration::Global::helpDirectory()); - //DefaultSession->setText(toConfigurationNewSingle::Instance().option(ToConfiguration::Global::defaultSession()); - CacheDirectory->setText(toCache::cacheDir().absolutePath()); + // Refresh (load fields into ComboBox) + Utils::toRefreshCreate(OptionGroup, "toRefreshCreate", QString::null, RefreshInterval); + + // style (load fields into ComboBox) + Style->addItems(QStyleFactory::keys()); + + // load values from toConfigurationNewSingle into Widgets (if widget name == Config Option Name) + toSettingTab::loadSettings(this); + #ifdef Q_OS_WIN MysqlHomeDirectory->setEnabled(true); MySQLHomeBrowse->setEnabled(true); @@ -191,58 +215,24 @@ GraphvizHomeDirectory->setEnabled(true); GraphvizHomeBrowse->setEnabled(true); #endif - //OracleHomeDirectory->setText(toConfigurationNewSingle::Instance().option(ToConfiguration::Global::oracleHome()); - //MysqlHomeDirectory->setText(toConfigurationNewSingle::Instance().option(ToConfiguration::Global::mysqlHome()); - //PgsqlHomeDirectory->setText(toConfigurationNewSingle::Instance().option(ToConfiguration::Global::pgsqlHome()); - //GraphvizHomeDirectory->setText(toConfigurationNewSingle::Instance().option(ToConfiguration::Global::graphvizHome()); - - ////ChangeConnectionBool->setChecked(ToConfiguration::Global::changeConnection()); - //SavePasswordBool->setChecked(toConfigurationNewSingle::Instance().option(ToConfiguration::Global::savePassword()); - //IncludeDbCaptionBool->setChecked(toConfigurationNewSingle::Instance().option(ToConfiguration::Global::includeDbCaption()); - //RestoreSessionBool->setChecked(toConfigurationNewSingle::Instance().option(ToConfiguration::Global::restoreSession()); - //ToadBindingsBool->setChecked(toConfigurationNewSingle::Instance().option(ToConfiguration::Global::toadBindings()); - ////CacheDiskBool->setChecked(toConfigurationNewSingle::Instance().option(ToConfiguration::Global::cacheDisk()); - ////DisplayGridlinesBool->setChecked(toConfigurationNewSingle::Instance().option(ToConfiguration::Global::displayGridlines()); - ////MultiLineResultsBool->setChecked(toConfigurationNewSingle::Instance().option(ToConfiguration::Global::multiLineResults()); - ////MessageStatusbarBool->setChecked(toConfigurationNewSingle::Instance().option(ToConfiguration::Global::messageStatusbar()); - ////ColorizedConnectionsBool->setChecked(toConfigurationNewSingle::Instance().option(ToConfiguration::Global::colorizedConnections()); connect(ColorizedConnectionsMap, SIGNAL(clicked()), this, SLOT(ColorizedConnectionsConfigure_clicked())); - ////StatusMessageInt->setValue(toConfigurationNewSingle::Instance().option(ToConfiguration::Global::statusMessage()); - ////HistorySizeInt->setValue(toConfigurationNewSingle::Instance().option(ToConfiguration::Global::historySize()); int samples = toConfigurationNewSingle::Instance().option(ToConfiguration::Global::ChartSamplesInt).toInt(); if (samples < 0) { UnlimitedSamples->setChecked(true); - ChartSamplesInt->setValue(100); // 100 is the default value + ChartSamplesInt->setValue(100); // 100 is the default value (max "unlimited" value?) } - else - ChartSamplesInt->setValue(samples); + UnlimitedSamples->setEnabled(true); + samples = toConfigurationNewSingle::Instance().option(ToConfiguration::Global::DisplaySamplesInt).toInt(); if (samples < 0) { AllSamples->setChecked(true); - DisplaySamplesInt->setValue(ChartSamplesInt->value()); + DisplaySamplesInt->setValue(0); // 0 is the default value (max "unlimited" value?) } - else - DisplaySamplesInt->setValue(samples); - // SizeUnit - QString typ(toConfigurationNewSingle::Instance().option(ToConfiguration::Global::SizeUnit).toString()); - if (typ == "KB") - SizeUnit->setCurrentIndex(1); - else if (typ == "MB") - SizeUnit->setCurrentIndex(2); - // Refresh - Utils::toRefreshCreate(OptionGroup, "toRefreshCreate", QString::null, RefreshIntervalInt); - // DefaultFormat - DefaultListFormat->setCurrentIndex(toConfigurationNewSingle::Instance().option(ToConfiguration::Global::DefaultListFormatInt).toInt()); - // style - Style->addItems(QStyleFactory::keys()); - // Translation - Translation->setText(toConfigurationNewSingle::Instance().option(ToConfiguration::Global::Translation).toString()); - - toSettingTab::loadSettings(this); + AllSamples->setEnabled(true); } void toGlobalSetting::sqlBrowse(void) @@ -361,29 +351,7 @@ void toGlobalSetting::saveSetting(void) { toSettingTab::saveSettings(this); - ////toConfigurationNewSingle::Instance().option(ToConfiguration::Global::setCustomSQL(CustomSQL->text()); - ////toConfigurationNewSingle::Instance().option(ToConfiguration::Global::setHelpDirectory(HelpDirectory->text()); - ////toConfigurationNewSingle::Instance().option(ToConfiguration::Global::setDefaultSession(DefaultSession->text()); - ////toConfigurationNewSingle::Instance().option(ToConfiguration::Global::setCacheDir(CacheDirectory->text()); - ////toConfigurationNewSingle::Instance().option(ToConfiguration::Global::setOracleHome(OracleHomeDirectory->text()); - ////toConfigurationNewSingle::Instance().option(ToConfiguration::Global::setMysqlHome(MysqlHomeDirectory->text()); - ////toConfigurationNewSingle::Instance().option(ToConfiguration::Global::setPgsqlHome(PgsqlHomeDirectory->text()); - ////toConfigurationNewSingle::Instance().option(ToConfiguration::Global::setGraphvizHome(GraphvizHomeDirectory->text()); - ////toConfigurationNewSingle::Instance().option(ToConfiguration::Global::setChangeConnection(ChangeConnectionBool->isChecked()); - ////toConfigurationNewSingle::Instance().option(ToConfiguration::Global::setSavePassword(SavePasswordBool->isChecked()); - ////toConfigurationNewSingle::Instance().option(ToConfiguration::Global::setIncludeDbCaption(IncludeDbCaptionBool->isChecked()); - ////toConfigurationNewSingle::Instance().option(ToConfiguration::Global::setRestoreSession(RestoreSessionBool->isChecked()); - ////toConfigurationNewSingle::Instance().option(ToConfiguration::Global::setToadBindings(ToadBindingsBool->isChecked()); - ////toConfigurationNewSingle::Instance().option(ToConfiguration::Global::setCacheDisk(CacheDiskBool->isChecked()); - ////toConfigurationNewSingle::Instance().option(ToConfiguration::Global::setDisplayGridlines(DisplayGridlinesBool->isChecked()); - ////toConfigurationNewSingle::Instance().option(ToConfiguration::Global::setMultiLineResults(MultiLineResultsBool->isChecked()); - ////toConfigurationNewSingle::Instance().option(ToConfiguration::Global::setMessageStatusbar(MessageStatusbarBool->isChecked()); - ////toConfigurationNewSingle::Instance().option(ToConfiguration::Global::setColorizedConnections(ColorizedConnectionsBool->isChecked()); - - ////toConfigurationNewSingle::Instance().option(ToConfiguration::Global::setStatusMessage(StatusMessageInt->value()); - ////toConfigurationNewSingle::Instance().option(ToConfiguration::Global::setHistorySize(HistorySizeInt->value()); - if (UnlimitedSamples->isChecked()) toConfigurationNewSingle::Instance().setOption(ToConfiguration::Global::ChartSamplesInt, -1); else @@ -394,12 +362,7 @@ else toConfigurationNewSingle::Instance().setOption(ToConfiguration::Global::DisplaySamplesInt, DisplaySamplesInt->value()); - ////toConfigurationNewSingle::Instance().option(ToConfiguration::Global::setSizeUnit(SizeUnit->currentText()); - ////toConfigurationNewSingle::Instance().option(ToConfiguration::Global::setRefresh(RefreshIntervalInt->currentText()); - ////toConfigurationNewSingle::Instance().option(ToConfiguration::Global::setDefaultFormat(DefaultListFormat->currentIndex()); - ////toConfigurationNewSingle::Instance().option(ToConfiguration::Global::setStyle(Style->currentText()); Utils::toSetSessionType(Style->currentText()); - ////toConfigurationNewSingle::Instance().option(ToConfiguration::Global::setTranslation(Translation->text()); } toToolSetting::toToolSetting(QWidget *parent, const char *name, Qt::WFlags fl) Modified: trunk/tora/src/core/toglobalsettingui.ui =================================================================== --- trunk/tora/src/core/toglobalsettingui.ui 2014-03-07 00:38:35 UTC (rev 5099) +++ trunk/tora/src/core/toglobalsettingui.ui 2014-03-07 13:26:35 UTC (rev 5100) @@ -6,10 +6,22 @@ <rect> <x>0</x> <y>0</y> - <width>756</width> - <height>680</height> + <width>600</width> + <height>682</height> </rect> </property> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>600</width> + <height>0</height> + </size> + </property> <property name="windowTitle"> <string>toGlobalSettingUI</string> </property> @@ -240,7 +252,7 @@ </property> <layout class="QGridLayout" name="gridLayout"> <item row="6" column="2"> - <widget class="QComboBox" name="DefaultListFormat"> + <widget class="QComboBox" name="DefaultListFormatInt"> <item> <property name="text"> <string>Text</string> @@ -272,7 +284,7 @@ <bool>false</bool> </property> <property name="buddy"> - <cstring>DefaultListFormat</cstring> + <cstring>DefaultListFormatInt</cstring> </property> </widget> </item> @@ -320,7 +332,7 @@ <bool>false</bool> </property> <property name="buddy"> - <cstring>RefreshIntervalInt</cstring> + <cstring>RefreshInterval</cstring> </property> </widget> </item> @@ -518,7 +530,7 @@ </widget> </item> <item row="5" column="2"> - <widget class="QComboBox" name="RefreshIntervalInt"/> + <widget class="QComboBox" name="RefreshInterval"/> </item> <item row="3" column="2"> <widget class="QSpinBox" name="DisplaySamplesInt"> Modified: trunk/tora/src/core/tohelp.cpp =================================================================== --- trunk/tora/src/core/tohelp.cpp 2014-03-07 00:38:35 UTC (rev 5099) +++ trunk/tora/src/core/tohelp.cpp 2014-03-07 13:26:35 UTC (rev 5100) @@ -62,7 +62,7 @@ QWidget *toHelpTool::configurationTab(QWidget *parent) { - return new toHelpPrefs(this, parent); + return new toHelpSetting(this, parent); } void toHelpTool::displayHelp(void) Modified: trunk/tora/src/core/tohelp.h =================================================================== --- trunk/tora/src/core/tohelp.h 2014-03-07 00:38:35 UTC (rev 5099) +++ trunk/tora/src/core/tohelp.h 2014-03-07 13:26:35 UTC (rev 5100) @@ -62,7 +62,7 @@ -class toHelpPrefs; +class toHelpSetting; /** * Additional help tool. Also used as object to connect to to display help @@ -202,7 +202,7 @@ */ static void connectDialog(QDialog *dialog); - friend class toHelpPrefs; + friend class toHelpSetting; }; #endif Modified: trunk/tora/src/core/tohelpsetup.cpp =================================================================== --- trunk/tora/src/core/tohelpsetup.cpp 2014-03-07 00:38:35 UTC (rev 5099) +++ trunk/tora/src/core/tohelpsetup.cpp 2014-03-07 13:26:35 UTC (rev 5100) @@ -69,7 +69,7 @@ } -toHelpPrefs::toHelpPrefs(toTool *tool, QWidget *parent, const char *name) +toHelpSetting::toHelpSetting(toTool *tool, QWidget *parent, const char *name) : QWidget(parent) , toSettingTab("additionalhelp.html") , Tool(tool) @@ -102,7 +102,7 @@ } -void toHelpPrefs::saveSetting() +void toHelpSetting::saveSetting() { toSettingTab::saveSettings(this); // int i = 0; @@ -122,7 +122,7 @@ } -void toHelpPrefs::addFile() +void toHelpSetting::addFile() { toHelpAddFile file(this); if (file.exec()) @@ -130,13 +130,13 @@ } -void toHelpPrefs::delFile() +void toHelpSetting::delFile() { delete FileList->selectedItem(); } -void toHelpPrefs::oracleManuals() +void toHelpSetting::oracleManuals() { // For Oracle 11g look for a file /nav/portal_3.htm which contains a list of all books QString filename = Utils::toOpenFilename(QString::fromLatin1("*index.htm*"), this); Modified: trunk/tora/src/core/tohelpsetup.h =================================================================== --- trunk/tora/src/core/tohelpsetup.h 2014-03-07 00:38:35 UTC (rev 5099) +++ trunk/tora/src/core/tohelpsetup.h 2014-03-07 13:26:35 UTC (rev 5100) @@ -57,9 +57,10 @@ }; -class toHelpPrefs : public QWidget, - public Ui::toHelpSetupUI, - public toSettingTab +class toHelpSetting + : public QWidget + , public Ui::toHelpSetupUI + , public toSettingTab { Q_OBJECT; @@ -67,7 +68,7 @@ toTool *Tool; public: - toHelpPrefs(toTool *tool, QWidget *parent, const char *name = 0); + toHelpSetting(toTool *tool, QWidget *parent, const char *name = 0); public slots: virtual void saveSetting(void); Modified: trunk/tora/src/core/toresultcode.cpp =================================================================== --- trunk/tora/src/core/toresultcode.cpp 2014-03-07 00:38:35 UTC (rev 5099) +++ trunk/tora/src/core/toresultcode.cpp 2014-03-07 13:26:35 UTC (rev 5100) @@ -115,7 +115,7 @@ { if ((type == QString::fromLatin1("TABLE") || type == QString::fromLatin1("TABLE PARTITION")) && - !toConfigurationNewSingle::Instance().option(Oracle::UseDbmsMetadata).toBool()) + !toConfigurationNewSingle::Instance().option(Oracle::UseDbmsMetadataBool).toBool()) { objects.insert(objects.end(), QString::fromLatin1("TABLE FAMILY:") + owner + QString::fromLatin1(".") + name); objects.insert(objects.end(), QString::fromLatin1("TABLE REFERENCES:") + owner + QString::fromLatin1(".") + name); @@ -132,11 +132,11 @@ objects.insert(objects.end(), type + QString::fromLatin1(":") + owner + QString::fromLatin1(".") + name); toExtract extract(conn, NULL); - extract.setCode(toConfigurationNewSingle::Instance().option(Oracle::IncludeCode).toBool()); - extract.setHeading(m_heading && toConfigurationNewSingle::Instance().option(Oracle::IncludeHeader).toBool()); + extract.setCode(toConfigurationNewSingle::Instance().option(Oracle::IncludeCodeBool).toBool()); + extract.setHeading(m_heading && toConfigurationNewSingle::Instance().option(Oracle::IncludeHeaderBool).toBool()); extract.setPrompt(Prompt); extract.setReplace(true); // generate create OR REPLACE statements - extract.setParallel(toConfigurationNewSingle::Instance().option(Oracle::IncludeParallel).toBool()); + extract.setParallel(toConfigurationNewSingle::Instance().option(Oracle::IncludeParallelBool).toBool()); editor()->setText(extract.create(objects)); } TOCATCH Modified: trunk/tora/src/core/toresultplan.cpp =================================================================== --- trunk/tora/src/core/toresultplan.cpp 2014-03-07 00:38:35 UTC (rev 5099) +++ trunk/tora/src/core/toresultplan.cpp 2014-03-07 13:26:35 UTC (rev 5100) @@ -596,7 +596,7 @@ QString planTable = ToConfiguration::Oracle::planTable(connection().user()); // if shared plan table does not exist, do not try to create it - if(toConfigurationNewSingle::Instance().option(ToConfiguration::Oracle::SharedPlan).toBool()) + if(toConfigurationNewSingle::Instance().option(ToConfiguration::Oracle::SharedPlanBool).toBool()) { TOMessageBox::warning(this, tr("Plan table doesn't exist"), Modified: trunk/tora/src/core/tosyntaxsetup.cpp =================================================================== --- trunk/tora/src/core/tosyntaxsetup.cpp 2014-03-07 00:38:35 UTC (rev 5099) +++ trunk/tora/src/core/tosyntaxsetup.cpp 2014-03-07 13:26:35 UTC (rev 5100) @@ -63,33 +63,47 @@ setupUi(this); + connect(EditorShortcutsEdit, SIGNAL(clicked()), + this, SLOT(openEditorShortcutsDialog())); + + // Crete/Adjust additioal complex widgets Analyzer = new toSyntaxAnalyzerNL(Example->editor()); + //Example->setAnalyzer(Analyzer); + Example->sciEditor()->setReadOnly(true); - //SyntaxHighlighting->setCurrentIndex(toConfigurationNewSingle::Instance().syntaxHighlighting()); - //EditorType->setCurrentIndex(toConfigurationNewSingle::Instance().editorType()); - //KeywordUpper->setChecked(toConfigurationNewSingle::Instance().keywordUpper()); - //ObjectNamesUpper->setChecked(toConfigurationNewSingle::Instance().objectNamesUpper()); - //CompletionSort->setChecked(toConfigurationNewSingle::Instance().completionSort()); + Example->sciEditor()->setText(QString::fromLatin1("create procedure CheckObvious as\n" + "begin\n" + " Quest:='Great'; -- This variable doesn't exist\n" + " if Quest = 'Great' then\n" + " Obvious(true);\n" + " end if;\n" + " HugeNumber := -12345678.90;\n" + "/*\n" + " * multi line comment\n" + " */\n" + "end;")); - //UseMaxTextWidthMarkBool->setChecked(toConfigurationNewSingle::Instance().useMaxTextWidthMark()); - //MaxTextWidthMark->setValue(toConfigurationNewSingle::Instance().maxTextWidthMark()); - //CodeCompletionBool->setChecked(toConfigurationNewSingle::Instance().codeCompletion()); - //EditorShortcuts->setChecked(toConfigurationNewSingle::Instance().option(Editor::UseEditorShortcutsBool).toBool()); - connect(EditorShortcutsEdit, SIGNAL(clicked()), - this, SLOT(openEditorShortcutsDialog())); + Example->setCurrentDebugLine(4); + QMap<int, QString> Errors; + Errors[2] = tr("Unknown variable"); + Example->setErrors(Errors); - //AutoIndentBool->setChecked(toConfigurationNewSingle::Instance().autoIndent()); - //Extensions->setText(toConfigurationNewSingle::Instance().extensions()); - //TabStopInt->setValue(toConfigurationNewSingle::Instance().tabStop()); - //UseSpacesForIndentBool->setChecked(toConfigurationNewSingle::Instance().useSpacesForIndent()); + for (int idx = 0; idx < ColorsEnum.keyCount(); idx++) + { + QString colorName = ColorsEnum.key(idx); + SyntaxComponent->addItem(colorName); + } + // load values from toConfigurationNewSingle into Widgets (if widget name == Config Option Name) + toSettingTab::loadSettings(this); + { QFont font(Utils::toStringToFont(toConfigurationNewSingle::Instance().option(Editor::ConfCodeFont).toString())); checkFixedWidth(font); - CodeExample->setFont(font); + CodeExampleFont->setFont(font); } - TextExample->setFont(Utils::toStringToFont(toConfigurationNewSingle::Instance().option(Editor::ConfTextFont).toString())); + TextExampleFont->setFont(Utils::toStringToFont(toConfigurationNewSingle::Instance().option(Editor::ConfTextFont).toString())); { QString str(toConfigurationNewSingle::Instance().option(Editor::ListTextFont).toString()); @@ -105,57 +119,30 @@ font = Utils::toStringToFont(str); } ListFontName = Utils::toFontToString(font); - ResultExample->setFont(font); + ResultExampleFont->setFont(font); } - - for (int idx = 0; idx < ColorsEnum.keyCount(); idx++) - { - QString colorName = ColorsEnum.key(idx); - SyntaxComponent->addItem(colorName); - } - //Example->setAnalyzer(Analyzer); - Example->sciEditor()->setReadOnly(true); - - Example->sciEditor()->setText(QString::fromLatin1("create procedure CheckObvious as\n" - "begin\n" - " Quest:='Great'; -- This variable doesn't exist\n" - " if Quest = 'Great' then\n" - " Obvious(true);\n" - " end if;\n" - " HugeNumber := -12345678.90;\n" - "/*\n" - " * multi line comment\n" - " */\n" - "end;")); - - Example->setCurrentDebugLine(4); - QMap<int, QString> Errors; - Errors[2] = tr("Unknown variable"); - Example->setErrors(Errors); - - toSettingTab::loadSettings(this); } void toSyntaxSetup::checkFixedWidth(const QFont &fnt) { QFontMetrics mtr(fnt); if (mtr.width(QString::fromLatin1("iiiiiiii")) == mtr.width(QString::fromLatin1("MMMMMMMM"))) - KeywordUpper->setEnabled(true); + KeywordUpperBool->setEnabled(true); else { - KeywordUpper->setChecked(false); - KeywordUpper->setEnabled(false); + KeywordUpperBool->setChecked(false); + KeywordUpperBool->setEnabled(false); } } void toSyntaxSetup::selectFont(void) { bool ok = true; - QFont font = QFontDialog::getFont(&ok, CodeExample->font(), this); + QFont font = QFontDialog::getFont(&ok, CodeExampleFont->font(), this); if (ok) { - CodeExample->setFont(font); + CodeExampleFont->setFont(font); Example->setFont(font); checkFixedWidth(font); } @@ -164,10 +151,10 @@ void toSyntaxSetup::selectText(void) { bool ok = true; - QFont font = QFontDialog::getFont(&ok, TextExample->font(), this); + QFont font = QFontDialog::getFont(&ok, TextExampleFont->font(), this); if (ok) - TextExample->setFont(font); + TextExampleFont->setFont(font); } void toSyntaxSetup::selectResultFont(void) @@ -178,7 +165,7 @@ if (ok) { ListFontName = Utils::toFontToString(font); - ResultExample->setFont(font); + ResultExampleFont->setFont(font); } } @@ -251,35 +238,12 @@ void toSyntaxSetup::saveSetting(void) { - //toConfigurationNewSingle::Instance().setSyntaxHighlighting(SyntaxHighlighting->currentIndex()); - //toConfigurationNewSingle::Instance().setEditorType(EditorType->currentIndex()); + toSettingTab::saveSettings(this); + toConfigurationNewSingle::Instance().setOption(ToConfiguration::Editor::ConfTextFont, Utils::toFontToString(TextExampleFont->font())); + toConfigurationNewSingle::Instance().setOption(ToConfiguration::Editor::ConfCodeFont, Utils::toFontToString(CodeExampleFont->font())); + toConfigurationNewSingle::Instance().setOption(ToConfiguration::Editor::ListTextFont, Utils::toFontToString(ResultExampleFont->font())); - //toConfigurationNewSingle::Instance().setTextFontName(Utils::toFontToString(TextExample->font())); - //toConfigurationNewSingle::Instance().setCodeFontName(Utils::toFontToString(CodeExample->font())); - //toConfigurationNewSingle::Instance().setListFontName(ListFontName); - // TODO bool highlight = SyntaxHighlighting->isChecked(); - // TODO toConfigurationNewSingle::Instance().setHighlightType(highlight); - //toConfigurationNewSingle::Instance().setUseMaxTextWidthMark(UseMaxTextWidthMarkBool->isChecked()); - //toConfigurationNewSingle::Instance().setMaxTextWidthMark(MaxTextWidthMark->value()); - //toConfigurationNewSingle::Instance().setKeywordUpper(KeywordUpper->isChecked()); - //toConfigurationNewSingle::Instance().setObjectNamesUpper(ObjectNamesUpper->isChecked()); - // TODO toConfigurationNewSingle::Instance().setCodeCompletion(highlight && CodeCompletion->isChecked()); - //toConfigurationNewSingle::Instance().setCompletionSort(CompletionSort->isChecked()); - //toConfigurationNewSingle::Instance().setUseEditorShortcuts(EditorShortcuts->isChecked()); - //toConfigurationNewSingle::Instance().setAutoIndent(AutoIndentBool->isChecked()); - //toConfigurationNewSingle::Instance().setTabStop(TabStopInt->value()); - //toConfigurationNewSingle::Instance().setUseSpacesForIndent(UseSpacesForIndentBool->isChecked()); - - //toConfigurationNewSingle::Instance().setStyles(Styles); - -//#define C2T(c) (Colors[Analyzer.typeString((c))]) -// toConfigurationNewSingle::Instance().setSyntaxDefaultBg(C2T(toSyntaxAnalyzer::DefaultBg)); -// toConfigurationNewSingle::Instance().setSyntaxDebugBg(C2T(toSyntaxAnalyzer::DebugBg)); -// toConfigurationNewSingle::Instance().setSyntaxErrorBg(C2T(toSyntaxAnalyzer::ErrorBg)); -// toConfigurationNewSingle::Instance().setSyntaxCurrentLineMarker(C2T(toSyntaxAnalyzer::CurrentLineMarker)); -/... [truncated message content] |
From: <ibr...@us...> - 2014-03-09 00:20:22
|
Revision: 5105 http://sourceforge.net/p/tora/code/5105 Author: ibre5041 Date: 2014-03-09 00:20:16 +0000 (Sun, 09 Mar 2014) Log Message: ----------- Modified Paths: -------------- trunk/tora/src/core/main.cpp trunk/tora/src/tools/tooutput.cpp trunk/tora/src/tools/tooutput.h trunk/tora/src/tools/tooutputsettingui.ui Modified: trunk/tora/src/core/main.cpp =================================================================== --- trunk/tora/src/core/main.cpp 2014-03-08 23:23:20 UTC (rev 5104) +++ trunk/tora/src/core/main.cpp 2014-03-09 00:20:16 UTC (rev 5105) @@ -94,6 +94,7 @@ /*! Try to transfer some config options from Tora 2.x */ { + // Transfer connections QSettings oldSettings (TOORGNAME, "TOra"); QSettings newSettings (TOORGNAME, TOAPPNAME); oldSettings.beginGroup("connections"); @@ -104,7 +105,14 @@ } oldSettings.endGroup(); newSettings.endGroup(); - + newSettings.sync(); + oldSettings.remove("connections"); + oldSettings.remove("helpdialog"); + oldSettings.remove("memoEditor"); + oldSettings.remove("toDescribe"); + oldSettings.remove("toWorksheet"); + oldSettings.remove("toWaitEvents"); + oldSettings.remove("toMessage"); } #pragma message WARN( "TODO/FIXME: hicolor theme is broken for Docklet icons. But we need to resolve X11 themes one day" ) Modified: trunk/tora/src/tools/tooutput.cpp =================================================================== --- trunk/tora/src/tools/tooutput.cpp 2014-03-08 23:23:20 UTC (rev 5104) +++ trunk/tora/src/tools/tooutput.cpp 2014-03-09 00:20:16 UTC (rev 5105) @@ -55,7 +55,7 @@ { switch(option) { - case PollingIntervalInt: return QVariant(QString("10 seconds")); + case PollingInterval: return QVariant(QString("10 seconds")); case SourceTypeInt: return QVariant((int)0); case LogUser: return QVariant(QString("ULOG")); default: @@ -83,8 +83,8 @@ Utils::toRefreshCreate(this, "toRefreshCreate", - toConfigurationNewSingle::Instance().option(Output::PollingIntervalInt).toString(), - PollingIntervalInt); + toConfigurationNewSingle::Instance().option(Output::PollingInterval).toString(), + PollingInterval); toSettingTab::loadSettings(this); } @@ -195,7 +195,7 @@ Refresh = Utils::toRefreshCreate(Toolbar, "Refresh", - toConfigurationNewSingle::Instance().option(ToConfiguration::Output::PollingIntervalInt).toString()); + toConfigurationNewSingle::Instance().option(ToConfiguration::Output::PollingInterval).toString()); Toolbar->addWidget(Refresh); connect(Refresh, SIGNAL(activated(const QString &)), @@ -216,7 +216,7 @@ try { connect(timer(), SIGNAL(timeout(void)), this, SLOT(refresh(void))); - Utils::toRefreshParse(timer(), toConfigurationNewSingle::Instance().option(ToConfiguration::Output::PollingIntervalInt).toString()); + Utils::toRefreshParse(timer(), toConfigurationNewSingle::Instance().option(ToConfiguration::Output::PollingInterval).toString()); } TOCATCH; Modified: trunk/tora/src/tools/tooutput.h =================================================================== --- trunk/tora/src/tools/tooutput.h 2014-03-08 23:23:20 UTC (rev 5104) +++ trunk/tora/src/tools/tooutput.h 2014-03-09 00:20:16 UTC (rev 5105) @@ -59,8 +59,8 @@ public: Output() : ConfigContext("Output", ENUM_REF(Output,OptionTypeEnum)) {}; enum OptionTypeEnum { - PollingIntervalInt = 12000 // #define CONF_POLLING - , SourceTypeInt // #define CONF_LOG_TYPE + PollingInterval = 12000 // #define CONF_POLLING + , SourceTypeInt // #define CONF_LOG_TYPE , LogUser // #define CONF_LOG_USER }; QVariant defaultValue(int option) const; Modified: trunk/tora/src/tools/tooutputsettingui.ui =================================================================== --- trunk/tora/src/tools/tooutputsettingui.ui 2014-03-08 23:23:20 UTC (rev 5104) +++ trunk/tora/src/tools/tooutputsettingui.ui 2014-03-09 00:20:16 UTC (rev 5105) @@ -62,7 +62,7 @@ </widget> </item> <item row="1" column="0"> - <widget class="QComboBox" name="PollingIntervalInt"/> + <widget class="QComboBox" name="PollingInterval"/> </item> <item row="0" column="0"> <widget class="QLabel" name="label"> @@ -73,7 +73,7 @@ <string>&Polling timeout</string> </property> <property name="buddy"> - <cstring>PollingIntervalInt</cstring> + <cstring>PollingInterval</cstring> </property> </widget> </item> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <su...@us...> - 2014-03-17 13:57:57
|
Revision: 5110 http://sourceforge.net/p/tora/code/5110 Author: subik Date: 2014-03-17 13:57:52 +0000 (Mon, 17 Mar 2014) Log Message: ----------- compilation fixes for 'my system (tm)' Modified Paths: -------------- trunk/tora/src/core/tomainwindow.cpp trunk/tora/src/core/totool.cpp trunk/tora/src/core/utils.cpp trunk/tora/src/tools/tobrowsertablewidget.cpp Modified: trunk/tora/src/core/tomainwindow.cpp =================================================================== --- trunk/tora/src/core/tomainwindow.cpp 2014-03-15 22:17:26 UTC (rev 5109) +++ trunk/tora/src/core/tomainwindow.cpp 2014-03-17 13:57:52 UTC (rev 5110) @@ -39,6 +39,7 @@ #include <QtGui/QApplication> #include <QtGui/QAction> +#include <QSettings> namespace ToConfiguration { Modified: trunk/tora/src/core/totool.cpp =================================================================== --- trunk/tora/src/core/totool.cpp 2014-03-15 22:17:26 UTC (rev 5109) +++ trunk/tora/src/core/totool.cpp 2014-03-17 13:57:52 UTC (rev 5110) @@ -53,6 +53,7 @@ #include <QtGui/QMenu> #include <QtGui/QBoxLayout> #include <QtGui/QAction> +#include <QtDebug> // A little magic to get lrefresh to work and get a check on qApp #undef QT_TRANSLATE_NOOP Modified: trunk/tora/src/core/utils.cpp =================================================================== --- trunk/tora/src/core/utils.cpp 2014-03-15 22:17:26 UTC (rev 5109) +++ trunk/tora/src/core/utils.cpp 2014-03-17 13:57:52 UTC (rev 5110) @@ -52,6 +52,7 @@ #include <QtGui/QPainter> #include <QtGui/QKeyEvent> #include <QtGui/QDockWidget> +#include <QStyleFactory> #include <stdlib.h> #include <algorithm> Modified: trunk/tora/src/tools/tobrowsertablewidget.cpp =================================================================== --- trunk/tora/src/tools/tobrowsertablewidget.cpp 2014-03-15 22:17:26 UTC (rev 5109) +++ trunk/tora/src/tools/tobrowsertablewidget.cpp 2014-03-17 13:57:52 UTC (rev 5110) @@ -51,8 +51,10 @@ #include "result/toresulttabledata.h" #include "core/toresultdrawing.h" +#ifdef TORA_EXPERIMENTAL #include "dotgraphview.h" #include "dotgraph.h" +#endif Util::RegisterInFactory<toBrowserTableWidget, toBrowserWidgetFactory, toCache::CacheEntryType> regToBrowserTableWidget(toCache::TABLE); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ibr...@us...> - 2014-04-17 13:47:52
|
Revision: 5115 http://sourceforge.net/p/tora/code/5115 Author: ibre5041 Date: 2014-04-17 13:47:48 +0000 (Thu, 17 Apr 2014) Log Message: ----------- Configure editors colors - can not be saved yet Modified Paths: -------------- trunk/tora/src/core/tosyntaxsetup.cpp trunk/tora/src/core/tosyntaxsetup.h trunk/tora/src/core/tosyntaxsetupui.ui trunk/tora/src/editor/tosqltext.h trunk/tora/src/editor/tostyle.cpp trunk/tora/src/editor/tostyle.h trunk/tora/src/parsing/tolexeroracle.cpp trunk/tora/src/parsing/tolexeroracle.h trunk/tora/src/parsing/tosyntaxanalyzernl.cpp trunk/tora/src/parsing/tosyntaxanalyzeroracle.cpp trunk/tora/src/parsing/tsqllexer.h trunk/tora/src/parsing/tsqllexeroracle2.cc Modified: trunk/tora/src/core/tosyntaxsetup.cpp =================================================================== --- trunk/tora/src/core/tosyntaxsetup.cpp 2014-04-14 15:38:50 UTC (rev 5114) +++ trunk/tora/src/core/tosyntaxsetup.cpp 2014-04-17 13:47:48 UTC (rev 5115) @@ -41,6 +41,7 @@ #include "editor/toworksheettext.h" #include "core/toconfiguration_new.h" #include "core/toeditorsetting.h" +#include "ts_log/ts_log_utils.h" #include <QtGui/QFontDialog> #include <QtGui/QColorDialog> @@ -52,7 +53,7 @@ toSyntaxSetup::toSyntaxSetup(QWidget *parent, const char *name, Qt::WFlags fl) : QWidget(parent) , toSettingTab("fonts.html") - , ColorsEnum(ENUM_REF(toSyntaxAnalyzer,WordClassEnum)) + , WordClassEnum(ENUM_REF(toSyntaxAnalyzer,WordClassEnum)) , Current(NULL) , Styles(toConfigurationNewSingle::Instance().option(ToConfiguration::Editor::EditStyleMap).value<toStylesMap>()) { @@ -66,12 +67,12 @@ connect(EditorShortcutsEdit, SIGNAL(clicked()), this, SLOT(openEditorShortcutsDialog())); - // Crete/Adjust additioal complex widgets + // Crete/Adjust additional complex widgets Analyzer = new toSyntaxAnalyzerNL(Example->editor()); - //Example->setAnalyzer(Analyzer); Example->sciEditor()->setReadOnly(true); - Example->sciEditor()->setText(QString::fromLatin1("create procedure CheckObvious as\n" + Example->sciEditor()->setText(QString::fromLatin1("PROMPT Create procedure\n" + "create procedure CheckObvious as\n" "begin\n" " Quest:='Great'; -- This variable doesn't exist\n" " if Quest = 'Great' then\n" @@ -83,20 +84,28 @@ " */\n" "end;")); +#pragma message WARN("TODO: Error line style & Debug line style") +#if 0 Example->setCurrentDebugLine(4); QMap<int, QString> Errors; Errors[2] = tr("Unknown variable"); Example->setErrors(Errors); +#endif - for (int idx = 0; idx < ColorsEnum.keyCount(); idx++) + for (int idx = 0; idx < WordClassEnum.keyCount(); idx++) { - QString colorName = ColorsEnum.key(idx); + QString colorName = WordClassEnum.key(idx); SyntaxComponent->addItem(colorName); } // load values from toConfigurationNewSingle into Widgets (if widget name == Config Option Name) toSettingTab::loadSettings(this); + if(SyntaxHighlightingInt->currentText() == "QsciSQL") + Example->editor()->setHighlighter(toSqlText::QsciSql); + else + Example->editor()->setHighlighter(toSqlText::Oracle); + { QFont font(Utils::toStringToFont(toConfigurationNewSingle::Instance().option(Editor::ConfCodeFont).toString())); checkFixedWidth(font); @@ -145,6 +154,20 @@ CodeExampleFont->setFont(font); Example->setFont(font); checkFixedWidth(font); + + FontSample->setFont(font); + FontSample->update(); + + // One font for all work classes + for (int idx = 0; idx < WordClassEnum.keyCount(); idx++) + { + QString colorName = WordClassEnum.key(idx); + toSyntaxAnalyzer::WordClassEnum key = (toSyntaxAnalyzer::WordClassEnum)WordClassEnum.value(idx); + Styles[key].Font = font; + } + Styles.updateLexer(Example->editor()->lexer()); + Example->editor()->recolor(0, -1); + Example->editor()->update(); } } @@ -178,7 +201,7 @@ int toSyntaxSetup::wordClass() const { QString t = Current->text(); - int e = ColorsEnum.keyToValue(t.toStdString().c_str()); + int e = WordClassEnum.keyToValue(t.toStdString().c_str()); if (e == -1) throw tr("Unknown color name %1").arg(t); @@ -211,10 +234,14 @@ palette.setColor(QPalette::Foreground, Styles.value(wc).FGColor); FontSample->setFont(Styles.value(wc).Font); FontSample->setPalette(palette); + FontSample->setAutoFillBackground(true); + FontSample->update(); + + //Example->setSt } } -void toSyntaxSetup::selectColor(void) +void toSyntaxSetup::selectFGColor(void) { try { @@ -234,12 +261,46 @@ palette.setColor(QPalette::Background, col); FGSample->setPalette(palette); FGSample->update(); + + Styles.updateLexer(Example->editor()->lexer()); + Example->editor()->recolor(0, -1); + Example->editor()->update(); } } } TOCATCH } +void toSyntaxSetup::selectBGColor(void) +{ + try + { + if (Current) + { + int coleng = wordClass(); + QColor col = QColorDialog::getColor(Styles.value(coleng).BGColor); + if (col.isValid()) + { + Styles[coleng].BGColor = col; + + QPalette palette = FontSample->palette(); + palette.setColor(QPalette::Background, col); + FontSample->setPalette(palette); + FontSample->update(); + + palette.setColor(QPalette::Background, col); + BGSample->setPalette(palette); + BGSample->update(); + + Styles.updateLexer(Example->editor()->lexer()); + Example->editor()->recolor(0, -1); + Example->editor()->update(); + } + } + } + TOCATCH +} + void toSyntaxSetup::saveSetting(void) { toSettingTab::saveSettings(this); @@ -247,7 +308,9 @@ toConfigurationNewSingle::Instance().setOption(ToConfiguration::Editor::ConfCodeFont, Utils::toFontToString(CodeExampleFont->font())); toConfigurationNewSingle::Instance().setOption(ToConfiguration::Editor::ListTextFont, Utils::toFontToString(ResultExampleFont->font())); - // for ToConfiguration::Editor::EditStyleMap see ShortcutModel::saveValues + // for ShortcutModel see ShortcutModel::saveValues + + toConfigurationNewSingle::Instance().setOption(ToConfiguration::Editor::EditStyleMap, QVariant::fromValue(Styles)); } ToConfiguration::Editor toSyntaxSetup::s_editorConfig; Modified: trunk/tora/src/core/tosyntaxsetup.h =================================================================== --- trunk/tora/src/core/tosyntaxsetup.h 2014-04-14 15:38:50 UTC (rev 5114) +++ trunk/tora/src/core/tosyntaxsetup.h 2014-04-17 13:47:48 UTC (rev 5115) @@ -57,7 +57,7 @@ QString ListFontName; QListWidgetItem *Current; - QMetaEnum ColorsEnum; + QMetaEnum WordClassEnum; toStylesMap Styles; // QMap<enum toSyntaxAnalyzer::WordClass, toStyle> => toStyle toSyntaxAnalyzer* Analyzer; public: @@ -66,7 +66,8 @@ public slots: virtual void changeLine(QListWidgetItem *); - virtual void selectColor(void); + virtual void selectFGColor(void); + virtual void selectBGColor(void); virtual void selectFont(void); virtual void selectText(void); virtual void selectResultFont(void); Modified: trunk/tora/src/core/tosyntaxsetupui.ui =================================================================== --- trunk/tora/src/core/tosyntaxsetupui.ui 2014-04-14 15:38:50 UTC (rev 5114) +++ trunk/tora/src/core/tosyntaxsetupui.ui 2014-04-17 13:47:48 UTC (rev 5115) @@ -52,6 +52,9 @@ <property name="text"> <string>Syntax highlighting</string> </property> + <property name="buddy"> + <cstring>SyntaxHighlightingInt</cstring> + </property> </widget> </item> <item> @@ -77,6 +80,9 @@ <property name="text"> <string>Editor Type</string> </property> + <property name="buddy"> + <cstring>EditorTypeInt</cstring> + </property> </widget> </item> <item> @@ -252,6 +258,9 @@ <property name="wordWrap"> <bool>false</bool> </property> + <property name="buddy"> + <cstring>TextExampleChoose</cstring> + </property> </widget> </item> <item> @@ -273,6 +282,9 @@ <property name="wordWrap"> <bool>false</bool> </property> + <property name="buddy"> + <cstring>CodeExampleChoose</cstring> + </property> </widget> </item> <item> @@ -294,6 +306,9 @@ <property name="wordWrap"> <bool>false</bool> </property> + <property name="buddy"> + <cstring>ResultExampleChoose</cstring> + </property> </widget> </item> <item> @@ -313,6 +328,9 @@ <property name="wordWrap"> <bool>false</bool> </property> + <property name="buddy"> + <cstring>Extensions</cstring> + </property> </widget> </item> <item> @@ -597,6 +615,22 @@ </hints> </connection> <connection> + <sender>PickFontButton</sender> + <signal>clicked()</signal> + <receiver>toSyntaxSetupUI</receiver> + <slot>selectFont()</slot> + <hints> + <hint type="sourcelabel"> + <x>20</x> + <y>20</y> + </hint> + <hint type="destinationlabel"> + <x>20</x> + <y>20</y> + </hint> + </hints> + </connection> + <connection> <sender>KeywordUpperBool</sender> <signal>toggled(bool)</signal> <receiver>toSyntaxSetupUI</receiver> @@ -616,7 +650,7 @@ <sender>PickFGButton</sender> <signal>clicked()</signal> <receiver>toSyntaxSetupUI</receiver> - <slot>selectColor()</slot> + <slot>selectFGColor()</slot> <hints> <hint type="sourcelabel"> <x>20</x> @@ -629,6 +663,22 @@ </hints> </connection> <connection> + <sender>PickBGButton</sender> + <signal>clicked()</signal> + <receiver>toSyntaxSetupUI</receiver> + <slot>selectBGColor()</slot> + <hints> + <hint type="sourcelabel"> + <x>20</x> + <y>20</y> + </hint> + <hint type="destinationlabel"> + <x>20</x> + <y>20</y> + </hint> + </hints> + </connection> + <connection> <sender>SyntaxComponent</sender> <signal>currentItemChanged(QListWidgetItem*,QListWidgetItem*)</signal> <receiver>toSyntaxSetupUI</receiver> Modified: trunk/tora/src/editor/tosqltext.h =================================================================== --- trunk/tora/src/editor/tosqltext.h 2014-04-14 15:38:50 UTC (rev 5114) +++ trunk/tora/src/editor/tosqltext.h 2014-04-17 13:47:48 UTC (rev 5115) @@ -56,10 +56,7 @@ /** * A editor which supports syntax highlighting. - * - * This needs to be heavily re-implemented/simplified to use QScintilla syntax - * coloring. For now it only stubs used API from previous version of - * toHighlightedTextEditor. The rest of the API comes unchanged from toScintilla + * The rest of the API comes unchanged from toScintilla * which is now derived from QScintilla. */ class toSqlText : public toScintilla Modified: trunk/tora/src/editor/tostyle.cpp =================================================================== --- trunk/tora/src/editor/tostyle.cpp 2014-04-14 15:38:50 UTC (rev 5114) +++ trunk/tora/src/editor/tostyle.cpp 2014-04-17 13:47:48 UTC (rev 5115) @@ -34,4 +34,47 @@ #include "editor/tostyle.h" +#include <Qsci/qsciapis.h> +#include <Qsci/qscilexersql.h> +void toStylesMap::updateLexer(QsciLexer *lexer) +{ + Q_FOREACH(int key, keys()) + { + lexer->setColor(value(key).FGColor, key); + lexer->setPaper(value(key).BGColor, key); + lexer->setFont(value(key).Font, key); + } + + // Treat all comment style as one + lexer->setColor(value(QsciLexerSQL::Comment).FGColor, QsciLexerSQL::CommentLine); + lexer->setColor(value(QsciLexerSQL::Comment).FGColor, QsciLexerSQL::CommentLineHash); + lexer->setColor(value(QsciLexerSQL::Comment).FGColor, QsciLexerSQL::PlusComment); + lexer->setColor(value(QsciLexerSQL::Comment).FGColor, QsciLexerSQL::CommentDocKeyword); + lexer->setColor(value(QsciLexerSQL::Comment).FGColor, QsciLexerSQL::CommentDocKeywordError); + lexer->setColor(value(QsciLexerSQL::Comment).FGColor, QsciLexerSQL::QuotedIdentifier+1); // See tolexeroracle.h:58 + + lexer->setPaper(value(QsciLexerSQL::Comment).BGColor, QsciLexerSQL::CommentLine); + lexer->setPaper(value(QsciLexerSQL::Comment).BGColor, QsciLexerSQL::CommentLineHash); + lexer->setPaper(value(QsciLexerSQL::Comment).BGColor, QsciLexerSQL::PlusComment); + lexer->setPaper(value(QsciLexerSQL::Comment).BGColor, QsciLexerSQL::CommentDocKeyword); + lexer->setPaper(value(QsciLexerSQL::Comment).BGColor, QsciLexerSQL::CommentDocKeywordError); + lexer->setPaper(value(QsciLexerSQL::Comment).BGColor, QsciLexerSQL::QuotedIdentifier+1); + + lexer->setFont(value(QsciLexerSQL::Comment).Font, QsciLexerSQL::CommentLine); + lexer->setFont(value(QsciLexerSQL::Comment).Font, QsciLexerSQL::CommentLineHash); + lexer->setFont(value(QsciLexerSQL::Comment).Font, QsciLexerSQL::PlusComment); + lexer->setFont(value(QsciLexerSQL::Comment).Font, QsciLexerSQL::CommentDocKeyword); + lexer->setFont(value(QsciLexerSQL::Comment).Font, QsciLexerSQL::CommentDocKeywordError); + lexer->setFont(value(QsciLexerSQL::Comment).Font, QsciLexerSQL::QuotedIdentifier+1); + + // see QsciScintilla::setPaper + // There are two "default" styles + // 0 - used for white spaces only + // 32 - used otherwise(used or empty paper's color), but this one can not be set when NOT using custom lexer + lexer->setPaper(value(QsciLexerSQL::Default).BGColor, QsciScintillaBase::STYLE_DEFAULT); + + // be sure the same font is used + lexer->setFont(value(QsciLexerSQL::Comment).Font); + lexer->setDefaultFont(value(QsciLexerSQL::Comment).Font); +} Modified: trunk/tora/src/editor/tostyle.h =================================================================== --- trunk/tora/src/editor/tostyle.h 2014-04-14 15:38:50 UTC (rev 5114) +++ trunk/tora/src/editor/tostyle.h 2014-04-17 13:47:48 UTC (rev 5115) @@ -41,6 +41,8 @@ #include <QtGui/QColor> #include <QtGui/QFont> +class QsciLexer; + class toStyle : public QObject { Q_OBJECT; @@ -96,7 +98,11 @@ bool Bold; }; -typedef QMap<int, toStyle> toStylesMap; +class toStylesMap: public QMap<int, toStyle> +{ +public: + void updateLexer(QsciLexer*); +}; Q_DECLARE_METATYPE(toStyle); Q_DECLARE_METATYPE(toStylesMap); Modified: trunk/tora/src/parsing/tolexeroracle.cpp =================================================================== --- trunk/tora/src/parsing/tolexeroracle.cpp 2014-04-14 15:38:50 UTC (rev 5114) +++ trunk/tora/src/parsing/tolexeroracle.cpp 2014-04-17 13:47:48 UTC (rev 5115) @@ -71,36 +71,36 @@ #else mono = QFont(Utils::toStringToFont(toConfigurationNewSingle::Instance().option(Editor::ConfCodeFont).toString())); #endif - - toStylesMap sMap = toConfigurationNewSingle::Instance().option(ToConfiguration::Editor::EditStyleMap).value<toStylesMap>(); - declareStyle(Default, - sMap[Default].FGColor, - sMap[Default].BGColor, - mono); - declareStyle(Comment, - sMap[Comment].FGColor, - sMap[Comment].BGColor, - mono); - declareStyle(CommentMultiline, - sMap[Comment].FGColor, - sMap[Comment].BGColor, - mono); - declareStyle(Reserved, - sMap[Reserved].FGColor, - sMap[Reserved].BGColor, - mono); - declareStyle(Builtin, - sMap[toSyntaxAnalyzer::KeywordSet5].FGColor, - sMap[toSyntaxAnalyzer::KeywordSet5].BGColor, - mono); - declareStyle(Identifier, - sMap[Identifier].FGColor, - sMap[Identifier].BGColor, - mono); - declareStyle(OneLine, - sMap[OneLine].FGColor, - sMap[OneLine].BGColor, - mono); +// +// toStylesMap sMap = toConfigurationNewSingle::Instance().option(ToConfiguration::Editor::EditStyleMap).value<toStylesMap>(); +// declareStyle(Default, +// sMap[Default].FGColor, +// sMap[Default].BGColor, +// mono); +// declareStyle(Comment, +// sMap[Comment].FGColor, +// sMap[Comment].BGColor, +// mono); +// declareStyle(CommentMultiline, +// sMap[Comment].FGColor, +// sMap[Comment].BGColor, +// mono); +// declareStyle(Reserved, +// sMap[Reserved].FGColor, +// sMap[Reserved].BGColor, +// mono); +// declareStyle(Builtin, +// sMap[toSyntaxAnalyzer::KeywordSet5].FGColor, +// sMap[toSyntaxAnalyzer::KeywordSet5].BGColor, +// mono); +// declareStyle(Identifier, +// sMap[Identifier].FGColor, +// sMap[Identifier].BGColor, +// mono); +// declareStyle(OneLine, +// sMap[OneLine].FGColor, +// sMap[OneLine].BGColor, +// mono); declareStyle(Failure, QColor(Qt::black), QColor(Qt::red), @@ -211,6 +211,9 @@ case SQLLexer::Token::L_IDENTIFIER: setStyling(len2, Identifier); break; + case SQLLexer::Token::L_NUMBER: + setStyling(len2, Number); + break; case SQLLexer::Token::X_COMMENT: setStyling(len2, Comment); break; Modified: trunk/tora/src/parsing/tolexeroracle.h =================================================================== --- trunk/tora/src/parsing/tolexeroracle.h 2014-04-14 15:38:50 UTC (rev 5114) +++ trunk/tora/src/parsing/tolexeroracle.h 2014-04-17 13:47:48 UTC (rev 5115) @@ -54,6 +54,7 @@ Reserved = toSyntaxAnalyzer::Keyword, Builtin = toSyntaxAnalyzer::KeywordSet5, Identifier = toSyntaxAnalyzer::Identifier, + Number = toSyntaxAnalyzer::Number, OneLine = toSyntaxAnalyzer::PlusPrompt, CommentMultiline = toSyntaxAnalyzer::QuotedIdentifier + 1, Failure, Modified: trunk/tora/src/parsing/tosyntaxanalyzernl.cpp =================================================================== --- trunk/tora/src/parsing/tosyntaxanalyzernl.cpp 2014-04-14 15:38:50 UTC (rev 5114) +++ trunk/tora/src/parsing/tosyntaxanalyzernl.cpp 2014-04-17 13:47:48 UTC (rev 5115) @@ -36,6 +36,7 @@ #include "core/toconfiguration_new.h" #include "core/toeditorsetting.h" #include "editor/tosqltext.h" +#include "editor/tostyle.h" #include <QtCore/QString> #include <QtCore/QRegExp> @@ -146,30 +147,8 @@ retval->setFoldCompact(false); toStylesMap sMap = toConfigurationNewSingle::Instance().option(ToConfiguration::Editor::EditStyleMap).value<toStylesMap>(); - QMetaEnum StyleNameEnum(ENUM_REF(toSyntaxAnalyzer,WordClassEnum)); - QsciLexerSQL *l = new QsciLexerSQL(NULL); - for (int idx = 0; idx < StyleNameEnum.keyCount(); idx++) - { - int styleNameEnum = StyleNameEnum.value(idx); - retval->setColor(sMap.value(styleNameEnum).FGColor, styleNameEnum); - retval->setPaper(sMap.value(styleNameEnum).BGColor, styleNameEnum); - retval->setFont(toConfigurationNewSingle::Instance().option(ToConfiguration::Editor::ConfCodeFont).toString(), styleNameEnum); - } + sMap.updateLexer(retval); - retval->setColor(sMap.value(toSyntaxAnalyzer::Comment).FGColor, QsciLexerSQL::CommentLine); - retval->setColor(sMap.value(toSyntaxAnalyzer::Comment).FGColor, QsciLexerSQL::CommentLineHash); - retval->setColor(sMap.value(toSyntaxAnalyzer::Comment).FGColor, QsciLexerSQL::PlusComment); - retval->setColor(sMap.value(toSyntaxAnalyzer::Comment).FGColor, QsciLexerSQL::CommentDocKeyword); - retval->setColor(sMap.value(toSyntaxAnalyzer::Comment).FGColor, QsciLexerSQL::CommentDocKeywordError); - - retval->setPaper(sMap.value(toSyntaxAnalyzer::Comment).BGColor, QsciLexerSQL::CommentLine); - retval->setPaper(sMap.value(toSyntaxAnalyzer::Comment).BGColor, QsciLexerSQL::CommentLineHash); - retval->setPaper(sMap.value(toSyntaxAnalyzer::Comment).BGColor, QsciLexerSQL::PlusComment); - retval->setPaper(sMap.value(toSyntaxAnalyzer::Comment).BGColor, QsciLexerSQL::CommentDocKeyword); - retval->setPaper(sMap.value(toSyntaxAnalyzer::Comment).BGColor, QsciLexerSQL::CommentDocKeywordError); - - retval->setFont(toConfigurationNewSingle::Instance().option(ToConfiguration::Editor::ConfCodeFont).toString()); - return retval; } Modified: trunk/tora/src/parsing/tosyntaxanalyzeroracle.cpp =================================================================== --- trunk/tora/src/parsing/tosyntaxanalyzeroracle.cpp 2014-04-14 15:38:50 UTC (rev 5114) +++ trunk/tora/src/parsing/tosyntaxanalyzeroracle.cpp 2014-04-17 13:47:48 UTC (rev 5115) @@ -34,7 +34,10 @@ #include "parsing/tosyntaxanalyzer.h" #include "parsing/tolexeroracle.h" +#include "core/toconfiguration_new.h" +#include "core/toeditorsetting.h" #include "editor/tosqltext.h" +#include "editor/tostyle.h" #include <QtCore/QDebug> @@ -155,6 +158,8 @@ QsciLexer* toSyntaxAnalyzerOracle::createLexer(QObject* parent) { QsciLexer *retval = new toLexerOracle(parent); + toStylesMap sMap = toConfigurationNewSingle::Instance().option(ToConfiguration::Editor::EditStyleMap).value<toStylesMap>(); + sMap.updateLexer(retval); return retval; } Modified: trunk/tora/src/parsing/tsqllexer.h =================================================================== --- trunk/tora/src/parsing/tsqllexer.h 2014-04-14 15:38:50 UTC (rev 5114) +++ trunk/tora/src/parsing/tsqllexer.h 2014-04-17 13:47:48 UTC (rev 5115) @@ -66,6 +66,7 @@ // Leaf node , L_RESERVED // Reserved word , L_IDENTIFIER + , L_NUMBER , L_BIND_VAR , L_BIND_VAR_WITH_PARAMS // Tora(otl) specific bind variable :n<int> , L_BUILDIN // Buildin function name Modified: trunk/tora/src/parsing/tsqllexeroracle2.cc =================================================================== --- trunk/tora/src/parsing/tsqllexeroracle2.cc 2014-04-14 15:38:50 UTC (rev 5114) +++ trunk/tora/src/parsing/tsqllexeroracle2.cc 2014-04-17 13:47:48 UTC (rev 5115) @@ -282,6 +282,9 @@ case PLSQLGuiLexer::REGULAR_ID: type = Token::L_IDENTIFIER; break; + case PLSQLGuiLexer::NUMBER_LIT: + type = Token::L_NUMBER; + break; default: type = Token::X_UNASSIGNED; break; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ibr...@us...> - 2014-04-18 09:26:00
|
Revision: 5116 http://sourceforge.net/p/tora/code/5116 Author: ibre5041 Date: 2014-04-18 09:25:56 +0000 (Fri, 18 Apr 2014) Log Message: ----------- Release (unlock) broken connection Modified Paths: -------------- trunk/tora/src/connection/tooracleconnection.cpp trunk/tora/src/tools/toworksheet.cpp Modified: trunk/tora/src/connection/tooracleconnection.cpp =================================================================== --- trunk/tora/src/connection/tooracleconnection.cpp 2014-04-17 13:47:48 UTC (rev 5115) +++ trunk/tora/src/connection/tooracleconnection.cpp 2014-04-18 09:25:56 UTC (rev 5116) @@ -312,13 +312,27 @@ void toOracleConnectionSub::commit() { - _conn->commit(); + try { + _conn->commit(); + } catch (const ::trotl::OciException &exc) { + if(exc.is_critical()) + Broken = true; + _hasTransaction = NO_TRANSACTION; + ReThrowException(exc); + } _hasTransaction = NO_TRANSACTION; } void toOracleConnectionSub::rollback() { - _conn->rollback(); + try { + _conn->rollback(); + } catch (const ::trotl::OciException &exc) { + if(exc.is_critical()) + Broken = true; + _hasTransaction = NO_TRANSACTION; + ReThrowException(exc); + } _hasTransaction = NO_TRANSACTION; } @@ -348,6 +362,8 @@ _hasTransaction = i ? HAS_TRANSACTION : NO_TRANSACTION; return i; } catch (const ::trotl::OciException &exc) { + if(exc.is_critical()) + Broken = true; ReThrowException(exc); } } Modified: trunk/tora/src/tools/toworksheet.cpp =================================================================== --- trunk/tora/src/tools/toworksheet.cpp 2014-04-17 13:47:48 UTC (rev 5115) +++ trunk/tora/src/tools/toworksheet.cpp 2014-04-18 09:25:56 UTC (rev 5116) @@ -2228,8 +2228,11 @@ case 2: return false; } - } - TOCATCH + } catch (const QString &str) { + Utils::toStatusMessage(str); + if ((*LockedConnection)->isBroken() || !(*LockedConnection)->hasTransaction()) + return true; + } return false; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ibr...@us...> - 2014-04-19 22:47:08
|
Revision: 5124 http://sourceforge.net/p/tora/code/5124 Author: ibre5041 Date: 2014-04-19 22:47:05 +0000 (Sat, 19 Apr 2014) Log Message: ----------- Parsing test for .dot grammar Modified Paths: -------------- trunk/tora/src/CMakeLists.txt trunk/tora/src/tests/test6.cpp Modified: trunk/tora/src/CMakeLists.txt =================================================================== --- trunk/tora/src/CMakeLists.txt 2014-04-19 22:45:52 UTC (rev 5123) +++ trunk/tora/src/CMakeLists.txt 2014-04-19 22:47:05 UTC (rev 5124) @@ -1114,7 +1114,7 @@ ${TEST6_SOURCES} ${PCH_SOURCE} ) -TARGET_LINK_LIBRARIES("test6") +TARGET_LINK_LIBRARIES("test6" ermodel) SET_TARGET_PROPERTIES("test6" PROPERTIES ENABLE_EXPORTS ON) ADD_DEPENDENCIES("test6" revisiontag) # explicitly say that the executable depends on the svnheader IF(PCH_DEFINED) Modified: trunk/tora/src/tests/test6.cpp =================================================================== --- trunk/tora/src/tests/test6.cpp 2014-04-19 22:45:52 UTC (rev 5123) +++ trunk/tora/src/tests/test6.cpp 2014-04-19 22:47:05 UTC (rev 5124) @@ -32,17 +32,76 @@ * * END_COMMON_COPYRIGHT_HEADER */ +#include "dotgrammar.h" +#include "dotgraph.h" +#include "DotGraphParsingHelper.h" + +#include <boost/spirit/include/classic_confix.hpp> +#include <boost/throw_exception.hpp> + +#include <iostream> +#include <sstream> +#include <fstream> +#include <string> + +#include <QtCore/QString> + #include <stdlib.h> #include <stdio.h> +using namespace std; + +static void usage(); +string slurp(string const& fileName); + +extern DotGraphParsingHelper* phelper; + +int main(int argc, char **argv) +{ + using namespace boost::spirit::classic; + if (argc != 2) + usage(); + + string txt = slurp(string(argv[1])); + + cout << txt << endl; + + DotGraph newGraph(QString("xdot"), QString(argv[1])); + phelper = new DotGraphParsingHelper; + phelper->graph = &newGraph; + phelper->z = 1; + phelper->maxZ = 1; + phelper->uniq = 0; + + DotGrammar g; + //parse_info<> p_info= boost::spirit::classic::parse(txt.c_str(), g >> end_p, (+boost::spirit::classic::space_p|boost::spirit::classic::comment_p("/*", "*/"))); + parse_info<> p_info= boost::spirit::classic::parse(txt.c_str() +// "[_draw_=\"c 9 -#fffffe00 C 7 -#ffffff P 4 0 0 0 36 54 36 54 0 \"," +// "bb=\"0,0,54,36\"," +// "fontsize=11, xdotversion=1.6," +// "id=unnamed]" +// "xdotversion=1.6" + , g >> end_p, (+boost::spirit::classic::space_p|boost::spirit::classic::comment_p("/*", "*/"))); + + if (p_info.full) + cout << "Parse OK" << endl; + else + cout << "Parse Fail at:" << p_info.length << " " << p_info.stop << endl; +} + static void usage() { printf("Usage:\n\n test6 filename\n\n"); - exit(2); + exit(2); } -int main(int argc, char **argv) +string slurp(string const& fileName) { - usage(); + ifstream ifs(fileName.c_str(), ios::in | ios::binary | ios::ate); + ifstream::pos_type fileSize = ifs.tellg(); + ifs.seekg(0, ios::beg); + + stringstream sstr; + sstr << ifs.rdbuf(); + return sstr.str(); } - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ibr...@us...> - 2014-05-06 11:29:50
|
Revision: 5128 http://sourceforge.net/p/tora/code/5128 Author: ibre5041 Date: 2014-05-06 11:29:48 +0000 (Tue, 06 May 2014) Log Message: ----------- Long Opts fixed Modified Paths: -------------- trunk/tora/src/core/toresultlong.cpp trunk/tora/src/tools/tosgatrace.cpp Modified: trunk/tora/src/core/toresultlong.cpp =================================================================== --- trunk/tora/src/core/toresultlong.cpp 2014-04-30 14:36:26 UTC (rev 5127) +++ trunk/tora/src/core/toresultlong.cpp 2014-05-06 11:29:48 UTC (rev 5128) @@ -61,13 +61,7 @@ void toResultLong::query(const QString &sql, const toQueryParams ¶m) { - if (!setSqlAndParams(sql, param)) - { - emit firstResult(toResult::sql(), - toConnection::exception(tr("Will not reexecute same query")), false); - emit done(); - return ; - } + setSqlAndParams(sql, param); slotStop(); Query = NULL; LastItem = NULL; @@ -96,8 +90,8 @@ //, Statistics , toEventQuery::READ_ALL ); - connect(Query, SIGNAL(dataAvailable()), this, SLOT(slotAddItem())); - connect(Query, SIGNAL(done()), this, SLOT(slotQueryDone())); + connect(Query, SIGNAL(dataAvailable(toEventQuery*)), this, SLOT(slotAddItem())); + connect(Query, SIGNAL(done(toEventQuery*)), this, SLOT(slotQueryDone())); if (ReadAll) { MaxNumber = -1; Modified: trunk/tora/src/tools/tosgatrace.cpp =================================================================== --- trunk/tora/src/tools/tosgatrace.cpp 2014-04-30 14:36:26 UTC (rev 5127) +++ trunk/tora/src/tools/tosgatrace.cpp 2014-05-06 11:29:48 UTC (rev 5128) @@ -249,9 +249,14 @@ "with SGA address at the end and a table name 'b' with a column username and must accept \"and ...\" clauses at end."); static toSQL SQLLongOps(TOSQL_LONGOPS, - "SELECT b.opname \"Type\",\n" - " a.SQL_Text \"SQL Text\",\n" - " b.start_time \"Start Time\",\n" + "SELECT " + //" b.opname \"Type\", \n" + " b.message \"Message\", \n" + " a.SQL_Text \"SQL Text\", \n" + " b.start_time \"Start Time\", \n" + " case when totalwork = 0 then 0 \n" + " else round(100 * sofar/totalwork, 2) \n" + " end as \"%\", \n" " b.sofar||'/'||b.totalwork \"Completed/Total\",\n" " b.elapsed_seconds||'/'||(b.elapsed_seconds+b.time_remaining) \"Completed/Total Time\",\n" " b.username \"Parsing Schema\",\n" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ibr...@us...> - 2014-11-22 09:25:49
|
Revision: 5150 http://sourceforge.net/p/tora/code/5150 Author: ibre5041 Date: 2014-11-22 09:25:33 +0000 (Sat, 22 Nov 2014) Log Message: ----------- remove QtGui prefix from widgets headers includes, part of Qt5 port Modified Paths: -------------- trunk/tora/src/connection/tooracleconnection.cpp trunk/tora/src/connection/tooracleextract.cpp trunk/tora/src/connection/toqmysqlsetting.cpp trunk/tora/src/connection/toqpsqlsetting.cpp trunk/tora/src/core/main.cpp trunk/tora/src/core/tobrowserbasewidget.cpp trunk/tora/src/core/tocache.cpp trunk/tora/src/core/tochangeconnection.cpp trunk/tora/src/core/toconnection.cpp trunk/tora/src/core/toconnectionimport.cpp trunk/tora/src/core/toconnectionregistry.cpp trunk/tora/src/core/todatabasesetting.cpp trunk/tora/src/core/todescribe.cpp trunk/tora/src/core/todocklet.cpp trunk/tora/src/core/toeditablemenu.cpp trunk/tora/src/core/toeditmenu.cpp trunk/tora/src/core/toeventqueryworker.cpp trunk/tora/src/core/toextract.cpp trunk/tora/src/core/toglobalsetting.cpp trunk/tora/src/core/tohelp.cpp trunk/tora/src/core/tohtml.cpp trunk/tora/src/core/tolinechart.cpp trunk/tora/src/core/tomain.cpp trunk/tora/src/core/tomainwindow.cpp trunk/tora/src/core/tomemoeditor.cpp trunk/tora/src/core/tomessage.cpp trunk/tora/src/core/tomodeleditor.cpp trunk/tora/src/core/tonewconnection.cpp trunk/tora/src/core/toparamget.cpp trunk/tora/src/core/topiechart.cpp trunk/tora/src/core/topreferences.cpp trunk/tora/src/core/topushbutton.cpp trunk/tora/src/core/toquery.cpp trunk/tora/src/core/toqvalue.cpp trunk/tora/src/core/toresultbar.cpp trunk/tora/src/core/toresultcols.cpp trunk/tora/src/core/toresultdatasingle.cpp trunk/tora/src/core/toresultdrawing.cpp trunk/tora/src/core/toresultextent.cpp trunk/tora/src/core/toresultitem.cpp trunk/tora/src/core/toresultline.cpp trunk/tora/src/core/toresultparam.cpp trunk/tora/src/core/toresulttableview.cpp trunk/tora/src/core/toresulttableviewedit.cpp trunk/tora/src/core/toresultview.cpp trunk/tora/src/core/tosplash.cpp trunk/tora/src/core/tosql.cpp trunk/tora/src/core/tosyntaxsetup.cpp trunk/tora/src/core/totableselect.cpp trunk/tora/src/core/totabwidget.cpp trunk/tora/src/core/totextview.cpp trunk/tora/src/core/totool.cpp trunk/tora/src/core/totreewidget.cpp trunk/tora/src/core/toworkingwidget.cpp trunk/tora/src/core/toworkspace.cpp trunk/tora/src/core/utils.cpp trunk/tora/src/core/utils_part.cpp trunk/tora/src/docklets/tocodeoutline.cpp trunk/tora/src/docklets/tologging.cpp trunk/tora/src/docklets/toquerymodel.cpp trunk/tora/src/docklets/toviewconnections.cpp trunk/tora/src/editor/tobaseeditor.cpp trunk/tora/src/editor/tocomplpopup.cpp trunk/tora/src/editor/toscintilla.cpp trunk/tora/src/editor/tosearchreplace.cpp trunk/tora/src/editor/tosqltext.cpp trunk/tora/src/editor/toworksheettext.cpp trunk/tora/src/migratetool/sqldeveloper.cpp trunk/tora/src/migratetool/squirrelsql.cpp trunk/tora/src/migratetool/tora3.cpp trunk/tora/src/result/toresulttabledata.cpp trunk/tora/src/shortcuteditor/shortcuteditordialog.cpp trunk/tora/src/templates/tosqledit.cpp trunk/tora/src/templates/totemplate.cpp trunk/tora/src/tests/test1.cpp trunk/tora/src/tests/test2.cpp trunk/tora/src/tests/test3.cpp trunk/tora/src/tests/test3window.cpp trunk/tora/src/tests/test4.cpp trunk/tora/src/tests/test4window.cpp trunk/tora/src/tests/test5.cpp trunk/tora/src/tests/test5window.cpp trunk/tora/src/tools/toalert.cpp trunk/tora/src/tools/toanalyze.cpp trunk/tora/src/tools/toawr.cpp trunk/tora/src/tools/tobackup.cpp trunk/tora/src/tools/tobrowser.cpp trunk/tora/src/tools/tobrowserdblinkswidget.cpp trunk/tora/src/tools/tocurrent.cpp trunk/tora/src/tools/toer.cpp trunk/tora/src/tools/tofilesize.cpp trunk/tora/src/tools/toinvalid.cpp trunk/tora/src/tools/tooutput.cpp trunk/tora/src/tools/toplsqleditor.cpp trunk/tora/src/tools/toplsqltext.cpp trunk/tora/src/tools/toprofiler.cpp trunk/tora/src/tools/toresultstorage.cpp trunk/tora/src/tools/torollback.cpp trunk/tora/src/tools/tosandboxtool.cpp trunk/tora/src/tools/toscript.cpp trunk/tora/src/tools/tosecurity.cpp trunk/tora/src/tools/tosession.cpp trunk/tora/src/tools/tosgatrace.cpp trunk/tora/src/tools/tostorage.cpp trunk/tora/src/tools/tostoragedefinition.cpp trunk/tora/src/tools/totemporary.cpp trunk/tora/src/tools/tounittest.cpp trunk/tora/src/tools/towaitevents.cpp trunk/tora/src/tools/toworksheet.cpp trunk/tora/src/tools/toworksheeteditor.cpp trunk/tora/src/tools/toworksheetstatistic.cpp Modified: trunk/tora/src/connection/tooracleconnection.cpp =================================================================== --- trunk/tora/src/connection/tooracleconnection.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/connection/tooracleconnection.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -54,9 +54,9 @@ #include "trotl_describe.h" #include <QtCore/QVariant> -#include <QtGui/QInputDialog> -#include <QtGui/QLineEdit> -#include <QtGui/QApplication> +#include <QInputDialog> +#include <QLineEdit> +#include <QApplication> #include <iomanip> _Noreturn void ReThrowException(const ::trotl::OciException &exc) Modified: trunk/tora/src/connection/tooracleextract.cpp =================================================================== --- trunk/tora/src/connection/tooracleextract.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/connection/tooracleextract.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -42,7 +42,7 @@ #include "core/tosql.h" #include "core/totool.h" -#include <QtGui/QApplication> +#include <QApplication> #include <QtCore/QRegExp> static toOracleExtract OracleExtractor; Modified: trunk/tora/src/connection/toqmysqlsetting.cpp =================================================================== --- trunk/tora/src/connection/toqmysqlsetting.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/connection/toqmysqlsetting.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -36,11 +36,11 @@ #include "connection/toqmysqlprovider.h" #include "core/toconfiguration_new.h" -#include <QtGui/QVBoxLayout> -#include <QtGui/QGroupBox> -#include <QtGui/QCheckBox> -#include <QtGui/QComboBox> -#include <QtGui/QLabel> +#include <QVBoxLayout> +#include <QGroupBox> +#include <QCheckBox> +#include <QComboBox> +#include <QLabel> ToConfiguration::MySQL s_mystConf; Modified: trunk/tora/src/connection/toqpsqlsetting.cpp =================================================================== --- trunk/tora/src/connection/toqpsqlsetting.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/connection/toqpsqlsetting.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -35,7 +35,7 @@ #include "connection/toqpsqlsetting.h" #include "core/utils.h" -#include <QtGui/QFileDialog> +#include <QFileDialog> toQPSQLSetting::toQPSQLSetting(QWidget *parent) : QWidget(parent) Modified: trunk/tora/src/core/main.cpp =================================================================== --- trunk/tora/src/core/main.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/core/main.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -70,10 +70,10 @@ #include <QtCore/QDebug> #include <QtCore/QDateTime> #include <QtCore/QSettings> -#include <QtGui/QProgressBar> -#include <QtGui/QStyleFactory> -#include <QtGui/QApplication> -#include <QtGui/QMessageBox> +#include <QProgressBar> +#include <QStyleFactory> +#include <QApplication> +#include <QMessageBox> int main(int argc, char **argv) { Modified: trunk/tora/src/core/tobrowserbasewidget.cpp =================================================================== --- trunk/tora/src/core/tobrowserbasewidget.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/core/tobrowserbasewidget.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -37,7 +37,7 @@ #include "core/utils.h" #include "result/toresulttabledata.h" -#include <QtGui/QApplication> +#include <QApplication> toBrowserBaseWidget::toBrowserBaseWidget(QWidget * parent) : QTabWidget(parent) Modified: trunk/tora/src/core/tocache.cpp =================================================================== --- trunk/tora/src/core/tocache.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/core/tocache.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -52,7 +52,7 @@ #include <QtCore/QDataStream> #include <QtCore/QMutexLocker> #include <QtCore/QThread> -#include <QtGui/QProgressDialog> +#include <QProgressDialog> //#include <boost/preprocessor/iteration/detail/local.hpp> /* This method runs as a separate thread executed from: Modified: trunk/tora/src/core/tochangeconnection.cpp =================================================================== --- trunk/tora/src/core/tochangeconnection.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/core/tochangeconnection.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -41,10 +41,10 @@ #include "core/tologger.h" #include "core/utils.h" -#include <QtGui/QMenu> -#include <QtGui/QToolTip> +#include <QMenu> +#include <QToolTip> #include <QtGui/QPixmap> -#include <QtGui/QToolBar> +#include <QToolBar> #include "icons/changeconnect.xpm" Modified: trunk/tora/src/core/toconnection.cpp =================================================================== --- trunk/tora/src/core/toconnection.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/core/toconnection.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -46,7 +46,7 @@ #include "core/toworkspace.h" #include "core/todatabasesetting.h" -#include <QtGui/QMenu> +#include <QMenu> toConnection::toConnection(const QString &provider, const QString &user, const QString &password, Modified: trunk/tora/src/core/toconnectionimport.cpp =================================================================== --- trunk/tora/src/core/toconnectionimport.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/core/toconnectionimport.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -39,7 +39,7 @@ #include "migratetool/squirrelsql.h" #include "migratetool/tora3.h" -#include <QtGui/QMessageBox> +#include <QMessageBox> toConnectionImport::toConnectionImport(QWidget * parent) : QDialog(parent) Modified: trunk/tora/src/core/toconnectionregistry.cpp =================================================================== --- trunk/tora/src/core/toconnectionregistry.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/core/toconnectionregistry.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -37,7 +37,7 @@ #include "core/utils.h" #include "ts_log/ts_log_utils.h" -#include <QtGui/QAction> +#include <QAction> toConnectionRegistry::~toConnectionRegistry() { Modified: trunk/tora/src/core/todatabasesetting.cpp =================================================================== --- trunk/tora/src/core/todatabasesetting.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/core/todatabasesetting.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -40,9 +40,9 @@ #include "core/toqvalue.h" #include "ts_log/ts_log_utils.h" -#include <QtGui/QColorDialog> +#include <QColorDialog> #include <QtCore/QString> -#include <QtGui/QFileDialog> +#include <QFileDialog> #include <QtCore/QDebug> Modified: trunk/tora/src/core/todescribe.cpp =================================================================== --- trunk/tora/src/core/todescribe.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/core/todescribe.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -39,7 +39,7 @@ #include <QtCore/QSettings> #include <QtGui/QHideEvent> -#include <QtGui/QMessageBox> +#include <QMessageBox> #include <QtCore/QList> toDescribe::toDescribe(QWidget * parent) Modified: trunk/tora/src/core/todocklet.cpp =================================================================== --- trunk/tora/src/core/todocklet.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/core/todocklet.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -37,8 +37,8 @@ #include "core/tomainwindow.h" #include "core/toworkspace.h" -#include <QtGui/QApplication> -#include <QtGui/QVBoxLayout> +#include <QApplication> +#include <QVBoxLayout> static QMap<QString, toDockletHolder *>& Docklets() Modified: trunk/tora/src/core/toeditablemenu.cpp =================================================================== --- trunk/tora/src/core/toeditablemenu.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/core/toeditablemenu.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -33,7 +33,7 @@ * END_COMMON_COPYRIGHT_HEADER */ #include "core/toeditablemenu.h" -#include <QtGui/QAction> +#include <QAction> #include <QtGui/QContextMenuEvent> #include "icons/trash.xpm" Modified: trunk/tora/src/core/toeditmenu.cpp =================================================================== --- trunk/tora/src/core/toeditmenu.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/core/toeditmenu.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -42,7 +42,7 @@ #include "icons/paste.xpm" #include "icons/search.xpm" -#include <QtGui/QApplication> +#include <QApplication> #include <QtGui/QClipboard> #include <QtCore/QMimeData> Modified: trunk/tora/src/core/toeventqueryworker.cpp =================================================================== --- trunk/tora/src/core/toeventqueryworker.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/core/toeventqueryworker.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -43,7 +43,7 @@ #include "core/toqvalue.h" #include "core/todatabasesetting.h" -#include <QtGui/QApplication> +#include <QApplication> #include <QtCore/QMutexLocker> #include <QtCore/QTimer> Modified: trunk/tora/src/core/toextract.cpp =================================================================== --- trunk/tora/src/core/toextract.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/core/toextract.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -39,8 +39,8 @@ #include "core/toraversion.h" #include "core/toconf.h" -#include <QtGui/QApplication> -#include <QtGui/QProgressDialog> +#include <QApplication> +#include <QProgressDialog> #include <QtCore/QString> #include <QtNetwork/QHostInfo> Modified: trunk/tora/src/core/toglobalsetting.cpp =================================================================== --- trunk/tora/src/core/toglobalsetting.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/core/toglobalsetting.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -44,9 +44,9 @@ #include <QtCore/QString> #include <QtCore/QDebug> -#include <QtGui/QColorDialog> -#include <QtGui/QFileDialog> -#include <QtGui/QStyleFactory> +#include <QColorDialog> +#include <QFileDialog> +#include <QStyleFactory> ToConfiguration::Global s_global; Modified: trunk/tora/src/core/tohelp.cpp =================================================================== --- trunk/tora/src/core/tohelp.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/core/tohelp.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -42,7 +42,7 @@ #include "core/toconfiguration_new.h" #include "ts_log/ts_log_utils.h" -#include <QtGui/QMessageBox> +#include <QMessageBox> #include <QtCore/QSettings> QVariant ToConfiguration::Help::defaultValue(int option) const Modified: trunk/tora/src/core/tohtml.cpp =================================================================== --- trunk/tora/src/core/tohtml.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/core/tohtml.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -35,7 +35,7 @@ #include "core/tohtml.h" #include "core/tomainwindow.h" -#include <QtGui/QApplication> +#include <QApplication> #include <QtCore/QString> #include <QtCore/QChar> Modified: trunk/tora/src/core/tolinechart.cpp =================================================================== --- trunk/tora/src/core/tolinechart.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/core/tolinechart.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -42,7 +42,7 @@ #include <QtGui/QPainter> #include <QtGui/QPrinter> -#include <QtGui/QScrollBar> +#include <QScrollBar> #include <QtGui/QPrintDialog> #include "icons/print.xpm" Modified: trunk/tora/src/core/tomain.cpp =================================================================== --- trunk/tora/src/core/tomain.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/core/tomain.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -72,9 +72,9 @@ #include "icons/stop.xpm" #include "icons/refresh.xpm" -#include <QtGui/QComboBox> -#include <QtGui/QStatusBar> -#include <QtGui/QMenuBar> +#include <QComboBox> +#include <QStatusBar> +#include <QMenuBar> toMain::toMain() Modified: trunk/tora/src/core/tomainwindow.cpp =================================================================== --- trunk/tora/src/core/tomainwindow.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/core/tomainwindow.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -37,8 +37,8 @@ #include "core/toconf.h" #include "ts_log/ts_log_utils.h" -#include <QtGui/QApplication> -#include <QtGui/QAction> +#include <QApplication> +#include <QAction> #include <QSettings> namespace ToConfiguration Modified: trunk/tora/src/core/tomemoeditor.cpp =================================================================== --- trunk/tora/src/core/tomemoeditor.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/core/tomemoeditor.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -38,10 +38,10 @@ #include "editor/toscintilla.h" #include <QtGui/QKeyEvent> -#include <QtGui/QVBoxLayout> -#include <QtGui/QDialogButtonBox> +#include <QVBoxLayout> +#include <QDialogButtonBox> #include <QtCore/QSettings> -#include <QtGui/QCheckBox> +#include <QCheckBox> #include "icons/commit.xpm" #include "icons/copy.xpm" Modified: trunk/tora/src/core/tomessage.cpp =================================================================== --- trunk/tora/src/core/tomessage.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/core/tomessage.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -35,7 +35,7 @@ #include "core/tomessage.h" #include "editor/toscintilla.h" -#include <QtGui/QPushButton> +#include <QPushButton> #include <QtCore/QDateTime> #include <QtCore/QSettings> Modified: trunk/tora/src/core/tomodeleditor.cpp =================================================================== --- trunk/tora/src/core/tomodeleditor.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/core/tomodeleditor.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -39,11 +39,11 @@ #include "editor/toscintilla.h" #include <QtGui/QKeyEvent> -#include <QtGui/QVBoxLayout> -#include <QtGui/QDialogButtonBox> +#include <QVBoxLayout> +#include <QDialogButtonBox> #include <QtCore/QSettings> #include <QtCore/QAbstractItemModel> -#include <QtGui/QCheckBox> +#include <QCheckBox> #include "icons/commit.xpm" #include "icons/copy.xpm" Modified: trunk/tora/src/core/tonewconnection.cpp =================================================================== --- trunk/tora/src/core/tonewconnection.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/core/tonewconnection.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -46,10 +46,10 @@ #include "icons/trash.xpm" -#include <QtGui/QMessageBox> -#include <QtGui/QHeaderView> +#include <QMessageBox> +#include <QHeaderView> #include <QtCore/QStringList> -#include <QtGui/QMenu> +#include <QMenu> #include <QtGui/QIcon> #include <QtGui/QSortFilterProxyModel> Modified: trunk/tora/src/core/toparamget.cpp =================================================================== --- trunk/tora/src/core/toparamget.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/core/toparamget.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -40,7 +40,7 @@ #include <QtCore/QHash> #include <QtCore/QString> #include <QtCore/QStringList> -#include <QtGui/QCheckBox> +#include <QCheckBox> QHash<QString, QStringList> toParamGet::DefaultCache; QHash<QString, QStringList> toParamGet::Cache; Modified: trunk/tora/src/core/topiechart.cpp =================================================================== --- trunk/tora/src/core/topiechart.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/core/topiechart.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -46,11 +46,11 @@ #include <time.h> #include <QtGui/QPainter> -#include <QtGui/QToolTip> +#include <QToolTip> #include <QtGui/QPaintEvent> #include <QtGui/QPixmap> #include <QtGui/QMouseEvent> -#include <QtGui/QMenu> +#include <QMenu> #include <QtGui/QPrinter> #include <QtGui/QPrintDialog> Modified: trunk/tora/src/core/topreferences.cpp =================================================================== --- trunk/tora/src/core/topreferences.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/core/topreferences.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -43,10 +43,10 @@ #include "core/tosyntaxsetup.h" #include <QtCore/QString> -#include <QtGui/QFrame> -#include <QtGui/QLayout> -#include <QtGui/QVBoxLayout> -#include <QtGui/QListWidget> +#include <QFrame> +#include <QLayout> +#include <QVBoxLayout> +#include <QListWidget> void toPreferences::addWidget(QListWidgetItem *item, QWidget *widget) Modified: trunk/tora/src/core/topushbutton.cpp =================================================================== --- trunk/tora/src/core/topushbutton.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/core/topushbutton.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -34,11 +34,11 @@ #include "core/topushbutton.h" -#include <QtGui/QStyleOptionButton> +#include <QStyleOptionButton> #include <QtGui/QPainter> -#include <QtGui/QStylePainter> -#include <QtGui/QToolButton> -#include <QtGui/QToolBar> +#include <QStylePainter> +#include <QToolButton> +#include <QToolBar> /** * much inspiration from libqxt Modified: trunk/tora/src/core/toquery.cpp =================================================================== --- trunk/tora/src/core/toquery.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/core/toquery.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -40,7 +40,7 @@ #include "core/toconnectiontraits.h" #include "core/tosql.h" -#include <QtGui/QApplication> +#include <QApplication> toQuery::toQuery(toConnectionSubLoan &conn, const toSQL &sql, toQueryParams const& params) : m_ConnectionSubLoan(conn) Modified: trunk/tora/src/core/toqvalue.cpp =================================================================== --- trunk/tora/src/core/toqvalue.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/core/toqvalue.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -38,7 +38,7 @@ #include "core/todatabasesetting.h" #include <QtCore/QVariant> -#include <QtGui/QApplication> +#include <QApplication> //#include <cstdio> Modified: trunk/tora/src/core/toresultbar.cpp =================================================================== --- trunk/tora/src/core/toresultbar.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/core/toresultbar.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -37,7 +37,7 @@ #include "core/toeventquery.h" #include "core/totimer.h" -#include <QtGui/QMenu> +#include <QMenu> #include <QtCore/QObject> toResultBar::toResultBar(QWidget *parent, const char *name) Modified: trunk/tora/src/core/toresultcols.cpp =================================================================== --- trunk/tora/src/core/toresultcols.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/core/toresultcols.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -42,13 +42,13 @@ #include "core/toconnectiontraits.h" #include <QtCore/QRegExp> -#include <QtGui/QCheckBox> -#include <QtGui/QLabel> -#include <QtGui/QVBoxLayout> -#include <QtGui/QHBoxLayout> -#include <QtGui/QGridLayout> -#include <QtGui/QScrollArea> -#include <QtGui/QApplication> +#include <QCheckBox> +#include <QLabel> +#include <QVBoxLayout> +#include <QHBoxLayout> +#include <QGridLayout> +#include <QScrollArea> +#include <QApplication> //static toSQL SQLComment( // "toResultCols:Comments", Modified: trunk/tora/src/core/toresultdatasingle.cpp =================================================================== --- trunk/tora/src/core/toresultdatasingle.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/core/toresultdatasingle.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -38,14 +38,14 @@ #include "core/toparamget.h" #include "core/tomodeleditor.h" -#include <QtGui/QScrollArea> -#include <QtGui/QCheckBox> -#include <QtGui/QLineEdit> -#include <QtGui/QAction> -#include <QtGui/QVBoxLayout> -#include <QtGui/QGridLayout> -#include <QtGui/QLabel> -#include <QtGui/QProgressBar> +#include <QScrollArea> +#include <QCheckBox> +#include <QLineEdit> +#include <QAction> +#include <QVBoxLayout> +#include <QGridLayout> +#include <QLabel> +#include <QProgressBar> toResultDataSingle::toResultDataSingle(QWidget *parent) : QWidget(parent) Modified: trunk/tora/src/core/toresultdrawing.cpp =================================================================== --- trunk/tora/src/core/toresultdrawing.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/core/toresultdrawing.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -32,7 +32,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ -#include <QtGui/QVBoxLayout> +#include <QVBoxLayout> #include "core/toresultdrawing.h" #include "core/utils.h" @@ -42,11 +42,11 @@ #include "icons/refresh.xpm" -#include <QtGui/QStyle> -#include <QtGui/QSlider> -#include <QtGui/QVBoxLayout> -#include <QtGui/QToolBar> -#include <QtGui/QAction> +#include <QStyle> +#include <QSlider> +#include <QVBoxLayout> +#include <QToolBar> +#include <QAction> #include <QMouseEvent> #include <QStyleOptionSlider> Modified: trunk/tora/src/core/toresultextent.cpp =================================================================== --- trunk/tora/src/core/toresultextent.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/core/toresultextent.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -37,7 +37,7 @@ #include "core/toresulttableview.h" #include "core/utils.h" -#include <QtGui/QProgressDialog> +#include <QProgressDialog> #include <QtCore/QCoreApplication> #include <QtGui/QPainter> Modified: trunk/tora/src/core/toresultitem.cpp =================================================================== --- trunk/tora/src/core/toresultitem.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/core/toresultitem.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -40,10 +40,10 @@ #include "core/tosql.h" #include "core/totool.h" -#include <QtGui/QLabel> -#include <QtGui/QLayout> -#include <QtGui/QToolTip> -#include <QtGui/QApplication> +#include <QLabel> +#include <QLayout> +#include <QToolTip> +#include <QApplication> #include <QtGui/QResizeEvent> static toSQL SQLResource( Modified: trunk/tora/src/core/toresultline.cpp =================================================================== --- trunk/tora/src/core/toresultline.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/core/toresultline.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -39,7 +39,7 @@ #include "core/totimer.h" #include "core/toglobalevent.h" -#include <QtGui/QMenu> +#include <QMenu> toResultLine::toResultLine(QWidget *parent, const char *name) Modified: trunk/tora/src/core/toresultparam.cpp =================================================================== --- trunk/tora/src/core/toresultparam.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/core/toresultparam.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -42,14 +42,14 @@ #include "core/toraversion.h" #include "core/toconnectionsub.h" -#include <QtGui/QLabel> -#include <QtGui/QLineEdit> +#include <QLabel> +#include <QLineEdit> #include <QtCore/QRegExp> -#include <QtGui/QToolBar> -#include <QtGui/QToolButton> -#include <QtGui/QToolTip> +#include <QToolBar> +#include <QToolButton> +#include <QToolTip> #include <QtGui/QPixmap> -#include <QtGui/QVBoxLayout> +#include <QVBoxLayout> #include "icons/database.xpm" #include "icons/filesave.xpm" Modified: trunk/tora/src/core/toresulttableview.cpp =================================================================== --- trunk/tora/src/core/toresulttableview.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/core/toresulttableview.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -55,11 +55,11 @@ #include <QtGui/QClipboard> #include <QtGui/QFont> #include <QtGui/QFontMetrics> -#include <QtGui/QHBoxLayout> -#include <QtGui/QMessageBox> -#include <QtGui/QScrollBar> -#include <QtGui/QVBoxLayout> -#include <QtGui/QProgressDialog> +#include <QHBoxLayout> +#include <QMessageBox> +#include <QScrollBar> +#include <QVBoxLayout> +#include <QProgressDialog> toResultTableView::toResultTableView(QWidget * parent) : QTableView(parent) Modified: trunk/tora/src/core/toresulttableviewedit.cpp =================================================================== --- trunk/tora/src/core/toresulttableviewedit.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/core/toresulttableviewedit.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -39,15 +39,15 @@ #include "core/toconnectionsub.h" #include "core/toglobalevent.h" -#include <QtGui/QApplication> +#include <QApplication> #include <QtGui/QClipboard> #include <QtGui/QKeyEvent> -#include <QtGui/QScrollBar> -#include <QtGui/QItemDelegate> +#include <QScrollBar> +#include <QItemDelegate> #include <QtCore/QSize> #include <QtGui/QFont> #include <QtGui/QFontMetrics> -#include <QtGui/QProgressDialog> +#include <QProgressDialog> toResultTableViewEdit::toResultTableViewEdit(QWidget *parent, const char *name) : toResultTableView(false, false, parent, name, true) Modified: trunk/tora/src/core/toresultview.cpp =================================================================== --- trunk/tora/src/core/toresultview.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/core/toresultview.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -47,7 +47,7 @@ #include <QtCore/QTimer> #include <QtGui/QClipboard> #include <QtGui/QPainter> -#include <QtGui/QProgressDialog> +#include <QProgressDialog> static int MaxColDisp; static bool Gridlines; Modified: trunk/tora/src/core/tosplash.cpp =================================================================== --- trunk/tora/src/core/tosplash.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/core/tosplash.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -36,12 +36,12 @@ #include "icons/largelogo.xpm" -#include <QtGui/QApplication> +#include <QApplication> #include <QtGui/QPixmap> -#include <QtGui/QLabel> -#include <QtGui/QDesktopWidget> -#include <QtGui/QProgressBar> -#include <QtGui/QVBoxLayout> +#include <QLabel> +#include <QDesktopWidget> +#include <QProgressBar> +#include <QVBoxLayout> #include <QtGui/QPalette> toSplash::toSplash(QWidget *parent) Modified: trunk/tora/src/core/tosql.cpp =================================================================== --- trunk/tora/src/core/tosql.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/core/tosql.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -36,7 +36,7 @@ #include "core/utils.h" #include "core/toconnection.h" -#include <QtGui/QApplication> +#include <QApplication> #include <QtCore/QString> // A little magic to get lrefresh to work and get a check on qApp Modified: trunk/tora/src/core/tosyntaxsetup.cpp =================================================================== --- trunk/tora/src/core/tosyntaxsetup.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/core/tosyntaxsetup.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -43,8 +43,8 @@ #include "core/toeditorsetting.h" #include "ts_log/ts_log_utils.h" -#include <QtGui/QFontDialog> -#include <QtGui/QColorDialog> +#include <QFontDialog> +#include <QColorDialog> #include <Qsci/qscilexersql.h> Modified: trunk/tora/src/core/totableselect.cpp =================================================================== --- trunk/tora/src/core/totableselect.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/core/totableselect.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -39,9 +39,9 @@ #include "core/toconnectiontraits.h" #include "core/toresultschema.h" -#include <QtGui/QLabel> +#include <QLabel> #include <QtCore/QTimer> -#include <QtGui/QVBoxLayout> +#include <QVBoxLayout> void toTableSelect::setup() { Modified: trunk/tora/src/core/totabwidget.cpp =================================================================== --- trunk/tora/src/core/totabwidget.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/core/totabwidget.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -35,7 +35,7 @@ #include "core/totabwidget.h" #include <QtCore/QObject> -#include <QtGui/QTabWidget> +#include <QTabWidget> #include <list> Modified: trunk/tora/src/core/totextview.cpp =================================================================== --- trunk/tora/src/core/totextview.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/core/totextview.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -38,7 +38,7 @@ #include <QtGui/QFocusEvent> #include <QtGui/QTextDocument> -#include <QtGui/QTextBrowser> +#include <QTextBrowser> toTextView::toTextView(QWidget *parent /* = 0*/, const char *name /* = 0*/) : QWidget(parent) Modified: trunk/tora/src/core/totool.cpp =================================================================== --- trunk/tora/src/core/totool.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/core/totool.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -49,10 +49,10 @@ #include "core/toglobalevent.h" #include "core/toglobalsetting.h" -#include <QtGui/QToolBar> -#include <QtGui/QMenu> -#include <QtGui/QBoxLayout> -#include <QtGui/QAction> +#include <QToolBar> +#include <QMenu> +#include <QBoxLayout> +#include <QAction> #include <QtDebug> // A little magic to get lrefresh to work and get a check on qApp Modified: trunk/tora/src/core/totreewidget.cpp =================================================================== --- trunk/tora/src/core/totreewidget.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/core/totreewidget.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -35,8 +35,8 @@ #include "core/totreewidget.h" -#include <QtGui/QTreeWidget> -#include <QtGui/QTreeWidgetItem> +#include <QTreeWidget> +#include <QTreeWidgetItem> toTreeWidget::toTreeWidget(QWidget *parent, Modified: trunk/tora/src/core/toworkingwidget.cpp =================================================================== --- trunk/tora/src/core/toworkingwidget.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/core/toworkingwidget.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -34,9 +34,9 @@ #include "core/toworkingwidget.h" -#include <QtGui/QPushButton> -#include <QtGui/QLabel> -#include <QtGui/QHBoxLayout> +#include <QPushButton> +#include <QLabel> +#include <QHBoxLayout> #include "icons/stop.xpm" Modified: trunk/tora/src/core/toworkspace.cpp =================================================================== --- trunk/tora/src/core/toworkspace.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/core/toworkspace.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -38,10 +38,10 @@ #include "core/utils.h" #include "ts_log/ts_log_utils.h" -#include <QtGui/QTabBar> -#include <QtGui/QStackedWidget> -#include <QtGui/QVBoxLayout> -#include <QtGui/QLabel> +#include <QTabBar> +#include <QStackedWidget> +#include <QVBoxLayout> +#include <QLabel> #include <QtCore/QSignalMapper> #include <QtCore/QVariant> #include <QtGui/QPixmap> Modified: trunk/tora/src/core/utils.cpp =================================================================== --- trunk/tora/src/core/utils.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/core/utils.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -44,14 +44,14 @@ #include <QtCore/QTextCodec> #include <QtCore/QThread> -#include <QtGui/QApplication> -#include <QtGui/QComboBox> -#include <QtGui/QFileDialog> -#include <QtGui/QToolBar> +#include <QApplication> +#include <QComboBox> +#include <QFileDialog> +#include <QToolBar> #include <QtGui/QPixmapCache> #include <QtGui/QPainter> #include <QtGui/QKeyEvent> -#include <QtGui/QDockWidget> +#include <QDockWidget> #include <QStyleFactory> #include <stdlib.h> Modified: trunk/tora/src/core/utils_part.cpp =================================================================== --- trunk/tora/src/core/utils_part.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/core/utils_part.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -41,7 +41,7 @@ #include <QtCore/QDir> #include <QtCore/QString> #include <QtCore/QTextCodec> -#include <QtGui/QFileDialog> +#include <QFileDialog> // A little magic to get lrefresh to work and get a check on qApp #undef QT_TRANSLATE_NOOP Modified: trunk/tora/src/docklets/tocodeoutline.cpp =================================================================== --- trunk/tora/src/docklets/tocodeoutline.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/docklets/tocodeoutline.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -42,9 +42,9 @@ //#include "toconnectionmodel.h" #include <QtCore/QTimerEvent> -#include <QtGui/QListWidget> -//#include <QtGui/QListView> -//#include <QtGui/QHeaderView> +#include <QListWidget> +//#include <QListView> +//#include <QHeaderView> REGISTER_VIEW("Outline", toCodeOutline); Modified: trunk/tora/src/docklets/tologging.cpp =================================================================== --- trunk/tora/src/docklets/tologging.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/docklets/tologging.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -38,7 +38,7 @@ #include "core/tomain.h" #include "editor/tosearchreplace.h" -#include <QtGui/QPlainTextEdit> +#include <QPlainTextEdit> REGISTER_VIEW("Logging", toLoggingDocklet); Modified: trunk/tora/src/docklets/toquerymodel.cpp =================================================================== --- trunk/tora/src/docklets/toquerymodel.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/docklets/toquerymodel.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -45,8 +45,8 @@ #include "dotgraph.h" #include <QtCore/QTimerEvent> -#include <QtGui/QTabWidget> -#include <QtGui/QListView> +#include <QTabWidget> +#include <QListView> #define TOOL_NAME "QueryModel" Modified: trunk/tora/src/docklets/toviewconnections.cpp =================================================================== --- trunk/tora/src/docklets/toviewconnections.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/docklets/toviewconnections.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -41,8 +41,8 @@ #include "core/utils.h" #include "core/toglobalevent.h" -#include <QtGui/QHeaderView> -#include <QtGui/QTableView> +#include <QHeaderView> +#include <QTableView> #include <QtGui/QSortFilterProxyModel> REGISTER_VIEW("Connection", toViewConnections); Modified: trunk/tora/src/editor/tobaseeditor.cpp =================================================================== --- trunk/tora/src/editor/tobaseeditor.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/editor/tobaseeditor.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -45,7 +45,7 @@ #include <QtCore/QFileSystemWatcher> #include <QtCore/QtDebug> #include <QtCore/QDir> -#include <QtGui/QVBoxLayout> +#include <QVBoxLayout> toBaseEditor::toBaseEditor(toScintilla *editor, QWidget *parent) : QWidget(parent) Modified: trunk/tora/src/editor/tocomplpopup.cpp =================================================================== --- trunk/tora/src/editor/tocomplpopup.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/editor/tocomplpopup.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -35,8 +35,8 @@ #include "editor/tocomplpopup.h" #include "editor/toworksheettext.h" -#include <QtGui/QVBoxLayout> -#include <QtGui/QListWidget> +#include <QVBoxLayout> +#include <QListWidget> toComplPopup::toComplPopup(toWorksheetText* editor) : QWidget(editor, Qt::Popup) Modified: trunk/tora/src/editor/toscintilla.cpp =================================================================== --- trunk/tora/src/editor/toscintilla.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/editor/toscintilla.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -44,9 +44,9 @@ #include <QtGui/QClipboard> #include <QtGui/QPrintDialog> #include <QtXml/QDomDocument> -#include <QtGui/QShortcut> +#include <QShortcut> #include <QtCore/QtDebug> -#include <QtGui/QMenu> +#include <QMenu> #include <QtGui/QClipboard> #include <Qsci/qsciprinter.h> Modified: trunk/tora/src/editor/tosearchreplace.cpp =================================================================== --- trunk/tora/src/editor/tosearchreplace.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/editor/tosearchreplace.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -41,9 +41,9 @@ #include "icons/close.xpm" -#include <QtGui/QAction> -#include <QtGui/QTextEdit> -#include <QtGui/QLineEdit> +#include <QAction> +#include <QTextEdit> +#include <QLineEdit> toSearchReplace::toSearchReplace(QWidget *parent) : QWidget(parent) Modified: trunk/tora/src/editor/tosqltext.cpp =================================================================== --- trunk/tora/src/editor/tosqltext.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/editor/tosqltext.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -40,8 +40,8 @@ #include "core/toconfiguration_new.h" #include "editor/toworksheettext.h" -#include <QtGui/QListWidget> -#include <QtGui/QVBoxLayout> +#include <QListWidget> +#include <QVBoxLayout> #include <Qsci/qsciapis.h> #include <Qsci/qsciabstractapis.h> Modified: trunk/tora/src/editor/toworksheettext.cpp =================================================================== --- trunk/tora/src/editor/toworksheettext.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/editor/toworksheettext.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -40,7 +40,7 @@ #include "core/tologger.h" #include "shortcuteditor/shortcutmodel.h" -#include <QtGui/QListWidget> +#include <QListWidget> using namespace ToConfiguration; Modified: trunk/tora/src/migratetool/sqldeveloper.cpp =================================================================== --- trunk/tora/src/migratetool/sqldeveloper.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/migratetool/sqldeveloper.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -34,8 +34,8 @@ #include "migratetool/sqldeveloper.h" -#include <QtGui/QMessageBox> -#include <QtGui/QFileDialog> +#include <QMessageBox> +#include <QFileDialog> #include <QtXml/QXmlStreamReader> #include <QtCore/QtDebug> Modified: trunk/tora/src/migratetool/squirrelsql.cpp =================================================================== --- trunk/tora/src/migratetool/squirrelsql.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/migratetool/squirrelsql.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -34,8 +34,8 @@ #include "migratetool/squirrelsql.h" -#include <QtGui/QMessageBox> -#include <QtGui/QFileDialog> +#include <QMessageBox> +#include <QFileDialog> #include <QtXml/QXmlStreamReader> #include <QtCore/QtDebug> Modified: trunk/tora/src/migratetool/tora3.cpp =================================================================== --- trunk/tora/src/migratetool/tora3.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/migratetool/tora3.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -35,8 +35,8 @@ #include "migratetool/tora3.h" #include "core/utils.h" -#include <QtGui/QMessageBox> -#include <QtGui/QFileDialog> +#include <QMessageBox> +#include <QFileDialog> #include <QtCore/QMap> namespace MigrateTool Modified: trunk/tora/src/result/toresulttabledata.cpp =================================================================== --- trunk/tora/src/result/toresulttabledata.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/result/toresulttabledata.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -43,10 +43,10 @@ #include "editor/toscintilla.h" #include "ui_toresultcontentfilterui.h" -#include <QtGui/QToolBar> -#include <QtGui/QAction> -#include <QtGui/QVBoxLayout> -#include <QtGui/QMessageBox> +#include <QToolBar> +#include <QAction> +#include <QVBoxLayout> +#include <QMessageBox> #include <QtGui/QCloseEvent> #include "icons/refresh.xpm" Modified: trunk/tora/src/shortcuteditor/shortcuteditordialog.cpp =================================================================== --- trunk/tora/src/shortcuteditor/shortcuteditordialog.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/shortcuteditor/shortcuteditordialog.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -7,8 +7,8 @@ a copyright and/or license notice that predates the release of Sqliteman for which a new license (GPL+exception) is in place. */ -#include <QtGui/QMessageBox> -#include <QtGui/QFileDialog> +#include <QMessageBox> +#include <QFileDialog> #include <QtCore/QTextStream> #if QT_VERSION >= 0x040300 #include <QtXml/QXmlStreamReader> Modified: trunk/tora/src/templates/tosqledit.cpp =================================================================== --- trunk/tora/src/templates/tosqledit.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/templates/tosqledit.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -50,17 +50,17 @@ #include <QtCore/QFileInfo> #include <QtCore/QString> -#include <QtGui/QLabel> -#include <QtGui/QLineEdit> -#include <QtGui/QMenuBar> -#include <QtGui/QMessageBox> -#include <QtGui/QSplitter> -#include <QtGui/QToolButton> -#include <QtGui/QComboBox> -#include <QtGui/QFrame> +#include <QLabel> +#include <QLineEdit> +#include <QMenuBar> +#include <QMessageBox> +#include <QSplitter> +#include <QToolButton> +#include <QComboBox> +#include <QFrame> #include <QtGui/QPixmap> -#include <QtGui/QVBoxLayout> -#include <QtGui/QHBoxLayout> +#include <QVBoxLayout> +#include <QHBoxLayout> #include "icons/add.xpm" #include "icons/commit.xpm" Modified: trunk/tora/src/templates/totemplate.cpp =================================================================== --- trunk/tora/src/templates/totemplate.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/templates/totemplate.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -50,14 +50,14 @@ #include <QtGui/QHideEvent> #include <QtGui/QShowEvent> -#include <QtGui/QTextEdit> +#include <QTextEdit> #include <QtCore/QFileInfo> -#include <QtGui/QLabel> -#include <QtGui/QLineEdit> -#include <QtGui/QMessageBox> -#include <QtGui/QPushButton> -#include <QtGui/QSplitter> -#include <QtGui/QToolBar> +#include <QLabel> +#include <QLineEdit> +#include <QMessageBox> +#include <QPushButton> +#include <QSplitter> +#include <QToolBar> #include "icons/totemplate.xpm" Modified: trunk/tora/src/tests/test1.cpp =================================================================== --- trunk/tora/src/tests/test1.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/tests/test1.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -38,7 +38,7 @@ #include "parsing/persistenttrie.h" #include <QtCore/QDateTime> -#include <QtGui/QApplication> +#include <QApplication> #include <QtCore/QTextCodec> #include <QtCore/QString> #include <QtCore/QStringList> Modified: trunk/tora/src/tests/test2.cpp =================================================================== --- trunk/tora/src/tests/test2.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/tests/test2.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -51,12 +51,12 @@ #include "editor/tomarkededitor.h" #include <QtCore/QDateTime> -#include <QtGui/QApplication> -#include <QtGui/QMessageBox> +#include <QApplication> +#include <QMessageBox> #include <QtCore/QTextCodec> #include <QtCore/QString> #include <QtCore/QTranslator> -#include <QtGui/QStyleFactory> +#include <QStyleFactory> #include <QtCore/QLibrary> #include <memory> Modified: trunk/tora/src/tests/test3.cpp =================================================================== --- trunk/tora/src/tests/test3.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/tests/test3.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -47,7 +47,7 @@ #include <QtCore/QDir> #include <QtCore/QLibrary> -#include <QtGui/QProgressBar> +#include <QProgressBar> static void usage() { Modified: trunk/tora/src/tests/test3window.cpp =================================================================== --- trunk/tora/src/tests/test3window.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/tests/test3window.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -45,9 +45,9 @@ #include "core/tologger.h" #include "tools/toworksheet.h" -#include <QtGui/QStatusBar> -#include <QtGui/QScrollArea> -#include <QtGui/QSplitter> +#include <QStatusBar> +#include <QScrollArea> +#include <QSplitter> Test3Window::Test3Window(QString user, QString password, QString connect, QSet<QString>& options) : toMainWindow() Modified: trunk/tora/src/tests/test4.cpp =================================================================== --- trunk/tora/src/tests/test4.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/tests/test4.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -38,7 +38,7 @@ #include "core/tologger.h" #include "core/toconfiguration_new.h" -#include <QtGui/QApplication> +#include <QApplication> #include <QtCore/QLibrary> int main(int argc, char **argv) Modified: trunk/tora/src/tests/test4window.cpp =================================================================== --- trunk/tora/src/tests/test4window.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/tests/test4window.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -35,10 +35,10 @@ #include "tests/test4window.h" #include "editor/tosqltext.h" -#include <QtGui/QStatusBar> -#include <QtGui/QScrollArea> -#include <QtGui/QSplitter> -#include <QtGui/QToolBar> +#include <QStatusBar> +#include <QScrollArea> +#include <QSplitter> +#include <QToolBar> Test4Window::Test4Window(const QString &sql) : Ui::Test4Window() Modified: trunk/tora/src/tests/test5.cpp =================================================================== --- trunk/tora/src/tests/test5.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/tests/test5.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -47,7 +47,7 @@ #include <QtCore/QDir> #include <QtCore/QLibrary> -#include <QtGui/QProgressBar> +#include <QProgressBar> static void usage() { Modified: trunk/tora/src/tests/test5window.cpp =================================================================== --- trunk/tora/src/tests/test5window.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/tests/test5window.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -51,9 +51,9 @@ #include "editor/tosqltext.h" -#include <QtGui/QStatusBar> -#include <QtGui/QScrollArea> -#include <QtGui/QSplitter> +#include <QStatusBar> +#include <QScrollArea> +#include <QSplitter> Test5Window::Test5Window(QString user, QString password, QString connect, QSet<QString>& options) : toMainWindow() Modified: trunk/tora/src/tools/toalert.cpp =================================================================== --- trunk/tora/src/tools/toalert.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/tools/toalert.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -48,12 +48,12 @@ #include <stdio.h> #include <QtCore/QMutexLocker> -#include <QtGui/QComboBox> -#include <QtGui/QLabel> -#include <QtGui/QLineEdit> -#include <QtGui/QMenuBar> -#include <QtGui/QToolButton> -#include <QtGui/QMdiArea> +#include <QComboBox> +#include <QLabel> +#include <QLineEdit> +#include <QMenuBar> +#include <QToolButton> +#include <QMdiArea> #include <QtGui/QPixmap> #include "icons/commit.xpm" Modified: trunk/tora/src/tools/toanalyze.cpp =================================================================== --- trunk/tora/src/tools/toanalyze.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/tools/toanalyze.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -42,11 +42,11 @@ //#include "core/toconfiguration_new.h" #include "connection/tooraclesetting.h" -#include <QtGui/QComboBox> -#include <QtGui/QSpinBox> -#include <QtGui/QMenu> -#include <QtGui/QToolBar> -#include <QtGui/QVBoxLayout> +#include <QComboBox> +#include <QSpinBox> +#include <QMenu> +#include <QToolBar> +#include <QVBoxLayout> #include "icons/execute.xpm" #include "icons/refresh.xpm" Modified: trunk/tora/src/tools/toawr.cpp =================================================================== --- trunk/tora/src/tools/toawr.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/tools/toawr.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -45,11 +45,11 @@ #include "icons/execute.xpm" #include "icons/awrtool.xpm" -#include <QtGui/QLineEdit> -#include <QtGui/QDateEdit> -#include <QtGui/QMessageBox> //TODO see utis.h define TOMessageBox QMessageBox(QMessageBox should be included there) -#include <QtGui/QToolBar> -#include <QtGui/QLabel> +#include <QLineEdit> +#include <QDateEdit> +#include <QMessageBox> //TODO see utis.h define TOMessageBox QMessageBox(QMessageBox should be included there) +#include <QToolBar> +#include <QLabel> #include <iostream> #include <list> Modified: trunk/tora/src/tools/tobackup.cpp =================================================================== --- trunk/tora/src/tools/tobackup.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/tools/tobackup.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -39,8 +39,8 @@ #include "core/toresulttableview.h" #include "core/toglobalevent.h" -#include <QtGui/QToolBar> -#include <QtGui/QVBoxLayout> +#include <QToolBar> +#include <QVBoxLayout> #include "icons/refresh.xpm" Modified: trunk/tora/src/tools/tobrowser.cpp =================================================================== --- trunk/tora/src/tools/tobrowser.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/tools/tobrowser.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -61,9 +61,9 @@ # include "core/tomysqluser.h" #endif -#include <QtGui/QInputDialog> -#include <QtGui/QSplitter> -#include <QtGui/QToolBar> +#include <QInputDialog> +#include <QSplitter> +#include <QToolBar> #include "icons/addindex.xpm" #include "icons/addtable.xpm" Modified: trunk/tora/src/tools/tobrowserdblinkswidget.cpp =================================================================== --- trunk/tora/src/tools/tobrowserdblinkswidget.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/tools/tobrowserdblinkswidget.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -39,7 +39,7 @@ #include "core/toresultcode.h" #include "core/toquery.h" -#include <QtGui/QMessageBox> +#include <QMessageBox> static toSQL SQLDBLinkInfo("toBrowser:DBLinkInformation", "SELECT * FROM Sys.all_db_links a\n" Modified: trunk/tora/src/tools/tocurrent.cpp =================================================================== --- trunk/tora/src/tools/tocurrent.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/tools/tocurrent.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -46,12 +46,12 @@ #include "core/tosql.h" #include "core/totool.h" -#include <QtGui/QLabel> -#include <QtGui/QMenuBar> -#include <QtGui/QTabWidget> -#include <QtGui/QToolBar> +#include <QLabel> +#include <QMenuBar> +#include <QTabWidget> +#include <QToolBar> #include <QtGui/QPixmap> -#include <QtGui/QLayout> +#include <QLayout> #include "icons/refresh.xpm" #include "icons/tocurrent.xpm" Modified: trunk/tora/src/tools/toer.cpp =================================================================== --- trunk/tora/src/tools/toer.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/tools/toer.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -32,7 +32,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ -#include <QtGui/QToolBar> +#include <QToolBar> #include "tools/toer.h" #include "core/tologger.h" @@ -50,7 +50,7 @@ #include "dotgraph.h" #include "dotgraphview.h" -#include <QtGui/QToolBar> +#include <QToolBar> static toSQL SQLALLRefs ( "toResultDrawing:ALLREFConstraints", Modified: trunk/tora/src/tools/tofilesize.cpp =================================================================== --- trunk/tora/src/tools/tofilesize.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/tools/tofilesize.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -34,11 +34,11 @@ #include "tools/tofilesize.h" -#include <QtGui/QRadioButton> -#include <QtGui/QSpinBox> -#include <QtGui/QLayout> -#include <QtGui/QVBoxLayout> -#include <QtGui/QHBoxLayout> +#include <QRadioButton> +#include <QSpinBox> +#include <QLayout> +#include <QVBoxLayout> +#include <QHBoxLayout> #include <stdio.h> Modified: trunk/tora/src/tools/toinvalid.cpp =================================================================== --- trunk/tora/src/tools/toinvalid.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/tools/toinvalid.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -49,11 +49,11 @@ #include <QtCore/QList> #include <QtCore/QDebug> -#include <QtGui/QToolBar> -#include <QtGui/QToolButton> -#include <QtGui/QSplitter> +#include <QToolBar> +#include <QToolButton> +#include <QSplitter> #include <QtGui/QPixmap> -#include <QtGui/QProgressDialog> +#include <QProgressDialog> #include "icons/refresh.xpm" #include "icons/toinvalid.xpm" Modified: trunk/tora/src/tools/tooutput.cpp =================================================================== --- trunk/tora/src/tools/tooutput.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/tools/tooutput.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -43,7 +43,7 @@ #include <map> -#include <QtGui/QWidget> +#include <QWidget> #include "icons/eraselog.xpm" #include "icons/offline.xpm" Modified: trunk/tora/src/tools/toplsqleditor.cpp =================================================================== --- trunk/tora/src/tools/toplsqleditor.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/tools/toplsqleditor.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -48,8 +48,8 @@ #include <QtCore/QSettings> #include <QtCore/QFileInfo> #include <QtCore/QDir> -#include <QtGui/QApplication> -#include <QtGui/QSplitter> +#include <QApplication> +#include <QSplitter> #define PLSQL_ERROR "ERROR" #define PLSQL_WARNING "WARNING" Modified: trunk/tora/src/tools/toplsqltext.cpp =================================================================== --- trunk/tora/src/tools/toplsqltext.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/tools/toplsqltext.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -53,11 +53,11 @@ #include <QtCore/QSettings> #include <QtCore/QTemporaryFile> #include <QtCore/QProcess> -#include <QtGui/QToolBar> -#include <QtGui/QMenu> -#include <QtGui/QTreeView> -#include <QtGui/QSplitter> -#include <QtGui/QToolButton> +#include <QToolBar> +#include <QMenu> +#include <QTreeView> +#include <QSplitter> +#include <QToolButton> #include "icons/close.xpm" #include "icons/compile.xpm" Modified: trunk/tora/src/tools/toprofiler.cpp =================================================================== --- trunk/tora/src/tools/toprofiler.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/tools/toprofiler.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -42,14 +42,14 @@ #include "editor/tohighlightededitor.h" #include "editor/tosqltext.h" -#include <QtGui/QComboBox> +#include <QComboBox> #include <QtGui/QPixmap> -#include <QtGui/QVBoxLayout> -#include <QtGui/QSpinBox> -#include <QtGui/QSplitter> -#include <QtGui/QTabWidget> -#include <QtGui/QToolBar> -#include <QtGui/QLineEdit> +#include <QVBoxLayout> +#include <QSpinBox> +#include <QSplitter> +#include <QTabWidget> +#include <QToolBar> +#include <QLineEdit> #include "icons/clock.xpm" #include "icons/execute.xpm" Modified: trunk/tora/src/tools/toresultstorage.cpp =================================================================== --- trunk/tora/src/tools/toresultstorage.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/tools/toresultstorage.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -39,7 +39,7 @@ #include "core/toglobalsetting.h" #include <QtGui/QPainter> -#include <QtGui/QItemDelegate> +#include <QItemDelegate> // columns count Modified: trunk/tora/src/tools/torollback.cpp =================================================================== --- trunk/tora/src/tools/torollback.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/tools/torollback.cpp 2014-11-22 09:25:33 UTC (rev 5150) @@ -47,7 +47,7 @@ #include "core/toconfiguration_new.h" #include "core/toglobalsetting.h" -#include <QtGui/QWidget> +#include <QWidget> #include "icons/addrollback.xpm" #include "icons/offline.xpm" Modified: trunk/tora/src/tools/tosandboxtool.cpp =================================================================== --- trunk/tora/src/tools/tosandboxtool.cpp 2014-11-19 09:43:32 UTC (rev 5149) +++ trunk/tora/src/tools/tosand... [truncated message content] |
From: <ibr...@us...> - 2014-11-22 12:06:09
|
Revision: 5151 http://sourceforge.net/p/tora/code/5151 Author: ibre5041 Date: 2014-11-22 12:06:02 +0000 (Sat, 22 Nov 2014) Log Message: ----------- remove QtGui prefix from widgets headers includes, part of Qt5 port(headers) Modified Paths: -------------- trunk/tora/src/connection/tooracleextract.h trunk/tora/src/core/tobackgroundlabel.h trunk/tora/src/core/tobrowserbasewidget.h trunk/tora/src/core/toconfiguration_new.h trunk/tora/src/core/toconnection.h trunk/tora/src/core/todockbar.h trunk/tora/src/core/todocklet.h trunk/tora/src/core/toeditablemenu.h trunk/tora/src/core/toeditmenu.h trunk/tora/src/core/toeditwidget.h trunk/tora/src/core/tohelp.h trunk/tora/src/core/tohelpsetup.h trunk/tora/src/core/tolinechart.h trunk/tora/src/core/tomain.h trunk/tora/src/core/tomainwindow.h trunk/tora/src/core/tomemoeditor.h trunk/tora/src/core/tomodeleditor.h trunk/tora/src/core/toparamget.h trunk/tora/src/core/topiechart.h trunk/tora/src/core/topreferences.h trunk/tora/src/core/topushbutton.h trunk/tora/src/core/toresultbar.h trunk/tora/src/core/toresultcolscomment.h trunk/tora/src/core/toresultcombo.h trunk/tora/src/core/toresultdatasingle.h trunk/tora/src/core/toresultextent.h trunk/tora/src/core/toresultitem.h trunk/tora/src/core/toresultlistformat.h trunk/tora/src/core/toresultparam.h trunk/tora/src/core/toresulttableview.h trunk/tora/src/core/toresulttableviewedit.h trunk/tora/src/core/toresultview.h trunk/tora/src/core/tosplash.h trunk/tora/src/core/totableselect.h trunk/tora/src/core/totabwidget.h trunk/tora/src/core/totool.h trunk/tora/src/core/totreewidget.h trunk/tora/src/core/toworkingwidget.h trunk/tora/src/core/toworkspace.h trunk/tora/src/core/utils.h trunk/tora/src/docklets/tologging.h trunk/tora/src/docklets/toviewdirectory.h trunk/tora/src/editor/tobaseeditor.h trunk/tora/src/editor/tocomplpopup.h trunk/tora/src/editor/tosearchreplace.h trunk/tora/src/editor/tosqltext.h trunk/tora/src/precompiled/precompiled_linux.h trunk/tora/src/precompiled/precompiled_msvc.h trunk/tora/src/result/tocomboview.h trunk/tora/src/result/tomvc.h trunk/tora/src/result/toresulttabledata.h trunk/tora/src/result/totableview.h trunk/tora/src/result/totreeview.h trunk/tora/src/tests/test3window.h trunk/tora/src/tests/test4window.h trunk/tora/src/tests/test5window.h trunk/tora/src/tools/toalert.h trunk/tora/src/tools/toanalyze.h trunk/tora/src/tools/tobackup.h trunk/tora/src/tools/tobrowser.h trunk/tora/src/tools/tobrowserschemawidget.h trunk/tora/src/tools/tofilesize.h trunk/tora/src/tools/tooutput.h trunk/tora/src/tools/torollback.h trunk/tora/src/tools/tosandboxtool.h trunk/tora/src/tools/tosession.h trunk/tora/src/tools/tosgastatement.h trunk/tora/src/tools/tostorage.h trunk/tora/src/tools/tostoragedefinition.h trunk/tora/src/tools/towaitevents.h trunk/tora/src/tools/toworksheet.h trunk/tora/src/tools/toworksheetstatistic.h Modified: trunk/tora/src/connection/tooracleextract.h =================================================================== --- trunk/tora/src/connection/tooracleextract.h 2014-11-22 09:25:33 UTC (rev 5150) +++ trunk/tora/src/connection/tooracleextract.h 2014-11-22 12:06:02 UTC (rev 5151) @@ -44,7 +44,7 @@ #include "core/toquery.h" //#include "core/totool.h" -#include <QtGui/QApplication> +#include <QApplication> #include <QtCore/QRegExp> // Some convenient defines Modified: trunk/tora/src/core/tobackgroundlabel.h =================================================================== --- trunk/tora/src/core/tobackgroundlabel.h 2014-11-22 09:25:33 UTC (rev 5150) +++ trunk/tora/src/core/tobackgroundlabel.h 2014-11-22 12:06:02 UTC (rev 5151) @@ -6,7 +6,7 @@ #ifndef TOBACKGROUNDLABEL_H #define TOBACKGROUNDLABEL_H -#include <QtGui/QLabel> +#include <QLabel> class QWidget; class QMouseEvent; Modified: trunk/tora/src/core/tobrowserbasewidget.h =================================================================== --- trunk/tora/src/core/tobrowserbasewidget.h 2014-11-22 09:25:33 UTC (rev 5150) +++ trunk/tora/src/core/tobrowserbasewidget.h 2014-11-22 12:06:02 UTC (rev 5151) @@ -37,7 +37,7 @@ #include "core/tocache.h" -#include <QtGui/QTabWidget> +#include <QTabWidget> #include <QtCore/QMap> #include "loki/Factory_alt.h" Modified: trunk/tora/src/core/toconfiguration_new.h =================================================================== --- trunk/tora/src/core/toconfiguration_new.h 2014-11-22 09:25:33 UTC (rev 5150) +++ trunk/tora/src/core/toconfiguration_new.h 2014-11-22 12:06:02 UTC (rev 5151) @@ -11,7 +11,7 @@ #include <QtCore/QMap> #include <QtCore/QSettings> #include <QtCore/QVariant> -#include <QtGui/QApplication> +#include <QApplication> namespace ToConfiguration { class ConfigContext; Modified: trunk/tora/src/core/toconnection.h =================================================================== --- trunk/tora/src/core/toconnection.h 2014-11-22 09:25:33 UTC (rev 5150) +++ trunk/tora/src/core/toconnection.h 2014-11-22 12:06:02 UTC (rev 5151) @@ -41,7 +41,7 @@ #include <QtCore/QObject> #include <QtCore/QPointer> -#include <QtGui/QWidget> +#include <QWidget> #include <QtCore/QSet> #include <QtCore/QMap> #include <QtCore/QMetaType> Modified: trunk/tora/src/core/todockbar.h =================================================================== --- trunk/tora/src/core/todockbar.h 2014-11-22 09:25:33 UTC (rev 5150) +++ trunk/tora/src/core/todockbar.h 2014-11-22 12:06:02 UTC (rev 5151) @@ -38,8 +38,8 @@ #include "core/topushbutton.h" -#include <QtGui/QAction> -#include <QtGui/QToolBar> +#include <QAction> +#include <QToolBar> #include <QtCore/QMap> class toDocklet; Modified: trunk/tora/src/core/todocklet.h =================================================================== --- trunk/tora/src/core/todocklet.h 2014-11-22 09:25:33 UTC (rev 5150) +++ trunk/tora/src/core/todocklet.h 2014-11-22 12:06:02 UTC (rev 5151) @@ -38,9 +38,9 @@ #include <QtCore/QMap> -#include <QtGui/QAction> -#include <QtGui/QWidget> -#include <QtGui/QDockWidget> +#include <QAction> +#include <QWidget> +#include <QDockWidget> #include <QtCore/QRect> class toDocklet; Modified: trunk/tora/src/core/toeditablemenu.h =================================================================== --- trunk/tora/src/core/toeditablemenu.h 2014-11-22 09:25:33 UTC (rev 5150) +++ trunk/tora/src/core/toeditablemenu.h 2014-11-22 12:06:02 UTC (rev 5151) @@ -37,7 +37,7 @@ -#include <QtGui/QMenu> +#include <QMenu> #include <QtGui/QKeyEvent> Modified: trunk/tora/src/core/toeditmenu.h =================================================================== --- trunk/tora/src/core/toeditmenu.h 2014-11-22 09:25:33 UTC (rev 5150) +++ trunk/tora/src/core/toeditmenu.h 2014-11-22 12:06:02 UTC (rev 5151) @@ -38,7 +38,7 @@ #include "core/toeditwidget.h" #include "loki/Singleton.h" -#include <QtGui/QMenu> +#include <QMenu> /** This singleton represents Edit menu in the main window widget * as this must be accessed from various pieces it was moved into singleton Modified: trunk/tora/src/core/toeditwidget.h =================================================================== --- trunk/tora/src/core/toeditwidget.h 2014-11-22 09:25:33 UTC (rev 5150) +++ trunk/tora/src/core/toeditwidget.h 2014-11-22 12:06:02 UTC (rev 5151) @@ -35,7 +35,7 @@ #ifndef TOEDITWIDGET_H #define TOEDITWIDGET_H -#include <QtGui/QWidget> +#include <QWidget> #include <list> Modified: trunk/tora/src/core/tohelp.h =================================================================== --- trunk/tora/src/core/tohelp.h 2014-11-22 09:25:33 UTC (rev 5150) +++ trunk/tora/src/core/tohelp.h 2014-11-22 12:06:02 UTC (rev 5151) @@ -41,9 +41,9 @@ #include "ui_tohelpui.h" -#include <QtGui/QProgressBar> -#include <QtGui/QWidget> -#include <QtGui/QTreeWidget> +#include <QProgressBar> +#include <QWidget> +#include <QTreeWidget> namespace ToConfiguration { class Help : public ConfigContext Modified: trunk/tora/src/core/tohelpsetup.h =================================================================== --- trunk/tora/src/core/tohelpsetup.h 2014-11-22 09:25:33 UTC (rev 5150) +++ trunk/tora/src/core/tohelpsetup.h 2014-11-22 12:06:02 UTC (rev 5151) @@ -41,7 +41,7 @@ #include "ui_tohelpaddfileui.h" #include "ui_tohelpsetupui.h" -#include <QtGui/QDialog> +#include <QDialog> class toHelpAddFile : public QDialog, public Ui::toHelpAddFileUI Modified: trunk/tora/src/core/tolinechart.h =================================================================== --- trunk/tora/src/core/tolinechart.h 2014-11-22 09:25:33 UTC (rev 5150) +++ trunk/tora/src/core/tolinechart.h 2014-11-22 12:06:02 UTC (rev 5151) @@ -35,7 +35,7 @@ #ifndef TOLINECHART_H #define TOLINECHART_H -#include <QtGui/QWidget> +#include <QWidget> #include <QtCore/QString> #include <QtGui/QPaintEvent> #include <QtGui/QMouseEvent> Modified: trunk/tora/src/core/tomain.h =================================================================== --- trunk/tora/src/core/tomain.h 2014-11-22 09:25:33 UTC (rev 5150) +++ trunk/tora/src/core/tomain.h 2014-11-22 12:06:02 UTC (rev 5151) @@ -40,7 +40,7 @@ #include "core/toeditwidget.h" #include "core/tobackground.h" -#include <QtGui/QLabel> +#include <QLabel> #include <QtCore/QPointer> #include <QtCore/QMap> Modified: trunk/tora/src/core/tomainwindow.h =================================================================== --- trunk/tora/src/core/tomainwindow.h 2014-11-22 09:25:33 UTC (rev 5150) +++ trunk/tora/src/core/tomainwindow.h 2014-11-22 12:06:02 UTC (rev 5151) @@ -39,7 +39,7 @@ #include "core/toconfenum.h" #include "loki/Singleton.h" -#include <QtGui/QMainWindow> +#include <QMainWindow> class toDockbar; class toDocklet; Modified: trunk/tora/src/core/tomemoeditor.h =================================================================== --- trunk/tora/src/core/tomemoeditor.h 2014-11-22 09:25:33 UTC (rev 5150) +++ trunk/tora/src/core/tomemoeditor.h 2014-11-22 12:06:02 UTC (rev 5151) @@ -38,9 +38,9 @@ #include "editor/tomarkededitor.h" #include "editor/tohighlightededitor.h" -#include <QtGui/QDialog> -#include <QtGui/QLabel> -#include <QtGui/QToolBar> +#include <QDialog> +#include <QLabel> +#include <QToolBar> class QCheckBox; class QLabel; Modified: trunk/tora/src/core/tomodeleditor.h =================================================================== --- trunk/tora/src/core/tomodeleditor.h 2014-11-22 09:25:33 UTC (rev 5150) +++ trunk/tora/src/core/tomodeleditor.h 2014-11-22 12:06:02 UTC (rev 5151) @@ -39,9 +39,9 @@ #include "editor/tohighlightededitor.h" #include "core/utils.h" -#include <QtGui/QDialog> -#include <QtGui/QLabel> -#include <QtGui/QToolBar> +#include <QDialog> +#include <QLabel> +#include <QToolBar> #include <QtCore/QModelIndex> class QCheckBox; Modified: trunk/tora/src/core/toparamget.h =================================================================== --- trunk/tora/src/core/toparamget.h 2014-11-22 09:25:33 UTC (rev 5150) +++ trunk/tora/src/core/toparamget.h 2014-11-22 12:06:02 UTC (rev 5151) @@ -40,11 +40,11 @@ #include "core/toquery.h" #include "core/tohelp.h" -#include <QtGui/QDialog> -#include <QtGui/QPushButton> +#include <QDialog> +#include <QPushButton> #include <QtGui/QResizeEvent> -#include <QtGui/QScrollArea> -#include <QtGui/QGridLayout> +#include <QScrollArea> +#include <QGridLayout> #include <list> #include <map> Modified: trunk/tora/src/core/topiechart.h =================================================================== --- trunk/tora/src/core/topiechart.h 2014-11-22 09:25:33 UTC (rev 5150) +++ trunk/tora/src/core/topiechart.h 2014-11-22 12:06:02 UTC (rev 5151) @@ -36,7 +36,7 @@ #define TOPIECHART_H -#include <QtGui/QWidget> +#include <QWidget> #include <QtCore/QObject> #include <QtCore/QRect> #include <list> Modified: trunk/tora/src/core/topreferences.h =================================================================== --- trunk/tora/src/core/topreferences.h 2014-11-22 09:25:33 UTC (rev 5150) +++ trunk/tora/src/core/topreferences.h 2014-11-22 12:06:02 UTC (rev 5151) @@ -39,7 +39,7 @@ #include "core/totool.h" #include <QtCore/QVariant> -#include <QtGui/QDialog> +#include <QDialog> #include <map> Modified: trunk/tora/src/core/topushbutton.h =================================================================== --- trunk/tora/src/core/topushbutton.h 2014-11-22 09:25:33 UTC (rev 5150) +++ trunk/tora/src/core/topushbutton.h 2014-11-22 12:06:02 UTC (rev 5151) @@ -37,8 +37,8 @@ -#include <QtGui/QPushButton> -#include <QtGui/QToolButton> +#include <QPushButton> +#include <QToolButton> #include <QtCore/QMetaEnum> class QToolBar; Modified: trunk/tora/src/core/toresultbar.h =================================================================== --- trunk/tora/src/core/toresultbar.h 2014-11-22 09:25:33 UTC (rev 5150) +++ trunk/tora/src/core/toresultbar.h 2014-11-22 12:06:02 UTC (rev 5151) @@ -38,7 +38,7 @@ #include "core/tobarchart.h" #include "core/toresult.h" -#include <QtGui/QMenu> +#include <QMenu> #include <time.h> #include <list> Modified: trunk/tora/src/core/toresultcolscomment.h =================================================================== --- trunk/tora/src/core/toresultcolscomment.h 2014-11-22 09:25:33 UTC (rev 5150) +++ trunk/tora/src/core/toresultcolscomment.h 2014-11-22 12:06:02 UTC (rev 5151) @@ -38,7 +38,7 @@ #include <QtCore/QString> -#include <QtGui/QLineEdit> +#include <QLineEdit> #include <QtGui/QFocusEvent> class QWidget; Modified: trunk/tora/src/core/toresultcombo.h =================================================================== --- trunk/tora/src/core/toresultcombo.h 2014-11-22 09:25:33 UTC (rev 5150) +++ trunk/tora/src/core/toresultcombo.h 2014-11-22 12:06:02 UTC (rev 5151) @@ -38,7 +38,7 @@ #include "core/toresult.h" -#include <QtGui/QComboBox> +#include <QComboBox> #include <QtCore/QStringList> #include <QtCore/QPointer> Modified: trunk/tora/src/core/toresultdatasingle.h =================================================================== --- trunk/tora/src/core/toresultdatasingle.h 2014-11-22 09:25:33 UTC (rev 5150) +++ trunk/tora/src/core/toresultdatasingle.h 2014-11-22 12:06:02 UTC (rev 5151) @@ -38,7 +38,7 @@ #include "core/toresultmodeledit.h" -#include <QtGui/QWidget> +#include <QWidget> #include <QtCore/QList> #include <QtCore/QPointer> Modified: trunk/tora/src/core/toresultextent.h =================================================================== --- trunk/tora/src/core/toresultextent.h 2014-11-22 09:25:33 UTC (rev 5150) +++ trunk/tora/src/core/toresultextent.h 2014-11-22 12:06:02 UTC (rev 5151) @@ -37,7 +37,7 @@ #include "core/toresult.h" -#include <QtGui/QSplitter> +#include <QSplitter> class toResultTableView; class toStorageExtent; Modified: trunk/tora/src/core/toresultitem.h =================================================================== --- trunk/tora/src/core/toresultitem.h 2014-11-22 09:25:33 UTC (rev 5150) +++ trunk/tora/src/core/toresultitem.h 2014-11-22 12:06:02 UTC (rev 5151) @@ -37,9 +37,9 @@ #include "core/toresult.h" -#include <QtGui/QScrollArea> +#include <QScrollArea> #include <QtGui/QFont> -#include <QtGui/QGridLayout> +#include <QGridLayout> #include <vector> Modified: trunk/tora/src/core/toresultlistformat.h =================================================================== --- trunk/tora/src/core/toresultlistformat.h 2014-11-22 09:25:33 UTC (rev 5150) +++ trunk/tora/src/core/toresultlistformat.h 2014-11-22 12:06:02 UTC (rev 5151) @@ -38,7 +38,7 @@ #include "ui_toresultlistformatui.h" -#include <QtGui/QDialog> +#include <QDialog> class toExportSettings; Modified: trunk/tora/src/core/toresultparam.h =================================================================== --- trunk/tora/src/core/toresultparam.h 2014-11-22 09:25:33 UTC (rev 5150) +++ trunk/tora/src/core/toresultparam.h 2014-11-22 12:06:02 UTC (rev 5151) @@ -39,7 +39,7 @@ #include <map> -#include <QtGui/QWidget> +#include <QWidget> class QLineEdit; class QToolButton; Modified: trunk/tora/src/core/toresulttableview.h =================================================================== --- trunk/tora/src/core/toresulttableview.h 2014-11-22 09:25:33 UTC (rev 5150) +++ trunk/tora/src/core/toresulttableview.h 2014-11-22 12:06:02 UTC (rev 5151) @@ -43,15 +43,15 @@ #include "core/toeditwidget.h" #include <QtCore/QAbstractTableModel> -#include <QtGui/QHeaderView> -#include <QtGui/QItemDelegate> -#include <QtGui/QLabel> +#include <QHeaderView> +#include <QItemDelegate> +#include <QLabel> #include <QtCore/QList> -#include <QtGui/QMenu> +#include <QMenu> #include <QtCore/QModelIndex> #include <QtCore/QObject> -#include <QtGui/QPushButton> -#include <QtGui/QTableView> +#include <QPushButton> +#include <QTableView> class toResultStats; class toViewFilter; Modified: trunk/tora/src/core/toresulttableviewedit.h =================================================================== --- trunk/tora/src/core/toresulttableviewedit.h 2014-11-22 09:25:33 UTC (rev 5150) +++ trunk/tora/src/core/toresulttableviewedit.h 2014-11-22 12:06:02 UTC (rev 5151) @@ -44,11 +44,11 @@ #include <QtCore/QObject> #include <QtCore/QAbstractTableModel> -#include <QtGui/QTableView> +#include <QTableView> #include <QtCore/QModelIndex> #include <QtCore/QList> -#include <QtGui/QHeaderView> -#include <QtGui/QMenu> +#include <QHeaderView> +#include <QMenu> class toResultModel; class toResultModelEdit; Modified: trunk/tora/src/core/toresultview.h =================================================================== --- trunk/tora/src/core/toresultview.h 2014-11-22 09:25:33 UTC (rev 5150) +++ trunk/tora/src/core/toresultview.h 2014-11-22 12:06:02 UTC (rev 5151) @@ -45,7 +45,7 @@ #include <QtGui/QFocusEvent> #include <QtGui/QMouseEvent> #include <QtGui/QKeyEvent> -#include <QtGui/QMenu> +#include <QMenu> #include <map> #include <algorithm> Modified: trunk/tora/src/core/tosplash.h =================================================================== --- trunk/tora/src/core/tosplash.h 2014-11-22 09:25:33 UTC (rev 5150) +++ trunk/tora/src/core/tosplash.h 2014-11-22 12:06:02 UTC (rev 5151) @@ -35,8 +35,8 @@ #ifndef TOSPLASH_H #define TOSPLASH_H -#include <QtGui/QWidget> -#include <QtGui/QLabel> +#include <QWidget> +#include <QLabel> class QLabel; class QProgressBar; Modified: trunk/tora/src/core/totableselect.h =================================================================== --- trunk/tora/src/core/totableselect.h 2014-11-22 09:25:33 UTC (rev 5150) +++ trunk/tora/src/core/totableselect.h 2014-11-22 12:06:02 UTC (rev 5151) @@ -4,7 +4,7 @@ #include "totool.h" -#include <QtGui/QGroupBox> +#include <QGroupBox> class toConnection; class toResultSchema; Modified: trunk/tora/src/core/totabwidget.h =================================================================== --- trunk/tora/src/core/totabwidget.h 2014-11-22 09:25:33 UTC (rev 5150) +++ trunk/tora/src/core/totabwidget.h 2014-11-22 12:06:02 UTC (rev 5151) @@ -35,7 +35,7 @@ #ifndef TOTABWIDGET_H #define TOTABWIDGET_H -#include <QtGui/QTabWidget> +#include <QTabWidget> #include <QtCore/QMap> #include <QtCore/QPointer> #include <QtCore/QString> Modified: trunk/tora/src/core/totool.h =================================================================== --- trunk/tora/src/core/totool.h 2014-11-22 09:25:33 UTC (rev 5150) +++ trunk/tora/src/core/totool.h 2014-11-22 12:06:02 UTC (rev 5151) @@ -42,7 +42,7 @@ #include <QtCore/QMap> #include <QtCore/QObject> #include <QtCore/QString> -#include <QtGui/QWidget> +#include <QWidget> class QPixmap; class QAction; Modified: trunk/tora/src/core/totreewidget.h =================================================================== --- trunk/tora/src/core/totreewidget.h 2014-11-22 09:25:33 UTC (rev 5150) +++ trunk/tora/src/core/totreewidget.h 2014-11-22 12:06:02 UTC (rev 5151) @@ -37,9 +37,9 @@ -#include <QtGui/QTreeWidget> -#include <QtGui/QTreeWidgetItem> -#include <QtGui/QTreeWidgetItemIterator> +#include <QTreeWidget> +#include <QTreeWidgetItem> +#include <QTreeWidgetItemIterator> #include <QtCore/QList> #include <QtCore/QVariant> Modified: trunk/tora/src/core/toworkingwidget.h =================================================================== --- trunk/tora/src/core/toworkingwidget.h 2014-11-22 09:25:33 UTC (rev 5150) +++ trunk/tora/src/core/toworkingwidget.h 2014-11-22 12:06:02 UTC (rev 5151) @@ -35,7 +35,7 @@ #ifndef TOWORKINGWIDGET_H #define TOWORKINGWIDGET_H -#include <QtGui/QWidget> +#include <QWidget> class QLabel; class QPushButton; Modified: trunk/tora/src/core/toworkspace.h =================================================================== --- trunk/tora/src/core/toworkspace.h 2014-11-22 09:25:33 UTC (rev 5150) +++ trunk/tora/src/core/toworkspace.h 2014-11-22 12:06:02 UTC (rev 5151) @@ -37,7 +37,7 @@ #include "loki/Singleton.h" -#include <QtGui/QWidget> +#include <QWidget> #include <QtCore/QMap> class toToolWidget; Modified: trunk/tora/src/core/utils.h =================================================================== --- trunk/tora/src/core/utils.h 2014-11-22 09:25:33 UTC (rev 5150) +++ trunk/tora/src/core/utils.h 2014-11-22 12:06:02 UTC (rev 5151) @@ -42,8 +42,8 @@ #include <QtCore/QThread> #include <QtCore/QFile> #include <QtCore/QFileInfo> -#include <QtGui/QMessageBox> -#include <QtGui/QMainWindow> +#include <QMessageBox> +#include <QMainWindow> #include <map> Modified: trunk/tora/src/docklets/tologging.h =================================================================== --- trunk/tora/src/docklets/tologging.h 2014-11-22 09:25:33 UTC (rev 5150) +++ trunk/tora/src/docklets/tologging.h 2014-11-22 12:06:02 UTC (rev 5151) @@ -41,9 +41,9 @@ #include "loki/Singleton.h" -#include <QtGui/QListView> -#include <QtGui/QDirModel> -#include <QtGui/QPlainTextEdit> +#include <QListView> +#include <QDirModel> +#include <QPlainTextEdit> class toToolWidget; class QMdiSubWindow; Modified: trunk/tora/src/docklets/toviewdirectory.h =================================================================== --- trunk/tora/src/docklets/toviewdirectory.h 2014-11-22 09:25:33 UTC (rev 5150) +++ trunk/tora/src/docklets/toviewdirectory.h 2014-11-22 12:06:02 UTC (rev 5151) @@ -38,8 +38,8 @@ #include "core/todocklet.h" -#include <QtGui/QListView> -#include <QtGui/QDirModel> +#include <QListView> +#include <QDirModel> class toToolWidget; Modified: trunk/tora/src/editor/tobaseeditor.h =================================================================== --- trunk/tora/src/editor/tobaseeditor.h 2014-11-22 09:25:33 UTC (rev 5150) +++ trunk/tora/src/editor/tobaseeditor.h 2014-11-22 12:06:02 UTC (rev 5151) @@ -38,7 +38,7 @@ #include "core/toeditwidget.h" #include "editor/tosearchreplace.h" -#include <QtGui/QWidget> +#include <QWidget> class toScintilla; class QFileSystemWatcher; Modified: trunk/tora/src/editor/tocomplpopup.h =================================================================== --- trunk/tora/src/editor/tocomplpopup.h 2014-11-22 09:25:33 UTC (rev 5150) +++ trunk/tora/src/editor/tocomplpopup.h 2014-11-22 12:06:02 UTC (rev 5151) @@ -35,7 +35,7 @@ #ifndef TOCOMPLPOPUP_H #define TOCOMPLPOPUP_H -#include <QtGui/QWidget> +#include <QWidget> class QListWidget; class toWorksheetText; Modified: trunk/tora/src/editor/tosearchreplace.h =================================================================== --- trunk/tora/src/editor/tosearchreplace.h 2014-11-22 09:25:33 UTC (rev 5150) +++ trunk/tora/src/editor/tosearchreplace.h 2014-11-22 12:06:02 UTC (rev 5151) @@ -39,7 +39,7 @@ #include "editor/toeditglobals.h" #include "core/totool.h" -#include <QtGui/QWidget> +#include <QWidget> class toListView; class toMarkedEditor; Modified: trunk/tora/src/editor/tosqltext.h =================================================================== --- trunk/tora/src/editor/tosqltext.h 2014-11-22 09:25:33 UTC (rev 5150) +++ trunk/tora/src/editor/tosqltext.h 2014-11-22 12:06:02 UTC (rev 5151) @@ -46,7 +46,7 @@ #include <QtCore/QTimer> #include <QtCore/QStringList> #include <QtGui/QKeyEvent> -#include <QtGui/QWidget> +#include <QWidget> class QListWidgetItem; class QsciAbstractAPIs; Modified: trunk/tora/src/precompiled/precompiled_linux.h =================================================================== --- trunk/tora/src/precompiled/precompiled_linux.h 2014-11-22 09:25:33 UTC (rev 5150) +++ trunk/tora/src/precompiled/precompiled_linux.h 2014-11-22 12:06:02 UTC (rev 5151) @@ -59,48 +59,48 @@ #include <QtCore/QWaitCondition> #include <QtCore/QtDebug> #include <QtCore/qglobal.h> -#include <QtGui/QAction> -#include <QtGui/QApplication> -#include <QtGui/QBoxLayout> -#include <QtGui/QCheckBox> +#include <QAction> +#include <QApplication> +#include <QBoxLayout> +#include <QCheckBox> #include <QtGui/QClipboard> #include <QtGui/QCloseEvent> #include <QtGui/QColor> -#include <QtGui/QColorDialog> -#include <QtGui/QComboBox> -#include <QtGui/QCompleter> +#include <QColorDialog> +#include <QComboBox> +#include <QCompleter> #include <QtGui/QContextMenuEvent> -#include <QtGui/QDateEdit> -#include <QtGui/QDesktopWidget> -#include <QtGui/QDialog> -#include <QtGui/QDialogButtonBox> -#include <QtGui/QDirModel> -#include <QtGui/QDockWidget> +#include <QDateEdit> +#include <QDesktopWidget> +#include <QDialog> +#include <QDialogButtonBox> +#include <QDirModel> +#include <QDockWidget> #include <QtGui/QDropEvent> -#include <QtGui/QFileDialog> +#include <QFileDialog> #include <QtGui/QFocusEvent> #include <QtGui/QFont> -#include <QtGui/QFontDialog> +#include <QFontDialog> #include <QtGui/QFontMetrics> -#include <QtGui/QFrame> -#include <QtGui/QGridLayout> -#include <QtGui/QGroupBox> -#include <QtGui/QHBoxLayout> -#include <QtGui/QHeaderView> +#include <QFrame> +#include <QGridLayout> +#include <QGroupBox> +#include <QHBoxLayout> +#include <QHeaderView> #include <QtGui/QHideEvent> #include <QtGui/QIcon> -#include <QtGui/QInputDialog> -#include <QtGui/QItemDelegate> +#include <QInputDialog> +#include <QItemDelegate> #include <QtGui/QKeyEvent> -#include <QtGui/QLabel> -#include <QtGui/QLayout> -#include <QtGui/QLineEdit> -#include <QtGui/QListView> -#include <QtGui/QListWidget> -#include <QtGui/QMainWindow> -#include <QtGui/QMenu> -#include <QtGui/QMenuBar> -#include <QtGui/QMessageBox> +#include <QLabel> +#include <QLayout> +#include <QLineEdit> +#include <QListView> +#include <QListWidget> +#include <QMainWindow> +#include <QMenu> +#include <QMenuBar> +#include <QMessageBox> #include <QtGui/QMouseEvent> #include <QtGui/QMovie> #include <QtGui/QPaintEvent> @@ -108,45 +108,45 @@ #include <QtGui/QPalette> #include <QtGui/QPixmap> #include <QtGui/QPixmapCache> -#include <QtGui/QPlainTextEdit> +#include <QPlainTextEdit> #include <QtGui/QPolygon> #include <QtGui/QPrintDialog> #include <QtGui/QPrinter> -#include <QtGui/QProgressBar> -#include <QtGui/QProgressDialog> -#include <QtGui/QPushButton> -#include <QtGui/QRadioButton> +#include <QProgressBar> +#include <QProgressDialog> +#include <QPushButton> +#include <QRadioButton> #include <QtGui/QResizeEvent> -#include <QtGui/QScrollArea> -#include <QtGui/QScrollBar> -#include <QtGui/QShortcut> -#include <QtGui/QSlider> +#include <QScrollArea> +#include <QScrollBar> +#include <QShortcut> +#include <QSlider> #include <QtGui/QSortFilterProxyModel> -#include <QtGui/QSpinBox> -#include <QtGui/QSplitter> -#include <QtGui/QStackedWidget> -#include <QtGui/QStatusBar> -#include <QtGui/QStyleFactory> -#include <QtGui/QStyleOptionButton> -#include <QtGui/QStylePainter> -#include <QtGui/QTabBar> -#include <QtGui/QTabWidget> -#include <QtGui/QTableView> -#include <QtGui/QTextBrowser> +#include <QSpinBox> +#include <QSplitter> +#include <QStackedWidget> +#include <QStatusBar> +#include <QStyleFactory> +#include <QStyleOptionButton> +#include <QStylePainter> +#include <QTabBar> +#include <QTabWidget> +#include <QTableView> +#include <QTextBrowser> #include <QtGui/QTextDocument> -#include <QtGui/QTextEdit> -#include <QtGui/QToolBar> -#include <QtGui/QToolBar> -#include <QtGui/QToolButton> -#include <QtGui/QToolTip> -#include <QtGui/QTreeView> -#include <QtGui/QTreeView> -#include <QtGui/QTreeWidget> -#include <QtGui/QTreeWidgetItem> -#include <QtGui/QTreeWidgetItemIterator> -#include <QtGui/QVBoxLayout> -#include <QtGui/QVBoxLayout> -#include <QtGui/QWidget> +#include <QTextEdit> +#include <QToolBar> +#include <QToolBar> +#include <QToolButton> +#include <QToolTip> +#include <QTreeView> +#include <QTreeView> +#include <QTreeWidget> +#include <QTreeWidgetItem> +#include <QTreeWidgetItemIterator> +#include <QVBoxLayout> +#include <QVBoxLayout> +#include <QWidget> #include <QtXml/QDomDocument> #include <QtXml/QXmlStreamReader> Modified: trunk/tora/src/precompiled/precompiled_msvc.h =================================================================== --- trunk/tora/src/precompiled/precompiled_msvc.h 2014-11-22 09:25:33 UTC (rev 5150) +++ trunk/tora/src/precompiled/precompiled_msvc.h 2014-11-22 12:06:02 UTC (rev 5151) @@ -61,48 +61,48 @@ #include <QtCore/QWaitCondition> #include <QtCore/QtDebug> #include <QtCore/qglobal.h> -#include <QtGui/QAction> -#include <QtGui/QApplication> -#include <QtGui/QBoxLayout> -#include <QtGui/QCheckBox> +#include <QAction> +#include <QApplication> +#include <QBoxLayout> +#include <QCheckBox> #include <QtGui/QClipboard> #include <QtGui/QCloseEvent> #include <QtGui/QColor> -#include <QtGui/QColorDialog> -#include <QtGui/QComboBox> -#include <QtGui/QCompleter> +#include <QColorDialog> +#include <QComboBox> +#include <QCompleter> #include <QtGui/QContextMenuEvent> -#include <QtGui/QDateEdit> -#include <QtGui/QDesktopWidget> -#include <QtGui/QDialog> -#include <QtGui/QDialogButtonBox> -#include <QtGui/QDirModel> -#include <QtGui/QDockWidget> +#include <QDateEdit> +#include <QDesktopWidget> +#include <QDialog> +#include <QDialogButtonBox> +#include <QDirModel> +#include <QDockWidget> #include <QtGui/QDropEvent> -#include <QtGui/QFileDialog> +#include <QFileDialog> #include <QtGui/QFocusEvent> #include <QtGui/QFont> -#include <QtGui/QFontDialog> +#include <QFontDialog> #include <QtGui/QFontMetrics> -#include <QtGui/QFrame> -#include <QtGui/QGridLayout> -#include <QtGui/QGroupBox> -#include <QtGui/QHBoxLayout> -#include <QtGui/QHeaderView> +#include <QFrame> +#include <QGridLayout> +#include <QGroupBox> +#include <QHBoxLayout> +#include <QHeaderView> #include <QtGui/QHideEvent> #include <QtGui/QIcon> -#include <QtGui/QInputDialog> -#include <QtGui/QItemDelegate> +#include <QInputDialog> +#include <QItemDelegate> #include <QtGui/QKeyEvent> -#include <QtGui/QLabel> -#include <QtGui/QLayout> -#include <QtGui/QLineEdit> -#include <QtGui/QListView> -#include <QtGui/QListWidget> -#include <QtGui/QMainWindow> -#include <QtGui/QMenu> -#include <QtGui/QMenuBar> -#include <QtGui/QMessageBox> +#include <QLabel> +#include <QLayout> +#include <QLineEdit> +#include <QListView> +#include <QListWidget> +#include <QMainWindow> +#include <QMenu> +#include <QMenuBar> +#include <QMessageBox> #include <QtGui/QMouseEvent> #include <QtGui/QMovie> #include <QtGui/QPaintEvent> @@ -110,45 +110,45 @@ #include <QtGui/QPalette> #include <QtGui/QPixmap> #include <QtGui/QPixmapCache> -#include <QtGui/QPlainTextEdit> +#include <QPlainTextEdit> #include <QtGui/QPolygon> #include <QtGui/QPrintDialog> #include <QtGui/QPrinter> -#include <QtGui/QProgressBar> -#include <QtGui/QProgressDialog> -#include <QtGui/QPushButton> -#include <QtGui/QRadioButton> +#include <QProgressBar> +#include <QProgressDialog> +#include <QPushButton> +#include <QRadioButton> #include <QtGui/QResizeEvent> -#include <QtGui/QScrollArea> -#include <QtGui/QScrollBar> -#include <QtGui/QShortcut> -#include <QtGui/QSlider> +#include <QScrollArea> +#include <QScrollBar> +#include <QShortcut> +#include <QSlider> #include <QtGui/QSortFilterProxyModel> -#include <QtGui/QSpinBox> -#include <QtGui/QSplitter> -#include <QtGui/QStackedWidget> -#include <QtGui/QStatusBar> -#include <QtGui/QStyleFactory> -#include <QtGui/QStyleOptionButton> -#include <QtGui/QStylePainter> -#include <QtGui/QTabBar> -#include <QtGui/QTabWidget> -#include <QtGui/QTableView> -#include <QtGui/QTextBrowser> +#include <QSpinBox> +#include <QSplitter> +#include <QStackedWidget> +#include <QStatusBar> +#include <QStyleFactory> +#include <QStyleOptionButton> +#include <QStylePainter> +#include <QTabBar> +#include <QTabWidget> +#include <QTableView> +#include <QTextBrowser> #include <QtGui/QTextDocument> -#include <QtGui/QTextEdit> -#include <QtGui/QToolBar> -#include <QtGui/QToolBar> -#include <QtGui/QToolButton> -#include <QtGui/QToolTip> -#include <QtGui/QTreeView> -#include <QtGui/QTreeView> -#include <QtGui/QTreeWidget> -#include <QtGui/QTreeWidgetItem> -#include <QtGui/QTreeWidgetItemIterator> -#include <QtGui/QVBoxLayout> -#include <QtGui/QVBoxLayout> -#include <QtGui/QWidget> +#include <QTextEdit> +#include <QToolBar> +#include <QToolBar> +#include <QToolButton> +#include <QToolTip> +#include <QTreeView> +#include <QTreeView> +#include <QTreeWidget> +#include <QTreeWidgetItem> +#include <QTreeWidgetItemIterator> +#include <QVBoxLayout> +#include <QVBoxLayout> +#include <QWidget> #include <QtXml/QDomDocument> #include <QtXml/QXmlStreamReader> Modified: trunk/tora/src/result/tocomboview.h =================================================================== --- trunk/tora/src/result/tocomboview.h 2014-11-22 09:25:33 UTC (rev 5150) +++ trunk/tora/src/result/tocomboview.h 2014-11-22 12:06:02 UTC (rev 5151) @@ -37,7 +37,7 @@ #include "ts_log/ts_log_utils.h" -#include <QtGui/QComboBox> +#include <QComboBox> class toComboBoxView : public QComboBox Modified: trunk/tora/src/result/tomvc.h =================================================================== --- trunk/tora/src/result/tomvc.h 2014-11-22 09:25:33 UTC (rev 5150) +++ trunk/tora/src/result/tomvc.h 2014-11-22 12:06:02 UTC (rev 5151) @@ -47,7 +47,7 @@ #include "result/totableview.h" #include <QtCore/QObject> -#include <QtGui/QHeaderView> +#include <QHeaderView> /** toTableView traits */ struct MVCTraits Modified: trunk/tora/src/result/toresulttabledata.h =================================================================== --- trunk/tora/src/result/toresulttabledata.h 2014-11-22 09:25:33 UTC (rev 5150) +++ trunk/tora/src/result/toresulttabledata.h 2014-11-22 12:06:02 UTC (rev 5151) @@ -38,7 +38,7 @@ #include "core/toresultmodeledit.h" #include "ui_toresulttabledataui.h" -#include <QtGui/QWidget> +#include <QWidget> #include <QtCore/QMap> class QAction; Modified: trunk/tora/src/result/totableview.h =================================================================== --- trunk/tora/src/result/totableview.h 2014-11-22 09:25:33 UTC (rev 5150) +++ trunk/tora/src/result/totableview.h 2014-11-22 12:06:02 UTC (rev 5151) @@ -37,7 +37,7 @@ #include "ts_log/ts_log_utils.h" -#include <QtGui/QTableView> +#include <QTableView> class toTableViewPriv : public QTableView Modified: trunk/tora/src/result/totreeview.h =================================================================== --- trunk/tora/src/result/totreeview.h 2014-11-22 09:25:33 UTC (rev 5150) +++ trunk/tora/src/result/totreeview.h 2014-11-22 12:06:02 UTC (rev 5151) @@ -37,7 +37,7 @@ #include "ts_log/ts_log_utils.h" -#include <QtGui/QTreeView> +#include <QTreeView> class toTreeViewPriv : public QTreeView Modified: trunk/tora/src/tests/test3window.h =================================================================== --- trunk/tora/src/tests/test3window.h 2014-11-22 09:25:33 UTC (rev 5150) +++ trunk/tora/src/tests/test3window.h 2014-11-22 12:06:02 UTC (rev 5151) @@ -41,11 +41,11 @@ #include "core/tobackgroundlabel.h" #include <QtCore/QObject> -#include <QtGui/QMdiArea> -#include <QtGui/QMdiSubWindow> -#include <QtGui/QMenuBar> +#include <QMdiArea> +#include <QMdiSubWindow> +#include <QMenuBar> #include <QtCore/QSet> -#include <QtGui/QTextEdit> +#include <QTextEdit> class toWorkSpace; class toConnection; Modified: trunk/tora/src/tests/test4window.h =================================================================== --- trunk/tora/src/tests/test4window.h 2014-11-22 09:25:33 UTC (rev 5150) +++ trunk/tora/src/tests/test4window.h 2014-11-22 12:06:02 UTC (rev 5151) @@ -38,7 +38,7 @@ #include "ui_test4ui.h" #include <QtCore/QObject> -#include <QtGui/QMainWindow> +#include <QMainWindow> class toSqlText; class QPushButton; Modified: trunk/tora/src/tests/test5window.h =================================================================== --- trunk/tora/src/tests/test5window.h 2014-11-22 09:25:33 UTC (rev 5150) +++ trunk/tora/src/tests/test5window.h 2014-11-22 12:06:02 UTC (rev 5151) @@ -41,11 +41,11 @@ #include "core/tobackgroundlabel.h" #include <QtCore/QObject> -#include <QtGui/QMdiArea> -#include <QtGui/QMdiSubWindow> -#include <QtGui/QMenuBar> +#include <QMdiArea> +#include <QMdiSubWindow> +#include <QMenuBar> #include <QtCore/QSet> -#include <QtGui/QTextEdit> +#include <QTextEdit> class toWorkSpace; class toConnection; Modified: trunk/tora/src/tools/toalert.h =================================================================== --- trunk/tora/src/tools/toalert.h 2014-11-22 09:25:33 UTC (rev 5150) +++ trunk/tora/src/tools/toalert.h 2014-11-22 12:06:02 UTC (rev 5151) @@ -40,7 +40,7 @@ #include <QtCore/QTimer> #include <QtCore/QMutex> #include <QtCore/QSemaphore> -#include <QtGui/QMenu> +#include <QMenu> #include "core/totool.h" Modified: trunk/tora/src/tools/toanalyze.h =================================================================== --- trunk/tora/src/tools/toanalyze.h 2014-11-22 09:25:33 UTC (rev 5150) +++ trunk/tora/src/tools/toanalyze.h 2014-11-22 12:06:02 UTC (rev 5151) @@ -39,9 +39,9 @@ #include "core/toeventquery.h" #include "core/totool.h" -#include <QtGui/QAction> -#include <QtGui/QLabel> -#include <QtGui/QToolButton> +#include <QAction> +#include <QLabel> +#include <QToolButton> class QComboBox; class QMenu; Modified: trunk/tora/src/tools/tobackup.h =================================================================== --- trunk/tora/src/tools/tobackup.h 2014-11-22 09:25:33 UTC (rev 5150) +++ trunk/tora/src/tools/tobackup.h 2014-11-22 12:06:02 UTC (rev 5151) @@ -37,7 +37,7 @@ #include "core/totool.h" -#include <QtGui/QLabel> +#include <QLabel> class QLabel; class QMenu; Modified: trunk/tora/src/tools/tobrowser.h =================================================================== --- trunk/tora/src/tools/tobrowser.h 2014-11-22 09:25:33 UTC (rev 5150) +++ trunk/tora/src/tools/tobrowser.h 2014-11-22 12:06:02 UTC (rev 5151) @@ -41,8 +41,8 @@ #include <map> #include <QtCore/QString> -#include <QtGui/QMenu> -#include <QtGui/QAction> +#include <QMenu> +#include <QAction> class QComboBox; class QTabWidget; Modified: trunk/tora/src/tools/tobrowserschemawidget.h =================================================================== --- trunk/tora/src/tools/tobrowserschemawidget.h 2014-11-22 09:25:33 UTC (rev 5150) +++ trunk/tora/src/tools/tobrowserschemawidget.h 2014-11-22 12:06:02 UTC (rev 5151) @@ -35,7 +35,7 @@ #ifndef TOBROWSERSCHEMAWIDGET_H #define TOBROWSERSCHEMAWIDGET_H -#include <QtGui/QTreeView> +#include <QTreeView> #include "core/toresulttableview.h" Modified: trunk/tora/src/tools/tofilesize.h =================================================================== --- trunk/tora/src/tools/tofilesize.h 2014-11-22 09:25:33 UTC (rev 5150) +++ trunk/tora/src/tools/tofilesize.h 2014-11-22 12:06:02 UTC (rev 5151) @@ -35,7 +35,7 @@ #ifndef TOFILESIZE_H #define TOFILESIZE_H -#include <QtGui/QGroupBox> +#include <QGroupBox> class QRadioButton; class QSpinBox; Modified: trunk/tora/src/tools/tooutput.h =================================================================== --- trunk/tora/src/tools/tooutput.h 2014-11-22 09:25:33 UTC (rev 5150) +++ trunk/tora/src/tools/tooutput.h 2014-11-22 12:06:02 UTC (rev 5151) @@ -42,9 +42,9 @@ #include "core/toconfenum.h" #include <QtGui/QCloseEvent> -#include <QtGui/QAction> -#include <QtGui/QMenu> -#include <QtGui/QToolBar> +#include <QAction> +#include <QMenu> +#include <QToolBar> class QComboBox; class toConnection; Modified: trunk/tora/src/tools/torollback.h =================================================================== --- trunk/tora/src/tools/torollback.h 2014-11-22 09:25:33 UTC (rev 5150) +++ trunk/tora/src/tools/torollback.h 2014-11-22 12:06:02 UTC (rev 5151) @@ -41,7 +41,7 @@ #include "ui_torollbackdialogui.h" -#include <QtGui/QDialog> +#include <QDialog> #include <algorithm> Modified: trunk/tora/src/tools/tosandboxtool.h =================================================================== --- trunk/tora/src/tools/tosandboxtool.h 2014-11-22 09:25:33 UTC (rev 5150) +++ trunk/tora/src/tools/tosandboxtool.h 2014-11-22 12:06:02 UTC (rev 5151) @@ -12,7 +12,7 @@ #include "result/totablemodel.h" #include "result/totreemodel.h" -#include <QtGui/QTreeView> +#include <QTreeView> class toResultView; class toToolWidget; Modified: trunk/tora/src/tools/tosession.h =================================================================== --- trunk/tora/src/tools/tosession.h 2014-11-22 09:25:33 UTC (rev 5150) +++ trunk/tora/src/tools/tosession.h 2014-11-22 12:06:02 UTC (rev 5151) @@ -39,9 +39,9 @@ #include "core/totool.h" #include "core/toresultlong.h" -#include <QtGui/QLabel> -#include <QtGui/QMenu> -#include <QtGui/QAction> +#include <QLabel> +#include <QMenu> +#include <QAction> #include <list> Modified: trunk/tora/src/tools/tosgastatement.h =================================================================== --- trunk/tora/src/tools/tosgastatement.h 2014-11-22 09:25:33 UTC (rev 5150) +++ trunk/tora/src/tools/tosgastatement.h 2014-11-22 12:06:02 UTC (rev 5151) @@ -37,7 +37,7 @@ -#include <QtGui/QTabWidget> +#include <QTabWidget> class QComboBox; class QTabWidget; Modified: trunk/tora/src/tools/tostorage.h =================================================================== --- trunk/tora/src/tools/tostorage.h 2014-11-22 09:25:33 UTC (rev 5150) +++ trunk/tora/src/tools/tostorage.h 2014-11-22 12:06:02 UTC (rev 5151) @@ -47,8 +47,8 @@ #include <list> -#include <QtGui/QDialog> -#include <QtGui/QLabel> +#include <QDialog> +#include <QLabel> class QCheckBox; class QLabel; Modified: trunk/tora/src/tools/tostoragedefinition.h =================================================================== --- trunk/tora/src/tools/tostoragedefinition.h 2014-11-22 09:25:33 UTC (rev 5150) +++ trunk/tora/src/tools/tostoragedefinition.h 2014-11-22 12:06:02 UTC (rev 5151) @@ -40,8 +40,8 @@ #include <list> -#include <QtGui/QWidget> -#include <QtGui/QLabel> +#include <QWidget> +#include <QLabel> class QCheckBox; class Q3GroupBox; Modified: trunk/tora/src/tools/towaitevents.h =================================================================== --- trunk/tora/src/tools/towaitevents.h 2014-11-22 09:25:33 UTC (rev 5150) +++ trunk/tora/src/tools/towaitevents.h 2014-11-22 12:06:02 UTC (rev 5151) @@ -39,7 +39,7 @@ #include <map> #include <algorithm> -#include <QtGui/QWidget> +#include <QWidget> #include <QtCore/QString> class toTreeWidget; Modified: trunk/tora/src/tools/toworksheet.h =================================================================== --- trunk/tora/src/tools/toworksheet.h 2014-11-22 09:25:33 UTC (rev 5150) +++ trunk/tora/src/tools/toworksheet.h 2014-11-22 12:06:02 UTC (rev 5151) @@ -45,9 +45,9 @@ #include <QtCore/QTimer> #include <QtCore/QString> #include <QtCore/QSharedPointer> -#include <QtGui/QLabel> -#include <QtGui/QAction> -#include <QtGui/QToolBar> +#include <QLabel> +#include <QAction> +#include <QToolBar> #include <map> Modified: trunk/tora/src/tools/toworksheetstatistic.h =================================================================== --- trunk/tora/src/tools/toworksheetstatistic.h 2014-11-22 09:25:33 UTC (rev 5150) +++ trunk/tora/src/tools/toworksheetstatistic.h 2014-11-22 12:06:02 UTC (rev 5151) @@ -41,10 +41,10 @@ #include <map> #include <QtCore/QString> -#include <QtGui/QSplitter> -#include <QtGui/QMenu> -#include <QtGui/QLabel> -#include <QtGui/QToolButton> +#include <QSplitter> +#include <QMenu> +#include <QLabel> +#include <QToolButton> class QLabel; class QSplitter; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ibr...@us...> - 2014-11-22 12:46:08
|
Revision: 5152 http://sourceforge.net/p/tora/code/5152 Author: ibre5041 Date: 2014-11-22 12:46:00 +0000 (Sat, 22 Nov 2014) Log Message: ----------- Qt::WFlags => toWFlags (part of Qt5 port) thx to Pert Bena Modified Paths: -------------- trunk/tora/src/core/toabout.cpp trunk/tora/src/core/toabout.h trunk/tora/src/core/tobarchart.cpp trunk/tora/src/core/tobarchart.h trunk/tora/src/core/todatabasesetting.cpp trunk/tora/src/core/todatabasesetting.h trunk/tora/src/core/todocklet.cpp trunk/tora/src/core/todocklet.h trunk/tora/src/core/toglobalsetting.cpp trunk/tora/src/core/toglobalsetting.h trunk/tora/src/core/tolinechart.cpp trunk/tora/src/core/tolinechart.h trunk/tora/src/core/tomessage.cpp trunk/tora/src/core/tomessage.h trunk/tora/src/core/tonewconnection.cpp trunk/tora/src/core/tonewconnection.h trunk/tora/src/core/topiechart.cpp trunk/tora/src/core/topiechart.h trunk/tora/src/core/topreferences.cpp trunk/tora/src/core/topreferences.h trunk/tora/src/core/toresultcols.cpp trunk/tora/src/core/toresultcols.h trunk/tora/src/core/toresultdrawing.cpp trunk/tora/src/core/toresultdrawing.h trunk/tora/src/core/toresultlong.cpp trunk/tora/src/core/toresultlong.h trunk/tora/src/core/toresultview.cpp trunk/tora/src/core/toresultview.h trunk/tora/src/core/tosyntaxsetup.cpp trunk/tora/src/core/tosyntaxsetup.h trunk/tora/src/core/totreewidget.cpp trunk/tora/src/core/totreewidget.h trunk/tora/src/core/utils.h trunk/tora/src/docklets/tocodeoutline.cpp trunk/tora/src/docklets/tocodeoutline.h trunk/tora/src/docklets/tologging.cpp trunk/tora/src/docklets/tologging.h trunk/tora/src/docklets/toquerymodel.cpp trunk/tora/src/docklets/toquerymodel.h trunk/tora/src/docklets/toviewconnections.cpp trunk/tora/src/docklets/toviewconnections.h trunk/tora/src/docklets/toviewdirectory.cpp trunk/tora/src/docklets/toviewdirectory.h trunk/tora/src/result/toresulttabledata.cpp trunk/tora/src/result/toresulttabledata.h trunk/tora/src/tests/test3window.h trunk/tora/src/tools/tostorage.cpp trunk/tora/src/tools/tostorage.h trunk/tora/src/tools/tostoragedefinition.cpp trunk/tora/src/tools/tostoragedefinition.h Modified: trunk/tora/src/core/toabout.cpp =================================================================== --- trunk/tora/src/core/toabout.cpp 2014-11-22 12:06:02 UTC (rev 5151) +++ trunk/tora/src/core/toabout.cpp 2014-11-22 12:46:00 UTC (rev 5152) @@ -136,7 +136,7 @@ #define ABOUT_CAPTION TOAPPNAME " %1" -toAbout::toAbout(AboutType page, QWidget* parent, const char* name, bool modal, Qt::WFlags fl) +toAbout::toAbout(AboutType page, QWidget* parent, const char* name, bool modal, toWFlags fl) : QDialog(parent, fl) { if (name) Modified: trunk/tora/src/core/toabout.h =================================================================== --- trunk/tora/src/core/toabout.h 2014-11-22 12:06:02 UTC (rev 5151) +++ trunk/tora/src/core/toabout.h 2014-11-22 12:46:00 UTC (rev 5152) @@ -37,6 +37,7 @@ #include "ui_toaboutui.h" +#include "core/utils.h" class toAbout : public QDialog, public Ui::toAboutUI { @@ -49,7 +50,7 @@ License }; - toAbout(AboutType, QWidget* parent = 0, const char* name = 0, bool modal = false, Qt::WFlags fl = 0); + toAbout(AboutType, QWidget* parent = 0, const char* name = 0, bool modal = false, toWFlags fl = 0); ~toAbout(); }; Modified: trunk/tora/src/core/tobarchart.cpp =================================================================== --- trunk/tora/src/core/tobarchart.cpp 2014-11-22 12:06:02 UTC (rev 5151) +++ trunk/tora/src/core/tobarchart.cpp 2014-11-22 12:46:00 UTC (rev 5152) @@ -39,7 +39,7 @@ #include <QtGui/QPainter> #include <QtGui/QPolygon> -toBarChart::toBarChart(QWidget *parent, const char *name, Qt::WFlags f) +toBarChart::toBarChart(QWidget *parent, const char *name, toWFlags f) : toLineChart(parent, name, f) { setMinValue(0); @@ -222,7 +222,7 @@ } } -toBarChart::toBarChart (toBarChart *chart, QWidget *parent, const char *name, Qt::WFlags f) +toBarChart::toBarChart (toBarChart *chart, QWidget *parent, const char *name, toWFlags f) : toLineChart(chart, parent, name, f) {} Modified: trunk/tora/src/core/tobarchart.h =================================================================== --- trunk/tora/src/core/tobarchart.h 2014-11-22 12:06:02 UTC (rev 5151) +++ trunk/tora/src/core/tobarchart.h 2014-11-22 12:46:00 UTC (rev 5152) @@ -52,7 +52,7 @@ * @param name Name of widget. * @param f Widget flags. */ - toBarChart(QWidget *parent = NULL, const char *name = NULL, Qt::WFlags f = 0); + toBarChart(QWidget *parent = NULL, const char *name = NULL, toWFlags f = 0); /** Create a new barchart by copying all the data from another barchart. * @param chart Chart to copy data from. @@ -60,7 +60,7 @@ * @param name Name of widget. * @param f Widget flags. */ - toBarChart(toBarChart *chart, QWidget *parent = NULL, const char *name = NULL, Qt::WFlags f = 0); + toBarChart(toBarChart *chart, QWidget *parent = NULL, const char *name = NULL, toWFlags f = 0); #ifdef TORA3_CHART /** Open chart in new window. Modified: trunk/tora/src/core/todatabasesetting.cpp =================================================================== --- trunk/tora/src/core/todatabasesetting.cpp 2014-11-22 12:06:02 UTC (rev 5151) +++ trunk/tora/src/core/todatabasesetting.cpp 2014-11-22 12:46:00 UTC (rev 5152) @@ -88,7 +88,7 @@ } } -toDatabaseSetting::toDatabaseSetting(QWidget *parent, const char *name, Qt::WFlags fl) +toDatabaseSetting::toDatabaseSetting(QWidget *parent, const char *name, toWFlags fl) : QWidget(parent, fl) , toSettingTab("database.html") { Modified: trunk/tora/src/core/todatabasesetting.h =================================================================== --- trunk/tora/src/core/todatabasesetting.h 2014-11-22 12:06:02 UTC (rev 5151) +++ trunk/tora/src/core/todatabasesetting.h 2014-11-22 12:46:00 UTC (rev 5152) @@ -73,7 +73,7 @@ Q_OBJECT; public: - toDatabaseSetting(QWidget *parent = 0, const char *name = 0, Qt::WFlags fl = 0); + toDatabaseSetting(QWidget *parent = 0, const char *name = 0, toWFlags fl = 0); public slots: virtual void saveSetting(void); Modified: trunk/tora/src/core/todocklet.cpp =================================================================== --- trunk/tora/src/core/todocklet.cpp 2014-11-22 12:06:02 UTC (rev 5151) +++ trunk/tora/src/core/todocklet.cpp 2014-11-22 12:46:00 UTC (rev 5152) @@ -36,6 +36,7 @@ #include "core/todocklet.h" #include "core/tomainwindow.h" #include "core/toworkspace.h" +#include "core/utils.h" #include <QApplication> #include <QVBoxLayout> @@ -50,7 +51,7 @@ toDocklet::toDocklet(const QString &title, QWidget *parent, - Qt::WindowFlags flags) + toWFlags flags) : QDockWidget(title, parent, flags), isPopup(false) { Modified: trunk/tora/src/core/todocklet.h =================================================================== --- trunk/tora/src/core/todocklet.h 2014-11-22 12:06:02 UTC (rev 5151) +++ trunk/tora/src/core/todocklet.h 2014-11-22 12:46:00 UTC (rev 5152) @@ -50,7 +50,7 @@ public: virtual ~toDockletHolder() {}; virtual toDocklet* docklet(QWidget *parent = 0, - Qt::WindowFlags flags = 0) = 0; + toWFlags flags = 0) = 0; }; @@ -61,7 +61,7 @@ public: explicit toDocklet(const QString &title, QWidget *parent = 0, - Qt::WindowFlags flags = 0); + toWFlags flags = 0); virtual ~toDocklet() {} @@ -161,7 +161,7 @@ { \ public: \ virtual toDocklet* docklet(QWidget *parent = 0, \ - Qt::WindowFlags flags = 0) \ + toWFlags flags = 0) \ { \ static TYPE *let = new TYPE(parent, flags); \ return let; \ Modified: trunk/tora/src/core/toglobalsetting.cpp =================================================================== --- trunk/tora/src/core/toglobalsetting.cpp 2014-11-22 12:06:02 UTC (rev 5151) +++ trunk/tora/src/core/toglobalsetting.cpp 2014-11-22 12:46:00 UTC (rev 5152) @@ -232,7 +232,7 @@ -toGlobalSetting::toGlobalSetting(QWidget *parent, const char *name, Qt::WFlags fl) +toGlobalSetting::toGlobalSetting(QWidget *parent, const char *name, toWFlags fl) : QWidget(parent, fl) , toSettingTab("preferences.html#global") { @@ -411,7 +411,7 @@ Utils::toSetSessionType(Style->currentText()); } -toToolSetting::toToolSetting(QWidget *parent, const char *name, Qt::WFlags fl) +toToolSetting::toToolSetting(QWidget *parent, const char *name, toWFlags fl) : QWidget(parent/*, name, fl*/) , toSettingTab("toolsetting.html") { Modified: trunk/tora/src/core/toglobalsetting.h =================================================================== --- trunk/tora/src/core/toglobalsetting.h 2014-11-22 12:06:02 UTC (rev 5151) +++ trunk/tora/src/core/toglobalsetting.h 2014-11-22 12:46:00 UTC (rev 5152) @@ -113,7 +113,7 @@ public: toGlobalSetting(QWidget* parent = 0, const char* name = 0, - Qt::WFlags fl = 0); + toWFlags fl = 0); public slots: virtual void saveSetting(void); @@ -138,7 +138,7 @@ Q_OBJECT; public: - toToolSetting(QWidget *parent = 0, const char *name = 0, Qt::WFlags fl = 0); + toToolSetting(QWidget *parent = 0, const char *name = 0, toWFlags fl = 0); public slots: virtual void saveSetting(void); Modified: trunk/tora/src/core/tolinechart.cpp =================================================================== --- trunk/tora/src/core/tolinechart.cpp 2014-11-22 12:06:02 UTC (rev 5151) +++ trunk/tora/src/core/tolinechart.cpp 2014-11-22 12:46:00 UTC (rev 5152) @@ -99,7 +99,7 @@ update(); } -toLineChart::toLineChart(QWidget *parent, const char *name, Qt::WFlags f) +toLineChart::toLineChart(QWidget *parent, const char *name, toWFlags f) : QWidget(parent, f) { if (name) @@ -821,7 +821,7 @@ toLineChart *newWin = new toLineChart(this, parent ? parent : toMainWidget()->workspace(), NULL, - (Qt::WindowFlags) (parent ? 0 : Qt::WA_DeleteOnClose)); + (toWFlags) (parent ? 0 : Qt::WA_DeleteOnClose)); if (!parent) { newWin->show(); @@ -837,7 +837,7 @@ { } -toLineChart::toLineChart (toLineChart *chart, QWidget *parent, const char *name, Qt::WFlags f) +toLineChart::toLineChart (toLineChart *chart, QWidget *parent, const char *name, toWFlags f) : QWidget(parent, f) { Modified: trunk/tora/src/core/tolinechart.h =================================================================== --- trunk/tora/src/core/tolinechart.h 2014-11-22 12:06:02 UTC (rev 5151) +++ trunk/tora/src/core/tolinechart.h 2014-11-22 12:46:00 UTC (rev 5152) @@ -109,7 +109,7 @@ * @param name Name of widget. * @param f Widget flags. */ - toLineChart(QWidget *parent = NULL, const char *name = NULL, Qt::WFlags f = 0); + toLineChart(QWidget *parent = NULL, const char *name = NULL, toWFlags f = 0); /** Create a new chart by copying all the data from another chart. * @param chart Chart to copy data from. @@ -117,7 +117,7 @@ * @param name Name of widget. * @param f Widget flags. */ - toLineChart(toLineChart *chart, QWidget *parent = NULL, const char *name = NULL, Qt::WFlags f = 0); + toLineChart(toLineChart *chart, QWidget *parent = NULL, const char *name = NULL, toWFlags f = 0); /** Destroy chart */ Modified: trunk/tora/src/core/tomessage.cpp =================================================================== --- trunk/tora/src/core/tomessage.cpp 2014-11-22 12:06:02 UTC (rev 5151) +++ trunk/tora/src/core/tomessage.cpp 2014-11-22 12:46:00 UTC (rev 5152) @@ -41,7 +41,7 @@ #include <algorithm> -toMessage::toMessage(QWidget * parent, Qt::WindowFlags f) +toMessage::toMessage(QWidget * parent, toWFlags f) : QDialog(parent, f) { setupUi(this); Modified: trunk/tora/src/core/tomessage.h =================================================================== --- trunk/tora/src/core/tomessage.h 2014-11-22 12:06:02 UTC (rev 5151) +++ trunk/tora/src/core/tomessage.h 2014-11-22 12:46:00 UTC (rev 5152) @@ -36,8 +36,8 @@ #define TOMESSAGE_H #include "ui_tomessageui.h" +#include "core/utils.h" - /*! \brief Non-modal and non-blocking message dialog for errors/warnings reporting. @@ -60,7 +60,7 @@ Q_OBJECT; public: - toMessage(QWidget * parent = 0, Qt::WindowFlags f = 0); + toMessage(QWidget * parent = 0, toWFlags f = 0); public slots: /*! \brief Appends text to the log widget. Modified: trunk/tora/src/core/tonewconnection.cpp =================================================================== --- trunk/tora/src/core/tonewconnection.cpp 2014-11-22 12:06:02 UTC (rev 5151) +++ trunk/tora/src/core/tonewconnection.cpp 2014-11-22 12:46:00 UTC (rev 5152) @@ -60,7 +60,7 @@ static toConnectionModel *m_connectionModel = 0; static QSortFilterProxyModel *m_proxyModel = 0; -toNewConnection::toNewConnection(QWidget* parent, Qt::WFlags fl) +toNewConnection::toNewConnection(QWidget* parent, toWFlags fl) : QDialog(parent, fl) , toHelpContext(QString::fromLatin1("newconnection.html")) { Modified: trunk/tora/src/core/tonewconnection.h =================================================================== --- trunk/tora/src/core/tonewconnection.h 2014-11-22 12:06:02 UTC (rev 5151) +++ trunk/tora/src/core/tonewconnection.h 2014-11-22 12:46:00 UTC (rev 5152) @@ -84,7 +84,7 @@ public: toNewConnection(QWidget* parent = 0, - Qt::WFlags fl = 0); + toWFlags fl = 0); toConnection* connection() { Modified: trunk/tora/src/core/topiechart.cpp =================================================================== --- trunk/tora/src/core/topiechart.cpp 2014-11-22 12:06:02 UTC (rev 5151) +++ trunk/tora/src/core/topiechart.cpp 2014-11-22 12:46:00 UTC (rev 5152) @@ -58,7 +58,7 @@ #include "icons/print.xpm" -toPieChart::toPieChart(QWidget *parent, const char *name, Qt::WFlags f) +toPieChart::toPieChart(QWidget *parent, const char *name, toWFlags f) : QWidget(parent, f) , AllTip(NULL) { @@ -132,7 +132,7 @@ toPieChart::toPieChart(toPieChart *pie, QWidget *parent, const char *name, - Qt::WFlags f) + toWFlags f) : QWidget(parent, f | Qt::Window), Values(pie->Values), Labels(pie->Labels), Modified: trunk/tora/src/core/topiechart.h =================================================================== --- trunk/tora/src/core/topiechart.h 2014-11-22 12:06:02 UTC (rev 5151) +++ trunk/tora/src/core/topiechart.h 2014-11-22 12:46:00 UTC (rev 5152) @@ -78,7 +78,7 @@ */ toPieChart(QWidget *parent = NULL, const char *name = NULL, - Qt::WFlags f = 0); + toWFlags f = 0); virtual ~toPieChart(); @@ -91,7 +91,7 @@ toPieChart(toPieChart *pie, QWidget *parent = NULL, const char *name = NULL, - Qt::WFlags f = 0); + toWFlags f = 0); /** Set the postfix text to append the current values when they * are displayed in the pie. Modified: trunk/tora/src/core/topreferences.cpp =================================================================== --- trunk/tora/src/core/topreferences.cpp 2014-11-22 12:06:02 UTC (rev 5151) +++ trunk/tora/src/core/topreferences.cpp 2014-11-22 12:46:00 UTC (rev 5152) @@ -89,7 +89,7 @@ toConfigurationNewSingle::Instance().saveAll(); } -toPreferences::toPreferences(QWidget* parent, const char* name, bool modal, Qt::WFlags fl) +toPreferences::toPreferences(QWidget* parent, const char* name, bool modal, toWFlags fl) : QDialog(parent) , toHelpContext(QString::fromLatin1("preferences.html")) { Modified: trunk/tora/src/core/topreferences.h =================================================================== --- trunk/tora/src/core/topreferences.h 2014-11-22 12:06:02 UTC (rev 5151) +++ trunk/tora/src/core/topreferences.h 2014-11-22 12:46:00 UTC (rev 5152) @@ -64,7 +64,7 @@ toPreferences(QWidget* parent = 0, const char* name = 0, bool modal = false, - Qt::WFlags fl = 0); + toWFlags fl = 0); static void displayPreferences(QWidget *parent); Modified: trunk/tora/src/core/toresultcols.cpp =================================================================== --- trunk/tora/src/core/toresultcols.cpp 2014-11-22 12:06:02 UTC (rev 5151) +++ trunk/tora/src/core/toresultcols.cpp 2014-11-22 12:46:00 UTC (rev 5152) @@ -414,7 +414,7 @@ "5.0", "QMYSQL"); -toResultCols::toResultCols(QWidget *parent, const char *name, Qt::WFlags f) +toResultCols::toResultCols(QWidget *parent, const char *name, toWFlags f) : QWidget(parent, f) , SQL(SQLTableColumns) { @@ -423,7 +423,7 @@ setup(); } -toResultCols::toResultCols(toSQL const& sql, QWidget *parent, const char *name, Qt::WFlags f) +toResultCols::toResultCols(toSQL const& sql, QWidget *parent, const char *name, toWFlags f) : QWidget(parent, f) , SQL(sql) // SQL(SQLTableColumns) { Modified: trunk/tora/src/core/toresultcols.h =================================================================== --- trunk/tora/src/core/toresultcols.h 2014-11-22 12:06:02 UTC (rev 5151) +++ trunk/tora/src/core/toresultcols.h 2014-11-22 12:46:00 UTC (rev 5152) @@ -75,9 +75,9 @@ * @param name Name of widget. * @param f Widget flags. */ - toResultCols(QWidget *parent, const char *name = NULL, Qt::WFlags f = 0); + toResultCols(QWidget *parent, const char *name = NULL, toWFlags f = 0); - toResultCols(toSQL const& sql, QWidget *parent, const char *name = NULL, Qt::WFlags f = 0); + toResultCols(toSQL const& sql, QWidget *parent, const char *name = NULL, toWFlags f = 0); /** * Reimplemented abstract method Modified: trunk/tora/src/core/toresultdrawing.cpp =================================================================== --- trunk/tora/src/core/toresultdrawing.cpp 2014-11-22 12:06:02 UTC (rev 5151) +++ trunk/tora/src/core/toresultdrawing.cpp 2014-11-22 12:46:00 UTC (rev 5152) @@ -144,7 +144,7 @@ "Oracle"); -toResultDrawing::toResultDrawing(QWidget *parent, const char *name, Qt::WindowFlags f) +toResultDrawing::toResultDrawing(QWidget *parent, const char *name, toWFlags f) : QWidget(parent, f) , toResult() , distance(1) Modified: trunk/tora/src/core/toresultdrawing.h =================================================================== --- trunk/tora/src/core/toresultdrawing.h 2014-11-22 12:06:02 UTC (rev 5151) +++ trunk/tora/src/core/toresultdrawing.h 2014-11-22 12:46:00 UTC (rev 5152) @@ -45,7 +45,7 @@ public: toResultDrawing(QWidget *parent = 0, const char *name = 0, - Qt::WindowFlags f = 0); + toWFlags f = 0); /** * Reimplemented from toResult. Can handle all connections. Modified: trunk/tora/src/core/toresultlong.cpp =================================================================== --- trunk/tora/src/core/toresultlong.cpp 2014-11-22 12:06:02 UTC (rev 5151) +++ trunk/tora/src/core/toresultlong.cpp 2014-11-22 12:46:00 UTC (rev 5152) @@ -39,7 +39,7 @@ #include "core/todatabasesetting.h" toResultLong::toResultLong(bool readable, bool dispCol, - QWidget *parent, const char *name, Qt::WFlags f) + QWidget *parent, const char *name, toWFlags f) : toResultView(readable, dispCol, parent, name, f) , First(false) , MaxNumber(-1) @@ -49,7 +49,7 @@ HasHeaders = false; } -toResultLong::toResultLong(QWidget *parent, const char *name, Qt::WFlags f) +toResultLong::toResultLong(QWidget *parent, const char *name, toWFlags f) : toResultView(parent, name, f) , First(false) , MaxNumber(-1) Modified: trunk/tora/src/core/toresultlong.h =================================================================== --- trunk/tora/src/core/toresultlong.h 2014-11-22 12:06:02 UTC (rev 5151) +++ trunk/tora/src/core/toresultlong.h 2014-11-22 12:46:00 UTC (rev 5152) @@ -90,13 +90,13 @@ * @param name Name of widget. * @param f Widget flags. */ - toResultLong(bool readable, bool numCol, QWidget *parent, const char *name = NULL, Qt::WFlags f = 0); + toResultLong(bool readable, bool numCol, QWidget *parent, const char *name = NULL, toWFlags f = 0); /** Create widget. The columns are not readable and the number column is displayed. * @param parent Parent of list. * @param name Name of widget. * @param f Widget flags. */ - toResultLong(QWidget *parent, const char *name = NULL, Qt::WFlags f = 0); + toResultLong(QWidget *parent, const char *name = NULL, toWFlags f = 0); ~toResultLong(); /** Set statistics widget. Modified: trunk/tora/src/core/toresultview.cpp =================================================================== --- trunk/tora/src/core/toresultview.cpp 2014-11-22 12:06:02 UTC (rev 5151) +++ trunk/tora/src/core/toresultview.cpp 2014-11-22 12:46:00 UTC (rev 5152) @@ -459,7 +459,7 @@ return txt; } -toListView::toListView(QWidget *parent, const char *name, Qt::WFlags f) +toListView::toListView(QWidget *parent, const char *name, toWFlags f) : toTreeWidget(parent, name, f) , toEditWidget() , AllTip(NULL) @@ -1202,13 +1202,13 @@ SortAscending = true; } -toResultView::toResultView(bool readable, bool dispCol, QWidget *parent, const char *name, Qt::WFlags f) +toResultView::toResultView(bool readable, bool dispCol, QWidget *parent, const char *name, toWFlags f) : toListView(parent, name, f) { setup(readable, dispCol); } -toResultView::toResultView(QWidget *parent, const char *name, Qt::WFlags f) +toResultView::toResultView(QWidget *parent, const char *name, toWFlags f) : toListView(parent, name, f) { setup(false, true); Modified: trunk/tora/src/core/toresultview.h =================================================================== --- trunk/tora/src/core/toresultview.h 2014-11-22 12:06:02 UTC (rev 5151) +++ trunk/tora/src/core/toresultview.h 2014-11-22 12:46:00 UTC (rev 5152) @@ -574,7 +574,7 @@ * @param name Name of list. * @param f Widget flags. */ - toListView(QWidget *parent, const char *name = NULL, Qt::WFlags f = 0); + toListView(QWidget *parent, const char *name = NULL, toWFlags f = 0); virtual ~toListView(); /** Get SQL name of list. @@ -814,7 +814,7 @@ bool numCol, QWidget *parent, const char *name = NULL, - Qt::WFlags f = 0); + toWFlags f = 0); /** Create list. The columns are not readable and the number * column is displayed. @@ -822,7 +822,7 @@ * @param name Name of widget. * @param f Widget flags. */ - toResultView(QWidget *parent, const char *name = NULL, Qt::WFlags f = 0); + toResultView(QWidget *parent, const char *name = NULL, toWFlags f = 0); ~toResultView(); /** Set the read all flag. Modified: trunk/tora/src/core/tosyntaxsetup.cpp =================================================================== --- trunk/tora/src/core/tosyntaxsetup.cpp 2014-11-22 12:06:02 UTC (rev 5151) +++ trunk/tora/src/core/tosyntaxsetup.cpp 2014-11-22 12:46:00 UTC (rev 5152) @@ -50,7 +50,7 @@ using namespace ToConfiguration; -toSyntaxSetup::toSyntaxSetup(QWidget *parent, const char *name, Qt::WFlags fl) +toSyntaxSetup::toSyntaxSetup(QWidget *parent, const char *name, toWFlags fl) : QWidget(parent) , toSettingTab("fonts.html") , WordClassEnum(ENUM_REF(toSyntaxAnalyzer,WordClassEnum)) Modified: trunk/tora/src/core/tosyntaxsetup.h =================================================================== --- trunk/tora/src/core/tosyntaxsetup.h 2014-11-22 12:06:02 UTC (rev 5151) +++ trunk/tora/src/core/tosyntaxsetup.h 2014-11-22 12:46:00 UTC (rev 5152) @@ -61,7 +61,7 @@ toStylesMap Styles; // QMap<enum toSyntaxAnalyzer::WordClass, toStyle> => toStyle toSyntaxAnalyzer* Analyzer; public: - toSyntaxSetup(QWidget *parent = 0, const char *name = 0, Qt::WFlags fl = 0); + toSyntaxSetup(QWidget *parent = 0, const char *name = 0, toWFlags fl = 0); virtual void saveSetting(void); public slots: Modified: trunk/tora/src/core/totreewidget.cpp =================================================================== --- trunk/tora/src/core/totreewidget.cpp 2014-11-22 12:06:02 UTC (rev 5151) +++ trunk/tora/src/core/totreewidget.cpp 2014-11-22 12:46:00 UTC (rev 5152) @@ -41,7 +41,7 @@ toTreeWidget::toTreeWidget(QWidget *parent, const char *name, - Qt::WFlags f) + toWFlags f) : QTreeWidget(parent) { if (name) Modified: trunk/tora/src/core/totreewidget.h =================================================================== --- trunk/tora/src/core/totreewidget.h 2014-11-22 12:06:02 UTC (rev 5151) +++ trunk/tora/src/core/totreewidget.h 2014-11-22 12:46:00 UTC (rev 5152) @@ -65,7 +65,7 @@ public: - toTreeWidget(QWidget *parent = 0, const char *name = 0, Qt::WFlags f = 0); + toTreeWidget(QWidget *parent = 0, const char *name = 0, toWFlags f = 0); /** * Returns the first (top) child of this item, or 0 if this item Modified: trunk/tora/src/core/utils.h =================================================================== --- trunk/tora/src/core/utils.h 2014-11-22 12:06:02 UTC (rev 5151) +++ trunk/tora/src/core/utils.h 2014-11-22 12:46:00 UTC (rev 5152) @@ -60,6 +60,12 @@ #define TOMessageBox QMessageBox #define TODock QWidget +#if QT_VERSION >= 0x050000 +typedef Qt::WindowFlags toWFlags; +#else +typedef Qt::WFlags toWFlags; +#endif + class QComboBox; class toTimer; class toConnection; Modified: trunk/tora/src/docklets/tocodeoutline.cpp =================================================================== --- trunk/tora/src/docklets/tocodeoutline.cpp 2014-11-22 12:06:02 UTC (rev 5151) +++ trunk/tora/src/docklets/tocodeoutline.cpp 2014-11-22 12:46:00 UTC (rev 5152) @@ -49,7 +49,7 @@ REGISTER_VIEW("Outline", toCodeOutline); toCodeOutline::toCodeOutline(QWidget *parent, - Qt::WindowFlags flags) + toWFlags flags) : toDocklet(tr("Outline"), parent, flags) , m_currentEditor(new editHandlerHolder()) , m_timerID(-1) Modified: trunk/tora/src/docklets/tocodeoutline.h =================================================================== --- trunk/tora/src/docklets/tocodeoutline.h 2014-11-22 12:06:02 UTC (rev 5151) +++ trunk/tora/src/docklets/tocodeoutline.h 2014-11-22 12:46:00 UTC (rev 5152) @@ -77,7 +77,7 @@ void timerEvent(QTimerEvent *e); public: - toCodeOutline(QWidget *parent = 0, Qt::WindowFlags flags = 0); + toCodeOutline(QWidget *parent = 0, toWFlags flags = 0); /** * Get the action icon name for this docklet Modified: trunk/tora/src/docklets/tologging.cpp =================================================================== --- trunk/tora/src/docklets/tologging.cpp 2014-11-22 12:06:02 UTC (rev 5151) +++ trunk/tora/src/docklets/tologging.cpp 2014-11-22 12:46:00 UTC (rev 5152) @@ -43,7 +43,7 @@ REGISTER_VIEW("Logging", toLoggingDocklet); toLoggingDocklet::toLoggingDocklet(QWidget *parent, - Qt::WindowFlags flags) + toWFlags flags) : toDocklet(tr("Logging"), parent, flags) , toEditWidget() , log(toLoggingWidgetSingle::Instance()) Modified: trunk/tora/src/docklets/tologging.h =================================================================== --- trunk/tora/src/docklets/tologging.h 2014-11-22 12:06:02 UTC (rev 5151) +++ trunk/tora/src/docklets/tologging.h 2014-11-22 12:46:00 UTC (rev 5152) @@ -55,7 +55,7 @@ public: toLoggingDocklet(QWidget *parent = 0, - Qt::WindowFlags flags = 0); + toWFlags flags = 0); /** * Get the action icon name for this docklet Modified: trunk/tora/src/docklets/toquerymodel.cpp =================================================================== --- trunk/tora/src/docklets/toquerymodel.cpp 2014-11-22 12:06:02 UTC (rev 5151) +++ trunk/tora/src/docklets/toquerymodel.cpp 2014-11-22 12:46:00 UTC (rev 5152) @@ -57,7 +57,7 @@ REGISTER_VIEW(TOOL_NAME, toQueryModel); -toQueryModel::toQueryModel(QWidget *parent, Qt::WindowFlags flags) +toQueryModel::toQueryModel(QWidget *parent, toWFlags flags) : toDocklet(tr(TOOL_NAME), parent, flags) , m_widget(NULL) , m_timerID(-1) Modified: trunk/tora/src/docklets/toquerymodel.h =================================================================== --- trunk/tora/src/docklets/toquerymodel.h 2014-11-22 12:06:02 UTC (rev 5151) +++ trunk/tora/src/docklets/toquerymodel.h 2014-11-22 12:46:00 UTC (rev 5152) @@ -53,7 +53,7 @@ QString m_lastText; int m_timerID; public: - toQueryModel(QWidget *parent = 0, Qt::WindowFlags flags = 0); + toQueryModel(QWidget *parent = 0, toWFlags flags = 0); /** * Get the action icon name for this docklet Modified: trunk/tora/src/docklets/toviewconnections.cpp =================================================================== --- trunk/tora/src/docklets/toviewconnections.cpp 2014-11-22 12:06:02 UTC (rev 5151) +++ trunk/tora/src/docklets/toviewconnections.cpp 2014-11-22 12:46:00 UTC (rev 5152) @@ -48,7 +48,7 @@ REGISTER_VIEW("Connection", toViewConnections); toViewConnections::toViewConnections(QWidget *parent, - Qt::WindowFlags flags) + toWFlags flags) : toDocklet(tr("Connections"), parent, flags) { setObjectName("Connections Docklet"); Modified: trunk/tora/src/docklets/toviewconnections.h =================================================================== --- trunk/tora/src/docklets/toviewconnections.h 2014-11-22 12:06:02 UTC (rev 5151) +++ trunk/tora/src/docklets/toviewconnections.h 2014-11-22 12:46:00 UTC (rev 5152) @@ -54,7 +54,7 @@ public: toViewConnections(QWidget *parent = 0, - Qt::WindowFlags flags = 0); + toWFlags flags = 0); /** Modified: trunk/tora/src/docklets/toviewdirectory.cpp =================================================================== --- trunk/tora/src/docklets/toviewdirectory.cpp 2014-11-22 12:06:02 UTC (rev 5151) +++ trunk/tora/src/docklets/toviewdirectory.cpp 2014-11-22 12:46:00 UTC (rev 5152) @@ -42,7 +42,7 @@ REGISTER_VIEW("Directory", toViewDirectory); toViewDirectory::toViewDirectory(QWidget *parent, - Qt::WindowFlags flags) + toWFlags flags) : toDocklet(tr("Directory"), parent, flags) { using namespace ToConfiguration; Modified: trunk/tora/src/docklets/toviewdirectory.h =================================================================== --- trunk/tora/src/docklets/toviewdirectory.h 2014-11-22 12:06:02 UTC (rev 5151) +++ trunk/tora/src/docklets/toviewdirectory.h 2014-11-22 12:46:00 UTC (rev 5152) @@ -53,7 +53,7 @@ public: toViewDirectory(QWidget *parent = 0, - Qt::WindowFlags flags = 0); + toWFlags flags = 0); /** Modified: trunk/tora/src/result/toresulttabledata.cpp =================================================================== --- trunk/tora/src/result/toresulttabledata.cpp 2014-11-22 12:06:02 UTC (rev 5151) +++ trunk/tora/src/result/toresulttabledata.cpp 2014-11-22 12:46:00 UTC (rev 5152) @@ -63,7 +63,7 @@ #include "icons/single.xpm" #include "icons/trash.xpm" -toResultTableData::toResultTableData(QWidget *parent, const char *name, Qt::WindowFlags f) +toResultTableData::toResultTableData(QWidget *parent, const char *name, toWFlags f) : QWidget(parent, f) , Model(NULL) , AllFilter(false) Modified: trunk/tora/src/result/toresulttabledata.h =================================================================== --- trunk/tora/src/result/toresulttabledata.h 2014-11-22 12:06:02 UTC (rev 5151) +++ trunk/tora/src/result/toresulttabledata.h 2014-11-22 12:46:00 UTC (rev 5152) @@ -56,7 +56,7 @@ Q_OBJECT; public: - toResultTableData(QWidget *parent = 0, const char *name = 0, Qt::WindowFlags f = 0); + toResultTableData(QWidget *parent = 0, const char *name = 0, toWFlags f = 0); /** * Reimplemented from toResult. First parameter is ignored. Modified: trunk/tora/src/tests/test3window.h =================================================================== --- trunk/tora/src/tests/test3window.h 2014-11-22 12:06:02 UTC (rev 5151) +++ trunk/tora/src/tests/test3window.h 2014-11-22 12:46:00 UTC (rev 5152) @@ -55,7 +55,7 @@ { public: XMdiSubWindow( QWidget * parent = 0 - , Qt::WindowFlags flags = 0 + , toWFlags flags = 0 ) : QMdiSubWindow( parent, flags ) { Modified: trunk/tora/src/tools/tostorage.cpp =================================================================== --- trunk/tora/src/tools/tostorage.cpp 2014-11-22 12:06:02 UTC (rev 5151) +++ trunk/tora/src/tools/tostorage.cpp 2014-11-22 12:46:00 UTC (rev 5152) @@ -135,7 +135,7 @@ static ToConfiguration::Storage s_storageConf; }; -toDropTablespace::toDropTablespace(QWidget* parent, const char* name, Qt::WFlags fl) +toDropTablespace::toDropTablespace(QWidget* parent, const char* name, toWFlags fl) : QWidget(parent, fl) { setupUi(this); @@ -163,7 +163,7 @@ -toStorageTablespace::toStorageTablespace(QWidget* parent, const char* name, Qt::WFlags fl) +toStorageTablespace::toStorageTablespace(QWidget* parent, const char* name, toWFlags fl) : QWidget(parent, fl) { setupUi(this); @@ -279,7 +279,7 @@ return ret; } -toStorageDatafile::toStorageDatafile(bool temp, bool dispName, QWidget* parent, const char* name, Qt::WFlags fl) +toStorageDatafile::toStorageDatafile(bool temp, bool dispName, QWidget* parent, const char* name, toWFlags fl) : QWidget(parent, fl), Tempfile(temp) { Modified: trunk/tora/src/tools/tostorage.h =================================================================== --- trunk/tora/src/tools/tostorage.h 2014-11-22 12:06:02 UTC (rev 5151) +++ trunk/tora/src/tools/tostorage.h 2014-11-22 12:46:00 UTC (rev 5152) @@ -94,7 +94,7 @@ bool PermanentOrig; public: - toStorageTablespace(QWidget *parent = 0, const char *name = 0, Qt::WFlags fl = 0); + toStorageTablespace(QWidget *parent = 0, const char *name = 0, toWFlags fl = 0); std::list<QString> sql(void); bool allowStorage(void); @@ -115,7 +115,7 @@ { Q_OBJECT public: - toDropTablespace(QWidget *parent = 0, const char *name = 0, Qt::WFlags fl = 0); + toDropTablespace(QWidget *parent = 0, const char *name = 0, toWFlags fl = 0); std::list<QString> sql(void); signals: void validContent(bool); @@ -134,7 +134,7 @@ public: toStorageDatafile(bool tempFile, bool dispName, - QWidget *parent = 0, const char *name = 0, Qt::WFlags fl = 0); + QWidget *parent = 0, const char *name = 0, toWFlags fl = 0); QString getName(void); std::list<QString> sql(); Modified: trunk/tora/src/tools/tostoragedefinition.cpp =================================================================== --- trunk/tora/src/tools/tostoragedefinition.cpp 2014-11-22 12:06:02 UTC (rev 5151) +++ trunk/tora/src/tools/tostoragedefinition.cpp 2014-11-22 12:46:00 UTC (rev 5152) @@ -40,7 +40,7 @@ #include <QLabel> #include <QSpinBox> -toStorageDefinition::toStorageDefinition(QWidget* parent, const char* name, Qt::WFlags fl) +toStorageDefinition::toStorageDefinition(QWidget* parent, const char* name, toWFlags fl) : QWidget(parent) { setupUi(this); Modified: trunk/tora/src/tools/tostoragedefinition.h =================================================================== --- trunk/tora/src/tools/tostoragedefinition.h 2014-11-22 12:06:02 UTC (rev 5151) +++ trunk/tora/src/tools/tostoragedefinition.h 2014-11-22 12:46:00 UTC (rev 5152) @@ -54,7 +54,7 @@ class toStorageDefinition : public QWidget, public Ui::toStorageDefinitionUI { public: - toStorageDefinition(QWidget *parent = 0, const char *name = 0, Qt::WFlags fl = 0); + toStorageDefinition(QWidget *parent = 0, const char *name = 0, toWFlags fl = 0); void forRollback(bool val); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ibr...@us...> - 2014-11-22 12:56:15
|
Revision: 5153 http://sourceforge.net/p/tora/code/5153 Author: ibre5041 Date: 2014-11-22 12:56:12 +0000 (Sat, 22 Nov 2014) Log Message: ----------- fromAScii => fromLatin1 (part of Qt5 port) thx to Pert Bena Modified Paths: -------------- trunk/tora/src/connection/tooraclefind.cpp trunk/tora/src/connection/tooracletraits.cpp trunk/tora/src/connection/toqsqlfind.cpp trunk/tora/src/connection/toteradatafind.cpp trunk/tora/src/core/main.cpp trunk/tora/src/core/toconfiguration_new.cpp trunk/tora/src/core/tonewconnection.cpp trunk/tora/src/result/toresulttabledata.cpp trunk/tora/src/tests/test4window.cpp trunk/tora/src/tools/tosandboxtool.cpp Modified: trunk/tora/src/connection/tooraclefind.cpp =================================================================== --- trunk/tora/src/connection/tooraclefind.cpp 2014-11-22 12:46:00 UTC (rev 5152) +++ trunk/tora/src/connection/tooraclefind.cpp 2014-11-22 12:56:12 UTC (rev 5153) @@ -70,7 +70,7 @@ virtual QString name() const { - return QString::fromAscii(ORACLE_INSTANTCLIENT); + return QString::fromLatin1(ORACLE_INSTANTCLIENT); }; /** Return list of possible client locations @@ -98,37 +98,37 @@ QSet<QString> const toOracleInstantFinder::m_paths = QSet<QString>() #if defined(Q_OS_LINUX) - << QString::fromAscii("/usr/lib/oracle/11.2/client64/lib") - << QString::fromAscii("/usr/lib/oracle/11.2/client/lib") - << QString::fromAscii("/usr/lib/oracle/11.1/client64/lib") - << QString::fromAscii("/usr/lib/oracle/11.1/client/lib") - << QString::fromAscii("/usr/lib/oracle/10.2.0.5/client64/lib") - << QString::fromAscii("/usr/lib/oracle/10.2.0.5/client/lib") - << QString::fromAscii("/usr/lib/oracle/10.2.0.4/client64/lib") - << QString::fromAscii("/usr/lib/oracle/10.2.0.4/client/lib") - << QString::fromAscii("/usr/lib/oracle/10.2.0.3/client64/lib") - << QString::fromAscii("/usr/lib/oracle/10.2.0.3/client/lib") - << QString::fromAscii("/opt/instantclient*") - << QString::fromAscii("/usr/lib") + << QString::fromLatin1("/usr/lib/oracle/11.2/client64/lib") + << QString::fromLatin1("/usr/lib/oracle/11.2/client/lib") + << QString::fromLatin1("/usr/lib/oracle/11.1/client64/lib") + << QString::fromLatin1("/usr/lib/oracle/11.1/client/lib") + << QString::fromLatin1("/usr/lib/oracle/10.2.0.5/client64/lib") + << QString::fromLatin1("/usr/lib/oracle/10.2.0.5/client/lib") + << QString::fromLatin1("/usr/lib/oracle/10.2.0.4/client64/lib") + << QString::fromLatin1("/usr/lib/oracle/10.2.0.4/client/lib") + << QString::fromLatin1("/usr/lib/oracle/10.2.0.3/client64/lib") + << QString::fromLatin1("/usr/lib/oracle/10.2.0.3/client/lib") + << QString::fromLatin1("/opt/instantclient*") + << QString::fromLatin1("/usr/lib") #elif defined(Q_OS_WIN32) - << QString::fromAscii("C:\\instantclient*") - << QString::fromAscii("D:\\instantclient*") - << QString::fromAscii("E:\\instantclient*") - << QString::fromAscii("C:\\oracle\\instantclient*") - << QString::fromAscii("D:\\oracle\\instantclient*") - << QString::fromAscii("E:\\oracle\\instantclient*") - << QString::fromAscii("D:\\devel\\instantclient*") + << QString::fromLatin1("C:\\instantclient*") + << QString::fromLatin1("D:\\instantclient*") + << QString::fromLatin1("E:\\instantclient*") + << QString::fromLatin1("C:\\oracle\\instantclient*") + << QString::fromLatin1("D:\\oracle\\instantclient*") + << QString::fromLatin1("E:\\oracle\\instantclient*") + << QString::fromLatin1("D:\\devel\\instantclient*") #endif << QDir::currentPath() ; QList<QString> const toOracleInstantFinder::m_libname = QList<QString>() #if defined(Q_OS_LINUX) - << QString::fromAscii("libclntsh.so*") + << QString::fromLatin1("libclntsh.so*") #elif defined(Q_WS_MAC) - << QString::fromAscii("libclntsh.*dylib") + << QString::fromLatin1("libclntsh.*dylib") #elif defined(Q_OS_WIN32) // Note both 32 and 64 bit build - << QString::fromAscii("OCI.dll") + << QString::fromLatin1("OCI.dll") #endif ; @@ -367,8 +367,8 @@ - dlopen("libtrotl.so") */ int retval; - QDir toraHome(QDir::homePath() + QDir::separator() + QChar('.') + QString::fromAscii(TOAPPNAME)); - QString providerPath(toraHome.absolutePath() + QDir::separator() + QString::fromAscii("poracle")); + QDir toraHome(QDir::homePath() + QDir::separator() + QChar('.') + QString::fromLatin1(TOAPPNAME)); + QString providerPath(toraHome.absolutePath() + QDir::separator() + QString::fromLatin1("poracle")); TLOG(5, toNoDecorator, __HERE__) << "Creating plugin path:" << providerPath << std::endl; if( !toraHome.mkpath(providerPath)) throw QString("Could not create: %1").arg(providerPath); @@ -426,7 +426,7 @@ virtual QString name() const { - return QString::fromAscii(ORACLE_TNSCLIENT); + return QString::fromLatin1(ORACLE_TNSCLIENT); }; /** Return list of possible client locations @@ -521,9 +521,9 @@ { QDir ohDir(s); #ifdef Q_OS_WIN32 - QDir ohLibDir(s + QDir::separator() + QString::fromAscii("bin")); + QDir ohLibDir(s + QDir::separator() + QString::fromLatin1("bin")); #else - QDir ohLibDir(s + QDir::separator() + QString::fromAscii("lib")); + QDir ohLibDir(s + QDir::separator() + QString::fromLatin1("lib")); #endif QStringList sLibraries = ohLibDir.entryList( m_libname); QString version; Modified: trunk/tora/src/connection/tooracletraits.cpp =================================================================== --- trunk/tora/src/connection/tooracletraits.cpp 2014-11-22 12:46:00 UTC (rev 5152) +++ trunk/tora/src/connection/tooracletraits.cpp 2014-11-22 12:56:12 UTC (rev 5153) @@ -106,7 +106,7 @@ QString toOracleTraits::quoteVarchar(const QString &name) const { QString retval(name); - retval.replace('\'', QString::fromAscii("\'\'"), Qt::CaseSensitive); + retval.replace('\'', QString::fromLatin1("\'\'"), Qt::CaseSensitive); return QChar('\'') + retval + ('\''); } @@ -118,8 +118,8 @@ QList<QString> toOracleTraits::primaryKeys(toConnection &conn, toCache::ObjectRef const&obj) const { - static const QString ROWID(QString::fromAscii("ROWID")); - static const QString ORA_ROWSCN(QString::fromAscii("ORA_ROWSCN")); + static const QString ROWID(QString::fromLatin1("ROWID")); + static const QString ORA_ROWSCN(QString::fromLatin1("ORA_ROWSCN")); toCache::CacheEntry const* e = conn.getCache().findEntry(obj); if (e && e->type == toCache::TABLE) Modified: trunk/tora/src/connection/toqsqlfind.cpp =================================================================== --- trunk/tora/src/connection/toqsqlfind.cpp 2014-11-22 12:46:00 UTC (rev 5152) +++ trunk/tora/src/connection/toqsqlfind.cpp 2014-11-22 12:56:12 UTC (rev 5153) @@ -51,7 +51,7 @@ virtual QString name() const { - return QString::fromAscii(QSQL_FINDER); + return QString::fromLatin1(QSQL_FINDER); }; /** Return list of possible client locations Modified: trunk/tora/src/connection/toteradatafind.cpp =================================================================== --- trunk/tora/src/connection/toteradatafind.cpp 2014-11-22 12:46:00 UTC (rev 5152) +++ trunk/tora/src/connection/toteradatafind.cpp 2014-11-22 12:56:12 UTC (rev 5153) @@ -58,7 +58,7 @@ virtual QString name() const { - return QString::fromAscii("Teradata"); + return QString::fromLatin1("Teradata"); }; /** Return list of possible client locations @@ -84,21 +84,21 @@ QSet<QString> const toTeradataFinder::m_paths = QSet<QString>() #if defined(Q_OS_LINUX) - << QString::fromAscii("/opt/teradata/client/14.00/lib64/") - << QString::fromAscii("/opt/teradata/client/14.00/lib/") - << QString::fromAscii("/opt/teradata/client/13.00/lib64/") - << QString::fromAscii("/opt/teradata/client/13.00/lib/") + << QString::fromLatin1("/opt/teradata/client/14.00/lib64/") + << QString::fromLatin1("/opt/teradata/client/14.00/lib/") + << QString::fromLatin1("/opt/teradata/client/13.00/lib64/") + << QString::fromLatin1("/opt/teradata/client/13.00/lib/") #elif defined(Q_OS_WIN32) #endif ; QList<QString> const toTeradataFinder::m_libname = QList<QString>() #if defined(Q_OS_LINUX) - << QString::fromAscii("libcliv2.so") + << QString::fromLatin1("libcliv2.so") #elif defined(Q_OS_WIN32) - << QString::fromAscii("wincli32.dll") + << QString::fromLatin1("wincli32.dll") #elif defined(Q_OS_WIN64) - << QString::fromAscii("wincli64.dll") + << QString::fromLatin1("wincli64.dll") #endif ; Modified: trunk/tora/src/core/main.cpp =================================================================== --- trunk/tora/src/core/main.cpp 2014-11-22 12:46:00 UTC (rev 5152) +++ trunk/tora/src/core/main.cpp 2014-11-22 12:56:12 UTC (rev 5153) @@ -125,8 +125,10 @@ if (!style.isEmpty()) QApplication::setStyle(QStyleFactory::create(style)); +#if QT_VERSION < 0x050000 // Set the default codec to use for QString QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8")); +#endif // qt4 if (getenv("LANG")) // qApp->setDefaultCodec(QTextCodec::codecForName(getenv("LANG"))); Modified: trunk/tora/src/core/toconfiguration_new.cpp =================================================================== --- trunk/tora/src/core/toconfiguration_new.cpp 2014-11-22 12:46:00 UTC (rev 5152) +++ trunk/tora/src/core/toconfiguration_new.cpp 2014-11-22 12:56:12 UTC (rev 5153) @@ -182,7 +182,7 @@ appl += QDir::separator(); return appl; #else - return QString::fromAscii(SHARE_DIR); + return QString::fromLatin1(SHARE_DIR); #endif } Modified: trunk/tora/src/core/tonewconnection.cpp =================================================================== --- trunk/tora/src/core/tonewconnection.cpp 2014-11-22 12:46:00 UTC (rev 5152) +++ trunk/tora/src/core/tonewconnection.cpp 2014-11-22 12:56:12 UTC (rev 5153) @@ -87,8 +87,8 @@ { if (p == "Oracle") { - Provider->addItem(ORACLE_INSTANTCLIENT, QVariant(QString::fromAscii(ORACLE_PROVIDER))); - Provider->addItem(ORACLE_TNSCLIENT, QVariant(QString::fromAscii(ORACLE_PROVIDER))); + Provider->addItem(ORACLE_INSTANTCLIENT, QVariant(QString::fromLatin1(ORACLE_PROVIDER))); + Provider->addItem(ORACLE_TNSCLIENT, QVariant(QString::fromLatin1(ORACLE_PROVIDER))); } else { Modified: trunk/tora/src/result/toresulttabledata.cpp =================================================================== --- trunk/tora/src/result/toresulttabledata.cpp 2014-11-22 12:46:00 UTC (rev 5152) +++ trunk/tora/src/result/toresulttabledata.cpp 2014-11-22 12:56:12 UTC (rev 5153) @@ -536,9 +536,9 @@ unsigned toResultTableData::commitUpdate(toConnectionSubLoan &conn, toResultModelEdit::ChangeSet &change) { - static const QString UPDATE = QString::fromAscii("UPDATE %1.%2 SET %3 WHERE 1=1 %4"); - static const QString CONJUNCTION = QString::fromAscii(" AND %1 = %2"); - static const QString ASSIGNMENT = QString::fromAscii("%1 = %2"); + static const QString UPDATE = QString::fromLatin1("UPDATE %1.%2 SET %3 WHERE 1=1 %4"); + static const QString CONJUNCTION = QString::fromLatin1(" AND %1 = %2"); + static const QString ASSIGNMENT = QString::fromLatin1("%1 = %2"); if (Model->getPriKeys().empty()) { @@ -646,8 +646,8 @@ unsigned toResultTableData::commitDelete(toConnectionSubLoan &conn, toResultModelEdit::ChangeSet &change) { - static const QString DELETESTAT = QString::fromAscii("DELETE FROM %1.%2 WHERE 1=1 %3"); - static const QString CONJUNCTION = QString::fromAscii(" AND %1 = %2"); + static const QString DELETESTAT = QString::fromLatin1("DELETE FROM %1.%2 WHERE 1=1 %3"); + static const QString CONJUNCTION = QString::fromLatin1(" AND %1 = %2"); if (Model->getPriKeys().empty()) { Utils::toStatusMessage(tr("This table has no known primary keys")); Modified: trunk/tora/src/tests/test4window.cpp =================================================================== --- trunk/tora/src/tests/test4window.cpp 2014-11-22 12:46:00 UTC (rev 5152) +++ trunk/tora/src/tests/test4window.cpp 2014-11-22 12:56:12 UTC (rev 5153) @@ -75,7 +75,7 @@ rightVerticalLayout->addWidget(editorRight); editorRight->setText(sql); editorRight->setMarginType(2, QsciScintilla::TextMarginRightJustified); - editorRight->setMarginWidth(2, QString::fromAscii("009")); + editorRight->setMarginWidth(2, QString::fromLatin1("009")); connect(oracle, SIGNAL(triggered()), this, SLOT(setOracle())); connect(mysql, SIGNAL(triggered()), this, SLOT(setMySQL())); Modified: trunk/tora/src/tools/tosandboxtool.cpp =================================================================== --- trunk/tora/src/tools/tosandboxtool.cpp 2014-11-22 12:46:00 UTC (rev 5152) +++ trunk/tora/src/tools/tosandboxtool.cpp 2014-11-22 12:56:12 UTC (rev 5153) @@ -101,7 +101,7 @@ new toChangeConnection(toolbar); m_statement = new QLineEdit(this); - m_statement->setText(QString::fromAscii("select * from dba_objects")); + m_statement->setText(QString::fromLatin1("select * from dba_objects")); layout()->addWidget(m_statement); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ibr...@us...> - 2014-11-24 10:00:42
|
Revision: 5157 http://sourceforge.net/p/tora/code/5157 Author: ibre5041 Date: 2014-11-24 10:00:32 +0000 (Mon, 24 Nov 2014) Log Message: ----------- add missing includes for core/utils.h (needed for toWFlags) part of QT5 port. txh to Nathan Modified Paths: -------------- trunk/tora/src/core/todatabasesetting.h trunk/tora/src/core/todocklet.h trunk/tora/src/core/toglobalsetting.h trunk/tora/src/core/tolinechart.h trunk/tora/src/core/tonewconnection.h trunk/tora/src/core/topiechart.h trunk/tora/src/core/topreferences.h trunk/tora/src/core/toresultcols.h trunk/tora/src/core/tosyntaxsetup.h trunk/tora/src/core/totreewidget.h trunk/tora/src/result/toresulttabledata.h trunk/tora/src/tools/tostoragedefinition.h Modified: trunk/tora/src/core/todatabasesetting.h =================================================================== --- trunk/tora/src/core/todatabasesetting.h 2014-11-22 13:12:21 UTC (rev 5156) +++ trunk/tora/src/core/todatabasesetting.h 2014-11-24 10:00:32 UTC (rev 5157) @@ -37,6 +37,7 @@ #include "core/totool.h" #include "core/toconfenum.h" +#include "core/utils.h" #include "ui_todatabasesettingui.h" Modified: trunk/tora/src/core/todocklet.h =================================================================== --- trunk/tora/src/core/todocklet.h 2014-11-22 13:12:21 UTC (rev 5156) +++ trunk/tora/src/core/todocklet.h 2014-11-24 10:00:32 UTC (rev 5157) @@ -43,6 +43,8 @@ #include <QDockWidget> #include <QtCore/QRect> +#include "core/utils.h" + class toDocklet; class toDockletHolder Modified: trunk/tora/src/core/toglobalsetting.h =================================================================== --- trunk/tora/src/core/toglobalsetting.h 2014-11-22 13:12:21 UTC (rev 5156) +++ trunk/tora/src/core/toglobalsetting.h 2014-11-24 10:00:32 UTC (rev 5157) @@ -37,6 +37,7 @@ #include "core/totool.h" #include "core/toconfenum.h" +#include "core/utils.h" #include "ui_toglobalsettingui.h" #include "ui_totoolsettingui.h" Modified: trunk/tora/src/core/tolinechart.h =================================================================== --- trunk/tora/src/core/tolinechart.h 2014-11-22 13:12:21 UTC (rev 5156) +++ trunk/tora/src/core/tolinechart.h 2014-11-24 10:00:32 UTC (rev 5157) @@ -46,6 +46,8 @@ #include <map> #include <algorithm> +#include "core/utils.h" + class QMenu; class QScrollBar; Modified: trunk/tora/src/core/tonewconnection.h =================================================================== --- trunk/tora/src/core/tonewconnection.h 2014-11-22 13:12:21 UTC (rev 5156) +++ trunk/tora/src/core/tonewconnection.h 2014-11-24 10:00:32 UTC (rev 5157) @@ -37,6 +37,7 @@ #include "core/totool.h" +#include "core/utils.h" #include "ui_tonewconnectionui.h" #include <QtCore/QMap> Modified: trunk/tora/src/core/topiechart.h =================================================================== --- trunk/tora/src/core/topiechart.h 2014-11-22 13:12:21 UTC (rev 5156) +++ trunk/tora/src/core/topiechart.h 2014-11-24 10:00:32 UTC (rev 5157) @@ -35,6 +35,7 @@ #ifndef TOPIECHART_H #define TOPIECHART_H +#include "core/utils.h" #include <QWidget> #include <QtCore/QObject> Modified: trunk/tora/src/core/topreferences.h =================================================================== --- trunk/tora/src/core/topreferences.h 2014-11-22 13:12:21 UTC (rev 5156) +++ trunk/tora/src/core/topreferences.h 2014-11-24 10:00:32 UTC (rev 5157) @@ -37,6 +37,7 @@ #include "core/totool.h" +#include "core/utils.h" #include <QtCore/QVariant> #include <QDialog> Modified: trunk/tora/src/core/toresultcols.h =================================================================== --- trunk/tora/src/core/toresultcols.h 2014-11-22 13:12:21 UTC (rev 5156) +++ trunk/tora/src/core/toresultcols.h 2014-11-24 10:00:32 UTC (rev 5157) @@ -38,6 +38,7 @@ #include "core/toconnection.h" #include "core/toresulttableview.h" +#include "core/utils.h" class QCheckBox; class QLabel; Modified: trunk/tora/src/core/tosyntaxsetup.h =================================================================== --- trunk/tora/src/core/tosyntaxsetup.h 2014-11-22 13:12:21 UTC (rev 5156) +++ trunk/tora/src/core/tosyntaxsetup.h 2014-11-24 10:00:32 UTC (rev 5157) @@ -40,6 +40,7 @@ #include "core/totool.h" #include "editor/tostyle.h" #include "core/toeditorsetting.h" +#include "core/utils.h" #include <QtCore/QString> #include <QtCore/QMetaEnum> Modified: trunk/tora/src/core/totreewidget.h =================================================================== --- trunk/tora/src/core/totreewidget.h 2014-11-22 13:12:21 UTC (rev 5156) +++ trunk/tora/src/core/totreewidget.h 2014-11-24 10:00:32 UTC (rev 5157) @@ -35,8 +35,8 @@ #ifndef TOTREEWIDGET_H #define TOTREEWIDGET_H +#include "core/utils.h" - #include <QTreeWidget> #include <QTreeWidgetItem> #include <QTreeWidgetItemIterator> Modified: trunk/tora/src/result/toresulttabledata.h =================================================================== --- trunk/tora/src/result/toresulttabledata.h 2014-11-22 13:12:21 UTC (rev 5156) +++ trunk/tora/src/result/toresulttabledata.h 2014-11-24 10:00:32 UTC (rev 5157) @@ -36,6 +36,7 @@ #define TORESULTTABLEDATA_H #include "core/toresultmodeledit.h" +#include "core/utils.h" #include "ui_toresulttabledataui.h" #include <QWidget> Modified: trunk/tora/src/tools/tostoragedefinition.h =================================================================== --- trunk/tora/src/tools/tostoragedefinition.h 2014-11-22 13:12:21 UTC (rev 5156) +++ trunk/tora/src/tools/tostoragedefinition.h 2014-11-24 10:00:32 UTC (rev 5157) @@ -37,6 +37,7 @@ #include "ui_tostoragedefinitionui.h" +#include "core/utils.h" #include <list> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ibr...@us...> - 2014-11-24 18:16:53
|
Revision: 5158 http://sourceforge.net/p/tora/code/5158 Author: ibre5041 Date: 2014-11-24 18:16:39 +0000 (Mon, 24 Nov 2014) Log Message: ----------- toQValue::operator QString() const make explicit - this should solve some ambiguities Modified Paths: -------------- trunk/tora/src/connection/tooracleextract.cpp trunk/tora/src/core/tocache.cpp trunk/tora/src/core/tocodemodel.cpp trunk/tora/src/core/toquery.cpp trunk/tora/src/core/toqvalue.h trunk/tora/src/core/toresultbar.cpp trunk/tora/src/core/toresultcode.cpp trunk/tora/src/core/toresultcols.cpp trunk/tora/src/core/toresultcombo.cpp trunk/tora/src/core/toresultdepend.cpp trunk/tora/src/core/toresultdrawing.cpp trunk/tora/src/core/toresultextent.cpp trunk/tora/src/core/toresultfield.cpp trunk/tora/src/core/toresultitem.cpp trunk/tora/src/core/toresultline.cpp trunk/tora/src/core/toresultlock.cpp trunk/tora/src/core/toresultlong.cpp trunk/tora/src/core/toresultmodeledit.cpp trunk/tora/src/core/toresultplan.cpp trunk/tora/src/core/toresultstats.cpp trunk/tora/src/core/toresulttableviewedit.cpp trunk/tora/src/core/toresultview.cpp trunk/tora/src/core/utils.cpp trunk/tora/src/result/toresulttabledata.cpp trunk/tora/src/templates/totemplate.cpp trunk/tora/src/tools/toawr.cpp trunk/tora/src/tools/tobrowserschemawidget.cpp trunk/tora/src/tools/tocurrent.cpp trunk/tora/src/tools/toer.cpp trunk/tora/src/tools/toinvalid.cpp trunk/tora/src/tools/tooutput.cpp trunk/tora/src/tools/toplsqleditor.cpp trunk/tora/src/tools/toprofiler.cpp trunk/tora/src/tools/torollback.cpp trunk/tora/src/tools/toscriptschemawidget.cpp trunk/tora/src/tools/toscripttreemodel.cpp trunk/tora/src/tools/tosecurity.cpp trunk/tora/src/tools/tosecuritytreemodel.cpp trunk/tora/src/tools/tosgastatement.cpp trunk/tora/src/tools/tostorage.cpp trunk/tora/src/tools/towaitevents.cpp trunk/tora/src/tools/toworksheet.cpp Modified: trunk/tora/src/connection/tooracleextract.cpp =================================================================== --- trunk/tora/src/connection/tooracleextract.cpp 2014-11-24 10:00:32 UTC (rev 5157) +++ trunk/tora/src/connection/tooracleextract.cpp 2014-11-24 18:16:39 UTC (rev 5158) @@ -94,7 +94,7 @@ bool first = true; while (!inf.eof()) { - QString line = inf.readValue(); + QString line = (QString)inf.readValue(); if (first) { int len; @@ -144,7 +144,7 @@ first = false; else ret += "\n , "; - ret += QUOTE(inf.readValue()); + ret += QUOTE((QString)inf.readValue()); } return ret; } @@ -208,7 +208,7 @@ first = false; else ret += ",\n "; - ret += QUOTE(query.readValue()); + ret += QUOTE((QString)query.readValue()); } ret += "\n)\n"; return ret; @@ -247,7 +247,7 @@ sql = QString("COMMENT ON TABLE %1%2 IS '%3'"). arg(schema). arg(QUOTE(name)). - arg(prepareDB(inf.readValue())); + arg(prepareDB((QString)inf.readValue())); if (PROMPT) { ret += "PROMPT "; @@ -260,12 +260,12 @@ toQuery col(conn, SQLColumnComments, toQueryParams() << name << owner); while (!col.eof()) { - QString column = col.readValue(); + QString column = (QString)col.readValue(); sql = QString("COMMENT ON COLUMN %1%2.%3 IS '%4'"). arg(schema). arg(QUOTE(name)). arg(QUOTE(column)). - arg(prepareDB(col.readValue())); + arg(prepareDB((QString)col.readValue())); if (PROMPT) { ret += "PROMPT "; @@ -413,10 +413,10 @@ first = true; while (!resultset.empty()) { - QString pre_class = Utils::toShift(resultset); - QString pre_obj = Utils::toShift(resultset); - QString pre_attr = Utils::toShift(resultset); - QString pre_val = Utils::toShift(resultset); + QString pre_class = (QString)Utils::toShift(resultset); + QString pre_obj = (QString)Utils::toShift(resultset); + QString pre_attr = (QString)Utils::toShift(resultset); + QString pre_val = (QString)Utils::toShift(resultset); if (first) { first = false; @@ -444,7 +444,7 @@ resultset = toQuery::readQuery(CONNECTION, SQLContextInfoNoAttr, toQueryParams() << name << *it); if (!resultset.empty()) { - QString pre_obj = Utils::toShift(resultset); + QString pre_obj = (QString)Utils::toShift(resultset); pre_name = QString("%1_%2").arg(name).arg(pre_obj); pre_name.truncate(30); tmp = QString("BEGIN\n CTX_DDL.CREATE_PREFERENCE('%1', '%2');\nEND;\n\n").arg(pre_name).arg(pre_obj); @@ -463,10 +463,10 @@ pre_name = ""; while (!resultset.empty()) { - QString pre_class = Utils::toShift(resultset); - QString pre_obj = Utils::toShift(resultset); - QString pre_attr = Utils::toShift(resultset); - QString pre_val = Utils::toShift(resultset); + QString pre_class = (QString)Utils::toShift(resultset); + QString pre_obj = (QString)Utils::toShift(resultset); + QString pre_attr = (QString)Utils::toShift(resultset); + QString pre_val = (QString)Utils::toShift(resultset); if (pre_name == "") { pre_name = QString("%1_STOPLIST").arg(name); @@ -495,7 +495,7 @@ if (!resultset.empty()) { - QString pre_obj = Utils::toShift(resultset); + QString pre_obj = (QString)Utils::toShift(resultset); pre_name = QString("%1_%2").arg(name).arg(pre_obj); pre_name.truncate(30); tmp = QString("BEGIN\n CTX_DDL.CREATE_STOPLIST('%1');\nEND;\n\n") @@ -513,10 +513,10 @@ pre_name = ""; while (!resultset.empty()) { - QString pre_class = Utils::toShift(resultset); - QString pre_obj = Utils::toShift(resultset); - QString pre_attr = Utils::toShift(resultset); - QString pre_val = Utils::toShift(resultset); + QString pre_class = (QString)Utils::toShift(resultset); + QString pre_obj = (QString)Utils::toShift(resultset); + QString pre_attr = (QString)Utils::toShift(resultset); + QString pre_val = (QString)Utils::toShift(resultset); QString pre_val1 = pre_val.left(pre_val.indexOf(':', 0, Qt::CaseInsensitive)); pre_val = pre_val.right(pre_val.length() - pre_val1.length() - 1); QString pre_val2 = pre_val.left(pre_val.indexOf(':', 0, Qt::CaseInsensitive)); @@ -555,7 +555,7 @@ resultset = toQuery::readQuery(CONNECTION, SQLContextInfoNoAttr, toQueryParams() << name << QString::fromLatin1("SECTION_GROUP")); if (!resultset.empty()) { - QString pre_obj = Utils::toShift(resultset); + QString pre_obj = (QString)Utils::toShift(resultset); pre_name = QString("%1_%2").arg(name).arg(pre_obj); pre_name.truncate(30); tmp = QString("BEGIN\n CTX_DDL.CREATE_SECTION_GROUP('%1', '%2');\nEND;\n\n"). @@ -575,22 +575,22 @@ resultset = toQuery::readQuery(CONNECTION, SQLContextColumn, toQueryParams() << name); if (!resultset.empty()) { - toQValue vlang = Utils::toShift(resultset); - toQValue vfrmt = Utils::toShift(resultset); - toQValue vcset = Utils::toShift(resultset); + toQValue vlang = (QString)Utils::toShift(resultset); + toQValue vfrmt = (QString)Utils::toShift(resultset); + toQValue vcset = (QString)Utils::toShift(resultset); if (!vlang.isNull()) { - tmp = QString(" LANGUAGE COLUMN %1\n").arg(vlang); + tmp = QString(" LANGUAGE COLUMN %1\n").arg((QString)vlang); parameters += tmp; } if (!vfrmt.isNull()) { - tmp = QString(" FORMAT COLUMN %1\n").arg(vfrmt); + tmp = QString(" FORMAT COLUMN %1\n").arg((QString)vfrmt); parameters += tmp; } if (!vcset.isNull()) { - tmp = QString(" CHARSET COLUMN %1\n").arg(vcset); + tmp = QString(" CHARSET COLUMN %1\n").arg((QString)vcset); parameters += tmp; } } @@ -760,11 +760,11 @@ const QString &name) const { using namespace ToConfiguration; - QString monitoring = Utils::toShift(result); - QString table = Utils::toShift(result); - QString degree = Utils::toShift(result); - QString instances = Utils::toShift(result); - QString organization = Utils::toShift(result); + QString monitoring = (QString)Utils::toShift(result); + QString table = (QString)Utils::toShift(result); + QString degree = (QString)Utils::toShift(result); + QString instances = (QString)Utils::toShift(result); + QString organization = (QString)Utils::toShift(result); QString ret; if (PROMPT) @@ -776,8 +776,8 @@ toQList res = toQuery::readQuery(CONNECTION, SQLPrimaryKey, toQueryParams() << name << owner); if (res.size() != 2) throw qApp->translate("toOracleExtract", "Couldn't find primary key of %1.%2").arg(owner).arg(name); - QString primary = *(res.begin()); - QString tablespace = *(res.rbegin()); + QString primary = (QString)*(res.begin()); + QString tablespace = (QString)*(res.rbegin()); ret += QString(" , CONSTRAINT %1 PRIMARY KEY\n").arg(QUOTE(primary)); ret += indexColumns(ext, " ", owner, primary); ret += QString(" USING TABLESPACE %2\n").arg(QUOTE(tablespace)); @@ -884,16 +884,16 @@ if (result.empty()) throw qApp->translate("toOracleExtract", "Couldn't find materialised table %1.%2"). arg(QUOTE(owner)).arg(QUOTE(name)); - QString table = Utils::toShift(result); - QString buildMode = Utils::toShift(result); - QString refreshMethod = Utils::toShift(result); - QString refreshMode = Utils::toShift(result); - QString startWith = Utils::toShift(result); - QString next = Utils::toShift(result); - QString usingPK = Utils::toShift(result); - QString masterRBSeg = Utils::toShift(result); - QString updatable = Utils::toShift(result); - QString query = Utils::toShift(result); + QString table = (QString)Utils::toShift(result); + QString buildMode = (QString)Utils::toShift(result); + QString refreshMethod = (QString)Utils::toShift(result); + QString refreshMode = (QString)Utils::toShift(result); + QString startWith = (QString)Utils::toShift(result); + QString next = (QString)Utils::toShift(result); + QString usingPK = (QString)Utils::toShift(result); + QString masterRBSeg = (QString)Utils::toShift(result); + QString updatable = (QString)Utils::toShift(result); + QString query = (QString)Utils::toShift(result); toQuery inf(conn, SQLIndexName, toQueryParams() << table << owner); QString index(inf.readValue()); @@ -1027,10 +1027,10 @@ if (result.size() != 4) throw qApp->translate("toOracleExtract", "Couldn't find log %1.%2").arg(owner).arg(name); - QString table = Utils::toShift(result); - QString rowIds = Utils::toShift(result); - QString primaryKey = Utils::toShift(result); - QString filterColumns = Utils::toShift(result); + QString table = (QString)Utils::toShift(result); + QString rowIds = (QString)Utils::toShift(result); + QString primaryKey = (QString)Utils::toShift(result); + QString filterColumns = (QString)Utils::toShift(result); QString ret; QString sql = QString("CREATE %1 LOG ON %2%3\n"). @@ -1065,7 +1065,7 @@ first = false; else ret += "\n , "; - ret += QUOTE(inf.readValue()); + ret += QUOTE((QString)inf.readValue()); } ret += ")"; } @@ -1531,10 +1531,10 @@ QString ret = sql; toQList result = toQuery::readQuery(CONNECTION, SQLIndexPartition, toQueryParams() << QString::number(ext.getBlockSize()) << name << owner); - QString partitionType = Utils::toShift(result); - QString subPartitionType = Utils::toShift(result); - QString locality = Utils::toShift(result); - QString compressed = Utils::toShift(result); + QString partitionType = (QString)Utils::toShift(result); + QString subPartitionType = (QString)Utils::toShift(result); + QString locality = (QString)Utils::toShift(result); + QString compressed = (QString)Utils::toShift(result); Utils::toUnShift(result, toQValue("")); ret += segmentAttributes(ext, result); @@ -1869,7 +1869,7 @@ i++; i++; i++; - organization = *i; + organization = (QString)*i; } QString ret = createTableText(ext, storage, schema, owner, name); @@ -1877,10 +1877,10 @@ if (ext.getPartition()) { toQList type = toQuery::readQuery(CONNECTION, SQLPartitionType, toQueryParams() << name << owner); - QString partitionType (Utils::toShift(type)); - QString partitionCount (Utils::toShift(type)); - QString subPartitionType (Utils::toShift(type)); - QString subPartitionCount(Utils::toShift(type)); + QString partitionType ((QString)Utils::toShift(type)); + QString partitionCount ((QString)Utils::toShift(type)); + QString subPartitionType ((QString)Utils::toShift(type)); + QString subPartitionCount((QString)Utils::toShift(type)); ret += QString("PARTITION BY %1\n(\n ").arg(partitionType); ret += partitionKeyColumns(ext, owner, name, "TABLE"); @@ -1904,8 +1904,8 @@ while (!segment.empty()) { toQList storage; - QString partition = Utils::toShift(segment); - QString highValue = Utils::toShift(segment); + QString partition = (QString)Utils::toShift(segment); + QString highValue = (QString)Utils::toShift(segment); Utils::toPush(storage, toQValue(" ")); Utils::toPush(storage, toQValue(organization)); for (int i = 0; i < 16; i++) @@ -1931,8 +1931,8 @@ else ret += "\n , "; ret += QString("SUBPARTITION %2 TABLESPACE %1"). - arg(QUOTE(Utils::toShift(subs))). - arg(QUOTE(Utils::toShift(subs))); + arg(QUOTE((QString)Utils::toShift(subs))). + arg(QUOTE((QString)Utils::toShift(subs))); } ret += "\n )\n"; } @@ -1950,8 +1950,8 @@ else ret += "\n , "; ret += QString("PARTITION %2 TABLESPACE %1"). - arg(QUOTE(Utils::toShift(hash))). - arg(QUOTE(Utils::toShift(hash))); + arg(QUOTE((QString)Utils::toShift(hash))). + arg(QUOTE((QString)Utils::toShift(hash))); } } ret += ")\n"; @@ -2016,11 +2016,11 @@ toQList result = toQuery::readQuery(CONNECTION, SQLSystemPrivs, toQueryParams() << name); while (!result.empty()) { - QString priv = QString(Utils::toShift(result)).toLower(); + QString priv = QString((QString)Utils::toShift(result)).toLower(); QString sql = QString("GRANT %1 TO %2 %3"). arg(priv). arg(dest). - arg(Utils::toShift(result)); + arg((QString)Utils::toShift(result)); if (PROMPT) { ret += "PROMPT "; @@ -2037,11 +2037,11 @@ toQList result = toQuery::readQuery(CONNECTION, SQLRolePrivs, toQueryParams() << name); while (!result.empty()) { - QString priv = QString(Utils::toShift(result)).toLower(); + QString priv = QString((QString)Utils::toShift(result)).toLower(); QString sql = QString("GRANT %1 TO %2 %3"). arg(priv). arg(dest). - arg(Utils::toShift(result)); + arg((QString)Utils::toShift(result)); if (PROMPT) { ret += "PROMPT "; @@ -2059,14 +2059,14 @@ while (!result.empty()) { QString priv = QString(Utils::toShift(result)).toLower(); - QString schema = ext.intSchema(Utils::toShift(result), false); - QString object = QUOTE(Utils::toShift(result)); + QString schema = ext.intSchema((QString)Utils::toShift(result), false); + QString object = QUOTE((QString)Utils::toShift(result)); QString sql = QString("GRANT %1 ON %2%3 TO %4 %5"). arg(priv.toLower()). arg(schema). arg(object). arg(dest). - arg(Utils::toShift(result)); + arg((QString)Utils::toShift(result)); if (PROMPT) { ret += "PROMPT "; @@ -2139,15 +2139,15 @@ bool first = true; while (!inf.eof()) { - QString col = inf.readValue(); - QString asc = inf.readValue(); + QString col = (QString)inf.readValue(); + QString asc = (QString)inf.readValue(); QString row; if (func.indexIn(col) >= 0) { toQuery def(conn, SQLIndexFunction, toQueryParams() << name << col << owner); if (!def.eof()) { - QString function(def.readValue()); + QString function((QString)def.readValue()); function.replace(quote, ""); if (asc == "DESC") row = QString("%1 DESC").arg(function, 30); @@ -2277,8 +2277,8 @@ QString comma = " "; while (!result.empty()) { - QString partition = Utils::toShift(result); - QString highValue = Utils::toShift(result); + QString partition = (QString)Utils::toShift(result); + QString highValue = (QString)Utils::toShift(result); toQList storage; Utils::toPush(storage, toQValue(" ")); @@ -2341,41 +2341,41 @@ toQList::iterator i = result.begin(); - QString indent = *i; + QString indent = (QString)*i; i++; - QString organization = *i; + QString organization = (QString)*i; i++; - QString cache = *i; + QString cache = (QString)*i; i++; - QString pctUsed = *i; + QString pctUsed = (QString)*i; i++; - QString pctFree = *i; + QString pctFree = (QString)*i; i++; - QString iniTrans = *i; + QString iniTrans = (QString)*i; i++; - QString maxTrans = *i; + QString maxTrans = (QString)*i; i++; - QString initial = *i; + QString initial = (QString)*i; i++; - QString next = *i; + QString next = (QString)*i; i++; - QString minExtents = *i; + QString minExtents = (QString)*i; i++; - QString maxExtents = *i; + QString maxExtents = (QString)*i; i++; - QString pctIncrease = *i; + QString pctIncrease = (QString)*i; i++; - QString freelists = *i; + QString freelists = (QString)*i; i++; - QString freelistGroups = *i; + QString freelistGroups = (QString)*i; i++; - QString bufferPool = *i; + QString bufferPool = (QString)*i; i++; - QString logging = *i; + QString logging = (QString)*i; i++; - QString tablespace = *i; + QString tablespace = (QString)*i; i++; - QString blocks = *i; + QString blocks = (QString)*i; i++; if (!toConfigurationNewSingle::Instance().option(Oracle::SkipStorageExceptTablespaceBool).toBool()) @@ -2717,11 +2717,11 @@ first = false; else ret += "\n , "; - ret += QString(QUOTE(Utils::toShift(cols))).leftJustified(32); + ret += QString(QUOTE((QString)Utils::toShift(cols))).leftJustified(32); ret += " "; - ret += Utils::toShift(cols); - QString def = Utils::toShift(cols); - QString notNull = Utils::toShift(cols); + ret += (QString)Utils::toShift(cols); + QString def = (QString)Utils::toShift(cols); + QString notNull = (QString)Utils::toShift(cols); if (!def.isEmpty()) { ret += " DEFAULT "; @@ -2753,41 +2753,41 @@ toQList::iterator i = result.begin(); - QString indent = *i; + QString indent = (QString)*i; i++; - QString organization = *i; + QString organization = (QString)*i; i++; - QString cache = *i; + QString cache = (QString)*i; i++; - QString pctUsed = *i; + QString pctUsed = (QString)*i; i++; - QString pctFree = *i; + QString pctFree = (QString)*i; i++; - QString iniTrans = *i; + QString iniTrans = (QString)*i; i++; - QString maxTrans = *i; + QString maxTrans = (QString)*i; i++; - QString initial = *i; + QString initial = (QString)*i; i++; - QString next = *i; + QString next = (QString)*i; i++; - QString minExtents = *i; + QString minExtents = (QString)*i; i++; - QString maxExtents = *i; + QString maxExtents = (QString)*i; i++; - QString pctIncrease = *i; + QString pctIncrease = (QString)*i; i++; - QString freelists = *i; + QString freelists = (QString)*i; i++; - QString freelistGroups = *i; + QString freelistGroups = (QString)*i; i++; - QString bufferPool = *i; + QString bufferPool = (QString)*i; i++; - QString logging = *i; + QString logging = (QString)*i; i++; - QString tablespace = *i; + QString tablespace = (QString)*i; i++; - QString blocks = *i; + QString blocks = (QString)*i; i++; if (ext.getResize()) @@ -2836,13 +2836,13 @@ toQuery inf(conn, SQLTableComments, toQueryParams() << name << owner); while (!inf.eof()) { - addDescription(lst, ctx, "COMMENT", inf.readValue()); + addDescription(lst, ctx, "COMMENT", (QString)inf.readValue()); } toQuery col(conn, SQLColumnComments, toQueryParams() << name << owner); while (!col.eof()) { - QString column = col.readValue(); - addDescription(lst, ctx, "COLUMN", QUOTE(column), "COMMENT", col.readValue()); + QString column = (QString)col.readValue(); + addDescription(lst, ctx, "COLUMN", QUOTE(column), "COMMENT", (QString)col.readValue()); } } } @@ -2858,25 +2858,25 @@ toQList result = toQuery::readQuery(CONNECTION, SQLRolePrivs, toQueryParams() << name); while (!result.empty()) { - QString role = QUOTE(Utils::toShift(result)); - addDescription(lst, ctx, "GRANT", "ROLE " + role, Utils::toShift(result)); + QString role = QUOTE((QString)Utils::toShift(result)); + addDescription(lst, ctx, "GRANT", "ROLE " + role, (QString)Utils::toShift(result)); } result = toQuery::readQuery(CONNECTION, SQLSystemPrivs, toQueryParams() << name); while (!result.empty()) { QString priv = QString(Utils::toShift(result)).toLower(); - addDescription(lst, ctx, "GRANT", priv, Utils::toShift(result)); + addDescription(lst, ctx, "GRANT", priv, (QString)Utils::toShift(result)); } result = toQuery::readQuery(CONNECTION, SQLObjectPrivs, toQueryParams() << name); while (!result.empty()) { - QString priv = Utils::toShift(result); - QString schema = ext.intSchema(Utils::toShift(result), false); + QString priv = (QString)Utils::toShift(result); + QString schema = ext.intSchema((QString)Utils::toShift(result), false); QString res = schema; - res += QUOTE(Utils::toShift(result)); - addDescription(lst, ctx, "GRANT", priv.toLower(), "ON", res, Utils::toShift(result)); + res += QUOTE((QString)Utils::toShift(result)); + addDescription(lst, ctx, "GRANT", priv.toLower(), "ON", res, (QString)Utils::toShift(result)); } } @@ -2915,14 +2915,14 @@ int num = 1; while (!inf.eof()) { - QString col = inf.readValue(); - QString asc = inf.readValue(); + QString col = (QString)inf.readValue(); + QString asc = (QString)inf.readValue(); QString row; if (func.indexIn(col) >= 0) { toConnectionSubLoan conn2(ext.connection()); toQuery def(conn2, SQLIndexFunction, toQueryParams() << col << name << owner); - QString function(def.readValue()); + QString function((QString)def.readValue()); inf.readValue(); // we read function index from def, but inf has to be shifted too function.replace(quote, ""); if (asc == "DESC") @@ -2948,16 +2948,16 @@ if (result.empty()) throw qApp->translate("toOracleExtract", "Couldn't find materialised table %1.%2"). arg(QUOTE(owner)).arg(QUOTE(name)); - QString table = Utils::toShift(result); - QString buildMode = Utils::toShift(result); - QString refreshMethod = Utils::toShift(result); - QString refreshMode = Utils::toShift(result); - QString startWith = Utils::toShift(result); - QString next = Utils::toShift(result); - QString usingPK = Utils::toShift(result); - QString masterRBSeg = Utils::toShift(result); - QString updatable = Utils::toShift(result); - QString query = Utils::toShift(result); + QString table = (QString)Utils::toShift(result); + QString buildMode = (QString)Utils::toShift(result); + QString refreshMethod = (QString)Utils::toShift(result); + QString refreshMode = (QString)Utils::toShift(result); + QString startWith = (QString)Utils::toShift(result); + QString next = (QString)Utils::toShift(result); + QString usingPK = (QString)Utils::toShift(result); + QString masterRBSeg = (QString)Utils::toShift(result); + QString updatable = (QString)Utils::toShift(result); + QString query = (QString)Utils::toShift(result); toConnectionSubLoan conn(ext.connection()); toQuery inf(conn, SQLIndexName, toQueryParams() << table << owner); @@ -3060,10 +3060,10 @@ if (result.size() != 4) throw qApp->translate("toOracleExtract", "Couldn't find log %1.%2").arg(owner).arg(name); - QString table = Utils::toShift(result); - QString rowIds = Utils::toShift(result); - QString primaryKey = Utils::toShift(result); - QString filterColumns = Utils::toShift(result); + QString table = (QString)Utils::toShift(result); + QString rowIds = (QString)Utils::toShift(result); + QString primaryKey = (QString)Utils::toShift(result); + QString filterColumns = (QString)Utils::toShift(result); std::list<QString> ctx; ctx.insert(ctx.end(), schema); @@ -3092,7 +3092,7 @@ first = false; else col += ","; - col += QUOTE(inf.readValue()); + col += QUOTE((QString)inf.readValue()); } col += ")"; addDescription(lst, ctx, col); @@ -3147,8 +3147,8 @@ while (!result.empty()) { - QString partition = Utils::toShift(result); - QString highValue = Utils::toShift(result); + QString partition = (QString)Utils::toShift(result); + QString highValue = (QString)Utils::toShift(result); toQList storage; Utils::toPush(storage, toQValue(" ")); @@ -3170,8 +3170,8 @@ toQuery inf(conn, SQLIndexSubPartitionName, toQueryParams() << name << partition << owner); while (!inf.eof()) { - QString sub(inf.readValue()); - QString tablespace(inf.readValue()); + QString sub((QString)inf.readValue()); + QString tablespace((QString)inf.readValue()); addDescription(lst, cctx, "HASH", QString("%1 TABLESPACE %2").arg(QUOTE(sub)).arg(QUOTE(tablespace))); } } @@ -3224,10 +3224,10 @@ return ; toQList result = toQuery::readQuery(ext.connection() , SQLIndexPartition, toQueryParams() << QString::number(ext.getBlockSize()) << owner << name); - QString partitionType = Utils::toShift(result); - QString subPartitionType = Utils::toShift(result); - QString locality = Utils::toShift(result); - QString compressed = Utils::toShift(result); + QString partitionType = (QString)Utils::toShift(result); + QString subPartitionType = (QString)Utils::toShift(result); + QString locality = (QString)Utils::toShift(result); + QString compressed = (QString)Utils::toShift(result); Utils::toUnShift(result, toQValue("")); describeAttributes(ext, lst, ctx, result); @@ -3271,7 +3271,7 @@ i++; i++; i++; - organization = *i; + organization = (QString)*i; } describeTableText(ext, lst, ctx, storage, schema, owner, name); @@ -3279,10 +3279,10 @@ if (ext.getPartition()) { toQList type = toQuery::readQuery(CONNECTION, SQLPartitionType, toQueryParams() << name << owner); - QString partitionType (Utils::toShift(type)); - QString partitionCount (Utils::toShift(type)); - QString subPartitionType (Utils::toShift(type)); - QString subPartitionCount(Utils::toShift(type)); + QString partitionType ((QString)Utils::toShift(type)); + QString partitionCount ((QString)Utils::toShift(type)); + QString subPartitionType ((QString)Utils::toShift(type)); + QString subPartitionCount((QString)Utils::toShift(type)); QString prtstr = QString("PARTITION BY %1 (%2)"). arg(partitionType). @@ -3305,8 +3305,8 @@ while (!segment.empty()) { toQList storage; - QString partition = Utils::toShift(segment); - QString highValue = Utils::toShift(segment); + QString partition = (QString)Utils::toShift(segment); + QString highValue = (QString)Utils::toShift(segment); Utils::toPush(storage, toQValue(" ")); Utils::toPush(storage, toQValue(organization)); for (int i = 0; i < 16; i++) @@ -3325,8 +3325,8 @@ toQueryParams() << name << partition << owner); while (!subs.empty()) { - QString subpart = QUOTE(Utils::toShift(subs)); - QString tabspac = Utils::toShift(subs); + QString subpart = QUOTE((QString)Utils::toShift(subs)); + QString tabspac = (QString)Utils::toShift(subs); addDescription(lst, cctx, subprtstr, subpart); addDescription(lst, cctx, subprtstr, subpart, QString("TABLESPACE %1").arg(QUOTE(tabspac))); @@ -3340,8 +3340,8 @@ toQueryParams() << name << owner); while (!hash.empty()) { - QString partition = QUOTE(Utils::toShift(hash)); - QString tablespac = Utils::toShift(hash); + QString partition = QUOTE((QString)Utils::toShift(hash)); + QString tablespac = (QString)Utils::toShift(hash); addDescription(lst, ctx, prtstr, partition); addDescription(lst, ctx, prtstr, partition, QString("TABLESPACE %1").arg(QUOTE(tablespac))); @@ -3380,9 +3380,9 @@ int num = 1; while (!cols.empty()) { - QString col = QUOTE(Utils::toShift(cols)); - QString line = Utils::toShift(cols); - QString extra = Utils::toShift(cols); + QString col = QUOTE((QString)Utils::toShift(cols)); + QString line = (QString)Utils::toShift(cols); + QString extra = (QString)Utils::toShift(cols); extra = extra.trimmed(); // In Oracle (at least up to 11R2 if default value was set on column you cannot totally // remove it from data dictionary. Default value is reported as being null rather than @@ -3392,7 +3392,7 @@ line += " DEFAULT "; line += extra.trimmed(); // extra could have trailing spaces } - extra = Utils::toShift(cols); // TS 2009-11-15 changed += to = as default value is already + extra = (QString)Utils::toShift(cols); // TS 2009-11-15 changed += to = as default value is already // added as "line" so not required as "extra" addDescription(lst, ctx, "COLUMN", col); addDescription(lst, ctx, "COLUMN", col, line); @@ -3411,11 +3411,11 @@ const QString &owner, const QString &name) const { - QString monitoring = Utils::toShift(result); - QString table = Utils::toShift(result); - QString degree = Utils::toShift(result); - QString instances = Utils::toShift(result); - QString organization = Utils::toShift(result); + QString monitoring = (QString)Utils::toShift(result); + QString table = (QString)Utils::toShift(result); + QString degree = (QString)Utils::toShift(result); + QString instances = (QString)Utils::toShift(result); + QString organization = (QString)Utils::toShift(result); QString ret; addDescription(lst, ctx); @@ -3490,15 +3490,15 @@ toQuery inf(conn, SQLListConstraint, toQueryParams() << owner << name); if (inf.eof()) throw qApp->translate("toOracleExtract", "Constraint %1.%2 doesn't exist").arg(owner).arg(name); - QString table(inf.readValue()); - QString tchr(inf.readValue()); - QString search(inf.readValue()); - QString rOwner(inf.readValue()); - QString rName(inf.readValue()); - QString delRule(inf.readValue()); - QString status(inf.readValue()); - QString defferable(inf.readValue()); - QString deffered(inf.readValue()); + QString table((QString)inf.readValue()); + QString tchr((QString)inf.readValue()); + QString search((QString)inf.readValue()); + QString rOwner((QString)inf.readValue()); + QString rName((QString)inf.readValue()); + QString delRule((QString)inf.readValue()); + QString status((QString)inf.readValue()); + QString defferable((QString)inf.readValue()); + QString deffered((QString)inf.readValue()); QString type = (tchr == "P") ? "PRIMARY KEY" : @@ -3531,7 +3531,7 @@ toQuery query(conn, SQLConstraintTable, toQueryParams() << rOwner << rName); ret += " REFERENCES "; ret += ext.intSchema(rOwner, false); - ret += QUOTE(query.readValue()); + ret += QUOTE((QString)query.readValue()); ret += constraintColumns(ext, rOwner, rName); if (delRule == "CASCADE") @@ -3576,9 +3576,9 @@ toQuery inf(conn, SQLDBLink, toQueryParams() << owner << name); if (inf.eof()) throw qApp->translate("toOracleExtract", "DBLink %1.%2 doesn't exist").arg(owner).arg(name); - QString user(inf.readValue()); - QString password(inf.readValue()); - QString host(inf.readValue()); + QString user((QString)inf.readValue()); + QString password((QString)inf.readValue()); + QString host((QString)inf.readValue()); QString publ = (owner == "PUBLIC") ? " PUBLIC" : ""; QString sql = QString("CREATE%1 DATABASE LINK %2").arg(publ).arg(QUOTE(name)); QString ret; @@ -3612,8 +3612,8 @@ toQuery inf(conn, SQLDirectory, toQueryParams() << name); if (inf.eof()) throw qApp->translate("toOracleExtract", "Directory %1 doesn't exist").arg(name); - QString dname(inf.readValue()); - QString path(inf.readValue()); + QString dname((QString)inf.readValue()); + QString path((QString)inf.readValue()); QString sql = QString("CREATE DIRECTORY %1").arg(QUOTE(dname)); QString ret; if (PROMPT) @@ -3712,17 +3712,17 @@ toQuery inf(conn, segments(ext, SQLPartitionSegmentType), toQueryParams() << segment << partition << owner); if (inf.eof()) throw qApp->translate("toOracleExtract", "Exchange index %1.%2 doesn't exist").arg(owner).arg(name); - QString type = inf.readValue(); - QString blocks = inf.readValue(); + QString type = (QString)inf.readValue(); + QString blocks = (QString)inf.readValue(); QString sql = toSQL::string(SQLExchangeIndex, CONNECTION). arg(type).arg(blocks); toQList result = toQuery::readQuery(CONNECTION, sql, toQueryParams() << segment << partition << owner); - QString degree = Utils::toShift(result); - QString instances = Utils::toShift(result); - QString table = Utils::toShift(result); - QString unique = Utils::toShift(result); - QString bitmap = Utils::toShift(result); + QString degree = (QString)Utils::toShift(result); + QString instances = (QString)Utils::toShift(result); + QString table = (QString)Utils::toShift(result); + QString unique = (QString)Utils::toShift(result); + QString bitmap = (QString)Utils::toShift(result); Utils::toUnShift(result, toQValue("")); @@ -3817,8 +3817,8 @@ toQuery inf(conn, segments(ext, SQLPartitionSegmentType), toQueryParams() << segment << partition << owner); if (inf.eof()) throw qApp->translate("toOracleExtract", "Exchange table %1.%2 doesn't exist").arg(owner).arg(name); - QString type = inf.readValue(); - QString blocks = inf.readValue(); + QString type = (QString)inf.readValue(); + QString blocks = (QString)inf.readValue(); QString sql = toSQL::string(SQLExchangeTable, CONNECTION).arg(type).arg(blocks); toQList result = toQuery::readQuery(CONNECTION, sql, toQueryParams() << segment << partition << owner); @@ -4044,21 +4044,21 @@ if (res.size() != 10) throw qApp->translate("toOracleExtract", "Couldn't find index %1.%2").arg(owner).arg(name); - QString partitioned = Utils::toShift(res); - QString table = Utils::toShift(res); - QString tableOwner = Utils::toShift(res); - QString reverse = Utils::toShift(res); - QString unique = Utils::toShift(res); - QString bitmap = Utils::toShift(res); - QString domain = Utils::toShift(res); - QString domOwner = Utils::toShift(res); - QString domName = Utils::toShift(res); - QString domParam = Utils::toShift(res); + QString partitioned = (QString)Utils::toShift(res); + QString table = (QString)Utils::toShift(res); + QString tableOwner = (QString)Utils::toShift(res); + QString reverse = (QString)Utils::toShift(res); + QString unique = (QString)Utils::toShift(res); + QString bitmap = (QString)Utils::toShift(res); + QString domain = (QString)Utils::toShift(res); + QString domOwner = (QString)Utils::toShift(res); + QString domName = (QString)Utils::toShift(res); + QString domParam = (QString)Utils::toShift(res); toQList storage = toQuery::readQuery(ext.connection(), segments(ext, SQLIndexSegment), toQueryParams() << name << owner); - QString degree = Utils::toShift(storage); - QString instances = Utils::toShift(storage); - QString compressed = Utils::toShift(storage); + QString degree = (QString)Utils::toShift(storage); + QString instances = (QString)Utils::toShift(storage); + QString compressed = (QString)Utils::toShift(storage); QString schema2 = ext.intSchema(tableOwner, false); @@ -4205,9 +4205,9 @@ while (!info.empty()) { ret += " "; - ret += Utils::toShift(info); + ret += (QString)Utils::toShift(info); ret += " "; - ret += Utils::toShift(info); + ret += (QString)Utils::toShift(info); ret += "\n"; } ret += ";\n\n"; @@ -4248,7 +4248,7 @@ QString ret; if (PROMPT) ret = QString("PROMPT CREATE ROLE %1\n\n").arg(QUOTE(name)); - ret += QString("CREATE ROLE %1 %2;\n\n").arg(QUOTE(name)).arg(Utils::toShift(info)); + ret += QString("CREATE ROLE %1 %2;\n\n").arg(QUOTE(name)).arg((QString)Utils::toShift(info)); ret += grantedPrivs(ext, QUOTE(name), name, 1); return ret; } @@ -4282,12 +4282,12 @@ const QString &name) const { toQList result = toQuery::readQuery(ext.connection(), SQLRollbackSegment, toQueryParams() << name); - QString isPublic = Utils::toShift(result); - QString tablespaceName = Utils::toShift(result); - QString initialExtent = Utils::toShift(result); - QString nextExtent = Utils::toShift(result); - QString minExtent = Utils::toShift(result); - QString maxExtent = Utils::toShift(result); + QString isPublic = (QString)Utils::toShift(result); + QString tablespaceName = (QString)Utils::toShift(result); + QString initialExtent = (QString)Utils::toShift(result); + QString nextExtent = (QString)Utils::toShift(result); + QString minExtent = (QString)Utils::toShift(result); + QString maxExtent = (QString)Utils::toShift(result); QString ret; if (PROMPT) @@ -4365,7 +4365,7 @@ while (!info.empty()) { ret += " "; - ret += Utils::toShift(info); + ret += (QString)Utils::toShift(info); ret += "\n"; } ret += ";\n\n"; @@ -4410,9 +4410,9 @@ if (info.empty()) throw qApp->translate("toOracleExtract", "Couldn't find synonym %1.%2").arg(owner).arg(name); - QString tableOwner = Utils::toShift(info); - QString tableName = Utils::toShift(info); - QString dbLink = Utils::toShift(info); + QString tableOwner = (QString)Utils::toShift(info); + QString tableName = (QString)Utils::toShift(info); + QString dbLink = (QString)Utils::toShift(info); if (dbLink == "NULL") dbLink = ""; else @@ -4644,8 +4644,8 @@ if (inf.eof()) throw qApp->translate("toOracleExtract", "Couldn't find table %1.%2").arg(owner).arg(name); - QString partitioned(inf.readValue()); - QString iot_type(inf.readValue()); + QString partitioned((QString)inf.readValue()); + QString iot_type((QString)inf.readValue()); if (iot_type == "IOT") { @@ -4773,7 +4773,7 @@ throw qApp->translate("toOracleExtract", "Couldn't find table %1.%2").arg(owner).arg(name); inf.readValue(); - QString iotType(inf.readValue()); + QString iotType((QString)inf.readValue()); toQList constraints = toQuery::readQuery(CONNECTION, SQLTableConstraints, toQueryParams() << name << owner); toQList indexes = toQuery::readQuery(CONNECTION, SQLIndexNames, toQueryParams() << name << owner); @@ -4788,9 +4788,9 @@ { for (toQList::iterator i = constraints.begin(); i != constraints.end(); i++) { - QString consType = *i; + QString consType = (QString)*i; i++; - QString consName = *i; + QString consName = (QString)*i; i++; if (consType == "P" && consName == indName && owner == indOwner) { @@ -4807,16 +4807,16 @@ while (!constraints.empty()) { - QString type = Utils::toShift(constraints); - QString name = Utils::toShift(constraints); - QString search = Utils::toShift(constraints); + QString type = (QString)Utils::toShift(constraints); + QString name = (QString)Utils::toShift(constraints); + QString search = (QString)Utils::toShift(constraints); if ((type != "P" || iotType != "IOT") && !search.contains(" IS NOT NULL")) ret += createConstraint(ext, schema, owner, name); } toQList triggers = toQuery::readQuery(CONNECTION, SQLTableTriggers, toQueryParams() << name << owner); while (!triggers.empty()) - ret += createTrigger(ext, schema, owner, Utils::toShift(triggers)); + ret += createTrigger(ext, schema, owner, (QString)Utils::toShift(triggers)); return ret; } @@ -4871,7 +4871,7 @@ first = false; else line += ","; - QString val = query.readValue(); + QString val = (QString)query.readValue(); if (dates[i]) { if (val.isNull()) @@ -4918,7 +4918,7 @@ QString ret; toQList constraints = toQuery::readQuery(ext.connection(), SQLTableReferences, toQueryParams() << name << owner); while (!constraints.empty()) - ret += createConstraint(ext, schema, owner, Utils::toShift(constraints)); + ret += createConstraint(ext, schema, owner, (QString)Utils::toShift(constraints)); return ret; } @@ -5078,16 +5078,16 @@ if (info.size() != 10) throw qApp->translate("toOracleExtract", "Couldn't find tablespace %1").arg(name); - QString initial = Utils::toShift(info); - QString next = Utils::toShift(info); - QString minExtents = Utils::toShift(info); - QString maxExtents = Utils::toShift(info); - QString pctIncrease = Utils::toShift(info); - QString minExtlen = Utils::toShift(info); - QString contents = Utils::toShift(info); - QString logging = Utils::toShift(info); - QString extentManagement = Utils::toShift(info); - QString allocationType = Utils::toShift(info); + QString initial = (QString)Utils::toShift(info); + QString next = (QString)Utils::toShift(info); + QString minExtents = (QString)Utils::toShift(info); + QString maxExtents = (QString)Utils::toShift(info); + QString pctIncrease = (QString)Utils::toShift(info); + QString minExtlen = (QString)Utils::toShift(info); + QString contents = (QString)Utils::toShift(info); + QString logging = (QString)Utils::toShift(info); + QString extentManagement = (QString)Utils::toShift(info); + QString allocationType = (QString)Utils::toShift(info); QString ret; QString sql; @@ -5115,11 +5115,11 @@ QString comma = " "; while (!files.empty()) { - QString fileName = Utils::toShift(files); - QString bytes = Utils::toShift(files); - QString autoExtensible = Utils::toShift(files); - QString maxBytes = Utils::toShift(files); - QString incrementBy = Utils::toShift(files); + QString fileName = (QString)Utils::toShift(files); + QString bytes = (QString)Utils::toShift(files); + QString autoExtensible = (QString)Utils::toShift(files); + QString maxBytes = (QString)Utils::toShift(files); + QString incrementBy = (QString)Utils::toShift(files); ret += QString("%1 '%2' SIZE %3 REUSE\n"). arg(comma). @@ -5226,16 +5226,16 @@ toQList result = toQuery::readQuery(ext.connection(), SQLTriggerInfo, toQueryParams() << name << owner); if (result.size() != 10) throw qApp->translate("toOracleExtract", "Couldn't find trigger %1.%2").arg(owner).arg(name); - QString triggerType = Utils::toShift(result); - QString event = Utils::toShift(result); - QString tableOwner = Utils::toShift(result); - QString table = Utils::toShift(result); - QString baseType = Utils::toShift(result); - QString refNames = Utils::toShift(result); - QString description = Utils::toShift(result); - QString when = Utils::toShift(result); - QString body = Utils::toShift(result); - QString status = Utils::toShift(result); + QString triggerType = (QString)Utils::toShift(result); + QString event = (QString)Utils::toShift(result); + QString tableOwner = (QString)Utils::toShift(result); + QString table = (QString)Utils::toShift(result); + QString baseType = (QString)Utils::toShift(result); + QString refNames = (QString)Utils::toShift(result); + QString description = (QString)Utils::toShift(result); + QString when = (QString)Utils::toShift(result); + QString body = (QString)Utils::toShift(result); + QString status = (QString)Utils::toShift(result); QString trgType; if (triggerType.indexOf("BEFORE") >= 0) @@ -5363,10 +5363,10 @@ if (info.size() != 4) throw qApp->translate("toOracleExtract", "Couldn't find user %1").arg(name); - QString password = Utils::toShift(info); - QString profile = Utils::toShift(info); - QString defaultTablespace = Utils::toShift(info); - QString temporaryTablespace = Utils::toShift(info); + QString password = (QString)Utils::toShift(info); + QString profile = (QString)Utils::toShift(info); + QString defaultTablespace = (QString)Utils::toShift(info); + QString temporaryTablespace = (QString)Utils::toShift(info); QString ret; QString nam; @@ -5391,8 +5391,8 @@ toQList quota = toQuery::readQuery(ext.connection(), SQLUserQuotas, toQueryParams() << name); while (!quota.empty()) { - QString siz = Utils::toShift(quota); - QString tab = Utils::toShift(quota); + QString siz = (QString)Utils::toShift(quota); + QString tab = (QString)Utils::toShift(quota); ret += QString(" QUOTA %1 ON %2\n"). arg(siz). arg(QUOTE(tab)); @@ -5433,7 +5433,7 @@ if (source.empty()) throw qApp->translate("toOracleExtract", "Couldn't find view %1.%2").arg(QUOTE(owner)).arg(QUOTE(name)); - QString text = Utils::toShift(source); + QString text = (QString)Utils::toShift(source); QString ret; QString sql = QString("CREATE OR REPLACE VIEW %1%2\n").arg(schema).arg(QUOTE(name)); if (PROMPT) @@ -5450,7 +5450,7 @@ QString sep = "\n "; while (!cols.empty()) { - QString str = Utils::toShift(cols); + QString str = (QString)Utils::toShift(cols); ret += sep; ret += QUOTE(str); sep = "\n , "; @@ -5477,15 +5477,15 @@ toQuery inf(conn, SQLListConstraint, toQueryParams() << owner << name); if (inf.eof()) throw qApp->translate("toOracleExtract", "Constraint %1.%2 doesn't exist").arg(owner).arg(name); - QString table(inf.readValue()); - QString tchr(inf.readValue()); - QString search(inf.readValue()); - QString rOwner(inf.readValue()); - QString rName(inf.readValue()); - QString delRule(inf.readValue()); - QString status(inf.readValue()); - QString defferable(inf.readValue()); - QString deffered(inf.readValue()); + QString table((QString)inf.readValue()); + QString tchr((QString)inf.readValue()); + QString search((QString)inf.readValue()); + QString rOwner((QString)inf.readValue()); + QString rName((QString)inf.readValue()); + QString delRule((QString)inf.readValue()); + QString status((QString)inf.readValue()); + QString defferable((QString)inf.readValue()); + QString deffered((QString)inf.readValue()); QString type = (tchr == "P") ? "PRIMARY KEY" : @@ -5518,7 +5518,7 @@ toQuery query(conn, SQLConstraintTable, toQueryParams() << rOwner << rName); ret += " REFERENCES "; ret += ext.intSchema(rOwner, false); - ret += QUOTE(query.readValue()); + ret += QUOTE((QString)query.readValue()); ret += constraintColumns(ext, rOwner, rName); if (delRule == "CASCADE") @@ -5554,9 +5554,9 @@ toQuery inf(conn, SQLDBLink, toQueryParams() << owner << name); if (inf.eof()) throw qApp->translate("toOracleExtract", "DBLink %1.%2 doesn't exist").arg(owner).arg(name); - QString user(inf.readValue()); - QString password(inf.readValue()); - QString host(inf.readValue()); + QString user((QString)inf.readValue()); + QString password((QString)inf.readValue()); + QString host((QString)inf.readValue()); QString publ = (owner == "PUBLIC") ? "PUBLIC" : ""; QString sql = QString("CREATE%1 DATABASE LINK %2").arg(publ).arg(QUOTE(name)); QString ret; @@ -5587,16 +5587,16 @@ toQuery inf(conn, segments(ext, SQLPartitionSegmentType), toQueryParams() << segment << partition << owner); if (inf.eof()) throw qApp->translate("toOracleExtract", "Exchange index %1.%2 doesn't exist").arg(owner).arg(name); - QString type = inf.readValue(); - QString blocks = inf.readValue(); + QString type = (QString)inf.readValue(); + QString blocks = (QString)inf.readValue(); QString sql = toSQL::string(SQLExchangeIndex, CONNECTION).arg(type).arg(blocks); toQList result = toQuery::readQuery(CONNECTION, sql, toQueryParams() << segment << partition << owner); - QString degree = Utils::toShift(result); - QString instances = Utils::toShift(result); - QString table = Utils::toShift(result); - QString unique = Utils::toShift(result); - QString bitmap = Utils::toShift(result); + QString degree = (QString)Utils::toShift(result); + QString instances = (QString)Utils::toShift(result); + QString table = (QString)Utils::toShift(result); + QString unique = (QString)Utils::toShift(result); + QString bitmap = (QString)Utils::toShift(result); Utils::toUnShift(result, toQValue("")); @@ -5635,8 +5635,8 @@ toQuery inf(conn, segments(ext, SQLPartitionSegmentType), toQueryParams() << segment << partition << owner); if (inf.eof()) throw qApp->translate("toOracleExtract", "Exchange table %1.%2 doesn't exist").arg(owner).arg(name); - QString type = inf.readValue(); - QString blocks = inf.readValue(); + QString type = (QString)inf.readValue(); + QString blocks = (QString)inf.readValue(); QString sql = toSQL::string(SQLExchangeTable, CONNECTION).arg(type).arg(blocks); toQList result = toQuery::readQuery(CONNECTION, sql, toQueryParams() << segment << partition << owner); @@ -5670,21 +5670,21 @@ if (res.size() != 10) throw qApp->translate("toOracleExtract", "Couldn't find index %1.%2").arg(owner).arg(name); - QString partitioned = Utils::toShift(res); - QString table = Utils::toShift(res); - QString tableOwner = Utils::toShift(res); - QString reverse = Utils::toShift(res); - QString unique = Utils::toShift(res); - QString bitmap = Utils::toShift(res); - QString domain = Utils::toShift(res); - QString domOwner = Utils::toShift(res); - QString domName = Utils::toShift(res); - QString domParam = Utils::toShift(res); + QString partitioned = (QString)Utils::toShift(res); + QString table = (QString)Utils::toShift(res); + QString tableOwner = (QString)Utils::toShift(res); + QString reverse = (QString)Utils::toShift(res); + QString unique = (QString)Utils::toShift(res); + QString bitmap = (QString)Utils::toShift(res); + QString domain = (QString)Utils::toShift(res); + QString domOwner = (QString)Utils::toShift(res); + QString domName = (QString)Utils::toShift(res); + QString domParam = (QString)Utils::toShift(res); toQList storage = toQuery::readQuery(CONNECTION, segments(ext, SQLIndexSegment), toQueryParams() << name << owner); - QString degree = Utils::toShift(storage); - QString instances = Utils::toShift(storage); - QString compressed = Utils::toShift(storage); + QString degree = (QString)Utils::toShift(storage); + QString instances = (QString)Utils::toShift(storage); + QString compressed = (QString)Utils::toShift(storage); QString schema2 = ext.intSchema(tableOwner, false); @@ -5789,8 +5789,8 @@ while (!info.empty()) { - QString nam = Utils::toShift(info); - QString val = Utils::toShift(info); + QString nam = (QString)Utils::toShift(info); + QString val = (QString)Utils::toShift(info); addDescription(lst, ctx, nam, val); } } @@ -5812,7 +5812,7 @@ ctx.insert(ctx.end(), "ROLE"); ctx.insert(ctx.end(), QUOTE(name)); addDescription(lst, ctx); - addDescription(lst, ctx, "INFO", Utils::toShift(info)); + addDescription(lst, ctx, "INFO", (QString)Utils::toShift(info)); describePrivs(ext, lst, ctx, name); } @@ -5823,12 +5823,12 @@ const QString &name) const { toQList result = toQuery::readQuery(CONNECTION, SQLRollbackSegment, toQueryParams() << name); - QString isPublic = Utils::toShift(result); - QString tablespaceName = Utils::toShift(result); - QString initialExtent = Utils::toShift(result); - QString nextExtent = Utils::toShift(result); - QString minExtent = Utils::toShift(result); - QString maxExtent = Utils::toShift(result); + QString isPublic = (QString)Utils::toShift(result); + QString tablespaceName = (QString)Utils::toShift(result); + QString initialExtent = (QString)Utils::toShift(result); + QString nextExtent = (QString)Utils::toShift(result); + QString minExtent = (QString)Utils::toShift(result); + QString maxExtent = (QString)Utils::toShift(result); std::list<QString> ctx; ctx.insert(ctx.end(), "NONE"); @@ -5869,7 +5869,7 @@ addDescription(lst, ctx); while (!info.empty()) - addDescription(lst, ctx, Utils::toShift(info)); + addDescription(lst, ctx, (QString)Utils::toShift(info)); } void toOracleExtract::describeSnapshot(toExtract &ext, @@ -5902,9 +5902,9 @@ if (info.empty()) throw qApp->translate("toOracleExtract", "Couldn't find synonym %1.%2").arg(owner).arg(name); - QString tableOwner = Utils::toShift(info); - QString tableName = Utils::toShift(info); - QString dbLink = Utils::toShift(info); + QString tableOwner = (QString)Utils::toShift(info); + QString tableName = (QString)Utils::toShift(info); + QString dbLink = (QString)Utils::toShift(info); if (dbLink == "NULL") dbLink = ""; else @@ -5929,8 +5929,8 @@ if (inf.eof()) throw qApp->translate("toOracleExtract", "Couldn't find table %1.%2").arg(owner).arg(name); - QString partitioned(inf.readValue()); - QString iot_type(inf.readValue()); + QString partitioned((QString)inf.readValue()); + QString iot_type((QString)inf.readValue()); std::list<QString> ctx; ctx.insert(ctx.end(), schema); @@ -5968,7 +5968,7 @@ while (!indexes.empty()) { QString indOwner(Utils::toShift(indexes)); - describeIndex(ext, lst, ext.intSchema(indOwner, true), indOwner, Utils::toShift(indexes)); + describeIndex(ext, lst, ext.intSchema(indOwner, true), indOwner, (QString)Utils::toShift(indexes)); } toConnectionSubLoan conn(ext.connection()); @@ -5977,13 +5977,13 @@ throw qApp->translate("toOracleExtract", "Couldn't find table %1.%2").arg(owner).arg(name); inf.readValue(); - QString iotType(inf.readValue()); + QString iotType((QString)inf.readValue()); toQList constraints = toQuery::readQuery(CONNECTION, SQLTableConstraints, toQueryParams() << name << owner); while (!constraints.empty()) { if ( (QString)Utils::toShift(constraints) != "P" || iotType != "IOT") - describeConstraint(ext, lst, schema, owner, Utils::toShift(constraints)); + describeConstraint(ext, lst, schema, owner, (QString)Utils::toShift(constraints)); else Utils::toShift(constraints); Utils::toShift(constraints); @@ -5991,7 +5991,7 @@ toQList triggers = toQuery::readQuery(ext.connection(), SQLTableTriggers, toQueryParams() << name << owner); while (!triggers.empty()) - describeTrigger(ext,... [truncated message content] |
From: <ibr...@us...> - 2014-11-24 18:29:07
|
Revision: 5159 http://sourceforge.net/p/tora/code/5159 Author: ibre5041 Date: 2014-11-24 18:28:57 +0000 (Mon, 24 Nov 2014) Log Message: ----------- fromAscii is deprecated, use fromLatin1 instead Modified Paths: -------------- trunk/tora/src/editor/toscintilla.cpp trunk/tora/src/editor/tosqltext.cpp trunk/tora/src/ts_log/toostream.h trunk/tora/src/ts_log/ts_log_utils.h Modified: trunk/tora/src/editor/toscintilla.cpp =================================================================== --- trunk/tora/src/editor/toscintilla.cpp 2014-11-24 18:16:39 UTC (rev 5158) +++ trunk/tora/src/editor/toscintilla.cpp 2014-11-24 18:28:57 UTC (rev 5159) @@ -112,7 +112,7 @@ super::setUtf8(true); setAcceptDrops(true); // QWidget::setAcceptDrops - super::setMarginWidth(0, QString::fromAscii("00")); + super::setMarginWidth(0, QString::fromLatin1("00")); } toScintilla::~toScintilla() @@ -637,7 +637,7 @@ if (lexer() == NULL) return QString::null; - static const QString SPAN_CLASS = QString::fromAscii("<span class=\"S%1\">"); + static const QString SPAN_CLASS = QString::fromLatin1("<span class=\"S%1\">"); clearIndicatorRange(0, 0, lines(), lineLength(lines()-1), m_searchIndicator); recolor(); Modified: trunk/tora/src/editor/tosqltext.cpp =================================================================== --- trunk/tora/src/editor/tosqltext.cpp 2014-11-24 18:16:39 UTC (rev 5158) +++ trunk/tora/src/editor/tosqltext.cpp 2014-11-24 18:28:57 UTC (rev 5159) @@ -71,7 +71,7 @@ // QsciScintilla::setFolding(QsciScintilla::BoxedFoldStyle); QsciScintilla::setMarginType(2, TextMarginRightJustified); - QsciScintilla::setMarginWidth(2, QString::fromAscii("009")); + QsciScintilla::setMarginWidth(2, QString::fromLatin1("009")); m_parserTimer->setInterval(5000); // every 5s m_parserTimer->setSingleShot(true); // repeat only if bg thread responded Modified: trunk/tora/src/ts_log/toostream.h =================================================================== --- trunk/tora/src/ts_log/toostream.h 2014-11-24 18:16:39 UTC (rev 5158) +++ trunk/tora/src/ts_log/toostream.h 2014-11-24 18:28:57 UTC (rev 5159) @@ -98,7 +98,7 @@ void putChars(char const* begin, std::streamsize len) { - QString s = QString::fromAscii(begin, len); + QString s = QString::fromLatin1(begin, len); sender.emit_send(s); } Modified: trunk/tora/src/ts_log/ts_log_utils.h =================================================================== --- trunk/tora/src/ts_log/ts_log_utils.h 2014-11-24 18:16:39 UTC (rev 5158) +++ trunk/tora/src/ts_log/ts_log_utils.h 2014-11-24 18:28:57 UTC (rev 5159) @@ -7,12 +7,12 @@ #ifdef __GNUC__ #include <string.h> -#define __QHERE__ QString::fromAscii(((strrchr(__FILE__, '/') ?: __FILE__ - 1) + 1)) + ":" __HERE1__(__LINE__) +#define __QHERE__ QString::fromLatin1(((strrchr(__FILE__, '/') ?: __FILE__ - 1) + 1)) + ":" __HERE1__(__LINE__) #define __HERE__ std::string(((strrchr(__FILE__, '/') ?: __FILE__ - 1) + 1)) + ":" __HERE1__(__LINE__) #define __HERE1__(x) STR(x)"\t" + __PRETTY_FUNCTION__ #define STR(a) #a #else -#define __QHERE__ QString::fromAscii(__FILE__) + ":"__HERE1__(__LINE__) +#define __QHERE__ QString::fromLatin1(__FILE__) + ":"__HERE1__(__LINE__) #define __HERE__ std::string(__FILE__) + ":"__HERE1__(__LINE__) #define __HERE1__(x) STR(x)"\t" + __FUNCSIG__ #define STR(a) #a This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ibr...@us...> - 2014-11-24 19:21:21
|
Revision: 5161 http://sourceforge.net/p/tora/code/5161 Author: ibre5041 Date: 2014-11-24 19:21:12 +0000 (Mon, 24 Nov 2014) Log Message: ----------- QT5 port (rest) thx to Petr Bena Modified Paths: -------------- trunk/tora/src/docklets/toviewconnections.cpp trunk/tora/src/editor/toscintilla.cpp trunk/tora/src/editor/tosqltext.cpp trunk/tora/src/migratetool/sqldeveloper.cpp trunk/tora/src/migratetool/squirrelsql.cpp trunk/tora/src/result/tomvc.h trunk/tora/src/result/toresulttabledata.cpp trunk/tora/src/shortcuteditor/shortcuteditordialog.cpp trunk/tora/src/shortcuteditor/shortcutmodel.cpp trunk/tora/src/templates/tosqledit.cpp trunk/tora/src/templates/totemplate.cpp trunk/tora/src/tools/toalert.cpp trunk/tora/src/tools/toanalyze.cpp trunk/tora/src/tools/toawr.cpp trunk/tora/src/tools/tobrowser.cpp trunk/tora/src/tools/toscripttreemodel.cpp trunk/tora/src/tools/tostorage.cpp trunk/tora/src/tools/toworksheet.cpp Modified: trunk/tora/src/docklets/toviewconnections.cpp =================================================================== --- trunk/tora/src/docklets/toviewconnections.cpp 2014-11-24 18:56:11 UTC (rev 5160) +++ trunk/tora/src/docklets/toviewconnections.cpp 2014-11-24 19:21:12 UTC (rev 5161) @@ -43,7 +43,7 @@ #include <QHeaderView> #include <QTableView> -#include <QtGui/QSortFilterProxyModel> +#include <QSortFilterProxyModel> REGISTER_VIEW("Connection", toViewConnections); Modified: trunk/tora/src/editor/toscintilla.cpp =================================================================== --- trunk/tora/src/editor/toscintilla.cpp 2014-11-24 18:56:11 UTC (rev 5160) +++ trunk/tora/src/editor/toscintilla.cpp 2014-11-24 19:21:12 UTC (rev 5161) @@ -42,12 +42,13 @@ #include "core/toconf.h" #include <QtGui/QClipboard> -#include <QtGui/QPrintDialog> +#include <QPrintDialog> #include <QtXml/QDomDocument> #include <QShortcut> #include <QtCore/QtDebug> #include <QMenu> #include <QtGui/QClipboard> +#include <QtCore/QMimeData> #include <Qsci/qsciprinter.h> #include <Qsci/qscilexersql.h> @@ -582,22 +583,22 @@ if (!isReadOnly()) { - action = popup->addAction(QIcon(undo_xpm), tr("&Undo"), this, SLOT(undo())); + action = popup->addAction(QIcon(QPixmap(undo_xpm)), tr("&Undo"), this, SLOT(undo())); action->setShortcut(QKeySequence::Undo); action->setEnabled(isUndoAvailable()); - action = popup->addAction(QIcon(redo_xpm), tr("&Redo"), this, SLOT(redo())); + action = popup->addAction(QIcon(QPixmap(redo_xpm)), tr("&Redo"), this, SLOT(redo())); action->setShortcut(QKeySequence::Redo); action->setEnabled(isRedoAvailable()); popup->addSeparator(); - action = popup->addAction(QIcon(cut_xpm), tr("Cu&t"), this, SLOT(cut())); + action = popup->addAction(QIcon(QPixmap(cut_xpm)), tr("Cu&t"), this, SLOT(cut())); action->setShortcut(QKeySequence::Cut); action->setToolTip(tr("Cut to clipboard")); action->setEnabled(hasSelectedText()); - action = popup->addAction(QIcon(copy_xpm), + action = popup->addAction(QIcon(QPixmap(copy_xpm)), tr("&Copy"), this, SLOT(copy())); @@ -605,7 +606,7 @@ action->setToolTip(tr("Copy to clipboard")); action->setEnabled(hasSelectedText()); - action = popup->addAction(QIcon(paste_xpm), + action = popup->addAction(QIcon(QPixmap(paste_xpm)), tr("&Paste"), this, SLOT(paste())); Modified: trunk/tora/src/editor/tosqltext.cpp =================================================================== --- trunk/tora/src/editor/tosqltext.cpp 2014-11-24 18:56:11 UTC (rev 5160) +++ trunk/tora/src/editor/tosqltext.cpp 2014-11-24 19:21:12 UTC (rev 5161) @@ -71,7 +71,7 @@ // QsciScintilla::setFolding(QsciScintilla::BoxedFoldStyle); QsciScintilla::setMarginType(2, TextMarginRightJustified); - QsciScintilla::setMarginWidth(2, QString::fromLatin1("009")); + QsciScintilla::setMarginWidth(2, QString("009")); m_parserTimer->setInterval(5000); // every 5s m_parserTimer->setSingleShot(true); // repeat only if bg thread responded Modified: trunk/tora/src/migratetool/sqldeveloper.cpp =================================================================== --- trunk/tora/src/migratetool/sqldeveloper.cpp 2014-11-24 18:56:11 UTC (rev 5160) +++ trunk/tora/src/migratetool/sqldeveloper.cpp 2014-11-24 19:21:12 UTC (rev 5161) @@ -36,7 +36,7 @@ #include <QMessageBox> #include <QFileDialog> -#include <QtXml/QXmlStreamReader> +#include <QtCore/QXmlStreamReader> #include <QtCore/QtDebug> Modified: trunk/tora/src/migratetool/squirrelsql.cpp =================================================================== --- trunk/tora/src/migratetool/squirrelsql.cpp 2014-11-24 18:56:11 UTC (rev 5160) +++ trunk/tora/src/migratetool/squirrelsql.cpp 2014-11-24 19:21:12 UTC (rev 5161) @@ -36,7 +36,7 @@ #include <QMessageBox> #include <QFileDialog> -#include <QtXml/QXmlStreamReader> +#include <QtCore/QXmlStreamReader> #include <QtCore/QtDebug> Modified: trunk/tora/src/result/tomvc.h =================================================================== --- trunk/tora/src/result/tomvc.h 2014-11-24 18:56:11 UTC (rev 5160) +++ trunk/tora/src/result/tomvc.h 2014-11-24 19:21:12 UTC (rev 5161) @@ -215,8 +215,8 @@ { struct toQuery::HeaderDesc d; - d.name = QString::fromLatin1("#"); - d.datatype = QString::fromLatin1("RowNumber"); + d.name = QString("#"); + d.datatype = QString("RowNumber"); h.prepend(d); } Model::setHeaders(h); Modified: trunk/tora/src/result/toresulttabledata.cpp =================================================================== --- trunk/tora/src/result/toresulttabledata.cpp 2014-11-24 18:56:11 UTC (rev 5160) +++ trunk/tora/src/result/toresulttabledata.cpp 2014-11-24 19:21:12 UTC (rev 5161) @@ -536,9 +536,9 @@ unsigned toResultTableData::commitUpdate(toConnectionSubLoan &conn, toResultModelEdit::ChangeSet &change) { - static const QString UPDATE = QString::fromLatin1("UPDATE %1.%2 SET %3 WHERE 1=1 %4"); - static const QString CONJUNCTION = QString::fromLatin1(" AND %1 = %2"); - static const QString ASSIGNMENT = QString::fromLatin1("%1 = %2"); + static const QString UPDATE = QString("UPDATE %1.%2 SET %3 WHERE 1=1 %4"); + static const QString CONJUNCTION = QString(" AND %1 = %2"); + static const QString ASSIGNMENT = QString("%1 = %2"); if (Model->getPriKeys().empty()) { Modified: trunk/tora/src/shortcuteditor/shortcuteditordialog.cpp =================================================================== --- trunk/tora/src/shortcuteditor/shortcuteditordialog.cpp 2014-11-24 18:56:11 UTC (rev 5160) +++ trunk/tora/src/shortcuteditor/shortcuteditordialog.cpp 2014-11-24 19:21:12 UTC (rev 5161) @@ -11,7 +11,7 @@ #include <QFileDialog> #include <QtCore/QTextStream> #if QT_VERSION >= 0x040300 -#include <QtXml/QXmlStreamReader> +#include <QXmlStreamReader> #else #warning "QXmlStreamReader is disabled. Qt 4.3.x required." #endif Modified: trunk/tora/src/shortcuteditor/shortcutmodel.cpp =================================================================== --- trunk/tora/src/shortcuteditor/shortcutmodel.cpp 2014-11-24 18:56:11 UTC (rev 5160) +++ trunk/tora/src/shortcuteditor/shortcutmodel.cpp 2014-11-24 19:21:12 UTC (rev 5161) @@ -45,7 +45,7 @@ return QVariant(index.column() == 0 ? m_values.at(index.row()).first : m_values.at(index.row()).second); } if (role == Qt::BackgroundRole && index.column() == 0 && m_values.at(index.row()).first.isEmpty()) - return QVariant(Qt::red); + return QColor(Qt::red); return QVariant(); } Modified: trunk/tora/src/templates/tosqledit.cpp =================================================================== --- trunk/tora/src/templates/tosqledit.cpp 2014-11-24 18:56:11 UTC (rev 5160) +++ trunk/tora/src/templates/tosqledit.cpp 2014-11-24 19:21:12 UTC (rev 5161) @@ -98,7 +98,7 @@ virtual void customSetup() { toEditMenuSingle::Instance().addAction( - QIcon(tosqledit_xpm), + QIcon(QPixmap(tosqledit_xpm)), qApp->translate("toSQLEditTool", "&Edit SQL..."), this, SLOT(createWindow())); @@ -166,29 +166,29 @@ QToolBar *toolbar = Utils::toAllocBar(this, tr("SQL editor")); layout()->addWidget(toolbar); - toolbar->addAction(QIcon(fileopen_xpm), + toolbar->addAction(QIcon(QPixmap(fileopen_xpm)), tr("Load SQL dictionary file"), this, SLOT(loadSQL())); - toolbar->addAction(QIcon(filesave_xpm), + toolbar->addAction(QIcon(QPixmap(filesave_xpm)), tr("Save modified SQL to dictionary file"), this, SLOT(saveSQL())); toolbar->addSeparator(); CommitButton = toolbar->addAction( - QIcon(commit_xpm), + QIcon(QPixmap(commit_xpm)), tr("Save this entry in the dictionary"), this, SLOT(commitChanges())); TrashButton = toolbar->addAction( - QIcon(trash_xpm), + QIcon(QPixmap(trash_xpm)), tr("Delete this version from the SQL dictionary"), this, SLOT(deleteVersion())); - toolbar->addAction(QIcon(add_xpm), + toolbar->addAction(QIcon(QPixmap(add_xpm)), tr("Start new SQL definition"), this, SLOT(newSQL())); Modified: trunk/tora/src/templates/totemplate.cpp =================================================================== --- trunk/tora/src/templates/totemplate.cpp 2014-11-24 18:56:11 UTC (rev 5160) +++ trunk/tora/src/templates/totemplate.cpp 2014-11-24 19:21:12 UTC (rev 5161) @@ -895,7 +895,7 @@ while (Query->hasMore()) { toTreeWidgetItem *item = Parent->createChild((QString)Query->readValue()); - for (unsigned int j = 1; j < desc.size(); j++) + for (int j = 1; j < desc.size(); j++) item->setText(j, (QString)Query->readValue()); } } Modified: trunk/tora/src/tools/toalert.cpp =================================================================== --- trunk/tora/src/tools/toalert.cpp 2014-11-24 18:56:11 UTC (rev 5160) +++ trunk/tora/src/tools/toalert.cpp 2014-11-24 19:21:12 UTC (rev 5161) @@ -377,7 +377,7 @@ { Parent.Lock.lock(); Parent.Error.sprintf("Exception in alert polling:\n%s", (const char *)str.toLatin1()); - fprintf(stderr, "%s\n", Parent.Error.toAscii().constData()); + fprintf(stderr, "%s\n", Parent.Error.toLatin1().constData()); fatal = true; Parent.Lock.unlock(); } @@ -385,7 +385,7 @@ { Parent.Lock.lock(); Parent.Error.sprintf("Unexpected exception in alert in polling."); - fprintf(stderr, "%s\n", Parent.Error.toAscii().constData()); + fprintf(stderr, "%s\n", Parent.Error.toLatin1().constData()); fatal = true; Parent.Lock.unlock(); } Modified: trunk/tora/src/tools/toanalyze.cpp =================================================================== --- trunk/tora/src/tools/toanalyze.cpp 2014-11-24 18:56:11 UTC (rev 5160) +++ trunk/tora/src/tools/toanalyze.cpp 2014-11-24 19:21:12 UTC (rev 5161) @@ -334,7 +334,7 @@ QSizePolicy::Minimum)); Stop = new QToolButton(this); - Stop->setIcon(QIcon(stop_xpm)); + Stop->setIcon(QIcon(QPixmap(stop_xpm))); Stop->setText(tr("Stop current run")); Stop->setEnabled(false); connect(Stop, SIGNAL(triggered(QAction *)), this, SLOT(slotStop())); Modified: trunk/tora/src/tools/toawr.cpp =================================================================== --- trunk/tora/src/tools/toawr.cpp 2014-11-24 18:56:11 UTC (rev 5160) +++ trunk/tora/src/tools/toawr.cpp 2014-11-24 19:21:12 UTC (rev 5161) @@ -328,10 +328,10 @@ // params.push_back(fsnaps); // params.push_back(tsnaps); TLOG(0, toDecorator, __HERE__) - << "Dbid:" << dbids.toAscii().constData() << ' ' - << "Inst:" << insts.toAscii().constData() << ' ' - << "fsnap:" << fsnaps.toAscii().constData() << ' ' - << "tsnap:" << tsnaps.toAscii().constData() << std::endl; + << "Dbid:" << dbids.toLatin1().constData() << ' ' + << "Inst:" << insts.toLatin1().constData() << ' ' + << "fsnap:" << fsnaps.toLatin1().constData() << ' ' + << "tsnap:" << tsnaps.toLatin1().constData() << std::endl; try { @@ -355,7 +355,7 @@ reports += line; reports += '\n'; } - std::cerr << reports.toAscii().constData() << std::endl; + std::cerr << reports.toLatin1().constData() << std::endl; QWidget *box = new QWidget(Tabs); QVBoxLayout *vbox = new QVBoxLayout; @@ -413,7 +413,7 @@ std::stringstream s; for(QList<QString>::iterator i = l.begin(); i != l.end(); ++i) { - s << ":\'" << (*i).toAscii().constData() << '\''; + s << ":\'" << (*i).toLatin1().constData() << '\''; } TLOG(0, toDecorator, __HERE__) << "start date changed:" << date.toString("YYYY:MM:DD") << std::endl; QString dbid = l.at(0); @@ -438,7 +438,7 @@ std::stringstream s; for(QList<QString>::iterator i = l.begin(); i != l.end(); ++i) { - s << ":\'" << (*i).toAscii().constData() << '\''; + s << ":\'" << (*i).toLatin1().constData() << '\''; } TLOG(0, toDecorator, __HERE__) << "end date changed:" << date.toString("YYYY:MM:DD") << std::endl; QString dbid = l.at(0); @@ -461,7 +461,7 @@ std::stringstream s; for(QList<QString>::iterator i = l.begin(); i != l.end(); ++i) { - s << ":\'" << (*i).toAscii().constData() << '\''; + s << ":\'" << (*i).toLatin1().constData() << '\''; } TLOG(0, toDecorator, __HERE__) << "Instance changed:" << pos << s.str() << std::endl; QString dbid = l.at(0); Modified: trunk/tora/src/tools/tobrowser.cpp =================================================================== --- trunk/tora/src/tools/tobrowser.cpp 2014-11-24 18:56:11 UTC (rev 5160) +++ trunk/tora/src/tools/tobrowser.cpp 2014-11-24 19:21:12 UTC (rev 5161) @@ -1748,9 +1748,9 @@ { //obsolete if (what.isEmpty()) // return ; - // if (TOMessageBox::warning(this, tr("Dropping %1?").arg(tr(type.toAscii().constData())), + // if (TOMessageBox::warning(this, tr("Dropping %1?").arg(tr(type.toLatin1().constData())), // tr("Are you sure you want to drop the %1 %2.%3?\n" - // "This action can not be undone!").arg(tr(type.toAscii().constData())).arg( + // "This action can not be undone!").arg(tr(type.toLatin1().constData())).arg( // Schema->selected()).arg(what), // tr("&Yes"), tr("&Cancel"), QString::null, 0) == 0) // { @@ -1788,12 +1788,12 @@ // QString sql = extractor.drop(objToDrop); // std::list<toSQLParse::statement> statements = toSQLParse::parse(sql, connection()); - // QProgressDialog prog(tr("Executing %1 change script").arg(tr(type.toAscii().constData())), + // QProgressDialog prog(tr("Executing %1 change script").arg(tr(type.toLatin1().constData())), // tr("Stop"), // 0, // statements.size(), // this); - // prog.setWindowTitle(tr("Performing %1 changes").arg(tr(type.toAscii().constData()))); + // prog.setWindowTitle(tr("Performing %1 changes").arg(tr(type.toLatin1().constData()))); // for (std::list<toSQLParse::statement>::iterator j = statements.begin(); j != statements.end(); j++) // { @@ -1808,7 +1808,7 @@ // } // qApp->processEvents(); // if (prog.wasCanceled()) - // throw tr("Canceled ongoing %1 modification, %2 might be corrupt").arg(tr(type.toAscii().constData())).arg(tr(type.toAscii().constData())); + // throw tr("Canceled ongoing %1 modification, %2 might be corrupt").arg(tr(type.toLatin1().constData())).arg(tr(type.toLatin1().constData())); // } // } // TOCATCH Modified: trunk/tora/src/tools/toscripttreemodel.cpp =================================================================== --- trunk/tora/src/tools/toscripttreemodel.cpp 2014-11-24 18:56:11 UTC (rev 5160) +++ trunk/tora/src/tools/toscripttreemodel.cpp 2014-11-24 19:21:12 UTC (rev 5161) @@ -304,6 +304,7 @@ secondLevel = c2; } - reset(); + beginResetModel(); + endResetModel(); // TLOG(2,toDecorator,__HERE__) << "void toScriptTreeModel::setupModelData(const QString & schema)" << "end"; } Modified: trunk/tora/src/tools/tostorage.cpp =================================================================== --- trunk/tora/src/tools/tostorage.cpp 2014-11-24 18:56:11 UTC (rev 5160) +++ trunk/tora/src/tools/tostorage.cpp 2014-11-24 19:21:12 UTC (rev 5161) @@ -46,7 +46,7 @@ #include <QTableView> #include <QToolBar> #include <QFileDialog> -#include <QtGui/QSortFilterProxyModel> +#include <QSortFilterProxyModel> #include "icons/addfile.xpm" #include "icons/addtablespace.xpm" @@ -1418,10 +1418,11 @@ void toStorageObjectModel::setValues(std::list<toStorageExtent::extentTotal> const& values) { + beginResetModel(); m_values.clear(); for (std::list<toStorageExtent::extentTotal>::const_iterator i = values.begin(); i != values.end(); ++i) m_values.append((*i)); - reset(); + endResetModel(); } int toStorageObjectModel::rowCount(const QModelIndex & parent) const Modified: trunk/tora/src/tools/toworksheet.cpp =================================================================== --- trunk/tora/src/tools/toworksheet.cpp 2014-11-24 18:56:11 UTC (rev 5160) +++ trunk/tora/src/tools/toworksheet.cpp 2014-11-24 19:21:12 UTC (rev 5161) @@ -1497,6 +1497,7 @@ { query(stat, Direct, DontSelectQueryEnum); } catch ( BatchExecException const& e) { + Q_UNUSED(e); break; } @@ -2067,7 +2068,7 @@ void toWorksheet::slotRefreshSetup(void) { bool ok = false; - int num = QInputDialog::getInteger(this, + int num = QInputDialog::getInt(this, tr("Enter refreshrate"), tr("Refresh rate of query in seconds"), RefreshSeconds, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |