Update of /cvsroot/seq/showeq/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31146/src Modified Files: Tag: pre_v5_0_dev2 Makefile.am bazaarlog.cpp bazaarlog.h category.cpp combatlog.cpp compass.cpp compassframe.cpp datetimemgr.cpp editor.cpp experiencelog.cpp filteredspawnlog.cpp filtermgr.cpp filternotifications.cpp group.cpp guild.cpp guildlist.cpp guildshell.cpp guildshell.h interface.cpp itemdb.cpp 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 seqlistview.cpp seqwindow.cpp skilllist.cpp spawnlist.cpp spawnlist2.cpp spawnlistcommon.cpp spawnlog.cpp spawnmonitor.cpp spawnpointlist.cpp spawnshell.cpp spelllist.cpp spellshell.cpp statlist.cpp terminal.cpp weapons.h xmlpreferences.cpp zonemgr.cpp Log Message: Improved MOC file handling and miscellaneous cleanup Index: spawnmonitor.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/spawnmonitor.cpp,v retrieving revision 1.5.12.1 retrieving revision 1.5.12.1.2.1 diff -u -d -r1.5.12.1 -r1.5.12.1.2.1 --- spawnmonitor.cpp 7 Dec 2003 06:30:44 -0000 1.5.12.1 +++ spawnmonitor.cpp 2 Oct 2004 21:36:36 -0000 1.5.12.1.2.1 @@ -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.1.2.1 diff -u -d -r1.10.16.1 -r1.10.16.1.2.1 --- combatlog.cpp 7 Dec 2003 06:30:43 -0000 1.10.16.1 +++ combatlog.cpp 2 Oct 2004 21:36:35 -0000 1.10.16.1.2.1 @@ -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.2.2.1 diff -u -d -r1.1.4.2 -r1.1.4.2.2.1 --- messagefilterdialog.cpp 13 Dec 2003 00:49:42 -0000 1.1.4.2 +++ messagefilterdialog.cpp 2 Oct 2004 21:36:36 -0000 1.1.4.2.2.1 @@ -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.2.2.1 diff -u -d -r1.1.4.2 -r1.1.4.2.2.1 --- messagewindow.cpp 13 Dec 2003 00:49:42 -0000 1.1.4.2 +++ messagewindow.cpp 2 Oct 2004 21:36:36 -0000 1.1.4.2.2.1 @@ -1175,3 +1175,4 @@ m_hideUserFilterMenu->insertItem(filter.name(), filterid); } +#include "messagewindow.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.4.2.1 diff -u -d -r1.1.4.4 -r1.1.4.4.2.1 --- messageshell.cpp 18 Feb 2004 22:56:15 -0000 1.1.4.4 +++ messageshell.cpp 2 Oct 2004 21:36:36 -0000 1.1.4.4.2.1 @@ -949,3 +949,4 @@ .arg(spawnInfo)); } +#include "messageshell.moc" Index: seqwindow.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/seqwindow.cpp,v retrieving revision 1.1.16.1 retrieving revision 1.1.16.1.2.1 diff -u -d -r1.1.16.1 -r1.1.16.1.2.1 --- seqwindow.cpp 7 Dec 2003 06:30:44 -0000 1.1.16.1 +++ seqwindow.cpp 2 Oct 2004 21:36:36 -0000 1.1.16.1.2.1 @@ -151,3 +151,4 @@ QDockWindow::mousePressEvent(e); } +#include "seqwindow.moc" Index: terminal.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/Attic/terminal.cpp,v retrieving revision 1.1.4.2 retrieving revision 1.1.4.2.2.1 diff -u -d -r1.1.4.2 -r1.1.4.2.2.1 --- terminal.cpp 13 Dec 2003 00:49:43 -0000 1.1.4.2 +++ terminal.cpp 2 Oct 2004 21:36:36 -0000 1.1.4.2.2.1 @@ -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.2.2.1 diff -u -d -r1.1.4.2 -r1.1.4.2.2.1 --- guildshell.cpp 24 Sep 2004 04:25:52 -0000 1.1.4.2 +++ guildshell.cpp 2 Oct 2004 21:36:35 -0000 1.1.4.2.2.1 @@ -241,6 +241,7 @@ } } +#include "guildshell.moc" Index: spawnlog.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/spawnlog.cpp,v retrieving revision 1.2.4.2.2.1 retrieving revision 1.2.4.2.2.2 diff -u -d -r1.2.4.2.2.1 -r1.2.4.2.2.2 --- spawnlog.cpp 2 Oct 2004 07:02:34 -0000 1.2.4.2.2.1 +++ spawnlog.cpp 2 Oct 2004 21:36:36 -0000 1.2.4.2.2.2 @@ -143,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.8.1 diff -u -d -r1.30 -r1.30.8.1 --- logger.cpp 25 Oct 2003 00:20:59 -0000 1.30 +++ logger.cpp 2 Oct 2004 21:36:36 -0000 1.30.8.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.2.2.1 diff -u -d -r1.6.16.2 -r1.6.16.2.2.1 --- group.cpp 13 Dec 2003 00:49:42 -0000 1.6.16.2 +++ group.cpp 2 Oct 2004 21:36:35 -0000 1.6.16.2.2.1 @@ -368,3 +368,4 @@ return m_members[slot].m_spawn; } +#include "group.moc" Index: datetimemgr.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/datetimemgr.cpp,v retrieving revision 1.2.4.1.2.1 retrieving revision 1.2.4.1.2.2 diff -u -d -r1.2.4.1.2.1 -r1.2.4.1.2.2 --- datetimemgr.cpp 2 Oct 2004 07:02:33 -0000 1.2.4.1.2.1 +++ datetimemgr.cpp 2 Oct 2004 21:36:35 -0000 1.2.4.1.2.2 @@ -73,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.1.2.1 diff -u -d -r1.8.6.1 -r1.8.6.1.2.1 --- statlist.cpp 7 Dec 2003 06:30:46 -0000 1.8.6.1 +++ statlist.cpp 2 Oct 2004 21:36:36 -0000 1.8.6.1.2.1 @@ -363,3 +363,5 @@ // make the listview save it's prefs m_statList->savePrefs(); } + +#include "statlist.moc" Index: map.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/map.cpp,v retrieving revision 1.40.6.3 retrieving revision 1.40.6.3.2.1 diff -u -d -r1.40.6.3 -r1.40.6.3.2.1 --- map.cpp 12 Feb 2004 00:39:28 -0000 1.40.6.3 +++ map.cpp 2 Oct 2004 21:36:36 -0000 1.40.6.3.2.1 @@ -4755,3 +4755,4 @@ } +#include "map.moc" Index: filteredspawnlog.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/Attic/filteredspawnlog.cpp,v retrieving revision 1.1.4.1 retrieving revision 1.1.4.1.2.1 diff -u -d -r1.1.4.1 -r1.1.4.1.2.1 --- filteredspawnlog.cpp 7 Dec 2003 06:30:43 -0000 1.1.4.1 +++ filteredspawnlog.cpp 2 Oct 2004 21:36:35 -0000 1.1.4.1.2.1 @@ -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.18.1 diff -u -d -r1.2 -r1.2.18.1 --- compass.cpp 30 Aug 2003 15:51:45 -0000 1.2 +++ compass.cpp 2 Oct 2004 21:36:35 -0000 1.2.18.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.3.2.1 diff -u -d -r1.1.4.3 -r1.1.4.3.2.1 --- bazaarlog.cpp 24 Sep 2004 04:25:52 -0000 1.1.4.3 +++ bazaarlog.cpp 2 Oct 2004 21:36:35 -0000 1.1.4.3.2.1 @@ -64,3 +64,6 @@ flush(); } + +#include "bazaarlog.moc" + Index: seqlistview.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/seqlistview.cpp,v retrieving revision 1.2 retrieving revision 1.2.18.1 diff -u -d -r1.2 -r1.2.18.1 --- seqlistview.cpp 24 May 2002 19:15:12 -0000 1.2 +++ seqlistview.cpp 2 Oct 2004 21:36:36 -0000 1.2.18.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.2.2.1 diff -u -d -r1.1.4.2 -r1.1.4.2.2.1 --- guildlist.cpp 12 Feb 2004 00:39:28 -0000 1.1.4.2 +++ guildlist.cpp 2 Oct 2004 21:36:35 -0000 1.1.4.2.2.1 @@ -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.2.1 retrieving revision 1.22.6.5.2.2 diff -u -d -r1.22.6.5.2.1 -r1.22.6.5.2.2 --- Makefile.am 2 Oct 2004 03:09:41 -0000 1.22.6.5.2.1 +++ Makefile.am 2 Oct 2004 21:36:23 -0000 1.22.6.5.2.2 @@ -8,13 +8,84 @@ 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) @@ -67,10 +138,12 @@ 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 $(srcdir)/h2info.pl $< $@ @@ -91,3 +164,4 @@ else :; fi; \ done endif + Index: player.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/player.cpp,v retrieving revision 1.42.6.6 retrieving revision 1.42.6.6.2.1 diff -u -d -r1.42.6.6 -r1.42.6.6.2.1 --- player.cpp 24 Sep 2004 04:25:53 -0000 1.42.6.6 +++ player.cpp 2 Oct 2004 21:36:36 -0000 1.42.6.6.2.1 @@ -1441,3 +1441,5 @@ clear(); } } + +#include "player.moc" Index: experiencelog.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/experiencelog.cpp,v retrieving revision 1.10.16.2 retrieving revision 1.10.16.2.2.1 diff -u -d -r1.10.16.2 -r1.10.16.2.2.1 --- experiencelog.cpp 13 Dec 2003 00:49:42 -0000 1.10.16.2 +++ experiencelog.cpp 2 Oct 2004 21:36:35 -0000 1.10.16.2.2.1 @@ -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: packetinfo.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/Attic/packetinfo.cpp,v retrieving revision 1.1.4.2 retrieving revision 1.1.4.2.2.1 diff -u -d -r1.1.4.2 -r1.1.4.2.2.1 --- packetinfo.cpp 16 Jan 2004 20:22:11 -0000 1.1.4.2 +++ packetinfo.cpp 2 Oct 2004 21:36:36 -0000 1.1.4.2.2.1 @@ -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.3.2.1 diff -u -d -r1.10.6.3 -r1.10.6.3.2.1 --- itemdb.cpp 24 Sep 2004 04:25:53 -0000 1.10.6.3 +++ itemdb.cpp 2 Oct 2004 21:36:36 -0000 1.10.6.3.2.1 @@ -2528,3 +2528,4 @@ return (((EQItemDBEntryData_3*)m_itemEntryData)->m_itemType == ItemTypeContainer); } +#include "itemdb.moc" Index: netdiag.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/netdiag.cpp,v retrieving revision 1.10.6.1.2.1 retrieving revision 1.10.6.1.2.2 diff -u -d -r1.10.6.1.2.1 -r1.10.6.1.2.2 --- netdiag.cpp 2 Oct 2004 03:09:41 -0000 1.10.6.1.2.1 +++ netdiag.cpp 2 Oct 2004 21:36:36 -0000 1.10.6.1.2.2 @@ -321,3 +321,5 @@ return paddr; } + +#include "netdiag.moc" Index: weapons.h =================================================================== RCS file: /cvsroot/seq/showeq/src/weapons.h,v retrieving revision 1.5.8.1 retrieving revision 1.5.8.2 diff -u -d -r1.5.8.1 -r1.5.8.2 --- weapons.h 2 Oct 2004 03:09:41 -0000 1.5.8.1 +++ weapons.h 2 Oct 2004 21:36:36 -0000 1.5.8.2 @@ -5,7 +5,8 @@ * http://seq.sourceforge.net/ */ -#ifndef DOXYGEN_SHOULD_SKIP_THIS "Generic", // 0x00 +#ifndef DOXYGEN_SHOULD_SKIP_THIS + "Generic", // 0x00 "1HSword", // 0x01 "2HSword", // 0x02 "Axe", // 0x03 Index: filternotifications.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/Attic/filternotifications.cpp,v retrieving revision 1.1.4.1 retrieving revision 1.1.4.1.2.1 diff -u -d -r1.1.4.1 -r1.1.4.1.2.1 --- filternotifications.cpp 7 Dec 2003 06:30:43 -0000 1.1.4.1 +++ filternotifications.cpp 2 Oct 2004 21:36:35 -0000 1.1.4.1.2.1 @@ -129,7 +129,7 @@ system ((const char*)command); } - +#include "filternotifications.moc" Index: filtermgr.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/filtermgr.cpp,v retrieving revision 1.5.6.2 retrieving revision 1.5.6.2.2.1 diff -u -d -r1.5.6.2 -r1.5.6.2.2.1 --- filtermgr.cpp 5 Sep 2004 19:11:12 -0000 1.5.6.2 +++ filtermgr.cpp 2 Oct 2004 21:36:35 -0000 1.5.6.2.2.1 @@ -325,3 +325,4 @@ emit runtimeFiltersChanged(type); } +#include "filtermgr.moc" Index: packetstream.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/packetstream.cpp,v retrieving revision 1.1.6.4 retrieving revision 1.1.6.4.2.1 diff -u -d -r1.1.6.4 -r1.1.6.4.2.1 --- packetstream.cpp 18 Sep 2004 20:51:32 -0000 1.1.6.4 +++ packetstream.cpp 2 Oct 2004 21:36:36 -0000 1.1.6.4.2.1 @@ -835,3 +835,5 @@ processCache(); } /* end ARQ processing */ } + +#include "packetstream.moc" Index: skilllist.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/skilllist.cpp,v retrieving revision 1.6.16.1 retrieving revision 1.6.16.1.2.1 diff -u -d -r1.6.16.1 -r1.6.16.1.2.1 --- skilllist.cpp 7 Dec 2003 06:30:44 -0000 1.6.16.1 +++ skilllist.cpp 2 Oct 2004 21:36:36 -0000 1.6.16.1.2.1 @@ -252,3 +252,5 @@ // make the listview save it's prefs m_skillList->savePrefs(); } + +#include "skilllist.moc" Index: compassframe.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/compassframe.cpp,v retrieving revision 1.7.16.1 retrieving revision 1.7.16.1.2.1 diff -u -d -r1.7.16.1 -r1.7.16.1.2.1 --- compassframe.cpp 7 Dec 2003 06:30:43 -0000 1.7.16.1 +++ compassframe.cpp 2 Oct 2004 21:36:35 -0000 1.7.16.1.2.1 @@ -98,3 +98,5 @@ m_y->setText(QString::number(y)); m_z->setText(QString::number(z)); } + +#include "compassframe.moc" Index: guild.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/guild.cpp,v retrieving revision 1.7.6.2 retrieving revision 1.7.6.2.2.1 diff -u -d -r1.7.6.2 -r1.7.6.2.2.1 --- guild.cpp 16 Jan 2004 20:22:09 -0000 1.7.6.2 +++ guild.cpp 2 Oct 2004 21:36:35 -0000 1.7.6.2.2.1 @@ -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.2.2.1 diff -u -d -r1.9.10.2 -r1.9.10.2.2.1 --- spelllist.cpp 13 Dec 2003 00:49:43 -0000 1.9.10.2 +++ spelllist.cpp 2 Oct 2004 21:36:36 -0000 1.9.10.2.2.1 @@ -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.1.2.1 diff -u -d -r1.1.4.1 -r1.1.4.1.2.1 --- messagefilter.cpp 7 Dec 2003 06:30:43 -0000 1.1.4.1 +++ messagefilter.cpp 2 Oct 2004 21:36:36 -0000 1.1.4.1.2.1 @@ -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.2.1 retrieving revision 1.3.16.2.2.2 diff -u -d -r1.3.16.2.2.1 -r1.3.16.2.2.2 --- xmlpreferences.cpp 2 Oct 2004 07:02:34 -0000 1.3.16.2.2.1 +++ xmlpreferences.cpp 2 Oct 2004 21:36:36 -0000 1.3.16.2.2.2 @@ -912,3 +912,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.1.2.1 diff -u -d -r1.19.12.1 -r1.19.12.1.2.1 --- spawnlist.cpp 7 Dec 2003 06:30:44 -0000 1.19.12.1 +++ spawnlist.cpp 2 Oct 2004 21:36:36 -0000 1.19.12.1.2.1 @@ -1174,3 +1174,5 @@ // make the listview save it's prefs m_spawnList->savePrefs(); } + +#include "spawnlist.moc" Index: spawnshell.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/spawnshell.cpp,v retrieving revision 1.42.6.2 retrieving revision 1.42.6.2.2.1 diff -u -d -r1.42.6.2 -r1.42.6.2.2.1 --- spawnshell.cpp 16 Jan 2004 20:22:11 -0000 1.42.6.2 +++ spawnshell.cpp 2 Oct 2004 21:36:36 -0000 1.42.6.2.2.1 @@ -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.2.2.1 diff -u -d -r1.7.12.2 -r1.7.12.2.2.1 --- spawnlist2.cpp 16 Jan 2004 20:22:11 -0000 1.7.12.2 +++ spawnlist2.cpp 2 Oct 2004 21:36:36 -0000 1.7.12.2.2.1 @@ -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.1.2.1 diff -u -d -r1.1.4.1 -r1.1.4.1.2.1 --- guildshell.h 16 Jan 2004 20:22:09 -0000 1.1.4.1 +++ guildshell.h 2 Oct 2004 21:36:35 -0000 1.1.4.1.2.1 @@ -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.1.2.1 diff -u -d -r1.1.4.1 -r1.1.4.1.2.1 --- messages.cpp 7 Dec 2003 06:30:43 -0000 1.1.4.1 +++ messages.cpp 2 Oct 2004 21:36:36 -0000 1.1.4.1.2.1 @@ -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.1.2.1 diff -u -d -r1.4.16.1 -r1.4.16.1.2.1 --- spawnpointlist.cpp 7 Dec 2003 06:30:44 -0000 1.4.16.1 +++ spawnpointlist.cpp 2 Oct 2004 21:36:36 -0000 1.4.16.1.2.1 @@ -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.3.2.1 diff -u -d -r1.62.6.3 -r1.62.6.3.2.1 --- packet.cpp 18 Sep 2004 20:51:31 -0000 1.62.6.3 +++ packet.cpp 2 Oct 2004 21:36:36 -0000 1.62.6.3.2.1 @@ -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.1.2.1 diff -u -d -r1.8.16.1 -r1.8.16.1.2.1 --- category.cpp 7 Dec 2003 06:30:42 -0000 1.8.16.1 +++ category.cpp 2 Oct 2004 21:36:35 -0000 1.8.16.1.2.1 @@ -366,3 +366,5 @@ pSEQPrefs->setPrefColor(prefBaseName + "Color", section, black); } } + +#include "category.moc" Index: packetlog.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/packetlog.cpp,v retrieving revision 1.1.6.4 retrieving revision 1.1.6.4.2.1 diff -u -d -r1.1.6.4 -r1.1.6.4.2.1 --- packetlog.cpp 16 Jan 2004 20:22:11 -0000 1.1.6.4 +++ packetlog.cpp 2 Oct 2004 21:36:36 -0000 1.1.6.4.2.1 @@ -487,3 +487,4 @@ } } +#include "packetlog.moc" Index: editor.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/editor.cpp,v retrieving revision 1.2.18.1 retrieving revision 1.2.18.2 diff -u -d -r1.2.18.1 -r1.2.18.2 --- editor.cpp 2 Oct 2004 07:02:33 -0000 1.2.18.1 +++ editor.cpp 2 Oct 2004 21:36:35 -0000 1.2.18.2 @@ -223,3 +223,6 @@ break; } } + + #include "editor.moc" + \ No newline at end of file Index: mapicon.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/Attic/mapicon.cpp,v retrieving revision 1.1.4.4 retrieving revision 1.1.4.4.2.1 diff -u -d -r1.1.4.4 -r1.1.4.4.2.1 --- mapicon.cpp 12 Feb 2004 00:39:28 -0000 1.1.4.4 +++ mapicon.cpp 2 Oct 2004 21:36:36 -0000 1.1.4.4.2.1 @@ -1264,3 +1264,5 @@ return m_player->pickConColor(spawn->level()); } + +#include "mapicon.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.1.2.1 diff -u -d -r1.1.4.1 -r1.1.4.1.2.1 --- bazaarlog.h 18 Feb 2004 22:56:14 -0000 1.1.4.1 +++ bazaarlog.h 2 Oct 2004 21:36:35 -0000 1.1.4.1.2.1 @@ -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: spellshell.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/spellshell.cpp,v retrieving revision 1.11.10.4 retrieving revision 1.11.10.4.2.1 diff -u -d -r1.11.10.4 -r1.11.10.4.2.1 --- spellshell.cpp 16 Jan 2004 20:22:11 -0000 1.11.10.4 +++ spellshell.cpp 2 Oct 2004 21:36:36 -0000 1.11.10.4.2.1 @@ -519,3 +519,4 @@ m_timer->stop(); } +#include "spellshell.moc" Index: spawnlistcommon.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/spawnlistcommon.cpp,v retrieving revision 1.6.6.2 retrieving revision 1.6.6.2.2.1 diff -u -d -r1.6.6.2 -r1.6.6.2.2.1 --- spawnlistcommon.cpp 16 Jan 2004 20:22:11 -0000 1.6.6.2 +++ spawnlistcommon.cpp 2 Oct 2004 21:36:36 -0000 1.6.6.2.2.1 @@ -740,3 +740,5 @@ if (ok) m_spawnlistWindow->setCaption(caption); } + +#include "spawnlistcommon.moc" Index: interface.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/interface.cpp,v retrieving revision 1.67.6.9.2.1 retrieving revision 1.67.6.9.2.2 diff -u -d -r1.67.6.9.2.1 -r1.67.6.9.2.2 --- interface.cpp 2 Oct 2004 07:02:33 -0000 1.67.6.9.2.1 +++ interface.cpp 2 Oct 2004 21:36:35 -0000 1.67.6.9.2.2 @@ -6065,3 +6065,4 @@ QMainWindow::setDockEnabled(dw, DockRight, enable); } +#include "interface.moc" Index: zonemgr.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/zonemgr.cpp,v retrieving revision 1.8.6.4 retrieving revision 1.8.6.4.2.1 diff -u -d -r1.8.6.4 -r1.8.6.4.2.1 --- zonemgr.cpp 18 Feb 2004 22:56:15 -0000 1.8.6.4 +++ zonemgr.cpp 2 Oct 2004 21:36:36 -0000 1.8.6.4.2.1 @@ -277,3 +277,5 @@ sizeof(zonePointStruct) * m_zonePointCount); } +#include "zonemgr.moc" + |