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

List:       kde-commits
Subject:    KDE/kdepim/ktnef
From:       Laurent Montel <montel () kde ! org>
Date:       2006-01-02 14:51:08
Message-ID: 1136213468.487726.6264.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 493478 by mlaurent:

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


 M  +1 -1      gui/attachpropertydialog.cpp  
 M  +1 -1      gui/ktnefmain.cpp  
 M  +2 -2      ktnef/ktnefpropertyset.h  
 M  +1 -1      lib/ktnefmessage.cpp  


--- trunk/KDE/kdepim/ktnef/gui/attachpropertydialog.cpp #493477:493478
@@ -131,7 +131,7 @@
 		QString tag = item->text( 2 );
 		int key = tag.mid( 5 ).toInt();
 		QVariant prop = ( tag.startsWith( "attr_" ) ? pSet->attribute( key ) : \
                pSet->property( key ) );
-		QString filename = KFileDialog::getSaveFileName( tag, QString::null, parent );
+		QString filename = KFileDialog::getSaveFileName( tag, QString(), parent );
 		if ( !filename.isEmpty() )
 		{
 			QFile f( filename );
--- trunk/KDE/kdepim/ktnef/gui/ktnefmain.cpp #493477:493478
@@ -396,7 +396,7 @@
 void KTNEFMain::slotSaveMessageText()
 {
 	QString rtf = parser_->message()->rtfString();
-	QString filename = KFileDialog::getSaveFileName( QString::null, QString::null, this \
); +	QString filename = KFileDialog::getSaveFileName( QString(), QString(), this );
 	if ( !filename.isEmpty() )
 	{
 		QFile f( filename );
--- trunk/KDE/kdepim/ktnef/ktnef/ktnefpropertyset.h #493477:493478
@@ -32,8 +32,8 @@
 
 	/* MAPI properties interface */
 	void addProperty( int key, int type, const QVariant& value, const QVariant& name = \
                QVariant(), bool overwrite = false );
-	QString findProp(     int key,             const QString& fallback=QString::null, \
                bool convertToUpper=false);
-	QString findNamedProp(const QString& name, const QString& fallback=QString::null, \
bool convertToUpper=false); +	QString findProp(     int key,             const \
QString& fallback=QString(), bool convertToUpper=false); +	QString \
findNamedProp(const QString& name, const QString& fallback=QString(), bool \
convertToUpper=false);  QMap<int,KTNEFProperty*>& properties();
 	const QMap<int,KTNEFProperty*>& properties() const;
 	QVariant property( int key ) const;
--- trunk/KDE/kdepim/ktnef/lib/ktnefmessage.cpp #493477:493478
@@ -82,7 +82,7 @@
 {
 	QVariant prop = property( 0x1009 );
 	if ( prop.isNull() || prop.type() != QVariant::ByteArray)
-		return QString::null;
+		return QString();
 	else
 	{
 		QByteArray rtf;


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