Rename KInstance and KAboutData to avoid conflicts with KDE4

13 files changed, 19 insertions, 19 deletions

diff --git a/korganizer/aboutdata.cpp b/korganizer/aboutdata.cpp
index 179b55615..6153d92c9 100644
--- a/korganizer/aboutdata.cpp
+++ b/korganizer/aboutdata.cpp
@@ -29,9 +29,9 @@
 using namespace KOrg;
 
 AboutData::AboutData()
-  : KAboutData( "korganizer", I18N_NOOP("KOrganizer"), korgVersion,
+  : TDEAboutData( "korganizer", I18N_NOOP("KOrganizer"), korgVersion,
                 I18N_NOOP("A Personal Organizer for TDE"),
-                KAboutData::License_GPL,
+                TDEAboutData::License_GPL,
                 "(c) 1997-1999 Preston Brown\n"
                 "(c) 2000-2004 Cornelius Schumacher\n"
                 "(c) 2004-2005 Reinhold Kainhofer\n"
diff --git a/korganizer/aboutdata.h b/korganizer/aboutdata.h
index ef3f19de3..c78361eee 100644
--- a/korganizer/aboutdata.h
+++ b/korganizer/aboutdata.h
@@ -29,7 +29,7 @@
 
 namespace KOrg {
 
-class KDE_EXPORT AboutData : public KAboutData
+class KDE_EXPORT AboutData : public TDEAboutData
 {
   public:
     AboutData();
diff --git a/korganizer/koglobals.cpp b/korganizer/koglobals.cpp
index e4caf058f..3077e0cdf 100644
--- a/korganizer/koglobals.cpp
+++ b/korganizer/koglobals.cpp
@@ -67,9 +67,9 @@ KOGlobals *KOGlobals::self()
 KOGlobals::KOGlobals()
   : mHolidays(0)
 {
-  // Needed to distinguish from global KInstance
+  // Needed to distinguish from global TDEInstance
   // in case we are a KPart
-  mOwnInstance = new KInstance( "korganizer" );
+  mOwnInstance = new TDEInstance( "korganizer" );
   mOwnInstance->config()->setGroup( "General" );
   mOwnInstance->iconLoader()->addAppDir( "tdepim" );
   KGlobal::iconLoader()->addAppDir( "tdepim" );
diff --git a/korganizer/koglobals.h b/korganizer/koglobals.h
index f32488628..4c1c5474b 100644
--- a/korganizer/koglobals.h
+++ b/korganizer/koglobals.h
@@ -33,7 +33,7 @@ class KCalendarSystem;
 class AlarmClient;
 
 class KConfig;
-class KInstance;
+class TDEInstance;
 class KHolidays;
 
 class KDE_EXPORT KOGlobals
@@ -110,7 +110,7 @@ class KDE_EXPORT KOGlobals
   private:
     static KOGlobals *mSelf;
 
-    KInstance *mOwnInstance;
+    TDEInstance *mOwnInstance;
 
     AlarmClient *mAlarmClient;
 
diff --git a/korganizer/korgac/korgacmain.cpp b/korganizer/korgac/korgacmain.cpp
index 95a728ded..8b9012387 100644
--- a/korganizer/korgac/korgacmain.cpp
+++ b/korganizer/korgac/korgacmain.cpp
@@ -62,9 +62,9 @@ static const KCmdLineOptions options[] =
 int main( int argc, char **argv )
 {
   KLocale::setMainCatalogue( "korganizer" );
-  KAboutData aboutData( "korgac", I18N_NOOP("KOrganizer Reminder Daemon"),
+  TDEAboutData aboutData( "korgac", I18N_NOOP("KOrganizer Reminder Daemon"),
                         korgacVersion, I18N_NOOP("KOrganizer Reminder Daemon"),
-                        KAboutData::License_GPL,
+                        TDEAboutData::License_GPL,
                         "(c) 2003 Cornelius Schumacher",
                         0, "http://pim.kde.org" );
   aboutData.addAuthor( "Cornelius Schumacher", I18N_NOOP("Maintainer"),
diff --git a/korganizer/korgac/testalarmdlg.cpp b/korganizer/korgac/testalarmdlg.cpp
index e7be364b7..833e6b34f 100644
--- a/korganizer/korgac/testalarmdlg.cpp
+++ b/korganizer/korgac/testalarmdlg.cpp
@@ -36,7 +36,7 @@
 
 int main(int argc,char **argv)
 {
-  KAboutData aboutData("testkabc",I18N_NOOP("TestKabc"),"0.1");
+  TDEAboutData aboutData("testkabc",I18N_NOOP("TestKabc"),"0.1");
   TDECmdLineArgs::init(argc,argv,&aboutData);
 
   TDEApplication app;
diff --git a/korganizer/korganizer_part.cpp b/korganizer/korganizer_part.cpp
index 9bcdc8edb..4bea20a78 100644
--- a/korganizer/korganizer_part.cpp
+++ b/korganizer/korganizer_part.cpp
@@ -135,7 +135,7 @@ KOrganizerPart::~KOrganizerPart()
   KOCore::self()->removeXMLGUIClient( mTopLevelWidget );
 }
 
-KAboutData *KOrganizerPart::createAboutData()
+TDEAboutData *KOrganizerPart::createAboutData()
 {
   return new KOrg::AboutData;
 }
diff --git a/korganizer/korganizer_part.h b/korganizer/korganizer_part.h
index ef307c559..ff35d9baf 100644
--- a/korganizer/korganizer_part.h
+++ b/korganizer/korganizer_part.h
@@ -31,8 +31,8 @@
 #include <korganizer/mainwindow.h>
 
 
-class KInstance;
-class KAboutData;
+class TDEInstance;
+class TDEAboutData;
 class KProcess;
 
 class CalendarView;
@@ -63,7 +63,7 @@ class KOrganizerPart: public KParts::ReadOnlyPart,
                     TQObject *parent, const char *name, const TQStringList & );
     virtual ~KOrganizerPart();
 
-    static KAboutData *createAboutData();
+    static TDEAboutData *createAboutData();
 
     virtual KOrg::CalendarViewBase *view() const;
 
diff --git a/korganizer/korgplugins.cpp b/korganizer/korgplugins.cpp
index e5fd0358d..3d371f9da 100644
--- a/korganizer/korgplugins.cpp
+++ b/korganizer/korgplugins.cpp
@@ -34,7 +34,7 @@
 
 int main(int argc,char **argv)
 {
-  KAboutData aboutData("korgplugins",I18N_NOOP("KOrgPlugins"),"0.1");
+  TDEAboutData aboutData("korgplugins",I18N_NOOP("KOrgPlugins"),"0.1");
   TDECmdLineArgs::init(argc,argv,&aboutData);
 
   TDEApplication app;
diff --git a/korganizer/plugins/exchange/exchange.cpp b/korganizer/plugins/exchange/exchange.cpp
index a0062387c..063c6756e 100644
--- a/korganizer/plugins/exchange/exchange.cpp
+++ b/korganizer/plugins/exchange/exchange.cpp
@@ -59,7 +59,7 @@ K_EXPORT_COMPONENT_FACTORY( libkorg_exchange, ExchangeFactory )
 Exchange::Exchange(KOrg::MainWindow *parent, const char *name) :
   KOrg::Part(parent,name)
 {
-  setInstance( new KInstance( "korganizer" ) );
+  setInstance( new TDEInstance( "korganizer" ) );
 
   kdDebug(5850) << "Creating Exchange Plugin...\n";
 
diff --git a/korganizer/plugins/projectview/projectview.cpp b/korganizer/plugins/projectview/projectview.cpp
index 2e7b3dc61..64cdd7a3f 100644
--- a/korganizer/plugins/projectview/projectview.cpp
+++ b/korganizer/plugins/projectview/projectview.cpp
@@ -48,7 +48,7 @@ K_EXPORT_COMPONENT_FACTORY( libkorg_projectview, ProjectViewFactory )
 ProjectView::ProjectView(KOrg::MainWindow *parent, const char *name) :
   KOrg::Part(parent,name), mView(0)
 {
-  setInstance( new KInstance( "korganizer" ) );
+  setInstance( new TDEInstance( "korganizer" ) );
 
   setXMLFile("plugins/projectviewui.rc");
 
diff --git a/korganizer/plugins/timespanview/timespanview.cpp b/korganizer/plugins/timespanview/timespanview.cpp
index 24a45abb1..bd910677b 100644
--- a/korganizer/plugins/timespanview/timespanview.cpp
+++ b/korganizer/plugins/timespanview/timespanview.cpp
@@ -47,7 +47,7 @@ K_EXPORT_COMPONENT_FACTORY( libkorg_timespanview, TimespanViewFactory )
 TimespanView::TimespanView(KOrg::MainWindow *parent, const char *name) :
   KOrg::Part(parent,name), mView(0)
 {
-  setInstance( new KInstance( "korganizer" ) );
+  setInstance( new TDEInstance( "korganizer" ) );
 
   setXMLFile( "plugins/timespanviewui.rc" );
 
diff --git a/korganizer/timezone.cpp b/korganizer/timezone.cpp
index 9d3c42d60..a8ef22339 100644
--- a/korganizer/timezone.cpp
+++ b/korganizer/timezone.cpp
@@ -36,7 +36,7 @@
 
 int main(int argc,char **argv)
 {
-  KAboutData aboutData("timezone",I18N_NOOP("KOrganizer Timezone Test"),"0.1");
+  TDEAboutData aboutData("timezone",I18N_NOOP("KOrganizer Timezone Test"),"0.1");
   TDECmdLineArgs::init(argc,argv,&aboutData);
 
   TDEApplication app;