Backmerge from trunk

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

Former-commit-id: 3f1b56bf4986df7bb2938ea2fff944eb9bf9b653

1 files changed, 35 insertions, 23 deletions

diff --git a/src/GudhUI/gui/Menu_k_nearest_neighbors.h b/src/GudhUI/gui/Menu_k_nearest_neighbors.h
index d72b0074..8088b768 100644
--- a/src/GudhUI/gui/Menu_k_nearest_neighbors.h
+++ b/src/GudhUI/gui/Menu_k_nearest_neighbors.h
@@ -1,39 +1,51 @@
-/*
- * Menu_k_nearest_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_K_NEAREST_NEIGHBORS_H_
-#define MENU_K_NEAREST_NEIGHBORS_H_
+#ifndef GUI_MENU_K_NEAREST_NEIGHBORS_H_
+#define GUI_MENU_K_NEAREST_NEIGHBORS_H_
 
 #include <QMainWindow>
 #include "gui/ui_KNearestNeighborsMenu.h"
 
 class QWidget;
 
+class Menu_k_nearest_neighbors : public QDialog, public Ui::KNearestNeighborsMenu {
+  Q_OBJECT
 
-class Menu_k_nearest_neighbors : public QDialog,public Ui::KNearestNeighborsMenu{
-	Q_OBJECT
-private:
-	QMainWindow* parent;
+ private:
+  QMainWindow* parent;
 
-public:
+ public:
+  Menu_k_nearest_neighbors(QMainWindow* parent_);
 
-	Menu_k_nearest_neighbors(QMainWindow* parent_);
+  void connectActions(QMainWindow* parent);
 
-	void connectActions(QMainWindow* parent);
-
-	public slots:
-	void send_compute_k_nearest_neighbors();
-	void update_k(int);
-	void accept();
-
-	signals:
-	void compute_k_nearest_neighbors(unsigned k);
+ public slots:
+  void send_compute_k_nearest_neighbors();
+  void update_k(int k);
+  void accept();
 
+ signals:
+  void compute_k_nearest_neighbors(unsigned k);
 };
 
-
-#endif /* MENU_K_NEAREST_NEIGHBORS_H_ */
+#endif  // GUI_MENU_K_NEAREST_NEIGHBORS_H_