sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-12 00:02:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

Astyle

Browse Source
This commit is contained in:
Nyall Dawson 2020-01-17 15:35:18 +10:00
parent bc1f21a127
commit 10e07ea5ef
2 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/core/qgsproject.cpp
View File

@ -475,12 +475,12 @@ QString QgsProject::title() const
QString QgsProject::saveUser() const
{
return mSaveUser;
return mSaveUser;
}
QString QgsProject::saveUserFullname() const
{
return mSaveUserFull;
return mSaveUserFull;
}
bool QgsProject::isDirty() const
@ -912,21 +912,21 @@ static void _getTitle( const QDomDocument &doc, QString &title )
}
static void getProjectMetadata(const QDomDocument &doc, QString &lastUser, QString &lastUserFull)
static void getProjectMetadata( const QDomDocument &doc, QString &lastUser, QString &lastUserFull )
{
QDomNodeList nl = doc.elementsByTagName(QStringLiteral("qgis"));
QDomNodeList nl = doc.elementsByTagName( QStringLiteral( "qgis" ) );
if (!nl.count())
{
QgsDebugMsg("unable to find qgis element");
return;
}
if ( !nl.count() )
{
QgsDebugMsg( "unable to find qgis element" );
return;
}
QDomNode qgisNode = nl.item(0); // there should only be one, so zeroth element OK
QDomNode qgisNode = nl.item( 0 ); // there should only be one, so zeroth element OK
QDomElement qgisElement = qgisNode.toElement(); // qgis node should be element
lastUser = qgisElement.attribute(QStringLiteral("save-user"), QString());
lastUserFull = qgisElement.attribute(QStringLiteral("save-user-full"), QString());
QDomElement qgisElement = qgisNode.toElement(); // qgis node should be element
lastUser = qgisElement.attribute( QStringLiteral( "save-user" ), QString() );
lastUserFull = qgisElement.attribute( QStringLiteral( "save-user-full" ), QString() );
}
@ -1265,7 +1265,7 @@ bool QgsProject::readProjectFile( const QString &filename, QgsProject::ReadFlags
QString oldTitle;
_getTitle( *doc, oldTitle );
getProjectMetadata(*doc, mSaveUser, mSaveUserFull);
getProjectMetadata( *doc, mSaveUser, mSaveUserFull );
QDomNodeList homePathNl = doc->elementsByTagName( QStringLiteral( "homePath" ) );
if ( homePathNl.count() > 0 )
@ -1558,8 +1558,8 @@ bool QgsProject::readProjectFile( const QString &filename, QgsProject::ReadFlags
if ( clean )
setDirty( false );
QgsDebugMsg(QString("Project save user: %1").arg(mSaveUser));
QgsDebugMsg(QString("Project save user: %1").arg(mSaveUserFull));
QgsDebugMsg( QString( "Project save user: %1" ).arg( mSaveUser ) );
QgsDebugMsg( QString( "Project save user: %1" ).arg( mSaveUserFull ) );
Q_NOWARN_DEPRECATED_PUSH
emit nonIdentifiableLayersChanged( nonIdentifiableLayers() );
@ -1988,8 +1988,8 @@ bool QgsProject::writeProjectFile( const QString &filename )
qgisNode.setAttribute( QStringLiteral( "version" ), QStringLiteral( "%1" ).arg( Qgis::version() ) );
QString newSaveUser = QgsApplication::userLoginName();
QString newSaveUserFull = QgsApplication::userFullName();
qgisNode.setAttribute(QStringLiteral("save-user"), newSaveUser);
qgisNode.setAttribute(QStringLiteral("save-user-full"), newSaveUserFull);
qgisNode.setAttribute( QStringLiteral( "save-user" ), newSaveUser );
qgisNode.setAttribute( QStringLiteral( "save-user-full" ), newSaveUserFull );
doc->appendChild( qgisNode );
QDomElement homePathNode = doc->createElement( QStringLiteral( "homePath" ) );

20
src/core/qgsproject.h
View File

@ -160,15 +160,15 @@ class CORE_EXPORT QgsProject : public QObject, public QgsExpressionContextGenera
*/
QString title() const;
/**
* Returns the user name that did the last save.
*/
QString saveUser() const;
/**
* Returns the user name that did the last save.
*/
QString saveUser() const;
/**
* Returns the full user name that did the last save.
*/
QString saveUserFullname() const;
/**
* Returns the full user name that did the last save.
*/
QString saveUserFullname() const;
/**
* Returns TRUE if the project has been modified since the last write()
@ -1803,8 +1803,8 @@ class CORE_EXPORT QgsProject : public QObject, public QgsExpressionContextGenera
QFile mFile; // current physical project file
QString mSaveUser; // last saved user.
QString mSaveUserFull; // last saved user full name.
QString mSaveUser; // last saved user.
QString mSaveUserFull; // last saved user full name.
/**
* Manual override for project home path - if empty, home path is automatically