Skip to content

Commit 6aee99a

Browse files
author
timlinux
committedMay 21, 2008
Prettified application variable name
git-svn-id: http://svn.osgeo.org/qgis/trunk@8485 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent bf60b12 commit 6aee99a

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed
 

‎src/app/main.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ int main(int argc, char *argv[])
379379
std::cerr << "QGIS starting in non-interactive mode not supported.\n You are seeing this message most likely because you have no DISPLAY environment variable set." << std::endl;
380380
exit(1); //exit for now until a version of qgis is capabable of running non interactive
381381
}
382-
QgsApplication a(argc, argv, myUseGuiFlag );
382+
QgsApplication myApp(argc, argv, myUseGuiFlag );
383383
//
384384
// Set up the QSettings environment must be done after qapp is created
385385
QCoreApplication::setOrganizationName("QuantumGIS");
@@ -423,7 +423,7 @@ int main(int argc, char *argv[])
423423
}
424424

425425

426-
// a.setFont(QFont("helvetica", 11));
426+
// myApp.setFont(QFont("helvetica", 11));
427427

428428
QString i18nPath = QgsApplication::i18nPath();
429429

@@ -467,7 +467,7 @@ int main(int argc, char *argv[])
467467
QTranslator qgistor(0);
468468
if (qgistor.load(QString("qgis_") + myTranslationCode, i18nPath))
469469
{
470-
a.installTranslator(&qgistor);
470+
myApp.installTranslator(&qgistor);
471471
}
472472
/* Translation file for Qt.
473473
* The strings from the QMenuBar context section are used by Qt/Mac to shift
@@ -477,7 +477,7 @@ int main(int argc, char *argv[])
477477
QTranslator qttor(0);
478478
if (qttor.load(QString("qt_") + myTranslationCode, i18nPath))
479479
{
480-
a.installTranslator(&qttor);
480+
myApp.installTranslator(&qttor);
481481
}
482482

483483
//set up splash screen
@@ -535,7 +535,7 @@ int main(int argc, char *argv[])
535535
//next two lines should not be needed, testing only
536536
//QCoreApplication::addLibraryPath( myPath + "/imageformats" );
537537
//QCoreApplication::addLibraryPath( myPath + "/sqldrivers" );
538-
//foreach (myPath, a.libraryPaths())
538+
//foreach (myPath, myApp.libraryPaths())
539539
//{
540540
//qDebug("Path:" + myPath.toLocal8Bit());
541541
//}
@@ -662,11 +662,11 @@ int main(int argc, char *argv[])
662662
qApp->processEvents(), grab the pixmap, save it, hide the window and exit.
663663
*/
664664
//qgis->show();
665-
a.processEvents();
665+
myApp.processEvents();
666666
QPixmap * myQPixmap = new QPixmap(800,600);
667667
myQPixmap->fill();
668668
qgis->saveMapAsImage(mySnapshotFileName,myQPixmap);
669-
a.processEvents();
669+
myApp.processEvents();
670670
qgis->hide();
671671
return 1;
672672
}
@@ -676,10 +676,10 @@ int main(int argc, char *argv[])
676676
// Continue on to interactive gui...
677677
/////////////////////////////////////////////////////////////////////
678678
qgis->show();
679-
a.connect(&a, SIGNAL(lastWindowClosed()), &a, SLOT(quit()));
679+
myApp.connect(&myApp, SIGNAL(lastWindowClosed()), &myApp, SLOT(quit()));
680680

681681
mypSplash->finish(qgis);
682682
delete mypSplash;
683-
return a.exec();
683+
return myApp.exec();
684684

685685
}

0 commit comments

Comments
 (0)
Please sign in to comment.