diff options
-rw-r--r-- | examples/ayatanaqmlmenumodel.qml (renamed from examples/unityqmlmenumodel.qml) | 0 | ||||
-rw-r--r-- | libqmenumodel/QMenuModel/plugin.cpp | 4 | ||||
-rw-r--r-- | libqmenumodel/src/CMakeLists.txt | 12 | ||||
-rw-r--r-- | libqmenumodel/src/ayatanamenuaction.cpp (renamed from libqmenumodel/src/unitymenuaction.cpp) | 6 | ||||
-rw-r--r-- | libqmenumodel/src/ayatanamenuaction.h (renamed from libqmenumodel/src/unitymenuaction.h) | 6 | ||||
-rw-r--r-- | libqmenumodel/src/ayatanamenuactionevents.cpp (renamed from libqmenumodel/src/unitymenuactionevents.cpp) | 2 | ||||
-rw-r--r-- | libqmenumodel/src/ayatanamenuactionevents.h (renamed from libqmenumodel/src/unitymenuactionevents.h) | 6 | ||||
-rw-r--r-- | libqmenumodel/src/ayatanamenumodel.cpp (renamed from libqmenumodel/src/unitymenumodel.cpp) | 8 | ||||
-rw-r--r-- | libqmenumodel/src/ayatanamenumodel.h (renamed from libqmenumodel/src/unitymenumodel.h) | 4 | ||||
-rw-r--r-- | libqmenumodel/src/ayatanamenumodelevents.cpp (renamed from libqmenumodel/src/unitymenumodelevents.cpp) | 4 | ||||
-rw-r--r-- | libqmenumodel/src/ayatanamenumodelevents.h (renamed from libqmenumodel/src/unitymenumodelevents.h) | 6 | ||||
-rw-r--r-- | tests/client/ayatanamenuactiontest.cpp (renamed from tests/client/unitymenuactiontest.cpp) | 4 |
12 files changed, 31 insertions, 31 deletions
diff --git a/examples/unityqmlmenumodel.qml b/examples/ayatanaqmlmenumodel.qml index e7360e0..e7360e0 100644 --- a/examples/unityqmlmenumodel.qml +++ b/examples/ayatanaqmlmenumodel.qml diff --git a/libqmenumodel/QMenuModel/plugin.cpp b/libqmenumodel/QMenuModel/plugin.cpp index b7a4400..5ea750f 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> 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..bbbbf77 100644 --- a/libqmenumodel/src/unitymenuaction.cpp +++ b/libqmenumodel/src/ayatanamenuaction.cpp @@ -16,9 +16,9 @@ * 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) : QObject(parent), diff --git a/libqmenumodel/src/unitymenuaction.h b/libqmenumodel/src/ayatanamenuaction.h index 7479d2c..3a7cbb8 100644 --- a/libqmenumodel/src/unitymenuaction.h +++ b/libqmenumodel/src/ayatanamenuaction.h @@ -16,8 +16,8 @@ * Authors: Nick Dedekind <nick.dedekind@canonical.com> */ -#ifndef UNITYMENUACTION_H -#define UNITYMENUACTION_H +#ifndef AYATANAMENUACTION_H +#define AYATANAMENUACTION_H #include <QObject> #include <QVariant> @@ -81,4 +81,4 @@ private: int m_index; }; -#endif // UNITYMENUACTIONGROUP_H +#endif // AYATANAMENUACTIONGROUP_H diff --git a/libqmenumodel/src/unitymenuactionevents.cpp b/libqmenumodel/src/ayatanamenuactionevents.cpp index f05e536..f83d35b 100644 --- a/libqmenumodel/src/unitymenuactionevents.cpp +++ b/libqmenumodel/src/ayatanamenuactionevents.cpp @@ -17,7 +17,7 @@ * Nicholas Dedekind <nick.dedekind@canonical.com */ -#include "unitymenuactionevents.h" +#include "ayatanamenuactionevents.h" const QEvent::Type UnityMenuActionAddEvent::eventType = static_cast<QEvent::Type>(QEvent::registerEventType()); const QEvent::Type UnityMenuActionRemoveEvent::eventType = static_cast<QEvent::Type>(QEvent::registerEventType()); diff --git a/libqmenumodel/src/unitymenuactionevents.h b/libqmenumodel/src/ayatanamenuactionevents.h index 44cb5de..2365da0 100644 --- a/libqmenumodel/src/unitymenuactionevents.h +++ b/libqmenumodel/src/ayatanamenuactionevents.h @@ -17,8 +17,8 @@ * Nicholas Dedekind <nick.dedekind@canonical.com */ -#ifndef UNITYMENUACTIONEVENTS_H -#define UNITYMENUACTIONEVENTS_H +#ifndef AYATANAMENUACTIONEVENTS_H +#define AYATANAMENUACTIONEVENTS_H #include <QEvent> #include <QVariant> @@ -62,4 +62,4 @@ public: QVariant state; }; -#endif //UNITYMENUACTIONEVENTS_H +#endif //AYATANAMENUACTIONEVENTS_H diff --git a/libqmenumodel/src/unitymenumodel.cpp b/libqmenumodel/src/ayatanamenumodel.cpp index fafed4c..24bfa40 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> diff --git a/libqmenumodel/src/unitymenumodel.h b/libqmenumodel/src/ayatanamenumodel.h index 1a2a190..7d11a67 100644 --- a/libqmenumodel/src/unitymenumodel.h +++ b/libqmenumodel/src/ayatanamenumodel.h @@ -16,8 +16,8 @@ * Authors: Lars Uebernickel <lars.uebernickel@canonical.com> */ -#ifndef UNITYMENUMODEL_H -#define UNITYMENUMODEL_H +#ifndef AYATANAMENUMODEL_H +#define AYATANAMENUMODEL_H #include <QAbstractListModel> class ActionStateParser; diff --git a/libqmenumodel/src/unitymenumodelevents.cpp b/libqmenumodel/src/ayatanamenumodelevents.cpp index 46a9517..57b2fa0 100644 --- a/libqmenumodel/src/unitymenumodelevents.cpp +++ b/libqmenumodel/src/ayatanamenumodelevents.cpp @@ -20,8 +20,8 @@ #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()); diff --git a/libqmenumodel/src/unitymenumodelevents.h b/libqmenumodel/src/ayatanamenumodelevents.h index d860f0e..1fa067a 100644 --- a/libqmenumodel/src/unitymenumodelevents.h +++ b/libqmenumodel/src/ayatanamenumodelevents.h @@ -17,8 +17,8 @@ * Nicholas Dedekind <nick.dedekind@canonical.com */ -#ifndef UNITYMENUMODELEVENTS_H -#define UNITYMENUMODELEVENTS_H +#ifndef AYATANAMENUMODELEVENTS_H +#define AYATANAMENUMODELEVENTS_H #include <QEvent> #include <glib.h> @@ -68,4 +68,4 @@ public: int position; }; -#endif //UNITYMENUMODELEVENTS_H +#endif //AYATANAMENUMODELEVENTS_H diff --git a/tests/client/unitymenuactiontest.cpp b/tests/client/ayatanamenuactiontest.cpp index d33ab2e..3dcec95 100644 --- a/tests/client/unitymenuactiontest.cpp +++ b/tests/client/ayatanamenuactiontest.cpp @@ -17,8 +17,8 @@ * Nick Dedekind <nick.dedekind@canonical.com> */ -#include "unitymenumodel.h" -#include "unitymenuaction.h" +#include "ayatanamenumodel.h" +#include "ayatanamenuaction.h" #include <QObject> #include <QtTest> |