summaryrefslogtreecommitdiffstats
path: root/kpf/src
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:21:16 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:21:16 -0600
commitef71f46965855308db367f74956513eccc71bc46 (patch)
tree71f1aca189b7beda22f9e95b19608dccfa4f3050 /kpf/src
parentbdf47e8ffbf1c94f4852d9aa2eb535a9ec176658 (diff)
downloadtdenetwork-ef71f46965855308db367f74956513eccc71bc46.tar.gz
tdenetwork-ef71f46965855308db367f74956513eccc71bc46.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kpf/src')
-rw-r--r--kpf/src/Applet.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/kpf/src/Applet.cpp b/kpf/src/Applet.cpp
index 98c91a0b..04a355c6 100644
--- a/kpf/src/Applet.cpp
+++ b/kpf/src/Applet.cpp
@@ -177,13 +177,13 @@ namespace KPF
void
Applet::about()
{
- KAboutData about
+ TDEAboutData about
(
"kpf",
I18N_NOOP("kpf"),
kpfVersion,
I18N_NOOP("TDE public fileserver"),
- KAboutData::License_Custom,
+ TDEAboutData::License_Custom,
"(C) 2001 Rik Hemsley (rikkus) <rik@kde.org>",
I18N_NOOP(
"File sharing applet, using the HTTP (Hyper Text Transfer Protocol)"