Restructure code

[vlp.git] / src / kernel / kernel.cpp

diff --git a/src/kernel/kernel.cpp b/src/kernel/kernel.cpp
index c943c48930500408c4d83df06927a861b9ead1e4..6e9beec81fa6aa43de734df0c83b51bbad0055fd 100644 (file)
--- a/src/kernel/kernel.cpp
+++ b/src/kernel/kernel.cpp
@@ -77,6 +77,9 @@
 #include "../../config.h"
 
 
+namespace loglan {
+namespace vlp {
+
 char CharLine[25] = "________________________";
 
 /**
@@ -408,7 +411,7 @@ void QKernel::on_actionConnect_triggered()
 {
        MESSAGE m;
 
-       ConnectDialog dialog(this);
+       dialog::ConnectDialog dialog(this);
        dialog.setWindowTitle("IP Address:");
 
        if (dialog.exec()) {
@@ -524,7 +527,7 @@ void QKernel::on_actionMessage_triggered()
  */
 void QKernel::on_actionKill_triggered()
 {
-       KillInterpreterDialog dialog(this);
+       dialog::KillInterpreterDialog dialog(this);
        dialog.setWindowTitle("Kill interpreter");
 
        if (dialog.exec()) {
@@ -780,7 +783,7 @@ void QKernel::on_actionInfo_messages_triggered()
  */
 void QKernel::on_actionOptions_triggered()
 {
-       OptionsDialog optionsDialog(getConfigFilePath(), this);
+       dialog::OptionsDialog optionsDialog(getConfigFilePath(), this);
        if (optionsDialog.exec()) {
                optionsDialog.saveConfig(getConfigFilePath());
 
@@ -795,7 +798,7 @@ void QKernel::on_actionOptions_triggered()
  */
 void QKernel::on_actionLock_console_triggered()
 {
-       LockDialog lockDialog(this);
+       dialog::LockDialog lockDialog(this);
 
        if (lockDialog.exec()) {
                QString password = lockDialog.getPassword();
@@ -829,7 +832,7 @@ void QKernel::on_actionLock_console_triggered()
  */
 void QKernel::on_actionUnlock_console_triggered()
 {
-       LockDialog lockDialog(this);
+       dialog::LockDialog lockDialog(this);
 
        if (lockDialog.exec()) {
                QString password = lockDialog.getPassword();
@@ -1110,6 +1113,9 @@ void QKernel::on_actionInfo_triggered()
        wait_for_info = TRUE;
 }
 
+}
+}
+
 /**
  * Program main function
  * All program arguments but the first one (argv[0]: program name) are saved and
@@ -1122,8 +1128,8 @@ int main(int argc, char **argv)
        XInitThreads();
 
        QApplication * app = new QApplication(argc, argv);
-       QKernel kernel(argc, argv);
+       loglan::vlp::QKernel kernel(argc, argv);
        kernel.show();
        
        return app->exec();
-}
+}
\ No newline at end of file