Save temporary changes

[vlp.git] / src / net / lognet.cpp

diff --git a/src/net/lognet.cpp b/src/net/lognet.cpp
index 7a93bc0661b919dd188ef21523117900918aaadd..4c00e276ad149d01af2146a63ce18e7cbffb00b0 100644 (file)
--- a/src/net/lognet.cpp
+++ b/src/net/lognet.cpp
@@ -16,10 +16,10 @@
 #include <signal.h>
 #include <sys/stat.h>
 #include <string.h>
-#include <qlist.h>
-#include <qfile.h>
-#include <qstring.h>
-#include <qstringlist.h>
+#include <QtCore/qlist.h>
+#include <QtCore/qfile.h>
+#include <QtCore/qstring.h>
+#include <QtCore/qstringlist.h>
 #include <unistd.h>
 
 #include <libconfig.h>
@@ -91,9 +91,9 @@ public:
        char kername[256];
 
        /* List of the Interpeter slots */
-       QList<INTlink> Interpreters;
+       QList<INTlink*> Interpreters;
        /* List of the Network slots */ 
-       QList<NETlink> Links;
+       QList<NETlink*> Links;
 
        NETMOD(char*);
 
@@ -385,7 +385,7 @@ void NETMOD::check_node(int n, int sc)
                        strcpy(m.param.pstr, pomlink->addr);
                        break;
                }
-               pomlink = Links.next();
+               pomlink = Links.takeFirst();
        }
        write(sc, &m, sizeof(MESSAGE));
 }
@@ -418,7 +418,7 @@ void NETMOD::get_internal()
                if (nrset < pomlink->sock) {
                        nrset = pomlink->sock;
                }
-               pomlink = Interpreters.next();
+               pomlink = Interpreters.takeFirst();
        }
 
        if (select(nrset + 1, &readset, &writeset, 0, (struct timeval *)&tout) >
@@ -450,7 +450,7 @@ void NETMOD::get_internal()
                                        }
                                }
                        } /* ISSET */
-                       pomlink=Interpreters.next();
+                       pomlink=Interpreters.takeFirst();
                } // while
 
                /* Check internal socket */
@@ -508,7 +508,7 @@ void NETMOD::get_internal()
                                                pomlink = findINTlink(msg.param.pword[1]);
                                                if (pomlink != NULL) {
                                                        close(pomlink->sock);
-                                                       Interpreters.remove(pomlink);
+                                                       Interpreters.removeOne(pomlink);
                                                }
                                                };
                                                break;
@@ -614,7 +614,7 @@ void NETMOD::get_message(NETlink *lnk)
                                                msg.param.pword[1]);
                                        write_at_console(pomstr);
                                        ::close(lnk->sock);
-                                       Links.remove(lnk);
+                                       Links.removeOne(lnk);
                                        delete lnk;
                                        break;
                                case NET_PROPAGATE:
@@ -652,7 +652,7 @@ void NETMOD::remote_messages()
                                max = pomlink->sock;
                        }
                }
-               pomlink=Links.next();
+               pomlink=Links.takeFirst();
        }
 
        if (select(max + 1, &rset, &wset, 0, (struct timeval *)&tout) > 0) {
@@ -661,7 +661,7 @@ void NETMOD::remote_messages()
                        if (FD_ISSET(pomlink->sock,&rset)) {
                                get_message(pomlink);
                        }
-                       pomlink=Links.next();
+                       pomlink=Links.takeFirst();
                }
        }
 }
@@ -690,7 +690,7 @@ void NETMOD::doitall() {
                if (max < pomlink2->sock) {
                        max=pomlink2->sock;
                }
-               pomlink2 = Interpreters.next();
+               pomlink2 = Interpreters.takeFirst();
        }
        pomlink = Links.first();
        while (pomlink != NULL) {
@@ -700,7 +700,7 @@ void NETMOD::doitall() {
                                max = pomlink->sock;
                        }
                }
