[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=f153318

The following commit has been merged in the master branch:
commit f1533186ceccdd36a508003935b17029d6715b0c
Author: Aleix Pol <aleixpol at kde.org>
Date:   Sat Feb 21 20:03:18 2015 +0100

    Move HideWindowComponent hacky unshareable class to ktp-desktop-applets
---
 KTp/Declarative/CMakeLists.txt            |  1 -
 KTp/Declarative/hide-window-component.cpp | 31 -------------------------
 KTp/Declarative/hide-window-component.h   | 38 -------------------------------
 KTp/Declarative/qml-plugins.cpp           |  2 --
 4 files changed, 72 deletions(-)

diff --git a/KTp/Declarative/CMakeLists.txt b/KTp/Declarative/CMakeLists.txt
index 1dbafea..2575573 100644
--- a/KTp/Declarative/CMakeLists.txt
+++ b/KTp/Declarative/CMakeLists.txt
@@ -6,7 +6,6 @@ include_directories (${CMAKE_CURRENT_BINARY_DIR}
 set (ktp_qml_plugin_SRCS
     conversation.cpp
     conversations-model.cpp
-    hide-window-component.cpp
     messages-model.cpp
     pinned-contacts-model.cpp
     filtered-pinned-contacts-proxy-model.cpp
diff --git a/KTp/Declarative/hide-window-component.cpp b/KTp/Declarative/hide-window-component.cpp
deleted file mode 100644
index bf8f24b..0000000
--- a/KTp/Declarative/hide-window-component.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
-    Copyright (C) 2012 Aleix Pol Gonzalez <aleixpol at blue-systems.com>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library 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
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-*/
-
-#include "hide-window-component.h"
-
-#include <KWindowSystem>
-
-HideWindowComponent::HideWindowComponent(QObject *parent)
-    : QObject(parent)
-{
-}
-
-void HideWindowComponent::hideWindowFromTaskbar(qulonglong winId)
-{
-    KWindowSystem::setState(winId, NET::SkipTaskbar | NET::SkipPager);
-}
diff --git a/KTp/Declarative/hide-window-component.h b/KTp/Declarative/hide-window-component.h
deleted file mode 100644
index 78d0bff..0000000
--- a/KTp/Declarative/hide-window-component.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-    Copyright (C) 2012 Aleix Pol Gonzalez <aleixpol at blue-systems.com>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library 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
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-*/
-
-#ifndef HIDEWINDOWCOMPONENT_H
-#define HIDEWINDOWCOMPONENT_H
-
-#include <QObject>
-
-/**
- * Plasma is not exposing such a feature to make its dialogs hidden from the taskbar,
- * that's why we added that weird object
- */
-
-class HideWindowComponent : public QObject
-{
-    Q_OBJECT
-  public:
-    explicit HideWindowComponent(QObject *parent = 0);
-
-    Q_SCRIPTABLE void hideWindowFromTaskbar(qulonglong winId);
-};
-
-#endif // HIDEWINDOWCOMPONENT_H
diff --git a/KTp/Declarative/qml-plugins.cpp b/KTp/Declarative/qml-plugins.cpp
index 31153ae..6231f72 100644
--- a/KTp/Declarative/qml-plugins.cpp
+++ b/KTp/Declarative/qml-plugins.cpp
@@ -25,7 +25,6 @@
 
 #include "conversation.h"
 #include "conversations-model.h"
-#include "hide-window-component.h"
 #include "messages-model.h"
 #include "pinned-contacts-model.h"
 #include "contact-pin.h"
@@ -56,7 +55,6 @@ void QmlPlugins::registerTypes(const char *uri)
 
     qmlRegisterType<ConversationsModel> (uri, 0, 1, "ConversationsModel");
     qmlRegisterType<Conversation>(uri, 0, 1, "Conversation");
-    qmlRegisterType<HideWindowComponent>(uri, 0, 1, "HideWindowComponent");
     qmlRegisterType<PinnedContactsModel>(uri, 0, 1, "PinnedContactsModel");
     qmlRegisterType<ContactPin>(uri, 0, 1, "ContactPin");
     qmlRegisterType<FilteredPinnedContactsProxyModel>(uri, 0, 1, "FilteredPinnedContactsProxyModel");

-- 
ktp-common-internals packaging