Skip to content

Commit

Permalink
remove trailing whitespace
Browse files Browse the repository at this point in the history
  • Loading branch information
jef-n committed Dec 5, 2012
1 parent 75ac364 commit 56bba06
Show file tree
Hide file tree
Showing 14 changed files with 61 additions and 61 deletions.
16 changes: 8 additions & 8 deletions cmake/FindQextserialport.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +5,27 @@
# Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
#
# Once run this will define:
#
# Once run this will define:
#
# QEXTSERIALPORT_FOUND = system has Qextserialport lib
# QEXTSERIALPORT_LIBRARY = full path to the Qextserialport library
# QEXTSERIALPORT_INCLUDE_DIR = where to find headers
# QEXTSERIALPORT_INCLUDE_DIR = where to find headers
#


FIND_PATH(QEXTSERIALPORT_INCLUDE_DIR NAMES qextserialport.h PATHS
/usr/include
/usr/local/include
"$ENV{LIB_DIR}/include"
"$ENV{INCLUDE}"
"$ENV{LIB_DIR}/include"
"$ENV{INCLUDE}"
PATH_SUFFIXES QtExtSerialPort
)

FIND_LIBRARY(QEXTSERIALPORT_LIBRARY NAMES qextserialport-1.2 PATHS
FIND_LIBRARY(QEXTSERIALPORT_LIBRARY NAMES qextserialport-1.2 PATHS
/usr/lib
/usr/local/lib
"$ENV{LIB_DIR}/lib"
"$ENV{LIB}/lib"
"$ENV{LIB_DIR}/lib"
"$ENV{LIB}/lib"
)

IF (QEXTSERIALPORT_INCLUDE_DIR AND QEXTSERIALPORT_LIBRARY)
Expand Down
8 changes: 4 additions & 4 deletions python/plugins/db_manager/dlg_export_vector.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
copyright : (C) 2011 by Giuseppe Sucameli
email : brush.tyler@gmail.com
The content of this file is based on
The content of this file is based on
- PG_Manager by Martin Dobias (GPLv2 license)
***************************************************************************/
Expand Down Expand Up @@ -37,7 +37,7 @@ def __init__(self, inLayer, inDb, parent=None):
self.inLayer = inLayer
self.db = inDb
self.setupUi(self)

# update UI
self.setupWorkingMode()
self.populateEncodings()
Expand Down Expand Up @@ -75,7 +75,7 @@ def chooseOutputFile(self):
settings.setValue("/db_manager/lastUsedDir", QFileInfo(filename).filePath())

self.editOutputFile.setText( filename )

def populateEncodings(self):
# populate the combo with supported encodings
self.cboEncoding.addItems(qgis.core.QgsVectorDataProvider.availableEncodings())
Expand All @@ -88,7 +88,7 @@ def populateEncodings(self):
self.cboEncoding.insertItem( 0, enc )
idx = 0
self.cboEncoding.setCurrentIndex( idx )

def accept(self):
# sanity checks
if self.editOutputFile.text() == "":
Expand Down
14 changes: 7 additions & 7 deletions src/designer/README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ Introduction:

The purpose of the QGIS designer plugins is to enable all third
party developers to create GIS enabled Qt4 based applications
with minimal programming. The idea being that you use the
with minimal programming. The idea being that you use the
standard Qt4 Designer GUI design tool to create your user
interface and then add map canvas, legend, projection selector
etc. type of widgets from the toolbox of widgets in designer
- with QGIS having added its own group of custome widgets there.
The QGIS custom widgets can then be graphically 'programmed' by
setting widget properties and using interactive signal/slot
setting widget properties and using interactive signal/slot
connectors.

Plugin Paths:
Expand All @@ -22,25 +22,25 @@ There are two options for having Qt4 Designer find your
plugins at startup:

1) copy the plugin from {QGIS Install Prefix}/lib/qgis/designer
into the standard Qt4 designer plugin directory at
into the standard Qt4 designer plugin directory at
$QTDIR/plugins/designer/

