From: <ibr...@us...> - 2012-10-20 09:27:57
|
Revision: 4514 http://tora.svn.sourceforge.net/tora/?rev=4514&view=rev Author: ibre5041 Date: 2012-10-20 09:27:50 +0000 (Sat, 20 Oct 2012) Log Message: ----------- Modified Paths: -------------- branches/tora3/src/todebug.cpp branches/tora3/src/todebug.h branches/tora3/src/toplsqleditor.cpp branches/tora3/src/toplsqleditor.h Modified: branches/tora3/src/todebug.cpp =================================================================== --- branches/tora3/src/todebug.cpp 2012-10-16 15:24:53 UTC (rev 4513) +++ branches/tora3/src/todebug.cpp 2012-10-20 09:27:50 UTC (rev 4514) @@ -40,38 +40,39 @@ * END_COMMON_COPYRIGHT_HEADER */ #include <QtDebug> -#include "utils.h" +#include "todebug.h" -#include "toconf.h" -#include "todebug.h" -#include "ui_todebugchangeui.h" +#include "core/utils.h" +#include "core/toconf.h" + #include "todebugtext.h" -#include "tohelp.h" -#include "tohighlightedtext.h" -#include "tomarkedtext.h" -#include "tomain.h" -#include "tooutput.h" -#include "toparamget.h" -#include "toresultview.h" -#include "toresultschema.h" -#include "tosql.h" -#include "toquery.h" -#include "tosqlparse.h" -#include "totool.h" +#include "core/tohelp.h" +#include "editor/tohighlightedtext.h" +#include "editor/tomarkedtext.h" +#include "core/tomain.h" +#include "tools/tooutput.h" +#include "core/toparamget.h" +#include "core/toresultview.h" +#include "core/toresultschema.h" +#include "core/tosql.h" +#include "core/toquery.h" +#include "core/tosqlparse.h" +#include "core/totool.h" #include "tocodemodel.h" +#include "ui_todebugchangeui.h" + #include <cstdio> #include <stack> -#include <qcheckbox.h> -#include <qlabel.h> -#include <qregexp.h> -#include <qsizepolicy.h> -#include <qsplitter.h> -#include <qtabwidget.h> -#include <qtoolbar.h> -#include <qtoolbutton.h> - +#include <QCheckBox> +#include <QLabel> +#include <QRegExp> +#include <QSizePolicy> +#include <QSplitter> +#include <QTabWidget> +#include <QToolBar> +#include <QToolButton> #include <QPixmap> #include <QList> #include <QString> @@ -3102,11 +3103,11 @@ } } -void toDebug::windowActivated(QMdiSubWindow *widget) +void toDebug::slotWindowActivated(toToolWidget *widget) { if (!widget) return; - if (widget->widget() == this) + if (widget == this) { if (!ToolMenu) { Modified: branches/tora3/src/todebug.h =================================================================== --- branches/tora3/src/todebug.h 2012-10-16 15:24:53 UTC (rev 4513) +++ branches/tora3/src/todebug.h 2012-10-20 09:27:50 UTC (rev 4514) @@ -42,14 +42,13 @@ #ifndef TODEBUG_H #define TODEBUG_H -#include "config.h" -#include "tobackground.h" -#include "toconnection.h" +#include "core/totool.h" +#include "core/tobackground.h" +#include "core/toconnection.h" +#include "editor/tohighlightedtext.h" +#include "core/tosqlparse.h" + #include "ui_todebugwatch.h" -#include "tohighlightedtext.h" -#include "tosqlparse.h" -#include "tothread.h" -#include "totool.h" #include <QString> #include <QMenu> @@ -330,7 +329,7 @@ { continueExecution(TO_BREAK_ANY_RETURN); } - void windowActivated(QMdiSubWindow *w); + void slotWindowActivated(toToolWidget *w); void selectedWatch(void); void deleteWatch(void); void clearLog(void); Modified: branches/tora3/src/toplsqleditor.cpp =================================================================== --- branches/tora3/src/toplsqleditor.cpp 2012-10-16 15:24:53 UTC (rev 4513) +++ branches/tora3/src/toplsqleditor.cpp 2012-10-20 09:27:50 UTC (rev 4514) @@ -100,7 +100,7 @@ } virtual bool canHandle(toConnection &conn) { - if (toIsOracle(conn)) + if (conn.providerIs("Oracle")) { return true; } @@ -187,7 +187,7 @@ } catch (const QString &str) { - toStatusMessage(str); + Utils::toStatusMessage(str); return false; } } @@ -196,7 +196,7 @@ : toToolWidget(PLSQLEditorTool, "plsqleditor.html", main, connection, "toPLSQLEditor") { createActions(); - QToolBar *toolbar = toAllocBar(this, tr("PLSQLEditor")); + QToolBar *toolbar = Utils::toAllocBar(this, tr("PLSQLEditor")); layout()->addWidget(toolbar); toolbar->addAction(refreshAct); @@ -227,7 +227,7 @@ toolbar->addAction(previousErrorAct); toolbar->addAction(describeAct); - toolbar->addWidget(new toSpacer()); + toolbar->addWidget(new Utils::toSpacer()); splitter = new QSplitter(Qt::Horizontal, this); layout()->addWidget(splitter); @@ -456,7 +456,7 @@ void toPLSQLEditor::changePackage(const QModelIndex ¤t, const QModelIndex &previous) { - toBusy busy; + Utils::toBusy busy; // TLOG(2,toDecorator,__HERE__) << "toDebug::changePackage 1"; toCodeModelItem *item = static_cast<toCodeModelItem*>(current.internalPointer()); @@ -526,11 +526,11 @@ viewSource(item->text(2), item->text(0), item->text(3), item->text(1).toInt(), false); } -void toPLSQLEditor::windowActivated(QMdiSubWindow *widget) +void toPLSQLEditor::slotWindowActivated(toToolWidget *widget) { if (!widget) return; - if (widget->widget() == this) + if (widget == this) { if (!ToolMenu) { @@ -671,7 +671,7 @@ QTemporaryFile tf; if (tf.open()) { - if (!toWriteFile(tf.fileName(), currentEditor()->editor()->text())) + if (!Utils::toWriteFile(tf.fileName(), currentEditor()->editor()->text())) { #ifdef DEBUG TLOG(2, toDecorator, __HERE__) << "Unable to write file (" + tf.fileName() + ")"; Modified: branches/tora3/src/toplsqleditor.h =================================================================== --- branches/tora3/src/toplsqleditor.h 2012-10-16 15:24:53 UTC (rev 4513) +++ branches/tora3/src/toplsqleditor.h 2012-10-20 09:27:50 UTC (rev 4514) @@ -138,7 +138,7 @@ void nextError(void); void showSource(toTreeWidgetItem *); void newSheet(void); - void windowActivated(QMdiSubWindow *w); + void slotWindowActivated(toToolWidget *w); void closeEditor(void); void closeEditor(int); void closeAllEditor(void); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |