summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-27 21:38:57 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-27 21:38:57 +0000
commit6371eaf92308c66fa386dbfc43baaf1ef16feda5 (patch)
tree4a1990f66095860aca62feff8b15480e2545facb
parentab257225f82696202bf13962be1926f7bbdad243 (diff)
downloadtdevelop-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
-rw-r--r--languages/cpp/debugger/gdbbreakpointwidget.cpp2
-rw-r--r--languages/ruby/debugger/rdbbreakpointwidget.cpp2
-rw-r--r--parts/fileview/vcsfiletreewidgetimpl.cpp2
-rw-r--r--vcs/cvsservice/cvsfileinfoprovider.cpp4
-rw-r--r--vcs/perforce/commitdlg.cpp2
-rw-r--r--vcs/subversion/svn_kio.cpp2
6 files changed, 7 insertions, 7 deletions
diff --git a/languages/cpp/debugger/gdbbreakpointwidget.cpp b/languages/cpp/debugger/gdbbreakpointwidget.cpp
index 10d8a749..1e62a201 100644
--- a/languages/cpp/debugger/gdbbreakpointwidget.cpp
+++ b/languages/cpp/debugger/gdbbreakpointwidget.cpp
@@ -216,7 +216,7 @@ controller_(controller)
header->setLabel( Enable, "" );
header->setLabel( Type, i18n("Type") );
- header->setLabel( tqStatus, i18n("tqStatus") );
+ header->setLabel( tqStatus, i18n("Status") );
header->setLabel( Location, i18n("Location") );
header->setLabel( Condition, i18n("Condition") );
header->setLabel( IgnoreCount, i18n("Ignore Count") );
diff --git a/languages/ruby/debugger/rdbbreakpointwidget.cpp b/languages/ruby/debugger/rdbbreakpointwidget.cpp
index 5fb75098..8607b73e 100644
--- a/languages/ruby/debugger/rdbbreakpointwidget.cpp
+++ b/languages/ruby/debugger/rdbbreakpointwidget.cpp
@@ -228,7 +228,7 @@ RDBBreakpointWidget::RDBBreakpointWidget(TQWidget *parent, const char *name) :
header->setLabel( Enable, "" );
header->setLabel( Type, i18n("Type") );
- header->setLabel( tqStatus, i18n("tqStatus") );
+ header->setLabel( tqStatus, i18n("Status") );
header->setLabel( Location, i18n("Location") );
m_table->show();
diff --git a/parts/fileview/vcsfiletreewidgetimpl.cpp b/parts/fileview/vcsfiletreewidgetimpl.cpp
index eb3d2c4a..79486ec0 100644
--- a/parts/fileview/vcsfiletreewidgetimpl.cpp
+++ b/parts/fileview/vcsfiletreewidgetimpl.cpp
@@ -194,7 +194,7 @@ VCSFileTreeWidgetImpl::VCSFileTreeWidgetImpl( FileTreeWidget *parent, KDevVCSFil
// Update the #define order on top if you change this order!
parent->addColumn( "Filename" );
- parent->addColumn( "tqStatus" );
+ parent->addColumn( "Status" );
parent->addColumn( "Work" );
parent->addColumn( "Repo" );
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 );