aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Uebernickel <lars.uebernickel@canonical.com>2013-08-29 11:15:10 +0000
committerTarmac <>2013-08-29 11:15:10 +0000
commit9acfda59efaf119eaf84f00311316521c3000d52 (patch)
tree6352070560ba1a1d49c2c4fa6c2fad0521af544c
parent7d013d70a079f64b010488849aee5909255d46de (diff)
parent1439420c06ac4083be4c550334b6d5d23ee441d8 (diff)
downloadqmenumodel-9acfda59efaf119eaf84f00311316521c3000d52.tar.gz
qmenumodel-9acfda59efaf119eaf84f00311316521c3000d52.tar.bz2
qmenumodel-9acfda59efaf119eaf84f00311316521c3000d52.zip
Remove theme image provider
The platform should provide that, because more than this one module ned themed icons. Approved by Michal Hruby, PS Jenkins bot.
-rw-r--r--libqmenumodel/QMenuModel/plugin.cpp2
-rw-r--r--libqmenumodel/src/CMakeLists.txt2
-rw-r--r--libqmenumodel/src/unitythemediconprovider.cpp35
-rw-r--r--libqmenumodel/src/unitythemediconprovider.h31
4 files changed, 0 insertions, 70 deletions
diff --git a/libqmenumodel/QMenuModel/plugin.cpp b/libqmenumodel/QMenuModel/plugin.cpp
index 0629099..21429ec 100644
--- a/libqmenumodel/QMenuModel/plugin.cpp
+++ b/libqmenumodel/QMenuModel/plugin.cpp
@@ -23,13 +23,11 @@
#include "qdbusactiongroup.h"
#include "qstateaction.h"
#include "unitymenumodel.h"
-#include "unitythemediconprovider.h"
#include <QtQml>
void QMenuModelQmlPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
{
- engine->addImageProvider("theme", new UnityThemedIconProvider);
}
void QMenuModelQmlPlugin::registerTypes(const char *uri)
diff --git a/libqmenumodel/src/CMakeLists.txt b/libqmenumodel/src/CMakeLists.txt
index 10f59c6..c86ccb4 100644
--- a/libqmenumodel/src/CMakeLists.txt
+++ b/libqmenumodel/src/CMakeLists.txt
@@ -13,7 +13,6 @@ set(QMENUMODEL_SRC
qstateaction.cpp
unitymenumodel.cpp
unitymenumodelevents.cpp
- unitythemediconprovider.cpp
gtk/gtkactionmuxer.c
gtk/gtkactionmuxer.h
gtk/gtkactionobservable.c
@@ -60,7 +59,6 @@ set(QMENUMODEL_HEADERS
qmenumodel.h
qstateaction.h
unitymenumodel.h
- unitythemediconprovider.h
)
set(INCLUDEDIR qmenumodel)
diff --git a/libqmenumodel/src/unitythemediconprovider.cpp b/libqmenumodel/src/unitythemediconprovider.cpp
deleted file mode 100644
index 69afd76..0000000
--- a/libqmenumodel/src/unitythemediconprovider.cpp
+++ /dev/null
@@ -1,35 +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: Lars Uebernickel <lars.uebernickel@canonical.com>
- */
-
-#include "unitythemediconprovider.h"
-
-#include <QIcon>
-
-UnityThemedIconProvider::UnityThemedIconProvider():
- QQuickImageProvider(QQuickImageProvider::Pixmap)
-{
-}
-
-#include <QtDebug>
-
-QPixmap UnityThemedIconProvider::requestPixmap(const QString &id, QSize *size, const QSize &requestedSize)
-{
- QPixmap pixmap = QIcon::fromTheme(id).pixmap(requestedSize.isValid() ? requestedSize : QSize(32, 32));
- *size = pixmap.size();
- return pixmap;
-}
diff --git a/libqmenumodel/src/unitythemediconprovider.h b/libqmenumodel/src/unitythemediconprovider.h
deleted file mode 100644
index 7e71ea8..0000000
--- a/libqmenumodel/src/unitythemediconprovider.h
+++ /dev/null
@@ -1,31 +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: Lars Uebernickel <lars.uebernickel@canonical.com>
- */
-
-#ifndef UNITY_THEMED_ICON_PROVIDER_H
-#define UNITY_THEMED_ICON_PROVIDER_H
-
-#include <QQuickImageProvider>
-
-class UnityThemedIconProvider: public QQuickImageProvider
-{
-public:
- UnityThemedIconProvider();
- QPixmap requestPixmap(const QString &id, QSize *size, const QSize &requestedSize);
-};
-
-#endif