ShortcutsDialog.hpp   ShortcutsDialog.hpp 
skipping to change at line 43 skipping to change at line 43
class QStandardItem; class QStandardItem;
//! Custom filter class for filtering tree sub-items. //! Custom filter class for filtering tree sub-items.
//! (The standard QSortFilterProxyModel shows child items only if the //! (The standard QSortFilterProxyModel shows child items only if the
//! parent item matches the filter.) //! parent item matches the filter.)
class ShortcutsFilterModel : public QSortFilterProxyModel class ShortcutsFilterModel : public QSortFilterProxyModel
{ {
Q_OBJECT Q_OBJECT
public: public:
ShortcutsFilterModel(QObject* parent = 0); ShortcutsFilterModel(QObject* parent = Q_NULLPTR);
protected: protected:
bool filterAcceptsRow(int source_row, bool filterAcceptsRow(int source_row,
const QModelIndex &source_parent) const; const QModelIndex &source_parent) const;
}; };
class ShortcutsDialog : public StelDialog class ShortcutsDialog : public StelDialog
{ {
Q_OBJECT Q_OBJECT
skipping to change at line 81 skipping to change at line 81
QList<QStandardItem*> findCollidingItems(QKeySequence ks); QList<QStandardItem*> findCollidingItems(QKeySequence ks);
void handleCollisions(ShortcutLineEdit* currentEdit); void handleCollisions(ShortcutLineEdit* currentEdit);
//! called when editors' state changed. //! called when editors' state changed.
void handleChanges(); void handleChanges();
//! called when apply button clicked. //! called when apply button clicked.
void applyChanges(); void applyChanges();
//! called by doubleclick; if click is on editable item, switch to e ditors //! called by doubleclick; if click is on editable item, switch to e ditors
void switchToEditors(const QModelIndex& index); void switchToEditors(const QModelIndex& index);
//! update shortcut representation in tree correspondingly to its ac tual contents. //! update shortcut representation in tree correspondingly to its ac tual contents.
//! if no item is specified, search for it in tree, if no items foun d, create new item //! if no item is specified, search for it in tree, if no items foun d, create new item
void updateShortcutsItem(class StelAction* action, QStandardItem* sh ortcutItem = NULL); void updateShortcutsItem(class StelAction* action, QStandardItem* sh ortcutItem = Q_NULLPTR);
void restoreDefaultShortcuts(); void restoreDefaultShortcuts();
void updateTreeData(); void updateTreeData();
protected: protected:
//! Initialize the dialog widgets and connect the signals/slots. //! Initialize the dialog widgets and connect the signals/slots.
virtual void createDialogContent(); virtual void createDialogContent();
private: private:
//! checks whether given item can be changed by editors. //! checks whether given item can be changed by editors.
static bool itemIsEditable(QStandardItem *item); static bool itemIsEditable(QStandardItem *item);
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/