mirror of
https://github.com/overte-org/overte.git
synced 2025-08-09 04:37:48 +02:00
Merge pull request #13 from Atlante45/backtrace-for-rc-63
Fix settings init in all exe
This commit is contained in:
commit
c2b1c4250c
9 changed files with 14 additions and 12 deletions
|
@ -157,7 +157,6 @@ DomainServer::DomainServer(int argc, char* argv[]) :
|
||||||
DependencyManager::set<StatTracker>();
|
DependencyManager::set<StatTracker>();
|
||||||
|
|
||||||
LogUtils::init();
|
LogUtils::init();
|
||||||
Setting::init();
|
|
||||||
|
|
||||||
qDebug() << "Setting up domain-server";
|
qDebug() << "Setting up domain-server";
|
||||||
qDebug() << "[VERSION] Build sequence:" << qPrintable(applicationVersion());
|
qDebug() << "[VERSION] Build sequence:" << qPrintable(applicationVersion());
|
||||||
|
|
|
@ -29,6 +29,8 @@ int main(int argc, char* argv[]) {
|
||||||
QCoreApplication::setOrganizationDomain(BuildInfo::ORGANIZATION_DOMAIN);
|
QCoreApplication::setOrganizationDomain(BuildInfo::ORGANIZATION_DOMAIN);
|
||||||
QCoreApplication::setApplicationVersion(BuildInfo::VERSION);
|
QCoreApplication::setApplicationVersion(BuildInfo::VERSION);
|
||||||
|
|
||||||
|
Setting::init();
|
||||||
|
|
||||||
#ifndef WIN32
|
#ifndef WIN32
|
||||||
setvbuf(stdout, NULL, _IOLBF, 0);
|
setvbuf(stdout, NULL, _IOLBF, 0);
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -33,8 +33,6 @@ private:
|
||||||
Qt59TestApp::Qt59TestApp(int argc, char* argv[]) :
|
Qt59TestApp::Qt59TestApp(int argc, char* argv[]) :
|
||||||
QCoreApplication(argc, argv)
|
QCoreApplication(argc, argv)
|
||||||
{
|
{
|
||||||
|
|
||||||
Setting::init();
|
|
||||||
DependencyManager::registerInheritance<LimitedNodeList, NodeList>();
|
DependencyManager::registerInheritance<LimitedNodeList, NodeList>();
|
||||||
DependencyManager::set<AccountManager>([&] { return QString("Mozilla/5.0 (HighFidelityACClient)"); });
|
DependencyManager::set<AccountManager>([&] { return QString("Mozilla/5.0 (HighFidelityACClient)"); });
|
||||||
DependencyManager::set<AddressManager>();
|
DependencyManager::set<AddressManager>();
|
||||||
|
|
|
@ -97,7 +97,6 @@ ACClientApp::ACClientApp(int argc, char* argv[]) :
|
||||||
_password = pieces[1];
|
_password = pieces[1];
|
||||||
}
|
}
|
||||||
|
|
||||||
Setting::init();
|
|
||||||
DependencyManager::registerInheritance<LimitedNodeList, NodeList>();
|
DependencyManager::registerInheritance<LimitedNodeList, NodeList>();
|
||||||
|
|
||||||
DependencyManager::set<AccountManager>([&]{ return QString("Mozilla/5.0 (HighFidelityACClient)"); });
|
DependencyManager::set<AccountManager>([&]{ return QString("Mozilla/5.0 (HighFidelityACClient)"); });
|
||||||
|
|
|
@ -25,6 +25,8 @@ int main(int argc, char * argv[]) {
|
||||||
QCoreApplication::setOrganizationDomain(BuildInfo::ORGANIZATION_DOMAIN);
|
QCoreApplication::setOrganizationDomain(BuildInfo::ORGANIZATION_DOMAIN);
|
||||||
QCoreApplication::setApplicationVersion(BuildInfo::VERSION);
|
QCoreApplication::setApplicationVersion(BuildInfo::VERSION);
|
||||||
|
|
||||||
|
Setting::init();
|
||||||
|
|
||||||
ACClientApp app(argc, argv);
|
ACClientApp app(argc, argv);
|
||||||
|
|
||||||
return app.exec();
|
return app.exec();
|
||||||
|
|
|
@ -135,7 +135,6 @@ ATPClientApp::ATPClientApp(int argc, char* argv[]) :
|
||||||
_domainServerAddress = domainURL.toString();
|
_domainServerAddress = domainURL.toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
Setting::init();
|
|
||||||
DependencyManager::registerInheritance<LimitedNodeList, NodeList>();
|
DependencyManager::registerInheritance<LimitedNodeList, NodeList>();
|
||||||
|
|
||||||
DependencyManager::set<StatTracker>();
|
DependencyManager::set<StatTracker>();
|
||||||
|
|
|
@ -25,6 +25,8 @@ int main(int argc, char * argv[]) {
|
||||||
QCoreApplication::setOrganizationDomain(BuildInfo::ORGANIZATION_DOMAIN);
|
QCoreApplication::setOrganizationDomain(BuildInfo::ORGANIZATION_DOMAIN);
|
||||||
QCoreApplication::setApplicationVersion(BuildInfo::VERSION);
|
QCoreApplication::setApplicationVersion(BuildInfo::VERSION);
|
||||||
|
|
||||||
|
Setting::init();
|
||||||
|
|
||||||
ATPClientApp app(argc, argv);
|
ATPClientApp app(argc, argv);
|
||||||
|
|
||||||
return app.exec();
|
return app.exec();
|
||||||
|
|
|
@ -14,7 +14,6 @@
|
||||||
#include <QtCore/QCommandLineParser>
|
#include <QtCore/QCommandLineParser>
|
||||||
|
|
||||||
#include <image/Image.h>
|
#include <image/Image.h>
|
||||||
#include <SettingInterface.h>
|
|
||||||
|
|
||||||
#include "ui/OvenMainWindow.h"
|
#include "ui/OvenMainWindow.h"
|
||||||
#include "Oven.h"
|
#include "Oven.h"
|
||||||
|
@ -29,12 +28,6 @@ static const QString CLI_TYPE_PARAMETER = "t";
|
||||||
Oven::Oven(int argc, char* argv[]) :
|
Oven::Oven(int argc, char* argv[]) :
|
||||||
QApplication(argc, argv)
|
QApplication(argc, argv)
|
||||||
{
|
{
|
||||||
QCoreApplication::setOrganizationName("High Fidelity");
|
|
||||||
QCoreApplication::setApplicationName("Oven");
|
|
||||||
|
|
||||||
// init the settings interface so we can save and load settings
|
|
||||||
Setting::init();
|
|
||||||
|
|
||||||
// parse the command line parameters
|
// parse the command line parameters
|
||||||
QCommandLineParser parser;
|
QCommandLineParser parser;
|
||||||
|
|
||||||
|
|
|
@ -10,7 +10,15 @@
|
||||||
|
|
||||||
#include "Oven.h"
|
#include "Oven.h"
|
||||||
|
|
||||||
|
#include <SettingInterface.h>
|
||||||
|
|
||||||
int main (int argc, char** argv) {
|
int main (int argc, char** argv) {
|
||||||
|
QCoreApplication::setOrganizationName("High Fidelity");
|
||||||
|
QCoreApplication::setApplicationName("Oven");
|
||||||
|
|
||||||
|
// init the settings interface so we can save and load settings
|
||||||
|
Setting::init();
|
||||||
|
|
||||||
Oven app(argc, argv);
|
Oven app(argc, argv);
|
||||||
return app.exec();
|
return app.exec();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue