Skip to content
Permalink
Browse files

automatic indentation update (r10065-r10429)

git-svn-id: http://svn.osgeo.org/qgis/trunk@10430 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef
jef committed Mar 27, 2009
1 parent 8688c0e commit 60b6bd6cb73ecf3c471d1dfc22b53e6b3937d535
Showing with 3,803 additions and 3,738 deletions.
  1. +60 −60 src/app/attributetable/BeataDialog.h
  2. +87 −87 src/app/attributetable/BeataModel.h
  3. +72 −72 src/app/attributetable/BeataView.cpp
  4. +12 −12 src/app/attributetable/BeataView.h
  5. +9 −9 src/app/composer/qgscomposer.cpp
  6. +1 −1 src/app/composer/qgscomposerscalebarwidget.cpp
  7. +8 −8 src/app/composer/qgscompositionwidget.cpp
  8. +1 −1 src/app/composer/qgscompositionwidget.h
  9. +1 −1 src/app/legend/qgslegend.cpp
  10. +2 −2 src/app/legend/qgslegendlayerfile.cpp
  11. +2 −1 src/app/main.cpp
  12. +145 −145 src/app/ogr/qgsnewogrconnection.cpp
  13. +51 −51 src/app/ogr/qgsnewogrconnection.h
  14. +103 −103 src/app/ogr/qgsogrhelperfunctions.cpp
  15. +23 −23 src/app/ogr/qgsogrhelperfunctions.h
  16. +500 −500 src/app/ogr/qgsopenvectorlayerdialog.cpp
  17. +94 −94 src/app/ogr/qgsopenvectorlayerdialog.h
  18. +37 −37 src/app/qgisapp.cpp
  19. +6 −6 src/app/qgisapp.h
  20. +4 −4 src/app/qgisappinterface.cpp
  21. +2 −2 src/app/qgisappinterface.h
  22. +1 −1 src/app/qgsoptions.cpp
  23. +47 −47 src/app/qgsserversourceselect.cpp
  24. +4 −4 src/app/qgsserversourceselect.h
  25. +11 −11 src/app/qgsspatialitefilterproxymodel.cpp
  26. +11 −11 src/app/qgsspatialitefilterproxymodel.h
  27. +313 −306 src/app/qgsspatialitesourceselect.cpp
  28. +77 −77 src/app/qgsspatialitesourceselect.h
  29. +145 −131 src/app/qgsspatialitetablemodel.cpp
  30. +29 −29 src/app/qgsspatialitetablemodel.h
  31. +1 −1 src/app/qgsvectorlayerproperties.cpp
  32. +3 −3 src/core/composer/qgscomposeritem.h
  33. +5 −5 src/core/composer/qgscomposition.cpp
  34. +1 −1 src/core/composer/qgscomposition.h
  35. +3 −3 src/core/qgscoordinatereferencesystem.cpp
  36. +2 −2 src/core/qgsgeometry.h
  37. +20 −20 src/core/qgsproviderregistry.cpp
  38. +28 −28 src/core/qgsproviderregistry.h
  39. +9 −9 src/core/qgsvectorlayer.cpp
  40. +20 −20 src/core/raster/qgsrasterlayer.cpp
  41. +2 −2 src/core/spatialindex/qgsspatialindex.cpp
  42. +3 −3 src/core/spatialindex/rtree/RTree.cc
  43. +2 −2 src/gui/qgisinterface.h
  44. +32 −32 src/gui/qgscomposerview.cpp
  45. +4 −4 src/gui/qgscomposerview.h
  46. +13 −13 src/gui/qgsmapcanvas.cpp
  47. +31 −27 src/gui/qgsprojectionselector.cpp
  48. +2 −2 src/plugins/coordinate_capture/coordinatecapture.cpp
  49. +1 −1 src/plugins/coordinate_capture/coordinatecapture.h
  50. +1 −1 src/plugins/copyright_label/plugin.cpp
  51. +1 −1 src/plugins/copyright_label/plugin.h
  52. +1 −1 src/plugins/delimited_text/qgsdelimitedtextplugin.cpp
  53. +1 −1 src/plugins/delimited_text/qgsdelimitedtextplugin.h
  54. +7 −7 src/plugins/delimited_text/qgsdelimitedtextplugingui.cpp
  55. +1 −1 src/plugins/dxf2shp_converter/dxf2shpconverter.cpp
  56. +1 −1 src/plugins/dxf2shp_converter/dxf2shpconverter.h
  57. +4 −4 src/plugins/georeferencer/mapcoordsdialog.cpp
  58. +29 −29 src/plugins/georeferencer/plugin.cpp
  59. +1 −1 src/plugins/georeferencer/plugin.h
  60. +1 −1 src/plugins/georeferencer/qgsgeorefwarpoptionsdialog.cpp
  61. +100 −99 src/plugins/georeferencer/qgsimagewarper.cpp
  62. +13 −13 src/plugins/georeferencer/qgsimagewarper.h
  63. +153 −149 src/plugins/georeferencer/qgspointdialog.cpp
  64. +2 −2 src/plugins/georeferencer/qgspointdialog.h
  65. +1 −1 src/plugins/gps_importer/qgsgpsplugin.cpp
  66. +1 −1 src/plugins/gps_importer/qgsgpsplugin.h
  67. +1 −1 src/plugins/grass/qgsgrassplugin.cpp
  68. +1 −1 src/plugins/grass/qgsgrassplugin.h
  69. +3 −2 src/plugins/grass/qgsgrasstools.cpp
  70. +1 −1 src/plugins/interpolation/qgsinterpolationplugin.cpp
  71. +1 −1 src/plugins/interpolation/qgsinterpolationplugin.h
  72. +2 −2 src/plugins/interpolation/qgsinterpolator.cpp
  73. +1 −1 src/plugins/north_arrow/plugin.cpp
  74. +1 −1 src/plugins/north_arrow/plugin.h
  75. +1 −1 src/plugins/ogr_converter/plugin.cpp
  76. +1 −1 src/plugins/ogr_converter/plugin.h
  77. +1 −1 src/plugins/quick_print/quickprintplugin.cpp
  78. +1 −1 src/plugins/quick_print/quickprintplugin.h
  79. +1 −1 src/plugins/scale_bar/plugin.cpp
  80. +1 −1 src/plugins/scale_bar/plugin.h
  81. +1 −1 src/plugins/spit/qgsspitplugin.cpp
  82. +1 −1 src/plugins/spit/qgsspitplugin.h
  83. +1 −1 src/plugins/wfs/qgswfsplugin.cpp
  84. +1 −1 src/plugins/wfs/qgswfsplugin.h
  85. +1 −1 src/providers/grass/qgsgrass.cpp
  86. +1 −1 src/providers/grass/qgsgrassprovider.cpp
  87. +1 −1 src/providers/memory/qgsmemoryprovider.cpp
  88. +213 −213 src/providers/ogr/qgsogrprovider.cpp
  89. +7 −7 src/providers/ogr/qgsogrprovider.h
  90. +1,026 −993 src/providers/spatialite/qgsspatialiteprovider.cpp
  91. +145 −145 src/providers/spatialite/qgsspatialiteprovider.h
  92. +23 −23 src/providers/wfs/qgswfsdata.cpp
  93. +4 −4 src/providers/wfs/qgswfsdata.h
  94. +1 −1 src/providers/wms/qgswmsprovider.cpp
  95. +2 −2 tests/src/core/testqgsrasterlayer.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
