Merged with trunk and removed unnecessary files

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

Former-commit-id: d0ec52d222d22c102e9fe57590882cd0024c82d5

1 files changed, 36 insertions, 21 deletions

diff --git a/src/GudhUI/gui/Menu_uniform_neighbors.h b/src/GudhUI/gui/Menu_uniform_neighbors.h
index cb90cc88..0b6f65fe 100644
--- a/src/GudhUI/gui/Menu_uniform_neighbors.h
+++ b/src/GudhUI/gui/Menu_uniform_neighbors.h
@@ -1,36 +1,51 @@
-/*
- * Menu_uniform_neighbors.h
+/* This file is part of the Gudhi Library. The Gudhi library 
+ *    (Geometric Understanding in Higher Dimensions) is a generic C++ 
+ *    library for computational topology.
  *
- *  Created on: Sep 11, 2014
- *      Author: dsalinas
+ *    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/>.
+ * 
  */
 
-#ifndef MENU_UNIFORM_NEIGHBORS_H_
-#define MENU_UNIFORM_NEIGHBORS_H_
+#ifndef GUI_MENU_UNIFORM_NEIGHBORS_H_
+#define GUI_MENU_UNIFORM_NEIGHBORS_H_
 
 #include <QMainWindow>
 #include "gui/ui_UniformNeighborsMenu.h"
 
-class Menu_uniform_neighbors : public QDialog,public Ui::UniformMenu {
-	Q_OBJECT
-private:
-	QMainWindow* parent;
-
-public:
+class Menu_uniform_neighbors : public QDialog, public Ui::UniformMenu {
+  Q_OBJECT
 
-	Menu_uniform_neighbors(QMainWindow* parent_);
+ private:
+  QMainWindow* parent;
 
-	void connectActions(QMainWindow* parent);
+ public:
+  Menu_uniform_neighbors(QMainWindow* parent_);
 
-	public slots:
-	void send_compute_uniform_neighbors();
-	void update_alpha(double);
-	void accept();
+  void connectActions(QMainWindow* parent);
 
-	signals:
-	void compute_uniform_neighbors(double alpha);
+ public slots:
+  void send_compute_uniform_neighbors();
+  void update_alpha(double alpha);
+  void accept();
 
+ signals:
+  void compute_uniform_neighbors(double alpha);
 };
 
 
-#endif /* MENU_UNIFORM_NEIGHBORS_H_ */
+#endif  // GUI_MENU_UNIFORM_NEIGHBORS_H_