Less CRLF line endings.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@1135 636b058d-ea47-450e-bf9e-a15bfbe3eedb

Former-commit-id: 83328005a983668b00961f069672e97493e42a34

2 files changed, 156 insertions, 156 deletions

diff --git a/src/GudhUI/gui/MenuEdgeContraction.ui b/src/GudhUI/gui/MenuEdgeContraction.ui
index da2e5c82..b1696431 100644
--- a/src/GudhUI/gui/MenuEdgeContraction.ui
+++ b/src/GudhUI/gui/MenuEdgeContraction.ui
@@ -1,118 +1,118 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<ui version="4.0">

- <class>MenuEdgeContraction</class>

- <widget class="QDialog" name="MenuEdgeContraction">

-  <property name="geometry">

-   <rect>

-    <x>0</x>

-    <y>0</y>

-    <width>362</width>

-    <height>209</height>

-   </rect>

-  </property>

-  <property name="windowTitle">

-   <string>Edge contraction</string>

-  </property>

-  <layout class="QGridLayout" name="gridLayout">

-   <item row="5" column="2">

-    <widget class="QSpinBox" name="spinBox_nb_remaining_vertices">

-     <property name="minimum">

-      <number>1</number>

-     </property>

-     <property name="maximum">

-      <number>999999999</number>

-     </property>

-     <property name="value">

-      <number>1</number>

-     </property>

-    </widget>

-   </item>

-   <item row="7" column="2">

-    <widget class="QCheckBox" name="checkBox_link_condition">

-     <property name="enabled">

-      <bool>false</bool>

-     </property>

-     <property name="text">

-      <string>Link condition</string>

-     </property>

-     <property name="checked">

-      <bool>true</bool>

-     </property>

-    </widget>

-   </item>

-   <item row="3" column="2" alignment="Qt::AlignRight">

-    <widget class="QLabel" name="txt_nb_collapses">

-     <property name="text">

-      <string>1</string>

-     </property>

-    </widget>

-   </item>

-   <item row="6" column="0">

-    <widget class="QLabel" name="label">

-     <property name="text">

-      <string>Policy</string>

-     </property>

-    </widget>

-   </item>

-   <item row="6" column="2">

-    <widget class="QComboBox" name="m_simplificationMethod">

-     <item>

-      <property name="text">

-       <string>Length_midpoint</string>

-      </property>

-     </item>

-    </widget>

-   </item>

-   <item row="2" column="2" alignment="Qt::AlignRight">

-    <widget class="QLabel" name="txt_nb_vertices">

-     <property name="text">

-      <string>0</string>

-     </property>

-    </widget>

-   </item>

-   <item row="2" column="0">

-    <widget class="QLabel" name="label_5">

-     <property name="text">

-      <string>Number of vertices</string>

-     </property>

-    </widget>

-   </item>

-   <item row="3" column="0" colspan="2">

-    <widget class="QLabel" name="label_3">

-     <property name="text">

-      <string>Number of contractions</string>

-     </property>

-    </widget>

-   </item>

-   <item row="5" column="0" colspan="2">

-    <widget class="QLabel" name="label_4">

-     <property name="text">

-      <string>Number of vertices after </string>

-     </property>

-    </widget>

-   </item>

-   <item row="1" column="0">

-    <widget class="QSlider" name="horizontalSlider">

-     <property name="minimum">

-      <number>0</number>

-     </property>

-     <property name="maximum">

-      <number>100</number>

-     </property>

-     <property name="orientation">

-      <enum>Qt::Horizontal</enum>

-     </property>

-    </widget>

-   </item>

-   <item row="1" column="2">

-    <widget class="QPushButton" name="pushButton_collapse">

-     <property name="text">

-      <string>Perform collapse</string>

-     </property>

-    </widget>

-   </item>

-  </layout>

- </widget>

- <resources/>

- <connections/>

-</ui>

