From efb9fd8fce0c1c80c05e2206893ca197b7999ca3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rafa=C5=82=20D=C5=82ugo=C5=82=C4=99cki?= Date: Mon, 25 Jan 2016 01:32:36 +0100 Subject: [PATCH] Move ui code into separate directory --- Makefile.am | 20 ++++++++++---------- src/kernel/kernel.cpp | 2 +- src/kernel/kernel.h | 2 +- src/kernel/lock.h | 2 +- src/kernel/options.h | 2 +- src/kernel/{ => ui}/kernelwindow.ui | 0 src/kernel/{ => ui}/lock_dialog.ui | 0 src/kernel/{ => ui}/optionsdialog.ui | 0 8 files changed, 14 insertions(+), 14 deletions(-) rename src/kernel/{ => ui}/kernelwindow.ui (100%) rename src/kernel/{ => ui}/lock_dialog.ui (100%) rename src/kernel/{ => ui}/optionsdialog.ui (100%) diff --git a/Makefile.am b/Makefile.am index f555025..3002f3a 100644 --- 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 e92118e..3e3d41b 100644 --- a/src/kernel/kernel.cpp +++ b/src/kernel/kernel.cpp @@ -65,7 +65,7 @@ #include #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 89260cc..96e6ced 100644 --- 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 a940d4b..152137f 100644 --- a/src/kernel/lock.h +++ b/src/kernel/lock.h @@ -3,7 +3,7 @@ #include -#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 e574b08..ecb73e3 100644 --- a/src/kernel/options.h +++ b/src/kernel/options.h @@ -3,7 +3,7 @@ #include -#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 -- 2.30.2