Rename KInstance and KAboutData to avoid conflicts with KDE4

14 files changed, 19 insertions, 19 deletions

diff --git a/libtdepim/cfgc/autoexample.cpp b/libtdepim/cfgc/autoexample.cpp
index fa9e9b528..595d195b8 100644
--- a/libtdepim/cfgc/autoexample.cpp
+++ b/libtdepim/cfgc/autoexample.cpp
@@ -38,7 +38,7 @@
 
 int main( int argc, char **argv )
 {
-  KAboutData aboutData( "example", I18N_NOOP("autoconfig example"), "0.1" );
+  TDEAboutData aboutData( "example", I18N_NOOP("autoconfig example"), "0.1" );
   aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" );
 
   TDECmdLineArgs::init( argc, argv, &aboutData );
diff --git a/libtdepim/cfgc/example.cpp b/libtdepim/cfgc/example.cpp
index 183b4f267..28c093784 100644
--- a/libtdepim/cfgc/example.cpp
+++ b/libtdepim/cfgc/example.cpp
@@ -34,7 +34,7 @@
 
 int main( int argc, char **argv )
 {
-  KAboutData aboutData( "example", I18N_NOOP("cfgc example"), "0.1" );
+  TDEAboutData aboutData( "example", I18N_NOOP("cfgc example"), "0.1" );
   aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" );
 
   TDECmdLineArgs::init( argc, argv, &aboutData );
diff --git a/libtdepim/kcmdesignerfields.cpp b/libtdepim/kcmdesignerfields.cpp
index d40d3f4ba..d99128ec0 100644
--- a/libtdepim/kcmdesignerfields.cpp
+++ b/libtdepim/kcmdesignerfields.cpp
@@ -131,9 +131,9 @@ KCMDesignerFields::KCMDesignerFields( TQWidget *parent, const char *name )
 {
   TQTimer::singleShot( 0, this, TQT_SLOT( delayedInit() ) );
   
-  KAboutData *about = new KAboutData( I18N_NOOP( "KCMDesignerfields" ),
+  TDEAboutData *about = new TDEAboutData( I18N_NOOP( "KCMDesignerfields" ),
                                       I18N_NOOP( "TQt Designer Fields Dialog" ),
-                                      0, 0, KAboutData::License_LGPL,
+                                      0, 0, TDEAboutData::License_LGPL,
                                       I18N_NOOP( "(c), 2004 Tobias Koenig" ) );
 
   about->addAuthor( "Tobias Koenig", 0, "tokoe@kde.org" );
diff --git a/libtdepim/komposer/core/core.cpp b/libtdepim/komposer/core/core.cpp
index f93e59cc9..945c22311 100644
--- a/libtdepim/komposer/core/core.cpp
+++ b/libtdepim/komposer/core/core.cpp
@@ -60,7 +60,7 @@ Core::Core( TQWidget *parent, const char *name )
   initWidgets();
   initCore();
   initConnections();
-  setInstance( new KInstance( "komposer" ) );
+  setInstance( new TDEInstance( "komposer" ) );
 
   createActions();
   setXMLFile( "komposerui.rc" );
diff --git a/libtdepim/komposer/core/prefsmodule.cpp b/libtdepim/komposer/core/prefsmodule.cpp
index 5aed441a9..807869487 100644
--- a/libtdepim/komposer/core/prefsmodule.cpp
+++ b/libtdepim/komposer/core/prefsmodule.cpp
@@ -56,12 +56,12 @@ PrefsModule::PrefsModule( TQWidget *parent, const char *name )
   load();
 }
 
-const KAboutData*
+const TDEAboutData*
 PrefsModule::aboutData() const
 {
-  KAboutData *about = new KAboutData( I18N_NOOP( "komposerconfig" ),
+  TDEAboutData *about = new TDEAboutData( I18N_NOOP( "komposerconfig" ),
                                       I18N_NOOP( "TDE Komposer" ),
-                                      0, 0, KAboutData::License_LGPL,
+                                      0, 0, TDEAboutData::License_LGPL,
                                       I18N_NOOP( "(c), 2003-2004 Zack Rusin" ) );
 
   about->addAuthor( "Zack Rusin", 0, "zack@kde.org" );;
diff --git a/libtdepim/komposer/core/prefsmodule.h b/libtdepim/komposer/core/prefsmodule.h
index 9e60098ee..a7733019c 100644
--- a/libtdepim/komposer/core/prefsmodule.h
+++ b/libtdepim/komposer/core/prefsmodule.h
@@ -27,7 +27,7 @@
 class TQGroupBox;
 class TQListViewItem;
 
-class KAboutData;
+class TDEAboutData;
 class KComboBox;
 
 namespace Komposer {
@@ -38,7 +38,7 @@ namespace Komposer {
   
   public:
     PrefsModule( TQWidget *parent=0, const char *name=0 );
-    virtual const KAboutData *aboutData() const;
+    virtual const TDEAboutData *aboutData() const;
   };
 
   class EditorSelection : public KPrefsWid
diff --git a/libtdepim/komposer/core/tests/main.cpp b/libtdepim/komposer/core/tests/main.cpp
index 80bf8fc95..e132ac883 100644
--- a/libtdepim/komposer/core/tests/main.cpp
+++ b/libtdepim/komposer/core/tests/main.cpp
@@ -38,7 +38,7 @@ static const KCmdLineOptions options[] =
 };
 int main( int argc, char** argv )
 {
-    KAboutData aboutData( "tests","Test","0.1" );
+    TDEAboutData aboutData( "tests","Test","0.1" );
     TDECmdLineArgs::init( argc, argv, &aboutData );
     TDECmdLineArgs::addCmdLineOptions( options );
 
diff --git a/libtdepim/komposer/test/test.cpp b/libtdepim/komposer/test/test.cpp
index c6cf91518..4f811e90f 100644
--- a/libtdepim/komposer/test/test.cpp
+++ b/libtdepim/komposer/test/test.cpp
@@ -36,8 +36,8 @@ static const char version[] = "0.0.1 (SVN)";
 
 int main(int argc, char **argv)
 {
-  KAboutData about( "komposertest", I18N_NOOP( "KomposerTest" ), version, description,
-                    KAboutData::License_GPL, "(C) 2001-2003 The Kontact developers", 0, "http://kontact.kde.org", "zack@kde.org" );
+  TDEAboutData about( "komposertest", I18N_NOOP( "KomposerTest" ), version, description,
+                    TDEAboutData::License_GPL, "(C) 2001-2003 The Kontact developers", 0, "http://kontact.kde.org", "zack@kde.org" );
   about.addAuthor( "Zack Rusin", 0, "zack@kde.org" );
 
   TDECmdLineArgs::init( argc, argv, &about );
diff --git a/libtdepim/tdepim.widgets b/libtdepim/tdepim.widgets
index 765abc23b..512efd15d 100644
--- a/libtdepim/tdepim.widgets
+++ b/libtdepim/tdepim.widgets
@@ -1,7 +1,7 @@
 [Global]
 PluginName=KDEPimWidgets
 Includes=kinstance.h
-Init=new KInstance("tdepimwidgets");
+Init=new TDEInstance("tdepimwidgets");
 
 [KPIM::AddresseeLineEdit]
 ToolTip=Addressee Line Edit (KDE-PIM)
diff --git a/libtdepim/tests/test_kregexp.cpp b/libtdepim/tests/test_kregexp.cpp
index a44e3be0f..f02d60b16 100644
--- a/libtdepim/tests/test_kregexp.cpp
+++ b/libtdepim/tests/test_kregexp.cpp
@@ -5,7 +5,7 @@
 int
 main()
 {
-  KInstance app("# ");
+  TDEInstance app("# ");
 
   // test for http://bugs.kde.org/show_bug.cgi?id=54886
   KRegExp3 reg("^");
diff --git a/libtdepim/tests/testaddresseelineedit.cpp b/libtdepim/tests/testaddresseelineedit.cpp
index b02998397..b08e1d8ac 100644
--- a/libtdepim/tests/testaddresseelineedit.cpp
+++ b/libtdepim/tests/testaddresseelineedit.cpp
@@ -29,7 +29,7 @@
 
 int main(int argc, char* argv[])
 {
-  KAboutData aboutData("testaddresseelineedit","Test AddresseeLineEdit","0.1");
+  TDEAboutData aboutData("testaddresseelineedit","Test AddresseeLineEdit","0.1");
   TDECmdLineArgs::init(argc,argv,&aboutData);
 
   TDEApplication app;
diff --git a/libtdepim/tests/testaddresseeselector.cpp b/libtdepim/tests/testaddresseeselector.cpp
index af5a1dd4f..0be82ca3a 100644
--- a/libtdepim/tests/testaddresseeselector.cpp
+++ b/libtdepim/tests/testaddresseeselector.cpp
@@ -30,7 +30,7 @@
 
 int main( int argc, char **argv )
 {
-  KAboutData aboutData( "testaddresseeseletor", "Test AddresseeSelector", "0.1" );
+  TDEAboutData aboutData( "testaddresseeseletor", "Test AddresseeSelector", "0.1" );
   TDECmdLineArgs::init( argc, argv, &aboutData );
 
   TDEApplication app;
diff --git a/libtdepim/tests/testdateedit.cpp b/libtdepim/tests/testdateedit.cpp
index 612aca177..24bade100 100644
--- a/libtdepim/tests/testdateedit.cpp
+++ b/libtdepim/tests/testdateedit.cpp
@@ -53,7 +53,7 @@ void DateEdit::dateChanged( const TQDate &date )
 
 int main(int argc,char **argv)
 {
-  KAboutData aboutData( "testdateedit", "Test KDateEdit", "0.1" );
+  TDEAboutData aboutData( "testdateedit", "Test KDateEdit", "0.1" );
   TDECmdLineArgs::init( argc, argv, &aboutData );
 
   TDEApplication app;
diff --git a/libtdepim/tests/testwizard.cpp b/libtdepim/tests/testwizard.cpp
index 03ee4ac43..4e3dec288 100644
--- a/libtdepim/tests/testwizard.cpp
+++ b/libtdepim/tests/testwizard.cpp
@@ -83,7 +83,7 @@ static const KCmdLineOptions options[] =
 
 int main(int argc,char **argv)
 {
-  KAboutData aboutData("testwizard","Test KConfigWizard","0.1");
+  TDEAboutData aboutData("testwizard","Test KConfigWizard","0.1");
   TDECmdLineArgs::init(argc,argv,&aboutData);
   TDECmdLineArgs::addCmdLineOptions( options );