Menu
▾
▴
[Seq-cvs-commit] SF.net SVN: seq:[1067] showeq/branches/pre_6_0_beta/src
|
From: <cn...@us...> - 2020-10-25 19:42:21
|
Revision: 1067
http://sourceforge.net/p/seq/svn/1067
Author: cn187
Date: 2020-10-25 19:42:18 +0000 (Sun, 25 Oct 2020)
Log Message:
-----------
Replace Q3ValueList with QList
Modified Paths:
--------------
showeq/branches/pre_6_0_beta/src/interface.cpp
showeq/branches/pre_6_0_beta/src/interface.h
showeq/branches/pre_6_0_beta/src/messages.h
showeq/branches/pre_6_0_beta/src/spawnlist.cpp
showeq/branches/pre_6_0_beta/src/spawnlist.h
showeq/branches/pre_6_0_beta/src/spelllist.cpp
showeq/branches/pre_6_0_beta/src/spelllist.h
showeq/branches/pre_6_0_beta/src/spellshell.cpp
showeq/branches/pre_6_0_beta/src/spellshell.h
Modified: showeq/branches/pre_6_0_beta/src/interface.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/interface.cpp 2020-10-25 19:42:12 UTC (rev 1066)
+++ showeq/branches/pre_6_0_beta/src/interface.cpp 2020-10-25 19:42:18 UTC (rev 1067)
@@ -76,7 +76,7 @@
#include <QApplication>
#include <QLabel>
#include <QPushButton>
-#include <Q3ValueList>
+#include <QList>
#include <Q3ValueVector>
#include <QStatusBar>
#include <QLineEdit>
Modified: showeq/branches/pre_6_0_beta/src/interface.h
===================================================================
--- showeq/branches/pre_6_0_beta/src/interface.h 2020-10-25 19:42:12 UTC (rev 1066)
+++ showeq/branches/pre_6_0_beta/src/interface.h 2020-10-25 19:42:18 UTC (rev 1067)
@@ -35,7 +35,7 @@
#include <Q3HBox>
#include <Q3VBox>
#include <QSplitter>
-#include <Q3ValueList>
+#include <QList>
#include <QTimer>
#include <Q3PtrList>
#include <QMessageBox>
Modified: showeq/branches/pre_6_0_beta/src/messages.h
===================================================================
--- showeq/branches/pre_6_0_beta/src/messages.h 2020-10-25 19:42:12 UTC (rev 1066)
+++ showeq/branches/pre_6_0_beta/src/messages.h 2020-10-25 19:42:18 UTC (rev 1067)
@@ -31,7 +31,7 @@
#include <QObject>
#include <QString>
-#include <Q3ValueList>
+#include <QList>
//----------------------------------------------------------------------
// forward declarations
@@ -39,7 +39,7 @@
//----------------------------------------------------------------------
// MessageList
-typedef Q3ValueList<MessageEntry> MessageList;
+typedef QList<MessageEntry> MessageList;
//----------------------------------------------------------------------
// Messages
Modified: showeq/branches/pre_6_0_beta/src/spawnlist.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/spawnlist.cpp 2020-10-25 19:42:12 UTC (rev 1066)
+++ showeq/branches/pre_6_0_beta/src/spawnlist.cpp 2020-10-25 19:42:18 UTC (rev 1067)
@@ -49,7 +49,6 @@
#endif
#include <cmath>
#include <regex.h>
-//Added by qt3to4:
#include <QMenu>
// ------------------------------------------------------
Modified: showeq/branches/pre_6_0_beta/src/spawnlist.h
===================================================================
--- showeq/branches/pre_6_0_beta/src/spawnlist.h 2020-10-25 19:42:12 UTC (rev 1066)
+++ showeq/branches/pre_6_0_beta/src/spawnlist.h 2020-10-25 19:42:18 UTC (rev 1067)
@@ -44,7 +44,6 @@
#include <cstdio>
#include <sys/time.h>
-#include <Q3ValueList>
#include <Q3ListView>
#include <QHash>
#include <Q3TextStream>
Modified: showeq/branches/pre_6_0_beta/src/spelllist.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/spelllist.cpp 2020-10-25 19:42:12 UTC (rev 1066)
+++ showeq/branches/pre_6_0_beta/src/spelllist.cpp 2020-10-25 19:42:18 UTC (rev 1067)
@@ -28,7 +28,7 @@
#include <QPainter>
#include <QLayout>
-#include <Q3ValueList>
+#include <QList>
#include <QMenu>
#include "spelllist.h"
@@ -197,7 +197,7 @@
if (!item)
return NULL;
- Q3ValueList<SpellListItem *>::Iterator it;
+ QList<SpellListItem *>::Iterator it;
for(it = m_spellList.begin(); it != m_spellList.end(); it++) {
if ((*it)->item() == item)
break;
@@ -259,7 +259,7 @@
SpellListItem* SpellList::Find(const SpellItem *item)
{
if (item) {
- Q3ValueList<SpellListItem*>::Iterator it;
+ QList<SpellListItem*>::Iterator it;
for(it = m_spellList.begin(); it != m_spellList.end(); ++it) {
if ((*it)->item() == item)
return (*it);
Modified: showeq/branches/pre_6_0_beta/src/spelllist.h
===================================================================
--- showeq/branches/pre_6_0_beta/src/spelllist.h 2020-10-25 19:42:12 UTC (rev 1066)
+++ showeq/branches/pre_6_0_beta/src/spelllist.h 2020-10-25 19:42:18 UTC (rev 1067)
@@ -29,7 +29,7 @@
#ifndef SPELLLIST_H
#define SPELLLIST_H
-#include <Q3ValueList>
+#include <QList>
#include <Q3ListView>
#include <Q3PopupMenu>
#include <ctime>
@@ -109,8 +109,8 @@
private:
void selectAndOpen(SpellListItem *);
SpellShell* m_spellShell;
- Q3ValueList<QString> m_categoryList;
- Q3ValueList<SpellListItem *> m_spellList;
+ QList<QString> m_categoryList;
+ QList<SpellListItem *> m_spellList;
QMenu *m_menu;
int mid_spellName, mid_spellId;
Modified: showeq/branches/pre_6_0_beta/src/spellshell.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/spellshell.cpp 2020-10-25 19:42:12 UTC (rev 1066)
+++ showeq/branches/pre_6_0_beta/src/spellshell.cpp 2020-10-25 19:42:18 UTC (rev 1067)
@@ -30,8 +30,7 @@
#include "packetcommon.h"
#include "spawn.h"
#include "diagnosticmessages.h"
-//Added by qt3to4:
-#include <Q3ValueList>
+#include <QList>
//#define DIAG_SPELLSHELL 1
@@ -138,7 +137,7 @@
SpellItem* SpellShell::findSpell(uint16_t spellId,
uint16_t targetId, const QString& targetName)
{
- for(Q3ValueList<SpellItem*>::Iterator it = m_spellList.begin();
+ for(QList<SpellItem*>::Iterator it = m_spellList.begin();
it != m_spellList.end();
it++)
{
@@ -156,7 +155,7 @@
SpellItem* SpellShell::findSpell(int spell_id)
{
- for(Q3ValueList<SpellItem*>::Iterator it = m_spellList.begin();
+ for(QList<SpellItem*>::Iterator it = m_spellList.begin();
it != m_spellList.end();
it++)
{
@@ -174,7 +173,7 @@
emit clearSpells();
m_lastPlayerSpell = 0;
- for(Q3ValueList<SpellItem*>::Iterator it = m_spellList.begin();
+ for(QList<SpellItem*>::Iterator it = m_spellList.begin();
it != m_spellList.end(); it++)
delete (*it);
@@ -454,7 +453,7 @@
if (b) {
// Can't really tell which spell/target, so just delete the last one
- for(Q3ValueList<SpellItem*>::Iterator it = m_spellList.begin();
+ for(QList<SpellItem*>::Iterator it = m_spellList.begin();
it != m_spellList.end(); it++) {
if ((*it)->spellName() == spell) {
(*it)->setDuration(0);
@@ -468,7 +467,7 @@
{
m_lastPlayerSpell = 0;
SpellItem* spell;
- for(Q3ValueList<SpellItem*>::Iterator it = m_spellList.begin();
+ for(QList<SpellItem*>::Iterator it = m_spellList.begin();
it != m_spellList.end(); it++)
{
spell = *it;
@@ -497,7 +496,7 @@
m_lastPlayerSpell = 0;
}
- Q3ValueList<SpellItem*>::Iterator it = m_spellList.begin();
+ QList<SpellItem*>::Iterator it = m_spellList.begin();
while(it != m_spellList.end())
{
spell = *it;
@@ -525,7 +524,7 @@
{
SpellItem* spell;
- Q3ValueList<SpellItem*>::Iterator it = m_spellList.begin();
+ QList<SpellItem*>::Iterator it = m_spellList.begin();
while (it != m_spellList.end())
{
spell = *it;
Modified: showeq/branches/pre_6_0_beta/src/spellshell.h
===================================================================
--- showeq/branches/pre_6_0_beta/src/spellshell.h 2020-10-25 19:42:12 UTC (rev 1066)
+++ showeq/branches/pre_6_0_beta/src/spellshell.h 2020-10-25 19:42:18 UTC (rev 1067)
@@ -30,7 +30,7 @@
#define SPELLSHELL_H
#include <QTimer>
-#include <Q3ValueList>
+#include <QList>
#include <Q3ListView>
#include <ctime>
#include <cstdio>
@@ -218,7 +218,7 @@
Player* m_player;
SpawnShell* m_spawnShell;
Spells* m_spells;
- Q3ValueList<SpellItem *> m_spellList;
+ QList<SpellItem *> m_spellList;
SpellItem* m_lastPlayerSpell;
QTimer *m_timer;
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
