From 64a52553d861d46b6064e07a0475c741f9f50046 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Tue, 22 Jan 2013 19:57:21 -0600
Subject: [PATCH] Rename KInstance and KAboutData to avoid conflicts with KDE4

---
 iso/iso.cpp       | 2 +-
 krArc/krarc.cpp   | 2 +-
 krusader/main.cpp | 4 ++--
 tar/ktartest.cpp  | 2 +-
 tar/tar.cc        | 2 +-
 virt/virt.cc      | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/iso/iso.cpp b/iso/iso.cpp
index 3a66edc..543abab 100644
--- a/iso/iso.cpp
+++ b/iso/iso.cpp
@@ -60,7 +60,7 @@ extern "C" { int kdemain(int argc, char **argv); }
 
 int kdemain( int argc, char **argv )
 {
-  KInstance instance( "kio_iso" );
+  TDEInstance instance( "kio_iso" );
 
   kdDebug()   << "Starting " << getpid() << endl;
 
diff --git a/krArc/krarc.cpp b/krArc/krarc.cpp
index 6ff1ca0..7934aff 100644
--- a/krArc/krarc.cpp
+++ b/krArc/krarc.cpp
@@ -61,7 +61,7 @@ using namespace KIO;
 extern "C" {
 
 int kdemain( int argc, char **argv ){
-	KInstance instance( "kio_krarc" );
+	TDEInstance instance( "kio_krarc" );
 	
 	if (argc != 4) {
 		kdWarning() << "Usage: kio_krarc  protocol domain-socket1 domain-socket2" << endl;
diff --git a/krusader/main.cpp b/krusader/main.cpp
index 06776a4..07e9483 100644
--- a/krusader/main.cpp
+++ b/krusader/main.cpp
@@ -109,9 +109,9 @@ int main(int argc, char *argv[]) {
 #else
   TQString versionName = VERSION;
 #endif
-  KAboutData aboutData( "krusader", ( geteuid() ? I18N_NOOP("Krusader") :
+  TDEAboutData aboutData( "krusader", ( geteuid() ? I18N_NOOP("Krusader") :
                         I18N_NOOP("Krusader - ROOT PRIVILEGES")),
-    versionName.latin1(), description, KAboutData::License_GPL,
+    versionName.latin1(), description, TDEAboutData::License_GPL,
     "(c) 2000-2003, Shie Erlich, Rafi Yanai\n(c) 2004-2007, Krusader Krew",
     I18N_NOOP("Feedback\nhttp://www.krusader.org/phpBB/\n\n"
               "IRC\nserver: irc.freenode.net, channel: #krusader"),
diff --git a/tar/ktartest.cpp b/tar/ktartest.cpp
index bfbb216..efb1e42 100644
--- a/tar/ktartest.cpp
+++ b/tar/ktartest.cpp
@@ -35,7 +35,7 @@ int main( int argc, char** argv )
     usage();
     return 1;
   }
-  KInstance instance("ktartest");
+  TDEInstance instance("ktartest");
 
   TQString command = argv[1];
   kdDebug() << "main: command=" << command << endl;
diff --git a/tar/tar.cc b/tar/tar.cc
index 26a51fe..1187291 100644
--- a/tar/tar.cc
+++ b/tar/tar.cc
@@ -30,7 +30,7 @@ extern "C" { int kdemain( int argc, char **argv ); }
 #endif
 
 int kdemain( int argc, char **argv ) {
-	KInstance instance( "kio_tar" );
+	TDEInstance instance( "kio_tar" );
 
 	kdDebug( 7109 ) << "Starting " << getpid() << endl;
 
diff --git a/virt/virt.cc b/virt/virt.cc
index 2e98f88..bb71d40 100644
--- a/virt/virt.cc
+++ b/virt/virt.cc
@@ -51,7 +51,7 @@ TQDict<KURL::List> VirtProtocol::kioVirtDict;
 KConfig* VirtProtocol::kio_virt_db;
 
 int kdemain( int argc, char **argv ) {
-	KInstance instance( "kio_virt" );
+	TDEInstance instance( "kio_virt" );
 
 	if ( argc != 4 ) {
 		fprintf( stderr, "Usage: kio_virt protocol domain-socket1 domain-socket2\n" );