[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [dragon] src: Fix minor EBN issues
From: Yuri Chornoivan <null () kde ! org>
Date: 2018-09-21 16:40:25
Message-ID: E1g3OTh-00080Z-Ab () code ! kde ! org
[Download RAW message or body]
Git commit 9c8fa7195c401729914918eda324d6822561bffb by Yuri Chornoivan.
Committed on 21/09/2018 at 16:40.
Pushed by yurchor into branch 'master'.
Fix minor EBN issues
M +1 -1 src/app/adjustSizeButton.h
M +20 -5 src/app/analyzer/analyzerBase.cpp
M +20 -3 src/app/analyzer/analyzerBase.h
M +1 -1 src/app/analyzer/blockAnalyzer.cpp
M +2 -2 src/app/analyzer/blockAnalyzer.h
M +1 -1 src/app/analyzer/fht.h
M +1 -1 src/app/fullScreenToolBarHandler.h
M +1 -1 src/app/mainWindow.cpp
M +1 -1 src/app/partToolBar.h
M +2 -2 src/app/playlistFile.cpp
M +1 -1 src/app/playlistFile.h
M +1 -1 src/app/videoWindow.h
M +3 -3 src/codeine.h
M +2 -2 src/mpris2/mediaplayer2.h
M +2 -2 src/mpris2/mediaplayer2player.h
https://commits.kde.org/dragon/9c8fa7195c401729914918eda324d6822561bffb
diff --git a/src/app/adjustSizeButton.h b/src/app/adjustSizeButton.h
index 320d5ee..f9654a8 100644
--- a/src/app/adjustSizeButton.h
+++ b/src/app/adjustSizeButton.h
@@ -43,7 +43,7 @@ class AdjustSizeButton : public QFrame
QFrame *m_thingy;
public:
- AdjustSizeButton( QWidget *parent );
+ explicit AdjustSizeButton( QWidget *parent );
private:
virtual void timerEvent( QTimerEvent* ) Q_DECL_OVERRIDE;
diff --git a/src/app/analyzer/analyzerBase.cpp b/src/app/analyzer/analyzerBase.cpp
index 3cc10d5..6255158 100644
--- a/src/app/analyzer/analyzerBase.cpp
+++ b/src/app/analyzer/analyzerBase.cpp
@@ -1,8 +1,23 @@
-/*
- Copyright 2003 by Max Howell
- Copyright 2009 by Martin Sandsmark
- LOL GPL
-*/
+ /***********************************************************************
+ * Copyright 2003 Max Howell <max.howell@methylblue.com>
+ * 2009 Martin Sandsmark <sandsmark@samfundet.no>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License or (at your option) version 3 or any later version
+ * accepted by the membership of KDE e.V. (or its successor approved
+ * by the membership of KDE e.V.), which shall act as a proxy
+ * defined in Section 14 of version 3 of the license.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ ***********************************************************************/
#include "analyzerBase.h"
#include <cmath> //interpolate()
diff --git a/src/app/analyzer/analyzerBase.h b/src/app/analyzer/analyzerBase.h
index aadc56b..32ec845 100644
--- a/src/app/analyzer/analyzerBase.h
+++ b/src/app/analyzer/analyzerBase.h
@@ -1,6 +1,23 @@
-// Author: Max Howell <max.howell@methylblue.com>, (C) 2004
-// Maintainer: Martin Sandsmark <sandsmark@samfundet.no>, (C) 2009
-// Copyright: See the COPYING file shipped with this distribution
+ /***********************************************************************
+ * Copyright 2004 Max Howell <max.howell@methylblue.com>
+ * 2009 Martin Sandsmark <sandsmark@samfundet.no>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License or (at your option) version 3 or any later version
+ * accepted by the membership of KDE e.V. (or its successor approved
+ * by the membership of KDE e.V.), which shall act as a proxy
+ * defined in Section 14 of version 3 of the license.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ ***********************************************************************/
#ifndef ANALYZERBASE_H
#define ANALYZERBASE_H
diff --git a/src/app/analyzer/blockAnalyzer.cpp b/src/app/analyzer/blockAnalyzer.cpp
index 500b272..4056785 100644
--- a/src/app/analyzer/blockAnalyzer.cpp
+++ b/src/app/analyzer/blockAnalyzer.cpp
@@ -9,7 +9,7 @@
* *
* This program is distributed in the hope that it will be useful, but WITHOUT ANY *
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A *
- * PARTICULAR PURPOSE. See the GNU General Pulic License for more details. *
+ * PARTICULAR PURPOSE. See the GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License along with *
* this program. If not, see <http://www.gnu.org/licenses/>. *
diff --git a/src/app/analyzer/blockAnalyzer.h b/src/app/analyzer/blockAnalyzer.h
index 542a957..0ef462a 100644
--- a/src/app/analyzer/blockAnalyzer.h
+++ b/src/app/analyzer/blockAnalyzer.h
@@ -8,7 +8,7 @@
* *
* This program is distributed in the hope that it will be useful, but WITHOUT ANY *
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A *
- * PARTICULAR PURPOSE. See the GNU General Pulic License for more details. *
+ * PARTICULAR PURPOSE. See the GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License along with *
* this program. If not, see <http://www.gnu.org/licenses/>. *
@@ -37,7 +37,7 @@ class QPalette;
class BlockAnalyzer : public Analyzer::Base2D
{
public:
- BlockAnalyzer( QWidget* );
+ explicit BlockAnalyzer( QWidget* );
~BlockAnalyzer();
// Signed ints because most of what we compare them against are ints
diff --git a/src/app/analyzer/fht.h b/src/app/analyzer/fht.h
index 857be19..1ed483d 100644
--- a/src/app/analyzer/fht.h
+++ b/src/app/analyzer/fht.h
@@ -55,7 +55,7 @@ class FHT
* should be at least 3. Values of more than 3 need a trigonometry table.
* @see makeCasTable()
*/
- FHT(int);
+ explicit FHT(int);
~FHT();
inline int sizeExp() const { return m_exp2; }
diff --git a/src/app/fullScreenToolBarHandler.h b/src/app/fullScreenToolBarHandler.h
index 5b3a145..2e762a3 100644
--- a/src/app/fullScreenToolBarHandler.h
+++ b/src/app/fullScreenToolBarHandler.h
@@ -34,7 +34,7 @@ class FullScreenToolBarHandler : QObject
{
Q_OBJECT
public:
- FullScreenToolBarHandler(KMainWindow *parent );
+ explicit FullScreenToolBarHandler(KMainWindow *parent );
bool eventFilter( QObject *o, QEvent *e ) Q_DECL_OVERRIDE;
void timerEvent( QTimerEvent* ) Q_DECL_OVERRIDE;
private:
diff --git a/src/app/mainWindow.cpp b/src/app/mainWindow.cpp
index 3f21294..f987e58 100644
--- a/src/app/mainWindow.cpp
+++ b/src/app/mainWindow.cpp
@@ -845,7 +845,7 @@ MainWindow::inhibitPowerSave()
void
MainWindow::releasePowerSave()
{
- //stop supressing sleep
+ //stop suppressing sleep
if (m_stopSleepCookie != -1) {
::close(m_stopSleepCookie);
m_stopSleepCookie = -1;
diff --git a/src/app/partToolBar.h b/src/app/partToolBar.h
index 186215d..f9bd9d3 100644
--- a/src/app/partToolBar.h
+++ b/src/app/partToolBar.h
@@ -31,7 +31,7 @@ class MouseOverToolBar : public KToolBar
virtual bool eventFilter( QObject*, QEvent* ) Q_DECL_OVERRIDE;
public:
- MouseOverToolBar( QWidget *parent );
+ explicit MouseOverToolBar( QWidget *parent );
};
#endif
diff --git a/src/app/playlistFile.cpp b/src/app/playlistFile.cpp
index 4f95d38..debe708 100644
--- a/src/app/playlistFile.cpp
+++ b/src/app/playlistFile.cpp
@@ -32,8 +32,8 @@
#include <QApplication>
#include <QFile>
#include <QDebug>
-#include <QtWidgets/qgraphicsitem.h>
-#include <QtGui/qevent.h>
+#include <QGraphicsItem>
+#include <QEvent>
PlaylistFile::PlaylistFile(const QUrl &url )
: m_url( url )
diff --git a/src/app/playlistFile.h b/src/app/playlistFile.h
index 11255bd..b1de4d5 100644
--- a/src/app/playlistFile.h
+++ b/src/app/playlistFile.h
@@ -29,7 +29,7 @@
class PlaylistFile
{
public:
- PlaylistFile( const QUrl &url );
+ explicit PlaylistFile( const QUrl &url );
~PlaylistFile();
enum FileFormat { M3U, PLS, Unknown, NotPlaylistFile = Unknown };
diff --git a/src/app/videoWindow.h b/src/app/videoWindow.h
index 0373eeb..ea688ae 100644
--- a/src/app/videoWindow.h
+++ b/src/app/videoWindow.h
@@ -84,7 +84,7 @@ private:
, const char* actionSlot );
public:
- VideoWindow( QWidget *parent );
+ explicit VideoWindow( QWidget *parent );
~VideoWindow();
bool init();
diff --git a/src/codeine.h b/src/codeine.h
index 77870f2..78afd7a 100644
--- a/src/codeine.h
+++ b/src/codeine.h
@@ -17,10 +17,10 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
***********************************************************************/
-#ifndef DRAGONPLAYER_H
-#define DRAGONPLAYER_H
+#ifndef CODEINE_H
+#define CODEINE_H
-#include "config.h"
+#include <config.h>
// try to keep this file light. It gets included by
// practically every implementation and many headers
diff --git a/src/mpris2/mediaplayer2.h b/src/mpris2/mediaplayer2.h
index c8e67fe..6b3af01 100644
--- a/src/mpris2/mediaplayer2.h
+++ b/src/mpris2/mediaplayer2.h
@@ -18,8 +18,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
***********************************************************************/
-#ifndef DRAGONPLAYER_MEDIAPLAYRER2_H
-#define DRAGONPLAYER_MEDIAPLAYRER2_H
+#ifndef DRAGONPLAYER_MEDIAPLAYER2_H
+#define DRAGONPLAYER_MEDIAPLAYER2_H
#include <QDBusAbstractAdaptor>
#include <QStringList> // Needed for automoc'ed cpp to compile
diff --git a/src/mpris2/mediaplayer2player.h b/src/mpris2/mediaplayer2player.h
index d9a7c47..a830294 100644
--- a/src/mpris2/mediaplayer2player.h
+++ b/src/mpris2/mediaplayer2player.h
@@ -18,8 +18,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
***********************************************************************/
-#ifndef DRAGONPLAYER_MEDIAPLAYRER2PLAYER_H
-#define DRAGONPLAYER_MEDIAPLAYRER2PLAYER_H
+#ifndef DRAGONPLAYER_MEDIAPLAYER2PLAYER_H
+#define DRAGONPLAYER_MEDIAPLAYER2PLAYER_H
#include <QDBusAbstractAdaptor>
#include <QDBusObjectPath>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic