[Seq-cvs-commit] SF.net SVN: seq:[1079] showeq/branches/pre_6_0_beta/src

[<cn...@us...>]

Revision: 1079
          http://sourceforge.net/p/seq/svn/1079
Author:   cn187
Date:     2020-10-28 00:31:56 +0000 (Wed, 28 Oct 2020)
Log Message:
-----------
Replace Q3VBox/Q3HBox with QVBoxLayout/QHBoxLayout

Modified Paths:
--------------
    showeq/branches/pre_6_0_beta/src/category.h
    showeq/branches/pre_6_0_beta/src/combatlog.cpp
    showeq/branches/pre_6_0_beta/src/compassframe.cpp
    showeq/branches/pre_6_0_beta/src/compassframe.h
    showeq/branches/pre_6_0_beta/src/experiencelog.cpp
    showeq/branches/pre_6_0_beta/src/interface.h
    showeq/branches/pre_6_0_beta/src/map.cpp
    showeq/branches/pre_6_0_beta/src/map.h
    showeq/branches/pre_6_0_beta/src/spawnlist.h

Modified: showeq/branches/pre_6_0_beta/src/category.h
===================================================================
--- showeq/branches/pre_6_0_beta/src/category.h	2020-10-27 04:48:38 UTC (rev 1078)
+++ showeq/branches/pre_6_0_beta/src/category.h	2020-10-28 00:31:56 UTC (rev 1079)
@@ -45,8 +45,6 @@
 #include <QComboBox>
 #include <QLabel>
 #include <QLayout>
-#include <Q3HBox>
-#include <Q3VBox>
 #include <QPushButton>
 #include <Q3Button>
 

Modified: showeq/branches/pre_6_0_beta/src/combatlog.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/combatlog.cpp	2020-10-27 04:48:38 UTC (rev 1078)
+++ showeq/branches/pre_6_0_beta/src/combatlog.cpp	2020-10-28 00:31:56 UTC (rev 1079)
@@ -26,7 +26,6 @@
 #include "diagnosticmessages.h"
 
 #include <QTimer>
-#include <Q3HBox>
 #include <QGroupBox>
 #include <QMessageBox>
 #include <QLayout>

Modified: showeq/branches/pre_6_0_beta/src/compassframe.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/compassframe.cpp	2020-10-27 04:48:38 UTC (rev 1078)
+++ showeq/branches/pre_6_0_beta/src/compassframe.cpp	2020-10-28 00:31:56 UTC (rev 1079)
@@ -34,7 +34,8 @@
   QVBoxLayout* layout = new QVBoxLayout(boxLayout());
   m_compass = new Compass (this, "compass");
   layout->addWidget(m_compass);
-  Q3HBox* coordsbox = new Q3HBox(this);
+  QWidget* coordsbox = new QWidget(this);
+  QHBoxLayout* coordsboxLayout = new QHBoxLayout(coordsbox);
   layout->addWidget(coordsbox);
   m_compass->setFixedWidth(120);
   m_compass->setFixedHeight(120);
@@ -45,39 +46,45 @@
     {
       // Create the x: label
       QLabel *labelx = new QLabel(showeq_params->retarded_coords?"E/W:":"X:",
-				  coordsbox);
+              this);
       labelx->setFixedHeight(labelx->sizeHint().height());
       labelx->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
-      
+      coordsboxLayout->addWidget(labelx);
+
       // Create the xpos label
-      m_x = new QLabel("----",coordsbox);
+      m_x = new QLabel("----", this);
       m_x->setFixedHeight(m_x->sizeHint().height());
       m_x->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
-    } 
-    else 
+      coordsboxLayout->addWidget(m_x);
+    }
+    else
     {
       // Create the y: label
       QLabel *labely = new QLabel(showeq_params->retarded_coords?"N/S:":"Y:",
-				  coordsbox);
+              this);
       labely->setFixedHeight(labely->sizeHint().height());
       labely->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
-      
+      coordsboxLayout->addWidget(labely);
+
       // Create the ypos label
-      m_y = new QLabel("----",coordsbox);
+      m_y = new QLabel("----", this);
       m_y->setFixedHeight(m_y->sizeHint().height());
       m_y->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
+      coordsboxLayout->addWidget(m_y);
     }
    }
-  
+
   // Create the z: label
-  QLabel *labelz = new QLabel("Z:",coordsbox);
+  QLabel *labelz = new QLabel("Z:", this);
   labelz->setFixedHeight(labelz->sizeHint().height());
   labelz->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
-  
+  coordsboxLayout->addWidget(labelz);
+
   // Create the zpos label
-  m_z = new QLabel("----",coordsbox);
-  m_z->setFixedHeight(m_z->sizeHint().height());      
+  m_z = new QLabel("----", this);
+  m_z->setFixedHeight(m_z->sizeHint().height());
   m_z->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
+  coordsboxLayout->addWidget(m_z);
 
   // connect
   connect(player, SIGNAL(posChanged(int16_t,int16_t,int16_t,

Modified: showeq/branches/pre_6_0_beta/src/compassframe.h
===================================================================
--- showeq/branches/pre_6_0_beta/src/compassframe.h	2020-10-27 04:48:38 UTC (rev 1078)
+++ showeq/branches/pre_6_0_beta/src/compassframe.h	2020-10-28 00:31:56 UTC (rev 1079)
@@ -23,8 +23,6 @@
 #ifndef _COMPASSFRAME_H_
 #define _COMPASSFRAME_H_
 
-#include <Q3HBox>
-#include <Q3VBox>
 #include <QLabel>
 
 #include "player.h"

Modified: showeq/branches/pre_6_0_beta/src/experiencelog.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/experiencelog.cpp	2020-10-27 04:48:38 UTC (rev 1078)
+++ showeq/branches/pre_6_0_beta/src/experiencelog.cpp	2020-10-28 00:31:56 UTC (rev 1079)
@@ -34,7 +34,6 @@
 #include <ctime>
 
 #include <QTimer>
-#include <Q3HBox>
 #include <QGroupBox>
 #include <QMessageBox>
 #include <QFileInfo>

Modified: showeq/branches/pre_6_0_beta/src/interface.h
===================================================================
--- showeq/branches/pre_6_0_beta/src/interface.h	2020-10-27 04:48:38 UTC (rev 1078)
+++ showeq/branches/pre_6_0_beta/src/interface.h	2020-10-28 00:31:56 UTC (rev 1079)
@@ -32,8 +32,6 @@
 #include <QMenuBar>
 #include <QMenu>
 #include <Q3MainWindow>
-#include <Q3HBox>
-#include <Q3VBox>
 #include <QSplitter>
 #include <QList>
 #include <QTimer>

Modified: showeq/branches/pre_6_0_beta/src/map.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/map.cpp	2020-10-27 04:48:38 UTC (rev 1078)
+++ showeq/branches/pre_6_0_beta/src/map.cpp	2020-10-28 00:31:56 UTC (rev 1079)
@@ -1011,14 +1011,19 @@
   m_action_drawSizeMenu = addMenu(subMenu);
 
   subMenu = new QMenu("Player FOV");
-  Q3HBox* tmpHBox = new Q3HBox(subMenu);
+  QWidget* tmpHBox = new QWidget(subMenu);
+  QHBoxLayout* tmpHBoxLayout = new QHBoxLayout(tmpHBox);
+  tmpHBoxLayout->setContentsMargins(1, 1, 1, 1);
   m_fovSpinBoxLabel = new QLabel("Distance:", tmpHBox);
   m_fovSpinBox = new QSpinBox(20, 1200, 20, tmpHBox, "FOV");
+  tmpHBoxLayout->addWidget(m_fovSpinBoxLabel);
+  tmpHBoxLayout->addWidget(m_fovSpinBox);
   m_fovSpinBox->setValue(m_mapIcons->fovDistance());
   connect(m_fovSpinBox, SIGNAL(valueChanged(int)),
       m_mapIcons, SLOT(setFOVDistance(int)));
   QWidgetAction* fovSpinBoxAction = new QWidgetAction(tmpHBox);
   fovSpinBoxAction->setDefaultWidget(tmpHBox);
+
   subMenu->addAction(fovSpinBoxAction);
   m_action_FOVColor = subMenu->addAction("Color...",
                       this, SLOT(select_fovColor()));
@@ -4606,14 +4611,15 @@
   m_vertical = new QVBoxLayout(boxLayout());
 
   // setup the top control window
-  m_topControlBox = new Q3HBox(this);
-  m_vertical->addWidget(m_topControlBox);
-  m_topControlBox->setSpacing(1);
-  m_topControlBox->setMargin(0);
+  m_topControlBox = new QWidget(this);
+  QHBoxLayout* topControlBoxLayout = new QHBoxLayout(m_topControlBox);
+  topControlBoxLayout->setSpacing(1);
+  topControlBoxLayout->setMargin(0);
   m_topControlBox->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
   tmpPrefString = "ShowTopControlBox";
   if (!pSEQPrefs->getPrefBool(tmpPrefString, prefString, 1))
     m_topControlBox->hide();
+  m_vertical->addWidget(m_topControlBox);
 
   // setup runtime filter
   m_filterMgr->registerRuntimeFilter(m_mapPreferenceName, 
@@ -4627,26 +4633,37 @@
   m_vertical->addWidget(m_map);
 
   // setup bottom control window
-  m_bottomControlBox = new Q3HBox(this);
-  m_vertical->addWidget(m_bottomControlBox);
-  m_bottomControlBox->setSpacing(1);
-  m_bottomControlBox->setMargin(0);
+  m_bottomControlBox = new QWidget(this);
+  QHBoxLayout* bottomControlBoxLayout = new QHBoxLayout(m_bottomControlBox);
+  bottomControlBoxLayout->setSpacing(1);
+  bottomControlBoxLayout->setMargin(0);
   m_bottomControlBox->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
   tmpPrefString = "ShowBottomControlBox";
   if (!pSEQPrefs->getPrefBool(tmpPrefString, prefString, 1))
     m_bottomControlBox->hide();
+  m_vertical->addWidget(m_bottomControlBox);
 
-  
+
   // setup Zoom control
-  m_zoomBox = new Q3HBox(m_topControlBox);
+  m_zoomBox = new QWidget(m_topControlBox);
+  m_zoomBox->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+  QHBoxLayout* zoomBoxLayout = new QHBoxLayout(m_zoomBox);
+  zoomBoxLayout->setSpacing(1);
+  zoomBoxLayout->setMargin(0);
   tmpLabel = new QLabel(m_zoomBox);
   tmpLabel->setText("Zoom:");
+  zoomBoxLayout->addWidget(tmpLabel);
   m_zoom = new QSpinBox(1, 32, 1, m_zoomBox);
   m_zoom->setWrapping(true);
   m_zoom->setSuffix("x");
   m_zoom->setValue(m_map->zoom());
+  zoomBoxLayout->addWidget(m_zoom);
   tmpLabel->setBuddy(m_zoom);
   tmpPrefString = "ShowZoom";
+  //minimum width should be the sum of all the minimum widths of the components
+  //minimum height should be the minimum height of the tallest component
+  m_zoomBox->setMinimumSize(tmpLabel->minimumSizeHint().width() + m_zoom->minimumSizeHint().width(),
+          qMax(tmpLabel->minimumSizeHint().height(), m_zoom->minimumSizeHint().height()));
   if (!pSEQPrefs->getPrefBool(tmpPrefString, prefString, 1))
     m_zoomBox->hide();
   connect(m_zoom, SIGNAL(valueChanged(int)),
@@ -4653,17 +4670,28 @@
       m_map, SLOT(setZoom(int)));
   connect(m_map, SIGNAL(zoomChanged(int)),
       m_zoom, SLOT(setValue(int)));
+  topControlBoxLayout->addWidget(m_zoomBox);
 
   // setup Player Location display
-  m_playerLocationBox = new Q3HBox(m_topControlBox);
+  m_playerLocationBox = new QWidget(m_topControlBox);
+  m_playerLocationBox->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+  QHBoxLayout* playerLocationBoxLayout = new QHBoxLayout(m_playerLocationBox);
+  playerLocationBoxLayout->setSpacing(1);
+  playerLocationBoxLayout->setMargin(0);
   tmpLabel = new QLabel(m_playerLocationBox);
   tmpLabel->setText("You:");
+  playerLocationBoxLayout->addWidget(tmpLabel);
   m_playerLocation = new QLabel(m_playerLocationBox);
   m_playerLocation->setFrameStyle(Q3Frame::Panel | Q3Frame::Sunken);
   m_playerLocation->setText("0      0      0      ");
   m_playerLocation->setMinimumWidth(90);
+  playerLocationBoxLayout->addWidget(m_playerLocation);
   tmpLabel->setBuddy(m_playerLocation);
   tmpPrefString = "ShowPlayerLocation";
+  //minimum width should be the sum of all the minimum widths of the components
+  //minimum height should be the minimum height of the tallest component
+  m_playerLocationBox->setMinimumSize(tmpLabel->minimumSizeHint().width() + m_playerLocation->minimumSizeHint().width(),
+          qMax(tmpLabel->minimumSizeHint().height(), m_playerLocation->minimumSizeHint().height()));
   if (!pSEQPrefs->getPrefBool(tmpPrefString, prefString, false))
     m_playerLocationBox->hide();
   connect (player, SIGNAL(posChanged(int16_t,int16_t,int16_t,
@@ -4670,30 +4698,52 @@
                     int16_t,int16_t,int16_t,int32_t)), 
        this, SLOT(setPlayer(int16_t,int16_t,int16_t,
                 int16_t,int16_t,int16_t,int32_t)));
+  topControlBoxLayout->addWidget(m_playerLocationBox);
 
   // setup Mouse Location display
-  m_mouseLocationBox = new Q3HBox(m_topControlBox);
+  m_mouseLocationBox = new QWidget(m_topControlBox);
+  m_mouseLocationBox->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+  QHBoxLayout* mouseLocationBoxLayout = new QHBoxLayout(m_mouseLocationBox);
+  mouseLocationBoxLayout->setSpacing(1);
+  mouseLocationBoxLayout->setMargin(0);
   tmpLabel = new QLabel(m_mouseLocationBox);
   tmpLabel->setText("Cursor:");
+  mouseLocationBoxLayout->addWidget(tmpLabel);
   m_mouseLocation = new QLabel(m_mouseLocationBox);
   m_mouseLocation->setFrameStyle(Q3Frame::Panel | Q3Frame::Sunken);
   m_mouseLocation->setText("0      0      ");
-  m_mouseLocation->setMinimumWidth(70);
+  m_mouseLocation->setMinimumWidth(90);
+  mouseLocationBoxLayout->addWidget(m_mouseLocation);
   tmpLabel->setBuddy(m_mouseLocationBox);
   tmpPrefString = "ShowMouseLocation";
+  //minimum width should be the sum of all the minimum widths of the components
+  //minimum height should be the minimum height of the tallest component
+  m_mouseLocationBox->setMinimumSize(tmpLabel->minimumSizeHint().width() +
+          m_mouseLocation->minimumWidth(),
+          qMax(tmpLabel->minimumSizeHint().height(), m_mouseLocation->minimumSizeHint().height()));
   if (!pSEQPrefs->getPrefBool(tmpPrefString, prefString, 1))
     m_mouseLocationBox->hide();
   connect (m_map, SIGNAL(mouseLocation(int16_t, int16_t)), 
        this, SLOT(mouseLocation(int16_t, int16_t)));
+  topControlBoxLayout->addWidget(m_mouseLocationBox);
 
   // setup Filter
-  m_filterBox = new Q3HBox(m_topControlBox);
+  m_filterBox = new QWidget(m_topControlBox);
+  m_filterBox->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
+  QHBoxLayout* filterBoxLayout = new QHBoxLayout(m_filterBox);
+  filterBoxLayout->setSpacing(1);
+  filterBoxLayout->setMargin(0);
   tmpLabel = new QLabel(m_filterBox);
   tmpLabel->setText("Find:");
+  filterBoxLayout->addWidget(tmpLabel);
   m_filter = new MapFilterLineEdit(m_filterBox);
-  //  m_filter->setAlignment(Qt::AlignCenter);
+  filterBoxLayout->addWidget(m_filter);
   tmpLabel->setBuddy(m_filter);
   tmpPrefString = "ShowFilter";
+  //minimum width should be the sum of all the minimum widths of the components
+  //minimum height should be the minimum height of the tallest component
+  m_filterBox->setMinimumSize(tmpLabel->minimumSizeHint().width() + m_filter->minimumSizeHint().width(),
+          qMax(tmpLabel->minimumSizeHint().height(), m_filter->minimumSizeHint().height()));
   if (!pSEQPrefs->getPrefBool(tmpPrefString, prefString, 1))
     m_filterBox->hide();
 #ifdef MAPFRAME_IMMEDIATE_REGEX
@@ -4703,17 +4753,28 @@
   connect (m_filter, SIGNAL(returnPressed()),
        this, SLOT(filterConfirmed()));
 #endif
+  topControlBoxLayout->addWidget(m_filterBox);
 
   // setup Frame Rate control
-  m_frameRateBox = new Q3HBox(m_bottomControlBox);
+  m_frameRateBox = new QWidget(m_bottomControlBox);
+  m_frameRateBox->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+  QHBoxLayout* frameRateBoxLayout = new QHBoxLayout(m_frameRateBox);
+  frameRateBoxLayout->setSpacing(1);
+  frameRateBoxLayout->setMargin(0);
   tmpLabel = new QLabel(m_frameRateBox);
   tmpLabel->setText("Frame Rate:");
+  frameRateBoxLayout->addWidget(tmpLabel);
   m_frameRate = new QSpinBox(1, 60, 1, m_frameRateBox);
   m_frameRate->setWrapping(true);
   m_frameRate->setSuffix(" fps");
   m_frameRate->setValue(m_map->frameRate());
+  frameRateBoxLayout->addWidget(m_frameRate);
   tmpLabel->setBuddy(m_frameRate);
   tmpPrefString = "ShowFrameRate";
+  //minimum width should be the sum of all the minimum widths of the components
+  //minimum height should be the minimum height of the tallest component
+  m_frameRateBox->setMinimumSize(tmpLabel->minimumSizeHint().width() + m_frameRate->minimumSizeHint().width(),
+          qMax(tmpLabel->minimumSizeHint().height(), m_frameRate->minimumSizeHint().height()));
   if (!pSEQPrefs->getPrefBool(tmpPrefString, prefString, 1))
     m_frameRateBox->hide();
   m_frameRate->setValue(m_map->frameRate());
@@ -4721,18 +4782,40 @@
       m_map, SLOT(setFrameRate(int)));
   connect(m_map, SIGNAL(frameRateChanged(int)),
       m_frameRate, SLOT(setValue(int)));
+  bottomControlBoxLayout->addWidget(m_frameRateBox);
 
   // setup Pan Controls
-  m_panBox = new Q3HBox(m_bottomControlBox);
+  m_panBox = new QWidget(m_bottomControlBox);
+  m_panBox->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+  QHBoxLayout* panBoxLayout = new QHBoxLayout(m_panBox);
+  panBoxLayout->setSpacing(1);
+  panBoxLayout->setMargin(0);
   tmpLabel = new QLabel(m_panBox);
   tmpLabel->setText("Pan X:");
+  QSize panXLabelMinSize = tmpLabel->minimumSizeHint();
+  panBoxLayout->addWidget(tmpLabel);
   m_panX = new QSpinBox(-8192, 8192, 16, m_panBox);
   m_panX->setValue(m_map->panOffsetX());
+  panBoxLayout->addWidget(m_panX);
   tmpLabel = new QLabel(m_panBox);
   tmpLabel->setText("Y:");
+  QSize panYLabelMinSize = tmpLabel->minimumSizeHint();
+  panBoxLayout->addWidget(tmpLabel);
   m_panY = new QSpinBox(-8192, 8192, 16, m_panBox);
   m_panY->setValue(m_map->panOffsetY());
+  panBoxLayout->addWidget(m_panY);
   tmpPrefString = "ShowPanControls";
+  //minimum width should be the sum of all the minimum widths of the components
+  //minimum height should be the minimum height of the tallest component
+  m_panBox->setMinimumSize(
+          //width
+          panXLabelMinSize.width() + m_panX->minimumSizeHint().width() +
+          panYLabelMinSize.width() + m_panY->minimumSizeHint().width(),
+          //height
+          qMax(panYLabelMinSize.height(),
+              qMax(m_panY->minimumSizeHint().height(),
+                  qMax(panXLabelMinSize.height(),
+                      m_panX->minimumSizeHint().height()))));
   if (!pSEQPrefs->getPrefBool(tmpPrefString, prefString, 1))
     m_panBox->hide();
   connect(m_panX, SIGNAL(valueChanged(int)),
@@ -4743,17 +4826,41 @@
       m_panX, SLOT(setValue(int)));
   connect(m_map, SIGNAL(panYChanged(int)),
       m_panY, SLOT(setValue(int)));
+  bottomControlBoxLayout->addWidget(m_panBox);
 
-  m_depthControlBox = new Q3HBox(m_bottomControlBox);
+  m_depthControlBox = new QWidget(m_bottomControlBox);
+  m_depthControlBox->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+  QHBoxLayout* depthControlBoxLayout = new QHBoxLayout(m_depthControlBox);
+  depthControlBoxLayout->setSpacing(1);
+  depthControlBoxLayout->setMargin(0);
   tmpLabel = new QLabel(m_depthControlBox);
   tmpLabel->setText("Head:");
+  QSize depthHeadLabelMinSize = tmpLabel->minimumSizeHint();
+  depthControlBoxLayout->addWidget(tmpLabel);
   m_head = new QSpinBox(5, 3000, 10, m_depthControlBox);
   m_head->setValue(m_map->headRoom());
+  depthControlBoxLayout->addWidget(m_head);
   tmpLabel = new QLabel(m_depthControlBox);
   tmpLabel->setText("Floor:");
+  QSize depthFloorLabelMinSize = tmpLabel->minimumSizeHint();
+  depthControlBoxLayout->addWidget(tmpLabel);
   m_floor = new QSpinBox(5, 3000, 10, m_depthControlBox);
   m_floor->setValue(m_map->floorRoom());
+  depthControlBoxLayout->addWidget(m_floor);
   tmpPrefString = "ShowDepthFilterControls";
+  //minimum width should be the sum of all the minimum widths of the components
+  //minimum height should be the minimum height of the tallest component
+  m_depthControlBox->setMinimumSize(
+          //width
+          depthHeadLabelMinSize.width() +
+          m_panX->minimumSizeHint().width() +
+          depthFloorLabelMinSize.width() +
+          m_floor->minimumSizeHint().width(),
+          //height
+          qMax(depthHeadLabelMinSize.height(),
+              qMax(m_panX->minimumSizeHint().height(),
+                  qMax(depthFloorLabelMinSize.height(),
+                      m_floor->minimumSizeHint().height()))));
   if (!pSEQPrefs->getPrefBool(tmpPrefString, prefString, 
                   (m_map->mapLineStyle() == tMap_DepthFiltered)))
     m_depthControlBox->hide();
@@ -4765,6 +4872,7 @@
       m_map, SLOT(setFloorRoom(int)));
   connect(m_map, SIGNAL(floorRoomChanged(int)),
       m_floor, SLOT(setValue(int)));
+  bottomControlBoxLayout->addWidget(m_depthControlBox);
 
   // add our own menu items to the maps menu
   QMenu* mapMenu = m_map->menu();

Modified: showeq/branches/pre_6_0_beta/src/map.h
===================================================================
--- showeq/branches/pre_6_0_beta/src/map.h	2020-10-27 04:48:38 UTC (rev 1078)
+++ showeq/branches/pre_6_0_beta/src/map.h	2020-10-28 00:31:56 UTC (rev 1079)
@@ -50,8 +50,6 @@
 
 // includes required for MapFrame
 #include <QLayout>
-#include <Q3VBox>
-#include <Q3HBox>
 #include <QSpinBox>
 #include <QList>
 
@@ -749,23 +747,23 @@
    QString m_mapPreferenceName;
 
    QVBoxLayout* m_vertical;
-   Q3HBox* m_topControlBox;
-   Q3HBox* m_zoomBox;
+   QWidget* m_topControlBox;
+   QWidget* m_zoomBox;
    QSpinBox* m_zoom;
-   Q3HBox* m_playerLocationBox;
+   QWidget* m_playerLocationBox;
    QLabel* m_playerLocation;
-   Q3HBox* m_mouseLocationBox;
+   QWidget* m_mouseLocationBox;
    QLabel* m_mouseLocation;
-   Q3HBox* m_filterBox;
+   QWidget* m_filterBox;
    MapFilterLineEdit* m_filter;
 
-   Q3HBox* m_bottomControlBox;
-   Q3HBox* m_frameRateBox;
+   QWidget* m_bottomControlBox;
+   QWidget* m_frameRateBox;
    QSpinBox* m_frameRate;
-   Q3HBox* m_panBox;
+   QWidget* m_panBox;
    QSpinBox* m_panX;
    QSpinBox* m_panY;
-   Q3HBox* m_depthControlBox;
+   QWidget* m_depthControlBox;
    QSpinBox* m_head;
    QSpinBox* m_floor;
    QList<QWidget*> m_statusWidgets;

Modified: showeq/branches/pre_6_0_beta/src/spawnlist.h
===================================================================
--- showeq/branches/pre_6_0_beta/src/spawnlist.h	2020-10-27 04:48:38 UTC (rev 1078)
+++ showeq/branches/pre_6_0_beta/src/spawnlist.h	2020-10-28 00:31:56 UTC (rev 1079)
@@ -54,8 +54,6 @@
 
 #include <QLabel>
 #include <QLayout>
-#include <Q3HBox>
-#include <Q3VBox>
 #include <QPushButton>
 
 #include "seqwindow.h"

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.