Skip to content

Commit

Permalink
indentation update
Browse files Browse the repository at this point in the history
  • Loading branch information
jef-n committed Dec 27, 2011
1 parent 317193e commit c2761d3
Show file tree
Hide file tree
Showing 18 changed files with 68 additions and 68 deletions.
20 changes: 10 additions & 10 deletions src/analysis/interpolation/ParametricLine.cc
Original file line number Diff line number Diff line change
Expand Up @@ -27,62 +27,62 @@ void ParametricLine::calcFirstDer( float t, Vector3D* v )
{
Q_UNUSED( t );
Q_UNUSED( v );
QgsDebugMsg( "warning, derive a class from ParametricLine");
QgsDebugMsg( "warning, derive a class from ParametricLine" );
}

void ParametricLine::calcSecDer( float t, Vector3D* v )
{
Q_UNUSED( t );
Q_UNUSED( v );
QgsDebugMsg( "warning, derive a class from ParametricLine");
QgsDebugMsg( "warning, derive a class from ParametricLine" );
}

void ParametricLine::calcPoint( float t, Point3D *p )
{
Q_UNUSED( t );
Q_UNUSED( p );
QgsDebugMsg( "warning, derive a class from ParametricLine");
QgsDebugMsg( "warning, derive a class from ParametricLine" );
}

ParametricLine* ParametricLine::getParent() const
{
QgsDebugMsg( "warning, derive a class from ParametricLine");
QgsDebugMsg( "warning, derive a class from ParametricLine" );
return 0;
}

void ParametricLine::remove( int i )
{
Q_UNUSED( i );
QgsDebugMsg( "warning, derive a class from ParametricLine");
QgsDebugMsg( "warning, derive a class from ParametricLine" );
}

void ParametricLine::setControlPoly( QVector<Point3D*>* cp )
{
Q_UNUSED( cp );
QgsDebugMsg( "warning, derive a class from ParametricLine");
QgsDebugMsg( "warning, derive a class from ParametricLine" );
}

void ParametricLine::setParent( ParametricLine* paral )
{
Q_UNUSED( paral );
QgsDebugMsg( "warning, derive a class from ParametricLine");
QgsDebugMsg( "warning, derive a class from ParametricLine" );
}

int ParametricLine::getDegree() const
{
QgsDebugMsg( "warning, derive a class from ParametricLine");
QgsDebugMsg( "warning, derive a class from ParametricLine" );
return mDegree;
}

const Point3D* ParametricLine::getControlPoint( int number ) const
{
Q_UNUSED( number );
QgsDebugMsg( "warning, derive a class from ParametricLine");
QgsDebugMsg( "warning, derive a class from ParametricLine" );
return 0;
}

const QVector<Point3D*>* ParametricLine::getControlPoly() const
{
QgsDebugMsg( "warning, derive a class from ParametricLine");
QgsDebugMsg( "warning, derive a class from ParametricLine" );
return 0;
}
8 changes: 4 additions & 4 deletions src/app/legend/qgslegend.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -256,10 +256,10 @@ void QgsLegend::removeLayer( QString layerId )

if ( ll && ll->layer() && ll->layer()->id() == layerId )
{
if( !ll->isVisible() )
{
if ( !ll->isVisible() )
{
invLayerRemoved = true;
}
}
removeItem( ll );
delete ll;
break;
Expand All @@ -269,7 +269,7 @@ void QgsLegend::removeLayer( QString layerId )
updateMapCanvasLayerSet();
adjustIconSize();

if( invLayerRemoved )
if ( invLayerRemoved )
emit invisibleLayerRemoved();
}

Expand Down
4 changes: 2 additions & 2 deletions src/app/qgslabelinggui.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ QgsLabelingGui::QgsLabelingGui( QgsPalLabeling* lbl, QgsVectorLayer* layer, QgsM
chkLineAbove->setChecked( lyr.placementFlags & QgsPalLayerSettings::AboveLine );
chkLineBelow->setChecked( lyr.placementFlags & QgsPalLayerSettings::BelowLine );
chkLineOn->setChecked( lyr.placementFlags & QgsPalLayerSettings::OnLine );
if ( ! ( lyr.placementFlags & QgsPalLayerSettings::MapOrientation ) )
if ( !( lyr.placementFlags & QgsPalLayerSettings::MapOrientation ) )
chkLineOrientationDependent->setChecked( true );
}