-               pomlink=Links.next();
+               pomlink=Links.takeFirst();
        }
 
        /* odczyt */
@@ -751,7 +751,7 @@ void NETMOD::doitall() {
                                        }
                                }
                        }/* ISSET */
-                       pomlink2 = Interpreters.next();
+                       pomlink2 = Interpreters.takeFirst();
                }/* while */
 
                /* Check internal socket */
@@ -806,7 +806,7 @@ void NETMOD::doitall() {
                                                pomlink2 = findINTlink(msg.param.pword[1]);
                                                if (pomlink2 != NULL) {
                                                        close(pomlink2->sock);
-                                                       Interpreters.remove(pomlink2);
+                                                       Interpreters.removeOne(pomlink2);
                                                }
                                                };
                                                break;
@@ -821,7 +821,7 @@ void NETMOD::doitall() {
                while (pomlink != NULL) {
                        if (FD_ISSET(pomlink->sock, &rset))
                                get_message(pomlink);
-                       pomlink=Links.next();
+                       pomlink=Links.takeFirst();
                }
        } // select 
 }
@@ -858,7 +858,7 @@ void NETMOD::connect_seq(char *a)
        while (pom != NULL) {
                if (strcmp(pom->addr, a) == 0)
                        return;
-               pom = Links.next();
+               pom = Links.takeFirst();
        }
        pom = new NETlink;
        strcpy(pom->addr, a);
@@ -912,7 +912,7 @@ void NETMOD::check_links()
                                        sock_reopen(pomlink);
                                }
                        } /* not connected */
-                       pomlink = Links.next();
+                       pomlink = Links.takeFirst();
                } /* while */
        } /* if */
        all_connected = TRUE;
@@ -922,7 +922,7 @@ void NETMOD::check_links()
                        all_connected = FALSE;
                        break;
                }
-               pomlink = Links.next();
+               pomlink = Links.takeFirst();
        }
 }
 
@@ -979,7 +979,7 @@ void NETMOD::send_to_all(MESSAGE *msg)
        pomlink = Links.first();
        while (pomlink != NULL) {
                write(pomlink->sock, msg, sizeof(MESSAGE));
-               pomlink = Links.next();
+               pomlink = Links.takeFirst();
        }
 }
 
@@ -1006,7 +1006,7 @@ void NETMOD::exit_sequence()
        pomlink = Links.first();
        while (pomlink != NULL) {
                ::close(pomlink->sock);
-               pomlink = Links.next();
+               pomlink = Links.takeFirst();
        }
        exit(0);
 }
@@ -1024,12 +1024,12 @@ void NETMOD::disconnect_seq()
        p = Links.first();
        while(p != NULL) {
                send_to_node(p, &m);
-               p=Links.next();
+               p=Links.takeFirst();
        }
        p = Links.first();
        while(p != NULL) {
                ::close(p->sock);
-               p = Links.next();
+               p = Links.takeFirst();
        }
        Links.clear();
 }
@@ -1042,7 +1042,7 @@ NETlink * NETMOD::findNETlink(int node)
                if (pomlink->node_number == node)
                        return pomlink;
 
-               pomlink = Links.next();
+               pomlink = Links.takeFirst();
        } 
        return pomlink;
 }
@@ -1054,7 +1054,7 @@ INTlink * NETMOD::findINTlink(int id)
        while(pomlink != NULL) {
                if (pomlink->ID == id)
                        return pomlink;
-               pomlink = Interpreters.next();
+               pomlink = Interpreters.takeFirst();
        }
        return pomlink;
 }
@@ -1215,7 +1215,7 @@ void NETMOD::conn_info(int sk)
                        write(sk, &m, sizeof(MESSAGE));
                        k = 0;
                }
-               pom = Links.next();
+               pom = Links.takeFirst();
        }
        if (k > 0) {
                m.param.pword[1] = k;