summaryrefslogtreecommitdiffstats
path: root/vcs/cvsservice/cvsfileinfoprovider.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'vcs/cvsservice/cvsfileinfoprovider.cpp')
-rw-r--r--vcs/cvsservice/cvsfileinfoprovider.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/vcs/cvsservice/cvsfileinfoprovider.cpp b/vcs/cvsservice/cvsfileinfoprovider.cpp
index 2ed764f4..cbfc726f 100644
--- a/vcs/cvsservice/cvsfileinfoprovider.cpp
+++ b/vcs/cvsservice/cvsfileinfoprovider.cpp
@@ -59,14 +59,14 @@ const VCSFileInfoMap *CVSFileInfoProvider::status( const TQString &dirPath )
delete m_cachedDirEntries;
CVSDir cvsdir( projectDirectory() + TQDir::separator() + dirPath );
m_previousDirPath = dirPath;
- m_cachedDirEntries = cvsdir.cacheableDirtqStatus();
+ m_cachedDirEntries = cvsdir.cacheableDirStatus();
}
return m_cachedDirEntries;
}
///////////////////////////////////////////////////////////////////////////////
-bool CVSFileInfoProvider::requesttqStatus( const TQString &dirPath, void *callerData, bool recursive, bool checkRepos )
+bool CVSFileInfoProvider::requestStatus( const TQString &dirPath, void *callerData, bool recursive, bool checkRepos )
{
m_savedCallerData = callerData;
if (m_requestStatusJob)
@@ -131,11 +131,11 @@ void CVSFileInfoProvider::propagateUpdate()
void CVSFileInfoProvider::updateStatusFor(const CVSDir& dir)
{
- m_cachedDirEntries = dir.cacheableDirtqStatus();
+ m_cachedDirEntries = dir.cacheableDirStatus();
printOutFileInfoMap( *m_cachedDirEntries );
- /* FileTree will call requesttqStatus() everytime the user expands a directory
- * Unfortunatly requesttqStatus() will be called before the
+ /* FileTree will call requestStatus() everytime the user expands a directory
+ * Unfortunatly requestStatus() will be called before the
* VCSFileTreeViewItem of the directory will be filled with the files
* it contains. Meaning, m_savedCallerData contains no childs at that
* time. When a dcop call is made to run "cvs status" this is no problem.
@@ -196,7 +196,7 @@ VCSFileInfoMap *CVSFileInfoProvider::parse( TQStringList stringStream )
{
TQRegExp rx_recordStart( "^=+$" );
TQRegExp rx_fileName( "^File: (\\.|\\-|\\w)+" );
- TQRegExp rx_filetqStatus( "Status: (\\.|-|\\s|\\w)+" );
+ TQRegExp rx_fileStatus( "Status: (\\.|-|\\s|\\w)+" );
TQRegExp rx_fileWorkRev( "\\bWorking revision:" );
TQRegExp rx_fileRepoRev( "\\bRepository revision:" );
//TQRegExp rx_stickyTag( "\\s+(Sticky Tag:\\W+(w+|\\(none\\)))" );
@@ -204,7 +204,7 @@ VCSFileInfoMap *CVSFileInfoProvider::parse( TQStringList stringStream )
//TQRegExp rx_stickyOptions( "" ); //@todo
TQString fileName,
- filetqStatus,
+ fileStatus,
workingRevision,
repositoryRevision,
stickyTag,
@@ -224,12 +224,12 @@ VCSFileInfoMap *CVSFileInfoProvider::parse( TQStringList stringStream )
if (rx_recordStart.exactMatch( s ))
state = 1;
- else if (state == 1 && rx_fileName.search( s ) >= 0 && rx_filetqStatus.search( s ) >= 0) // FileName
+ else if (state == 1 && rx_fileName.search( s ) >= 0 && rx_fileStatus.search( s ) >= 0) // FileName
{
fileName = rx_fileName.cap().replace( "File:", "" ).stripWhiteSpace();
- filetqStatus = rx_filetqStatus.cap().replace( "Status:", "" ).stripWhiteSpace();
+ fileStatus = rx_fileStatus.cap().replace( "Status:", "" ).stripWhiteSpace();
++state; // Next state
- kdDebug(9006) << ">> " << fileName << ", " << filetqStatus << endl;
+ kdDebug(9006) << ">> " << fileName << ", " << fileStatus << endl;
}
else if (state == 2 && rx_fileWorkRev.search( s ) >= 0)
{
@@ -266,7 +266,7 @@ VCSFileInfoMap *CVSFileInfoProvider::parse( TQStringList stringStream )
{
// Package stuff, put into map and get ready for a new record
VCSFileInfo vcsInfo( fileName, workingRevision, repositoryRevision,
- String2EnumState( filetqStatus ) );
+ String2EnumState( fileStatus ) );
kdDebug(9006) << "== Inserting: " << vcsInfo.toString() << endl;
vcsStates->insert( fileName, vcsInfo );
}