main.cpp   main.cpp 
skipping to change at line 50 skipping to change at line 50
virtual QString translate(const char* context, const char* sourceTex t, const char* comment=0) const virtual QString translate(const char* context, const char* sourceTex t, const char* comment=0) const
{ {
return q_(sourceText); return q_(sourceText);
} }
}; };
// Main stellarium procedure // Main stellarium procedure
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
QCoreApplication::setApplicationName("stellarium"); QCoreApplication::setApplicationName("stellarium");
QApplication::setDesktopSettingsAware(false); QCoreApplication::setApplicationVersion(StelApp::getApplicationVersi
on());
QCoreApplication::setOrganizationDomain("stellarium.org");
QCoreApplication::setOrganizationName("stellarium");
//QApplication::setDesktopSettingsAware(false);
QApplication::setStyle(new QPlastiqueStyle()); QApplication::setStyle(new QPlastiqueStyle());
QApplication app(argc, argv);
//app.setQuitOnLastWindowClosed(false); // With Qt 4.5, force the usage of the raster backend
char** argv2 = (char**)malloc(sizeof(char*)*(argc+2));
memcpy(argv2, argv, argc*sizeof(char*));
char cmd1[] = "-graphicssystem";
char cmd2[] = "raster";
argv2[argc]=cmd1;
argv2[argc+1]=cmd2;
int argc2 = argc+2;
QApplication app(argc2, argv2);
#ifdef MACOSX #ifdef MACOSX
StelMacosxDirs::addApplicationPluginDirectory(); StelMacosxDirs::addApplicationPluginDirectory();
#endif #endif
GettextStelTranslator trans; GettextStelTranslator trans;
app.installTranslator(&trans); app.installTranslator(&trans);
if (!QGLFormat::hasOpenGL()) if (!QGLFormat::hasOpenGL())
{ {
QMessageBox::warning(0, "Stellarium", q_("This system does n ot support OpenGL.")); QMessageBox::warning(0, "Stellarium", q_("This system does n ot support OpenGL."));
} }
StelMainWindow* mainWin = new StelMainWindow(NULL); StelMainWindow* mainWin = new StelMainWindow(NULL);
StelMainGraphicsView* view = new StelMainGraphicsView(NULL, argc, ar gv); StelMainGraphicsView* view = new StelMainGraphicsView(NULL, argc, ar gv);
mainWin->setCentralWidget(view); mainWin->setCentralWidget(view);
mainWin->init(); mainWin->init();
app.exec(); app.exec();
view->deinitGL(); view->deinitGL();
delete view; delete view;
delete mainWin; delete mainWin;
free(argv2);
return 0; return 0;
} }
 End of changes. 3 change blocks. 
3 lines changed or deleted 18 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/