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
commit16d826ac0f129438876a1cd5d7b43179bcf11679 (patch)
treed6210df32750bb6a1a753ce13623ec54cebad135
parenteb4a2bcdc03599636b17fe199beb2b8357600a2b (diff)
downloadtdesdk-16d826ac0f129438876a1cd5d7b43179bcf11679.tar.gz
tdesdk-16d826ac0f129438876a1cd5d7b43179bcf11679.zip
Fix a number of accidental tqStatus string conversions
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdesdk@1249829 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--cervisia/misc.cpp2
-rw-r--r--cervisia/repositorydlg.cpp2
-rw-r--r--cervisia/settingsdlg.cpp2
-rw-r--r--cervisia/updateview.cpp2
-rw-r--r--kbabel/catalogmanager/catalogmanager.cpp12
-rw-r--r--kbabel/kbabel/kbabel.cpp2
-rw-r--r--kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp4
-rw-r--r--kbugbuster/backend/bugcache.cpp4
-rw-r--r--kbugbuster/gui/cwbuglistcontainer.cpp2
-rw-r--r--kioslave/svn/svn.cpp2
10 files changed, 17 insertions, 17 deletions
diff --git a/cervisia/misc.cpp b/cervisia/misc.cpp
index 9adda71a..c58bee78 100644
--- a/cervisia/misc.cpp
+++ b/cervisia/misc.cpp
@@ -82,7 +82,7 @@ static const TQStringList FetchBranchesAndTags(const TQString& searchedType,
if( !cvsService->ok() )
return branchOrTagList;
- ProgressDialog dlg(parent, "tqStatus", job, TQString(), i18n("CVS tqStatus"));
+ ProgressDialog dlg(parent, "Status", job, TQString(), i18n("CVS tqStatus"));
if( dlg.execute() )
{
diff --git a/cervisia/repositorydlg.cpp b/cervisia/repositorydlg.cpp
index 1ebce85f..64adc69e 100644
--- a/cervisia/repositorydlg.cpp
+++ b/cervisia/repositorydlg.cpp
@@ -170,7 +170,7 @@ RepositoryDialog::RepositoryDialog(KConfig& cfg, CvsService_stub* cvsService,
m_repoList->addColumn(i18n("Repository"));
m_repoList->addColumn(i18n("Method"));
m_repoList->addColumn(i18n("Compression"));
- m_repoList->addColumn(i18n("tqStatus"));
+ m_repoList->addColumn(i18n("Status"));
m_repoList->setFocus();
connect(m_repoList, TQT_SIGNAL(doubleClicked(TQListViewItem*)),
diff --git a/cervisia/settingsdlg.cpp b/cervisia/settingsdlg.cpp
index 8551a7e9..ad19d00c 100644
--- a/cervisia/settingsdlg.cpp
+++ b/cervisia/settingsdlg.cpp
@@ -293,7 +293,7 @@ void SettingsDialog::addDiffPage()
*/
void SettingsDialog::addStatusPage()
{
- TQVBox* statusPage = addVBoxPage(i18n("tqStatus"), TQString(),
+ TQVBox* statusPage = addVBoxPage(i18n("Status"), TQString(),
LoadIcon("fork"));
remotestatusbox = new TQCheckBox(i18n("When opening a sandbox from a &remote repository,\n"
diff --git a/cervisia/updateview.cpp b/cervisia/updateview.cpp
index ae2ae61b..47ab5c65 100644
--- a/cervisia/updateview.cpp
+++ b/cervisia/updateview.cpp
@@ -49,7 +49,7 @@ UpdateView::UpdateView(KConfig& partConfig, TQWidget *parent, const char *name)
addColumn(i18n("File Name"), 280);
addColumn(i18n("File Type"), 180);
- addColumn(i18n("tqStatus"), 90);
+ addColumn(i18n("Status"), 90);
addColumn(i18n("Revision"), 70);
addColumn(i18n("Tag/Date"), 90);
addColumn(i18n("Timestamp"), 120);
diff --git a/kbabel/catalogmanager/catalogmanager.cpp b/kbabel/catalogmanager/catalogmanager.cpp
index 906437c6..2ac32836 100644
--- a/kbabel/catalogmanager/catalogmanager.cpp
+++ b/kbabel/catalogmanager/catalogmanager.cpp
@@ -430,9 +430,9 @@ void CatalogManager::setupActions()
TQT_SLOT( cvsCommit( ) ), actionCollection( ), "cvs_commit" );
(void)new KAction( i18n( "Commit Marked" ), 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT( cvsCommitMarked( ) ), actionCollection( ), "cvs_commit_marked" );
- (void)new KAction( i18n( "tqStatus" ), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new KAction( i18n( "Status" ), 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT( cvstqStatus( ) ), actionCollection( ), "cvs_status" );
- (void)new KAction( i18n( "tqStatus for Marked" ), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new KAction( i18n( "Status for Marked" ), 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT( cvsStatusMarked( ) ), actionCollection( ), "cvs_status_marked" );
(void)new KAction( i18n( "Show Diff" ), 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT( cvsDiff( ) ), actionCollection( ), "cvs_diff" );
@@ -456,13 +456,13 @@ void CatalogManager::setupActions()
TQT_SLOT( svnCommit( ) ), actionCollection( ), "svn_commit" );
(void)new KAction( i18n( "Commit Marked" ), 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT( svnCommitMarked( ) ), actionCollection( ), "svn_commit_marked" );
- (void)new KAction( i18n( "tqStatus (Local)" ), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new KAction( i18n( "Status (Local)" ), 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT( svnStatusLocal() ), actionCollection( ), "svn_status_local" );
- (void)new KAction( i18n( "tqStatus (Local) for Marked" ), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new KAction( i18n( "Status (Local) for Marked" ), 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT( svnStatusLocalMarked() ), actionCollection( ), "svn_status_local_marked" );
- (void)new KAction( i18n( "tqStatus (Remote)" ), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new KAction( i18n( "Status (Remote)" ), 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT( svnStatusRemote() ), actionCollection( ), "svn_status_remote" );
- (void)new KAction( i18n( "tqStatus (Remote) for Marked" ), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new KAction( i18n( "Status (Remote) for Marked" ), 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT( svnStatusRemoteMarked() ), actionCollection( ), "svn_status_remote_marked" );
(void)new KAction( i18n( "Show Diff" ), 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT( svnDiff( ) ), actionCollection( ), "svn_diff" );
diff --git a/kbabel/kbabel/kbabel.cpp b/kbabel/kbabel/kbabel.cpp
index f7607534..e5e6a00e 100644
--- a/kbabel/kbabel/kbabel.cpp
+++ b/kbabel/kbabel/kbabel.cpp
@@ -710,7 +710,7 @@ void KBabelMW::setupStatusBar()
TQColor ledColor=KBabelSettings::ledColor();
TQHBox* statusBox = new TQHBox(statusBar(),"statusBox");
statusBox->setSpacing(2);
- new TQLabel(" "+i18n("tqStatus: "),statusBox);
+ new TQLabel(" "+i18n("Status: "),statusBox);
_fuzzyLed = new KLed(ledColor,KLed::Off,KLed::Sunken,KLed::Rectangular
,statusBox);
_fuzzyLed->setFixedSize(15,12);
diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp
index a21252a2..23f0b7d2 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp
@@ -39,7 +39,7 @@ void MessagesSource::writeConfig(KConfigBase *config)
config->writeEntry("LocationType",type);
config->writeEntry("ProjectName",projectName);
config->writeEntry("ProjectKeywords",projectKeywords);
- config->writeEntry("tqStatus",status);
+ config->writeEntry("Status",status);
}
void MessagesSource::readConfig(KConfigBase *config)
@@ -48,7 +48,7 @@ void MessagesSource::readConfig(KConfigBase *config)
type=config->readNumEntry("LocationType",0);
projectName=config->readEntry("ProjectName");
projectKeywords=config->readEntry("ProjectKeywords");
- status=config->readEntry("tqStatus");
+ status=config->readEntry("Status");
}
diff --git a/kbugbuster/backend/bugcache.cpp b/kbugbuster/backend/bugcache.cpp
index 4650c9fe..66f59eb5 100644
--- a/kbugbuster/backend/bugcache.cpp
+++ b/kbugbuster/backend/bugcache.cpp
@@ -97,7 +97,7 @@ void BugCache::saveBugList( const Package &pkg, const TQString &component, const
m_cacheBugs->setGroup( number );
m_cacheBugs->writeEntry( "Title", (*it).title() );
m_cacheBugs->writeEntry( "Severity", Bug::severityToString((*it).severity()) );
- m_cacheBugs->writeEntry( "tqStatus", Bug::statusToString((*it).status()) );
+ m_cacheBugs->writeEntry( "Status", Bug::statusToString((*it).status()) );
m_cacheBugs->writeEntry( "MergedWith" , (*it).mergedWith() );
m_cacheBugs->writeEntry( "Age", ( *it ).age() );
writePerson( m_cacheBugs, "Submitter", (*it).submitter() );
@@ -137,7 +137,7 @@ Bug::List BugCache::loadBugList( const Package &pkg, const TQString &component,
if ( !title.isEmpty() ) // dunno how I ended up with an all empty bug in the cache
{
Person submitter = readPerson( m_cacheBugs, "Submitter" );
- Bug::tqStatus status = Bug::stringTotqStatus( m_cacheBugs->readEntry("tqStatus") );
+ Bug::tqStatus status = Bug::stringTotqStatus( m_cacheBugs->readEntry("Status") );
Bug::Severity severity = Bug::stringToSeverity( m_cacheBugs->readEntry("Severity") );
Person developerTODO = readPerson( m_cacheBugs, "TODO" );
Bug::BugMergeList mergedWith = m_cacheBugs->readIntListEntry( "MergedWith" );
diff --git a/kbugbuster/gui/cwbuglistcontainer.cpp b/kbugbuster/gui/cwbuglistcontainer.cpp
index 59b27899..98124dda 100644
--- a/kbugbuster/gui/cwbuglistcontainer.cpp
+++ b/kbugbuster/gui/cwbuglistcontainer.cpp
@@ -68,7 +68,7 @@ CWBugListContainer::CWBugListContainer( TQWidget *parent , const char * name )
m_listBugs->addColumn( i18n( "Number" ) );
m_listBugs->addColumn( i18n( "Age" ) );
m_listBugs->addColumn( i18n( "Title" ), 500 ); // so that the widthmode isn't "Maximum"
- m_listBugs->addColumn( i18n( "tqStatus" ) );
+ m_listBugs->addColumn( i18n( "Status" ) );
m_listBugs->addColumn( i18n( "Severity" ) );
m_listBugs->addColumn( i18n( "Sender" ), 150 ); // idem. hardcoded widths suck a bit, but...
m_listBugs->setAllColumnsShowFocus( true );
diff --git a/kioslave/svn/svn.cpp b/kioslave/svn/svn.cpp
index e714eee8..362852d3 100644
--- a/kioslave/svn/svn.cpp
+++ b/kioslave/svn/svn.cpp
@@ -1478,7 +1478,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 );