Rename KInstance and KAboutData to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent f6107ad464
commit 0bb16222af

@ -62,17 +62,17 @@ public:
virtual KParts::Part *createPartObject
(TQWidget *wparent, const char *wname, TQObject *parent, const char *name,
const char *className, const TQStringList &args);
static KInstance * instance () { return s_instance; }
static TDEInstance * instance () { return s_instance; }
private:
static KInstance * s_instance;
static TDEInstance * s_instance;
};
K_EXPORT_COMPONENT_FACTORY (libkmplayerkofficepart, KMPlayerFactory)
KInstance *KMPlayerFactory::s_instance = 0;
TDEInstance *KMPlayerFactory::s_instance = 0;
KMPlayerFactory::KMPlayerFactory () {
s_instance = new KInstance ("KMPlayerKofficePart");
s_instance = new TDEInstance ("KMPlayerKofficePart");
}
KMPlayerFactory::~KMPlayerFactory () {

@ -38,9 +38,9 @@
class KProcess;
class KAboutData;
class TDEAboutData;
class KMPlayer;
class KInstance;
class TDEInstance;
class KConfig;
class TQIODevice;

@ -100,17 +100,17 @@ public:
(TQWidget *wparent, const char *wname,
TQObject *parent, const char *name,
const char *className, const TQStringList &args);
static KInstance * instance () { return s_instance; }
static TDEInstance * instance () { return s_instance; }
private:
static KInstance * s_instance;
static TDEInstance * s_instance;
};
K_EXPORT_COMPONENT_FACTORY (libkmplayerpart, KMPlayerFactory)
KInstance *KMPlayerFactory::s_instance = 0;
TDEInstance *KMPlayerFactory::s_instance = 0;
KDE_NO_CDTOR_EXPORT KMPlayerFactory::KMPlayerFactory () {
s_instance = new KInstance ("kmplayer");
s_instance = new TDEInstance ("kmplayer");
}
KDE_NO_CDTOR_EXPORT KMPlayerFactory::~KMPlayerFactory () {

@ -24,9 +24,9 @@
#include "kmplayersource.h"
class KAboutData;
class TDEAboutData;
class KMPlayerPart;
class KInstance;
class TDEInstance;
class JSCommandEntry;
/*

@ -885,7 +885,7 @@ KDE_NO_EXPORT bool PartBase::isPaused () {
return doc && doc->state == Node::state_deferred;
}
KAboutData* PartBase::createAboutData () {
TDEAboutData* PartBase::createAboutData () {
KMessageBox::error(0L, "createAboutData", "KMPlayer");
return 0;
}

@ -36,8 +36,8 @@
#include "kmplayersource.h"
class KAboutData;
class KInstance;
class TDEAboutData;
class TDEInstance;
class KActionCollection;
class KBookmarkMenu;
class KConfig;
@ -122,7 +122,7 @@ public:
~PartBase ();
void init (KActionCollection * = 0L);
virtual KMediaPlayer::View* view ();
static KAboutData* createAboutData ();
static TDEAboutData* createAboutData ();
Settings * settings () const { return m_settings; }
void keepMovieAspect (bool);

@ -45,8 +45,8 @@ extern "C" {
{
setsid ();
KAboutData aboutData ("kmplayer", I18N_NOOP ("KMPlayer"),
VERSION, description, KAboutData::License_GPL,
TDEAboutData aboutData ("kmplayer", I18N_NOOP ("KMPlayer"),
VERSION, description, TDEAboutData::License_GPL,
"(c) 2002-2005, Koos Vriezen", 0, 0, "");
aboutData.addAuthor( "Koos Vriezen",0, "");
TDECmdLineArgs::init (argc, argv, &aboutData);

Loading…
Cancel
Save