main.cpp   main.cpp 
skipping to change at line 141 skipping to change at line 141
// See http://support.microsoft.com/kb/821893 // See http://support.microsoft.com/kb/821893
UINT timerGrain = 1; UINT timerGrain = 1;
if (timeBeginPeriod(timerGrain) == TIMERR_NOCANDO) if (timeBeginPeriod(timerGrain) == TIMERR_NOCANDO)
{ {
// If this is too fine a grain, try the lowest value used by a timer // If this is too fine a grain, try the lowest value used by a timer
timerGrain = 5; timerGrain = 5;
if (timeBeginPeriod(timerGrain) == TIMERR_NOCANDO) if (timeBeginPeriod(timerGrain) == TIMERR_NOCANDO)
timerGrain = 0; timerGrain = 0;
} }
#endif #endif
#ifdef Q_OS_MAC
char ** newArgv = (char**) malloc((argc + 2) * sizeof(*newArgv));
memmove(newArgv, argv, sizeof(*newArgv) * argc);
char * option = new char[20];
char * value = new char[21];
strcpy( option, "-platformpluginpath");
strcpy( value, "../plugins/platforms");
newArgv[argc++] = option;
newArgv[argc++] = value;
argv = newArgv;
#endif
QCoreApplication::setApplicationName("stellarium"); QCoreApplication::setApplicationName("stellarium");
QCoreApplication::setApplicationVersion(StelUtils::getApplicationVer sion()); QCoreApplication::setApplicationVersion(StelUtils::getApplicationVer sion());
QCoreApplication::setOrganizationDomain("stellarium.org"); QCoreApplication::setOrganizationDomain("stellarium.org");
QCoreApplication::setOrganizationName("stellarium"); QCoreApplication::setOrganizationName("stellarium");
// LP:1335611: Avoid troubles with search of the paths of the plugin s (deployments troubles) --AW // LP:1335611: Avoid troubles with search of the paths of the plugin s (deployments troubles) --AW
QFileInfo appInfo(QString::fromUtf8(argv[0])); QFileInfo appInfo(QString::fromUtf8(argv[0]));
QDir appDir(appInfo.absolutePath()); QDir appDir(appInfo.absolutePath());
registerPluginsDir(appDir); registerPluginsDir(appDir);
skipping to change at line 370 skipping to change at line 358
app.exec(); app.exec();
mainWin.deinit(); mainWin.deinit();
delete confSettings; delete confSettings;
StelLogger::deinit(); StelLogger::deinit();
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
if(timerGrain) if(timerGrain)
timeEndPeriod(timerGrain); timeEndPeriod(timerGrain);
#endif //Q_OS_WIN #endif //Q_OS_WIN
#ifdef Q_OS_MAC
delete(newArgv);
delete(option);
delete(value);
#endif
return 0; return 0;
} }
 End of changes. 2 change blocks. 
17 lines changed or deleted 0 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/