BeataDialog.h
BeataDialog.h
BEtter Attribute TAble
-------------------
date : Feb 2009
@@ -43,65 +43,65 @@ class BeataView;

class BeataDialog : public QDialog, private Ui::BeataDialogGui
{
Q_OBJECT

public:
BeataDialog(QgsVectorLayer *theLayer, QWidget *parent = 0, Qt::WindowFlags flags = Qt::Window);
~BeataDialog();

public slots:
void editingToggled();
private slots:
void submit();
void revert();
void search();
void on_mAdvancedSearchButton_clicked();
void updateSelection();
void updateSelectionFromLayer();
void updateRowSelection(int index);
void updateRowSelection(int first, int last, bool startNewSelection);

void on_cbxShowSelectedOnly_toggled( bool theFlag );
void on_mCopySelectedRowsButton_clicked();
void on_mToggleEditingButton_toggled();
void on_mInvertSelectionButton_clicked();
void on_mRemoveSelectionButton_clicked();
void on_mZoomMapToSelectedRowsButton_clicked();
void on_mSelectedToTopButton_clicked();
void showAdvanced();
void startEditing();

signals:
void editingToggled( QgsMapLayer * );
protected:
void closeEvent( QCloseEvent* event );
private:
void columnBoxInit();
int columnBoxColumnId();
void doSearch(QString searchString);

QIcon getThemeIcon( const QString theName );
QLineEdit *mQuery;
QComboBox *mColumnBox;
QComboBox *mShowBox;
QMenu* mMenuActions;
QAction* mActionToggleEditing;

BeataModel *mModel;
BeataFilterModel *mFilterModel;
QgsVectorLayer *mLayer;
QgsFeatureIds mSelectedFeatures;

QItemSelectionModel* mSelectionModel;
int mLastClickedHeaderIndex;
QDockWidget *mDock;
Q_OBJECT

public:
BeataDialog( QgsVectorLayer *theLayer, QWidget *parent = 0, Qt::WindowFlags flags = Qt::Window );
~BeataDialog();

public slots:
void editingToggled();

private slots:
void submit();
void revert();
void search();
void on_mAdvancedSearchButton_clicked();
void updateSelection();
void updateSelectionFromLayer();
void updateRowSelection( int index );
void updateRowSelection( int first, int last, bool startNewSelection );

void on_cbxShowSelectedOnly_toggled( bool theFlag );
void on_mCopySelectedRowsButton_clicked();

void on_mToggleEditingButton_toggled();
void on_mInvertSelectionButton_clicked();
void on_mRemoveSelectionButton_clicked();
void on_mZoomMapToSelectedRowsButton_clicked();
void on_mSelectedToTopButton_clicked();
void showAdvanced();
void startEditing();

signals:
void editingToggled( QgsMapLayer * );

protected:
void closeEvent( QCloseEvent* event );

private:
void columnBoxInit();
int columnBoxColumnId();
void doSearch( QString searchString );

QIcon getThemeIcon( const QString theName );

QLineEdit *mQuery;
QComboBox *mColumnBox;
QComboBox *mShowBox;

QMenu* mMenuActions;
QAction* mActionToggleEditing;

BeataModel *mModel;
BeataFilterModel *mFilterModel;
QgsVectorLayer *mLayer;
QgsFeatureIds mSelectedFeatures;

QItemSelectionModel* mSelectionModel;
int mLastClickedHeaderIndex;

QDockWidget *mDock;
};

