From 56bba0609e24e4db52d266790298151d2d89a04a Mon Sep 17 00:00:00 2001 From: "Juergen E. Fischer" Date: Wed, 5 Dec 2012 22:14:16 +0100 Subject: [PATCH] remove trailing whitespace --- cmake/FindQextserialport.cmake | 16 ++++++------ .../plugins/db_manager/dlg_export_vector.py | 8 +++--- src/designer/README.txt | 14 +++++----- src/plugins/coordinate_capture/CMakeLists.txt | 8 +++--- src/plugins/coordinate_capture/README | 2 +- src/plugins/globe/CMakeModules/FindOSG.cmake | 2 +- .../globe/CMakeModules/FindOpenThreads.cmake | 26 +++++++++---------- src/plugins/gps_importer/README | 2 +- src/plugins/grass/modules/r.distance.qgm | 2 +- src/plugins/grass/modules/v.in.ogr.all.qgm | 2 +- src/plugins/grass/modules/v.in.ogr.qgis.qgm | 6 ++--- src/plugins/interpolation/CMakeLists.txt | 14 +++++----- .../raster_terrain_analysis/CMakeLists.txt | 12 ++++----- src/plugins/sqlanywhere/CMakeLists.txt | 8 +++--- 14 files changed, 61 insertions(+), 61 deletions(-) diff --git a/cmake/FindQextserialport.cmake b/cmake/FindQextserialport.cmake index 3615b0df8a4..27276552bfc 100644 --- a/cmake/FindQextserialport.cmake +++ b/cmake/FindQextserialport.cmake @@ -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) diff --git a/python/plugins/db_manager/dlg_export_vector.py b/python/plugins/db_manager/dlg_export_vector.py index 86400279e8e..e895ed7c9ba 100644 --- a/python/plugins/db_manager/dlg_export_vector.py +++ b/python/plugins/db_manager/dlg_export_vector.py @@ -8,7 +8,7 @@ Date : Oct 13, 2011 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) ***************************************************************************/ @@ -37,7 +37,7 @@ class DlgExportVector(QDialog, Ui_DlgExportVector): self.inLayer = inLayer self.db = inDb self.setupUi(self) - + # update UI self.setupWorkingMode() self.populateEncodings() @@ -75,7 +75,7 @@ class DlgExportVector(QDialog, Ui_DlgExportVector): 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()) @@ -88,7 +88,7 @@ class DlgExportVector(QDialog, Ui_DlgExportVector): self.cboEncoding.insertItem( 0, enc ) idx = 0 self.cboEncoding.setCurrentIndex( idx ) - + def accept(self): # sanity checks if self.editOutputFile.text() == "": diff --git a/src/designer/README.txt b/src/designer/README.txt index 507decfa364..85444c6979c 100644 --- a/src/designer/README.txt +++ b/src/designer/README.txt @@ -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: @@ -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. diff --git a/src/plugins/coordinate_capture/CMakeLists.txt b/src/plugins/coordinate_capture/CMakeLists.txt index cbc7f8a6d32..cf8ac7b4fdd 100644 --- a/src/plugins/coordinate_capture/CMakeLists.txt +++ b/src/plugins/coordinate_capture/CMakeLists.txt @@ -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}) @@ -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 .. diff --git a/src/plugins/coordinate_capture/README b/src/plugins/coordinate_capture/README index 1ed6b7e8a0d..09bb4e7f83e 100644 --- a/src/plugins/coordinate_capture/README +++ b/src/plugins/coordinate_capture/README @@ -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. diff --git a/src/plugins/globe/CMakeModules/FindOSG.cmake b/src/plugins/globe/CMakeModules/FindOSG.cmake index c792d3bef1d..efc8c7173f1 100644 --- a/src/plugins/globe/CMakeModules/FindOSG.cmake +++ b/src/plugins/globe/CMakeModules/FindOSG.cmake @@ -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 diff --git a/src/plugins/globe/CMakeModules/FindOpenThreads.cmake b/src/plugins/globe/CMakeModules/FindOpenThreads.cmake index ef0e5eb1d85..5c857cbfd22 100644 --- a/src/plugins/globe/CMakeModules/FindOpenThreads.cmake +++ b/src/plugins/globe/CMakeModules/FindOpenThreads.cmake @@ -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 @@ -21,8 +21,8 @@ # #include # 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. @@ -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} @@ -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 @@ -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} @@ -140,7 +140,7 @@ 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 @@ -148,7 +148,7 @@ IF(NOT OPENTHREADS_LIBRARY_DEBUG) 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 @@ -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") diff --git a/src/plugins/gps_importer/README b/src/plugins/gps_importer/README index e794b646a5e..610f278a01f 100644 --- a/src/plugins/gps_importer/README +++ b/src/plugins/gps_importer/README @@ -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. diff --git a/src/plugins/grass/modules/r.distance.qgm b/src/plugins/grass/modules/r.distance.qgm index c0ce9c9f052..c554e957652 100644 --- a/src/plugins/grass/modules/r.distance.qgm +++ b/src/plugins/grass/modules/r.distance.qgm @@ -4,6 +4,6 @@ diff --git a/src/plugins/grass/modules/v.in.ogr.all.qgm b/src/plugins/grass/modules/v.in.ogr.all.qgm index c2f626b01c3..6375fe9ec94 100644 --- a/src/plugins/grass/modules/v.in.ogr.all.qgm +++ b/src/plugins/grass/modules/v.in.ogr.all.qgm @@ -7,7 +7,7 @@