Rename KInstance and KAboutData to avoid conflicts with KDE4

11 years ago · 3a43178f34
parent bce5ac6c58
commit 3a43178f34
2 changed files with 3 additions and 3 deletions
--- 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 )
 		{
--- 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",