summaryrefslogtreecommitdiffstats
path: root/krfb
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-22 20:21:16 -0600
committerTimothy Pearson <[email protected]>2013-01-22 20:21:16 -0600
commitef71f46965855308db367f74956513eccc71bc46 (patch)
tree71f1aca189b7beda22f9e95b19608dccfa4f3050 /krfb
parentbdf47e8ffbf1c94f4852d9aa2eb535a9ec176658 (diff)
downloadtdenetwork-ef71f46965855308db367f74956513eccc71bc46.tar.gz
tdenetwork-ef71f46965855308db367f74956513eccc71bc46.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'krfb')
-rw-r--r--krfb/kcm_krfb/kcm_krfb.cpp4
-rw-r--r--krfb/krfb/main.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/krfb/kcm_krfb/kcm_krfb.cpp b/krfb/kcm_krfb/kcm_krfb.cpp
index ff3760e9..38fb5ad3 100644
--- a/krfb/kcm_krfb/kcm_krfb.cpp
+++ b/krfb/kcm_krfb/kcm_krfb.cpp
@@ -64,9 +64,9 @@ KcmKRfb::KcmKRfb(TQWidget *p, const char *name, const TQStringList &) :
setButtons(Default|Apply|Reset);
- KAboutData* about = new KAboutData( "kcm_krfb", I18N_NOOP("Desktop Sharing Control Module"),
+ TDEAboutData* about = new TDEAboutData( "kcm_krfb", I18N_NOOP("Desktop Sharing Control Module"),
VERSION,
- I18N_NOOP("Configure desktop sharing"), KAboutData::License_GPL,
+ I18N_NOOP("Configure desktop sharing"), TDEAboutData::License_GPL,
"(c) 2002, Tim Jansen\n",
0, "http://www.tjansen.de/krfb", "[email protected]");
about->addAuthor("Tim Jansen", 0, "[email protected]");
diff --git a/krfb/krfb/main.cpp b/krfb/krfb/main.cpp
index db730dcf..8991be48 100644
--- a/krfb/krfb/main.cpp
+++ b/krfb/krfb/main.cpp
@@ -70,8 +70,8 @@ void checkKInetd(bool &kinetdAvailable, bool &krfbAvailable) {
int main(int argc, char *argv[])
{
- KAboutData aboutData( "krfb", I18N_NOOP("Desktop Sharing"),
- VERSION, description, KAboutData::License_GPL,
+ TDEAboutData aboutData( "krfb", I18N_NOOP("Desktop Sharing"),
+ VERSION, description, TDEAboutData::License_GPL,
"(c) 2001-2003, Tim Jansen\n"
"(c) 2001, Johannes E. Schindelin\n"
"(c) 2000, heXoNet Support GmbH, D-66424 Homburg\n"