Save temporary changes

[vlp.git] / src / graph / loggraph.cpp

diff --git a/src/graph/loggraph.cpp b/src/graph/loggraph.cpp
index 461669fe881fe64a388048a75a1662efb451d9c4..6053ebece6f720968791f82c4ccf82b2cdd05214 100644 (file)
--- a/src/graph/loggraph.cpp
+++ b/src/graph/loggraph.cpp
@@ -7,20 +7,21 @@
 
 //#include <qwindow.h>
 */
-#include <qpainter.h>
-#include <qprinter.h>
-#include <qpushbt.h>
-#include <qradiobt.h>
-#include <qbttngrp.h>
-#include <qapp.h>
+#include <QtGui/qpainter.h>
+#include <QtGui/qprinter.h>
+#include <QtGui/qpushbutton.h>
+#include <QtGui/qradiobutton.h>
+#include <QtGui/qbuttongroup.h>
+#include <QtGui/qapplication.h>
+#include <QtGui/qframe.h>
 #include <math.h>
-#include <qpixmap.h>
-#include <qscrbar.h>
-#include <qcolor.h>
+#include <QtGui/qpixmap.h>
+#include <QtGui/qscrollbar.h>
+#include <QtGui/qcolor.h>
 #include <stdio.h>
-#include <qfont.h>
-#include <qfontmet.h>
-#include <qlist.h>
+#include <QtGui/qfont.h>
+#include <QtGui/qfontmetrics.h>
+#include <QtCore/qlist.h>
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <netinet/in.h>
@@ -28,14 +29,14 @@
 #include "comm.h"
 #include "socu.h"
 #include <unistd.h>
-#include <qsocknot.h>
-#include <qobject.h>
+#include <QtCore/qsocketnotifier.h>
+#include <QtCore/qobject.h>
 #include <errno.h>
-#include <qqueue.h>
-#include <qmsgbox.h>
-#include <qmenubar.h>
-#include <qpopmenu.h>
-#include <qkeycode.h>
+#include <QtCore/qqueue.h>
+#include <QtGui/qmessagebox.h>
+#include <QtGui/qmenubar.h>
+//#include <qpopmenu.h>
+#include <QtCore/qnamespace.h>
 
 #define MAXWIDTH       640
 #define MAXHEIGHT      480
@@ -203,8 +204,8 @@ VGR::VGR(char *sockname)
        prv_font = normal_font;
 
        MakeColors();
-       setCaption("graphic resource");
-       setBackgroundColor(white);
+       setWindowTitle("graphic resource");
+       //setBackgroundColor(white);//@TODO Restore?
        canvas = new QPixmap(640, 480);
        canvas->fill(backgroundColor());
 
@@ -966,7 +967,7 @@ void VGR::Putmap(int map)
                                        m->map->width(), m->map->height());
                        break;
                }
-               m = maps.next();
+               m = maps.takeFirst();
        }
 }
 
@@ -1277,7 +1278,7 @@ void VGR::MagicGraph(G_MESSAGE *msg)
                                maps.remove(pmap);
                                break;
                        }
-                       pmap = maps.next();
+                       pmap = maps.takeFirst();
                }
                break;
        /* Line (x1,y1,x2,y2,col) */