Menu
▾
▴
tora-cvs — CVS update notification
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
(24) |
Mar
(11) |
Apr
(14) |
May
(1) |
Jun
(2) |
Jul
(85) |
Aug
(14) |
Sep
(1) |
Oct
(26) |
Nov
(8) |
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(11) |
Feb
|
Mar
|
Apr
|
May
(13) |
Jun
(7) |
Jul
(8) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2005 |
Jan
|
Feb
(98) |
Mar
(40) |
Apr
(14) |
May
(14) |
Jun
(36) |
Jul
(3) |
Aug
|
Sep
(23) |
Oct
|
Nov
|
Dec
(8) |
| 2006 |
Jan
(17) |
Feb
(46) |
Mar
(105) |
Apr
(22) |
May
(7) |
Jun
(11) |
Jul
(6) |
Aug
|
Sep
|
Oct
(4) |
Nov
(8) |
Dec
|
| 2007 |
Jan
(13) |
Feb
(21) |
Mar
(1) |
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
(55) |
Oct
(97) |
Nov
(3) |
Dec
(127) |
| 2008 |
Jan
(87) |
Feb
(111) |
Mar
(48) |
Apr
(82) |
May
(90) |
Jun
(49) |
Jul
(46) |
Aug
(43) |
Sep
(74) |
Oct
(30) |
Nov
(19) |
Dec
(48) |
| 2009 |
Jan
(13) |
Feb
(13) |
Mar
(3) |
Apr
(13) |
May
(22) |
Jun
(7) |
Jul
(16) |
Aug
(37) |
Sep
(60) |
Oct
(17) |
Nov
(24) |
Dec
(6) |
| 2010 |
Jan
(22) |
Feb
(63) |
Mar
(32) |
Apr
(34) |
May
(29) |
Jun
(53) |
Jul
(40) |
Aug
(34) |
Sep
(33) |
Oct
(85) |
Nov
(32) |
Dec
(23) |
| 2011 |
Jan
(23) |
Feb
(37) |
Mar
(20) |
Apr
(20) |
May
(16) |
Jun
(21) |
Jul
(18) |
Aug
(28) |
Sep
(62) |
Oct
(27) |
Nov
(40) |
Dec
(33) |
| 2012 |
Jan
(33) |
Feb
(3) |
Mar
(18) |
Apr
(35) |
May
(37) |
Jun
(48) |
Jul
(24) |
Aug
(38) |
Sep
(42) |
Oct
(47) |
Nov
(26) |
Dec
|
| 2013 |
Jan
(6) |
Feb
(38) |
Mar
(50) |
Apr
(34) |
May
(15) |
Jun
(16) |
Jul
(18) |
Aug
(123) |
Sep
(47) |
Oct
(63) |
Nov
(39) |
Dec
(43) |
| 2014 |
Jan
(41) |
Feb
(44) |
Mar
(25) |
Apr
(16) |
May
(2) |
Jun
|
Jul
(8) |
Aug
|
Sep
(4) |
Oct
|
Nov
(34) |
Dec
(4) |
| 2015 |
Jan
(2) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <ibr...@us...> - 2015-01-10 15:07:58
|
Revision: 5181
http://sourceforge.net/p/tora/code/5181
Author: ibre5041
Date: 2015-01-10 15:07:50 +0000 (Sat, 10 Jan 2015)
Log Message:
-----------
missing files added
Modified Paths:
--------------
trunk/tora/src/CMakeLists.txt
Modified: trunk/tora/src/CMakeLists.txt
===================================================================
--- trunk/tora/src/CMakeLists.txt 2015-01-10 14:07:40 UTC (rev 5180)
+++ trunk/tora/src/CMakeLists.txt 2015-01-10 15:07:50 UTC (rev 5181)
@@ -216,6 +216,7 @@
core/toeventqueryworker.h
core/toglobalevent.h
core/toglobalsetting.h
+ core/toglobalsettingenum.h
core/tohelp.h
core/tohelpsetup.h
core/tolinechart.h
@@ -442,6 +443,7 @@
core/toextract.cpp
core/toglobalevent.cpp
core/toglobalsetting.cpp
+ core/toglobalsettingenum.cpp
core/todatabasesetting.cpp
core/tohelp.cpp
core/tohelpsetup.cpp
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ibr...@us...> - 2015-01-10 14:07:56
|
Revision: 5180
http://sourceforge.net/p/tora/code/5180
Author: ibre5041
Date: 2015-01-10 14:07:40 +0000 (Sat, 10 Jan 2015)
Log Message:
-----------
compiler warning fixes
Modified Paths:
--------------
trunk/tora/extlibs/trotl/src/trotl_conn.h
trunk/tora/extlibs/trotl/src/trotl_cursor.cpp
Modified: trunk/tora/extlibs/trotl/src/trotl_conn.h
===================================================================
--- trunk/tora/extlibs/trotl/src/trotl_conn.h 2014-12-29 23:37:59 UTC (rev 5179)
+++ trunk/tora/extlibs/trotl/src/trotl_conn.h 2015-01-10 14:07:40 UTC (rev 5180)
@@ -173,10 +173,10 @@
OciLogin(OciEnv& env, const LoginPara& login_para, ub4 mode=OCI_DEFAULT)
: super(env)
, _server(env)
+ , _sid(0)
+ , _serial(0)
, _session(env)
, _connected(false)
- , _sid(0)
- , _serial(0)
{
connect(login_para._username, login_para._password, login_para._tnsname, mode);
@@ -186,6 +186,8 @@
OciLogin(OciEnv& env, const LoginAndPChangePara& login_para, ub4 mode=OCI_DEFAULT)
: super(env),
_server(env),
+ _sid(0),
+ _serial(0),
_session(env),
_connected(false)
{
Modified: trunk/tora/extlibs/trotl/src/trotl_cursor.cpp
===================================================================
--- trunk/tora/extlibs/trotl/src/trotl_cursor.cpp 2014-12-29 23:37:59 UTC (rev 5179)
+++ trunk/tora/extlibs/trotl/src/trotl_cursor.cpp 2015-01-10 14:07:40 UTC (rev 5180)
@@ -126,8 +126,8 @@
SqlCursor::SqlCursor()
- : c(NULL)
- , handle(NULL)
+ : handle(NULL)
+ , c(NULL)
{
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ibr...@us...> - 2014-12-29 23:38:01
|
Revision: 5179
http://sourceforge.net/p/tora/code/5179
Author: ibre5041
Date: 2014-12-29 23:37:59 +0000 (Mon, 29 Dec 2014)
Log Message:
-----------
file splitted
Modified Paths:
--------------
trunk/tora/src/core/toglobalsetting.cpp
trunk/tora/src/core/toglobalsetting.h
Added Paths:
-----------
trunk/tora/src/core/toglobalsettingenum.cpp
trunk/tora/src/core/toglobalsettingenum.h
Modified: trunk/tora/src/core/toglobalsetting.cpp
===================================================================
--- trunk/tora/src/core/toglobalsetting.cpp 2014-12-23 14:32:26 UTC (rev 5178)
+++ trunk/tora/src/core/toglobalsetting.cpp 2014-12-29 23:37:59 UTC (rev 5179)
@@ -48,133 +48,6 @@
#include <QFileDialog>
#include <QStyleFactory>
-
-ToConfiguration::Global s_global;
-
-QVariant ToConfiguration::Global::defaultValue(int option) const
-{
- switch(option)
- {
- // Paths
- case CustomSQL:
- {
- QFileInfo torasql(QDir::homePath(), ".torasql");
- return QVariant(torasql.absoluteFilePath());
- }
- case HelpDirectory: return QVariant(QString("qrc:/help/toc.html"));
- 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:
- {
- QString defaultGvHome;
-#if defined(Q_OS_WIN32)
- defaultGvHome = "C:/Program Files/Graphviz 2.28/bin";
-#elif defined(Q_OS_WIN64)
- defaultGvHome = "C:/Program Files(x86)/Graphviz 2.28/bin";
-#else
- defaultGvHome = "/usr/bin";
-#endif
- return QVariant(defaultGvHome);
- }
- // Options: (1st column)
- case ChangeConnectionBool: return QVariant((bool)true);
- case SavePasswordBool: return QVariant((bool)false);
- case IncludeDbCaptionBool: return QVariant((bool)true);
- case RestoreSessionBool: return QVariant((bool)false);
- case ToadBindingsBool: return QVariant((bool)false);
- case CacheDiskBool: return QVariant((bool)true);
- case DisplayGridlinesBool: return QVariant((bool)true);
- case MultiLineResultsBool: return QVariant((bool)false);
- case MessageStatusbarBool: return QVariant((bool)false);
- case ColorizedConnectionsBool: return QVariant((bool)true);
- case ColorizedConnectionsMap:
- {
- QMap<QString, QVariant> retval;
- retval["#FF0000"] = QVariant("Production");
- retval["#00FF00"] = QVariant("Development");
- retval["#0000FF"] = QVariant("Testing");
- return retval;
- }
- // Options: (2nd column)
- case StatusMessageInt: return QVariant((int)5);
- case HistorySizeInt: return QVariant((int)10);
- case ChartSamplesInt: return QVariant((int)100);
- case DisplaySamplesInt: return QVariant((int)-1);
- case SizeUnit: return QVariant(QString("MB"));
- case RefreshInterval: return QVariant(QString("None")); // None - 0
- case DefaultListFormatInt: return QVariant((int)0);
- case Style: return QVariant(Utils::toGetSessionType());
- case Translation: return QVariant(QLocale().name());
- default:
- Q_ASSERT_X( false, qPrintable(__QHERE__), qPrintable(QString("Context Global un-registered enum value: %1").arg(option)));
- return QVariant();
- }
-};
-
-QVariant ToConfiguration::Global::toraIIValue(int option) const
-{
- QSettings s(TOORGNAME, "TOra"); // "old" Tora 2.x config namespace
- QVariant retval;
-
- switch(option)
- {
- // Paths
- case CustomSQL: s.beginGroup("preferences"); retval = s.value("SQLDictionary"); break;
- //case HelpDirectory:
- //case DefaultSession:
- //case CacheDirectory:
- case OracleHomeDirectory: s.beginGroup("preferences"); retval = s.value("ORACLE_HOME"); break;
- case MysqlHomeDirectory: s.beginGroup("preferences"); retval = s.value("MYSQL_HOME"); break;
- case PgsqlHomeDirectory: s.beginGroup("preferences"); retval = s.value("PGSQL_HOME"); break;
- case GraphvizHomeDirectory: s.beginGroup("preferences"); retval = s.value("GV_HOME"); break;
- // Options: (1st column)
- //case ChangeConnectionBool: return QVariant((bool)true);
- case SavePasswordBool: s.beginGroup("preferences"); retval = s.value("SavePassword"); break;
- //case IncludeDbCaptionBool: return QVariant((bool)true);
- //case RestoreSessionBool: return QVariant((bool)false);
- //case ToadBindingsBool: return QVariant((bool)false);
- //case CacheDiskBool: s.beginGroup("preferences"); retval = s.value("CacheDiskUse"); break;
- //case DisplayGridlinesBool: return QVariant((bool)true);
- //case MultiLineResultsBool: return QVariant((bool)false);
- //case MessageStatusbarBool: return QVariant((bool)false);
- //case ColorizedConnectionsBool: return QVariant((bool)true);
- //case ColorizedConnectionsMap:
- // Options: (2nd column)
- //case StatusMessageInt: return QVariant((int)5);
- //case HistorySizeInt: return QVariant((int)10);
- //case ChartSamplesInt: return QVariant((int)100);
- //case DisplaySamplesInt: return QVariant((int)-1);
- //case SizeUnit: return QVariant(QString("MB"));
- //case RefreshInterval: return QVariant(QString("None")); // None - 0
- //case DefaultListFormatInt: return QVariant((int)0);
- //case Style: return QVariant(Utils::toGetSessionType());
- //case Translation: return QVariant(QLocale().name());
- default:
- s.beginGroup("preferences");
- retval = QVariant(); break;
- }
- s.endGroup();
- return retval;
-}
-
ConnectionColorsDialog::ConnectionColorsDialog(QWidget * parent)
: QDialog(parent)
{
Modified: trunk/tora/src/core/toglobalsetting.h
===================================================================
--- trunk/tora/src/core/toglobalsetting.h 2014-12-23 14:32:26 UTC (rev 5178)
+++ trunk/tora/src/core/toglobalsetting.h 2014-12-29 23:37:59 UTC (rev 5179)
@@ -60,52 +60,6 @@
void accept();
};
-namespace ToConfiguration {
- class Global : public ConfigContext
- {
- Q_OBJECT;
- Q_ENUMS(OptionTypeEnum);
- public:
- Global() : ConfigContext("Global", ENUM_REF(Global,OptionTypeEnum)) {};
- enum OptionTypeEnum {
- // Paths
- CustomSQL = 2000 // #define CONF_SQL_FILE
- , HelpDirectory // #define CONF_HELP_PATH
- , DefaultSession // #define CONF_DEFAULT_SESSION
- , CacheDirectory // #define CONF_CACHE_DIR
- , OracleHomeDirectory // #define CONF_ORACLE_HOME
- , MysqlHomeDirectory // #define CONF_MYSQL_HOME
- , PgsqlHomeDirectory // #define CONF_PGSQL_HOME
- , GraphvizHomeDirectory
- // Options (1st column)
- , ChangeConnectionBool // #define CONF_CHANGE_CONNECTION
- , SavePasswordBool // #define CONF_SAVE_PWD
- , IncludeDbCaptionBool // #define CONF_DB_TITLE
- , RestoreSessionBool // #define CONF_RESTORE_SESSION
- , ToadBindingsBool // #define CONF_TOAD_BINDINGS
- , CacheDiskBool // #define CONF_CACHE_DISK
- , DisplayGridlinesBool // #define CONF_DISPLAY_GRIDLINES
- , MultiLineResultsBool // #define CONF_MULTI_LINE_RESULTS
- , MessageStatusbarBool // #define CONF_MESSAGE_STATUSBAR
- , ColorizedConnectionsBool
- , ColorizedConnectionsMap
- // Options (2nd column)
- , StatusMessageInt // #define CONF_STATUS_MESSAGE
- , HistorySizeInt // #define CONF_STATUS_SAVE
- , ChartSamplesInt // #define CONF_CHART_SAMPLES
- , DisplaySamplesInt // #define CONF_DISPLAY_SAMPLES
- , SizeUnit // #define CONF_SIZE_UNIT
- , RefreshInterval // #define CONF_REFRESH
- , DefaultListFormatInt // #define CONF_DEFAULT_FORMAT
- , Style // #define CONF_STYLE
- , Translation // #define CONF_LOCALE (Translation)
- };
- virtual QVariant defaultValue(int) const;
-
- virtual QVariant toraIIValue(int) const;
- };
-};
-
class toGlobalSetting : public QWidget
, public Ui::toGlobalSettingUI
, public toSettingTab
Added: trunk/tora/src/core/toglobalsettingenum.cpp
===================================================================
--- trunk/tora/src/core/toglobalsettingenum.cpp (rev 0)
+++ trunk/tora/src/core/toglobalsettingenum.cpp 2014-12-29 23:37:59 UTC (rev 5179)
@@ -0,0 +1,169 @@
+
+/* 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/toglobalsettingenum.h"
+
+#include <QtCore/QFileInfo>
+#include <QtCore/QDir>
+#include <QtCore/QLocale>
+#include <QtCore/QSettings>
+
+#include "core/toconf.h"
+#include "core/utils.h"
+
+ToConfiguration::Global s_global;
+
+QVariant ToConfiguration::Global::defaultValue(int option) const
+{
+ switch(option)
+ {
+ // Paths
+ case CustomSQL:
+ {
+ QFileInfo torasql(QDir::homePath(), ".torasql");
+ return QVariant(torasql.absoluteFilePath());
+ }
+ case HelpDirectory: return QVariant(QString("qrc:/help/toc.html"));
+ 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:
+ {
+ QString defaultGvHome;
+#if defined(Q_OS_WIN32)
+ defaultGvHome = "C:/Program Files/Graphviz 2.28/bin";
+#elif defined(Q_OS_WIN64)
+ defaultGvHome = "C:/Program Files(x86)/Graphviz 2.28/bin";
+#else
+ defaultGvHome = "/usr/bin";
+#endif
+ return QVariant(defaultGvHome);
+ }
+ // Options: (1st column)
+ case ChangeConnectionBool: return QVariant((bool)true);
+ case SavePasswordBool: return QVariant((bool)false);
+ case IncludeDbCaptionBool: return QVariant((bool)true);
+ case RestoreSessionBool: return QVariant((bool)false);
+ case ToadBindingsBool: return QVariant((bool)false);
+ case CacheDiskBool: return QVariant((bool)true);
+ case DisplayGridlinesBool: return QVariant((bool)true);
+ case MultiLineResultsBool: return QVariant((bool)false);
+ case MessageStatusbarBool: return QVariant((bool)false);
+ case ColorizedConnectionsBool: return QVariant((bool)true);
+ case ColorizedConnectionsMap:
+ {
+ QMap<QString, QVariant> retval;
+ retval["#FF0000"] = QVariant("Production");
+ retval["#00FF00"] = QVariant("Development");
+ retval["#0000FF"] = QVariant("Testing");
+ return retval;
+ }
+ // Options: (2nd column)
+ case StatusMessageInt: return QVariant((int)5);
+ case HistorySizeInt: return QVariant((int)10);
+ case ChartSamplesInt: return QVariant((int)100);
+ case DisplaySamplesInt: return QVariant((int)-1);
+ case SizeUnit: return QVariant(QString("MB"));
+ case RefreshInterval: return QVariant(QString("None")); // None - 0
+ case DefaultListFormatInt: return QVariant((int)0);
+ case Style: return QVariant(Utils::toGetSessionType());
+ case Translation: return QVariant(QLocale().name());
+ default:
+ Q_ASSERT_X( false, qPrintable(__QHERE__), qPrintable(QString("Context Global un-registered enum value: %1").arg(option)));
+ return QVariant();
+ }
+};
+
+QVariant ToConfiguration::Global::toraIIValue(int option) const
+{
+ QSettings s(TOORGNAME, "TOra"); // "old" Tora 2.x config namespace
+ QVariant retval;
+
+ switch(option)
+ {
+ // Paths
+ case CustomSQL: s.beginGroup("preferences"); retval = s.value("SQLDictionary"); break;
+ //case HelpDirectory:
+ //case DefaultSession:
+ //case CacheDirectory:
+ case OracleHomeDirectory: s.beginGroup("preferences"); retval = s.value("ORACLE_HOME"); break;
+ case MysqlHomeDirectory: s.beginGroup("preferences"); retval = s.value("MYSQL_HOME"); break;
+ case PgsqlHomeDirectory: s.beginGroup("preferences"); retval = s.value("PGSQL_HOME"); break;
+ case GraphvizHomeDirectory: s.beginGroup("preferences"); retval = s.value("GV_HOME"); break;
+ // Options: (1st column)
+ //case ChangeConnectionBool: return QVariant((bool)true);
+ case SavePasswordBool: s.beginGroup("preferences"); retval = s.value("SavePassword"); break;
+ //case IncludeDbCaptionBool: return QVariant((bool)true);
+ //case RestoreSessionBool: return QVariant((bool)false);
+ //case ToadBindingsBool: return QVariant((bool)false);
+ //case CacheDiskBool: s.beginGroup("preferences"); retval = s.value("CacheDiskUse"); break;
+ //case DisplayGridlinesBool: return QVariant((bool)true);
+ //case MultiLineResultsBool: return QVariant((bool)false);
+ //case MessageStatusbarBool: return QVariant((bool)false);
+ //case ColorizedConnectionsBool: return QVariant((bool)true);
+ //case ColorizedConnectionsMap:
+ // Options: (2nd column)
+ //case StatusMessageInt: return QVariant((int)5);
+ //case HistorySizeInt: return QVariant((int)10);
+ //case ChartSamplesInt: return QVariant((int)100);
+ //case DisplaySamplesInt: return QVariant((int)-1);
+ //case SizeUnit: return QVariant(QString("MB"));
+ //case RefreshInterval: return QVariant(QString("None")); // None - 0
+ //case DefaultListFormatInt: return QVariant((int)0);
+ //case Style: return QVariant(Utils::toGetSessionType());
+ //case Translation: return QVariant(QLocale().name());
+ default:
+ s.beginGroup("preferences");
+ retval = QVariant(); break;
+ }
+ s.endGroup();
+ return retval;
+}
Added: trunk/tora/src/core/toglobalsettingenum.h
===================================================================
--- trunk/tora/src/core/toglobalsettingenum.h (rev 0)
+++ trunk/tora/src/core/toglobalsettingenum.h 2014-12-29 23:37:59 UTC (rev 5179)
@@ -0,0 +1,87 @@
+
+/* 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 TOGLOBALSETTINGENUM_H
+#define TOGLOBALSETTINGENUM_H
+
+#include "core/toconfenum.h"
+
+namespace ToConfiguration {
+ class Global : public ConfigContext
+ {
+ Q_OBJECT;
+ Q_ENUMS(OptionTypeEnum);
+ public:
+ Global() : ConfigContext("Global", ENUM_REF(Global,OptionTypeEnum)) {};
+ enum OptionTypeEnum {
+ // Paths
+ CustomSQL = 2000 // #define CONF_SQL_FILE
+ , HelpDirectory // #define CONF_HELP_PATH
+ , DefaultSession // #define CONF_DEFAULT_SESSION
+ , CacheDirectory // #define CONF_CACHE_DIR
+ , OracleHomeDirectory // #define CONF_ORACLE_HOME
+ , MysqlHomeDirectory // #define CONF_MYSQL_HOME
+ , PgsqlHomeDirectory // #define CONF_PGSQL_HOME
+ , GraphvizHomeDirectory
+ // Options (1st column)
+ , ChangeConnectionBool // #define CONF_CHANGE_CONNECTION
+ , SavePasswordBool // #define CONF_SAVE_PWD
+ , IncludeDbCaptionBool // #define CONF_DB_TITLE
+ , RestoreSessionBool // #define CONF_RESTORE_SESSION
+ , ToadBindingsBool // #define CONF_TOAD_BINDINGS
+ , CacheDiskBool // #define CONF_CACHE_DISK
+ , DisplayGridlinesBool // #define CONF_DISPLAY_GRIDLINES
+ , MultiLineResultsBool // #define CONF_MULTI_LINE_RESULTS
+ , MessageStatusbarBool // #define CONF_MESSAGE_STATUSBAR
+ , ColorizedConnectionsBool
+ , ColorizedConnectionsMap
+ // Options (2nd column)
+ , StatusMessageInt // #define CONF_STATUS_MESSAGE
+ , HistorySizeInt // #define CONF_STATUS_SAVE
+ , ChartSamplesInt // #define CONF_CHART_SAMPLES
+ , DisplaySamplesInt // #define CONF_DISPLAY_SAMPLES
+ , SizeUnit // #define CONF_SIZE_UNIT
+ , RefreshInterval // #define CONF_REFRESH
+ , DefaultListFormatInt // #define CONF_DEFAULT_FORMAT
+ , Style // #define CONF_STYLE
+ , Translation // #define CONF_LOCALE (Translation)
+ };
+ virtual QVariant defaultValue(int) const;
+
+ virtual QVariant toraIIValue(int) const;
+ };
+};
+
+#endif
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ibr...@us...> - 2014-12-23 14:32:30
|
Revision: 5178
http://sourceforge.net/p/tora/code/5178
Author: ibre5041
Date: 2014-12-23 14:32:26 +0000 (Tue, 23 Dec 2014)
Log Message:
-----------
script to maintain CMakeList.txt
Added Paths:
-----------
trunk/tora/src/files.pl
Added: trunk/tora/src/files.pl
===================================================================
--- trunk/tora/src/files.pl (rev 0)
+++ trunk/tora/src/files.pl 2014-12-23 14:32:26 UTC (rev 5178)
@@ -0,0 +1,51 @@
+#!/usr/bin/perl
+
+use strict;
+use Switch;
+use Cwd();
+use Data::Dumper;
+
+my @subdirs = ('core', 'widgets', 'editor', 'result', 'parsing');
+
+for my $dir (@subdirs)
+{
+ print $dir . "\n";
+ chdir $dir;
+ open CMAKE_FILE, "CMakeLists.txt" or die $!;
+ open CMAKE_FILE_NEW, ">CMakeLists.txt.new" or die $!;
+
+ my @headers = glob "*.h *.hpp"; @headers = map { " " . $_ . "\n" } sort(@headers);
+ my @sources = glob "*.cc *.cpp"; @sources = map { " " . $_ . "\n" } sort(@sources);
+ my @ui = glob "*.ui"; @ui = map { " " . $_ . "\n" } sort(@ui);
+
+ my $skip = 0;
+ while(my $line = <CMAKE_FILE>)
+ {
+ if( $line =~m/#\s*(BEGIN|END)\s+(UI|SOURCES|HEADERS)/)
+ {
+ print CMAKE_FILE_NEW $line;
+ switch ($1.$2)
+ {
+ case ('BEGIN'.'HEADERS') { $skip = 1; print CMAKE_FILE_NEW join('', @headers); }
+ case ('END'.'HEADERS') { $skip = 0; }
+
+ case ('BEGIN'.'SOURCES') { $skip = 1; print CMAKE_FILE_NEW join('', @sources); }
+ case ('END'.'SOURCES') { $skip = 0; }
+
+ case ('BEGIN'.'UI') { $skip = 1; print CMAKE_FILE_NEW join('', @ui); }
+ case ('END'.'UI') { $skip = 0; }
+ }
+ } else {
+ print CMAKE_FILE_NEW $line unless $skip;
+ }
+ }
+
+ my $output = `diff -Naurw CMakeLists.txt CMakeLists.txt.new`;
+ print Cwd::cwd() . "\n" if $output;
+ print $output;
+
+ chdir "..";
+ close CMAKE_FILE;
+ close CMAKE_FILE_NEW;
+}
+
Property changes on: trunk/tora/src/files.pl
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ibr...@us...> - 2014-12-08 11:25:31
|
Revision: 5177
http://sourceforge.net/p/tora/code/5177
Author: ibre5041
Date: 2014-12-08 11:25:22 +0000 (Mon, 08 Dec 2014)
Log Message:
-----------
compiler warning fix
Modified Paths:
--------------
trunk/tora/src/tools/toplsqleditor.cpp
Modified: trunk/tora/src/tools/toplsqleditor.cpp
===================================================================
--- trunk/tora/src/tools/toplsqleditor.cpp 2014-12-01 09:51:24 UTC (rev 5176)
+++ trunk/tora/src/tools/toplsqleditor.cpp 2014-12-08 11:25:22 UTC (rev 5177)
@@ -56,7 +56,7 @@
#define PLSQL_STATIC "STATIC"
#define PLSQL_RESULT ""
-
+#if TORA3_PARSING
static struct TypeMapType
{
const char *Type;
@@ -75,10 +75,10 @@
{ "LOOP", "Loop", NULL, false, false},
{ "WHILE", "Loop", NULL, false, false},
{ "FOR", "Loop", NULL, false, false},
- { NULL, NULL, false, false}
+ { NULL, NULL, NULL, false, false}
};
+#endif
-
static toTreeWidgetItem *toLastItem(toTreeWidgetItem *parent)
{
toTreeWidgetItem *lastItem = NULL;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ibr...@us...> - 2014-12-01 09:51:32
|
Revision: 5176
http://sourceforge.net/p/tora/code/5176
Author: ibre5041
Date: 2014-12-01 09:51:24 +0000 (Mon, 01 Dec 2014)
Log Message:
-----------
Fix dependency on Qt5 even when Qt4 is used
Modified Paths:
--------------
trunk/tora/src/CMakeLists.txt
Modified: trunk/tora/src/CMakeLists.txt
===================================================================
--- trunk/tora/src/CMakeLists.txt 2014-11-28 09:56:02 UTC (rev 5175)
+++ trunk/tora/src/CMakeLists.txt 2014-12-01 09:51:24 UTC (rev 5176)
@@ -1150,7 +1150,11 @@
"connection/tooracletraits.cpp"
"connection/tooracleconnection.cpp"
"connection/tooraclequery.cpp")
- TARGET_LINK_LIBRARIES(${PROVIDER_ORACLE} ${ORACLE_LIBRARIES} ${QT_LIBRARIES} Qt5::Core Qt5::Widgets ${TORA_LIB} "trotl")
+ IF(QT5_BUILD)
+ TARGET_LINK_LIBRARIES(${PROVIDER_ORACLE} ${ORACLE_LIBRARIES} Qt5::Core Qt5::Widgets ${TORA_LIB} "trotl")
+ ELSE()
+ TARGET_LINK_LIBRARIES(${PROVIDER_ORACLE} ${ORACLE_LIBRARIES} ${QT_LIBRARIES} ${TORA_LIB} "trotl")
+ ENDIF()
IF(DEFINED TORA_LIB)
ADD_DEPENDENCIES(${PROVIDER_ORACLE} ${TORA_LIB})
ELSE()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ibr...@us...> - 2014-11-28 09:56:10
|
Revision: 5175
http://sourceforge.net/p/tora/code/5175
Author: ibre5041
Date: 2014-11-28 09:56:02 +0000 (Fri, 28 Nov 2014)
Log Message:
-----------
Fix for bug reported by Petr. The iterator in fact must be bi-directional.
Curiously this faulty code worked till boost version 1.55. Since version 1.57 it won't compile (which is expected behavior).
Modified Paths:
--------------
trunk/tora/src/parsing/tsqllexer.h
Modified: trunk/tora/src/parsing/tsqllexer.h
===================================================================
--- trunk/tora/src/parsing/tsqllexer.h 2014-11-26 18:52:46 UTC (rev 5174)
+++ trunk/tora/src/parsing/tsqllexer.h 2014-11-28 09:56:02 UTC (rev 5175)
@@ -136,7 +136,7 @@
<
token_const_iterator
, Token const
- , boost::forward_traversal_tag
+ , boost::bidirectional_traversal_tag
>
{
public:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ibr...@us...> - 2014-11-26 18:52:55
|
Revision: 5174
http://sourceforge.net/p/tora/code/5174
Author: ibre5041
Date: 2014-11-26 18:52:46 +0000 (Wed, 26 Nov 2014)
Log Message:
-----------
experimental qt5 build
Modified Paths:
--------------
trunk/tora/src/windows/installer/make_msi.bat
trunk/tora/src/windows/installer/make_msi64.bat
Added Paths:
-----------
trunk/tora/src/windows/installer/make_msi64_qt5.bat
trunk/tora/src/windows/installer/tora-qt5.wxs
Modified: trunk/tora/src/windows/installer/make_msi.bat
===================================================================
--- trunk/tora/src/windows/installer/make_msi.bat 2014-11-26 01:06:29 UTC (rev 5173)
+++ trunk/tora/src/windows/installer/make_msi.bat 2014-11-26 18:52:46 UTC (rev 5174)
@@ -1,8 +1,8 @@
@echo off
SET BUILD_ARCH=x86
-SET DIR1=c:\Program Files (x86)\WiX Toolset v3.8\bin
-SET DIR2=c:\Program Files\WiX Toolset v3.8\bin
+SET DIR1=c:\Program Files (x86)\WiX Toolset v3.9\bin
+SET DIR2=c:\Program Files\WiX Toolset v3.9\bin
IF EXIST "%DIR1%"\ SET PATH=%DIR1%;%PATH%
IF EXIST "%DIR2%"\ SET PATH=%DIR2%;%PATH%
Modified: trunk/tora/src/windows/installer/make_msi64.bat
===================================================================
--- trunk/tora/src/windows/installer/make_msi64.bat 2014-11-26 01:06:29 UTC (rev 5173)
+++ trunk/tora/src/windows/installer/make_msi64.bat 2014-11-26 18:52:46 UTC (rev 5174)
@@ -1,8 +1,8 @@
@echo off
SET BUILD_ARCH=x64
-SET DIR1=c:\Program Files (x86)\WiX Toolset v3.8\bin
-SET DIR2=c:\Program Files\WiX Toolset v3.8\bin
+SET DIR1=c:\Program Files (x86)\WiX Toolset v3.9\bin
+SET DIR2=c:\Program Files\WiX Toolset v3.9\bin
IF EXIST "%DIR1%"\ SET PATH=%DIR1%;%PATH%
IF EXIST "%DIR2%"\ SET PATH=%DIR2%;%PATH%
Added: trunk/tora/src/windows/installer/make_msi64_qt5.bat
===================================================================
--- trunk/tora/src/windows/installer/make_msi64_qt5.bat (rev 0)
+++ trunk/tora/src/windows/installer/make_msi64_qt5.bat 2014-11-26 18:52:46 UTC (rev 5174)
@@ -0,0 +1,20 @@
+@echo off
+SET BUILD_ARCH=x64
+
+SET DIR1=c:\Program Files (x86)\WiX Toolset v3.9\bin
+SET DIR2=c:\Program Files\WiX Toolset v3.9\bin
+
+IF EXIST "%DIR1%"\ SET PATH=%DIR1%;%PATH%
+IF EXIST "%DIR2%"\ SET PATH=%DIR2%;%PATH%
+
+set BUILD_NUMBER=
+
+for /F "tokens=1,2" %%t in ('svn info') do @if "%%t"=="Revision:" set BUILD_NUMBER=%%u
+
+echo Build Number: %BUILD_NUMBER%
+
+candle.exe tora-qt5.wxs
+light.exe -ext WixUIExtension -o tora3alpha.64bit.msi tora-qt5.wixobj
+
+@pause
+
Added: trunk/tora/src/windows/installer/tora-qt5.wxs
===================================================================
--- trunk/tora/src/windows/installer/tora-qt5.wxs (rev 0)
+++ trunk/tora/src/windows/installer/tora-qt5.wxs 2014-11-26 18:52:46 UTC (rev 5174)
@@ -0,0 +1,320 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+ <!-- Product name as you want it to appear in Add/Remove Programs-->
+ <!--<?define Platform = x64 ?>-->
+ <?define Platform = $(env.BUILD_ARCH) ?>
+ <?if $(var.Platform) = x64 ?>
+ <?define ProductName = "Tora (64 bit)" ?>
+ <?define Win64 = "yes" ?>
+ <?define PlatformProgramFilesFolder = "ProgramFiles64Folder" ?>
+ <?define PlatformSystemFolder = "System64Folder" ?>
+ <?else ?>
+ <?define ProductName = "Tora" ?>
+ <?define Win64 = "no" ?>
+ <?define PlatformProgramFilesFolder = "ProgramFilesFolder" ?>
+ <?define PlatformSystemFolder = "SystemFolder" ?>
+ <?endif ?>
+ <?ifdef env.BUILD_NUMBER?>
+ <?define ProductVersion="2.9.$(env.BUILD_NUMBER)"?>
+ <?else?>
+ <?define ProductVersion="2.9.0"?>
+ <?endif?>
+ <?define UpgradeCode="BAAA2F25-E626-4CC5-BC37-86477A2409AC"?>
+ <?define BuildType = "RelWithDebInfo" ?>
+ <Product Id="*"
+ Name="$(var.ProductName)" Language="1033"
+ Version="$(var.ProductVersion)"
+ Manufacturer="TOra"
+ UpgradeCode="$(var.UpgradeCode)">
+ <Package Description="$(var.ProductName)"
+ Comments="Tora tool for Oracle"
+ InstallScope="perMachine"
+ Platform="$(var.Platform)"
+ InstallerVersion="200" Compressed="yes" />
+ <Media Id="1" Cabinet="Tora.cab" EmbedCab="yes" />
+ <Icon Id="tora.ico" SourceFile="..\tora.ico" />
+ <Property Id="ARPPRODUCTICON" Value="tora.ico" />
+ <Property Id="ARPHELPLINK" Value="http://torasql.com" />
+ <Property Id="ARPURLINFOABOUT" Value="http://torasql.com" />
+ <Property Id="ARPNOREPAIR" Value="1" />
+ <Property Id="INSTALLLOCATION">
+ <RegistrySearch Id="RegistrySearch" Type="raw" Root="HKLM" Win64="$(var.Win64)"
+ Key="Software\TOra\TOra" Name="InstallLocation" />
+ </Property>
+
+ <WixVariable Id="WixUIBannerBmp" Value="largelogo.bmp" />
+ <WixVariable Id="WixUILicenseRtf" Value="..\..\..\COPYING" />
+
+ <Property Id="PREVIOUSVERSIONSINSTALLED" Secure="yes" />
+ <Upgrade Id="$(var.UpgradeCode)">
+ <UpgradeVersion
+ OnlyDetect="no"
+ Minimum="0.0.0.0" IncludeMinimum="yes"
+ Maximum="$(var.ProductVersion)" IncludeMaximum="no"
+ Property="PREVIOUSFOUND" />
+ </Upgrade>
+ <!--
+ <Condition Message="A newer version of this software is already installed.">
+ NOT NEWERVERSIONDETECTED
+ </Condition>
+ -->
+
+ <Directory Id="TARGETDIR" Name="SourceDir">
+ <Directory Id="$(var.PlatformProgramFilesFolder)">
+ <Directory Id="INSTALLDIR" Name="Tora">
+
+ <Component Id="ICUDT52.DLL" DiskId="1" Win64="$(var.Win64)" Guid="*">
+ <File Id="ICUDT52.DLL" Name="ICUDT52.DLL" Source="..\..\$(var.BuildType)\ICUDT52.DLL" />
+ </Component>
+ <Component Id="ICUIN52.DLL" DiskId="1" Win64="$(var.Win64)">
+ <File Id="ICUIN52.DLL" Name="ICUIN52.DLL" Source="..\..\$(var.BuildType)\ICUIN52.DLL" />
+ </Component>
+ <Component Id="ICUUC52.DLL" DiskId="1" Win64="$(var.Win64)">
+ <File Id="ICUUC52.DLL" Name="ICUUC52.DLL" Source="..\..\$(var.BuildType)\ICUUC52.DLL" />
+ </Component>
+ <Component Id="QT5CORE.DLL" DiskId="1" Win64="$(var.Win64)">
+ <File Id="QT5CORE.DLL" Name="QT5CORE.DLL" Source="..\..\$(var.BuildType)\QT5CORE.DLL" />
+ </Component>
+ <Component Id="QT5GUI.DLL" DiskId="1" Win64="$(var.Win64)">
+ <File Id="QT5GUI.DLL" Name="QT5GUI.DLL" Source="..\..\$(var.BuildType)\QT5GUI.DLL" />
+ </Component>
+ <Component Id="QT5NETWORK.DLL" DiskId="1" Win64="$(var.Win64)">
+ <File Id="QT5NETWORK.DLL" Name="QT5NETWORK.DLL" Source="..\..\$(var.BuildType)\QT5NETWORK.DLL" />
+ </Component>
+ <Component Id="QT5PRINTSUPPORT.DLL" DiskId="1" Win64="$(var.Win64)">
+ <File Id="QT5PRINTSUPPORT.DLL" Name="QT5PRINTSUPPORT.DLL" Source="..\..\$(var.BuildType)\QT5PRINTSUPPORT.DLL" />
+ </Component>
+ <Component Id="QT5SQL.DLL" DiskId="1" Win64="$(var.Win64)">
+ <File Id="QT5SQL.DLL" Name="QT5SQL.DLL" Source="..\..\$(var.BuildType)\QT5SQL.DLL" />
+ </Component>
+ <Component Id="QT5WIDGETS.DLL" DiskId="1" Win64="$(var.Win64)">
+ <File Id="QT5WIDGETS.DLL" Name="QT5WIDGETS.DLL" Source="..\..\$(var.BuildType)\QT5WIDGETS.DLL" />
+ </Component>
+ <!--
+ <Component Id="QTCORE4.DLL" DiskId="1" Win64="$(var.Win64)" Guid="A06ADCBB-EFAD-4DBA-9BC9-B871CE8B728C">
+ <File Id="QTCORE4.DLL" Name="QtCore4.dll" Source="..\..\$(var.BuildType)\QtCore4.dll" />
+ </Component>
+ <Component Id="QTGUI4.DLL" DiskId="1" Win64="$(var.Win64)" Guid="B0A31CA7-A416-4265-982B-E626C187C06E">
+ <File Id="QTGUI4.DLL" Name="QtGui4.dll" Source="..\..\$(var.BuildType)\QtGui4.dll" />
+ </Component>
+ <Component Id="QTNETWORK4.DLL" DiskId="1" Win64="$(var.Win64)" Guid="57BF565A-7EFC-4C7D-B282-5F98B969650E">
+ <File Id="QTNETWORK4.DLL" Name="QtNetwork4.dll" Source="..\..\$(var.BuildType)\QtNetwork4.dll" />
+ </Component>
+ <Component Id="QTSQL4.DLL" DiskId="1" Win64="$(var.Win64)" Guid="CB86B8BB-39B6-4747-B969-9FA1D5688FCD">
+ <File Id="QTSQL4.DLL" Name="QtSql4.dll" Source="..\..\$(var.BuildType)\QtSql4.dll" />
+ </Component>
+ <Component Id="QTXML4.DLL" DiskId="1" Win64="$(var.Win64)" Guid="F158986A-1C1B-4956-A376-FB000310FAB7">
+ <File Id="QTXML4.DLL" Name="QtXml4.dll" Source="..\..\$(var.BuildType)\QtXml4.dll" />
+ </Component>
+ -->
+ <Component Id="TORA.EXE" DiskId="1" Win64="$(var.Win64)" Guid="DB3855D1-FD03-4AAE-A220-D81071E3635B">
+ <File Id="TORA.EXE" Name="tora.exe" Source="..\..\$(var.BuildType)\tora.exe" />
+ </Component>
+ <Component Id="TROTL.DLL" DiskId="1" Win64="$(var.Win64)" Guid="3D149B9C-D59C-4B68-979D-BE132671F00D">
+ <File Id="TROTL.DLL" Name="trotl.dll" Source="..\..\$(var.BuildType)\trotl.dll" />
+ </Component>
+ <Component Id="PORACLE.DLL" DiskId="1" Win64="$(var.Win64)" Guid="D864C985-6F7C-44ED-9417-3E4C274E351D">
+ <File Id="PORACLE.DLL" Name="poracle.dll" Source="..\..\$(var.BuildType)\poracle.dll" />
+ </Component>
+ <!--
+ <Directory Id="PLUGINS" Name="plugins">
+ <Component Id="QSQLMYSQL4.DLL" Win64="$(var.Win64)" DiskId="1" Guid="7FEC6332-E4CC-4F2F-B2C0-29A2744AFD7D">
+ <File Id="QSQLMYSQL4.DLL" Name="qsqlmysql4.dll" Source="..\..\$(var.BuildType)\plugins\qsqlmysql4.dll" />
+ </Component>
+ <Component Id="QSQLODBC4.DLL" Win64="$(var.Win64)" DiskId="1" Guid="1BB8D019-7313-4159-BB55-8810F25A7C48">
+ <File Id="QSQLODBC4.DLL" Name="qsqlodbc4.dll" Source="..\..\$(var.BuildType)\plugins\qsqlodbc4.dll" />
+ </Component>
+ </Directory>
+ -->
+ </Directory>
+ </Directory>
+
+ <Directory Id="ProgramMenuFolder">
+ <Directory Id="ProgramMenuSubfolder" Name="Tora">
+ <Component Id="ApplicationShortcuts"
+ Guid="6e6901f0-d92a-43da-95bd-f21e48b5b37a">
+ <Shortcut Id="ApplicationShortcut1" Name="Tora"
+ Description="Tora tool for Oracle"
+ Target="[INSTALLDIR]Tora.exe"
+ WorkingDirectory="INSTALLDIR" />
+ <Shortcut Id="UninstallProduct"
+ Name="Uninstall Tora"
+ Description="Uninstalls Tora"
+ Target="[$(var.PlatformSystemFolder)]msiexec.exe"
+ Arguments="/x [ProductCode]"/>
+ <RegistryValue Root="HKCU" Key="Software\TOra\TOra"
+ Name="installed" Type="integer" Value="1" KeyPath="yes" />
+ <RemoveFolder Id="ProgramMenuSubfolder" On="uninstall" />
+ </Component>
+ </Directory>
+ </Directory>
+
+ <Directory Id="DesktopFolder" Name="Desktop">
+ <Component Id="DesktopShortcut" Guid="EC9BAF82-9766-481B-8E03-62754F190BBB">
+ <Condition>INSTALLDESKTOPSHORTCUT</Condition>
+ <CreateFolder/>
+ <RegistryKey Root="HKCU" Key="Software\TOra\TOra">
+ <RegistryValue Name="DTSC" Value="1" Type="integer" KeyPath="yes" />
+ </RegistryKey>
+ <Shortcut Id="DesktopShortcut" Directory="DesktopFolder" Name="Tora" Target="[TORA.EXE]" WorkingDirectory="INSTALLDIR" />
+ </Component>
+ </Directory>
+ </Directory>
+
+ <InstallExecuteSequence>
+ <!--<RemoveExistingProducts After="InstallValidate" />-->
+ <RemoveExistingProducts Before="InstallInitialize" />
+ </InstallExecuteSequence>
+
+ <Feature Id="DefaultFeature" Title="Main Feature" Level="1">
+ <ComponentRef Id="PORACLE.DLL" />
+ <!--
+ <ComponentRef Id="QSQLMYSQL4.DLL" />
+ <ComponentRef Id="QSQLODBC4.DLL" />
+ <ComponentRef Id="QTCORE4.DLL" />
+ <ComponentRef Id="QTGUI4.DLL" />
+ <ComponentRef Id="QTNETWORK4.DLL" />
+ <ComponentRef Id="QTSQL4.DLL" />
+ <ComponentRef Id="QTXML4.DLL" />
+ -->
+ <ComponentRef Id="ICUDT52.DLL"/>
+ <ComponentRef Id="ICUIN52.DLL"/>
+ <ComponentRef Id="ICUUC52.DLL"/>
+ <ComponentRef Id="QT5CORE.DLL"/>
+ <ComponentRef Id="QT5GUI.DLL"/>
+ <ComponentRef Id="QT5NETWORK.DLL"/>
+ <ComponentRef Id="QT5PRINTSUPPORT.DLL"/>
+ <ComponentRef Id="QT5SQL.DLL"/>
+ <ComponentRef Id="QT5WIDGETS.DLL"/>
+ <ComponentRef Id="TORA.EXE" />
+ <ComponentRef Id="TROTL.DLL" />
+ <ComponentRef Id="ApplicationShortcuts" />
+ <ComponentRef Id="DesktopShortcut" />
+ </Feature>
+
+
+ <Property Id="INSTALLDESKTOPSHORTCUT" Value="1" />
+ <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" />
+ <UIRef Id="MyWixUI_InstallDir" />
+ <Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT" Value="Launch My Application Name" />
+
+ <!-- Step 3: Include the custom action -->
+ <CustomAction Id="LaunchApplication" FileKey="TORA.EXE" ExeCommand="" Execute="immediate" Impersonate="yes" Return="asyncNoWait" />
+ <UI>
+ <Publish Dialog="MyExitDialog" Control="Finish" Order="1" Event="DoAction" Value="LaunchApplication">LAUNCHAPPONEXIT</Publish>
+ </UI>
+ </Product>
+
+ <Fragment>
+ <UI Id="MyWixUI_InstallDir">
+ <TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" />
+ <TextStyle Id="WixUI_Font_Bigger" FaceName="Tahoma" Size="12" />
+ <TextStyle Id="WixUI_Font_Title" FaceName="Tahoma" Size="9" Bold="yes" />
+
+ <Property Id="DefaultUIFont" Value="WixUI_Font_Normal" />
+ <Property Id="WixUI_Mode" Value="InstallDir" />
+
+ <DialogRef Id="BrowseDlg" />
+ <DialogRef Id="DiskCostDlg" />
+ <DialogRef Id="ErrorDlg" />
+ <DialogRef Id="FatalError" />
+ <DialogRef Id="FilesInUse" />
+ <DialogRef Id="MsiRMFilesInUse" />
+ <DialogRef Id="PrepareDlg" />
+ <DialogRef Id="ProgressDlg" />
+ <DialogRef Id="ResumeDlg" />
+ <DialogRef Id="UserExit" />
+
+ <Publish Dialog="BrowseDlg" Control="OK" Event="DoAction" Value="WixUIValidatePath" Order="3">1</Publish>
+ <Publish Dialog="BrowseDlg" Control="OK" Event="SpawnDialog" Value="InvalidDirDlg" Order="4"><![CDATA[WIXUI_INSTALLDIR_VALID<>"1"]]></Publish>
+
+ <Publish Dialog="MyExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish>
+
+ <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="MyInstallDirDlg">NOT Installed</Publish>
+ <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">Installed AND PATCH</Publish>
+
+ <Publish Dialog="MyInstallDirDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg">1</Publish>
+ <Publish Dialog="MyInstallDirDlg" Control="Next" Event="SetTargetPath" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
+ <Publish Dialog="MyInstallDirDlg" Control="Next" Event="DoAction" Value="WixUIValidatePath" Order="2">NOT WIXUI_DONTVALIDATEPATH</Publish>
+ <Publish Dialog="MyInstallDirDlg" Control="Next" Event="SpawnDialog" Value="InvalidDirDlg" Order="3"><![CDATA[NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID<>"1"]]></Publish>
+ <Publish Dialog="MyInstallDirDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg" Order="4">WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1"</Publish>
+ <Publish Dialog="MyInstallDirDlg" Control="ChangeFolder" Property="_BrowseProperty" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
+ <Publish Dialog="MyInstallDirDlg" Control="ChangeFolder" Event="SpawnDialog" Value="BrowseDlg" Order="2">1</Publish>
+
+ <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MyInstallDirDlg" Order="1">NOT Installed</Publish>
+ <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="2">Installed AND NOT PATCH</Publish>
+ <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="2">Installed AND PATCH</Publish>
+
+ <Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="MaintenanceTypeDlg">1</Publish>
+
+ <Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+ <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+ <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg">1</Publish>
+
+ <!--<Property Id="ARPNOMODIFY" Value="1" />-->
+ </UI>
+
+ <UIRef Id="WixUI_Common" />
+ </Fragment>
+
+ <Fragment>
+ <UI>
+ <Dialog Id="MyInstallDirDlg" Width="370" Height="270" Title="!(loc.InstallDirDlg_Title)">
+ <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.WixUINext)" />
+ <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)" />
+ <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
+ <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
+ </Control>
+
+ <Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.InstallDirDlgDescription)" />
+ <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.InstallDirDlgTitle)" />
+ <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.InstallDirDlgBannerBitmap)" />
+ <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
+ <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
+
+ <Control Id="FolderLabel" Type="Text" X="20" Y="60" Width="290" Height="30" NoPrefix="yes" Text="!(loc.InstallDirDlgFolderLabel)" />
+ <Control Id="Folder" Type="PathEdit" X="20" Y="100" Width="320" Height="18" Property="WIXUI_INSTALLDIR" Indirect="yes" />
+ <Control Id="ChangeFolder" Type="PushButton" X="20" Y="120" Width="56" Height="17" Text="!(loc.InstallDirDlgChange)" />
+ <!-- TODO does not work ATM
+ <Control Id="DesktopShortcutCheckBox" Type="CheckBox" X="20" Y="160" Width="290" Height="17" Property="INSTALLDESKTOPSHORTCUT" CheckBoxValue="1" Text="Create a shortcut for this program on the desktop." />
+ -->
+ </Dialog>
+ </UI>
+ </Fragment>
+
+ <Fragment>
+ <UI>
+ <Dialog Id="MyExitDialog" Width="370" Height="270" Title="!(loc.ExitDialog_Title)">
+ <Control Id="Finish" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.WixUIFinish)" />
+ <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUICancel)" />
+ <Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="!(loc.ExitDialogBitmap)" />
+ <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUIBack)" />
+ <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
+ <Control Id="Description" Type="Text" X="135" Y="70" Width="220" Height="20" Transparent="yes" NoPrefix="yes" Text="!(loc.ExitDialogDescription)" />
+ <Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.ExitDialogTitle)" />
+ <!--
+ <Control Id="OptionalText" Type="Text" X="135" Y="100" Width="220" Height="80" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="[WIXUI_EXITDIALOGOPTIONALTEXT]">
+ <Condition Action="show">WIXUI_EXITDIALOGOPTIONALTEXT AND NOT Installed</Condition>
+ </Control>
+ <Control Id="OptionalCheckBox" Type="CheckBox" X="135" Y="190" Width="220" Height="40" Hidden="yes" Property="WIXUI_EXITDIALOGOPTIONALCHECKBOX" CheckBoxValue="1" Text="[WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT]">
+ <Condition Action="show">WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT AND NOT Installed</Condition>
+ </Control>
+ -->
+ <Control Id="LaunchCheckBox" Type="CheckBox" X="10" Y="243" Width="170" Height="17" Property="LAUNCHAPPONEXIT" Hidden="yes" CheckBoxValue="1" Text="Launch $(var.ProductName) when setup exits.">
+ <Condition Action="show">NOT Installed</Condition>
+ </Control>
+ </Dialog>
+
+ <InstallUISequence>
+ <Show Dialog="MyExitDialog" OnExit="success" />
+ </InstallUISequence>
+
+ <AdminUISequence>
+ <Show Dialog="MyExitDialog" OnExit="success" />
+ </AdminUISequence>
+ </UI>
+ </Fragment>
+
+</Wix>
+
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ibr...@us...> - 2014-11-26 01:06:36
|
Revision: 5173
http://sourceforge.net/p/tora/code/5173
Author: ibre5041
Date: 2014-11-26 01:06:29 +0000 (Wed, 26 Nov 2014)
Log Message:
-----------
fix - depend on qt5 libs
Modified Paths:
--------------
trunk/tora/src/CMakeLists.txt
Modified: trunk/tora/src/CMakeLists.txt
===================================================================
--- trunk/tora/src/CMakeLists.txt 2014-11-26 00:12:11 UTC (rev 5172)
+++ trunk/tora/src/CMakeLists.txt 2014-11-26 01:06:29 UTC (rev 5173)
@@ -1150,7 +1150,7 @@
"connection/tooracletraits.cpp"
"connection/tooracleconnection.cpp"
"connection/tooraclequery.cpp")
- TARGET_LINK_LIBRARIES(${PROVIDER_ORACLE} ${ORACLE_LIBRARIES} ${QT_LIBRARIES} ${TORA_LIB} "trotl")
+ TARGET_LINK_LIBRARIES(${PROVIDER_ORACLE} ${ORACLE_LIBRARIES} ${QT_LIBRARIES} Qt5::Core Qt5::Widgets ${TORA_LIB} "trotl")
IF(DEFINED TORA_LIB)
ADD_DEPENDENCIES(${PROVIDER_ORACLE} ${TORA_LIB})
ELSE()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ibr...@us...> - 2014-11-26 00:12:20
|
Revision: 5172
http://sourceforge.net/p/tora/code/5172
Author: ibre5041
Date: 2014-11-26 00:12:11 +0000 (Wed, 26 Nov 2014)
Log Message:
-----------
ambiguous override fix
Modified Paths:
--------------
trunk/tora/src/tools/tostorage.cpp
Modified: trunk/tora/src/tools/tostorage.cpp
===================================================================
--- trunk/tora/src/tools/tostorage.cpp 2014-11-25 23:41:43 UTC (rev 5171)
+++ trunk/tora/src/tools/tostorage.cpp 2014-11-26 00:12:11 UTC (rev 5172)
@@ -643,7 +643,7 @@
Datafile->FilenameOrig = filename;
Datafile->Filename->setText(filename);
Datafile->InitialSize->setValue(Datafile->InitialSizeOrig = Utils::toShift(result).toInt());
- if (!(Utils::toShift(result) == QString::fromLatin1("NO")))
+ if (!(Utils::toShift(result).displayData() == QString::fromLatin1("NO")))
{
Datafile->AutoExtend->setChecked(true);
Datafile->NextSize->setValue(Datafile->NextSizeOrig = Utils::toShift(result).toInt());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ibr...@us...> - 2014-11-25 23:41:48
|
Revision: 5171
http://sourceforge.net/p/tora/code/5171
Author: ibre5041
Date: 2014-11-25 23:41:43 +0000 (Tue, 25 Nov 2014)
Log Message:
-----------
MSVC compile fix
Modified Paths:
--------------
trunk/tora/src/precompiled/precompiled_msvc.h
Modified: trunk/tora/src/precompiled/precompiled_msvc.h
===================================================================
--- trunk/tora/src/precompiled/precompiled_msvc.h 2014-11-25 23:23:18 UTC (rev 5170)
+++ trunk/tora/src/precompiled/precompiled_msvc.h 2014-11-25 23:41:43 UTC (rev 5171)
@@ -112,8 +112,8 @@
#include <QtGui/QPixmapCache>
#include <QPlainTextEdit>
#include <QtGui/QPolygon>
-#include <QtGui/QPrintDialog>
-#include <QtGui/QPrinter>
+#include <QPrintDialog>
+#include <QPrinter>
#include <QProgressBar>
#include <QProgressDialog>
#include <QPushButton>
@@ -123,7 +123,7 @@
#include <QScrollBar>
#include <QShortcut>
#include <QSlider>
-#include <QtGui/QSortFilterProxyModel>
+#include <QSortFilterProxyModel>
#include <QSpinBox>
#include <QSplitter>
#include <QStackedWidget>
@@ -150,7 +150,7 @@
#include <QVBoxLayout>
#include <QWidget>
#include <QtXml/QDomDocument>
-#include <QtXml/QXmlStreamReader>
+#include <QXmlStreamReader>
// STL headers
#include <algorithm>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ibr...@us...> - 2014-11-25 23:23:22
|
Revision: 5170
http://sourceforge.net/p/tora/code/5170
Author: ibre5041
Date: 2014-11-25 23:23:18 +0000 (Tue, 25 Nov 2014)
Log Message:
-----------
more env scripts
Added Paths:
-----------
trunk/tora/utils/qt4-32.bat
trunk/tora/utils/qt4-64.bat
trunk/tora/utils/qt5-64.bat
Removed Paths:
-------------
trunk/tora/utils/qt32.bat
Deleted: trunk/tora/utils/qt32.bat
===================================================================
--- trunk/tora/utils/qt32.bat 2014-11-25 22:57:01 UTC (rev 5169)
+++ trunk/tora/utils/qt32.bat 2014-11-25 23:23:18 UTC (rev 5170)
@@ -1,47 +0,0 @@
-@ECHO OFF
-
-set DEV=D:\DEVEL
-set QTDIR=%DEV%\qt-everywhere-opensource-src-4.8.5
-set PATH=%SystemRoot%;%SystemRoot%\system32;d:\devel\TortoiseSVN\bin;D:\DEVEL\CMake2.8\bin;%QTDIR%\bin;D:\devel\doxygen\bin
-
-echo Setting OpenSSL Env.
-set OPENSSL=%DEV%\openssl
-set PATH=%OPENSSL%\bin;%PATH%
-set LIB=%OPENSSL%\lib
-set INCLUDE=%OPENSSL%\include
-
-rem echo Setting NASM Env.
-rem set PATH=%DEV%\NASM;%PATH%
-
-echo Setting DirectX Env.
-set LIB=%DEV%\DXSDK2010\Lib\x86;%LIB%
-set INCLUDE=%DEV%\DXSDK2010\Include;%INCLUDE%
-
-echo Setting MSVC2010 Env.
-set VSINSTALLDIR=C:\DEVEL\MSVCE2010
-set VCINSTALLDIR=C:\DEVEL\MSVCE2010\VC
-set DevEnvDir=%VSINSTALLDIR%\Common7\IDE
-set PATH=%VCINSTALLDIR%\bin;%VSINSTALLDIR%\Common7\Tools;%VSINSTALLDIR%\Common7\IDE;%VCINSTALLDIR%\VCPackages;%PATH%
-set INCLUDE=%VCINSTALLDIR%\include;%INCLUDE%
-set LIB=%VCINSTALLDIR%\lib;%LIB%
-set LIBPATH=%VCINSTALLDIR%\lib
-
-echo Setting Windows SDK Env.
-set WindowsSdkDir=%DEV%\XPSDK7.1
-set PATH=%WindowsSdkDir%\Bin;%PATH%
-set LIB=%WindowsSdkDir%\Lib;%LIB%
-set INCLUDE=%WindowsSdkDir%\Include;%INCLUDE%
-set TARGET_CPU=x86
-
-echo Setting Framework Env.
-set FrameworkVersion=v4.0.30319
-set Framework35Version=v3.5
-set FrameworkDir=%SystemRoot%\Microsoft.NET\Framework
-set LIBPATH=%FrameworkDir%\%FrameworkVersion%;%FrameworkDir%\%Framework35Version%;%LIBPATH%
-set PATH=%LIBPATH%;%PATH%;D:\Perl\bin
-
-echo Env. ready.
-
-title Qt Framework 4.8.5 Development Kit.
-
-cd %DEV%
Copied: trunk/tora/utils/qt4-32.bat (from rev 5169, trunk/tora/utils/qt32.bat)
===================================================================
--- trunk/tora/utils/qt4-32.bat (rev 0)
+++ trunk/tora/utils/qt4-32.bat 2014-11-25 23:23:18 UTC (rev 5170)
@@ -0,0 +1,47 @@
+@ECHO OFF
+
+set DEV=D:\DEVEL
+set QTDIR=%DEV%\qt-everywhere-opensource-src-4.8.5
+set PATH=%SystemRoot%;%SystemRoot%\system32;d:\devel\TortoiseSVN\bin;D:\DEVEL\CMake2.8\bin;%QTDIR%\bin;D:\devel\doxygen\bin
+
+echo Setting OpenSSL Env.
+set OPENSSL=%DEV%\openssl
+set PATH=%OPENSSL%\bin;%PATH%
+set LIB=%OPENSSL%\lib
+set INCLUDE=%OPENSSL%\include
+
+rem echo Setting NASM Env.
+rem set PATH=%DEV%\NASM;%PATH%
+
+echo Setting DirectX Env.
+set LIB=%DEV%\DXSDK2010\Lib\x86;%LIB%
+set INCLUDE=%DEV%\DXSDK2010\Include;%INCLUDE%
+
+echo Setting MSVC2010 Env.
+set VSINSTALLDIR=C:\DEVEL\MSVCE2010
+set VCINSTALLDIR=C:\DEVEL\MSVCE2010\VC
+set DevEnvDir=%VSINSTALLDIR%\Common7\IDE
+set PATH=%VCINSTALLDIR%\bin;%VSINSTALLDIR%\Common7\Tools;%VSINSTALLDIR%\Common7\IDE;%VCINSTALLDIR%\VCPackages;%PATH%
+set INCLUDE=%VCINSTALLDIR%\include;%INCLUDE%
+set LIB=%VCINSTALLDIR%\lib;%LIB%
+set LIBPATH=%VCINSTALLDIR%\lib
+
+echo Setting Windows SDK Env.
+set WindowsSdkDir=%DEV%\XPSDK7.1
+set PATH=%WindowsSdkDir%\Bin;%PATH%
+set LIB=%WindowsSdkDir%\Lib;%LIB%
+set INCLUDE=%WindowsSdkDir%\Include;%INCLUDE%
+set TARGET_CPU=x86
+
+echo Setting Framework Env.
+set FrameworkVersion=v4.0.30319
+set Framework35Version=v3.5
+set FrameworkDir=%SystemRoot%\Microsoft.NET\Framework
+set LIBPATH=%FrameworkDir%\%FrameworkVersion%;%FrameworkDir%\%Framework35Version%;%LIBPATH%
+set PATH=%LIBPATH%;%PATH%;D:\Perl\bin
+
+echo Env. ready.
+
+title Qt Framework 4.8.5 Development Kit.
+
+cd %DEV%
Added: trunk/tora/utils/qt4-64.bat
===================================================================
--- trunk/tora/utils/qt4-64.bat (rev 0)
+++ trunk/tora/utils/qt4-64.bat 2014-11-25 23:23:18 UTC (rev 5170)
@@ -0,0 +1,47 @@
+@ECHO OFF
+
+set DEV=C:\Devel
+set QTDIR=%DEV%\qt-everywhere-opensource-src-4.8.5.64bit
+set PATH=%SystemRoot%;%SystemRoot%\system32;%QTDIR%\bin;c:\devel\CMake2.8\bin;C:\devel\Perl64\bin;c:\devel\TortoiseSVN\bin
+
+echo Setting OpenSSL Env.
+set OPENSSL=%DEV%\openssl-1.0.1e.64bit
+set PATH=%OPENSSL%\bin;%PATH%
+set LIB=%OPENSSL%\lib
+set INCLUDE=%OPENSSL%\include
+
+rem echo Setting NASM Env.
+rem set PATH=%DEV%\NASM;%PATH%
+
+echo Setting DirectX Env.
+set LIB=%DEV%\DXSDK\Lib\x64;%LIB%
+set INCLUDE=%DEV%\DXSDK\Include;%INCLUDE%
+
+echo Setting Windows SDK Env.
+set WindowsSdkDir=%DEV%\SDK7.1
+set PATH=%WindowsSdkDir%\Bin;%PATH%
+set LIB=%WindowsSdkDir%\Lib\x64;%LIB%
+set INCLUDE=%WindowsSdkDir%\Include;%INCLUDE%
+set TARGET_CPU=x64
+
+echo Setting MSVC2010 Env.
+set VSINSTALLDIR=%DEV%\MSVC10
+set VCINSTALLDIR=%DEV%\MSVC10\VC
+set DevEnvDir=%VSINSTALLDIR%\Common7\IDE
+set PATH=%VCINSTALLDIR%\bin\amd64;%VSINSTALLDIR%\Common7\Tools;%VSINSTALLDIR%\Common7\IDE;%VCINSTALLDIR%\VCPackages;%PATH%
+set INCLUDE=%VCINSTALLDIR%\include;%INCLUDE%
+set LIB=%VCINSTALLDIR%\lib\amd64;%LIB%
+set LIBPATH=%VCINSTALLDIR%\lib\amd64
+
+echo Setting Framework Env.
+set FrameworkVersion=v4.0.30319
+set Framework35Version=v3.5
+set FrameworkDir=%SystemRoot%\Microsoft.NET\Framework
+set LIBPATH=%FrameworkDir%\%FrameworkVersion%;%FrameworkDir%\%Framework35Version%;%LIBPATH%
+set PATH=%LIBPATH%;%PATH%
+
+echo Env. ready.
+
+title Qt Framework 4.8.5 Development Kit(64bit)
+
+cd %DEV%
Added: trunk/tora/utils/qt5-64.bat
===================================================================
--- trunk/tora/utils/qt5-64.bat (rev 0)
+++ trunk/tora/utils/qt5-64.bat 2014-11-25 23:23:18 UTC (rev 5170)
@@ -0,0 +1,47 @@
+@ECHO OFF
+
+set DEV=C:\Devel
+set QTDIR=%DEV%\Qt5.3.2.64bit
+set PATH=%SystemRoot%;%SystemRoot%\system32;%QTDIR%\bin;c:\devel\CMake2.8\bin;C:\devel\Perl64\bin;c:\devel\TortoiseSVN\bin
+
+echo Setting OpenSSL Env.
+set OPENSSL=%DEV%\openssl-1.0.1e.64bit
+set PATH=%OPENSSL%\bin;%PATH%
+set LIB=%OPENSSL%\lib
+set INCLUDE=%OPENSSL%\include
+
+rem echo Setting NASM Env.
+rem set PATH=%DEV%\NASM;%PATH%
+
+echo Setting DirectX Env.
+set LIB=%DEV%\DXSDK\Lib\x64;%LIB%
+set INCLUDE=%DEV%\DXSDK\Include;%INCLUDE%
+
+echo Setting Windows SDK Env.
+set WindowsSdkDir=%DEV%\SDK7.1
+set PATH=%WindowsSdkDir%\Bin;%PATH%
+set LIB=%WindowsSdkDir%\Lib\x64;%LIB%
+set INCLUDE=%WindowsSdkDir%\Include;%INCLUDE%
+set TARGET_CPU=x64
+
+rem echo Setting MSVC2010 Env.
+rem set VSINSTALLDIR=%DEV%\MSVC10
+rem set VCINSTALLDIR=%DEV%\MSVC10\VC
+rem set DevEnvDir=%VSINSTALLDIR%\Common7\IDE
+rem set PATH=%VCINSTALLDIR%\bin\amd64;%VSINSTALLDIR%\Common7\Tools;%VSINSTALLDIR%\Common7\IDE;%VCINSTALLDIR%\VCPackages;%PATH%
+rem set INCLUDE=%VCINSTALLDIR%\include;%INCLUDE%
+rem set LIB=%VCINSTALLDIR%\lib\amd64;%LIB%
+rem set LIBPATH=%VCINSTALLDIR%\lib\amd64
+
+echo Setting Framework Env.
+set FrameworkVersion=v4.0.30319
+set Framework35Version=v3.5
+set FrameworkDir=%SystemRoot%\Microsoft.NET\Framework
+set LIBPATH=%FrameworkDir%\%FrameworkVersion%;%FrameworkDir%\%Framework35Version%;%LIBPATH%
+set PATH=%LIBPATH%;%PATH%
+
+echo Env. ready.
+
+title Qt Framework 4.8.5 Development Kit(64bit)
+
+cd %DEV%
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ibr...@us...> - 2014-11-25 22:57:12
|
Revision: 5169
http://sourceforge.net/p/tora/code/5169
Author: ibre5041
Date: 2014-11-25 22:57:01 +0000 (Tue, 25 Nov 2014)
Log Message:
-----------
missing #include utils.h (toWFlags)
Modified Paths:
--------------
trunk/tora/src/core/toresultdrawing.h
Modified: trunk/tora/src/core/toresultdrawing.h
===================================================================
--- trunk/tora/src/core/toresultdrawing.h 2014-11-25 22:53:35 UTC (rev 5168)
+++ trunk/tora/src/core/toresultdrawing.h 2014-11-25 22:57:01 UTC (rev 5169)
@@ -36,6 +36,7 @@
#define TORESULTDRAWING_H
#include "core/toresult.h"
+#include "core/utils.h"
class DotGraphView;
class QSlider;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ibr...@us...> - 2014-11-25 22:53:44
|
Revision: 5168
http://sourceforge.net/p/tora/code/5168
Author: ibre5041
Date: 2014-11-25 22:53:35 +0000 (Tue, 25 Nov 2014)
Log Message:
-----------
qt5 module path
Modified Paths:
--------------
trunk/tora/CMakeLists.txt
Modified: trunk/tora/CMakeLists.txt
===================================================================
--- trunk/tora/CMakeLists.txt 2014-11-25 22:33:49 UTC (rev 5167)
+++ trunk/tora/CMakeLists.txt 2014-11-25 22:53:35 UTC (rev 5168)
@@ -166,7 +166,8 @@
#SET(CMAKE_AUTOMOC ON)
if(QT5_BUILD)
set (QT_FOUND true)
- #set (CMAKE_PREFIX_PATH "C:\\Qt\\5.3\\msvc2013\\")
+ #set(CMAKE_PREFIX_PATH "$ENV{QTDIR}\\5.3\\msvc2013\\") # multiple paths do not work
+ set(CMAKE_PREFIX_PATH "$ENV{QTDIR}\\5.3\\msvc2013_64_opengl\\")
find_package(Qt5Core REQUIRED)
find_package(Qt5Gui REQUIRED)
find_package(Qt5Network REQUIRED)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ibr...@us...> - 2014-11-25 22:33:55
|
Revision: 5167
http://sourceforge.net/p/tora/code/5167
Author: ibre5041
Date: 2014-11-25 22:33:49 +0000 (Tue, 25 Nov 2014)
Log Message:
-----------
MSVC 2013 bug
c++x11 - missing support for explicit conversion operators
Modified Paths:
--------------
trunk/tora/src/core/toqvalue.h
Modified: trunk/tora/src/core/toqvalue.h
===================================================================
--- trunk/tora/src/core/toqvalue.h 2014-11-24 20:03:51 UTC (rev 5166)
+++ trunk/tora/src/core/toqvalue.h 2014-11-25 22:33:49 UTC (rev 5167)
@@ -212,7 +212,7 @@
/** Convert value to a string. If binary convert to hex.
*/
- explicit operator QString() const;
+ /*explicit MSVC 2013 bug 811334*/ operator QString() const;
QString toSIsize() const;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ibr...@us...> - 2014-11-24 20:03:59
|
Revision: 5166
http://sourceforge.net/p/tora/code/5166
Author: ibre5041
Date: 2014-11-24 20:03:51 +0000 (Mon, 24 Nov 2014)
Log Message:
-----------
Modified Paths:
--------------
trunk/tora/obsolete/debug/todebug.cpp
trunk/tora/obsolete/toresultlabel.cpp
Modified: trunk/tora/obsolete/debug/todebug.cpp
===================================================================
--- trunk/tora/obsolete/debug/todebug.cpp 2014-11-24 20:03:21 UTC (rev 5165)
+++ trunk/tora/obsolete/debug/todebug.cpp 2014-11-24 20:03:51 UTC (rev 5166)
@@ -404,7 +404,7 @@
{
outputSession->execute(SQLDebugOutputPoll);
ret = outputSession->readValue().toInt();
- QString str = outputSession->readValue();
+ QString str = (QString)outputSession->readValue();
if (ret == 0 || str.length())
insertLine(str);
}
@@ -633,7 +633,7 @@
toLocker lock (Parent.Lock);
Parent.DebuggerStarted = true;
- Parent.TargetID = targetSession->readValue();
+ Parent.TargetID = (QString)targetSession->readValue();
Parent.TargetLog += QString::fromLatin1("Debug session connected\n");
Parent.ChildSemaphore.up(); // resume main TOra thread
}
Modified: trunk/tora/obsolete/toresultlabel.cpp
===================================================================
--- trunk/tora/obsolete/toresultlabel.cpp 2014-11-24 20:03:21 UTC (rev 5165)
+++ trunk/tora/obsolete/toresultlabel.cpp 2014-11-24 20:03:51 UTC (rev 5166)
@@ -94,7 +94,7 @@
{
while (Query->hasMore())
{
- res << Query->readValue();
+ res << (QString)Query->readValue();
}
setText(res.join(QString::fromLatin1("/")));
}
@@ -112,4 +112,4 @@
delete Query;
Query = NULL;
res.clear();
-} // queryDone
\ No newline at end of file
+} // queryDone
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ibr...@us...> - 2014-11-24 20:03:30
|
Revision: 5165
http://sourceforge.net/p/tora/code/5165
Author: ibre5041
Date: 2014-11-24 20:03:21 +0000 (Mon, 24 Nov 2014)
Log Message:
-----------
Experimental support for QT5
Modified Paths:
--------------
trunk/tora/extlibs/qscintilla2/CMakeLists.txt
Modified: trunk/tora/extlibs/qscintilla2/CMakeLists.txt
===================================================================
--- trunk/tora/extlibs/qscintilla2/CMakeLists.txt 2014-11-24 20:02:56 UTC (rev 5164)
+++ trunk/tora/extlibs/qscintilla2/CMakeLists.txt 2014-11-24 20:03:21 UTC (rev 5165)
@@ -15,7 +15,11 @@
FILE(GLOB TORA_QSCINTILLA2_LIB_SOURCES "lexers/*.cpp" "lexlib/*.cpp" "Qt4Qt5/*.cpp" "src/*.cpp")
+if(QT5_BUILD)
+QT5_WRAP_CPP(TORA_QSCINTILLA2_MOC_SOURCES ${TORA_QSCINTILLA2_MOC_CLASSES})
+else()
QT4_WRAP_CPP(TORA_QSCINTILLA2_MOC_SOURCES ${TORA_QSCINTILLA2_MOC_CLASSES})
+endif()
SET(TORA_QSCINTILLA2_LIB "tora_qscintilla2_lib")
ADD_LIBRARY(${TORA_QSCINTILLA2_LIB} STATIC ${TORA_QSCINTILLA2_LIB_SOURCES} ${TORA_QSCINTILLA2_MOC_SOURCES})
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ibr...@us...> - 2014-11-24 20:03:00
|
Revision: 5164
http://sourceforge.net/p/tora/code/5164
Author: ibre5041
Date: 2014-11-24 20:02:56 +0000 (Mon, 24 Nov 2014)
Log Message:
-----------
Experimental support for QT5
Modified Paths:
--------------
trunk/tora/extlibs/libermodel/CMakeLists.txt
trunk/tora/extlibs/libermodel/dotgraph.cpp
trunk/tora/extlibs/libermodel/dotgraphview.cpp
trunk/tora/extlibs/libermodel/dotgraphview.h
Modified: trunk/tora/extlibs/libermodel/CMakeLists.txt
===================================================================
--- trunk/tora/extlibs/libermodel/CMakeLists.txt 2014-11-24 20:00:27 UTC (rev 5163)
+++ trunk/tora/extlibs/libermodel/CMakeLists.txt 2014-11-24 20:02:56 UTC (rev 5164)
@@ -32,7 +32,11 @@
dotgraph.h
)
+if(QT5_BUILD)
+QT5_WRAP_CPP(ERMODEL_MOC_SOURCES ${ERMODEL_MOC_CLASSES})
+else()
QT4_WRAP_CPP(ERMODEL_MOC_SOURCES ${ERMODEL_MOC_CLASSES})
+endif()
INCLUDE_DIRECTORIES(${graphviz_INCLUDE_DIRECTORIES})
Modified: trunk/tora/extlibs/libermodel/dotgraph.cpp
===================================================================
--- trunk/tora/extlibs/libermodel/dotgraph.cpp 2014-11-24 20:00:27 UTC (rev 5163)
+++ trunk/tora/extlibs/libermodel/dotgraph.cpp 2014-11-24 20:02:56 UTC (rev 5164)
@@ -44,7 +44,7 @@
#include <QtCore/QProcess>
#include <QtCore/QMutexLocker>
#include <QtCore/QUuid>
-#include <QtGui/QMessageBox>
+#include <QMessageBox>
using namespace boost;
using namespace boost::spirit::classic;
Modified: trunk/tora/extlibs/libermodel/dotgraphview.cpp
===================================================================
--- trunk/tora/extlibs/libermodel/dotgraphview.cpp 2014-11-24 20:00:27 UTC (rev 5163)
+++ trunk/tora/extlibs/libermodel/dotgraphview.cpp 2014-11-24 20:02:56 UTC (rev 5164)
@@ -49,7 +49,7 @@
#include <QtGui/QMatrix>
#include <QtGui/QPainter>
-#include <QtGui/QStyle>
+#include <QStyle>
#include <QtGui/QImage>
#include <QtGui/QContextMenuEvent>
#include <QtGui/QKeyEvent>
@@ -59,13 +59,13 @@
#include <QtGui/QFocusEvent>
#include <QtGui/QMouseEvent>
#include <QtGui/QWheelEvent>
-#include <QtGui/QMenu>
-#include <QtGui/QGraphicsSimpleTextItem>
-#include <QtGui/QScrollBar>
-#include <QtGui/QActionGroup>
-#include <QtGui/QInputDialog>
-#include <QtGui/QApplication>
-#include <QtGui/QFileDialog>
+#include <QMenu>
+#include <QGraphicsSimpleTextItem>
+#include <QScrollBar>
+#include <QActionGroup>
+#include <QInputDialog>
+#include <QApplication>
+#include <QFileDialog>
#include <QMessageBox> // TODO just a test - remove me
@@ -481,7 +481,7 @@
font->setPointSize(fontSize);
fm = QFontMetrics(*font);
}
- QGraphicsSimpleTextItem* labelView = new QGraphicsSimpleTextItem(str, 0, m_canvas);
+ QGraphicsSimpleTextItem* labelView = new QGraphicsSimpleTextItem(str, 0/* obsolete parameter, m_canvas*/);
labelView->setFont(*font);
labelView->setPos(
(scaleX *
Modified: trunk/tora/extlibs/libermodel/dotgraphview.h
===================================================================
--- trunk/tora/extlibs/libermodel/dotgraphview.h 2014-11-24 20:00:27 UTC (rev 5163)
+++ trunk/tora/extlibs/libermodel/dotgraphview.h 2014-11-24 20:02:56 UTC (rev 5164)
@@ -36,7 +36,7 @@
///#include <kactioncollection.h>
///#include <kconfiggroup.h>
-#include <QtGui/QGraphicsView>
+#include <QGraphicsView>
#include <QtCore/QSet>
#include <QtCore/QMap>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ibr...@us...> - 2014-11-24 20:00:38
|
Revision: 5163
http://sourceforge.net/p/tora/code/5163
Author: ibre5041
Date: 2014-11-24 20:00:27 +0000 (Mon, 24 Nov 2014)
Log Message:
-----------
Build system adopted for experemental support for Qt5, thx to Petr Bena
Modified Paths:
--------------
trunk/tora/CMakeLists.txt
trunk/tora/src/CMakeLists.txt
Modified: trunk/tora/CMakeLists.txt
===================================================================
--- trunk/tora/CMakeLists.txt 2014-11-24 19:58:41 UTC (rev 5162)
+++ trunk/tora/CMakeLists.txt 2014-11-24 20:00:27 UTC (rev 5163)
@@ -16,6 +16,7 @@
OPTION(ENABLE_ORACLE "Enable/Disable Oracle support at all. Including detection" ON)
OPTION(ENABLE_PGSQL "Enable/Disable PostgreSQL support. Including detection" ON)
OPTION(ENABLE_DB2 "Enable/Disable DB2 support. Including detection" ON)
+OPTION(QT5_BUILD "Use Qt5" OFF)
OPTION(ENABLE_TERADATA "Enable/Disable Teradata support." ON)
OPTION(WANT_RPM "Enable additional RPM related stuff. Additional make package_rpm target" OFF)
OPTION(USE_PCH "Use percompiled headers" OFF)
@@ -31,7 +32,7 @@
#Require 2.4.2 for Qt finding
#Require 2.4.3 for moc change detection and rpath updates for custom cairo install
#Require 2.8 for svnversion
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8 FATAL_ERROR)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11 FATAL_ERROR) # qt5 requirement
#Pretty colors
SET(CMAKE_COLOR_MAKEFILE ON)
@@ -108,7 +109,7 @@
SET(CMAKE_CXX_FLAGS_RELEASE "-O2")
SET(CMAKE_C_FLAGS_RELEASE "-O2")
SET(CMAKE_CXX_FLAGS "-Wall -std=c++11 -ggdb3")
- SET(CMAKE_C_FLAGS "-Wall -ggdb3")
+ SET(CMAKE_C_FLAGS "-Wall -ggdb3")
ENDIF (CMAKE_COMPILER_IS_GNUCC)
#Convert our simpler command line option to the CMake style
@@ -158,24 +159,52 @@
##############################################################################################################
########## Find Dependencies ##########
-SET (QT_MT_REQUIRED true)
-SET (QT_MIN_VERSION "4.8.0")
-SET (QT_USE_QTSQL TRUE)
-SET (QT_USE_QTNETWORK TRUE)
-SET (QT_USE_QTXML TRUE)
-FIND_PACKAGE(Qt4 REQUIRED)
-INCLUDE( ${QT_USE_FILE} )
+SET(QT_MT_REQUIRED true)
+SET(QT_USE_QTNETWORK TRUE)
+SET(QT_USE_QTXML TRUE)
+SET(QT_USE_QTWEBKIT TRUE)
+#SET(CMAKE_AUTOMOC ON)
+if(QT5_BUILD)
+ set (QT_FOUND true)
+ #set (CMAKE_PREFIX_PATH "C:\\Qt\\5.3\\msvc2013\\")
+ find_package(Qt5Core REQUIRED)
+ find_package(Qt5Gui REQUIRED)
+ find_package(Qt5Network REQUIRED)
+ find_package(Qt5PrintSupport REQUIRED)
+ find_package(Qt5Sql REQUIRED)
+ find_package(Qt5Widgets REQUIRED)
+ find_package(Qt5Xml REQUIRED)
+ set(QT_INCLUDES
+ ${Qt5Core_INCLUDE_DIRS}
+ ${Qt5Gui_INCLUDE_DIRS}
+ ${Qt5Network_INCLUDE_DIRS}
+ ${Qt5PrintSupport_INCLUDE_DIRS}
+ ${Qt5Sql_INCLUDE_DIRS}
+ ${Qt5Widgets_INCLUDE_DIRS}
+ ${Qt5Xml_INCLUDE_DIRS}
+ )
+ include_directories(${QT_INCLUDES})
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
+else()
+ SET (QT_MIN_VERSION "4.8.0")
+ SET (QT_USE_QTSQL TRUE)
+ SET (QT_USE_QTNETWORK TRUE)
+ SET (QT_USE_QTXML TRUE)
+ FIND_PACKAGE(Qt4 REQUIRED)
+ INCLUDE( ${QT_USE_FILE} )
+endif()
IF (QT_FOUND)
- MESSAGE("Qt4 Found OK")
- #Add our Qt definitions
- ADD_DEFINITIONS(
- ${QT_DEFINITIONS}
- -DQT_CORE_LIB
- -DQT_GUI_LIB
- -DQT_THREAD_LIB
- )
+ MESSAGE("Qt Found OK")
+ #Add our Qt definitions
+ ADD_DEFINITIONS(
+ ${QT_DEFINITIONS}
+ -DQT_CORE_LIB
+ -DQT_GUI_LIB
+ -DQT_THREAD_LIB
+ )
ELSE(QT_FOUND)
- MESSAGE(FATAL_ERROR "No Qt4 found")
+ MESSAGE(FATAL_ERROR "No Qt found")
ENDIF(QT_FOUND)
IF (WANT_INTERNAL_QSCINTILLA)
Modified: trunk/tora/src/CMakeLists.txt
===================================================================
--- trunk/tora/src/CMakeLists.txt 2014-11-24 19:58:41 UTC (rev 5162)
+++ trunk/tora/src/CMakeLists.txt 2014-11-24 20:00:27 UTC (rev 5163)
@@ -687,10 +687,17 @@
LIST(APPEND TORA_SOURCES ${CMAKE_CURRENT_BINARY_DIR}/tora_rc.o)
ENDIF (WIN32 AND MINGW)
+if(QT5_BUILD)
+#QT5_ADD_TRANSLATION(TORA_I18N_QM ${TORA_I18N_TS} ${TORA_I18N_TS_TOAD})
+QT5_WRAP_UI(TORA_UI_SOURCES ${TORA_UI_SRC} )
+QT5_WRAP_CPP(TORA_MOC_SOURCES ${TORA_MOC_CLASSES})
+QT5_ADD_RESOURCES(TORA_RCC_SRCS ${TORA_RCC_FILES})
+else()
QT4_ADD_TRANSLATION(TORA_I18N_QM ${TORA_I18N_TS} ${TORA_I18N_TS_TOAD})
QT4_WRAP_UI(TORA_UI_SOURCES ${TORA_UI_SRC} )
QT4_WRAP_CPP(TORA_MOC_SOURCES ${TORA_MOC_CLASSES})
QT4_ADD_RESOURCES(TORA_RCC_SRCS ${TORA_RCC_FILES})
+endif()
################################################################################
# Libraries and library imports #
@@ -729,7 +736,14 @@
#Set up libraries to link with all found packages
SET(TORA_LIBS
- ${QT_LIBRARIES} # dynamic
+ ${QT_LIBRARIES} # dynamic qt4
+ ${Qt5Core_LIBRARIES} # dynamic qt5
+ ${Qt5Gui_LIBRARIES} # dynamic qt5
+ ${Qt5Network_LIBRARIES} # dynamic qt5
+ ${Qt5PrintSupport_LIBRARIES} # dynamic qt5
+ ${Qt5Sql_LIBRARIES} # dynamic qt5
+ ${Qt5Widgets_LIBRARIES} # dynamic qt5
+ ${Qt5Xml_LIBRARIES} # dynamic qt5
${QSCINTILLA_LIBRARIES} # dynamic
${TORA_LOKI_LIB} # static
)
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:58:51
|
Revision: 5162
http://sourceforge.net/p/tora/code/5162
Author: ibre5041
Date: 2014-11-24 19:58:41 +0000 (Mon, 24 Nov 2014)
Log Message:
-----------
toAscii is deprecated, use toLatin1 instead
Modified Paths:
--------------
trunk/tora/src/connection/tooracleprovider.cpp
Modified: trunk/tora/src/connection/tooracleprovider.cpp
===================================================================
--- trunk/tora/src/connection/tooracleprovider.cpp 2014-11-24 19:21:12 UTC (rev 5161)
+++ trunk/tora/src/connection/tooracleprovider.cpp 2014-11-24 19:58:41 UTC (rev 5162)
@@ -137,7 +137,7 @@
//::trotl::g_OCIPL_BULK_ROWS = toConfigurationSingle::Instance().
- dateFormat = toConfigurationNewSingle::Instance().option(ToConfiguration::Oracle::ConfDateFormat).toString().toAscii();
+ dateFormat = toConfigurationNewSingle::Instance().option(ToConfiguration::Oracle::ConfDateFormat).toString().toLatin1();
::trotl::g_TROTL_DEFAULT_DATE_FTM = const_cast<char*>(dateFormat.constData());
::trotl::OciEnvAlloc *_envallocp = new ::trotl::OciEnvAlloc;
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.
|
|
From: <ibr...@us...> - 2014-11-24 18:56:15
|
Revision: 5160
http://sourceforge.net/p/tora/code/5160
Author: ibre5041
Date: 2014-11-24 18:56:11 +0000 (Mon, 24 Nov 2014)
Log Message:
-----------
QT5 port (core) thx to Petr Bena
Modified Paths:
--------------
trunk/tora/src/core/toabout.cpp
trunk/tora/src/core/tobarchart.h
trunk/tora/src/core/tocodemodel.cpp
trunk/tora/src/core/toconnection.cpp
trunk/tora/src/core/toconnectionmodel.cpp
trunk/tora/src/core/toextract.cpp
trunk/tora/src/core/tolinechart.cpp
trunk/tora/src/core/tolistviewformatterhtml.cpp
trunk/tora/src/core/tomodeleditor.cpp
trunk/tora/src/core/tonewconnection.cpp
trunk/tora/src/core/topiechart.cpp
trunk/tora/src/core/topiechart.h
trunk/tora/src/core/toquery.cpp
trunk/tora/src/core/toqvalue.cpp
trunk/tora/src/core/toresultmodel.cpp
trunk/tora/src/core/toresultmodeledit.cpp
trunk/tora/src/core/toresultplan.cpp
trunk/tora/src/core/toresultview.cpp
trunk/tora/src/core/tosql.cpp
trunk/tora/src/core/totool.cpp
trunk/tora/src/core/totreewidget.h
trunk/tora/src/core/toworkingwidget.cpp
trunk/tora/src/core/utils.cpp
trunk/tora/src/core/utils.h
trunk/tora/src/core/utils_part.cpp
Modified: trunk/tora/src/core/toabout.cpp
===================================================================
--- trunk/tora/src/core/toabout.cpp 2014-11-24 18:28:57 UTC (rev 5159)
+++ trunk/tora/src/core/toabout.cpp 2014-11-24 18:56:11 UTC (rev 5160)
@@ -74,6 +74,7 @@
"Contributors (In alphabetical order):<P>\n"
"<UL>\n"
"<LI><B>Henrik Johnson</B> - Original developer, no longer involved.\n"
+ "<LI><B>Petr Bena</B> - Qt5 support.\n"
"<LI><B>Alexander (Leo) Bergolth</B> - Access to Oracle 7 database.\n"
"<LI><B>Volker Götz</B> - Improved PostgreSQL support.\n"
"<LI><B>Oliver Jehle</B> - Object caching to disc, SAP and much more.\n"
Modified: trunk/tora/src/core/tobarchart.h
===================================================================
--- trunk/tora/src/core/tobarchart.h 2014-11-24 18:28:57 UTC (rev 5159)
+++ trunk/tora/src/core/tobarchart.h 2014-11-24 18:56:11 UTC (rev 5160)
@@ -36,6 +36,7 @@
#define TOBARCHART_H
#include "core/tolinechart.h"
+#include "core/utils.h"
/** A widget that displays a barchart. Each line is added onto the next one.
*/
Modified: trunk/tora/src/core/tocodemodel.cpp
===================================================================
--- trunk/tora/src/core/tocodemodel.cpp 2014-11-24 18:28:57 UTC (rev 5159)
+++ trunk/tora/src/core/tocodemodel.cpp 2014-11-24 18:56:11 UTC (rev 5160)
@@ -548,7 +548,8 @@
new toCodeModelItem(item, cname, ctype, cstatus);
}
- reset();
+ beginResetModel();
+ endResetModel();
emit dataReady();
if(!query->hasMore() && query->eof())
Modified: trunk/tora/src/core/toconnection.cpp
===================================================================
--- trunk/tora/src/core/toconnection.cpp 2014-11-24 18:28:57 UTC (rev 5159)
+++ trunk/tora/src/core/toconnection.cpp 2014-11-24 18:56:11 UTC (rev 5160)
@@ -203,8 +203,12 @@
Utils::toBusy busy;
Abort = true;
+#if QT_VERSION < 0x050000
Q_ASSERT_X( (int)LoanCnt == 0 , qPrintable(__QHERE__), "toConnection deleted while BG query is running");
-
+#else
+ Q_ASSERT_X( LoanCnt.loadAcquire() == 0 , qPrintable(__QHERE__), "toConnection deleted while BG query is running");
+#endif
+
unsigned cacheNewRefCnt;
{
QWriteLocker clock(&getCache().cacheLock);
@@ -237,7 +241,11 @@
void toConnection::commit(void)
{
QMutexLocker clock(&ConnectionLock);
+#if QT_VERSION < 0x050000
if((int)LoanCnt)
+#else
+ if(LoanCnt.loadAcquire())
+#endif
throw qApp->translate("toConnection::commit", "Couldn't commit, while connection is active");
Q_FOREACH(toConnectionSub *conn, Connections)
@@ -433,7 +441,11 @@
Connections.remove(retval);
LentConnections.insert(retval);
LoanCnt.fetchAndAddAcquire(1);
- Q_ASSERT_X((int)LoanCnt == LentConnections.size(), qPrintable(__QHERE__), "Invalid number of lent toConnectionSub(s)");
+#if QT_VERSION < 0x050000
+ Q_ASSERT_X((int)LoanCnt == LentConnections.size(), qPrintable(__QHERE__), "Invalid number of lent toConnectionSub(s)");
+#else
+ Q_ASSERT_X(LoanCnt.loadAcquire() == LentConnections.size(), qPrintable(__QHERE__), "Invalid number of lent toConnectionSub(s)");
+#endif
return retval;
}
else
@@ -441,8 +453,12 @@
toConnectionSub* retval = addConnection();
LoanCnt.fetchAndAddAcquire(1);
LentConnections.insert(retval);
+#if QT_VERSION < 0x050000
Q_ASSERT_X((int)LoanCnt == LentConnections.size(), qPrintable(__QHERE__), "Invalid number of lent toConnectionSub(s)");
- return retval;
+#else
+ Q_ASSERT_X(LoanCnt.loadAcquire() == LentConnections.size(), qPrintable(__QHERE__), "Invalid number of lent toConnectionSub(s)");
+#endif
+ return retval;
}
}
@@ -469,7 +485,11 @@
Connections.insert(conn);
bool removed = LentConnections.remove(conn);
Q_ASSERT_X(removed, qPrintable(__QHERE__), "Lent connection not found");
+#if QT_VERSION < 0x050000
Q_ASSERT_X((int)LoanCnt == LentConnections.size(), qPrintable(__QHERE__), "Invalid number of lent toConnectionSub(s)");
+#else
+ Q_ASSERT_X(LoanCnt.loadAcquire() == LentConnections.size(), qPrintable(__QHERE__), "Invalid number of lent toConnectionSub(s)");
+#endif
}
void toConnection::allExecute(QString const& sql)
Modified: trunk/tora/src/core/toconnectionmodel.cpp
===================================================================
--- trunk/tora/src/core/toconnectionmodel.cpp 2014-11-24 18:28:57 UTC (rev 5159)
+++ trunk/tora/src/core/toconnectionmodel.cpp 2014-11-24 18:56:11 UTC (rev 5160)
@@ -49,14 +49,16 @@
void toConnectionModel::setupData(QMap<int, toConnectionOptions> list)
{
+ beginResetModel();
m_data.clear();
m_data = list;
- reset();
+ endResetModel();
}
void toConnectionModel::readConfig()
{
+ beginResetModel();
m_data.clear();
QSettings Settings;
@@ -107,13 +109,14 @@
}
Settings.endGroup(); // history section
- reset();
+ endResetModel();
}
void toConnectionModel::append(int ix, toConnectionOptions conn)
{
+ beginResetModel();
m_data[ix] = conn;
- reset();
+ endResetModel();
}
bool toConnectionModel::removeRow(int row, const QModelIndex &parent)
Modified: trunk/tora/src/core/toextract.cpp
===================================================================
--- trunk/tora/src/core/toextract.cpp 2014-11-24 18:28:57 UTC (rev 5159)
+++ trunk/tora/src/core/toextract.cpp 2014-11-24 18:56:11 UTC (rev 5160)
@@ -55,7 +55,7 @@
QString name = toExtract::extractorName(db, oper, type);
if ((*toExtract::Extractors).find(name) != (*toExtract::Extractors).end())
- fprintf(stderr, "Extractor %s multiply defined\n", name.toAscii().constData());
+ fprintf(stderr, "Extractor %s multiply defined\n", name.toLatin1().constData());
(*toExtract::Extractors)[name] = this;
}
@@ -69,7 +69,7 @@
QString name = toExtract::extractorName(db, oper, type);
std::map<QString, extractor *>::iterator i = (*toExtract::Extractors).find(name);
if (i == (*toExtract::Extractors).end())
- fprintf(stderr, "Extractor %s not defined on unregistering\n", name.toAscii().constData());
+ fprintf(stderr, "Extractor %s not defined on unregistering\n", name.toLatin1().constData());
else
(*toExtract::Extractors).erase(i);
}
@@ -955,8 +955,8 @@
current->bNotNull = true;
else
printf("Error! Found unknown extra data for column %s -> %s\n",
- name.toAscii().constData(),
- extra.toAscii().constData());
+ name.toLatin1().constData(),
+ extra.toLatin1().constData());
}
else if (!extra.isEmpty())
{
Modified: trunk/tora/src/core/tolinechart.cpp
===================================================================
--- trunk/tora/src/core/tolinechart.cpp 2014-11-24 18:28:57 UTC (rev 5159)
+++ trunk/tora/src/core/tolinechart.cpp 2014-11-24 18:56:11 UTC (rev 5160)
@@ -41,9 +41,9 @@
#include "core/toconf.h"
#include <QtGui/QPainter>
-#include <QtGui/QPrinter>
+#include <QPrinter>
#include <QScrollBar>
-#include <QtGui/QPrintDialog>
+#include <QPrintDialog>
#include "icons/print.xpm"
#include "icons/chart.xpm"
Modified: trunk/tora/src/core/tolistviewformatterhtml.cpp
===================================================================
--- trunk/tora/src/core/tolistviewformatterhtml.cpp 2014-11-24 18:28:57 UTC (rev 5159)
+++ trunk/tora/src/core/tolistviewformatterhtml.cpp 2014-11-24 18:56:11 UTC (rev 5160)
@@ -37,6 +37,7 @@
#include "core/tolistviewformatteridentifier.h"
#include "core/toresultview.h"
#include "core/toresultmodel.h"
+#include "core/utils.h"
#include <QtGui/QTextDocument>
@@ -89,9 +90,7 @@
output += QString("\t<TH>");
endLine(output);
- QString text(Qt::escape(model->headerData(j,
- Qt::Horizontal,
- Qt::DisplayRole).toString()));
+ QString text = TO_ESCAPE(QString(model->headerData(j, Qt::Horizontal, Qt::DisplayRole).toString()));
output += "\t\t" + text;
@@ -123,7 +122,7 @@
endLine(output);
mi = model->index(row, i);
- QString text(Qt::escape(model->data(mi, Qt::EditRole).toString()));
+ QString text = TO_ESCAPE(QString(model->data(mi, Qt::EditRole).toString()));
output += "\t\t" + text;
endLine(output);
Modified: trunk/tora/src/core/tomodeleditor.cpp
===================================================================
--- trunk/tora/src/core/tomodeleditor.cpp 2014-11-24 18:28:57 UTC (rev 5159)
+++ trunk/tora/src/core/tomodeleditor.cpp 2014-11-24 18:56:11 UTC (rev 5160)
@@ -76,7 +76,7 @@
toMainWindow::lookup(),
QT_TRANSLATE_NOOP("toWriteFile", "File error"),
QT_TRANSLATE_NOOP("toWriteFile", QString("Couldn't open %1 for writing")
- .arg(fn).toAscii().constData())); // TODO test this in MSVC
+ .arg(fn).toLatin1().constData())); // TODO test this in MSVC
return;
}
offset = 0;
Modified: trunk/tora/src/core/tonewconnection.cpp
===================================================================
--- trunk/tora/src/core/tonewconnection.cpp 2014-11-24 18:28:57 UTC (rev 5159)
+++ trunk/tora/src/core/tonewconnection.cpp 2014-11-24 18:56:11 UTC (rev 5160)
@@ -51,7 +51,7 @@
#include <QtCore/QStringList>
#include <QMenu>
#include <QtGui/QIcon>
-#include <QtGui/QSortFilterProxyModel>
+#include <QSortFilterProxyModel>
// TODO turn these into enum (QMetaEnum)
#define CONF_PROVIDER_LIST_SORT_OFFSET "ProvListSort" //Sort by database/connection name, asc
@@ -115,7 +115,7 @@
PreviousContext = new QMenu(this);
QAction *delact = PreviousContext->addAction(
- QIcon(trash_xpm),
+ QIcon(QPixmap(trash_xpm)),
tr("&Delete"));
connect(delact,
SIGNAL(triggered()),
Modified: trunk/tora/src/core/topiechart.cpp
===================================================================
--- trunk/tora/src/core/topiechart.cpp 2014-11-24 18:28:57 UTC (rev 5159)
+++ trunk/tora/src/core/topiechart.cpp 2014-11-24 18:56:11 UTC (rev 5160)
@@ -51,8 +51,8 @@
#include <QtGui/QPixmap>
#include <QtGui/QMouseEvent>
#include <QMenu>
-#include <QtGui/QPrinter>
-#include <QtGui/QPrintDialog>
+#include <QPrinter>
+#include <QPrintDialog>
#include "icons/chart.xpm"
#include "icons/print.xpm"
@@ -167,7 +167,7 @@
{
Menu = new QMenu(this);
- Menu->addAction(QIcon(print_xpm),
+ Menu->addAction(QIcon(QPixmap(print_xpm)),
tr("&Print..."),
this,
SLOT(editPrint()));
Modified: trunk/tora/src/core/topiechart.h
===================================================================
--- trunk/tora/src/core/topiechart.h 2014-11-24 18:28:57 UTC (rev 5159)
+++ trunk/tora/src/core/topiechart.h 2014-11-24 18:56:11 UTC (rev 5160)
@@ -42,6 +42,8 @@
#include <QtCore/QRect>
#include <list>
+#include "core/utils.h"
+
class QMenu;
class toLineChart;
class toPieTip;
Modified: trunk/tora/src/core/toquery.cpp
===================================================================
--- trunk/tora/src/core/toquery.cpp 2014-11-24 18:28:57 UTC (rev 5159)
+++ trunk/tora/src/core/toquery.cpp 2014-11-24 18:56:11 UTC (rev 5160)
@@ -45,7 +45,7 @@
toQuery::toQuery(toConnectionSubLoan &conn, const toSQL &sql, toQueryParams const& params)
: m_ConnectionSubLoan(conn)
, m_Params(params)
- , m_SQL(sql(conn.ParentConnection).toAscii())
+ , m_SQL(sql(conn.ParentConnection).toLatin1())
, m_Query(NULL)
, m_eof(false)
, m_rowsProcessed(0)
Modified: trunk/tora/src/core/toqvalue.cpp
===================================================================
--- trunk/tora/src/core/toqvalue.cpp 2014-11-24 18:28:57 UTC (rev 5159)
+++ trunk/tora/src/core/toqvalue.cpp 2014-11-24 18:56:11 UTC (rev 5160)
@@ -394,7 +394,7 @@
{
int num;
// qt4 char c = hex.at(i);
- char c = hex.at(i).toAscii();
+ char c = hex.at(i).toLatin1();
if (c >= 'a')
num = c - 'a';
else if (c >= 'A')
@@ -403,7 +403,7 @@
num = c - '0';
num <<= 4;
// qt4 c = hex.at(i + 1);
- c = hex.at(i + 1).toAscii();
+ c = hex.at(i + 1).toLatin1();
if (c >= 'a')
num += c - 'a';
else if (c >= 'A')
Modified: trunk/tora/src/core/toresultmodel.cpp
===================================================================
--- trunk/tora/src/core/toresultmodel.cpp 2014-11-24 18:28:57 UTC (rev 5159)
+++ trunk/tora/src/core/toresultmodel.cpp 2014-11-24 18:56:11 UTC (rev 5160)
@@ -78,8 +78,9 @@
SIGNAL(done(toEventQuery*)),
this,
SLOT(slotFetchMore(toEventQuery*)));
-
+#if QT_VERSION < 0x050000
setSupportedDragActions(Qt::CopyAction);
+#endif
}
toResultModel::toResultModel(const QString &owner,
@@ -97,9 +98,9 @@
, CurrRowKey(1)
{
MaxRowsToAdd = MaxRows = toConfigurationNewSingle::Instance().option(ToConfiguration::Database::InitialFetchInt).toInt();
-
+#if QT_VERSION < 0x050000
setSupportedDragActions(Qt::CopyAction);
-
+#endif
// Manually add two columns (first one will be invisible)
// NOTE: If this function is used to display say table columns from the cache
// it will have to be modified to set header dynamically according to type of
@@ -248,7 +249,8 @@
First = !First;
// need to reset view(s) since we have to poll for data
- reset();
+ beginResetModel();
+ endResetModel();
if(Query && Query->rowsProcessed() > 0)
{
emit firstResult(QString::number(Query->rowsProcessed()) +
Modified: trunk/tora/src/core/toresultmodeledit.cpp
===================================================================
--- trunk/tora/src/core/toresultmodeledit.cpp 2014-11-24 18:28:57 UTC (rev 5159)
+++ trunk/tora/src/core/toresultmodeledit.cpp 2014-11-24 18:56:11 UTC (rev 5160)
@@ -49,7 +49,9 @@
: toResultModel(query, parent, read)
, PriKeys(priKeys)
{
+#if QT_VERSION < 0x050000
setSupportedDragActions(Qt::CopyAction | Qt::MoveAction);
+#endif
}
toResultModelEdit::~toResultModelEdit()
Modified: trunk/tora/src/core/toresultplan.cpp
===================================================================
--- trunk/tora/src/core/toresultplan.cpp 2014-11-24 18:28:57 UTC (rev 5159)
+++ trunk/tora/src/core/toresultplan.cpp 2014-11-24 18:56:11 UTC (rev 5160)
@@ -520,7 +520,7 @@
/*
std::map <QString, toTreeWidgetItem *>::reverse_iterator it;
- for (it=Parents.rbegin(); it!=Parents.rend(); it++) {printf("Aqq %s\n",it->first.toAscii().constData()); delete it->second;}
+ for (it=Parents.rbegin(); it!=Parents.rend(); it++) {printf("Aqq %s\n",it->first.toLatin1().constData()); delete it->second;}
*/
TopItem->deleteChildren();
LastTop = NULL;
Modified: trunk/tora/src/core/toresultview.cpp
===================================================================
--- trunk/tora/src/core/toresultview.cpp 2014-11-24 18:28:57 UTC (rev 5159)
+++ trunk/tora/src/core/toresultview.cpp 2014-11-24 18:56:11 UTC (rev 5160)
@@ -45,6 +45,7 @@
#include "core/toconfiguration_new.h"
#include <QtCore/QTimer>
+#include <QtCore/QMimeData>
#include <QtGui/QClipboard>
#include <QtGui/QPainter>
#include <QProgressDialog>
@@ -407,8 +408,11 @@
t = txt;
int wx = top->itemMargin() * 2 - fm.minLeftBearing() - fm.minRightBearing() + 1;
if (column == 0)
+#if QT_VERSION < 0x050000
wx += top->style()->pixelMetric(QStyle::PM_CheckListButtonSize) + 4 + top->itemMargin();
-
+#else
+ wx += top->style()->pixelMetric(QStyle::PM_IndicatorWidth) + 4 + top->itemMargin();
+#endif
return (std::min)(TextWidth(fm, t), MaxColDisp) + wx;
}
@@ -425,7 +429,11 @@
QRect bounds = fm.boundingRect(t);
int wx = top->itemMargin() * 2 - fm.minLeftBearing() - fm.minRightBearing() + 1;
if (column == 0)
+#if QT_VERSION < 0x050000
wx += top->style()->pixelMetric(QStyle::PM_CheckListButtonSize) + 4 + top->itemMargin();
+#else
+ wx += top->style()->pixelMetric(QStyle::PM_IndicatorWidth) + 4 + top->itemMargin();
+#endif
return (std::min)(bounds.width(), MaxColDisp) + wx;
}
Modified: trunk/tora/src/core/tosql.cpp
===================================================================
--- trunk/tora/src/core/tosql.cpp 2014-11-24 18:28:57 UTC (rev 5159)
+++ trunk/tora/src/core/tosql.cpp 2014-11-24 18:56:11 UTC (rev 5160)
@@ -83,7 +83,7 @@
{
if (description.isEmpty())
{
- fprintf(stderr, "ERROR:Tried add new version to unknown SQL (%s)\n", name.toAscii().constData());
+ fprintf(stderr, "ERROR:Tried add new version to unknown SQL (%s)\n", name.toLatin1().constData());
return false;
}
definition newDef;
@@ -107,7 +107,7 @@
(*i).second.Modified = modified;
}
if (!modified)
- fprintf(stderr, "ERROR:Overwrite description of nonmodified (%s)\n", name.toAscii().constData());
+ fprintf(stderr, "ERROR:Overwrite description of nonmodified (%s)\n", name.toLatin1().constData());
}
std::list<version> &cl = (*i).second.Versions;
for (std::list<version>::iterator j = cl.begin(); j != cl.end(); j++)
Modified: trunk/tora/src/core/totool.cpp
===================================================================
--- trunk/tora/src/core/totool.cpp 2014-11-24 18:28:57 UTC (rev 5159)
+++ trunk/tora/src/core/totool.cpp 2014-11-24 18:56:11 UTC (rev 5160)
@@ -318,7 +318,7 @@
{
if (Action == NULL)
{
- Action = new QAction(QIcon(Tool.pictureXPM()), windowTitle(), this);
+ Action = new QAction(QIcon(QPixmap(Tool.pictureXPM())), windowTitle(), this);
Action->setCheckable(true);
}
return Action;
Modified: trunk/tora/src/core/totreewidget.h
===================================================================
--- trunk/tora/src/core/totreewidget.h 2014-11-24 18:28:57 UTC (rev 5159)
+++ trunk/tora/src/core/totreewidget.h 2014-11-24 18:56:11 UTC (rev 5160)
@@ -43,6 +43,8 @@
#include <QtCore/QList>
#include <QtCore/QVariant>
+#include "core/utils.h"
+
class QPainter;
class QColorGroup;
Modified: trunk/tora/src/core/toworkingwidget.cpp
===================================================================
--- trunk/tora/src/core/toworkingwidget.cpp 2014-11-24 18:28:57 UTC (rev 5159)
+++ trunk/tora/src/core/toworkingwidget.cpp 2014-11-24 18:56:11 UTC (rev 5160)
@@ -63,7 +63,7 @@
WorkingLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum);
hbox->addWidget(WorkingLabel);
- WorkingStop = new QPushButton(QIcon(stop_xpm), tr("Stop"), HWorking);
+ WorkingStop = new QPushButton(QIcon(QPixmap(stop_xpm)), tr("Stop"), HWorking);
WorkingStop->setAutoFillBackground(true);
WorkingStop->setBackgroundRole(QPalette::Window);
WorkingStop->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
Modified: trunk/tora/src/core/utils.cpp
===================================================================
--- trunk/tora/src/core/utils.cpp 2014-11-24 18:28:57 UTC (rev 5159)
+++ trunk/tora/src/core/utils.cpp 2014-11-24 18:56:11 UTC (rev 5160)
@@ -756,7 +756,7 @@
QKeySequence ret = key;
// TODO printf? use logging
if (key.isEmpty() && ret.isEmpty())
- printf("Key sequence %s is not valid\n", key.toAscii().constData());
+ printf("Key sequence %s is not valid\n", key.toLatin1().constData());
return ret;
}
Modified: trunk/tora/src/core/utils.h
===================================================================
--- trunk/tora/src/core/utils.h 2014-11-24 18:28:57 UTC (rev 5159)
+++ trunk/tora/src/core/utils.h 2014-11-24 18:56:11 UTC (rev 5160)
@@ -55,6 +55,12 @@
#include <dlfcn.h>
#endif
+#if QT_VERSION >= 0x050000
+#define TO_ESCAPE(string) string.toHtmlEscaped()
+#else
+#define TO_ESCAPE(string) Qt::escape(string)
+#endif
+
#define TOPrinter QPrinter
#define TOFileDialog QFileDialog
#define TOMessageBox QMessageBox
Modified: trunk/tora/src/core/utils_part.cpp
===================================================================
--- trunk/tora/src/core/utils_part.cpp 2014-11-24 18:28:57 UTC (rev 5159)
+++ trunk/tora/src/core/utils_part.cpp 2014-11-24 18:56:11 UTC (rev 5160)
@@ -166,7 +166,7 @@
if (codecConf == "Default")
return QTextCodec::codecForLocale();
else
- return QTextCodec::codecForName(codecConf.toAscii());
+ return QTextCodec::codecForName(codecConf.toLatin1());
} // toGetCodec
QString toExpandFile(const QString &file)
@@ -285,7 +285,7 @@
QT_TRANSLATE_NOOP("toWriteFile", "File error"),
QT_TRANSLATE_NOOP(
"toWriteFile",
- QString("Couldn't open %1 for writing").arg(filename).toAscii().constData()));
+ QString("Couldn't open %1 for writing").arg(filename).toLatin1().constData()));
return false;
}
QTextCodec *codec = toGetCodec();
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: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 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 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.
|
2 messages has been excluded from this view by a project administrator.
