alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merge the kinstance-redesign branch back to trunk.

Browse Source 
svn path=/trunk/KDE/kdebase/workspace/plasma/lib/; revision=628276
This commit is contained in:
Matthias Kretz 2007-01-29 17:14:20 +00:00
parent 0c5ef68f2c
commit 6ee2e5cb5e
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/testAppletInfo.cpp
View File

@ -22,16 +22,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <QMimeData>
#include <kaboutdata.h>
#include <kinstance.h>
#include <kcomponentdata.h>
#include "appletinfo.h"
#include "testAppletInfo.h"
TestAppletInfo::TestAppletInfo(QObject* parent)
: QObject(parent)
: QObject(parent),
m_componentData("testappletinfo")
{
m_aboutData = new KAboutData("Test Applet Info", "testappletinfo", "1");
m_instance = new KInstance("testappletinfo");
QString pwd = QDir::currentPath();
notUniqueNative = new Plasma::AppletInfo(pwd + "/nativeApplet.desktop");
uniqueJavascript = new Plasma::AppletInfo(pwd + "/uniqueJavaScriptApplet.desktop");
@ -39,7 +39,6 @@ TestAppletInfo::TestAppletInfo(QObject* parent)
TestAppletInfo::~TestAppletInfo()
{
delete m_instance;
delete m_aboutData;
}

4
tests/testAppletInfo.h
View File

@ -22,13 +22,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#define testappletinfo_h_
#include <QtTest/QtTest>
#include <kcomponentdata.h>
namespace Plasma
{
class AppletInfo;
}
class KAboutData;
class KInstance;
class TestAppletInfo: public QObject
{
@ -64,7 +64,7 @@ class TestAppletInfo: public QObject
Plasma::AppletInfo* notUniqueNative;
Plasma::AppletInfo* uniqueJavascript;
KAboutData* m_aboutData;
KInstance* m_instance;
KComponentData m_componentData;
};
#endif

1
theme.cpp
View File

@ -18,6 +18,7 @@
#include <KSharedConfig>
#include <KStandardDirs>
#include <kconfiggroup.h>
#include "theme.h"