From: <ibr...@us...> - 2012-08-20 14:00:16
|
Revision: 4425 http://tora.svn.sourceforge.net/tora/?rev=4425&view=rev Author: ibre5041 Date: 2012-08-20 14:00:08 +0000 (Mon, 20 Aug 2012) Log Message: ----------- useless cleanups Modified Paths: -------------- branches/tora3/src/toalert.cpp branches/tora3/src/tobackup.cpp branches/tora3/src/tochartmanager.cpp branches/tora3/src/toprofiler.cpp branches/tora3/src/toresultline.cpp branches/tora3/src/toresultline.h branches/tora3/src/tosimplequery.cpp branches/tora3/src/tosqledit.cpp branches/tora3/src/totemplate.cpp branches/tora3/src/totemporary.cpp branches/tora3/src/totextview.cpp branches/tora3/src/totuning.cpp branches/tora3/src/tounittest.cpp Modified: branches/tora3/src/toalert.cpp =================================================================== --- branches/tora3/src/toalert.cpp 2012-08-19 22:58:12 UTC (rev 4424) +++ branches/tora3/src/toalert.cpp 2012-08-20 14:00:08 UTC (rev 4425) @@ -51,12 +51,6 @@ #include "toconnection.h" #include "toquery.h" -#ifndef Q_OS_WIN32 -#include <unistd.h> -#else -#include <windows.h> -#endif - #include <algorithm> #include <stdio.h> @@ -130,7 +124,7 @@ : toToolWidget(AlertTool, "alert.html", main, connection, "toAlert") , Connection(connection) { - QToolBar *toolbar = toAllocBar(this, tr("Alert Messenger")); + QToolBar *toolbar = Utils::toAllocBar(this, tr("Alert Messenger")); layout()->addWidget(toolbar); QString def; @@ -230,7 +224,7 @@ catch (...) { TLOG(1, toDecorator, __HERE__) << " Ignored exception." << std::endl; - toStatusMessage(tr("Failed to start polling thread, try closing " + Utils::toStatusMessage(tr("Failed to start polling thread, try closing " "some other tools and restart Alert Messenger")); State = Done; } @@ -430,7 +424,7 @@ ; if (!Error.isNull()) { - toStatusMessage(Error); + Utils::toStatusMessage(Error); Error = QString::null; } std::list<QString>::iterator i = NewAlerts.begin(); Modified: branches/tora3/src/tobackup.cpp =================================================================== --- branches/tora3/src/tobackup.cpp 2012-08-19 22:58:12 UTC (rev 4424) +++ branches/tora3/src/tobackup.cpp 2012-08-20 14:00:08 UTC (rev 4425) @@ -323,7 +323,7 @@ : toToolWidget(*tool, "backup.html", main, connection, "toBackup") , tool_(tool) { - QToolBar *toolbar = toAllocBar(this, tr("Backup Manager")); + QToolBar *toolbar = Utils::toAllocBar(this, tr("Backup Manager")); layout()->addWidget(toolbar); updateAct = new QAction(QPixmap(const_cast<const char**>(refresh_xpm)), @@ -332,7 +332,7 @@ connect(updateAct, SIGNAL(triggered()), this, SLOT(refresh(void))); toolbar->addAction(updateAct); - toolbar->addWidget(new toSpacer()); + toolbar->addWidget(new Utils::toSpacer()); new toChangeConnection(toolbar, TO_TOOLBAR_WIDGET_NAME); Modified: branches/tora3/src/tochartmanager.cpp =================================================================== --- branches/tora3/src/tochartmanager.cpp 2012-08-19 22:58:12 UTC (rev 4424) +++ branches/tora3/src/tochartmanager.cpp 2012-08-20 14:00:08 UTC (rev 4425) @@ -811,7 +811,7 @@ { toChartManager::alarmSignal signal = toShift(SignalAlarms); if (signal.Action == toChartManager::StatusMessage) - toStatusMessage(tr("ALARM:") + signal.Chart + QString::fromLatin1(": ") + signal.Alarm + QString::fromLatin1(": ") + signal.xValue); + Utils::toStatusMessage(tr("ALARM:") + signal.Chart + QString::fromLatin1(": ") + signal.Alarm + QString::fromLatin1(": ") + signal.xValue); else if (signal.Action == toChartManager::Email) new toSMTP(QString::fromLatin1(TOAPPNAME " <noreply@localhost>"), signal.Extra, Modified: branches/tora3/src/toprofiler.cpp =================================================================== --- branches/tora3/src/toprofiler.cpp 2012-08-19 22:58:12 UTC (rev 4424) +++ branches/tora3/src/toprofiler.cpp 2012-08-20 14:00:08 UTC (rev 4425) @@ -319,7 +319,7 @@ return new unitsItem(this, last, str); } toProfilerUnits(QWidget *parent) - : toResultLong(true, false, toQuery::Normal, parent) + : toResultLong(true, false, parent) { setColumnAlignment(3, Qt::AlignRight); setSQL(SQLListUnits); @@ -435,7 +435,7 @@ TotalOccur = TotalTime = MaxTime = MinTime = 0; } toProfilerSource(QWidget *parent) - : toResultLong(true, false, toQuery::Normal, parent) + : toResultLong(true, false, parent) { setColumnAlignment(1, Qt::AlignRight); setColumnAlignment(2, Qt::AlignRight); @@ -470,7 +470,7 @@ toProfiler::toProfiler(QWidget *parent, toConnection &connection) : toToolWidget(ProfilerTool, "toprofiler.html", parent, connection, "toProfiler") { - QToolBar *toolbar = toAllocBar(this, tr("PL/SQL Profiler")); + QToolBar *toolbar = Utils::toAllocBar(this, tr("PL/SQL Profiler")); layout()->addWidget(toolbar); toolbar->addAction(QIcon(QPixmap(const_cast<const char**>(refresh_xpm))), @@ -513,7 +513,7 @@ this, SLOT(execute())); - toolbar->addWidget(new toSpacer()); + toolbar->addWidget(new Utils::toSpacer()); new toChangeConnection(toolbar, TO_TOOLBAR_WIDGET_NAME); @@ -571,7 +571,7 @@ } catch (const QString &str) { - toStatusMessage(str); + Utils::toStatusMessage(str); QTimer::singleShot(0, this, SLOT(noTables())); return ; } @@ -639,7 +639,7 @@ refresh(); } else - toStatusMessage(tr("Something went wrong collecting statistics")); + Utils::toStatusMessage(tr("Something went wrong collecting statistics")); } TOCATCH } @@ -655,10 +655,10 @@ QString run = QString::number(CurrentRun); try { - toQList vals = toQuery::readQuery(connection(), SQLTotalTime, run); + toQList vals = toQuery::readQuery(connection(), SQLTotalTime, toQueryParams() << run); Units->setTotal(toShift(vals).toDouble()); - Units->executeWithParams(run); - Info->executeWithParams(run); + Units->refreshWithParams(toQueryParams() << run); + Info->refreshWithParams(toQueryParams() << run); } TOCATCH } @@ -674,12 +674,12 @@ toResultViewItem *item = qi ? dynamic_cast<toResultViewItem *>(qi) : NULL; if (item) { - toQList par; - toPush(par, toQValue(item->allText(0))); - toPush(par, toQValue(item->allText(1))); - toPush(par, toQValue(item->allText(4))); - toPush(par, toQValue(item->allText(5))); - toPush(par, toQValue(item->allText(6))); + toQueryParams par = toQueryParams() + << toQValue(item->allText(0)) + << toQValue(item->allText(1)) + << toQValue(item->allText(4)) + << toQValue(item->allText(5)) + << toQValue(item->allText(6)); Lines->clearTotals(); try { Modified: branches/tora3/src/toresultline.cpp =================================================================== --- branches/tora3/src/toresultline.cpp 2012-08-19 22:58:12 UTC (rev 4424) +++ branches/tora3/src/toresultline.cpp 2012-08-20 14:00:08 UTC (rev 4425) @@ -93,21 +93,20 @@ } } -void toResultLine::query(const QString &sql, const toQList ¶m, bool first) +void toResultLine::query(const QString &sql, const toQueryParams ¶m, bool first) { if (!handled() || Query) return ; start(); - setSQLParams(sql, param); + setSqlAndParams(sql, param); try { First = first; - Query = new toEventQuery(connection(), toQuery::Background, sql, param); + Query = new toEventQuery(this, connection(), sql, param, toEventQuery::READ_ALL); connect(Query, SIGNAL(dataAvailable()), this, SLOT(poll())); connect(Query, SIGNAL(done()), this, SLOT(queryDone())); - Query->slotReadAll(); // indicate that all records should be fetched Query->start(); } TOCATCH @@ -182,7 +181,7 @@ { delete Query; Query = NULL; - toStatusMessage(exc); + Utils::toStatusMessage(exc); } } Modified: branches/tora3/src/toresultline.h =================================================================== --- branches/tora3/src/toresultline.h 2012-08-19 22:58:12 UTC (rev 4424) +++ branches/tora3/src/toresultline.h 2012-08-20 14:00:08 UTC (rev 4425) @@ -75,7 +75,7 @@ bool First; toEventQuery *Query; unsigned int Columns; - void query(const QString &sql, const toQList ¶m, bool first); + void query(const QString &sql, const toQueryParams ¶m, bool first); public: /** Create widget. * @param parent Parent of list. @@ -110,7 +110,7 @@ /** Reimplemented for internal reasons. */ - virtual void query(const QString &sql, const toQList ¶m) + virtual void query(const QString &sql, const toQueryParams ¶m) { query(sql, param, true); } @@ -136,47 +136,6 @@ return true; } - // Why are these needed? -#if 0 - /** Set the SQL statement of this list - * @param sql String containing statement. - */ - void setSQL(const QString &sql) - { - toResult::setSQL(sql); - } - /** Set the SQL statement of this list. This will also affect @ref Name. - * @param sql SQL containing statement. - */ - void setSQL(const toSQL &sql) - { - toResult::setSQL(sql); - } - /** Set new SQL and run query. - * @param sql New sql. - * @see setSQL - */ - void query(const QString &sql) - { - toResult::query(sql); - } - /** Set new SQL and run query. - * @param sql New sql. - * @see setSQL - */ - void query(const toSQL &sql) - { - toResult::query(sql); - } - /** Set new SQL and run query. - * @param sql New sql. - * @see setSQL - */ - void query(const toSQL &sql, toQList &par) - { - toResult::query(sql, par); - } -#endif public slots: /** Reimplemented for internal reasons. */ @@ -184,24 +143,6 @@ { query(sql(), params(), false); } -// /** Reimplemented for internal reasons. -// */ -// virtual void executeWithParams(const QString &Param1) -// { -// toResult::executeWithParams(Param1); -// } -// /** Reimplemented For internal reasons. -// */ -// virtual void executeWithParams(const QString &Param1, const QString &Param2) -// { -// toResult::executeWithParams(Param1, Param2); -// } -// /** Reimplemented for internal reasons. -// */ -// virtual void executeWithParams(const QString &Param1, const QString &Param2, const QString &Param3) -// { -// toResult::executeWithParams(Param1, Param2, Param3); -// } protected slots: /** Reimplemented for internal reasons. */ Modified: branches/tora3/src/tosimplequery.cpp =================================================================== --- branches/tora3/src/tosimplequery.cpp 2012-08-19 22:58:12 UTC (rev 4424) +++ branches/tora3/src/tosimplequery.cpp 2012-08-20 14:00:08 UTC (rev 4425) @@ -91,7 +91,7 @@ toAWR::toAWR(/*toTool *tool,*/ QWidget *parent, toConnection &connection) : toToolWidget(/* *tool*/AWRTool, "simplequery.html", parent, connection, "toAWR") { - QToolBar *toolbar = toAllocBar(this, tr("Simple Query")); + QToolBar *toolbar = Utils::toAllocBar(this, tr("Simple Query")); layout()->addWidget(toolbar); QAction *executeAct = new QAction(QPixmap(execute_xpm), tr("Execute_ current statement"), this); Modified: branches/tora3/src/tosqledit.cpp =================================================================== --- branches/tora3/src/tosqledit.cpp 2012-08-19 22:58:12 UTC (rev 4424) +++ branches/tora3/src/tosqledit.cpp 2012-08-20 14:00:08 UTC (rev 4425) @@ -170,7 +170,7 @@ : toToolWidget(SQLEditTool, "sqledit.html", main, connection, "toSQLEdit") { - QToolBar *toolbar = toAllocBar(this, tr("SQL editor")); + QToolBar *toolbar = Utils::toAllocBar(this, tr("SQL editor")); layout()->addWidget(toolbar); toolbar->addAction(QIcon(fileopen_xpm), @@ -203,7 +203,7 @@ CommitButton->setEnabled(true); TrashButton->setEnabled(false); - toolbar->addWidget(new toSpacer()); + toolbar->addWidget(new Utils::toSpacer()); QSplitter *splitter = new QSplitter(Qt::Horizontal, this); layout()->addWidget(splitter); @@ -288,7 +288,7 @@ { try { - QString filename = toOpenFilename(QString::null, this); + QString filename = Utils::toOpenFilename(QString::null, this); if (!filename.isEmpty()) { toSQL::loadSQL(filename); @@ -303,7 +303,7 @@ // must commit changes first for sql to be present in dictionary. commitChanges(); - QString filename = toSaveFilename(QString::null, QString::null, this); + QString filename = Utils::toSaveFilename(QString::null, QString::null, this); if (!filename.isEmpty()) { Filename = filename; Modified: branches/tora3/src/totemplate.cpp =================================================================== --- branches/tora3/src/totemplate.cpp 2012-08-19 22:58:12 UTC (rev 4424) +++ branches/tora3/src/totemplate.cpp 2012-08-20 14:00:08 UTC (rev 4425) @@ -209,7 +209,7 @@ } catch (const QString &str) { - toStatusMessage(str); + Utils::toStatusMessage(str); reject(); } } Modified: branches/tora3/src/totemporary.cpp =================================================================== --- branches/tora3/src/totemporary.cpp 2012-08-19 22:58:12 UTC (rev 4424) +++ branches/tora3/src/totemporary.cpp 2012-08-20 14:00:08 UTC (rev 4425) @@ -126,11 +126,9 @@ } virtual bool canHandle(toConnection &conn) { - if (!toIsOracle(conn)) - return false; - if (conn.version() < "0800") - return false; - return true; + if (conn.providerIs("Oracle") || conn.version() >= "0800") + return true; + return false; } virtual void closeWindow(toConnection &connection) {}; }; @@ -140,7 +138,7 @@ toTemporary::toTemporary(QWidget *main, toConnection &connection) : toToolWidget(TemporaryTool, "temporary.html", main, connection, "toTemporary") { - QToolBar *toolbar = toAllocBar(this, tr("Temporary Objects")); + QToolBar *toolbar = Utils::toAllocBar(this, tr("Temporary Objects")); layout()->addWidget(toolbar); refreshAct = @@ -149,23 +147,21 @@ this, SLOT(refresh())); - toolbar->addWidget(new toSpacer()); + toolbar->addWidget(new Utils::toSpacer()); new toChangeConnection(toolbar, TO_TOOLBAR_WIDGET_NAME); QSplitter *splitter = new QSplitter(Qt::Vertical, this); layout()->addWidget(splitter); - Objects = new toResultLong(false, false, toQuery::Background, splitter); + Objects = new toResultLong(false, false, splitter); QList<int> list; list.append(75); splitter->setSizes(list); QString unit(toConfigurationSingle::Instance().sizeUnit()); - toQList args; - toPush(args, toQValue(toSizeDecode(unit))); - toPush(args, toQValue(unit)); + toQueryParams args = toQueryParams() << toQValue(Utils::toSizeDecode(unit)) << toQValue(unit); Objects->setSelectionMode(toTreeWidget::Single); Objects->query(SQLListTemporaryObjects, args); Modified: branches/tora3/src/totextview.cpp =================================================================== --- branches/tora3/src/totextview.cpp 2012-08-19 22:58:12 UTC (rev 4424) +++ branches/tora3/src/totextview.cpp 2012-08-20 14:00:08 UTC (rev 4425) @@ -47,10 +47,10 @@ bool toTextView::editSave(bool) { - QString fn = toSaveFilename(QString::null, QString::fromLatin1("*.html"), this); + QString fn = Utils::toSaveFilename(QString::null, QString::fromLatin1("*.html"), this); if (!fn.isEmpty()) { - if (!toWriteFile(fn, toPlainText())) + if (!Utils::toWriteFile(fn, toPlainText())) return false; return true; } Modified: branches/tora3/src/totuning.cpp =================================================================== --- branches/tora3/src/totuning.cpp 2012-08-19 22:58:12 UTC (rev 4424) +++ branches/tora3/src/totuning.cpp 2012-08-20 14:00:08 UTC (rev 4425) @@ -39,25 +39,25 @@ * * END_COMMON_COPYRIGHT_HEADER */ -#include "tochangeconnection.h" -#include "toconf.h" -#include "toconnection.h" -#include "tomain.h" -#include "toeventquery.h" -#include "toresultbar.h" -#include "toresultitem.h" -#include "toresultline.h" -#include "toresultlock.h" -#include "toresulttableview.h" -#include "toresultparam.h" -#include "toresultpie.h" -#include "toresultstats.h" -#include "toresultview.h" -#include "tosql.h" -#include "totool.h" -#include "totuning.h" -#include "ui_totuningsettingui.h" -#include "towaitevents.h" +#include "tool/totuning.h" +#include "core/tochangeconnection.h" +#include "core/toconf.h" +#include "core/toconnection.h" +#include "core/tomain.h" +#include "core/toeventquery.h" +#include "core/toresultbar.h" +#include "core/toresultitem.h" +#include "core/toresultline.h" +#include "core/toresultlock.h" +#include "core/toresulttableview.h" +#include "core/toresultparam.h" +#include "core/toresultpie.h" +#include "core/toresultstats.h" +#include "core/toresultview.h" +#include "core/tosql.h" +#include "core/totool.h" +#include "tools/ui_totuningsettingui.h" +#include "tool/towaitevents.h" #include <time.h> #include <stdio.h> @@ -888,7 +888,7 @@ if (postfix == QString::fromLatin1("b/s")) { QString unitStr(toConfigurationSingle::Instance().sizeUnit()); - val.insert(val.end(), toQValue(toSizeDecode(unitStr))); + val.insert(val.end(), toQValue(Utils::toSizeDecode(unitStr))); unitStr += QString::fromLatin1("/s"); chart->setYPostfix(unitStr); } @@ -940,7 +940,7 @@ try { toQList val; - val.insert(val.end(), toQValue(toSizeDecode(toConfigurationSingle::Instance().sizeUnit()))); + val.insert(val.end(), toQValue(Utils::toSizeDecode(toConfigurationSingle::Instance().sizeUnit()))); FileUsed->query(toSQL::string(SQLOverviewFilespace, toCurrentConnection(this)), (const toQList)val); } TOCATCH @@ -966,7 +966,7 @@ { try { - disconnect(toCurrentTool(this)->timer(), SIGNAL(timeout()), this, SLOT(refresh())); + disconnect(toToolWidget::currentTool(this)->timer(), SIGNAL(timeout()), this, SLOT(refresh())); } TOCATCH @@ -992,7 +992,7 @@ { try { - connect(toCurrentTool(this)->timer(), SIGNAL(timeout()), this, SLOT(refresh())); + connect(toToolWidget::currentTool(this)->timer(), SIGNAL(timeout()), this, SLOT(refresh())); } TOCATCH @@ -1135,7 +1135,7 @@ try { toQList val; - val.insert(val.end(), toQValue(toSizeDecode(Parent.UnitString))); + val.insert(val.end(), toQValue(Utils::toSizeDecode(Parent.UnitString))); toQList res = toQuery::readQuery(*Parent.Connection, SQLOverviewArchive, val); QString tmp = toShift(res); @@ -1459,7 +1459,7 @@ toolbar->addWidget(new QLabel(tr("Refresh") + " ", toolbar)); - Refresh = toRefreshCreate(toolbar, TO_TOOLBAR_WIDGET_NAME); + Refresh = Utils::toRefreshCreate(toolbar, TO_TOOLBAR_WIDGET_NAME); connect(Refresh, SIGNAL(activated(const QString &)), this, SLOT(changeRefresh(const QString &))); toolbar->addWidget(Refresh); @@ -1514,7 +1514,7 @@ QString unitStr = toConfigurationSingle::Instance().sizeUnit(); toQList unit; - unit.insert(unit.end(), toQValue(toSizeDecode(unitStr))); + unit.insert(unit.end(), toQValue(Utils::toSizeDecode(unitStr))); { std::list<QString> val = toSQL::range("toTuning:Charts"); @@ -1594,7 +1594,7 @@ chart->query(toSQL::sql(*i)); } else - toStatusMessage(tr("Wrong format of name on chart (%1).").arg(QString(*i))); + Utils::toStatusMessage(tr("Wrong format of name on chart (%1).").arg(QString(*i))); } } @@ -1893,7 +1893,7 @@ else if (LastTab == ControlFiles) { QString unit = toConfigurationSingle::Instance().sizeUnit(); - ControlFiles->changeParams(QString::number(toSizeDecode(unit)), unit); + ControlFiles->changeParams(QString::number(Utils::toSizeDecode(unit)), unit); } else if (LastTab == Options) Options->refresh(); @@ -1962,7 +1962,7 @@ { try { - connect(toCurrentTool(this)->timer(), SIGNAL(timeout()), this, SLOT(refresh())); + connect(toToolWidget::currentTool(this)->timer(), SIGNAL(timeout()), this, SLOT(refresh())); // fscking qscrollarea won't resize unless this is added QHBoxLayout *h = new QHBoxLayout; @@ -2291,7 +2291,7 @@ { try { - disconnect(toCurrentTool(this)->timer(), SIGNAL(timeout()), this, SLOT(refresh())); + disconnect(toToolWidget::currentTool(this)->timer(), SIGNAL(timeout()), this, SLOT(refresh())); } TOCATCH } @@ -2300,7 +2300,7 @@ { try { - connect(toCurrentTool(this)->timer(), SIGNAL(timeout()), this, SLOT(refresh())); + connect(toToolWidget::currentTool(this)->timer(), SIGNAL(timeout()), this, SLOT(refresh())); } TOCATCH } Modified: branches/tora3/src/tounittest.cpp =================================================================== --- branches/tora3/src/tounittest.cpp 2012-08-19 22:58:12 UTC (rev 4424) +++ branches/tora3/src/tounittest.cpp 2012-08-20 14:00:08 UTC (rev 4425) @@ -268,7 +268,7 @@ { packageList->setVisible(true); packageList->clearParams(); - packageList->executeWithParams(m_owner, m_name); + packageList->refreshWithParams(toQueryParams() << m_owner << m_name); packageList->setReadAll(true); } else @@ -280,28 +280,29 @@ void toUnitTest::slotPackageListSelectionChanged() { - toQList p; + toQueryParams params; if (m_type == "PACKAGE") { - p.push_back(m_owner); - p.push_back(packageList->selectedIndex(1).data(Qt::EditRole).toString()); - p.push_back(m_name); + params << m_owner; + params << packageList->selectedIndex(1).data(Qt::EditRole).toString(); + params << m_name; } else { - p.push_back(m_owner); - p.push_back(m_name); + params << m_owner; + params << m_name; } worksheet->editor()->setText("-- getting the script..."); try { toQuery q(worksheet->toToolWidget::connection(), (m_type == "PACKAGE" ? SQLPackageParams : SQLUnitParams), - p + params ); - toEventQuery * query = new toEventQuery(worksheet->toToolWidget::connection() + toEventQuery * query = new toEventQuery(this + , worksheet->toToolWidget::connection() , q.sql() - , p + , params , toEventQuery::READ_ALL); if (m_model) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |