Skip to content
Permalink
Browse files

automatic indentation update (r10594-r10876)

git-svn-id: http://svn.osgeo.org/qgis/trunk@10877 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef
jef committed Jun 2, 2009
1 parent ebba6f7 commit fd149514cf60a04742b17923465b20040ead8114
Showing with 680 additions and 670 deletions.
  1. +7 −7 src/app/attributetable/qgsattributetabledelegate.cpp
  2. +12 −12 src/app/attributetable/qgsattributetabledelegate.h
  3. +3 −3 src/app/attributetable/qgsattributetabledialog.cpp
  4. +2 −2 src/app/attributetable/qgsattributetablememorymodel.h
  5. +1 −1 src/app/attributetable/qgsattributetablemodel.h
  6. +1 −1 src/app/attributetable/qgsattributetableview.h
  7. +3 −3 src/app/composer/qgscomposer.cpp
  8. +6 −6 src/app/composer/qgscomposermapwidget.cpp
  9. +1 −1 src/app/qgisapp.cpp
  10. +63 −63 src/app/qgsconfigureshortcutsdialog.cpp
  11. +9 −9 src/app/qgsconfigureshortcutsdialog.h
  12. +12 −12 src/app/qgsmaptooldeletepart.cpp
  13. +1 −1 src/app/qgsmaptooldeletepart.h
  14. +12 −12 src/app/qgsmaptooldeletering.cpp
  15. +1 −1 src/app/qgsmaptooldeletering.h
  16. +154 −152 src/app/qgsmaptoolsimplify.cpp
  17. +61 −60 src/app/qgsmaptoolsimplify.h
  18. +1 −1 src/app/qgsnewhttpconnection.cpp
  19. +1 −1 src/app/qgsprojectproperties.cpp
  20. +2 −2 src/app/qgspythondialog.cpp
  21. +4 −4 src/app/qgsrasterlayerproperties.cpp
  22. +52 −52 src/app/qgsserversourceselect.cpp
  23. +1 −1 src/app/qgsserversourceselect.h
  24. +8 −8 src/app/qgsshortcutsmanager.cpp
  25. +20 −20 src/app/qgsshortcutsmanager.h
  26. +2 −2 src/core/composer/qgscomposeritem.h
  27. +1 −1 src/core/qgsdatasourceuri.cpp
  28. +15 −15 src/core/qgsgeometry.cpp
  29. +2 −2 src/core/qgsoverlayobjectpositionmanager.h
  30. +4 −4 src/core/qgspalgeometry.cpp
  31. +13 −13 src/core/qgspalgeometry.h
  32. +10 −10 src/core/qgspalobjectpositionmanager.cpp
  33. +2 −2 src/core/raster/qgscolorrampshader.h
  34. +38 −32 src/plugins/grass/qgsgrassmodule.cpp
  35. +9 −9 src/plugins/grass/qgsgrassmodule.h
  36. +61 −60 src/plugins/grass/qgsgrassshell.cpp
  37. +10 −10 src/plugins/grass/qgsgrassshell.h
  38. +6 −6 src/plugins/grass/qgsgrasstools.cpp
  39. +4 −4 src/plugins/wfs/qgswfssourceselect.cpp
  40. +3 −3 src/providers/grass/qgsgrassprovider.cpp
  41. +53 −53 src/providers/wfs/qgswfsdata.cpp
  42. +5 −5 src/providers/wfs/qgswfsprovider.cpp
  43. +3 −3 src/providers/wms/qgswmsprovider.cpp
  44. +1 −1 src/providers/wms/qgswmsprovider.h
@@ -22,10 +22,10 @@
#include "qgsattributetabledelegate.h"
#include "qgsvectordataprovider.h"

QWidget * QgsAttributeTableDelegate::createEditor(
QWidget *parent,
const QStyleOptionViewItem &option,
const QModelIndex &index ) const
QWidget * QgsAttributeTableDelegate::createEditor(
QWidget *parent,
const QStyleOptionViewItem &option,
const QModelIndex &index ) const
{
QWidget *editor = QItemDelegate::createEditor( parent, option, index );

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


void QgsAttributeTableDelegate::paint( QPainter * painter,
const QStyleOptionViewItem & option,
const QModelIndex & index ) const
void QgsAttributeTableDelegate::paint( QPainter * painter,
const QStyleOptionViewItem & option,
const QModelIndex & index ) const
{
QItemDelegate::paint( painter, option, index );

@@ -25,22 +25,22 @@ class QPainter;

class QgsAttributeTableDelegate : public QItemDelegate
{
Q_OBJECT;
Q_OBJECT;
public:
/** Constructor */
QgsAttributeTableDelegate( QObject* parent = NULL ) :
QItemDelegate( parent ) {};
/** Used to create an editor for when the user tries to
QgsAttributeTableDelegate( QObject* parent = NULL ) :
QItemDelegate( parent ) {};
/** Used to create an editor for when the user tries to
* change the contents of a cell */
QWidget * createEditor(
QWidget *parent,
const QStyleOptionViewItem &option,
const QModelIndex &index ) const;
QWidget * createEditor(
QWidget *parent,
const QStyleOptionViewItem &option,
const QModelIndex &index ) const;
/** Overloads the paint method form the QItemDelegate bas class */
void paint(
QPainter * painter,
const QStyleOptionViewItem & option,
const QModelIndex & index ) const;
void paint(
QPainter * painter,
const QStyleOptionViewItem & option,
const QModelIndex & index ) const;
};

#endif //QGSATTRIBUTETABLEDELEGATE_H
@@ -425,19 +425,19 @@ void QgsAttributeTableDialog::doSearch( QString searchString )

QApplication::setOverrideCursor( Qt::WaitCursor );
mSelectedFeatures.clear();

if ( cbxSearchSelectedOnly->isChecked() )
{
QgsFeatureList selectedFeatures = mLayer->selectedFeatures();
for (QgsFeatureList::ConstIterator it = selectedFeatures.begin(); it != selectedFeatures.end(); ++it)
for ( QgsFeatureList::ConstIterator it = selectedFeatures.begin(); it != selectedFeatures.end(); ++it )
{
if ( searchTree->checkAgainst( mLayer->pendingFields(), it->attributeMap() ) )
mSelectedFeatures << it->id();

// check if there were errors during evaluating
if ( searchTree->hasError() )
break;
}
}
}
else
{
@@ -24,8 +24,8 @@
//QGIS Includes
#include "qgsfeature.h" //QgsAttributeMap
#include "qgsvectorlayer.h" //QgsAttributeList
#include "qgsattributetablemodel.h"
#include "qgsattributetableidcolumnpair.h"
#include "qgsattributetablemodel.h"
#include "qgsattributetableidcolumnpair.h"

class QgsAttributeTableMemoryModel: public QgsAttributeTableModel
{
@@ -24,7 +24,7 @@
//QGIS Includes
#include "qgsfeature.h" //QgsAttributeMap
#include "qgsvectorlayer.h" //QgsAttributeList
#include "qgsattributetableidcolumnpair.h"
#include "qgsattributetableidcolumnpair.h"

class QgsAttributeTableModel: public QAbstractTableModel
{
@@ -23,7 +23,7 @@ class QgsVectorLayer;

class QgsAttributeTableView: public QTableView
{
//private slots:
//private slots:
//void setRows(int rows);

public:
@@ -779,10 +779,10 @@ void QgsComposer::on_mActionSaveAsTemplate_activated( void )

QFileInfo saveFileInfo( saveFileName );
//check if suffix has been added
if(saveFileInfo.suffix().isEmpty())
if ( saveFileInfo.suffix().isEmpty() )
{
QString saveFileNameWithSuffix = saveFileName.append(".qpt");
saveFileInfo = QFileInfo(saveFileNameWithSuffix);
QString saveFileNameWithSuffix = saveFileName.append( ".qpt" );
saveFileInfo = QFileInfo( saveFileNameWithSuffix );
}
settings.setValue( "UI/LastComposerTemplateDir", saveFileInfo.absolutePath() );

@@ -156,17 +156,17 @@ void QgsComposerMapWidget::on_mSetToMapCanvasExtentButton_clicked()
double currentWidthHeightRatio = currentMapExtent.width() / currentMapExtent.height();
double newWidthHeightRatio = newExtent.width() / newExtent.height();

if(currentWidthHeightRatio < newWidthHeightRatio)
{
if ( currentWidthHeightRatio < newWidthHeightRatio )
{
//enlarge height of new extent
double newHeight = newExtent.width() / currentWidthHeightRatio;
newExtent.setYMinimum(newExtent.yMaximum() - newHeight);
}
else if(currentWidthHeightRatio > newWidthHeightRatio)
newExtent.setYMinimum( newExtent.yMaximum() - newHeight );
}
else if ( currentWidthHeightRatio > newWidthHeightRatio )
{
//enlarge width of new extent
double newWidth = currentWidthHeightRatio * newExtent.height();
newExtent.setXMaximum(newExtent.xMinimum() + newWidth);
newExtent.setXMaximum( newExtent.xMinimum() + newWidth );
}

//fill text into line edits
@@ -552,7 +552,7 @@ void QgisApp::createActions()
connect( mActionOpenProject, SIGNAL( triggered() ), this, SLOT( fileOpen() ) );

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

0 comments on commit fd14951

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