Skip to content

Commit a72d11b

Browse files
author
jef
committed
automatic indentation update (r10594-r10876)
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@10877 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent e00f490 commit a72d11b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+680
-670
lines changed

src/app/attributetable/qgsattributetabledelegate.cpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
#include "qgsattributetabledelegate.h"
2323
#include "qgsvectordataprovider.h"
2424

25-
QWidget * QgsAttributeTableDelegate::createEditor(
26-
QWidget *parent,
27-
const QStyleOptionViewItem &option,
28-
const QModelIndex &index ) const
25+
QWidget * QgsAttributeTableDelegate::createEditor(
26+
QWidget *parent,
27+
const QStyleOptionViewItem &option,
28+
const QModelIndex &index ) const
2929
{
3030
QWidget *editor = QItemDelegate::createEditor( parent, option, index );
3131

@@ -51,9 +51,9 @@ QWidget * QgsAttributeTableDelegate::createEditor(
5151
}
5252

5353

54-
void QgsAttributeTableDelegate::paint( QPainter * painter,
55-
const QStyleOptionViewItem & option,
56-
const QModelIndex & index ) const
54+
void QgsAttributeTableDelegate::paint( QPainter * painter,
55+
const QStyleOptionViewItem & option,
56+
const QModelIndex & index ) const
5757
{
5858
QItemDelegate::paint( painter, option, index );
5959

src/app/attributetable/qgsattributetabledelegate.h

+12-12
Original file line numberDiff line numberDiff line change
@@ -25,22 +25,22 @@ class QPainter;
2525

2626
class QgsAttributeTableDelegate : public QItemDelegate
2727
{
28-
Q_OBJECT;
28+
Q_OBJECT;
2929
public:
3030
/** Constructor */
31-
QgsAttributeTableDelegate( QObject* parent = NULL ) :
32-
QItemDelegate( parent ) {};
33-
/** Used to create an editor for when the user tries to
31+
QgsAttributeTableDelegate( QObject* parent = NULL ) :
32+
QItemDelegate( parent ) {};
33+
/** Used to create an editor for when the user tries to
3434
* change the contents of a cell */
35-
QWidget * createEditor(
36-
QWidget *parent,
37-
const QStyleOptionViewItem &option,
38-
const QModelIndex &index ) const;
35+
QWidget * createEditor(
36+
QWidget *parent,
37+
const QStyleOptionViewItem &option,
38+
const QModelIndex &index ) const;
3939
/** Overloads the paint method form the QItemDelegate bas class */
40-
void paint(
41-
QPainter * painter,
42-
const QStyleOptionViewItem & option,
43-
const QModelIndex & index ) const;
40+
void paint(
41+
QPainter * painter,
42+
const QStyleOptionViewItem & option,
43+
const QModelIndex & index ) const;
4444
};
4545

4646
#endif //QGSATTRIBUTETABLEDELEGATE_H

src/app/attributetable/qgsattributetabledialog.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -425,19 +425,19 @@ void QgsAttributeTableDialog::doSearch( QString searchString )
425425

426426
QApplication::setOverrideCursor( Qt::WaitCursor );
427427
mSelectedFeatures.clear();
428-
428+
429429
if ( cbxSearchSelectedOnly->isChecked() )
430430
{
431431
QgsFeatureList selectedFeatures = mLayer->selectedFeatures();
432-
for (QgsFeatureList::ConstIterator it = selectedFeatures.begin(); it != selectedFeatures.end(); ++it)
432+
for ( QgsFeatureList::ConstIterator it = selectedFeatures.begin(); it != selectedFeatures.end(); ++it )
433433
{
434434
if ( searchTree->checkAgainst( mLayer->pendingFields(), it->attributeMap() ) )
435435
mSelectedFeatures << it->id();
436436

437437
// check if there were errors during evaluating
438438
if ( searchTree->hasError() )
439439
break;
440-
}
440+
}
441441
}
442442
else
443443
{

src/app/attributetable/qgsattributetablememorymodel.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
//QGIS Includes
2525
#include "qgsfeature.h" //QgsAttributeMap
2626
#include "qgsvectorlayer.h" //QgsAttributeList
27-
#include "qgsattributetablemodel.h"
28-
#include "qgsattributetableidcolumnpair.h"
27+
#include "qgsattributetablemodel.h"
28+
#include "qgsattributetableidcolumnpair.h"
2929

3030
class QgsAttributeTableMemoryModel: public QgsAttributeTableModel
3131
{

src/app/attributetable/qgsattributetablemodel.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
//QGIS Includes
2525
#include "qgsfeature.h" //QgsAttributeMap
2626
#include "qgsvectorlayer.h" //QgsAttributeList
27-
#include "qgsattributetableidcolumnpair.h"
27+
#include "qgsattributetableidcolumnpair.h"
2828

2929
class QgsAttributeTableModel: public QAbstractTableModel
3030
{

src/app/attributetable/qgsattributetableview.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class QgsVectorLayer;
2323

2424
class QgsAttributeTableView: public QTableView
2525
{
26-
//private slots:
26+
//private slots:
2727
//void setRows(int rows);
2828

2929
public:

src/app/composer/qgscomposer.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -779,10 +779,10 @@ void QgsComposer::on_mActionSaveAsTemplate_activated( void )
779779

780780
QFileInfo saveFileInfo( saveFileName );
781781
//check if suffix has been added
782-
if(saveFileInfo.suffix().isEmpty())
782+
if ( saveFileInfo.suffix().isEmpty() )
783783
{
784-
QString saveFileNameWithSuffix = saveFileName.append(".qpt");
785-
saveFileInfo = QFileInfo(saveFileNameWithSuffix);
784+
QString saveFileNameWithSuffix = saveFileName.append( ".qpt" );
785+
saveFileInfo = QFileInfo( saveFileNameWithSuffix );
786786
}
787787
settings.setValue( "UI/LastComposerTemplateDir", saveFileInfo.absolutePath() );
788788

src/app/composer/qgscomposermapwidget.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -156,17 +156,17 @@ void QgsComposerMapWidget::on_mSetToMapCanvasExtentButton_clicked()
156156
double currentWidthHeightRatio = currentMapExtent.width() / currentMapExtent.height();
157157
double newWidthHeightRatio = newExtent.width() / newExtent.height();
158158

159-
if(currentWidthHeightRatio < newWidthHeightRatio)
160-
{
159+
if ( currentWidthHeightRatio < newWidthHeightRatio )
160+
{
161161
//enlarge height of new extent
162162
double newHeight = newExtent.width() / currentWidthHeightRatio;
163-
newExtent.setYMinimum(newExtent.yMaximum() - newHeight);
164-
}
165-
else if(currentWidthHeightRatio > newWidthHeightRatio)
163+
newExtent.setYMinimum( newExtent.yMaximum() - newHeight );
164+
}
165+
else if ( currentWidthHeightRatio > newWidthHeightRatio )
166166
{
167167
//enlarge width of new extent
168168
double newWidth = currentWidthHeightRatio * newExtent.height();
169-
newExtent.setXMaximum(newExtent.xMinimum() + newWidth);
169+
newExtent.setXMaximum( newExtent.xMinimum() + newWidth );
170170
}
171171

172172
//fill text into line edits

src/app/qgisapp.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -552,7 +552,7 @@ void QgisApp::createActions()
552552
connect( mActionOpenProject, SIGNAL( triggered() ), this, SLOT( fileOpen() ) );
553553

554554
mActionSaveProject = new QAction( getThemeIcon( "mActionFileSave.png" ), tr( "&Save Project" ), this );
555-
shortcuts->registerAction( mActionSaveProject, tr( "Ctrl+S", "Save Project" ));
555+
shortcuts->registerAction( mActionSaveProject, tr( "Ctrl+S", "Save Project" ) );
556556
mActionSaveProject->setStatusTip( tr( "Save Project" ) );
557557
connect( mActionSaveProject, SIGNAL( triggered() ), this, SLOT( fileSave() ) );
558558

0 commit comments

Comments
 (0)