aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--examples/ayatanaqmlmenumodel.qml (renamed from examples/unityqmlmenumodel.qml)2
-rw-r--r--libqmenumodel/QMenuModel/plugin.cpp8
-rw-r--r--libqmenumodel/src/CMakeLists.txt12
-rw-r--r--libqmenumodel/src/ayatanamenuaction.cpp (renamed from libqmenumodel/src/unitymenuaction.cpp)56
-rw-r--r--libqmenumodel/src/ayatanamenuaction.h (renamed from libqmenumodel/src/unitymenuaction.h)24
-rw-r--r--libqmenumodel/src/ayatanamenuactionevents.cpp46
-rw-r--r--libqmenumodel/src/ayatanamenuactionevents.h (renamed from libqmenumodel/src/unitymenuactionevents.h)30
-rw-r--r--libqmenumodel/src/ayatanamenumodel.cpp (renamed from libqmenumodel/src/unitymenumodel.cpp)258
-rw-r--r--libqmenumodel/src/ayatanamenumodel.h (renamed from libqmenumodel/src/unitymenumodel.h)22
-rw-r--r--libqmenumodel/src/ayatanamenumodelevents.cpp (renamed from libqmenumodel/src/unitymenumodelevents.cpp)30
-rw-r--r--libqmenumodel/src/ayatanamenumodelevents.h (renamed from libqmenumodel/src/unitymenumodelevents.h)32
-rw-r--r--libqmenumodel/src/logging.h2
-rw-r--r--libqmenumodel/src/unitymenuactionevents.cpp46
-rw-r--r--tests/client/CMakeLists.txt2
-rw-r--r--tests/client/ayatanamenuactiontest.cpp (renamed from tests/client/unitymenuactiontest.cpp)18
15 files changed, 294 insertions, 294 deletions
diff --git a/examples/unityqmlmenumodel.qml b/examples/ayatanaqmlmenumodel.qml
index e7360e0..00984f0 100644
--- a/examples/unityqmlmenumodel.qml
+++ b/examples/ayatanaqmlmenumodel.qml
@@ -23,7 +23,7 @@ Item {
width: 400;
height: 500;
- UnityMenuModel {
+ AyatanaMenuModel {
id: menu
busName: "org.ayatana.indicator.sound"
actions: { "indicator": "/org/ayatana/indicator/sound" }
diff --git a/libqmenumodel/QMenuModel/plugin.cpp b/libqmenumodel/QMenuModel/plugin.cpp
index b7a4400..9060f86 100644
--- a/libqmenumodel/QMenuModel/plugin.cpp
+++ b/libqmenumodel/QMenuModel/plugin.cpp
@@ -22,8 +22,8 @@
#include "qdbusmenumodel.h"
#include "qdbusactiongroup.h"
#include "qstateaction.h"
-#include "unitymenuaction.h"
-#include "unitymenumodel.h"
+#include "ayatanamenuaction.h"
+#include "ayatanamenumodel.h"
#include <QtQml>
@@ -42,6 +42,6 @@ void QMenuModelQmlPlugin::registerTypes(const char *uri)
qmlRegisterType<QDBusMenuModel>(uri, 0, 1, "QDBusMenuModel");
qmlRegisterType<QDBusActionGroup>(uri, 0, 1, "QDBusActionGroup");
- qmlRegisterType<UnityMenuModel>(uri, 0, 1, "UnityMenuModel");
- qmlRegisterType<UnityMenuAction>(uri, 0, 1, "UnityMenuAction");
+ qmlRegisterType<AyatanaMenuModel>(uri, 0, 1, "AyatanaMenuAction");
+ qmlRegisterType<AyatanaMenuAction>(uri, 0, 1, "AyatanaMenuAction");
}
diff --git a/libqmenumodel/src/CMakeLists.txt b/libqmenumodel/src/CMakeLists.txt
index 9a49840..02c4b4c 100644
--- a/libqmenumodel/src/CMakeLists.txt
+++ b/libqmenumodel/src/CMakeLists.txt
@@ -11,10 +11,10 @@ set(QMENUMODEL_SRC
qdbusactiongroup.cpp
qmenumodelevents.cpp
qstateaction.cpp
- unitymenuaction.cpp
- unitymenuactionevents.cpp
- unitymenumodel.cpp
- unitymenumodelevents.cpp
+ ayatanamenuaction.cpp
+ ayatanamenuactionevents.cpp
+ ayatanamenumodel.cpp
+ ayatanamenumodelevents.cpp
gtk/gtkactionmuxer.c
gtk/gtkactionmuxer.h
gtk/gtkactionobservable.c
@@ -62,8 +62,8 @@ set(QMENUMODEL_HEADERS
qdbusobject.h
qmenumodel.h
qstateaction.h
- unitymenuaction.h
- unitymenumodel.h
+ ayatanamenuaction.h
+ ayatanamenumodel.h
)
set(INCLUDEDIR qmenumodel)
diff --git a/libqmenumodel/src/unitymenuaction.cpp b/libqmenumodel/src/ayatanamenuaction.cpp
index 1f0372d..7e13b35 100644
--- a/libqmenumodel/src/unitymenuaction.cpp
+++ b/libqmenumodel/src/ayatanamenuaction.cpp
@@ -16,11 +16,11 @@
* Authors: Nick Dedekind <nick.dedekind@canonical.com>
*/
-#include "unitymenuaction.h"
-#include "unitymenumodel.h"
-#include "unitymenuactionevents.h"
+#include "ayatanamenuaction.h"
+#include "ayatanamenumodel.h"
+#include "ayatanamenuactionevents.h"
-UnityMenuAction::UnityMenuAction(QObject* parent)
+AyatanaMenuAction::AyatanaMenuAction(QObject* parent)
: QObject(parent),
m_valid(false),
m_enabled(false),
@@ -29,17 +29,17 @@ UnityMenuAction::UnityMenuAction(QObject* parent)
{
}
-UnityMenuAction::~UnityMenuAction()
+AyatanaMenuAction::~AyatanaMenuAction()
{
unregisterAction();
}
-QString UnityMenuAction::name() const
+QString AyatanaMenuAction::name() const
{
return m_name;
}
-void UnityMenuAction::setName(const QString& name)
+void AyatanaMenuAction::setName(const QString& name)
{
if (m_name != name) {
m_name = name;
@@ -47,12 +47,12 @@ void UnityMenuAction::setName(const QString& name)
}
}
-UnityMenuModel* UnityMenuAction::model() const
+AyatanaMenuModel* AyatanaMenuAction::model() const
{
return m_model;
}
-void UnityMenuAction::setModel(UnityMenuModel* model)
+void AyatanaMenuAction::setModel(AyatanaMenuModel* model)
{
if (m_model != model) {
unregisterAction();
@@ -62,12 +62,12 @@ void UnityMenuAction::setModel(UnityMenuModel* model)
}
}
-QVariant UnityMenuAction::state() const
+QVariant AyatanaMenuAction::state() const
{
return m_state;
}
-void UnityMenuAction::setState(const QVariant& state)
+void AyatanaMenuAction::setState(const QVariant& state)
{
if (m_state != state) {
m_state = state;
@@ -75,12 +75,12 @@ void UnityMenuAction::setState(const QVariant& state)
}
}
-bool UnityMenuAction::isEnabled() const
+bool AyatanaMenuAction::isEnabled() const
{
return m_enabled;
}
-void UnityMenuAction::setEnabled(bool enabled)
+void AyatanaMenuAction::setEnabled(bool enabled)
{
if (m_enabled != enabled) {
m_enabled = enabled;
@@ -88,12 +88,12 @@ void UnityMenuAction::setEnabled(bool enabled)
}
}
-bool UnityMenuAction::isValid() const
+bool AyatanaMenuAction::isValid() const
{
return m_valid;
}
-void UnityMenuAction::setValid(bool valid)
+void AyatanaMenuAction::setValid(bool valid)
{
if (m_valid != valid) {
m_valid = valid;
@@ -101,12 +101,12 @@ void UnityMenuAction::setValid(bool valid)
}
}
-int UnityMenuAction::index() const
+int AyatanaMenuAction::index() const
{
return m_index;
}
-void UnityMenuAction::setIndex(int i)
+void AyatanaMenuAction::setIndex(int i)
{
if (i != m_index) {
m_index = i;
@@ -114,41 +114,41 @@ void UnityMenuAction::setIndex(int i)
}
}
-void UnityMenuAction::registerAction()
+void AyatanaMenuAction::registerAction()
{
if (m_model) {
m_model->registerAction(this);
}
}
-void UnityMenuAction::unregisterAction()
+void AyatanaMenuAction::unregisterAction()
{
if (m_model) {
m_model->unregisterAction(this);
}
}
-bool UnityMenuAction::event(QEvent* e)
+bool AyatanaMenuAction::event(QEvent* e)
{
- if (e->type() == UnityMenuActionAddEvent::eventType) {
- UnityMenuActionAddEvent *umaae = static_cast<UnityMenuActionAddEvent*>(e);
+ if (e->type() == AyatanaMenuActionAddEvent::eventType) {
+ AyatanaMenuActionAddEvent *umaae = static_cast<AyatanaMenuActionAddEvent*>(e);
setEnabled(umaae->enabled);
setState(umaae->state);
setValid(true);
return true;
- } else if (e->type() == UnityMenuActionEnabledChangedEvent::eventType) {
- UnityMenuActionEnabledChangedEvent *umaece = static_cast<UnityMenuActionEnabledChangedEvent*>(e);
+ } else if (e->type() == AyatanaMenuActionEnabledChangedEvent::eventType) {
+ AyatanaMenuActionEnabledChangedEvent *umaece = static_cast<AyatanaMenuActionEnabledChangedEvent*>(e);
setEnabled(umaece->enabled);
return true;
- } else if (e->type() == UnityMenuActionStateChangeEvent::eventType) {
- UnityMenuActionStateChangeEvent *umasce = static_cast<UnityMenuActionStateChangeEvent*>(e);
+ } else if (e->type() == AyatanaMenuActionStateChangeEvent::eventType) {
+ AyatanaMenuActionStateChangeEvent *umasce = static_cast<AyatanaMenuActionStateChangeEvent*>(e);
setState(umasce->state);
return true;
- } else if (e->type() == UnityMenuActionRemoveEvent::eventType) {
- UnityMenuActionRemoveEvent *umare = static_cast<UnityMenuActionRemoveEvent*>(e);
+ } else if (e->type() == AyatanaMenuActionRemoveEvent::eventType) {
+ AyatanaMenuActionRemoveEvent *umare = static_cast<AyatanaMenuActionRemoveEvent*>(e);
setValid(false);
return true;
diff --git a/libqmenumodel/src/unitymenuaction.h b/libqmenumodel/src/ayatanamenuaction.h
index 7479d2c..2454d8b 100644
--- a/libqmenumodel/src/unitymenuaction.h
+++ b/libqmenumodel/src/ayatanamenuaction.h
@@ -16,14 +16,14 @@
* Authors: Nick Dedekind <nick.dedekind@canonical.com>
*/
-#ifndef UNITYMENUACTION_H
-#define UNITYMENUACTION_H
+#ifndef AYATANAMENUACTION_H
+#define AYATANAMENUACTION_H
#include <QObject>
#include <QVariant>
-class UnityMenuModel;
+class AyatanaMenuModel;
-class UnityMenuAction: public QObject
+class AyatanaMenuAction: public QObject
{
Q_OBJECT
@@ -31,18 +31,18 @@ class UnityMenuAction: public QObject
Q_PROPERTY(QVariant state READ state NOTIFY stateChanged)
Q_PROPERTY(bool enabled READ isEnabled NOTIFY enabledChanged)
Q_PROPERTY(bool valid READ isValid NOTIFY validChanged)
- Q_PROPERTY(UnityMenuModel* model READ model WRITE setModel NOTIFY modelChanged)
+ Q_PROPERTY(AyatanaMenuModel* model READ model WRITE setModel NOTIFY modelChanged)
Q_PROPERTY(int index READ index WRITE setIndex NOTIFY indexChanged)
public:
- UnityMenuAction(QObject* parent = 0);
- ~UnityMenuAction();
+ AyatanaMenuAction(QObject* parent = 0);
+ ~AyatanaMenuAction();
QString name() const;
void setName(const QString& str);
- UnityMenuModel* model() const;
- void setModel(UnityMenuModel* model);
+ AyatanaMenuModel* model() const;
+ void setModel(AyatanaMenuModel* model);
int index() const;
void setIndex(int i);
@@ -56,7 +56,7 @@ Q_SIGNALS:
Q_INVOKABLE void changeState(const QVariant& parameter);
void nameChanged(const QString& name);
- void modelChanged(UnityMenuModel* model);
+ void modelChanged(AyatanaMenuModel* model);
void stateChanged(const QVariant& name);
void enabledChanged(bool enabled);
void validChanged(bool valid);
@@ -77,8 +77,8 @@ private:
QVariant m_state;
bool m_valid;
bool m_enabled;
- UnityMenuModel* m_model;
+ AyatanaMenuModel* m_model;
int m_index;
};
-#endif // UNITYMENUACTIONGROUP_H
+#endif // AYATANAMENUACTIONGROUP_H
diff --git a/libqmenumodel/src/ayatanamenuactionevents.cpp b/libqmenumodel/src/ayatanamenuactionevents.cpp
new file mode 100644
index 0000000..6524c1b
--- /dev/null
+++ b/libqmenumodel/src/ayatanamenuactionevents.cpp
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program 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; version 3.
+ *
+ * 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ * Nicholas Dedekind <nick.dedekind@canonical.com
+ */
+
+#include "ayatanamenuactionevents.h"
+
+const QEvent::Type AyatanaMenuActionAddEvent::eventType = static_cast<QEvent::Type>(QEvent::registerEventType());
+const QEvent::Type AyatanaMenuActionRemoveEvent::eventType = static_cast<QEvent::Type>(QEvent::registerEventType());
+const QEvent::Type AyatanaMenuActionEnabledChangedEvent::eventType = static_cast<QEvent::Type>(QEvent::registerEventType());
+const QEvent::Type AyatanaMenuActionStateChangeEvent::eventType = static_cast<QEvent::Type>(QEvent::registerEventType());
+
+AyatanaMenuActionAddEvent::AyatanaMenuActionAddEvent(bool _enabled, const QVariant& _state)
+ : QEvent(AyatanaMenuActionAddEvent::eventType),
+ enabled(_enabled),
+ state(_state)
+{}
+
+AyatanaMenuActionRemoveEvent::AyatanaMenuActionRemoveEvent()
+ : QEvent(AyatanaMenuActionRemoveEvent::eventType)
+{
+}
+
+AyatanaMenuActionEnabledChangedEvent::AyatanaMenuActionEnabledChangedEvent(bool _enabled)
+ : QEvent(AyatanaMenuActionEnabledChangedEvent::eventType),
+ enabled(_enabled)
+{}
+
+AyatanaMenuActionStateChangeEvent::AyatanaMenuActionStateChangeEvent(const QVariant& _state)
+ : QEvent(AyatanaMenuActionStateChangeEvent::eventType),
+ state(_state)
+{}
diff --git a/libqmenumodel/src/unitymenuactionevents.h b/libqmenumodel/src/ayatanamenuactionevents.h
index 44cb5de..ec67784 100644
--- a/libqmenumodel/src/unitymenuactionevents.h
+++ b/libqmenumodel/src/ayatanamenuactionevents.h
@@ -17,49 +17,49 @@
* Nicholas Dedekind <nick.dedekind@canonical.com
*/
-#ifndef UNITYMENUACTIONEVENTS_H
-#define UNITYMENUACTIONEVENTS_H
+#ifndef AYATANAMENUACTIONEVENTS_H
+#define AYATANAMENUACTIONEVENTS_H
#include <QEvent>
#include <QVariant>
-/* Event for a unitymenuaction add */
-class UnityMenuActionAddEvent : public QEvent
+/* Event for a ayatanamenuaction add */
+class AyatanaMenuActionAddEvent : public QEvent
{
public:
static const QEvent::Type eventType;
- UnityMenuActionAddEvent(bool enabled, const QVariant& state);
+ AyatanaMenuActionAddEvent(bool enabled, const QVariant& state);
bool enabled;
QVariant state;
};
-/* Event for a unitymenuaction remove */
-class UnityMenuActionRemoveEvent : public QEvent
+/* Event for a ayatanamenuaction remove */
+class AyatanaMenuActionRemoveEvent : public QEvent
{
public:
static const QEvent::Type eventType;
- UnityMenuActionRemoveEvent();
+ AyatanaMenuActionRemoveEvent();
};
-/* Event for change in enabled value of a unitymenuaction */
-class UnityMenuActionEnabledChangedEvent : public QEvent
+/* Event for change in enabled value of a ayatanamenuaction */
+class AyatanaMenuActionEnabledChangedEvent : public QEvent
{
public:
static const QEvent::Type eventType;
- UnityMenuActionEnabledChangedEvent(bool enabled);
+ AyatanaMenuActionEnabledChangedEvent(bool enabled);
int enabled;
};
-/* Event for change in state value of a unitymenuaction */
-class UnityMenuActionStateChangeEvent : public QEvent
+/* Event for change in state value of a ayatanamenuaction */
+class AyatanaMenuActionStateChangeEvent : public QEvent
{
public:
static const QEvent::Type eventType;
- UnityMenuActionStateChangeEvent(const QVariant& state);
+ AyatanaMenuActionStateChangeEvent(const QVariant& state);
QVariant state;
};
-#endif //UNITYMENUACTIONEVENTS_H
+#endif //AYATANAMENUACTIONEVENTS_H
diff --git a/libqmenumodel/src/unitymenumodel.cpp b/libqmenumodel/src/ayatanamenumodel.cpp
index fafed4c..f535e5c 100644
--- a/libqmenumodel/src/unitymenumodel.cpp
+++ b/libqmenumodel/src/ayatanamenumodel.cpp
@@ -16,12 +16,12 @@
* Authors: Lars Uebernickel <lars.uebernickel@canonical.com>
*/
-#include "unitymenumodel.h"
+#include "ayatanamenumodel.h"
#include "converter.h"
#include "actionstateparser.h"
-#include "unitymenumodelevents.h"
-#include "unitymenuaction.h"
-#include "unitymenuactionevents.h"
+#include "ayatanamenumodelevents.h"
+#include "ayatanamenuaction.h"
+#include "ayatanamenuactionevents.h"
#include "logging.h"
#include <QIcon>
@@ -35,12 +35,12 @@ extern "C" {
#include "gtk/gtksimpleactionobserver.h"
}
-Q_LOGGING_CATEGORY(unitymenumodel, "qmenumodel.unitymenumodel", QtCriticalMsg)
+Q_LOGGING_CATEGORY(ayatanamenumodel, "qmenumodel.ayatanamenumodel", QtCriticalMsg)
-G_DEFINE_QUARK (UNITY_MENU_MODEL, unity_menu_model)
-G_DEFINE_QUARK (UNITY_SUBMENU_MODEL, unity_submenu_model)
-G_DEFINE_QUARK (UNITY_MENU_ITEM_EXTENDED_ATTRIBUTES, unity_menu_item_extended_attributes)
-G_DEFINE_QUARK (UNITY_MENU_ACTION, unity_menu_action)
+G_DEFINE_QUARK (AYATANA_MENU_MODEL, ayatana_menu_model)
+G_DEFINE_QUARK (AYATANA_SUBMENU_MODEL, ayatana_submenu_model)
+G_DEFINE_QUARK (AYATANA_MENU_ITEM_EXTENDED_ATTRIBUTES, ayatana_menu_item_extended_attributes)
+G_DEFINE_QUARK (AYATANA_MENU_ACTION, ayatana_menu_action)
enum MenuRoles {
@@ -59,12 +59,12 @@ enum MenuRoles {
HasSubmenuRole
};
-class UnityMenuModelPrivate
+class AyatanaMenuModelPrivate
{
public:
- UnityMenuModelPrivate(UnityMenuModel *model);
- UnityMenuModelPrivate(const UnityMenuModelPrivate& other, UnityMenuModel *model);
- ~UnityMenuModelPrivate();
+ AyatanaMenuModelPrivate(AyatanaMenuModel *model);
+ AyatanaMenuModelPrivate(const AyatanaMenuModelPrivate& other, AyatanaMenuModel *model);
+ ~AyatanaMenuModelPrivate();
void clearItems(bool resetModel=true);
void clearName();
@@ -72,7 +72,7 @@ public:
void updateMenuModel();
QVariant itemState(GtkMenuTrackerItem *item);
- UnityMenuModel *model;
+ AyatanaMenuModel *model;
GtkActionMuxer *muxer;
GtkMenuTracker *menutracker;
GSequence *items;
@@ -84,7 +84,7 @@ public:
QByteArray menuObjectPath;
QHash<QByteArray, int> roles;
ActionStateParser* actionStateParser;
- QHash<UnityMenuAction*, GtkSimpleActionObserver*> registeredActions;
+ QHash<AyatanaMenuAction*, GtkSimpleActionObserver*> registeredActions;
bool destructorGuard;
static void nameAppeared(GDBusConnection *connection, const gchar *name, const gchar *owner, gpointer user_data);
@@ -101,19 +101,19 @@ public:
static void registeredActionStateChanged(GtkSimpleActionObserver *observer_item, const gchar *action_name, GVariant *state);
static void registeredActionRemoved(GtkSimpleActionObserver *observer_item, const gchar *action_name);
- gchar * fullActionName(UnityMenuAction *action);
- void updateRegisteredAction(UnityMenuAction *action);
+ gchar * fullActionName(AyatanaMenuAction *action);
+ void updateRegisteredAction(AyatanaMenuAction *action);
};
void menu_item_free (gpointer data)
{
GtkMenuTrackerItem *item = (GtkMenuTrackerItem *) data;
- g_signal_handlers_disconnect_by_func (item, (gpointer) UnityMenuModelPrivate::menuItemChanged, NULL);
+ g_signal_handlers_disconnect_by_func (item, (gpointer) AyatanaMenuModelPrivate::menuItemChanged, NULL);
g_object_unref (item);
}
-UnityMenuModelPrivate::UnityMenuModelPrivate(UnityMenuModel *model)
+AyatanaMenuModelPrivate::AyatanaMenuModelPrivate(AyatanaMenuModel *model)
{
this->model = model;
this->menutracker = NULL;
@@ -127,7 +127,7 @@ UnityMenuModelPrivate::UnityMenuModelPrivate(UnityMenuModel *model)
this->items = g_sequence_new (menu_item_free);
}
-UnityMenuModelPrivate::UnityMenuModelPrivate(const UnityMenuModelPrivate& other, UnityMenuModel *model)
+AyatanaMenuModelPrivate::AyatanaMenuModelPrivate(const AyatanaMenuModelPrivate& other, AyatanaMenuModel *model)
{
this->model = model;
this->menutracker = NULL;
@@ -141,7 +141,7 @@ UnityMenuModelPrivate::UnityMenuModelPrivate(const UnityMenuModelPrivate& other,
this->items = g_sequence_new (menu_item_free);
}
-UnityMenuModelPrivate::~UnityMenuModelPrivate()
+AyatanaMenuModelPrivate::~AyatanaMenuModelPrivate()
{
this->destructorGuard = true;
this->clearItems(false);
@@ -151,7 +151,7 @@ UnityMenuModelPrivate::~UnityMenuModelPrivate()
g_clear_object (&this->muxer);
g_clear_object (&this->connection);
- QHash<UnityMenuAction*, GtkSimpleActionObserver*>::const_iterator it = this->registeredActions.constBegin();
+ QHash<AyatanaMenuAction*, GtkSimpleActionObserver*>::const_iterator it = this->registeredActions.constBegin();
for (; it != this->registeredActions.constEnd(); ++it) {
g_object_unref(it.value());
it.key()->setModel(NULL);
@@ -162,13 +162,13 @@ UnityMenuModelPrivate::~UnityMenuModelPrivate()
g_bus_unwatch_name (this->nameWatchId);
}
-void UnityMenuModelPrivate::clearItems(bool resetModel)
+void AyatanaMenuModelPrivate::clearItems(bool resetModel)
{
- UnityMenuModelClearEvent ummce(resetModel);
+ AyatanaMenuModelClearEvent ummce(resetModel);
QCoreApplication::sendEvent(model, &ummce);
}
-void UnityMenuModelPrivate::clearName()
+void AyatanaMenuModelPrivate::clearName()
{
this->clearItems();
@@ -180,7 +180,7 @@ void UnityMenuModelPrivate::clearName()
Q_EMIT model->nameOwnerChanged (this->nameOwner);
}
-void UnityMenuModelPrivate::updateActions()
+void AyatanaMenuModelPrivate::updateActions()
{
Q_FOREACH (QString prefix, this->actions.keys())
gtk_action_muxer_remove (this->muxer, prefix.toUtf8());
@@ -198,7 +198,7 @@ void UnityMenuModelPrivate::updateActions()
}
}
-void UnityMenuModelPrivate::updateMenuModel()
+void AyatanaMenuModelPrivate::updateMenuModel()
{
this->clearItems();
g_clear_pointer (&this->menutracker, gtk_menu_tracker_free);
@@ -215,7 +215,7 @@ void UnityMenuModelPrivate::updateMenuModel()
}
}
-QVariant UnityMenuModelPrivate::itemState(GtkMenuTrackerItem *item)
+QVariant AyatanaMenuModelPrivate::itemState(GtkMenuTrackerItem *item)
{
QVariant result;
@@ -230,9 +230,9 @@ QVariant UnityMenuModelPrivate::itemState(GtkMenuTrackerItem *item)
return result;
}
-void UnityMenuModelPrivate::nameAppeared(GDBusConnection *connection, const gchar *name, const gchar *owner, gpointer user_data)
+void AyatanaMenuModelPrivate::nameAppeared(GDBusConnection *connection, const gchar *name, const gchar *owner, gpointer user_data)
{
- UnityMenuModelPrivate *priv = (UnityMenuModelPrivate *)user_data;
+ AyatanaMenuModelPrivate *priv = (AyatanaMenuModelPrivate *)user_data;
priv->connection = (GDBusConnection *) g_object_ref (connection);
priv->nameOwner = owner;
@@ -243,74 +243,74 @@ void UnityMenuModelPrivate::nameAppeared(GDBusConnection *connection, const gcha
Q_EMIT priv->model->nameOwnerChanged (priv->nameOwner);
}
-void UnityMenuModelPrivate::nameVanished(GDBusConnection *connection, const gchar *name, gpointer user_data)
+void AyatanaMenuModelPrivate::nameVanished(GDBusConnection *connection, const gchar *name, gpointer user_data)
{
- UnityMenuModelPrivate *priv = (UnityMenuModelPrivate *)user_data;
+ AyatanaMenuModelPrivate *priv = (AyatanaMenuModelPrivate *)user_data;
priv->clearName();
}
-void UnityMenuModelPrivate::menuItemInserted(GPtrArray *items, gint position, gpointer user_data)
+void AyatanaMenuModelPrivate::menuItemInserted(GPtrArray *items, gint position, gpointer user_data)
{
- UnityMenuModelPrivate *priv = (UnityMenuModelPrivate *)user_data;
+ AyatanaMenuModelPrivate *priv = (AyatanaMenuModelPrivate *)user_data;
- UnityMenuModelAddRowEvent ummare(items, position);
+ AyatanaMenuModelAddRowEvent ummare(items, position);
QCoreApplication::sendEvent(priv->model, &ummare);
}
-void UnityMenuModelPrivate::menuItemRemoved(gint position, gint n_items, gpointer user_data)
+void AyatanaMenuModelPrivate::menuItemRemoved(gint position, gint n_items, gpointer user_data)
{
- UnityMenuModelPrivate *priv = (UnityMenuModelPrivate *)user_data;
+ AyatanaMenuModelPrivate *priv = (AyatanaMenuModelPrivate *)user_data;
- UnityMenuModelRemoveRowEvent ummrre(position, n_items);
+ AyatanaMenuModelRemoveRowEvent ummrre(position, n_items);
QCoreApplication::sendEvent(priv->model, &ummrre);
}
-void UnityMenuModelPrivate::menuItemChanged(GObject *object, GParamSpec *pspec, gpointer user_data)
+void AyatanaMenuModelPrivate::menuItemChanged(GObject *object, GParamSpec *pspec, gpointer user_data)
{
GSequenceIter *it = (GSequenceIter *) user_data;
GtkMenuTrackerItem *item;
GtkActionObservable *muxer;
- UnityMenuModel *model;
+ AyatanaMenuModel *model;
gint position;
item = (GtkMenuTrackerItem *) g_sequence_get (it);
muxer = _gtk_menu_tracker_item_get_observable (item);
- model = (UnityMenuModel *) g_object_get_qdata (G_OBJECT (item), unity_menu_model_quark ());
+ model = (AyatanaMenuModel *) g_object_get_qdata (G_OBJECT (item), ayatana_menu_model_quark ());
position = g_sequence_iter_get_position (it);
- UnityMenuModelDataChangeEvent ummdce(position);
+ AyatanaMenuModelDataChangeEvent ummdce(position);
QCoreApplication::sendEvent(model, &ummdce);
}
-UnityMenuModel::UnityMenuModel(QObject *parent):
+AyatanaMenuModel::AyatanaMenuModel(QObject *parent):
QAbstractListModel(parent)
{
- priv = new UnityMenuModelPrivate(this);
+ priv = new AyatanaMenuModelPrivate(this);
}
-UnityMenuModel::UnityMenuModel(const UnityMenuModelPrivate& other, UnityMenuModel *parent):
+AyatanaMenuModel::AyatanaMenuModel(const AyatanaMenuModelPrivate& other, AyatanaMenuModel *parent):
QAbstractListModel(parent)
{
- priv = new UnityMenuModelPrivate(other, this);
+ priv = new AyatanaMenuModelPrivate(other, this);
}
-UnityMenuModel::~UnityMenuModel()
+AyatanaMenuModel::~AyatanaMenuModel()
{
delete priv;
}
-QByteArray UnityMenuModel::busName() const
+QByteArray AyatanaMenuModel::busName() const
{
return priv->busName;
}
-QByteArray UnityMenuModel::nameOwner() const
+QByteArray AyatanaMenuModel::nameOwner() const
{
return priv->nameOwner;
}
-void UnityMenuModel::setBusName(const QByteArray &name)
+void AyatanaMenuModel::setBusName(const QByteArray &name)
{
if (name == priv->busName)
return;
@@ -321,40 +321,40 @@ void UnityMenuModel::setBusName(const QByteArray &name)
g_bus_unwatch_name (priv->nameWatchId);
priv->nameWatchId = g_bus_watch_name (G_BUS_TYPE_SESSION, name.constData(), G_BUS_NAME_WATCHER_FLAGS_AUTO_START,
- UnityMenuModelPrivate::nameAppeared, UnityMenuModelPrivate::nameVanished,
+ AyatanaMenuModelPrivate::nameAppeared, AyatanaMenuModelPrivate::nameVanished,
priv, NULL);
priv->busName = name;
Q_EMIT busNameChanged (priv->busName);
}
-QVariantMap UnityMenuModel::actions() const
+QVariantMap AyatanaMenuModel::actions() const
{
return priv->actions;
}
-void UnityMenuModel::setActions(const QVariantMap &actions)
+void AyatanaMenuModel::setActions(const QVariantMap &actions)
{
priv->actions = actions;
priv->updateActions();
}
-QByteArray UnityMenuModel::menuObjectPath() const
+QByteArray AyatanaMenuModel::menuObjectPath() const
{
return priv->menuObjectPath;
}
-void UnityMenuModel::setMenuObjectPath(const QByteArray &path)
+void AyatanaMenuModel::setMenuObjectPath(const QByteArray &path)
{
priv->menuObjectPath = path;
priv->updateMenuModel();
}
-ActionStateParser* UnityMenuModel::actionStateParser() const
+ActionStateParser* AyatanaMenuModel::actionStateParser() const
{
return priv->actionStateParser;
}
-void UnityMenuModel::setActionStateParser(ActionStateParser* actionStateParser)
+void AyatanaMenuModel::setActionStateParser(ActionStateParser* actionStateParser)
{
if (priv->actionStateParser != actionStateParser) {
priv->actionStateParser = actionStateParser;
@@ -362,12 +362,12 @@ void UnityMenuModel::setActionStateParser(ActionStateParser* actionStateParser)
}
}
-int UnityMenuModel::rowCount(const QModelIndex &parent) const
+int AyatanaMenuModel::rowCount(const QModelIndex &parent) const
{
return !parent.isValid() ? g_sequence_get_length (priv->items) : 0;
}
-int UnityMenuModel::columnCount(const QModelIndex &parent) const
+int AyatanaMenuModel::columnCount(const QModelIndex &parent) const
{
return 1;
}
@@ -417,7 +417,7 @@ static QString iconUri(GIcon *icon)
return uri;
}
-QVariant UnityMenuModel::data(const QModelIndex &index, int role) const
+QVariant AyatanaMenuModel::data(const QModelIndex &index, int role) const
{
GSequenceIter *it;
GtkMenuTrackerItem *item;
@@ -471,7 +471,7 @@ QVariant UnityMenuModel::data(const QModelIndex &index, int role) const
}
case ExtendedAttributesRole: {
- QVariantMap *map = (QVariantMap *) g_object_get_qdata (G_OBJECT (item), unity_menu_item_extended_attributes_quark ());
+ QVariantMap *map = (QVariantMap *) g_object_get_qdata (G_OBJECT (item), ayatana_menu_item_extended_attributes_quark ());
return map ? *map : QVariant();
}
@@ -505,17 +505,17 @@ QVariant UnityMenuModel::data(const QModelIndex &index, int role) const
}
}
-QModelIndex UnityMenuModel::index(int row, int column, const QModelIndex &parent) const
+QModelIndex AyatanaMenuModel::index(int row, int column, const QModelIndex &parent) const
{
return createIndex(row, column);
}
-QModelIndex UnityMenuModel::parent(const QModelIndex &index) const
+QModelIndex AyatanaMenuModel::parent(const QModelIndex &index) const
{
return QModelIndex();
}
-QHash<int, QByteArray> UnityMenuModel::roleNames() const
+QHash<int, QByteArray> AyatanaMenuModel::roleNames() const
{
QHash<int, QByteArray> names;
@@ -536,11 +536,11 @@ QHash<int, QByteArray> UnityMenuModel::roleNames() const
return names;
}
-QObject * UnityMenuModel::submenu(int position, QQmlComponent* actionStateParser)
+QObject * AyatanaMenuModel::submenu(int position, QQmlComponent* actionStateParser)
{
GSequenceIter *it;
GtkMenuTrackerItem *item;
- UnityMenuModel *model;
+ AyatanaMenuModel *model;
it = g_sequence_get_iter_at_pos (priv->items, position);
if (g_sequence_iter_is_end (it)) {
@@ -552,9 +552,9 @@ QObject * UnityMenuModel::submenu(int position, QQmlComponent* actionStateParser
return NULL;
}
- model = (UnityMenuModel *) g_object_get_qdata (G_OBJECT (item), unity_submenu_model_quark ());
+ model = (AyatanaMenuModel *) g_object_get_qdata (G_OBJECT (item), ayatana_submenu_model_quark ());
if (model == NULL) {
- model = new UnityMenuModel(*priv, this);
+ model = new AyatanaMenuModel(*priv, this);
if (actionStateParser) {
ActionStateParser* parser = qobject_cast<ActionStateParser*>(actionStateParser->create());
@@ -564,10 +564,10 @@ QObject * UnityMenuModel::submenu(int position, QQmlComponent* actionStateParser
}
model->priv->menutracker = gtk_menu_tracker_new_for_item_submenu (item,
- UnityMenuModelPrivate::menuItemInserted,
- UnityMenuModelPrivate::menuItemRemoved,
+ AyatanaMenuModelPrivate::menuItemInserted,
+ AyatanaMenuModelPrivate::menuItemRemoved,
model->priv);
- g_object_set_qdata (G_OBJECT (item), unity_submenu_model_quark (), model);
+ g_object_set_qdata (G_OBJECT (item), ayatana_submenu_model_quark (), model);
}
return model;
@@ -649,7 +649,7 @@ static QString qtify_name(const char *name)
return result;
}
-bool UnityMenuModel::loadExtendedAttributes(int position, const QVariantMap &schema)
+bool AyatanaMenuModel::loadExtendedAttributes(int position, const QVariantMap &schema)
{
GSequenceIter *it;
GtkMenuTrackerItem *item;
@@ -673,7 +673,7 @@ bool UnityMenuModel::loadExtendedAttributes(int position, const QVariantMap &sch
GVariant *value = gtk_menu_tracker_item_get_attribute_value (item, name.toUtf8(), NULL);
if (value == NULL) {
- qCWarning(unitymenumodel, "loadExtendedAttributes: menu item does not contain '%s'", it.key().toUtf8().constData());
+ qCWarning(ayatanamenumodel, "loadExtendedAttributes: menu item does not contain '%s'", it.key().toUtf8().constData());
continue;
}
@@ -681,20 +681,20 @@ bool UnityMenuModel::loadExtendedAttributes(int position, const QVariantMap &sch
if (qvalue.isValid())
extendedAttrs->insert(qtify_name (name.toUtf8()), qvalue);
else
- qCWarning(unitymenumodel, "loadExtendedAttributes: key '%s' is of type '%s' (expected '%s')",
+ qCWarning(ayatanamenumodel, "loadExtendedAttributes: key '%s' is of type '%s' (expected '%s')",
name.toUtf8().constData(), g_variant_get_type_string(value), type.constData());
g_variant_unref (value);
}
- g_object_set_qdata_full (G_OBJECT (item), unity_menu_item_extended_attributes_quark (),
+ g_object_set_qdata_full (G_OBJECT (item), ayatana_menu_item_extended_attributes_quark (),
extendedAttrs, freeExtendedAttrs);
Q_EMIT dataChanged(index(position, 0), index(position, 0), QVector<int>() << ExtendedAttributesRole);
return true;
}
-QVariant UnityMenuModel::get(int row, const QByteArray &role)
+QVariant AyatanaMenuModel::get(int row, const QByteArray &role)
{
if (priv->roles.isEmpty()) {
QHash<int, QByteArray> names = roleNames();
@@ -705,7 +705,7 @@ QVariant UnityMenuModel::get(int row, const QByteArray &role)
return this->data(this->index(row, 0), priv->roles[role]);
}
-void UnityMenuModel::activate(int index, const QVariant& parameter)
+void AyatanaMenuModel::activate(int index, const QVariant& parameter)
{
GSequenceIter *it;
GtkMenuTrackerItem *item;
@@ -736,7 +736,7 @@ void UnityMenuModel::activate(int index, const QVariant& parameter)
}
}
-void UnityMenuModel::aboutToShow(int index)
+void AyatanaMenuModel::aboutToShow(int index)
{
GSequenceIter *it = g_sequence_get_iter_at_pos (priv->items, index);
if (g_sequence_iter_is_end (it)) {
@@ -750,10 +750,10 @@ void UnityMenuModel::aboutToShow(int index)
quint64 actionTag;
if (gtk_menu_tracker_item_get_attribute (item, "qtubuntu-tag", "t", &actionTag)) {
- // Child UnityMenuModel have priv->connection null, so climb to the parent until we find a non null one
- UnityMenuModelPrivate *privToUse = priv;
+ // Child AyatanaMenuModel have priv->connection null, so climb to the parent until we find a non null one
+ AyatanaMenuModelPrivate *privToUse = priv;
while (privToUse && !privToUse->connection) {
- auto pModel = dynamic_cast<UnityMenuModel*>(privToUse->model->QObject::parent());
+ auto pModel = dynamic_cast<AyatanaMenuModel*>(privToUse->model->QObject::parent());
if (pModel) {
privToUse = pModel->priv;
} else {
@@ -777,17 +777,17 @@ void UnityMenuModel::aboutToShow(int index)
}
}
-void UnityMenuModel::activateByVariantString(int index, const QString& parameter)
+void AyatanaMenuModel::activateByVariantString(int index, const QString& parameter)
{
activate(index, Converter::toQVariantFromVariantString(parameter));
}
-void UnityMenuModel::changeStateByVariantString(int index, const QString& parameter)
+void AyatanaMenuModel::changeStateByVariantString(int index, const QString& parameter)
{
changeState(index, Converter::toQVariantFromVariantString(parameter));
}
-void UnityMenuModel::changeState(int index, const QVariant& parameter)
+void AyatanaMenuModel::changeState(int index, const QVariant& parameter)
{
GSequenceIter *it;
GtkMenuTrackerItem* item;
@@ -820,10 +820,10 @@ void UnityMenuModel::changeState(int index, const QVariant& parameter)
}
-bool UnityMenuModel::event(QEvent* e)
+bool AyatanaMenuModel::event(QEvent* e)
{
- if (e->type() == UnityMenuModelClearEvent::eventType) {
- UnityMenuModelClearEvent *emmce = static_cast<UnityMenuModelClearEvent*>(e);
+ if (e->type() == AyatanaMenuModelClearEvent::eventType) {
+ AyatanaMenuModelClearEvent *emmce = static_cast<AyatanaMenuModelClearEvent*>(e);
GSequenceIter *begin;
GSequenceIter *end;
@@ -839,8 +839,8 @@ bool UnityMenuModel::event(QEvent* e)
endResetModel();
return true;
- } else if (e->type() == UnityMenuModelAddRowEvent::eventType) {
- UnityMenuModelAddRowEvent *ummrce = static_cast<UnityMenuModelAddRowEvent*>(e);
+ } else if (e->type() == AyatanaMenuModelAddRowEvent::eventType) {
+ AyatanaMenuModelAddRowEvent *ummrce = static_cast<AyatanaMenuModelAddRowEvent*>(e);
GSequenceIter *it;
it = g_sequence_get_iter_at_pos (priv->items, ummrce->position);
@@ -850,14 +850,14 @@ bool UnityMenuModel::event(QEvent* e)
for (gint i = ummrce->items->len - 1; i >= 0; --i) {
GtkMenuTrackerItem *item = (GtkMenuTrackerItem*)g_ptr_array_index(ummrce->items, i);
it = g_sequence_insert_before (it, g_object_ref (item));
- g_object_set_qdata (G_OBJECT (item), unity_menu_model_quark (), this);
- g_signal_connect (item, "notify", G_CALLBACK (UnityMenuModelPrivate::menuItemChanged), it);
+ g_object_set_qdata (G_OBJECT (item), ayatana_menu_model_quark (), this);
+ g_signal_connect (item, "notify", G_CALLBACK (AyatanaMenuModelPrivate::menuItemChanged), it);
}
endInsertRows();
return true;
- } else if (e->type() == UnityMenuModelRemoveRowEvent::eventType) {
- UnityMenuModelRemoveRowEvent *ummrre = static_cast<UnityMenuModelRemoveRowEvent*>(e);
+ } else if (e->type() == AyatanaMenuModelRemoveRowEvent::eventType) {
+ AyatanaMenuModelRemoveRowEvent *ummrre = static_cast<AyatanaMenuModelRemoveRowEvent*>(e);
beginRemoveRows(QModelIndex(), ummrre->position, ummrre->position + ummrre->nItems - 1);
for (int i = 0; i < ummrre->nItems; ++i) {
@@ -869,8 +869,8 @@ bool UnityMenuModel::event(QEvent* e)
endRemoveRows();
return true;
- } else if (e->type() == UnityMenuModelDataChangeEvent::eventType) {
- UnityMenuModelDataChangeEvent *ummdce = static_cast<UnityMenuModelDataChangeEvent*>(e);
+ } else if (e->type() == AyatanaMenuModelDataChangeEvent::eventType) {
+ AyatanaMenuModelDataChangeEvent *ummdce = static_cast<AyatanaMenuModelDataChangeEvent*>(e);
Q_EMIT dataChanged(index(ummdce->position, 0), index(ummdce->position, 0));
return true;
@@ -878,7 +878,7 @@ bool UnityMenuModel::event(QEvent* e)
return QAbstractListModel::event(e);
}
-void UnityMenuModel::registerAction(UnityMenuAction* action)
+void AyatanaMenuModel::registerAction(AyatanaMenuAction* action)
{
if (priv->destructorGuard)
return;
@@ -886,12 +886,12 @@ void UnityMenuModel::registerAction(UnityMenuAction* action)
if (!priv->registeredActions.contains(action)) {
GtkSimpleActionObserver* observer_item;
observer_item = gtk_simple_action_observer_new(GTK_ACTION_OBSERVABLE (priv->muxer),
- UnityMenuModelPrivate::registeredActionAdded,
- UnityMenuModelPrivate::registeredActionEnabledChanged,
- UnityMenuModelPrivate::registeredActionStateChanged,
- UnityMenuModelPrivate::registeredActionRemoved);
+ AyatanaMenuModelPrivate::registeredActionAdded,
+ AyatanaMenuModelPrivate::registeredActionEnabledChanged,
+ AyatanaMenuModelPrivate::registeredActionStateChanged,
+ AyatanaMenuModelPrivate::registeredActionRemoved);
- g_object_set_qdata (G_OBJECT (observer_item), unity_menu_action_quark (), action);
+ g_object_set_qdata (G_OBJECT (observer_item), ayatana_menu_action_quark (), action);
priv->registeredActions[action] = observer_item;
@@ -902,7 +902,7 @@ void UnityMenuModel::registerAction(UnityMenuAction* action)
}
}
-void UnityMenuModel::unregisterAction(UnityMenuAction* action)
+void AyatanaMenuModel::unregisterAction(AyatanaMenuAction* action)
{
if (priv->destructorGuard)
return;
@@ -923,7 +923,7 @@ void UnityMenuModel::unregisterAction(UnityMenuAction* action)
* section or submenu with "action-namespace" set, this namespace
* is prepended to @action->name()
*/
-char * UnityMenuModelPrivate::fullActionName(UnityMenuAction *action)
+char * AyatanaMenuModelPrivate::fullActionName(AyatanaMenuAction *action)
{
GSequenceIter *iter;
QByteArray bytes;
@@ -951,7 +951,7 @@ char * UnityMenuModelPrivate::fullActionName(UnityMenuAction *action)
return g_strdup (name);
}
-void UnityMenuModelPrivate::updateRegisteredAction(UnityMenuAction *action)
+void AyatanaMenuModelPrivate::updateRegisteredAction(AyatanaMenuAction *action)
{
GtkSimpleActionObserver *observer_item;
gchar *action_name;
@@ -969,7 +969,7 @@ void UnityMenuModelPrivate::updateRegisteredAction(UnityMenuAction *action)
if (g_action_group_query_action (G_ACTION_GROUP (this->muxer), action_name,
&enabled, NULL, NULL, NULL, &state))
{
- UnityMenuActionAddEvent umaae(enabled, Converter::toQVariant(state));
+ AyatanaMenuActionAddEvent umaae(enabled, Converter::toQVariant(state));
QCoreApplication::sendEvent(action, &umaae);
if (state) {
@@ -980,19 +980,19 @@ void UnityMenuModelPrivate::updateRegisteredAction(UnityMenuAction *action)
g_free(action_name);
}
-void UnityMenuModel::onRegisteredActionNameChanged(const QString& name)
+void AyatanaMenuModel::onRegisteredActionNameChanged(const QString& name)
{
- priv->updateRegisteredAction(qobject_cast<UnityMenuAction*>(sender()));
+ priv->updateRegisteredAction(qobject_cast<AyatanaMenuAction*>(sender()));
}
-void UnityMenuModel::onRegisteredActionIndexChanged(int index)
+void AyatanaMenuModel::onRegisteredActionIndexChanged(int index)
{
- priv->updateRegisteredAction(qobject_cast<UnityMenuAction*>(sender()));
+ priv->updateRegisteredAction(qobject_cast<AyatanaMenuAction*>(sender()));
}
-void UnityMenuModel::onRegisteredActionActivated(const QVariant& parameter)
+void AyatanaMenuModel::onRegisteredActionActivated(const QVariant& parameter)
{
- UnityMenuAction* action = qobject_cast<UnityMenuAction*>(sender());
+ AyatanaMenuAction* action = qobject_cast<AyatanaMenuAction*>(sender());
if (!action || action->name().isEmpty())
return;
@@ -1003,9 +1003,9 @@ void UnityMenuModel::onRegisteredActionActivated(const QVariant& parameter)
g_free(action_name);
}
-void UnityMenuModel::onRegisteredActionStateChanged(const QVariant& parameter)
+void AyatanaMenuModel::onRegisteredActionStateChanged(const QVariant& parameter)
{
- UnityMenuAction* action = qobject_cast<UnityMenuAction*>(sender());
+ AyatanaMenuAction* action = qobject_cast<AyatanaMenuAction*>(sender());
if (!action || action->name().isEmpty())
return;
@@ -1016,49 +1016,49 @@ void UnityMenuModel::onRegisteredActionStateChanged(const QVariant& parameter)
g_free(action_name);
}
-void UnityMenuModelPrivate::registeredActionAdded(GtkSimpleActionObserver *observer_item,
+void AyatanaMenuModelPrivate::registeredActionAdded(GtkSimpleActionObserver *observer_item,
const gchar *action_name,
gboolean enabled,
GVariant *state)
{
- UnityMenuAction *action;
- action = (UnityMenuAction *) g_object_get_qdata (G_OBJECT (observer_item), unity_menu_action_quark ());
+ AyatanaMenuAction *action;
+ action = (AyatanaMenuAction *) g_object_get_qdata (G_OBJECT (observer_item), ayatana_menu_action_quark ());
if (action) {
- UnityMenuActionAddEvent umaae(enabled, Converter::toQVariant(state));
+ AyatanaMenuActionAddEvent umaae(enabled, Converter::toQVariant(state));
QCoreApplication::sendEvent(action, &umaae);
}
}
-void UnityMenuModelPrivate::registeredActionEnabledChanged(GtkSimpleActionObserver *observer_item, const gchar *action_name, gboolean enabled)
+void AyatanaMenuModelPrivate::registeredActionEnabledChanged(GtkSimpleActionObserver *observer_item, const gchar *action_name, gboolean enabled)
{
- UnityMenuAction *action;
- action = (UnityMenuAction *) g_object_get_qdata (G_OBJECT (observer_item), unity_menu_action_quark ());
+ AyatanaMenuAction *action;
+ action = (AyatanaMenuAction *) g_object_get_qdata (G_OBJECT (observer_item), ayatana_menu_action_quark ());
if (action) {
- UnityMenuActionEnabledChangedEvent umaece(enabled);
+ AyatanaMenuActionEnabledChangedEvent umaece(enabled);
QCoreApplication::sendEvent(action, &umaece);
}
}
-void UnityMenuModelPrivate::registeredActionStateChanged(GtkSimpleActionObserver *observer_item, const gchar *action_name, GVariant *state)
+void AyatanaMenuModelPrivate::registeredActionStateChanged(GtkSimpleActionObserver *observer_item, const gchar *action_name, GVariant *state)
{
- UnityMenuAction *action;
- action = (UnityMenuAction *) g_object_get_qdata (G_OBJECT (observer_item), unity_menu_action_quark ());
+ AyatanaMenuAction *action;
+ action = (AyatanaMenuAction *) g_object_get_qdata (G_OBJECT (observer_item), ayatana_menu_action_quark ());
if (action) {
- UnityMenuActionStateChangeEvent umasce(Converter::toQVariant(state));
+ AyatanaMenuActionStateChangeEvent umasce(Converter::toQVariant(state));
QCoreApplication::sendEvent(action, &umasce);
}
}
-void UnityMenuModelPrivate::registeredActionRemoved(GtkSimpleActionObserver *observer_item, const gchar *action_name)
+void AyatanaMenuModelPrivate::registeredActionRemoved(GtkSimpleActionObserver *observer_item, const gchar *action_name)
{
- UnityMenuAction *action;
- action = (UnityMenuAction *) g_object_get_qdata (G_OBJECT (observer_item), unity_menu_action_quark ());
+ AyatanaMenuAction *action;
+ action = (AyatanaMenuAction *) g_object_get_qdata (G_OBJECT (observer_item), ayatana_menu_action_quark ());
if (action) {
- UnityMenuActionRemoveEvent umare;
+ AyatanaMenuActionRemoveEvent umare;
QCoreApplication::sendEvent(action, &umare);
}
}
diff --git a/libqmenumodel/src/unitymenumodel.h b/libqmenumodel/src/ayatanamenumodel.h
index 1a2a190..25722d9 100644
--- a/libqmenumodel/src/unitymenumodel.h
+++ b/libqmenumodel/src/ayatanamenumodel.h
@@ -16,15 +16,15 @@
* Authors: Lars Uebernickel <lars.uebernickel@canonical.com>
*/
-#ifndef UNITYMENUMODEL_H
-#define UNITYMENUMODEL_H
+#ifndef AYATANAMENUMODEL_H
+#define AYATANAMENUMODEL_H
#include <QAbstractListModel>
class ActionStateParser;
class QQmlComponent;
-class UnityMenuAction;
+class AyatanaMenuAction;
-class UnityMenuModel: public QAbstractListModel
+class AyatanaMenuModel: public QAbstractListModel
{
Q_OBJECT
Q_PROPERTY(QByteArray busName READ busName WRITE setBusName NOTIFY busNameChanged)
@@ -34,8 +34,8 @@ class UnityMenuModel: public QAbstractListModel
Q_PROPERTY(ActionStateParser* actionStateParser READ actionStateParser WRITE setActionStateParser NOTIFY actionStateParserChanged)
public:
- UnityMenuModel(QObject *parent = NULL);
- virtual ~UnityMenuModel();
+ AyatanaMenuModel(QObject *parent = NULL);
+ virtual ~AyatanaMenuModel();
QByteArray busName() const;
void setBusName(const QByteArray &name);
@@ -68,8 +68,8 @@ public:
Q_INVOKABLE void changeState(int index, const QVariant& parameter);
Q_INVOKABLE void changeStateByVariantString(int index, const QString& parameter);
- void registerAction(UnityMenuAction* action);
- void unregisterAction(UnityMenuAction* action);
+ void registerAction(AyatanaMenuAction* action);
+ void unregisterAction(AyatanaMenuAction* action);
Q_SIGNALS:
void busNameChanged(const QByteArray &name);
@@ -88,10 +88,10 @@ protected:
virtual bool event(QEvent* e);
private:
- class UnityMenuModelPrivate *priv;
- friend class UnityMenuModelPrivate;
+ class AyatanaMenuModelPrivate *priv;
+ friend class AyatanaMenuModelPrivate;
- UnityMenuModel(const UnityMenuModelPrivate& other, UnityMenuModel *parent);
+ AyatanaMenuModel(const AyatanaMenuModelPrivate& other, AyatanaMenuModel *parent);
};
#endif
diff --git a/libqmenumodel/src/unitymenumodelevents.cpp b/libqmenumodel/src/ayatanamenumodelevents.cpp
index 46a9517..357b6be 100644
--- a/libqmenumodel/src/unitymenumodelevents.cpp
+++ b/libqmenumodel/src/ayatanamenumodelevents.cpp
@@ -20,21 +20,21 @@
#include <glib-object.h>
#include <gio/gio.h>
-#include "unitymenumodelevents.h"
-#include "unitymenumodel.h"
+#include "ayatanamenumodelevents.h"
+#include "ayatanamenumodel.h"
-const QEvent::Type UnityMenuModelClearEvent::eventType = static_cast<QEvent::Type>(QEvent::registerEventType());
-const QEvent::Type UnityMenuModelAddRowEvent::eventType = static_cast<QEvent::Type>(QEvent::registerEventType());
-const QEvent::Type UnityMenuModelRemoveRowEvent::eventType = static_cast<QEvent::Type>(QEvent::registerEventType());
-const QEvent::Type UnityMenuModelDataChangeEvent::eventType = static_cast<QEvent::Type>(QEvent::registerEventType());
+const QEvent::Type AyatanaMenuModelClearEvent::eventType = static_cast<QEvent::Type>(QEvent::registerEventType());
+const QEvent::Type AyatanaMenuModelAddRowEvent::eventType = static_cast<QEvent::Type>(QEvent::registerEventType());
+const QEvent::Type AyatanaMenuModelRemoveRowEvent::eventType = static_cast<QEvent::Type>(QEvent::registerEventType());
+const QEvent::Type AyatanaMenuModelDataChangeEvent::eventType = static_cast<QEvent::Type>(QEvent::registerEventType());
-UnityMenuModelClearEvent::UnityMenuModelClearEvent(bool _reset)
- : QEvent(UnityMenuModelClearEvent::eventType),
+AyatanaMenuModelClearEvent::AyatanaMenuModelClearEvent(bool _reset)
+ : QEvent(AyatanaMenuModelClearEvent::eventType),
reset(_reset)
{}
-UnityMenuModelAddRowEvent::UnityMenuModelAddRowEvent(GPtrArray *_items, int _position)
- : QEvent(UnityMenuModelAddRowEvent::eventType),
+AyatanaMenuModelAddRowEvent::AyatanaMenuModelAddRowEvent(GPtrArray *_items, int _position)
+ : QEvent(AyatanaMenuModelAddRowEvent::eventType),
items(_items),
position(_position)
{
@@ -45,7 +45,7 @@ UnityMenuModelAddRowEvent::UnityMenuModelAddRowEvent(GPtrArray *_items, int _pos
}
}
-UnityMenuModelAddRowEvent::~UnityMenuModelAddRowEvent()
+AyatanaMenuModelAddRowEvent::~AyatanaMenuModelAddRowEvent()
{
if (items) {
for (gint i = 0; i < items->len; ++i)
@@ -54,12 +54,12 @@ UnityMenuModelAddRowEvent::~UnityMenuModelAddRowEvent()
}
}
-UnityMenuModelRemoveRowEvent::UnityMenuModelRemoveRowEvent(int _position, int _nItems)
- : QEvent(UnityMenuModelRemoveRowEvent::eventType),
+AyatanaMenuModelRemoveRowEvent::AyatanaMenuModelRemoveRowEvent(int _position, int _nItems)
+ : QEvent(AyatanaMenuModelRemoveRowEvent::eventType),
position(_position), nItems(_nItems)
{}
-UnityMenuModelDataChangeEvent::UnityMenuModelDataChangeEvent(int _position)
- : QEvent(UnityMenuModelDataChangeEvent::eventType),
+AyatanaMenuModelDataChangeEvent::AyatanaMenuModelDataChangeEvent(int _position)
+ : QEvent(AyatanaMenuModelDataChangeEvent::eventType),
position(_position)
{}
diff --git a/libqmenumodel/src/unitymenumodelevents.h b/libqmenumodel/src/ayatanamenumodelevents.h
index d860f0e..7a6f0cf 100644
--- a/libqmenumodel/src/unitymenumodelevents.h
+++ b/libqmenumodel/src/ayatanamenumodelevents.h
@@ -17,55 +17,55 @@
* Nicholas Dedekind <nick.dedekind@canonical.com
*/
-#ifndef UNITYMENUMODELEVENTS_H
-#define UNITYMENUMODELEVENTS_H
+#ifndef AYATANAMENUMODELEVENTS_H
+#define AYATANAMENUMODELEVENTS_H
#include <QEvent>
#include <glib.h>
typedef struct _GtkMenuTrackerItem GtkMenuTrackerItem;
-/* Event for a unitymenumodel clear */
-class UnityMenuModelClearEvent : public QEvent
+/* Event for a ayatanamenumodel clear */
+class AyatanaMenuModelClearEvent : public QEvent
{
public:
static const QEvent::Type eventType;
- UnityMenuModelClearEvent(bool reset);
+ AyatanaMenuModelClearEvent(bool reset);
bool reset;
};
-/* Event for a row add for unitymenumodel */
-class UnityMenuModelAddRowEvent : public QEvent
+/* Event for a row add for ayatanamenumodel */
+class AyatanaMenuModelAddRowEvent : public QEvent
{
public:
static const QEvent::Type eventType;
- UnityMenuModelAddRowEvent(GPtrArray *_items, int position);
- ~UnityMenuModelAddRowEvent();
+ AyatanaMenuModelAddRowEvent(GPtrArray *_items, int position);
+ ~AyatanaMenuModelAddRowEvent();
GPtrArray *items;
int position;
};
-/* Event for a row remove for unitymenumodel */
-class UnityMenuModelRemoveRowEvent : public QEvent
+/* Event for a row remove for ayatanamenumodel */
+class AyatanaMenuModelRemoveRowEvent : public QEvent
{
public:
static const QEvent::Type eventType;
- UnityMenuModelRemoveRowEvent(int position, int nItems);
+ AyatanaMenuModelRemoveRowEvent(int position, int nItems);
int position;
int nItems;
};
-/* Event for a row data change for unitymenumodel */
-class UnityMenuModelDataChangeEvent : public QEvent
+/* Event for a row data change for ayatanamenumodel */
+class AyatanaMenuModelDataChangeEvent : public QEvent
{
public:
static const QEvent::Type eventType;
- UnityMenuModelDataChangeEvent(int position);
+ AyatanaMenuModelDataChangeEvent(int position);
int position;
};
-#endif //UNITYMENUMODELEVENTS_H
+#endif //AYATANAMENUMODELEVENTS_H
diff --git a/libqmenumodel/src/logging.h b/libqmenumodel/src/logging.h
index bd7e708..fa2627a 100644
--- a/libqmenumodel/src/logging.h
+++ b/libqmenumodel/src/logging.h
@@ -18,6 +18,6 @@
#define QMENUMODEL_LOGGING_H
#include <QLoggingCategory>
-Q_DECLARE_LOGGING_CATEGORY(unitymenumodel)
+Q_DECLARE_LOGGING_CATEGORY(ayatanamenumodel)
#endif // QMENUMODEL_LOGGING_H
diff --git a/libqmenumodel/src/unitymenuactionevents.cpp b/libqmenumodel/src/unitymenuactionevents.cpp
deleted file mode 100644
index f05e536..0000000
--- a/libqmenumodel/src/unitymenuactionevents.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2013 Canonical Ltd.
- *
- * This program 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; version 3.
- *
- * 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 Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- * Nicholas Dedekind <nick.dedekind@canonical.com
- */
-
-#include "unitymenuactionevents.h"
-
-const QEvent::Type UnityMenuActionAddEvent::eventType = static_cast<QEvent::Type>(QEvent::registerEventType());
-const QEvent::Type UnityMenuActionRemoveEvent::eventType = static_cast<QEvent::Type>(QEvent::registerEventType());
-const QEvent::Type UnityMenuActionEnabledChangedEvent::eventType = static_cast<QEvent::Type>(QEvent::registerEventType());
-const QEvent::Type UnityMenuActionStateChangeEvent::eventType = static_cast<QEvent::Type>(QEvent::registerEventType());
-
-UnityMenuActionAddEvent::UnityMenuActionAddEvent(bool _enabled, const QVariant& _state)
- : QEvent(UnityMenuActionAddEvent::eventType),
- enabled(_enabled),
- state(_state)
-{}
-
-UnityMenuActionRemoveEvent::UnityMenuActionRemoveEvent()
- : QEvent(UnityMenuActionRemoveEvent::eventType)
-{
-}
-
-UnityMenuActionEnabledChangedEvent::UnityMenuActionEnabledChangedEvent(bool _enabled)
- : QEvent(UnityMenuActionEnabledChangedEvent::eventType),
- enabled(_enabled)
-{}
-
-UnityMenuActionStateChangeEvent::UnityMenuActionStateChangeEvent(const QVariant& _state)
- : QEvent(UnityMenuActionStateChangeEvent::eventType),
- state(_state)
-{}
diff --git a/tests/client/CMakeLists.txt b/tests/client/CMakeLists.txt
index ce8192d..9021585 100644
--- a/tests/client/CMakeLists.txt
+++ b/tests/client/CMakeLists.txt
@@ -61,7 +61,7 @@ declare_test(qmltest)
declare_test(convertertest)
declare_test(modelsignalstest)
declare_test(treetest)
-declare_test(unitymenuactiontest)
+declare_test(ayatanamenuactiontest)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/qmlfiles.h.in
${CMAKE_CURRENT_BINARY_DIR}/qmlfiles.h)
diff --git a/tests/client/unitymenuactiontest.cpp b/tests/client/ayatanamenuactiontest.cpp
index d33ab2e..e01233c 100644
--- a/tests/client/unitymenuactiontest.cpp
+++ b/tests/client/ayatanamenuactiontest.cpp
@@ -17,13 +17,13 @@
* Nick Dedekind <nick.dedekind@canonical.com>
*/
-#include "unitymenumodel.h"
-#include "unitymenuaction.h"
+#include "ayatanamenumodel.h"
+#include "ayatanamenuaction.h"
#include <QObject>
#include <QtTest>
-class UnityMenuActionTest : public QObject
+class AyatanaMenuActionTest : public QObject
{
Q_OBJECT
private:
@@ -35,8 +35,8 @@ private Q_SLOTS:
*/
void testDestroyAfterModel()
{
- UnityMenuModel* model = new UnityMenuModel;
- UnityMenuAction* action = new UnityMenuAction;
+ AyatanaMenuModel* model = new AyatanaMenuModel;
+ AyatanaMenuAction* action = new AyatanaMenuAction;
action->setModel(model);
delete model;
@@ -48,8 +48,8 @@ private Q_SLOTS:
*/
void testDestroyBeforeModel()
{
- UnityMenuModel* model = new UnityMenuModel;
- UnityMenuAction* action = new UnityMenuAction;
+ AyatanaMenuModel* model = new AyatanaMenuModel;
+ AyatanaMenuAction* action = new AyatanaMenuAction;
action->setModel(model);
delete action;
@@ -57,6 +57,6 @@ private Q_SLOTS:
}
};
-QTEST_MAIN(UnityMenuActionTest)
+QTEST_MAIN(AyatanaMenuActionTest)
-#include "unitymenuactiontest.moc"
+#include "ayatanamenuactiontest.moc"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 06:16:41 +0000