From: <ibr...@us...> - 2014-11-22 12:56:15
|
Revision: 5153 http://sourceforge.net/p/tora/code/5153 Author: ibre5041 Date: 2014-11-22 12:56:12 +0000 (Sat, 22 Nov 2014) Log Message: ----------- fromAScii => fromLatin1 (part of Qt5 port) thx to Pert Bena Modified Paths: -------------- trunk/tora/src/connection/tooraclefind.cpp trunk/tora/src/connection/tooracletraits.cpp trunk/tora/src/connection/toqsqlfind.cpp trunk/tora/src/connection/toteradatafind.cpp trunk/tora/src/core/main.cpp trunk/tora/src/core/toconfiguration_new.cpp trunk/tora/src/core/tonewconnection.cpp trunk/tora/src/result/toresulttabledata.cpp trunk/tora/src/tests/test4window.cpp trunk/tora/src/tools/tosandboxtool.cpp Modified: trunk/tora/src/connection/tooraclefind.cpp =================================================================== --- trunk/tora/src/connection/tooraclefind.cpp 2014-11-22 12:46:00 UTC (rev 5152) +++ trunk/tora/src/connection/tooraclefind.cpp 2014-11-22 12:56:12 UTC (rev 5153) @@ -70,7 +70,7 @@ virtual QString name() const { - return QString::fromAscii(ORACLE_INSTANTCLIENT); + return QString::fromLatin1(ORACLE_INSTANTCLIENT); }; /** Return list of possible client locations @@ -98,37 +98,37 @@ QSet<QString> const toOracleInstantFinder::m_paths = QSet<QString>() #if defined(Q_OS_LINUX) - << QString::fromAscii("/usr/lib/oracle/11.2/client64/lib") - << QString::fromAscii("/usr/lib/oracle/11.2/client/lib") - << QString::fromAscii("/usr/lib/oracle/11.1/client64/lib") - << QString::fromAscii("/usr/lib/oracle/11.1/client/lib") - << QString::fromAscii("/usr/lib/oracle/10.2.0.5/client64/lib") - << QString::fromAscii("/usr/lib/oracle/10.2.0.5/client/lib") - << QString::fromAscii("/usr/lib/oracle/10.2.0.4/client64/lib") - << QString::fromAscii("/usr/lib/oracle/10.2.0.4/client/lib") - << QString::fromAscii("/usr/lib/oracle/10.2.0.3/client64/lib") - << QString::fromAscii("/usr/lib/oracle/10.2.0.3/client/lib") - << QString::fromAscii("/opt/instantclient*") - << QString::fromAscii("/usr/lib") + << QString::fromLatin1("/usr/lib/oracle/11.2/client64/lib") + << QString::fromLatin1("/usr/lib/oracle/11.2/client/lib") + << QString::fromLatin1("/usr/lib/oracle/11.1/client64/lib") + << QString::fromLatin1("/usr/lib/oracle/11.1/client/lib") + << QString::fromLatin1("/usr/lib/oracle/10.2.0.5/client64/lib") + << QString::fromLatin1("/usr/lib/oracle/10.2.0.5/client/lib") + << QString::fromLatin1("/usr/lib/oracle/10.2.0.4/client64/lib") + << QString::fromLatin1("/usr/lib/oracle/10.2.0.4/client/lib") + << QString::fromLatin1("/usr/lib/oracle/10.2.0.3/client64/lib") + << QString::fromLatin1("/usr/lib/oracle/10.2.0.3/client/lib") + << QString::fromLatin1("/opt/instantclient*") + << QString::fromLatin1("/usr/lib") #elif defined(Q_OS_WIN32) - << QString::fromAscii("C:\\instantclient*") - << QString::fromAscii("D:\\instantclient*") - << QString::fromAscii("E:\\instantclient*") - << QString::fromAscii("C:\\oracle\\instantclient*") - << QString::fromAscii("D:\\oracle\\instantclient*") - << QString::fromAscii("E:\\oracle\\instantclient*") - << QString::fromAscii("D:\\devel\\instantclient*") + << QString::fromLatin1("C:\\instantclient*") + << QString::fromLatin1("D:\\instantclient*") + << QString::fromLatin1("E:\\instantclient*") + << QString::fromLatin1("C:\\oracle\\instantclient*") + << QString::fromLatin1("D:\\oracle\\instantclient*") + << QString::fromLatin1("E:\\oracle\\instantclient*") + << QString::fromLatin1("D:\\devel\\instantclient*") #endif << QDir::currentPath() ; QList<QString> const toOracleInstantFinder::m_libname = QList<QString>() #if defined(Q_OS_LINUX) - << QString::fromAscii("libclntsh.so*") + << QString::fromLatin1("libclntsh.so*") #elif defined(Q_WS_MAC) - << QString::fromAscii("libclntsh.*dylib") + << QString::fromLatin1("libclntsh.*dylib") #elif defined(Q_OS_WIN32) // Note both 32 and 64 bit build - << QString::fromAscii("OCI.dll") + << QString::fromLatin1("OCI.dll") #endif ; @@ -367,8 +367,8 @@ - dlopen("libtrotl.so") */ int retval; - QDir toraHome(QDir::homePath() + QDir::separator() + QChar('.') + QString::fromAscii(TOAPPNAME)); - QString providerPath(toraHome.absolutePath() + QDir::separator() + QString::fromAscii("poracle")); + QDir toraHome(QDir::homePath() + QDir::separator() + QChar('.') + QString::fromLatin1(TOAPPNAME)); + QString providerPath(toraHome.absolutePath() + QDir::separator() + QString::fromLatin1("poracle")); TLOG(5, toNoDecorator, __HERE__) << "Creating plugin path:" << providerPath << std::endl; if( !toraHome.mkpath(providerPath)) throw QString("Could not create: %1").arg(providerPath); @@ -426,7 +426,7 @@ virtual QString name() const { - return QString::fromAscii(ORACLE_TNSCLIENT); + return QString::fromLatin1(ORACLE_TNSCLIENT); }; /** Return list of possible client locations @@ -521,9 +521,9 @@ { QDir ohDir(s); #ifdef Q_OS_WIN32 - QDir ohLibDir(s + QDir::separator() + QString::fromAscii("bin")); + QDir ohLibDir(s + QDir::separator() + QString::fromLatin1("bin")); #else - QDir ohLibDir(s + QDir::separator() + QString::fromAscii("lib")); + QDir ohLibDir(s + QDir::separator() + QString::fromLatin1("lib")); #endif QStringList sLibraries = ohLibDir.entryList( m_libname); QString version; Modified: trunk/tora/src/connection/tooracletraits.cpp =================================================================== --- trunk/tora/src/connection/tooracletraits.cpp 2014-11-22 12:46:00 UTC (rev 5152) +++ trunk/tora/src/connection/tooracletraits.cpp 2014-11-22 12:56:12 UTC (rev 5153) @@ -106,7 +106,7 @@ QString toOracleTraits::quoteVarchar(const QString &name) const { QString retval(name); - retval.replace('\'', QString::fromAscii("\'\'"), Qt::CaseSensitive); + retval.replace('\'', QString::fromLatin1("\'\'"), Qt::CaseSensitive); return QChar('\'') + retval + ('\''); } @@ -118,8 +118,8 @@ QList<QString> toOracleTraits::primaryKeys(toConnection &conn, toCache::ObjectRef const&obj) const { - static const QString ROWID(QString::fromAscii("ROWID")); - static const QString ORA_ROWSCN(QString::fromAscii("ORA_ROWSCN")); + static const QString ROWID(QString::fromLatin1("ROWID")); + static const QString ORA_ROWSCN(QString::fromLatin1("ORA_ROWSCN")); toCache::CacheEntry const* e = conn.getCache().findEntry(obj); if (e && e->type == toCache::TABLE) Modified: trunk/tora/src/connection/toqsqlfind.cpp =================================================================== --- trunk/tora/src/connection/toqsqlfind.cpp 2014-11-22 12:46:00 UTC (rev 5152) +++ trunk/tora/src/connection/toqsqlfind.cpp 2014-11-22 12:56:12 UTC (rev 5153) @@ -51,7 +51,7 @@ virtual QString name() const { - return QString::fromAscii(QSQL_FINDER); + return QString::fromLatin1(QSQL_FINDER); }; /** Return list of possible client locations Modified: trunk/tora/src/connection/toteradatafind.cpp =================================================================== --- trunk/tora/src/connection/toteradatafind.cpp 2014-11-22 12:46:00 UTC (rev 5152) +++ trunk/tora/src/connection/toteradatafind.cpp 2014-11-22 12:56:12 UTC (rev 5153) @@ -58,7 +58,7 @@ virtual QString name() const { - return QString::fromAscii("Teradata"); + return QString::fromLatin1("Teradata"); }; /** Return list of possible client locations @@ -84,21 +84,21 @@ QSet<QString> const toTeradataFinder::m_paths = QSet<QString>() #if defined(Q_OS_LINUX) - << QString::fromAscii("/opt/teradata/client/14.00/lib64/") - << QString::fromAscii("/opt/teradata/client/14.00/lib/") - << QString::fromAscii("/opt/teradata/client/13.00/lib64/") - << QString::fromAscii("/opt/teradata/client/13.00/lib/") + << QString::fromLatin1("/opt/teradata/client/14.00/lib64/") + << QString::fromLatin1("/opt/teradata/client/14.00/lib/") + << QString::fromLatin1("/opt/teradata/client/13.00/lib64/") + << QString::fromLatin1("/opt/teradata/client/13.00/lib/") #elif defined(Q_OS_WIN32) #endif ; QList<QString> const toTeradataFinder::m_libname = QList<QString>() #if defined(Q_OS_LINUX) - << QString::fromAscii("libcliv2.so") + << QString::fromLatin1("libcliv2.so") #elif defined(Q_OS_WIN32) - << QString::fromAscii("wincli32.dll") + << QString::fromLatin1("wincli32.dll") #elif defined(Q_OS_WIN64) - << QString::fromAscii("wincli64.dll") + << QString::fromLatin1("wincli64.dll") #endif ; Modified: trunk/tora/src/core/main.cpp =================================================================== --- trunk/tora/src/core/main.cpp 2014-11-22 12:46:00 UTC (rev 5152) +++ trunk/tora/src/core/main.cpp 2014-11-22 12:56:12 UTC (rev 5153) @@ -125,8 +125,10 @@ if (!style.isEmpty()) QApplication::setStyle(QStyleFactory::create(style)); +#if QT_VERSION < 0x050000 // Set the default codec to use for QString QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8")); +#endif // qt4 if (getenv("LANG")) // qApp->setDefaultCodec(QTextCodec::codecForName(getenv("LANG"))); Modified: trunk/tora/src/core/toconfiguration_new.cpp =================================================================== --- trunk/tora/src/core/toconfiguration_new.cpp 2014-11-22 12:46:00 UTC (rev 5152) +++ trunk/tora/src/core/toconfiguration_new.cpp 2014-11-22 12:56:12 UTC (rev 5153) @@ -182,7 +182,7 @@ appl += QDir::separator(); return appl; #else - return QString::fromAscii(SHARE_DIR); + return QString::fromLatin1(SHARE_DIR); #endif } Modified: trunk/tora/src/core/tonewconnection.cpp =================================================================== --- trunk/tora/src/core/tonewconnection.cpp 2014-11-22 12:46:00 UTC (rev 5152) +++ trunk/tora/src/core/tonewconnection.cpp 2014-11-22 12:56:12 UTC (rev 5153) @@ -87,8 +87,8 @@ { if (p == "Oracle") { - Provider->addItem(ORACLE_INSTANTCLIENT, QVariant(QString::fromAscii(ORACLE_PROVIDER))); - Provider->addItem(ORACLE_TNSCLIENT, QVariant(QString::fromAscii(ORACLE_PROVIDER))); + Provider->addItem(ORACLE_INSTANTCLIENT, QVariant(QString::fromLatin1(ORACLE_PROVIDER))); + Provider->addItem(ORACLE_TNSCLIENT, QVariant(QString::fromLatin1(ORACLE_PROVIDER))); } else { Modified: trunk/tora/src/result/toresulttabledata.cpp =================================================================== --- trunk/tora/src/result/toresulttabledata.cpp 2014-11-22 12:46:00 UTC (rev 5152) +++ trunk/tora/src/result/toresulttabledata.cpp 2014-11-22 12:56:12 UTC (rev 5153) @@ -536,9 +536,9 @@ unsigned toResultTableData::commitUpdate(toConnectionSubLoan &conn, toResultModelEdit::ChangeSet &change) { - static const QString UPDATE = QString::fromAscii("UPDATE %1.%2 SET %3 WHERE 1=1 %4"); - static const QString CONJUNCTION = QString::fromAscii(" AND %1 = %2"); - static const QString ASSIGNMENT = QString::fromAscii("%1 = %2"); + static const QString UPDATE = QString::fromLatin1("UPDATE %1.%2 SET %3 WHERE 1=1 %4"); + static const QString CONJUNCTION = QString::fromLatin1(" AND %1 = %2"); + static const QString ASSIGNMENT = QString::fromLatin1("%1 = %2"); if (Model->getPriKeys().empty()) { @@ -646,8 +646,8 @@ unsigned toResultTableData::commitDelete(toConnectionSubLoan &conn, toResultModelEdit::ChangeSet &change) { - static const QString DELETESTAT = QString::fromAscii("DELETE FROM %1.%2 WHERE 1=1 %3"); - static const QString CONJUNCTION = QString::fromAscii(" AND %1 = %2"); + static const QString DELETESTAT = QString::fromLatin1("DELETE FROM %1.%2 WHERE 1=1 %3"); + static const QString CONJUNCTION = QString::fromLatin1(" AND %1 = %2"); if (Model->getPriKeys().empty()) { Utils::toStatusMessage(tr("This table has no known primary keys")); Modified: trunk/tora/src/tests/test4window.cpp =================================================================== --- trunk/tora/src/tests/test4window.cpp 2014-11-22 12:46:00 UTC (rev 5152) +++ trunk/tora/src/tests/test4window.cpp 2014-11-22 12:56:12 UTC (rev 5153) @@ -75,7 +75,7 @@ rightVerticalLayout->addWidget(editorRight); editorRight->setText(sql); editorRight->setMarginType(2, QsciScintilla::TextMarginRightJustified); - editorRight->setMarginWidth(2, QString::fromAscii("009")); + editorRight->setMarginWidth(2, QString::fromLatin1("009")); connect(oracle, SIGNAL(triggered()), this, SLOT(setOracle())); connect(mysql, SIGNAL(triggered()), this, SLOT(setMySQL())); Modified: trunk/tora/src/tools/tosandboxtool.cpp =================================================================== --- trunk/tora/src/tools/tosandboxtool.cpp 2014-11-22 12:46:00 UTC (rev 5152) +++ trunk/tora/src/tools/tosandboxtool.cpp 2014-11-22 12:56:12 UTC (rev 5153) @@ -101,7 +101,7 @@ new toChangeConnection(toolbar); m_statement = new QLineEdit(this); - m_statement->setText(QString::fromAscii("select * from dba_objects")); + m_statement->setText(QString::fromLatin1("select * from dba_objects")); layout()->addWidget(m_statement); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |