[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: extragear/multimedia/amarok/src
From: Maximilian Kossick <maximilian.kossick () googlemail ! com>
Date: 2007-03-11 21:08:04
Message-ID: 1173647284.236630.31340.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 641576 by mkossick:
EBN warnings--
M +5 -5 collection/sqlmeta.h
M +1 -1 collectiondb.cpp
M +3 -3 collectionscanner/collectionscanner.cpp
M +2 -2 coverfetcher.cpp
M +1 -1 coverfetcher.h
M +1 -1 equalizersetup.h
M +1 -1 k3bexporter.cpp
M +1 -1 lastfm.cpp
M +3 -3 mediabrowser.h
M +1 -1 medium.h
M +8 -8 playlist.cpp
M +9 -9 playlistbrowser.cpp
M +1 -1 playlistwindow.cpp
M +3 -3 scrobbler.cpp
M +1 -1 statusbar/statusbar.cpp
--- trunk/extragear/multimedia/amarok/src/collection/sqlmeta.h #641575:641576
@@ -119,7 +119,7 @@
QString m_name;
bool m_tracksLoaded;
TrackList m_tracks;
- //QReadWriteLock doesnt support lock upgrades :(
+ //QReadWriteLock does not support lock upgrades :(
//see http://www.trolltech.com/developer/task-tracker/index_html?method=entry&id=131880
//switch to QReadWriteLock as soon as it does!
QMutex m_mutex;
@@ -152,7 +152,7 @@
QString m_name;
bool m_tracksLoaded;
TrackList m_tracks;
- //QReadWriteLock doesnt support lock upgrades :(
+ //QReadWriteLock does not support lock upgrades :(
//see http://www.trolltech.com/developer/task-tracker/index_html?method=entry&id=131880
//switch to QReadWriteLock as soon as it does!
QMutex m_mutex;
@@ -176,7 +176,7 @@
QString m_name;
bool m_tracksLoaded;
TrackList m_tracks;
- //QReadWriteLock doesnt support lock upgrades :(
+ //QReadWriteLock does not support lock upgrades :(
//see http://www.trolltech.com/developer/task-tracker/index_html?method=entry&id=131880
//switch to QReadWriteLock as soon as it does!
QMutex m_mutex;
@@ -198,7 +198,7 @@
QString m_name;
bool m_tracksLoaded;
TrackList m_tracks;
- //QReadWriteLock doesnt support lock upgrades :(
+ //QReadWriteLock does not support lock upgrades :(
//see http://www.trolltech.com/developer/task-tracker/index_html?method=entry&id=131880
//switch to QReadWriteLock as soon as it does!
QMutex m_mutex;
@@ -220,7 +220,7 @@
QString m_name;
bool m_tracksLoaded;
TrackList m_tracks;
- //QReadWriteLock doesnt support lock upgrades :(
+ //QReadWriteLock does not support lock upgrades :(
//see http://www.trolltech.com/developer/task-tracker/index_html?method=entry&id=131880
//switch to QReadWriteLock as soon as it does!
QMutex m_mutex;
--- trunk/extragear/multimedia/amarok/src/collectiondb.cpp #641575:641576
@@ -4123,7 +4123,7 @@
// Get just the directory.
KUrl dir = dstURL;
- dir.setFileName(QString::null);
+ dir.setFileName(QString());
// Create the directory.
if(!KStandardDirs::exists(dir.path()))
--- trunk/extragear/multimedia/amarok/src/collectionscanner/collectionscanner.cpp \
#641575:641576 @@ -58,7 +58,7 @@
, m_recursively( recursive )
, m_incremental( incremental )
, m_restart( restart )
- , m_logfile( Amarok::saveLocation( QString::null ) + "collection_scan.log" \
) + , m_logfile( Amarok::saveLocation( QString() ) + "collection_scan.log" )
, m_pause( false )
{
DbusCollectionScannerHandler* dcsh = new DbusCollectionScannerHandler();
@@ -118,7 +118,7 @@
logFile.close();
}
- QFile folderFile( Amarok::saveLocation( QString::null ) + \
"collection_scan.files" ); + QFile folderFile( Amarok::saveLocation( \
QString() ) + "collection_scan.files" ); if ( !folderFile.open( \
QIODevice::ReadOnly ) )
warning() << "Failed to open folder file " << folderFile.fileName()
<< " read-only" << endl;
@@ -147,7 +147,7 @@
readDir( dir, entries );
}
- QFile folderFile( Amarok::saveLocation( QString::null ) + \
"collection_scan.files" ); + QFile folderFile( Amarok::saveLocation( \
QString() ) + "collection_scan.files" ); folderFile.open( QIODevice::WriteOnly );
QTextStream stream( &folderFile );
stream.setCodec( QTextCodec::codecForName("UTF-8") );
--- trunk/extragear/multimedia/amarok/src/coverfetcher.cpp #641575:641576
@@ -76,7 +76,7 @@
{
const int button = KMessageBox::warningContinueCancel( parent,
i18n( "Are you sure you want to remove this cover from the \
Collection?" ),
- QString::null,
+ QString(),
KStandardGuiItem::del() );
if ( button == KMessageBox::Continue )
@@ -205,7 +205,7 @@
m_coverAsins.clear();
m_coverUrls.clear();
m_coverNames.clear();
- m_xml = QString::null;
+ m_xml.clear();
m_size = 2;
if ( m_queries.isEmpty() ) {
--- trunk/extragear/multimedia/amarok/src/coverfetcher.h #641575:641576
@@ -108,7 +108,7 @@
void finishWithError( const QString &message, KJob *job = 0 );
/// Prompt the user for a query
- void getUserQuery( QString explanation = QString::null );
+ void getUserQuery( QString explanation = QString() );
/// Will try all available queries, and then prompt the user, if allowed
void attemptAnotherFetch();
--- trunk/extragear/multimedia/amarok/src/equalizersetup.h #641575:641576
@@ -62,7 +62,7 @@
void loadPresets();
void savePresets();
- void updatePresets(QString selectTitle = QString::null);
+ void updatePresets(QString selectTitle = QString());
QString presetsCache() const;
Amarok::Slider* m_slider_preamp;
--- trunk/extragear/multimedia/amarok/src/k3bexporter.cpp #641575:641576
@@ -72,7 +72,7 @@
void K3bExporter::exportAlbum( const QString &album, int openmode )
{
- exportAlbum( QString::null, album, openmode );
+ exportAlbum( QString(), album, openmode );
}
void K3bExporter::exportAlbum( const QString &artist, const QString &album, int \
openmode )
--- trunk/extragear/multimedia/amarok/src/lastfm.cpp #641575:641576
@@ -563,7 +563,7 @@
QString imageUrl = parameter( "albumcover_medium", result );
if( imageUrl == "http://static.last.fm/coverart/" ||
- imageUrl == "http://static.last.fm/depth/catalogue/no_album_large.gif" )
+ imageUrl == "http://static.last.fm/depth/catalogue/no_album_large.gif" ) \
//krazy:exclude=spelling imageUrl = QString::null;
lastFmStuff.setImageUrl ( CollectionDB::instance()->notAvailCover( true ) );
--- trunk/extragear/multimedia/amarok/src/mediabrowser.h #641575:641576
@@ -149,9 +149,9 @@
void save( const QString &path );
void syncPlaylist( const QString &playlistName, const QString &sql, bool \
loading=false );
void syncPlaylist( const QString &playlistName, const KUrl &url, bool \
loading=false );
- void addUrl( const KUrl& url, MetaBundle *bundle=NULL, const QString \
&playlistName=QString::null ); + void addUrl( const KUrl& url, MetaBundle \
*bundle=NULL, const QString &playlistName=QString() ); void addUrl( const KUrl& url, \
MediaItem *item );
- void addUrls( const KUrl::List urls, const QString \
&playlistName=QString::null ); + void addUrls( const KUrl::List urls, const \
QString &playlistName=QString() );
void URLsAdded(); // call after finishing adding single urls
@@ -459,7 +459,7 @@
virtual void applyConfig() {}
virtual void loadConfig();
- QString configString( const QString &name, const QString &defValue = \
QString::null ); + QString configString( const QString &name, const QString \
&defValue = QString() );
void setConfigString( const QString &name, const QString &value );
bool configBool( const QString &name, bool defValue=false );
void setConfigBool( const QString &name, bool value );
--- trunk/extragear/multimedia/amarok/src/medium.h #641575:641576
@@ -86,7 +86,7 @@
void mountableState(const QString &deviceNode,
const QString &mountPoint,
const QString &fsType, bool mounted);
- void unmountableState(const QString &baseURL = QString::null);
+ void unmountableState(const QString &baseURL = QString());
void setMimeType(const QString &mimeType);
void setIconName(const QString &iconName);
--- trunk/extragear/multimedia/amarok/src/playlist.cpp #641575:641576
@@ -989,7 +989,7 @@
}
for( it = uniquecopy.begin(); it != uniquecopy.end(); ++it )
- updateEntriesStatusDeleted( QString::null, it.key() );
+ updateEntriesStatusDeleted( QString(), it.key() );
}
////////////////////////////////////////////////////////////////////////////////
@@ -1617,7 +1617,7 @@
if( !item->checkExists() )
{
//debug() << "not found, finding new url" << endl;
- QString path = QString::null;
+ QString path;
if( !item->uniqueId().isEmpty() )
{
path = CollectionDB::instance()->urlFromUniqueId( item->uniqueId() );
@@ -1745,13 +1745,13 @@
{
PlaylistItem *item = static_cast<PlaylistItem*>( itemAt( pos ) );
if( !item )
- return QPair<QString, QRect>( QString::null, QRect() );
+ return QPair<QString, QRect>( QString(), QRect() );
const QPoint contentsPos = viewportToContents( pos );
const int col = header()->sectionAt( contentsPos.x() );
if( item == m_renameItem && col == m_renameColumn )
- return QPair<QString, QRect>( QString::null, QRect() );
+ return QPair<QString, QRect>( QString(), QRect() );
QString text;
if( col == PlaylistItem::Rating )
@@ -1784,7 +1784,7 @@
}
if( col != PlaylistItem::Rating && fontMetrics().width( text ) <= itemWidth )
- return QPair<QString, QRect>( QString::null, QRect() );
+ return QPair<QString, QRect>( QString(), QRect() );
QRect globalRect( viewport()->mapToGlobal( irect.topLeft() ), irect.size() );
Q3SimpleRichText t( text, font() );
@@ -1808,7 +1808,7 @@
return QPair<QString, QRect>( text, globalRect );
}
- return QPair<QString, QRect>( QString::null, QRect() );
+ return QPair<QString, QRect>( QString(), QRect() );
}
void
@@ -1962,7 +1962,7 @@
if( !m_currentTrack )
return;
- QString pixmap = QString::null;
+ QString pixmap;
if( state < 0 )
state = EngineController::engine()->state();
@@ -2313,7 +2313,7 @@
static_cast<PlaylistItem*>(qitem)->setDynamicEnabled( dynamicEnabled );
m_itemsToChangeTagsFor.clear();
- m_editOldTag = QString::null;
+ m_editOldTag.clear();
}
void
--- trunk/extragear/multimedia/amarok/src/playlistbrowser.cpp #641575:641576
@@ -473,7 +473,7 @@
void PlaylistBrowser::addStream( Q3ListViewItem *parent )
{
- StreamEditor dialog( this, i18n( "Radio Stream" ), QString::null );
+ StreamEditor dialog( this, i18n( "Radio Stream" ), QString() );
dialog.setCaption( i18n( "Add Radio Stream" ) );
if( !parent ) parent = static_cast<Q3ListViewItem*>(m_streamsCategory);
@@ -591,7 +591,7 @@
void PlaylistBrowser::addLastFmRadio( Q3ListViewItem *parent )
{
- StreamEditor dialog( this, i18n( "Last.fm Radio" ), QString::null );
+ StreamEditor dialog( this, i18n( "Last.fm Radio" ), QString() );
dialog.setCaption( i18n( "Add Last.fm Radio" ) );
if( !parent ) parent = static_cast<Q3ListViewItem*>(m_lastfmCategory);
@@ -1301,7 +1301,7 @@
void PlaylistBrowser::addPodcast( Q3ListViewItem *parent )
{
bool ok;
- const QString name = KInputDialog::getText(i18n("Add Podcast"), i18n("Enter \
Podcast URL:"), QString::null, &ok, this); + const QString name = \
KInputDialog::getText(i18n("Add Podcast"), i18n("Enter Podcast URL:"), QString(), \
&ok, this);
if( ok && !name.isEmpty() )
{
@@ -1512,7 +1512,7 @@
button = KMessageBox::warningContinueCancel( this,
i18np( "<p>You have selected 1 podcast episode to be \
<b>irreversibly</b> deleted. ",
"<p>You have selected %1 podcast episodes to be \
<b>irreversibly</b> deleted. ",
- urls.count() ), QString::null, KStandardGuiItem::del() );
+ urls.count() ), QString(), KStandardGuiItem::del() );
if( silent || button != KMessageBox::Continue )
return false;
@@ -2235,7 +2235,7 @@
if( totalCount > 0 )
{
- int button = KMessageBox::warningContinueCancel( this, message, \
QString::null, KStandardGuiItem::del() ); + int button = \
KMessageBox::warningContinueCancel( this, message, QString(), KStandardGuiItem::del() \
); if( button != KMessageBox::Continue )
return;
}
@@ -2730,7 +2730,7 @@
PlaylistBrowser *pb = PlaylistBrowser::instance();
QString title = suggestion == 1 ? album
: suggestion == 2 ? artist
- : QString::null;
+ : QString();
if ( pb->createPlaylist( item, false, title ) )
pb->m_lastPlaylist->insertTracks( 0, bundles );
}
@@ -2912,7 +2912,7 @@
K3MultipleDrag *drag = new K3MultipleDrag( this );
Q3ListViewItemIterator it( this, Q3ListViewItemIterator::Selected );
- QString pixText = QString::null;
+ QString pixText;
uint count = 0;
for( ; it.current(); ++it )
@@ -3031,7 +3031,7 @@
if( !podList.isEmpty() )
urls += podList;
- if( count > 1 ) pixText = QString::null;
+ if( count > 1 ) pixText.clear();
drag->addDragObject( new K3URLDrag( urls, viewport() ) );
drag->setPixmap( CollectionDB::createDragPixmap( itemList, pixText ),
@@ -3246,7 +3246,7 @@
"</tr>"
"</table>"
"</div>" ).arg( title, info ) :
- QString::null );
+ QString() );
}
#include "playlistbrowser.moc"
--- trunk/extragear/multimedia/amarok/src/playlistwindow.cpp #641575:641576
@@ -157,7 +157,7 @@
///////// public interface
/**
- * This funtion will initialize the playlist window.
+ * This function will initialize the playlist window.
*/
void PlaylistWindow::init()
{
--- trunk/extragear/multimedia/amarok/src/scrobbler.cpp #641575:641576
@@ -421,7 +421,7 @@
*/
void ScrobblerSubmitter::performHandshake()
{
- QString handshakeUrl = QString::null;
+ QString handshakeUrl;
uint currentTime = QDateTime::currentDateTime( Qt::UTC ).toTime_t();
if ( PROTOCOL_VERSION == "1.1" )
@@ -795,7 +795,7 @@
if ( interval.startsWith( "INTERVAL" ) )
m_interval = interval.mid( 9 ).toUInt();
- m_challenge = QString::null;
+ m_challenge = QString();
enqueueJob( job );
}
else
@@ -1143,7 +1143,7 @@
if ( m_needHandshake || m_challenge.isEmpty() )
{
- m_challenge = QString::null;
+ m_challenge = QString();
m_needHandshake = false;
if ( when == 0 )
--- trunk/extragear/multimedia/amarok/src/statusbar/statusbar.cpp #641575:641576
@@ -152,7 +152,7 @@
m_slider->newBundle( MetaBundle() ); // Set an empty bundle
m_timeLabel->setEnabled( false ); //must be done after the setValue() above, \
due to a signal connection m_timeLabel2->setEnabled( false );
- setMainText( QString::null );
+ setMainText( QString() );
break;
case Engine::Paused:
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic