diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:21:16 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:21:16 -0600 |
| commit | ef71f46965855308db367f74956513eccc71bc46 (patch) | |
| tree | 71f1aca189b7beda22f9e95b19608dccfa4f3050 /krfb | |
| parent | bdf47e8ffbf1c94f4852d9aa2eb535a9ec176658 (diff) | |
| download | tdenetwork-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.cpp | 4 | ||||
| -rw-r--r-- | krfb/krfb/main.cpp | 4 |
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", "tim@tjansen.de"); about->addAuthor("Tim Jansen", 0, "tim@tjansen.de"); 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" |