Restructure code

diff --git a/Makefile.am b/Makefile.am
index c074aebfc87505ffeed1025c732ef1f2126e7985..566e1c97e596b166841fe173b524c96814cf7f44 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -68,35 +68,35 @@ clean-lognet-extra:
 bin_logker_SOURCES = \
        src/kernel/kernel.cpp \
        src/kernel/kernel.moc.cpp \
-       src/kernel/lock.cpp \
-       src/kernel/options.cpp \
-       src/kernel/options.moc.cpp \
-       src/kernel/kill_interpreter_dialog.cpp \
-       src/kernel/connect_dialog.cpp \
+       src/kernel/LockDialog.cpp \
+       src/kernel/OptionsDialog.cpp \
+       src/kernel/OptionsDialog.moc.cpp \
+       src/kernel/KillDialog.cpp \
+       src/kernel/ConnectDialog.cpp \
        src/global/vlp/config.cpp
 bin_logker_CPPFLAGS = $(bin_logker_CFLAGS)
 bin_logker_LDADD = $(bin_logker_LIBS) -lconfig++ -lX11
 bin_logkerdir = src/kernel
 bin_logker_HEADERS = \
        src/kernel/kernel.h \
-       src/kernel/lock.h \
-       src/kernel/options.h \
-       src/kernel/kill_interpreter_dialog.h \
-       src/kernel/connect_dialog.h \
+       src/kernel/LockDialog.h \
+       src/kernel/OptionsDialog.h \
+       src/kernel/KillDialog.h \
+       src/kernel/ConnectDialog.h \
        src/global/vlp/config.h
 src/kernel/kernel.moc.cpp: \
                src/kernel/kernel.h \
-               src/kernel/ui/kernelwindow.h \
+               src/kernel/ui/KernelWindow.h \
                src/kernel/ui/dialogs/LockDialog.h \
                src/kernel/ui/dialogs/OptionsDialog.h \
                src/kernel/ui/dialogs/KillDialog.h \
                src/kernel/ui/dialogs/ConnectDialog.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-qt4 src/kernel/OptionsDialog.h -o src/kernel/OptionsDialog.moc.cpp
 #      $(MOC) -i src/kernel/kernel.cpp -o src/kernel/kernel.moc
 
-src/kernel/ui/kernelwindow.h:
-       uic src/kernel/ui/kernelwindow.ui -o src/kernel/ui/kernelwindow.h
+src/kernel/ui/KernelWindow.h:
+       uic src/kernel/ui/KernelWindow.ui -o src/kernel/ui/KernelWindow.h
 
 src/kernel/ui/dialogs/LockDialog.h:
        uic src/kernel/ui/dialogs/LockDialog.ui -o src/kernel/ui/dialogs/LockDialog.h

diff --git a/src/kernel/connect_dialog.cpp b/src/kernel/ConnectDialog.cpp
similarity index 91%
rename from src/kernel/connect_dialog.cpp
rename to src/kernel/ConnectDialog.cpp
index 26b4a83d1bbf5b2825c531f8dd2da5675f1fc7b4..5dc6fbd0927fff80f2e0a124292136dfa93de9dc 100644 (file)
--- a/src/kernel/connect_dialog.cpp
+++ b/src/kernel/ConnectDialog.cpp
@@ -1,6 +1,6 @@
 #include <QtGui/QDialog>
 
-#include "connect_dialog.h"
+#include "ConnectDialog.h"
 
 namespace loglan {
 namespace vlp {

diff --git a/src/kernel/connect_dialog.h b/src/kernel/ConnectDialog.h
similarity index 100%
rename from src/kernel/connect_dialog.h
rename to src/kernel/ConnectDialog.h

diff --git a/src/kernel/kill_interpreter_dialog.cpp b/src/kernel/KillDialog.cpp
similarity index 90%
rename from src/kernel/kill_interpreter_dialog.cpp
rename to src/kernel/KillDialog.cpp
index 9e2e823426d2a57024843d28f1def25bffa96111..1c2683e5fcd92b6738a97708a34634781d9374b1 100644 (file)
--- a/src/kernel/kill_interpreter_dialog.cpp
+++ b/src/kernel/KillDialog.cpp
@@ -1,6 +1,6 @@
 #include <QtGui/QDialog>
 
-#include "kill_interpreter_dialog.h"
+#include "KillDialog.h"
 
 namespace loglan {
 namespace vlp {

diff --git a/src/kernel/kill_interpreter_dialog.h b/src/kernel/KillDialog.h
similarity index 100%
rename from src/kernel/kill_interpreter_dialog.h
rename to src/kernel/KillDialog.h

diff --git a/src/kernel/lock.cpp b/src/kernel/LockDialog.cpp
similarity index 93%
rename from src/kernel/lock.cpp
rename to src/kernel/LockDialog.cpp
index 6a4fe08219ddb06e915e2037d1940a907f1ea6c3..f49aa75ef030a55609eab380d807a3c686807af6 100644 (file)
--- a/src/kernel/lock.cpp
+++ b/src/kernel/LockDialog.cpp
@@ -1,6 +1,6 @@
 #include <QtGui/QDialog>
 
-#include "lock.h"
+#include "LockDialog.h"
 
 namespace loglan {
 namespace vlp {

diff --git a/src/kernel/lock.h b/src/kernel/LockDialog.h
similarity index 100%
rename from src/kernel/lock.h
rename to src/kernel/LockDialog.h

diff --git a/src/kernel/options.cpp b/src/kernel/OptionsDialog.cpp
similarity index 99%
rename from src/kernel/options.cpp
rename to src/kernel/OptionsDialog.cpp
index e3d20b77595f1e0349927bae6ecc5bb0e562631a..b7261cd639835eefce7dd81c7d50b738fcbfd0d9 100644 (file)
--- a/src/kernel/options.cpp
+++ b/src/kernel/OptionsDialog.cpp
@@ -2,7 +2,7 @@
 #include <libconfig.h>
 
 #include "vlp/config.h"
-#include "options.h"
+#include "OptionsDialog.h"
 
 namespace loglan {
 namespace vlp {

diff --git a/src/kernel/options.h b/src/kernel/OptionsDialog.h
similarity index 100%
rename from src/kernel/options.h
rename to src/kernel/OptionsDialog.h

diff --git a/src/kernel/kernel.cpp b/src/kernel/kernel.cpp
index 6e9beec81fa6aa43de734df0c83b51bbad0055fd..31cb74d1a3277635f1b2a51fa1e02c7e5477540d 100644 (file)
--- a/src/kernel/kernel.cpp
+++ b/src/kernel/kernel.cpp
@@ -65,11 +65,11 @@
 #include <X11/Xlib.h>
 
 #include "kernel.h"
-#include "ui/kernelwindow.h"
-#include "lock.h"
-#include "options.h"
-#include "kill_interpreter_dialog.h"
-#include "connect_dialog.h"
+#include "ui/KernelWindow.h"
+#include "LockDialog.h"
+#include "OptionsDialog.h"
+#include "KillDialog.h"
+#include "ConnectDialog.h"
 
 #include "vlp/config.h"
 

diff --git a/src/kernel/kernel.h b/src/kernel/kernel.h
index 7213b461a9a54d996923b19cfe45a4785b588cfb..aaef05d22609964027ed47122f8b7263984d17b1 100644 (file)
--- a/src/kernel/kernel.h
+++ b/src/kernel/kernel.h
@@ -40,7 +40,7 @@
 
 #include "comm.h"
 
-#include "ui/kernelwindow.h"
+#include "ui/KernelWindow.h"
 
 #define GPATH "loggr"
 #define IPATH "logi"

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