Port kdesvn to TQt4

This enables compilation under both Qt3 and Qt4


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

1 files changed, 60 insertions, 60 deletions

diff --git a/src/svnfrontend/svnitem.cpp b/src/svnfrontend/svnitem.cpp
index 20133d5..83c6aba 100644
--- a/src/svnfrontend/svnitem.cpp
+++ b/src/svnfrontend/svnitem.cpp
@@ -36,12 +36,12 @@
 #include <kfileitem.h>
 #include <kdebug.h>
 
-#include <qstring.h>
-#include <qfileinfo.h>
-#include <qimage.h>
-#include <qptrlist.h>
-#include <qpainter.h>
-#include <qbitmap.h>
+#include <tqstring.h>
+#include <tqfileinfo.h>
+#include <tqimage.h>
+#include <tqptrlist.h>
+#include <tqpainter.h>
+#include <tqbitmap.h>
 
 class SvnItem_p:public svn::ref_count
 {
@@ -57,10 +57,10 @@ public:
 protected:
     svn::StatusPtr m_Stat;
     void init();
-    QString m_url,m_full,m_short;
+    TQString m_url,m_full,m_short;
     KURL m_kdename;
-    QDateTime m_fullDate;
-    QString m_infoText;
+    TQDateTime m_fullDate;
+    TQString m_infoText;
     KFileItem*m_fitem;
     bool isWc;
     svn::Revision lRev;
@@ -68,7 +68,7 @@ protected:
 };
 
 SvnItem_p::SvnItem_p()
-    :ref_count(),m_Stat(new svn::Status())
+    :ref_count(),m_Stat(new svn::tqStatus())
 {
     init();
 }
@@ -94,7 +94,7 @@ void SvnItem_p::init()
         /* dir name possible */
         m_full.truncate(m_full.length()-1);
     }
-    int p = m_full.findRev("/");
+    int p = m_full.tqfindRev("/");
     if (p>-1) {
         ++p;
         m_short = m_full.right(m_full.length()-p);
@@ -103,7 +103,7 @@ void SvnItem_p::init()
     }
     m_url = m_Stat->entry().url();
     m_fullDate = svn::DateTime(m_Stat->entry().cmtDate());
-    m_infoText = QString::null;
+    m_infoText = TQString();
     m_fitem = 0;
 }
 
@@ -125,15 +125,15 @@ KMimeType::Ptr SvnItem_p::mimeType(bool dir)
 const KURL& SvnItem_p::kdeName(const svn::Revision&r)
 {
     isWc = !svn::Url::isValid(m_Stat->path());
-    QString name;
+    TQString name;
     if (!(r==lRev)||m_kdename.isEmpty()) {
         lRev=r;
         if (!isWc) {
             m_kdename = m_Stat->entry().url();
-            QString proto;
+            TQString proto;
             proto = helpers::KTranslateUrl::makeKdeUrl(m_kdename.protocol());
             m_kdename.setProtocol(proto);
-            QString revstr= lRev.toString();
+            TQString revstr= lRev.toString();
             if (revstr.length()>0) {
                 m_kdename.setQuery("?rev="+revstr);
             }
@@ -176,17 +176,17 @@ void SvnItem::setStat(const svn::StatusPtr&aStat)
     p_Item = new SvnItem_p(aStat);
 }
 
-const QString&SvnItem::fullName()const
+const TQString&SvnItem::fullName()const
 {
     return (p_Item->m_full);
 }
 
-const QString&SvnItem::shortName()const
+const TQString&SvnItem::shortName()const
 {
     return (p_Item->m_short);
 }
 
-const QString&SvnItem::Url()const
+const TQString&SvnItem::Url()const
 {
     return (p_Item->m_url);
 }
@@ -197,31 +197,31 @@ bool SvnItem::isDir()const
         return p_Item->m_Stat->entry().kind()==svn_node_dir;
     }
     /* must be a local file */
-    QFileInfo f(fullName());
+    TQFileInfo f(fullName());
     return f.isDir();
 }
 
-const QDateTime&SvnItem::fullDate()const
+const TQDateTime&SvnItem::fullDate()const
 {
     return (p_Item->m_fullDate);
 }
 
-QPixmap SvnItem::internalTransform(const QPixmap&first,int size)
+TQPixmap SvnItem::internalTransform(const TQPixmap&first,int size)
 {
-    QPixmap result(size,size);
+    TQPixmap result(size,size);
     if (result.isNull()) {
         return result;
     }
-    const QBitmap * b = first.mask();
-    result.fill(Qt::white);
+    const TQBitmap * b = first.tqmask();
+    result.fill(TQt::white);
     if (b) {
         result.setMask(*b);
     } else {
-        QBitmap m(size,size,true);
-        m.fill(Qt::white);
+        TQBitmap m(size,size,true);
+        m.fill(TQt::white);
         result.setMask(m);
     }
-    QPainter pa;
+    TQPainter pa;
     pa.begin(&result);
     int w = first.width()>size?size:first.width();
     int h = first.height()>size?size:first.height();
@@ -230,19 +230,19 @@ QPixmap SvnItem::internalTransform(const QPixmap&first,int size)
     return result;
 }
 
