1 files changed, 14 insertions, 14 deletions

diff --git a/cervisia/updateview_items.cpp b/cervisia/updateview_items.cpp
index 9e0abc22..4e07c1ab 100644
--- a/cervisia/updateview_items.cpp
+++ b/cervisia/updateview_items.cpp
@@ -39,7 +39,7 @@
 
 
 using Cervisia::Entry;
-using Cervisia::EntryStatus;
+using Cervisia::EntrytqStatus;
 
 
 // ------------------------------------------------------------------------------
@@ -103,7 +103,7 @@ UpdateDirItem::UpdateDirItem(UpdateView* parent,
  * Update the status of an item; if it doesn't exist yet, create new one
  */
 void UpdateDirItem::updateChildItem(const TQString& name,
-                                    EntryStatus status,
+                                    EntrytqStatus status,
                                     bool isdir)
 {
     if (UpdateItem* item = findItem(name))
@@ -111,7 +111,7 @@ void UpdateDirItem::updateChildItem(const TQString& name,
         if (isFileItem(item))
         {
             UpdateFileItem* fileItem = static_cast<UpdateFileItem*>(item);
-            fileItem->setStatus(status);
+            fileItem->settqStatus(status);
         }
         return;
     }
@@ -127,7 +127,7 @@ void UpdateDirItem::updateChildItem(const TQString& name,
     else
     {
         entry.m_type = Entry::File;
-        createFileItem(entry)->setStatus(status);
+        createFileItem(entry)->settqStatus(status);
     }
 }
 
@@ -150,7 +150,7 @@ void UpdateDirItem::updateEntriesItem(const Entry& entry,
                 entry.m_status == Cervisia::LocallyRemoved ||
                 entry.m_status == Cervisia::Conflict)
             {
-                fileItem->setStatus(entry.m_status);
+                fileItem->settqStatus(entry.m_status);
             }
             fileItem->setRevTag(entry.m_revision, entry.m_tag);
             fileItem->setDate(entry.m_dateTime);
@@ -288,7 +288,7 @@ TQDateTime parseDateTime(const TQString &s)
 	TQDate date( year, month, day );
 	TQTime time;
 	int hour, minute, second;
-	int pivot = s.find( TQRegExp(TQString::fromLatin1("[0-9][0-9]:[0-9][0-9]:[0-9][0-9]")) );
+	int pivot = s.find( TQRegExp(TQString::tqfromLatin1("[0-9][0-9]:[0-9][0-9]:[0-9][0-9]")) );
 	if ( pivot != -1 ) {
 	    hour = s.mid( pivot, 2 ).toInt();
 	    minute = s.mid( pivot+3, 2 ).toInt();
@@ -392,7 +392,7 @@ void UpdateDirItem::syncWithDirectory()
             // is file removed?
             if (!dir.exists(it.key()))
             {
-                fileItem->setStatus(Cervisia::Removed);
+                fileItem->settqStatus(Cervisia::Removed);
                 fileItem->setRevTag(TQString(), TQString());
             }
         }
@@ -501,14 +501,14 @@ UpdateFileItem::UpdateFileItem(UpdateDirItem* parent, const Entry& entry)
 }
 
 
-void UpdateFileItem::setStatus(EntryStatus status)
+void UpdateFileItem::settqStatus(EntrytqStatus status)
 {
     if (status != m_entry.m_status)
     {
         m_entry.m_status = status;
         const bool visible(applyFilter(updateView()->filter()));
         if (visible)
-            repaint();
+            tqrepaint();
     }
     m_undefined = false;
 }
@@ -584,7 +584,7 @@ void UpdateFileItem::setRevTag(const TQString& rev, const TQString& tag)
     if (isVisible())
     {
         widthChanged();
-        repaint();
+        tqrepaint();
     }
 }
 
@@ -598,13 +598,13 @@ void UpdateFileItem::setDate(const TQDateTime& date)
 void UpdateFileItem::markUpdated(bool laststage,
                                  bool success)
 {
-    EntryStatus newstatus = m_entry.m_status;
+    EntrytqStatus newstatus = m_entry.m_status;
 
     if (laststage)
     {
         if (undefinedState() && m_entry.m_status != Cervisia::NotInCVS)
             newstatus = success? Cervisia::UpToDate : Cervisia::Unknown;
-        setStatus(newstatus);
+        settqStatus(newstatus);
     }
     else
         setUndefinedState(true);
@@ -668,7 +668,7 @@ int UpdateFileItem::compare(TQListViewItem* i,
     case MimeType:
         iResult = KMimeType::findByPath(entry().m_name)->comment().localeAwareCompare(KMimeType::findByPath(item->entry().m_name)->comment());
         break;
-    case Status:
+    case tqStatus:
         if ((iResult = ::compare(statusClass(), item->statusClass())) == 0)
             iResult = entry().m_name.localeAwareCompare(item->entry().m_name);
         break;
@@ -698,7 +698,7 @@ TQString UpdateFileItem::text(int column) const
     case MimeType:
 	result = KMimeType::findByPath(entry().m_name)->comment();
 	break;
-    case Status:
+    case tqStatus:
         result = toString(entry().m_status);
         break;
     case Revision: