razzaline/tahoma2d
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Merge pull request #2956 from otakuto/fix-std-labels

Browse source 
Fix std labels
This commit is contained in:
Rodney 2019-12-24 08:35:33 -06:00 committed by GitHub
commit c9f2eb8b95
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
toonz/sources/toonzfarm/tfarmcontroller/tfarmcontroller.cpp
View file

@ -105,8 +105,7 @@ TFilePath getLocalRoot() {
TFilePath lroot; TFilePath lroot;
#ifdef _WIN32 #ifdef _WIN32
std: std::string regpath = "SOFTWARE\\" + tver.getAppName() + "\\" + tver.getAppName() +
string regpath = "SOFTWARE\\" + tver.getAppName() + "\\" + tver.getAppName() +
"\\" + tver.getAppVersionString() + "\\FARMROOT"; "\\" + tver.getAppVersionString() + "\\FARMROOT";
TFilePath name(regpath); TFilePath name(regpath);
lroot = TFilePath(TSystem::getSystemValue(name).toStdString()) + lroot = TFilePath(TSystem::getSystemValue(name).toStdString()) +
@ -2251,8 +2250,7 @@ void ControllerService::onStart(int argc, char *argv[]) {
TFilePath logFilePath = lRootDir + "controller.log"; TFilePath logFilePath = lRootDir + "controller.log";
m_userLog = new TUserLog(logFilePath); m_userLog = new TUserLog(logFilePath);
} }
std: std::string appverinfo = tver.getAppVersionInfo("Farm Controller") + "\n\n";
string appverinfo = tver.getAppVersionInfo("Farm Controller") + "\n\n";
m_userLog->info(appverinfo.c_str()); m_userLog->info(appverinfo.c_str());
TFilePath globalRoot = getGlobalRoot(); TFilePath globalRoot = getGlobalRoot();

3
toonz/sources/toonzfarm/tfarmserver/tfarmserver.cpp
View file

@ -876,8 +876,7 @@ void FarmServerService::onStart(int argc, char *argv[]) {
m_userLog = new TUserLog(logFilePath); m_userLog = new TUserLog(logFilePath);
} }
std: std::string appverinfo = tver.getAppVersionInfo("Farm Server") + "\n\n";
string appverinfo = tver.getAppVersionInfo("Farm Server") + "\n\n";
m_userLog->info(appverinfo.c_str()); m_userLog->info(appverinfo.c_str());
// legge dal file di configurazione dei server il numero di porta da // legge dal file di configurazione dei server il numero di porta da