dlugolecki.net.pl
Dziennik
Polecane
Software
projects
/
vlp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Restructure code
[vlp.git]
/
src
/
kernel
/
kernel.h
diff --git
a/src/kernel/kernel.h
b/src/kernel/kernel.h
index eadf975166aab0358ba230e018c99e812b899ae9..7213b461a9a54d996923b19cfe45a4785b588cfb 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 <QtGui/QListWidget>
#include <QtGui/QTextEdit>
#include <QtCore/QSocketNotifier>
+#include <QtCore/QDir>
#include "comm.h"
#include "comm.h"
-#include "kernelwindow.h"
+#include "
ui/
kernelwindow.h"
#define GPATH "loggr"
#define IPATH "logi"
#define GPATH "loggr"
#define IPATH "logi"
@@
-54,6
+55,9
@@
#define NORM_COL 2
#define NORM_COL 2
+namespace loglan {
+namespace vlp {
+
/**
* Interpreter slot
*/
/**
* Interpreter slot
*/
@@
-82,10
+86,14
@@
public:
class ConnectEntry {
public:
char addr[256];
class ConnectEntry {
public:
char addr[256];
-
+
ConnectEntry(char *s) {
strcpy(addr, s);
};
ConnectEntry(char *s) {
strcpy(addr, s);
};
+
+ ConnectEntry(const char *s) {
+ strcpy(addr, s);
+ };
};
};
@@
-100,13
+108,11
@@
public:
int NodeNumber;
int ConType;
int NodeNumber;
int ConType;
- QKernel();
+ QKernel(
int argc, char **argv
);
- void WriteMessage(char* msg);
- void InitMessage();
+ void WriteMessage(const char * msg);
public slots:
public slots:
- void n_impl();
void NetMessage();
void IntMessage(int);
void NetMessage();
void IntMessage(int);
@@
-138,10
+144,13
@@
private:
int net_sock;
int freeINTid;
QSocketNotifier *Net_Notify;
int net_sock;
int freeINTid;
QSocketNotifier *Net_Notify;
- char HomeDir[255];
+ QDir homeDir;
+ char myargs[5][255];
bool info_messages;
bool info_messages;
- void LoadConfig(char *);
+ void loadConfig(const QString &fname);
+ void loadConfig(const char *);
+
void RunGraphModule(char*);
void RunNetModule();
InterpEntry *findINTbySocket(int);
void RunGraphModule(char*);
void RunNetModule();
InterpEntry *findINTbySocket(int);
@@
-156,6
+165,13
@@
private:
*/
void setLocked(bool locked);
*/
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();
private slots:
void on_actionExecute_triggered();
void on_actionKill_triggered();
@@
-174,4
+190,7
@@
private slots:
void on_actionUnlock_console_triggered();
};
void on_actionUnlock_console_triggered();
};
+}
+}
+
#endif /* VLP_KERNEL_H */
#endif /* VLP_KERNEL_H */