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

---
 kpovmodeler/pmfactory.cpp       | 14 +++++++-------
 kpovmodeler/pmfactory.h         | 12 ++++++------
 kpovmodeler/pmpluginmanager.cpp |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'kpovmodeler')

diff --git a/kpovmodeler/pmfactory.cpp b/kpovmodeler/pmfactory.cpp
index 488db1ce..971fcdde 100644
--- a/kpovmodeler/pmfactory.cpp
+++ b/kpovmodeler/pmfactory.cpp
@@ -35,8 +35,8 @@ extern "C"
 
 static const char description[] = I18N_NOOP( "Modeler for POV-Ray Scenes" );
 
-KInstance* PMFactory::s_instance = 0L;
-KAboutData* PMFactory::s_aboutData = 0L;
+TDEInstance* PMFactory::s_instance = 0L;
+TDEAboutData* PMFactory::s_aboutData = 0L;
 
 PMFactory::PMFactory( )
 {
@@ -71,21 +71,21 @@ KParts::Part* PMFactory::createPartObject( TQWidget* parentWidget,
    return part;
 }
 
-KInstance* PMFactory::instance( )
+TDEInstance* PMFactory::instance( )
 {
    if( !s_instance )
-      s_instance = new KInstance( aboutData( ) );
+      s_instance = new TDEInstance( aboutData( ) );
    return s_instance;
 }
 
-const KAboutData* PMFactory::aboutData( )
+const TDEAboutData* PMFactory::aboutData( )
 {
    if( !s_aboutData )
    {
       s_aboutData =
-         new KAboutData( "kpovmodeler", I18N_NOOP( "KPovModeler" ),
+         new TDEAboutData( "kpovmodeler", I18N_NOOP( "KPovModeler" ),
                          KPOVMODELER_VERSION, description,
-                         KAboutData::License_GPL, "(c) 2001-2006, Andreas Zehender" );
+                         TDEAboutData::License_GPL, "(c) 2001-2006, Andreas Zehender" );
       s_aboutData->addAuthor( "Andreas Zehender", 0,
                               "zehender@kde.org", "http://www.azweb.de" );
       s_aboutData->addAuthor( "Luis Passos Carvalho", I18N_NOOP( "Textures" ),
diff --git a/kpovmodeler/pmfactory.h b/kpovmodeler/pmfactory.h
index 6af1b2ed..fd147aaa 100644
--- a/kpovmodeler/pmfactory.h
+++ b/kpovmodeler/pmfactory.h
@@ -22,8 +22,8 @@
 
 #include <kparts/factory.h>
 
-class KAboutData;
-class KInstance;
+class TDEAboutData;
+class TDEInstance;
 
 class PMFactory : public KParts::Factory
 {
@@ -39,11 +39,11 @@ public:
                                      const char* classname,
                                      const TQStringList& args );
    
-   static KInstance* instance( );
-   static const KAboutData* aboutData( );
+   static TDEInstance* instance( );
+   static const TDEAboutData* aboutData( );
 private:
-   static KInstance* s_instance;
-   static KAboutData* s_aboutData;
+   static TDEInstance* s_instance;
+   static TDEAboutData* s_aboutData;
 };
 
 #endif
diff --git a/kpovmodeler/pmpluginmanager.cpp b/kpovmodeler/pmpluginmanager.cpp
index 7af50d5c..c06f3342 100644
--- a/kpovmodeler/pmpluginmanager.cpp
+++ b/kpovmodeler/pmpluginmanager.cpp
@@ -38,7 +38,7 @@ class PMPluginWorkaround : public Plugin
 {
 public:
    PMPluginWorkaround( ) : Plugin( 0, 0 ) { };
-   static TQValueList<Plugin::PluginInfo> installedPlugins( const KInstance* instance )
+   static TQValueList<Plugin::PluginInfo> installedPlugins( const TDEInstance* instance )
    {
       return pluginInfos( instance );
    }
-- 
cgit v1.2.1