[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdemultimedia/noatun
From:       Thomas Häber <thomas () haeber ! de>
Date:       2006-09-23 3:17:10
Message-ID: 1158981430.566244.7023.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 587521 by haeber:

removed assignments to QString::null -> use QString() instead (in return values) or \
str.clear() (with the help of the English Breakfast Network)

 M  +1 -1      library/titleproxy.cpp  
 M  +1 -1      modules/infrared/irprefs.cpp  
 M  +2 -2      modules/infrared/lirc.cpp  
 M  +2 -2      modules/kjofol-skin/kjwidget.cpp  
 M  +1 -1      modules/metatag/edit.cpp  


--- trunk/KDE/kdemultimedia/noatun/library/titleproxy.cpp #587520:587521
@@ -363,7 +363,7 @@
 	int index = str.find( key, 0, true );
 	if ( index == -1 )
 	{
-		return QString::null;
+		return QString();
 	}
 	else
 	{
--- trunk/KDE/kdemultimedia/noatun/modules/infrared/irprefs.cpp #587520:587521
@@ -278,7 +278,7 @@
 		case PreviousSection:
 			return i18n("Previous Section");
 	}
-	return QString::null;
+	return QString();
 }
 
 void IRPrefs::readConfig()
--- trunk/KDE/kdemultimedia/noatun/modules/infrared/lirc.cpp #587520:587521
@@ -153,11 +153,11 @@
 const QString Lirc::readLine()
 {
 	if (!m_socket->bytesAvailable())
-		return QString::null;
+		return QString();
 
 	QString line = m_socket->readLine();
 	if (line.isEmpty())
-		return QString::null;
+		return QString();
 
 	line.remove(line.length() - 1, 1);
 	return line;
--- trunk/KDE/kdemultimedia/noatun/modules/kjofol-skin/kjwidget.cpp #587520:587521
@@ -53,7 +53,7 @@
 	if(bmp.isEmpty()) // play safe
 	{
 //		kDebug(66666) << k_funcinfo << "empty argument 'bmp', returning QString::null!" \
                << endl;
-		return QString::null;
+		return QString();
 	}
 
 //	kDebug(66666) << k_funcinfo << "Returning pressed pixmap for '" << bmp.latin1() \
<< "'" << endl; @@ -63,7 +63,7 @@
 	if(item.count() < 2)
 	{
 //		kDebug(66666) << k_funcinfo << "backgroundimagepressed doesn't have enough keys \
                in its line!" << endl;
-		return QString::null;
+		return QString();
 	}
 	else
 		return item[1];
--- trunk/KDE/kdemultimedia/noatun/modules/metatag/edit.cpp #587520:587521
@@ -280,7 +280,7 @@
         }
     }
 
-    return QString::null;
+    return QString();
 }
 
 bool Editor::keyAddable(const KFileMetaInfo &i, QString key) {


[prev in list] [next in list] [prev in thread] [next in thread]