Menu
▾
▴
[Seq-cvs-commit] SF.net SVN: seq: [667] showeq/branches/qt3to4_Z/src
|
From: <do...@us...> - 2007-02-03 20:32:31
|
Revision: 667
http://seq.svn.sourceforge.net/seq/?rev=667&view=rev
Author: dohpaz
Date: 2007-02-03 12:32:28 -0800 (Sat, 03 Feb 2007)
Log Message:
-----------
Do the easy to do porting.
Clean up a bunch of distracting warnings.
Now begins the hard part...
Modified Paths:
--------------
showeq/branches/qt3to4_Z/src/category.cpp
showeq/branches/qt3to4_Z/src/category.h
showeq/branches/qt3to4_Z/src/combatlog.h
showeq/branches/qt3to4_Z/src/compass.cpp
showeq/branches/qt3to4_Z/src/compassframe.cpp
showeq/branches/qt3to4_Z/src/datetimemgr.h
showeq/branches/qt3to4_Z/src/editor.cpp
showeq/branches/qt3to4_Z/src/experiencelog.cpp
showeq/branches/qt3to4_Z/src/filter.cpp
showeq/branches/qt3to4_Z/src/filter.h
showeq/branches/qt3to4_Z/src/fixpt.h
showeq/branches/qt3to4_Z/src/group.cpp
showeq/branches/qt3to4_Z/src/group.h
showeq/branches/qt3to4_Z/src/guild.cpp
showeq/branches/qt3to4_Z/src/guildlist.cpp
showeq/branches/qt3to4_Z/src/guildshell.cpp
showeq/branches/qt3to4_Z/src/guildshell.h
showeq/branches/qt3to4_Z/src/interface.cpp
showeq/branches/qt3to4_Z/src/interface.h
showeq/branches/qt3to4_Z/src/logger.h
showeq/branches/qt3to4_Z/src/map.cpp
showeq/branches/qt3to4_Z/src/map.h
showeq/branches/qt3to4_Z/src/mapcore.cpp
showeq/branches/qt3to4_Z/src/mapcore.h
showeq/branches/qt3to4_Z/src/mapicon.cpp
showeq/branches/qt3to4_Z/src/mapicon.h
showeq/branches/qt3to4_Z/src/messagefilterdialog.cpp
showeq/branches/qt3to4_Z/src/messages.cpp
showeq/branches/qt3to4_Z/src/messageshell.cpp
showeq/branches/qt3to4_Z/src/messagewindow.cpp
showeq/branches/qt3to4_Z/src/packet.cpp
showeq/branches/qt3to4_Z/src/packet.h
showeq/branches/qt3to4_Z/src/packetformat.cpp
showeq/branches/qt3to4_Z/src/packetinfo.cpp
showeq/branches/qt3to4_Z/src/packetlog.cpp
showeq/branches/qt3to4_Z/src/packetstream.cpp
showeq/branches/qt3to4_Z/src/player.cpp
showeq/branches/qt3to4_Z/src/seqwindow.cpp
showeq/branches/qt3to4_Z/src/spawn.cpp
showeq/branches/qt3to4_Z/src/spawnlist.cpp
showeq/branches/qt3to4_Z/src/spawnlist2.cpp
showeq/branches/qt3to4_Z/src/spawnlistcommon.cpp
showeq/branches/qt3to4_Z/src/spawnmonitor.cpp
showeq/branches/qt3to4_Z/src/spawnpointlist.cpp
showeq/branches/qt3to4_Z/src/spawnshell.cpp
showeq/branches/qt3to4_Z/src/spawnshell.h
showeq/branches/qt3to4_Z/src/spelllist.cpp
showeq/branches/qt3to4_Z/src/statlist.cpp
showeq/branches/qt3to4_Z/src/xmlconv.cpp
showeq/branches/qt3to4_Z/src/xmlpreferences.cpp
showeq/branches/qt3to4_Z/src/xmlpreferences.h
showeq/branches/qt3to4_Z/src/zonemgr.cpp
Modified: showeq/branches/qt3to4_Z/src/category.cpp
===================================================================
--- showeq/branches/qt3to4_Z/src/category.cpp 2007-02-03 14:32:01 UTC (rev 666)
+++ showeq/branches/qt3to4_Z/src/category.cpp 2007-02-03 20:32:28 UTC (rev 667)
@@ -30,6 +30,7 @@
#include <Q3HBoxLayout>
#include <QLabel>
#include <Q3VBoxLayout>
+#include <QTextStream>
// ------------------------------------------------------
// Category
@@ -95,8 +96,8 @@
QLabel *colorLabel = new QLabel ("Color", this);
colorLabel->setFont(labelFont);
- colorLabel->setAlignment(QLabel::AlignRight|QLabel::AlignVCenter);
- row1Layout->addWidget(colorLabel, 0, AlignLeft);
+ colorLabel->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
+ row1Layout->addWidget(colorLabel, 0, Qt::AlignLeft);
m_Color = new QPushButton(this, "color");
m_Color->setText("...");
@@ -107,7 +108,7 @@
QLabel *nameLabel = new QLabel ("Name", this);
nameLabel->setFont(labelFont);
- nameLabel->setAlignment(QLabel::AlignLeft|QLabel::AlignVCenter);
+ nameLabel->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
row4Layout->addWidget(nameLabel);
m_Name = new QLineEdit(this, "Name");
@@ -116,7 +117,7 @@
QLabel *filterLabel = new QLabel ("Filter", this);
filterLabel->setFont(labelFont);
- filterLabel->setAlignment(QLabel::AlignLeft|QLabel::AlignVCenter);
+ filterLabel->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
row3Layout->addWidget(filterLabel);
m_Filter = new QLineEdit(this, "Filter");
@@ -125,7 +126,7 @@
QLabel *filteroutLabel = new QLabel ("FilterOut", this);
filteroutLabel->setFont(labelFont);
- filteroutLabel->setAlignment(QLabel::AlignLeft|QLabel::AlignVCenter);
+ filteroutLabel->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
row2Layout->addWidget(filteroutLabel);
m_FilterOut = new QLineEdit(this, "FilterOut");
@@ -133,10 +134,10 @@
row2Layout->addWidget(m_FilterOut);
QPushButton *ok = new QPushButton("OK", this);
- row0Layout->addWidget(ok, 0, AlignLeft);
+ row0Layout->addWidget(ok, 0, Qt::AlignLeft);
QPushButton *cancel = new QPushButton("Cancel", this);
- row0Layout->addWidget(cancel, 0, AlignRight);
+ row0Layout->addWidget(cancel, 0, Qt::AlignRight);
// Hook on pressing the buttons
connect(ok, SIGNAL(clicked()), SLOT(accept()));
Modified: showeq/branches/qt3to4_Z/src/category.h
===================================================================
--- showeq/branches/qt3to4_Z/src/category.h 2007-02-03 14:32:01 UTC (rev 666)
+++ showeq/branches/qt3to4_Z/src/category.h 2007-02-03 20:32:28 UTC (rev 667)
@@ -85,7 +85,7 @@
QLineEdit* m_Name;
QLineEdit* m_Filter;
QLineEdit* m_FilterOut;
- QButton* m_Color;
+ QPushButton* m_Color;
};
typedef QList<Category> CategoryList;
Modified: showeq/branches/qt3to4_Z/src/combatlog.h
===================================================================
--- showeq/branches/qt3to4_Z/src/combatlog.h 2007-02-03 14:32:01 UTC (rev 666)
+++ showeq/branches/qt3to4_Z/src/combatlog.h 2007-02-03 20:32:28 UTC (rev 667)
@@ -53,7 +53,7 @@
int getMaxDamage() { return m_iMaxDamage; };
int getTotalDamage() { return m_iTotalDamage; };
- void addMiss(int iMissReason) { m_iMisses++; };
+ void addMiss(int /*iMissReason*/) { m_iMisses++; };
void addHit(int iDamage);
private:
Modified: showeq/branches/qt3to4_Z/src/compass.cpp
===================================================================
--- showeq/branches/qt3to4_Z/src/compass.cpp 2007-02-03 14:32:01 UTC (rev 666)
+++ showeq/branches/qt3to4_Z/src/compass.cpp 2007-02-03 20:32:28 UTC (rev 667)
@@ -119,9 +119,9 @@
tmp.begin (&pix);
tmp.setBrush(QColor(64, 64, 64));
- tmp.setPen(darkGray);
+ tmp.setPen(Qt::darkGray);
tmp.drawEllipse(0,0,pix.width(), pix.height());
- tmp.setPen(gray);
+ tmp.setPen(Qt::gray);
tmp.drawLine(0,phd2, pix.width(), phd2);
tmp.drawLine(pwd2,0, pwd2, pix.height());
tmp.drawLine(pwd4, phd4,
@@ -131,19 +131,19 @@
tmp.translate(pwd2, phd2);
tmp.rotate (-m_ang);
- tmp.setBrush(blue);
- tmp.setPen(blue);
+ tmp.setBrush(Qt::blue);
+ tmp.setPen(Qt::blue);
tmp.drawLine(0-pwd4, 0, pwd2, 0);
tmp.drawLine(0,0-phd4, 0, phd4);
- tmp.setBrush(red);
- tmp.setPen(red);
+ tmp.setBrush(Qt::red);
+ tmp.setPen(Qt::red);
tmp.drawLine(0, 1, pwd2, 1);
tmp.drawLine(0, -1, pwd4, -1);
- tmp.setBrush(blue);
- tmp.setPen(red);
+ tmp.setBrush(Qt::blue);
+ tmp.setPen(Qt::red);
tmp.drawEllipse (0-5, 0-5, 10, 10);
- tmp.setBrush(red);
- tmp.setPen(red);
+ tmp.setBrush(Qt::red);
+ tmp.setPen(Qt::red);
tmp.drawEllipse ((pwd2) -2, -2, 4, 4);
if (m_dSpawnAngle > 0)
@@ -151,8 +151,8 @@
tmp.resetXForm();
tmp.translate(pwd2, phd2);
tmp.rotate(-m_dSpawnAngle);
- tmp.setPen(green);
- tmp.setBrush(green);
+ tmp.setPen(Qt::green);
+ tmp.setBrush(Qt::green);
tmp.drawEllipse(pwd2 -2, -2, 4, 4);
}
Modified: showeq/branches/qt3to4_Z/src/compassframe.cpp
===================================================================
--- showeq/branches/qt3to4_Z/src/compassframe.cpp 2007-02-03 14:32:01 UTC (rev 666)
+++ showeq/branches/qt3to4_Z/src/compassframe.cpp 2007-02-03 20:32:28 UTC (rev 667)
@@ -35,12 +35,12 @@
QLabel *labelx = new QLabel(showeq_params->retarded_coords?"E/W:":"X:",
coordsbox);
labelx->setFixedHeight(labelx->sizeHint().height());
- labelx->setAlignment(QLabel::AlignLeft|QLabel::AlignVCenter);
+ labelx->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
// Create the xpos label
m_x = new QLabel("----",coordsbox);
m_x->setFixedHeight(m_x->sizeHint().height());
- m_x->setAlignment(QLabel::AlignRight|QLabel::AlignVCenter);
+ m_x->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
}
else
{
@@ -48,24 +48,24 @@
QLabel *labely = new QLabel(showeq_params->retarded_coords?"N/S:":"Y:",
coordsbox);
labely->setFixedHeight(labely->sizeHint().height());
- labely->setAlignment(QLabel::AlignLeft|QLabel::AlignVCenter);
+ labely->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
// Create the ypos label
m_y = new QLabel("----",coordsbox);
m_y->setFixedHeight(m_y->sizeHint().height());
- m_y->setAlignment(QLabel::AlignRight|QLabel::AlignVCenter);
+ m_y->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
}
}
// Create the z: label
QLabel *labelz = new QLabel("Z:",coordsbox);
labelz->setFixedHeight(labelz->sizeHint().height());
- labelz->setAlignment(QLabel::AlignLeft|QLabel::AlignVCenter);
+ labelz->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
// Create the zpos label
m_z = new QLabel("----",coordsbox);
m_z->setFixedHeight(m_z->sizeHint().height());
- m_z->setAlignment(QLabel::AlignRight|QLabel::AlignVCenter);
+ m_z->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
// connect
connect(player, SIGNAL(posChanged(int16_t,int16_t,int16_t,
@@ -91,7 +91,7 @@
}
void CompassFrame::posChanged(int16_t x, int16_t y, int16_t z,
- int16_t deltaX, int16_t deltaY, int16_t deltaZ,
+ int16_t /*deltaX*/, int16_t /*deltaY*/, int16_t /*deltaZ*/,
int32_t heading)
{
// set compass info
Modified: showeq/branches/qt3to4_Z/src/datetimemgr.h
===================================================================
--- showeq/branches/qt3to4_Z/src/datetimemgr.h 2007-02-03 14:32:01 UTC (rev 666)
+++ showeq/branches/qt3to4_Z/src/datetimemgr.h 2007-02-03 20:32:28 UTC (rev 667)
@@ -18,8 +18,9 @@
#include <sys/types.h>
#include <stdint.h>
-#include <qobject.h>
-#include <qdatetime.h>
+#include <QObject>
+#include <QDateTime>
+#include <QTimer>
struct timeOfDayStruct;
Modified: showeq/branches/qt3to4_Z/src/editor.cpp
===================================================================
--- showeq/branches/qt3to4_Z/src/editor.cpp 2007-02-03 14:32:01 UTC (rev 666)
+++ showeq/branches/qt3to4_Z/src/editor.cpp 2007-02-03 20:32:28 UTC (rev 667)
@@ -1,4 +1,3 @@
-
/*
* editor.cpp
*
@@ -25,7 +24,7 @@
#include <q3mainwindow.h>
#include <q3filedialog.h>
#include <qtoolbutton.h>
-#include <q3textstream.h>
+#include <QTextStream>
#include <qpaintdevice.h>
#include <qobject.h>
#include <q3multilineedit.h>
@@ -107,13 +106,13 @@
menuBar()->insertItem( "&File", file );
id = file->insertItem( openIcon, "&Open",
- this, SLOT(load()), CTRL+Key_O );
+ this, SLOT(load()), Qt::CTRL+Qt::Key_O );
id = file->insertItem( saveIcon, "&Save",
- this, SLOT(save()), CTRL+Key_S );
+ this, SLOT(save()), Qt::CTRL+Qt::Key_S );
file->insertSeparator();
- file->insertItem( "&Close Editor", this, SLOT(close()), CTRL+Key_W );
+ file->insertItem( "&Close Editor", this, SLOT(close()), Qt::CTRL+Qt::Key_W );
e = new Q3MultiLineEdit( this, "editor" );
e->setFocus();
@@ -149,8 +148,8 @@
e->setAutoUpdate( FALSE );
e->clear();
- Q3TextStream t(&f);
- while ( !t.eof() ) {
+ QTextStream t(&f);
+ while ( !t.atEnd() ) {
QString s = t.readLine();
e->append( s );
}
@@ -180,7 +179,7 @@
return;
}
- Q3TextStream t( &f );
+ QTextStream t( &f );
t << text;
f.close();
Modified: showeq/branches/qt3to4_Z/src/experiencelog.cpp
===================================================================
--- showeq/branches/qt3to4_Z/src/experiencelog.cpp 2007-02-03 14:32:01 UTC (rev 666)
+++ showeq/branches/qt3to4_Z/src/experiencelog.cpp 2007-02-03 20:32:28 UTC (rev 667)
@@ -9,7 +9,6 @@
#include "experiencelog.h"
-#include "map.h"
#include "util.h"
#include "group.h"
#include "player.h"
@@ -533,7 +532,7 @@
}
-void ExperienceWindow::resizeEvent ( QResizeEvent *e )
+void ExperienceWindow::resizeEvent ( QResizeEvent* /*e*/ )
{
// int mh = m_menu_bar->height() + 4;
Modified: showeq/branches/qt3to4_Z/src/filter.cpp
===================================================================
--- showeq/branches/qt3to4_Z/src/filter.cpp 2007-02-03 14:32:01 UTC (rev 666)
+++ showeq/branches/qt3to4_Z/src/filter.cpp 2007-02-03 20:32:28 UTC (rev 667)
@@ -123,7 +123,7 @@
// if a hyphen was specified, but no max value after it, it means
// all values above min
if (levelString.isEmpty())
- maxLevel = INT_MAX;
+ maxLevel = 255;
else
{
// get the max level
@@ -197,7 +197,7 @@
{
}
-bool FilterItem::save(QString& indent, Q3TextStream& out)
+bool FilterItem::save(QString& indent, QTextStream& out)
{
out << indent << "<oldfilter>";
@@ -289,7 +289,7 @@
//
// parses the filter file and builds filter list
//
-bool Filter::save(QString& indent, Q3TextStream& out)
+bool Filter::save(QString& indent, QTextStream& out)
{
FilterItem *re;
@@ -516,13 +516,13 @@
return false;
// create a QTextStream object on the QFile object
- Q3TextStream out(&file);
+ QTextStream out(&file);
// set the output encoding to be UTF8
- out.setEncoding(Q3TextStream::UnicodeUTF8);
+ out.setEncoding(QTextStream::UnicodeUTF8);
// set the number output to be left justified decimal
- out.setf(Q3TextStream::dec | Q3TextStream::left);
+ out.setf(QTextStream::dec | QTextStream::left);
// print document header
out << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" << endl
Modified: showeq/branches/qt3to4_Z/src/filter.h
===================================================================
--- showeq/branches/qt3to4_Z/src/filter.h 2007-02-03 14:32:01 UTC (rev 666)
+++ showeq/branches/qt3to4_Z/src/filter.h 2007-02-03 20:32:28 UTC (rev 667)
@@ -20,7 +20,7 @@
#include <qlist.h>
#include <qregexp.h>
#include <qxml.h>
-#include <q3textstream.h>
+#include <QTextStream>
#include <map>
@@ -47,7 +47,7 @@
FilterItem(const QString& filterPattern, bool caseSensitive,
uint8_t minLevel, uint8_t maxLevel);
~FilterItem(void);
- bool save(QString& indent, Q3TextStream& out);
+ bool save(QString& indent, QTextStream& out);
bool isFiltered(const QString& filterString, uint8_t level) const;
@@ -76,7 +76,7 @@
Filter(bool caseSensitive = 0);
~Filter();
- bool save(QString& indent, Q3TextStream& out);
+ bool save(QString& indent, QTextStream& out);
bool isFiltered(const QString& filterString, uint8_t level);
bool addFilter(const QString& filterPattern);
bool addFilter(const QString& filterPattern, uint8_t minLevel, uint8_t maxLevel);
Modified: showeq/branches/qt3to4_Z/src/fixpt.h
===================================================================
--- showeq/branches/qt3to4_Z/src/fixpt.h 2007-02-03 14:32:01 UTC (rev 666)
+++ showeq/branches/qt3to4_Z/src/fixpt.h 2007-02-03 20:32:28 UTC (rev 667)
@@ -80,13 +80,13 @@
}
template <class _T, class _I> inline
-_T fixPtMulI(_T a, qType q, _I b)
+_T fixPtMulI(_T a, qType /*q*/, _I b)
{
return (a * b);
}
template <class _T, class _I> inline
-_T fixPtDivI(_T a, qType q, _I b)
+_T fixPtDivI(_T a, qType /*q*/, _I b)
{
return (a / b);
}
Modified: showeq/branches/qt3to4_Z/src/group.cpp
===================================================================
--- showeq/branches/qt3to4_Z/src/group.cpp 2007-02-03 14:32:01 UTC (rev 666)
+++ showeq/branches/qt3to4_Z/src/group.cpp 2007-02-03 20:32:28 UTC (rev 667)
@@ -14,6 +14,8 @@
#include "everquest.h"
#include "diagnosticmessages.h"
+#include <QTextStream>
+
GroupMgr::GroupMgr(SpawnShell* spawnShell,
Player* player,
QObject* parent, const char* name)
@@ -268,7 +270,7 @@
}
}
-void GroupMgr::dumpInfo(Q3TextStream& out)
+void GroupMgr::dumpInfo(QTextStream& out)
{
// dump general group manager information
out << "[GroupMgr]" << endl;
Modified: showeq/branches/qt3to4_Z/src/group.h
===================================================================
--- showeq/branches/qt3to4_Z/src/group.h 2007-02-03 14:32:01 UTC (rev 666)
+++ showeq/branches/qt3to4_Z/src/group.h 2007-02-03 20:32:28 UTC (rev 667)
@@ -10,13 +10,16 @@
#include <stdint.h>
-#include <qobject.h>
-#include <qstring.h>
+#include <QObject>
+#include <QString>
+
#include "everquest.h"
//----------------------------------------------------------------------
// forward declarations
+class QTextStream;
+
class Player;
class SpawnShell;
class Item;
@@ -50,7 +53,7 @@
void killSpawn(const Item* item);
// dump debug info
- void dumpInfo(Q3TextStream& out);
+ void dumpInfo(QTextStream& out);
signals:
void added(const QString& name, const Spawn* mem);
Modified: showeq/branches/qt3to4_Z/src/guild.cpp
===================================================================
--- showeq/branches/qt3to4_Z/src/guild.cpp 2007-02-03 14:32:01 UTC (rev 666)
+++ showeq/branches/qt3to4_Z/src/guild.cpp 2007-02-03 20:32:28 UTC (rev 667)
@@ -20,7 +20,7 @@
#include <qfile.h>
#include <qdatastream.h>
-#include <q3textstream.h>
+#include <QTextStream>
GuildMgr::GuildMgr(QString fn, QObject* parent, const char* name)
: QObject(parent, name)
@@ -49,7 +49,7 @@
readGuildList();
}
-void GuildMgr::writeGuildList(const worldGuildListStruct* gls, size_t len)
+void GuildMgr::writeGuildList(const worldGuildListStruct* gls, size_t /*len*/)
{
QFile guildsfile(guildsFileName);
@@ -110,7 +110,7 @@
void GuildMgr::guildList2text(QString fn)
{
QFile guildsfile(fn);
- Q3TextStream guildtext(&guildsfile);
+ QTextStream guildtext(&guildsfile);
if (guildsfile.exists()) {
if (!guildsfile.remove()) {
@@ -128,7 +128,7 @@
for (unsigned int i =0 ; i < m_guildMap.size(); i++)
{
- if (m_guildMap[i])
+ if (!m_guildMap[i].isEmpty())
guildtext << i << "\t" << m_guildMap[i] << endl;
}
@@ -142,7 +142,7 @@
{
for (unsigned int i = 0; i < m_guildMap.size(); i++)
{
- if (m_guildMap[i])
+ if (!m_guildMap[i].isEmpty())
seqInfo("%d\t%s", i, (const char*)m_guildMap[i]);
}
}
Modified: showeq/branches/qt3to4_Z/src/guildlist.cpp
===================================================================
--- showeq/branches/qt3to4_Z/src/guildlist.cpp 2007-02-03 14:32:01 UTC (rev 666)
+++ showeq/branches/qt3to4_Z/src/guildlist.cpp 2007-02-03 20:32:28 UTC (rev 667)
@@ -159,22 +159,22 @@
// Guild Name
m_guildName = new QLabel("Guild", this);
- m_guildName->setAlignment(AlignLeft|AlignVCenter|SingleLine);
+ m_guildName->setAlignment(Qt::AlignLeft|Qt::AlignVCenter|SingleLine);
m_guildName->setFrameShape(LineEditPanel);
m_guildName->setFrameShadow(Sunken);
m_guildName->setMinimumWidth(50);
m_guildName->setMaximumWidth(300);
- hLayout->addWidget(m_guildName, 1, AlignLeft);
+ hLayout->addWidget(m_guildName, 1, Qt::AlignLeft);
guildChanged();
// Guild Totals
m_guildTotals = new QLabel("", this);
- m_guildTotals->setAlignment(AlignRight|AlignVCenter|SingleLine);
+ m_guildTotals->setAlignment(Qt::AlignRight|Qt::AlignVCenter|SingleLine);
m_guildTotals->setFrameShape(LineEditPanel);
m_guildTotals->setFrameShadow(Sunken);
m_guildTotals->setMinimumWidth(30);
m_guildTotals->setMaximumWidth(120);
- hLayout->addWidget(m_guildTotals, 0, AlignRight);
+ hLayout->addWidget(m_guildTotals, 0, Qt::AlignRight);
// create the spawn listview
m_guildList = new SEQListView(preferenceName(),
@@ -441,7 +441,7 @@
m_guildList->setColumnVisible(colnum, true);
}
-void GuildListWindow::set_font(int id)
+void GuildListWindow::set_font(int /*id*/)
{
QFont newFont;
bool ok = false;
@@ -455,7 +455,7 @@
setWindowFont(newFont);
}
-void GuildListWindow::set_caption(int id)
+void GuildListWindow::set_caption(int /*id*/)
{
bool ok = false;
Modified: showeq/branches/qt3to4_Z/src/guildshell.cpp
===================================================================
--- showeq/branches/qt3to4_Z/src/guildshell.cpp 2007-02-03 14:32:01 UTC (rev 666)
+++ showeq/branches/qt3to4_Z/src/guildshell.cpp 2007-02-03 20:32:28 UTC (rev 667)
@@ -15,7 +15,8 @@
#include "everquest.h"
#include "diagnosticmessages.h"
-#include <qdatetime.h>
+#include <QDateTime>
+#include <QTextStream>
//----------------------------------------------------------------------
// diagnostic defines
@@ -174,7 +175,7 @@
return m_zoneMgr->zoneNameFromID(zoneid);
}
-void GuildShell::dumpMembers(Q3TextStream& out)
+void GuildShell::dumpMembers(QTextStream& out)
{
QDateTime dt;
GuildMemberDictIterator it(m_members);
@@ -184,8 +185,8 @@
QString dateFormat("ddd MMM dd hh:mm:ss yyyy");
// calculate the maximum class name width
- size_t maxClassNameLength = 0;
- for (uint8_t i = 1; i <= PLAYER_CLASSES; i++)
+ int maxClassNameLength = 0;
+ for (int i = 1; i <= PLAYER_CLASSES; i++)
if (classString(i).length() > maxClassNameLength)
maxClassNameLength = classString(i).length();
@@ -291,7 +292,7 @@
#endif //
}
-void GuildShell::guildMemberUpdate(const uint8_t* data, size_t len)
+void GuildShell::guildMemberUpdate(const uint8_t* data, size_t /*len*/)
{
const GuildMemberUpdate* gmu = (const GuildMemberUpdate*)data;
Modified: showeq/branches/qt3to4_Z/src/guildshell.h
===================================================================
--- showeq/branches/qt3to4_Z/src/guildshell.h 2007-02-03 14:32:01 UTC (rev 666)
+++ showeq/branches/qt3to4_Z/src/guildshell.h 2007-02-03 20:32:28 UTC (rev 667)
@@ -20,7 +20,7 @@
//----------------------------------------------------------------------
// forward declarations
-class Q3TextStream;
+class QTextStream;
class NetStream;
class ZoneMgr;
@@ -85,9 +85,9 @@
GuildShell(ZoneMgr* zoneMgr, QObject* parent = 0, const char* name = 0);
~GuildShell();
const GuildMemberDict& members() { return m_members; }
- size_t maxNameLength() { return m_maxNameLength; }
+ int maxNameLength() { return m_maxNameLength; }
- void dumpMembers(Q3TextStream& out);
+ void dumpMembers(QTextStream& out);
QString zoneString(uint16_t zoneid) const;
@@ -105,7 +105,7 @@
protected:
GuildMemberDict m_members;
- size_t m_maxNameLength;
+ int m_maxNameLength;
ZoneMgr* m_zoneMgr;
};
Modified: showeq/branches/qt3to4_Z/src/interface.cpp
===================================================================
--- showeq/branches/qt3to4_Z/src/interface.cpp 2007-02-03 14:32:01 UTC (rev 666)
+++ showeq/branches/qt3to4_Z/src/interface.cpp 2007-02-03 20:32:28 UTC (rev 667)
@@ -73,16 +73,14 @@
#include <q3accel.h>
#include <qfileinfo.h>
#include <qfile.h>
-#include <q3textstream.h>
+#include <QTextStream>
#include <qinputdialog.h>
#include <qfontdialog.h>
#include <qcolordialog.h>
#include <q3dockarea.h>
#include <qwindowsstyle.h>
-#include <qplatinumstyle.h>
#include <qmotifstyle.h>
#include <qcdestyle.h>
-#include <qsgistyle.h>
//Added by qt3to4:
#include <Q3PtrList>
#include <Q3PopupMenu>
@@ -359,9 +357,9 @@
setDockEnabled(m_expWindow,
pSEQPrefs->getPrefBool("DockableExperienceWindow",
section, false));
- Dock edge = (Qt::ToolBarDock)pSEQPrefs->getPrefInt("Dock",
+ Qt::Dock edge = (Qt::ToolBarDock)pSEQPrefs->getPrefInt("Dock",
m_expWindow->preferenceName(),
- DockUnmanaged);
+ Qt::DockUnmanaged);
addDockWindow(m_expWindow, edge, false);
m_expWindow->undock();
@@ -519,25 +517,25 @@
//pFileMenu = new QPopupMenu;
Q3PopupMenu* pFileMenu = new Q3PopupMenu;
menuBar()->insertItem("&File", pFileMenu);
- pFileMenu->insertItem("&Save Preferences", this, SLOT(savePrefs()), CTRL+Key_S);
- pFileMenu->insertItem("Open &Map", m_mapMgr, SLOT(loadMap()), Key_F1);
+ pFileMenu->insertItem("&Save Preferences", this, SLOT(savePrefs()), Qt::CTRL+Qt::Key_S);
+ pFileMenu->insertItem("Open &Map", m_mapMgr, SLOT(loadMap()), Qt::Key_F1);
pFileMenu->insertItem("&Import &Map", m_mapMgr, SLOT(importMap()));
- pFileMenu->insertItem("Sa&ve Map", m_mapMgr, SLOT(saveMap()), Key_F2);
+ pFileMenu->insertItem("Sa&ve Map", m_mapMgr, SLOT(saveMap()), Qt::Key_F2);
pFileMenu->insertItem("Save SOE Map", m_mapMgr, SLOT(saveSOEMap()));
pFileMenu->insertItem("Reload Guilds File", m_guildmgr, SLOT(readGuildList()));
- pFileMenu->insertItem("Add Spawn Category", this, SLOT(addCategory()) , ALT+Key_C);
- pFileMenu->insertItem("Rebuild SpawnList", this, SLOT(rebuildSpawnList()) , ALT+Key_R);
- pFileMenu->insertItem("Reload Categories", this, SLOT(reloadCategories()) , CTRL+Key_R);
- pFileMenu->insertItem("Select Next", this, SLOT(selectNext()), CTRL+Key_Right);
- pFileMenu->insertItem("Select Prev", this, SLOT(selectPrev()), CTRL+Key_Left);
+ pFileMenu->insertItem("Add Spawn Category", this, SLOT(addCategory()) , Qt::ALT+Qt::Key_C);
+ pFileMenu->insertItem("Rebuild SpawnList", this, SLOT(rebuildSpawnList()) , Qt::ALT+Qt::Key_R);
+ pFileMenu->insertItem("Reload Categories", this, SLOT(reloadCategories()) , Qt::CTRL+Qt::Key_R);
+ pFileMenu->insertItem("Select Next", this, SLOT(selectNext()), Qt::CTRL+Qt::Key_Right);
+ pFileMenu->insertItem("Select Prev", this, SLOT(selectPrev()), Qt::CTRL+Qt::Key_Left);
pFileMenu->insertItem("Save Selected Spawns Path",
this, SLOT(saveSelectedSpawnPath(void)));
pFileMenu->insertItem("Save NPC Spawn Paths",
this, SLOT(saveSpawnPaths(void)));
if (m_packet->playbackPackets() != PLAYBACK_OFF)
{
- pFileMenu->insertItem("Inc Playback Speed", m_packet, SLOT(incPlayback()), CTRL+Key_X);
- pFileMenu->insertItem("Dec Playback Speed", m_packet, SLOT(decPlayback()), CTRL+Key_Z);
+ pFileMenu->insertItem("Inc Playback Speed", m_packet, SLOT(incPlayback()), Qt::CTRL+Qt::Key_X);
+ pFileMenu->insertItem("Dec Playback Speed", m_packet, SLOT(decPlayback()), Qt::CTRL+Qt::Key_Z);
}
pFileMenu->insertItem("&Quit", qApp, SLOT(quit()));
@@ -909,7 +907,7 @@
m_id_opt_KeepSelectedVisible =
pOptMenu->insertItem("Keep Selected Visible?" , this, SLOT(toggle_opt_KeepSelectedVisible()));
m_id_opt_LogSpawns = pOptMenu->insertItem("Log Spawns", this, SLOT(toggle_opt_LogSpawns()));
- m_id_opt_BazaarData = pOptMenu->insertItem("Bazaar Searches", this, SLOT(toggle_opt_BazaarData()), Key_F11);
+ m_id_opt_BazaarData = pOptMenu->insertItem("Bazaar Searches", this, SLOT(toggle_opt_BazaarData()), Qt::Key_F11);
menuBar()->setItemChecked (m_id_opt_BazaarData, (m_bazaarLog != 0));
m_id_opt_ResetMana = pOptMenu->insertItem("Reset Max Mana", this, SLOT(resetMaxMana()));
m_id_opt_PvPTeams = pOptMenu->insertItem("PvP Teams", this, SLOT(toggle_opt_PvPTeams()));
@@ -1013,14 +1011,14 @@
Q3PopupMenu* pLogMenu = new Q3PopupMenu;
m_netMenu->insertItem("Lo&g", pLogMenu);
pLogMenu->setCheckable(true);
- m_id_log_AllPackets = pLogMenu->insertItem("All Packets", this, SLOT(toggle_log_AllPackets()), Key_F5);
- m_id_log_WorldData = pLogMenu->insertItem("World Data", this, SLOT(toggle_log_WorldData()), Key_F6);
- m_id_log_ZoneData = pLogMenu->insertItem("Zone Data", this, SLOT(toggle_log_ZoneData()), Key_F7);
- m_id_log_UnknownData = pLogMenu->insertItem("Unknown Data", this, SLOT(toggle_log_UnknownData()), Key_F8);
+ m_id_log_AllPackets = pLogMenu->insertItem("All Packets", this, SLOT(toggle_log_AllPackets()), Qt::Key_F5);
+ m_id_log_WorldData = pLogMenu->insertItem("World Data", this, SLOT(toggle_log_WorldData()), Qt::Key_F6);
+ m_id_log_ZoneData = pLogMenu->insertItem("Zone Data", this, SLOT(toggle_log_ZoneData()), Qt::Key_F7);
+ m_id_log_UnknownData = pLogMenu->insertItem("Unknown Data", this, SLOT(toggle_log_UnknownData()), Qt::Key_F8);
m_id_view_UnknownData = pLogMenu->insertItem("View Unknown Data", this,
SLOT(toggle_view_UnknownData()) ,
- Key_F9);
- m_id_log_RawData = pLogMenu->insertItem("Raw Data", this, SLOT(toggle_log_RawData()), Key_F10);
+ Qt::Key_F9);
+ m_id_log_RawData = pLogMenu->insertItem("Raw Data", this, SLOT(toggle_log_RawData()), Qt::Key_F10);
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));
@@ -1042,7 +1040,7 @@
pOpCodeMenu->setItemChecked(x, (m_opcodeMonitorLog != 0));
pOpCodeMenu->insertItem("&Reload Monitored OpCode List..", this,
- SLOT(set_opcode_monitored_list()), CTRL+ALT+Key_R);
+ SLOT(set_opcode_monitored_list()), Qt::CTRL+ALT+Qt::Key_R);
section = "OpCodeMonitoring";
x =pOpCodeMenu->insertItem("&View Monitored OpCode Matches", this,
SLOT(toggle_opcode_view(int)));
@@ -1127,13 +1125,13 @@
menuBar()->insertItem( "Fi<ers" , filterMenu);
filterMenu->setCheckable(true);
- filterMenu->insertItem("&Reload Filters", m_filterMgr, SLOT(loadFilters()), Key_F3);
- filterMenu->insertItem("&Save Filters", m_filterMgr, SLOT(saveFilters()), Key_F4);
+ filterMenu->insertItem("&Reload Filters", m_filterMgr, SLOT(loadFilters()), Qt::Key_F3);
+ filterMenu->insertItem("&Save Filters", m_filterMgr, SLOT(saveFilters()), Qt::Key_F4);
filterMenu->insertItem("&Edit Filters", this, SLOT(launch_editor_filters()));
filterMenu->insertItem("Select Fil&ter File", this, SLOT(select_filter_file()));
- filterMenu->insertItem("Reload &Zone Filters", m_filterMgr, SLOT(loadZoneFilters()), SHIFT+Key_F3);
- filterMenu->insertItem("S&ave Zone Filters", m_filterMgr, SLOT(saveZoneFilters()), SHIFT+Key_F4);
+ filterMenu->insertItem("Reload &Zone Filters", m_filterMgr, SLOT(loadZoneFilters()), SHIFT+Qt::Key_F3);
+ filterMenu->insertItem("S&ave Zone Filters", m_filterMgr, SLOT(saveZoneFilters()), SHIFT+Qt::Key_F4);
filterMenu->insertItem("Edit Zone Fi<ers", this, SLOT(launch_editor_zoneFilters()));
filterMenu->insertItem("Re&filter Spawns", m_spawnShell, SLOT(refilterSpawns()));
@@ -1493,20 +1491,20 @@
Q3PopupMenu* pDebugMenu = new Q3PopupMenu;
menuBar()->insertItem("&Debug", pDebugMenu);
pDebugMenu->insertItem("List I&nterface", this, SLOT(listInterfaceInfo()));
- pDebugMenu->insertItem("List S&pawns", this, SLOT(listSpawns()), ALT+CTRL+Key_P);
- pDebugMenu->insertItem("List &Drops", this, SLOT(listDrops()), ALT+CTRL+Key_D);
- pDebugMenu->insertItem("List &Map Info", this, SLOT(listMapInfo()), ALT+CTRL+Key_M);
+ pDebugMenu->insertItem("List S&pawns", this, SLOT(listSpawns()), Qt::ALT+Qt::CTRL+Qt::Key_P);
+ pDebugMenu->insertItem("List &Drops", this, SLOT(listDrops()), Qt::ALT+Qt::CTRL+Qt::Key_D);
+ pDebugMenu->insertItem("List &Map Info", this, SLOT(listMapInfo()), Qt::ALT+Qt::CTRL+Qt::Key_M);
pDebugMenu->insertItem("List G&uild Info", m_guildmgr, SLOT(listGuildInfo()));
- pDebugMenu->insertItem("List &Group", this, SLOT(listGroup()), ALT+CTRL+Key_G);
- pDebugMenu->insertItem("List Guild M&embers", this, SLOT(listGuild()), ALT+CTRL+Key_E);
- pDebugMenu->insertItem("Dump Spawns", this, SLOT(dumpSpawns()), ALT+SHIFT+CTRL+Key_P);
- pDebugMenu->insertItem("Dump Drops", this, SLOT(dumpDrops()), ALT+SHIFT+CTRL+Key_D);
- pDebugMenu->insertItem("Dump Map Info", this, SLOT(dumpMapInfo()), ALT+SHIFT+CTRL+Key_M);
+ pDebugMenu->insertItem("List &Group", this, SLOT(listGroup()), Qt::ALT+Qt::CTRL+Qt::Key_G);
+ pDebugMenu->insertItem("List Guild M&embers", this, SLOT(listGuild()), Qt::ALT+Qt::CTRL+Qt::Key_E);
+ pDebugMenu->insertItem("Dump Spawns", this, SLOT(dumpSpawns()), Qt::ALT+SHIFT+Qt::CTRL+Qt::Key_P);
+ pDebugMenu->insertItem("Dump Drops", this, SLOT(dumpDrops()), Qt::ALT+SHIFT+Qt::CTRL+Qt::Key_D);
+ pDebugMenu->insertItem("Dump Map Info", this, SLOT(dumpMapInfo()), Qt::ALT+SHIFT+Qt::CTRL+Qt::Key_M);
pDebugMenu->insertItem("Dump Guild Info", this , SLOT(dumpGuildInfo()));
pDebugMenu->insertItem("Dump SpellBook Info", this , SLOT(dumpSpellBook()));
- pDebugMenu->insertItem("Dump Group", this, SLOT(dumpGroup()), ALT+CTRL+SHIFT+Key_G);
- pDebugMenu->insertItem("Dump Guild Members", this, SLOT(dumpGuild()), ALT+CTRL+SHIFT+Key_E);
- pDebugMenu->insertItem("List &Filters", m_filterMgr, SLOT(listFilters()), ALT+CTRL+Key_F);
+ pDebugMenu->insertItem("Dump Group", this, SLOT(dumpGroup()), Qt::ALT+Qt::CTRL+SHIFT+Qt::Key_G);
+ pDebugMenu->insertItem("Dump Guild Members", this, SLOT(dumpGuild()), Qt::ALT+Qt::CTRL+SHIFT+Qt::Key_E);
+ pDebugMenu->insertItem("List &Filters", m_filterMgr, SLOT(listFilters()), Qt::ALT+Qt::CTRL+Qt::Key_F);
pDebugMenu->insertItem("List &Zone Filters", m_filterMgr, SLOT(listZoneFilters()));
////////////////////
@@ -2134,15 +2132,15 @@
show();
Q3Accel *accel = new Q3Accel(this);
- accel->connectItem( accel->insertItem(CTRL+ALT+Key_S), this, SLOT(toggle_view_statusbar()));
- accel->connectItem( accel->insertItem(CTRL+ALT+Key_T), this, SLOT(toggle_view_menubar()));
+ accel->connectItem( accel->insertItem(Qt::CTRL+Qt::ALT+Qt::Key_S), this, SLOT(toggle_view_statusbar()));
+ accel->connectItem( accel->insertItem(Qt::CTRL+Qt::ALT+Qt::Key_T), this, SLOT(toggle_view_menubar()));
// load in the docking preferences if any have been saved
QString dockPrefs = pSEQPrefs->getPrefString("DockingInfo", section,
QString());
if (!dockPrefs.isEmpty())
{
- Q3TextStream ts(&dockPrefs, QIODevice::ReadOnly);
+ QTextStream ts(&dockPrefs, QIODevice::ReadOnly);
ts >> *this;
}
@@ -2787,7 +2785,7 @@
}
}
-void EQInterface::set_main_Font(int id)
+void EQInterface::set_main_Font(int /*id*/)
{
QString name = "ShowEQ - Application Font";
bool ok = false;
@@ -2813,7 +2811,7 @@
}
-void EQInterface::select_main_FormatFile(int id)
+void EQInterface::select_main_FormatFile(int /*id*/)
{
QString formatFile = pSEQPrefs->getPrefString("FormatFile", "Interface",
"eqstr_us.txt");
@@ -2835,7 +2833,7 @@
}
}
-void EQInterface::select_main_SpellsFile(int id)
+void EQInterface::select_main_SpellsFile(int /*id*/)
{
QString spellsFile = pSEQPrefs->getPrefString("SpellsFile", "Interface",
"spells_us.txt");
@@ -2934,7 +2932,7 @@
pSEQPrefs->setPrefBool(preference, "Interface_StatusBar", show);
}
-void EQInterface::set_main_statusbar_Font(int id)
+void EQInterface::set_main_statusbar_Font(int /*id*/)
{
QString name = "ShowEQ - Status Font";
bool ok = false;
@@ -3000,7 +2998,7 @@
QString tempStr;
QString dockPrefs;
- Q3TextStream ts(&dockPrefs, QIODevice::WriteOnly);
+ QTextStream ts(&dockPrefs, QIODevice::WriteOnly);
ts << *this;
@@ -3175,7 +3173,7 @@
QString outText;
// open the output data stream
- Q3TextStream out(&outText, QIODevice::WriteOnly);
+ QTextStream out(&outText, QIODevice::WriteOnly);
// dump the spawns
m_spawnShell->dumpSpawns(tSpawn, out);
@@ -3191,7 +3189,7 @@
QString outText;
// open the output data stream
- Q3TextStream out(&outText, QIODevice::WriteOnly);
+ QTextStream out(&outText, QIODevice::WriteOnly);
// dump the drops
m_spawnShell->dumpSpawns(tDrop, out);
@@ -3207,7 +3205,7 @@
QString outText;
// open the output data stream
- Q3TextStream out(&outText, QIODevice::WriteOnly);
+ QTextStream out(&outText, QIODevice::WriteOnly);
// dump map managers info
m_mapMgr->dumpInfo(out);
@@ -3232,7 +3230,7 @@
QString outText;
// open the output data stream
- Q3TextStream out(&outText, QIODevice::WriteOnly);
+ QTextStream out(&outText, QIODevice::WriteOnly);
out << "Map window layout info:" << endl;
out << "-----------------------" << endl;
@@ -3251,7 +3249,7 @@
QString outText;
// open the output data stream
- Q3TextStream out(&outText, QIODevice::WriteOnly);
+ QTextStream out(&outText, QIODevice::WriteOnly);
// dump the drops
m_groupMgr->dumpInfo(out);
@@ -3268,7 +3266,7 @@
QString outText;
// open the output data stream
- Q3TextStream out(&outText, QIODevice::WriteOnly);
+ QTextStream out(&outText, QIODevice::WriteOnly);
// dump the drops
m_guildShell->dumpMembers(out);
@@ -3290,7 +3288,7 @@
// open the output data stream
QFile file(logFileInfo.absFilePath());
file.open(QIODevice::WriteOnly);
- Q3TextStream out(&file);
+ QTextStream out(&file);
// dump the spawns
m_spawnShell->dumpSpawns(tSpawn, out);
@@ -3310,7 +3308,7 @@
// open the output data stream
QFile file(logFileInfo.absFilePath());
file.open(QIODevice::WriteOnly);
- Q3TextStream out(&file);
+ QTextStream out(&file);
// dump the drops
m_spawnShell->dumpSpawns(tDrop, out);
@@ -3331,7 +3329,7 @@
// open the output data stream
QFile file(logFileInfo.absFilePath());
file.open(QIODevice::WriteOnly);
- Q3TextStream out(&file);
+ QTextStream out(&file);
// dump map managers info
m_mapMgr->dumpInfo(out);
@@ -3371,7 +3369,7 @@
// open the output data stream
QFile file(logFileInfo.absFilePath());
file.open(QIODevice::WriteOnly);
- Q3TextStream out(&file);
+ QTextStream out(&file);
QString txt;
seqInfo("Dumping Spell Book to '%s'\n",
@@ -3427,7 +3425,7 @@
// open the output data stream
QFile file(logFileInfo.absFilePath());
file.open(QIODevice::WriteOnly);
- Q3TextStream out(&file);
+ QTextStream out(&file);
// dump the drops
m_groupMgr->dumpInfo(out);
@@ -3447,7 +3445,7 @@
// open the output data stream
QFile file(logFileInfo.absFilePath());
file.open(QIODevice::WriteOnly);
- Q3TextStream out(&file);
+ QTextStream out(&file);
// dump the drops
m_guildShell->dumpMembers(out);
@@ -4222,8 +4220,8 @@
}
void EQInterface::setExp(uint32_t totalExp, uint32_t totalTick,
- uint32_t minExpLevel, uint32_t maxExpLevel,
- uint32_t tickExpLevel)
+ uint32_t /*minExpLevel*/, uint32_t /*maxExpLevel*/,
+ uint32_t /*tickExpLevel*/)
{
if (m_stsbarExp)
{
@@ -4283,17 +4281,17 @@
}
void EQInterface::setAltExp(uint32_t totalExp,
- uint32_t maxExp, uint32_t tickExp,
- uint32_t aapoints)
+ uint32_t /*maxExp*/, uint32_t /*tickExp*/,
+ uint32_t /*aapoints*/)
{
if (m_stsbarExpAA)
m_stsbarExpAA->setText(QString("ExpAA: %1").arg(totalExp));
}
-void EQInterface::newAltExp(uint32_t newExp, uint32_t totalExp,
+void EQInterface::newAltExp(uint32_t /*newExp*/, uint32_t totalExp,
uint32_t totalTick,
- uint32_t maxExp, uint32_t tickExp,
- uint32_t aapoints)
+ uint32_t /*maxExp*/, uint32_t /*tickExp*/,
+ uint32_t /*aapoints*/)
{
if (m_stsbarExpAA)
{
@@ -4317,7 +4315,7 @@
// TODO: clear after timeout miliseconds
//
void
-EQInterface::stsMessage(const QString &string, int timeout)
+EQInterface::stsMessage(const QString &string, int /*timeout*/)
{
if (m_stsbarStatus)
m_stsbarStatus->setText(string);
@@ -4388,7 +4386,7 @@
m_stsbarPkt->setText(tempStr);
}
-void EQInterface::attack2Hand1(const uint8_t* data)
+void EQInterface::attack2Hand1(const uint8_t* /*data*/)
{
// const attack2Struct * atk2 = (const attack2Struct*)data;
}
@@ -4443,7 +4441,7 @@
m_stsbarZEM->setText(tempStr);
}
-void EQInterface::zoneEnd(const QString& shortZoneName,
+void EQInterface::zoneEnd(const QString& /*shortZoneName*/,
const QString& longZoneName)
{
emit newZoneName(longZoneName);
@@ -4660,7 +4658,7 @@
QFile mobPathFile(fileInfo.absFilePath());
if (mobPathFile.open(QIODevice::Append | QIODevice::WriteOnly))
{
- Q3TextStream out(&mobPathFile);
+ QTextStream out(&mobPathFile);
// append the selected spawns path to the end
saveSpawnPath(out, m_selectedSpawn);
@@ -4680,7 +4678,7 @@
QFile mobPathFile(fileInfo.absFilePath());
if (mobPathFile.open(QIODevice::Truncate | QIODevice::WriteOnly))
{
- Q3TextStream out(&mobPathFile);
+ QTextStream out(&mobPathFile);
// map header line
out << m_zoneMgr->longZoneName() << ","
<< m_zoneMgr->shortZoneName() << ",0,0" << endl;
@@ -4700,7 +4698,7 @@
}
}
-void EQInterface::saveSpawnPath(Q3TextStream& out, const Item* item)
+void EQInterface::saveSpawnPath(QTextStream& out, const Item* item)
{
if (item == 0)
return;
@@ -5018,7 +5016,7 @@
}
}
-void EQInterface::opt_clearChannelMsgs(int id)
+void EQInterface::opt_clearChannelMsgs(int /*id*/)
{
// clear the messages
m_messages->clear();
@@ -5345,8 +5343,8 @@
pSEQPrefs->getPrefBool(QString("Dockable") + mapPrefName,
"Interface", true));
- Dock edge = (Qt::ToolBarDock)pSEQPrefs->getPrefInt("Dock", m_map[i]->preferenceName(),
- Left);
+ Qt::Dock edge = (Qt::ToolBarDock)pSEQPrefs->getPrefInt("Dock", m_map[i]->preferenceName(),
+ Qt::Left);
addDockWindow(m_map[i], mapName, edge, true);
if (!m_isMapDocked[i])
m_map[i]->undock();
@@ -5404,9 +5402,9 @@
setDockEnabled(m_messageWindow[i],
pSEQPrefs->getPrefBool(QString("Dockable") + prefName,
"Interface", false));
- Dock edge = (Qt::ToolBarDock)pSEQPrefs->getPrefInt("Dock",
+ Qt::Dock edge = (Qt::ToolBarDock)pSEQPrefs->getPrefInt("Dock",
m_messageWindow[i]->preferenceName(),
- Left);
+ Qt::Left);
addDockWindow(m_messageWindow[i], edge, false);
if (!m_isMessageWindowDocked[i])
m_messageWindow[i]->undock();
@@ -5441,9 +5439,9 @@
pSEQPrefs->getPrefBool("DockableSpawnList",
"Interface", true));
- Dock edge = (Qt::ToolBarDock)pSEQPrefs->getPrefInt("Dock",
+ Qt::Dock edge = (Qt::ToolBarDock)pSEQPrefs->getPrefInt("Dock",
m_spawnList->preferenceName(),
- Left);
+ Qt::Left);
addDockWindow(m_spawnList, edge, false);
if (m_isSpawnListDocked)
m_spawnList->undock();
@@ -5488,9 +5486,9 @@
setDockEnabled(m_spawnList2,
pSEQPrefs->getPrefBool("DockableSpawnList2",
"Interface", true));
- Dock edge = (Qt::ToolBarDock)pSEQPrefs->getPrefInt("Dock",
+ Qt::Dock edge = (Qt::ToolBarDock)pSEQPrefs->getPrefInt("Dock",
m_spawnList2->preferenceName(),
- Left);
+ Qt::Left);
addDockWindow(m_spawnList2, edge, false);
if (!m_isSpawnList2Docked)
m_spawnList2->undock();
@@ -5534,10 +5532,10 @@
setDockEnabled(m_spawnPointList,
pSEQPrefs->getPrefBool("DockableSpawnPointList",
"Interface", true));
- Dock edge =
+ Qt::Dock edge =
(Qt::ToolBarDock)pSEQPrefs->getPrefInt("Dock",
m_spawnPointList->preferenceName(),
- Left);
+ Qt::Left);
addDockWindow(m_spawnPointList, edge, false);
if (!m_isSpawnPointListDocked)
m_spawnPointList->undock();
@@ -5574,9 +5572,9 @@
setDockEnabled(m_statList,
pSEQPrefs->getPrefBool("DockablePlayerStats",
"Interface", true));
- Dock edge = (Qt::ToolBarDock)pSEQPrefs->getPrefInt("Dock",
+ Qt::Dock edge = (Qt::ToolBarDock)pSEQPrefs->getPrefInt("Dock",
m_statList->preferenceName(),
- Left);
+ Qt::Left);
addDockWindow(m_statList, edge, false);
if (!m_isStatListDocked)
m_statList->undock();
@@ -5613,9 +5611,9 @@
setDockEnabled(m_skillList,
pSEQPrefs->getPrefBool("DockablePlayerSkills",
"Interface", true));
- Dock edge = (Qt::ToolBarDock)pSEQPrefs->getPrefInt("Dock",
+ Qt::Dock edge = (Qt::ToolBarDock)pSEQPrefs->getPrefInt("Dock",
m_skillList->preferenceName(),
- Left);
+ Qt::Left);
addDockWindow(m_skillList, edge, false);
if (!m_isSkillListDocked)
m_skillList->undock();
@@ -5652,9 +5650,9 @@
setDockEnabled(m_spellList,
pSEQPrefs->getPrefBool("DockableSpellList",
"Interface", true));
- Dock edge = (Qt::ToolBarDock)pSEQPrefs->getPrefInt("Dock",
+ Qt::Dock edge = (Qt::ToolBarDock)pSEQPrefs->getPrefInt("Dock",
m_spellList->preferenceName(),
- Left);
+ Qt::Left);
addDockWindow(m_spellList, edge, false);
if (!m_isSpellListDocked)
m_spellList->undock();
@@ -5701,9 +5699,9 @@
setDockEnabled(m_compass,
pSEQPrefs->getPrefBool("DockableCompass",
"Interface", true));
- Dock edge = (Qt::ToolBarDock)pSEQPrefs->getPrefInt("Dock",
+ Qt::Dock edge = (Qt::ToolBarDock)pSEQPrefs->getPrefInt("Dock",
m_compass->preferenceName(),
- Left);
+ Qt::Left);
addDockWindow(m_compass, edge, false);
if (!m_isCompassDocked)
m_compass->undock();
@@ -5738,9 +5736,9 @@
setDockEnabled(m_netDiag,
pSEQPrefs->getPrefBool("DockableNetDiag",
"Interface", true));
- Dock edge = (Qt::ToolBarDock)pSEQPrefs->getPrefInt("Dock",
+ Qt::Dock edge = (Qt::ToolBarDock)pSEQPrefs->getPrefInt("Dock",
m_netDiag->preferenceName(),
- Bottom);
+ Qt::Bottom);
addDockWindow(m_netDiag, edge, true);
m_netDiag->undock();
@@ -5772,9 +5770,9 @@
setDockEnabled(m_guildListWindow,
pSEQPrefs->getPrefBool("DockableGuildListWindow",
"Interface", true));
- Dock edge = (Qt::ToolBarDock)pSEQPrefs->getPrefInt("Dock",
+ Qt::Dock edge = (Qt::ToolBarDock)pSEQPrefs->getPrefInt("Dock",
m_guildListWindow->preferenceName(),
- Bottom);
+ Qt::Bottom);
addDockWindow(m_guildListWindow, edge, true);
m_guildListWindow->undock();
@@ -6031,10 +6029,10 @@
void EQInterface::setDockEnabled(Q3DockWindow* dw, bool enable)
{
- Q3MainWindow::setDockEnabled(dw, DockTop, enable);
- Q3MainWindow::setDockEnabled(dw, DockBottom, enable);
- Q3MainWindow::setDockEnabled(dw, DockLeft, enable);
- Q3MainWindow::setDockEnabled(dw, DockRight, enable);
+ Q3MainWindow::setDockEnabled(dw, Qt::DockTop, enable);
+ Q3MainWindow::setDockEnabled(dw, Qt::DockBottom, enable);
+ Q3MainWindow::setDockEnabled(dw, Qt::DockLeft, enable);
+ Q3MainWindow::setDockEnabled(dw, Qt::DockRight, enable);
}
#ifndef QMAKEBUILD
Modified: showeq/branches/qt3to4_Z/src/interface.h
===================================================================
--- showeq/branches/qt3to4_Z/src/interface.h 2007-02-03 14:32:01 UTC (rev 666)
+++ showeq/branches/qt3to4_Z/src/interface.h 2007-02-03 20:32:28 UTC (rev 667)
@@ -168,7 +168,7 @@
void selectPrev(void);
void saveSelectedSpawnPath(void);
void saveSpawnPaths(void);
- void saveSpawnPath(Q3TextStream& out, const Item* item);
+ void saveSpawnPath(QTextStream& out, const Item* item);
void toggle_log_AllPackets();
void toggle_log_WorldData();
void toggle_log_ZoneData();
Modified: showeq/branches/qt3to4_Z/src/logger.h
===================================================================
--- showeq/branches/qt3to4_Z/src/logger.h 2007-02-03 14:32:01 UTC (rev 666)
+++ showeq/branches/qt3to4_Z/src/logger.h 2007-02-03 20:32:28 UTC (rev 667)
@@ -10,7 +10,7 @@
#include <qobject.h>
#include <qfile.h>
-#include <q3textstream.h>
+#include <QTextStream>
#ifdef __FreeBSD__
// since they are incapable of following standards
@@ -37,7 +37,7 @@
protected:
FILE* m_fp;
QFile m_file;
- Q3TextStream m_out;
+ QTextStream m_out;
QString m_filename;
bool m_errOpen;
};
Modified: showeq/branches/qt3to4_Z/src/map.cpp
===================================================================
--- showeq/branches/qt3to4_Z/src/map.cpp 2007-02-03 14:32:01 UTC (rev 666)
+++ showeq/branches/qt3to4_Z/src/map.cpp 2007-02-03 20:32:28 UTC (rev 667)
@@ -51,9 +51,11 @@
#include <qtimer.h>
#include <q3strlist.h>
#include <qimage.h>
+#include <QTextStream>
#if 1 // ZBTEMP: Until we setup a better way to enter location name/color
#include <qinputdialog.h>
+#endif
//Added by qt3to4:
#include <QPaintEvent>
#include <Q3VBoxLayout>
@@ -64,7 +66,7 @@
#include <Q3PopupMenu>
#include <Q3HBoxLayout>
#include <QMouseEvent>
-#endif
+#include <QDesktopWidget>
//----------------------------------------------------------------------
// Macros
@@ -99,7 +101,7 @@
colorLabel->setFont(labelFont);
colorLabel->setFixedHeight(colorLabel->sizeHint().height());
colorLabel->setFixedWidth(colorLabel->sizeHint().width()+10);
- colorLabel->setAlignment(QLabel::AlignLeft|QLabel::AlignVCenter);
+ colorLabel->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
row1Layout->addWidget(colorLabel);
m_LineColor = new QComboBox(FALSE, this, "LineColor");
@@ -122,13 +124,13 @@
m_LineColor->setFont(labelFont);
m_LineColor->setFixedHeight(m_LineColor->sizeHint().height());
m_LineColor->setFixedWidth(m_LineColor->sizeHint().width());
- row1Layout->addWidget(m_LineColor, 0, AlignLeft);
+ row1Layout->addWidget(m_LineColor, 0, Qt::AlignLeft);
m_ColorPreview = new Q3Frame(this);
m_ColorPreview->setFrameStyle(Q3Frame::Box|Q3Frame::Raised);
m_ColorPreview->setFixedWidth(50);
m_ColorPreview->setFixedHeight(m_LineColor->sizeHint().height());
- m_ColorPreview->setPalette(QPalette(QColor(gray)));
+ m_ColorPreview->setPalette(QPalette(Qt::gray));
row1Layout->addWidget(m_ColorPreview);
// Hook on when a color changes
@@ -139,7 +141,7 @@
nameLabel->setFont(labelFont);
nameLabel->setFixedHeight(nameLabel->sizeHint().height());
nameLabel->setFixedWidth(nameLabel->sizeHint().width()+5);
- nameLabel->setAlignment(QLabel::AlignLeft|QLabel::AlignVCenter);
+ nameLabel->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
row2Layout->addWidget(nameLabel);
m_LineName = new QLineEdit(this, "LineName");
@@ -154,7 +156,7 @@
QPushButton *ok = new QPushButton("OK", this);
ok->setFixedWidth(30);
ok->setFixedHeight(30);
- topLayout->addWidget(ok, 0, AlignCenter);
+ topLayout->addWidget(ok, 0, Qt::AlignCenter);
// Hook on pressing the OK button
connect(ok, SIGNAL(clicked()), SLOT(accept()));
@@ -180,8 +182,8 @@
// MapLabel
MapLabel::MapLabel( Map* map )
: QLabel(map, "mapLabel",
- Qt::WStyle_Customize + Qt::WStyle_NoBorder + Qt::WStyle_Tool + Qt::WType_TopLevel
- + Qt::WType_Dialog + Qt::WX11BypassWM)
+ Qt::WStyle_Customize | Qt::WStyle_NoBorder | Qt::WStyle_Tool | Qt::WType_TopLevel
+ | Qt::WType_Dialog | Qt::WX11BypassWM)
{
m_Map = map;
setMargin( 1 );
@@ -189,7 +191,7 @@
setAutoMask( false );
setFrameStyle( Q3Frame::Plain | Q3Frame::Box );
setLineWidth( 1 );
- setAlignment( AlignLeft | AlignTop );
+ setAlignment( Qt::AlignLeft | Qt::AlignTop );
polish();
setText( "" );
adjustSize();
@@ -203,7 +205,7 @@
// borrowed from QPopupMenu::popup()
// get info about the widget and its environment
- QWidget *desktop = QApplication::desktop();
+ QDesktopWidget *desktop = QApplication::desktop();
int sw = desktop->width(); // screen width
int sh = desktop->height(); // screen height
int sx = desktop->x(); // screen pos
@@ -323,7 +325,7 @@
loadZoneMap(shortZoneName);
}
-void MapMgr::zoneEnd(const QString& shortZoneName, const QString& longZoneName)
+void MapMgr::zoneEnd(const QString& shortZoneName, const QString& /*longZoneName*/)
{
#ifdef DEBUGMAP
debug ("zoneEnd(%s, %s)",
@@ -684,29 +686,29 @@
#endif
}
-void MapMgr::dumpInfo(Q3TextStream& out)
+void MapMgr::dumpInfo(QTextStream& myout)
{
- out << "[MapMgr]" << endl;
- out << "DefaultLineColor: " << m_curLineColor << endl;
- out << "DefaultLineName: " << m_curLineName << endl;
- out << "DefaultLocationColor: " << m_curLocationColor << endl;
- out << "ImageLoaded: " << m_mapData.imageLoaded() << endl;
- out << "MapLoaded: " << m_mapData.mapLoaded() << endl;
- out << "MapFileName: " << m_mapData.fileName() << endl;
- out << "ZoneShortName: " << m_mapData.zoneShortName() << endl;
- out << "ZoneLongName: " << m_mapData.zoneLongName() << endl;
- out << "boundingRect: top(" << m_mapData.boundingRect().top()
+ myout << QString("[MapMgr]\n");
+ myout << "\nDefaultLineColor: " << m_curLineColor;
+ myout << "\nDefaultLineName: " << m_curLineName;
+ myout << "\nDefaultLocationColor: " << m_curLocationColor;
+ myout << "\nImageLoaded: " << m_mapData.imageLoaded();
+ myout << "\nMapLoaded: " << m_mapData.mapLoaded();
+ myout << "\nMapFileName: " << m_mapData.fileName();
+ myout << "\nZoneShortName: " << m_mapData.zoneShortName();
+ myout << "\nZoneLongName: " << m_mapData.zoneLongName();
+ myout << "\nboundingRect: top(" << m_mapData.boundingRect().top()
<< ") bottom(" << m_mapData.boundingRect().bottom()
<< ") left(" << m_mapData.boundingRect().left()
- << ") right(" << m_mapData.boundingRect().right() << ") " << endl;
- out << "size: width(" << m_mapData.size().width()
- << ") height(" << m_mapData.size().height() << ")" << endl;
- out << "ZoneZEM: " << m_mapData.zoneZEM() << endl;
- out << "LLines: " << m_mapData.lLines().count() << endl;
- out << "MLines: " << m_mapData.mLines().count() << endl;
- out << "Locations: " << m_mapData.locations().count() << endl;
- out << "Aggros: " << m_mapData.aggros().count() << endl;
- out << endl;
+ << ") right(" << m_mapData.boundingRect().right() << ") ";
+ myout << "\nsize: width(" << m_mapData.size().width()
+ << ") height(" << m_mapData.size().height() << ")";
+ myout << "\nZoneZEM: " << m_mapData.zoneZEM();
+ myout << "\nLLines: " << m_mapData.lLines().count();
+ myout << "\nMLines: " << m_mapData.mLines().count();
+ myout << "\nLocations: " << m_mapData.locations().count();
+ myout << "\nAggros: " << m_mapData.aggros().count();
+ myout << endl;
}
//----------------------------------------------------------------------
@@ -833,19 +835,6 @@
#endif
m_id_showSub = insertItem("Show", subMenu);
-
- subMenu = new Q3PopupMenu;
- subMenu->setCheckable(true);
- m_id_mapOptimization_Memory = subMenu->insertItem("Memory");
- subMenu->setItemParameter(m_id_mapOptimization_Memory, tMap_MemoryOptim);
- m_id_mapOptimization_Normal = subMenu->insertItem("Normal");
- subMenu->setItemParameter(m_id_mapOptimization_Normal, tMap_NormalOptim);
- m_id_mapOptimization_Best = subMenu->insertItem("Speed");
- subMenu->setItemParameter(m_id_mapOptimization_Best, tMap_BestOptim);
- connect(subMenu, SIGNAL(activated(int)),
- this, SLOT(select_mapOptimization(int)));
- m_id_mapOptimization = insertItem("Map Optimization", subMenu);
-
m_id_gridTickColor = insertItem("Grid Tick Color...",
this, SLOT(select_gridTickColor(int)));
m_id_gridLineColor = insertItem("Grid Line Color...",
@@ -998,12 +987,7 @@
#ifdef DEBUG
setItemChecked(m_id_debugInfo, m_map->showDebugInfo());
#endif
- MapOptimizationMethod method = m_map->mapOptimization();
- setItemChecked(m_id_mapOptimization_Memory, (method == tMap_MemoryOptim));
- setItemChecked(m_id_mapOptimization_Normal, (method == tMap_NormalOptim));
- setItemChecked(m_id_mapOptimization_Best, (method == tMap_BestOptim));
-
m_drawSizeSpinBox->setValue(m_mapIcons->drawSize());
m_fovSpinBox->setValue(m_mapIcons->fovDistance());
@@ -1072,132 +1056,132 @@
m_map->setMapLineStyle((MapLineStyle)itemParameter(itemId));
}
-void MapMenu::toggle_spawnDepthFilter(int itemId)
+void MapMenu::toggle_spawnDepthFilter(int /*itemId*/)
{
m_map->setSpawnDepthFilter(!m_map->spawnDepthFilter());
}
-void MapMenu::toggle_tooltip(int itemId)
+void MapMenu::toggle_tooltip(int /*itemId*/)
{
m_map->setShowTooltips(!m_map->showTooltips());
}
-void MapMenu::toggle_filtered(int itemId)
+void MapMenu::toggle_filtered(int /*itemId*/)
{
m_map->setShowFiltered(!m_map->showFiltered());
}
-void MapMenu::toggle_map(int itemId)
+void MapMenu::toggle_map(int /*itemId*/)
{
m_map->setShowLines(!m_map->showLines());
}
-void MapMenu::toggle_pvp(int itemId)
+void MapMenu::toggle_pvp(int /*itemId*/)
{
m_map->setPvP(!m_map->pvp());
}
-void MapMenu::toggle_deityPvP(int itemId)
+void MapMenu::toggle_deityPvP(int /*itemId*/)
{
m_map->setDeityPvP(!m_map->deityPvP());
}
-void MapMenu::toggle_racePvP(int itemId)
+void MapMenu::toggle_racePvP(int /*itemId*/)
{
m_map->setRacePvP(!m_map->racePvP());
}
-void MapMenu::toggle_velocity(int itemId)
+void MapMenu::toggle_velocity(int /*itemId*/)
{
m_map->setShowVelocityLines(!m_map->showVelocityLines());
}
-void MapMenu::toggle_animate(int itemId)
+void MapMenu::toggle_animate(int /*itemId*/)
{
m_map->setAnimate(!m_map->animate());
}
-void MapMenu::toggle_player(int itemId)
+void MapMenu::toggle_player(int /*itemId*/)
{
m_map->setShowPlayer(!m_map->showPlayer());
}
-void MapMenu::toggle_playerBackground(int itemId)
+void MapMenu::toggle_playerBackground(int /*itemId*/)
{
m_map->setShowPlayerBackground(!m_map->showPlayerBackground());
}
-void MapMenu::toggle_playerView(int itemId)
+void MapMenu::toggle_playerView(int /*itemId*/)
{
m_map->setShowPlayerView(!m_map->showPlayerView());
}
-void MapMenu::toggle_gridLines(int itemId)
+void MapMenu::toggle_gridLines(int /*itemId*/)
{
m_map->setShowGridLines(!m_map->showGridLines());
}
-void MapMenu::toggle_gridTicks(int itemId)
+void MapMenu::toggle_gridTicks(int /*itemId*/)
{
m_map->setShowGridTicks(!m_map->showGridTicks());
}
-void MapMenu::toggle_locations(int itemId)
+void MapMenu::toggle_locations(int /*itemId*/)
{
m_map->setShowLocations(!m_map->showLocations());
}
-void MapMenu::toggle_spawns(int itemId)
+void MapMenu::toggle_spawns(int /*itemId*/)
{
m_map->setShowSpawns(!m_map->showSpawns());
}
-void MapMenu::toggle_spawnPnts(int itemId)
+void MapMenu::toggle_spawnPnts(int /*itemId*/)
{
m_map->setShowSpawnPoints(!m_map->showSpawnPoints());
}
-void MapMenu::toggle_unknownSpawns(int itemId)
+void MapMenu::toggle_unknownSpawns(int /*itemId*/)
{
m_map->setShowUnknownSpawns(!m_map->showUnknownSpawns());
}
-void MapMenu::toggle_drops(int itemId)
+void MapMenu::toggle_drops(int /*itemId*/)
{
m_map->setShowDrops(!m_map->showDrops());
}
-void MapMenu::toggle_doors(int itemId)
+void MapMenu::toggle_doors(int /*itemId*/)
{
m_map->setShowDoors(!m_map->showDoors());
}
-void MapMenu::toggle_spawnNames(int itemId)
+void MapMenu::toggle_spawnNames(int /*itemId*/)
{
m_mapIcons->setShowSpawnNames(!m_mapIcons->showSpawnNames());
}
-void MapMenu::toggle_highlightConsideredSpawns(int itemId)
+void MapMenu::toggle_highlightConsideredSpawns(int /*itemId*/)
{
m_map->setHighlightConsideredSpawns(!m_map->highlightConsideredSpawns());
}
-void MapMenu::toggle_walkPath(int itemId)
+void MapMenu::toggle_walkPath(int /*itemId*/)
{
m_map->setWalkPathShowSelect(!m_map->walkPathShowSelect());
}
-void MapMenu::toggle_npcWalkPaths(int itemId)
+void MapMenu::toggle_npcWalkPaths(int /*itemId*/)
{
m_mapIcons->setShowNPCWalkPaths(!m_mapIcons->showNPCWalkPaths());
}
-void MapMenu::toggle_mapImage(int itemId)
+void MapMenu::toggle_mapImage(int /*itemId*/)
{
m_map->setShowBackgroundImage(!m_map->showBackgroundImage());
}
-void MapMenu::toggle_debugInfo(int itemId)
+void MapMenu::toggle_debugInfo(int /*itemId*/)
{
#ifdef DEBUG
m_map->setShowDebugInfo(!m_map->showDebugInfo());
@@ -1214,18 +1198,13 @@
m_map->setCacheChanges(!m_map->cacheChanges());
}
-void MapMenu::toggle_zoneSafePoint(int itemId)
+void MapMenu::toggle_zoneSafePoint(int /*itemId*/)
{
m_map->setShowZoneSafePoint(!m_map->showZoneSafePoint());
}
-void MapMenu::select_mapOptimization(int itemId)
+void MapMenu::select_gridTickColor(int /*itemId*/)
{
- m_map->setMapOptimization((MapOptimizationMethod)itemParameter(itemId));
-}
-
-void MapMenu::select_gridTickColor(int itemId)
-{
QString name = QString("ShowEQ - ") + m_map->preferenceName()
+ " Grid Tick Color";
QColor newColor = QColorDialog::getColor(m_map->gridTickColor(),
@@ -1235,7 +1214,7 @@
m_map->setGridTickColor(newColor);
}
-void MapMenu::select_gridLineColor(int itemId)
+void MapMenu::select_gridLineColor(int /*itemId*/)
{
QString name = QString("ShowEQ - ") + m_map->preferenceName()
+ " Grid Tick Color";
@@ -1246,7 +1225,7 @@
m_map->setGridLineCo...
[truncated message content] |