+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>MenuEdgeContraction</class>
+ <widget class="QDialog" name="MenuEdgeContraction">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>362</width>
+    <height>209</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Edge contraction</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="5" column="2">
+    <widget class="QSpinBox" name="spinBox_nb_remaining_vertices">
+     <property name="minimum">
+      <number>1</number>
+     </property>
+     <property name="maximum">
+      <number>999999999</number>
+     </property>
+     <property name="value">
+      <number>1</number>
+     </property>
+    </widget>
+   </item>
+   <item row="7" column="2">
+    <widget class="QCheckBox" name="checkBox_link_condition">
+     <property name="enabled">
+      <bool>false</bool>
+     </property>
+     <property name="text">
+      <string>Link condition</string>
+     </property>
+     <property name="checked">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="2" alignment="Qt::AlignRight">
+    <widget class="QLabel" name="txt_nb_collapses">
+     <property name="text">
+      <string>1</string>
+     </property>
+    </widget>
+   </item>
+   <item row="6" column="0">
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>Policy</string>
+     </property>
+    </widget>
+   </item>
+   <item row="6" column="2">
+    <widget class="QComboBox" name="m_simplificationMethod">
+     <item>
+      <property name="text">
+       <string>Length_midpoint</string>
+      </property>
+     </item>
+    </widget>
+   </item>
+   <item row="2" column="2" alignment="Qt::AlignRight">
+    <widget class="QLabel" name="txt_nb_vertices">
+     <property name="text">
+      <string>0</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0">
+    <widget class="QLabel" name="label_5">
+     <property name="text">
+      <string>Number of vertices</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0" colspan="2">
+    <widget class="QLabel" name="label_3">
+     <property name="text">
+      <string>Number of contractions</string>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="0" colspan="2">
+    <widget class="QLabel" name="label_4">
+     <property name="text">
+      <string>Number of vertices after </string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="QSlider" name="horizontalSlider">
+     <property name="minimum">
+      <number>0</number>
+     </property>
+     <property name="maximum">
+      <number>100</number>
+     </property>
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="2">
+    <widget class="QPushButton" name="pushButton_collapse">
+     <property name="text">
+      <string>Perform collapse</string>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/GudhUI/gui/gudhui.cpp b/src/GudhUI/gui/gudhui.cpp
index 377cd2f2..276c4a5f 100644
--- a/src/GudhUI/gui/gudhui.cpp
+++ b/src/GudhUI/gui/gudhui.cpp
@@ -1,38 +1,38 @@
-/* This file is part of the Gudhi Library. The Gudhi library 

- *    (Geometric Understanding in Higher Dimensions) is a generic C++ 

- *    library for computational topology.

- *

- *    Author(s):       David Salinas

- *

- *    Copyright (C) 2014  INRIA Sophia Antipolis-Mediterranee (France)

- *

- *    This program is free software: you can redistribute it and/or modify

- *    it under the terms of the GNU General Public License as published by

- *    the Free Software Foundation, either version 3 of the License, or

- *    (at your option) any later version.

- *

- *    This program is distributed in the hope that it will be useful,

- *    but WITHOUT ANY WARRANTY; without even the implied warranty of

- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- *    GNU General Public License for more details.

- *

- *    You should have received a copy of the GNU General Public License

- *    along with this program.  If not, see <http://www.gnu.org/licenses/>.

- * 

- */

-

-#include "MainWindow.h"

-#include <QApplication>

-#include <CGAL/Qt/resources.h>

-

-int main(int argc, char** argv) {

-  QApplication application(argc, argv);

-  application.setOrganizationDomain("inria.fr");

-  application.setOrganizationName("INRIA");

-  application.setApplicationName("GudhUI");

-

-  MainWindow mw;

-  application.setQuitOnLastWindowClosed(false);

-  mw.show();

-  return application.exec();

-}

+/* This file is part of the Gudhi Library. The Gudhi library 
+ *    (Geometric Understanding in Higher Dimensions) is a generic C++ 
+ *    library for computational topology.
+ *
+ *    Author(s):       David Salinas
+ *
+ *    Copyright (C) 2014  INRIA Sophia Antipolis-Mediterranee (France)
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, either version 3 of the License, or
+ *    (at your option) any later version.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ */
+
+#include "MainWindow.h"
+#include <QApplication>
+#include <CGAL/Qt/resources.h>
+
+int main(int argc, char** argv) {
+  QApplication application(argc, argv);
+  application.setOrganizationDomain("inria.fr");
+  application.setOrganizationName("INRIA");
+  application.setApplicationName("GudhUI");
+
+  MainWindow mw;
+  application.setQuitOnLastWindowClosed(false);
+  mw.show();
+  return application.exec();
+}