Skip to content

Commit b49980c

Browse files
author
jef
committed
automatic indentation update (r11003-r11227)
git-svn-id: http://svn.osgeo.org/qgis/trunk@11228 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 2528ef4 commit b49980c

32 files changed

+1951
-1926
lines changed

src/app/composer/qgscomposer.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,7 @@ void QgsComposer::on_mActionPrint_triggered()
471471

472472
void QgsComposer::print( QPrinter &printer )
473473
{
474-
if( !mComposition )
474+
if ( !mComposition )
475475
return;
476476

477477
if ( containsWMSLayer() )

src/app/ogr/qgsopenvectorlayerdialog.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ QgsOpenVectorLayerDialog::QgsOpenVectorLayerDialog( QWidget* parent, Qt::WFlags
4242
//set encoding
4343
// cmbEncodings->setItemText( cmbEncodings->currentIndex(), QString( QTextCodec::codecForLocale()->name() ) );
4444
QSettings settings;
45-
QString enc = settings.value( "/UI/encoding", QString("System") ).toString();
46-
45+
QString enc = settings.value( "/UI/encoding", QString( "System" ) ).toString();
46+
4747
// The specified decoding is added if not existing alread, and then set current.
4848
// This should select it.
4949
int encindex = cmbEncodings->findText( enc );

src/app/qgisapp.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -2303,7 +2303,7 @@ static void openFilesRememberingFilter_( QString const &filterName,
23032303
QgsDebugMsg( "Opening file dialog with filters: " + filters );
23042304

23052305
QgsEncodingFileDialog* openFileDialog = new QgsEncodingFileDialog( 0,
2306-
title, lastUsedDir, filters, QString ("" ) );
2306+
title, lastUsedDir, filters, QString( "" ) );
23072307

23082308
// allow for selection of more than one file
23092309
openFileDialog->setFileMode( QFileDialog::ExistingFiles );
@@ -3153,7 +3153,7 @@ void QgisApp::newVectorLayer()
31533153
QgsDebugMsg( "Saving vector file dialog without filters: " );
31543154

31553155
QgsEncodingFileDialog* openFileDialog = new QgsEncodingFileDialog( this,
3156-
tr( "Save As" ), lastUsedDir, "", QString( "" ) );
3156+
tr( "Save As" ), lastUsedDir, "", QString( "" ) );
31573157

31583158
// allow for selection of more than one file
31593159
openFileDialog->setFileMode( QFileDialog::AnyFile );

src/app/qgsabout.cpp

+9-9
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ void QgsAbout::init()
133133
QStringList myTokens = sline.split( "|", QString::SkipEmptyParts );
134134
if ( myTokens.size() > 1 )
135135
{
136-
website = "<a href=\"" + myTokens[1].remove(' ') + "\">" + myTokens[1] + "</a>";
136+
website = "<a href=\"" + myTokens[1].remove( ' ' ) + "\">" + myTokens[1] + "</a>";
137137
}
138138
else
139139
{
@@ -153,7 +153,7 @@ void QgsAbout::init()
153153
QgsDebugMsg( QString( "sponsorHTML:%1" ).arg( sponsorHTML.toAscii().constData() ) );
154154
QgsDebugMsg( QString( "txtSponsors:%1" ).arg( txtSponsors->toHtml().toAscii().constData() ) );
155155
}
156-
156+
157157
// read the DONORS file and populate the text widget
158158
QFile donorsFile( QgsApplication::donorsFilePath() );
159159
#ifdef QGISDEBUG
@@ -163,12 +163,12 @@ void QgsAbout::init()
163163
if ( donorsFile.open( QIODevice::ReadOnly ) )
164164
{
165165
QString donorsHTML = ""
166-
+ tr( "<p>The following individuals and institutions have contributed "
167-
"money to fund QGIS development and other project costs</p>" )
168-
+ "<hr>"
169-
"<table width='100%'>"
170-
"<tr><th>" + tr( "Name" ) + "</th>"
171-
"<th>" + tr( "Website" ) + "</th></tr>";
166+
+ tr( "<p>The following individuals and institutions have contributed "
167+
"money to fund QGIS development and other project costs</p>" )
168+
+ "<hr>"
169+
"<table width='100%'>"
170+
"<tr><th>" + tr( "Name" ) + "</th>"
171+
"<th>" + tr( "Website" ) + "</th></tr>";
172172
QString website;
173173
QTextStream donorsStream( &donorsFile );
174174
// Always use UTF-8
@@ -182,7 +182,7 @@ void QgsAbout::init()
182182
QStringList myTokens = sline.split( "|", QString::SkipEmptyParts );
183183
if ( myTokens.size() > 1 )
184184
{
185-
website = "<a href=\"" + myTokens[1].remove(' ') + "\">" + myTokens[1] + "</a>";
185+
website = "<a href=\"" + myTokens[1].remove( ' ' ) + "\">" + myTokens[1] + "</a>";
186186
}
187187
else
188188
{

0 commit comments

Comments
 (0)