Menu
▾
▴
[Seq-cvs-commit] SF.net SVN: seq:[1089] showeq/branches/pre_6_0_beta/src
|
From: <cn...@us...> - 2020-11-02 01:41:36
|
Revision: 1089
http://sourceforge.net/p/seq/svn/1089
Author: cn187
Date: 2020-11-02 01:41:33 +0000 (Mon, 02 Nov 2020)
Log Message:
-----------
Replace Q3TextStream with QTextStream
Modified Paths:
--------------
showeq/branches/pre_6_0_beta/src/cgiconv.cpp
showeq/branches/pre_6_0_beta/src/drawmap.cpp
showeq/branches/pre_6_0_beta/src/editor.cpp
showeq/branches/pre_6_0_beta/src/filter.cpp
showeq/branches/pre_6_0_beta/src/filter.h
showeq/branches/pre_6_0_beta/src/group.cpp
showeq/branches/pre_6_0_beta/src/group.h
showeq/branches/pre_6_0_beta/src/guild.cpp
showeq/branches/pre_6_0_beta/src/guildshell.cpp
showeq/branches/pre_6_0_beta/src/guildshell.h
showeq/branches/pre_6_0_beta/src/interface.cpp
showeq/branches/pre_6_0_beta/src/interface.h
showeq/branches/pre_6_0_beta/src/listitem.cpp
showeq/branches/pre_6_0_beta/src/listspawn.cpp
showeq/branches/pre_6_0_beta/src/logger.h
showeq/branches/pre_6_0_beta/src/map.cpp
showeq/branches/pre_6_0_beta/src/map.h
showeq/branches/pre_6_0_beta/src/mapicon.cpp
showeq/branches/pre_6_0_beta/src/mapicon.h
showeq/branches/pre_6_0_beta/src/messagewindow.cpp
showeq/branches/pre_6_0_beta/src/packetinfo.cpp
showeq/branches/pre_6_0_beta/src/packetinfo.h
showeq/branches/pre_6_0_beta/src/showitem.cpp
showeq/branches/pre_6_0_beta/src/showspawn.cpp
showeq/branches/pre_6_0_beta/src/sortitem.cpp
showeq/branches/pre_6_0_beta/src/spawnlist.h
showeq/branches/pre_6_0_beta/src/spawnmonitor.cpp
showeq/branches/pre_6_0_beta/src/spawnshell.cpp
showeq/branches/pre_6_0_beta/src/spawnshell.h
Modified: showeq/branches/pre_6_0_beta/src/cgiconv.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/cgiconv.cpp 2020-10-29 13:30:18 UTC (rev 1088)
+++ showeq/branches/pre_6_0_beta/src/cgiconv.cpp 2020-11-02 01:41:33 UTC (rev 1089)
@@ -29,7 +29,7 @@
#include <QRegExp>
#include <QFilh>
-#include <Q3TextStream>
+#include <QTextStream>
#include "cgiconv.h"
@@ -56,10 +56,10 @@
char* query_str = new char[content_length + 1];
// open the data stream
- Q3TextStream postStream(stdin, QIODevice::ReadOnly);
+ QTextStream postStream(stdin, QIODevice::ReadOnly);
// set the encoding (required for readRawBytes to work)
- postStream.setEncoding(Q3TextStream::Latin1);
+ postStream.setEncoding(QTextStream::Latin1);
// read the data into the allocated buffer
postStream.readRawBytes(query_str, content_length);
@@ -150,7 +150,7 @@
if (file.open(QIODevice::WriteOnly))
{
// create a QTextStream object on the file
- Q3TextStream textFile(&file);
+ QTextStream textFile(&file);
// get the environment
textFile << "REQUEST_METHOD=" << getenv("REQUEST_METHOD") << endl;
Modified: showeq/branches/pre_6_0_beta/src/drawmap.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/drawmap.cpp 2020-10-29 13:30:18 UTC (rev 1088)
+++ showeq/branches/pre_6_0_beta/src/drawmap.cpp 2020-11-02 01:41:33 UTC (rev 1089)
@@ -30,7 +30,7 @@
#include <QString>
#include <QDir>
-#include <Q3TextStream>
+#include <QTextStream>
#include <QRegExp>
#include "cgiconv.h"
@@ -589,9 +589,9 @@
else
{
// open the output data stream
- Q3TextStream out(stdout, QIODevice::WriteOnly);
- out.setEncoding(Q3TextStream::Latin1);
- out.flags(Q3TextStream::showbase | Q3TextStream::dec);
+ QTextStream out(stdout, QIODevice::WriteOnly);
+ out.setEncoding(QTextStream::Latin1);
+ out.flags(QTextStream::showbase | QTextStream::dec);
const char* header =
"Content-type: text/html; charset=iso-8859-1\n\n"
Modified: showeq/branches/pre_6_0_beta/src/editor.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/editor.cpp 2020-10-29 13:30:18 UTC (rev 1088)
+++ showeq/branches/pre_6_0_beta/src/editor.cpp 2020-11-02 01:41:33 UTC (rev 1089)
@@ -35,7 +35,7 @@
#include <QMainWindow>
#include <QFileDialog>
#include <QToolButton>
-#include <Q3TextStream>
+#include <QTextStream>
#include <QPaintDevice>
#include <QObject>
#include <QTextEdit>
@@ -147,8 +147,8 @@
e->clear();
- Q3TextStream t(&f);
- while ( !t.eof() ) {
+ QTextStream t(&f);
+ while ( !t.atEnd() ) {
QString s = t.readLine();
e->append( s );
}
@@ -177,7 +177,7 @@
return;
}
- Q3TextStream t( &f );
+ QTextStream t( &f );
t << text;
f.close();
Modified: showeq/branches/pre_6_0_beta/src/filter.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/filter.cpp 2020-10-29 13:30:18 UTC (rev 1088)
+++ showeq/branches/pre_6_0_beta/src/filter.cpp 2020-11-02 01:41:33 UTC (rev 1089)
@@ -32,7 +32,7 @@
#include <climits>
#include <QFile>
-#include <Q3TextStream>
+#include <QTextStream>
#define MAXLEN 5000
@@ -212,7 +212,7 @@
{
}
-bool FilterItem::save(QString& indent, Q3TextStream& out)
+bool FilterItem::save(QString& indent, QTextStream& out)
{
out << indent << "<oldfilter>";
@@ -308,7 +308,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;
@@ -555,13 +555,14 @@
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.setIntegerBase(10);
+ out.setFieldAlignment(QTextStream::AlignLeft);
// print document header
out << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" << endl
Modified: showeq/branches/pre_6_0_beta/src/filter.h
===================================================================
--- showeq/branches/pre_6_0_beta/src/filter.h 2020-10-29 13:30:18 UTC (rev 1088)
+++ showeq/branches/pre_6_0_beta/src/filter.h 2020-11-02 01:41:33 UTC (rev 1089)
@@ -35,7 +35,7 @@
#include <QList>
#include <QRegExp>
#include <QXmlAttributes>
-#include <Q3TextStream>
+#include <QTextStream>
#include <map>
@@ -62,7 +62,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;
@@ -91,7 +91,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/pre_6_0_beta/src/group.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/group.cpp 2020-10-29 13:30:18 UTC (rev 1088)
+++ showeq/branches/pre_6_0_beta/src/group.cpp 2020-11-02 01:41:33 UTC (rev 1089)
@@ -28,7 +28,7 @@
#include "diagnosticmessages.h"
#include "netstream.h"
-#include <Q3TextStream>
+#include <QTextStream>
GroupMgr::GroupMgr(SpawnShell* spawnShell,
Player* player,
@@ -322,7 +322,7 @@
}
}
-void GroupMgr::dumpInfo(Q3TextStream& out)
+void GroupMgr::dumpInfo(QTextStream& out)
{
// dump general group manager information
out << "[GroupMgr]" << endl;
Modified: showeq/branches/pre_6_0_beta/src/group.h
===================================================================
--- showeq/branches/pre_6_0_beta/src/group.h 2020-10-29 13:30:18 UTC (rev 1088)
+++ showeq/branches/pre_6_0_beta/src/group.h 2020-11-02 01:41:33 UTC (rev 1089)
@@ -27,7 +27,7 @@
#include <QObject>
#include <QString>
-#include <Q3TextStream>
+#include <QTextStream>
#include "everquest.h"
@@ -69,7 +69,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/pre_6_0_beta/src/guild.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/guild.cpp 2020-10-29 13:30:18 UTC (rev 1088)
+++ showeq/branches/pre_6_0_beta/src/guild.cpp 2020-11-02 01:41:33 UTC (rev 1089)
@@ -32,7 +32,7 @@
#include <QFile>
#include <QDataStream>
-#include <Q3TextStream>
+#include <QTextStream>
GuildMgr::GuildMgr(QString fn, QObject* parent, const char* name)
: QObject(parent, name)
@@ -157,7 +157,7 @@
void GuildMgr::guildList2text(QString fn)
{
QFile guildsfile(fn);
- Q3TextStream guildtext(&guildsfile);
+ QTextStream guildtext(&guildsfile);
if (guildsfile.exists()) {
if (!guildsfile.remove()) {
Modified: showeq/branches/pre_6_0_beta/src/guildshell.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/guildshell.cpp 2020-10-29 13:30:18 UTC (rev 1088)
+++ showeq/branches/pre_6_0_beta/src/guildshell.cpp 2020-11-02 01:41:33 UTC (rev 1089)
@@ -29,7 +29,7 @@
#include "diagnosticmessages.h"
#include <QDateTime>
-#include <Q3TextStream>
+#include <QTextStream>
//----------------------------------------------------------------------
// diagnostic defines
@@ -195,7 +195,7 @@
return m_zoneMgr->zoneNameFromID(zoneid);
}
-void GuildShell::dumpMembers(Q3TextStream& out)
+void GuildShell::dumpMembers(QTextStream& out)
{
QDateTime dt;
GuildMemberDictIterator it(m_members);
Modified: showeq/branches/pre_6_0_beta/src/guildshell.h
===================================================================
--- showeq/branches/pre_6_0_beta/src/guildshell.h 2020-10-29 13:30:18 UTC (rev 1088)
+++ showeq/branches/pre_6_0_beta/src/guildshell.h 2020-11-02 01:41:33 UTC (rev 1089)
@@ -30,11 +30,11 @@
#include <QString>
#include <QObject>
#include <QHash>
-#include <Q3TextStream>
+#include <QTextStream>
//----------------------------------------------------------------------
// forward declarations
-class Q3TextStream;
+class QTextStream;
class NetStream;
class ZoneMgr;
@@ -102,7 +102,7 @@
const GuildMemberDict& members() { return m_members; }
size_t maxNameLength() { return m_maxNameLength; }
- void dumpMembers(Q3TextStream& out);
+ void dumpMembers(QTextStream& out);
QString zoneString(uint16_t zoneid) const;
Modified: showeq/branches/pre_6_0_beta/src/interface.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/interface.cpp 2020-10-29 13:30:18 UTC (rev 1088)
+++ showeq/branches/pre_6_0_beta/src/interface.cpp 2020-11-02 01:41:33 UTC (rev 1089)
@@ -84,7 +84,7 @@
#include <QShortcut>
#include <QFileInfo>
#include <QFile>
-#include <Q3TextStream>
+#include <QTextStream>
#include <QInputDialog>
#include <QFontDialog>
#include <QColorDialog>
@@ -3444,7 +3444,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);
@@ -3460,7 +3460,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);
@@ -3476,7 +3476,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);
@@ -3520,7 +3520,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);
@@ -3537,7 +3537,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);
@@ -3559,7 +3559,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);
@@ -3579,7 +3579,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);
@@ -3600,7 +3600,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);
@@ -3640,7 +3640,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",
@@ -3696,7 +3696,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);
@@ -3716,7 +3716,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);
@@ -4964,7 +4964,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);
@@ -4984,7 +4984,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;
@@ -5009,7 +5009,7 @@
}
}
-void EQInterface::saveSpawnPath(Q3TextStream& out, const Item* item)
+void EQInterface::saveSpawnPath(QTextStream& out, const Item* item)
{
if (item == 0)
return;
Modified: showeq/branches/pre_6_0_beta/src/interface.h
===================================================================
--- showeq/branches/pre_6_0_beta/src/interface.h 2020-10-29 13:30:18 UTC (rev 1088)
+++ showeq/branches/pre_6_0_beta/src/interface.h 2020-11-02 01:41:33 UTC (rev 1089)
@@ -37,7 +37,7 @@
#include <QMessageBox>
#include <QSpinBox>
#include <QHash>
-#include <Q3TextStream>
+#include <QTextStream>
#include "everquest.h"
#include "spawnlist.h"
#include "spawnshell.h"
@@ -179,7 +179,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/pre_6_0_beta/src/listitem.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/listitem.cpp 2020-10-29 13:30:18 UTC (rev 1088)
+++ showeq/branches/pre_6_0_beta/src/listitem.cpp 2020-11-02 01:41:33 UTC (rev 1089)
@@ -28,7 +28,7 @@
#include <cstring>
#include <QString>
-#include <Q3TextStream>
+#include <QTextStream>
#include "cgiconv.h"
#include "util.h"
@@ -36,7 +36,7 @@
#include "qmap.h"
// forward declaration
-void displayForm(Q3TextStream& out,
+void displayForm(QTextStream& out,
CGI& cgiconv,
bool displayIcon);
@@ -110,9 +110,9 @@
}
// open the output data stream
- Q3TextStream out(stdout, QIODevice::WriteOnly);
- out.setEncoding(Q3TextStream::Latin1);
- out.flags(Q3TextStream::showbase | Q3TextStream::dec);
+ QTextStream out(stdout, QIODevice::WriteOnly);
+ out.setEncoding(QTextStream::Latin1);
+ out.flags(QTextStream::showbase | QTextStream::dec);
const char* header =
"Content-type: text/html; charset=iso-8859-1\n\n"
@@ -511,7 +511,7 @@
out << "</HTML>";
}
-void displaySelectOption(Q3TextStream& out,
+void displaySelectOption(QTextStream& out,
const QString& value,
const QString& name,
const QString currentChk)
@@ -522,7 +522,7 @@
out << ">" << name << "</OPTION>\n";
}
-void displayForm(Q3TextStream& out,
+void displayForm(QTextStream& out,
CGI& cgiconv,
bool displayIcon)
{
Modified: showeq/branches/pre_6_0_beta/src/listspawn.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/listspawn.cpp 2020-10-29 13:30:18 UTC (rev 1088)
+++ showeq/branches/pre_6_0_beta/src/listspawn.cpp 2020-11-02 01:41:33 UTC (rev 1089)
@@ -26,7 +26,7 @@
#include <cerrno>
#include <QString>
-#include <Q3TextStream>
+#include <QTextStream>
#include <QRegExp>
#include "cgiconv.h"
@@ -80,9 +80,9 @@
}
// open the output data stream
- Q3TextStream out(stdout, QIODevice::WriteOnly);
- out.setEncoding(Q3TextStream::Latin1);
- out.flags(Q3TextStream::showbase | Q3TextStream::dec);
+ QTextStream out(stdout, QIODevice::WriteOnly);
+ out.setEncoding(QTextStream::Latin1);
+ out.flags(QTextStream::showbase | QTextStream::dec);
const char* header =
"Content-type: text/html; charset=iso-8859-1\n\n"
Modified: showeq/branches/pre_6_0_beta/src/logger.h
===================================================================
--- showeq/branches/pre_6_0_beta/src/logger.h 2020-10-29 13:30:18 UTC (rev 1088)
+++ showeq/branches/pre_6_0_beta/src/logger.h 2020-11-02 01:41:33 UTC (rev 1089)
@@ -25,7 +25,7 @@
#include <QObject>
#include <QFile>
-#include <Q3TextStream>
+#include <QTextStream>
#ifdef __FreeBSD__
// since they are incapable of following standards
@@ -52,7 +52,7 @@
protected:
FILE* m_fp;
QFile m_file;
- Q3TextStream m_out;
+ QTextStream m_out;
QString m_filename;
bool m_errOpen;
};
Modified: showeq/branches/pre_6_0_beta/src/map.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/map.cpp 2020-10-29 13:30:18 UTC (rev 1088)
+++ showeq/branches/pre_6_0_beta/src/map.cpp 2020-11-02 01:41:33 UTC (rev 1089)
@@ -79,7 +79,7 @@
#include <QResizeEvent>
#include <QLabel>
#include <QHBoxLayout>
-#include <Q3TextStream>
+#include <QTextStream>
#include <QMouseEvent>
//----------------------------------------------------------------------
@@ -695,7 +695,7 @@
#endif
}
-void MapMgr::dumpInfo(Q3TextStream& out)
+void MapMgr::dumpInfo(QTextStream& out)
{
out << "[MapMgr]" << endl;
out << "DefaultLineColor: " << m_curLineColor << endl;
@@ -2884,7 +2884,7 @@
refreshMap ();
}
-void Map::dumpInfo(Q3TextStream& out)
+void Map::dumpInfo(QTextStream& out)
{
out << "[" << preferenceName() << "]" << endl;
out << "Caption: " << caption() << endl;
@@ -5031,7 +5031,7 @@
m_map->savePrefs();
}
-void MapFrame::dumpInfo(Q3TextStream& out)
+void MapFrame::dumpInfo(QTextStream& out)
{
// first dump information about the map frame
out << "[" << preferenceName() << "]" << endl;
Modified: showeq/branches/pre_6_0_beta/src/map.h
===================================================================
--- showeq/branches/pre_6_0_beta/src/map.h 2020-10-29 13:30:18 UTC (rev 1088)
+++ showeq/branches/pre_6_0_beta/src/map.h 2020-11-02 01:41:33 UTC (rev 1089)
@@ -40,7 +40,7 @@
#include <QToolTip>
#include <QRegExp>
#include <QHash>
-#include <Q3TextStream>
+#include <QTextStream>
#include <QDateTime>
#include <QPen>
#include <QBrush>
@@ -200,7 +200,7 @@
void savePrefs(void);
// dump debug info
- void dumpInfo(Q3TextStream& out);
+ void dumpInfo(QTextStream& out);
signals:
void mapLoaded(void);
@@ -551,7 +551,7 @@
void setShowInstanceLocationMarker(bool val);
// dump debug info
- void dumpInfo(Q3TextStream& out);
+ void dumpInfo(QTextStream& out);
void showMapIconDialog();
@@ -718,7 +718,7 @@
virtual void savePrefs(void);
// dump debug info
- void dumpInfo(Q3TextStream& out);
+ void dumpInfo(QTextStream& out);
protected slots:
void init_Menu(void);
Modified: showeq/branches/pre_6_0_beta/src/mapicon.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/mapicon.cpp 2020-10-29 13:30:18 UTC (rev 1088)
+++ showeq/branches/pre_6_0_beta/src/mapicon.cpp 2020-11-02 01:41:33 UTC (rev 1089)
@@ -31,7 +31,7 @@
#include <QPainter>
#include <QPoint>
#include <QTimer>
-#include <Q3TextStream>
+#include <QTextStream>
#include <QPolygon>
//----------------------------------------------------------------------
@@ -819,7 +819,7 @@
m_mapIcons[k].save(iconTypePrefBaseNames[k], preferenceName());
}
-void MapIcons::dumpInfo(Q3TextStream& out)
+void MapIcons::dumpInfo(QTextStream& out)
{
out << "[" << preferenceName() << " MapIcons]" << endl;
out << "ShowSpawnNames: " << m_showSpawnNames << endl;
Modified: showeq/branches/pre_6_0_beta/src/mapicon.h
===================================================================
--- showeq/branches/pre_6_0_beta/src/mapicon.h 2020-10-29 13:30:18 UTC (rev 1088)
+++ showeq/branches/pre_6_0_beta/src/mapicon.h 2020-11-02 01:41:33 UTC (rev 1089)
@@ -41,7 +41,7 @@
#include <QPen>
#include <QBrush>
#include <QString>
-#include <Q3TextStream>
+#include <QTextStream>
//----------------------------------------------------------------------
// forward declarations
@@ -317,7 +317,7 @@
void setIcon(int iconType, const MapIcon& icon);
// dump debug info
- void dumpInfo(Q3TextStream& out);
+ void dumpInfo(QTextStream& out);
// painting slots
void paintIcon(MapParameters& param,
Modified: showeq/branches/pre_6_0_beta/src/messagewindow.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/messagewindow.cpp 2020-10-29 13:30:18 UTC (rev 1088)
+++ showeq/branches/pre_6_0_beta/src/messagewindow.cpp 2020-11-02 01:41:33 UTC (rev 1089)
@@ -39,7 +39,7 @@
#include <QGroupBox>
#include <QFileDialog>
#include <QFile>
-#include <Q3TextStream>
+#include <QTextStream>
#include <QHBoxLayout>
#include <QKeyEvent>
#include <QGridLayout>
@@ -864,7 +864,7 @@
QFile file( fileName ); // Write the text to a file
if ( file.open( QIODevice::WriteOnly ) )
{
- Q3TextStream stream( &file );
+ QTextStream stream( &file );
stream << m_messageWindow->toPlainText() << endl;
}
Modified: showeq/branches/pre_6_0_beta/src/packetinfo.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/packetinfo.cpp 2020-10-29 13:30:18 UTC (rev 1088)
+++ showeq/branches/pre_6_0_beta/src/packetinfo.cpp 2020-11-02 01:41:33 UTC (rev 1089)
@@ -28,7 +28,7 @@
#include <QMetaObject>
#include <QFile>
#include <QXmlAttributes>
-#include <Q3TextStream>
+#include <QTextStream>
#include <QByteArray>
#include <map>
@@ -318,13 +318,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/pre_6_0_beta/src/packetinfo.h
===================================================================
--- showeq/branches/pre_6_0_beta/src/packetinfo.h 2020-10-29 13:30:18 UTC (rev 1088)
+++ showeq/branches/pre_6_0_beta/src/packetinfo.h 2020-11-02 01:41:33 UTC (rev 1089)
@@ -33,7 +33,7 @@
#include <QByteArray>
#include <QString>
#include <QStringList>
-#include <Q3TextStream>
+#include <QTextStream>
//----------------------------------------------------------------------
// forward declarations
Modified: showeq/branches/pre_6_0_beta/src/showitem.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/showitem.cpp 2020-10-29 13:30:18 UTC (rev 1088)
+++ showeq/branches/pre_6_0_beta/src/showitem.cpp 2020-11-02 01:41:33 UTC (rev 1089)
@@ -28,7 +28,7 @@
#include <cstdio>
#include <cstring>
-#include <Q3TextStream>
+#include <QTextStream>
#include "cgiconv.h"
#include "util.h"
@@ -35,12 +35,12 @@
#include "itemdb.h"
// forward declarations
-void printdata (Q3TextStream& out, int len, char *data);
+void printdata (QTextStream& out, int len, char *data);
int main (int argc, char *argv[])
{
// open the output data stream
- Q3TextStream out(stdout, QIODevice::WriteOnly);
+ QTextStream out(stdout, QIODevice::WriteOnly);
const char* header =
"Content-type: text/html; charset=iso-8859-1\n\n"
@@ -404,7 +404,7 @@
return 0;
}
-void printdata (Q3TextStream& out, int len, char *data)
+void printdata (QTextStream& out, int len, char *data)
{
char asc[1024];
uint8_t fieldCount = 1;
Modified: showeq/branches/pre_6_0_beta/src/showspawn.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/showspawn.cpp 2020-10-29 13:30:18 UTC (rev 1088)
+++ showeq/branches/pre_6_0_beta/src/showspawn.cpp 2020-11-02 01:41:33 UTC (rev 1089)
@@ -27,7 +27,7 @@
#include <QString>
#include <QRegExp>
-#include <Q3TextStream>
+#include <QTextStream>
#include "cgiconv.h"
#include "spawn.h"
@@ -34,7 +34,7 @@
#include "util.h"
// forward declarations
-void printdata (Q3TextStream& out, int len, unsigned char *data);
+void printdata (QTextStream& out, int len, unsigned char *data);
int main (int argc, char *argv[])
{
@@ -82,9 +82,9 @@
}
// open the output data stream
- Q3TextStream out(stdout, QIODevice::WriteOnly);
- out.setEncoding(Q3TextStream::Latin1);
- out.flags(Q3TextStream::showbase | Q3TextStream::dec);
+ QTextStream out(stdout, QIODevice::WriteOnly);
+ out.setEncoding(QTextStream::Latin1);
+ out.flags(QTextStream::showbase | QTextStream::dec);
const char* header =
"Content-type: text/html; charset=iso-8859-1\n\n"
@@ -275,7 +275,7 @@
out << footer;
}
-void printdata (Q3TextStream& out, int len, unsigned char *data)
+void printdata (QTextStream& out, int len, unsigned char *data)
{
char hex[128];
char asc[128];
Modified: showeq/branches/pre_6_0_beta/src/sortitem.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/sortitem.cpp 2020-10-29 13:30:18 UTC (rev 1088)
+++ showeq/branches/pre_6_0_beta/src/sortitem.cpp 2020-11-02 01:41:33 UTC (rev 1089)
@@ -23,7 +23,7 @@
#include <cstdlib>
#include <cstdio>
-#include <Q3TextStream>
+#include <QTextStream>
#include "util.h"
@@ -33,7 +33,7 @@
int main (int, char *[])
{
// open the data stream
- Q3TextStream out(stdout, QIODevice::WriteOnly);
+ QTextStream out(stdout, QIODevice::WriteOnly);
// format that the text will be output to.
QString format = "%1:%2:%3\n";
Modified: showeq/branches/pre_6_0_beta/src/spawnlist.h
===================================================================
--- showeq/branches/pre_6_0_beta/src/spawnlist.h 2020-10-29 13:30:18 UTC (rev 1088)
+++ showeq/branches/pre_6_0_beta/src/spawnlist.h 2020-11-02 01:41:33 UTC (rev 1089)
@@ -46,7 +46,7 @@
#include <Q3ListView>
#include <QHash>
-#include <Q3TextStream>
+#include <QTextStream>
#include <QMenu>
// these are all used for the CFilterDlg
Modified: showeq/branches/pre_6_0_beta/src/spawnmonitor.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/spawnmonitor.cpp 2020-10-29 13:30:18 UTC (rev 1088)
+++ showeq/branches/pre_6_0_beta/src/spawnmonitor.cpp 2020-11-02 01:41:33 UTC (rev 1089)
@@ -31,7 +31,7 @@
#include <QDir>
#include <QFile>
#include <QFileInfo>
-#include <Q3TextStream>
+#include <QTextStream>
SpawnPoint::SpawnPoint(uint16_t spawnID,
@@ -303,7 +303,7 @@
return;
}
- Q3TextStream output(&spFile);
+ QTextStream output(&spFile);
QHashIterator<QString, SpawnPoint*> it( m_points );
SpawnPoint* sp;
@@ -380,7 +380,7 @@
return;
}
- Q3TextStream input( &spFile );
+ QTextStream input( &spFile );
int16_t x, y, z;
unsigned long diffTime;
Modified: showeq/branches/pre_6_0_beta/src/spawnshell.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/spawnshell.cpp 2020-10-29 13:30:18 UTC (rev 1088)
+++ showeq/branches/pre_6_0_beta/src/spawnshell.cpp 2020-11-02 01:41:33 UTC (rev 1089)
@@ -39,7 +39,7 @@
#include <QFile>
#include <QDataStream>
-#include <Q3TextStream>
+#include <QTextStream>
#ifdef __FreeBSD__
#include <sys/types.h>
@@ -335,7 +335,7 @@
return false;
}
-void SpawnShell::dumpSpawns(spawnItemType type, Q3TextStream& out)
+void SpawnShell::dumpSpawns(spawnItemType type, QTextStream& out)
{
ItemIterator it(getMap(type));
Modified: showeq/branches/pre_6_0_beta/src/spawnshell.h
===================================================================
--- showeq/branches/pre_6_0_beta/src/spawnshell.h 2020-10-29 13:30:18 UTC (rev 1088)
+++ showeq/branches/pre_6_0_beta/src/spawnshell.h 2020-11-02 01:41:33 UTC (rev 1089)
@@ -44,7 +44,7 @@
#include <QHash>
#include <QTimer>
-#include <Q3TextStream>
+#include <QTextStream>
#include "everquest.h"
#include "spawn.h"
@@ -94,7 +94,7 @@
double& minDistance);
Spawn* findSpawnByName(const QString& name);
- void dumpSpawns(spawnItemType type, Q3TextStream& out);
+ void dumpSpawns(spawnItemType type, QTextStream& out);
FilterMgr* filterMgr(void) { return &m_filterMgr; }
const ItemMap& getConstMap(spawnItemType type) const;
const ItemMap& spawns(void) const;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
