Formatting, typos

This commit is contained in:
Klaus Basan
2017-02-03 02:56:55 +01:00
committed by Mathew Sutcliffe
parent f87a06f6d2
commit eeaed099f0
8 changed files with 9 additions and 23 deletions

View File

@@ -22,7 +22,6 @@ using namespace BlackMisc::Input;
namespace BlackCore
{
CInputManager::CInputManager(QObject *parent) :
QObject(parent),
m_keyboard(IKeyboard::create(this)),

View File

@@ -44,6 +44,7 @@ namespace BlackCore
void registerRemoteActions(const QStringList &actions);
//! Register a new hotkey function
//! \remark RecvObj has to be a QObject
template <typename RecvObj>
int bind(const QString &action, RecvObj *receiver, void (RecvObj:: *slotPointer)(bool))
{
@@ -62,7 +63,6 @@ namespace BlackCore
//! Unbind a slot
void unbind(int index);
//!
//! Select a key combination as hotkey. This method returns immediatly.
//! Listen for signals combinationSelectionChanged and combinationSelectionFinished
//! to retrieve the user input.
@@ -104,9 +104,7 @@ namespace BlackCore
CInputManager(QObject *parent = nullptr);
private slots:
void ps_processKeyCombinationChanged(const BlackMisc::Input::CHotkeyCombination &combination);
void ps_processButtonCombinationChanged(const BlackMisc::Input::CHotkeyCombination &combination);
//! Change hotkey settings
@@ -116,7 +114,7 @@ namespace BlackCore
//! Handle to a bound action
struct BindInfo
{
// Using unique int intex for identification because std::function does not have a operator==
// Using unique int index for identification because std::function does not have a operator==
int m_index = 0;
QString m_action;
QPointer<QObject> m_receiver;
@@ -124,7 +122,6 @@ namespace BlackCore
};
int bindImpl(const QString &action, QObject *receiver, std::function<void(bool)> function);
void processCombination(const BlackMisc::Input::CHotkeyCombination &combination);
static CInputManager *m_instance;

View File

@@ -27,7 +27,6 @@
class QWidget;
namespace Ui { class CSettingsHotkeyComponent; }
namespace BlackGui
{
namespace Components
@@ -49,6 +48,7 @@ namespace BlackGui
void ps_addEntry();
void ps_editEntry();
void ps_removeEntry();
void ps_hotkeySlot(bool keyDown);
private:
void addHotkeytoSettings(const BlackMisc::Input::CActionHotkey &actionHotkey);
@@ -61,10 +61,7 @@ namespace BlackGui
BlackGui::Models::CActionHotkeyListModel m_model;
BlackMisc::CSetting<BlackCore::Application::TActionHotkeys> m_actionHotkeys { this };
BlackCore::CActionBind m_action { "/Test/Message", this, &CSettingsHotkeyComponent::ps_hotkeySlot };
void ps_hotkeySlot(bool keyDown);
};
} // ns
} // ns

View File

@@ -26,7 +26,6 @@ class QTimer;
namespace BlackGui
{
//! Widget which displays a vertical audio level meter, indicating the
//! RMS and peak levels of the window of audio samples most recently analyzed
//! by the Engine.
@@ -38,13 +37,12 @@ namespace BlackGui
CLevelMeter(QWidget *parent = nullptr);
//! Destructor
~CLevelMeter();
virtual ~CLevelMeter();
//! \copydoc QWidget::paintEvent
void paintEvent(QPaintEvent *event) override;
public slots:
//! Clean up
void reset();

View File

@@ -45,7 +45,7 @@ namespace BlackGui
CActionModel(QObject *parent = nullptr);
//! Destructor
~CActionModel();
virtual ~CActionModel();
//! \copydoc QAbstractItemModel::data
QVariant data(const QModelIndex &index, int role) const override;

View File

@@ -21,7 +21,7 @@ class QKeySequence;
namespace BlackGui
{
/*!
* Shortcut class to avoid overlapping shortcut defintions
* Shortcut definitions to avoid duplicated shortcut defintions
*/
class BLACKGUI_EXPORT CShortcut
{

View File

@@ -14,7 +14,6 @@ using namespace BlackMisc;
namespace BlackGui
{
CTickLabel::CTickLabel(QWidget *parent) :
QLabel(parent)
{
@@ -58,5 +57,4 @@ namespace BlackGui
this->setPixmap(this->m_isPixmapTicked ? m_pixmapTicked : m_pixmapUnticked);
this->setToolTip(this->m_isPixmapTicked ? m_toolTipTicked : m_toolTipUnticked);
}
} // namespace

View File

@@ -9,8 +9,8 @@
//! \file
#ifndef TICKLABEL_H
#define TICKLABEL_H
#ifndef BLACKGUI_TICKLABEL_H
#define BLACKGUI_TICKLABEL_H
#include "blackgui/blackguiexport.h"
#include "blackmisc/icons.h"
@@ -30,7 +30,6 @@ namespace BlackGui
Q_OBJECT
public:
//! Constructor
explicit CTickLabel(QWidget *parent = nullptr);
@@ -57,11 +56,9 @@ namespace BlackGui
QPixmap m_pixmapTicked = BlackMisc::CIcons::tick16();
QPixmap m_pixmapUnticked = BlackMisc::CIcons::cross16();
//! Set the label according to \sa
//! Set the label
void setLabel();
};
} // namespace
#endif // guard