aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/General
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2018-07-04 19:55:41 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2018-07-04 19:55:41 +0000
commit58296fef1b4d3962530b5ba7c21e0768a1c06f86 (patch)
treee276e80897163c2485a9d25579905df56e495ff2 /src/plugins/General
parent050380c4949e398fd1798f5106916826a7d901bd (diff)
downloadqmmp-58296fef1b4d3962530b5ba7c21e0768a1c06f86.tar.gz
qmmp-58296fef1b4d3962530b5ba7c21e0768a1c06f86.tar.bz2
qmmp-58296fef1b4d3962530b5ba7c21e0768a1c06f86.zip
refactoring
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@8107 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins/General')
-rw-r--r--src/plugins/General/hotkey/hotkeydialog.cpp10
-rw-r--r--src/plugins/General/hotkey/hotkeydialog.h4
2 files changed, 7 insertions, 7 deletions
diff --git a/src/plugins/General/hotkey/hotkeydialog.cpp b/src/plugins/General/hotkey/hotkeydialog.cpp
index 5067715f5..654b871e9 100644
--- a/src/plugins/General/hotkey/hotkeydialog.cpp
+++ b/src/plugins/General/hotkey/hotkeydialog.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2009-2012 by Ilya Kotov *
+ * Copyright (C) 2009-2018 by Ilya Kotov *
* forkotov02@ya.ru *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -25,10 +25,10 @@
HotkeyDialog::HotkeyDialog(quint32 key, quint32 mod, QWidget *parent)
: QDialog(parent)
{
- ui.setupUi(this);
+ m_ui.setupUi(this);
m_key = key;
m_modifiers = mod;
- ui.keyLineEdit->setText(HotkeyManager::getKeyString(m_key, m_modifiers));
+ m_ui.keyLineEdit->setText(HotkeyManager::getKeyString(m_key, m_modifiers));
grabKeyboard();
}
@@ -44,7 +44,7 @@ void HotkeyDialog::keyPressEvent (QKeyEvent *event)
foreach(long mask_mod, HotkeyManager::ignModifiersList())
m_modifiers &= ~mask_mod; //remove ignored modifiers (num lock, caps lock, etc)
- ui.keyLineEdit->setText(HotkeyManager::getKeyString(m_key, m_modifiers));
+ m_ui.keyLineEdit->setText(HotkeyManager::getKeyString(m_key, m_modifiers));
QWidget::keyPressEvent(event);
}
@@ -60,7 +60,7 @@ quint32 HotkeyDialog::keySym () const
void HotkeyDialog::accept()
{
- if (ui.keyLineEdit->text().isEmpty()) //clear key & modifiers
+ if (m_ui.keyLineEdit->text().isEmpty()) //clear key & modifiers
{
m_key = 0;
m_modifiers = 0;
diff --git a/src/plugins/General/hotkey/hotkeydialog.h b/src/plugins/General/hotkey/hotkeydialog.h
index 5b87c4d2e..490539eac 100644
--- a/src/plugins/General/hotkey/hotkeydialog.h
+++ b/src/plugins/General/hotkey/hotkeydialog.h
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2009 by Ilya Kotov *
+ * Copyright (C) 2009-2018 by Ilya Kotov *
* forkotov02@ya.ru *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -47,7 +47,7 @@ protected:
virtual void keyPressEvent (QKeyEvent *event);
private:
- Ui::HotkeyDialog ui;
+ Ui::HotkeyDialog m_ui;
quint32 m_key, m_modifiers;
};