[med-svn] [SCM] aghermann branch, master, updated. f0d4c0fd35bf09e7dff56ddb9a2d798ae916c2ef

[Andrei Zavada]

The following commit has been merged in the master branch:
commit 32dc70f2650ae201236d3fdd0653a1c9735f0bdc
Author: Andrei Zavada <johnhommer at gmail.com>
Date:   Thu Jan 24 20:08:17 2013 +0200

    ongoing mighty code movement in sf

diff --git a/src/ui/sf/dialogs/Makefile.am b/src/ui/sf/dialogs/Makefile.am
new file mode 100644
index 0000000..ed46d5d
--- /dev/null
+++ b/src/ui/sf/dialogs/Makefile.am
@@ -0,0 +1,38 @@
+AM_CXXFLAGS := \
+	-std=c++11 -fno-rtti -Wdeprecated-declarations -Wall \
+	$(GTK_CFLAGS)  $(UNIQUE_CFLAGS)  $(CAIRO_CFLAGS) $(LIBCONFIGXX_CFLAGS) \
+	-DPACKAGE_DATADIR=\"$(datadir)\" \
+	$(OPENMP_CXXFLAGS) \
+	-I$(top_srcdir)/src
+
+noinst_LIBRARIES := liba.a
+
+liba_a_SOURCES := \
+	artifacts.cc \
+	artifacts-construct.cc \
+	artifacts_cb.cc \
+	filters.hh \
+	filters.cc \
+	filters-construct.cc \
+	filters_cb.cc \
+	patterns.hh \
+	patterns.cc \
+	patterns-construct.cc \
+	patterns-draw.cc \
+	patterns-enumerate.cc \
+	patterns_cb.cc \
+	phasediff.cc \
+	phasediff-construct.cc \
+	phasediff_cb.cc
+
+if DO_PCH
+BUILT_SOURCES = \
+	artifacts.hh.gch \
+	patterns.hh.gch \
+	filters.hh.gch \
+	phasediff.hh.gch
+%.hh.gch: %.hh
+	$(CXXCOMPILE) -c $<
+CLEANFILES := \
+	$(BUILT_SOURCES)
+endif
diff --git a/src/ui/sf/sf-artifacts.cc b/src/ui/sf/dialogs/artifacts.cc
similarity index 94%
rename from src/ui/sf/sf-artifacts.cc
rename to src/ui/sf/dialogs/artifacts.cc
index 3e6547f..34d0464 100644
--- a/src/ui/sf/sf-artifacts.cc
+++ b/src/ui/sf/dialogs/artifacts.cc
@@ -1,6 +1,5 @@
-// ;-*-C++-*-
 /*
- *       File name:  ui/sf/sf-artifacts.cc
+ *       File name:  ui/sf/dialogs/artifacts.cc
  *         Project:  Aghermann
  *          Author:  Andrei Zavada <johnhommer at gmail.com>
  * Initial version:  2012-10-05
@@ -65,5 +64,7 @@ populate_mSFADProfiles()
 }
 
 
-
-// eof
+// Local Variables:
+// Mode: c++
+// indent-tabs-mode: 8
+// End:
diff --git a/src/ui/sf/sf-artifacts_cb.cc b/src/ui/sf/dialogs/artifacts_cb.cc
similarity index 99%
rename from src/ui/sf/sf-artifacts_cb.cc
rename to src/ui/sf/dialogs/artifacts_cb.cc
index e19ab80..31fe8c8 100644
--- a/src/ui/sf/sf-artifacts_cb.cc
+++ b/src/ui/sf/dialogs/artifacts_cb.cc
@@ -1,6 +1,6 @@
 // ;-*-C++-*-
 /*
- *       File name:  ui/sf/sf-artifacts_cb.cc
+ *       File name:  ui/sf/dialogs/artifacts_cb.cc
  *         Project:  Aghermann
  *          Author:  Andrei Zavada <johnhommer at gmail.com>
  * Initial version:  2012-10-05
diff --git a/src/ui/sf/sf-filter.cc b/src/ui/sf/dialogs/sf-filter.cc
similarity index 100%
rename from src/ui/sf/sf-filter.cc
rename to src/ui/sf/dialogs/sf-filter.cc
diff --git a/src/ui/sf/sf-filter_cb.cc b/src/ui/sf/dialogs/sf-filter_cb.cc
similarity index 100%
rename from src/ui/sf/sf-filter_cb.cc
rename to src/ui/sf/dialogs/sf-filter_cb.cc
diff --git a/src/ui/sf/sf-patterns-construct.cc b/src/ui/sf/dialogs/sf-patterns-construct.cc
similarity index 100%
rename from src/ui/sf/sf-patterns-construct.cc
rename to src/ui/sf/dialogs/sf-patterns-construct.cc
diff --git a/src/ui/sf/sf-patterns-draw.cc b/src/ui/sf/dialogs/sf-patterns-draw.cc
similarity index 100%
rename from src/ui/sf/sf-patterns-draw.cc
rename to src/ui/sf/dialogs/sf-patterns-draw.cc
diff --git a/src/ui/sf/sf-patterns-enumerate.cc b/src/ui/sf/dialogs/sf-patterns-enumerate.cc
similarity index 100%
rename from src/ui/sf/sf-patterns-enumerate.cc
rename to src/ui/sf/dialogs/sf-patterns-enumerate.cc
diff --git a/src/ui/sf/sf-patterns.cc b/src/ui/sf/dialogs/sf-patterns.cc
similarity index 100%
rename from src/ui/sf/sf-patterns.cc
rename to src/ui/sf/dialogs/sf-patterns.cc
diff --git a/src/ui/sf/sf-patterns.hh b/src/ui/sf/dialogs/sf-patterns.hh
similarity index 100%
rename from src/ui/sf/sf-patterns.hh
rename to src/ui/sf/dialogs/sf-patterns.hh
diff --git a/src/ui/sf/sf-patterns_cb.cc b/src/ui/sf/dialogs/sf-patterns_cb.cc
similarity index 100%
rename from src/ui/sf/sf-patterns_cb.cc
rename to src/ui/sf/dialogs/sf-patterns_cb.cc
diff --git a/src/ui/sf/sf-phasediff.cc b/src/ui/sf/dialogs/sf-phasediff.cc
similarity index 100%
rename from src/ui/sf/sf-phasediff.cc
rename to src/ui/sf/dialogs/sf-phasediff.cc
diff --git a/src/ui/sf/sf-phasediff_cb.cc b/src/ui/sf/dialogs/sf-phasediff_cb.cc
similarity index 100%
rename from src/ui/sf/sf-phasediff_cb.cc
rename to src/ui/sf/dialogs/sf-phasediff_cb.cc
diff --git a/src/ui/sf/sf-phasic-events.cc b/src/ui/sf/dialogs/sf-phasic-events.cc
similarity index 100%
rename from src/ui/sf/sf-phasic-events.cc
rename to src/ui/sf/dialogs/sf-phasic-events.cc

-- 
Sleep experiment manager