Menu
▾
▴
[Seq-cvs-commit] SF.net SVN: seq: [664] showeq/trunk
|
From: <do...@us...> - 2007-02-03 03:47:09
|
Revision: 664
http://seq.svn.sourceforge.net/seq/?rev=664&view=rev
Author: dohpaz
Date: 2007-02-02 19:47:08 -0800 (Fri, 02 Feb 2007)
Log Message:
-----------
+ Updated version to 5.7.0.1
+ Assorted minor tweaks
+ Initial attempt to build with qmake
+ Fix odd crash in packet handling.
+ Normalize some data type usage.
+ Remove ItemDB and related utilities from build since they haven't
worked in a while and would really need a rewrite.
+ Remove gdbm/db3 requirements
+ Update some copyright info.
Modified Paths:
--------------
showeq/trunk/ChangeLog
showeq/trunk/INSTALL
showeq/trunk/INSTALL.newbies
showeq/trunk/configure.in
showeq/trunk/src/Makefile.am
showeq/trunk/src/bazaarlog.cpp
showeq/trunk/src/category.cpp
showeq/trunk/src/combatlog.cpp
showeq/trunk/src/compass.cpp
showeq/trunk/src/compass.h
showeq/trunk/src/compassframe.cpp
showeq/trunk/src/datetimemgr.cpp
showeq/trunk/src/editor.cpp
showeq/trunk/src/experiencelog.cpp
showeq/trunk/src/filteredspawnlog.cpp
showeq/trunk/src/filtermgr.cpp
showeq/trunk/src/filternotifications.cpp
showeq/trunk/src/group.cpp
showeq/trunk/src/guild.cpp
showeq/trunk/src/guildlist.cpp
showeq/trunk/src/guildshell.cpp
showeq/trunk/src/interface.cpp
showeq/trunk/src/interface.h
showeq/trunk/src/itemdb.cpp
showeq/trunk/src/logger.cpp
showeq/trunk/src/main.cpp
showeq/trunk/src/main.h
showeq/trunk/src/map.cpp
showeq/trunk/src/map.h
showeq/trunk/src/mapcore.cpp
showeq/trunk/src/mapicon.cpp
showeq/trunk/src/messagefilter.cpp
showeq/trunk/src/messagefilterdialog.cpp
showeq/trunk/src/messages.cpp
showeq/trunk/src/messageshell.cpp
showeq/trunk/src/messagewindow.cpp
showeq/trunk/src/netdiag.cpp
showeq/trunk/src/packet.cpp
showeq/trunk/src/packetinfo.cpp
showeq/trunk/src/packetlog.cpp
showeq/trunk/src/packetstream.cpp
showeq/trunk/src/player.cpp
showeq/trunk/src/seqlistview.cpp
showeq/trunk/src/seqwindow.cpp
showeq/trunk/src/skilllist.cpp
showeq/trunk/src/spawnlist.cpp
showeq/trunk/src/spawnlist2.cpp
showeq/trunk/src/spawnlistcommon.cpp
showeq/trunk/src/spawnlog.cpp
showeq/trunk/src/spawnmonitor.cpp
showeq/trunk/src/spawnpointlist.cpp
showeq/trunk/src/spawnshell.cpp
showeq/trunk/src/spelllist.cpp
showeq/trunk/src/spellshell.cpp
showeq/trunk/src/statlist.cpp
showeq/trunk/src/terminal.cpp
showeq/trunk/src/util.cpp
showeq/trunk/src/xmlpreferences.cpp
showeq/trunk/src/zonemgr.cpp
Added Paths:
-----------
showeq/trunk/src/showeq.pro
Modified: showeq/trunk/ChangeLog
===================================================================
--- showeq/trunk/ChangeLog 2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/ChangeLog 2007-02-03 03:47:08 UTC (rev 664)
@@ -1,5 +1,17 @@
Version: $Id$ $Name$
+dohpaZ (2/2/07)
+------------------------
++ Updated version to 5.7.0.1
++ Assorted minor tweaks
++ Initial attempt to build with qmake
++ Fix odd crash in packet handling.
++ Normalize some data type usage.
++ Remove ItemDB and related utilities from build since they haven't worked
+ in a while and would really need a rewrite.
++ Remove gdbm/db3 requirements
++ Update some copyright info.
+
purple (12/05/06)
-----------------
+ Updated version to 5.7
Modified: showeq/trunk/INSTALL
===================================================================
--- showeq/trunk/INSTALL 2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/INSTALL 2007-02-03 03:47:08 UTC (rev 664)
@@ -21,11 +21,7 @@
*** 3rd party libraries ***
qt 3.2 Compiled with -thread) http://www.trolltech.com)
libpcap 0.62 http://www.tcpdump.org/
- gdbm 1.8.0 http://www.gnu.org/software/gdbm/
- *** Optional 3rd party libraries ***
- db3 3.2.9 3.3 (Not db4) http://www.sleepycat.com/
-
*** C++ Compilation ***
glibc 2.2 2.3.2 http://www.gnu.org/software/libc/
gcc 3.0.5 3.2 http://gcc.gnu.org/
Modified: showeq/trunk/INSTALL.newbies
===================================================================
--- showeq/trunk/INSTALL.newbies 2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/INSTALL.newbies 2007-02-03 03:47:08 UTC (rev 664)
@@ -94,8 +94,6 @@
zlib-devel
gd
gd-devel
-gdbm
-gdbm-devel
glibc-kernheaders
glibc-devel
xorg-x11-libs
Modified: showeq/trunk/configure.in
===================================================================
--- showeq/trunk/configure.in 2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/configure.in 2007-02-03 03:47:08 UTC (rev 664)
@@ -2,7 +2,7 @@
dnl $Id$ $Name$
AC_PREREQ(2.59)
-AC_INIT(showeq, 5.7.0.0)
+AC_INIT(showeq, 5.7.0.1)
AC_CONFIG_SRCDIR(src/main.cpp)
AC_CANONICAL_SYSTEM
@@ -220,9 +220,6 @@
AC_CHECK_LIB(z, inflate,
,
AC_MSG_ERROR(cannot find compresion library functions. Make sure libz is installed) )
-AC_CHECK_LIB(gdbm, gdbm_open,
- ,
- AC_MSG_ERROR(cannot find gdbm library functions. Make sure libgdbm is installed) )
dnl Checks for header files.
AC_HEADER_STDC
@@ -439,82 +436,6 @@
)
AC_SUBST(PROFILE_LIBS)
-AC_ARG_WITH(db3-dir,
- [ --with-db3-dir=DIR where the root of Berkeley DB3 is installed. ],
- [ db3_includes="$withval"/include
- db3_libs="$withval"/lib
- ])
-
-AC_ARG_WITH(db3-includes,
- [ --with-db3-includes=DIR where the Berkeley DB3 includes are. ],
- [ db3_includes="$withval"
- ])
-
-AC_ARG_WITH(db3-libraries,
- [ --with-db3-libraries=DIR where the Berkeley DB3 libraries are. ],
- [ db3_libs="$withval"
- ])
-
-AC_SUBST(db3_includes)
-AC_SUBST(db3_libs)
-
-if [[ -z "$db3_includes" ]]; then
- DB3_INCLUDES=""
-else
- DB3_INCLUDES="-I$db3_includes"
- all_includes="$DB3_INCLUDES $all_includes"
-fi
-
-if [[ -z "$db3_libs" ]]; then
- DB3_LDFLAGS=""
-else
- DB3_LDFLAGS="-L$db3_libs"
- all_libraries="$all_libraries $DB3_LDFLAGS"
-fi
-
-AC_SUBST(DB3_INCLUDES)
-AC_SUBST(DB3_LDFLAGS)
-
-AC_MSG_CHECKING(whether to build with Berkeley DB3)
-AC_ARG_WITH(db3,
- [ --with-db3 Build with Berkeley DB 3],
- [ AC_MSG_RESULT(yes)
- AC_LANG_SAVE
- db3_save_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CFLAGS $all_includes"
- db3_save_LIBS="$LIBS"
- LIBS="$all_libraries -ldb_cxx"
- AC_LANG_CPLUSPLUS
- AC_CHECK_HEADER(db_cxx.h,,AC_MSG_ERROR(cannot find db_cxx.h, necessary for compilation with Berkeley DB 3 support))
-
- AC_MSG_CHECKING([for DbEnv::version in -ldb_cxx])
- AC_TRY_LINK([
-#include <stdio.h>
-#include <db_cxx.h>
-],
-[
- printf("DB3: %s\n", DbEnv::version(NULL, NULL, NULL));
-],
- db3_have_dbenv=yes,
- db3_have_dbenv=no
-)
- AC_MSG_RESULT($db3_have_dbenv)
- if test "db3_have_dbenv" = "no"; then
- AC_MSG_ERROR([cannot find Berkeley DB3 C++ library functions. Make sure libdb_cxx is installed])
- else
- AC_DEFINE(USE_DB3, 1, Define if using Berkeley DB3 for database operations)
- fi
-dnl AC_CHECK_LIB(db_cxx, DbEnv::version,, AC_MSG_ERROR(cannot find Berkeley DB3 library functions. Make sure libdb_cxx is installed) )
- CPPFLAGS="$db3_save_CPPFLAGS"
- LIBS="$db3_save_LIBS"
- db3=true
- AC_LANG_RESTORE
- ],
- [ AC_MSG_RESULT(no)
- db3=false ]
-)
-AM_CONDITIONAL(USEDB3, test x$db3 = xtrue)
-
AC_MSG_CHECKING(whether to build for use with the test server)
AC_ARG_WITH(test-server,
[ --with-test-server Compile for use with the test server ],
Modified: showeq/trunk/src/Makefile.am
===================================================================
--- showeq/trunk/src/Makefile.am 2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/Makefile.am 2007-02-03 03:47:08 UTC (rev 664)
@@ -1,17 +1,9 @@
-INCLUDES = $(QT_INCLUDES) $(X_INCLUDES) $(DB3_INCLUDES) -DPKGDATADIR=\"$(pkgdatadir)/\" -I/usr/include/pcap $(USER_INCLUDES)
+INCLUDES = $(QT_INCLUDES) $(X_INCLUDES) -DPKGDATADIR=\"$(pkgdatadir)/\" -I/usr/include/pcap $(USER_INCLUDES)
QTLIB = -lqt-mt
-if USEDB3
-DB3_SRCS = db3conv.cpp
-DB3_LIBS = $(DB3_LDFLAGS) -ldb_cxx
-endif
+bin_PROGRAMS = showeq
-ITEMDB_SRCS = itemdb.cpp gdbmconv.cpp $(DB3_SRCS)
-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 \
@@ -23,21 +15,21 @@
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)
+ guildlist.cpp bazaarlog.cpp
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 \
+ guild.moc guildlist.moc guildshell.moc interface.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)
+nodist_showeq_SOURCES = ui_mapicondialog.h ui_mapicondialog.cpp $(showeq_moc_SRCS) m_ui_mapicondialog.cpp
+
$(srcdir)/bazaarlog.cpp: bazaarlog.moc
$(srcdir)/category.cpp: category.moc
$(srcdir)/combatlog.cpp: combatlog.moc
@@ -54,7 +46,6 @@
$(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
@@ -87,13 +78,9 @@
$(srcdir)/zonemgr.cpp: zonemgr.moc
$(srcdir)/packetinfo.cpp: s_everquest.h
-showeq_LDADD = $(QT_LDFLAGS) $(QTLIB) $(DB3_LIBS) $(LIBPTHREAD) $(MEMORY_LIBS) \
+showeq_LDADD = $(QT_LDFLAGS) $(QTLIB) $(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)
-
TEST_PROGS = sortitem
if CGI
@@ -101,29 +88,21 @@
GD_CGI_PROGS = drawmap.cgi
endif
-CGI_PROGS = listitem.cgi showitem.cgi $(GD_CGI_PROGS) listspawn.cgi showspawn.cgi
+CGI_PROGS = $(GD_CGI_PROGS) listspawn.cgi showspawn.cgi
endif
noinst_PROGRAMS = $(TEST_PROGS) $(CGI_PROGS)
-listitem_cgi_SOURCES = listitem.cpp util.cpp diagnosticmessageslight.cpp $(ITEMDB_SRCS) cgiconv.cpp
-nodist_listitem_cgi_SOURCES = $(nodist_ITEMDB_SRCS)
-listitem_cgi_LDADD = $(QT_LDFLAGS) $(DB3_LIBS) $(QTLIB) $(LIBPTHREAD) $(SHOWEQ_RPATH) $(USER_LDFLAGS)
-
-showitem_cgi_SOURCES = showitem.cpp util.cpp diagnosticmessageslight.cpp $(ITEMDB_SRCS) cgiconv.cpp
-nodist_showitem_cgi_SOURCES = $(nodist_ITEMDB_SRCS)
-showitem_cgi_LDADD = $(QT_LDFLAGS) $(DB3_LIBS) $(QTLIB) $(LIBPTHREAD) $(SHOWEQ_RPATH) $(USER_LDFLAGS)
-
-listspawn_cgi_SOURCES = listspawn.cpp spawn.cpp util.cpp diagnosticmessageslight.cpp cgiconv.cpp
-nodist_listspawn_cgi_SOURCES = $(nodist_ITEMDB_SRCS)
+ listspawn_cgi_SOURCES = listspawn.cpp spawn.cpp util.cpp diagnosticmessageslight.cpp cgiconv.cpp
+nodist_listspawn_cgi_SOURCES =
listspawn_cgi_LDADD = $(QT_LDFLAGS) $(QTLIB) $(LIBPTHREAD) $(SHOWEQ_RPATH) $(USER_LDFLAGS)
showspawn_cgi_SOURCES = showspawn.cpp spawn.cpp util.cpp diagnosticmessageslight.cpp cgiconv.cpp
-nodist_showspawn_cgi_SOURCES = $(nodist_ITEMDB_SRCS)
+nodist_showspawn_cgi_SOURCES =
showspawn_cgi_LDADD = $(QT_LDFLAGS) $(QTLIB) $(LIBPTHREAD) $(SHOWEQ_RPATH) $(USER_LDFLAGS)
drawmap_cgi_SOURCES = drawmap.cpp util.cpp diagnosticmessageslight.cpp cgiconv.cpp
-nodist_drawmap_cgi_SOURCES = $(nodist_ITEMDB_SRCS)
+nodist_drawmap_cgi_SOURCES =
drawmap_cgi_LDADD = $(QT_LDFLAGS) $(QTLIB) -lgd $(LIBPTHREAD) $(SHOWEQ_RPATH) $(USER_LDFLAGS)
sortitem_SOURCES = sortitem.cpp util.cpp diagnosticmessageslight.cpp
@@ -132,7 +111,7 @@
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 weapons29.h weapons2a.h weapons2b.h weapons2c.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
+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 weapons29.h weapons2a.h weapons2b.h weapons2c.h decode.h cgiconv.h skilllist.h statlist.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)
Modified: showeq/trunk/src/bazaarlog.cpp
===================================================================
--- showeq/trunk/src/bazaarlog.cpp 2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/bazaarlog.cpp 2007-02-03 03:47:08 UTC (rev 664)
@@ -4,7 +4,7 @@
* ShowEQ Distributed under GPL
* http://www.sourceforge.net/projects/seq
*
- * Copyright 2003-2004 by the respective ShowEQ Developers
+ * Copyright 2003-2007 by the respective ShowEQ Developers
*/
#include <qdatetime.h>
@@ -65,5 +65,8 @@
flush();
}
+#ifndef QMAKEBUILD
#include "bazaarlog.moc"
+#endif
+
Modified: showeq/trunk/src/category.cpp
===================================================================
--- showeq/trunk/src/category.cpp 2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/category.cpp 2007-02-03 03:47:08 UTC (rev 664)
@@ -3,6 +3,8 @@
*
* ShowEQ Distributed under GPL
* http://seq.sf.net/
+ *
+ * Copyright 2003-2007 by the respective ShowEQ Developers
*/
// Author: Zaphod (do...@us...)
@@ -379,4 +381,7 @@
}
}
+#ifndef QMAKEBUILD
#include "category.moc"
+#endif
+
Modified: showeq/trunk/src/combatlog.cpp
===================================================================
--- showeq/trunk/src/combatlog.cpp 2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/combatlog.cpp 2007-02-03 03:47:08 UTC (rev 664)
@@ -3,6 +3,8 @@
*
* ShowEQ Distributed under GPL
* http://seq.sourceforge.net
+ *
+ * Copyright 2003-2007 by the respective ShowEQ Developers
*/
#include "combatlog.h"
@@ -987,4 +989,7 @@
resetDPS();
}
+#ifndef QMAKEBUILD
#include "combatlog.moc"
+#endif
+
Modified: showeq/trunk/src/compass.cpp
===================================================================
--- showeq/trunk/src/compass.cpp 2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/compass.cpp 2007-02-03 03:47:08 UTC (rev 664)
@@ -3,6 +3,8 @@
*
* ShowEQ Distributed under GPL
* http://seq.sf.net/
+ *
+ * Copyright 2003-2007 by the respective ShowEQ Developers
*/
//
@@ -22,7 +24,7 @@
Compass::Compass (QWidget *parent, const char *name)
: QWidget ( parent, name )
{
- ang = 0;
+ m_ang = 0;
m_dSpawnAngle = -1;
}
@@ -71,29 +73,27 @@
void Compass::setHeading(int32_t degrees)
{
- if (ang == ((360-degrees)+90))
+ if (m_ang == ((360-degrees)+90))
return;
- ang = (360-degrees)+90;
+ m_ang = (360-degrees)+90;
repaint ( compassRect(), FALSE);
- emit angleChanged(ang);
+ emit angleChanged(m_ang);
}
-void Compass::setPos(int16_t x, int16_t y)
+void Compass::setPos(int16_t x, int16_t y, int16_t z)
{
- m_cPlayer.setX(x);
- m_cPlayer.setY(y);
-
+ m_cPlayer.setPoint(x, y, z);
+
if (m_dSpawnAngle > 0)
{
calcTargetHeading();
}
}
-void Compass::setTargetPos(int x,int y)
+void Compass::setTargetPos(int x,int y, int z)
{
// Recalc the mob heading
- m_cTarget.setX(x);
- m_cTarget.setY(y);
+ m_cTarget.setPoint(x,y,z);
calcTargetHeading();
}
@@ -128,7 +128,7 @@
pwd4, pix.height()-(phd4));
tmp.translate(pwd2, phd2);
- tmp.rotate (-ang);
+ tmp.rotate (-m_ang);
tmp.setBrush(blue);
tmp.setPen(blue);
tmp.drawLine(0-pwd4, 0, pwd2, 0);
@@ -168,4 +168,7 @@
p.end();
}
+#ifndef QMAKEBUILD
#include "compass.moc"
+#endif
+
Modified: showeq/trunk/src/compass.h
===================================================================
--- showeq/trunk/src/compass.h 2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/compass.h 2007-02-03 03:47:08 UTC (rev 664)
@@ -3,6 +3,8 @@
*
* ShowEQ Distributed under GPL
* http://seq.sf.net/
+ *
+ * Copyright 2002-2007 by the respective ShowEQ Developers
*/
//
@@ -20,10 +22,15 @@
#include <stdint.h>
#endif
+#include "point.h"
+
#include <qwidget.h>
#include <qsize.h>
-#include <qpoint.h>
+///////////////////////////////////////////
+// type definitions
+typedef Point3D<int16_t> CompassPoint;
+
class Compass : public QWidget
{
Q_OBJECT
@@ -35,8 +42,8 @@
public slots:
void setHeading(int32_t degrees);
- void setPos(int16_t x, int16_t y);
- void setTargetPos(int x, int y);
+ void setPos(int16_t x, int16_t y, int16_t z);
+ void setTargetPos(int x, int y, int z);
void clearTarget(void);
signals:
@@ -49,10 +56,10 @@
void paintCompass ( QPainter * );
void calcTargetHeading();
QRect compassRect() const;
- int ang;
+ int m_ang;
double m_dSpawnAngle;
- QPoint m_cPlayer;
- QPoint m_cTarget;
+ CompassPoint m_cPlayer;
+ CompassPoint m_cTarget;
};
#endif // EQCOMPASS_H
Modified: showeq/trunk/src/compassframe.cpp
===================================================================
--- showeq/trunk/src/compassframe.cpp 2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/compassframe.cpp 2007-02-03 03:47:08 UTC (rev 664)
@@ -3,6 +3,8 @@
*
* ShowEQ Distributed under GPL
* http://seq.sf.net/
+ *
+ * Copyright 2003-2007 by the respective ShowEQ Developers
*/
#include <qfont.h>
@@ -69,7 +71,7 @@
int16_t,int16_t,int16_t,int32_t)));
// initialize compass
- m_compass->setPos(player->x(), player->y());
+ m_compass->setPos(player->x(), player->y(), player->z());
m_compass->setHeading(player->headingDegrees());
}
@@ -80,7 +82,7 @@
void CompassFrame::selectSpawn(const Item* item)
{
if (item)
- m_compass->setTargetPos(item->x(), item->y());
+ m_compass->setTargetPos(item->x(), item->y(), item->z());
else
m_compass->clearTarget();
}
@@ -90,7 +92,7 @@
int32_t heading)
{
// set compass info
- m_compass->setPos(x, y);
+ m_compass->setPos(x, y, z);
m_compass->setHeading(heading);
// set position labels
@@ -99,4 +101,7 @@
m_z->setText(QString::number(z));
}
+#ifndef QMAKEBUILD
#include "compassframe.moc"
+#endif
+
Modified: showeq/trunk/src/datetimemgr.cpp
===================================================================
--- showeq/trunk/src/datetimemgr.cpp 2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/datetimemgr.cpp 2007-02-03 03:47:08 UTC (rev 664)
@@ -4,7 +4,7 @@
* ShowEQ Distributed under GPL
* http://seq.sourceforge.net/
*
- * Copyright 2003 Zaphod (do...@us...). All Rights Reserved.
+ * Copyright 2003,2007 Zaphod (do...@us...). All Rights Reserved.
*
* Contributed to ShowEQ by Zaphod (do...@us...)
* for use under the terms of the GNU General Public License,
@@ -73,5 +73,7 @@
}
}
+#ifndef QMAKEBUILD
#include "datetimemgr.moc"
+#endif
Modified: showeq/trunk/src/editor.cpp
===================================================================
--- showeq/trunk/src/editor.cpp 2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/editor.cpp 2007-02-03 03:47:08 UTC (rev 664)
@@ -6,6 +6,8 @@
*
* ShowEQ Distributed under GPL
* http://www.sourceforge.net/projects/seq
+ *
+ * Copyright 2002-2007 by the respective ShowEQ Developers
*/
/* Implementation of text editor class */
@@ -224,5 +226,6 @@
}
}
- #include "editor.moc"
-
+#ifndef QMAKEBUILD
+#include "editor.moc"
+#endif
Modified: showeq/trunk/src/experiencelog.cpp
===================================================================
--- showeq/trunk/src/experiencelog.cpp 2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/experiencelog.cpp 2007-02-03 03:47:08 UTC (rev 664)
@@ -3,6 +3,8 @@
*
* ShowEQ Distributed under GPL
* http://www.sourceforge.net/projects/seq
+ *
+ * Copyright 2003-2007 by the respective ShowEQ Developers
*/
@@ -705,4 +707,7 @@
seqInfo("ZEM - ZEM - ZEM ===== %d ", ZEM);
}
+#ifndef QMAKEBUILD
#include "experiencelog.moc"
+#endif
+
Modified: showeq/trunk/src/filteredspawnlog.cpp
===================================================================
--- showeq/trunk/src/filteredspawnlog.cpp 2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/filteredspawnlog.cpp 2007-02-03 03:47:08 UTC (rev 664)
@@ -5,7 +5,7 @@
* http://www.sourceforge.net/projects/seq
*
* Copyright 2001-2003 by the respective ShowEQ Developers
- * Portions Copyright 2001-2003 Zaphod (do...@us...).
+ * Portions Copyright 2001-2007 Zaphod (do...@us...).
*/
#include "filteredspawnlog.h"
@@ -89,4 +89,7 @@
flush();
}
+#ifndef QMAKEBUILD
#include "filteredspawnlog.moc"
+#endif
+
Modified: showeq/trunk/src/filtermgr.cpp
===================================================================
--- showeq/trunk/src/filtermgr.cpp 2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/filtermgr.cpp 2007-02-03 03:47:08 UTC (rev 664)
@@ -3,6 +3,8 @@
*
* ShowEQ Distributed under GPL
* http://seq.sourceforge.net
+ *
+ * Copyright 2003-2007 by the respective ShowEQ Developers
*/
//
@@ -316,4 +318,7 @@
emit runtimeFiltersChanged(type);
}
+#ifndef QMAKEBUILD
#include "filtermgr.moc"
+#endif
+
Modified: showeq/trunk/src/filternotifications.cpp
===================================================================
--- showeq/trunk/src/filternotifications.cpp 2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/filternotifications.cpp 2007-02-03 03:47:08 UTC (rev 664)
@@ -4,7 +4,7 @@
* ShowEQ Distributed under GPL
* http://seq.sourceforge.net/
*
- * Portions Copyright 2003 Zaphod (do...@us...).
+ * Portions Copyright 2003-2007 Zaphod (do...@us...).
*
*/
@@ -129,8 +129,11 @@
system ((const char*)command);
}
+#ifndef QMAKEBUILD
#include "filternotifications.moc"
+#endif
+
Modified: showeq/trunk/src/group.cpp
===================================================================
--- showeq/trunk/src/group.cpp 2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/group.cpp 2007-02-03 03:47:08 UTC (rev 664)
@@ -3,6 +3,8 @@
*
* ShowEQ Distributed under GPL
* http://seq.sourceforge.net/
+ *
+ * Copyright 2003-2007 by the respective ShowEQ Developers
*/
#include "group.h"
@@ -372,4 +374,7 @@
return m_members[slot]->m_spawn;
}
+#ifndef QMAKEBUILD
#include "group.moc"
+#endif
+
Modified: showeq/trunk/src/guild.cpp
===================================================================
--- showeq/trunk/src/guild.cpp 2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/guild.cpp 2007-02-03 03:47:08 UTC (rev 664)
@@ -6,6 +6,8 @@
*
* Copyright 2001 Fee (fe...@us...). All Rights Reserved.
*
+ * Portions Copyright 2001-2007 by the respective ShowEQ Developers
+ *
* Contributed to ShowEQ by fee (fe...@us...)
* for use under the terms of the GNU General Public License,
* incorporated herein by reference.
@@ -145,4 +147,7 @@
}
}
+#ifndef QMAKEBUILD
#include "guild.moc"
+#endif
+
Modified: showeq/trunk/src/guildlist.cpp
===================================================================
--- showeq/trunk/src/guildlist.cpp 2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/guildlist.cpp 2007-02-03 03:47:08 UTC (rev 664)
@@ -4,7 +4,7 @@
* ShowEQ Distributed under GPL
* http://www.sourceforge.net/projects/seq
*
- * Copyright 2004 Zaphod (do...@us...).
+ * Copyright 2004-2007 Zaphod (do...@us...).
*
*/
@@ -544,4 +544,7 @@
m_guildTotals->setText(text.arg(m_membersOn).arg(m_guildShell->members().count()));
}
+#ifndef QMAKEBUILD
#include "guildlist.moc"
+#endif
+
Modified: showeq/trunk/src/guildshell.cpp
===================================================================
--- showeq/trunk/src/guildshell.cpp 2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/guildshell.cpp 2007-02-03 03:47:08 UTC (rev 664)
@@ -4,7 +4,7 @@
* ShowEQ Distributed under GPL
* http://www.sourceforge.net/projects/seq
*
- * Copyright 2004 Zaphod (do...@us...).
+ * Copyright 2004-2007 Zaphod (do...@us...).
*
*/
@@ -323,7 +323,10 @@
}
}
+#ifndef QMAKEBUILD
#include "guildshell.moc"
+#endif
+
Modified: showeq/trunk/src/interface.cpp
===================================================================
--- showeq/trunk/src/interface.cpp 2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/interface.cpp 2007-02-03 03:47:08 UTC (rev 664)
@@ -3,6 +3,8 @@
*
* ShowEQ Distributed under GPL
* http://seq.sourceforge.net/
+ *
+ * Copyright 2000-2007 by the respective ShowEQ Developers
*/
#include "interface.h"
@@ -32,7 +34,6 @@
#include "packetlog.h"
#include "bazaarlog.h"
#include "category.h"
-#include "itemdb.h"
#include "guild.h"
#include "guildshell.h"
#include "guildlist.h"
@@ -107,7 +108,6 @@
m_spellShell(0),
m_groupMgr(0),
m_spawnMonitor(0),
- m_itemDB(0),
m_guildmgr(0),
m_guildShell(0),
m_dateTimeMgr(0),
@@ -268,38 +268,6 @@
// Create our player object
m_player = new Player(this, m_zoneMgr, m_guildmgr);
- section = "ItemDB";
- if (pSEQPrefs->getPrefBool("Enabled", section, false))
- {
- seqDebug("ItemDB: Enabled");
-
- // Create an instance of the ItemDB
- m_itemDB = new EQItemDB(m_dataLocationMgr);
-
- // make it's parameters match those set via the config file and
- // command line
- fileName = pSEQPrefs->getPrefString("DataDBFilename", section,
- "itemdata2");
-
- fileInfo = m_dataLocationMgr->findWriteFile(".", fileName);
-
- m_itemDB->SetDBFile(EQItemDB::DATA_DB, fileInfo.absFilePath());
-
- fileName = pSEQPrefs->getPrefString("RawDataDBFilename", section,
- "itemrawdata2");
-
- m_itemDB->SetDBFile(EQItemDB::RAW_DATA_DB, fileInfo.absFilePath());
- m_itemDB->SetEnabledDBTypes(pSEQPrefs->getPrefInt("DatabasesEnabled",
- section,
- (EQItemDB::DATA_DB|EQItemDB::RAW_DATA_DB)));
- m_itemDB->SetItemLogging(pSEQPrefs->getPrefBool("ItemLogging", "ItemDB", false));
- m_itemDB->SetItemPacketLogging(pSEQPrefs->getPrefBool("ItemPackingLogging", "ItemDB", false));
- // Make sure the databases are upgraded to the current format
- m_itemDB->Upgrade();
- }
- else
- seqDebug("ItemDB: Disabled");
-
// Create the filter manager
m_filterMgr = new FilterMgr(m_dataLocationMgr,
pSEQPrefs->getPrefString("FilterFile",
@@ -1050,11 +1018,6 @@
SLOT(toggle_view_UnknownData()) ,
Key_F9);
m_id_log_RawData = pLogMenu->insertItem("Raw Data", this, SLOT(toggle_log_RawData()), Key_F10);
- if (m_itemDB)
- {
- m_id_log_Items = pLogMenu->insertItem("Item Data", this, SLOT(toggle_log_ItemData()));
- m_id_log_ItemPackets = pLogMenu->insertItem("Item Packet Data", this, SLOT(toggle_log_ItemPacketData()));
- }
menuBar()->setItemChecked (m_id_log_AllPackets, (m_globalLog != 0));
menuBar()->setItemChecked (m_id_log_WorldData, (m_worldLog != 0));
menuBar()->setItemChecked (m_id_log_ZoneData, (m_zoneLog != 0));
@@ -1068,12 +1031,6 @@
"PacketLogging",
false));
- if (m_itemDB)
- {
- menuBar()->setItemChecked (m_id_log_Items, m_itemDB->GetItemLogging());
- menuBar()->setItemChecked (m_id_log_ItemPackets, m_itemDB->GetItemPacketLogging());
- }
-
// OpCode Monitor
QPopupMenu* pOpCodeMenu = new QPopupMenu;
m_netMenu->insertItem("OpCode Monitor", pOpCodeMenu);
@@ -1690,23 +1647,6 @@
m_zoneMgr, SLOT(zonePoints(const uint8_t*, size_t, uint8_t)));
}
- if (m_itemDB != 0)
- {
- // connect ItemDB slots to EQPacket signals
- m_packet->connect2("OP_ItemPacket", SP_Zone, DIR_Server,
- "itemPacketStruct", SZC_None,
- m_itemDB, SLOT(item(const uint8_t*, size_t, uint8_t)));
- m_packet->connect2("OP_ItemPlayerPacket", SP_Zone, DIR_Server,
- "char", SZC_None, m_itemDB,
- SLOT(playerItem(const uint8_t*, size_t, uint8_t)));
- m_packet->connect2("OP_ItemLinkResponse", SP_Zone, DIR_Server,
- "itemInfoStruct", SZC_None, m_itemDB,
- SLOT(itemInfo(const uint8_t*, size_t, uint8_t)));
- m_packet->connect2("OP_Shroud", SP_Zone, DIR_Server,
- "spawnShroudOther", SZC_None, m_itemDB,
- SLOT(playerShroud(const uint8_t*, size_t, uint8_t)));
- }
-
if (m_groupMgr != 0)
{
connect(m_zoneMgr, SIGNAL(playerProfile(const charProfileStruct*)),
@@ -2291,13 +2231,6 @@
if (m_eqStrings != 0)
delete m_eqStrings;
- // Shutdown the Item DB before any other cleanup
- if (m_itemDB != 0)
- m_itemDB->Shutdown();
-
- // delete the ItemDB before application exit
- delete m_itemDB;
-
if (m_player != 0)
delete m_player;
@@ -3658,21 +3591,6 @@
pSEQPrefs->setPrefBool("LogRawPackets", "PacketLogging", state);
}
-void EQInterface::toggle_log_ItemData (void)
-{
- m_itemDB->SetItemLogging(!m_itemDB->GetItemLogging());
- menuBar()->setItemChecked (m_id_log_Items, m_itemDB->GetItemLogging());
- pSEQPrefs->setPrefBool("ItemLogging", "ItemDB", m_itemDB->GetItemLogging());
-}
-
-void EQInterface::toggle_log_ItemPacketData (void)
-{
- m_itemDB->SetItemPacketLogging(!m_itemDB->GetItemPacketLogging());
- menuBar()->setItemChecked (m_id_log_ItemPackets, m_itemDB->GetItemPacketLogging());
- pSEQPrefs->setPrefBool("ItemPacketLogging", "ItemDB", m_itemDB->GetItemPacketLogging());
-}
-
-
/* Check and uncheck View menu options */
void
EQInterface::toggle_view_ChannelMsgs(int id)
@@ -6116,4 +6034,7 @@
QMainWindow::setDockEnabled(dw, DockRight, enable);
}
+#ifndef QMAKEBUILD
#include "interface.moc"
+#endif
+
Modified: showeq/trunk/src/interface.h
===================================================================
--- showeq/trunk/src/interface.h 2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/interface.h 2007-02-03 03:47:08 UTC (rev 664)
@@ -175,8 +175,6 @@
void toggle_opt_BazaarData();
void toggle_log_UnknownData();
void toggle_log_RawData();
- void toggle_log_ItemData();
- void toggle_log_ItemPacketData();
void listSpawns(void);
void listDrops(void);
void listMapInfo(void);
@@ -352,7 +350,6 @@
SpellShell* m_spellShell;
GroupMgr* m_groupMgr;
SpawnMonitor* m_spawnMonitor;
- EQItemDB* m_itemDB;
GuildMgr* m_guildmgr;
GuildShell* m_guildShell;
DateTimeMgr* m_dateTimeMgr;
Modified: showeq/trunk/src/itemdb.cpp
===================================================================
--- showeq/trunk/src/itemdb.cpp 2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/itemdb.cpp 2007-02-03 03:47:08 UTC (rev 664)
@@ -3,6 +3,8 @@
*
* ShowEQ Distributed under GPL
* http://seq.sourceforge.net/
+ *
+ * Copyright 2003-2007 by the respective ShowEQ Developers
*/
static char* itemdbid = "@(#) $Id$ $Name$";
@@ -2542,4 +2544,7 @@
return (((EQItemDBEntryData_3*)m_itemEntryData)->m_itemType == ItemTypeContainer);
}
+#ifndef QMAKEBUILD
#include "itemdb.moc"
+#endif
+
Modified: showeq/trunk/src/logger.cpp
===================================================================
--- showeq/trunk/src/logger.cpp 2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/logger.cpp 2007-02-03 03:47:08 UTC (rev 664)
@@ -5,6 +5,8 @@
*
* ShowEQ Distributed under GPL
* http://www.sourceforge.net/projects/seq
+ *
+ * Copyright 2003-2007 by the respective ShowEQ Developers
*/
#include <stdio.h>
@@ -140,4 +142,7 @@
fprintf (m_fp, "%03d | %-48s | %s \n\n", c, hex, asc);
}
+#ifndef QMAKEBUILD
#include "logger.moc"
+#endif
+
Modified: showeq/trunk/src/main.cpp
===================================================================
--- showeq/trunk/src/main.cpp 2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/main.cpp 2007-02-03 03:47:08 UTC (rev 664)
@@ -772,11 +772,14 @@
printf ("\t\tUsing headers from linux version: %s\n",
UTS_RELEASE);
#endif
+#ifdef ITEMDB
printf ("\t\tUsing EQItemDB: %s\n", EQItemDB::Version());
printf ("\tUsing GDBM: %s\n", GDBMConvenience::Version());
#ifdef USE_DB3
printf ("\tUsing DB3: %s\n", DB3Convenience::Version());
#endif
+#endif
+
/////////////////////////////////
// Display current system environment information
struct utsname utsbuff;
Modified: showeq/trunk/src/main.h
===================================================================
--- showeq/trunk/src/main.h 2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/main.h 2007-02-03 03:47:08 UTC (rev 664)
@@ -19,8 +19,6 @@
#include "xmlpreferences.h"
extern class XMLPreferences *pSEQPrefs;
-class EQItemDB;
-
#include "config.h"
//----------------------------------------------------------------------
Modified: showeq/trunk/src/map.cpp
===================================================================
--- showeq/trunk/src/map.cpp 2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/map.cpp 2007-02-03 03:47:08 UTC (rev 664)
@@ -4,7 +4,7 @@
* ShowEQ Distributed under GPL
* http://seq.sourceforge.net/
*
- * Portions Copyright 2001-2004 Zaphod (do...@us...).
+ * Portions Copyright 2001-2007 Zaphod (do...@us...).
*
*/
@@ -1187,12 +1187,12 @@
m_map->setShowBackgroundImage(!m_map->showBackgroundImage());
}
-#ifdef DEBUG
void MapMenu::toggle_debugInfo(int itemId)
{
+#ifdef DEBUG
m_map->setShowDebugInfo(!m_map->showDebugInfo());
+#endif
}
-#endif
void MapMenu::toggle_cacheAlwaysRepaint()
{
@@ -2272,9 +2272,9 @@
refreshMap ();
}
-#ifdef DEBUG
void Map::setShowDebugInfo(bool val)
{
+#ifdef DEBUG
m_showDebugInfo = val;
QString tmpPrefString = "ShowDebugInfo";
@@ -2282,8 +2282,8 @@
if(!m_cacheChanges)
refreshMap ();
+#endif
}
-#endif
void Map::setAnimate(bool val)
{
@@ -4877,4 +4877,7 @@
}
+#ifndef QMAKEBUILD
#include "map.moc"
+#endif
+
Modified: showeq/trunk/src/map.h
===================================================================
--- showeq/trunk/src/map.h 2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/map.h 2007-02-03 03:47:08 UTC (rev 664)
@@ -4,7 +4,7 @@
* ShowEQ Distributed under GPL
* http://seq.sourceforge.net/
*
- * Portions Copyright 2001-2004 Zaphod (do...@us...).
+ * Portions Copyright 2001-2007 Zaphod (do...@us...).
*
*/
@@ -245,9 +245,7 @@
void toggle_racePvP(int itemId);
void toggle_walkPath(int itemId);
void toggle_npcWalkPaths(int itemId);
-#ifdef DEBUG
void toggle_debugInfo(int itemId);
-#endif
void toggle_cacheAlwaysRepaint();
void toggle_cacheChanges();
void toggle_zoneSafePoint(int itemId);
Modified: showeq/trunk/src/mapcore.cpp
===================================================================
--- showeq/trunk/src/mapcore.cpp 2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/mapcore.cpp 2007-02-03 03:47:08 UTC (rev 664)
@@ -4,7 +4,7 @@
* ShowEQ Distributed under GPL
* http://seq.sf.net/
*
- * Portions Copyright 2001-2003 Zaphod (do...@us...).
+ * Portions Copyright 2001-2007 Zaphod (do...@us...).
*
*/
@@ -2223,7 +2223,9 @@
: m_mapData(mapData),
m_lastParam(mapData)
{
+#ifdef DEBUG
m_paintCount = 0;
+#endif
m_painted = false;
m_alwaysRepaint = false;
}
@@ -2268,9 +2270,10 @@
if (!needRepaint(param))
return m_mapImage;
+#ifdef DEBUG
// increment paint count
m_paintCount++;
-
+#endif
// set pixmap optimization if it's changed
if (m_lastParam.mapOptimizationMethod() !=
param.mapOptimizationMethod())
Modified: showeq/trunk/src/mapicon.cpp
===================================================================
--- showeq/trunk/src/mapicon.cpp 2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/mapicon.cpp 2007-02-03 03:47:08 UTC (rev 664)
@@ -4,7 +4,7 @@
* ShowEQ Distributed under GPL
* http://seq.sourceforge.net/
*
- * Portions Copyright 2003-2004 Zaphod (do...@us...).
+ * Portions Copyright 2003-2007 Zaphod (do...@us...).
*
*/
@@ -1282,4 +1282,7 @@
return m_player->pickConColor(spawn->level());
}
+#ifndef QMAKEBUILD
#include "mapicon.moc"
+#endif
+
Modified: showeq/trunk/src/messagefilter.cpp
===================================================================
--- showeq/trunk/src/messagefilter.cpp 2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/messagefilter.cpp 2007-02-03 03:47:08 UTC (rev 664)
@@ -4,7 +4,7 @@
* ShowEQ Distributed under GPL
* http://seq.sourceforge.net/
*
- * Copyright 2003 Zaphod (do...@us...)
+ * Copyright 2003-2007 Zaphod (do...@us...)
*
*/
@@ -190,4 +190,7 @@
return mask;
}
+#ifndef QMAKEBUILD
#include "messagefilter.moc"
+#endif
+
Modified: showeq/trunk/src/messagefilterdialog.cpp
===================================================================
--- showeq/trunk/src/messagefilterdialog.cpp 2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/messagefilterdialog.cpp 2007-02-03 03:47:08 UTC (rev 664)
@@ -4,6 +4,8 @@
* ShowEQ Distributed under GPL
* http://seq.sf.net/
*
+ * Copyright 2003-2007 by the respective ShowEQ Developers
+ *
*/
#include "messagefilterdialog.h"
@@ -467,4 +469,6 @@
m_delete->setEnabled(m_currentFilter != 0);
}
+#ifndef QMAKEBUILD
#include "messagefilterdialog.moc"
+#endif
Modified: showeq/trunk/src/messages.cpp
===================================================================
--- showeq/trunk/src/messages.cpp 2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/messages.cpp 2007-02-03 03:47:08 UTC (rev 664)
@@ -4,7 +4,7 @@
* ShowEQ Distributed under GPL
* http://seq.sourceforge.net/
*
- * Copyright 2002-2003 Zaphod (do...@us...)
+ * Copyright 2002-2003,2007 Zaphod (do...@us...)
*
*/
@@ -82,4 +82,7 @@
(*it).setFilterFlags((*it).filterFlags() | mask);
}
+#ifndef QMAKEBUILD
#include "messages.moc"
+#endif
+
Modified: showeq/trunk/src/messageshell.cpp
===================================================================
--- showeq/trunk/src/messageshell.cpp 2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/messageshell.cpp 2007-02-03 03:47:08 UTC (rev 664)
@@ -4,7 +4,7 @@
* ShowEQ Distributed under GPL
* http://seq.sourceforge.net/
*
- * Copyright 2002-2003 Zaphod (do...@us...)
+ * Copyright 2002-2003,2007 Zaphod (do...@us...)
*
*/
@@ -1022,4 +1022,7 @@
.arg(spawnInfo));
}
+#ifndef QMAKEBUILD
#include "messageshell.moc"
+#endif
+
Modified: showeq/trunk/src/messagewindow.cpp
===================================================================
--- showeq/trunk/src/messagewindow.cpp 2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/messagewindow.cpp 2007-02-03 03:47:08 UTC (rev 664)
@@ -3,6 +3,8 @@
*
* ShowEQ Distributed under GPL
* http://seq.sf.net/
+ *
+ * Copyright 2003-2007 by the respective ShowEQ Developers
*/
#include "messagefilterdialog.h"
@@ -1175,4 +1177,7 @@
m_hideUserFilterMenu->insertItem(filter.name(), filterid);
}
+#ifndef QMAKEBUILD
#include "messagewindow.moc"
+#endif
+
Modified: showeq/trunk/src/netdiag.cpp
===================================================================
--- showeq/trunk/src/netdiag.cpp 2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/netdiag.cpp 2007-02-03 03:47:08 UTC (rev 664)
@@ -4,6 +4,8 @@
* ShowEQ Distributed under GPL
* http://seq.sourceforge.net/
*
+ * Copyright 2003-2007 by the respective ShowEQ Developers
+ *
*/
#include <qpushbutton.h>
@@ -336,4 +338,7 @@
return paddr;
}
+#ifndef QMAKEBUILD
#include "netdiag.moc"
+#endif
+
Modified: showeq/trunk/src/packet.cpp
===================================================================
--- showeq/trunk/src/packet.cpp 2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/packet.cpp 2007-02-03 03:47:08 UTC (rev 664)
@@ -5,7 +5,7 @@
* http://www.sourceforge.net/projects/seq
*
* Copyright 2000-2004 by the respective ShowEQ Developers
- * Portions Copyright 2001-2004 Zaphod (do...@us...).
+ * Portions Copyright 2001-2004,2007 Zaphod (do...@us...).
*/
/* Implementation of Packet class */
@@ -1145,4 +1145,7 @@
return m_streams[stream]->arqSeqExp();
}
+#ifndef QMAKEBUILD
#include "packet.moc"
+#endif
+
Modified: showeq/trunk/src/packetinfo.cpp
===================================================================
--- showeq/trunk/src/packetinfo.cpp 2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/packetinfo.cpp 2007-02-03 03:47:08 UTC (rev 664)
@@ -4,7 +4,7 @@
* ShowEQ Distributed under GPL
* http://www.sourceforge.net/projects/seq
*
- * Copyright 2003-2004 Zaphod (do...@us...).
+ * Copyright 2003-2004,2007 Zaphod (do...@us...).
*
*/
@@ -741,4 +741,7 @@
return true;
}
+#ifndef QMAKEBUILD
#include "packetinfo.moc"
+#endif
+
Modified: showeq/trunk/src/packetlog.cpp
===================================================================
--- showeq/trunk/src/packetlog.cpp 2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/packetlog.cpp 2007-02-03 03:47:08 UTC (rev 664)
@@ -5,7 +5,7 @@
* http://www.sourceforge.net/projects/seq
*
* Copyright 2000-2004 by the respective ShowEQ Developers
- * Portions Copyright 2001-2004 Zaphod (do...@us...).
+ * Portions Copyright 2001-2004,2007 Zaphod (do...@us...).
*/
#include <qdatetime.h>
@@ -508,4 +508,7 @@
}
}
+#ifndef QMAKEBUILD
#include "packetlog.moc"
+#endif
+
Modified: showeq/trunk/src/packetstream.cpp
===================================================================
--- showeq/trunk/src/packetstream.cpp 2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/packetstream.cpp 2007-02-03 03:47:08 UTC (rev 664)
@@ -5,7 +5,7 @@
* http://www.sourceforge.net/projects/seq
*
* Copyright 2000-2003 by the respective ShowEQ Developers
- * Portions Copyright 2001-2003 Zaphod (do...@us...).
+ * Portions Copyright 2001-2003,2007 Zaphod (do...@us...).
*/
/* Implementation of EQPacketStream class */
@@ -1220,4 +1220,7 @@
m_sessionKey);
}
+#ifndef QMAKEBUILD
#include "packetstream.moc"
+#endif
+
Modified: showeq/trunk/src/player.cpp
===================================================================
--- showeq/trunk/src/player.cpp 2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/player.cpp 2007-02-03 03:47:08 UTC (rev 664)
@@ -3,6 +3,8 @@
*
* ShowEQ Distributed under GPL
* http://seq.sourceforge.net/
+ *
+ * Copyright 2000-2007 by the respective ShowEQ Developers
*/
#include "player.h"
@@ -1470,4 +1472,7 @@
}
}
+#ifndef QMAKEBUILD
#include "player.moc"
+#endif
+
Modified: showeq/trunk/src/seqlistview.cpp
===================================================================
--- showeq/trunk/src/seqlistview.cpp 2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/seqlistview.cpp 2007-02-03 03:47:08 UTC (rev 664)
@@ -4,7 +4,7 @@
* ShowEQ Distributed under GPL
* http://seq.sourceforge.net/
*
- * Copyright 2001 Zaphod (do...@us...). All Rights Reserved.
+ * Copyright 2001,2007 Zaphod (do...@us...). All Rights Reserved.
*
* Contributed to ShowEQ by Zaphod (do...@us...)
* for use under the terms of the GNU General Public License,
@@ -224,4 +224,7 @@
triggerUpdate();
}
+#ifndef QMAKEBUILD
#include "seqlistview.moc"
+#endif
+
Modified: showeq/trunk/src/seqwindow.cpp
===================================================================
--- showeq/trunk/src/seqwindow.cpp 2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/seqwindow.cpp 2007-02-03 03:47:08 UTC (rev 664)
@@ -4,7 +4,7 @@
* ShowEQ Distributed under GPL
* http://seq.sourceforge.net/
*
- * Copyright 2001-2003 Zaphod (do...@us...). All Rights Reserved.
+ * Copyright 2001-2003,2007 Zaphod (do...@us...). All Rights Reserved.
*
* Contributed to ShowEQ by Zaphod (do...@us...)
* for use under the terms of the GNU General Public License,
@@ -151,4 +151,6 @@
QDockWindow::mousePressEvent(e);
}
+#ifndef QMAKEBUILD
#include "seqwindow.moc"
+#endif
Added: showeq/trunk/src/showeq.pro
===================================================================
--- showeq/trunk/src/showeq.pro (rev 0)
+++ showeq/trunk/src/showeq.pro 2007-02-03 03:47:08 UTC (rev 664)
@@ -0,0 +1,32 @@
+TEMPLATE = app
+TARGET = showeq
+MOC_DIR = tmp
+OBJECTS_DIR = tmp
+UI_DIR = tmp
+CONFIG += qt thread stl warn_on debug
+DEFINES += PKGDATADIR=\"/usr/local/share/showeq\"
+DEFINES += QMAKEBUILD
+LIBS += -lpcap
+
+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 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
+
+SOURCES += interface.cpp
+
+INCLUDEPATH += ..
+INCLUDEPATH += /usr/include/pcap
+
+HEADES += ../config.h
+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 weapons29.h weapons2a.h weapons2b.h weapons2c.h decode.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.h filternotifications.h netstream.h guildshell.h guildlist.h bazaarlog.h message.h s_everquest.h staticspells.h
+FORMS += mapicondialog.ui
+
Property changes on: showeq/trunk/src/showeq.pro
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ author id date revision
Name: svn:eol-style
+ native
Modified: showeq/trunk/src/skilllist.cpp
===================================================================
--- showeq/trunk/src/skilllist.cpp 2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/skilllist.cpp 2007-02-03 03:47:08 UTC (rev 664)
@@ -3,6 +3,8 @@
*
* ShowEQ Distributed under GPL
* http://seq.sourceforge.net/
+ *
+ * Copyright 2003-2007 by the respective ShowEQ Developers
*/
#include "player.h"
@@ -263,4 +265,7 @@
m_skillList->savePrefs();
}
+#ifndef QMAKEBUILD
#include "skilllist.moc"
+#endif
+
Modified: showeq/trunk/src/spawnlist.cpp
===================================================================
--- showeq/trunk/src/spawnlist.cpp 2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/spawnlist.cpp 2007-02-03 03:47:08 UTC (rev 664)
@@ -3,6 +3,8 @@
*
* ShowEQ Distributed under GPL
* http://seq.sourceforge.net/
+ *
+ * Copyright 2000-2007 by the respective ShowEQ Developers
*/
/*
@@ -1175,4 +1177,7 @@
m_spawnList->savePrefs();
}
+#ifndef QMAKEBUILD
#include "spawnlist.moc"
+#endif
+
Modified: showeq/trunk/src/spawnlist2.cpp
===================================================================
--- showeq/trunk/src/spawnlist2.cpp 2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/spawnlist2.cpp 2007-02-03 03:47:08 UTC (rev 664)
@@ -1,4 +1,11 @@
-
+/*
+ * spawnlist2.cpp
+ *
+ * ShowEQ Distributed under GPL
+ * http://www.sourceforge.net/projects/seq
+ *
+ * Copyright 2000-2007 by the respective ShowEQ Developers
+ */
#include "spawnlist2.h"
#include "category.h"
#include "spawnshell.h"
@@ -947,4 +954,7 @@
#endif
}
+#ifndef QMAKEBUILD
#include "spawnlist2.moc"
+#endif
+
Modified: showeq/trunk/src/spawnlistcommon.cpp
===================================================================
--- showeq/trunk/src/spawnlistcommon.cpp 2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/spawnlistcommon.cpp 2007-02-03 03:47:08 UTC (rev 664)
@@ -3,6 +3,8 @@
*
* ShowEQ Distributed under GPL
* http://seq.sourceforge.net/
+ *
+ * Copyright 2000-2007 by the respective ShowEQ Developers
*/
/*
@@ -743,4 +745,7 @@
m_spawnlistWindow->setCaption(caption);
}
+#ifndef QMAKEBUILD
#include "spawnlistcommon.moc"
+#endif
+
Modified: showeq/trunk/src/spawnlog.cpp
===================================================================
--- showeq/trunk/src/spawnlog.cpp 2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/spawnlog.cpp 2007-02-03 03:47:08 UTC (rev 664)
@@ -5,7 +5,7 @@
* http://www.sourceforge.net/projects/seq
*
* Copyright 2001-2003 by the respective ShowEQ Developers
- * Portions Copyright 2001-2003 Zaphod (do...@us...).
+ * Portions Copyright 2001-2003,2007 Zaphod (do...@us...).
*/
#include "spawn.h"
@@ -143,4 +143,7 @@
zoneShortName = zonename;
}
+#ifndef QMAKEBUILD
#include "spawnlog.moc"
+#endif
+
Modified: showeq/trunk/src/spawnmonitor.cpp
===================================================================
--- showeq/trunk/src/spawnmonitor.cpp 2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/spawnmonitor.cpp 2007-02-03 03:47:08 UTC (rev 664)
@@ -5,7 +5,7 @@
* http://seq.sourceforge.net/
*
* Borrowed from: SINS Distributed under GPL
- * Portions Copyright 2001 Zaphod (do...@us...).
+ * Portions Copyright 2001,2007 Zaphod (do...@us...).
*
* For use under the terms of the GNU General Public License,
* incorporated herein by reference.
@@ -406,4 +406,6 @@
m_modified = false;
}
+#ifndef QMAKEBUILD
#include "spawnmonitor.moc"
+#endif
Modified: showeq/trunk/src/spawnpointlist.cpp
===================================================================
--- showeq/trunk/src/spawnpointlist.cpp 2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/spawnpointlist.cpp 2007-02-03 03:47:08 UTC (rev 664)
@@ -5,7 +5,7 @@
* http://seq.sourceforge.net/
*
* Borrowed from: SINS Distributed under GPL
- * Portions Copyright 2001 Zaphod (do...@us...).
+ * Portions Copyright 2001,2007 Zaphod (do...@us...).
*
* For use under the terms of the GNU General Public License,
* incorporated herein by reference.
@@ -569,4 +569,7 @@
m_spawnPointList->savePrefs();
}
+#ifndef QMAKEBUILD
#include "spawnpointlist.moc"
+#endif
+
Modified: showeq/trunk/src/spawnshell.cpp
===================================================================
--- showeq/trunk/src/spawnshell.cpp 2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/spawnshell.cpp 2007-02-03 03:47:08 UTC (rev 664)
@@ -4,7 +4,7 @@
* ShowEQ Distributed under GPL
* http://seq.sourceforge.net/
*
- * Portions Copyright 2001-2003 Zaphod (do...@us...).
+ * Portions Copyright 2001-2003,2007 Zaphod (do...@us...).
*
*/
@@ -1461,4 +1461,7 @@
}
}
+#ifndef QMAKEBUILD
#include "spawnshell.moc"
+#endif
+
Modified: showeq/trunk/src/spelllist.cpp
===================================================================
--- showeq/trunk/src/spelllist.cpp 2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/spelllist.cpp 2007-02-03 03:47:08 UTC (rev 664)
@@ -3,6 +3,8 @@
*
* ShowEQ Distributed under GPL
* http://seq.sourceforge.net/
+ *
+ * Copyright 2001-2007 by the respective ShowEQ Developers
*/
/*
@@ -394,4 +396,6 @@
m_spellList->savePrefs();
}
+#ifndef QMAKEBUILD
#include "spelllist.moc"
+#endif
Modified: showeq/trunk/src/spellshell.cpp
===================================================================
--- showeq/trunk/src/spellshell.cpp 2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/spellshell.cpp 2007-02-03 03:47:08 UTC (rev 664)
@@ -7,7 +7,7 @@
* Crazy Joe Divola (cj...@us...)
* September 5, 2001
*
- * Portions Copyright 2003 Zaphod (do...@us...).
+ * Portions Copyright 2003-2007 Zaphod (do...@us...).
*
*/
@@ -540,4 +540,7 @@
m_timer->stop();
}
+#ifndef QMAKEBUILD
#include "spellshell.moc"
+#endif
+
Modified: showeq/trunk/src/statlist.cpp
===================================================================
--- showeq/trunk/src/statlist.cpp 2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/statlist.cpp 2007-02-03 03:47:08 UTC (rev 664)
@@ -3,6 +3,8 @@
*
* ShowEQ Distributed under GPL
* http://seq.sourceforge.net/
+ *
+ * Copyright 2000-2007 by the respective ShowEQ Developers
*/
#include <qlayout.h>
@@ -352,4 +354,7 @@
m_statList->savePrefs();
}
+#ifndef QMAKEBUILD
#include "statlist.moc"
+#endif
+
Modified: showeq/trunk/src/terminal.cpp
===================================================================
--- showeq/trunk/src/terminal.cpp 2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/terminal.cpp 2007-02-03 03:47:08 UTC (rev 664)
@@ -4,7 +4,7 @@
* ShowEQ Distributed under GPL
* http://seq.sourceforge.net/
*
- * Copyright 2003 Zaphod (do...@us...)
+ * Copyright 2003-2007 Zaphod (do...@us...)
*
*/
@@ -214,4 +214,7 @@
fputc('\n', stdout);
}
+#ifndef QMAKEBUILD
#include "terminal.moc"
+#endif
+
Modified: showeq/trunk/src/util.cpp
===================================================================
--- showeq/trunk/src/util.cpp 2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/util.cpp 2007-02-03 03:47:08 UTC (rev 664)
@@ -3,6 +3,9 @@
*
* ShowEQ Distributed under GPL
* http://seq.sourceforge.net/
+ *
+ * Copyright 2000-2007 by the respective ShowEQ Developers
+ *
*/
#include "util.h"
@@ -579,7 +582,7 @@
return slotname;
}
-uint32_t calc_exp (int level, uint16_t race, uint8_t class_)
+uint32_t calc_exp (int32_t level, uint16_t race, uint8_t class_)
{
float exp=level*level*level;
@@ -646,7 +649,7 @@
default : exp*=10;
}
- return (unsigned long)(exp);
+ return (uint32_t)(exp);
}
//
@@ -968,7 +971,7 @@
uint16_t calcCRC16(uint8_t* p, uint32_t length, uint32_t seed)
{
#include "crctab.h"
- unsigned long crc = 0L ^ 0xffffffff;
+ uint32_t crc = 0L ^ 0xffffffff;
// CRC each byte of the seed
crc = crc >> 8 ^ crctab[(seed ^ crc) & 0xFF];
@@ -978,9 +981,7 @@
// Then crc the buffer
while(length--)
- {
crc = crc >> 8 ^ crctab[(*(p++) ^ crc) & 0xFF];
- }
return crc ^ 0xffffffffL;
}
Modified: showeq/trunk/src/xmlpreferences.cpp
===================================================================
--- showeq/trunk/src/xmlpreferences.cpp 2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/xmlpreferences.cpp 2007-02-03 03:47:08 UTC (rev 664)
@@ -917,4 +917,6 @@
setPref(inName, inSection, inValue, pers);
}
+#ifndef QMAKEBUILD
#include "xmlpreferences.moc"
+#endif
Modified: showeq/trunk/src/zonemgr.cpp
===================================================================
--- showeq/trunk/src/zonemgr.cpp 2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/zonemgr.cpp 2007-02-03 03:47:08 UTC (rev 664)
@@ -4,7 +4,7 @@
* ShowEQ Distributed under GPL
* http://seq.sourceforge.net/
*
- * Copyright 2001 Zaphod (do...@us...). All Rights Reserved.
+ * Copyright 2001,2007 Zaphod (do...@us...). All Rights Reserved.
*
* Contributed to ShowEQ by Zaphod (do...@us...)
* for use under the terms of the GNU General Public License,
@@ -273,5 +273,6 @@
sizeof(zonePointStruct) * m_zonePointCount);
}
+#ifndef QMAKEBUILD
#include "zonemgr.moc"
-
+#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
