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

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

Revision: 1075
          http://sourceforge.net/p/seq/svn/1075
Author:   cn187
Date:     2020-10-26 05:04:16 +0000 (Mon, 26 Oct 2020)
Log Message:
-----------
Replace Q3GridLayout with QGridLayout

Modified Paths:
--------------
    showeq/branches/pre_6_0_beta/src/combatlog.cpp
    showeq/branches/pre_6_0_beta/src/experiencelog.cpp
    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/netdiag.cpp

Modified: showeq/branches/pre_6_0_beta/src/combatlog.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/combatlog.cpp	2020-10-26 05:04:02 UTC (rev 1074)
+++ showeq/branches/pre_6_0_beta/src/combatlog.cpp	2020-10-26 05:04:16 UTC (rev 1075)
@@ -32,7 +32,7 @@
 #include <QMessageBox>
 #include <QLayout>
 #include <QLabel>
-#include <Q3GridLayout>
+#include <QGridLayout>
 #include <QMenu>
 #include <QVBoxLayout>
 #include <cstdio>
@@ -357,8 +357,8 @@
 	new QLabel("Avg NonMelee:", summaryGrid);
 	m_label_offense_avgnonmelee = new QLabel(summaryGrid);
 
-	((Q3GridLayout *)summaryGrid->layout())->setColStretch(1, 1);
-	((Q3GridLayout *)summaryGrid->layout())->setColStretch(3, 1);
+	((QGridLayout *)summaryGrid->layout())->setColStretch(1, 1);
+	((QGridLayout *)summaryGrid->layout())->setColStretch(3, 1);
 	summaryGrid->layout()->setSpacing(5);
 
 	return pWidget;
@@ -392,9 +392,9 @@
 	new QLabel("Total:", avoidanceGrid);
 	m_label_defense_avoid_total = new QLabel(avoidanceGrid);
 
-	((Q3GridLayout *)avoidanceGrid->layout())->setColStretch(1, 1);
-	((Q3GridLayout *)avoidanceGrid->layout())->setColStretch(3, 1);
-	((Q3GridLayout *)avoidanceGrid->layout())->setColStretch(5, 1);
+	((QGridLayout *)avoidanceGrid->layout())->setColStretch(1, 1);
+	((QGridLayout *)avoidanceGrid->layout())->setColStretch(3, 1);
+	((QGridLayout *)avoidanceGrid->layout())->setColStretch(5, 1);
 	avoidanceGrid->layout()->setSpacing(5);
 
 	Q3GroupBox *mitigationGBox = new Q3VGroupBox("Mitigation", pWidget);
@@ -411,9 +411,9 @@
 	new QLabel("Max:", mitigationGrid);
 	m_label_defense_mitigate_maxhit = new QLabel(mitigationGrid);
 
-	((Q3GridLayout *)mitigationGrid->layout())->setColStretch(1, 1);
-	((Q3GridLayout *)mitigationGrid->layout())->setColStretch(3, 1);
-	((Q3GridLayout *)mitigationGrid->layout())->setColStretch(5, 1);
+	((QGridLayout *)mitigationGrid->layout())->setColStretch(1, 1);
+	((QGridLayout *)mitigationGrid->layout())->setColStretch(3, 1);
+	((QGridLayout *)mitigationGrid->layout())->setColStretch(5, 1);
 	mitigationGrid->layout()->setSpacing(5);
 
 	Q3GroupBox *summaryGBox = new Q3VGroupBox("Summary", pWidget);
@@ -430,9 +430,9 @@
 	new QLabel("Total Damage:", summaryGrid);
 	m_label_defense_summary_totaldamage = new QLabel(summaryGrid);
 
-	((Q3GridLayout *)summaryGrid->layout())->setColStretch(1, 1);
-	((Q3GridLayout *)summaryGrid->layout())->setColStretch(3, 1);
-	((Q3GridLayout *)summaryGrid->layout())->setColStretch(5, 1);
+	((QGridLayout *)summaryGrid->layout())->setColStretch(1, 1);
+	((QGridLayout *)summaryGrid->layout())->setColStretch(3, 1);
+	((QGridLayout *)summaryGrid->layout())->setColStretch(5, 1);
 	summaryGrid->layout()->setSpacing(5);
 
 	return pWidget;
@@ -486,8 +486,8 @@
 	new QLabel("Last DPS:", summaryGrid);
 	m_label_mob_lastdps = new QLabel(summaryGrid);
 
-	((Q3GridLayout *)summaryGrid->layout())->setColStretch(1, 1);
-	((Q3GridLayout *)summaryGrid->layout())->setColStretch(3, 1);
+	((QGridLayout *)summaryGrid->layout())->setColStretch(1, 1);
+	((QGridLayout *)summaryGrid->layout())->setColStretch(3, 1);
 	summaryGrid->layout()->setSpacing(5);
 
 

