Ported scroll bar

diff --git a/lib/declarativescrollbar.cpp b/lib/declarativescrollbar.cpp
deleted file mode 100644 (file)
index 0c242b4..0000000
--- a/lib/declarativescrollbar.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
-  Copyright (C) 2012 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com
-  Author: Kevin Krammer, krake@kdab.com
-  Author: Tobias Koenig, tokoe@kdab.com
-
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License along
-  with this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*/
-
-#include "declarativescrollbar_p.h"
-
-DeclarativeScrollBar::DeclarativeScrollBar(QObject *parent)
-  : DeclarativeWidgetProxy<QScrollBar>(parent)
-{
-  connectAllSignals(m_proxiedObject, this);
-}
-
-CUSTOM_METAOBJECT(DeclarativeScrollBar, QScrollBar)

diff --git a/lib/declarativescrollbar_p.h b/lib/declarativescrollbar_p.h
deleted file mode 100644 (file)
index 9046d52..0000000
--- a/lib/declarativescrollbar_p.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-  Copyright (C) 2012 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com
-  Author: Kevin Krammer, krake@kdab.com
-  Author: Tobias Koenig, tokoe@kdab.com
-
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License along
-  with this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*/
-
-#ifndef DECLARATIVESCROLLBAR_P_H
-#define DECLARATIVESCROLLBAR_P_H
-
-#include "declarativewidgetproxy_p.h"
-
-#include <QScrollBar>
-
-class DeclarativeScrollBar : public DeclarativeWidgetProxy<QScrollBar>
-{
-  DECLARATIVE_OBJECT
-
-  public:
-    explicit DeclarativeScrollBar(QObject *parent = 0);
-};
-
-#endif

diff --git a/lib/declarativewidgetsdocument.cpp b/lib/declarativewidgetsdocument.cpp
index b0958ef..8c98bfd 100644 (file)
--- a/lib/declarativewidgetsdocument.cpp
+++ b/lib/declarativewidgetsdocument.cpp
@@ -42,7 +42,6 @@
 #include "declarativemessagebox_p.h"
 #include "declarativeprogressbar_p.h"
 #include "declarativescrollareaextension_p.h"
-#include "declarativescrollbar_p.h"
 #include "declarativeseparator_p.h"
 #include "declarativestackedlayout_p.h"
 #include "declarativestackedwidgetextension_p.h"
@@ -74,6 +73,7 @@
 #include <QMenuBar>
 #include <QPlainTextEdit>
 #include <QRadioButton>
+#include <QScrollBar>
 #include <QStackedWidget>
 #include <QTableView>
 #include <QToolBar>
@@ -112,7 +112,6 @@ DeclarativeWidgetsDocument::DeclarativeWidgetsDocument(const QUrl &url, QObject
   qmlRegisterType<DeclarativeLabel>("QtGui", 1, 0, "Label");
   qmlRegisterType<DeclarativeLCDNumber>("QtGui", 1, 0, "LCDNumber");
   qmlRegisterType<DeclarativeProgressBar>("QtGui", 1, 0, "ProgressBar");
-  qmlRegisterType<DeclarativeScrollBar>("QtGui", 1, 0, "ScrollBar");
   qmlRegisterType<DeclarativeStatusBarAttached>();
   qmlRegisterType<DeclarativeTabWidgetAttached>();
   qmlRegisterType<DeclarativeTextBrowser>("QtGui", 1, 0, "TextBrowser");
@@ -163,6 +162,7 @@ DeclarativeWidgetsDocument::DeclarativeWidgetsDocument(const QUrl &url, QObject
   qmlRegisterExtendedType<QPushButton, DeclarativeWidgetExtension>("QtGui", 1, 0, "PushButton");
   qmlRegisterExtendedType<QRadioButton, DeclarativeWidgetExtension>("QtGui", 1, 0, "RadioButton");
   qmlRegisterExtendedType<QScrollArea, DeclarativeScrollAreaExtension>("QtGui", 1, 0, "ScrollArea");
+  qmlRegisterExtendedType<QScrollBar, DeclarativeWidgetExtension>("QtGui", 1, 0, "ScrollBar");
   qmlRegisterExtendedType<QSlider, DeclarativeWidgetExtension>("QtGui", 1, 0, "Slider");
   qmlRegisterExtendedType<QStackedWidget, DeclarativeStackedWidgetExtension>("QtGui", 1, 0, "StackedWidget");
   qmlRegisterExtendedType<QSpinBox, DeclarativeWidgetExtension>("QtGui", 1, 0, "SpinBox");

diff --git a/lib/lib.pro b/lib/lib.pro
index c52804c..b408619 100644 (file)
--- a/lib/lib.pro
+++ b/lib/lib.pro
@@ -32,7 +32,6 @@ HEADERS = \
   declarativeobjectproxy_p.h \
   declarativeprogressbar_p.h \
   declarativescrollareaextension_p.h \
-  declarativescrollbar_p.h \
   declarativeseparator_p.h \
   declarativestackedlayout_p.h \
   declarativestackedwidgetextension_p.h \
@@ -75,7 +74,6 @@ SOURCES = \
   declarativeobjectextension.cpp \
   declarativeprogressbar.cpp \
   declarativescrollareaextension.cpp \
-  declarativescrollbar.cpp \
   declarativeseparator.cpp \
   declarativestackedlayout.cpp \
   declarativestackedwidgetextension.cpp \