Rename KInstance and KAboutData to avoid conflicts with KDE4

5 files changed, 24 insertions, 24 deletions

diff --git a/chalk/doc/chalk.xmi b/chalk/doc/chalk.xmi
index 43d78f28d..87a6905e1 100644
--- a/chalk/doc/chalk.xmi
+++ b/chalk/doc/chalk.xmi
@@ -1447,7 +1447,7 @@ pixels in the brush." visibility="public" xmi.id="705" type="virtual KisAlphaMas
      <UML:Parameter visibility="private" xmi.id="1116" value="" type="QObject *" name="parent" />
      <UML:Parameter visibility="private" xmi.id="1117" value="" type="const char *" name="name" />
     </UML:Operation>
-    <UML:Operation visibility="public" xmi.id="1118" type="KAboutData *" name="aboutData" ownerScope="classifier" />
+    <UML:Operation visibility="public" xmi.id="1118" type="TDEAboutData *" name="aboutData" ownerScope="classifier" />
     <UML:Operation visibility="public" xmi.id="1119" type="virtual KParts :: Part *" name="createPartObject" >
      <UML:Parameter visibility="private" xmi.id="1120" value="" type="QWidget *" name="parentWidget" />
      <UML:Parameter visibility="private" xmi.id="1121" value="" type="const char *" name="widgetName" />
@@ -1456,12 +1456,12 @@ pixels in the brush." visibility="public" xmi.id="705" type="virtual KisAlphaMas
      <UML:Parameter visibility="private" xmi.id="1124" value="" type="const char *" name="classname" />
      <UML:Parameter visibility="private" xmi.id="1125" value="" type="const QStringList &amp;" name="args" />
     </UML:Operation>
-    <UML:Operation visibility="public" xmi.id="1126" type="KInstance *" name="global" ownerScope="classifier" />
+    <UML:Operation visibility="public" xmi.id="1126" type="TDEInstance *" name="global" ownerScope="classifier" />
     <UML:Operation visibility="public" xmi.id="1127" type="KisPluginServer *" name="pServer" ownerScope="classifier" />
     <UML:Operation visibility="public" xmi.id="1128" type="KisResourceServer *" name="rServer" ownerScope="classifier" />
     <UML:Operation visibility="public" xmi.id="1129" type="" name="~KisFactory" />
-    <UML:Attribute visibility="private" xmi.id="1111" value="" type="KAboutData *" name="s_aboutData" />
-    <UML:Attribute visibility="private" xmi.id="1112" value="" type="KInstance *" name="s_global" />
+    <UML:Attribute visibility="private" xmi.id="1111" value="" type="TDEAboutData *" name="s_aboutData" />
+    <UML:Attribute visibility="private" xmi.id="1112" value="" type="TDEInstance *" name="s_global" />
     <UML:Attribute visibility="private" xmi.id="1113" value="" type="KisPluginServer *" name="s_pserver" />
     <UML:Attribute visibility="private" xmi.id="1114" value="" type="KisResourceServer *" name="s_rserver" />
    </UML:Class>
