Skip to content

Commit 56f629f

Browse files
author
timlinux
committedJan 14, 2007
Code cleanups:
- removed long coding style preamble - sorted headers includes alphabetically - removed duplicate includes git-svn-id: http://svn.osgeo.org/qgis/trunk@6431 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent d3b240e commit 56f629f

File tree

1 file changed

+15
-80
lines changed

1 file changed

+15
-80
lines changed
 

‎src/core/raster/qgsrasterlayer.cpp

+15-80
Original file line numberDiff line numberDiff line change
@@ -16,53 +16,18 @@ email : tim at linfiniti.com
1616
***************************************************************************/
1717
/* $Id$ */
1818

19-
/*
20-
Please observe the following variable naming guidelines when editing this class:
21-
---------------------------------------------------------------------------------
22-
In my opinion, clarity of code is more important than brevity, so variables should be
23-
given clear, unambiguous names. Variables names should be written in mixed case, with
24-
a lowercase first letter. Each variable name should include a scope resolution
25-
indicator and a type indicator, in the form:
26-
27-
[scope]+[name]+[type]
28-
29-
Where scope resolution indicators are:
30-
31-
- global vars and class members : [none]
32-
- variables passed as parameters to a function/method: the
33-
- variables declared locally in a method or function: my
34-
35-
For example:
36-
37-
class FooClass {
38-
int fooInt; //class var has no prefix
39-
40-
void FooClass::fooMethod (int theBarInt) //function parameter prefixed by 'the'
41-
{
42-
fooInt=1;
43-
int myLocalInt=0; //function members prefixed by 'my'
44-
myLocalInt=fooInt+theBarInt;
45-
}
46-
}
47-
48-
Using this scope resolution naming scheme makes the origin of each variable unambiguous
49-
and the code easy to read (especially by people who did not write it!).
50-
51-
The [name] part of the variable should be short and descriptive, usually a noun.
52-
53-
The [type] part of the variable should be the type class of the variable written out in full.
54-
55-
56-
DEBUG DIRECTIVES:
57-
58-
When compiling you can make sure DEBUG is defined by including -DDEBUG in the gcc command (e.g. gcc -DDEBUG myprog.c ) if you
59-
wish to see edbug messages printed to stdout.
60-
61-
*/
6219

20+
#include "qgsapplication.h"
6321
#include "qgslogger.h"
64-
#include "qgsrasterlayer.h"
22+
#include "qgsmaplayerregistry.h"
6523
#include "qgsmaptopixel.h"
24+
#include "qgsproviderregistry.h"
25+
#include "qgsrasterbandstats.h"
26+
#include "qgsrasterlayer.h"
27+
#include "qgsrasterpyramid.h"
28+
#include "qgsrasterviewport.h"
29+
#include "qgsrect.h"
30+
#include "qgsspatialrefsys.h"
6631

6732

6833
#include <cstdio>
@@ -72,53 +37,23 @@ email : tim at linfiniti.com
7237

7338
#include <QApplication>
7439
#include <QCursor>
75-
#include <QPainter>
76-
#include <QImage>
77-
#include <QFont>
40+
#include <QDomElement>
41+
#include <QDomNode>
7842
#include <QFile>
7943
#include <QFileInfo>
44+
#include <QFont>
8045
#include <QFontMetrics>
81-
#include <QMatrix>
82-
#include <QMessageBox>
83-
#include <QRegExp>
84-
#include <QSlider>
85-
#include <QLabel>
86-
#include <QDomNode>
87-
#include <QDomElement>
8846
#include <QFrame>
8947
#include <QImage>
9048
#include <QLabel>
9149
#include <QMatrix>
50+
#include <QMessageBox>
51+
#include <QLibrary>
9252
#include <QPainter>
9353
#include <QPixmap>
9454
#include <QRegExp>
55+
#include <QSlider>
9556

96-
/*
97-
*
98-
* New includes that will convert this class to a data provider interface
99-
* (B Morley)
100-
*
101-
*/
102-
103-
#include <QLibrary>
104-
105-
#include "qgsproviderregistry.h"
106-
107-
/*
108-
* END
109-
*/
110-
111-
#include "qgsrasterlayer.h"
112-
113-
#include "qgsapplication.h"
114-
#include "qgslogger.h"
115-
#include "qgsmaplayerregistry.h"
116-
#include "qgsmaptopixel.h"
117-
#include "qgsrasterbandstats.h"
118-
#include "qgsrasterpyramid.h"
119-
#include "qgsrasterviewport.h"
120-
#include "qgsrect.h"
121-
#include "qgsspatialrefsys.h"
12257

12358

12459
// workaround for MSVC compiler which already has defined macro max

0 commit comments

Comments
 (0)
Please sign in to comment.