Skip to content
Permalink
Browse files

automatic indentation update (r11003-r11227)

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@11228 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef
jef committed Jul 31, 2009
1 parent 1848239 commit 024529e67a0e3293e4645a01861a0417c9c15031
@@ -471,7 +471,7 @@ void QgsComposer::on_mActionPrint_triggered()

void QgsComposer::print( QPrinter &printer )
{
if( !mComposition )
if ( !mComposition )
return;

if ( containsWMSLayer() )
@@ -42,8 +42,8 @@ QgsOpenVectorLayerDialog::QgsOpenVectorLayerDialog( QWidget* parent, Qt::WFlags
//set encoding
// cmbEncodings->setItemText( cmbEncodings->currentIndex(), QString( QTextCodec::codecForLocale()->name() ) );
QSettings settings;
QString enc = settings.value( "/UI/encoding", QString("System") ).toString();
QString enc = settings.value( "/UI/encoding", QString( "System" ) ).toString();

// The specified decoding is added if not existing alread, and then set current.
// This should select it.
int encindex = cmbEncodings->findText( enc );
@@ -2303,7 +2303,7 @@ static void openFilesRememberingFilter_( QString const &filterName,
QgsDebugMsg( "Opening file dialog with filters: " + filters );

QgsEncodingFileDialog* openFileDialog = new QgsEncodingFileDialog( 0,
title, lastUsedDir, filters, QString ("" ) );
title, lastUsedDir, filters, QString( "" ) );

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

QgsEncodingFileDialog* openFileDialog = new QgsEncodingFileDialog( this,
tr( "Save As" ), lastUsedDir, "", QString( "" ) );
tr( "Save As" ), lastUsedDir, "", QString( "" ) );

// allow for selection of more than one file
openFileDialog->setFileMode( QFileDialog::AnyFile );
@@ -133,7 +133,7 @@ void QgsAbout::init()
QStringList myTokens = sline.split( "|", QString::SkipEmptyParts );
if ( myTokens.size() > 1 )
{
website = "<a href=\"" + myTokens[1].remove(' ') + "\">" + myTokens[1] + "</a>";
website = "<a href=\"" + myTokens[1].remove( ' ' ) + "\">" + myTokens[1] + "</a>";
}
else
{
@@ -153,7 +153,7 @@ void QgsAbout::init()
QgsDebugMsg( QString( "sponsorHTML:%1" ).arg( sponsorHTML.toAscii().constData() ) );
QgsDebugMsg( QString( "txtSponsors:%1" ).arg( txtSponsors->toHtml().toAscii().constData() ) );
}

// read the DONORS file and populate the text widget
QFile donorsFile( QgsApplication::donorsFilePath() );
#ifdef QGISDEBUG
@@ -163,12 +163,12 @@ void QgsAbout::init()
if ( donorsFile.open( QIODevice::ReadOnly ) )
{
QString donorsHTML = ""
+ tr( "<p>The following individuals and institutions have contributed "
"money to fund QGIS development and other project costs</p>" )
+ "<hr>"
"<table width='100%'>"
"<tr><th>" + tr( "Name" ) + "</th>"
"<th>" + tr( "Website" ) + "</th></tr>";
+ tr( "<p>The following individuals and institutions have contributed "
"money to fund QGIS development and other project costs</p>" )
+ "<hr>"
"<table width='100%'>"
"<tr><th>" + tr( "Name" ) + "</th>"
"<th>" + tr( "Website" ) + "</th></tr>";
QString website;
QTextStream donorsStream( &donorsFile );
// Always use UTF-8
@@ -182,7 +182,7 @@ void QgsAbout::init()
QStringList myTokens = sline.split( "|", QString::SkipEmptyParts );
if ( myTokens.size() > 1 )
{
website = "<a href=\"" + myTokens[1].remove(' ') + "\">" + myTokens[1] + "</a>";
website = "<a href=\"" + myTokens[1].remove( ' ' ) + "\">" + myTokens[1] + "</a>";
}
else
{

0 comments on commit 024529e

Please sign in to comment.
You can’t perform that action at this time.