From 364fadcbea5f37799bb42e663106e3a007746984 Mon Sep 17 00:00:00 2001 From: Johannes Hofmann Date: Mon, 30 Oct 2006 20:45:53 +0100 Subject: strip copyright --- src/Hill.H | 18 ------------------ 1 file changed, 18 deletions(-) (limited to 'src/Hill.H') diff --git a/src/Hill.H b/src/Hill.H index 13d7d64..5c8aca7 100644 --- a/src/Hill.H +++ b/src/Hill.H @@ -1,21 +1,3 @@ -// -// Copyright 2005 by Johannes Hofmann -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Library General Public -// License as published by the Free Software Foundation; either -// version 2 of the License, or (at your option) any later version. -// -// This library 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 -// Library General Public License for more details. -// -// You should have received a copy of the GNU Library General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -// USA. -// #ifndef HILL_H #define HILL_H -- cgit v1.2.3 From 6c50749f40e50a4b6a260a262b40035bfe83fd76 Mon Sep 17 00:00:00 2001 From: Johannes Hofmann Date: Mon, 30 Oct 2006 20:49:30 +0100 Subject: add simplified copyright --- src/Hill.H | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/Hill.H') diff --git a/src/Hill.H b/src/Hill.H index 5c8aca7..37ab44a 100644 --- a/src/Hill.H +++ b/src/Hill.H @@ -1,3 +1,8 @@ +// +// Copyright 2006 Johannes Hofmann +// +// This software may be used and distributed according to the terms +// of the GNU General Public License, incorporated herein by reference. #ifndef HILL_H #define HILL_H -- cgit v1.2.3 From f8fb82ba705f6314d502b8efc8f03ecd16b8bed8 Mon Sep 17 00:00:00 2001 From: Johannes Hofmann Date: Mon, 30 Oct 2006 22:27:04 +0100 Subject: more reindent --- src/Hill.H | 96 +++++++++++++++++++++++++++++++------------------------------- 1 file changed, 48 insertions(+), 48 deletions(-) (limited to 'src/Hill.H') diff --git a/src/Hill.H b/src/Hill.H index 37ab44a..2e95def 100644 --- a/src/Hill.H +++ b/src/Hill.H @@ -11,69 +11,69 @@ class Hill; class Hill { - private: - - public: - typedef enum { - DUPLICATE = 0x01, - TRACK_POINT = 0x02, - VISIBLE = 0x04, - HIDDEN = 0x08 - } flags_t; - - double phi, lam; - double height; - double alph; - double a_view; - double a_nick; - double dist; - int x, y; - int label_x, label_y; - char *name; - int flags; - - Hill(const char *n, double p, double l, double h); - - Hill(const Hill& h); - - Hill(int x_tmp, int y_tmp); - - ~Hill(); + private: + + public: + typedef enum { + DUPLICATE = 0x01, + TRACK_POINT = 0x02, + VISIBLE = 0x04, + HIDDEN = 0x08 + } flags_t; + + double phi, lam; + double height; + double alph; + double a_view; + double a_nick; + double dist; + int x, y; + int label_x, label_y; + char *name; + int flags; + + Hill(const char *n, double p, double l, double h); + + Hill(const Hill& h); + + Hill(int x_tmp, int y_tmp); + + ~Hill(); }; class Hills { - private: - int num, cap; - Hill **m; + private: + int num, cap; + Hill **m; - public: - Hills(); + public: + Hills(); - Hills(const Hills *h); + Hills(const Hills *h); - ~Hills(); + ~Hills(); - int load(const char *file); + int load(const char *file); - void mark_duplicates(double dist); + void mark_duplicates(double dist); - void add(Hill *m); + void add(Hill *m); - void add(Hills *h); + void add(Hills *h); - void sort_phi(); + void sort_phi(); - void sort_name(); + void sort_name(); - void sort(); - - void clear(); + void sort(); - void clobber(); + void clear(); - int get_num(); - - Hill *get(int n); + void clobber(); + + int get_num(); + + Hill *get(int n); }; #endif -- cgit v1.2.3