Modified: showeq/branches/pre_6_0_beta/src/experiencelog.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/experiencelog.cpp	2020-10-26 05:04:02 UTC (rev 1074)
+++ showeq/branches/pre_6_0_beta/src/experiencelog.cpp	2020-10-26 05:04:16 UTC (rev 1075)
@@ -40,7 +40,7 @@
 #include <QMessageBox>
 #include <QFileInfo>
 #include <QResizeEvent>
-#include <Q3GridLayout>
+#include <QGridLayout>
 #include <QLabel>
 #include <QMenu>
 #include <QVBoxLayout>
@@ -264,8 +264,8 @@
    m_time_to_level = new QLabel( statsGrid );
 
    // ewww, why can't we just get it from QGrid? :(
-   ((Q3GridLayout *)statsGrid->layout())->setColStretch( 1, 1 );
-   ((Q3GridLayout *)statsGrid->layout())->setColStretch( 3, 1 );
+   ((QGridLayout *)statsGrid->layout())->setColStretch( 1, 1 );
+   ((QGridLayout *)statsGrid->layout())->setColStretch( 3, 1 );
    statsGrid->layout()->setSpacing( 5 );
 
    updateAverage( );

Modified: showeq/branches/pre_6_0_beta/src/messagefilterdialog.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/messagefilterdialog.cpp	2020-10-26 05:04:02 UTC (rev 1074)
+++ showeq/branches/pre_6_0_beta/src/messagefilterdialog.cpp	2020-10-26 05:04:16 UTC (rev 1075)
@@ -36,7 +36,7 @@
 #include <QPushButton>
 #include <Q3ListBox>
 #include <QHBoxLayout>
-#include <Q3GridLayout>
+#include <QGridLayout>
 #include <Q3Frame>
 #include <QVBoxLayout>
 
@@ -133,7 +133,7 @@
 
   Q3Frame* dummy = new Q3Frame(m_filterGroup, "dummy");
 
-  Q3GridLayout* filterLayout = new Q3GridLayout(dummy, 8, 3, 5, -1, "filterlayout");
+  QGridLayout* filterLayout = new QGridLayout(dummy, 8, 3, 5, -1, "filterlayout");
   
   label = new QLabel("&Name", dummy);
   filterLayout->addWidget(label, 0, 0, Qt::AlignLeft | Qt::AlignVCenter);

Modified: showeq/branches/pre_6_0_beta/src/messagewindow.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/messagewindow.cpp	2020-10-26 05:04:02 UTC (rev 1074)
+++ showeq/branches/pre_6_0_beta/src/messagewindow.cpp	2020-10-26 05:04:16 UTC (rev 1075)
@@ -42,7 +42,7 @@
 #include <Q3TextStream>
 #include <QHBoxLayout>
 #include <QKeyEvent>
-#include <Q3GridLayout>
+#include <QGridLayout>
 #include <Q3Frame>
 #include <QMouseEvent>
 #include <QEvent>
@@ -119,7 +119,7 @@
   setCaption(caption);
   
   // setup the GUI
-  Q3GridLayout* grid = new Q3GridLayout(this, 5, 2);
+  QGridLayout* grid = new QGridLayout(this, 5, 2);
 
   // sets margin around the grid
   grid->setMargin(5);
@@ -252,7 +252,7 @@
   setCaption(caption);
   
   // setup the GUI
-  Q3GridLayout* grid = new Q3GridLayout(this, 6, 2);
+  QGridLayout* grid = new QGridLayout(this, 6, 2);
 
   // sets margin around the grid
   grid->setMargin(10);

Modified: showeq/branches/pre_6_0_beta/src/netdiag.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/netdiag.cpp	2020-10-26 05:04:02 UTC (rev 1074)
+++ showeq/branches/pre_6_0_beta/src/netdiag.cpp	2020-10-26 05:04:16 UTC (rev 1075)
@@ -22,7 +22,7 @@
 
 #include <QPushButton>
 #include <QShortcut>
-#include <Q3GridLayout>
+#include <QGridLayout>
 #include <QLabel>
 
 #include "main.h"
@@ -37,7 +37,7 @@
 {
   //  setResizeEnabled(false);
   // get preferences
-  Q3GridLayout* tmpGrid = new Q3GridLayout(boxLayout(), 26, 9);
+  QGridLayout* tmpGrid = new QGridLayout(boxLayout(), 26, 9);
   tmpGrid->addColSpacing(3, 5);
   tmpGrid->addColSpacing(6, 5);
   tmpGrid->addRowSpacing(1, 5);

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