summaryrefslogtreecommitdiffstats
path: root/parts/fileview/vcsfiletreewidgetimpl.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 10:00:25 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 10:00:25 -0600
commit1623fe64102c18ab098b79656b80f28cef840756 (patch)
tree78f35fef11ea3dbbca1ba4c99937736a1a0894cf /parts/fileview/vcsfiletreewidgetimpl.cpp
parentb6ba5d642f3fc7d320e3d6f4650eb259a3a52b04 (diff)
downloadtdevelop-1623fe64102c18ab098b79656b80f28cef840756.tar.gz
tdevelop-1623fe64102c18ab098b79656b80f28cef840756.zip
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit b6ba5d642f3fc7d320e3d6f4650eb259a3a52b04.
Diffstat (limited to 'parts/fileview/vcsfiletreewidgetimpl.cpp')
-rw-r--r--parts/fileview/vcsfiletreewidgetimpl.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/parts/fileview/vcsfiletreewidgetimpl.cpp b/parts/fileview/vcsfiletreewidgetimpl.cpp
index 780ccf9f..0e102cd9 100644
--- a/parts/fileview/vcsfiletreewidgetimpl.cpp
+++ b/parts/fileview/vcsfiletreewidgetimpl.cpp
@@ -46,12 +46,12 @@ public:
: FileTreeViewItem( parent, item, branch, pf ), m_statusColor( &FileViewPart::vcsColors.unknown ) {}
VCSFileTreeViewItem( KFileTreeView* parent, KFileItem* item, KFileTreeBranch* branch )
: FileTreeViewItem( parent, item, branch ), m_statusColor( &FileViewPart::vcsColors.unknown ) {}
- virtual void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment )
+ virtual void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment )
{
// paint cell in a different color depending on VCS state
TQColorGroup mycg( cg );
mycg.setColor( TQColorGroup::Base, *m_statusColor );
- FileTreeViewItem::paintCell( p, mycg, column, width, alignment );
+ FileTreeViewItem::paintCell( p, mycg, column, width, tqalignment );
}
void setVCSInfo( const VCSFileInfo &info );
@@ -62,7 +62,7 @@ public:
void setFileName( const TQString &p ) { setText( FILENAME_COLUMN, p ); }
void setWorkingRev( const TQString &p ) { setText( WORKREVISION_COLUMN, p ); }
void setRepositoryRev( const TQString &p ) { setText( REPOREVISION_COLUMN, p ); }
- void setStatus( const VCSFileInfo::FileState status );
+ void settqStatus( const VCSFileInfo::FileState status );
private:
TQColor *m_statusColor; // cached
@@ -75,12 +75,12 @@ void VCSFileTreeViewItem::setVCSInfo( const VCSFileInfo &info )
//setFileName( info.fileName );
setRepositoryRev( info.repoRevision );
setWorkingRev( info.workRevision );
- setStatus( info.state );
+ settqStatus( info.state );
}
///////////////////////////////////////////////////////////////////////////////
-void VCSFileTreeViewItem::setStatus( const VCSFileInfo::FileState status )
+void VCSFileTreeViewItem::settqStatus( const VCSFileInfo::FileState status )
{
setText( STATUS_COLUMN, VCSFileInfo::state2String( status ) );
// Update color too
@@ -331,7 +331,7 @@ void VCSFileTreeWidgetImpl::slotSyncWithRepository()
const VCSFileTreeViewItem *myFileItem = static_cast<VCSFileTreeViewItem *>( m_vcsStatusRequestedItem );
const TQString relDirPath = URLUtil::extractPathNameRelative( projectDirectory(), myFileItem->fileItem()->url().path() );
kdDebug(9017) << "VCS Info requested for: " << relDirPath << endl;
- m_vcsInfoProvider->requestStatus( relDirPath, m_vcsStatusRequestedItem );
+ m_vcsInfoProvider->requesttqStatus( relDirPath, m_vcsStatusRequestedItem );
m_isSyncingWithRepository = true;
}
@@ -344,7 +344,7 @@ void VCSFileTreeWidgetImpl::slotDirectoryExpanded( TQListViewItem* aItem )
const TQString relDirPath = URLUtil::extractPathNameRelative( projectDirectory(), item->fileItem()->url().path() );
kdDebug(9017) << "ASync VCS Info requested for: " << relDirPath << endl;
- m_vcsInfoProvider->requestStatus( relDirPath, item, false, false );
+ m_vcsInfoProvider->requesttqStatus( relDirPath, item, false, false );
// m_isSyncingWithRepository = true;