Move ui code into separate directory

diff --git a/Makefile.am b/Makefile.am
index f55502580a0a963305d0f5dba1f32e536c55e6ba..3002f3ac34cbabb4fee2d6e518c67dca8a29154e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -76,27 +76,27 @@ bin_logker_HEADERS = \
        src/kernel/kernel.h \
        src/kernel/lock.h \
        src/kernel/options.h
-src/kernel/kernel.moc.cpp: src/kernel/kernel.h src/kernel/kernelwindow.h src/kernel/lock_dialog.h src/kernel/optionsdialog.h
+src/kernel/kernel.moc.cpp: src/kernel/kernel.h src/kernel/ui/kernelwindow.h src/kernel/ui/lock_dialog.h src/kernel/ui/optionsdialog.h
        moc-qt4 src/kernel/kernel.h -o src/kernel/kernel.moc.cpp
        moc-qt4 src/kernel/options.h -o src/kernel/options.moc.cpp
 #      $(MOC) -i src/kernel/kernel.cpp -o src/kernel/kernel.moc
 
-src/kernel/kernelwindow.h:
-       uic src/kernel/kernelwindow.ui -o src/kernel/kernelwindow.h
+src/kernel/ui/kernelwindow.h:
+       uic src/kernel/ui/kernelwindow.ui -o src/kernel/ui/kernelwindow.h
 
-src/kernel/lock_dialog.h:
-       uic src/kernel/lock_dialog.ui -o src/kernel/lock_dialog.h
+src/kernel/ui/lock_dialog.h:
+       uic src/kernel/ui/lock_dialog.ui -o src/kernel/ui/lock_dialog.h
 
-src/kernel/optionsdialog.h:
-       uic src/kernel/optionsdialog.ui -o src/kernel/optionsdialog.h
+src/kernel/ui/optionsdialog.h:
+       uic src/kernel/ui/optionsdialog.ui -o src/kernel/ui/optionsdialog.h
 
 
 clean-logker-extra:
        rm -f src/kernel/*.moc
        rm -f src/kernel/*.moc.cpp
-       rm -f src/kernel/kernelwindow.h
-       rm -f src/kernel/lock_dialog.h
-       rm -f src/kernel/optionsdialog.h
+       rm -f src/kernel/ui/kernelwindow.h
+       rm -f src/kernel/ui/lock_dialog.h
+       rm -f src/kernel/ui/optionsdialog.h
        rm -f bin/logker
        
 bin_logint_SOURCES = \

diff --git a/src/kernel/kernel.cpp b/src/kernel/kernel.cpp
index e92118e76024e401fc528155685bb91a21dbcf38..3e3d41be93e347d862ae373e4732c0d4f19fe6bb 100644 (file)
--- a/src/kernel/kernel.cpp
+++ b/src/kernel/kernel.cpp
@@ -65,7 +65,7 @@
 #include <X11/Xlib.h>
 
 #include "kernel.h"
-#include "kernelwindow.h"
+#include "ui/kernelwindow.h"
 #include "lock.h"
 #include "options.h"
 

diff --git a/src/kernel/kernel.h b/src/kernel/kernel.h
index 89260cc2334245a97d70453cf17e6478c7c9fb10..96e6cedf99d4304518ac4b3549a83f967b25fc44 100644 (file)
--- a/src/kernel/kernel.h
+++ b/src/kernel/kernel.h
@@ -40,7 +40,7 @@
 
 #include "comm.h"
 
-#include "kernelwindow.h"
+#include "ui/kernelwindow.h"
 
 #define GPATH "loggr"
 #define IPATH "logi"

diff --git a/src/kernel/lock.h b/src/kernel/lock.h
index a940d4b69f3450997336e3eb319aecd0d06a5c88..152137fee719f277a33db7375c2ff37b3332008e 100644 (file)
--- a/src/kernel/lock.h
+++ b/src/kernel/lock.h
@@ -3,7 +3,7 @@
 
 #include <QtGui/QDialog>
 
-#include "lock_dialog.h"
+#include "ui/lock_dialog.h"
 
 /**
  * Lock Dialog class

diff --git a/src/kernel/options.h b/src/kernel/options.h
index e574b0805d537eccf77b02274ee9ff79cb1c2da3..ecb73e317e0e505d58de1ab185f32820be2c85ee 100644 (file)
--- a/src/kernel/options.h
+++ b/src/kernel/options.h
@@ -3,7 +3,7 @@
 
 #include <QtGui/QDialog>
 
-#include "optionsdialog.h"
+#include "ui/optionsdialog.h"
 
 /**
  * Options Dialog class

diff --git a/src/kernel/kernelwindow.ui b/src/kernel/ui/kernelwindow.ui
similarity index 100%
rename from src/kernel/kernelwindow.ui
rename to src/kernel/ui/kernelwindow.ui

diff --git a/src/kernel/lock_dialog.ui b/src/kernel/ui/lock_dialog.ui
similarity index 100%
rename from src/kernel/lock_dialog.ui
rename to src/kernel/ui/lock_dialog.ui

diff --git a/src/kernel/optionsdialog.ui b/src/kernel/ui/optionsdialog.ui
similarity index 100%
rename from src/kernel/optionsdialog.ui
rename to src/kernel/ui/optionsdialog.ui