Rename KAbout to avoid conflicts with KDE4

5 files changed, 37 insertions, 37 deletions

diff --git a/tdecore/kaboutdata.cpp b/tdecore/kaboutdata.cpp
index 8db37e58f..c5055e4dc 100644
--- a/tdecore/kaboutdata.cpp
+++ b/tdecore/kaboutdata.cpp
@@ -26,13 +26,13 @@
 #include <tqtextstream.h>
 
 TQString
-KAboutPerson::name() const
+TDEAboutPerson::name() const
 {
    return TQString::fromUtf8(mName);
 }
 
 TQString
-KAboutPerson::task() const
+TDEAboutPerson::task() const
 {
    if (mTask && *mTask)
       return i18n(mTask);
@@ -41,32 +41,32 @@ KAboutPerson::task() const
 }
 
 TQString
-KAboutPerson::emailAddress() const
+TDEAboutPerson::emailAddress() const
 {
    return TQString::fromUtf8(mEmailAddress);
 }
 
 
 TQString
-KAboutPerson::webAddress() const
+TDEAboutPerson::webAddress() const
 {
    return TQString::fromUtf8(mWebAddress);
 }
 
 
-KAboutTranslator::KAboutTranslator(const TQString & name,
+TDEAboutTranslator::TDEAboutTranslator(const TQString & name,
                 const TQString & emailAddress)
 {
     mName=name;
     mEmail=emailAddress;
 }
 
-TQString KAboutTranslator::name() const
+TQString TDEAboutTranslator::name() const
 {
     return mName;
 }
 
-TQString KAboutTranslator::emailAddress() const
+TQString TDEAboutTranslator::emailAddress() const
 {
     return mEmail;
 }
@@ -141,14 +141,14 @@ void
 TDEAboutData::addAuthor( const char *name, const char *task,
 		    const char *emailAddress, const char *webAddress )
 {
-  mAuthorList.append(KAboutPerson(name,task,emailAddress,webAddress));
+  mAuthorList.append(TDEAboutPerson(name,task,emailAddress,webAddress));
 }
 
 void
 TDEAboutData::addCredit( const char *name, const char *task,
 		    const char *emailAddress, const char *webAddress )
 {
-  mCreditList.append(KAboutPerson(name,task,emailAddress,webAddress));
+  mCreditList.append(TDEAboutPerson(name,task,emailAddress,webAddress));
 }
 
 void
@@ -320,22 +320,22 @@ TDEAboutData::bugAddress() const
    return TQString::fromLatin1(mBugEmailAddress);
 }
 
-const TQValueList<KAboutPerson>
+const TQValueList<TDEAboutPerson>
 TDEAboutData::authors() const
 {
    return mAuthorList;
 }
 
-const TQValueList<KAboutPerson>
+const TQValueList<TDEAboutPerson>
 TDEAboutData::credits() const
 {
    return mCreditList;
 }
 
-const TQValueList<KAboutTranslator>
+const TQValueList<TDEAboutTranslator>
 TDEAboutData::translators() const
 {
-    TQValueList<KAboutTranslator> personList;
+    TQValueList<TDEAboutTranslator> personList;
 
     if(d->translatorName == 0)
         return personList;
@@ -375,7 +375,7 @@ TDEAboutData::translators() const
 
         TQString name=*nit;
 
-        personList.append(KAboutTranslator(name.stripWhiteSpace(), email.stripWhiteSpace()));
+        personList.append(TDEAboutTranslator(name.stripWhiteSpace(), email.stripWhiteSpace()));
     }
 
     return personList;
diff --git a/tdecore/kaboutdata.h b/tdecore/kaboutdata.h
index b803b779e..d5addac0a 100644
--- a/tdecore/kaboutdata.h
+++ b/tdecore/kaboutdata.h
@@ -27,7 +27,7 @@
 #ifndef _KABOUTDATA_H_
 #define _KABOUTDATA_H_
 
-class KAboutPersonPrivate;
+class TDEAboutPersonPrivate;
 class TDEAboutDataPrivate;
 
 /**
@@ -51,7 +51,7 @@ class TDEAboutDataPrivate;
  *   TDECmdLineArgs::init(argc, argv, &about);
  * \endcode
  */
