Menu
▾
▴
[Seq-cvs-commit] SF.net SVN: seq:[1074] showeq/branches/pre_6_0_beta/src
|
From: <cn...@us...> - 2020-10-26 05:04:05
|
Revision: 1074
http://sourceforge.net/p/seq/svn/1074
Author: cn187
Date: 2020-10-26 05:04:02 +0000 (Mon, 26 Oct 2020)
Log Message:
-----------
Replace Q3*BoxLayout with Q*BoxLayout
Modified Paths:
--------------
showeq/branches/pre_6_0_beta/src/category.cpp
showeq/branches/pre_6_0_beta/src/combatlog.cpp
showeq/branches/pre_6_0_beta/src/combatlog.h
showeq/branches/pre_6_0_beta/src/compassframe.cpp
showeq/branches/pre_6_0_beta/src/experiencelog.cpp
showeq/branches/pre_6_0_beta/src/experiencelog.h
showeq/branches/pre_6_0_beta/src/guildlist.cpp
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/messagefilterdialog.cpp
showeq/branches/pre_6_0_beta/src/messagewindow.cpp
showeq/branches/pre_6_0_beta/src/spawnlist2.cpp
Modified: showeq/branches/pre_6_0_beta/src/category.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/category.cpp 2020-10-25 23:56:27 UTC (rev 1073)
+++ showeq/branches/pre_6_0_beta/src/category.cpp 2020-10-26 05:04:02 UTC (rev 1074)
@@ -39,10 +39,10 @@
#include <cstdio>
#include <QColorDialog>
-#include <Q3HBoxLayout>
-#include <Q3BoxLayout>
+#include <QHBoxLayout>
+#include <QBoxLayout>
#include <QLabel>
-#include <Q3VBoxLayout>
+#include <QVBoxLayout>
// ------------------------------------------------------
// Category
@@ -99,12 +99,12 @@
QFont labelFont;
labelFont.setBold(true);
- Q3BoxLayout* topLayout = new Q3VBoxLayout(this);
- Q3BoxLayout* row4Layout = new Q3HBoxLayout(topLayout);
- Q3BoxLayout* row3Layout = new Q3HBoxLayout(topLayout);
- Q3BoxLayout* row2Layout = new Q3HBoxLayout(topLayout);
- Q3BoxLayout* row1Layout = new Q3HBoxLayout(topLayout);
- Q3BoxLayout* row0Layout = new Q3HBoxLayout(topLayout);
+ QBoxLayout* topLayout = new QVBoxLayout(this);
+ QBoxLayout* row4Layout = new QHBoxLayout(topLayout);
+ QBoxLayout* row3Layout = new QHBoxLayout(topLayout);
+ QBoxLayout* row2Layout = new QHBoxLayout(topLayout);
+ QBoxLayout* row1Layout = new QHBoxLayout(topLayout);
+ QBoxLayout* row0Layout = new QHBoxLayout(topLayout);
QLabel *colorLabel = new QLabel ("Color", this);
colorLabel->setFont(labelFont);
Modified: showeq/branches/pre_6_0_beta/src/combatlog.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/combatlog.cpp 2020-10-25 23:56:27 UTC (rev 1073)
+++ showeq/branches/pre_6_0_beta/src/combatlog.cpp 2020-10-26 05:04:02 UTC (rev 1074)
@@ -34,7 +34,7 @@
#include <QLabel>
#include <Q3GridLayout>
#include <QMenu>
-#include <Q3VBoxLayout>
+#include <QVBoxLayout>
#include <cstdio>
#include <ctime>
@@ -271,7 +271,7 @@
#ifdef DEBUGCOMBAT
seqDebug("CombatWindow::initUI: starting...");
#endif
- Q3VBoxLayout* layout = new Q3VBoxLayout(boxLayout());
+ QVBoxLayout* layout = new QVBoxLayout(boxLayout());
m_menu_bar = new QMenuBar(this);
layout->addWidget(m_menu_bar);
@@ -307,7 +307,7 @@
{
QWidget *pWidget = new QWidget(m_tab);
- m_layout_offense = new Q3VBoxLayout(pWidget);
+ m_layout_offense = new QVBoxLayout(pWidget);
Q3GroupBox *listGBox = new Q3VGroupBox(pWidget);
m_layout_offense->addWidget(listGBox);
@@ -367,7 +367,7 @@
QWidget* CombatWindow::initDefenseWidget()
{
QWidget *pWidget = new QWidget(m_tab);
- m_layout_defense = new Q3VBoxLayout(pWidget);
+ m_layout_defense = new QVBoxLayout(pWidget);
Q3GroupBox *avoidanceGBox = new Q3VGroupBox("Avoidance", pWidget);
m_layout_defense->addWidget(avoidanceGBox);
@@ -442,7 +442,7 @@
{
QWidget *pWidget = new QWidget(m_tab);
- m_layout_mob = new Q3VBoxLayout(pWidget);
+ m_layout_mob = new QVBoxLayout(pWidget);
Q3GroupBox *listGBox = new Q3VGroupBox(pWidget);
m_layout_mob->addWidget(listGBox);
Modified: showeq/branches/pre_6_0_beta/src/combatlog.h
===================================================================
--- showeq/branches/pre_6_0_beta/src/combatlog.h 2020-10-25 23:56:27 UTC (rev 1073)
+++ showeq/branches/pre_6_0_beta/src/combatlog.h 2020-10-26 05:04:02 UTC (rev 1074)
@@ -33,7 +33,7 @@
# include <QLayout>
# include <QMenuBar>
#include <QMenu>
-#include <Q3VBoxLayout>
+#include <QVBoxLayout>
# include <sys/time.h>
# include <sys/types.h>
@@ -211,9 +211,9 @@
QWidget* m_widget_mob;
QTabWidget* m_tab;
- Q3VBoxLayout* m_layout_offense;
- Q3VBoxLayout* m_layout_defense;
- Q3VBoxLayout* m_layout_mob;
+ QVBoxLayout* m_layout_offense;
+ QVBoxLayout* m_layout_defense;
+ QVBoxLayout* m_layout_mob;
SEQListView* m_listview_offense;
SEQListView* m_listview_mob;
Modified: showeq/branches/pre_6_0_beta/src/compassframe.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/compassframe.cpp 2020-10-25 23:56:27 UTC (rev 1073)
+++ showeq/branches/pre_6_0_beta/src/compassframe.cpp 2020-10-26 05:04:02 UTC (rev 1074)
@@ -22,7 +22,7 @@
#include <QFont>
#include <QLayout>
-#include <Q3VBoxLayout>
+#include <QVBoxLayout>
#include <QLabel>
#include "main.h"
@@ -31,7 +31,7 @@
CompassFrame::CompassFrame(Player* player, QWidget* parent, const char* name)
: SEQWindow("Compass", "ShowEQ - Compass", parent, name)
{
- Q3VBoxLayout* layout = new Q3VBoxLayout(boxLayout());
+ QVBoxLayout* layout = new QVBoxLayout(boxLayout());
m_compass = new Compass (this, "compass");
layout->addWidget(m_compass);
Q3HBox* coordsbox = new Q3HBox(this);
Modified: showeq/branches/pre_6_0_beta/src/experiencelog.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/experiencelog.cpp 2020-10-25 23:56:27 UTC (rev 1073)
+++ showeq/branches/pre_6_0_beta/src/experiencelog.cpp 2020-10-26 05:04:02 UTC (rev 1074)
@@ -43,7 +43,7 @@
#include <Q3GridLayout>
#include <QLabel>
#include <QMenu>
-#include <Q3VBoxLayout>
+#include <QVBoxLayout>
#define DEBUGEXP
@@ -204,7 +204,7 @@
m_view_menu->insertItem( "ZEM View Options", m_ZEM_menu );
m_view_menu->insertItem( "Calculate ZEM on next kill", this, SLOT(calcZEMNextKill()) );
- m_layout = new Q3VBoxLayout(boxLayout());
+ m_layout = new QVBoxLayout(boxLayout());
m_menu_bar = new QMenuBar( this );
m_menu_bar->insertItem( "&View", m_view_menu );
Modified: showeq/branches/pre_6_0_beta/src/experiencelog.h
===================================================================
--- showeq/branches/pre_6_0_beta/src/experiencelog.h 2020-10-25 23:56:27 UTC (rev 1073)
+++ showeq/branches/pre_6_0_beta/src/experiencelog.h 2020-10-26 05:04:02 UTC (rev 1074)
@@ -35,7 +35,7 @@
#include <QLayout>
#include <QMenuBar>
#include <QResizeEvent>
-#include <Q3VBoxLayout>
+#include <QVBoxLayout>
#include <QMenu>
#include <cstdint>
@@ -133,7 +133,7 @@
GroupMgr* m_group;
ZoneMgr* m_zoneMgr;
- Q3VBoxLayout *m_layout;
+ QVBoxLayout *m_layout;
SEQListView *m_exp_listview;
Modified: showeq/branches/pre_6_0_beta/src/guildlist.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/guildlist.cpp 2020-10-25 23:56:27 UTC (rev 1073)
+++ showeq/branches/pre_6_0_beta/src/guildlist.cpp 2020-10-26 05:04:02 UTC (rev 1074)
@@ -34,9 +34,9 @@
#include <QLineEdit>
#include <QLabel>
#include <QLayout>
-#include <Q3HBoxLayout>
-#include <Q3BoxLayout>
-#include <Q3VBoxLayout>
+#include <QHBoxLayout>
+#include <QBoxLayout>
+#include <QVBoxLayout>
//----------------------------------------------------------------------
// GuildListItem
@@ -164,8 +164,8 @@
m_showAlts = pSEQPrefs->getPrefBool("ShowAlts", preferenceName(), true);
- Q3BoxLayout* vLayout = new Q3VBoxLayout(boxLayout());
- Q3HBoxLayout* hLayout= new Q3HBoxLayout(vLayout);
+ QBoxLayout* vLayout = new QVBoxLayout(boxLayout());
+ QHBoxLayout* hLayout= new QHBoxLayout(vLayout);
// Guild Name
m_guildName = new QLabel("Guild", this);
Modified: showeq/branches/pre_6_0_beta/src/map.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/map.cpp 2020-10-25 23:56:27 UTC (rev 1073)
+++ showeq/branches/pre_6_0_beta/src/map.cpp 2020-10-26 05:04:02 UTC (rev 1074)
@@ -72,14 +72,14 @@
#include <QInputDialog>
#endif
-#include <Q3BoxLayout>
+#include <QBoxLayout>
#include <QPaintEvent>
-#include <Q3VBoxLayout>
+#include <QVBoxLayout>
#include <QPolygon>
#include <Q3Frame>
#include <QResizeEvent>
#include <QLabel>
-#include <Q3HBoxLayout>
+#include <QHBoxLayout>
#include <Q3TextStream>
#include <QMouseEvent>
@@ -108,9 +108,9 @@
QFont labelFont;
labelFont.setBold(true);
- Q3BoxLayout *topLayout = new Q3VBoxLayout(this);
- Q3BoxLayout *row2Layout = new Q3HBoxLayout(topLayout);
- Q3BoxLayout *row1Layout = new Q3HBoxLayout(topLayout);
+ QBoxLayout *topLayout = new QVBoxLayout(this);
+ QBoxLayout *row2Layout = new QHBoxLayout(topLayout);
+ QBoxLayout *row1Layout = new QHBoxLayout(topLayout);
QLabel *colorLabel = new QLabel ("Color", this);
colorLabel->setFont(labelFont);
@@ -4603,7 +4603,7 @@
QLabel* tmpLabel;
// setup the vertical box
- m_vertical = new Q3VBoxLayout(boxLayout());
+ m_vertical = new QVBoxLayout(boxLayout());
// setup the top control window
m_topControlBox = new Q3HBox(this);
Modified: showeq/branches/pre_6_0_beta/src/map.h
===================================================================
--- showeq/branches/pre_6_0_beta/src/map.h 2020-10-25 23:56:27 UTC (rev 1073)
+++ showeq/branches/pre_6_0_beta/src/map.h 2020-10-26 05:04:02 UTC (rev 1074)
@@ -58,7 +58,7 @@
#include <QResizeEvent>
#include <QMouseEvent>
#include <QEvent>
-#include <Q3VBoxLayout>
+#include <QVBoxLayout>
#include <Q3Frame>
#include <QPaintEvent>
@@ -748,7 +748,7 @@
QString m_mapPreferenceName;
- Q3VBoxLayout* m_vertical;
+ QVBoxLayout* m_vertical;
Q3HBox* m_topControlBox;
Q3HBox* m_zoomBox;
QSpinBox* m_zoom;
Modified: showeq/branches/pre_6_0_beta/src/messagefilterdialog.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/messagefilterdialog.cpp 2020-10-25 23:56:27 UTC (rev 1073)
+++ showeq/branches/pre_6_0_beta/src/messagefilterdialog.cpp 2020-10-26 05:04:02 UTC (rev 1074)
@@ -35,10 +35,10 @@
#include <QLineEdit>
#include <QPushButton>
#include <Q3ListBox>
-#include <Q3HBoxLayout>
+#include <QHBoxLayout>
#include <Q3GridLayout>
#include <Q3Frame>
-#include <Q3VBoxLayout>
+#include <QVBoxLayout>
//----------------------------------------------------------------------
// MessageFilterListBoxText
@@ -106,9 +106,9 @@
this, SLOT(addedFilter(uint32_t, uint8_t, const MessageFilter&)));
// setup the dialog
- Q3VBoxLayout* outerLayout = new Q3VBoxLayout(this, 5, -1, "outerlayout");
- Q3HBoxLayout* columnLayout = new Q3HBoxLayout(outerLayout, -1, "columns");
- Q3VBoxLayout* column1Layout = new Q3VBoxLayout(5, "column1");
+ QVBoxLayout* outerLayout = new QVBoxLayout(this, 5, -1, "outerlayout");
+ QHBoxLayout* columnLayout = new QHBoxLayout(outerLayout, -1, "columns");
+ QVBoxLayout* column1Layout = new QVBoxLayout(5, "column1");
columnLayout->addLayout(column1Layout, 1);
// layout 1st column
Modified: showeq/branches/pre_6_0_beta/src/messagewindow.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/messagewindow.cpp 2020-10-25 23:56:27 UTC (rev 1073)
+++ showeq/branches/pre_6_0_beta/src/messagewindow.cpp 2020-10-26 05:04:02 UTC (rev 1074)
@@ -40,7 +40,7 @@
#include <QFileDialog>
#include <QFile>
#include <Q3TextStream>
-#include <Q3HBoxLayout>
+#include <QHBoxLayout>
#include <QKeyEvent>
#include <Q3GridLayout>
#include <Q3Frame>
@@ -139,7 +139,7 @@
m_findBackwards = new QCheckBox("Find &Backwards", this);
grid->addWidget(m_findBackwards, 3, 1);
- Q3HBoxLayout* layout = new Q3HBoxLayout(grid);
+ QHBoxLayout* layout = new QHBoxLayout(grid);
grid->addMultiCell(layout, 5, 5, 0, 2);
layout->addStretch();
m_find = new QPushButton("&Find", this);
@@ -320,7 +320,7 @@
grid->addRowSpacing(5, 0);
- Q3HBoxLayout* layout = new Q3HBoxLayout(grid);
+ QHBoxLayout* layout = new QHBoxLayout(grid);
grid->addMultiCell(layout, 6, 6, 0, 2);
layout->addStretch();
QPushButton* ok = new QPushButton("OK", this);
Modified: showeq/branches/pre_6_0_beta/src/spawnlist2.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/spawnlist2.cpp 2020-10-25 23:56:27 UTC (rev 1073)
+++ showeq/branches/pre_6_0_beta/src/spawnlist2.cpp 2020-10-26 05:04:02 UTC (rev 1074)
@@ -31,10 +31,10 @@
#include <QSpinBox>
#include <QTimer>
#include <QLayout>
-#include <Q3HBoxLayout>
-#include <Q3BoxLayout>
+#include <QHBoxLayout>
+#include <QBoxLayout>
#include <QMenu>
-#include <Q3VBoxLayout>
+#include <QVBoxLayout>
SpawnListWindow2::SpawnListWindow2(Player* player,
SpawnShell* spawnShell,
@@ -65,8 +65,8 @@
int fpm = pSEQPrefs->getPrefInt("FPM", preferenceName(), 10);
m_delay = 60000L / fpm;
- Q3BoxLayout* vLayout = new Q3VBoxLayout(boxLayout());
- Q3HBoxLayout* hLayout= new Q3HBoxLayout(vLayout);
+ QBoxLayout* vLayout = new QVBoxLayout(boxLayout());
+ QHBoxLayout* hLayout= new QHBoxLayout(vLayout);
// create the spawn list combo box
m_categoryCombo = new QComboBox(false, this, "spawnlistcombo");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
