From 81c0ac18dbece99f99afb5b127e91162e1935de4 Mon Sep 17 00:00:00 2001
From: Diane Trout <diane@caltech.edu>
Date: Mon, 30 Oct 2006 22:47:45 +0000
Subject: [PATCH] move SubanalysisWindow code to a subdirectory

---
 qui/CMakeLists.txt                              | 8 ++++----
 qui/MussaAlignedWindow.hpp                      | 2 +-
 qui/MussaWindow.hpp                             | 2 +-
 qui/{ => subanalysis}/SequenceLocationModel.cpp | 2 +-
 qui/{ => subanalysis}/SequenceLocationModel.hpp | 1 +
 qui/{ => subanalysis}/SubanalysisWindow.cpp     | 2 +-
 qui/{ => subanalysis}/SubanalysisWindow.hpp     | 2 +-
 qui/test/TestSequenceLocationModel.hpp          | 2 +-
 8 files changed, 11 insertions(+), 10 deletions(-)
 rename qui/{ => subanalysis}/SequenceLocationModel.cpp (98%)
 rename qui/{ => subanalysis}/SequenceLocationModel.hpp (99%)
 rename qui/{ => subanalysis}/SubanalysisWindow.cpp (98%)
 rename qui/{ => subanalysis}/SubanalysisWindow.hpp (95%)

diff --git a/qui/CMakeLists.txt b/qui/CMakeLists.txt
index d4ab6db..e7339ad 100644
--- a/qui/CMakeLists.txt
+++ b/qui/CMakeLists.txt
@@ -21,8 +21,6 @@ SET(MOC_HEADERS
       IntAction.hpp           
       MussaAlignedWindow.hpp  
       MussaWindow.hpp
-      SequenceLocationModel.hpp
-      SubanalysisWindow.hpp
       ThresholdWidget.hpp
       ZoomWidget.hpp
       motif_editor/MotifModel.hpp
@@ -38,6 +36,8 @@ SET(MOC_HEADERS
       seqbrowser/SequenceBrowserSidebar.hpp
       seqbrowser/SequenceBrowserWidget.hpp
       seqbrowser/SequenceDescription.hpp
+      subanalysis/SequenceLocationModel.hpp
+      subanalysis/SubanalysisWindow.hpp
     )
 SET(GUI_SOURCES 
       ImageSaveDialog.cpp      
@@ -45,8 +45,6 @@ SET(GUI_SOURCES
       IntAction.cpp            
       MussaAlignedWindow.cpp
       MussaWindow.cpp
-      SequenceLocationModel.cpp
-      SubanalysisWindow.cpp
       ThresholdWidget.cpp
       ZoomWidget.cpp
       motif_editor/MotifEditor.cpp
@@ -64,6 +62,8 @@ SET(GUI_SOURCES
       seqbrowser/SequenceBrowserSidebar.cpp
       seqbrowser/SequenceBrowserWidget.cpp
       seqbrowser/SequenceDescription.cpp
+      subanalysis/SequenceLocationModel.cpp
+      subanalysis/SubanalysisWindow.cpp
      )
 SET(PY_SOURCES ../py/python.cpp)
 SET(RCCS ../icons.qrc)
diff --git a/qui/MussaAlignedWindow.hpp b/qui/MussaAlignedWindow.hpp
index 391ca54..28d43d6 100644
--- a/qui/MussaAlignedWindow.hpp
+++ b/qui/MussaAlignedWindow.hpp
@@ -14,7 +14,7 @@
 #include "qui/ZoomWidget.hpp"
 #include "qui/ThresholdWidget.hpp"
 #include "qui/seqbrowser/SequenceBrowserWidget.hpp"
-#include "qui/SubanalysisWindow.hpp"
+#include "qui/subanalysis/SubanalysisWindow.hpp"
 
 //! Show sequence alignments
 class MussaAlignedWindow : public QMainWindow
diff --git a/qui/MussaWindow.hpp b/qui/MussaWindow.hpp
index d848fea..8afa91b 100644
--- a/qui/MussaWindow.hpp
+++ b/qui/MussaWindow.hpp
@@ -16,7 +16,7 @@
 #include "qui/motif_editor/MotifEditor.hpp"
 #include "qui/mussa_setup_dialog/MussaSetupDialog.hpp"
 #include "qui/seqbrowser/SequenceBrowserWidget.hpp"
-#include "qui/SubanalysisWindow.hpp"
+#include "qui/subanalysis/SubanalysisWindow.hpp"
 #include "qui/ThresholdWidget.hpp"
 #include "qui/ZoomWidget.hpp"
 
diff --git a/qui/SequenceLocationModel.cpp b/qui/subanalysis/SequenceLocationModel.cpp
similarity index 98%
rename from qui/SequenceLocationModel.cpp
rename to qui/subanalysis/SequenceLocationModel.cpp
index a4e9c71..22f5d08 100644
--- a/qui/SequenceLocationModel.cpp
+++ b/qui/subanalysis/SequenceLocationModel.cpp
@@ -1,4 +1,4 @@
-#include "qui/SequenceLocationModel.hpp"
+#include "qui/subanalysis/SequenceLocationModel.hpp"
 
 SequenceLocationModel::SequenceLocationModel(QObject *parent) 
   : QAbstractTableModel(parent)
diff --git a/qui/SequenceLocationModel.hpp b/qui/subanalysis/SequenceLocationModel.hpp
similarity index 99%
rename from qui/SequenceLocationModel.hpp
rename to qui/subanalysis/SequenceLocationModel.hpp
index 6b6a924..100fd46 100644
--- a/qui/SequenceLocationModel.hpp
+++ b/qui/subanalysis/SequenceLocationModel.hpp
@@ -1,6 +1,7 @@
 #ifndef _SEQUENCE_LOCATION_MODEL_HPP_
 #define _SEQUENCE_LOCATION_MODEL_HPP_
 
+#include <QObject>
 #include <QAbstractTableModel>
 #include "alg/sequence_location.hpp"
 #include <vector>
diff --git a/qui/SubanalysisWindow.cpp b/qui/subanalysis/SubanalysisWindow.cpp
similarity index 98%
rename from qui/SubanalysisWindow.cpp
rename to qui/subanalysis/SubanalysisWindow.cpp
index 99dfb69..056ba9b 100644
--- a/qui/SubanalysisWindow.cpp
+++ b/qui/subanalysis/SubanalysisWindow.cpp
@@ -1,4 +1,4 @@
-#include "qui/SubanalysisWindow.hpp"
+#include "qui/subanalysis/SubanalysisWindow.hpp"
 #include "qui/MussaWindow.hpp"
 
 #include "mussa_exceptions.hpp"
diff --git a/qui/SubanalysisWindow.hpp b/qui/subanalysis/SubanalysisWindow.hpp
similarity index 95%
rename from qui/SubanalysisWindow.hpp
rename to qui/subanalysis/SubanalysisWindow.hpp
index 9d9ef73..ce9f62c 100644
--- a/qui/SubanalysisWindow.hpp
+++ b/qui/subanalysis/SubanalysisWindow.hpp
@@ -7,7 +7,7 @@
 #include <QStringList>
 #include <QWidget>
 
-#include "qui/SequenceLocationModel.hpp"
+#include "qui/subanalysis/SequenceLocationModel.hpp"
 #include "alg/mussa.hpp"
 
 class SubanalysisWindow : public QWidget
diff --git a/qui/test/TestSequenceLocationModel.hpp b/qui/test/TestSequenceLocationModel.hpp
index a1a774e..153a4f5 100644
--- a/qui/test/TestSequenceLocationModel.hpp
+++ b/qui/test/TestSequenceLocationModel.hpp
@@ -1,6 +1,6 @@
 #ifndef _TEST_SEQUENCE_LOCATION_MODEL_HPP_
 #define _TEST_SEQUENCE_LOCATION_MODEL_HPP_
-#include "qui/SequenceLocationModel.hpp"
+#include "qui/subanalysis/SequenceLocationModel.hpp"
 #include "alg/sequence_location.hpp"
 #include "alg/sequence.hpp"
 
-- 
2.30.2