|
From: <cn...@us...> - 2023-03-15 18:25:46
|
Revision: 1351
http://sourceforge.net/p/seq/svn/1351
Author: cn187
Date: 2023-03-15 18:25:44 +0000 (Wed, 15 Mar 2023)
Log Message:
-----------
Fix Qt deprecation warnings about QString::null
Modified Paths:
--------------
showeq/trunk/src/combatlog.cpp
showeq/trunk/src/experiencelog.cpp
showeq/trunk/src/map.cpp
showeq/trunk/src/messagefilterdialog.cpp
showeq/trunk/src/spawnmonitor.cpp
showeq/trunk/src/xmlpreferences.h
Modified: showeq/trunk/src/combatlog.cpp
===================================================================
--- showeq/trunk/src/combatlog.cpp 2023-03-15 18:25:26 UTC (rev 1350)
+++ showeq/trunk/src/combatlog.cpp 2023-03-15 18:25:44 UTC (rev 1351)
@@ -1062,7 +1062,7 @@
switch( QMessageBox::information( this, "ShowEQ",
"This function will clear all data listed on the mob "
"tab. Do you want to continue?",
- "&OK", "&Cancel", QString::null, 1, 1 ) )
+ "&OK", "&Cancel", "", 1, 1 ) )
{
case 0:
qDeleteAll(m_combat_mob_list);
@@ -1079,7 +1079,7 @@
switch( QMessageBox::information( this, "ShowEQ",
"This function will clear all data listed on the offense "
"tab. Do you want to continue?",
- "&OK", "&Cancel", QString::null, 1, 1 ) )
+ "&OK", "&Cancel", "", 1, 1 ) )
{
case 0:
qDeleteAll(m_combat_offense_list);
Modified: showeq/trunk/src/experiencelog.cpp
===================================================================
--- showeq/trunk/src/experiencelog.cpp 2023-03-15 18:25:26 UTC (rev 1350)
+++ showeq/trunk/src/experiencelog.cpp 2023-03-15 18:25:44 UTC (rev 1351)
@@ -664,7 +664,7 @@
if (QMessageBox::information( this, "ShowEQ",
"This function will clear all data listed in the experience "
"log. Do you want to continue?",
- "&OK", "&Cancel", QString::null, 1, 1) == 0)
+ "&OK", "&Cancel", "", 1, 1) == 0)
{
clear();
}
Modified: showeq/trunk/src/map.cpp
===================================================================
--- showeq/trunk/src/map.cpp 2023-03-15 18:25:26 UTC (rev 1350)
+++ showeq/trunk/src/map.cpp 2023-03-15 18:25:44 UTC (rev 1351)
@@ -667,7 +667,7 @@
QString name = QInputDialog::getText(parent, "Location Name",
"Please enter a location name",
QLineEdit::Normal,
- QString::null, &ok);
+ "", &ok);
// if the user clicked ok, and actually gave a name, add it
if (ok && !name.isEmpty())
Modified: showeq/trunk/src/messagefilterdialog.cpp
===================================================================
--- showeq/trunk/src/messagefilterdialog.cpp 2023-03-15 18:25:26 UTC (rev 1350)
+++ showeq/trunk/src/messagefilterdialog.cpp 2023-03-15 18:25:44 UTC (rev 1351)
@@ -46,7 +46,7 @@
{
public:
MessageFilterListBoxText(QListWidget * listbox,
- const QString & text = QString::null,
+ const QString & text = "",
uint32_t data = 0);
virtual ~MessageFilterListBoxText();
Modified: showeq/trunk/src/spawnmonitor.cpp
===================================================================
--- showeq/trunk/src/spawnmonitor.cpp 2023-03-15 18:25:26 UTC (rev 1350)
+++ showeq/trunk/src/spawnmonitor.cpp 2023-03-15 18:25:44 UTC (rev 1351)
@@ -44,7 +44,7 @@
m_diffTime(diffTime),
m_count(count),
m_name( name ),
- m_last( QString::null ),
+ m_last( "" ),
m_lastID(spawnID)
{
}
Modified: showeq/trunk/src/xmlpreferences.h
===================================================================
--- showeq/trunk/src/xmlpreferences.h 2023-03-15 18:25:26 UTC (rev 1350)
+++ showeq/trunk/src/xmlpreferences.h 2023-03-15 18:25:44 UTC (rev 1351)
@@ -104,7 +104,7 @@
// getPref{} methods retrieve the current value of a preference
QString getPrefString(const QString& inName, const QString& inSection,
- const QString& outDefault = QString::null,
+ const QString& outDefault = "",
Persistence pers = Any);
int getPrefInt(const QString& inName, const QString& inSection,
int def = -1, Persistence pers = Any);
@@ -153,7 +153,7 @@
// setPref{} methods set the current value of a preference
void setPrefString(const QString& inName, const QString& inSection,
- const QString& inValue = QString::null,
+ const QString& inValue = "",
Persistence pers = User);
void setPrefInt(const QString& inName, const QString& inSection,
int inValue, Persistence pers = User);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|