2) export the environment variable QT_PLUGIN_PATH with all the
places designer should look for your plugins in. Separate
each entry with a colon. So for example:

export QT_PLUGIN_PATH={QGIS Install Prefix}/lib/qgis

Note that the 'designer' directory is omitted from the path.

Its probably a good idea to add the above export clause to
your ~/.bash_profile or ~/.bashrc if you plan to use the
Its probably a good idea to add the above export clause to
your ~/.bash_profile or ~/.bashrc if you plan to use the
designer plugins frequently.


Additional Notes:

If you built Qt4 in debug mode then the designer plugins must also
If you built Qt4 in debug mode then the designer plugins must also
be built in debug mode or they will be ignored. The converse is also
true.

8 changes: 4 additions & 4 deletions src/plugins/coordinate_capture/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ SET (coordinatecapture_RCCS coordinatecapture.qrc)
########################################################
# Build

QT4_WRAP_UI (coordinatecapture_UIS_H ${coordinatecapture_UIS})
QT4_WRAP_UI (coordinatecapture_UIS_H ${coordinatecapture_UIS})

QT4_WRAP_CPP (coordinatecapture_MOC_SRCS ${coordinatecapture_MOC_HDRS})

Expand All @@ -30,9 +30,9 @@ ADD_LIBRARY (coordinatecaptureplugin MODULE ${coordinatecapture_SRCS} ${coordina
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}/../../ui/
../../core
../../core/raster
../../core/renderer
../../core
../../core/raster
../../core/renderer
../../core/symbology
../../gui
..
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/coordinate_capture/README
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ Coordinate Capture Plugin for Quantum GIS

Tim Sutton 2008

A simple plugin that allows you to copy the
A simple plugin that allows you to copy the
coordinates of mouse clicks to the clipboard.
2 changes: 1 addition & 1 deletion src/plugins/globe/CMakeModules/FindOSG.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# directory, and source directory, respectively
# OSGDIR or OSG_SOURCE_DIR: osg source directory, typically OpenSceneGraph
# OSG_DIR or OSG_BUILD_DIR: osg build directory, place in which you've
# built osg via cmake
# built osg via cmake

# Header files are presumed to be included like
# #include <osg/PositionAttitudeTransform>
Expand Down
26 changes: 13 additions & 13 deletions src/plugins/globe/CMakeModules/FindOpenThreads.cmake
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# OpenThreads is a C++ based threading library. Its largest userbase
# OpenThreads is a C++ based threading library. Its largest userbase
# seems to OpenSceneGraph so you might notice I accept OSGDIR as an
# environment path.
# I consider this part of the Findosg* suite used to find OpenSceneGraph
# I consider this part of the Findosg* suite used to find OpenSceneGraph
# components.
# Each component is separate and you must opt in to each module.
#
#
# Locate OpenThreads
# This module defines
# OPENTHREADS_LIBRARY
Expand All @@ -21,8 +21,8 @@
# #include <OpenThreads/Thread>

# To make it easier for one-step automated configuration/builds,
# we leverage environmental paths. This is preferable
# to the -DVAR=value switches because it insulates the
# we leverage environmental paths. This is preferable
# to the -DVAR=value switches because it insulates the
# users from changes we may make in this script.
# It also offers a little more flexibility than setting
# the CMAKE_*_PATH since we can target specific components.
Expand Down Expand Up @@ -75,7 +75,7 @@ IF(NOT OPENTHREADS_INCLUDE_DIR)
ENDIF(NOT OPENTHREADS_INCLUDE_DIR)


FIND_LIBRARY(OPENTHREADS_LIBRARY
FIND_LIBRARY(OPENTHREADS_LIBRARY
NAMES OpenThreads OpenThreadsWin32
PATHS
$ENV{OPENTHREADS_LIBRARY_DIR}
Expand All @@ -90,15 +90,15 @@ FIND_LIBRARY(OPENTHREADS_LIBRARY
)

IF(NOT OPENTHREADS_LIBRARY)
FIND_LIBRARY(OPENTHREADS_LIBRARY
NAMES OpenThreads OpenThreadsWin32
FIND_LIBRARY(OPENTHREADS_LIBRARY
NAMES OpenThreads OpenThreadsWin32
PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
PATH_SUFFIXES lib64 lib
)
ENDIF(NOT OPENTHREADS_LIBRARY)

IF(NOT OPENTHREADS_LIBRARY)
FIND_LIBRARY(OPENTHREADS_LIBRARY
FIND_LIBRARY(OPENTHREADS_LIBRARY
NAMES OpenThreads OpenThreadsWin32
PATHS
~/Library/Frameworks
Expand All @@ -121,7 +121,7 @@ IF(NOT OPENTHREADS_LIBRARY)
ENDIF(NOT OPENTHREADS_LIBRARY)


FIND_LIBRARY(OPENTHREADS_LIBRARY_DEBUG
FIND_LIBRARY(OPENTHREADS_LIBRARY_DEBUG
NAMES OpenThreadsd OpenThreadsWin32d
PATHS
$ENV{OPENTHREADS_DEBUG_LIBRARY_DIR}
Expand All @@ -140,15 +140,15 @@ FIND_LIBRARY(OPENTHREADS_LIBRARY_DEBUG
)

IF(NOT OPENTHREADS_LIBRARY_DEBUG)
FIND_LIBRARY(OPENTHREADS_LIBRARY_DEBUG
FIND_LIBRARY(OPENTHREADS_LIBRARY_DEBUG
NAMES OpenThreadsd OpenThreadsWin32d
PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
PATH_SUFFIXES lib64 lib
)
ENDIF(NOT OPENTHREADS_LIBRARY_DEBUG)

IF(NOT OPENTHREADS_LIBRARY_DEBUG)
FIND_LIBRARY(OPENTHREADS_LIBRARY_DEBUG
FIND_LIBRARY(OPENTHREADS_LIBRARY_DEBUG
NAMES OpenThreadsd OpenThreadsWin32d
PATHS
/usr/local/lib64
Expand Down Expand Up @@ -176,7 +176,7 @@ IF(OPENTHREADS_LIBRARY)
SET(OPENTHREADS_LIBRARY_DEBUG "${OPENTHREADS_LIBRARY}" CACHE FILEPATH "Debug version of OpenThreads Library (use regular version if not available)" FORCE)
ENDIF(NOT OPENTHREADS_LIBRARY_DEBUG)
ENDIF(OPENTHREADS_LIBRARY)

SET(OPENTHREADS_FOUND "NO")
IF(OPENTHREADS_INCLUDE_DIR AND OPENTHREADS_LIBRARY)
SET(OPENTHREADS_FOUND "YES")
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/gps_importer/README
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
##############################################

Please do not edit the files in this directory
unless you know exactly what you are doing -
unless you know exactly what you are doing -
these files are used as the basis for creating
new plugins. Altering these files may break
the automated plugin template generation process.
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/grass/modules/r.distance.qgm
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
<qgisgrassmodule label="Locate the closest points between objects in two raster maps" module="r.distance">
<option key="maps" option="map1"/>
<option key="maps" option="map2"/>
<option key="fs" advanced="yes"/>
<option key="fs" advanced="yes"/>
</qgisgrassmodule>

2 changes: 1 addition & 1 deletion src/plugins/grass/modules/v.in.ogr.all.qgm
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<option key="type" advanced="yes"/>
<flag key="z" answer="off" hidden="no" advanced="yes"/>
<flag key="e" answer="off" hidden="no" advanced="yes"/>
<option key="snap" advanced="yes" />
<option key="snap" advanced="yes" />
<option key="min_area" advanced="yes" />
<flag key="o" answer="on" advanced="yes" />
</qgisgrassmodule>
6 changes: 3 additions & 3 deletions src/plugins/grass/modules/v.in.ogr.qgis.qgm
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Import loaded vector" module="v.in.ogr">
<ogr key="dsn" layeroption="layer" whereoption="where" label="Loaded layer" />
<option key="output" />
<qgisgrassmodule label="Import loaded vector" module="v.in.ogr">
<ogr key="dsn" layeroption="layer" whereoption="where" label="Loaded layer" />
<option key="output" />
<option key="type" advanced="yes"/>
<flag key="z" answer="off" hidden="no" advanced="yes" />
<flag key="e" answer="off" hidden="no" advanced="yes" />
Expand Down
14 changes: 7 additions & 7 deletions src/plugins/interpolation/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ SET (INTERPOLATION_SRCS
qgstininterpolatordialog.cpp
)

SET (INTERPOLATION_UIS
SET (INTERPOLATION_UIS
qgsidwinterpolatordialogbase.ui
qgsinterpolationdialogbase.ui
qgstininterpolatordialogbase.ui
Expand All @@ -32,19 +32,19 @@ QT4_WRAP_CPP (INTERPOLATION_MOC_SRCS ${INTERPOLATION_MOC_HDRS})

QT4_ADD_RESOURCES(INTERPOLATION_RCC_SRCS ${INTERPOLATION_RCCS})

ADD_LIBRARY (interpolationplugin MODULE
ADD_LIBRARY (interpolationplugin MODULE
${INTERPOLATION_SRCS}
${INTERPOLATION_MOC_SRCS}
${INTERPOLATION_RCC_SRCS}
${INTERPOLATION_MOC_SRCS}
${INTERPOLATION_RCC_SRCS}
${INTERPOLATION_UIS_H})

INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_BINARY_DIR}
${GEOS_INCLUDE_DIR}
../../analysis/interpolation
../../core
../../core/raster
../../core/renderer
../../core
../../core/raster
../../core/renderer
../../core/symbology
../../gui
..
Expand Down
12 changes: 6 additions & 6 deletions src/plugins/raster_terrain_analysis/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ SET (RASTER_TERRAIN_SRCS
qgsrasterterrainanalysisdialog.cpp
)

SET (RASTER_TERRAIN_UIS
SET (RASTER_TERRAIN_UIS
qgsrasterterrainanalysisdialogbase.ui
)

Expand All @@ -25,17 +25,17 @@ QT4_WRAP_CPP (RASTER_TERRAIN_MOC_SRCS ${RASTER_TERRAIN_MOC_HDRS})

QT4_ADD_RESOURCES(RASTER_TERRAIN_RCC_SRCS ${RASTER_TERRAIN_RCCS})

ADD_LIBRARY (rasterterrainplugin MODULE
ADD_LIBRARY (rasterterrainplugin MODULE
${RASTER_TERRAIN_SRCS}
${RASTER_TERRAIN_MOC_SRCS}
${RASTER_TERRAIN_RCC_SRCS}
${RASTER_TERRAIN_MOC_SRCS}
${RASTER_TERRAIN_RCC_SRCS}
${RASTER_TERRAIN_UIS_H})

INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_BINARY_DIR}
${GDAL_INCLUDE_DIR}
../../core
../../core/raster
../../core
../../core/raster
../../gui
../../analysis/raster
..
Expand Down
8 changes: 4 additions & 4 deletions src/plugins/sqlanywhere/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ SET (sqlanywhere_SRCS
sadbtablemodel.cpp
)

SET (sqlanywhere_UIS
SET (sqlanywhere_UIS
sanewconnectionbase.ui
sasourceselectbase.ui
)
Expand Down Expand Up @@ -48,9 +48,9 @@ INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}/../../ui
../../core
../../core/raster
../../core/renderer
../../core
../../core/raster
../../core/renderer
../../core/symbology
../../gui
../../app
Expand Down

0 comments on commit 56bba06

Please sign in to comment.