From 396e121758a344c50800867343bed230aea11a64 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 31 Aug 2011 04:15:04 +0000 Subject: [PATCH] Fix remaining instances of tqStatus embedded in user visible strings git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdewebdev@1250385 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- klinkstatus/src/actionmanager.cpp | 4 ++-- klinkstatus/src/engine/searchmanager.cpp | 2 +- klinkstatus/src/ui/resultview.cpp | 2 +- klinkstatus/src/ui/tablelinkstatus.cpp | 4 ++-- klinkstatus/src/utils/xsl.cpp | 2 +- lib/compatibility/knewstuff/downloaddialog.cpp | 6 +++--- lib/compatibility/knewstuff/knewstuffsecure.cpp | 6 +++--- quanta/quanta_uml.xmi | 8 ++++---- quanta/src/dtds.cpp | 2 +- quanta/src/quanta_init.cpp | 2 +- quanta/treeviews/projecttreeview.cpp | 6 +++--- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/klinkstatus/src/actionmanager.cpp b/klinkstatus/src/actionmanager.cpp index 2f74369d..3026736b 100644 --- a/klinkstatus/src/actionmanager.cpp +++ b/klinkstatus/src/actionmanager.cpp @@ -105,13 +105,13 @@ void ActionManager::initPart(KLinkStatusPart* part) // *************** Settings menu ********************* - (void) new KAction(i18n("Configure KLinktqStatus..."), "configure", + (void) new KAction(i18n("Configure KLinkStatus..."), "configure", 0, d->part, TQT_SLOT(slotConfigureKLinktqStatus()), TQT_TQOBJECT(d->actionCollection), "configure_klinkstatus"); // *************** Help menu ********************* - (void) new KAction(i18n("About KLinktqStatus"), "klinkstatus", + (void) new KAction(i18n("About KLinkStatus"), "klinkstatus", 0, d->part, TQT_SLOT(slotAbout()), TQT_TQOBJECT(d->actionCollection), "about_klinkstatus"); diff --git a/klinkstatus/src/engine/searchmanager.cpp b/klinkstatus/src/engine/searchmanager.cpp index 6ba9a1ba..282a2de8 100644 --- a/klinkstatus/src/engine/searchmanager.cpp +++ b/klinkstatus/src/engine/searchmanager.cpp @@ -106,7 +106,7 @@ void SearchManager::cleanItems() ((search_results_[i])[j])[l] = 0; } else - kdDebug(23100) << "LinktqStatus NULL!!" << endl; + kdDebug(23100) << "LinkStatus NULL!!" << endl; } search_results_[i][j].clear(); } diff --git a/klinkstatus/src/ui/resultview.cpp b/klinkstatus/src/ui/resultview.cpp index 7f64334b..32c9e527 100644 --- a/klinkstatus/src/ui/resultview.cpp +++ b/klinkstatus/src/ui/resultview.cpp @@ -133,7 +133,7 @@ TQColor const& ResultViewItem::textStatusColor() const { if(linktqStatus()->errorOccurred()) { - //kdDebug(23100) << "ERROR: " << linktqStatus()->error() << ": " << linktqStatus()->absoluteUrl().prettyURL() << endl; + //kdDebug(23100) << "ERROR: " << linkStatus()->error() << ": " << linktqStatus()->absoluteUrl().prettyURL() << endl; if(linktqStatus()->error() == i18n( "Javascript not supported" )) return TQt::lightGray; else diff --git a/klinkstatus/src/ui/tablelinkstatus.cpp b/klinkstatus/src/ui/tablelinkstatus.cpp index df7ade68..90eff9b6 100644 --- a/klinkstatus/src/ui/tablelinkstatus.cpp +++ b/klinkstatus/src/ui/tablelinkstatus.cpp @@ -487,7 +487,7 @@ TQColor const& TableItem::textStatusColor() const { if(linktqStatus()->errorOccurred()) { - //kdDebug(23100) << "ERROR: " << linktqStatus()->error() << ": " << linktqStatus()->absoluteUrl().prettyURL() << endl; + //kdDebug(23100) << "ERROR: " << linkStatus()->error() << ": " << linktqStatus()->absoluteUrl().prettyURL() << endl; if(linktqStatus()->error() == i18n( "Javascript not supported" )) return TQt::lightGray; else @@ -636,7 +636,7 @@ void TableItemtqStatus::setText() /* if(linktqStatus()->httpHeader().statusCode() == 0) { - kdDebug(23100) << "TableItemtqStatus::setText : statusCode() == 0" << endl; + kdDebug(23100) << "TableItemStatus::setText : statusCode() == 0" << endl; kdDebug(23100) << linktqStatus()->toString() << endl; kdDebug(23100) << linktqStatus()->docHtml() << endl; } diff --git a/klinkstatus/src/utils/xsl.cpp b/klinkstatus/src/utils/xsl.cpp index fc3c8f31..03c1a6a0 100644 --- a/klinkstatus/src/utils/xsl.cpp +++ b/klinkstatus/src/utils/xsl.cpp @@ -179,7 +179,7 @@ TQString KopeteXSLThread::xsltTransform( const TQString &xmlString, xsltStyleshe if ( resultString.isEmpty() ) { - resultString = i18n( "
KLinktqStatus encountered the following error while parsing a message:
%1
" ).tqarg( errorMsg ); + resultString = i18n( "
KLinkStatus encountered the following error while parsing a message:
%1
" ).tqarg( errorMsg ); } #ifdef RAWXSL diff --git a/lib/compatibility/knewstuff/downloaddialog.cpp b/lib/compatibility/knewstuff/downloaddialog.cpp index ec008059..87c35918 100644 --- a/lib/compatibility/knewstuff/downloaddialog.cpp +++ b/lib/compatibility/knewstuff/downloaddialog.cpp @@ -287,7 +287,7 @@ void DownloadDialog::slotResult(KIO::Job *job) kdDebug() << "got data: " << m_data[job] << endl; - kapp->config()->setGroup("KNewStufftqStatus"); + kapp->config()->setGroup("KNewStuffStatus"); dom.setContent(m_data[job]); knewstuff = dom.documentElement(); @@ -327,7 +327,7 @@ int DownloadDialog::installtqStatus(Entry *entry) TQString datestring; int installed; - kapp->config()->setGroup("KNewStufftqStatus"); + kapp->config()->setGroup("KNewStuffStatus"); datestring = kapp->config()->readEntry(entry->name()); if(datestring.isNull()) installed = 0; else @@ -453,7 +453,7 @@ void DownloadDialog::slotInstall() void DownloadDialog::install(Entry *e) { - kapp->config()->setGroup("KNewStufftqStatus"); + kapp->config()->setGroup("KNewStuffStatus"); kapp->config()->writeEntry(m_entryname, e->releaseDate().toString(Qt::ISODate)); kapp->config()->sync(); diff --git a/lib/compatibility/knewstuff/knewstuffsecure.cpp b/lib/compatibility/knewstuff/knewstuffsecure.cpp index 31ecd75f..d9bf82af 100644 --- a/lib/compatibility/knewstuff/knewstuffsecure.cpp +++ b/lib/compatibility/knewstuff/knewstuffsecure.cpp @@ -145,8 +145,8 @@ void KNewStuffSecure::slotValidated(int result) } else { KConfig *cfg = KGlobal::config(); - cfg->deleteGroup("KNewStufftqStatus"); - cfg->setGroup("KNewStufftqStatus"); + cfg->deleteGroup("KNewStuffStatus"); + cfg->setGroup("KNewStuffStatus"); for (TQMap::ConstIterator it = m_installedResources.constBegin(); it != m_installedResources.constEnd(); ++it) { cfg->writeEntry(it.key(), it.data()); @@ -160,7 +160,7 @@ void KNewStuffSecure::slotValidated(int result) void KNewStuffSecure::downloadResource() { KConfig *cfg = KGlobal::config(); - m_installedResources = cfg->entryMap("KNewStufftqStatus"); + m_installedResources = cfg->entryMap("KNewStuffStatus"); engine()->ignoreInstallResult(true); KNewStuff::download(); } diff --git a/quanta/quanta_uml.xmi b/quanta/quanta_uml.xmi index b6b4ee96..3903e794 100644 --- a/quanta/quanta_uml.xmi +++ b/quanta/quanta_uml.xmi @@ -428,7 +428,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat - + @@ -549,7 +549,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat - + @@ -2506,7 +2506,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat - + @@ -2555,7 +2555,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat - + diff --git a/quanta/src/dtds.cpp b/quanta/src/dtds.cpp index abf0a292..90038b2e 100644 --- a/quanta/src/dtds.cpp +++ b/quanta/src/dtds.cpp @@ -678,7 +678,7 @@ uint DTDs::readTagFile(const TQString& fileName, DTDStruct* parentDTD, TQTagList bool result = f.open( IO_ReadOnly ); if (! result) kdError() << "dtds::readTagFile unable to open:" << fileName - << " tqStatus: " << f.status() << endl; + << " Status: " << f.status() << endl; } TQString errorMsg; int errorLine, errorCol; diff --git a/quanta/src/quanta_init.cpp b/quanta/src/quanta_init.cpp index 15e1abdd..275a269d 100644 --- a/quanta/src/quanta_init.cpp +++ b/quanta/src/quanta_init.cpp @@ -1460,7 +1460,7 @@ void QuantaInit::checkRuntimeDependencies() dependencies.append(dependency); - dependency.name = "KLinktqStatus"; + dependency.name = "KLinkStatus"; dependency.execName = "Link Checker"; dependency.url = "http://kde-apps.org/content/show.php?content=12318"; dependency.description = i18n("link validity checking"); diff --git a/quanta/treeviews/projecttreeview.cpp b/quanta/treeviews/projecttreeview.cpp index 8fba1282..dcfab886 100644 --- a/quanta/treeviews/projecttreeview.cpp +++ b/quanta/treeviews/projecttreeview.cpp @@ -136,7 +136,7 @@ ProjectTreeView::ProjectTreeView(TQWidget *parent, const char *name ) m_fileMenu->insertItem( i18n("&Remove From Project"), this, TQT_SLOT(slotRemoveFromProject(int))); m_fileMenu->insertItem(SmallIcon("editdelete"), i18n("&Delete"), this, TQT_SLOT(slotDelete())); m_fileMenu->insertSeparator(); - m_fileMenu->insertItem(i18n("Upload &tqStatus"), m_uploadStatusMenu); + m_fileMenu->insertItem(i18n("Upload &Status"), m_uploadStatusMenu); m_fileMenu->insertItem(SmallIcon("info"), i18n("&Properties"), this, TQT_SLOT(slotProperties())); KPopupMenu *createNewMenu = new KPopupMenu(this); @@ -155,7 +155,7 @@ ProjectTreeView::ProjectTreeView(TQWidget *parent, const char *name ) m_folderMenu->insertItem(SmallIcon("editdelete"), i18n("&Delete"), this, TQT_SLOT(slotDelete())); m_folderMenu->insertSeparator(); m_setDocumentRootId = m_folderMenu->insertItem(i18n("Document-&Base Folder"), this, TQT_SLOT(slotChangeDocumentFoldertqStatus())); - m_folderMenu->insertItem(i18n("Upload &tqStatus"), m_uploadStatusMenu); + m_folderMenu->insertItem(i18n("Upload &Status"), m_uploadStatusMenu); m_folderMenu->insertItem(SmallIcon("info"), i18n("&Properties"), this, TQT_SLOT(slotProperties())); m_projectMenu = new KPopupMenu(this); @@ -166,7 +166,7 @@ ProjectTreeView::ProjectTreeView(TQWidget *parent, const char *name ) m_projectMenu->insertItem(SmallIcon("configure"), i18n("Project &Properties"), this, TQT_SLOT(slotOptions())); m_projectMenu->insertItem(SmallIcon("revert"), i18n("&Reload"), this, TQT_SLOT(slotReload())); m_projectMenu->insertSeparator(); - m_projectMenu->insertItem(i18n("Upload &tqStatus"), m_uploadStatusMenu); + m_projectMenu->insertItem(i18n("Upload &Status"), m_uploadStatusMenu); connect(this, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)),