From 3a43178f345b99e3f0c9499548ba5385e60a2561 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 19:52:11 -0600 Subject: [PATCH] Rename KInstance and KAboutData to avoid conflicts with KDE4 --- lib/kio-msits/msits.cpp | 2 +- src/main.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/kio-msits/msits.cpp b/lib/kio-msits/msits.cpp index 0be488f..8171525 100755 --- a/lib/kio-msits/msits.cpp +++ b/lib/kio-msits/msits.cpp @@ -44,7 +44,7 @@ extern "C" { kdDebug() << "*** kio_msits Init" << endl; - KInstance instance( "kio_msits" ); + TDEInstance instance( "kio_msits" ); if ( argc != 4 ) { diff --git a/src/main.cpp b/src/main.cpp index 1ab0584..87bddf8 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -48,11 +48,11 @@ int main( int argc, char ** argv ) KCmdLineLastOption }; - KAboutData aboutdata ( "kchmviewer", + TDEAboutData aboutdata ( "kchmviewer", APP_NAME, APP_VERSION, I18N_NOOP("CHM file viewer"), - KAboutData::License_GPL, + TDEAboutData::License_GPL, "(c) 2004-2007 George Yunaev, gyunaev@ulduzsoft.com", 0, "http://www.kchmviewer.net",