-class TDECORE_EXPORT KAboutPerson
+class TDECORE_EXPORT TDEAboutPerson
 {
 public:
     /**
@@ -67,7 +67,7 @@ public:
      *
      * @param webAddress Home page of the person.
      */
-    KAboutPerson( const char *name, const char *task,
+    TDEAboutPerson( const char *name, const char *task,
                   const char *emailAddress, const char *webAddress )
     {
       mName = name;
@@ -79,7 +79,7 @@ public:
      * @internal
      * Don't use. Required by QValueList
      */
-    KAboutPerson() {}
+    TDEAboutPerson() {}
 
     /**
      * The person's name
@@ -115,10 +115,10 @@ private:
     const char *mEmailAddress;
     const char *mWebAddress;
 
-    KAboutPersonPrivate *d;
+    TDEAboutPersonPrivate *d;
 };
 
-class KAboutTranslatorPrivate;
+class TDEAboutTranslatorPrivate;
 /**
  * This structure is used to store information about a translator.
  * It can store the translator's name and an email address.
@@ -126,12 +126,12 @@ class KAboutTranslatorPrivate;
  * but it can be used elsewhere as well.
  * Normally you should at least define the translator's name.
  *
- * It's not possible to use KAboutPerson for this, because
- * KAboutPerson stores internally only const char* pointers, but the
+ * It's not possible to use TDEAboutPerson for this, because
+ * TDEAboutPerson stores internally only const char* pointers, but the
  * translator information is generated dynamically from the translation
  * of a dummy string.
 */
-class TDECORE_EXPORT KAboutTranslator
+class TDECORE_EXPORT TDEAboutTranslator
 {
 public:
     /**
@@ -141,7 +141,7 @@ public:
      *
      * @param emailAddress The email address of the person.
      */
-    KAboutTranslator(const TQString & name=TQString::null,
+    TDEAboutTranslator(const TQString & name=TQString::null,
                      const TQString & emailAddress=TQString::null);
 
     /**
@@ -161,7 +161,7 @@ public:
 private:
     TQString mName;
     TQString mEmail;
-    KAboutTranslatorPrivate* d;
+    TDEAboutTranslatorPrivate* d;
 };
 
 
@@ -169,10 +169,10 @@ private:
  * This class is used to store information about a program. It can store
  * such values as version number, program name, home page, email address
  * for bug reporting, multiple authors and contributors
- * (using KAboutPerson), license and copyright information.
+ * (using TDEAboutPerson), license and copyright information.
  *
  * Currently, the values set here are shown by the "About" box
- * (see KAboutDialog), used by the bug report dialog (see KBugReport),
+ * (see TDEAboutDialog), used by the bug report dialog (see KBugReport),
  * and by the help shown on command line (see TDECmdLineArgs).
  *
  * @short Holds information needed by the "About" box and other
@@ -318,7 +318,7 @@ class TDECORE_EXPORT TDEAboutData
      *
      * @param name the name of the translator
      * @param emailAddress the email address of the translator
-     * @see KAboutTranslator
+     * @see TDEAboutTranslator
      */
     void setTranslator(const char* name, const char* emailAddress);
 
@@ -521,19 +521,19 @@ class TDECORE_EXPORT TDEAboutData
      * Returns a list of authors.
      * @return author information (list of persons).
      */
-    const TQValueList<KAboutPerson> authors() const;
+    const TQValueList<TDEAboutPerson> authors() const;
 
     /**
      * Returns a list of persons who contributed.
      * @return credit information (list of persons).
      */
-    const TQValueList<KAboutPerson> credits() const;
+    const TQValueList<TDEAboutPerson> credits() const;
 
     /**
      * Returns a list of translators.
      * @return translators information (list of persons)
      */
-    const TQValueList<KAboutTranslator> translators() const;
+    const TQValueList<TDEAboutTranslator> translators() const;
 
     /**
      * Returns a message about the translation team.
@@ -618,8 +618,8 @@ class TDECORE_EXPORT TDEAboutData
     const char *mOtherText;
     const char *mHomepageAddress;
     const char *mBugEmailAddress;
-    TQValueList<KAboutPerson> mAuthorList;
-    TQValueList<KAboutPerson> mCreditList;
+    TQValueList<TDEAboutPerson> mAuthorList;
+    TQValueList<TDEAboutPerson> mCreditList;
     const char *mLicenseText;
     static const char *defaultBugTracker;
 
diff --git a/tdecore/kcmdlineargs.cpp b/tdecore/kcmdlineargs.cpp
index 9617125a5..a1d3adcf9 100644
--- a/tdecore/kcmdlineargs.cpp
+++ b/tdecore/kcmdlineargs.cpp
@@ -607,10 +607,10 @@ TDECmdLineArgs::parseAllArgs()
          } else if ( ::qstrcmp( option, "author") == 0 ) {
              enable_i18n();
        if ( about ) {
-         const TQValueList<KAboutPerson> authors = about->authors();
+         const TQValueList<TDEAboutPerson> authors = about->authors();
          if ( !authors.isEmpty() ) {
            TQString authorlist;
-           for (TQValueList<KAboutPerson>::ConstIterator it = authors.begin(); it != authors.end(); ++it ) {
+           for (TQValueList<TDEAboutPerson>::ConstIterator it = authors.begin(); it != authors.end(); ++it ) {
              TQString email;
              if ( !(*it).emailAddress().isEmpty() )
                email = " <" + (*it).emailAddress() + ">";
diff --git a/tdecore/kdebug.areas b/tdecore/kdebug.areas
index 536bc2ce4..b6e742489 100644
--- a/tdecore/kdebug.areas
+++ b/tdecore/kdebug.areas
@@ -37,7 +37,7 @@
 281        tdeui (TDECModule)
 282        tdeui (KDockWidget)
 290        tdeui (KPixmapIO)
-291        tdeui (KAboutDialog)
+291        tdeui (TDEAboutDialog)
 292        tdeui (KComboBox)
 293        tdeui (KLineEdit)
 294        tdeui (KEdit)
diff --git a/tdecore/kglobal.h b/tdecore/kglobal.h
index cf8836661..a1a8114be 100644
--- a/tdecore/kglobal.h
+++ b/tdecore/kglobal.h
@@ -175,7 +175,7 @@ public:
     /**
      * The instance currently active (useful in a multi-instance
      * application, such as a KParts application).
-     * Don't use this - it's mainly for KAboutDialog and KBugReport.
+     * Don't use this - it's mainly for TDEAboutDialog and KBugReport.
      * @internal
      */
     static void setActiveInstance(TDEInstance *d);