Restore compilation of loggraph, extract code layout of kernel's message dialog into...

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

diff --git a/src/kernel/kernel.h b/src/kernel/kernel.h
index e0843cb09fed52fbc9a7c2965c3847353f76c9cc..aaef05d22609964027ed47122f8b7263984d17b1 100644 (file)
--- a/src/kernel/kernel.h
+++ b/src/kernel/kernel.h
@@ -36,10 +36,11 @@
 #include <QtGui/QListWidget>
 #include <QtGui/QTextEdit>
 #include <QtCore/QSocketNotifier>
+#include <QtCore/QDir>
 
 #include "comm.h"
 
-#include "kernelwindow.h"
+#include "ui/KernelWindow.h"
 
 #define GPATH "loggr"
 #define IPATH "logi"
@@ -54,6 +55,9 @@
 #define NORM_COL       2
 
 
+namespace loglan {
+namespace vlp {
+
 /**
  * Interpreter slot
  */
@@ -82,10 +86,14 @@ public:
 class ConnectEntry {
 public:
        char addr[256];
-       
+
        ConnectEntry(char *s) {
                strcpy(addr, s);
        };
+
+       ConnectEntry(const char *s) {
+               strcpy(addr, s);
+       };
 };
 
 
@@ -95,26 +103,16 @@ public:
 class QKernel : public QMainWindow, private Ui::KernelWindow {
        Q_OBJECT
 public:
-       QTextEdit *desktop;
-       QMenuBar *bar;
-       QMenu *programMenu;
-       QMenu *machineMenu;
        QMenu *toolsMenu;
        char progdir[256];
        int NodeNumber;
        int ConType;
 
-       QKernel();
+       QKernel(int argc, char **argv);
 
-       virtual void resizeEvent(QResizeEvent *ev);
-
-       void WriteMessage(char* msg);
-       void InitMessage();
+       void WriteMessage(const char * msg);
 
 public slots:
-       void n_impl();
-       void AddAddress();
-       void DelAddress();
        void NetMessage();
        void IntMessage(int);
 
@@ -124,7 +122,6 @@ protected:
 private:
        QList<InterpEntry*> Interpreters;
        QList<ConnectEntry*> ConnectList;
-       QListWidget *connections;
        
        /**
         * number of working interpreters
@@ -143,15 +140,17 @@ private:
        bool synchro;
        bool wait_for_info;
        char LockPasswd[25];
-       QAction * quitAction;
        
        int net_sock;
        int freeINTid;
        QSocketNotifier *Net_Notify;
-       char HomeDir[255];
+       QDir homeDir;
+       char myargs[5][255];
        bool info_messages;
 
-       void LoadConfig(char *);
+       void loadConfig(const QString &fname);
+       void loadConfig(const char *);
+
        void RunGraphModule(char*);
        void RunNetModule();
        InterpEntry *findINTbySocket(int);
@@ -166,6 +165,13 @@ private:
         */
        void setLocked(bool locked);
 
+       QString getConfigFilePath();
+       const char * getHomeDir();
+       const char * getRemoteDir();
+
+       const char * getNetModuleSocket();
+       const char * getGraphModuleSocket();
+
 private slots:
        void on_actionExecute_triggered();
        void on_actionKill_triggered();
@@ -184,4 +190,7 @@ private slots:
        void on_actionUnlock_console_triggered();
 };
 
+}
+}
+
 #endif /* VLP_KERNEL_H */