[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=463050f

The following commit has been merged in the master branch:
commit 463050f11228f92f255f61cf6530e7f366e9223b
Author: Aleix Pol <aleixpol at kde.org>
Date:   Thu Aug 1 03:04:15 2013 +0200

    Revert "windows build fix"
    
    This reverts commit 201de3a1c8a593b62a165a2644db388bbec13182.
    The commit is not correct because even though it compiles it stops
    working.
    Why is this change needed? There's no qulonglong on windows? I've
    just seen that in my system WId is ulong, maybe we could use that...
    
    CCMAIL: vonreth at kde.org
---
 KTp/Declarative/hide-window-component.cpp | 2 +-
 KTp/Declarative/hide-window-component.h   | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/KTp/Declarative/hide-window-component.cpp b/KTp/Declarative/hide-window-component.cpp
index d462ae8..bf8f24b 100644
--- a/KTp/Declarative/hide-window-component.cpp
+++ b/KTp/Declarative/hide-window-component.cpp
@@ -25,7 +25,7 @@ HideWindowComponent::HideWindowComponent(QObject *parent)
 {
 }
 
-void HideWindowComponent::hideWindowFromTaskbar(WId winId)
+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
index 115c436..78d0bff 100644
--- a/KTp/Declarative/hide-window-component.h
+++ b/KTp/Declarative/hide-window-component.h
@@ -20,7 +20,6 @@
 #define HIDEWINDOWCOMPONENT_H
 
 #include <QObject>
-#include <QWidget>
 
 /**
  * Plasma is not exposing such a feature to make its dialogs hidden from the taskbar,
@@ -33,7 +32,7 @@ class HideWindowComponent : public QObject
   public:
     explicit HideWindowComponent(QObject *parent = 0);
 
-    Q_SCRIPTABLE void hideWindowFromTaskbar(WId winId);
+    Q_SCRIPTABLE void hideWindowFromTaskbar(qulonglong winId);
 };
 
 #endif // HIDEWINDOWCOMPONENT_H

-- 
ktp-common-internals packaging