@@ -38410,12 +38410,12 @@ in the constructor, you have to call loadAsync.
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock parent_id="1111" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" KAboutData * s_aboutData;" >
+              <ccfdeclarationcodeblock parent_id="1111" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAboutData * s_aboutData;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock parent_id="1112" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" KInstance * s_global;" >
+              <ccfdeclarationcodeblock parent_id="1112" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" TDEInstance * s_global;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -38531,7 +38531,7 @@ in the constructor, you have to call loadAsync.
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock parent_id="1111" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" KAboutData * s_aboutData;" >
+       <ccfdeclarationcodeblock parent_id="1111" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAboutData * s_aboutData;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
@@ -38551,7 +38551,7 @@ in the constructor, you have to call loadAsync.
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock parent_id="1112" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" KInstance * s_global;" >
+       <ccfdeclarationcodeblock parent_id="1112" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" TDEInstance * s_global;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
diff --git a/chalk/plugins/viewplugins/screenshot/main.cpp b/chalk/plugins/viewplugins/screenshot/main.cpp
index 21c4112ba..66f66812b 100644
--- a/chalk/plugins/viewplugins/screenshot/main.cpp
+++ b/chalk/plugins/viewplugins/screenshot/main.cpp
@@ -11,8 +11,8 @@ static const char description[] =
 
 int main(int argc, char **argv)
 {
-  KAboutData aboutData( "ksnapshot", I18N_NOOP("KSnapshot"),
-    KSNAPVERSION, description, KAboutData::License_GPL,
+  TDEAboutData aboutData( "ksnapshot", I18N_NOOP("KSnapshot"),
+    KSNAPVERSION, description, TDEAboutData::License_GPL,
     "(c) 1997-2003, Richard J. Moore,\n(c) 2000, Matthias Ettrich,\n(c) 2002-2003 Aaron J. Seigo");
   aboutData.addAuthor("Richard J. Moore",0, "rich@kde.org");
   aboutData.addAuthor("Matthias Ettrich",0, "ettrich@kde.org");
diff --git a/chalk/ui/kis_aboutdata.h b/chalk/ui/kis_aboutdata.h
index d06fd134a..dc083850b 100644
--- a/chalk/ui/kis_aboutdata.h
+++ b/chalk/ui/kis_aboutdata.h
@@ -25,13 +25,13 @@
 #include <kofficeversion.h>
 #include <config.h>
 
-KAboutData * newChalkAboutData()
+TDEAboutData * newChalkAboutData()
 {
-    KAboutData * aboutData = new KAboutData( "chalk",
+    TDEAboutData * aboutData = new TDEAboutData( "chalk",
             I18N_NOOP("Chalk"),
             KOFFICE_VERSION_STRING,
             I18N_NOOP("KOffice image manipulation application"),
-            KAboutData::License_GPL,
+            TDEAboutData::License_GPL,
             I18N_NOOP("(c) 1999-2006 The Chalk team.\n"),
             "",
             "http://www.koffice.org/chalk",
diff --git a/chalk/ui/kis_factory.cc b/chalk/ui/kis_factory.cc
index 7da1c5fe0..04bca5f9e 100644
--- a/chalk/ui/kis_factory.cc
+++ b/chalk/ui/kis_factory.cc
@@ -45,8 +45,8 @@
 
 #include "kis_factory.h"
 
-KAboutData* KisFactory::s_aboutData = 0;
-KInstance* KisFactory::s_instance = 0;
+TDEAboutData* KisFactory::s_aboutData = 0;
+TDEInstance* KisFactory::s_instance = 0;
 
 
 
@@ -95,18 +95,18 @@ KParts::Part* KisFactory::createPartObject( TQWidget *parentWidget,
 }
 
 
-KAboutData* KisFactory::aboutData()
+TDEAboutData* KisFactory::aboutData()
 {
     return s_aboutData;
 }
 
-KInstance* KisFactory::instance()
+TDEInstance* KisFactory::instance()
 {
     TQString homedir = getenv("HOME");
     
     if ( !s_instance )
     {
-        s_instance = new KInstance(s_aboutData);
+        s_instance = new TDEInstance(s_aboutData);
         TQ_CHECK_PTR(s_instance);
 
         s_instance->dirs()->addResourceType("chalk_template", KStandardDirs::kde_default("data") + "chalk/templates");
diff --git a/chalk/ui/kis_factory.h b/chalk/ui/kis_factory.h
index 5426b4fa8..cddf4c081 100644
--- a/chalk/ui/kis_factory.h
+++ b/chalk/ui/kis_factory.h
@@ -29,8 +29,8 @@
 
 #include <koffice_export.h>
 
-class KInstance;
-class KAboutData;
+class TDEInstance;
+class TDEAboutData;
 
 class KRITACORE_EXPORT KisFactory : public KoFactory
 {
@@ -48,12 +48,12 @@ public:
                            const char *classname = "KoDocument",
                            const TQStringList &args = TQStringList() );
 
-    static KAboutData        *aboutData();
-    static KInstance         *instance();
+    static TDEAboutData        *aboutData();
+    static TDEInstance         *instance();
 
 private:
-    static KInstance                    *s_instance;
-    static KAboutData                   *s_aboutData;
+    static TDEInstance                    *s_instance;
+    static TDEAboutData                   *s_aboutData;
 };
 
 #endif