diff options
| author | Aqua-sama <aqua@iserlohn-fortress.net> | 2017-04-02 20:22:13 +0200 |
|---|---|---|
| committer | Aqua-sama <aqua@iserlohn-fortress.net> | 2017-04-02 20:22:13 +0200 |
| commit | b231faf8ed4d8cc009a33afb636fd4fe197ddd0e (patch) | |
| tree | 5fb9642ea245a7f906f44f253c5d50d18772c316 | |
| parent | Some code cleanup (diff) | |
| download | smolbote-b231faf8ed4d8cc009a33afb636fd4fe197ddd0e.tar.xz | |
Updated pre-commit.rb
44 files changed, 51 insertions, 51 deletions
diff --git a/src/blocker/blockermanager.cpp b/src/blocker/blockermanager.cpp index e8533fe..16caa98 100644 --- a/src/blocker/blockermanager.cpp +++ b/src/blocker/blockermanager.cpp @@ -1,4 +1,4 @@ -/** LICENSE ******************************************************************** +/******************************************************************************* ** ** smolbote: yet another qute browser ** Copyright (C) 2017 Xian Nox diff --git a/src/blocker/blockermanager.h b/src/blocker/blockermanager.h index 726053c..cffcf5f 100644 --- a/src/blocker/blockermanager.h +++ b/src/blocker/blockermanager.h @@ -1,4 +1,4 @@ -/** LICENSE ******************************************************************** +/******************************************************************************* ** ** smolbote: yet another qute browser ** Copyright (C) 2017 Xian Nox diff --git a/src/blocker/blockerrule.cpp b/src/blocker/blockerrule.cpp index fb7f2bf..f0bfbd6 100644 --- a/src/blocker/blockerrule.cpp +++ b/src/blocker/blockerrule.cpp @@ -1,4 +1,4 @@ -/** LICENSE ******************************************************************** +/******************************************************************************* ** ** smolbote: yet another qute browser ** Copyright (C) 2017 Xian Nox diff --git a/src/blocker/blockerrule.h b/src/blocker/blockerrule.h index 85a5dc1..a98f699 100644 --- a/src/blocker/blockerrule.h +++ b/src/blocker/blockerrule.h @@ -1,4 +1,4 @@ -/** LICENSE ******************************************************************** +/******************************************************************************* ** ** smolbote: yet another qute browser ** Copyright (C) 2017 Xian Nox diff --git a/src/blocker/blockersubscription.cpp b/src/blocker/blockersubscription.cpp index 86cb0b5..f5af196 100644 --- a/src/blocker/blockersubscription.cpp +++ b/src/blocker/blockersubscription.cpp @@ -1,4 +1,4 @@ -/** LICENSE ******************************************************************** +/******************************************************************************* ** ** smolbote: yet another qute browser ** Copyright (C) 2017 Xian Nox diff --git a/src/blocker/blockersubscription.h b/src/blocker/blockersubscription.h index 918a4dc..d3d2b7e 100644 --- a/src/blocker/blockersubscription.h +++ b/src/blocker/blockersubscription.h @@ -1,4 +1,4 @@ -/** LICENSE ******************************************************************** +/******************************************************************************* ** ** smolbote: yet another qute browser ** Copyright (C) 2017 Xian Nox diff --git a/src/blocker/regexp.cpp b/src/blocker/regexp.cpp index a8dff79..30fe00e 100644 --- a/src/blocker/regexp.cpp +++ b/src/blocker/regexp.cpp @@ -1,4 +1,4 @@ -/** LICENSE ******************************************************************** +/******************************************************************************* ** ** smolbote: yet another qute browser ** Copyright (C) 2017 Xian Nox diff --git a/src/blocker/regexp.h b/src/blocker/regexp.h index 16827ad..183fa35 100644 --- a/src/blocker/regexp.h +++ b/src/blocker/regexp.h @@ -1,4 +1,4 @@ -/** LICENSE ******************************************************************** +/******************************************************************************* ** ** smolbote: yet another qute browser ** Copyright (C) 2017 Xian Nox diff --git a/src/browser.cpp b/src/browser.cpp index 4df7eb9..942df00 100644 --- a/src/browser.cpp +++ b/src/browser.cpp @@ -1,4 +1,4 @@ -/** LICENSE ******************************************************************** +/******************************************************************************* ** ** smolbote: yet another qute browser ** Copyright (C) 2017 Xian Nox diff --git a/src/browser.h b/src/browser.h index bb4a6bf..1f50599 100644 --- a/src/browser.h +++ b/src/browser.h @@ -1,4 +1,4 @@ -/** LICENSE ******************************************************************** +/******************************************************************************* ** ** smolbote: yet another qute browser ** Copyright (C) 2017 Xian Nox diff --git a/src/forms/aboutdialog.cpp b/src/forms/aboutdialog.cpp index dd26e91..e5dd854 100644 --- a/src/forms/aboutdialog.cpp +++ b/src/forms/aboutdialog.cpp @@ -1,4 +1,4 @@ -/** LICENSE ******************************************************************** +/******************************************************************************* ** ** smolbote: yet another qute browser ** Copyright (C) 2017 Xian Nox diff --git a/src/forms/aboutdialog.h b/src/forms/aboutdialog.h index aaa299a..98a4a49 100644 --- a/src/forms/aboutdialog.h +++ b/src/forms/aboutdialog.h @@ -1,4 +1,4 @@ -/** LICENSE ******************************************************************** +/******************************************************************************* ** ** smolbote: yet another qute browser ** Copyright (C) 2017 Xian Nox diff --git a/src/forms/bookmarkswidget.cpp b/src/forms/bookmarkswidget.cpp index 63062a2..ffb5d6c 100644 --- a/src/forms/bookmarkswidget.cpp +++ b/src/forms/bookmarkswidget.cpp @@ -1,4 +1,4 @@ -/** LICENSE ******************************************************************** +/******************************************************************************* ** ** smolbote: yet another qute browser ** Copyright (C) 2017 Xian Nox diff --git a/src/forms/bookmarkswidget.h b/src/forms/bookmarkswidget.h index 19c49e5..ba0b361 100644 --- a/src/forms/bookmarkswidget.h +++ b/src/forms/bookmarkswidget.h @@ -1,4 +1,4 @@ -/** LICENSE ******************************************************************** +/******************************************************************************* ** ** smolbote: yet another qute browser ** Copyright (C) 2017 Xian Nox diff --git a/src/forms/cookiesform.cpp b/src/forms/cookiesform.cpp index 7dfeb26..37b00c5 100644 --- a/src/forms/cookiesform.cpp +++ b/src/forms/cookiesform.cpp @@ -1,4 +1,4 @@ -/** LICENSE ******************************************************************** +/******************************************************************************* ** ** smolbote: yet another qute browser ** Copyright (C) 2017 Xian Nox diff --git a/src/forms/cookiesform.h b/src/forms/cookiesform.h index 0b3386a..4484823 100644 --- a/src/forms/cookiesform.h +++ b/src/forms/cookiesform.h @@ -1,4 +1,4 @@ -/** LICENSE ******************************************************************** +/******************************************************************************* ** ** smolbote: yet another qute browser ** Copyright (C) 2017 Xian Nox diff --git a/src/forms/downloadswidget.cpp b/src/forms/downloadswidget.cpp index 45c458d..ab1d6c0 100644 --- a/src/forms/downloadswidget.cpp +++ b/src/forms/downloadswidget.cpp @@ -1,4 +1,4 @@ -/** LICENSE ******************************************************************** +/******************************************************************************* ** ** smolbote: yet another qute browser ** Copyright (C) 2017 Xian Nox diff --git a/src/forms/downloadswidget.h b/src/forms/downloadswidget.h index 1ae29ee..fed3833 100644 --- a/src/forms/downloadswidget.h +++ b/src/forms/downloadswidget.h @@ -1,4 +1,4 @@ -/** LICENSE ******************************************************************** +/******************************************************************************* ** ** smolbote: yet another qute browser ** Copyright (C) 2017 Xian Nox diff --git a/src/forms/profiledialog.cpp b/src/forms/profiledialog.cpp index 047f51b..4d6c047 100644 --- a/src/forms/profiledialog.cpp +++ b/src/forms/profiledialog.cpp @@ -1,4 +1,4 @@ -/** LICENSE ******************************************************************** +/******************************************************************************* ** ** smolbote: yet another qute browser ** Copyright (C) 2017 Xian Nox diff --git a/src/forms/profiledialog.h b/src/forms/profiledialog.h index 79f85b1..613ed80 100644 --- a/src/forms/profiledialog.h +++ b/src/forms/profiledialog.h @@ -1,4 +1,4 @@ -/** LICENSE ******************************************************************** +/******************************************************************************* ** ** smolbote: yet another qute browser ** Copyright (C) 2017 Xian Nox diff --git a/src/main.cpp b/src/main.cpp index 964a226..0e55a8f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,4 +1,4 @@ -/** LICENSE ******************************************************************** +/******************************************************************************* ** ** smolbote: yet another qute browser ** Copyright (C) 2017 Xian Nox diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 5c6f0ca..76e4a54 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -1,4 +1,4 @@ -/** LICENSE ******************************************************************** +/******************************************************************************* ** ** smolbote: yet another qute browser ** Copyright (C) 2017 Xian Nox diff --git a/src/mainwindow.h b/src/mainwindow.h index 2865fa9..2456490 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -1,4 +1,4 @@ -/** LICENSE ******************************************************************** +/******************************************************************************* ** ** smolbote: yet another qute browser ** Copyright (C) 2017 Xian Nox diff --git a/src/settings.cpp b/src/settings.cpp index 5d78cb7..c1485b1 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -1,4 +1,4 @@ -/** LICENSE ******************************************************************** +/******************************************************************************* ** ** smolbote: yet another qute browser ** Copyright (C) 2017 Xian Nox diff --git a/src/settings.h b/src/settings.h index 32eb4b4..76cf949 100644 --- a/src/settings.h +++ b/src/settings.h @@ -1,4 +1,4 @@ -/** LICENSE ******************************************************************** +/******************************************************************************* ** ** smolbote: yet another qute browser ** Copyright (C) 2017 Xian Nox @@ -27,7 +27,7 @@ class Settings { public: - Settings(const QString &configFile = QString()); + explicit Settings(const QString &configFile = QString()); ~Settings(); QString filePath() const; diff --git a/src/webengine/urlinterceptor.cpp b/src/webengine/urlinterceptor.cpp index 94bfffa..2a8f816 100644 --- a/src/webengine/urlinterceptor.cpp +++ b/src/webengine/urlinterceptor.cpp @@ -1,4 +1,4 @@ -/** LICENSE ******************************************************************** +/******************************************************************************* ** ** smolbote: yet another qute browser ** Copyright (C) 2017 Xian Nox diff --git a/src/webengine/urlinterceptor.h b/src/webengine/urlinterceptor.h index 2e5d6bf..65f2ce0 100644 --- a/src/webengine/urlinterceptor.h +++ b/src/webengine/urlinterceptor.h @@ -1,4 +1,4 @@ -/** LICENSE ******************************************************************** +/******************************************************************************* ** ** smolbote: yet another qute browser ** Copyright (C) 2017 Xian Nox diff --git a/src/webengine/webengineprofile.cpp b/src/webengine/webengineprofile.cpp index 1ff27dc..814d38c 100644 --- a/src/webengine/webengineprofile.cpp +++ b/src/webengine/webengineprofile.cpp @@ -1,4 +1,4 @@ -/** LICENSE ******************************************************************** +/******************************************************************************* ** ** smolbote: yet another qute browser ** Copyright (C) 2017 Xian Nox diff --git a/src/webengine/webengineprofile.h b/src/webengine/webengineprofile.h index 421ff0e..dfdd0f8 100644 --- a/src/webengine/webengineprofile.h +++ b/src/webengine/webengineprofile.h @@ -1,4 +1,4 @@ -/** LICENSE ******************************************************************** +/******************************************************************************* ** ** smolbote: yet another qute browser ** Copyright (C) 2017 Xian Nox @@ -28,7 +28,7 @@ class WebEngineProfile : public QWebEngineProfile { Q_OBJECT public: - WebEngineProfile(QObject *parent = Q_NULLPTR); + explicit WebEngineProfile(QObject *parent = Q_NULLPTR); WebEngineProfile(const QString &storageName, QObject *parent = Q_NULLPTR); ~WebEngineProfile(); diff --git a/src/webengine/webview.cpp b/src/webengine/webview.cpp index 71708b7..6742101 100644 --- a/src/webengine/webview.cpp +++ b/src/webengine/webview.cpp @@ -1,4 +1,4 @@ -/** LICENSE ******************************************************************** +/******************************************************************************* ** ** smolbote: yet another qute browser ** Copyright (C) 2017 Xian Nox diff --git a/src/webengine/webview.h b/src/webengine/webview.h index c833067..557c5a4 100644 --- a/src/webengine/webview.h +++ b/src/webengine/webview.h @@ -1,4 +1,4 @@ -/** LICENSE ******************************************************************** +/******************************************************************************* ** ** smolbote: yet another qute browser ** Copyright (C) 2017 Xian Nox diff --git a/src/widgets/dockingwidget.cpp b/src/widgets/dockingwidget.cpp index d7f7d30..e501f16 100644 --- a/src/widgets/dockingwidget.cpp +++ b/src/widgets/dockingwidget.cpp @@ -1,4 +1,4 @@ -/** LICENSE ******************************************************************** +/******************************************************************************* ** ** smolbote: yet another qute browser ** Copyright (C) 2017 Xian Nox diff --git a/src/widgets/dockingwidget.h b/src/widgets/dockingwidget.h index bd1d210..4b35758 100644 --- a/src/widgets/dockingwidget.h +++ b/src/widgets/dockingwidget.h @@ -1,4 +1,4 @@ -/** LICENSE ******************************************************************** +/******************************************************************************* ** ** smolbote: yet another qute browser ** Copyright (C) 2017 Xian Nox diff --git a/src/widgets/downloaditemwidget.cpp b/src/widgets/downloaditemwidget.cpp index 78b8a7c..57ece0a 100644 --- a/src/widgets/downloaditemwidget.cpp +++ b/src/widgets/downloaditemwidget.cpp @@ -1,4 +1,4 @@ -/** LICENSE ******************************************************************** +/******************************************************************************* ** ** smolbote: yet another qute browser ** Copyright (C) 2017 Xian Nox diff --git a/src/widgets/downloaditemwidget.h b/src/widgets/downloaditemwidget.h index a27f9a8..e2f764e 100644 --- a/src/widgets/downloaditemwidget.h +++ b/src/widgets/downloaditemwidget.h @@ -1,4 +1,4 @@ -/** LICENSE ******************************************************************** +/******************************************************************************* ** ** smolbote: yet another qute browser ** Copyright (C) 2017 Xian Nox diff --git a/src/widgets/loadingbar.cpp b/src/widgets/loadingbar.cpp index 31208b8..a9194bd 100644 --- a/src/widgets/loadingbar.cpp +++ b/src/widgets/loadingbar.cpp @@ -1,4 +1,4 @@ -/** LICENSE ******************************************************************** +/******************************************************************************* ** ** smolbote: yet another qute browser ** Copyright (C) 2017 Xian Nox diff --git a/src/widgets/loadingbar.h b/src/widgets/loadingbar.h index 938549f..4523f88 100644 --- a/src/widgets/loadingbar.h +++ b/src/widgets/loadingbar.h @@ -1,4 +1,4 @@ -/** LICENSE ******************************************************************** +/******************************************************************************* ** ** smolbote: yet another qute browser ** Copyright (C) 2017 Xian Nox diff --git a/src/widgets/urllineedit.cpp b/src/widgets/urllineedit.cpp index 6f07a4a..5063191 100644 --- a/src/widgets/urllineedit.cpp +++ b/src/widgets/urllineedit.cpp @@ -1,4 +1,4 @@ -/** LICENSE ******************************************************************** +/******************************************************************************* ** ** smolbote: yet another qute browser ** Copyright (C) 2017 Xian Nox diff --git a/src/widgets/urllineedit.h b/src/widgets/urllineedit.h index c925c28..d9d11ae 100644 --- a/src/widgets/urllineedit.h +++ b/src/widgets/urllineedit.h @@ -1,4 +1,4 @@ -/** LICENSE ******************************************************************** +/******************************************************************************* ** ** smolbote: yet another qute browser ** Copyright (C) 2017 Xian Nox diff --git a/src/widgets/webviewtabbar.cpp b/src/widgets/webviewtabbar.cpp index c482eb3..71d3c92 100644 --- a/src/widgets/webviewtabbar.cpp +++ b/src/widgets/webviewtabbar.cpp @@ -1,4 +1,4 @@ -/** LICENSE ******************************************************************** +/******************************************************************************* ** ** smolbote: yet another qute browser ** Copyright (C) 2017 Xian Nox diff --git a/src/widgets/webviewtabbar.h b/src/widgets/webviewtabbar.h index 91e55d0..f7772e0 100644 --- a/src/widgets/webviewtabbar.h +++ b/src/widgets/webviewtabbar.h @@ -1,4 +1,4 @@ -/** LICENSE ******************************************************************** +/******************************************************************************* ** ** smolbote: yet another qute browser ** Copyright (C) 2017 Xian Nox @@ -29,7 +29,7 @@ class WebViewTabBar : public QTabBar Q_OBJECT public: - WebViewTabBar(QWidget *parent = 0); + explicit WebViewTabBar(QWidget *parent = 0); ~WebViewTabBar(); void setProfile(QWebEngineProfile *profile); diff --git a/src/xbel.cpp b/src/xbel.cpp index 59204d8..7ba0cb4 100644 --- a/src/xbel.cpp +++ b/src/xbel.cpp @@ -1,4 +1,4 @@ -/** LICENSE ******************************************************************** +/******************************************************************************* ** ** smolbote: yet another qute browser ** Copyright (C) 2017 Xian Nox @@ -1,4 +1,4 @@ -/** LICENSE ******************************************************************** +/******************************************************************************* ** ** smolbote: yet another qute browser ** Copyright (C) 2017 Xian Nox @@ -29,7 +29,7 @@ class QTreeWidgetItem; class Xbel { public: - Xbel(QTreeWidget *widget); + explicit Xbel(QTreeWidget *widget); bool read(const QString &xbel); bool write(const QString &xbel); diff --git a/tools/hooks/pre-commit.rb b/tools/hooks/pre-commit.rb index 6e52147..ef2c6a5 100755 --- a/tools/hooks/pre-commit.rb +++ b/tools/hooks/pre-commit.rb @@ -7,15 +7,15 @@ puts "Running in #{`pwd`}" puts 'Checking licenses...' files.each { |name| - File.open(name) { |f| - if not f.readline.start_with? '/** LICENSE **' then - puts "Missing license header: #{name}" + File.open(name) { |file| + if file.grep(/Copyright\s\(C\)\s(\d{4}\s*-\s*){0,1}(#{Time.now.year})/).empty? then + puts "Missing or incorrect license header: #{name}" result = 1 end } } -puts 'Checking style...' +puts 'Running astyle...' if not `astyle --dry-run --formatted --options=astyle.rc #{files.join(' ')}`.empty? then system "astyle --verbose --suffix=none --formatted --options=astyle.rc #{files.join(' ')}" result = 1 |