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

List:       kde-commits
Subject:    [Amarok] fa44c02: Unbreak compilation with Qt 4.7: Don't initialize
From:       Eike Hein <sho () eikehein ! com>
Date:       2010-03-13 16:21:03
Message-ID: 201003131621.o2DGL34l017469 () kore ! kollide ! net
[Download RAW message or body]

commit fa44c02f5294de7928093ccf36ab153c839365d7
Author: Eike Hein <sho@eikehein.com>
Date:   Sat Mar 13 17:25:53 2010 +0100

    Unbreak compilation with Qt 4.7: Don't initialize QStrings with ints.

diff --git a/src/aboutdialog/libattica-ocsclient/knowledgebase.cpp \
b/src/aboutdialog/libattica-ocsclient/knowledgebase.cpp index abbdfe8..68c2a7f 100644
--- a/src/aboutdialog/libattica-ocsclient/knowledgebase.cpp
+++ b/src/aboutdialog/libattica-ocsclient/knowledgebase.cpp
@@ -25,7 +25,7 @@
 using namespace AmarokAttica;
 
 KnowledgeBase::KnowledgeBase()
-    : m_id(0),
+    : m_id('0'),
       m_contentId(0),
       m_comments(0)
 {
diff --git a/src/context/applets/photos/DragPixmapItem.cpp \
b/src/context/applets/photos/DragPixmapItem.cpp index 10ec1ee..3fd862e 100644
--- a/src/context/applets/photos/DragPixmapItem.cpp
+++ b/src/context/applets/photos/DragPixmapItem.cpp
@@ -34,7 +34,7 @@
 DragPixmapItem::DragPixmapItem( QGraphicsItem* parent )
     : QGraphicsPixmapItem( parent )
     , m_dragPos( QPoint() )
-    , m_url( 0 )
+    , m_url( '0' )
 {
     setAcceptDrops( true );
     setCursor( Qt::PointingHandCursor );
diff --git a/src/context/widgets/TextScrollingWidget.cpp \
b/src/context/widgets/TextScrollingWidget.cpp index a4a9f13..6462b0f 100644
--- a/src/context/widgets/TextScrollingWidget.cpp
+++ b/src/context/widgets/TextScrollingWidget.cpp
@@ -35,7 +35,7 @@
 TextScrollingWidget::TextScrollingWidget( QGraphicsItem* parent )
     : QGraphicsTextItem( parent )
     , m_fm( 0 )
-    , m_text( 0 )
+    , m_text( '0' )
     , m_delta( 0 )
     , m_currentDelta( 0. )
     , m_animfor( 0 )
diff --git a/src/services/ServiceMetaBase.cpp b/src/services/ServiceMetaBase.cpp
index 2c380de..695cec0 100644
--- a/src/services/ServiceMetaBase.cpp
+++ b/src/services/ServiceMetaBase.cpp
@@ -136,13 +136,13 @@ ServiceTrack::ServiceTrack( const QString & name )
     , m_id( 0 )
     , m_trackNumber( 0 )
     , m_length( 0 )
-    , m_displayUrl( 0 )
-    , m_playableUrl( 0 )
-    , m_downloadableUrl( 0 )
+    , m_displayUrl( '0' )
+    , m_playableUrl( '0' )
+    , m_downloadableUrl( '0' )
     , m_albumId( 0 )
-    , m_albumName( 0 )
+    , m_albumName( '0' )
     , m_artistId( 0 )
-    , m_artistName( 0 )
+    , m_artistName( '0' )
     , m_name( name )
 {
 }
@@ -575,7 +575,7 @@ ServiceArtist::ServiceArtist( const QString & name )
     , BookmarkThisProvider()
     , m_id( 0 )
     , m_name( name )
-    , m_description( 0 )
+    , m_description( '0' )
     , m_tracks()
 {
     //nothing to do
@@ -685,7 +685,7 @@ ServiceAlbum::ServiceAlbum( const QString & name )
     , m_isCompilation( false )
     , m_albumArtist( 0 )
     , m_artistId( 0 )
-    , m_artistName( 0 )
+    , m_artistName( '0' )
 {
     //nothing to do
 }
diff --git a/utilities/afttagger/SafeFileSaver.cpp \
b/utilities/afttagger/SafeFileSaver.cpp index 6000db7..4c43904 100644
--- a/utilities/afttagger/SafeFileSaver.cpp
+++ b/utilities/afttagger/SafeFileSaver.cpp
@@ -35,7 +35,7 @@ SafeFileSaver::SafeFileSaver( const QString &origPath )
     : m_origPath( origPath )
     , m_tempSavePath()
     , m_origRenamedSavePath()
-    , m_tempSaveDigest( 0 )
+    , m_tempSaveDigest( '0' )
     , m_cleanupNeeded( false )
     , m_verbose( false )
     , m_prefix( "safefilesaver" )


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