summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 19:53:16 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 19:53:16 -0600
commit0bb16222af363e31a5b825789203461556703bdd (patch)
treeff52756dbe25cd3e44e2fb79cd2ee4de2239dd51 /src
parentf6107ad4646372ea0c8a517fbe91c0c2786513ea (diff)
downloadkmplayer-0bb16222af363e31a5b825789203461556703bdd.tar.gz
kmplayer-0bb16222af363e31a5b825789203461556703bdd.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'src')
-rw-r--r--src/kmplayer_koffice_part.cpp8
-rw-r--r--src/kmplayer_koffice_part.h4
-rw-r--r--src/kmplayer_part.cpp8
-rw-r--r--src/kmplayer_part.h4
-rw-r--r--src/kmplayerpartbase.cpp2
-rw-r--r--src/kmplayerpartbase.h6
-rw-r--r--src/main.cpp4
7 files changed, 18 insertions, 18 deletions
diff --git a/src/kmplayer_koffice_part.cpp b/src/kmplayer_koffice_part.cpp
index c32e829..76dc11f 100644
--- a/src/kmplayer_koffice_part.cpp
+++ b/src/kmplayer_koffice_part.cpp
@@ -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 () {
diff --git a/src/kmplayer_koffice_part.h b/src/kmplayer_koffice_part.h
index 0c02984..0520d50 100644
--- a/src/kmplayer_koffice_part.h
+++ b/src/kmplayer_koffice_part.h
@@ -38,9 +38,9 @@
class KProcess;
-class KAboutData;
+class TDEAboutData;
class KMPlayer;
-class KInstance;
+class TDEInstance;
class KConfig;
class TQIODevice;
diff --git a/src/kmplayer_part.cpp b/src/kmplayer_part.cpp
index fbdc632..1073a50 100644
--- a/src/kmplayer_part.cpp
+++ b/src/kmplayer_part.cpp
@@ -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 () {
diff --git a/src/kmplayer_part.h b/src/kmplayer_part.h
index 418607d..faca045 100644
--- a/src/kmplayer_part.h
+++ b/src/kmplayer_part.h
@@ -24,9 +24,9 @@
#include "kmplayersource.h"
-class KAboutData;
+class TDEAboutData;
class KMPlayerPart;
-class KInstance;
+class TDEInstance;
class JSCommandEntry;
/*
diff --git a/src/kmplayerpartbase.cpp b/src/kmplayerpartbase.cpp
index b9f7a2f..4f0349a 100644
--- a/src/kmplayerpartbase.cpp
+++ b/src/kmplayerpartbase.cpp
@@ -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;
}
diff --git a/src/kmplayerpartbase.h b/src/kmplayerpartbase.h
index bf2fbde..ee53ba9 100644
--- a/src/kmplayerpartbase.h
+++ b/src/kmplayerpartbase.h
@@ -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);
diff --git a/src/main.cpp b/src/main.cpp
index 7799a18..00b0183 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -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);