[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kactivities/ivan/plugin-refactor] /: Small fixes
From:       Ivan Čukić <ivan.cukic () kde ! org>
Date:       2012-06-30 21:04:40
Message-ID: 20120630210440.59443A60A6 () git ! kde ! org
[Download RAW message or body]

Git commit ce51a1c9ba0f942c20701d48ac967ad98b1bda61 by Ivan =C4=8Cuki=C4=87.
Committed on 29/06/2012 at 09:27.
Pushed by ivan into branch 'ivan/plugin-refactor'.

Small fixes

M  +1    -0    .clang_complete
D  +0    -1    TRUE
M  +1    -1    service/Activities.h
A  +46   -0    service/Features.h     [License: GPL (v2)]

http://commits.kde.org/kactivities/ce51a1c9ba0f942c20701d48ac967ad98b1bda61

diff --git a/.clang_complete b/.clang_complete
index 1b7b17f..d5db756 100644
--- a/.clang_complete
+++ b/.clang_complete
@@ -2,6 +2,7 @@
 -DQT_USE_FAST_OPERATOR_PLUS
 -DQT_NO_DEBUG
 -I/opt/kde/build-clang/libs/kactivities/service
+-I/opt/kde/build-clang/libs/kactivities/lib
 -I/opt/kde/build-clang/libs/kactivities
 -I/opt/kde/src/libs/kactivities/service
 -I/opt/kde/src/libs/kactivities
diff --git a/TRUE b/TRUE
deleted file mode 100644
index 8b13789..0000000
--- a/TRUE
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/service/Activities.h b/service/Activities.h
index 3376cda..b9c96db 100644
--- a/service/Activities.h
+++ b/service/Activities.h
@@ -34,7 +34,7 @@
  */
 class Activities: public QObject {
     Q_OBJECT
-    Q_CLASSINFO("D-Bus Interface", "org.kde.Activities")
+    Q_CLASSINFO("D-Bus Interface", "org.kde.ActivityManager.Activities")
     Q_PROPERTY(QString CurrentActivity READ CurrentActivity WRITE SetCurre=
ntActivity NOTIFY CurrentActivityChanged)
 =

 public:
diff --git a/service/Features.h b/service/Features.h
new file mode 100644
index 0000000..efdc5ae
--- /dev/null
+++ b/service/Features.h
@@ -0,0 +1,46 @@
+/*
+ *   Copyright (C) 2010, 2011, 2012 Ivan Cukic <ivan.cukic(at)kde.org>
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License version 2,
+ *   or (at your option) any later version, as published by the Free
+ *   Software Foundation
+ *
+ *   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 FEATURES_H
+#define FEATURES_H
+
+#include <QString>
+#include <QStringList>
+
+#include <KUrl>
+
+#include <utils/d_ptr.h>
+#include <utils/nullptr.h>
+
+/**
+ * Service for tracking the user actions and managing the
+ * activities
+ */
+class Features: public QObject {
+    Q_OBJECT
+    Q_CLASSINFO("D-Bus Interface", "org.kde.ActivityManager.Features")
+
+public:
+
+
+private:
+    D_PTR;
+};
+
+#endif // FEATURES_H

[prev in list] [next in list] [prev in thread] [next in thread]