From: Laurent Montel <montel@kde.org>
Date: Tue, 3 Jan 2006 10:46:37 +0000 (+0000)
Subject: QString::null->QString()
X-Git-Tag: v3.80.2~194
X-Git-Url: https://git.rmz.fi/?a=commitdiff_plain;h=5fb96b3defa189cc356a90ff39d6f7b32a1fec72;p=libqmvoc.git

QString::null->QString()
.clear()
Etc.

svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=493787
---

diff --git a/extdate/extcalendarsystem.cpp b/extdate/extcalendarsystem.cpp
index 81da8ed..8ee4eeb 100644
--- a/extdate/extcalendarsystem.cpp
+++ b/extdate/extcalendarsystem.cpp
@@ -146,6 +146,6 @@ QString ExtCalendarSystem::weekDayName (int weekDay, bool shortName) const
       case 7:  return locale()->translate("Sunday");
       }
 
-  return QString::null;
+  return QString();
 }
 
diff --git a/extdate/extcalendarsystem.h b/extdate/extcalendarsystem.h
index 5007ba9..0d419df 100644
--- a/extdate/extcalendarsystem.h
+++ b/extdate/extcalendarsystem.h
@@ -235,7 +235,7 @@ public:
 
   /**
    * Gets specific calendar type month name for a given month number
-   * If an invalid month is specified, QString::null is returned.
+   * If an invalid month is specified, QString() is returned.
    *
    * @param month The month number
    * @param year The year the month belongs to
@@ -257,7 +257,7 @@ public:
    * Returns a string containing the possessive form of the month name.
    * ("of January", "of February", etc.)
    * It's needed in long format dates in some languages.
-   * If an invalid month is specified, QString::null is returned.
+   * If an invalid month is specified, QString() is returned.
    *
    * @param month The month number
    * @param year The year the month belongs to
@@ -281,7 +281,7 @@ public:
 
   /**
    * Gets specific calendar type week day name
-   * If an invalid week day is specified, QString::null is returned.
+   * If an invalid week day is specified, QString() is returned.
    *
    * @param weekDay number of day in week (1 -> Monday)
    * @param shortName short or complete day name
diff --git a/extdate/extcalendarsystemgregorian.cpp b/extdate/extcalendarsystemgregorian.cpp
index d358f59..4707530 100644
--- a/extdate/extcalendarsystemgregorian.cpp
+++ b/extdate/extcalendarsystemgregorian.cpp
@@ -144,7 +144,7 @@ QString ExtCalendarSystemGregorian::monthName(int month, int year, bool shortNam
         return locale()->translate("December");
       }
 
-  return QString::null;
+  return QString();
 }
 
 QString ExtCalendarSystemGregorian::monthNamePossessive(int month, int year,
@@ -209,7 +209,7 @@ QString ExtCalendarSystemGregorian::monthNamePossessive(int month, int year,
         return locale()->translate("of December");
       }
 
-  return QString::null;
+  return QString();
 }
 
 bool ExtCalendarSystemGregorian::setYMD(ExtDate & date, int y, int m, int d) const
diff --git a/extdate/extdatetime.cpp b/extdate/extdatetime.cpp
index d311bfc..3871048 100644
--- a/extdate/extdatetime.cpp
+++ b/extdate/extdatetime.cpp
@@ -201,7 +201,7 @@ QString ExtDate::toString( Qt::DateFormat f) const
 {
 	QString	a_format;
 
-	if ( ! isValid() ) return QString::null;
+	if ( ! isValid() ) return QString();
 
 	switch (f)
 	{
@@ -228,7 +228,7 @@ QString ExtDate::toString( Qt::DateFormat f) const
 
 QString ExtDate::toString( const QString& format ) const
 {
-	if ( ! isValid() ) return QString::null;
+	if ( ! isValid() ) return QString();
 
 	//We use the KDE Date format specs.
 	//Replace occurences of the following tokens with their
@@ -820,7 +820,7 @@ void ExtDateTime::setTime_t( uint secsSince1Jan1970UTC, Qt::TimeSpec ts )
 QString ExtDateTime::toString( Qt::DateFormat f ) const
 {
 	if ( !isValid() )
-		return QString::null;
+		return QString();
 
 	if ( f == Qt::ISODate ) {
 		return d.toString( Qt::ISODate ) + "T" + t.toString( Qt::ISODate );
@@ -835,14 +835,14 @@ QString ExtDateTime::toString( Qt::DateFormat f ) const
 						+ " " + KGlobal::locale()->timeFormat() );
 	}
 
-	return QString::null;
+	return QString();
 }
 #endif
 
 QString ExtDateTime::toString( const QString& format ) const
 {
 	if ( !isValid() )
-		return QString::null;
+		return QString();
 
 	//Parse the date portion of the format string
 	QString result = date().toString( format );
diff --git a/kdeeducore/keduvocdata.cpp b/kdeeducore/keduvocdata.cpp
index 7e97be3..da73cb3 100644
--- a/kdeeducore/keduvocdata.cpp
+++ b/kdeeducore/keduvocdata.cpp
@@ -69,13 +69,13 @@ QString KEduVocDataItem::getText(const QString &tagName) const
                 return element.text();
             }
             else
-                return QString::null;
+                return QString();
         }
         else
-            return QString::null;
+            return QString();
     }
     else
-        return QString::null;
+        return QString();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/kdeeducore/leitnersystem.cpp b/kdeeducore/leitnersystem.cpp
index f8e85a2..0a55bf4 100644
--- a/kdeeducore/leitnersystem.cpp
+++ b/kdeeducore/leitnersystem.cpp
@@ -74,7 +74,7 @@ const QString& LeitnerSystem::nextBox( QString& previousBox )
 			return box( i );
 	}
 
-	return QString::null;
+	return QString();
 }
 
 const QString& LeitnerSystem::correctBox( int box )
diff --git a/libscience/parser.cpp b/libscience/parser.cpp
index 38b4683..68acab5 100644
--- a/libscience/parser.cpp
+++ b/libscience/parser.cpp
@@ -21,7 +21,7 @@
 
 Parser::Parser()
 {
-    start(QString::null);
+    start(QString());
 }