-QPixmap SvnItem::getPixmap(const QPixmap&_p,int size,bool overlay)
+TQPixmap SvnItem::getPixmap(const TQPixmap&_p,int size,bool overlay)
 {
     if (!isVersioned()) {
         m_bgColor = NOTVERSIONED;
     } else if (isRealVersioned()) {
         SvnActions*wrap = getWrapper();
         bool mod = false;
-        QPixmap p2 = QPixmap();
-        if (p_Item->m_Stat->textStatus()==svn_wc_status_conflicted) {
+        TQPixmap p2 = TQPixmap();
+        if (p_Item->m_Stat->texttqStatus()==svn_wc_status_conflicted) {
             m_bgColor = CONFLICT;
             if (overlay)
                 p2 = kdesvnPartFactory::instance()->iconLoader()->loadIcon("kdesvnconflicted",KIcon::Desktop,size);
-        } else if (p_Item->m_Stat->textStatus ()==svn_wc_status_missing) {
+        } else if (p_Item->m_Stat->texttqStatus ()==svn_wc_status_missing) {
             m_bgColor = MISSING;
         } else if (isLocked()||wrap->checkReposLockCache(fullName())) {
             if (overlay) p2 = kdesvnPartFactory::instance()->iconLoader()->loadIcon("kdesvnlocked",KIcon::Desktop,size);
@@ -253,10 +253,10 @@ QPixmap SvnItem::getPixmap(const QPixmap&_p,int size,bool overlay)
         } else if (wrap->isUpdated(p_Item->m_Stat->path())) {
             if (overlay) p2 = kdesvnPartFactory::instance()->iconLoader()->loadIcon("kdesvnupdates",KIcon::Desktop,size);
             m_bgColor = UPDATES;
-        } else if (p_Item->m_Stat->textStatus()==svn_wc_status_deleted) {
+        } else if (p_Item->m_Stat->texttqStatus()==svn_wc_status_deleted) {
             if (overlay) p2 = kdesvnPartFactory::instance()->iconLoader()->loadIcon("kdesvndeleted",KIcon::Desktop,size);
             m_bgColor = DELETED;
-        } else if (p_Item->m_Stat->textStatus()==svn_wc_status_added ) {
+        } else if (p_Item->m_Stat->texttqStatus()==svn_wc_status_added ) {
             if (overlay) p2 = kdesvnPartFactory::instance()->iconLoader()->loadIcon("kdesvnadded",KIcon::Desktop,size);
             m_bgColor = ADDED;
         } else if (isModified()) {
@@ -280,15 +280,15 @@ QPixmap SvnItem::getPixmap(const QPixmap&_p,int size,bool overlay)
             if (overlay) p2 = kdesvnPartFactory::instance()->iconLoader()->loadIcon("kdesvnmodified",KIcon::Desktop,size);
         }
         if (!p2.isNull()) {
-            QPixmap p;
+            TQPixmap p;
             if (_p.width()!=size || _p.height()!=size) {
                 p = internalTransform(_p,size);
             } else {
                 p = _p;
             }
             m_overlaycolor = true;
-            QImage i1; i1 = p;
-            QImage i2;i2 = p2;
+            TQImage i1; i1 = p;
+            TQImage i2;i2 = p2;
 
             KIconEffect::overlay(i1,i2);
             p = i1;
@@ -298,9 +298,9 @@ QPixmap SvnItem::getPixmap(const QPixmap&_p,int size,bool overlay)
     return _p;
 }
 
-QPixmap SvnItem::getPixmap(int size,bool overlay)
+TQPixmap SvnItem::getPixmap(int size,bool overlay)
 {
-    QPixmap p;
+    TQPixmap p;
     m_overlaycolor = false;
     m_bgColor = NONE;
     /* yes - different way to "isDir" above 'cause here we try to use the
@@ -311,11 +311,11 @@ QPixmap SvnItem::getPixmap(int size,bool overlay)
         p = p_Item->mimeType(isDir())->pixmap(KIcon::Desktop,size,KIcon::DefaultState);
         if (isLocked()) {
             m_bgColor = LOCKED;
-            QPixmap p2;
+            TQPixmap p2;
             if (overlay) p2 = kdesvnPartFactory::instance()->iconLoader()->loadIcon("kdesvnlocked",KIcon::Desktop,size);
             if (!p2.isNull()) {
-                QImage i1; i1 = p;
-                QImage i2; i2 = p2;
+                TQImage i1; i1 = p;
+                TQImage i2; i2 = p2;
                 KIconEffect::overlay(i1,i2);
                 p = i1;
             }
@@ -347,7 +347,7 @@ bool SvnItem::isValid()const
     if (isVersioned()) {
         return true;
     }
-    QFileInfo f(fullName());
+    TQFileInfo f(fullName());
     return f.exists();
 }
 
@@ -358,26 +358,26 @@ bool SvnItem::isRealVersioned()const
 
 bool SvnItem::isIgnored()const
 {
-    return p_Item->m_Stat->textStatus()==svn_wc_status_ignored;
+    return p_Item->m_Stat->texttqStatus()==svn_wc_status_ignored;
 }
 
 bool SvnItem::isRemoteAdded()const
 {
     return getWrapper()->isUpdated(p_Item->m_Stat->path()) &&
-            p_Item->m_Stat->validReposStatus()&&!p_Item->m_Stat->validLocalStatus();
+            p_Item->m_Stat->validRepostqStatus()&&!p_Item->m_Stat->validLocaltqStatus();
 }
 
-QString SvnItem::infoText()const
+TQString SvnItem::infoText()const
 {
-    QString info_text = "";
+    TQString info_text = "";
     if (getWrapper()->isUpdated(p_Item->m_Stat->path())) {
-        if (p_Item->m_Stat->validReposStatus()&&!p_Item->m_Stat->validLocalStatus()) {
+        if (p_Item->m_Stat->validRepostqStatus()&&!p_Item->m_Stat->validLocaltqStatus()) {
             info_text = i18n("Added in repository");
         } else {
             info_text = i18n("Needs update");
         }
     } else {
-    switch(p_Item->m_Stat->textStatus ()) {
+    switch(p_Item->m_Stat->texttqStatus ()) {
     case svn_wc_status_modified:
         info_text = i18n("Locally modified");
         break;
@@ -412,7 +412,7 @@ QString SvnItem::infoText()const
         break;
     }
     if (info_text.isEmpty()) {
-        switch (p_Item->m_Stat->propStatus ()) {
+        switch (p_Item->m_Stat->proptqStatus ()) {
         case svn_wc_status_modified:
             info_text = i18n("Property modified");
             break;
@@ -424,7 +424,7 @@ QString SvnItem::infoText()const
     return info_text;
 }
 
-QString SvnItem::cmtAuthor()const
+TQString SvnItem::cmtAuthor()const
 {
     return p_Item->m_Stat->entry().cmtAuthor();
 }
@@ -439,12 +439,12 @@ bool SvnItem::isLocked()const
     return p_Item->m_Stat->entry().lockEntry().Locked();
 }
 
-QString SvnItem::lockOwner()const
+TQString SvnItem::lockOwner()const
 {
     if (p_Item->m_Stat->entry().lockEntry().Locked()) {
         return p_Item->m_Stat->entry().lockEntry().Owner();
     }
-    svn::SharedPointer<svn::Status> tmp;
+    svn::SharedPointer<svn::tqStatus> tmp;
     if (getWrapper()->checkReposLockCache(fullName(),tmp) && tmp) {
         return tmp->lockEntry().Owner();
     }
@@ -457,8 +457,8 @@ QString SvnItem::lockOwner()const
  */
 bool SvnItem::isModified()const
 {
-    return p_Item->m_Stat->textStatus ()==svn_wc_status_modified||p_Item->m_Stat->propStatus()==svn_wc_status_modified
-            ||p_Item->m_Stat->textStatus ()==svn_wc_status_replaced;
+    return p_Item->m_Stat->texttqStatus ()==svn_wc_status_modified||p_Item->m_Stat->proptqStatus()==svn_wc_status_modified
+            ||p_Item->m_Stat->texttqStatus ()==svn_wc_status_replaced;
 }
 
 const svn::StatusPtr& SvnItem::stat()const
@@ -472,28 +472,28 @@ const svn::StatusPtr& SvnItem::stat()const
  */
 bool SvnItem::isNormal()const
 {
-    return p_Item->m_Stat->textStatus()==svn_wc_status_normal;
+    return p_Item->m_Stat->texttqStatus()==svn_wc_status_normal;
 }
 
 bool SvnItem::isMissing()const
 {
-    return p_Item->m_Stat->textStatus()==svn_wc_status_missing;
+    return p_Item->m_Stat->texttqStatus()==svn_wc_status_missing;
 }
 
 bool SvnItem::isDeleted()const
 {
-    return p_Item->m_Stat->textStatus()==svn_wc_status_deleted;
+    return p_Item->m_Stat->texttqStatus()==svn_wc_status_deleted;
 }
 
 bool SvnItem::isConflicted()const
 {
-    return p_Item->m_Stat->textStatus()==svn_wc_status_conflicted;
+    return p_Item->m_Stat->texttqStatus()==svn_wc_status_conflicted;
 }
 
 /*!
     \fn SvnItem::getToolTipText()
  */
-const QString& SvnItem::getToolTipText()
+const TQString& SvnItem::getToolTipText()
 {
     if (p_Item->m_infoText.isNull()) {
         if (isRealVersioned() && !p_Item->m_Stat->entry().url().isEmpty()) {
@@ -508,7 +508,7 @@ const QString& SvnItem::getToolTipText()
                 /* local */
             }
             if (wrap) {
-                QPtrList<SvnItem> lst; lst.append(this);
+                TQPtrList<SvnItem> lst; lst.append(this);
                 p_Item->m_infoText = wrap->getInfo(lst,rev,peg,false,false);
                 if (p_Item->m_fitem) p_Item->m_infoText+=p_Item->m_fitem->getToolTipText(0);
             }