TQt4 port piklab

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/piklab@1238822 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 71 insertions, 71 deletions

diff --git a/src/common/nokde/nokde_kaboutdata.cpp b/src/common/nokde/nokde_kaboutdata.cpp
index 21b6917..6dd8f33 100644
--- a/src/common/nokde/nokde_kaboutdata.cpp
+++ b/src/common/nokde/nokde_kaboutdata.cpp
@@ -24,52 +24,52 @@
 
 #include "nokde_kaboutdata.h"
 //#include <kstandarddirs.h>
-#include <qfile.h>
-#include <qtextstream.h>
-#include <qstringlist.h>
+#include <tqfile.h>
+#include <tqtextstream.h>
+#include <tqstringlist.h>
 
-QString
+TQString
 KAboutPerson::name() const
 {
-   return QString::fromUtf8(mName);
+   return TQString::fromUtf8(mName);
 }
 
-QString
+TQString
 KAboutPerson::task() const
 {
    if (mTask && *mTask)
       return i18n(mTask);
    else
-      return QString::null;
+      return TQString();
 }
 
-QString
+TQString
 KAboutPerson::emailAddress() const
 {
-   return QString::fromUtf8(mEmailAddress);
+   return TQString::fromUtf8(mEmailAddress);
 }
 
 
-QString
+TQString
 KAboutPerson::webAddress() const
 {
-   return QString::fromUtf8(mWebAddress);
+   return TQString::fromUtf8(mWebAddress);
 }
 
 
-KAboutTranslator::KAboutTranslator(const QString & name,
-                const QString & emailAddress)
+KAboutTranslator::KAboutTranslator(const TQString & name,
+                const TQString & emailAddress)
 {
     mName=name;
     mEmail=emailAddress;
 }
 
-QString KAboutTranslator::name() const
+TQString KAboutTranslator::name() const
 {
     return mName;
 }
 
-QString KAboutTranslator::emailAddress() const
+TQString KAboutTranslator::emailAddress() const
 {
     return mEmail;
 }
@@ -90,7 +90,7 @@ public:
     const char *translatorName;
     const char *translatorEmail;
     const char *productName;
-//    QImage* programLogo;
+//    TQImage* programLogo;
 };
 
 
@@ -163,9 +163,9 @@ KAboutData::setLicenseText( const char *licenseText )
 }
 
 void
-KAboutData::setLicenseTextFile( const QString &file )
+KAboutData::setLicenseTextFile( const TQString &file )
 {
-  mLicenseText = qstrdup(QFile::encodeName(file));
+  mLicenseText = qstrdup(TQFile::encodeName(file));
   mLicenseKey = License_File;
 }
 
@@ -244,99 +244,99 @@ KAboutData::productName() const
       return appName();
 }
 
-QString
+TQString
 KAboutData::programName() const
 {
    if (mProgramName && *mProgramName)
       return i18n(mProgramName);
    else
-      return QString::null;
+      return TQString();
 }
 /*
-QImage
+TQImage
 KAboutData::programLogo() const
 {
-    return d->programLogo ? (*d->programLogo) : QImage();
+    return d->programLogo ? (*d->programLogo) : TQImage();
 }
 
 void
-KAboutData::setProgramLogo(const QImage& image)
+KAboutData::setProgramLogo(const TQImage& image)
 {
     if (!d->programLogo)
-       d->programLogo = new QImage( image );
+       d->programLogo = new TQImage( image );
     else
        *d->programLogo = image;
 }
 */
-QString
+TQString
 KAboutData::version() const
 {
-   return QString::fromLatin1(mVersion);
+   return TQString::tqfromLatin1(mVersion);
 }
 
-QString
+TQString
 KAboutData::shortDescription() const
 {
    if (mShortDescription && *mShortDescription)
       return i18n(mShortDescription);
    else
-      return QString::null;
+      return TQString();
 }
 
-QString
+TQString
 KAboutData::homepage() const
 {
-   return QString::fromLatin1(mHomepageAddress);
+   return TQString::tqfromLatin1(mHomepageAddress);
 }
 
-QString
+TQString
 KAboutData::bugAddress() const
 {
-   return QString::fromLatin1(mBugEmailAddress);
+   return TQString::tqfromLatin1(mBugEmailAddress);
 }
 
-const QValueList<KAboutPerson>
+const TQValueList<KAboutPerson>
 KAboutData::authors() const
 {
    return mAuthorList;
 }
 
-const QValueList<KAboutPerson>
+const TQValueList<KAboutPerson>
 KAboutData::credits() const
 {
    return mCreditList;
 }
 
