Rename KInstance and KAboutData to avoid conflicts with KDE4

akregator/src/aboutdata.cpp

@@ -29,7 +29,7 @@
 namespace Akregator {
 
 AboutData::AboutData()
-    : KAboutData("akregator", I18N_NOOP("Akregator"), AKREGATOR_VERSION, I18N_NOOP("A TDE Feed Aggregator"),
+    : TDEAboutData("akregator", I18N_NOOP("Akregator"), AKREGATOR_VERSION, I18N_NOOP("A TDE Feed Aggregator"),
                  License_GPL, I18N_NOOP("(C) 2004, 2005 Akregator developers"), 0,
                      "http://akregator.kde.org/")
 {

akregator/src/aboutdata.h

@@ -34,7 +34,7 @@ namespace Akregator {
 /**
 @author Teemu Rytilahti
 */
-class KDE_EXPORT AboutData : public KAboutData
+class KDE_EXPORT AboutData : public TDEAboutData
 {
 public:
     AboutData();

akregator/src/akregator_part.cpp

@@ -766,14 +766,14 @@ void Part::addFeed()
     m_view->slotFeedAdd();
 }
 
-KAboutData *Part::createAboutData()
+TDEAboutData *Part::createAboutData()
 {
     return new Akregator::AboutData;
 }
 
 void Part::showKNotifyOptions()
 {
-    KAboutData* about = new Akregator::AboutData;
+    TDEAboutData* about = new Akregator::AboutData;
     KNotifyDialog::configure(m_view, "akregator_knotify_config", about);
     delete about;
 }
@@ -934,7 +934,7 @@ bool Part::tryToLock(const TQString& backendName)
         appName = "akregator";
 
     TQString programName;
-    const KAboutData *about = kapp->aboutData();
+    const TDEAboutData *about = kapp->aboutData();
     if ( about )
         programName = about->programName();
     if ( programName.isEmpty() )

akregator/src/akregator_part.h

@@ -37,7 +37,7 @@
 class TQDomDocument;
 class TQTimer;
 
-class KAboutData;
+class TDEAboutData;
 class KConfig;
 class KURL;
 
@@ -88,8 +88,8 @@ namespace Akregator
 	        /** Destructor. */
             virtual ~Part();
 
-            /** Create KAboutData for this KPart. */
-            static KAboutData *createAboutData();
+            /** Create TDEAboutData for this KPart. */
+            static TDEAboutData *createAboutData();
 
             /**
              Opens feedlist

akregator/src/librss/testlibrss.cpp

@@ -58,7 +58,7 @@ void Tester::slotLoadingComplete( Loader *loader, Document doc, Status status )
 
 int main( int argc, char **argv )
 {
-	KAboutData aboutData( "testlibrss", "testlibrss", "0.1" );
+	TDEAboutData aboutData( "testlibrss", "testlibrss", "0.1" );
 	TDECmdLineArgs::init( argc, argv, &aboutData );
     TDECmdLineArgs::addCmdLineOptions( options );
 	TDEApplication app;

akregator/src/notificationmanager.cpp

@@ -52,7 +52,7 @@ NotificationManager::~NotificationManager()
     m_self = 0;
 }
 
-void NotificationManager::setWidget(TQWidget* widget, KInstance* inst)
+void NotificationManager::setWidget(TQWidget* widget, TDEInstance* inst)
 {
     m_widget = widget;
     m_instance = inst != NULL ? inst : KGlobal::instance();

akregator/src/notificationmanager.h

@@ -44,7 +44,7 @@ class NotificationManager : public TQObject
         ~NotificationManager();
 
         /** the widget used for notification, normally either the mainwindow or the tray icon */
-        void setWidget(TQWidget* widget, KInstance* inst=0);
+        void setWidget(TQWidget* widget, TDEInstance* inst=0);
         
     public slots:
 
@@ -74,7 +74,7 @@ class NotificationManager : public TQObject
         bool m_running;
         bool m_addedInLastInterval;
         TQWidget* m_widget;
-        KInstance* m_instance;
+        TDEInstance* m_instance;
 
         TQValueList<Article> m_articles;
 

certmanager/aboutdata.cpp

@@ -76,7 +76,7 @@ static const about_data credits[] = {
 
 
 AboutData::AboutData()
-  : KAboutData( "kleopatra", I18N_NOOP("Kleopatra"),
+  : TDEAboutData( "kleopatra", I18N_NOOP("Kleopatra"),
 		kleopatra_version, description, License_GPL,
 		"(c) 2002 Steffen Hansen, Jesper Pedersen,\n"
 		"Kalle Dalheimer, Klar\xC3\xA4lvdalens Datakonsult AB\n\n"

certmanager/aboutdata.h

@@ -35,7 +35,7 @@
 
 #include <kaboutdata.h>
 
-class AboutData : public KAboutData {
+class AboutData : public TDEAboutData {
 public:
   AboutData();
 };

certmanager/kwatchgnupg/aboutdata.cpp

@@ -56,7 +56,7 @@ static const about_data credits[] = {
 #endif
 
 AboutData::AboutData()
-  : KAboutData( "kwatchgnupg", I18N_NOOP("KWatchGnuPG"),
+  : TDEAboutData( "kwatchgnupg", I18N_NOOP("KWatchGnuPG"),
 		kwatchgnupg_version, description, License_GPL,
 		"(c) 2004 Klar\xC3\xA4lvdalens Datakonsult AB\n" )
 {

certmanager/kwatchgnupg/aboutdata.h

@@ -35,7 +35,7 @@
 
 #include <kaboutdata.h>
 
-class AboutData : public KAboutData {
+class AboutData : public TDEAboutData {
 public:
   AboutData();
 };

certmanager/lib/tests/test_cryptoconfig.cpp

@@ -42,7 +42,7 @@ using namespace std;
 
 int main( int argc, char** argv ) {
 
-  KAboutData aboutData( "test_cryptoconfig", "CryptoConfig Test", "0.1" );
+  TDEAboutData aboutData( "test_cryptoconfig", "CryptoConfig Test", "0.1" );
   TDECmdLineArgs::init( argc, argv, &aboutData );
   TDEApplication app( false, false );
 

certmanager/lib/tests/test_gnupgprocessbase.cpp

@@ -119,7 +119,7 @@ int main( int argc, char** argv ) {
     kdDebug() << "Need at least two arguments" << endl;
     return 1;
   }
-  KAboutData aboutData( "test_gnupgprocessbase", "GnuPGProcessBase Test", "0.1" );
+  TDEAboutData aboutData( "test_gnupgprocessbase", "GnuPGProcessBase Test", "0.1" );
   TDECmdLineArgs::init( &aboutData );
   TDEApplication app;
 

certmanager/lib/tests/test_jobs.cpp

@@ -100,7 +100,7 @@ int main( int argc, char** argv ) {
     protocol = argv[1];
     argc = 1; // hide from KDE
   }
-  KAboutData aboutData( "test_jobs", "Signing Job Test", "0.1" );
+  TDEAboutData aboutData( "test_jobs", "Signing Job Test", "0.1" );
   TDECmdLineArgs::init( argc, argv, &aboutData );
   TDEApplication app;
 

certmanager/lib/tests/test_keygen.cpp

@@ -146,7 +146,7 @@ int main( int argc, char** argv ) {
     protocol = argv[1];
     argc = 1; // hide from KDE
   }
-  KAboutData aboutData( "test_keygen", "KeyGenerationJob Test", "0.1" );
+  TDEAboutData aboutData( "test_keygen", "KeyGenerationJob Test", "0.1" );
   TDECmdLineArgs::init( argc, argv, &aboutData );
   TDEApplication app;
 

certmanager/lib/tests/test_keylister.cpp

@@ -130,7 +130,7 @@ void CertListView::slotStart() {
 
 int main( int argc, char** argv ) {
 
-  KAboutData aboutData( "test_keylister", "KeyLister Test", "0.1" );
+  TDEAboutData aboutData( "test_keylister", "KeyLister Test", "0.1" );
   TDECmdLineArgs::init( argc, argv, &aboutData );
   TDEApplication app;
 

certmanager/lib/tests/test_keyselectiondialog.cpp

@@ -44,7 +44,7 @@
 #include <vector>
 
 int main( int argc, char ** argv ) {
-  KAboutData aboutData( "test_keyselectiondialog", "KeySelectionDialog Test", "0.1" );
+  TDEAboutData aboutData( "test_keyselectiondialog", "KeySelectionDialog Test", "0.1" );
   TDECmdLineArgs::init( argc, argv, &aboutData );
   TDEApplication app;
 

certmanager/lib/tests/test_verify.cpp

@@ -53,7 +53,7 @@ int main( int argc, char **argv )
   setenv("LC_ALL", "C", 1);
   setenv("TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.tde-unit-test" ), 1);
 
-  KAboutData aboutData( "test_verify", "verify job test", "0.1" );
+  TDEAboutData aboutData( "test_verify", "verify job test", "0.1" );
   TDECmdLineArgs::init( argc, argv, &aboutData );
   TDEApplication app( false, false );
 

kabc/frontend/main.cpp

@@ -8,7 +8,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;

kabc/kabcdistlistupdater/kabcdistlistupdater.cpp

@@ -72,7 +72,7 @@ int main( int argc, char **argv )
 {
   TDEApplication::disableAutoDcopRegistration();
 
-  KAboutData aboutData( "kabcdistlistupdater", "Converter tool for distribution lists", "0.1" );
+  TDEAboutData aboutData( "kabcdistlistupdater", "Converter tool for distribution lists", "0.1" );
   aboutData.addAuthor( "Tobias Koenig", 0, "tokoe@kde.org" );
 
   TDECmdLineArgs::init( argc, argv, &aboutData );

kaddressbook/interfaces/xxport.cpp

@@ -45,7 +45,7 @@ XXPort::XXPort( KABC::AddressBook *ab, TQWidget *parent,
   : TQObject( parent, name ), mAddressBook( ab ), mParentWidget( parent ),
     d( new XXPortPrivate )
 {
-  setInstance( new KInstance( "kaddressbook" ) );
+  setInstance( new TDEInstance( "kaddressbook" ) );
 
   d->mExportMapper = new TQSignalMapper( this );
   d->mImportMapper = new TQSignalMapper( this );

kaddressbook/kabcore.cpp

@@ -310,11 +310,11 @@ TQWidget *KABCore::widget() const
   return mWidget;
 }
 
-KAboutData *KABCore::createAboutData()
+TDEAboutData *KABCore::createAboutData()
 {
-  KAboutData *about = new KAboutData( "kaddressbook", I18N_NOOP( "KAddressBook" ),
+  TDEAboutData *about = new TDEAboutData( "kaddressbook", I18N_NOOP( "KAddressBook" ),
                                       "3.5.13", I18N_NOOP( "The TDE Address Book" ),
-                                      KAboutData::License_GPL_V2,
+                                      TDEAboutData::License_GPL_V2,
                                       I18N_NOOP( "(c) 2008-2010, The Trinity Team\n(c) 1997-2005, The KDE PIM Team" ) );
   about->addAuthor( "Timothy Pearson", I18N_NOOP( "Current maintainer" ), "kb9vqf@pearsoncomputing.net" );
   about->addAuthor( "Tobias Koenig", I18N_NOOP( "Previous maintainer" ), "tokoe@kde.org" );

kaddressbook/kabcore.h

@@ -46,7 +46,7 @@ class CategoryEditDialog;
 class CategorySelectDialog;
 }
 
-class KAboutData;
+class TDEAboutData;
 class KAction;
 class KActionCollection;
 class KConfig;
@@ -138,7 +138,7 @@ class KDE_EXPORT KABCore : public KAB::Core
      */
     TQWidget *widget() const;
 
-    static KAboutData *createAboutData();
+    static TDEAboutData *createAboutData();
 
     void setStatusBar( KStatusBar *statusBar );
 

kaddressbook/kaddressbook_part.cpp

@@ -77,7 +77,7 @@ KAddressbookPart::~KAddressbookPart()
   closeURL();
 }
 
-KAboutData *KAddressbookPart::createAboutData()
+TDEAboutData *KAddressbookPart::createAboutData()
 {
   return KABCore::createAboutData();
 }

kaddressbook/kaddressbook_part.h

@@ -29,8 +29,8 @@
 
 #include "kaddressbookiface.h"
 
-class KAboutData;
-class KInstance;
+class TDEAboutData;
+class TDEInstance;
 
 class KABCore;
 
@@ -44,7 +44,7 @@ class KAddressbookPart: public KParts::ReadOnlyPart, virtual public KAddressBook
                       TQObject *parent, const char *name, const TQStringList& );
     virtual ~KAddressbookPart();
 
-    static KAboutData *createAboutData();
+    static TDEAboutData *createAboutData();
 
     virtual void saveToProfile( const TQString& path ) const;
     virtual void loadProfile( const TQString& path );

kaddressbook/kcmconfigs/kcmkabconfig.cpp

@@ -51,9 +51,9 @@ KCMKabConfig::KCMKabConfig( TQWidget *parent, const char *name )
 
   load();
 
-  KAboutData *about = new KAboutData( I18N_NOOP( "kcmkabconfig" ),
+  TDEAboutData *about = new TDEAboutData( I18N_NOOP( "kcmkabconfig" ),
                                       I18N_NOOP( "KAddressBook Configure Dialog" ),
-                                      0, 0, KAboutData::License_GPL,
+                                      0, 0, TDEAboutData::License_GPL,
                                       I18N_NOOP( "(c), 2003 - 2004 Tobias Koenig" ) );
 
   about->addAuthor( "Tobias Koenig", 0, "tokoe@kde.org" );

kaddressbook/kcmconfigs/kcmkabldapconfig.cpp

@@ -52,9 +52,9 @@ KCMKabLdapConfig::KCMKabLdapConfig( TQWidget *parent, const char *name )
 
   load();
 
-  KAboutData *about = new KAboutData( I18N_NOOP( "kcmkabldapconfig" ),
+  TDEAboutData *about = new TDEAboutData( I18N_NOOP( "kcmkabldapconfig" ),
                                       I18N_NOOP( "KAB LDAP Configure Dialog" ),
-                                      0, 0, KAboutData::License_GPL,
+                                      0, 0, TDEAboutData::License_GPL,
                                       I18N_NOOP( "(c), 2003 - 2004 Tobias Koenig" ) );
 
   about->addAuthor( "Tobias Koenig", 0, "tokoe@kde.org" );

kalarm/kalarmd/admain.cpp

@@ -39,8 +39,8 @@ static const KCmdLineOptions options[] =
 
 int main(int argc, char** argv)
 {
-	KAboutData aboutData(DAEMON_APP_NAME, I18N_NOOP("KAlarm Daemon"),
-	                     DAEMON_VERSION, I18N_NOOP("KAlarm Alarm Daemon"), KAboutData::License_GPL,
+	TDEAboutData aboutData(DAEMON_APP_NAME, I18N_NOOP("KAlarm Daemon"),
+	                     DAEMON_VERSION, I18N_NOOP("KAlarm Alarm Daemon"), TDEAboutData::License_GPL,
 	                     "Copyright 1997-1999 Preston Brown\nCopyright 2000-2001 Cornelius Schumacher\nCopyright 2001,2004-2007 David Jarvie", 0,
 	                     "http://www.astrojar.org.uk/kalarm");
 	aboutData.addAuthor("David Jarvie", I18N_NOOP("Maintainer"), "software@astrojar.org.uk");

kalarm/main.cpp

@@ -107,9 +107,9 @@ static KCmdLineOptions options[] =
 
 int main(int argc, char *argv[])
 {
-	KAboutData aboutData(PROGRAM_NAME, I18N_NOOP("KAlarm"), KALARM_VERSION,
+	TDEAboutData aboutData(PROGRAM_NAME, I18N_NOOP("KAlarm"), KALARM_VERSION,
 		I18N_NOOP("Personal alarm message, command and email scheduler for TDE"),
-		KAboutData::License_GPL,
+		TDEAboutData::License_GPL,
 		"Copyright 2001-2007, David Jarvie", 0, "http://www.astrojar.org.uk/kalarm");
 	aboutData.addAuthor("David Jarvie", 0, "software@astrojar.org.uk");
 

kandy/src/main.cpp

@@ -87,8 +87,8 @@ void initModem(Modem *modem)
 
 int main(int argc, char **argv)
 {
-  KAboutData about("kandy", I18N_NOOP("Kandy"), version, description,
-                   KAboutData::License_GPL, "(C) 2001 Cornelius Schumacher",0,
+  TDEAboutData about("kandy", I18N_NOOP("Kandy"), version, description,
+                   TDEAboutData::License_GPL, "(C) 2001 Cornelius Schumacher",0,
                    "http://kandy.kde.org/");
   about.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" );
   about.addAuthor( "Heiko Falk", 0, "hf2@ls12.cs.uni-dortmund.de" );

karm/karm_part.cpp

@@ -367,12 +367,12 @@ void karmPart::fileSaveAs()
 
 
 // It's usually safe to leave the factory code alone.. with the
-// notable exception of the KAboutData data
+// notable exception of the TDEAboutData data
 #include <kaboutdata.h>
 #include <klocale.h>
 
-KInstance*  karmPartFactory::s_instance = 0L;
-KAboutData* karmPartFactory::s_about = 0L;
+TDEInstance*  karmPartFactory::s_instance = 0L;
+TDEAboutData* karmPartFactory::s_about = 0L;
 
 karmPartFactory::karmPartFactory()
     : KParts::Factory()
@@ -401,13 +401,13 @@ KParts::Part* karmPartFactory::createPartObject( TQWidget *parentWidget, const c
     return obj;
 }
 
-KInstance* karmPartFactory::instance()
+TDEInstance* karmPartFactory::instance()
 {
     if( !s_instance )
     {
-        s_about = new KAboutData("karmpart", I18N_NOOP("karmPart"), "0.1");
+        s_about = new TDEAboutData("karmpart", I18N_NOOP("karmPart"), "0.1");
         s_about->addAuthor("Thorsten Staerk", 0, "thorsten@staerk.de");
-        s_instance = new KInstance(s_about);
+        s_instance = new TDEInstance(s_about);
     }
     return s_instance;
 }

karm/karm_part.h

@@ -116,8 +116,8 @@ protected slots:
     void startNewSession(); 
 };
 
-class KInstance;
-class KAboutData;
+class TDEInstance;
+class TDEAboutData;
 
 class karmPartFactory : public KParts::Factory
 {
@@ -129,11 +129,11 @@ public:
     virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName,
                                             TQObject *parent, const char *name,
                                             const char *classname, const TQStringList &args );
-    static KInstance* instance();
+    static TDEInstance* instance();
  
 private:
-    static KInstance* s_instance;
-    static KAboutData* s_about;
+    static TDEInstance* s_instance;
+    static TDEAboutData* s_about;
 };
 
 #endif // _KARMPART_H_

karm/main.cpp

@@ -27,8 +27,8 @@ static const KCmdLineOptions options[] =
 
 int main( int argc, char *argv[] )
 {
-  KAboutData aboutData( "karm", I18N_NOOP("KArm"),
-      KARM_VERSION, description, KAboutData::License_GPL,
+  TDEAboutData aboutData( "karm", I18N_NOOP("KArm"),
+      KARM_VERSION, description, TDEAboutData::License_GPL,
       "(c) 1997-2004, KDE PIM Developers" );
 
   aboutData.addAuthor( "Mark Bucciarelli", I18N_NOOP( "Current Maintainer" ),

kioslaves/imap4/imap4.cc

@@ -109,7 +109,7 @@ kdemain (int argc, char **argv)
 {
   kdDebug(7116) << "IMAP4::kdemain" << endl;
 
-  KInstance instance ("kio_imap4");
+  TDEInstance instance ("kio_imap4");
   if (argc != 4)
   {
     fprintf(stderr, "Usage: kio_imap4 protocol domain-socket1 domain-socket2\n");

kioslaves/mbox/mbox.cc

@@ -43,7 +43,7 @@ extern "C" { KDE_EXPORT int kdemain(int argc, char* argv[]); }
 int kdemain( int argc, char * argv[] )
 {
 	KLocale::setMainCatalogue("tdelibs");
-	KInstance instance("kio_mbox");
+	TDEInstance instance("kio_mbox");
 	(void) KGlobal::locale();
 
 	if (argc != 4) {

kioslaves/opengroupware/opengroupware.cpp

@@ -69,7 +69,7 @@ KDE_EXPORT int kdemain( int argc, char **argv );
 
 int kdemain( int argc, char **argv )
 {
-  KInstance instance( "kio_OpenGroupware" );
+  TDEInstance instance( "kio_OpenGroupware" );
   
   kdDebug(7000) << "Starting kio_OpenGroupware(pid:  " << getpid() << ")" << endl;
   

kioslaves/sieve/sieve.cpp

@@ -82,7 +82,7 @@ extern "C"
 {
 	KDE_EXPORT int kdemain(int argc, char **argv)
 	{
-		KInstance instance("kio_sieve" );
+		TDEInstance instance("kio_sieve" );
 
 		ksDebug() << "*** Starting kio_sieve " << endl;
 

kitchensync/src/main.cpp

@@ -34,7 +34,7 @@ static KCmdLineOptions options[] =
 
 int main( int argc, char **argv )
 {
-  KAboutData *about = MainWidget::aboutData();
+  TDEAboutData *about = MainWidget::aboutData();
 
   TDECmdLineArgs::init( argc, argv, about );
   TDECmdLineArgs::addCmdLineOptions( options );

kitchensync/src/mainwidget.cpp

@@ -72,11 +72,11 @@ KXMLGUIClient *MainWidget::guiClient() const
   return mGUIClient;
 }
 
-KAboutData *MainWidget::aboutData()
+TDEAboutData *MainWidget::aboutData()
 {
-  KAboutData *about = new KAboutData( "kitchensync", I18N_NOOP( "KitchenSync" ),
+  TDEAboutData *about = new TDEAboutData( "kitchensync", I18N_NOOP( "KitchenSync" ),
                                       "0.1", I18N_NOOP( "The TDE Syncing Application" ),
-                                      KAboutData::License_GPL_V2,
+                                      TDEAboutData::License_GPL_V2,
                                       I18N_NOOP( "(c) 2005, The KDE PIM Team" ) );
   about->addAuthor( "Tobias Koenig", I18N_NOOP( "Current maintainer" ), "tokoe@kde.org" );
   about->addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" );

kitchensync/src/mainwidget.h

@@ -25,7 +25,7 @@
 
 #include <tqwidget.h>
 
-class KAboutData;
+class TDEAboutData;
 class KAction;
 class KXMLGUIClient;
 class GroupView;
@@ -45,7 +45,7 @@ class KDE_EXPORT MainWidget : public TQWidget
     ~MainWidget();
 
     virtual KXMLGUIClient *guiClient() const;
-    static KAboutData *aboutData();
+    static TDEAboutData *aboutData();
 
   public slots:
     void addGroup();

kitchensync/src/part.cpp

@@ -58,7 +58,7 @@ KitchenSyncPart::~KitchenSyncPart()
   closeURL();
 }
 
-KAboutData *KitchenSyncPart::createAboutData()
+TDEAboutData *KitchenSyncPart::createAboutData()
 {
   return MainWidget::aboutData();
 }

kitchensync/src/part.h

@@ -25,7 +25,7 @@
 #include <kparts/factory.h>
 #include <kparts/part.h>
 
-class KAboutData;
+class TDEAboutData;
 
 class KitchenSyncPart: public KParts::ReadOnlyPart
 {
@@ -37,7 +37,7 @@ class KitchenSyncPart: public KParts::ReadOnlyPart
                      TQObject *parent, const char *name, const TQStringList& );
     virtual ~KitchenSyncPart();
 
-    static KAboutData *createAboutData();
+    static TDEAboutData *createAboutData();
 
     virtual void exit();
     virtual bool openURL( const KURL &url );

kmail/aboutdata.cpp

@@ -209,7 +209,7 @@ namespace KMail {
   };
 
   AboutData::AboutData()
-    : KAboutData( "kmail", I18N_NOOP("KMail"),KMAIL_VERSION,
+    : TDEAboutData( "kmail", I18N_NOOP("KMail"),KMAIL_VERSION,
                   I18N_NOOP("TDE Email Client"), License_GPL,
                   I18N_NOOP("(c) 1997-2008, The KMail developers"), 0,
                   "http://kontact.kde.org/kmail/" )

kmail/aboutdata.h

@@ -37,7 +37,7 @@
 
 namespace KMail {
 
-  class KDE_EXPORT AboutData : public KAboutData {
+  class KDE_EXPORT AboutData : public TDEAboutData {
   public:
     AboutData();
     ~AboutData();

kmail/dcoptest.cpp

@@ -15,7 +15,7 @@ int main(int argc,char **argv)
 {
   kdDebug(5006) << "Test KMail DCOP interface." << endl;
 
-  KAboutData aboutData( "testKMailDCOP",
+  TDEAboutData aboutData( "testKMailDCOP",
    "Test for KMail DCOP interface", "0.0" );
   TDECmdLineArgs::init(argc, argv, &aboutData);
   TDEApplication app;

kmail/kmail_part.cpp

@@ -165,7 +165,7 @@ KMailPart::~KMailPart()
   KMail::cleanup(); // pid file (see kmstartup.cpp)
 }
 
-KAboutData *KMailPart::createAboutData()
+TDEAboutData *KMailPart::createAboutData()
 {
   return new KMail::AboutData();
 }

kmail/kmail_part.h

@@ -37,8 +37,8 @@
 #include <tqwidget.h>
 #include <tdepimmacros.h>
 
-class KInstance;
-class KAboutData;
+class TDEInstance;
+class TDEAboutData;
 class KMailStatusBarExtension;
 class KMKernel;
 class KMMainWidget;
@@ -60,7 +60,7 @@ class KDE_EXPORT KMailPart: public KParts::ReadOnlyPart, virtual public KMailPar
 
     TQWidget* parentWidget() const;
 
-    static KAboutData *createAboutData();
+    static TDEAboutData *createAboutData();
 
   public slots:
     virtual void save() { /*TODO*/ }

kmail/kmkernel.h

@@ -59,7 +59,7 @@ namespace KPIM {
 class KMKernel;
 class KProcess;
 class KProgressDialog;
-class KInstance;
+class TDEInstance;
 class TQTimer;
 class KProgress;
 class KPassivePopup;
@@ -291,8 +291,8 @@ public:
    */
   KMFolder* findFolderById( const TQString& idString );
 
-  KInstance *xmlGuiInstance() { return mXmlGuiInstance; }
-  void setXmlGuiInstance( KInstance *instance ) { mXmlGuiInstance = instance; }
+  TDEInstance *xmlGuiInstance() { return mXmlGuiInstance; }
+  void setXmlGuiInstance( TDEInstance *instance ) { mXmlGuiInstance = instance; }
 
   KMFolder *inboxFolder() { return the_inboxFolder; }
   KMFolder *outboxFolder() { return the_outboxFolder; }
@@ -489,7 +489,7 @@ private:
   static KMKernel *mySelf;
   KSharedConfig::Ptr mConfig;
   TQTextCodec *netCodec;
-  KInstance* mXmlGuiInstance;
+  TDEInstance* mXmlGuiInstance;
   ConfigureDialog *mConfigureDialog;
 
   TQTimer *mBackgroundTasksTimer;

kmail/kmstartup.cpp

@@ -142,7 +142,7 @@ void lockOrDie() {
     appName = "kmail";
 
   TQString programName;
-  const KAboutData *about = kapp->aboutData();
+  const TDEAboutData *about = kapp->aboutData();
   if ( about )
     programName = about->programName();
   if ( programName.isEmpty() )

kmail/recipientseditortest.cpp

@@ -90,7 +90,7 @@ void Composer::slotClose()
 
 int main( int argc, char **argv )
 {
-  KAboutData aboutData( "testrecipienteditor",
+  TDEAboutData aboutData( "testrecipienteditor",
    "Test Recipient Editor", "0.1" );
   TDECmdLineArgs::init( argc, argv, &aboutData );
 

kmailcvt/main.cpp

@@ -30,8 +30,8 @@ int main(int argc, char *argv[])
 {
   KLocale::setMainCatalogue("kmailcvt");
 
-  KAboutData aboutData( "kmailcvt", I18N_NOOP("KMailCVT"),
-    "3", I18N_NOOP("KMail Import Filters"), KAboutData::License_GPL_V2,
+  TDEAboutData aboutData( "kmailcvt", I18N_NOOP("KMailCVT"),
+    "3", I18N_NOOP("KMail Import Filters"), TDEAboutData::License_GPL_V2,
     I18N_NOOP("(c) 2000-2005, The KMailCVT developers"));
   aboutData.addAuthor("Hans Dijkema",I18N_NOOP("Original author"), "kmailcvt@hum.org");
   aboutData.addAuthor("Danny Kukawka", I18N_NOOP("Maintainer & New filters"), "danny.kukawka@web.de");

kmobile/kioslave/kio_mobile.cpp

@@ -47,7 +47,7 @@ extern "C" { KDE_EXPORT int kdemain(int argc, char **argv); }
  */
 int kdemain(int argc, char **argv)
 {
-  KInstance instance( "kio_mobile" );
+  TDEInstance instance( "kio_mobile" );
 
   PRINT_DEBUG << "Starting " << getpid() << endl;
 

kmobile/main.cpp

@@ -37,8 +37,8 @@ static KCmdLineOptions options[] =
 
 int main(int argc, char **argv)
 {
-    KAboutData about("kmobile", I18N_NOOP("KMobile"), version, description,
-                     KAboutData::License_GPL, "(C) 2003-2005 Helge Deller", 0, 0, "deller@kde.org");
+    TDEAboutData about("kmobile", I18N_NOOP("KMobile"), version, description,
+                     TDEAboutData::License_GPL, "(C) 2003-2005 Helge Deller", 0, 0, "deller@kde.org");
     about.addAuthor( "Helge Deller", 0, "deller@kde.org" );
     TDECmdLineArgs::init(argc, argv, &about);
     TDECmdLineArgs::addCmdLineOptions(options);

knode/aboutdata.cpp

@@ -42,11 +42,11 @@ namespace KNode
   };
 
   AboutData::AboutData()
-    : KAboutData( "knode",
+    : TDEAboutData( "knode",
                   I18N_NOOP("KNode"),
                   KNODE_VERSION,
                   I18N_NOOP("A newsreader for TDE"),
-                  KAboutData::License_GPL,
+                  TDEAboutData::License_GPL,
                   I18N_NOOP("Copyright (c) 1999-2005 the KNode authors"),
                   0,
                   "http://knode.sourceforge.net/" )

knode/aboutdata.h

@@ -22,7 +22,7 @@
 
 namespace KNode
 {
-  class KDE_EXPORT AboutData : public KAboutData
+  class KDE_EXPORT AboutData : public TDEAboutData
   {
   public:
     AboutData();

knode/knglobals.h

@@ -22,7 +22,7 @@
 
 #include <tdepimmacros.h>
 
-class KInstance;
+class TDEInstance;
 class KNConfigManager;
 class KNNetAccess;
 class KNProgress;
@@ -63,7 +63,7 @@ class KDE_EXPORT KNGlobals {
     KNArticleFactory      *artFactory;
     Kpgp::Module          *pgp;
     KConfig               *config();
-    KInstance             *instance;
+    TDEInstance             *instance;
 
     KNConfigManager       *configManager();
     KNNetAccess           *netAccess();

knode/knode_part.cpp

@@ -94,7 +94,7 @@ KNodePart::~KNodePart()
   mainWidget->prepareShutdown();
 }
 
-KAboutData *KNodePart::createAboutData()
+TDEAboutData *KNodePart::createAboutData()
 {
   return new KNode::AboutData();
 }

knode/knode_part.h

@@ -33,8 +33,8 @@
 
 #include <tqwidget.h>
 
-class KInstance;
-class KAboutData;
+class TDEInstance;
+class TDEAboutData;
 
 class ActionManager;
 class KNMainWidget;
@@ -50,7 +50,7 @@ class KNodePart: public KParts::ReadOnlyPart
 
     TQWidget* parentWidget() const;
 
-    static KAboutData *createAboutData();
+    static TDEAboutData *createAboutData();
 
   protected:
     virtual bool openFile();

knotes/ChangeLog

@@ -816,7 +816,7 @@ ChangeLog for KNotes
 
 2000/01/30  Charles Samuels <charles@kde.org>
 
-    This is my daily huge commit for KAboutData.  There are also patches for
+    This is my daily huge commit for TDEAboutData.  There are also patches for
     TDECmdLineArgs (so it works).  Ktop is really doing bad folks.
 
 2000/01/03  Espen Sand <espen@kde.org>

knotes/main.cpp

@@ -90,12 +90,12 @@ int main( int argc, char* argv[] )
 {
     TQString version = TQString::number( KNOTES_VERSION );
 
-    KAboutData aboutData(
+    TDEAboutData aboutData(
           "knotes",
           I18N_NOOP("KNotes"),
           version.latin1(),
           I18N_NOOP( "TDE Notes" ),
-          KAboutData::License_GPL,
+          TDEAboutData::License_GPL,
           I18N_NOOP("(c) 1997-2006, The KNotes Developers")
     );
 

kode/kodemain.cpp

@@ -415,7 +415,7 @@ int create( TDECmdLineArgs *args )
     main.addArgument( "char **argv" );
 
     code.clear();
-    code += "KAboutData aboutData(\"test\",\"Test\",\"0.1\");";
+    code += "TDEAboutData aboutData(\"test\",\"Test\",\"0.1\");";
     code += "TDECmdLineArgs::init(argc,argv,&aboutData);";
     code += "TDECmdLineArgs::addCmdLineOptions( options );";
     code += "";
@@ -490,7 +490,7 @@ int create( TDECmdLineArgs *args )
     
     code.clear();
 
-    code += "KInstance instance( \"kio_" + protocol + "\" );";
+    code += "TDEInstance instance( \"kio_" + protocol + "\" );";
     code += "";
     code += "kdDebug(7000) << \"Starting kio_" + protocol + "(pid:  \" << getpid() << \")\" << endl;";
     code += "";
@@ -609,7 +609,7 @@ int create( TDECmdLineArgs *args )
 
 int main(int argc,char **argv)
 {
-  KAboutData aboutData( "kode", I18N_NOOP("TDE Code Generator"), "0.1" );
+  TDEAboutData aboutData( "kode", I18N_NOOP("TDE Code Generator"), "0.1" );
   aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" );
 
   TDECmdLineArgs::init( argc, argv, &aboutData );

kode/kwsdl/kung/main.cpp

@@ -37,9 +37,9 @@ static const KCmdLineOptions options[] =
 
 int main( int argc, char **argv )
 {
-  KAboutData aboutData( "kung", I18N_NOOP( "TDE WSDL Interpreter" ), "0.1",
+  TDEAboutData aboutData( "kung", I18N_NOOP( "TDE WSDL Interpreter" ), "0.1",
                         I18N_NOOP( "TDE WSDL Interpreter" ),
-                        KAboutData::License_LGPL );
+                        TDEAboutData::License_LGPL );
 
   aboutData.addAuthor( "Tobias Koenig", 0, "tokoe@kde.org" );
 

kode/kwsdl/main.cpp

@@ -43,9 +43,9 @@ static const KCmdLineOptions options[] =
 
 int main( int argc, char **argv )
 {
-  KAboutData aboutData( "kwsdl_compiler", I18N_NOOP( "TDE wsdl compiler" ), "0.1",
+  TDEAboutData aboutData( "kwsdl_compiler", I18N_NOOP( "TDE wsdl compiler" ), "0.1",
                         I18N_NOOP( "TDE WSDL Compiler" ),
-                        KAboutData::License_LGPL );
+                        TDEAboutData::License_LGPL );
 
   aboutData.addAuthor( "Tobias Koenig", 0, "tokoe@kde.org" );
 

kode/kwsdl/tests/google/main.cc

@@ -7,7 +7,7 @@
 
 int main( int argc, char **argv )
 {
-  KAboutData aboutData( "kgooglesearch", "TDE Google Search", "0.1", "", KAboutData::License_GPL );
+  TDEAboutData aboutData( "kgooglesearch", "TDE Google Search", "0.1", "", TDEAboutData::License_GPL );
   aboutData.addAuthor( "Tobias Koenig", 0, "tokoe@kde.org" );
 
   TDECmdLineArgs::init( argc, argv, &aboutData );

kode/kxml_compiler/kxml_compiler.cpp

@@ -57,14 +57,14 @@ static const KCmdLineOptions options[] =
 
 int main( int argc, char **argv )
 {
-  KAboutData aboutData( "kxml_compiler", I18N_NOOP("TDE xml compiler"), "0.1",
-  	I18N_NOOP("TDE XML Compiler") , KAboutData::License_LGPL );
+  TDEAboutData aboutData( "kxml_compiler", I18N_NOOP("TDE xml compiler"), "0.1",
+  	I18N_NOOP("TDE XML Compiler") , TDEAboutData::License_LGPL );
   aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" );
 
   TDECmdLineArgs::init( argc, argv, &aboutData );
   TDECmdLineArgs::addCmdLineOptions( options );
 
-  KInstance app( &aboutData );
+  TDEInstance app( &aboutData );
 
   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 

konsolekalendar/main.cpp

@@ -167,12 +167,12 @@ static KCmdLineOptions options[] =
 
 int main( int argc, char *argv[] )
 {
-  KAboutData aboutData(
+  TDEAboutData aboutData(
     progName,                        // internal program name
     I18N_NOOP( progDisplay ),        // displayable program name.
     progVersion,                     // version string
     I18N_NOOP( progDesc ),           // short porgram description
-    KAboutData::License_GPL,         // license type
+    TDEAboutData::License_GPL,         // license type
     "(c) 2002-2005, Tuukka Pasanen and Allen Winter", // copyright statement
     0,                               // any free form text
     progURL,                         // program home page address

kontact/interfaces/plugin.cpp

@@ -126,11 +126,11 @@ KParts::ReadOnlyPart *Plugin::loadPart()
   return core()->createPart( d->partLibraryName );
 }
 
-const KAboutData *Plugin::aboutData()
+const TDEAboutData *Plugin::aboutData()
 {
   kdDebug(5601) << "Plugin::aboutData(): libname: " << d->partLibraryName << endl;
 
-  const KInstance *instance =
+  const TDEInstance *instance =
     KParts::Factory::partInstanceFromLibrary( d->partLibraryName );
 
   if ( instance ) {

kontact/interfaces/plugin.h

@@ -32,7 +32,7 @@
 class TQStringList;
 class DCOPClient;
 class DCOPObject;
-class KAboutData;
+class TDEAboutData;
 class KAction;
 class KConfig;
 class TQWidget;
@@ -142,7 +142,7 @@ class KDE_EXPORT Plugin : public TQObject, virtual public KXMLGUIClient
       Reimplement this method if you want to add your credits to the Kontact
       about dialog.
     */
-    virtual const KAboutData *aboutData();
+    virtual const TDEAboutData *aboutData();
 
     /**
       You can use this method if you need to access the current part. You can be

kontact/plugins/akregator/akregator_plugin.h

@@ -33,7 +33,7 @@
 #include "akregator_partiface_stub.h"
 #include <uniqueapphandler.h>
 
-class KAboutData;
+class TDEAboutData;
 
 namespace Akregator {
 

kontact/plugins/kaddressbook/kaddressbook_plugin.h

@@ -32,7 +32,7 @@
 #include "plugin.h"
 #include <uniqueapphandler.h>
 
-class KAboutData;
+class TDEAboutData;
 
 class KABUniqueAppHandler : public Kontact::UniqueAppHandler
 {

kontact/plugins/karm/karm_plugin.h

@@ -32,7 +32,7 @@
 
 #include "plugin.h"
 
-class KAboutData;
+class TDEAboutData;
 
 class KarmPlugin : public Kontact::Plugin
 {

kontact/plugins/kitchensync/kitchensync_plugin.h

@@ -30,7 +30,7 @@
 
 #include "plugin.h"
 
-class KAboutData;
+class TDEAboutData;
 
 class KitchenSyncPlugin : public Kontact::Plugin
 {

kontact/plugins/kmail/kcmkmailsummary.cpp

@@ -59,9 +59,9 @@ KCMKMailSummary::KCMKMailSummary( TQWidget *parent, const char *name )
 
   load();
 
-  KAboutData *about = new KAboutData( I18N_NOOP( "kcmkmailsummary" ),
+  TDEAboutData *about = new TDEAboutData( I18N_NOOP( "kcmkmailsummary" ),
                                       I18N_NOOP( "Mail Summary Configuration Dialog" ),
-                                      0, 0, KAboutData::License_GPL,
+                                      0, 0, TDEAboutData::License_GPL,
                                       I18N_NOOP( "(c) 2004 Tobias Koenig" ) );
 
   about->addAuthor( "Tobias Koenig", 0, "tokoe@kde.org" );

kontact/plugins/knotes/knotes_part.cpp

@@ -47,7 +47,7 @@ KNotesPart::KNotesPart( TQObject *parent, const char *name )
 {
   mNoteList.setAutoDelete( true );
 
-  setInstance( new KInstance( "knotes" ) );
+  setInstance( new TDEInstance( "knotes" ) );
 
   // create the actions
   new KAction( i18n( "&New" ), "knotes", CTRL+Key_N, this, TQT_SLOT( newNote() ),

kontact/plugins/knotes/knotes_part_p.h

@@ -125,7 +125,7 @@ class KNoteEditDlg : public KDialogBase, virtual public KXMLGUIClient
       // this dialog is modal to prevent one from editing the same note twice in two
       // different windows
 
-      setInstance( new KInstance( "knotes" ) ); // TODO: hm, memleak??
+      setInstance( new TDEInstance( "knotes" ) ); // TODO: hm, memleak??
       setXMLFile( "knotesui.rc" );
       actionCollection()->setWidget( this );
 

kontact/plugins/knotes/knotes_plugin.cpp

@@ -64,12 +64,12 @@ Kontact::Summary *KNotesPlugin::createSummaryWidget( TQWidget *parentWidget )
   return new KNotesSummaryWidget( this, parentWidget );
 }
 
-const KAboutData *KNotesPlugin::aboutData()
+const TDEAboutData *KNotesPlugin::aboutData()
 {
   if ( !mAboutData ) {
-    mAboutData = new KAboutData( "knotes", I18N_NOOP( "Notes Management" ),
+    mAboutData = new TDEAboutData( "knotes", I18N_NOOP( "Notes Management" ),
                                  "0.5", I18N_NOOP( "Notes Management" ),
-                                  KAboutData::License_GPL_V2,
+                                  TDEAboutData::License_GPL_V2,
                                   "(c) 2003-2004 The Kontact developers" );
     mAboutData->addAuthor( "Michael Brade", "Current Maintainer", "brade@kde.org" );
     mAboutData->addAuthor( "Tobias Koenig", "", "tokoe@kde.org" );

kontact/plugins/knotes/knotes_plugin.h

@@ -42,7 +42,7 @@ class KNotesPlugin : public Kontact::Plugin
 
     int weight() const { return 600; }
 
-    const KAboutData *aboutData();
+    const TDEAboutData *aboutData();
 
   protected:
     KParts::ReadOnlyPart* createPart();
@@ -52,7 +52,7 @@ class KNotesPlugin : public Kontact::Plugin
     void slotSyncNotes();
 
   private:
-    KAboutData *mAboutData;
+    TDEAboutData *mAboutData;
 };
 
 #endif