Fix some problems

dist/copyright.py

@@ -123,6 +123,7 @@ def change_file(filename):
         copyrights=gen_copyrights(filename)
                 
         if -1 == content[0].find("/* This file is part of Clementine."):
+                print("File {} have no Clementine copyright info".format(filename))
                 return 0
 
         for i in content:

dist/cpplint.py

@@ -245,7 +245,7 @@ _ERROR_CATEGORIES = [
 # flag. By default all errors are on, so only add here categories that should be
 # off by default (i.e., categories that must be enabled by the --filter= flags).
 # All entries here should start with a '-' or '+', as in the --filter= flag.
-_DEFAULT_FILTERS = ['-build/include_alpha', '-build/include_order', '-build/include', '-readability/function', '-runtime/references']
+_DEFAULT_FILTERS = ['-build/include_alpha', '-build/include_order', '-build/include', '-readability/function', '-runtime/references', '-whitespace/line_length', '-readability/streams']
 
 # We used to check for high-bit characters, but after much discussion we
 # decided those were OK, as long as they were in UTF-8 and didn't represent

src/core/database.h

@@ -180,7 +180,7 @@ class Database : public QObject {
 
 class MemoryDatabase : public Database {
  public:
-  MemoryDatabase(Application* app, QObject* parent = nullptr)
+  explicit MemoryDatabase(Application* app, QObject* parent = nullptr)
       : Database(app, parent, ":memory:") {}
   ~MemoryDatabase() {
     // Make sure Qt doesn't reuse the same database

src/core/mergedproxymodel.cpp

@@ -47,7 +47,8 @@ std::size_t hash_value(const QModelIndex& index) { return qHash(index); }
 namespace {
 
 struct Mapping {
-  explicit Mapping(const QModelIndex& _source_index) : source_index(_source_index) {}
+  explicit Mapping(const QModelIndex& _source_index) :
+    source_index(_source_index) {}
 
   QModelIndex source_index;
 };
@@ -193,9 +194,9 @@ void MergedProxyModel::SourceModelReset() {
 void MergedProxyModel::SubModelReset() {
   QAbstractItemModel* submodel = static_cast<QAbstractItemModel*>(sender());
 
-  // TODO(David Sansome): When we require Qt 4.6, use beginResetModel() and endResetModel()
+  // TODO(David Sansome): When we require Qt 4.6, use beginResetModel() and
-  // in LibraryModel and catch those here - that will let us do away with this
+  // endResetModel() in LibraryModel and catch those here - that will let
-  // std::numeric_limits<int>::max() hack.
+  // us do away with this std::numeric_limits<int>::max() hack.
 
   // Remove all the children of the item that got deleted
   QModelIndex source_parent = merge_points_.value(submodel);

src/core/modelfuturewatcher.h

@@ -25,7 +25,7 @@
 template <typename T>
 class ModelFutureWatcher : public QFutureWatcher<T> {
  public:
-  ModelFutureWatcher(const QModelIndex& index, QObject* parent = nullptr)
+  explicit ModelFutureWatcher(const QModelIndex& index, QObject* parent = nullptr)
       : QFutureWatcher<T>(parent), index_(index) {}
 
   ~ModelFutureWatcher() {}

src/core/mpris.h

@@ -33,7 +33,7 @@ class Mpris : public QObject {
   Q_OBJECT
 
  public:
-  Mpris(Application* app, QObject* parent = nullptr);
+  explicit Mpris(Application* app, QObject* parent = nullptr);
 
  signals:
   void RaiseMainWindow();

src/core/mpris1.h

@@ -104,7 +104,7 @@ class Mpris1Root : public QObject {
   Q_OBJECT
 
  public:
-  Mpris1Root(Application* app, QObject* parent = nullptr);
+  explicit Mpris1Root(Application* app, QObject* parent = nullptr);
 
   QString Identity();
   void Quit();
@@ -118,7 +118,7 @@ class Mpris1Player : public QObject {
   Q_OBJECT
 
  public:
-  Mpris1Player(Application* app, QObject* parent = nullptr);
+  explicit Mpris1Player(Application* app, QObject* parent = nullptr);
 
   void Pause();
   void Stop();
@@ -173,7 +173,7 @@ class Mpris1TrackList : public QObject {
   Q_OBJECT
 
  public:
-  Mpris1TrackList(Application* app, QObject* parent = nullptr);
+  explicit Mpris1TrackList(Application* app, QObject* parent = nullptr);
 
   int AddTrack(const QString&, bool);
   void DelTrack(int index);

src/core/mpris2.cpp

@@ -175,7 +175,7 @@ void Mpris2::EmitNotification(const QString& name) {
   if (value.isValid()) EmitNotification(name, value);
 }
 
-//------------------Root Interface--------------------------//
+  // ------------------Root Interface--------------- //
 
 bool Mpris2::CanQuit() const { return true; }
 

src/core/network.h

@@ -61,7 +61,7 @@ class RedirectFollower : public QObject {
   Q_OBJECT
 
  public:
-  RedirectFollower(QNetworkReply* first_reply, int max_redirects = 5);
+  explicit RedirectFollower(QNetworkReply* first_reply, int max_redirects = 5);
 
   bool hit_redirect_limit() const { return redirects_remaining_ < 0; }
   QNetworkReply* reply() const { return current_reply_; }
@@ -106,7 +106,7 @@ class NetworkTimeouts : public QObject {
   Q_OBJECT
 
  public:
-  NetworkTimeouts(int timeout_msec, QObject* parent = nullptr);
+  explicit NetworkTimeouts(int timeout_msec, QObject* parent = nullptr);
 
   // TODO(John Maguire): Template this to avoid code duplication.
   void AddReply(QNetworkReply* reply);

src/core/organise.h

@@ -47,8 +47,9 @@ class Organise : public QObject {
   typedef QList<NewSongInfo> NewSongInfoList;
 
   Organise(TaskManager* task_manager, std::shared_ptr<MusicStorage> destination,
-           const OrganiseFormat& format, bool copy, bool overwrite, bool mark_as_listened,
+           const OrganiseFormat& format, bool copy, bool overwrite,
-           const NewSongInfoList& songs, bool eject_after);
+           bool mark_as_listened, const NewSongInfoList& songs,
+           bool eject_after);
 
   static const int kBatchSize;
   static const int kTranscodeProgressInterval;

src/core/organiseformat.cpp

@@ -177,6 +177,8 @@ QString OrganiseFormat::ParseBlock(QString block, const Song& song,
 QString OrganiseFormat::TagValue(const QString& tag, const Song& song) const {
   QString value;
 
+  // TODO(sobkas): What about nice switch statement?
+
   if (tag == "title")
     value = song.title();
   else if (tag == "album")

src/core/organiseformat.h

@@ -27,7 +27,7 @@
 
 class OrganiseFormat {
  public:
-  OrganiseFormat(const QString& format = QString());
+  explicit OrganiseFormat(const QString& format = QString());
 
   static const char* kTagPattern;
   static const char* kBlockPattern;

src/core/player.h

@@ -116,7 +116,7 @@ class Player : public PlayerInterface {
   Q_OBJECT
 
  public:
-  Player(Application* app, QObject* parent = nullptr);
+  explicit Player(Application* app, QObject* parent = nullptr);
   ~Player();
 
   void Init();

src/core/simpletreeitem.h

@@ -30,7 +30,7 @@ class SimpleTreeItem {
  public:
   SimpleTreeItem(int _type, SimpleTreeModel<T>* _model);  // For the root item
   SimpleTreeItem(int _type, const QString& _key, T* _parent = nullptr);
-  SimpleTreeItem(int _type, T* _parent = nullptr);
+  explicit SimpleTreeItem(int _type, T* _parent = nullptr);
   virtual ~SimpleTreeItem();
 
   void InsertNotify(T* _parent);

src/core/simpletreemodel.h

@@ -27,7 +27,7 @@ class QModelIndex;
 template <typename T>
 class SimpleTreeModel : public QAbstractItemModel {
  public:
-  SimpleTreeModel(T* root = 0, QObject* parent = nullptr);
+  explicit SimpleTreeModel(T* root = 0, QObject* parent = nullptr);
   virtual ~SimpleTreeModel() {}
 
   // QAbstractItemModel

src/core/songloader.cpp

@@ -217,7 +217,8 @@ void SongLoader::LoadLocalAsync(const QString& filename) {
   if (!parser) {
     // Check the file extension as well, maybe the magic failed, or it was a
     // basic M3U file which is just a plain list of filenames.
-    parser = playlist_parser_->ParserForExtension(QFileInfo(filename).suffix().toLower());
+    parser = playlist_parser_->
+      ParserForExtension(QFileInfo(filename).suffix().toLower());
   }
 
   if (parser) {

src/podcasts/addpodcastbyurl.h

@@ -34,7 +34,7 @@ class AddPodcastByUrl : public AddPodcastPage {
   Q_OBJECT
 
  public:
-  AddPodcastByUrl(Application* app, QWidget* parent = nullptr);
+  explicit AddPodcastByUrl(Application* app, QWidget* parent = nullptr);
   ~AddPodcastByUrl();
 
   void Show();

src/podcasts/addpodcastdialog.h

@@ -37,7 +37,7 @@ class AddPodcastDialog : public QDialog {
   Q_OBJECT
 
  public:
-  AddPodcastDialog(Application* app, QWidget* parent = nullptr);
+  explicit AddPodcastDialog(Application* app, QWidget* parent = nullptr);
   ~AddPodcastDialog();
 
   static const char* kBbcOpmlUrl;

src/podcasts/addpodcastpage.h

@@ -29,7 +29,7 @@ class AddPodcastPage : public QWidget {
   Q_OBJECT
 
  public:
-  AddPodcastPage(Application* app, QWidget* parent = nullptr);
+  explicit AddPodcastPage(Application* app, QWidget* parent = nullptr);
 
   PodcastDiscoveryModel* model() const { return model_; }
 

src/podcasts/gpoddersearchpage.h

@@ -32,7 +32,7 @@ class GPodderSearchPage : public AddPodcastPage {
   Q_OBJECT
 
  public:
-  GPodderSearchPage(Application* app, QWidget* parent = nullptr);
+  explicit GPodderSearchPage(Application* app, QWidget* parent = nullptr);
   ~GPodderSearchPage();
 
   void Show();

src/podcasts/gpoddersync.h

@@ -45,7 +45,7 @@ class GPodderSync : public QObject {
   Q_OBJECT
 
  public:
-  GPodderSync(Application* app, QObject* parent = nullptr);
+  explicit GPodderSync(Application* app, QObject* parent = nullptr);
   ~GPodderSync();
 
   static const char* kSettingsGroup;

src/podcasts/gpoddertoptagspage.h

@@ -32,7 +32,7 @@ class GPodderTopTagsPage : public AddPodcastPage {
   Q_OBJECT
 
  public:
-  GPodderTopTagsPage(Application* app, QWidget* parent = nullptr);
+  explicit GPodderTopTagsPage(Application* app, QWidget* parent = nullptr);
   ~GPodderTopTagsPage();
 
   static const int kMaxTagCount;

src/podcasts/podcastbackend.h

@@ -31,7 +31,7 @@ class PodcastBackend : public QObject {
   Q_OBJECT
 
  public:
-  PodcastBackend(Application* app, QObject* parent = nullptr);
+  explicit PodcastBackend(Application* app, QObject* parent = nullptr);
 
   // Adds the podcast and any included Episodes to the database.  Updates the
   // podcast with a database ID.  If this podcast already has an ID set, this

src/podcasts/podcastdiscoverymodel.h

@@ -34,7 +34,7 @@ class PodcastDiscoveryModel : public QStandardItemModel {
   Q_OBJECT
 
  public:
-  PodcastDiscoveryModel(Application* app, QObject* parent = nullptr);
+  explicit PodcastDiscoveryModel(Application* app, QObject* parent = nullptr);
 
   enum Type { Type_Folder, Type_Podcast, Type_LoadingIndicator };
 

src/podcasts/podcastdownloader.h

@@ -44,7 +44,7 @@ class PodcastDownloader : public QObject {
   Q_OBJECT
 
  public:
-  PodcastDownloader(Application* app, QObject* parent = nullptr);
+  explicit PodcastDownloader(Application* app, QObject* parent = nullptr);
 
   enum State { NotDownloading, Queued, Downloading, Finished };
 

src/podcasts/podcastupdater.h

@@ -36,7 +36,7 @@ class PodcastUpdater : public QObject {
   Q_OBJECT
 
  public:
-  PodcastUpdater(Application* app, QObject* parent = nullptr);
+  explicit PodcastUpdater(Application* app, QObject* parent = nullptr);
 
   static const char* kSettingsGroup;