From 406d8843f5f5d9246d08fcb955ed9edee85920d7 Mon Sep 17 00:00:00 2001
From: Moritz Bunkus <moritz@bunkus.org>
Date: Wed, 11 Apr 2012 01:53:43 +0200
Subject: [PATCH] Move main_window files into their own sub-directory

---
 Rakefile                                             | 2 +-
 src/mkvtoolnix-gui/{ => main_window}/main_window.cpp | 2 +-
 src/mkvtoolnix-gui/{ => main_window}/main_window.h   | 0
 src/mkvtoolnix-gui/mkvtoolnix_gui.cpp                | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename src/mkvtoolnix-gui/{ => main_window}/main_window.cpp (96%)
 rename src/mkvtoolnix-gui/{ => main_window}/main_window.h (100%)

diff --git a/Rakefile b/Rakefile
index 3f59bf7f7..a9b3f701b 100644
--- a/Rakefile
+++ b/Rakefile
@@ -653,7 +653,7 @@ end
 if $build_mkvtoolnix_gui
   ui_files = FileList["src/mkvtoolnix-gui/forms/**/*.ui"].to_a
   ui_files.each do |ui|
-    file ui.ext('cpp').gsub(/forms\//, '') => ui.ext('h')
+    file ui.ext('cpp').gsub(/forms\/(.*)\.cpp$/, '\1/\1.cpp') => ui.ext('h')
   end
 
   Application.new("src/mkvtoolnix-gui/mkvtoolnix-gui").
diff --git a/src/mkvtoolnix-gui/main_window.cpp b/src/mkvtoolnix-gui/main_window/main_window.cpp
similarity index 96%
rename from src/mkvtoolnix-gui/main_window.cpp
rename to src/mkvtoolnix-gui/main_window/main_window.cpp
index 1dc242a70..d45fef6a5 100644
--- a/src/mkvtoolnix-gui/main_window.cpp
+++ b/src/mkvtoolnix-gui/main_window/main_window.cpp
@@ -1,7 +1,7 @@
 #include "common/common_pch.h"
 
 #include "common/qt.h"
-#include "mkvtoolnix-gui/main_window.h"
+#include "mkvtoolnix-gui/main_window/main_window.h"
 #include "mkvtoolnix-gui/forms/main_window.h"
 #include "mkvtoolnix-gui/util/file_identifier.h"
 #include "mkvtoolnix-gui/util/file_type_filter.h"
diff --git a/src/mkvtoolnix-gui/main_window.h b/src/mkvtoolnix-gui/main_window/main_window.h
similarity index 100%
rename from src/mkvtoolnix-gui/main_window.h
rename to src/mkvtoolnix-gui/main_window/main_window.h
diff --git a/src/mkvtoolnix-gui/mkvtoolnix_gui.cpp b/src/mkvtoolnix-gui/mkvtoolnix_gui.cpp
index c31d35652..4b26176bc 100644
--- a/src/mkvtoolnix-gui/mkvtoolnix_gui.cpp
+++ b/src/mkvtoolnix-gui/mkvtoolnix_gui.cpp
@@ -4,7 +4,7 @@
 
 #include "mkvtoolnix-gui/app.h"
 #include "mkvtoolnix-gui/mkvtoolnix_gui.h"
-#include "mkvtoolnix-gui/main_window.h"
+#include "mkvtoolnix-gui/main_window/main_window.h"
 
 int
 main(int argc,