Menu
▾
▴
[Seq-cvs-commit] showeq/src Makefile.am,1.22.6.5,1.22.6.6 bazaarlog.cpp,1.1.4.3,1.1.4.4 bazaarlog.h,1.1.4.1,1.1.4.2 category.cpp,1.8.16.1,1.8.16.2 classes.h,1.2.8.2,1.2.8.3 combatlog.cpp,1.10.16.1,1.10.16.2 compass.cpp,1.2,1.2.16.1 compassframe.cpp,1.7.16.1,1.7.16.2 datetimemgr.cpp,1.2.4.1,1.2.4.2 deity.h,1.1.1.1,1.1.1.1.16.1 editor.cpp,1.2,1.2.16.1 everquest.h,1.74.6.16,1.74.6.17 experiencelog.cpp,1.10.16.2,1.10.16.3 filter.cpp,1.6.6.1,1.6.6.2 filteredspawnlog.cpp,1.1.4.1,1.1.4.2 filtermgr.cpp,1.5.6.2,1.5.6.3 filternotifications.cpp,1.1.4.1,1.1.4.2 group.cpp,1.6.16.2,1.6.16.3 guild.cpp,1.7.6.2,1.7.6.3 guildlist.cpp,1.1.4.2,1.1.4.3 guildshell.cpp,1.1.4.2,1.1.4.3 guildshell.h,1.1.4.1,1.1.4.2 interface.cpp,1.67.6.9,1.67.6.10 interface.h,1.33.6.6,1.33.6.7 itemdb.cpp,1.10.6.3,1.10.6.4 itemdbtool.cpp,1.11.6.3,1.11.6.4 languages.h,1.4,1.4.16.1 logger.cpp,1.30,1.30.6.1 map.cpp,1.40.6.3,1.40.6.4 mapicon.cpp,1.1.4.4,1.1.4.5 messagefilter.cpp,1.1.4.1,1.1.4.2 messagefilterdialog.cpp,1.1.4.2,1.1.4.3 messages.cpp,1.1.4.1,1.1.4.2 messageshell.cpp,1.1.4.4,1.1.4.5 messagewindow.cpp,1.1.4.2,1.1.4.3 netdiag.cpp,1.10.6.1,1.10.6.2 packet.cpp,1.62.6.3,1.62.6.4 packetinfo.cpp,1.1.4.2,1.1.4.3 packetlog.cpp,1.1.6.4,1.1.6.5 packetstream.cpp,1.1.6.4,1.1.6.5 player.cpp,1.42.6.6,1.42.6.7 player.h,1.21.6.2,1.21.6.3 races.h,1.9.8.3,1.9.8.4 seqlistview.cpp,1.2,1.2.16.1 seqwindow.cpp,1.1.16.1,1.1.16.2 skilllist.cpp,1.6.16.1,1.6.16.2 skills.h,1.1.1.1.16.1,1.1.1.1.16.2 spawn.h,1.19.6.3,1.19.6.4 spawnlist.cpp,1.19.12.1,1.19.12.2 spawnlist2.cpp,1.7.12.2,1.7.12.3 spawnlistcommon.cpp,1.6.6.2,1.6.6.3 spawnlog.cpp,1.2.4.2,1.2.4.3 spawnmonitor.cpp,1.5.12.1,1.5.12.2 spawnpointlist.cpp,1.4.16.1,1.4.16.2 spawnshell.cpp,1.42.6.2,1.42.6.3 spelllist.cpp,1.9.10.2,1.9.10.3 spells.cpp,1.4.4.2,1.4.4.3 spellshell.cpp,1.11.10.4,1.11.10.5 staticspells.h,1.1,1.1.14.1 statlist.cpp,1.8.6.1,1.8.6.2 terminal.cpp,1.1.4.2,1.1.4.3 typenames.h,1.4,1.4.6.1 weapons.h,1.5,1.5.6.1 weapons1.h,1.1,1.1.10.1 weapons27.h,1.4,1.4.10.1 weapons28.h,1.1,1.1.16.1 weapons2b.h,1.1,1.1.16.1 xmlconv.cpp,1.2.16.3,1.2.16.4 xmlpreferences.cpp,1.3.16.2,1.3.16.3 zonemgr.cpp,1.8.6.4,1.8.6.5
Update of /cvsroot/seq/showeq/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18654/src Modified Files: Tag: pre_5_0_beta Makefile.am bazaarlog.cpp bazaarlog.h category.cpp classes.h combatlog.cpp compass.cpp compassframe.cpp datetimemgr.cpp deity.h editor.cpp everquest.h experiencelog.cpp filter.cpp filteredspawnlog.cpp filtermgr.cpp filternotifications.cpp group.cpp guild.cpp guildlist.cpp guildshell.cpp guildshell.h interface.cpp interface.h itemdb.cpp itemdbtool.cpp languages.h logger.cpp map.cpp mapicon.cpp messagefilter.cpp messagefilterdialog.cpp messages.cpp messageshell.cpp messagewindow.cpp netdiag.cpp packet.cpp packetinfo.cpp packetlog.cpp packetstream.cpp player.cpp player.h races.h seqlistview.cpp seqwindow.cpp skilllist.cpp skills.h spawn.h spawnlist.cpp spawnlist2.cpp spawnlistcommon.cpp spawnlog.cpp spawnmonitor.cpp spawnpointlist.cpp spawnshell.cpp spelllist.cpp spells.cpp spellshell.cpp staticspells.h statlist.cpp terminal.cpp typenames.h weapons.h weapons1.h weapons27.h weapons28.h weapons2b.h xmlconv.cpp xmlpreferences.cpp zonemgr.cpp Log Message: 5.0.0.16 Index: spawnmonitor.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/spawnmonitor.cpp,v retrieving revision 1.5.12.1 retrieving revision 1.5.12.2 diff -u -d -r1.5.12.1 -r1.5.12.2 --- spawnmonitor.cpp 7 Dec 2003 06:30:44 -0000 1.5.12.1 +++ spawnmonitor.cpp 7 Nov 2004 23:10:25 -0000 1.5.12.2 @@ -405,3 +405,5 @@ seqInfo("Loaded spawn points: %s", (const char*)fileName); m_modified = false; } + +#include "spawnmonitor.moc" Index: combatlog.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/combatlog.cpp,v retrieving revision 1.10.16.1 retrieving revision 1.10.16.2 diff -u -d -r1.10.16.1 -r1.10.16.2 --- combatlog.cpp 7 Dec 2003 06:30:43 -0000 1.10.16.1 +++ combatlog.cpp 7 Nov 2004 23:09:56 -0000 1.10.16.2 @@ -987,3 +987,4 @@ resetDPS(); } +#include "combatlog.moc" Index: messagefilterdialog.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/Attic/messagefilterdialog.cpp,v retrieving revision 1.1.4.2 retrieving revision 1.1.4.3 diff -u -d -r1.1.4.2 -r1.1.4.3 --- messagefilterdialog.cpp 13 Dec 2003 00:49:42 -0000 1.1.4.2 +++ messagefilterdialog.cpp 7 Nov 2004 23:10:22 -0000 1.1.4.3 @@ -466,3 +466,5 @@ // only enable delete if editing an existing filter m_delete->setEnabled(m_currentFilter != 0); } + +#include "messagefilterdialog.moc" Index: messagewindow.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/Attic/messagewindow.cpp,v retrieving revision 1.1.4.2 retrieving revision 1.1.4.3 diff -u -d -r1.1.4.2 -r1.1.4.3 --- messagewindow.cpp 13 Dec 2003 00:49:42 -0000 1.1.4.2 +++ messagewindow.cpp 7 Nov 2004 23:10:22 -0000 1.1.4.3 @@ -1175,3 +1175,4 @@ m_hideUserFilterMenu->insertItem(filter.name(), filterid); } +#include "messagewindow.moc" Index: weapons27.h =================================================================== RCS file: /cvsroot/seq/showeq/src/weapons27.h,v retrieving revision 1.4 retrieving revision 1.4.10.1 diff -u -d -r1.4 -r1.4.10.1 --- weapons27.h 7 Oct 2003 14:34:29 -0000 1.4 +++ weapons27.h 7 Nov 2004 23:10:26 -0000 1.4.10.1 @@ -4,6 +4,8 @@ * ShowEQ Distributed under GPL * http://seq.sourceforge.net/ */ + +#ifndef DOXYGEN_SHOULD_SKIP_THIS NULL, // 0x00 NULL, // 0x01 NULL, // 0x02 @@ -277,3 +279,5 @@ NULL, // 0xfd NULL, // 0xfe NULL, // 0xff +#endif /* DOXYGEN_SHOULD_SKIP_THIS */ + Index: spawn.h =================================================================== RCS file: /cvsroot/seq/showeq/src/spawn.h,v retrieving revision 1.19.6.3 retrieving revision 1.19.6.4 diff -u -d -r1.19.6.3 -r1.19.6.4 --- spawn.h 24 Sep 2004 04:25:53 -0000 1.19.6.3 +++ spawn.h 7 Nov 2004 23:10:25 -0000 1.19.6.4 @@ -428,16 +428,16 @@ { // if this is an item of spawn type, return the pointer to Spawn, // return otherwise NULL - if (!item || (item->type() == tSpawn)) - return NULL; // otherwise NULL - else + if (item && ((item->type() == tSpawn) || (item->type() == tPlayer))) return (const Spawn*)item; + else + return NULL; // otherwise NULL } inline Spawn* spawnType(Item* item) { // if this is an item of spawn type, return the pointer to Spawn - if (item->type() == tSpawn) + if (item && ((item->type() == tSpawn) || (item->type() == tPlayer))) return (Spawn*)item; else return NULL; // otherwise NULL @@ -447,7 +447,7 @@ inline const Door* doorType(const Item* item) { // if this is an item of door type, return the pointer to Door - if (item->type() == tDoors) + if (item && (item->type() == tDoors)) return (const Door*)item; else return NULL; // otherwise NULL @@ -456,7 +456,7 @@ inline Door* doorType(Item* item) { // if this is an item of door type, return the pointer to Door - if (item->type() == tDoors) + if (item && (item->type() == tDoors)) return (Door*)item; else return NULL; // otherwise NULL @@ -466,7 +466,7 @@ inline const Drop* dropType(const Item* item) { // if this is an item of drop type, return the pointer to Drop - if (item->type() == tDrop) + if (item && (item->type() == tDrop)) return (const Drop*)item; else return NULL; // otherwise NULL @@ -475,7 +475,7 @@ inline Drop* dropType(Item* item) { // if this is an item of drop type, return the pointer to Drop - if (item->type() == tDrop) + if (item && (item->type() == tDrop)) return (Drop*)item; else return NULL; // otherwise NULL Index: seqwindow.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/seqwindow.cpp,v retrieving revision 1.1.16.1 retrieving revision 1.1.16.2 diff -u -d -r1.1.16.1 -r1.1.16.2 --- seqwindow.cpp 7 Dec 2003 06:30:44 -0000 1.1.16.1 +++ seqwindow.cpp 7 Nov 2004 23:10:25 -0000 1.1.16.2 @@ -151,3 +151,4 @@ QDockWindow::mousePressEvent(e); } +#include "seqwindow.moc" Index: typenames.h =================================================================== RCS file: /cvsroot/seq/showeq/src/typenames.h,v retrieving revision 1.4 retrieving revision 1.4.6.1 diff -u -d -r1.4 -r1.4.6.1 --- typenames.h 25 Oct 2003 00:21:00 -0000 1.4 +++ typenames.h 7 Nov 2004 23:10:26 -0000 1.4.6.1 @@ -4,6 +4,8 @@ * ShowEQ Distributed under GPL * http://seq.sourceforge.net/ */ + +#ifndef DOXYGEN_SHOULD_SKIP_THIS NULL, // 0 "Humanoid", // 1 NULL, // 2 @@ -73,3 +75,5 @@ "Timer", // 66 "EventTrigger", // 67 NULL, // 68 +#endif /* DOXYGEN_SHOULD_SKIP_THIS */ + Index: weapons1.h =================================================================== RCS file: /cvsroot/seq/showeq/src/weapons1.h,v retrieving revision 1.1 retrieving revision 1.1.10.1 diff -u -d -r1.1 -r1.1.10.1 --- weapons1.h 7 Oct 2003 14:34:29 -0000 1.1 +++ weapons1.h 7 Nov 2004 23:10:26 -0000 1.1.10.1 @@ -4,6 +4,8 @@ * ShowEQ Distributed under GPL * http://seq.sourceforge.net/ */ + +#ifndef DOXYGEN_SHOULD_SKIP_THIS NULL, // 0x00 NULL, // 0x01 NULL, // 0x02 @@ -277,3 +279,5 @@ NULL, // 0xfd NULL, // 0xfe NULL, // 0xff +#endif /* DOXYGEN_SHOULD_SKIP_THIS */ + Index: terminal.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/Attic/terminal.cpp,v retrieving revision 1.1.4.2 retrieving revision 1.1.4.3 diff -u -d -r1.1.4.2 -r1.1.4.3 --- terminal.cpp 13 Dec 2003 00:49:43 -0000 1.1.4.2 +++ terminal.cpp 7 Nov 2004 23:10:26 -0000 1.1.4.3 @@ -213,3 +213,4 @@ fputc('\n', stdout); } +#include "terminal.moc" Index: guildshell.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/Attic/guildshell.cpp,v retrieving revision 1.1.4.2 retrieving revision 1.1.4.3 diff -u -d -r1.1.4.2 -r1.1.4.3 --- guildshell.cpp 24 Sep 2004 04:25:52 -0000 1.1.4.2 +++ guildshell.cpp 7 Nov 2004 23:10:03 -0000 1.1.4.3 @@ -241,6 +241,7 @@ } } +#include "guildshell.moc" Index: zonemgr.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/zonemgr.cpp,v retrieving revision 1.8.6.4 retrieving revision 1.8.6.5 diff -u -d -r1.8.6.4 -r1.8.6.5 --- zonemgr.cpp 18 Feb 2004 22:56:15 -0000 1.8.6.4 +++ zonemgr.cpp 7 Nov 2004 23:10:27 -0000 1.8.6.5 @@ -277,3 +277,5 @@ sizeof(zonePointStruct) * m_zonePointCount); } +#include "zonemgr.moc" + Index: xmlconv.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/xmlconv.cpp,v retrieving revision 1.2.16.3 retrieving revision 1.2.16.4 diff -u -d -r1.2.16.3 -r1.2.16.4 --- xmlconv.cpp 24 Sep 2004 04:25:53 -0000 1.2.16.3 +++ xmlconv.cpp 7 Nov 2004 23:10:27 -0000 1.2.16.4 @@ -205,11 +205,7 @@ // fix the key code (deal with Qt brain death) key &= ~Qt::UNICODE_ACCEL; -#if QT_VERSION >= 300 v = QVariant(QKeySequence(key)); -#else - v = QVariant(key); -#endif ok = true; } } @@ -240,12 +236,10 @@ sp.setHorData((QSizePolicy::SizeType)e.attribute("hsizetype").toInt()); if (e.hasAttribute("vsizetype")) sp.setVerData((QSizePolicy::SizeType)e.attribute("vsizetype").toInt()); -#if (QT_VERSION >= 300) if (e.hasAttribute("horstretch")) sp.setHorStretch(e.attribute("horstretch").toInt()); if (e.hasAttribute("verstretch")) sp.setHorStretch(e.attribute("verstretch").toInt()); -#endif v = QVariant(sp); ok = true; } @@ -453,10 +447,8 @@ QSizePolicy sp(v.toSizePolicy()); e.setAttribute("hsizetype", sp.horData()); e.setAttribute("vsizetype", sp.verData()); -#if (QT_VERSION >= 300) e.setAttribute("horstretch", sp.horStretch()); e.setAttribute("verstretch", sp.verStretch()); -#endif } break; case QVariant::Cursor: @@ -515,12 +507,10 @@ } break; -#if QT_VERSION >= 300 case QVariant::KeySequence: e.setTagName("key"); e.setAttribute("sequence", (QString)v.toKeySequence()); break; -#endif case QVariant::ByteArray: // this is only for [u]int64_t { Index: spawnlog.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/spawnlog.cpp,v retrieving revision 1.2.4.2 retrieving revision 1.2.4.3 diff -u -d -r1.2.4.2 -r1.2.4.3 --- spawnlog.cpp 16 Jan 2004 20:22:11 -0000 1.2.4.2 +++ spawnlog.cpp 7 Nov 2004 23:10:25 -0000 1.2.4.3 @@ -35,11 +35,7 @@ const char *killedBy, int kid, int guildid) { const QDateTime& eqDate = m_dateTimeMgr->updatedDateTime(); -#if (QT_VERSION > 0x030100) const QTime& time = QTime::currentTime(Qt::LocalTime); -#else - const QTime& time = QTime::currentTime(); -#endif logSpawnInfo(type, name, id, level, x, y, z, eqDate, time, @@ -88,11 +84,7 @@ int spawndatasize = len / sizeof(spawnStruct); const QDateTime& eqDate = m_dateTimeMgr->updatedDateTime(); -#if (QT_VERSION > 0x030100) const QTime& time = QTime::currentTime(Qt::LocalTime); -#else - const QTime& time = QTime::currentTime(); -#endif for (int i = 0; i < spawndatasize; i++) { @@ -151,4 +143,4 @@ zoneShortName = zonename; } - +#include "spawnlog.moc" Index: logger.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/logger.cpp,v retrieving revision 1.30 retrieving revision 1.30.6.1 diff -u -d -r1.30 -r1.30.6.1 --- logger.cpp 25 Oct 2003 00:20:59 -0000 1.30 +++ logger.cpp 7 Nov 2004 23:10:20 -0000 1.30.6.1 @@ -140,3 +140,4 @@ fprintf (m_fp, "%03d | %-48s | %s \n\n", c, hex, asc); } +#include "logger.moc" Index: group.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/group.cpp,v retrieving revision 1.6.16.2 retrieving revision 1.6.16.3 diff -u -d -r1.6.16.2 -r1.6.16.3 --- group.cpp 13 Dec 2003 00:49:42 -0000 1.6.16.2 +++ group.cpp 7 Nov 2004 23:10:03 -0000 1.6.16.3 @@ -368,3 +368,4 @@ return m_members[slot].m_spawn; } +#include "group.moc" Index: player.h =================================================================== RCS file: /cvsroot/seq/showeq/src/player.h,v retrieving revision 1.21.6.2 retrieving revision 1.21.6.3 diff -u -d -r1.21.6.2 -r1.21.6.3 --- player.h 16 Jan 2004 20:22:11 -0000 1.21.6.2 +++ player.h 7 Nov 2004 23:10:25 -0000 1.21.6.3 @@ -132,7 +132,7 @@ signals: void newPlayer(void); void buffLoad(const spellBuff*); - void newSpeed (int speed); + void newSpeed (double speed); void statChanged ( int statNum, int val, int max Index: datetimemgr.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/datetimemgr.cpp,v retrieving revision 1.2.4.1 retrieving revision 1.2.4.2 diff -u -d -r1.2.4.1 -r1.2.4.2 --- datetimemgr.cpp 7 Dec 2003 06:30:43 -0000 1.2.4.1 +++ datetimemgr.cpp 7 Nov 2004 23:09:56 -0000 1.2.4.2 @@ -44,11 +44,7 @@ { const timeOfDayStruct* tday = (const timeOfDayStruct*)data; -#if (QT_VERSION > 0x030100) m_refDateTime = QDateTime::currentDateTime(Qt::UTC); -#else - m_refDateTime = QDateTime::currentDateTime(); -#endif m_eqDateTime.setDate(QDate(tday->year, tday->month, tday->day)); m_eqDateTime.setTime(QTime(tday->hour - 1, tday->minute, 0)); if (!m_timer) @@ -66,11 +62,7 @@ if (!m_eqDateTime.isValid()) return; -#if (QT_VERSION > 0x030100) const QDateTime& current = QDateTime::currentDateTime(Qt::UTC); -#else - const QDateTime& current = QDateTime::currentDateTime(); -#endif int secs = m_refDateTime.secsTo(current); if (secs) @@ -81,3 +73,5 @@ } } +#include "datetimemgr.moc" + Index: statlist.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/statlist.cpp,v retrieving revision 1.8.6.1 retrieving revision 1.8.6.2 diff -u -d -r1.8.6.1 -r1.8.6.2 --- statlist.cpp 7 Dec 2003 06:30:46 -0000 1.8.6.1 +++ statlist.cpp 7 Nov 2004 23:10:26 -0000 1.8.6.2 @@ -363,3 +363,5 @@ // make the listview save it's prefs m_statList->savePrefs(); } + +#include "statlist.moc" Index: bazaarlog.h =================================================================== RCS file: /cvsroot/seq/showeq/src/Attic/bazaarlog.h,v retrieving revision 1.1.4.1 retrieving revision 1.1.4.2 diff -u -d -r1.1.4.1 -r1.1.4.2 --- bazaarlog.h 18 Feb 2004 22:56:14 -0000 1.1.4.1 +++ bazaarlog.h 7 Nov 2004 23:09:56 -0000 1.1.4.2 @@ -7,12 +7,15 @@ * Copyright 2003-2004 by the respective ShowEQ Developers */ +#ifndef _BAZAARLOG_H_ +#define _BAZAARLOG_H_ + #include <qobject.h> #include "logger.h" class EQPacket; class SpawnShell; - + //---------------------------------------------------------------------- // BazaarLog is an SEQLogger subclass that handles bazaar packets class BazaarLog : public SEQLogger @@ -32,3 +35,4 @@ SpawnShell& m_shell; }; +#endif // _BAZAARLOG_H_ Index: filteredspawnlog.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/Attic/filteredspawnlog.cpp,v retrieving revision 1.1.4.1 retrieving revision 1.1.4.2 diff -u -d -r1.1.4.1 -r1.1.4.2 --- filteredspawnlog.cpp 7 Dec 2003 06:30:43 -0000 1.1.4.1 +++ filteredspawnlog.cpp 7 Nov 2004 23:10:03 -0000 1.1.4.2 @@ -89,3 +89,4 @@ flush(); } +#include "filteredspawnlog.moc" Index: compass.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/compass.cpp,v retrieving revision 1.2 retrieving revision 1.2.16.1 diff -u -d -r1.2 -r1.2.16.1 --- compass.cpp 30 Aug 2003 15:51:45 -0000 1.2 +++ compass.cpp 7 Nov 2004 23:09:56 -0000 1.2.16.1 @@ -167,3 +167,5 @@ paintCompass (&p); p.end(); } + +#include "compass.moc" Index: bazaarlog.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/Attic/bazaarlog.cpp,v retrieving revision 1.1.4.3 retrieving revision 1.1.4.4 diff -u -d -r1.1.4.3 -r1.1.4.4 --- bazaarlog.cpp 24 Sep 2004 04:25:52 -0000 1.1.4.3 +++ bazaarlog.cpp 7 Nov 2004 23:09:56 -0000 1.1.4.4 @@ -64,3 +64,6 @@ flush(); } + +#include "bazaarlog.moc" + Index: itemdbtool.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/itemdbtool.cpp,v retrieving revision 1.11.6.3 retrieving revision 1.11.6.4 diff -u -d -r1.11.6.3 -r1.11.6.4 --- itemdbtool.cpp 24 Sep 2004 04:25:53 -0000 1.11.6.3 +++ itemdbtool.cpp 7 Nov 2004 23:10:20 -0000 1.11.6.4 @@ -1683,7 +1683,7 @@ printf("001: "); uint8_t fieldCount = 1; uint8_t col = 5; - size_t fieldWidth; + int fieldWidth; const char* curPos = rawData; const char* endField; Index: seqlistview.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/seqlistview.cpp,v retrieving revision 1.2 retrieving revision 1.2.16.1 diff -u -d -r1.2 -r1.2.16.1 --- seqlistview.cpp 24 May 2002 19:15:12 -0000 1.2 +++ seqlistview.cpp 7 Nov 2004 23:10:25 -0000 1.2.16.1 @@ -223,3 +223,5 @@ // trigger an update, otherwise things may look messy triggerUpdate(); } + +#include "seqlistview.moc" Index: guildlist.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/Attic/guildlist.cpp,v retrieving revision 1.1.4.2 retrieving revision 1.1.4.3 diff -u -d -r1.1.4.2 -r1.1.4.3 --- guildlist.cpp 12 Feb 2004 00:39:28 -0000 1.1.4.2 +++ guildlist.cpp 7 Nov 2004 23:10:03 -0000 1.1.4.3 @@ -477,3 +477,4 @@ m_guildTotals->setText(text.arg(m_membersOn).arg(m_guildShell->members().count())); } +#include "guildlist.moc" Index: Makefile.am =================================================================== RCS file: /cvsroot/seq/showeq/src/Makefile.am,v retrieving revision 1.22.6.5 retrieving revision 1.22.6.6 diff -u -d -r1.22.6.5 -r1.22.6.6 --- Makefile.am 24 Sep 2004 04:25:51 -0000 1.22.6.5 +++ Makefile.am 7 Nov 2004 23:09:55 -0000 1.22.6.6 @@ -8,18 +8,88 @@ endif ITEMDB_SRCS = itemdb.cpp gdbmconv.cpp $(DB3_SRCS) -nodist_ITEMDB_SRCS = m_itemdb.cpp +nodist_ITEMDB_SRCS = bin_PROGRAMS = showeq showeqitemdbtool -showeq_SOURCES = main.cpp spawn.cpp spawnshell.cpp spawnlist.cpp spellshell.cpp spelllist.cpp vpacket.cpp editor.cpp filter.cpp packetfragment.cpp packetstream.cpp packetinfo.cpp packet.cpp packetcapture.cpp packetformat.cpp interface.cpp compass.cpp map.cpp util.cpp experiencelog.cpp combatlog.cpp player.cpp skilllist.cpp statlist.cpp filtermgr.cpp mapcore.cpp category.cpp compassframe.cpp group.cpp guild.cpp netdiag.cpp logger.cpp xmlconv.cpp xmlpreferences.cpp seqwindow.cpp seqlistview.cpp zonemgr.cpp spawnmonitor.cpp spawnpointlist.cpp spawnlistcommon.cpp spawnlist2.cpp spells.cpp datetimemgr.cpp spawnlog.cpp packetlog.cpp datalocationmgr.cpp eqstr.cpp messages.cpp message.cpp messagefilter.cpp messagewindow.cpp messageshell.cpp terminal.cpp filteredspawnlog.cpp messagefilterdialog.cpp diagnosticmessages.cpp mapicon.cpp filternotifications.cpp netstream.cpp guildshell.cpp guildlist.cpp bazaarlog.cpp $(ITEMDB_SRCS) +showeq_SOURCES = main.cpp spawn.cpp spawnshell.cpp spawnlist.cpp spellshell.cpp \ + spelllist.cpp vpacket.cpp editor.cpp filter.cpp packetfragment.cpp packetstream.cpp \ + packetinfo.cpp packet.cpp packetcapture.cpp packetformat.cpp interface.cpp compass.cpp \ + map.cpp util.cpp experiencelog.cpp combatlog.cpp player.cpp skilllist.cpp \ + statlist.cpp filtermgr.cpp mapcore.cpp category.cpp compassframe.cpp group.cpp \ + guild.cpp netdiag.cpp logger.cpp xmlconv.cpp xmlpreferences.cpp seqwindow.cpp \ + seqlistview.cpp zonemgr.cpp spawnmonitor.cpp spawnpointlist.cpp spawnlistcommon.cpp \ + spawnlist2.cpp spells.cpp datetimemgr.cpp spawnlog.cpp packetlog.cpp \ + datalocationmgr.cpp eqstr.cpp messages.cpp message.cpp messagefilter.cpp messagewindow.cpp \ + messageshell.cpp terminal.cpp filteredspawnlog.cpp messagefilterdialog.cpp \ + diagnosticmessages.cpp mapicon.cpp filternotifications.cpp netstream.cpp guildshell.cpp \ + guildlist.cpp bazaarlog.cpp $(ITEMDB_SRCS) -nodist_showeq_SOURCES = m_spawnshell.cpp m_spawnlist.cpp m_spellshell.cpp m_spelllist.cpp m_editor.cpp m_packetstream.cpp m_packetinfo.cpp m_packet.cpp m_interface.cpp m_compass.cpp m_map.cpp m_experiencelog.cpp m_combatlog.cpp m_player.cpp m_skilllist.cpp m_statlist.cpp m_filtermgr.cpp m_category.cpp m_compassframe.cpp m_group.cpp m_guild.cpp m_netdiag.cpp m_logger.cpp m_xmlpreferences.cpp m_seqwindow.cpp m_seqlistview.cpp m_zonemgr.cpp m_spawnmonitor.cpp m_spawnpointlist.cpp m_spawnlistcommon.cpp m_spawnlist2.cpp m_datetimemgr.cpp m_spawnlog.cpp m_packetlog.cpp m_messages.cpp m_messagefilter.cpp m_messagewindow.cpp m_messageshell.cpp m_terminal.cpp m_filteredspawnlog.cpp m_messagefilterdialog.cpp m_mapicon.cpp m_filternotifications.cpp m_guildshell.cpp m_guildlist.cpp m_bazaarlog.cpp ui_mapicondialog.h ui_mapicondialog.cpp m_ui_mapicondialog.cpp $(nodist_ITEMDB_SRCS) +showeq_moc_SRCS = bazaarlog.moc category.moc combatlog.moc compass.moc \ + compassframe.moc datetimemgr.moc editor.moc experiencelog.moc \ + filteredspawnlog.moc filtermgr.moc filternotifications.moc group.moc \ + guild.moc guildlist.moc guildshell.moc interface.moc itemdb.moc logger.moc \ + map.moc mapicon.moc messagefilter.moc messagefilterdialog.moc messages.moc \ + messageshell.moc messagewindow.moc netdiag.moc packet.moc packetinfo.moc \ + packetlog.moc packetstream.moc player.moc seqlistview.moc \ + seqwindow.moc skilllist.moc spawnlist.moc spawnlist2.moc spawnlistcommon.moc \ + spawnlog.moc spawnmonitor.moc spawnpointlist.moc spawnshell.moc spelllist.moc \ + spellshell.moc statlist.moc terminal.moc xmlpreferences.moc zonemgr.moc + +nodist_showeq_SOURCES = ui_mapicondialog.h ui_mapicondialog.cpp $(showeq_moc_SRCS) m_ui_mapicondialog.cpp $(nodist_ITEMDB_SRCS) + +$(srcdir)/bazaarlog.cpp: bazaarlog.moc +$(srcdir)/category.cpp: category.moc +$(srcdir)/combatlog.cpp: combatlog.moc +$(srcdir)/compass.cpp: compass.moc +$(srcdir)/compassframe.cpp: compassframe.moc +$(srcdir)/datetimemgr.cpp: datetimemgr.moc +$(srcdir)/editor.cpp: editor.moc +$(srcdir)/experiencelog.cpp: experiencelog.moc +$(srcdir)/filteredspawnlog.cpp: filteredspawnlog.moc +$(srcdir)/filtermgr.cpp: filtermgr.moc +$(srcdir)/filternotifications.cpp: filternotifications.moc +$(srcdir)/group.cpp: group.moc +$(srcdir)/guild.cpp: guild.moc +$(srcdir)/guildlist.cpp: guildlist.moc +$(srcdir)/guildshell.cpp: guildshell.moc +$(srcdir)/interface.cpp: interface.moc +$(srcdir)/itemdb.cpp: itemdb.moc +$(srcdir)/logger.cpp: logger.moc +$(srcdir)/map.cpp: map.moc +$(srcdir)/mapicon.cpp: mapicon.moc +$(srcdir)/messagefilter.cpp: messagefilter.moc +$(srcdir)/messagefilterdialog.cpp: messagefilterdialog.moc +$(srcdir)/messages.cpp: messages.moc +$(srcdir)/messageshell.cpp: messageshell.moc +$(srcdir)/messagewindow.cpp: messagewindow.moc +$(srcdir)/netdiag.cpp: netdiag.moc +$(srcdir)/packet.cpp: packet.moc +$(srcdir)/packetinfo.cpp: packetinfo.moc +$(srcdir)/packetlog.cpp: packetlog.moc +$(srcdir)/packetstream.cpp: packetstream.moc +$(srcdir)/player.cpp: player.moc +$(srcdir)/seqlistview.cpp: seqlistview.moc +$(srcdir)/seqwindow.cpp: seqwindow.moc +$(srcdir)/skilllist.cpp: skilllist.moc +$(srcdir)/spawnlist.cpp: spawnlist.moc +$(srcdir)/spawnlist2.cpp: spawnlist2.moc +$(srcdir)/spawnlistcommon.cpp: spawnlistcommon.moc +$(srcdir)/spawnlog.cpp: spawnlog.moc +$(srcdir)/spawnmonitor.cpp: spawnmonitor.moc +$(srcdir)/spawnpointlist.cpp: spawnpointlist.moc +$(srcdir)/spawnshell.cpp: spawnshell.moc +$(srcdir)/spelllist.cpp: spelllist.moc +$(srcdir)/spellshell.cpp: spellshell.moc +$(srcdir)/statlist.cpp: statlist.moc +$(srcdir)/terminal.cpp: terminal.moc +$(srcdir)/xmlpreferences.cpp: xmlpreferences.moc +$(srcdir)/zonemgr.cpp: zonemgr.moc +$(srcdir)/packetinfo.cpp: s_everquest.h showeq_LDADD = $(QT_LDFLAGS) $(QTLIB) $(DB3_LIBS) $(LIBPTHREAD) $(MEMORY_LIBS) \ $(PROFILE_LIBS) $(SHOWEQ_RPATH) $(USER_LDFLAGS) - showeqitemdbtool_SOURCES = itemdbtool.cpp util.cpp diagnosticmessageslight.cpp datalocationmgr.cpp $(ITEMDB_SRCS) nodist_showeqitemdbtool_SOURCES = $(nodist_ITEMDB_SRCS) showeqitemdbtool_LDADD = $(QT_LDFLAGS) $(DB3_LIBS) $(QTLIB) $(LIBPTHREAD) $(SHOWEQ_RPATH) $(USER_LDFLAGS) @@ -60,20 +130,24 @@ nodist_sortitem_SOURCES = sortitem_LDADD = $(QT_LDFLAGS) $(QTLIB) $(LIBPTHREAD) $(SHOWEQ_RPATH) $(USER_LDFLAGS) -EXTRA_DIST = classes.h compass.h everquest.h interface.h main.h map.h filter.h vpacket.h editor.h packet.h packetcapture.h packetcommon.h packetformat.h packetstream.h packetfragment.h packetinfo.h races.h skills.h spells.h util.h experiencelog.h combatlog.h spawn.h spawnshell.h spawnlist.h spellshell.h spelllist.h languages.h weapons.h weapons1.h weapons27.h weapons28.h weapons2b.h decode.h itemdb.h gdbmconv.h cgiconv.h skilllist.h statlist.h db3conv.h dbcommon.h deity.h player.h crctab.h filtermgr.h point.h pointarray.h mapcore.h category.h compassframe.h group.h guild.h fixpt.h netdiag.h zones.h logger.h xmlconv.h xmlpreferences.h seqwindow.h seqlistview.h zonemgr.h spawnmonitor.h spawnpointlist.h typenames.h spawnlistcommon.h spawnlist2.h datetimemgr.h spawnlog.h packetlog.h datalocationmgr.h eqstr.h messages.h messagefilter.h messagewindow.h messageshell.h terminal.h filteredspawnlog.h messagefilterdialog.h diagnosticmessages.h mapicon.h mapicondialog.ui mapicondialog.ui.h filternotifications.h netstream.h guildshell.h guildlist.h bazaarlog.h message.h s_everquest.h staticspells.h h2info.pl +EXTRA_DIST = h2info.pl + +noinst_HEADERS = classes.h compass.h everquest.h interface.h main.h map.h filter.h vpacket.h editor.h packet.h packetcapture.h packetcommon.h packetformat.h packetstream.h packetfragment.h packetinfo.h races.h skills.h spells.h util.h experiencelog.h combatlog.h spawn.h spawnshell.h spawnlist.h spellshell.h spelllist.h languages.h weapons.h weapons1.h weapons27.h weapons28.h weapons2b.h decode.h itemdb.h gdbmconv.h cgiconv.h skilllist.h statlist.h db3conv.h dbcommon.h deity.h player.h crctab.h filtermgr.h point.h pointarray.h mapcore.h category.h compassframe.h group.h guild.h fixpt.h netdiag.h zones.h logger.h xmlconv.h xmlpreferences.h seqwindow.h seqlistview.h zonemgr.h spawnmonitor.h spawnpointlist.h typenames.h spawnlistcommon.h spawnlist2.h datetimemgr.h spawnlog.h packetlog.h datalocationmgr.h eqstr.h messages.h messagefilter.h messagewindow.h messageshell.h terminal.h filteredspawnlog.h messagefilterdialog.h diagnosticmessages.h mapicon.h mapicondialog.ui mapicondialog.ui.h filternotifications.h netstream.h guildshell.h guildlist.h bazaarlog.h message.h s_everquest.h staticspells.h CLEANFILES = $(nodist_showeq_SOURCES) MAINTAINERCLEANFILES = Makefile.in s_everquest.h map.o: map.cpp map.h ui_mapicondialog.h -packetinfo.o: s_everquest.h + +.h.moc: + $(MOC) $< -o $@ m_%.cpp: %.h - $(MOC) -nw $< -o $@ + $(MOC) $< -o $@ s_%.h: %.h - ./h2info.pl $< $@ + $(srcdir)/h2info.pl $< $@ ui_%.h: %.ui $(UIC) -nounload $< > $@ @@ -91,3 +165,5 @@ else :; fi; \ done endif + + Index: everquest.h =================================================================== RCS file: /cvsroot/seq/showeq/src/everquest.h,v retrieving revision 1.74.6.16 retrieving revision 1.74.6.17 diff -u -d -r1.74.6.16 -r1.74.6.17 --- everquest.h 24 Sep 2004 04:25:52 -0000 1.74.6.16 +++ everquest.h 7 Nov 2004 23:09:59 -0000 1.74.6.17 @@ -445,7 +445,7 @@ /*0244*/ uint8_t unknown244[14]; /*0258*/ int16_t deity; // Player's Deity -/*0262*/ uint8_t unknown260[115]; +/*0262*/ uint8_t unknown260[119]; }; /* 0375 */ /* @@ -473,7 +473,7 @@ /*0508*/ float underworld; // Underworld /*0512*/ float minclip; // Minimum view distance /*0516*/ float maxclip; // Maximum view distance -/*0520*/ uint8_t unknown0520[156]; // *** Placeholder +/*0520*/ uint8_t unknown0520[160]; // *** Placeholder /*0676*/ }; @@ -820,7 +820,7 @@ /*250*/ int8_t unknown249[4]; /*254*/ uint32_t petOwnerId; /*258*/ int16_t deity; -/*260*/ uint8_t unknown260[115]; +/*260*/ uint8_t unknown260[119]; /*375*/ }; Index: deity.h =================================================================== RCS file: /cvsroot/seq/showeq/src/deity.h,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.16.1 diff -u -d -r1.1.1.1 -r1.1.1.1.16.1 --- deity.h 19 Dec 2001 00:36:52 -0000 1.1.1.1 +++ deity.h 7 Nov 2004 23:09:56 -0000 1.1.1.1.16.1 @@ -5,6 +5,7 @@ * http://seq.sourceforge.net/ */ +#ifndef DOXYGEN_SHOULD_SKIP_THIS "Bertoxxulous", // DEITY_BERT = 201 "Brell Serilis", // DEITY_BRELL = 202 "Cazic Thule", // DEITY_CAZIC = 203 @@ -21,3 +22,5 @@ "The Tribunal", // DEITY_TRIBUNAL = 214 "Tunare", // DEITY_TUNARE = 215 "Veeshan", // DEITY_VEESHAN = 216 +#endif /* DOXYGEN_SHOULD_SKIP_THIS */ + Index: packetstream.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/packetstream.cpp,v retrieving revision 1.1.6.4 retrieving revision 1.1.6.5 diff -u -d -r1.1.6.4 -r1.1.6.5 --- packetstream.cpp 18 Sep 2004 20:51:32 -0000 1.1.6.4 +++ packetstream.cpp 7 Nov 2004 23:10:24 -0000 1.1.6.5 @@ -695,7 +695,7 @@ if (!found && !opcodeEntry->isEmpty()) { QString tempStr; - tempStr.sprintf("%s (%#04x) (dataLen: %d) doesn't match:", + tempStr.sprintf("%s (%#04x) (dataLen: %u) doesn't match:", (const char*)opcodeEntry->name(), opcodeEntry->opcode(), len); @@ -835,3 +835,5 @@ processCache(); } /* end ARQ processing */ } + +#include "packetstream.moc" Index: player.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/player.cpp,v retrieving revision 1.42.6.6 retrieving revision 1.42.6.7 diff -u -d -r1.42.6.6 -r1.42.6.7 --- player.cpp 24 Sep 2004 04:25:53 -0000 1.42.6.6 +++ player.cpp 7 Nov 2004 23:10:24 -0000 1.42.6.7 @@ -851,9 +851,9 @@ updateLastChanged(); emit changeItem(this, tSpawnChangedPosition); - emit newSpeed((int)lrint(hypot( hypot( (pupdate->deltaX*8), - (pupdate->deltaY*8)), - (pupdate->deltaZ*8)))); + emit newSpeed(hypot( hypot( (pupdate->deltaX*8), + (pupdate->deltaY*8)), + (pupdate->deltaZ*8))); static uint8_t count = 0; @@ -1441,3 +1441,5 @@ clear(); } } + +#include "player.moc" Index: packetlog.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/packetlog.cpp,v retrieving revision 1.1.6.4 retrieving revision 1.1.6.5 diff -u -d -r1.1.6.4 -r1.1.6.5 --- packetlog.cpp 16 Jan 2004 20:22:11 -0000 1.1.6.4 +++ packetlog.cpp 7 Nov 2004 23:10:24 -0000 1.1.6.5 @@ -266,7 +266,7 @@ else ::putchar('\n'); - ::printf("%s [Size: %d]%s\n", + ::printf("%s [Size: %u]%s\n", ((dir == DIR_Server) ? "[Server->Client]" : "[Client->Server]"), len, (const char*)opCodeToString(opcode)); @@ -487,3 +487,4 @@ } } +#include "packetlog.moc" Index: packetinfo.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/Attic/packetinfo.cpp,v retrieving revision 1.1.4.2 retrieving revision 1.1.4.3 diff -u -d -r1.1.4.2 -r1.1.4.3 --- packetinfo.cpp 16 Jan 2004 20:22:11 -0000 1.1.4.2 +++ packetinfo.cpp 7 Nov 2004 23:10:23 -0000 1.1.4.3 @@ -739,3 +739,4 @@ return true; } +#include "packetinfo.moc" Index: itemdb.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/itemdb.cpp,v retrieving revision 1.10.6.3 retrieving revision 1.10.6.4 diff -u -d -r1.10.6.3 -r1.10.6.4 --- itemdb.cpp 24 Sep 2004 04:25:53 -0000 1.10.6.3 +++ itemdb.cpp 7 Nov 2004 23:10:04 -0000 1.10.6.4 @@ -2528,3 +2528,4 @@ return (((EQItemDBEntryData_3*)m_itemEntryData)->m_itemType == ItemTypeContainer); } +#include "itemdb.moc" Index: weapons.h =================================================================== RCS file: /cvsroot/seq/showeq/src/weapons.h,v retrieving revision 1.5 retrieving revision 1.5.6.1 diff -u -d -r1.5 -r1.5.6.1 --- weapons.h 25 Oct 2003 00:21:00 -0000 1.5 +++ weapons.h 7 Nov 2004 23:10:26 -0000 1.5.6.1 @@ -4,6 +4,8 @@ * ShowEQ Distributed under GPL * http://seq.sourceforge.net/ */ + +#ifndef DOXYGEN_SHOULD_SKIP_THIS "Generic", // 0x00 "1HSword", // 0x01 "2HSword", // 0x02 @@ -260,4 +262,5 @@ NULL, // 0xfd - Unknown Weapon NULL, // 0xfe - Unknown Weapon NULL, // 0xff - Unknown Weapon +#endif /* DOXYGEN_SHOULD_SKIP_THIS */ Index: staticspells.h =================================================================== RCS file: /cvsroot/seq/showeq/src/staticspells.h,v retrieving revision 1.1 retrieving revision 1.1.14.1 diff -u -d -r1.1 -r1.1.14.1 --- staticspells.h 29 Sep 2003 00:51:03 -0000 1.1 +++ staticspells.h 7 Nov 2004 23:10:25 -0000 1.1.14.1 @@ -5,6 +5,7 @@ * http://seq.sourceforge.net/ */ +#ifndef DOXYGEN_SHOULD_SKIP_THIS /* File autogenerated from spells_en.txt */ // Format: // /* Spell ID */ { Spell Name }, @@ -4431,3 +4432,5 @@ // Max SpellId: 0x1142 = 4418 // Number of Spells: 4293 // Empty Entries: 125 +#endif /* DOXYGEN_SHOULD_SKIP_THIS */ + Index: filternotifications.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/Attic/filternotifications.cpp,v retrieving revision 1.1.4.1 retrieving revision 1.1.4.2 diff -u -d -r1.1.4.1 -r1.1.4.2 --- filternotifications.cpp 7 Dec 2003 06:30:43 -0000 1.1.4.1 +++ filternotifications.cpp 7 Nov 2004 23:10:03 -0000 1.1.4.2 @@ -129,7 +129,7 @@ system ((const char*)command); } - +#include "filternotifications.moc" Index: spells.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/spells.cpp,v retrieving revision 1.4.4.2 retrieving revision 1.4.4.3 diff -u -d -r1.4.4.2 -r1.4.4.3 --- spells.cpp 13 Dec 2003 00:49:43 -0000 1.4.4.2 +++ spells.cpp 7 Nov 2004 23:10:25 -0000 1.4.4.3 @@ -261,19 +261,7 @@ if ((unicodeIndicator != 0xfffe) && (unicodeIndicator != 0xfeff)) text = textData; else - { -#if (QT_VERSION > 0x030100) text = QString::fromUcs2((uint16_t*)textData.data()); -#else - if (sizeof(QChar) == 2) - text.setUnicode(QChar*(textData.data()), textData.size() / 2); - else - { - seqWarn("Spells::loadSpells(): Upgrade your version of Qt to at least 3.1 to properly handle UTF-16 encoded files!"); - text = textData; - } -#endif - } // split the file into at the line termination QStringList lines = QStringList::split(lineTerm, Index: experiencelog.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/experiencelog.cpp,v retrieving revision 1.10.16.2 retrieving revision 1.10.16.3 diff -u -d -r1.10.16.2 -r1.10.16.3 --- experiencelog.cpp 13 Dec 2003 00:49:42 -0000 1.10.16.2 +++ experiencelog.cpp 7 Nov 2004 23:10:03 -0000 1.10.16.3 @@ -697,3 +697,5 @@ seqInfo("xpgained: %ld group_ag: %d myLevel: %d gbonus: %d mob_level: %d penalty: %d ", xp_gained, group_ag, myLevel, gbonus, mob_level, penalty); seqInfo("ZEM - ZEM - ZEM ===== %d ", ZEM); } + +#include "experiencelog.moc" Index: filtermgr.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/filtermgr.cpp,v retrieving revision 1.5.6.2 retrieving revision 1.5.6.3 diff -u -d -r1.5.6.2 -r1.5.6.3 --- filtermgr.cpp 5 Sep 2004 19:11:12 -0000 1.5.6.2 +++ filtermgr.cpp 7 Nov 2004 23:10:03 -0000 1.5.6.3 @@ -325,3 +325,4 @@ emit runtimeFiltersChanged(type); } +#include "filtermgr.moc" Index: messageshell.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/Attic/messageshell.cpp,v retrieving revision 1.1.4.4 retrieving revision 1.1.4.5 diff -u -d -r1.1.4.4 -r1.1.4.5 --- messageshell.cpp 18 Feb 2004 22:56:15 -0000 1.1.4.4 +++ messageshell.cpp 7 Nov 2004 23:10:22 -0000 1.1.4.5 @@ -949,3 +949,4 @@ .arg(spawnInfo)); } +#include "messageshell.moc" Index: skilllist.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/skilllist.cpp,v retrieving revision 1.6.16.1 retrieving revision 1.6.16.2 diff -u -d -r1.6.16.1 -r1.6.16.2 --- skilllist.cpp 7 Dec 2003 06:30:44 -0000 1.6.16.1 +++ skilllist.cpp 7 Nov 2004 23:10:25 -0000 1.6.16.2 @@ -252,3 +252,5 @@ // make the listview save it's prefs m_skillList->savePrefs(); } + +#include "skilllist.moc" Index: skills.h =================================================================== RCS file: /cvsroot/seq/showeq/src/skills.h,v retrieving revision 1.1.1.1.16.1 retrieving revision 1.1.1.1.16.2 diff -u -d -r1.1.1.1.16.1 -r1.1.1.1.16.2 --- skills.h 18 Feb 2004 22:56:15 -0000 1.1.1.1.16.1 +++ skills.h 7 Nov 2004 23:10:25 -0000 1.1.1.1.16.2 @@ -4,6 +4,8 @@ * ShowEQ Distributed under GPL * http://seq.sourceforge.net/ */ + +#ifndef DOXYGEN_SHOULD_SKIP_THIS "1H Blunt", // 0 "1H Slashing", // 1 "2H Blunt", // 2 @@ -79,3 +81,5 @@ "Berserking", // 72 "Taunt", // 73 "Frenzy", // 74 +#endif /* DOXYGEN_SHOULD_SKIP_THIS */ + Index: guild.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/guild.cpp,v retrieving revision 1.7.6.2 retrieving revision 1.7.6.3 diff -u -d -r1.7.6.2 -r1.7.6.3 --- guild.cpp 16 Jan 2004 20:22:09 -0000 1.7.6.2 +++ guild.cpp 7 Nov 2004 23:10:03 -0000 1.7.6.3 @@ -144,3 +144,5 @@ seqInfo("%d\t%s", i, (const char*)m_guildMap[i]); } } + +#include "guild.moc" Index: spelllist.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/spelllist.cpp,v retrieving revision 1.9.10.2 retrieving revision 1.9.10.3 diff -u -d -r1.9.10.2 -r1.9.10.3 --- spelllist.cpp 13 Dec 2003 00:49:43 -0000 1.9.10.2 +++ spelllist.cpp 7 Nov 2004 23:10:25 -0000 1.9.10.3 @@ -393,3 +393,5 @@ // make the listview save it's prefs m_spellList->savePrefs(); } + +#include "spelllist.moc" Index: messagefilter.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/Attic/messagefilter.cpp,v retrieving revision 1.1.4.1 retrieving revision 1.1.4.2 diff -u -d -r1.1.4.1 -r1.1.4.2 --- messagefilter.cpp 7 Dec 2003 06:30:43 -0000 1.1.4.1 +++ messagefilter.cpp 7 Nov 2004 23:10:21 -0000 1.1.4.2 @@ -189,3 +189,5 @@ // return the filter mask return mask; } + +#include "messagefilter.moc" Index: xmlpreferences.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/xmlpreferences.cpp,v retrieving revision 1.3.16.2 retrieving revision 1.3.16.3 diff -u -d -r1.3.16.2 -r1.3.16.3 --- xmlpreferences.cpp 13 Dec 2003 00:49:43 -0000 1.3.16.2 +++ xmlpreferences.cpp 7 Nov 2004 23:10:27 -0000 1.3.16.3 @@ -25,9 +25,7 @@ #include <qdir.h> #include <qfileinfo.h> #include <qregexp.h> -#if QT_VERSION > 300 #include <qkeysequence.h> -#endif #include <qtextstream.h> @@ -112,15 +110,6 @@ return; } -#if QT_VERSION < 300 - if (!doc.setContent(&f)) - { - qWarning("Unable to set preference document to contents of file: %s!", - (const char*)filename); - f.close(); - return; - } -#else QString errorMsg; int errorLine = 0; int errorColumn = 0; @@ -132,7 +121,6 @@ f.close(); return; } -#endif // do more processing here QDomElement docElem = doc.documentElement(); @@ -286,15 +274,6 @@ bool loaded = false; if (f.open(IO_ReadOnly)) { -#if QT_VERSION < 300 - if (doc.setContent(&f)) - loaded = true; - else - { - qWarning("Unable to set preference document to contents of file: %s!", - (const char*)filename); - } -#else QString errorMsg; int errorLine = 0; int errorColumn = 0; @@ -307,7 +286,6 @@ (const char*)errorMsg, errorLine, errorColumn); } -#endif // close the file f.close(); @@ -316,16 +294,11 @@ // if no file was loaded, use the template document if (!loaded) { -#if QT_VERSION < 300 - if (doc.setContent(m_templateDoc)) - loaded = true; -#else QString errorMsg; int errorLine = 0; int errorColumn = 0; if (doc.setContent(m_templateDoc, false, &errorMsg, &errorLine, &errorColumn)) loaded = true; -#endif } // if there was an existing file, rename it @@ -725,11 +698,9 @@ switch(preference->type()) { -#if QT_VERSION >= 300 case QVariant::KeySequence: key = preference->toInt(); break; -#endif case QVariant::String: // convert it to a key key = QAccel::stringToKey(preference->toString()); @@ -794,7 +765,7 @@ default: qWarning("XMLPreferences::getPrefInt64(%s, %s, %lld): preference found,\n" "\tbut type %s is not convertable to type int64_t!", - (const char*)inName, (const char*)inSection, def, + (const char*)inName, (const char*)inSection, (long long)def, preference->typeName()); } @@ -840,9 +811,10 @@ break; } default: - qWarning("XMLPreferences::getPrefUInt64(%s, %s, %lld): preference found,\n" + qWarning("XMLPreferences::getPrefUInt64(%s, %s, %llu): preference found,\n" "\tbut type %s is not convertable to type uint64_t!", - (const char*)inName, (const char*)inSection, def, + (const char*)inName, (const char*)inSection, + (unsigned long long)def, preference->typeName()); } @@ -909,11 +881,7 @@ int inValue, Persistence pers) { -#if QT_VERSION < 300 - setPref(inName, inSection, QVariant(QAccel::keyToString(inValue)), pers); -#else setPref(inName, inSection, QVariant(QKeySequence(inValue)), pers); -#endif } void XMLPreferences::setPrefInt64(const QString& inName, @@ -945,3 +913,4 @@ setPref(inName, inSection, inValue, pers); } +#include "xmlpreferences.moc" Index: spawnlist.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/spawnlist.cpp,v retrieving revision 1.19.12.1 retrieving revision 1.19.12.2 diff -u -d -r1.19.12.1 -r1.19.12.2 --- spawnlist.cpp 7 Dec 2003 06:30:44 -0000 1.19.12.1 +++ spawnlist.cpp 7 Nov 2004 23:10:25 -0000 1.19.12.2 @@ -1174,3 +1174,5 @@ // make the listview save it's prefs m_spawnList->savePrefs(); } + +#include "spawnlist.moc" Index: interface.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/interface.cpp,v retrieving revision 1.67.6.9 retrieving revision 1.67.6.10 diff -u -d -r1.67.6.9 -r1.67.6.10 --- interface.cpp 24 Sep 2004 04:25:52 -0000 1.67.6.9 +++ interface.cpp 7 Nov 2004 23:10:03 -0000 1.67.6.10 @@ -126,6 +126,7 @@ m_unknownZoneLog(0), m_opcodeMonitorLog(0), m_selectedSpawn(0), + m_windowsMenus(11), m_compass(0), m_expWindow(0), m_combatWindow(0), @@ -135,6 +136,9 @@ { // disable the dock menu setDockMenuEnabled(false); + + // make sure the windows menus list autodeletes + m_windowsMenus.setAutoDelete(true); setCentralWidget(new QWidget(this, "filler")); @@ -2095,8 +2099,8 @@ this, SLOT(numPacket(int, int))); connect (m_packet, SIGNAL(resetPacket(int, int)), this, SLOT(resetPacket(int, int))); - connect (m_player, SIGNAL(newSpeed(int)), - this, SLOT(newSpeed(int))); + connect (m_player, SIGNAL(newSpeed(double)), + this, SLOT(newSpeed(double))); connect(m_player, SIGNAL(setExp(uint32_t, uint32_t, uint32_t, uint32_t, uint32_t)), this, SLOT(setExp(uint32_t, uint32_t, uint32_t, @@ -4384,7 +4388,7 @@ } void -EQInterface::newSpeed(int speed) +EQInterface::newSpeed(double speed) { // update twice per sec static int lastupdate = 0; @@ -4393,7 +4397,7 @@ lastupdate = mTime(); QString tempStr; - tempStr.sprintf("Run Speed: %d", speed); + tempStr.sprintf("Run Speed: %3.1f", speed); m_stsbarSpeed->setText(tempStr); } @@ -5279,21 +5283,13 @@ case 1: // platinum { QPalette p( QColor( 239, 239, 239 ) ); -#if QT_VERSION >= 0x030000 qApp->setStyle("platinum"); -#else - qApp->setStyle( (QStyle *) new QPlatinumStyle ); -#endif qApp->setPalette( p, TRUE ); } break; case 2: // windows { -#if QT_VERSION >= 0x030000 qApp->setStyle("windows"); -#else - qApp->setStyle( (QStyle *) new QWindowsStyle ); -#endif qApp->setFont( OrigFont, TRUE ); qApp->setPalette( OrigPalette, TRUE ); } @@ -5302,11 +5298,7 @@ case 4: // cde polished { QPalette p( QColor( 75, 123, 130 ) ); -#if QT_VERSION >= 0x030000 qApp->setStyle("cde"); -#else - qApp->setStyle( (QStyle *) new QCDEStyle( theme == 3 ? TRUE : FALSE ) ); -#endif p.setColor( QPalette::Active, QColorGroup::Base, QColor( 55, 77, 78 ) ); p.setColor( QPalette::Inactive, QColorGroup::Base, QColor( 55, 77, 78 ) ); p.setColor( QPalette::Disabled, QColorGroup::Base, QColor( 55, 77, 78 ) ); @@ -5332,11 +5324,7 @@ case 5: // motif { QPalette p( QColor( 192, 192, 192 ) ); -#if QT_VERSION >= 0x030000 qApp->setStyle("motif"); -#else - qApp->setStyle( (QStyle *) new QMotifStyle ); -#endif qApp->setPalette( p, TRUE ); qApp->setFont( OrigFont, TRUE ); } @@ -5344,11 +5332,7 @@ case 6: // SGI { //QPalette p( QColor( 192, 192, 192 ) ); -#if QT_VERSION >= 0x030000 qApp->setStyle("sgi"); -#else - qApp->setStyle( (QStyle *) new QSGIStyle( FALSE ) ); -#endif qApp->setPalette( OrigPalette, TRUE ); qApp->setFont( OrigFont, TRUE ); } @@ -5356,11 +5340,7 @@ default: // system default { QPalette p( QColor( 192, 192, 192 ) ); -#if QT_VERSION >= 0x030000 qApp->setStyle("motif"); -#else - qApp->setStyle( (QStyle *) new QMotifStyle ); -#endif qApp->setPalette( p, TRUE ); qApp->setFont( OrigFont, TRUE ); theme = 2; @@ -6073,12 +6053,28 @@ { QPopupMenu* menu = window->menu(); if (menu) - m_windowMenu->insertItem(window->caption(), menu, int(window)); + { + // insert the windows menu into the window menu + int id = m_windowMenu->insertItem(window->caption(), menu); + + // insert it into the window to window menu id dictionary + m_windowsMenus.insert((void*)window, new int(id)); + } } void EQInterface::removeWindowMenu(SEQWindow* window) { - m_windowMenu->removeItem(int(window)); + // find the windows menu id + int* id = m_windowsMenus.find((void*)window); + + // if the window had a menu, then remove it + if (id) + { + m_windowMenu->removeItem(*id); + + // remove the item from the list + m_windowsMenus.remove(window); + } } void EQInterface::setDockEnabled(QDockWindow* dw, bool enable) @@ -6089,3 +6085,4 @@ QMainWindow::setDockEnabled(dw, DockRight, enable); } +#include "interface.moc" Index: compassframe.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/compassframe.cpp,v retrieving revision 1.7.16.1 retrieving revision 1.7.16.2 diff -u -d -r1.7.16.1 -r1.7.16.2 --- compassframe.cpp 7 Dec 2003 06:30:43 -0000 1.7.16.1 +++ compassframe.cpp 7 Nov 2004 23:09:56 -0000 1.7.16.2 @@ -98,3 +98,5 @@ m_y->setText(QString::number(y)); m_z->setText(QString::number(z)); } + +#include "compassframe.moc" Index: spawnshell.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/spawnshell.cpp,v retrieving revision 1.42.6.2 retrieving revision 1.42.6.3 diff -u -d -r1.42.6.2 -r1.42.6.3 --- spawnshell.cpp 16 Jan 2004 20:22:11 -0000 1.42.6.2 +++ spawnshell.cpp 7 Nov 2004 23:10:25 -0000 1.42.6.3 @@ -1058,3 +1058,5 @@ (const char*)fileName); } } + +#include "spawnshell.moc" Index: spawnlist2.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/spawnlist2.cpp,v retrieving revision 1.7.12.2 retrieving revision 1.7.12.3 diff -u -d -r1.7.12.2 -r1.7.12.3 --- spawnlist2.cpp 16 Jan 2004 20:22:11 -0000 1.7.12.2 +++ spawnlist2.cpp 7 Nov 2004 23:10:25 -0000 1.7.12.3 @@ -944,3 +944,4 @@ #endif } +#include "spawnlist2.moc" Index: guildshell.h =================================================================== RCS file: /cvsroot/seq/showeq/src/Attic/guildshell.h,v retrieving revision 1.1.4.1 retrieving revision 1.1.4.2 diff -u -d -r1.1.4.1 -r1.1.4.2 --- guildshell.h 16 Jan 2004 20:22:09 -0000 1.1.4.1 +++ guildshell.h 7 Nov 2004 23:10:03 -0000 1.1.4.2 @@ -8,6 +8,9 @@ * */ +#ifndef _GUILDSHELL_H_ +#define _GUILDSHELL_H_ + #include <stdint.h> #include <time.h> @@ -94,3 +97,4 @@ ZoneMgr* m_zoneMgr; }; +#endif // _GUILDSHELL_H_ Index: messages.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/Attic/messages.cpp,v retrieving revision 1.1.4.1 retrieving revision 1.1.4.2 diff -u -d -r1.1.4.1 -r1.1.4.2 --- messages.cpp 7 Dec 2003 06:30:43 -0000 1.1.4.1 +++ messages.cpp 7 Nov 2004 23:10:22 -0000 1.1.4.2 @@ -82,4 +82,4 @@ (*it).setFilterFlags((*it).filterFlags() | mask); } - +#include "messages.moc" Index: spawnpointlist.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/spawnpointlist.cpp,v retrieving revision 1.4.16.1 retrieving revision 1.4.16.2 diff -u -d -r1.4.16.1 -r1.4.16.2 --- spawnpointlist.cpp 7 Dec 2003 06:30:44 -0000 1.4.16.1 +++ spawnpointlist.cpp 7 Nov 2004 23:10:25 -0000 1.4.16.2 @@ -568,3 +568,5 @@ if (m_spawnPointList) m_spawnPointList->savePrefs(); } + +#include "spawnpointlist.moc" Index: packet.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/packet.cpp,v retrieving revision 1.62.6.3 retrieving revision 1.62.6.4 diff -u -d -r1.62.6.3 -r1.62.6.4 --- packet.cpp 18 Sep 2004 20:51:31 -0000 1.62.6.3 +++ packet.cpp 7 Nov 2004 23:10:23 -0000 1.62.6.4 @@ -1092,3 +1092,5 @@ { return m_streams[stream]->arqSeqExp(); } + +#include "packet.moc" Index: category.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/category.cpp,v retrieving revision 1.8.16.1 retrieving revision 1.8.16.2 diff -u -d -r1.8.16.1 -r1.8.16.2 --- category.cpp 7 Dec 2003 06:30:42 -0000 1.8.16.1 +++ category.cpp 7 Nov 2004 23:09:56 -0000 1.8.16.2 @@ -366,3 +366,5 @@ pSEQPrefs->setPrefColor(prefBaseName + "Color", section, black); } } + +#include "category.moc" Index: weapons28.h =================================================================== RCS file: /cvsroot/seq/showeq/src/weapons28.h,v retrieving revision 1.1 retrieving revision 1.1.16.1 diff -u -d -r1.1 -r1.1.16.1 --- weapons28.h 30 Dec 2001 07:18:55 -0000 1.1 +++ weapons28.h 7 Nov 2004 23:10:26 -0000 1.1.16.1 @@ -4,6 +4,8 @@ * ShowEQ Distributed under GPL * http://seq.sourceforge.net/ */ + +#ifndef DOXYGEN_SHOULD_SKIP_THIS NULL, // 0x00 NULL, // 0x01 NULL, // 0x02 @@ -277,3 +279,5 @@ NULL, // 0xfd NULL, // 0xfe NULL, // 0xff +#endif /* DOXYGEN_SHOULD_SKIP_THIS */ + Index: editor.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/editor.cpp,v retrieving revision 1.2 retrieving revision 1.2.16.1 diff -u -d -r1.2 -r1.2.16.1 --- editor.cpp 24 May 2002 19:15:11 -0000 1.2 +++ editor.cpp 7 Nov 2004 23:09:58 -0000 1.2.16.1 @@ -82,8 +82,6 @@ EditorWindow::EditorWindow(const char *fileName) : QMainWindow( 0, "ShowEQ - Editor", WDestructiveClose ) { -#if (QT_VERSION > 209) - int id; QPixmap openIcon, saveIcon; @@ -121,7 +119,6 @@ resize( 600, 450 ); filename = (QString)fileName; load(fileName); -#endif } EditorWindow::~EditorWindow() @@ -130,19 +127,16 @@ void EditorWindow::load() { -#if (QT_VERSION > 209) QString fn = QFileDialog::getOpenFileName( QString::null, QString::null, this); if ( !fn.isEmpty() ) load( fn ); else statusBar()->message( "File Open Cancelled", 2000 ); -#endif } void EditorWindow::load( const char *fileName ) { -#if (QT_VERSION > 209) QFile f( fileName ); if ( !f.open( IO_ReadOnly ) ) return; @@ -164,12 +158,10 @@ QString s; s.sprintf( "Opened %s", fileName ); statusBar()->message( s, 2000 ); -#endif } void EditorWindow::save() { -#if (QT_VERSION > 209) if ( filename.isEmpty() ) { saveAs(); return; @@ -192,12 +184,10 @@ setCaption( filename ); statusBar()->message( QString( "Saved %1" ).arg( filename ), 2000 ); -#endif } void EditorWindow::saveAs() { -#if (QT_VERSION > 209) QString fn = QFileDialog::getSaveFileName( QString::null, QString::null, this ); if ( !fn.isEmpty() ) { @@ -206,12 +196,10 @@ } else { statusBar()->message( "Saving cancelled", 2000 ); } -#endif } void EditorWindow::closeEvent( QCloseEvent* ce ) { -#if (QT_VERSION > 209) if ( !e->edited() ) { ce->accept(); return; @@ -234,5 +222,7 @@ ce->accept(); break; } -#endif } + + #include "editor.moc" + Index: races.h =================================================================== RCS file: /cvsroot/seq/showeq/src/races.h,v retrieving revision 1.9.8.3 retrieving revision 1.9.8.4 diff -u -d -r1.9.8.3 -r1.9.8.4 --- races.h 18 Sep 2004 20:51:32 -0000 1.9.8.3 +++ races.h 7 Nov 2004 23:10:25 -0000 1.9.8.4 @@ -4,6 +4,8 @@ * ShowEQ Distributed under GPL * http://seq.sourceforge.net/ */ + +#ifndef DOXYGEN_SHOULD_SKIP_THIS NULL, // 0 - Unknown Race "Human", // 1 "Barbarian", // 2 @@ -424,3 +426,5 @@ "Gelidran", // 417 "Discordling", // 418 "Girplan", // 419 +#endif /* DOXYGEN_SHOULD_SKIP_THIS */ + Index: languages.h =================================================================== RCS file: /cvsroot/seq/showeq/src/languages.h,v retrieving revision 1.4 retrieving revision 1.4.16.1 diff -u -d -r1.4 -r1.4.16.1 --- languages.h 11 May 2002 17:16:06 -0000 1.4 +++ languages.h 7 Nov 2004 23:10:20 -0000 1.4.16.1 @@ -5,6 +5,7 @@ * http://seq.sourceforge.net/ */ +#ifndef DOXYGEN_SHOULD_SKIP_THIS "Common Tongue", // 0 "Barbarian", // 1 "Erudian", // 2 @@ -30,3 +31,5 @@ "Elder Dragon", // 22 "Dark Speech", // 23 "Van Shir", // 24 +#endif /* DOXYGEN_SHOULD_SKIP_THIS */ + Index: classes.h =================================================================== RCS file: /cvsroot/seq/showeq/src/classes.h,v retrieving revision 1.2.8.2 retrieving revision 1.2.8.3 diff -u -d -r1.2.8.2 -r1.2.8.3 --- classes.h 12 Feb 2004 00:39:28 -0000 1.2.8.2 +++ classes.h 7 Nov 2004 23:09:56 -0000 1.2.8.3 @@ -4,6 +4,7 @@ * ShowEQ Distributed under GPL * http://seq.sourceforge.net/ */ +#ifndef DOXYGEN_SHOULD_SKIP_THIS /* Maps class numbers to strings, included from util.cpp */ "0", // 0 is unknown @@ -69,3 +70,5 @@ "LDoN Recruiter", // 60 "LDoN Merchant", // 61 "LDoN Object", // 62 +#endif /* DOXYGEN_SHOULD_SKIP_THIS */ + Index: mapicon.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/Attic/mapicon.cpp,v retrieving revision 1.1.4.4 retrieving revision 1.1.4.5 diff -u -d -r1.1.4.4 -r1.1.4.5 --- mapicon.cpp 12 Feb 2004 00:39:28 -0000 1.1.4.4 +++ mapicon.cpp 7 Nov 2004 23:10:21 -0000 1.1.4.5 @@ -1264,3 +1264,5 @@ return m_player->pickConColor(spawn->level()); } + +#include "mapicon.moc" Index: weapons2b.h =================================================================== RCS file: /cvsroot/seq/showeq/src/weapons2b.h,v retrieving revision 1.1 retrieving revision 1.1.16.1 diff -u -d -r1.1 -r1.1.16.1 --- weapons2b.h 30 Dec 2001 07:18:55 -0000 1.1 +++ weapons2b.h 7 Nov 2004 23:10:27 -0000 1.1.16.1 @@ -4,6 +4,8 @@ * ShowEQ Distributed under GPL * http://seq.sourceforge.net/ */ + +#ifndef DOXYGEN_SHOULD_SKIP_THIS NULL, // 0x00 NULL, // 0x01 NULL, // 0x02 @@ -277,3 +279,5 @@ NULL, // 0xfd NULL, // 0xfe NULL, // 0xff +#endif /* DOXYGEN_SHOULD_SKIP_THIS */ + Index: spellshell.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/spellshell.cpp,v retrieving revision 1.11.10.4 retrieving revision 1.11.10.5 diff -u -d -r1.11.10.4 -r1.11.10.5 --- spellshell.cpp 16 Jan 2004 20:22:11 -0000 1.11.10.4 +++ spellshell.cpp 7 Nov 2004 23:10:25 -0000 1.11.10.5 @@ -519,3 +519,4 @@ m_timer->stop(); } +#include "spellshell.moc" Index: interface.h =================================================================== RCS file: /cvsroot/seq/showeq/src/interface.h,v retrieving revision 1.33.6.6 retrieving revision 1.33.6.7 diff -u -d -r1.33.6.6 -r1.33.6.7 --- interface.h 5 Sep 2004 19:11:12 -0000 1.33.6.6 +++ interface.h 7 Nov 2004 23:10:04 -0000 1.33.6.7 @@ -28,7 +28,7 @@ #include <qtabdialog.h> #include <qspinbox.h> #include <qintdict.h> - +#include <qptrdict.h> #include "everquest.h" #include "spawnlist.h" #include "spawnshell.h" @@ -106,6 +106,9 @@ //-------------------------------------------------- // EQInterface +/*! + \brief QMainWindow from Hell! Also known as ShowEQ's main window. +*/ class EQInterface:public QMainWindow { Q_OBJECT @@ -132,7 +135,7 @@ void newAltExp(uint32_t newExp, uint32_t totalExp, uint32_t totalTick, uint32_t maxExp, uint32_t tickExp, uint32_t aapoints); void levelChanged(uint8_t level); - void newSpeed(int); + void newSpeed(double); void numPacket(int, int); void resetPacket(int, int); void attack2Hand1(const uint8_t*); @@ -390,6 +393,7 @@ QPopupMenu* m_terminalShowUserFilterMenu; QPopupMenu* m_terminalHideUserFilterMenu; QPopupMenu* m_windowMenu; + QPtrDict<int> m_windowsMenus; CompassFrame* m_compass; MessageWindow* m_messageWindow[maxNumMessageWindows]; Index: spawnlistcommon.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/spawnlistcommon.cpp,v retrieving revision 1.6.6.2 retrieving revision 1.6.6.3 diff -u -d -r1.6.6.2 -r1.6.6.3 --- spawnlistcommon.cpp 16 Jan 2004 20:22:11 -0000 1.6.6.2 +++ spawnlistcommon.cpp 7 Nov 2004 23:10:25 -0000 1.6.6.3 @@ -740,3 +740,5 @@ if (ok) m_spawnlistWindow->setCaption(caption); } + +#include "spawnlistcommon.moc" Index: map.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/map.cpp,v retrieving revision 1.40.6.3 retrieving revision 1.40.6.4 diff -u -d -r1.40.6.3 -r1.40.6.4 --- map.cpp 12 Feb 2004 00:39:28 -0000 1.40.6.3 +++ map.cpp 7 Nov 2004 23:10:20 -0000 1.40.6.4 @@ -4755,3 +4755,4 @@ } +#include "map.moc" Index: netdiag.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/netdiag.cpp,v retrieving revision 1.10.6.1 retrieving revision 1.10.6.2 diff -u -d -r1.10.6.1 -r1.10.6.2 --- netdiag.cpp 7 Dec 2003 06:30:43 -0000 1.10.6.1 +++ netdiag.cpp 7 Nov 2004 23:10:22 -0000 1.10.6.2 @@ -195,7 +195,7 @@ m_seqExp[stream]->setText(disp); } -void NetDiag::clientChanged(uint32_t addr) +void NetDiag::clientChanged(in_addr_t addr) { QString disp, tmp; disp = print_addr(addr); @@ -219,7 +219,7 @@ m_clientLabel->setText(disp); } -void NetDiag::clientPortLatched(uint16_t clientPort) +void NetDiag::clientPortLatched(in_port_t ... [truncated message content] |
