From kde-commits Wed Aug 10 09:07:59 2011 From: Jan Gerrit Marker Date: Wed, 10 Aug 2011 09:07:59 +0000 To: kde-commits Subject: KDE/kdemultimedia/juk Message-Id: <20110810090759.BB420AC871 () svn ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=131296731217233 SVN commit 1246183 by jangmarker: juk: fix krazy issues Fixes some issues krazy points out. M +4 -4 exampleoptionsbase.ui M +1 -1 filehandle.cpp M +1 -1 filerenamer.cpp M +1 -1 filerenamerbase.ui M +3 -3 filerenameroptionsbase.ui M +0 -1 nowplaying.cpp M +1 -1 playlist.cpp M +1 -1 playlist.h M +2 -1 stringshare.cpp M +1 -1 svghandler.cpp M +1 -1 systemtray.h M +1 -1 tageditor.cpp M +3 -3 tageditor.ui M +5 -1 tagguesser.cpp M +3 -2 trackpickerdialog.cpp --- trunk/KDE/kdemultimedia/juk/exampleoptionsbase.ui #1246182:1246183 @@ -209,28 +209,28 @@ 0 - + Title - + Artist - + Album - + Genre --- trunk/KDE/kdemultimedia/juk/filehandle.cpp #1246182:1246183 @@ -153,7 +153,7 @@ } if(!QFile::exists(path)) { - kError() << "trying to set non-existant file: " << path << endl; + kError() << "trying to set non-existent file: " << path << endl; return; } --- trunk/KDE/kdemultimedia/juk/filerenamer.cpp #1246182:1246183 @@ -952,7 +952,7 @@ // Split path, and go through each path element. If a path element has // the album information, set its folder icon. - QStringList elements = dstURL.directory().split("/", QString::SkipEmptyParts); + QStringList elements = dstURL.directory().split('/', QString::SkipEmptyParts); QString path; for(QStringList::ConstIterator it = elements.constBegin(); it != elements.constEnd(); ++it) { --- trunk/KDE/kdemultimedia/juk/filerenamerbase.ui #1246182:1246183 @@ -232,7 +232,7 @@ - + Qt::NoFocus --- trunk/KDE/kdemultimedia/juk/filerenameroptionsbase.ui #1246182:1246183 @@ -64,7 +64,7 @@ - + Qt::AlignRight @@ -74,7 +74,7 @@ - + Qt::AlignLeading @@ -164,7 +164,7 @@ - + false --- trunk/KDE/kdemultimedia/juk/nowplaying.cpp #1246182:1246183 @@ -46,7 +46,6 @@ #include "coverinfo.h" #include "covermanager.h" #include "tag.h" -#include "playlistitem.h" #include "collectionlist.h" static const int imageSize = 64; --- trunk/KDE/kdemultimedia/juk/playlist.cpp #1246182:1246183 @@ -1078,7 +1078,7 @@ KMimeType::Ptr mimeType = KMimeType::findByPath(file); - if(item && mimeType->name().startsWith("image/")) { + if(item && mimeType->name().startsWith(QLatin1String("image/"))) { item->file().coverInfo()->setCover(QImage(file)); refreshAlbum(item->file().tag()->artist(), item->file().tag()->album()); --- trunk/KDE/kdemultimedia/juk/playlist.h #1246182:1246183 @@ -287,7 +287,7 @@ /** * Subclasses of Playlist which add new columns will set this value to - * specify how many of those colums exist. This allows the Playlist + * specify how many of those columns exist. This allows the Playlist * class to do some internal calculations on the number and positions * of columns. */ --- trunk/KDE/kdemultimedia/juk/stringshare.cpp #1246182:1246183 @@ -12,9 +12,10 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include #include "stringshare.h" +#include + const int SIZE = 5003; StringShare::Data* StringShare::s_data = 0; --- trunk/KDE/kdemultimedia/juk/svghandler.cpp #1246182:1246183 @@ -196,7 +196,7 @@ QPoint tl, br; if ( inverse ) { - tl = knob.topRight() + QPoint( -5, 5 ); // 5px x padding to avoid a "gap" between it and the top and botton of the round knob. + tl = knob.topRight() + QPoint( -5, 5 ); // 5px x padding to avoid a "gap" between it and the top and bottom of the round knob. br = slider->rect.topRight() + QPoint( -3, 5 + playedBarHeight - 1 ); QPixmap rightEnd = renderSvg( "progress_slider_played_right", playedBarHeight, playedBarHeight, "progress_slider_played_right" ); p->drawPixmap( br.x() - rightEnd.width() + 1, tl.y(), rightEnd, qMax(0, rightEnd.width() - (sizeOfLeftPlayed + 3)), 0, sizeOfLeftPlayed + 3, playedBarHeight ); --- trunk/KDE/kdemultimedia/juk/systemtray.h #1246182:1246183 @@ -94,7 +94,7 @@ Q_OBJECT public: - SystemTray(PlayerManager *player, QWidget *parent = 0); + explicit SystemTray(PlayerManager *player, QWidget *parent = 0); signals: // Emitted when the fade process is complete. --- trunk/KDE/kdemultimedia/juk/tageditor.cpp #1246182:1246183 @@ -511,7 +511,7 @@ foreach(QCheckBox *enable, findChildren(QRegExp("Enable"))) { enable->hide(); - QRegExp re("^" + enable->objectName().replace("Enable", "") + "(Box|Spin)$"); + QRegExp re('^' + enable->objectName().replace("Enable", "") + "(Box|Spin)$"); QList targets = findChildren(re); Q_ASSERT(!targets.isEmpty()); m_enableBoxes[targets.front()] = enable; --- trunk/KDE/kdemultimedia/juk/tageditor.ui #1246182:1246183 @@ -77,10 +77,10 @@ - + - + @@ -251,7 +251,7 @@ KLineEdit - QLineEdit + KLineEdit
klineedit.h
 --- trunk/KDE/kdemultimedia/juk/tagguesser.cpp #1246182:1246183 @@ -180,7 +180,11 @@ void TagGuesser::guess(const QString &absFileName) { - m_title = m_artist = m_album = m_track = m_comment = QString(); + m_title.clear(); + m_artist.clear(); + m_album.clear(); + m_track.clear(); + m_comment.clear(); FileNameScheme::List::ConstIterator it = m_schemes.constBegin(); FileNameScheme::List::ConstIterator end = m_schemes.constEnd(); --- trunk/KDE/kdemultimedia/juk/trackpickerdialog.cpp #1246182:1246183 @@ -14,14 +14,15 @@ ***************************************************************************/ #include + +#include "trackpickerdialog.h" + #if HAVE_TUNEPIMP #include #include -#include "trackpickerdialog.h" - #define NUMBER(x) (x == 0 ? QString::null : QString::number(x)) //krazy:exclude=nullstrassign for old broken gcc class TrackPickerItem : public K3ListViewItem