--- a/src/configDialog.h Sun Aug 18 17:53:23 2013 +0300 +++ b/src/configDialog.h Tue Aug 20 14:47:21 2013 +0300 @@ -28,7 +28,7 @@ // ============================================================================= class ShortcutListItem : public QListWidgetItem { - PROPERTY (keyseqconfig*, keyConfig, setKeyConfig) + PROPERTY (KeySequenceConfig*, keyConfig, setKeyConfig) PROPERTY (QAction*, action, setAction) public: @@ -61,9 +61,9 @@ void initQuickColorTab(); void initGridTab(); void initExtProgTab(); - void addShortcut (keyseqconfig& cfg, QAction* act, ulong& i); + void addShortcut (KeySequenceConfig& cfg, QAction* act, ulong& i); void setButtonBackground (QPushButton* button, str value); - void pickColor (strconfig& cfg, QPushButton* button); + void pickColor (StringConfig& cfg, QPushButton* button); void updateQuickColorList (LDQuickColor* sel = null); void setShortcutText (ShortcutListItem* item); int getItemRow (QListWidgetItem* item, List<QListWidgetItem*>& haystack); @@ -94,7 +94,7 @@ public: explicit KeySequenceDialog (QKeySequence seq, QWidget* parent = null, Qt::WindowFlags f = 0); - static bool staticDialog (keyseqconfig* cfg, QWidget* parent = null); + static bool staticDialog (KeySequenceConfig* cfg, QWidget* parent = null); QLabel* lb_output; QDialogButtonBox* bbx_buttons;