diff --git a/includes/CMakeLists.txt b/includes/CMakeLists.txt index 5ba97580..d1416cc8 100644 --- a/includes/CMakeLists.txt +++ b/includes/CMakeLists.txt @@ -466,7 +466,7 @@ install( Plasma/ToolButton Plasma/ToolTipContent Plasma/ToolTipManager - Plasma/TreeView + Plasma/TreeWidget Plasma/CalendarWidget Plasma/View Plasma/Wallpaper diff --git a/includes/Plasma/TreeView b/includes/Plasma/TreeView deleted file mode 100644 index a7cf8455..00000000 --- a/includes/Plasma/TreeView +++ /dev/null @@ -1 +0,0 @@ -#include "../../plasma/widgets/treeview.h" diff --git a/includes/Plasma/TreeWidget b/includes/Plasma/TreeWidget new file mode 100644 index 00000000..867d2992 --- /dev/null +++ b/includes/Plasma/TreeWidget @@ -0,0 +1 @@ +#include "../../plasma/widgets/treewidget.h" diff --git a/plasma/CMakeLists.txt b/plasma/CMakeLists.txt index 4b5cc2a8..e3acb4ce 100644 --- a/plasma/CMakeLists.txt +++ b/plasma/CMakeLists.txt @@ -92,7 +92,7 @@ set(plasma_LIB_SRCS widgets/svgwidget.cpp widgets/tabbar.cpp widgets/textbrowser.cpp - widgets/treeview.cpp + widgets/treewidget.cpp widgets/textedit.cpp widgets/calendarwidget.cpp ) @@ -198,7 +198,7 @@ install( widgets/scrollwidget.h widgets/tabbar.h widgets/textbrowser.h - widgets/treeview.h + widgets/treewidget.h widgets/textedit.h widgets/calendarwidget.h DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/plasma/widgets diff --git a/plasma/widgets/treeview.cpp b/plasma/widgets/treewidget.cpp similarity index 73% rename from plasma/widgets/treeview.cpp rename to plasma/widgets/treewidget.cpp index bb9a6fb0..773df648 100644 --- a/plasma/widgets/treeview.cpp +++ b/plasma/widgets/treewidget.cpp @@ -17,10 +17,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "treeview.h" +#include "treewidget.h" -#include -#include +#include #include #include @@ -30,17 +29,17 @@ namespace Plasma { -class TreeViewPrivate +class TreeWidgetPrivate { public: Plasma::Style::Ptr style; }; -TreeView::TreeView(QGraphicsWidget *parent) +TreeWidget::TreeWidget(QGraphicsWidget *parent) : QGraphicsProxyWidget(parent), - d(new TreeViewPrivate) + d(new TreeWidgetPrivate) { - QTreeView *native = new QTreeView(); + QTreeWidget *native = new QTreeWidget(); setWidget(native); native->setWindowIcon(QIcon()); native->setAttribute(Qt::WA_NoSystemBackground); @@ -51,28 +50,18 @@ TreeView::TreeView(QGraphicsWidget *parent) native->horizontalScrollBar()->setStyle(d->style.data()); } -TreeView::~TreeView() +TreeWidget::~TreeWidget() { delete d; Plasma::Style::doneWithSharedStyle(); } -void TreeView::setModel(QAbstractItemModel *model) +QTreeWidget *TreeWidget::nativeWidget() const { - nativeWidget()->setModel(model); -} - -QAbstractItemModel *TreeView::model() -{ - return nativeWidget()->model(); -} - -QTreeView *TreeView::nativeWidget() const -{ - return static_cast(widget()); + return static_cast(widget()); } } -#include "moc_treeview.cpp" +#include "moc_treewidget.cpp" diff --git a/plasma/widgets/treeview.h b/plasma/widgets/treewidget.h similarity index 57% rename from plasma/widgets/treeview.h rename to plasma/widgets/treewidget.h index 28e57a98..be5ba8ed 100644 --- a/plasma/widgets/treeview.h +++ b/plasma/widgets/treewidget.h @@ -17,54 +17,41 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef PLASMA_TREEVIEW_H -#define PLASMA_TREEVIEW_H +#ifndef PLASMA_TREEWIDGET_H +#define PLASMA_TREEWIDGET_H #include #include -#include +#include #include namespace Plasma { -class TreeViewPrivate; +class TreeWidgetPrivate; /** - * @class TreeView plasma/widgets/treeview.h + * @class TreeWidget plasma/widgets/treewidget.h * - * @short Provides a plasma-themed QTreeView. + * @short Provides a plasma-themed QTreeWidget. */ -class PLASMA_EXPORT TreeView : public QGraphicsProxyWidget +class PLASMA_EXPORT TreeWidget : public QGraphicsProxyWidget { Q_OBJECT - Q_PROPERTY(QAbstractItemModel *model READ model WRITE setModel) public: - explicit TreeView(QGraphicsWidget *parent = 0); - ~TreeView(); + explicit TreeWidget(QGraphicsWidget *parent = 0); + ~TreeWidget(); /** - * Sets a model for this weather view - * - * @param model the model to display + * @return the native widget wrapped by this TreeWidget */ - void setModel(QAbstractItemModel *model); - - /** - * @return the model shown by this view - */ - QAbstractItemModel *model(); - - /** - * @return the native widget wrapped by this TreeView - */ - QTreeView *nativeWidget() const; + QTreeWidget *nativeWidget() const; private: - TreeViewPrivate *const d; + TreeWidgetPrivate *const d; }; }