summaryrefslogtreecommitdiffstats
path: root/src/kmplayerpartbase.cpp
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/kmplayerpartbase.cpp
parentf6107ad4646372ea0c8a517fbe91c0c2786513ea (diff)
downloadkmplayer-0bb16222af363e31a5b825789203461556703bdd.tar.gz
kmplayer-0bb16222af363e31a5b825789203461556703bdd.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'src/kmplayerpartbase.cpp')
-rw-r--r--src/kmplayerpartbase.cpp2
1 files changed, 1 insertions, 1 deletions
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;
}