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

List:       kde-commits
Subject:    extragear/multimedia/amarok/src/mediadevice
From:       Maximilian Kossick <maximilian.kossick () googlemail ! com>
Date:       2007-03-11 21:07:02
Message-ID: 1173647222.080600.30931.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 641574 by mkossick:

EBN warnings--

 M  +2 -2      daap/daapclient.cpp  
 M  +4 -4      generic/genericmediadevice.cpp  
 M  +1 -1      ifp/ifpmediadevice.cpp  
 M  +4 -4      ipod/ipodmediadevice.cpp  
 M  +1 -1      ipod/ipodmediadevice.h  
 M  +2 -2      mtp/mtpmediadevice.cpp  
 M  +2 -2      njb/njbmediadevice.cpp  


--- trunk/extragear/multimedia/amarok/src/mediadevice/daap/daapclient.cpp \
#641573:641574 @@ -734,7 +734,7 @@
         setText( 0, i18n( "Loading %1", text( 0 ) ) );
 
         Daap::Reader* reader = new Daap::Reader( m_ip, m_port, this,
-                                                 QString::null, m_daapClient, ( m_ip \
+ ":3689" ).ascii() ); +                                                 QString(), \
m_daapClient, ( m_ip + ":3689" ).ascii() );  setReader ( reader );
 
         connect( reader, SIGNAL( daapBundles( const QString&, Daap::SongList ) ),
@@ -865,7 +865,7 @@
 void
 DaapDownloader::downloadFailed( const QString & error )
 {
- //   Amarok::StatusBar::instance()->longMessageThreadSafe( i18n( "An error occured \
while downloading from remote music server." ), Amarok::StatusBar::Error ); + //   \
Amarok::StatusBar::instance()->longMessageThreadSafe( i18n( "An error occurred while \
downloading from remote music server." ), Amarok::StatusBar::Error );  DEBUG_BLOCK
     debug() << "failed on " << error << endl;
     m_successful = false;
--- trunk/extragear/multimedia/amarok/src/mediadevice/generic/genericmediadevice.cpp \
#641573:641574 @@ -217,9 +217,9 @@
         setBaseName( QString &name ) { m_baseName = name; }
 
         void
-        setNamesFromBase( const QString &name = QString::null )
+        setNamesFromBase( const QString &name = QString() )
         {
-            if( name != QString::null )
+            if( name != QString() )
                 m_baseName = name;
             if( m_parent )
                 m_fullName = m_parent->getFullName() + '/' + m_baseName;
@@ -324,8 +324,8 @@
     m_ignoreThePrefix     = false;
     m_asciiTextOnly       = false;
 
-    m_songLocation = QString::null;
-    m_podcastLocation = QString::null;
+    m_songLocation = QString();
+    m_podcastLocation = QString();
 
     m_supportedFileTypes.clear();
 
--- trunk/extragear/multimedia/amarok/src/mediadevice/ifp/ifpmediadevice.cpp \
#641573:641574 @@ -455,7 +455,7 @@
 {
 //     KConfig *config = Amarok::config( "MediaDevice" );
 //     QString save = config->readEntry( "DownloadLocation", QString::null );  \
                //restore the save directory
-    QString save = QString::null;
+    QString save;
 
     KUrlRequesterDlg dialog( save, 0, 0 );
     dialog.setCaption( KDialog::makeStandardCaption( i18n( "Choose a Download \
                Directory" ) ) );
--- trunk/extragear/multimedia/amarok/src/mediadevice/ipod/ipodmediadevice.cpp \
#641573:641574 @@ -941,7 +941,7 @@
         if( !silent )
         {
             if( KMessageBox::warningContinueCancel( m_parent, msg, i18n( "Remove \
                iTunes Lock File?" ),
-                        KGuiItem(i18n("&Remove"), "editdelete"), QString::null, \
KMessageBox::Dangerous ) +                        KGuiItem(i18n("&Remove"), \
"editdelete"), QString(), KMessageBox::Dangerous )  == KMessageBox::Continue )
             {
                 msg = i18n( "Media Device: removing lockfile %1 failed: %2. " )
@@ -1355,14 +1355,14 @@
 
     QString musicpath;
     pathExists( itunesDir( "Music" ), &musicpath );
-    QDir dir( musicpath, QString::null, QDir::Unsorted, QDir::Dirs );
+    QDir dir( musicpath, QString(), QDir::Unsorted, QDir::Dirs );
     for(unsigned i=0; i<dir.count(); i++)
     {
         if(dir[i] == "." || dir[i] == "..")
             continue;
 
         QString hashpath = musicpath + '/' + dir[i];
-        QDir hashdir( hashpath, QString::null, QDir::Unsorted, QDir::Files );
+        QDir hashdir( hashpath, QString(), QDir::Unsorted, QDir::Files );
         for(unsigned j=0; j<hashdir.count(); j++)
         {
             QString filename = hashpath + '/' + hashdir[j];
@@ -2351,7 +2351,7 @@
                 if( playlistsMenu && id >= FIRST_PLAYLIST )
                 {
                     QString name = playlistsMenu->text(id);
-                    if( name != QString::null )
+                    if( name != QString() )
                     {
                         MediaItem *list = m_playlistItem->findItem(name);
                         if(list)
--- trunk/extragear/multimedia/amarok/src/mediadevice/ipod/ipodmediadevice.h \
#641573:641574 @@ -128,7 +128,7 @@
         void              addPlaylistToView( Itdb_Playlist *playlist );
         void              playlistFromItem( IpodMediaItem *item );
 
-        QString           itunesDir( const QString &path = QString::null ) const;
+        QString           itunesDir( const QString &path = QString() ) const;
         QString           realPath( const char *ipodPath );
         QString           ipodPath( const QString &realPath );
         bool              pathExists( const QString &ipodPath, QString *realPath=0 \
                );
--- trunk/extragear/multimedia/amarok/src/mediadevice/mtp/mtpmediadevice.cpp \
#641573:641574 @@ -680,7 +680,7 @@
     Q3PtrList<MediaItem> items;
     m_view->getSelectedLeaves( 0, &items );
 
-    KTempDir tempdir( QString::null );
+    KTempDir tempdir( QString() );
     tempdir.setAutoDelete( true );
     KUrl::List urls;
     QString genericError = i18n( "Could not copy track from device." );
@@ -1341,7 +1341,7 @@
                                 "<p>You are updating cover art for %n tracks. This \
may take some time.",  items->count()
                                 ),
-                            QString::null );
+                            QString() );
 
                     if( button != KMessageBox::Continue )
                         return;
--- trunk/extragear/multimedia/amarok/src/mediadevice/njb/njbmediadevice.cpp \
#641573:641574 @@ -336,7 +336,7 @@
 NjbMediaDevice::downloadSelectedItems()
 {
     /* Copied from ifpmediadevice */
-    QString save = QString::null;
+    QString save;
 
     KUrlRequesterDlg dialog( save, 0, 0 );
     dialog.setCaption( KDialog::makeStandardCaption( i18n( "Choose a Download \
Directory" ) ) ); @@ -381,7 +381,7 @@
     Q3PtrList<MediaItem> items;
     m_view->getSelectedLeaves( 0, &items );
 
-    KTempDir tempdir( QString::null ); // Default prefix is fine with us
+    KTempDir tempdir( QString() ); // Default prefix is fine with us
     tempdir.setAutoDelete( true ); // We don't need it once the work is done.
     QString path = tempdir.name(), filepath;
     KUrl::List urls;


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