merge the kinstance-redesign branch back to trunk.
svn path=/trunk/KDE/kdebase/workspace/plasma/lib/; revision=628276
This commit is contained in:
parent
0c5ef68f2c
commit
6ee2e5cb5e
|
@ -22,16 +22,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
#include <QMimeData>
|
#include <QMimeData>
|
||||||
|
|
||||||
#include <kaboutdata.h>
|
#include <kaboutdata.h>
|
||||||
#include <kinstance.h>
|
#include <kcomponentdata.h>
|
||||||
|
|
||||||
#include "appletinfo.h"
|
#include "appletinfo.h"
|
||||||
#include "testAppletInfo.h"
|
#include "testAppletInfo.h"
|
||||||
|
|
||||||
TestAppletInfo::TestAppletInfo(QObject* parent)
|
TestAppletInfo::TestAppletInfo(QObject* parent)
|
||||||
: QObject(parent)
|
: QObject(parent),
|
||||||
|
m_componentData("testappletinfo")
|
||||||
{
|
{
|
||||||
m_aboutData = new KAboutData("Test Applet Info", "testappletinfo", "1");
|
m_aboutData = new KAboutData("Test Applet Info", "testappletinfo", "1");
|
||||||
m_instance = new KInstance("testappletinfo");
|
|
||||||
QString pwd = QDir::currentPath();
|
QString pwd = QDir::currentPath();
|
||||||
notUniqueNative = new Plasma::AppletInfo(pwd + "/nativeApplet.desktop");
|
notUniqueNative = new Plasma::AppletInfo(pwd + "/nativeApplet.desktop");
|
||||||
uniqueJavascript = new Plasma::AppletInfo(pwd + "/uniqueJavaScriptApplet.desktop");
|
uniqueJavascript = new Plasma::AppletInfo(pwd + "/uniqueJavaScriptApplet.desktop");
|
||||||
|
@ -39,7 +39,6 @@ TestAppletInfo::TestAppletInfo(QObject* parent)
|
||||||
|
|
||||||
TestAppletInfo::~TestAppletInfo()
|
TestAppletInfo::~TestAppletInfo()
|
||||||
{
|
{
|
||||||
delete m_instance;
|
|
||||||
delete m_aboutData;
|
delete m_aboutData;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -22,13 +22,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
#define testappletinfo_h_
|
#define testappletinfo_h_
|
||||||
|
|
||||||
#include <QtTest/QtTest>
|
#include <QtTest/QtTest>
|
||||||
|
#include <kcomponentdata.h>
|
||||||
|
|
||||||
namespace Plasma
|
namespace Plasma
|
||||||
{
|
{
|
||||||
class AppletInfo;
|
class AppletInfo;
|
||||||
}
|
}
|
||||||
class KAboutData;
|
class KAboutData;
|
||||||
class KInstance;
|
|
||||||
|
|
||||||
class TestAppletInfo: public QObject
|
class TestAppletInfo: public QObject
|
||||||
{
|
{
|
||||||
|
@ -64,7 +64,7 @@ class TestAppletInfo: public QObject
|
||||||
Plasma::AppletInfo* notUniqueNative;
|
Plasma::AppletInfo* notUniqueNative;
|
||||||
Plasma::AppletInfo* uniqueJavascript;
|
Plasma::AppletInfo* uniqueJavascript;
|
||||||
KAboutData* m_aboutData;
|
KAboutData* m_aboutData;
|
||||||
KInstance* m_instance;
|
KComponentData m_componentData;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue
Block a user