From c75428cb70ed336c2d3f40d71ad41444097a6626 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 20:17:59 -0600 Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4 --- atlantik/client/main.cpp | 4 ++-- atlantik/kio_atlantik/kio_atlantik.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'atlantik') diff --git a/atlantik/client/main.cpp b/atlantik/client/main.cpp index cd810aea..ec677a57 100644 --- a/atlantik/client/main.cpp +++ b/atlantik/client/main.cpp @@ -36,11 +36,11 @@ static KCmdLineOptions options[] = int main(int argc, char *argv[]) { - KAboutData aboutData( + TDEAboutData aboutData( "atlantik", I18N_NOOP("Atlantik"), ATLANTIK_VERSION_STRING, I18N_NOOP("The Atlantic board game"), - KAboutData::License_GPL, + TDEAboutData::License_GPL, I18N_NOOP("(c) 1998-2004 Rob Kaper"), I18N_NOOP("TDE client for playing Monopoly-like games on the monopd network."), "http://unixcode.org/atlantik/" diff --git a/atlantik/kio_atlantik/kio_atlantik.cpp b/atlantik/kio_atlantik/kio_atlantik.cpp index 3cba3275..95eca5fa 100644 --- a/atlantik/kio_atlantik/kio_atlantik.cpp +++ b/atlantik/kio_atlantik/kio_atlantik.cpp @@ -36,7 +36,7 @@ extern "C" { int LIBATLANTIC_EXPORT kdemain( int, char **argv ) { - KInstance instance( "kio_atlantik" ); + TDEInstance instance( "kio_atlantik" ); AtlantikProtocol slave(argv[2], argv[3]); slave.dispatchLoop(); return 0; -- cgit v1.2.1