From 1d061b286a8b183b39be60fe531f2b1c2915f03a Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Tue, 22 Jan 2013 20:15:55 -0600
Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4

---
 kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp                  | 2 +-
 kcontrol/ebrowsing/plugins/ikws/ikwsopts.h                    | 2 +-
 kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.h              | 2 +-
 kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.h            | 2 +-
 kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.h | 2 +-
 kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.h         | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'kcontrol/ebrowsing/plugins')

diff --git a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp
index dacc1ed7e..2c04835c9 100644
--- a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp
+++ b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp
@@ -75,7 +75,7 @@ private:
     SearchProvider *m_provider;
 };
 
-FilterOptions::FilterOptions(KInstance *instance, TQWidget *parent, const char *name)
+FilterOptions::FilterOptions(TDEInstance *instance, TQWidget *parent, const char *name)
               :KCModule(instance, parent, name)
 {
     TQVBoxLayout *mainLayout = new TQVBoxLayout( this, KDialog::marginHint(),
diff --git a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.h b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.h
index e39997995..6352dfea5 100644
--- a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.h
+++ b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.h
@@ -35,7 +35,7 @@ class FilterOptions : public KCModule
     Q_OBJECT
 
 public:
-    FilterOptions(KInstance *instance, TQWidget *parent = 0, const char *name = 0);
+    FilterOptions(TDEInstance *instance, TQWidget *parent = 0, const char *name = 0);
 
     void load();
     void load( bool useDefaults );
diff --git a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.h b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.h
index 77e8c8b0f..abf3fe255 100644
--- a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.h
+++ b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.h
@@ -27,7 +27,7 @@
 
 #include <kurifilter.h>
 
-class KInstance;
+class TDEInstance;
 
 class KAutoWebSearch : public KURIFilterPlugin, public DCOPObject
 {
diff --git a/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.h b/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.h
index eff650902..7ad52849b 100644
--- a/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.h
+++ b/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.h
@@ -27,7 +27,7 @@
 
 #include <kurifilter.h>
 
-class KInstance;
+class TDEInstance;
 
 class KURISearchFilter : public KURIFilterPlugin, public DCOPObject
 {
diff --git a/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.h b/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.h
index 0c8035d89..b5154cbc6 100644
--- a/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.h
+++ b/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.h
@@ -28,7 +28,7 @@
 #include <kurifilter.h>
 #include <tqregexp.h>
 
-class KInstance;
+class TDEInstance;
 class KProcess;
 
 /*
diff --git a/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.h b/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.h
index f2bf4654c..db5f9027d 100644
--- a/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.h
+++ b/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.h
@@ -27,7 +27,7 @@
 #include <kgenericfactory.h>
 #include <kurifilter.h>
 
-class KInstance;
+class TDEInstance;
 
 /**
 * This is short URL filter class.
-- 
cgit v1.2.3