Expand Down Expand Up @@ -519,7 +519,7 @@ void QgsLabelingGui::updateUi()
spinDecimals->setEnabled( chkFormattedNumbers->isChecked() );

bool offline = chkLineAbove->isChecked() || chkLineBelow->isChecked();
offlineOptions->setEnabled ( offline );
offlineOptions->setEnabled( offline );
}

void QgsLabelingGui::changeBufferColor()
Expand Down
4 changes: 2 additions & 2 deletions src/core/composer/qgscomposermap.h
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@ class CORE_EXPORT QgsComposerMap : public QgsComposerItem
@param extent map extent
@param size size in scene coordinates
@param dpi scene dpi
@param forceWidthScale force wysiwyg line widths / marker sizes
*/
@param forceWidthScale force wysiwyg line widths / marker sizes
*/
void draw( QPainter *painter, const QgsRectangle& extent, const QSizeF& size, double dpi, double* forceWidthScale = 0 );

/** \brief Reimplementation of QCanvasItem::paint - draw on canvas */
Expand Down
16 changes: 8 additions & 8 deletions src/core/qgsapplication.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -505,14 +505,14 @@ void QgsApplication::exitQgis()
QString QgsApplication::showSettings()
{
QString myState = tr( "Application state:\n"
"Prefix:\t\t%1\n"
"Plugin Path:\t\t%2\n"
"Package Data Path:\t%3\n"
"Active Theme Name:\t%4\n"
"Active Theme Path:\t%5\n"
"Default Theme Path:\t%6\n"
"SVG Search Paths:\t%7\n"
"User DB Path:\t%8\n" )
"Prefix:\t\t%1\n"
"Plugin Path:\t\t%2\n"
"Package Data Path:\t%3\n"
"Active Theme Name:\t%4\n"
"Active Theme Path:\t%5\n"
"Default Theme Path:\t%6\n"
"SVG Search Paths:\t%7\n"
"User DB Path:\t%8\n" )
.arg( mPrefixPath )
.arg( mPluginPath )
.arg( mPkgDataPath )
Expand Down
4 changes: 2 additions & 2 deletions src/core/qgsapplication.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ class CORE_EXPORT QgsApplication: public QApplication
virtual ~QgsApplication();

/** This method initialises paths etc for QGIS. Called by the ctor or call it manually
when your app does not extend the QApplication class.
@note you will probably want to call initQgis too to load the providers in
when your app does not extend the QApplication class.
@note you will probably want to call initQgis too to load the providers in
the above case.
*/
static void init( QString customConfigPath = QString() );
Expand Down
16 changes: 8 additions & 8 deletions src/core/qgscoordinatetransform.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -392,20 +392,20 @@ void QgsCoordinateTransform::transformInPlace( std::vector<float>& x,
std::vector<double> xd( x.size() );
std::vector<double> yd( y.size() );
std::vector<double> zd( z.size() );
for( int i = 0; i < vectorSize; ++i )
for ( int i = 0; i < vectorSize; ++i )
{
xd[i] = x[i];
yd[i] = y[i];
zd[i] = z[i];
xd[i] = x[i];
yd[i] = y[i];
zd[i] = z[i];
}
transformCoords( x.size(), &xd[0], &yd[0], &zd[0], direction );

//copy back
for( int i = 0; i < vectorSize; ++i )
for ( int i = 0; i < vectorSize; ++i )
{
x[i] = xd[i];
y[i] = yd[i];
z[i] = zd[i];
x[i] = xd[i];
y[i] = yd[i];
z[i] = zd[i];
}
}
catch ( QgsCsException &cse )
Expand Down
2 changes: 1 addition & 1 deletion src/core/qgsmaptopixel.h
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ class CORE_EXPORT QgsMapToPixel
#ifdef ANDROID
void transformInPlace( float& x, float& y ) const;
void transformInPlace( std::vector<float>& x,
std::vector<float>& y ) const;
std::vector<float>& y ) const;
#endif

QgsPoint toMapCoordinates( int x, int y ) const;
Expand Down
6 changes: 3 additions & 3 deletions src/core/qgsmessagelog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@

