summaryrefslogtreecommitdiffstats
path: root/cervisia/updateview_items.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-18 18:35:10 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-18 18:35:10 -0600
commit1dd83e5f38d1c16d3e6da18d0caca0ee093ab58f (patch)
tree11037eed53e1cd90dad4e194f9dea542ad28607f /cervisia/updateview_items.cpp
parent3b34e5cf56262c9f54a3bcf02ee5ad93ca0fb05b (diff)
downloadtdesdk-1dd83e5f38d1c16d3e6da18d0caca0ee093ab58f.tar.gz
tdesdk-1dd83e5f38d1c16d3e6da18d0caca0ee093ab58f.zip
Rename old tq methods that no longer need a unique name
Diffstat (limited to 'cervisia/updateview_items.cpp')
-rw-r--r--cervisia/updateview_items.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/cervisia/updateview_items.cpp b/cervisia/updateview_items.cpp
index 4e07c1ab..99276c3c 100644
--- a/cervisia/updateview_items.cpp
+++ b/cervisia/updateview_items.cpp
@@ -39,7 +39,7 @@
using Cervisia::Entry;
-using Cervisia::EntrytqStatus;
+using Cervisia::EntryStatus;
// ------------------------------------------------------------------------------
@@ -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,
- EntrytqStatus status,
+ EntryStatus 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->settqStatus(status);
+ fileItem->setStatus(status);
}
return;
}
@@ -127,7 +127,7 @@ void UpdateDirItem::updateChildItem(const TQString& name,
else
{
entry.m_type = Entry::File;
- createFileItem(entry)->settqStatus(status);
+ createFileItem(entry)->setStatus(status);
}
}
@@ -150,7 +150,7 @@ void UpdateDirItem::updateEntriesItem(const Entry& entry,
entry.m_status == Cervisia::LocallyRemoved ||
entry.m_status == Cervisia::Conflict)
{
- fileItem->settqStatus(entry.m_status);
+ fileItem->setStatus(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::tqfromLatin1("[0-9][0-9]:[0-9][0-9]:[0-9][0-9]")) );
+ int pivot = s.find( TQRegExp(TQString::fromLatin1("[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->settqStatus(Cervisia::Removed);
+ fileItem->setStatus(Cervisia::Removed);
fileItem->setRevTag(TQString(), TQString());
}
}
@@ -501,7 +501,7 @@ UpdateFileItem::UpdateFileItem(UpdateDirItem* parent, const Entry& entry)
}
-void UpdateFileItem::settqStatus(EntrytqStatus status)
+void UpdateFileItem::setStatus(EntryStatus status)
{
if (status != m_entry.m_status)
{
@@ -598,13 +598,13 @@ void UpdateFileItem::setDate(const TQDateTime& date)
void UpdateFileItem::markUpdated(bool laststage,
bool success)
{
- EntrytqStatus newstatus = m_entry.m_status;
+ EntryStatus newstatus = m_entry.m_status;
if (laststage)
{
if (undefinedState() && m_entry.m_status != Cervisia::NotInCVS)
newstatus = success? Cervisia::UpToDate : Cervisia::Unknown;
- settqStatus(newstatus);
+ setStatus(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 tqStatus:
+ case Status:
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 tqStatus:
+ case Status:
result = toString(entry().m_status);
break;
case Revision: