Rename KInstance and KAboutData to avoid conflicts with KDE4

kiosktool/kcms/autostart/kcmautostart.cpp

@@ -51,9 +51,9 @@ AutoStartConfig::AutoStartConfig(TQWidget* parent, const char* name, const TQStr
     KCModule( AutoStartFactory::instance(), parent, name )
 {
     KGlobal::dirs()->addResourceType("autostart", "share/autostart");
-    KAboutData *about =
-        new KAboutData( I18N_NOOP( "kcmautostart" ), I18N_NOOP( "TDE Service Manager" ),
-            0, 0, KAboutData::License_GPL, I18N_NOOP( "(c) 2004 Martijn Klingens" ) );
+    TDEAboutData *about =
+        new TDEAboutData( I18N_NOOP( "kcmautostart" ), I18N_NOOP( "TDE Service Manager" ),
+            0, 0, TDEAboutData::License_GPL, I18N_NOOP( "(c) 2004 Martijn Klingens" ) );
     about->addAuthor( "Martijn Klingens", 0, "klingens@kde.org" );
 
 #if KDE_IS_VERSION(3,2,91)

kiosktool/kioskrun.cpp

@@ -276,7 +276,7 @@ KioskRun::setupConfigEnv()
 
    m_configDir = TQString("%1/.trinity/share/config/").arg(m_homeDir);
 
-   m_instance = new KInstance("kioskrun");
+   m_instance = new TDEInstance("kioskrun");
    (void) m_instance->dirs(); // Create KStandardDirs obj
 
    m_desktopPath = m_homeDir + "/Desktop/";
@@ -291,7 +291,7 @@ KioskRun::setupConfigEnv()
       SetEnv xdgDataHome("XDG_DATA_HOME", m_xdgDataDirs.first());
       SetEnv xdgConfigHome("XDG_CONFIG_HOME", m_xdgConfigDirs.first());
 
-      m_saveInstance = new KInstance("kioskrun");
+      m_saveInstance = new TDEInstance("kioskrun");
       (void) m_saveInstance->dirs(); // Create KStandardDirs obj
    }
 }

kiosktool/kioskrun.h

@@ -197,8 +197,8 @@ private:
   TQStringList m_xdgDataDirs;
   TQStringList m_xdgConfigDirs;
   DCOPClient *m_dcopClient;
-  KInstance *m_instance;
-  KInstance *m_saveInstance;
+  TDEInstance *m_instance;
+  TDEInstance *m_saveInstance;
   TQDict<KConfig> m_saveConfigCache;
   TQDict<ImmutableStatus> m_immutableStatusCache;
   bool m_noRestrictions;

kiosktool/kiosktool-tdedirs.cpp

@@ -122,12 +122,12 @@ static KCmdLineOptions options[] = {
 int main(int argc, char **argv)
 {
     KLocale::setMainCatalogue("kiosktool");
-    KAboutData about("kiosktool-tdedirs", "kiosktool-tdedirs", "1.0", description, KAboutData::License_GPL, "(C) 2004 Waldo Bastian");
+    TDEAboutData about("kiosktool-tdedirs", "kiosktool-tdedirs", "1.0", description, TDEAboutData::License_GPL, "(C) 2004 Waldo Bastian");
     TDECmdLineArgs::init( argc, argv, &about);
     TDECmdLineArgs::addCmdLineOptions(options);
     TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
-    KInstance a("kiosktool-tdedirs");
+    TDEInstance a("kiosktool-tdedirs");
 
     if (args->isSet("check"))
     {

kiosktool/main.cpp

@@ -46,8 +46,8 @@ static const KCmdLineOptions options[] =
 
 int main(int argc, char *argv[])
 {
-   KAboutData aboutData( "kiosktool", I18N_NOOP("KIOSK Admin Tool"),
-                         version, description, KAboutData::License_GPL_V2,
+   TDEAboutData aboutData( "kiosktool", I18N_NOOP("KIOSK Admin Tool"),
+                         version, description, TDEAboutData::License_GPL_V2,
                          "(c) 2003,2004 Waldo Bastian");
    aboutData.addAuthor("Waldo Bastian",I18N_NOOP("Author"), "bastian@kde.org");