Skip to content

Commit 79a924e

Browse files
committed
Spelling and docs
1 parent 2ded9c2 commit 79a924e

File tree

4 files changed

+17
-8
lines changed

4 files changed

+17
-8
lines changed

python/core/qgsapplication.sip.in

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,13 @@ for resources in their own datastores e.g. a Qt4 resource bundle.
143143
be reverted to 'default'.
144144
%End
145145

146+
static QString resolvePkgPath( );
147+
%Docstring
148+
Calculate the application pkg path
149+
150+
:return: the resolved pkg path
151+
%End
152+
146153
static QString themeName();
147154
%Docstring
148155
Set the active theme to the specified theme.

src/app/main.cpp

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -812,7 +812,6 @@ int main( int argc, char *argv[] )
812812
if ( globalsettingsfile.isEmpty() )
813813
{
814814
QString default_globalsettingsfile = QgsApplication::resolvePkgPath() + "/resources/qgis_global_settings.ini";
815-
QgsDebugMsg( "GLOABL SETTINGS FILE:" + default_globalsettingsfile );
816815
if ( QFile::exists( default_globalsettingsfile ) )
817816
{
818817
globalsettingsfile = default_globalsettingsfile;
@@ -853,8 +852,6 @@ int main( int argc, char *argv[] )
853852
}
854853
delete globalSettings;
855854

856-
QgsDebugMsg( "CONFIG LOCAL STORAGE:" + configLocalStorageLocation );
857-
858855
QString rootProfileFolder = QgsUserProfileManager::resolveProfilesFolder( configLocalStorageLocation );
859856
QgsUserProfileManager manager( rootProfileFolder );
860857
QgsUserProfile *profile = manager.getProfile( profileName, true );
@@ -867,10 +864,10 @@ int main( int argc, char *argv[] )
867864
// Should be cleaned up in future to make this cleaner.
868865
QgsSettings settings;
869866

870-
QgsDebugMsg( "User profile details:" );
871-
QgsDebugMsg( QString( "\t - %1" ).arg( profileName ) );
872-
QgsDebugMsg( QString( "\t - %1" ).arg( profileFolder ) );
873-
QgsDebugMsg( QString( "\t - %1" ).arg( rootProfileFolder ) );
867+
QgsDebugMsgLevel( QStringLiteral( "User profile details:" ), 2 );
868+
QgsDebugMsgLevel( QStringLiteral( "\t - %1" ).arg( profileName ), 2 );
869+
QgsDebugMsgLevel( QStringLiteral( "\t - %1" ).arg( profileFolder ), 2 );
870+
QgsDebugMsgLevel( QStringLiteral( "\t - %1" ).arg( rootProfileFolder ), 2 );
874871

875872
myApp.init( profileFolder );
876873

src/core/qgsapplication.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -594,7 +594,8 @@ QString QgsApplication::resolvePkgPath()
594594
#endif
595595
QFile f;
596596
// "/../../.." is for Mac bundled app in build directory
597-
Q_FOREACH ( const QString &path, QStringList() << "" << "/.." << "/bin" << "/../../.." )
597+
const QStringList pathPrefixes = QStringList() << "" << "/.." << "/bin" << "/../../..";
598+
for ( const QString &path : pathPrefixes )
598599
{
599600
f.setFileName( prefixPath + path + "/qgisbuildpath.txt" );
600601
QgsDebugMsg( f.fileName() );

src/core/qgsapplication.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,10 @@ class CORE_EXPORT QgsApplication : public QApplication
184184
*/
185185
static void setThemeName( const QString &themeName );
186186

187+
/**
188+
* Calculate the application pkg path
189+
* \return the resolved pkg path
190+
*/
187191
static QString resolvePkgPath( );
188192

189193
/**

0 commit comments

Comments
 (0)