Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 13:18:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update new ACClientApp code

Browse source
This commit is contained in:
Atlante45 2016-10-12 10:57:14 -07:00
parent 5bae69bb51
commit 36bd9ef4e6
6 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
assignment-client/src/AssignmentClientApp.cpp
View file

@ -12,7 +12,6 @@
#include <QCommandLineParser> #include <QCommandLineParser>
#include <QThread> #include <QThread>
#include <BuildInfo.h>
#include <LogHandler.h> #include <LogHandler.h>
#include <SharedUtil.h> #include <SharedUtil.h>
#include <HifiConfigVariantMap.h> #include <HifiConfigVariantMap.h>
@ -40,11 +39,6 @@ AssignmentClientApp::AssignmentClientApp(int argc, char* argv[]) :
ShutdownEventListener::getInstance(); ShutdownEventListener::getInstance();
# endif # endif
setApplicationName(BuildInfo::ASSIGNMENT_CLIENT_NAME);
setOrganizationName(BuildInfo::MODIFIED_ORGANIZATION);
setOrganizationDomain(BuildInfo::ORGANIZATION_DOMAIN);
setApplicationVersion(BuildInfo::VERSION);
// use the verbose message handler in Logging // use the verbose message handler in Logging
qInstallMessageHandler(LogHandler::verboseMessageHandler); qInstallMessageHandler(LogHandler::verboseMessageHandler);

6
assignment-client/src/main.cpp
View file

@ -14,10 +14,16 @@
#include <SharedUtil.h> #include <SharedUtil.h>
#include "AssignmentClientApp.h" #include "AssignmentClientApp.h"
#include <BuildInfo.h>
int main(int argc, char* argv[]) { int main(int argc, char* argv[]) {
disableQtBearerPoll(); // Fixes wifi ping spikes disableQtBearerPoll(); // Fixes wifi ping spikes
QCoreApplication::setApplicationName(BuildInfo::ASSIGNMENT_CLIENT_NAME);
QCoreApplication::setOrganizationName(BuildInfo::MODIFIED_ORGANIZATION);
QCoreApplication::setOrganizationDomain(BuildInfo::ORGANIZATION_DOMAIN);
QCoreApplication::setApplicationVersion(BuildInfo::VERSION);
AssignmentClientApp app(argc, argv); AssignmentClientApp app(argc, argv);
int acReturn = app.exec(); int acReturn = app.exec();

1
cmake/templates/BuildInfo.h.in
View file

@ -20,6 +20,7 @@ namespace BuildInfo {
const QString INTERFACE_NAME = "Interface"; const QString INTERFACE_NAME = "Interface";
const QString ASSIGNMENT_CLIENT_NAME = "assignment-client"; const QString ASSIGNMENT_CLIENT_NAME = "assignment-client";
const QString DOMAIN_SERVER_NAME = "domain-server"; const QString DOMAIN_SERVER_NAME = "domain-server";
const QString AC_CLIENT_SERVER_NAME = "ac-client";
const QString MODIFIED_ORGANIZATION = "@BUILD_ORGANIZATION@"; const QString MODIFIED_ORGANIZATION = "@BUILD_ORGANIZATION@";
const QString ORGANIZATION_DOMAIN = "highfidelity.io"; const QString ORGANIZATION_DOMAIN = "highfidelity.io";
const QString VERSION = "@BUILD_VERSION@"; const QString VERSION = "@BUILD_VERSION@";

10
libraries/shared/src/SettingHelpers.h
View file

@ -12,17 +12,7 @@
#ifndef hifi_SettingHelpers_h #ifndef hifi_SettingHelpers_h
#define hifi_SettingHelpers_h #define hifi_SettingHelpers_h
#include <QSettings> #include <QSettings>
#include <QJsonDocument>
#include <QJsonObject>
#include <QRect>
#include <QSize>
#include <QPoint>
#include <QDataStream>
#include <QStringList>
bool readJSONFile(QIODevice& device, QSettings::SettingsMap& map); bool readJSONFile(QIODevice& device, QSettings::SettingsMap& map);
bool writeJSONFile(QIODevice& device, const QSettings::SettingsMap& map); bool writeJSONFile(QIODevice& device, const QSettings::SettingsMap& map);

3
tools/ac-client/src/ACClientApp.cpp
View file

@ -81,9 +81,8 @@ ACClientApp::ACClientApp(int argc, char* argv[]) :
listenPort = parser.value(listenPortOption).toInt(); listenPort = parser.value(listenPortOption).toInt();
} }
Setting::preInit();
DependencyManager::registerInheritance<LimitedNodeList, NodeList>();
Setting::init(); Setting::init();
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>();

8
tools/ac-client/src/main.cpp
View file

@ -13,11 +13,19 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include <BuildInfo.h>
#include "ACClientApp.h" #include "ACClientApp.h"
using namespace std; using namespace std;
int main(int argc, char * argv[]) { int main(int argc, char * argv[]) {
QCoreApplication::setApplicationName(BuildInfo::AC_CLIENT_SERVER_NAME);
QCoreApplication::setOrganizationName(BuildInfo::MODIFIED_ORGANIZATION);
QCoreApplication::setOrganizationDomain(BuildInfo::ORGANIZATION_DOMAIN);
QCoreApplication::setApplicationVersion(BuildInfo::VERSION);
ACClientApp app(argc, argv); ACClientApp app(argc, argv);
return app.exec(); return app.exec();
} }