From: <nn...@us...> - 2006-11-21 15:48:34
|
Revision: 2080 http://svn.sourceforge.net/tora/?rev=2080&view=rev Author: nneul Date: 2006-11-21 07:48:29 -0800 (Tue, 21 Nov 2006) Log Message: ----------- fix for monolithic compile Modified Paths: -------------- trunk/tora/src/main.cpp Modified: trunk/tora/src/main.cpp =================================================================== --- trunk/tora/src/main.cpp 2006-11-21 15:43:22 UTC (rev 2079) +++ trunk/tora/src/main.cpp 2006-11-21 15:48:29 UTC (rev 2080) @@ -70,6 +70,7 @@ #ifndef TOMONOLITHIC #include <dlfcn.h> +#include <tosplash.h> #include <qdir.h> #include <qfileinfo.h> #include <qlabel.h> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mrj...@us...> - 2008-02-07 04:25:22
|
Revision: 2525 http://tora.svn.sourceforge.net/tora/?rev=2525&view=rev Author: mrjohnson0 Date: 2008-02-06 20:25:27 -0800 (Wed, 06 Feb 2008) Log Message: ----------- removing qt3support Modified Paths: -------------- trunk/tora/src/main.cpp Modified: trunk/tora/src/main.cpp =================================================================== --- trunk/tora/src/main.cpp 2008-02-07 04:22:17 UTC (rev 2524) +++ trunk/tora/src/main.cpp 2008-02-07 04:25:27 UTC (rev 2525) @@ -92,7 +92,7 @@ int main(int argc, char **argv) { #ifdef ENABLE_QT_XFT - toSetEnv("QT_XFT", toConfigurationSingle::Instance().globalConfig(CONF_QT_XFT, DEFAULT_QT_XFT).latin1()); + toSetEnv("QT_XFT", toConfigurationSingle::Instance().globalConfig(CONF_QT_XFT, DEFAULT_QT_XFT).toLatin1()); #endif # ifndef Q_OS_WIN32 @@ -110,7 +110,7 @@ // qApp->setDefaultCodec(QTextCodec::codecForName(getenv("LANG"))); QTranslator torats(0); - torats.load(toPluginPath() + "/" + QString("tora_") + toConfigurationSingle::Instance().globalConfig(CONF_LOCALE, QTextCodec::locale()), "."); + torats.load(toPluginPath() + "/" + QString("tora_") + toConfigurationSingle::Instance().globalConfig(CONF_LOCALE, QLocale().name()), "."); qApp->installTranslator(&torats); QTranslator toadbindings(0); if (!toConfigurationSingle::Instance().globalConfig(CONF_TOAD_BINDINGS, DEFAULT_TOAD_BINDINGS).isEmpty()) @@ -203,7 +203,7 @@ nls = "american_america.UTF8"; else { - int pos = nls.findRev('.'); + int pos = nls.lastIndexOf('.'); if (pos > 0) nls = nls.left(pos); nls += ".UTF8"; @@ -242,7 +242,7 @@ { QString connect = QString::fromLatin1(qApp->argv()[1]); QString user; - int pos = connect.find(QString::fromLatin1("@")); + int pos = connect.indexOf(QString::fromLatin1("@")); if (pos > -1) { user = connect.left(pos); @@ -256,7 +256,7 @@ } if (!connect.isEmpty()) toConfigurationSingle::Instance().globalSetConfig(CONF_DATABASE, connect); - pos = user.find(QString::fromLatin1("/")); + pos = user.indexOf(QString::fromLatin1("/")); if (pos > -1) { toConfigurationSingle::Instance().globalSetConfig(CONF_PASSWORD, user.right(user.length() - pos - 1)); @@ -280,8 +280,9 @@ } catch (const QString &str) { - fprintf(stderr, "Unhandled exception:\n\n%s\n", - (const char *)str); + fprintf(stderr, + "Unhandled exception:\n\n%s\n", + (const char *) str.toLatin1()); TOMessageBox::critical(NULL, qApp->translate("main", "Unhandled exception"), str, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mrj...@us...> - 2008-06-05 14:11:55
|
Revision: 2843 http://tora.svn.sourceforge.net/tora/?rev=2843&view=rev Author: mrjohnson0 Date: 2008-06-05 07:10:54 -0700 (Thu, 05 Jun 2008) Log Message: ----------- set default codec for c strings to utf8 Modified Paths: -------------- trunk/tora/src/main.cpp Modified: trunk/tora/src/main.cpp =================================================================== --- trunk/tora/src/main.cpp 2008-06-05 05:36:57 UTC (rev 2842) +++ trunk/tora/src/main.cpp 2008-06-05 14:10:54 UTC (rev 2843) @@ -67,6 +67,7 @@ #include <QTranslator> #include <QStyleFactory> #include <QFont> +#include <QTextCodec> #ifndef TOMONOLITHIC #include <dlfcn.h> @@ -99,6 +100,9 @@ if (!style.isEmpty()) QApplication::setStyle(QStyleFactory::create(style)); + // Set the default codec to use for QString + QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8")); + QApplication app(argc, argv); try This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <su...@us...> - 2008-07-07 09:36:24
|
Revision: 2883 http://tora.svn.sourceforge.net/tora/?rev=2883&view=rev Author: subik Date: 2008-07-07 02:35:49 -0700 (Mon, 07 Jul 2008) Log Message: ----------- last (forgotten) part of broken font in GUI. Modified Paths: -------------- trunk/tora/src/main.cpp Modified: trunk/tora/src/main.cpp =================================================================== --- trunk/tora/src/main.cpp 2008-07-07 08:24:06 UTC (rev 2882) +++ trunk/tora/src/main.cpp 2008-07-07 09:35:49 UTC (rev 2883) @@ -96,6 +96,14 @@ { toConfiguration::setQSettingsEnv(); + /*! \warning: Keep the code before QApplication init as small + as possible. There could be serious display issues when + you construct some Qt classes before QApplication. + It's the same for global static stuff - some instances can + break it (e.g. qscintilla lexers etc.). + */ + QApplication app(argc, argv); + QString style(toConfigurationSingle::Instance().style()); if (!style.isEmpty()) QApplication::setStyle(QStyleFactory::create(style)); @@ -103,8 +111,6 @@ // Set the default codec to use for QString QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8")); - QApplication app(argc, argv); - try { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |