# # # patch "src/view/Splitter.cpp" # from [78cf20ef93dfe83a97ec969f265e87854e37d0e9] # to [4ef814b5b7fcb03120f6f889aa279fdd0518df5f] # # patch "src/view/Splitter.h" # from [5981f42c7bcf7280f3c15e64ccdedca0853967e0] # to [f5c74798271f8b56f1eed47efd0fa3180cc3d70d] # # patch "src/view/TreeView.cpp" # from [3707234163333d91629f88fd1c84576610f942f0] # to [d12be44a24939400a3ccb6f823b347b65b309425] # # patch "src/view/TreeView.h" # from [7e93a8ff3028e2c65d1eee3114d92e3049d42ff5] # to [105ab235037a91b7e5bf9ec3a532441f5d981bad] # ============================================================ --- src/view/Splitter.cpp 78cf20ef93dfe83a97ec969f265e87854e37d0e9 +++ src/view/Splitter.cpp 4ef814b5b7fcb03120f6f889aa279fdd0518df5f @@ -23,25 +23,21 @@ #include -Splitter::Splitter(QWidget* parent) -: QSplitter(parent) -{ -} +Splitter::Splitter(QWidget * parent) : QSplitter(parent) {} -Splitter::Splitter(QWidget* parent, QString objName) -: QSplitter(parent) +Splitter::Splitter(QWidget * parent, const QString & objName) : QSplitter(parent) { - setObjectName(objName); + setObjectName(objName); } -Splitter::~Splitter() +Splitter::~Splitter() { saveState(); } void Splitter::init() { - restoreState(); + restoreState(); } void Splitter::restoreState(void) @@ -62,7 +58,7 @@ void Splitter::saveState(void) sum += s.at(i); } if (sum == 0) return; - + Settings::setSplitterState(QSplitter::saveState(), objectName()); } ============================================================ --- src/view/Splitter.h 5981f42c7bcf7280f3c15e64ccdedca0853967e0 +++ src/view/Splitter.h f5c74798271f8b56f1eed47efd0fa3180cc3d70d @@ -25,16 +25,16 @@ class Splitter : public QSplitter class Splitter : public QSplitter { - Q_OBJECT + Q_OBJECT public: - Splitter(QWidget*); - Splitter(QWidget*, QString); - ~Splitter(); + Splitter(QWidget *); + Splitter(QWidget *, const QString &); + ~Splitter(); void init(); private: - void restoreState(void); + void restoreState(void); void saveState(void); }; ============================================================ --- src/view/TreeView.cpp 3707234163333d91629f88fd1c84576610f942f0 +++ src/view/TreeView.cpp d12be44a24939400a3ccb6f823b347b65b309425 @@ -23,29 +23,23 @@ #include -TreeView::TreeView(QWidget* parent) -: QTreeView(parent) -{ -} +TreeView::TreeView(QWidget * parent) : QTreeView(parent) {} -TreeView::TreeView(QWidget* parent, QString objName) -: QTreeView(parent) +TreeView::TreeView(QWidget * parent, const QString & objName) : QTreeView(parent) { - setObjectName(objName); + setObjectName(objName); init(); } -TreeView::~TreeView() +TreeView::~TreeView() { - saveHeaderViewState(); + saveHeaderViewState(); } void TreeView::init() { - header()->setResizeMode(QHeaderView::Interactive); - - stateLoaded = false; + stateLoaded = false; } void TreeView::setModel(QAbstractItemModel * model) @@ -63,16 +57,16 @@ void TreeView::contextMenuEvent(QContext void TreeView::contextMenuEvent(QContextMenuEvent* ev) { - QItemSelectionModel* selection = selectionModel(); - + QItemSelectionModel * selection = selectionModel(); + // make sure the element under the cursor is selected as well QModelIndex currentItem = indexAt(ev->pos()); - selection->select(currentItem, + selection->select(currentItem, QItemSelectionModel::Select | QItemSelectionModel::Rows ); setSelectionModel(selection); - + // remove multiple cols of the same row, since we're selected // complete rows we're not interested in these QModelIndexList currentSelection = selection->selectedIndexes(); @@ -84,9 +78,9 @@ void TreeView::contextMenuEvent(QContext i--; } } - + QPoint pos = ev->pos(); - + QHeaderView * headerView = header(); if (headerView) { @@ -99,7 +93,7 @@ void TreeView::contextMenuEvent(QContext pos += QPoint(headerView->width(), 0); } } - + emit contextMenuRequested(currentSelection, mapToGlobal(pos)); } ============================================================ --- src/view/TreeView.h 7e93a8ff3028e2c65d1eee3114d92e3049d42ff5 +++ src/view/TreeView.h 105ab235037a91b7e5bf9ec3a532441f5d981bad @@ -26,20 +26,19 @@ class TreeView : public QTreeView class TreeView : public QTreeView { - Q_OBJECT - + Q_OBJECT public: - TreeView(QWidget*); - TreeView(QWidget*, QString); - ~TreeView(); - virtual void setModel(QAbstractItemModel*); + TreeView(QWidget *); + TreeView(QWidget *, const QString &); + ~TreeView(); + virtual void setModel(QAbstractItemModel *); void init(); signals: void contextMenuRequested(const QModelIndexList &, const QPoint &); - + private: - void saveHeaderViewState(); + void saveHeaderViewState(); bool stateLoaded; void contextMenuEvent(QContextMenuEvent *); };