-const QValueList<KAboutTranslator>
+const TQValueList<KAboutTranslator>
 KAboutData::translators() const
 {
-    QValueList<KAboutTranslator> personList;
+    TQValueList<KAboutTranslator> personList;
 
     if(d->translatorName == 0)
         return personList;
 
-    QStringList nameList;
-    QStringList emailList;
+    TQStringList nameList;
+    TQStringList emailList;
 
-    QString names = i18n(d->translatorName);
-    if(names != QString::fromUtf8(d->translatorName))
+    TQString names = i18n(d->translatorName);
+    if(names != TQString::fromUtf8(d->translatorName))
     {
-#if QT_VERSION < 0x040000
-        nameList = QStringList::split(',',names);
+#if [[[TQT_VERSION IS DEPRECATED]]] < 0x040000
+        nameList = TQStringList::split(',',names);
 #else
-        nameList = names.split(',', QString::SkipEmptyParts);
+        nameList = names.split(',', TQString::SkipEmptyParts);
 #endif
     }
 
 
     if(d->translatorEmail)
     {
-        QString emails = i18n(d->translatorEmail);
+        TQString emails = i18n(d->translatorEmail);
 
-        if(emails != QString::fromUtf8(d->translatorEmail))
+        if(emails != TQString::fromUtf8(d->translatorEmail))
         {
-#if QT_VERSION < 0x040000
-            emailList = QStringList::split(',',emails,true);
+#if [[[TQT_VERSION IS DEPRECATED]]] < 0x040000
+            emailList = TQStringList::split(',',emails,true);
 #else
             emailList = emails.split(',');
 #endif
@@ -344,21 +344,21 @@ KAboutData::translators() const
     }
 
 
-    QStringList::Iterator nit;
-    QStringList::Iterator eit=emailList.begin();
+    TQStringList::Iterator nit;
+    TQStringList::Iterator eit=emailList.begin();
 
     for(nit = nameList.begin(); nit != nameList.end(); ++nit)
     {
-        QString email;
+        TQString email;
         if(eit != emailList.end())
         {
             email=*eit;
             ++eit;
         }
 
-        QString name=*nit;
+        TQString name=*nit;
 
-#if QT_VERSION < 0x040000
+#if [[[TQT_VERSION IS DEPRECATED]]] < 0x040000
         personList.append(KAboutTranslator(name.stripWhiteSpace(), email.stripWhiteSpace()));
 #else
         personList.append(KAboutTranslator(name.trimmed(), email.trimmed()));
@@ -368,7 +368,7 @@ KAboutData::translators() const
     return personList;
 }
 
-QString
+TQString
 KAboutData::aboutTranslationTeam()
 {
     return i18n("replace this with information about your translation team",
@@ -378,29 +378,29 @@ KAboutData::aboutTranslationTeam()
             "visit http://i18n.kde.org</p>");
 }
 
-QString
+TQString
 KAboutData::otherText() const
 {
    if (mOtherText && *mOtherText)
       return i18n(mOtherText);
    else
-      return QString::null;
+      return TQString();
 }
 
 
-QString
+TQString
 KAboutData::license() const
 {
-  QString result;
+  TQString result;
   if (!copyrightStatement().isEmpty())
     result = copyrightStatement() + "\n\n";
 
-  QString l;
-  QString f;
+  TQString l;
+  TQString f;
   switch ( mLicenseKey )
   {
     case License_File:
-       f = QFile::decodeName(mLicenseText);
+       f = TQFile::decodeName(mLicenseText);
        break;
     case License_GPL_V2:
        l = "GPL v2";
@@ -418,9 +418,9 @@ KAboutData::license() const
        l = "Artistic License";
        f = locate("data", "LICENSES/ARTISTIC");
        break;
-    case License_QPL_V1_0:
-       l = "QPL v1.0";
-       f = locate("data", "LICENSES/QPL_V1.0");
+    case License_TQPL_V1_0:
+       l = "TQPL v1.0";
+       f = locate("data", "LICENSES/TQPL_V1.0");
        break;
     case License_Custom:
        if (mLicenseText && *mLicenseText)
@@ -434,21 +434,21 @@ KAboutData::license() const
       }
 
   if (!l.isEmpty())
-     result += i18n("This program is distributed under the terms of the %1.").arg( l );
+     result += i18n("This program is distributed under the terms of the %1.").tqarg( l );
 
   if (!f.isEmpty())
   {
-     QFile file(f);
-#if QT_VERSION < 0x040000
+     TQFile file(f);
+#if [[[TQT_VERSION IS DEPRECATED]]] < 0x040000
      if (file.open(IO_ReadOnly))
 #else
-     if (file.open(QIODevice::ReadOnly))
+     if (file.open(TQIODevice::ReadOnly))
 #endif
      {
         result += '\n';
         result += '\n';
-        QTextStream str(&file);
-#if QT_VERSION < 0x040000
+        TQTextStream str(&file);
+#if [[[TQT_VERSION IS DEPRECATED]]] < 0x040000
         result += str.read();
 #else
         result += str.readAll();
@@ -459,11 +459,11 @@ KAboutData::license() const
   return result;
 }
 
-QString
+TQString
 KAboutData::copyrightStatement() const
 {
   if (mCopyrightStatement && *mCopyrightStatement)
      return i18n(mCopyrightStatement);
   else
-     return QString::null;
+     return TQString();
 }