From 198f7c18fd0b5fa84528e9b28a84269c3a856cc4 Mon Sep 17 00:00:00 2001 From: Diane Trout Date: Sun, 12 Mar 2006 01:25:23 +0000 Subject: [PATCH] There can be only one (filename convention) So I was used to using .cxx/.h, tristan used .cc/.hh, neither are really that great, so after some consultation we're going to use the boost convention of .cpp/.hpp, we assume that the boost people know what they're doing. --- Makefile.noqt | 6 +- alg/{color.cxx => color.cpp} | 2 +- alg/{color.h => color.hpp} | 0 ...{conserved_path.cxx => conserved_path.cpp} | 2 +- alg/{conserved_path.h => conserved_path.hpp} | 0 alg/{flp.cxx => flp.cpp} | 2 +- alg/{flp.hh => flp.hpp} | 0 alg/{flp_seqcomp.cxx => flp_seqcomp.cpp} | 2 +- alg/{glsequence.cxx => glsequence.cpp} | 2 +- alg/{glsequence.h => glsequence.hpp} | 4 +- alg/module.mk | 30 +++---- alg/{mussa_class.cxx => mussa.cpp} | 7 +- alg/{mussa_class.hh => mussa.hpp} | 4 +- alg/{nway_entropy.cxx => nway_entropy.cpp} | 2 +- alg/{nway_other.cxx => nway_other.cpp} | 2 +- alg/{nway_paths.cxx => nway_paths.cpp} | 6 +- alg/{nway_paths.hh => nway_paths.hpp} | 4 +- alg/{nway_refine.cxx => nway_refine.cpp} | 0 alg/{parse_options.cxx => parse_options.cpp} | 4 +- alg/{parse_options.h => parse_options.hpp} | 0 alg/{sequence.cxx => sequence.cpp} | 4 +- alg/{sequence.hh => sequence.hpp} | 0 alg/test/module.mk | 20 ++--- alg/test/{test_color.cxx => test_color.cpp} | 2 +- ...erved_path.cxx => test_conserved_path.cpp} | 2 +- alg/test/{test_flp.cxx => test_flp.cpp} | 4 +- ...est_glsequence.cxx => test_glsequence.cpp} | 4 +- alg/test/{test_main.cxx => test_main.cpp} | 0 alg/test/{test_mussa.cxx => test_mussa.cpp} | 2 +- alg/test/{test_nway.cxx => test_nway.cpp} | 6 +- .../{test_sequence.cxx => test_sequence.cpp} | 4 +- gui/{AnnotWindow.cxx => AnnotWindow.cpp} | 2 +- gui/{AnnotWindow.hh => AnnotWindow.hpp} | 2 +- gui/{ConnView.cxx => ConnView.cpp} | 2 +- gui/{ConnView.hh => ConnView.hpp} | 12 +-- gui/{ConnWindow.cxx => ConnWindow.cpp} | 4 +- gui/{ConnWindow.hh => ConnWindow.hpp} | 8 +- gui/{MotifWindow.cxx => MotifWindow.cpp} | 2 +- gui/{MotifWindow.hh => MotifWindow.hpp} | 2 +- gui/{SeqTextWindow.cxx => SeqTextWindow.cpp} | 2 +- gui/{SeqTextWindow.hh => SeqTextWindow.hpp} | 2 +- gui/{SeqView.cxx => SeqView.cpp} | 2 +- gui/{SeqView.hh => SeqView.hpp} | 4 +- gui/{SeqWindow.cxx => SeqWindow.cpp} | 2 +- gui/{SeqWindow.hh => SeqWindow.hpp} | 2 +- gui/{SetupWindow.cxx => SetupWindow.cpp} | 6 +- gui/{SetupWindow.hh => SetupWindow.hpp} | 2 +- ...alysisWindow.cxx => SubAnalysisWindow.cpp} | 6 +- ...nalysisWindow.hh => SubAnalysisWindow.hpp} | 4 +- gui/module.mk | 22 +++--- mussa.cxx => mussa.cpp | 6 +- mussa_exceptions.hh => mussa_exceptions.hpp | 0 mussagl.cxx => mussagl.cpp | 4 +- mussagl.pro | 78 +++++++++---------- py/{conserved_path.cxx => conserved_path.cpp} | 2 +- py/{glsequence.cxx => glsequence.cpp} | 4 +- py/{module.cxx => module.cpp} | 0 py/module.mk | 16 ++-- py/{mussa.cxx => mussa.cpp} | 2 +- py/{nway_paths.cxx => nway_paths.cpp} | 2 +- py/{sequence.cxx => sequence.cpp} | 2 +- ...mageSaveDialog.cxx => ImageSaveDialog.cpp} | 4 +- ...{ImageSaveDialog.h => ImageSaveDialog.hpp} | 0 qui/{ImageScaler.cxx => ImageScaler.cpp} | 2 +- qui/{ImageScaler.h => ImageScaler.hpp} | 0 qui/{PathScene.cxx => PathScene.cpp} | 7 +- qui/{PathScene.h => PathScene.hpp} | 6 +- qui/{PathWidget.cxx => PathWidget.cpp} | 4 +- qui/{PathWidget.h => PathWidget.hpp} | 0 qui/{PathWindow.cxx => PathWindow.cpp} | 10 +-- qui/{PathWindow.h => PathWindow.hpp} | 0 ...hresholdWidget.cxx => ThresholdWidget.cpp} | 4 +- ...{ThresholdWidget.h => ThresholdWidget.hpp} | 0 seqcomp.cxx => seqcomp.cpp | 0 74 files changed, 184 insertions(+), 184 deletions(-) rename alg/{color.cxx => color.cpp} (98%) rename alg/{color.h => color.hpp} (100%) rename alg/{conserved_path.cxx => conserved_path.cpp} (99%) rename alg/{conserved_path.h => conserved_path.hpp} (100%) rename alg/{flp.cxx => flp.cpp} (99%) rename alg/{flp.hh => flp.hpp} (100%) rename alg/{flp_seqcomp.cxx => flp_seqcomp.cpp} (99%) rename alg/{glsequence.cxx => glsequence.cpp} (99%) rename alg/{glsequence.h => glsequence.hpp} (98%) rename alg/{mussa_class.cxx => mussa.cpp} (99%) rename alg/{mussa_class.hh => mussa.hpp} (98%) rename alg/{nway_entropy.cxx => nway_entropy.cpp} (99%) rename alg/{nway_other.cxx => nway_other.cpp} (99%) rename alg/{nway_paths.cxx => nway_paths.cpp} (99%) rename alg/{nway_paths.hh => nway_paths.hpp} (98%) rename alg/{nway_refine.cxx => nway_refine.cpp} (100%) rename alg/{parse_options.cxx => parse_options.cpp} (95%) rename alg/{parse_options.h => parse_options.hpp} (100%) rename alg/{sequence.cxx => sequence.cpp} (99%) rename alg/{sequence.hh => sequence.hpp} (100%) rename alg/test/{test_color.cxx => test_color.cpp} (98%) rename alg/test/{test_conserved_path.cxx => test_conserved_path.cpp} (98%) rename alg/test/{test_flp.cxx => test_flp.cpp} (98%) rename alg/test/{test_glsequence.cxx => test_glsequence.cpp} (98%) rename alg/test/{test_main.cxx => test_main.cpp} (100%) rename alg/test/{test_mussa.cxx => test_mussa.cpp} (98%) rename alg/test/{test_nway.cxx => test_nway.cpp} (93%) rename alg/test/{test_sequence.cxx => test_sequence.cpp} (97%) rename gui/{AnnotWindow.cxx => AnnotWindow.cpp} (99%) rename gui/{AnnotWindow.hh => AnnotWindow.hpp} (98%) rename gui/{ConnView.cxx => ConnView.cpp} (99%) rename gui/{ConnView.hh => ConnView.hpp} (92%) rename gui/{ConnWindow.cxx => ConnWindow.cpp} (99%) rename gui/{ConnWindow.hh => ConnWindow.hpp} (93%) rename gui/{MotifWindow.cxx => MotifWindow.cpp} (99%) rename gui/{MotifWindow.hh => MotifWindow.hpp} (98%) rename gui/{SeqTextWindow.cxx => SeqTextWindow.cpp} (98%) rename gui/{SeqTextWindow.hh => SeqTextWindow.hpp} (98%) rename gui/{SeqView.cxx => SeqView.cpp} (99%) rename gui/{SeqView.hh => SeqView.hpp} (97%) rename gui/{SeqWindow.cxx => SeqWindow.cpp} (99%) rename gui/{SeqWindow.hh => SeqWindow.hpp} (98%) rename gui/{SetupWindow.cxx => SetupWindow.cpp} (99%) rename gui/{SetupWindow.hh => SetupWindow.hpp} (98%) rename gui/{SubAnalysisWindow.cxx => SubAnalysisWindow.cpp} (98%) rename gui/{SubAnalysisWindow.hh => SubAnalysisWindow.hpp} (97%) rename mussa.cxx => mussa.cpp (98%) rename mussa_exceptions.hh => mussa_exceptions.hpp (100%) rename mussagl.cxx => mussagl.cpp (80%) rename py/{conserved_path.cxx => conserved_path.cpp} (95%) rename py/{glsequence.cxx => glsequence.cpp} (89%) rename py/{module.cxx => module.cpp} (100%) rename py/{mussa.cxx => mussa.cpp} (98%) rename py/{nway_paths.cxx => nway_paths.cpp} (92%) rename py/{sequence.cxx => sequence.cpp} (92%) rename qui/{ImageSaveDialog.cxx => ImageSaveDialog.cpp} (98%) rename qui/{ImageSaveDialog.h => ImageSaveDialog.hpp} (100%) rename qui/{ImageScaler.cxx => ImageScaler.cpp} (99%) rename qui/{ImageScaler.h => ImageScaler.hpp} (100%) rename qui/{PathScene.cxx => PathScene.cpp} (99%) rename qui/{PathScene.h => PathScene.hpp} (96%) rename qui/{PathWidget.cxx => PathWidget.cpp} (95%) rename qui/{PathWidget.h => PathWidget.hpp} (100%) rename qui/{PathWindow.cxx => PathWindow.cpp} (97%) rename qui/{PathWindow.h => PathWindow.hpp} (100%) rename qui/{ThresholdWidget.cxx => ThresholdWidget.cpp} (97%) rename qui/{ThresholdWidget.h => ThresholdWidget.hpp} (100%) rename seqcomp.cxx => seqcomp.cpp (100%) diff --git a/Makefile.noqt b/Makefile.noqt index b2aaecc..5431ab1 100644 --- a/Makefile.noqt +++ b/Makefile.noqt @@ -26,7 +26,7 @@ include gui/module.mk include module.mk # process what the module.mks defined -OBJ := $(patsubst %.cxx,%.o, $(filter %.cxx,$(SRC))) +OBJ := $(patsubst %.cpp,%.o, $(filter %.cpp,$(SRC))) DEPS := $(OBJ:.o=.d) targets: $(TARGETLIBS) $(TARGETBINS) @@ -38,11 +38,11 @@ define make-depend $(CXX) -MM -MF $3 -MP -MT $2 $(CFLAGS) $(CXXFLAGS) $1 endef -%.d: %.cxx +%.d: %.cpp $(call make-depend,$<,$@,$(subst .o,.d,$@)) # makedepend -o.d $(dirname $^) $(CFLAGS) $(CXXFILAGS) $^ -f- > $@ -%.o: %.cxx +%.o: %.cpp $(CXX) -c -o $@ $(CXXFLAGS) $^ include $(DEPS) diff --git a/alg/color.cxx b/alg/color.cpp similarity index 98% rename from alg/color.cxx rename to alg/color.cpp index 61342fc..1c01f89 100644 --- a/alg/color.cxx +++ b/alg/color.cpp @@ -1,4 +1,4 @@ -#include "alg/color.h" +#include "alg/color.hpp" #include Color::Color() diff --git a/alg/color.h b/alg/color.hpp similarity index 100% rename from alg/color.h rename to alg/color.hpp diff --git a/alg/conserved_path.cxx b/alg/conserved_path.cpp similarity index 99% rename from alg/conserved_path.cxx rename to alg/conserved_path.cpp index bf845ad..af2a4a0 100644 --- a/alg/conserved_path.cxx +++ b/alg/conserved_path.cpp @@ -1,4 +1,4 @@ -#include "alg/conserved_path.h" +#include "alg/conserved_path.hpp" #include using namespace std; diff --git a/alg/conserved_path.h b/alg/conserved_path.hpp similarity index 100% rename from alg/conserved_path.h rename to alg/conserved_path.hpp diff --git a/alg/flp.cxx b/alg/flp.cpp similarity index 99% rename from alg/flp.cxx rename to alg/flp.cpp index 88a2fb6..3076e7b 100644 --- a/alg/flp.cxx +++ b/alg/flp.cpp @@ -12,7 +12,7 @@ // ---------- flp.cc ----------- // ---------------------------------------- -#include "flp.hh" +#include "alg/flp.hpp" #include #include diff --git a/alg/flp.hh b/alg/flp.hpp similarity index 100% rename from alg/flp.hh rename to alg/flp.hpp diff --git a/alg/flp_seqcomp.cxx b/alg/flp_seqcomp.cpp similarity index 99% rename from alg/flp_seqcomp.cxx rename to alg/flp_seqcomp.cpp index 68df520..6db57bc 100644 --- a/alg/flp_seqcomp.cxx +++ b/alg/flp_seqcomp.cpp @@ -12,7 +12,7 @@ // ---------- flp_seqcomp.cc ----------- // ---------------------------------------- -#include "alg/flp.hh" +#include "alg/flp.hpp" #include using namespace std; diff --git a/alg/glsequence.cxx b/alg/glsequence.cpp similarity index 99% rename from alg/glsequence.cxx rename to alg/glsequence.cpp index 3aad53a..62896aa 100644 --- a/alg/glsequence.cxx +++ b/alg/glsequence.cpp @@ -1,4 +1,4 @@ -#include "alg/glsequence.h" +#include "alg/glsequence.hpp" #include #include diff --git a/alg/glsequence.h b/alg/glsequence.hpp similarity index 98% rename from alg/glsequence.h rename to alg/glsequence.hpp index 9ccc4e3..aeedf47 100644 --- a/alg/glsequence.h +++ b/alg/glsequence.hpp @@ -1,8 +1,8 @@ #ifndef _GL_SEQUENCE_H_ #define _GL_SEQUENCE_H_ -#include "alg/sequence.hh" -#include "alg/color.h" +#include "alg/sequence.hpp" +#include "alg/color.hpp" #include //! Manage rendering a mussa sequence track /*! The idea is this will keep track of the location of where the sequence diff --git a/alg/module.mk b/alg/module.mk index bc52a6b..ba925db 100644 --- a/alg/module.mk +++ b/alg/module.mk @@ -1,22 +1,22 @@ CURDIR := $(BASEDIR)alg/ -SOURCES.cxx := color.cxx \ - conserved_path.cxx \ - flp.cxx \ - flp_seqcomp.cxx \ - mussa_class.cxx \ - nway_paths.cxx \ - nway_entropy.cxx \ - nway_other.cxx \ - sequence.cxx - # mussa_nway_refine.cxx (broken) +SOURCES.cpp := color.cpp \ + conserved_path.cpp \ + flp.cpp \ + flp_seqcomp.cpp \ + mussa.cpp \ + nway_paths.cpp \ + nway_entropy.cpp \ + nway_other.cpp \ + sequence.cpp + # mussa_nway_refine.cpp (broken) -MUSSA_ALG_SRC := $(addprefix $(CURDIR), $(SOURCES.cxx)) -MUSSA_ALG_OBJ := $(MUSSA_ALG_SRC:.cxx=$(OBJEXT)) +MUSSA_ALG_SRC := $(addprefix $(CURDIR), $(SOURCES.cpp)) +MUSSA_ALG_OBJ := $(MUSSA_ALG_SRC:.cpp=$(OBJEXT)) -GLSOURCES.cxx := glsequence.cxx -MUSSA_ALG_GL_SRC := $(addprefix $(CURDIR), $(GLSOURCES.cxx)) -MUSSA_ALG_GL_OBJ := $(MUSSA_ALG_GL_SRC:.cxx=$(OBJEXT)) +GLSOURCES.cpp := glsequence.cpp +MUSSA_ALG_GL_SRC := $(addprefix $(CURDIR), $(GLSOURCES.cpp)) +MUSSA_ALG_GL_OBJ := $(MUSSA_ALG_GL_SRC:.cpp=$(OBJEXT)) SRC += $(MUSSA_ALG_SRC) $(MUSSA_ALG_GL_SRC) CXXFLAGS += diff --git a/alg/mussa_class.cxx b/alg/mussa.cpp similarity index 99% rename from alg/mussa_class.cxx rename to alg/mussa.cpp index 389ef1b..47794ef 100644 --- a/alg/mussa_class.cxx +++ b/alg/mussa.cpp @@ -12,13 +12,14 @@ // ---------- mussa_class.cc ----------- // ---------------------------------------- -#include "mussa_exceptions.hh" -#include "mussa_class.hh" -#include "flp.hh" #include #include #include +#include "mussa_exceptions.hpp" +#include "alg/mussa.hpp" +#include "alg/flp.hpp" + using namespace std; Mussa::Mussa() diff --git a/alg/mussa_class.hh b/alg/mussa.hpp similarity index 98% rename from alg/mussa_class.hh rename to alg/mussa.hpp index f0ed884..805b09d 100644 --- a/alg/mussa_class.hh +++ b/alg/mussa.hpp @@ -18,8 +18,8 @@ #include #include -#include "nway_paths.hh" -#include "sequence.hh" +#include "alg/nway_paths.hpp" +#include "alg/sequence.hpp" std::string int_to_str(int an_int); diff --git a/alg/nway_entropy.cxx b/alg/nway_entropy.cpp similarity index 99% rename from alg/nway_entropy.cxx rename to alg/nway_entropy.cpp index b8dcc7f..13a42c5 100644 --- a/alg/nway_entropy.cxx +++ b/alg/nway_entropy.cpp @@ -9,7 +9,7 @@ -#include "nway_paths.hh" +#include "alg/nway_paths.hpp" #include #include using namespace std; diff --git a/alg/nway_other.cxx b/alg/nway_other.cpp similarity index 99% rename from alg/nway_other.cxx rename to alg/nway_other.cpp index cc00036..5e23936 100644 --- a/alg/nway_other.cxx +++ b/alg/nway_other.cpp @@ -8,7 +8,7 @@ // file for more information, or contact Tristan directly. -#include "nway_paths.hh" +#include "nway_paths.hpp" #include using namespace std; diff --git a/alg/nway_paths.cxx b/alg/nway_paths.cpp similarity index 99% rename from alg/nway_paths.cxx rename to alg/nway_paths.cpp index 9471d72..b82cff6 100644 --- a/alg/nway_paths.cxx +++ b/alg/nway_paths.cpp @@ -12,9 +12,9 @@ // ---------- mussa_nway.cc ----------- // ---------------------------------------- -#include "alg/nway_paths.hh" -#include "alg/conserved_path.h" -#include "mussa_exceptions.hh" +#include "alg/nway_paths.hpp" +#include "alg/conserved_path.hpp" +#include "mussa_exceptions.hpp" #include #include diff --git a/alg/nway_paths.hh b/alg/nway_paths.hpp similarity index 98% rename from alg/nway_paths.hh rename to alg/nway_paths.hpp index ee1f07c..23f7698 100644 --- a/alg/nway_paths.hh +++ b/alg/nway_paths.hpp @@ -18,8 +18,8 @@ #include #include -#include "alg/flp.hh" -#include "alg/conserved_path.h" +#include "alg/flp.hpp" +#include "alg/conserved_path.hpp" class NwayPaths { diff --git a/alg/nway_refine.cxx b/alg/nway_refine.cpp similarity index 100% rename from alg/nway_refine.cxx rename to alg/nway_refine.cpp diff --git a/alg/parse_options.cxx b/alg/parse_options.cpp similarity index 95% rename from alg/parse_options.cxx rename to alg/parse_options.cpp index 2d44498..3282dc7 100644 --- a/alg/parse_options.cxx +++ b/alg/parse_options.cpp @@ -4,8 +4,8 @@ namespace po = boost::program_options; #include #include -#include "alg/mussa_class.hh" -#include "alg/parse_options.h" +#include "alg/mussa.hpp" +#include "alg/parse_options.hpp" Mussa *initialize_mussa(int argc, char **argv) { diff --git a/alg/parse_options.h b/alg/parse_options.hpp similarity index 100% rename from alg/parse_options.h rename to alg/parse_options.hpp diff --git a/alg/sequence.cxx b/alg/sequence.cpp similarity index 99% rename from alg/sequence.cxx rename to alg/sequence.cpp index 8afe8f0..b05349e 100644 --- a/alg/sequence.cxx +++ b/alg/sequence.cpp @@ -22,8 +22,8 @@ // ---------- sequence.cc ----------- // ---------------------------------------- -#include "sequence.hh" -#include "mussa_exceptions.hh" +#include "alg/sequence.hpp" +#include "mussa_exceptions.hpp" #include #include diff --git a/alg/sequence.hh b/alg/sequence.hpp similarity index 100% rename from alg/sequence.hh rename to alg/sequence.hpp diff --git a/alg/test/module.mk b/alg/test/module.mk index e1a5626..c02382d 100644 --- a/alg/test/module.mk +++ b/alg/test/module.mk @@ -1,16 +1,16 @@ CURDIR := $(BASEDIR)alg/test/ -SOURCES.cxx := test_conserved_path.cxx \ - test_flp.cxx \ - test_glsequence.cxx \ - test_color.cxx \ - test_main.cxx \ - test_mussa.cxx \ - test_nway.cxx \ - test_sequence.cxx +SOURCES.cpp := test_conserved_path.cpp \ + test_flp.cpp \ + test_glsequence.cpp \ + test_color.cpp \ + test_main.cpp \ + test_mussa.cpp \ + test_nway.cpp \ + test_sequence.cpp -TESTSRC := $(addprefix $(CURDIR), $(SOURCES.cxx)) -TESTOBJ := $(TESTSRC:.cxx=$(OBJEXT)) +TESTSRC := $(addprefix $(CURDIR), $(SOURCES.cpp)) +TESTOBJ := $(TESTSRC:.cpp=$(OBJEXT)) SRC += $(TESTSRC) CXXFLAGS += diff --git a/alg/test/test_color.cxx b/alg/test/test_color.cpp similarity index 98% rename from alg/test/test_color.cxx rename to alg/test/test_color.cpp index e457bd0..a3d4134 100644 --- a/alg/test/test_color.cxx +++ b/alg/test/test_color.cpp @@ -2,7 +2,7 @@ #include #include -#include "alg/color.h" +#include "alg/color.hpp" using namespace std; diff --git a/alg/test/test_conserved_path.cxx b/alg/test/test_conserved_path.cpp similarity index 98% rename from alg/test/test_conserved_path.cxx rename to alg/test/test_conserved_path.cpp index b248470..b28c635 100644 --- a/alg/test/test_conserved_path.cxx +++ b/alg/test/test_conserved_path.cpp @@ -5,7 +5,7 @@ using namespace boost::assign; #include using namespace std; -#include "alg/conserved_path.h" +#include "alg/conserved_path.hpp" //! write tests for our conserved path types (just to make sure they //! don't change on us. diff --git a/alg/test/test_flp.cxx b/alg/test/test_flp.cpp similarity index 98% rename from alg/test/test_flp.cxx rename to alg/test/test_flp.cpp index a89fc70..c3c9437 100644 --- a/alg/test/test_flp.cxx +++ b/alg/test/test_flp.cpp @@ -5,8 +5,8 @@ #include #include -#include "alg/flp.hh" -#include "alg/sequence.hh" +#include "alg/flp.hpp" +#include "alg/sequence.hpp" #include #include diff --git a/alg/test/test_glsequence.cxx b/alg/test/test_glsequence.cpp similarity index 98% rename from alg/test/test_glsequence.cxx rename to alg/test/test_glsequence.cpp index 62f39e3..220b455 100644 --- a/alg/test/test_glsequence.cxx +++ b/alg/test/test_glsequence.cpp @@ -2,8 +2,8 @@ #include -#include "alg/glsequence.h" -#include "alg/sequence.hh" +#include "alg/glsequence.hpp" +#include "alg/sequence.hpp" using namespace std; diff --git a/alg/test/test_main.cxx b/alg/test/test_main.cpp similarity index 100% rename from alg/test/test_main.cxx rename to alg/test/test_main.cpp diff --git a/alg/test/test_mussa.cxx b/alg/test/test_mussa.cpp similarity index 98% rename from alg/test/test_mussa.cxx rename to alg/test/test_mussa.cpp index 00cae24..6d9036f 100644 --- a/alg/test/test_mussa.cxx +++ b/alg/test/test_mussa.cpp @@ -2,7 +2,7 @@ #include -#include "alg/mussa_class.hh" +#include "alg/mussa.hpp" //! can we initialize a mussa object? BOOST_AUTO_TEST_CASE( mussa_simple ) diff --git a/alg/test/test_nway.cxx b/alg/test/test_nway.cpp similarity index 93% rename from alg/test/test_nway.cxx rename to alg/test/test_nway.cpp index b472213..d67753c 100644 --- a/alg/test/test_nway.cxx +++ b/alg/test/test_nway.cpp @@ -3,9 +3,9 @@ #include #include -#include "alg/mussa_class.hh" -#include "alg/nway_paths.hh" -#include "alg/sequence.hh" +#include "alg/mussa.hpp" +#include "alg/nway_paths.hpp" +#include "alg/sequence.hpp" using namespace std; diff --git a/alg/test/test_sequence.cxx b/alg/test/test_sequence.cpp similarity index 97% rename from alg/test/test_sequence.cxx rename to alg/test/test_sequence.cpp index 17c021d..6b06b46 100644 --- a/alg/test/test_sequence.cxx +++ b/alg/test/test_sequence.cpp @@ -1,7 +1,7 @@ #include -#include "alg/sequence.hh" -#include "mussa_exceptions.hh" +#include "alg/sequence.hpp" +#include "mussa_exceptions.hpp" //! when we try to load a missing file, do we get an error? BOOST_AUTO_TEST_CASE( sequence_load_exception ) diff --git a/gui/AnnotWindow.cxx b/gui/AnnotWindow.cpp similarity index 99% rename from gui/AnnotWindow.cxx rename to gui/AnnotWindow.cpp index e82a51a..9ab0b0e 100644 --- a/gui/AnnotWindow.cxx +++ b/gui/AnnotWindow.cpp @@ -8,7 +8,7 @@ // file for more information, or contact Tristan directly. -#include "AnnotWindow.hh" +#include "gui/AnnotWindow.hpp" #include #include diff --git a/gui/AnnotWindow.hh b/gui/AnnotWindow.hpp similarity index 98% rename from gui/AnnotWindow.hh rename to gui/AnnotWindow.hpp index 0303139..3ad0fbd 100644 --- a/gui/AnnotWindow.hh +++ b/gui/AnnotWindow.hpp @@ -20,7 +20,7 @@ #include #include -#include "MotifWindow.hh" +#include "gui/MotifWindow.hpp" struct annot_color { diff --git a/gui/ConnView.cxx b/gui/ConnView.cpp similarity index 99% rename from gui/ConnView.cxx rename to gui/ConnView.cpp index 2888fdb..178a8ea 100644 --- a/gui/ConnView.cxx +++ b/gui/ConnView.cpp @@ -8,7 +8,7 @@ // file for more information, or contact Tristan directly. -#include "ConnView.hh" +#include "gui/ConnView.hpp" #include #include diff --git a/gui/ConnView.hh b/gui/ConnView.hpp similarity index 92% rename from gui/ConnView.hh rename to gui/ConnView.hpp index d58995d..f5a95c4 100644 --- a/gui/ConnView.hh +++ b/gui/ConnView.hpp @@ -14,12 +14,12 @@ #include #include -#include "alg/sequence.hh" -#include "alg/nway_paths.hh" -#include "SeqView.hh" -#include "SeqWindow.hh" -#include "MotifWindow.hh" -#include "AnnotWindow.hh" // aparently for annot_color +#include "alg/sequence.hpp" +#include "alg/nway_paths.hpp" +#include "gui/SeqView.hpp" +#include "gui/SeqWindow.hpp" +#include "gui/MotifWindow.hpp" +#include "gui/AnnotWindow.hpp" // aparently for annot_color #include diff --git a/gui/ConnWindow.cxx b/gui/ConnWindow.cpp similarity index 99% rename from gui/ConnWindow.cxx rename to gui/ConnWindow.cpp index 0f06bea..bd32682 100644 --- a/gui/ConnWindow.cxx +++ b/gui/ConnWindow.cpp @@ -8,8 +8,8 @@ // file for more information, or contact Tristan directly. -#include "ConnWindow.hh" -#include "mussa_exceptions.hh" +#include "gui/ConnWindow.hpp" +#include "mussa_exceptions.hpp" #include using namespace std; diff --git a/gui/ConnWindow.hh b/gui/ConnWindow.hpp similarity index 93% rename from gui/ConnWindow.hh rename to gui/ConnWindow.hpp index 35c9e05..cef4de0 100644 --- a/gui/ConnWindow.hh +++ b/gui/ConnWindow.hpp @@ -16,10 +16,10 @@ #include #include -#include "ConnView.hh" -#include "SetupWindow.hh" -#include "SubAnalysisWindow.hh" -#include "SeqTextWindow.hh" +#include "gui/ConnView.hpp" +#include "gui/SetupWindow.hpp" +#include "gui/SubAnalysisWindow.hpp" +#include "gui/SeqTextWindow.hpp" //! Window for showing the lines connecting the various sequences together class ConnWindow : public Fl_Double_Window diff --git a/gui/MotifWindow.cxx b/gui/MotifWindow.cpp similarity index 99% rename from gui/MotifWindow.cxx rename to gui/MotifWindow.cpp index 7667ec1..7a7708b 100644 --- a/gui/MotifWindow.cxx +++ b/gui/MotifWindow.cpp @@ -8,7 +8,7 @@ // file for more information, or contact Tristan directly. -#include "MotifWindow.hh" +#include "gui/MotifWindow.hpp" #include diff --git a/gui/MotifWindow.hh b/gui/MotifWindow.hpp similarity index 98% rename from gui/MotifWindow.hh rename to gui/MotifWindow.hpp index ac1e60a..84f5de2 100644 --- a/gui/MotifWindow.hh +++ b/gui/MotifWindow.hpp @@ -19,7 +19,7 @@ #include #include -#include "alg/mussa_class.hh" +#include "alg/mussa.hpp" struct motif { diff --git a/gui/SeqTextWindow.cxx b/gui/SeqTextWindow.cpp similarity index 98% rename from gui/SeqTextWindow.cxx rename to gui/SeqTextWindow.cpp index 614a065..857e49b 100644 --- a/gui/SeqTextWindow.cxx +++ b/gui/SeqTextWindow.cpp @@ -8,7 +8,7 @@ // file for more information, or contact Tristan directly. -#include "gui/SeqTextWindow.hh" +#include "gui/SeqTextWindow.hpp" #include using namespace std; diff --git a/gui/SeqTextWindow.hh b/gui/SeqTextWindow.hpp similarity index 98% rename from gui/SeqTextWindow.hh rename to gui/SeqTextWindow.hpp index 810879c..30030a5 100644 --- a/gui/SeqTextWindow.hh +++ b/gui/SeqTextWindow.hpp @@ -19,7 +19,7 @@ #include #include -#include "alg/sequence.hh" +#include "alg/sequence.hpp" class SeqTextWindow : public Fl_Window { diff --git a/gui/SeqView.cxx b/gui/SeqView.cpp similarity index 99% rename from gui/SeqView.cxx rename to gui/SeqView.cpp index 8f6d9d5..30c1dd3 100644 --- a/gui/SeqView.cxx +++ b/gui/SeqView.cpp @@ -8,7 +8,7 @@ // file for more information, or contact Tristan directly. -#include "SeqView.hh" +#include "gui/SeqView.hpp" #include #include diff --git a/gui/SeqView.hh b/gui/SeqView.hpp similarity index 97% rename from gui/SeqView.hh rename to gui/SeqView.hpp index e124e17..40a43dd 100644 --- a/gui/SeqView.hh +++ b/gui/SeqView.hpp @@ -15,8 +15,8 @@ #include -#include "MotifWindow.hh" -#include "SetupWindow.hh" +#include "gui/MotifWindow.hpp" +#include "gui/SetupWindow.hpp" class SeqView : public Fl_Box { diff --git a/gui/SeqWindow.cxx b/gui/SeqWindow.cpp similarity index 99% rename from gui/SeqWindow.cxx rename to gui/SeqWindow.cpp index dc65148..0e011e2 100644 --- a/gui/SeqWindow.cxx +++ b/gui/SeqWindow.cpp @@ -8,7 +8,7 @@ // file for more information, or contact Tristan directly. -#include "SeqWindow.hh" +#include "gui/SeqWindow.hpp" #include diff --git a/gui/SeqWindow.hh b/gui/SeqWindow.hpp similarity index 98% rename from gui/SeqWindow.hh rename to gui/SeqWindow.hpp index 71432e3..467445c 100644 --- a/gui/SeqWindow.hh +++ b/gui/SeqWindow.hpp @@ -14,7 +14,7 @@ #include #include -#include "SeqView.hh" +#include "gui/SeqView.hpp" #include #include diff --git a/gui/SetupWindow.cxx b/gui/SetupWindow.cpp similarity index 99% rename from gui/SetupWindow.cxx rename to gui/SetupWindow.cpp index 4115218..7b57abd 100644 --- a/gui/SetupWindow.cxx +++ b/gui/SetupWindow.cpp @@ -8,9 +8,9 @@ // file for more information, or contact Tristan directly. -#include "SetupWindow.hh" -#include "alg/mussa_class.hh" -#include "mussa_exceptions.hh" +#include "gui/SetupWindow.hpp" +#include "alg/mussa.hpp" +#include "mussa_exceptions.hpp" #include #include diff --git a/gui/SetupWindow.hh b/gui/SetupWindow.hpp similarity index 98% rename from gui/SetupWindow.hh rename to gui/SetupWindow.hpp index c776449..532a62e 100644 --- a/gui/SetupWindow.hh +++ b/gui/SetupWindow.hpp @@ -19,7 +19,7 @@ #include class Mussa; -#include "SetupWindow.hh" +#include "gui/SetupWindow.hpp" class SetupWindow : public Fl_Window { diff --git a/gui/SubAnalysisWindow.cxx b/gui/SubAnalysisWindow.cpp similarity index 98% rename from gui/SubAnalysisWindow.cxx rename to gui/SubAnalysisWindow.cpp index b808f4a..4ec72d9 100644 --- a/gui/SubAnalysisWindow.cxx +++ b/gui/SubAnalysisWindow.cpp @@ -8,9 +8,9 @@ // file for more information, or contact Tristan directly. -#include "SubAnalysisWindow.hh" -#include "alg/mussa_class.hh" -#include "mussa_exceptions.hh" +#include "gui/SubAnalysisWindow.hpp" +#include "alg/mussa.hpp" +#include "mussa_exceptions.hpp" #include using namespace std; diff --git a/gui/SubAnalysisWindow.hh b/gui/SubAnalysisWindow.hpp similarity index 97% rename from gui/SubAnalysisWindow.hh rename to gui/SubAnalysisWindow.hpp index d0fb150..8bcaaa6 100644 --- a/gui/SubAnalysisWindow.hh +++ b/gui/SubAnalysisWindow.hpp @@ -18,8 +18,8 @@ #include #include -#include "alg/mussa_class.hh" -#include "SeqTextWindow.hh" +#include "alg/mussa.hpp" +#include "gui/SeqTextWindow.hpp" class SubAnalysisWindow : public Fl_Window { diff --git a/gui/module.mk b/gui/module.mk index f65a212..255f172 100644 --- a/gui/module.mk +++ b/gui/module.mk @@ -1,17 +1,17 @@ CURDIR := $(BASEDIR)gui/ -SOURCES.cxx := AnnotWindow.cxx \ - ConnView.cxx \ - ConnWindow.cxx \ - MotifWindow.cxx \ - SeqTextWindow.cxx \ - SeqView.cxx \ - SeqWindow.cxx \ - SetupWindow.cxx \ - SubAnalysisWindow.cxx +SOURCES.cpp := AnnotWindow.cpp \ + ConnView.cpp \ + ConnWindow.cpp \ + MotifWindow.cpp \ + SeqTextWindow.cpp \ + SeqView.cpp \ + SeqWindow.cpp \ + SetupWindow.cpp \ + SubAnalysisWindow.cpp -MUSSA_FLTK_SRC := $(addprefix $(CURDIR), $(SOURCES.cxx)) -MUSSA_FLTK_OBJ := $(MUSSA_FLTK_SRC:.cxx=$(OBJEXT)) +MUSSA_FLTK_SRC := $(addprefix $(CURDIR), $(SOURCES.cpp)) +MUSSA_FLTK_OBJ := $(MUSSA_FLTK_SRC:.cpp=$(OBJEXT)) SRC += $(MUSSA_FLTK_SRC) CXXFLAGS += diff --git a/mussa.cxx b/mussa.cpp similarity index 98% rename from mussa.cxx rename to mussa.cpp index 34ee333..92fe0b1 100644 --- a/mussa.cxx +++ b/mussa.cpp @@ -8,9 +8,9 @@ // file for more information, or contact Tristan directly. -#include "gui/ConnWindow.hh" -#include "alg/mussa_class.hh" -#include "mussa_exceptions.hh" +#include "gui/ConnWindow.hpp" +#include "alg/mussa.hpp" +#include "mussa_exceptions.hpp" #include using namespace std; diff --git a/mussa_exceptions.hh b/mussa_exceptions.hpp similarity index 100% rename from mussa_exceptions.hh rename to mussa_exceptions.hpp diff --git a/mussagl.cxx b/mussagl.cpp similarity index 80% rename from mussagl.cxx rename to mussagl.cpp index f0ddc88..1447b7d 100644 --- a/mussagl.cxx +++ b/mussagl.cpp @@ -1,7 +1,7 @@ #include -#include "qui/PathWindow.h" -#include "alg/parse_options.h" +#include "qui/PathWindow.hpp" +#include "alg/parse_options.hpp" int main(int argc, char **argv) { diff --git a/mussagl.pro b/mussagl.pro index 7ec4364..24e1124 100644 --- a/mussagl.pro +++ b/mussagl.pro @@ -11,45 +11,45 @@ DEPENDPATH += . \ INCLUDEPATH += . alg qui # Input -HEADERS += mussa_exceptions.hh \ - qui/PathWidget.h \ - qui/PathWindow.h \ - qui/PathScene.h \ - qui/ThresholdWidget.h \ - qui/ImageScaler.h \ - qui/ImageSaveDialog.h \ - alg/color.h \ - alg/conserved_path.h \ - alg/flp.hh \ - alg/glsequence.h \ - alg/mussa_class.hh \ - alg/nway_paths.hh \ - alg/parse_options.h \ - alg/sequence.hh -SOURCES += mussagl.cxx \ - qui/PathWidget.cxx \ - qui/PathWindow.cxx \ - qui/PathScene.cxx \ - qui/ThresholdWidget.cxx \ - qui/ImageScaler.cxx \ - qui/ImageSaveDialog.cxx \ - alg/color.cxx \ - alg/conserved_path.cxx \ - alg/flp.cxx \ - alg/flp_seqcomp.cxx \ - alg/glsequence.cxx \ - alg/mussa_class.cxx \ - alg/nway_entropy.cxx \ - alg/nway_other.cxx \ - alg/nway_paths.cxx \ - alg/parse_options.cxx \ -# alg/nway_refine.cxx \ - alg/sequence.cxx -# test/test_flp.cxx \ -# test/test_main.cxx \ -# test/test_mussa.cxx \ -# test/test_nway.cxx \ -# test/test_sequence.cxx +HEADERS += mussa_exceptions.hpp \ + qui/PathWidget.hpp \ + qui/PathWindow.hpp \ + qui/PathScene.hpp \ + qui/ThresholdWidget.hpp \ + qui/ImageScaler.hpp \ + qui/ImageSaveDialog.hpp \ + alg/color.hpp \ + alg/conserved_path.hpp \ + alg/flp.hpp \ + alg/glsequence.hpp \ + alg/mussa.hpp \ + alg/nway_paths.hpp \ + alg/parse_options.hpp \ + alg/sequence.hpp +SOURCES += mussagl.cpp \ + qui/PathWidget.cpp \ + qui/PathWindow.cpp \ + qui/PathScene.cpp \ + qui/ThresholdWidget.cpp \ + qui/ImageScaler.cpp \ + qui/ImageSaveDialog.cpp \ + alg/color.cpp \ + alg/conserved_path.cpp \ + alg/flp.cpp \ + alg/flp_seqcomp.cpp \ + alg/glsequence.cpp \ + alg/mussa.cpp \ + alg/nway_entropy.cpp \ + alg/nway_other.cpp \ + alg/nway_paths.cpp \ + alg/parse_options.cpp \ +# alg/nway_refine.cpp \ + alg/sequence.cpp +# test/test_flp.cpp \ +# test/test_main.cpp \ +# test/test_mussa.cpp \ +# test/test_nway.cpp \ +# test/test_sequence.cpp LIBS += -lm QT += opengl diff --git a/py/conserved_path.cxx b/py/conserved_path.cpp similarity index 95% rename from py/conserved_path.cxx rename to py/conserved_path.cpp index 2b23428..65a5d06 100644 --- a/py/conserved_path.cxx +++ b/py/conserved_path.cpp @@ -3,7 +3,7 @@ #include using namespace boost::python; -#include "alg/conserved_path.h" +#include "alg/conserved_path.hpp" void export_conserved_path() { diff --git a/py/glsequence.cxx b/py/glsequence.cpp similarity index 89% rename from py/glsequence.cxx rename to py/glsequence.cpp index dd8c7ea..213ce63 100644 --- a/py/glsequence.cxx +++ b/py/glsequence.cpp @@ -1,8 +1,8 @@ #include using namespace boost::python; -#include "alg/glsequence.h" -#include "alg/sequence.hh" +#include "alg/glsequence.hpp" +#include "alg/sequence.hpp" void export_glsequence() { diff --git a/py/module.cxx b/py/module.cpp similarity index 100% rename from py/module.cxx rename to py/module.cpp diff --git a/py/module.mk b/py/module.mk index d129a1a..015ca2b 100644 --- a/py/module.mk +++ b/py/module.mk @@ -1,14 +1,14 @@ CURDIR := $(BASEDIR)py/ -SOURCES.cxx := module.cxx \ - conserved_path.cxx \ - glsequence.cxx \ - mussa.cxx \ - nway_paths.cxx \ - sequence.cxx +SOURCES.cpp := module.cpp \ + conserved_path.cpp \ + glsequence.cpp \ + mussa.cpp \ + nway_paths.cpp \ + sequence.cpp -MUSSA_PY_SRC := $(addprefix $(CURDIR), $(SOURCES.cxx)) -MUSSA_PY_OBJ := $(MUSSA_PY_SRC:.cxx=$(OBJEXT)) +MUSSA_PY_SRC := $(addprefix $(CURDIR), $(SOURCES.cpp)) +MUSSA_PY_OBJ := $(MUSSA_PY_SRC:.cpp=$(OBJEXT)) SRC += $(MUSSA_PY_SRC) CXXFLAGS += diff --git a/py/mussa.cxx b/py/mussa.cpp similarity index 98% rename from py/mussa.cxx rename to py/mussa.cpp index 690928f..cf34041 100644 --- a/py/mussa.cxx +++ b/py/mussa.cpp @@ -2,7 +2,7 @@ using namespace boost::python; -#include "alg/mussa_class.hh" +#include "alg/mussa.hpp" void export_mussa() { diff --git a/py/nway_paths.cxx b/py/nway_paths.cpp similarity index 92% rename from py/nway_paths.cxx rename to py/nway_paths.cpp index 3a03323..73a13a9 100644 --- a/py/nway_paths.cxx +++ b/py/nway_paths.cpp @@ -1,7 +1,7 @@ #include using namespace boost::python; -#include "alg/nway_paths.hh" +#include "alg/nway_paths.hpp" void export_nway_paths() { diff --git a/py/sequence.cxx b/py/sequence.cpp similarity index 92% rename from py/sequence.cxx rename to py/sequence.cpp index 39542fa..68fc0ba 100644 --- a/py/sequence.cxx +++ b/py/sequence.cpp @@ -2,7 +2,7 @@ using namespace boost::python; #include -#include "alg/glsequence.h" +#include "alg/glsequence.hpp" void export_sequence() { diff --git a/qui/ImageSaveDialog.cxx b/qui/ImageSaveDialog.cpp similarity index 98% rename from qui/ImageSaveDialog.cxx rename to qui/ImageSaveDialog.cpp index 06bd0a0..3c5b009 100644 --- a/qui/ImageSaveDialog.cxx +++ b/qui/ImageSaveDialog.cpp @@ -7,8 +7,8 @@ //#include #include -#include "ImageSaveDialog.h" -#include "ImageScaler.h" +#include "ImageSaveDialog.hpp" +#include "ImageScaler.hpp" #include diff --git a/qui/ImageSaveDialog.h b/qui/ImageSaveDialog.hpp similarity index 100% rename from qui/ImageSaveDialog.h rename to qui/ImageSaveDialog.hpp diff --git a/qui/ImageScaler.cxx b/qui/ImageScaler.cpp similarity index 99% rename from qui/ImageScaler.cxx rename to qui/ImageScaler.cpp index db5cac6..dbf9d58 100644 --- a/qui/ImageScaler.cxx +++ b/qui/ImageScaler.cpp @@ -7,7 +7,7 @@ //#include #include -#include "ImageScaler.h" +#include "ImageScaler.hpp" ImageScaler::ImageScaler(QWidget *parent) : QWidget(parent) diff --git a/qui/ImageScaler.h b/qui/ImageScaler.hpp similarity index 100% rename from qui/ImageScaler.h rename to qui/ImageScaler.hpp diff --git a/qui/PathScene.cxx b/qui/PathScene.cpp similarity index 99% rename from qui/PathScene.cxx rename to qui/PathScene.cpp index 175915e..3f0e335 100644 --- a/qui/PathScene.cxx +++ b/qui/PathScene.cpp @@ -1,5 +1,3 @@ -#include "PathScene.h" - #include #include #include @@ -13,8 +11,9 @@ #include #include -#include "alg/glsequence.h" -#include "mussa_exceptions.hh" +#include "qui/PathScene.hpp" +#include "alg/glsequence.hpp" +#include "mussa_exceptions.hpp" using namespace std; diff --git a/qui/PathScene.h b/qui/PathScene.hpp similarity index 96% rename from qui/PathScene.h rename to qui/PathScene.hpp index 4819c67..98e5ad5 100644 --- a/qui/PathScene.h +++ b/qui/PathScene.hpp @@ -5,10 +5,10 @@ #include #include #include +#include -#include "alg/mussa_class.hh" -#include "alg/glsequence.h" -#include "GL/gl.h" +#include "alg/mussa.hpp" +#include "alg/glsequence.hpp" class QMouseEvent; class QRubberBand; diff --git a/qui/PathWidget.cxx b/qui/PathWidget.cpp similarity index 95% rename from qui/PathWidget.cxx rename to qui/PathWidget.cpp index 3f32770..6d9565b 100644 --- a/qui/PathWidget.cxx +++ b/qui/PathWidget.cpp @@ -3,8 +3,8 @@ #include #include -#include "qui/PathScene.h" -#include "qui/PathWidget.h" +#include "qui/PathScene.hpp" +#include "qui/PathWidget.hpp" #include using namespace std; diff --git a/qui/PathWidget.h b/qui/PathWidget.hpp similarity index 100% rename from qui/PathWidget.h rename to qui/PathWidget.hpp diff --git a/qui/PathWindow.cxx b/qui/PathWindow.cpp similarity index 97% rename from qui/PathWindow.cxx rename to qui/PathWindow.cpp index 3048dec..5a7c47f 100644 --- a/qui/PathWindow.cxx +++ b/qui/PathWindow.cpp @@ -12,11 +12,11 @@ #include #include -#include "qui/PathScene.h" -#include "qui/PathWidget.h" -#include "qui/PathWindow.h" -#include "qui/ThresholdWidget.h" -#include "qui/ImageSaveDialog.h" +#include "qui/PathScene.hpp" +#include "qui/PathWidget.hpp" +#include "qui/PathWindow.hpp" +#include "qui/ThresholdWidget.hpp" +#include "qui/ImageSaveDialog.hpp" #include diff --git a/qui/PathWindow.h b/qui/PathWindow.hpp similarity index 100% rename from qui/PathWindow.h rename to qui/PathWindow.hpp diff --git a/qui/ThresholdWidget.cxx b/qui/ThresholdWidget.cpp similarity index 97% rename from qui/ThresholdWidget.cxx rename to qui/ThresholdWidget.cpp index 3974d95..5837b4b 100644 --- a/qui/ThresholdWidget.cxx +++ b/qui/ThresholdWidget.cpp @@ -1,9 +1,9 @@ -#include "qui/ThresholdWidget.h" - #include #include #include +#include "qui/ThresholdWidget.hpp" + // This is completely and totally derived from the Qt example // LCDRange.cpp ThresholdWidget::ThresholdWidget(QWidget *parent, int min, int max) diff --git a/qui/ThresholdWidget.h b/qui/ThresholdWidget.hpp similarity index 100% rename from qui/ThresholdWidget.h rename to qui/ThresholdWidget.hpp diff --git a/seqcomp.cxx b/seqcomp.cpp similarity index 100% rename from seqcomp.cxx rename to seqcomp.cpp -- 2.30.2