[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=cf88fb2

The following commit has been merged in the master branch:
commit cf88fb2801563ee9b28d04e059a394c44d881981
Author: Aleix Pol <aleixpol at kde.org>
Date:   Tue Jan 15 01:58:01 2013 +0100

    Use qmlRegisterType(void) instead qmlRegisterUncreatableType
    
    It looks cleaner and does mostly the same.
    
    Reviewed by David Edmunson
---
 KTp/Declarative/qml-plugins.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/KTp/Declarative/qml-plugins.cpp b/KTp/Declarative/qml-plugins.cpp
index 2184e4f..7c68e53 100644
--- a/KTp/Declarative/qml-plugins.cpp
+++ b/KTp/Declarative/qml-plugins.cpp
@@ -38,9 +38,6 @@
 void QmlPlugins::registerTypes(const char *uri)
 {
     qmlRegisterType<ContactList> (uri, 0, 1, "ContactList");
-    qmlRegisterUncreatableType<AccountsFilterModel> (uri, 0, 1, "AccountsFilterModel",
-        QLatin1String("Filter cannot be created. Access through ContactList.filter"));
-
     qmlRegisterType<TelepathyTextObserver> (uri, 0, 1, "TelepathyTextObserver");
     qmlRegisterType<Conversation>(uri, 0, 1, "Conversation");
     qmlRegisterType<HideWindowComponent>(uri, 0, 1, "HideWindowComponent");
@@ -50,6 +47,7 @@ void QmlPlugins::registerTypes(const char *uri)
     qmlRegisterType<MessagesModel>();
     qmlRegisterType<ConversationTarget>();
     qmlRegisterType<ConversationsModel>();
+    qmlRegisterType<AccountsFilterModel>();
     qRegisterMetaType<Tp::AccountManagerPtr>();
     qRegisterMetaType<Tp::ContactPtr>();
     qRegisterMetaType<Tp::AccountPtr>();

-- 
ktp-common-internals packaging