#endif
@@ -1,5 +1,5 @@
/***************************************************************************
BeataModel.h
BeataModel.h
BEtter Attribute TAble
-------------------
date : Feb 2009
@@ -30,112 +30,112 @@

class idColumnPair
{
public:
int id;
QVariant columnItem;
public:
int id;
QVariant columnItem;

bool operator<(const idColumnPair &b) const;
bool operator<( const idColumnPair &b ) const;
};

class BeataFilterModel: public QSortFilterProxyModel
{
public:
BeataFilterModel(QgsVectorLayer* theLayer);
//QModelIndex mapToSource ( const QModelIndex & filterIndex ) const;
//QModelIndex mapFromSource ( const QModelIndex & sourceIndex ) const;
bool mHideUnselected;
virtual void sort(int column, Qt::SortOrder order = Qt::AscendingOrder);
protected:
bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const;
private:
QgsVectorLayer* mLayer;
public:
BeataFilterModel( QgsVectorLayer* theLayer );
//QModelIndex mapToSource ( const QModelIndex & filterIndex ) const;
//QModelIndex mapFromSource ( const QModelIndex & sourceIndex ) const;
bool mHideUnselected;
virtual void sort( int column, Qt::SortOrder order = Qt::AscendingOrder );
protected:
bool filterAcceptsRow( int sourceRow, const QModelIndex &sourceParent ) const;
private:
QgsVectorLayer* mLayer;
};


class BeataModel: public QAbstractTableModel
{
Q_OBJECT

public:
BeataModel(QgsVectorLayer *theLayer, QObject *parent = 0);

int rowCount(const QModelIndex &parent = QModelIndex()) const;
int columnCount(const QModelIndex &parent = QModelIndex()) const;

QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
virtual QVariant data(const QModelIndex &index, int role) const;
virtual bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole);
Qt::ItemFlags flags(const QModelIndex &index) const;

void reload(const QModelIndex &index1, const QModelIndex &index2);
void resetModel();
void changeLayout();
void incomingChangeLayout();
int idToRow(const int id) const;
int rowToId(const int id) const;
virtual void sort(int column, Qt::SortOrder order = Qt::AscendingOrder);
void swapRows(int a, int b);
QgsVectorLayer* layer() const { return mLayer; }

signals:
void modelChanged();
void setNumRows(int oldNum, int newNum);

private slots:
virtual void attributeAdded (int idx);
virtual void attributeDeleted (int idx);
virtual void attributeValueChanged (int fid, int idx, const QVariant &value);
virtual void layerModified(bool onlyGeometry);

protected slots:
virtual void featureDeleted(int fid);
virtual void featureAdded(int fid);
virtual void layerDeleted ();

protected:
QgsVectorLayer *mLayer;
int mFeatureCount;
int mFieldCount;
mutable int mLastRowId;
mutable QgsFeature mFeat;

mutable QgsAttributeMap *mLastRow;
QgsAttributeList mAttributes;

QList<idColumnPair> mSortList;
QMap<int, int> mIdRowMap;
QMap<int, int> mRowIdMap;

void initIdMaps();
virtual void loadLayer();
Q_OBJECT

public:
BeataModel( QgsVectorLayer *theLayer, QObject *parent = 0 );

int rowCount( const QModelIndex &parent = QModelIndex() ) const;
int columnCount( const QModelIndex &parent = QModelIndex() ) const;

QVariant headerData( int section, Qt::Orientation orientation, int role = Qt::DisplayRole ) const;
virtual QVariant data( const QModelIndex &index, int role ) const;
virtual bool setData( const QModelIndex &index, const QVariant &value, int role = Qt::EditRole );
Qt::ItemFlags flags( const QModelIndex &index ) const;

void reload( const QModelIndex &index1, const QModelIndex &index2 );
void resetModel();
void changeLayout();
void incomingChangeLayout();
int idToRow( const int id ) const;
int rowToId( const int id ) const;
virtual void sort( int column, Qt::SortOrder order = Qt::AscendingOrder );
void swapRows( int a, int b );

QgsVectorLayer* layer() const { return mLayer; }

signals:
void modelChanged();
void setNumRows( int oldNum, int newNum );

private slots:
virtual void attributeAdded( int idx );
virtual void attributeDeleted( int idx );
virtual void attributeValueChanged( int fid, int idx, const QVariant &value );
virtual void layerModified( bool onlyGeometry );

protected slots:
virtual void featureDeleted( int fid );
virtual void featureAdded( int fid );
virtual void layerDeleted();

protected:
QgsVectorLayer *mLayer;
int mFeatureCount;
int mFieldCount;
mutable int mLastRowId;
mutable QgsFeature mFeat;

mutable QgsAttributeMap *mLastRow;
QgsAttributeList mAttributes;

QList<idColumnPair> mSortList;
QMap<int, int> mIdRowMap;
QMap<int, int> mRowIdMap;

void initIdMaps();
virtual void loadLayer();

};

class BeataMemModel: public BeataModel
{
Q_OBJECT
Q_OBJECT

public:
BeataMemModel(QgsVectorLayer *theLayer);//, QObject *parent = 0);
public:
BeataMemModel( QgsVectorLayer *theLayer );//, QObject *parent = 0);

protected slots:
virtual void featureDeleted(int fid);
virtual void featureAdded(int fid);
virtual void layerDeleted ();
protected slots:
virtual void featureDeleted( int fid );
virtual void featureAdded( int fid );
virtual void layerDeleted();

private slots:
//virtual void attributeAdded (int idx);
//virtual void attributeDeleted (int idx);
virtual void attributeValueChanged (int fid, int idx, const QVariant &value);
//virtual void layerModified(bool onlyGeometry);
private slots:
//virtual void attributeAdded (int idx);
//virtual void attributeDeleted (int idx);
virtual void attributeValueChanged( int fid, int idx, const QVariant &value );
//virtual void layerModified(bool onlyGeometry);

private:
virtual QVariant data(const QModelIndex &index, int role) const;
virtual bool setData(const QModelIndex &index, const QVariant &value, int role);
virtual void loadLayer();
private:
virtual QVariant data( const QModelIndex &index, int role ) const;
virtual bool setData( const QModelIndex &index, const QVariant &value, int role );
virtual void loadLayer();

QMap<int, QgsFeature> mFeatureMap;
QMap<int, QgsFeature> mFeatureMap;
};

#endif

0 comments on commit 60b6bd6

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