diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-27 21:38:57 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-27 21:38:57 +0000 |
| commit | 6371eaf92308c66fa386dbfc43baaf1ef16feda5 (patch) | |
| tree | 4a1990f66095860aca62feff8b15480e2545facb /vcs | |
| parent | ab257225f82696202bf13962be1926f7bbdad243 (diff) | |
| download | tdevelop-6371eaf92308c66fa386dbfc43baaf1ef16feda5.tar.gz tdevelop-6371eaf92308c66fa386dbfc43baaf1ef16feda5.zip | |
Fix a number of accidental tqStatus string conversions
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1249829 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'vcs')
| -rw-r--r-- | vcs/cvsservice/cvsfileinfoprovider.cpp | 4 | ||||
| -rw-r--r-- | vcs/perforce/commitdlg.cpp | 2 | ||||
| -rw-r--r-- | vcs/subversion/svn_kio.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/vcs/cvsservice/cvsfileinfoprovider.cpp b/vcs/cvsservice/cvsfileinfoprovider.cpp index 3c20af0c..2ed764f4 100644 --- a/vcs/cvsservice/cvsfileinfoprovider.cpp +++ b/vcs/cvsservice/cvsfileinfoprovider.cpp @@ -196,7 +196,7 @@ VCSFileInfoMap *CVSFileInfoProvider::parse( TQStringList stringStream ) { TQRegExp rx_recordStart( "^=+$" ); TQRegExp rx_fileName( "^File: (\\.|\\-|\\w)+" ); - TQRegExp rx_filetqStatus( "tqStatus: (\\.|-|\\s|\\w)+" ); + TQRegExp rx_filetqStatus( "Status: (\\.|-|\\s|\\w)+" ); TQRegExp rx_fileWorkRev( "\\bWorking revision:" ); TQRegExp rx_fileRepoRev( "\\bRepository revision:" ); //TQRegExp rx_stickyTag( "\\s+(Sticky Tag:\\W+(w+|\\(none\\)))" ); @@ -227,7 +227,7 @@ VCSFileInfoMap *CVSFileInfoProvider::parse( TQStringList stringStream ) else if (state == 1 && rx_fileName.search( s ) >= 0 && rx_filetqStatus.search( s ) >= 0) // FileName { fileName = rx_fileName.cap().replace( "File:", "" ).stripWhiteSpace(); - filetqStatus = rx_filetqStatus.cap().replace( "tqStatus:", "" ).stripWhiteSpace(); + filetqStatus = rx_filetqStatus.cap().replace( "Status:", "" ).stripWhiteSpace(); ++state; // Next state kdDebug(9006) << ">> " << fileName << ", " << filetqStatus << endl; } diff --git a/vcs/perforce/commitdlg.cpp b/vcs/perforce/commitdlg.cpp index c3b94071..44ff0875 100644 --- a/vcs/perforce/commitdlg.cpp +++ b/vcs/perforce/commitdlg.cpp @@ -126,7 +126,7 @@ TQString CommitDialog::changeList() const lst += "Change: new\n" "Client: " + client() + "\n" "User: " + user() + "\n" - "tqStatus: new\n" + "Status: new\n" "Description:\n "; lst += logMessage().replace(TQRegExp("\n"), "\n ") + "\n\n"; diff --git a/vcs/subversion/svn_kio.cpp b/vcs/subversion/svn_kio.cpp index 9a70dd1b..8b97d3f2 100644 --- a/vcs/subversion/svn_kio.cpp +++ b/vcs/subversion/svn_kio.cpp @@ -2030,7 +2030,7 @@ void kio_svnProtocol::notify(void *baton, const char *path, svn_wc_notify_action break; case svn_wc_notify_status_completed: //status_completed if (SVN_IS_VALID_REVNUM (revision)) - userstring = i18n( "tqStatus against revision: %1.").tqarg( revision ); + userstring = i18n( "Status against revision: %1.").tqarg( revision ); break; case svn_wc_notify_status_external: //status_external userstring = i18n("Performing status on external item at %1.").tqarg( path ); |