class QgsMessageLogConsole;

void (*QgsMessageLog::gmLogger)( QString message, QString tag, int level ) = 0;
void ( *QgsMessageLog::gmLogger )( QString message, QString tag, int level ) = 0;

void QgsMessageLog::setLogger( void (*f)( QString message, QString tag, int level ) )
void QgsMessageLog::setLogger( void ( *f )( QString message, QString tag, int level ) )
{
gmLogger = f;
}
Expand All @@ -31,7 +31,7 @@ void QgsMessageLog::logMessage( QString message, QString tag, int level )
{
QgsDebugMsg( QString( "%1 %2[%3] %4" ).arg( QDateTime::currentDateTime().toString( Qt::ISODate ) ).arg( tag ).arg( level ).arg( message ) );

if( !gmLogger )
if ( !gmLogger )
QgsMessageLogConsole::logger( message, tag, level );
else
gmLogger( message, tag, level );
Expand Down
4 changes: 2 additions & 2 deletions src/core/qgsmessagelog.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ class CORE_EXPORT QgsMessageLog
static void logMessage( QString message, QString tag = QString::null, int level = 0 );

//! set log message
static void setLogger( void (*logger)( QString message, QString tag, int level ) );
static void setLogger( void ( *logger )( QString message, QString tag, int level ) );

private:
//! function
static void (*gmLogger)( QString message, QString tag, int level );
static void ( *gmLogger )( QString message, QString tag, int level );
};


Expand Down
6 changes: 3 additions & 3 deletions src/core/raster/qgsrasterlayer.h
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,7 @@ class CORE_EXPORT QgsRasterLayer : public QgsMapLayer
/** \brief Accessor for transparent band name mapping */
QString transparentBandName() const { return mTransparencyBandName; }

/** \brief [ data provider interface ] Does this layer use a provider for setting/retrieving data?
/** \brief [ data provider interface ] Does this layer use a provider for setting/retrieving data?
* @deprecated in 2.0
*/
Q_DECL_DEPRECATED bool usesProvider();
Expand Down Expand Up @@ -548,12 +548,12 @@ class CORE_EXPORT QgsRasterLayer : public QgsMapLayer
/** \brief Get an 100x100 pixmap of the color palette. If the layer has no palette a white pixmap will be returned */
QPixmap paletteAsPixmap( int theBandNumber = 1 );

/** \brief [ data provider interface ] Which provider is being used for this Raster Layer?
/** \brief [ data provider interface ] Which provider is being used for this Raster Layer?
* @note added in 2.0
*/
QString providerType() const;

/** \brief [ data provider interface ] Which provider is being used for this Raster Layer?
/** \brief [ data provider interface ] Which provider is being used for this Raster Layer?
* @deprecated use providerType()
*/
Q_DECL_DEPRECATED QString providerKey() const { return providerType(); }
Expand Down
20 changes: 10 additions & 10 deletions src/core/symbology-ng/qgsrendererv2.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@ unsigned char* QgsFeatureRendererV2::_getLineString( QPolygonF& pts, QgsRenderCo

bool hasZValue = ( wkbType == QGis::WKBLineString25D );
double x, y;
#ifdef ANDROID
qreal z;
#else
double z;
#endif //ANDROID
#ifdef ANDROID
qreal z;
#else
double z;
#endif //ANDROID
const QgsCoordinateTransform* ct = context.coordinateTransform();
const QgsMapToPixel& mtp = context.mapToPixel();

Expand Down Expand Up @@ -120,11 +120,11 @@ unsigned char* QgsFeatureRendererV2::_getPolygon( QPolygonF& pts, QList<QPolygon

const QgsCoordinateTransform* ct = context.coordinateTransform();
const QgsMapToPixel& mtp = context.mapToPixel();
#ifdef ANDROID
qreal z = 0; // dummy variable for coordiante transform
#else
double z = 0; // dummy variable for coordiante transform
#endif
#ifdef ANDROID
qreal z = 0; // dummy variable for coordiante transform
#else
double z = 0; // dummy variable for coordiante transform
#endif
const QgsRectangle& e = context.extent();
double cw = e.width() / 10; double ch = e.height() / 10;
QgsRectangle clipRect( e.xMinimum() - cw, e.yMinimum() - ch, e.xMaximum() + cw, e.yMaximum() + ch );
Expand Down
4 changes: 2 additions & 2 deletions src/gui/attributetable/qgsattributetablememorymodel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ void QgsAttributeTableMemoryModel::loadLayer()

mLayer->select( mLayer->pendingAllAttributesList(), rect, false );

if( behaviour != 1 )
if ( behaviour != 1 )
mFeatureMap.reserve( mLayer->pendingFeatureCount() + 50 );
else
mFeatureMap.reserve( mLayer->selectedFeatureCount() );
Expand All @@ -59,7 +59,7 @@ void QgsAttributeTableMemoryModel::loadLayer()
QgsFeature f;
while ( mLayer->nextFeature( f ) )
{
if( behaviour == 1 && !mLayer->selectedFeaturesIds().contains( f.id() ) )
if ( behaviour == 1 && !mLayer->selectedFeaturesIds().contains( f.id() ) )
continue;

mIdRowMap.insert( f.id(), n );
Expand Down
2 changes: 1 addition & 1 deletion src/gui/qgsattributeeditor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -765,7 +765,7 @@ bool QgsAttributeEditor::setValue( QWidget *editor, QgsVectorLayer *vl, int idx,
case QgsVectorLayer::Calendar:
{
QLineEdit* le = qobject_cast<QLineEdit*>( editor );
if( !le )
if ( !le )
{
le = editor->findChild<QLineEdit *>();
}
Expand Down
4 changes: 2 additions & 2 deletions src/gui/qgsdetaileditemdelegate.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -293,8 +293,8 @@ int QgsDetailedItemDelegate::height( const QStyleOptionViewItem & theOption,
myHeight += myCategoryMetrics.height() + verticalSpacing();
// if category should be wrapped use this code
//~ myList = wordWrap( theData.category(),
//~ myCategoryMetrics,
//~ theOption.rect.width() - ( mpCheckBox->width() + horizontalSpacing() ) );
//~ myCategoryMetrics,
//~ theOption.rect.width() - ( mpCheckBox->width() + horizontalSpacing() ) );
//~ myHeight += ( myList.count() + 1 ) * ( myCategoryMetrics.height() - verticalSpacing() );
return myHeight;
}
Expand Down
6 changes: 3 additions & 3 deletions src/gui/qgsmapcanvas.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,9 @@ QgsMapCanvas::QgsMapCanvas( QWidget * parent, const char *name )
//disable the update that leads to the resize crash
if ( viewport() )
{
#ifndef ANDROID
viewport()->setAttribute( Qt::WA_PaintOnScreen, true );
#endif //ANDROID
#ifndef ANDROID
viewport()->setAttribute( Qt::WA_PaintOnScreen, true );
#endif //ANDROID
}

mScene = new QGraphicsScene();
Expand Down
2 changes: 1 addition & 1 deletion src/gui/qgsprojectionselector.h
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ class GUI_EXPORT QgsProjectionSelector: public QWidget, private Ui::QgsProjectio
void setOgcWmsCrsFilter( QSet<QString> crsFilter );
void on_lstRecent_currentItemChanged( QTreeWidgetItem *, QTreeWidgetItem * );
void on_cbxHideDeprecated_stateChanged();
void on_leSearch_textChanged(const QString &);
void on_leSearch_textChanged( const QString & );

protected:
/** Used to ensure the projection list view is actually populated */
Expand Down
8 changes: 4 additions & 4 deletions src/plugins/gps_importer/qgsgpsdevicedialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
#include <QSettings>


QgsGPSDeviceDialog::QgsGPSDeviceDialog( std::map<QString,
QgsGPSDevice*>& devices )
: QDialog( 0, QgisGui::ModalDialogFlags )
, mDevices( devices )
QgsGPSDeviceDialog::QgsGPSDeviceDialog( std::map < QString,
QgsGPSDevice* > & devices )
: QDialog( 0, QgisGui::ModalDialogFlags )
, mDevices( devices )
{
setupUi( this );
setAttribute( Qt::WA_DeleteOnClose );
Expand Down

0 comments on commit c2761d3

Please sign in to comment.