Sophie

Sophie

distrib > Mandriva > cs4.0 > i586 > by-pkgid > 8cb2ceb43c0b18390fe678dab1b0aecd > files > 4

k3b-0.12.16-3.1.20060mlcs4.src.rpm

--- k3b-0.12.3/libk3b/projects/datacd/k3bisooptions.cpp--	2005-08-04 20:42:32.000000000 +0200
+++ k3b-0.12.3/libk3b/projects/datacd/k3bisooptions.cpp	2005-08-04 20:42:46.000000000 +0200
@@ -57,10 +57,13 @@ K3bIsoOptions::K3bIsoOptions()
 
   m_preserveFilePermissions = false;
 
-  m_whiteSpaceTreatment = noChange;
+  m_whiteSpaceTreatment = K3bIsoOptions::noChange;
 
   m_volumeSetSize = 1;
   m_volumeSetNumber = 1;
+  m_preparer = QString::null;
+  m_publisher = QString::null;
+  m_volumeSetId = QString::null;
 }
 
 
--- k3b-0.12.3/libk3b/projects/datacd/k3bisooptions.h--	2005-08-04 20:42:36.000000000 +0200
+++ k3b-0.12.3/libk3b/projects/datacd/k3bisooptions.h	2005-08-04 20:43:55.000000000 +0200
@@ -27,7 +27,7 @@ class K3bIsoOptions
   K3bIsoOptions();
 
   bool forceInputCharset() const { return m_bForceInputCharset; }
-  const QString& inputCharset() const { return m_inputCharset; }
+  QString inputCharset() const { return m_inputCharset; }
 
   void setForceInputCharset( bool b ) { m_bForceInputCharset = b; }
   void setInputCharset( const QString& cs ) { m_inputCharset = cs; }
@@ -55,14 +55,14 @@ class K3bIsoOptions
   bool preserveFilePermissions() const { return m_preserveFilePermissions; }
 
   int ISOLevel() const { return m_isoLevel; }
-  const QString& systemId() const { return m_systemId; }
-  const QString& applicationID() const { return m_applicationID; }
-  const QString& volumeID() const { return m_volumeID; }
-  const QString& volumeSetId() const { return m_volumeSetId; }
+  QString systemId() const { return m_systemId; }
+  QString applicationID() const { return m_applicationID; }
+  QString volumeID() const { return m_volumeID; }
+  QString volumeSetId() const { return m_volumeSetId; }
   int volumeSetSize() const { return m_volumeSetSize; }
   int volumeSetNumber() const { return m_volumeSetNumber; }
-  const QString& publisher() const { return m_publisher; }
-  const QString& preparer() const { return m_preparer; }
+  QString publisher() const { return m_publisher; }
+  QString preparer() const { return m_preparer; }
 	
   void setCreateRockRidge( bool b ) { m_createRockRidge = b; }
   void setCreateJoliet( bool b ) {  m_createJoliet = b; }
@@ -99,7 +99,7 @@ class K3bIsoOptions
 
   void setWhiteSpaceTreatment( int i ) { m_whiteSpaceTreatment = i; }
   int whiteSpaceTreatment() const { return m_whiteSpaceTreatment; }
-  const QString& whiteSpaceTreatmentReplaceString() const { return m_whiteSpaceTreatmentReplaceString; }
+  QString whiteSpaceTreatmentReplaceString() const { return m_whiteSpaceTreatmentReplaceString; }
   void setWhiteSpaceTreatmentReplaceString( const QString& s ) { m_whiteSpaceTreatmentReplaceString = s; }
 
   bool discardSymlinks() const { return m_discardSymlinks; }