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
v3.5.13-sru
tpearson 13 years ago
parent ab257225f8
commit 6371eaf923

@ -216,7 +216,7 @@ controller_(controller)
header->setLabel( Enable, "" ); header->setLabel( Enable, "" );
header->setLabel( Type, i18n("Type") ); header->setLabel( Type, i18n("Type") );
header->setLabel( tqStatus, i18n("tqStatus") ); header->setLabel( tqStatus, i18n("Status") );
header->setLabel( Location, i18n("Location") ); header->setLabel( Location, i18n("Location") );
header->setLabel( Condition, i18n("Condition") ); header->setLabel( Condition, i18n("Condition") );
header->setLabel( IgnoreCount, i18n("Ignore Count") ); header->setLabel( IgnoreCount, i18n("Ignore Count") );

@ -228,7 +228,7 @@ RDBBreakpointWidget::RDBBreakpointWidget(TQWidget *parent, const char *name) :
header->setLabel( Enable, "" ); header->setLabel( Enable, "" );
header->setLabel( Type, i18n("Type") ); header->setLabel( Type, i18n("Type") );
header->setLabel( tqStatus, i18n("tqStatus") ); header->setLabel( tqStatus, i18n("Status") );
header->setLabel( Location, i18n("Location") ); header->setLabel( Location, i18n("Location") );
m_table->show(); m_table->show();

@ -194,7 +194,7 @@ VCSFileTreeWidgetImpl::VCSFileTreeWidgetImpl( FileTreeWidget *parent, KDevVCSFil
// Update the #define order on top if you change this order! // Update the #define order on top if you change this order!
parent->addColumn( "Filename" ); parent->addColumn( "Filename" );
parent->addColumn( "tqStatus" ); parent->addColumn( "Status" );
parent->addColumn( "Work" ); parent->addColumn( "Work" );
parent->addColumn( "Repo" ); parent->addColumn( "Repo" );

@ -196,7 +196,7 @@ VCSFileInfoMap *CVSFileInfoProvider::parse( TQStringList stringStream )
{ {
TQRegExp rx_recordStart( "^=+$" ); TQRegExp rx_recordStart( "^=+$" );
TQRegExp rx_fileName( "^File: (\\.|\\-|\\w)+" ); TQRegExp rx_fileName( "^File: (\\.|\\-|\\w)+" );
TQRegExp rx_filetqStatus( "tqStatus: (\\.|-|\\s|\\w)+" ); TQRegExp rx_filetqStatus( "Status: (\\.|-|\\s|\\w)+" );
TQRegExp rx_fileWorkRev( "\\bWorking revision:" ); TQRegExp rx_fileWorkRev( "\\bWorking revision:" );
TQRegExp rx_fileRepoRev( "\\bRepository revision:" ); TQRegExp rx_fileRepoRev( "\\bRepository revision:" );
//TQRegExp rx_stickyTag( "\\s+(Sticky Tag:\\W+(w+|\\(none\\)))" ); //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 else if (state == 1 && rx_fileName.search( s ) >= 0 && rx_filetqStatus.search( s ) >= 0) // FileName
{ {
fileName = rx_fileName.cap().replace( "File:", "" ).stripWhiteSpace(); fileName = rx_fileName.cap().replace( "File:", "" ).stripWhiteSpace();
filetqStatus = rx_filetqStatus.cap().replace( "tqStatus:", "" ).stripWhiteSpace(); filetqStatus = rx_filetqStatus.cap().replace( "Status:", "" ).stripWhiteSpace();
++state; // Next state ++state; // Next state
kdDebug(9006) << ">> " << fileName << ", " << filetqStatus << endl; kdDebug(9006) << ">> " << fileName << ", " << filetqStatus << endl;
} }

@ -126,7 +126,7 @@ TQString CommitDialog::changeList() const
lst += "Change: new\n" lst += "Change: new\n"
"Client: " + client() + "\n" "Client: " + client() + "\n"
"User: " + user() + "\n" "User: " + user() + "\n"
"tqStatus: new\n" "Status: new\n"
"Description:\n "; "Description:\n ";
lst += logMessage().replace(TQRegExp("\n"), "\n ") + "\n\n"; lst += logMessage().replace(TQRegExp("\n"), "\n ") + "\n\n";

@ -2030,7 +2030,7 @@ void kio_svnProtocol::notify(void *baton, const char *path, svn_wc_notify_action
break; break;
case svn_wc_notify_status_completed: //status_completed case svn_wc_notify_status_completed: //status_completed
if (SVN_IS_VALID_REVNUM (revision)) if (SVN_IS_VALID_REVNUM (revision))
userstring = i18n( "tqStatus against revision: %1.").tqarg( revision ); userstring = i18n( "Status against revision: %1.").tqarg( revision );
break; break;
case svn_wc_notify_status_external: //status_external case svn_wc_notify_status_external: //status_external
userstring = i18n("Performing status on external item at %1.").tqarg( path ); userstring = i18n("Performing status on external item at %1.").tqarg( path );

Loading…
Cancel
Save