diff options
679 files changed, 4336 insertions, 4336 deletions
diff --git a/NewsLog.txt b/NewsLog.txt index 57403ecee..2e934da96 100644 --- a/NewsLog.txt +++ b/NewsLog.txt @@ -2063,7 +2063,7 @@ Bugfixes Korganizer ----------- -- proko35 W1-9 icon tqalignment was improved. +- proko35 W1-9 icon alignment was improved. Additional Fixes ================ diff --git a/akregator/src/addfeeddialog.cpp b/akregator/src/addfeeddialog.cpp index 1cca9d903..bb37d26e0 100644 --- a/akregator/src/addfeeddialog.cpp +++ b/akregator/src/addfeeddialog.cpp @@ -83,7 +83,7 @@ void AddFeedDialog::slotOk( ) feedURL.prepend("http://"); f->setXmlUrl(feedURL); - widget->statusLabel->setText( i18n("Downloading %1").tqarg(feedURL) ); + widget->statusLabel->setText( i18n("Downloading %1").arg(feedURL) ); connect( feed, TQT_SIGNAL(fetched(Feed* )), this, TQT_SLOT(fetchCompleted(Feed *)) ); @@ -102,7 +102,7 @@ void AddFeedDialog::fetchCompleted(Feed */*f*/) void AddFeedDialog::fetchError(Feed *) { - KMessageBox::error(this, i18n("Feed not found from %1.").tqarg(feedURL)); + KMessageBox::error(this, i18n("Feed not found from %1.").arg(feedURL)); KDialogBase::slotCancel(); } diff --git a/akregator/src/akregator_part.cpp b/akregator/src/akregator_part.cpp index c62526904..7fece27ae 100644 --- a/akregator/src/akregator_part.cpp +++ b/akregator/src/akregator_part.cpp @@ -146,7 +146,7 @@ Part::Part( TQWidget *parentWidget, const char * /*widgetName*/, TQStringList storageParams; - storageParams.append(TQString("taggingEnabled=%1").tqarg(Settings::showTaggingGUI() ? "true" : "false")); + storageParams.append(TQString("taggingEnabled=%1").arg(Settings::showTaggingGUI() ? "true" : "false")); if (factory != 0) { @@ -168,7 +168,7 @@ Part::Part( TQWidget *parentWidget, const char * /*widgetName*/, { m_storage = Backend::StorageFactoryRegistry::self()->getFactory("dummy")->createStorage(storageParams); - KMessageBox::error(parentWidget, i18n("Unable to load storage backend plugin \"%1\". No feeds are archived.").tqarg(Settings::archiveBackend()), i18n("Plugin error") ); + KMessageBox::error(parentWidget, i18n("Unable to load storage backend plugin \"%1\". No feeds are archived.").arg(Settings::archiveBackend()), i18n("Plugin error") ); } Filters::ArticleFilterList list; @@ -194,7 +194,7 @@ Part::Part( TQWidget *parentWidget, const char * /*widgetName*/, m_extension = new BrowserExtension(this, "ak_extension"); connect(m_view, TQT_SIGNAL(setWindowCaption(const TQString&)), this, TQT_SIGNAL(setWindowCaption(const TQString&))); - connect(m_view, TQT_SIGNAL(seStatusBarText(const TQString&)), this, TQT_SIGNAL(seStatusBarText(const TQString&))); + connect(m_view, TQT_SIGNAL(setStatusBarText(const TQString&)), this, TQT_SIGNAL(setStatusBarText(const TQString&))); connect(m_view, TQT_SIGNAL(setProgress(int)), m_extension, TQT_SIGNAL(loadingProgress(int))); connect(m_view, TQT_SIGNAL(signalCanceled(const TQString&)), this, TQT_SIGNAL(canceled(const TQString&))); connect(m_view, TQT_SIGNAL(signalStarted(KIO::Job*)), this, TQT_SIGNAL(started(KIO::Job*))); @@ -232,7 +232,7 @@ Part::Part( TQWidget *parentWidget, const char * /*widgetName*/, initFonts(); - RSS::FileRetriever::setUserAgent(TQString("Akregator/%1; librss/remnants").tqarg(AKREGATOR_VERSION)); + RSS::FileRetriever::setUserAgent(TQString("Akregator/%1; librss/remnants").arg(AKREGATOR_VERSION)); } void Part::loadPlugins() @@ -432,7 +432,7 @@ bool Part::openFile() copyFile(backup); - KMessageBox::error(m_view, i18n("<qt>The standard feed list is corrupted (invalid XML). A backup was created:<p><b>%2</b></p></qt>").tqarg(backup), i18n("XML Parsing Error") ); + KMessageBox::error(m_view, i18n("<qt>The standard feed list is corrupted (invalid XML). A backup was created:<p><b>%2</b></p></qt>").arg(backup), i18n("XML Parsing Error") ); } if (!doc.setContent(listBackup)) @@ -447,7 +447,7 @@ bool Part::openFile() TQString backup = m_file + "-backup." + TQString::number(TQDateTime::currentDateTime().toTime_t()); copyFile(backup); - KMessageBox::error(m_view, i18n("<qt>The standard feed list is corrupted (no valid OPML). A backup was created:<p><b>%2</b></p></qt>").tqarg(backup), i18n("OPML Parsing Error") ); + KMessageBox::error(m_view, i18n("<qt>The standard feed list is corrupted (no valid OPML). A backup was created:<p><b>%2</b></p></qt>").arg(backup), i18n("OPML Parsing Error") ); } m_view->loadFeeds(createDefaultFeedList()); } @@ -486,7 +486,7 @@ void Part::slotSaveFeedList() if (file.open(IO_WriteOnly) == false) { //FIXME: allow to save the feedlist into different location -tpr 20041118 - KMessageBox::error(m_view, i18n("Access denied: cannot save feed list (%1)").tqarg(m_file), i18n("Write error") ); + KMessageBox::error(m_view, i18n("Access denied: cannot save feed list (%1)").arg(m_file), i18n("Write error") ); return; } @@ -639,10 +639,10 @@ void Part::importFile(const KURL& url) if (doc.setContent(TQByteArray(file.readAll()))) m_view->importFeeds(doc); else - KMessageBox::error(m_view, i18n("Could not import the file %1 (no valid OPML)").tqarg(filename), i18n("OPML Parsing Error") ); + KMessageBox::error(m_view, i18n("Could not import the file %1 (no valid OPML)").arg(filename), i18n("OPML Parsing Error") ); } else - KMessageBox::error(m_view, i18n("The file %1 could not be read, check if it exists or if it is readable for the current user.").tqarg(filename), i18n("Read Error")); + KMessageBox::error(m_view, i18n("The file %1 could not be read, check if it exists or if it is readable for the current user.").arg(filename), i18n("Read Error")); if (isRemote) KIO::NetAccess::removeTempFile(filename); @@ -656,7 +656,7 @@ void Part::exportFile(const KURL& url) if ( file.exists() && KMessageBox::questionYesNo(m_view, - i18n("The file %1 already exists; do you want to overwrite it?").tqarg(file.name()), + i18n("The file %1 already exists; do you want to overwrite it?").arg(file.name()), i18n("Export"), i18n("Overwrite"), KStdGuiItem::cancel()) == KMessageBox::No ) @@ -664,7 +664,7 @@ void Part::exportFile(const KURL& url) if ( !file.open(IO_WriteOnly) ) { - KMessageBox::error(m_view, i18n("Access denied: cannot write to file %1").tqarg(file.name()), i18n("Write Error") ); + KMessageBox::error(m_view, i18n("Access denied: cannot write to file %1").arg(file.name()), i18n("Write Error") ); return; } @@ -978,11 +978,11 @@ bool Part::tryToLock(const TQString& backendName) "can cause the loss of archived articles and crashes at startup.</b> " "You should disable the archive for now " "unless you are sure that %2 is not already running.</qt>") - .tqarg( programName, programName, backendName ); + .arg( programName, programName, backendName ); // TQString::arg( st ) only replaces the first occurrence of %1 // with st while TQString::arg( s1, s2 ) replacess all occurrences // of %1 with s1 and all occurrences of %2 with s2. So don't - // even think about changing the above to .tqarg( programName ). + // even think about changing the above to .arg( programName ). else msg = i18n("<qt>%1 seems to be running on another display on this " "machine. <b>Running %1 and %2 at the same " @@ -990,7 +990,7 @@ bool Part::tryToLock(const TQString& backendName) "the loss of archived articles and crashes at startup.</b> " "You should disable the archive for now " "unless you are sure that %2 is not already running.</qt>") - .tqarg( oldProgramName, programName, backendName ); + .arg( oldProgramName, programName, backendName ); } else { @@ -1001,7 +1001,7 @@ bool Part::tryToLock(const TQString& backendName) "You should disable the archive for now " "unless you are sure that it is " "not already running on %2.</qt>") - .tqarg( programName, oldHostName, backendName ); + .arg( programName, oldHostName, backendName ); else msg = i18n("<qt>%1 seems to be running on %3. <b>Running %1 and %2 at the " "same time is not supported by the %4 backend and can cause " @@ -1009,7 +1009,7 @@ bool Part::tryToLock(const TQString& backendName) "You should disable the archive for now " "unless you are sure that %1 is " "not running on %3.</qt>") - .tqarg( oldProgramName, programName, oldHostName, backendName ); + .arg( oldProgramName, programName, oldHostName, backendName ); } KCursorSaver idle( KBusyPtr::idle() ); diff --git a/akregator/src/akregator_view.cpp b/akregator/src/akregator_view.cpp index e0ff06eba..4a20008d1 100644 --- a/akregator/src/akregator_view.cpp +++ b/akregator/src/akregator_view.cpp @@ -145,7 +145,7 @@ class View::DeleteNodeVisitor : public TreeNodeVisitor virtual bool visitTagNode(TagNode* node) { - TQString msg = i18n("<qt>Are you sure you want to delete tag <b>%1</b>? The tag will be removed from all articles.</qt>").tqarg(node->title()); + TQString msg = i18n("<qt>Are you sure you want to delete tag <b>%1</b>? The tag will be removed from all articles.</qt>").arg(node->title()); if (KMessageBox::warningContinueCancel(0, msg, i18n("Delete Tag"), KStdGuiItem::del()) == KMessageBox::Continue) { Tag tag = node->tag(); @@ -166,7 +166,7 @@ class View::DeleteNodeVisitor : public TreeNodeVisitor if (node->title().isEmpty()) msg = i18n("<qt>Are you sure you want to delete this folder and its feeds and subfolders?</qt>"); else - msg = i18n("<qt>Are you sure you want to delete folder <b>%1</b> and its feeds and subfolders?</qt>").tqarg(node->title()); + msg = i18n("<qt>Are you sure you want to delete folder <b>%1</b> and its feeds and subfolders?</qt>").arg(node->title()); if (KMessageBox::warningContinueCancel(0, msg, i18n("Delete Folder"), KStdGuiItem::del()) == KMessageBox::Continue) { @@ -182,7 +182,7 @@ class View::DeleteNodeVisitor : public TreeNodeVisitor if (node->title().isEmpty()) msg = i18n("<qt>Are you sure you want to delete this feed?</qt>"); else - msg = i18n("<qt>Are you sure you want to delete feed <b>%1</b>?</qt>").tqarg(node->title()); + msg = i18n("<qt>Are you sure you want to delete feed <b>%1</b>?</qt>").arg(node->title()); if (KMessageBox::warningContinueCancel(0, msg, i18n("Delete Feed"), KStdGuiItem::del()) == KMessageBox::Continue) { @@ -468,7 +468,7 @@ void View::connectFrame(Frame *f) void View::sloStatusText(const TQString &c) { if (sender() == m_currentFrame) - emit seStatusBarText(c); + emit setStatusBarText(c); } void View::slotCaptionChanged(const TQString &c) @@ -690,7 +690,7 @@ void View::slotFrameChanged(Frame *f) emit setWindowCaption(f->caption()); emit setProgress(f->progress()); - emit seStatusBarText(f->statusText()); + emit setStatusBarText(f->statusText()); if (f->part() == m_part) m_part->mergePart(m_articleViewer); @@ -884,7 +884,7 @@ void View::slotFeedAdd() } - TreeNode* lastChild = group->tqchildren().last(); + TreeNode* lastChild = group->children().last(); addFeed(TQString(), lastChild, group, false); } @@ -1070,14 +1070,14 @@ void View::slotFetchingStarted() { m_mainFrame->setState(Frame::Started); m_actionManager->action("feed_stop")->setEnabled(true); - m_mainFrame->seStatusText(i18n("Fetching Feeds...")); + m_mainFrame->setStatusText(i18n("Fetching Feeds...")); } void View::slotFetchingStopped() { m_mainFrame->setState(Frame::Completed); m_actionManager->action("feed_stop")->setEnabled(false); - m_mainFrame->seStatusText(TQString()); + m_mainFrame->setStatusText(TQString()); } void View::slotFeedFetched(Feed *feed) @@ -1186,7 +1186,7 @@ void View::slotArticleSelected(const Article& article) if (delay > 0) m_markReadTimer->start( delay*1000, true ); else - a.seStatus(Article::Read); + a.setStatus(Article::Read); } } @@ -1312,7 +1312,7 @@ void View::slotArticleDelete() case 0: return; case 1: - msg = i18n("<qt>Are you sure you want to delete article <b>%1</b>?</qt>").tqarg(TQStyleSheet::escape(articles.first().title())); + msg = i18n("<qt>Are you sure you want to delete article <b>%1</b>?</qt>").arg(TQStyleSheet::escape(articles.first().title())); break; default: msg = i18n("<qt>Are you sure you want to delete the selected article?</qt>", @@ -1370,7 +1370,7 @@ void View::slotSetSelectedArticleRead() return; for (TQValueList<Article>::Iterator it = articles.begin(); it != articles.end(); ++it) - (*it).seStatus(Article::Read); + (*it).setStatus(Article::Read); } void View::slotTextToSpeechRequest() @@ -1408,7 +1408,7 @@ void View::slotSetSelectedArticleUnread() return; for (TQValueList<Article>::Iterator it = articles.begin(); it != articles.end(); ++it) - (*it).seStatus(Article::Unread); + (*it).setStatus(Article::Unread); } void View::slotSetSelectedArticleNew() @@ -1419,7 +1419,7 @@ void View::slotSetSelectedArticleNew() return; for (TQValueList<Article>::Iterator it = articles.begin(); it != articles.end(); ++it) - (*it).seStatus(Article::New); + (*it).setStatus(Article::New); } void View::slotSetCurrentArticleReadDelayed() @@ -1429,7 +1429,7 @@ void View::slotSetCurrentArticleReadDelayed() if (article.isNull()) return; - article.seStatus(Article::Read); + article.setStatus(Article::Read); } void View::slotMouseOverInfo(const KFileItem *kifi) @@ -1437,11 +1437,11 @@ void View::slotMouseOverInfo(const KFileItem *kifi) if (kifi) { KFileItem *k=(KFileItem*)kifi; - m_mainFrame->seStatusText(k->url().prettyURL());//geStatusBarInfo()); + m_mainFrame->setStatusText(k->url().prettyURL());//geStatusBarInfo()); } else { - m_mainFrame->seStatusText(TQString()); + m_mainFrame->setStatusText(TQString()); } } diff --git a/akregator/src/akregator_view.h b/akregator/src/akregator_view.h index c6e94eb09..6dd52f215 100644 --- a/akregator/src/akregator_view.h +++ b/akregator/src/akregator_view.h @@ -134,7 +134,7 @@ namespace Akregator { void signalUnreadCountChanged(int); void setWindowCaption(const TQString&); - void seStatusBarText(const TQString&); + void setStatusBarText(const TQString&); void setProgress(int); void signalStarted(KIO::Job*); void signalCompleted(); diff --git a/akregator/src/article.cpp b/akregator/src/article.cpp index 36ba87d63..8b62509f4 100644 --- a/akregator/src/article.cpp +++ b/akregator/src/article.cpp @@ -109,7 +109,7 @@ void Article::initialize(RSS::Article article, Backend::FeedStorage* archive) if (article.meta("deleted") == "true") { // if article is in deleted state, we just add the status and omit the rest d->status = Private::Read | Private::Deleted; - d->archive->seStatus(d->guid, d->status); + d->archive->setStatus(d->guid, d->status); } else { // article is not deleted, let's add it to the archive @@ -157,7 +157,7 @@ void Article::initialize(RSS::Article article, Backend::FeedStorage* archive) int statusInt = status.toInt(); if (statusInt == New) statusInt = Unread; - seStatus(statusInt); + setStatus(statusInt); } setKeep(article.meta("keep") == "true"); } @@ -210,9 +210,9 @@ void Article::setDeleted() if (isDeleted()) return; - seStatus(Read); + setStatus(Read); d->status = Private::Deleted | Private::Read; - d->archive->seStatus(d->guid, d->status); + d->archive->setStatus(d->guid, d->status); d->archive->setDeleted(d->guid); if (d->feed) @@ -299,7 +299,7 @@ int Article::status() const return Unread; } -void Article::seStatus(int stat) +void Article::setStatus(int stat) { // use status() rather than statusBits() here to filter out status flags that we are not // interested in @@ -319,7 +319,7 @@ void Article::seStatus(int stat) d->status = ( d->status | Private::New) & ~Private::Read; break; } - d->archive->seStatus(d->guid, d->status); + d->archive->setStatus(d->guid, d->status); if (d->feed) d->feed->setArticleChanged(*this, oldStatus); } @@ -404,7 +404,7 @@ RSS::Enclosure Article::enclosure() const void Article::setKeep(bool keep) { d->status = keep ? ( statusBits() | Private::Keep) : ( statusBits() & ~Private::Keep); - d->archive->seStatus(d->guid, d->status); + d->archive->setStatus(d->guid, d->status); if (d->feed) d->feed->setArticleChanged(*this); } diff --git a/akregator/src/article.h b/akregator/src/article.h index 902aa47c6..ef70b839b 100644 --- a/akregator/src/article.h +++ b/akregator/src/article.h @@ -80,7 +80,7 @@ namespace Akregator bool isNull() const; int status() const; - void seStatus(int s); + void setStatus(int s); void offsetPubDate(int secs); diff --git a/akregator/src/articlefilter.cpp b/akregator/src/articlefilter.cpp index fc1ff29af..20ebc5afc 100644 --- a/akregator/src/articlefilter.cpp +++ b/akregator/src/articlefilter.cpp @@ -449,7 +449,7 @@ SeStatusAction::SeStatusAction(int status) : m_status(status) void SeStatusAction::exec(Article& article) { if (!article.isNull()) - article.seStatus(m_status); + article.setStatus(m_status); } int SeStatusAction::status() const @@ -457,7 +457,7 @@ int SeStatusAction::status() const return m_status; } -void SeStatusAction::seStatus(int status) +void SeStatusAction::setStatus(int status) { m_status = status; } diff --git a/akregator/src/articlefilter.h b/akregator/src/articlefilter.h index ddf05490e..4979c76ec 100644 --- a/akregator/src/articlefilter.h +++ b/akregator/src/articlefilter.h @@ -174,7 +174,7 @@ class SeStatusAction : public AbstractAction virtual void exec(Article& article); int status() const; - void seStatus(int status); + void setStatus(int status); virtual void writeConfig(KConfig* config) const; virtual void readConfig(KConfig* config); diff --git a/akregator/src/articleviewer.cpp b/akregator/src/articleviewer.cpp index f8ad74bc8..5f1870f97 100644 --- a/akregator/src/articleviewer.cpp +++ b/akregator/src/articleviewer.cpp @@ -72,9 +72,9 @@ class ArticleViewer::ShowSummaryVisitor : public TreeNodeVisitor m_view->m_link = TQString(); TQString text; - text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").tqarg(TQApplication::reverseLayout() ? "rtl" : "ltr"); + text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").arg(TQApplication::reverseLayout() ? "rtl" : "ltr"); - text += TQString("<div class=\"headertitle\" dir=\"%1\">").tqarg(directionOf(Utils::stripTags(node->title()))); + text += TQString("<div class=\"headertitle\" dir=\"%1\">").arg(directionOf(Utils::stripTags(node->title()))); text += node->title(); if(node->unread() == 0) text += i18n(" (no unread articles)"); @@ -90,26 +90,26 @@ class ArticleViewer::ShowSummaryVisitor : public TreeNodeVisitor TQString file = url.replace("/", "_").replace(":", "_"); KURL u(m_view->m_imageDir); u.setFileName(file); - text += TQString("<a href=\"%1\"><img class=\"headimage\" src=\"%2.png\"></a>\n").tqarg(node->htmlUrl()).tqarg(u.url()); + text += TQString("<a href=\"%1\"><img class=\"headimage\" src=\"%2.png\"></a>\n").arg(node->htmlUrl()).arg(u.url()); } else text += "<div class=\"body\">"; if( !node->description().isEmpty() ) { - text += TQString("<div dir=\"%1\">").tqarg(Utils::stripTags(directionOf(node->description()))); - text += i18n("<b>Description:</b> %1<br><br>").tqarg(node->description()); + text += TQString("<div dir=\"%1\">").arg(Utils::stripTags(directionOf(node->description()))); + text += i18n("<b>Description:</b> %1<br><br>").arg(node->description()); text += "</div>\n"; // /description } if ( !node->htmlUrl().isEmpty() ) { - text += TQString("<div dir=\"%1\">").tqarg(directionOf(node->htmlUrl())); - text += i18n("<b>Homepage:</b> <a href=\"%1\">%2</a>").tqarg(node->htmlUrl()).tqarg(node->htmlUrl()); + text += TQString("<div dir=\"%1\">").arg(directionOf(node->htmlUrl())); + text += i18n("<b>Homepage:</b> <a href=\"%1\">%2</a>").arg(node->htmlUrl()).arg(node->htmlUrl()); text += "</div>\n"; // / link } - //text += i18n("<b>Unread articles:</b> %1").tqarg(node->unread()); + //text += i18n("<b>Unread articles:</b> %1").arg(node->unread()); text += "</div>"; // /body m_view->renderContent(text); @@ -121,8 +121,8 @@ class ArticleViewer::ShowSummaryVisitor : public TreeNodeVisitor m_view->m_link = TQString(); TQString text; - text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").tqarg(TQApplication::reverseLayout() ? "rtl" : "ltr"); - text += TQString("<div class=\"headertitle\" dir=\"%1\">%2").tqarg(directionOf(Utils::stripTags(node->title()))).tqarg(node->title()); + text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").arg(TQApplication::reverseLayout() ? "rtl" : "ltr"); + text += TQString("<div class=\"headertitle\" dir=\"%1\">%2").arg(directionOf(Utils::stripTags(node->title()))).arg(node->title()); if(node->unread() == 0) text += i18n(" (no unread articles)"); else @@ -139,8 +139,8 @@ class ArticleViewer::ShowSummaryVisitor : public TreeNodeVisitor m_view->m_link = TQString(); TQString text; - text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").tqarg(TQApplication::reverseLayout() ? "rtl" : "ltr"); - text += TQString("<div class=\"headertitle\" dir=\"%1\">%2").tqarg(directionOf(Utils::stripTags(node->title()))).tqarg(node->title()); + text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").arg(TQApplication::reverseLayout() ? "rtl" : "ltr"); + text += TQString("<div class=\"headertitle\" dir=\"%1\">%2").arg(directionOf(Utils::stripTags(node->title()))).arg(node->title()); if(node->unread() == 0) text += i18n(" (no unread articles)"); else @@ -198,10 +198,10 @@ void ArticleViewer::generateNormalModeCSS() " font-size: %2 ! important;\n" " color: %3 ! important;\n" " background: %4 ! important;\n" - "}\n\n").tqarg(Settings::standardFont()) - .tqarg(TQString::number(pointsToPixel(Settings::mediumFontSize()))+"px") - .tqarg(cg.text().name()) - .tqarg(cg.base().name()); + "}\n\n").arg(Settings::standardFont()) + .arg(TQString::number(pointsToPixel(Settings::mediumFontSize()))+"px") + .arg(cg.text().name()) + .arg(cg.base().name()); m_normalModeCSS += TQString( "a {\n" + TQString(" color: %1 ! important;\n") @@ -214,18 +214,18 @@ void ArticleViewer::generateNormalModeCSS() +" margin-bottom: 10pt;\n" // +" width: 99%;\n" + "}\n\n") - .tqarg(cg.link().name()) - .tqarg(cg.background().name()) - .tqarg(cg.text().name()); + .arg(cg.link().name()) + .arg(cg.background().name()) + .arg(cg.text().name()); m_normalModeCSS += TQString(".headertitle a:link { color: %1 ! important; }\n" ".headertitle a:visited { color: %2 ! important; }\n" ".headertitle a:hover{ color: %3 ! important; }\n" ".headertitle a:active { color: %4 ! important; }\n") - .tqarg(cg.highlightedText().name()) - .tqarg(cg.highlightedText().name()) - .tqarg(cg.highlightedText().name()) - .tqarg(cg.highlightedText().name()); + .arg(cg.highlightedText().name()) + .arg(cg.highlightedText().name()) + .arg(cg.highlightedText().name()) + .arg(cg.highlightedText().name()); m_normalModeCSS += TQString( ".headertitle {\n" @@ -244,8 +244,8 @@ void ArticleViewer::generateNormalModeCSS() ".headimage {\n" " float: right;\n" " margin-left: 5px;\n" - "}\n\n").tqarg(cg.highlight().name()) - .tqarg(cg.highlightedText().name()); + "}\n\n").arg(cg.highlight().name()) + .arg(cg.highlightedText().name()); m_normalModeCSS += TQString( "body { clear: none; }\n\n" @@ -278,10 +278,10 @@ void ArticleViewer::generateCombinedModeCSS() " font-size: %2 ! important;\n" " color: %3 ! important;\n" " background: %4 ! important;\n" - "}\n\n").tqarg(Settings::standardFont()) - .tqarg(TQString::number(pointsToPixel(Settings::mediumFontSize()))+"px") - .tqarg(cg.text().name()) - .tqarg(cg.base().name()); + "}\n\n").arg(Settings::standardFont()) + .arg(TQString::number(pointsToPixel(Settings::mediumFontSize()))+"px") + .arg(cg.text().name()) + .arg(cg.base().name()); m_combinedModeCSS += ( "a {\n" + TQString(" color: %1 ! important;\n") @@ -294,18 +294,18 @@ void ArticleViewer::generateCombinedModeCSS() +" margin-bottom: 10pt;\n" // +" width: 99%;\n" + "}\n\n") - .tqarg(cg.link().name()) - .tqarg(cg.background().name()) - .tqarg(cg.text().name()); + .arg(cg.link().name()) + .arg(cg.background().name()) + .arg(cg.text().name()); m_combinedModeCSS += TQString(".headertitle a:link { color: %1 ! important; }\n" ".headertitle a:visited { color: %2 ! important; }\n" ".headertitle a:hover{ color: %3 ! important; }\n" ".headertitle a:active { color: %4 ! important; }\n") - .tqarg(cg.highlightedText().name()) - .tqarg(cg.highlightedText().name()) - .tqarg(cg.highlightedText().name()) - .tqarg(cg.highlightedText().name()); + .arg(cg.highlightedText().name()) + .arg(cg.highlightedText().name()) + .arg(cg.highlightedText().name()) + .arg(cg.highlightedText().name()); m_combinedModeCSS += TQString( ".headertitle {\n" " background: %1 ! important;\n" @@ -323,8 +323,8 @@ void ArticleViewer::generateCombinedModeCSS() ".headimage {\n" " float: right;\n" " margin-left: 5px;\n" - "}\n\n").tqarg(cg.highlight().name()) - .tqarg(cg.highlightedText().name()); + "}\n\n").arg(cg.highlight().name()) + .arg(cg.highlightedText().name()); m_combinedModeCSS += TQString( "body { clear: none; }\n\n" @@ -368,11 +368,11 @@ void ArticleViewer::displayAboutPage() { TQString location = locate("data", "akregator/about/main.html"); TQString content = KPIM::kFileToString(location); - content = content.tqarg( locate( "data", "libtdepim/about/kde_infopage.css" ) ); + content = content.arg( locate( "data", "libtdepim/about/kde_infopage.css" ) ); if ( kapp->reverseLayout() ) - content = content.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "libtdepim/about/kde_infopage_rtl.css" ) ); + content = content.arg( "@import \"%1\";" ).arg( locate( "data", "libtdepim/about/kde_infopage_rtl.css" ) ); else - content = content.tqarg( "" ); + content = content.arg( "" ); begin(KURL( location )); TQString info = @@ -389,25 +389,25 @@ void ArticleViewer::displayAboutPage() "<p>We hope that you will enjoy Akregator.</p>\n" "<p>Thank you,</p>\n" "<p style='margin-bottom: 0px'> The Akregator Team</p>\n") - .tqarg(AKREGATOR_VERSION) // Akregator version - .tqarg("http://akregator.kde.org/"); // Akregator homepage URL + .arg(AKREGATOR_VERSION) // Akregator version + .arg("http://akregator.kde.org/"); // Akregator homepage URL TQString fontSize = TQString::number( pointsToPixel( Settings::mediumFontSize() )); TQString appTitle = i18n("Akregator"); TQString catchPhrase = ""; //not enough space for a catch phrase at default window size i18n("Part of the Kontact Suite"); TQString quickDescription = i18n("An RSS feed reader for the K Desktop Environment."); - write(content.tqarg(fontSize).tqarg(appTitle).tqarg(catchPhrase).tqarg(quickDescription).tqarg(info)); + write(content.arg(fontSize).arg(appTitle).arg(catchPhrase).arg(quickDescription).arg(info)); end(); } TQString ArticleViewer::formatArticleNormalMode(Feed* feed, const Article& article) { TQString text; - text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").tqarg(TQApplication::reverseLayout() ? "rtl" : "ltr"); + text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").arg(TQApplication::reverseLayout() ? "rtl" : "ltr"); if (!article.title().isEmpty()) { - text += TQString("<div class=\"headertitle\" dir=\"%1\">\n").tqarg(directionOf(Utils::stripTags(article.title()))); + text += TQString("<div class=\"headertitle\" dir=\"%1\">\n").arg(directionOf(Utils::stripTags(article.title()))); if (article.link().isValid()) text += "<a href=\""+article.link().url()+"\">"; text += article.title().replace("<", "<").replace(">", ">"); // TODO: better leave things escaped in the parser @@ -417,16 +417,16 @@ TQString ArticleViewer::formatArticleNormalMode(Feed* feed, const Article& artic } if (article.pubDate().isValid()) { - text += TQString("<span class=\"header\" dir=\"%1\">").tqarg(directionOf(i18n("Date"))); - text += TQString ("%1:").tqarg(i18n("Date")); + text += TQString("<span class=\"header\" dir=\"%1\">").arg(directionOf(i18n("Date"))); + text += TQString ("%1:").arg(i18n("Date")); text += "</span><span class=\"headertext\">"; text += KGlobal::locale()->formatDateTime(article.pubDate(), false, false)+"</span>\n"; // TODO: might need RTL? } TQString author = article.author(); if (!author.isEmpty()) { - text += TQString("<br/><span class=\"header\" dir=\"%1\">").tqarg(directionOf(i18n("Author"))); - text += TQString ("%1:").tqarg(i18n("Author")); + text += TQString("<br/><span class=\"header\" dir=\"%1\">").arg(directionOf(i18n("Author"))); + text += TQString ("%1:").arg(i18n("Author")); text += "</span><span class=\"headertext\">"; text += author+"</span>\n"; // TODO: might need RTL? } @@ -437,14 +437,14 @@ TQString ArticleViewer::formatArticleNormalMode(Feed* feed, const Article& artic TQString file = Utils::fileNameForUrl(feed->xmlUrl()); KURL u(m_imageDir); u.setFileName(file); - text += TQString("<a href=\"%1\"><img class=\"headimage\" src=\"%2.png\"></a>\n").tqarg(feed->htmlUrl()).tqarg(u.url()); + text += TQString("<a href=\"%1\"><img class=\"headimage\" src=\"%2.png\"></a>\n").arg(feed->htmlUrl()).arg(u.url()); } if (!article.description().isEmpty()) { - text += TQString("<div dir=\"%1\">").tqarg(directionOf(Utils::stripTags(article.description())) ); + text += TQString("<div dir=\"%1\">").arg(directionOf(Utils::stripTags(article.description())) ); text += "<span class=\"content\">"+article.description()+"</span>"; text += "</div>"; } @@ -486,7 +486,7 @@ TQString ArticleViewer::formatArticleNormalMode(Feed* feed, const Article& artic //int length = article.enclosure().length(); //TQString lengthStr = KIO::convertSize(length); - //text += TQString("<hr><div><a href=\"%1\">%2</a> (%3, %4)</div>").tqarg(url).tqarg(url).tqarg(lengthStr).tqarg(type); + //text += TQString("<hr><div><a href=\"%1\">%2</a> (%3, %4)</div>").arg(url).arg(url).arg(lengthStr).arg(type); } //kdDebug() << text << endl; return text; @@ -496,13 +496,13 @@ TQString ArticleViewer::formatArticleNormalMode(Feed* feed, const Article& artic TQString ArticleViewer::formatArticleCombinedMode(Feed* feed, const Article& article) { TQString text; - text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").tqarg(TQApplication::reverseLayout() ? "rtl" : "ltr"); + text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").arg(TQApplication::reverseLayout() ? "rtl" : "ltr"); KURL link = article.link(); if (!article.title().isEmpty()) { - text += TQString("<div class=\"headertitle\" dir=\"%1\">\n").tqarg(directionOf(Utils::stripTags(article.title()))); + text += TQString("<div class=\"headertitle\" dir=\"%1\">\n").arg(directionOf(Utils::stripTags(article.title()))); if (link.isValid()) text += "<a href=\""+link.url()+"\">"; text += article.title().replace("<", "<").replace(">", ">"); // TODO: better leave things escaped in the parser @@ -512,8 +512,8 @@ TQString ArticleViewer::formatArticleCombinedMode(Feed* feed, const Article& art } if (article.pubDate().isValid()) { - text += TQString("<span class=\"header\" dir=\"%1\">").tqarg(directionOf(i18n("Date"))); - text += TQString ("%1:").tqarg(i18n("Date")); + text += TQString("<span class=\"header\" dir=\"%1\">").arg(directionOf(i18n("Date"))); + text += TQString ("%1:").arg(i18n("Date")); text += "</span><span class=\"headertext\">"; text += KGlobal::locale()->formatDateTime(article.pubDate(), false, false)+"</span>\n"; // TODO: might need RTL? } @@ -521,8 +521,8 @@ TQString ArticleViewer::formatArticleCombinedMode(Feed* feed, const Article& art TQString author = article.author(); if (!author.isEmpty()) { - text += TQString("<br/><span class=\"header\" dir=\"%1\">").tqarg(directionOf(i18n("Author"))); - text += TQString ("%1:").tqarg(i18n("Author")); + text += TQString("<br/><span class=\"header\" dir=\"%1\">").arg(directionOf(i18n("Author"))); + text += TQString ("%1:").arg(i18n("Author")); text += "</span><span class=\"headertext\">"; text += author+"</span>\n"; // TODO: might need RTL? } @@ -534,14 +534,14 @@ TQString ArticleViewer::formatArticleCombinedMode(Feed* feed, const Article& art TQString file = Utils::fileNameForUrl(feed->xmlUrl()); KURL u(m_imageDir); u.setFileName(file); - text += TQString("<a href=\"%1\"><img class=\"headimage\" src=\"%2.png\"></a>\n").tqarg(feed->htmlUrl()).tqarg(u.url()); + text += TQString("<a href=\"%1\"><img class=\"headimage\" src=\"%2.png\"></a>\n").arg(feed->htmlUrl()).arg(u.url()); } if (!article.description().isEmpty()) { - text += TQString("<div dir=\"%1\">").tqarg(directionOf(Utils::stripTags(article.description())) ); + text += TQString("<div dir=\"%1\">").arg(directionOf(Utils::stripTags(article.description())) ); text += "<span class=\"content\">"+article.description()+"</span>"; text += "</div>"; } diff --git a/akregator/src/feed.cpp b/akregator/src/feed.cpp index f24c48095..cb62b53a1 100644 --- a/akregator/src/feed.cpp +++ b/akregator/src/feed.cpp @@ -402,7 +402,7 @@ void Feed::slotMarkAllArticlesAsRead() TQValueList<Article>::Iterator en = tarticles.end(); for (it = tarticles.begin(); it != en; ++it) - (*it).seStatus(Article::Read); + (*it).setStatus(Article::Read); setNotificationMode(true, true); } } @@ -464,9 +464,9 @@ void Feed::appendArticles(const RSS::Document &doc) d->addedArticlesNotify.append(mya); if (!mya.isDeleted() && !markImmediatelyAsRead()) - mya.seStatus(Article::New); + mya.setStatus(Article::New); else - mya.seStatus(Article::Read); + mya.setStatus(Article::Read); changed = true; } @@ -479,12 +479,12 @@ void Feed::appendArticles(const RSS::Document &doc) { mya.setKeep(old.keep()); int oldstatus = old.status(); - old.seStatus(Article::Read); + old.setStatus(Article::Read); d->articles.remove(old.guid()); appendArticle(mya); - mya.seStatus(oldstatus); + mya.setStatus(oldstatus); d->updatedArticlesNotify.append(mya); changed = true; @@ -558,7 +558,7 @@ void Feed::fetch(bool followDiscovery) { if ((*it).status() == Article::New) { - (*it).seStatus(Article::Unread); + (*it).setStatus(Article::Unread); } } diff --git a/akregator/src/feedlist.cpp b/akregator/src/feedlist.cpp index 1daf1aa63..e05aded8a 100644 --- a/akregator/src/feedlist.cpp +++ b/akregator/src/feedlist.cpp @@ -222,10 +222,10 @@ void FeedList::append(FeedList* list, Folder* parent, TreeNode* after) if ( !flatList()->contains(parent) ) parent = rootNode(); - TQValueList<TreeNode*> tqchildren = list->rootNode()->tqchildren(); + TQValueList<TreeNode*> children = list->rootNode()->children(); - TQValueList<TreeNode*>::ConstIterator end( tqchildren.end() ); - for (TQValueList<TreeNode*>::ConstIterator it = tqchildren.begin(); it != end; ++it) + TQValueList<TreeNode*>::ConstIterator end( children.end() ); + for (TQValueList<TreeNode*>::ConstIterator it = children.begin(); it != end; ++it) { list->rootNode()->removeChild(*it); parent->insertChild(*it, after); @@ -254,11 +254,11 @@ TQDomDocument FeedList::toXML() const TQDomElement body = doc.createElement( "body" ); root.appendChild( body ); - TQValueList<TreeNode*> tqchildren = rootNode()->tqchildren(); + TQValueList<TreeNode*> children = rootNode()->children(); - TQValueList<TreeNode*>::ConstIterator end( tqchildren.end() ); + TQValueList<TreeNode*>::ConstIterator end( children.end() ); - for (TQValueList<TreeNode*>::ConstIterator it = tqchildren.begin(); it != end; ++it) + for (TQValueList<TreeNode*>::ConstIterator it = children.begin(); it != end; ++it) body.appendChild( (*it)->toOPML(body, doc) ); return doc; diff --git a/akregator/src/feedlistview.cpp b/akregator/src/feedlistview.cpp index aa6101ded..8998882ff 100644 --- a/akregator/src/feedlistview.cpp +++ b/akregator/src/feedlistview.cpp @@ -180,8 +180,8 @@ class NodeListView::DeleteItemVisitor : public TreeNodeVisitor virtual bool visitFolder(Folder* node) { // delete child items recursively before deleting parent - TQValueList<TreeNode*> tqchildren = node->tqchildren(); - for (TQValueList<TreeNode*>::ConstIterator it = tqchildren.begin(); it != tqchildren.end(); ++it ) + TQValueList<TreeNode*> children = node->children(); + for (TQValueList<TreeNode*>::ConstIterator it = children.begin(); it != children.end(); ++it ) visit(*it); visitTreeNode(node); @@ -267,10 +267,10 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor } m_view->d->itemDict.insert(node, item); - TQValueList<TreeNode*> tqchildren = node->tqchildren(); + TQValueList<TreeNode*> children = node->children(); - // add tqchildren recursively - for (TQValueList<TreeNode*>::ConstIterator it = tqchildren.begin(); it != tqchildren.end(); ++it ) + // add children recursively + for (TQValueList<TreeNode*>::ConstIterator it = children.begin(); it != children.end(); ++it ) visit(*it); m_view->connectToNode(node); @@ -305,9 +305,9 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor } m_view->d->itemDict.insert(node, item); - // add tqchildren recursively - TQValueList<TreeNode*> tqchildren = node->tqchildren(); - for (TQValueList<TreeNode*>::ConstIterator it = tqchildren.begin(); it != tqchildren.end(); ++it ) + // add children recursively + TQValueList<TreeNode*> children = node->children(); + for (TQValueList<TreeNode*>::ConstIterator it = children.begin(); it != children.end(); ++it ) visit(*it); m_view->connectToNode(node); diff --git a/akregator/src/feedlistview.h b/akregator/src/feedlistview.h index 52952089d..8d4394e10 100644 --- a/akregator/src/feedlistview.h +++ b/akregator/src/feedlistview.h @@ -157,7 +157,7 @@ protected slots: /** Called when a node in the tree is taken out of the tree (parent->removeChild()) - Removes a node and its tqchildren from the tree. Note that it doesn't delete the corresponding view items (get deleted only when the node itself gets deleted) */ + Removes a node and its children from the tree. Note that it doesn't delete the corresponding view items (get deleted only when the node itself gets deleted) */ virtual void slotNodeRemoved(Folder* parent, TreeNode* node); /** deletes the item belonging to the deleted node */ diff --git a/akregator/src/feedstorage.h b/akregator/src/feedstorage.h index 98176756a..23a8b9751 100644 --- a/akregator/src/feedstorage.h +++ b/akregator/src/feedstorage.h @@ -111,7 +111,7 @@ class AKREGATOR_EXPORT FeedStorage : public TQObject virtual uint pubDate(const TQString& guid) = 0; virtual void setPubDate(const TQString& guid, uint pubdate) = 0; virtual int status(const TQString& guid) = 0; - virtual void seStatus(const TQString& guid, int status) = 0; + virtual void setStatus(const TQString& guid, int status) = 0; virtual TQString title(const TQString& guid) = 0; virtual void setTitle(const TQString& guid, const TQString& title) = 0; virtual TQString description(const TQString& guid) = 0; diff --git a/akregator/src/feedstoragedummyimpl.cpp b/akregator/src/feedstoragedummyimpl.cpp index 6fe973954..1dd23b060 100644 --- a/akregator/src/feedstoragedummyimpl.cpp +++ b/akregator/src/feedstoragedummyimpl.cpp @@ -246,7 +246,7 @@ int FeedStorageDummyImpl::status(const TQString& guid) return contains(guid) ? d->entries[guid].status : 0; } -void FeedStorageDummyImpl::seStatus(const TQString& guid, int status) +void FeedStorageDummyImpl::setStatus(const TQString& guid, int status) { if (contains(guid)) d->entries[guid].status = status; @@ -407,7 +407,7 @@ void FeedStorageDummyImpl::copyArticle(const TQString& guid, FeedStorage* source setHash(guid, source->hash(guid)); setLink(guid, source->link(guid)); setPubDate(guid, source->pubDate(guid)); - seStatus(guid, source->status(guid)); + setStatus(guid, source->status(guid)); setTitle(guid, source->title(guid)); TQStringList tags = source->tags(guid); diff --git a/akregator/src/feedstoragedummyimpl.h b/akregator/src/feedstoragedummyimpl.h index fc9ab31f2..78378959d 100644 --- a/akregator/src/feedstoragedummyimpl.h +++ b/akregator/src/feedstoragedummyimpl.h @@ -69,7 +69,7 @@ class FeedStorageDummyImpl : public FeedStorage virtual uint pubDate(const TQString& guid); virtual void setPubDate(const TQString& guid, uint pubdate); virtual int status(const TQString& guid); - virtual void seStatus(const TQString& guid, int status); + virtual void setStatus(const TQString& guid, int status); virtual TQString title(const TQString& guid); virtual void setTitle(const TQString& guid, const TQString& title); virtual TQString description(const TQString& guid); diff --git a/akregator/src/folder.cpp b/akregator/src/folder.cpp index 824fc4db7..739b0cf19 100644 --- a/akregator/src/folder.cpp +++ b/akregator/src/folder.cpp @@ -39,9 +39,9 @@ namespace Akregator { class Folder::FolderPrivate { public: - /** List of tqchildren */ - TQValueList<TreeNode*> tqchildren; - /** caching unread count of tqchildren */ + /** List of children */ + TQValueList<TreeNode*> children; + /** caching unread count of children */ int unread; /** whether or not the folder is expanded */ bool open; @@ -77,7 +77,7 @@ Folder::Folder(const TQString& title) : TreeNode(), d(new FolderPrivate) Folder::~Folder() { TreeNode* tmp = 0; - for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != d->tqchildren.end(); ++it) + for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != d->children.end(); ++it) { delete tmp; tmp = *it; @@ -93,8 +93,8 @@ Folder::~Folder() TQStringList Folder::tags() const { TQStringList t; - TQValueList<TreeNode*>::ConstIterator en = d->tqchildren.end(); - for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != en; ++it) + TQValueList<TreeNode*>::ConstIterator en = d->children.end(); + for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it) { // intersect tag sets instead of appending lists, to avoid dupes. This sucks. Definitely. I want TQSet. Now. TQStringList t2 = (*it)->tags(); @@ -108,8 +108,8 @@ TQStringList Folder::tags() const TQValueList<Article> Folder::articles(const TQString& tag) { TQValueList<Article> seq; - TQValueList<TreeNode*>::ConstIterator en = d->tqchildren.end(); - for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != en; ++it) + TQValueList<TreeNode*>::ConstIterator en = d->children.end(); + for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it) seq += (*it)->articles(tag); return seq; @@ -123,21 +123,21 @@ TQDomElement Folder::toOPML( TQDomElement parent, TQDomDocument document ) const el.setAttribute("isOpen", d->open ? "true" : "false"); el.setAttribute( "id", TQString::number(id()) ); - TQValueList<TreeNode*>::ConstIterator en = d->tqchildren.end(); - for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != en; ++it) + TQValueList<TreeNode*>::ConstIterator en = d->children.end(); + for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it) el.appendChild( (*it)->toOPML(el, document) ); return el; } -TQValueList<TreeNode*> Folder::tqchildren() const +TQValueList<TreeNode*> Folder::children() const { - return d->tqchildren; + return d->children; } void Folder::insertChild(TreeNode* node, TreeNode* after) { - int pos = d->tqchildren.findIndex(after); + int pos = d->children.findIndex(after); if (pos < 0) prependChild(node); @@ -150,10 +150,10 @@ void Folder::insertChild(uint index, TreeNode* node) // kdDebug() << "enter Folder::insertChild(int, node) " << node->title() << endl; if (node) { - if (index >= d->tqchildren.size()) - d->tqchildren.append(node); + if (index >= d->children.size()) + d->children.append(node); else - d->tqchildren.insert(d->tqchildren.at(index), node); + d->children.insert(d->children.at(index), node); node->setParent(this); connectToNode(node); updateUnreadCount(); @@ -170,7 +170,7 @@ void Folder::appendChild(TreeNode* node) // kdDebug() << "enter Folder::appendChild() " << node->title() << endl; if (node) { - d->tqchildren.append(node); + d->children.append(node); node->setParent(this); connectToNode(node); updateUnreadCount(); @@ -187,7 +187,7 @@ void Folder::prependChild(TreeNode* node) // kdDebug() << "enter Folder::prependChild() " << node->title() << endl; if (node) { - d->tqchildren.prepend(node); + d->children.prepend(node); node->setParent(this); connectToNode(node); updateUnreadCount(); @@ -202,10 +202,10 @@ void Folder::prependChild(TreeNode* node) void Folder::removeChild(TreeNode* node) { // kdDebug() << "enter Folder::removeChild() node:" << (node ? node->title() : "null") << endl; - if (node && d->tqchildren.contains(node)) + if (node && d->children.contains(node)) { node->setParent(0); - d->tqchildren.remove(node); + d->children.remove(node); disconnectFromNode(node); updateUnreadCount(); emit signalChildRemoved(this, node); @@ -219,12 +219,12 @@ void Folder::removeChild(TreeNode* node) TreeNode* Folder::firstChild() { - return d->tqchildren.isEmpty() ? 0 : d->tqchildren.first(); + return d->children.isEmpty() ? 0 : d->children.first(); } TreeNode* Folder::lastChild() { - return d->tqchildren.isEmpty() ? 0 : d->tqchildren.last(); + return d->children.isEmpty() ? 0 : d->children.last(); } bool Folder::isOpen() const @@ -246,8 +246,8 @@ int Folder::totalCount() const { int totalCount = 0; - TQValueList<TreeNode*>::ConstIterator en = d->tqchildren.end(); - for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != en; ++it) + TQValueList<TreeNode*>::ConstIterator en = d->children.end(); + for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it) totalCount += (*it)->totalCount(); return totalCount; @@ -257,8 +257,8 @@ void Folder::updateUnreadCount() { int unread = 0; - TQValueList<TreeNode*>::ConstIterator en = d->tqchildren.end(); - for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != en; ++it) + TQValueList<TreeNode*>::ConstIterator en = d->children.end(); + for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it) unread += (*it)->unread(); d->unread = unread; @@ -267,8 +267,8 @@ void Folder::updateUnreadCount() void Folder::slotMarkAllArticlesAsRead() { setNotificationMode(false); - TQValueList<TreeNode*>::ConstIterator en = d->tqchildren.end(); - for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != en; ++it) + TQValueList<TreeNode*>::ConstIterator en = d->children.end(); + for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it) (*it)->slotMarkAllArticlesAsRead(); setNotificationMode(true, true); } @@ -281,7 +281,7 @@ void Folder::slotChildChanged(TreeNode* /*node*/) void Folder::slotChildDestroyed(TreeNode* node) { - d->tqchildren.remove(node); + d->children.remove(node); updateUnreadCount(); nodeModified(); } @@ -289,16 +289,16 @@ void Folder::slotChildDestroyed(TreeNode* node) void Folder::slotDeleteExpiredArticles() { setNotificationMode(false); - TQValueList<TreeNode*>::ConstIterator en = d->tqchildren.end(); - for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != en; ++it) + TQValueList<TreeNode*>::ConstIterator en = d->children.end(); + for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it) (*it)->slotDeleteExpiredArticles(); setNotificationMode(true, true); } void Folder::slotAddToFetchQueue(FetchQueue* queue, bool intervalFetchOnly) { - TQValueList<TreeNode*>::ConstIterator en = d->tqchildren.end(); - for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != en; ++it) + TQValueList<TreeNode*>::ConstIterator en = d->children.end(); + for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it) (*it)->slotAddToFetchQueue(queue, intervalFetchOnly); } diff --git a/akregator/src/folder.h b/akregator/src/folder.h index 6743dd573..f2a024dd6 100644 --- a/akregator/src/folder.h +++ b/akregator/src/folder.h @@ -61,18 +61,18 @@ namespace Akregator virtual bool accept(TreeNodeVisitor* visitor); - /** returns recursively concatenated articles of tqchildren - @return an article sequence containing articles of tqchildren */ + /** returns recursively concatenated articles of children + @return an article sequence containing articles of children */ virtual TQValueList<Article> articles(const TQString& tag=TQString()); /** returns a list of all tags occurring in the subtree of this folder */ virtual TQStringList tags() const; - /** returns the number of unread articles in all tqchildren + /** returns the number of unread articles in all children @return number of unread articles */ virtual int unread() const; - /** returns the number of articles in all tqchildren + /** returns the number of articles in all children @return number of articles */ virtual int totalCount() const; @@ -86,10 +86,10 @@ namespace Akregator @return The newly created element representing this feed group */ virtual TQDomElement toOPML( TQDomElement parent, TQDomDocument document ) const; - /** returns the (direct) tqchildren of this node. + /** returns the (direct) children of this node. @return a list of pointers to the child nodes */ - virtual TQValueList<TreeNode*> tqchildren() const; + virtual TQValueList<TreeNode*> children() const; /** inserts @c node as child after child node @c after. if @c after is not a child of this group, @c node will be inserted as first child @@ -105,7 +105,7 @@ namespace Akregator @param node the tree node to insert */ virtual void appendChild(TreeNode* node); - /** remove @c node from tqchildren. Note that @c node will not be deleted + /** remove @c node from children. Note that @c node will not be deleted @param node the child node to remove */ virtual void removeChild(TreeNode* node); @@ -134,7 +134,7 @@ namespace Akregator /** Delete expired articles recursively. */ virtual void slotDeleteExpiredArticles(); - /** Mark articles of tqchildren recursively as read. */ + /** Mark articles of children recursively as read. */ virtual void slotMarkAllArticlesAsRead(); /** Called when a child was modified. @@ -147,7 +147,7 @@ namespace Akregator */ virtual void slotChildDestroyed(TreeNode* node); - /** enqueues tqchildren recursively for fetching + /** enqueues children recursively for fetching @param queue a fetch queue @param internvalFetchesOnly */ virtual void slotAddToFetchQueue(FetchQueue* queue, bool intervalFetchesOnly=false); diff --git a/akregator/src/frame.cpp b/akregator/src/frame.cpp index 5cc95b8bd..baa472fd2 100644 --- a/akregator/src/frame.cpp +++ b/akregator/src/frame.cpp @@ -51,7 +51,7 @@ Frame::Frame(TQObject * parent, KParts::ReadOnlyPart *p, TQWidget *visWidget, co if (watchSignals) // e.g, articles tab has no part { connect(m_part, TQT_SIGNAL(setWindowCaption (const TQString &)), this, TQT_SLOT(setCaption (const TQString &))); - connect(m_part, TQT_SIGNAL(seStatusBarText (const TQString &)), this, TQT_SLOT(seStatusText (const TQString &))); + connect(m_part, TQT_SIGNAL(setStatusBarText (const TQString &)), this, TQT_SLOT(setStatusText (const TQString &))); KParts::BrowserExtension *ext=KParts::BrowserExtension::childObject( p ); if (ext) @@ -120,7 +120,7 @@ void Frame::setCaption(const TQString &s) emit captionChanged(s); } -void Frame::seStatusText(const TQString &s) +void Frame::setStatusText(const TQString &s) { m_statusText=s; m_statusText.replace(TQRegExp("<[^>]*>"), ""); @@ -175,7 +175,7 @@ void Frame::setStarted() { if(m_progressId.isNull() || m_progressId.isEmpty()) m_progressId = KPIM::ProgressManager::getUniqueID(); m_progressItem = KPIM::ProgressManager::createProgressItem(m_progressId, TQStyleSheet::escape( title() ), TQString(), false); - m_progressItem->seStatus(i18n("Loading...")); + m_progressItem->setStatus(i18n("Loading...")); //connect(m_progressItem, TQT_SIGNAL(progressItemCanceled(KPIM::ProgressItem*)), TQT_SLOT(slotAbortFetch())); m_state=Started; emit started(); @@ -184,7 +184,7 @@ void Frame::setStarted() void Frame::setCanceled(const TQString &s) { if(m_progressItem) { - m_progressItem->seStatus(i18n("Loading canceled")); + m_progressItem->setStatus(i18n("Loading canceled")); m_progressItem->setComplete(); m_progressItem = 0; } @@ -195,7 +195,7 @@ void Frame::setCanceled(const TQString &s) void Frame::setCompleted() { if(m_progressItem) { - m_progressItem->seStatus(i18n("Loading completed")); + m_progressItem->setStatus(i18n("Loading completed")); m_progressItem->setComplete(); m_progressItem = 0; } diff --git a/akregator/src/frame.h b/akregator/src/frame.h index 24a879546..981a46611 100644 --- a/akregator/src/frame.h +++ b/akregator/src/frame.h @@ -70,7 +70,7 @@ namespace Akregator void setProgress(int); void setCaption(const TQString &); void setTitle(const TQString &); - void seStatusText(const TQString &); + void setStatusText(const TQString &); signals: void captionChanged(const TQString &); diff --git a/akregator/src/kcursorsaver.h b/akregator/src/kcursorsaver.h index 96c100e4c..95dca1f6e 100644 --- a/akregator/src/kcursorsaver.h +++ b/akregator/src/kcursorsaver.h @@ -17,9 +17,9 @@ namespace Akregator { class KCursorSaver : public TQt { public: - /// constructor taking TQCursor tqshapes - KCursorSaver(TQt::CursorShape tqshape) { - TQApplication::setOverrideCursor( TQCursor(tqshape) ); + /// constructor taking TQCursor shapes + KCursorSaver(TQt::CursorShape shape) { + TQApplication::setOverrideCursor( TQCursor(shape) ); inited = true; } diff --git a/akregator/src/librss/tools_p.cpp b/akregator/src/librss/tools_p.cpp index 909d95805..bd8ce39b3 100644 --- a/akregator/src/librss/tools_p.cpp +++ b/akregator/src/librss/tools_p.cpp @@ -239,7 +239,7 @@ TQString parseItemAuthor(const TQDomElement& element, Format format, Version ver name = email; if (!email.isNull()) - return TQString("<a href=\"mailto:%1\">%2</a>").tqarg(email).tqarg(name); + return TQString("<a href=\"mailto:%1\">%2</a>").arg(email).arg(name); else return name; } diff --git a/akregator/src/listtabwidget.cpp b/akregator/src/listtabwidget.cpp index a137f1fe7..77957ac69 100644 --- a/akregator/src/listtabwidget.cpp +++ b/akregator/src/listtabwidget.cpp @@ -125,7 +125,7 @@ void ListTabWidget::slotRootNodeChanged(NodeListView* view, TreeNode* node) if (unread > 0) { //uncomment this to append unread count - //d->tabWidget->changeTab(view, TQString("<qt>%1 (%2)").tqarg(d->captions[view]).tqarg(node->unread())); + //d->tabWidget->changeTab(view, TQString("<qt>%1 (%2)").arg(d->captions[view]).arg(node->unread())); d->tabWidget->changeTab(view, d->captions[view]); } else diff --git a/akregator/src/mk4storage/feedstoragemk4impl.cpp b/akregator/src/mk4storage/feedstoragemk4impl.cpp index 32af90966..3b567933b 100644 --- a/akregator/src/mk4storage/feedstoragemk4impl.cpp +++ b/akregator/src/mk4storage/feedstoragemk4impl.cpp @@ -401,7 +401,7 @@ int FeedStorageMK4Impl::status(const TQString& guid) return findidx != -1 ? d->pstatus(d->archiveView.GetAt(findidx)) : 0; } -void FeedStorageMK4Impl::seStatus(const TQString& guid, int status) +void FeedStorageMK4Impl::setStatus(const TQString& guid, int status) { int findidx = findArticle(guid); if (findidx == -1) @@ -799,7 +799,7 @@ void FeedStorageMK4Impl::copyArticle(const TQString& guid, FeedStorage* source) setHash(guid, source->hash(guid)); setLink(guid, source->link(guid)); setPubDate(guid, source->pubDate(guid)); - seStatus(guid, source->status(guid)); + setStatus(guid, source->status(guid)); setTitle(guid, source->title(guid)); setAuthor(guid, source->author(guid)); diff --git a/akregator/src/mk4storage/feedstoragemk4impl.h b/akregator/src/mk4storage/feedstoragemk4impl.h index 6dff8283b..ec2e8658e 100644 --- a/akregator/src/mk4storage/feedstoragemk4impl.h +++ b/akregator/src/mk4storage/feedstoragemk4impl.h @@ -69,7 +69,7 @@ class FeedStorageMK4Impl : public FeedStorage virtual uint pubDate(const TQString& guid); virtual void setPubDate(const TQString& guid, uint pubdate); virtual int status(const TQString& guid); - virtual void seStatus(const TQString& guid, int status); + virtual void setStatus(const TQString& guid, int status); virtual TQString title(const TQString& guid); virtual void setTitle(const TQString& guid, const TQString& title); virtual TQString description(const TQString& guid); diff --git a/akregator/src/mk4storage/metakit/CHANGES b/akregator/src/mk4storage/metakit/CHANGES index 4f167afbc..20cd91d39 100644 --- a/akregator/src/mk4storage/metakit/CHANGES +++ b/akregator/src/mk4storage/metakit/CHANGES @@ -996,9 +996,9 @@ M-solaris.sh and M-dyn.sh scripts need to be manually edited when choosing between CC and gcc. -2001-03-27 Double-tqalignment bug on Solaris +2001-03-27 Double-alignment bug on Solaris - Two changes (c4_Bytes in mk4.h and src/column.h) to fix an tqalignment + Two changes (c4_Bytes in mk4.h and src/column.h) to fix an alignment problem for 8-byte doubles on Solaris. This caused tests b17, b23, b24, s22, and s28 to fail. @@ -1084,7 +1084,7 @@ 2000-10-03 Fixes for Alpha Unix - Moved _item in column.h up to fix tqalignment sensitivity. Config.h + Moved _item in column.h up to fix alignment sensitivity. Config.h did not get SIZE_LONG right on Alpha Unix (0?). 2000-09-27 Contributed fixes and Python 2.0b2 diff --git a/akregator/src/mk4storage/metakit/README b/akregator/src/mk4storage/metakit/README index 314c956b9..21edd0fc2 100644 --- a/akregator/src/mk4storage/metakit/README +++ b/akregator/src/mk4storage/metakit/README @@ -40,7 +40,7 @@ WEBSITE URLS - The main pages on the world wide web, for news and downloads: License info: http://www.equi4.com/mklicense.html Contact info: http://www.equi4.com/contact.html -ACKNOWLEDGEMENTS - Thanks to everyone who has helped tqshape and extend Metakit, +ACKNOWLEDGEMENTS - Thanks to everyone who has helped shape and extend Metakit, including Kyrill Denisenko, Mark Roseman, Gordon McMillan, Matt Newman, Christian Tismer, John Bushakra, Steve Landers, Jacob Levy, John Barnard, Nicholas Riley, Brian Kelley, and many more people who have reported bugs diff --git a/akregator/src/mk4storage/metakit/src/column.h b/akregator/src/mk4storage/metakit/src/column.h index 96d1622ef..3f6e4f157 100644 --- a/akregator/src/mk4storage/metakit/src/column.h +++ b/akregator/src/mk4storage/metakit/src/column.h @@ -169,7 +169,7 @@ private: tSetter _setter; union { - t4_byte _item[8]; // holds temp result (careful with tqalignment!) + t4_byte _item[8]; // holds temp result (careful with alignment!) double _aligner; // needed for SPARC }; diff --git a/akregator/src/nodelist.cpp b/akregator/src/nodelist.cpp index 6bcee5f6d..e79acb20d 100644 --- a/akregator/src/nodelist.cpp +++ b/akregator/src/nodelist.cpp @@ -165,9 +165,9 @@ void NodeList::clear() { Q_ASSERT(rootNode()); - TQValueList<TreeNode*> tqchildren = rootNode()->tqchildren(); + TQValueList<TreeNode*> children = rootNode()->children(); - for (TQValueList<TreeNode*>::ConstIterator it = tqchildren.begin(); it != tqchildren.end(); ++it) + for (TQValueList<TreeNode*>::ConstIterator it = children.begin(); it != children.end(); ++it) delete *it; // emits signal "emitSignalDestroyed" } diff --git a/akregator/src/notificationmanager.cpp b/akregator/src/notificationmanager.cpp index ce4251b87..6220e97c0 100644 --- a/akregator/src/notificationmanager.cpp +++ b/akregator/src/notificationmanager.cpp @@ -76,7 +76,7 @@ void NotificationManager::slotNotifyFeeds(const TQStringList& feeds) if (feeds.count() == 1) { KNotifyClient::Instance inst(m_instance); - KNotifyClient::event(m_widget->winId(), "feed_added", i18n("Feed added:\n %1").tqarg(feeds[0])); + KNotifyClient::event(m_widget->winId(), "feed_added", i18n("Feed added:\n %1").arg(feeds[0])); } else if (feeds.count() > 1) { @@ -84,7 +84,7 @@ void NotificationManager::slotNotifyFeeds(const TQStringList& feeds) for (TQStringList::ConstIterator it = feeds.begin(); it != feeds.end(); ++it) message += *it + "\n"; KNotifyClient::Instance inst(m_instance); - KNotifyClient::event(m_widget->winId(), "feed_added", i18n("Feeds added:\n %1").tqarg(message)); + KNotifyClient::event(m_widget->winId(), "feed_added", i18n("Feeds added:\n %1").arg(message)); } } @@ -99,7 +99,7 @@ void NotificationManager::doNotify() if (feedTitle != (*it).feed()->title()) { feedTitle = (*it).feed()->title(); - message += TQString("<p><b>%1:</b></p>").tqarg(feedTitle); + message += TQString("<p><b>%1:</b></p>").arg(feedTitle); } message += (*it).title() + "<br>"; } diff --git a/akregator/src/pluginmanager.cpp b/akregator/src/pluginmanager.cpp index 108fcf9b1..d12016d45 100644 --- a/akregator/src/pluginmanager.cpp +++ b/akregator/src/pluginmanager.cpp @@ -92,8 +92,8 @@ PluginManager::createFromService( const KService::Ptr service ) if ( !lib ) { KMessageBox::error( 0, i18n( "<p>KLibLoader could not load the plugin:<br/><i>%1</i></p>" "<p>Error message:<br/><i>%2</i></p>" ) - .tqarg( service->library() ) - .tqarg( loader->lastErrorMessage() ) ); + .arg( service->library() ) + .arg( loader->lastErrorMessage() ) ); return 0; } //look up address of init function and cast it to pointer-to-function @@ -167,12 +167,12 @@ PluginManager::showAbout( const TQString &constraint ) TQString str = "<html><body><table width=\"100%\" border=\"1\">"; - str += body.tqarg( i18n( "Name" ), s->name() ); - str += body.tqarg( i18n( "Library" ), s->library() ); - str += body.tqarg( i18n( "Authors" ), s->property( "X-KDE-akregator-authors" ).toStringList().join( "\n" ) ); - str += body.tqarg( i18n( "Email" ), s->property( "X-KDE-akregator-email" ).toStringList().join( "\n" ) ); - str += body.tqarg( i18n( "Version" ), s->property( "X-KDE-akregator-version" ).toString() ); - str += body.tqarg( i18n( "Framework Version" ), s->property( "X-KDE-akregator-framework-version" ).toString() ); + str += body.arg( i18n( "Name" ), s->name() ); + str += body.arg( i18n( "Library" ), s->library() ); + str += body.arg( i18n( "Authors" ), s->property( "X-KDE-akregator-authors" ).toStringList().join( "\n" ) ); + str += body.arg( i18n( "Email" ), s->property( "X-KDE-akregator-email" ).toStringList().join( "\n" ) ); + str += body.arg( i18n( "Version" ), s->property( "X-KDE-akregator-version" ).toString() ); + str += body.arg( i18n( "Framework Version" ), s->property( "X-KDE-akregator-framework-version" ).toString() ); str += "</table></body></html>"; diff --git a/akregator/src/progressmanager.cpp b/akregator/src/progressmanager.cpp index 6b6ae4e6c..07290a13f 100644 --- a/akregator/src/progressmanager.cpp +++ b/akregator/src/progressmanager.cpp @@ -178,7 +178,7 @@ void ProgressItemHandler::slotFetchCompleted() { if (d->progressItem) { - d->progressItem->seStatus(i18n("Fetch completed")); + d->progressItem->setStatus(i18n("Fetch completed")); d->progressItem->setComplete(); d->progressItem = 0; } @@ -188,7 +188,7 @@ void ProgressItemHandler::slotFetchError() { if (d->progressItem) { - d->progressItem->seStatus(i18n("Fetch error")); + d->progressItem->setStatus(i18n("Fetch error")); d->progressItem->setComplete(); d->progressItem = 0; } @@ -198,7 +198,7 @@ void ProgressItemHandler::slotFetchAborted() { if (d->progressItem) { - d->progressItem->seStatus(i18n("Fetch aborted")); + d->progressItem->setStatus(i18n("Fetch aborted")); d->progressItem->setComplete(); d->progressItem = 0; } diff --git a/akregator/src/propertiesdialog.cpp b/akregator/src/propertiesdialog.cpp index b5b732bae..a0f13c479 100644 --- a/akregator/src/propertiesdialog.cpp +++ b/akregator/src/propertiesdialog.cpp @@ -102,7 +102,7 @@ void FeedPropertiesDialog::slotSetCaption(const TQString& c) if(c.isEmpty()) setCaption(i18n("Feed Properties")); else - setCaption(i18n("Properties of %1").tqarg(c)); + setCaption(i18n("Properties of %1").arg(c)); } diff --git a/akregator/src/simplenodeselector.cpp b/akregator/src/simplenodeselector.cpp index 5370bebef..bb55e24c0 100644 --- a/akregator/src/simplenodeselector.cpp +++ b/akregator/src/simplenodeselector.cpp @@ -102,9 +102,9 @@ class SimpleNodeSelector::NodeVisitor : public TreeNodeVisitor virtual bool visitFolder(Folder* node) { visitTreeNode(node); - TQValueList<TreeNode*> tqchildren = node->tqchildren(); + TQValueList<TreeNode*> children = node->children(); m_view->d->nodeToItem[node]->setExpandable(true); - for (TQValueList<TreeNode*>::ConstIterator it = tqchildren.begin(); it != tqchildren.end(); ++it) + for (TQValueList<TreeNode*>::ConstIterator it = children.begin(); it != children.end(); ++it) createItems(*it); return true; } diff --git a/akregator/src/tagnode.cpp b/akregator/src/tagnode.cpp index 4c4789dfe..1f5743fd8 100644 --- a/akregator/src/tagnode.cpp +++ b/akregator/src/tagnode.cpp @@ -162,7 +162,7 @@ void TagNode::slotMarkAllArticlesAsRead() setNotificationMode(false); TQValueList<Article>::Iterator en = d->articles.end(); for (TQValueList<Article>::Iterator it = d->articles.begin(); it != en; ++it) - (*it).seStatus(Article::Read); + (*it).setStatus(Article::Read); setNotificationMode(true); } diff --git a/akregator/src/treenode.cpp b/akregator/src/treenode.cpp index 9cc716b45..a4ae0936e 100644 --- a/akregator/src/treenode.cpp +++ b/akregator/src/treenode.cpp @@ -93,23 +93,23 @@ TreeNode* TreeNode::nextSibling() const { if (!d->parent) return 0; - TQValueList<TreeNode*> tqchildren = d->parent->tqchildren(); + TQValueList<TreeNode*> children = d->parent->children(); TreeNode* me = (TreeNode*)this; - int idx = tqchildren.findIndex(me); + int idx = children.findIndex(me); - return idx+1 < tqchildren.size() ? *(tqchildren.at(idx+1)) : 0L; + return idx+1 < children.size() ? *(children.at(idx+1)) : 0L; } TreeNode* TreeNode::prevSibling() const { if (!d->parent) return 0; - TQValueList<TreeNode*> tqchildren = d->parent->tqchildren(); + TQValueList<TreeNode*> children = d->parent->children(); TreeNode* me = (TreeNode*)this; - int idx = tqchildren.findIndex(me); - return idx > 0 ? *(d->parent->tqchildren().at(idx-1)) : 0L; + int idx = children.findIndex(me); + return idx > 0 ? *(d->parent->children().at(idx-1)) : 0L; } Folder* TreeNode::parent() const diff --git a/certmanager/certificateinfowidgetimpl.cpp b/certmanager/certificateinfowidgetimpl.cpp index 1cf5a2b4b..3a6c3200f 100644 --- a/certmanager/certificateinfowidgetimpl.cpp +++ b/certmanager/certificateinfowidgetimpl.cpp @@ -126,7 +126,7 @@ void CertificateInfoWidgetImpl::setKey( const GpgME::Key & key ) { TQListViewItem * item = 0; item = new TQListViewItem( listView, item, i18n("Valid"), TQString("From %1 to %2") - .tqarg( time_t2string( key.subkey(0).creationTime() ), + .arg( time_t2string( key.subkey(0).creationTime() ), time_t2string( key.subkey(0).expirationTime() ) ) ); item = new TQListViewItem( listView, item, i18n("Can be used for signing"), key.canSign() ? i18n("Yes") : i18n("No") ); @@ -187,7 +187,7 @@ static void showChainListError( TQWidget * parent, const GpgME::Error & err, con const TQString msg = i18n("<qt><p>An error occurred while fetching " "the certificate <b>%1</b> from the backend:</p>" "<p><b>%2</b></p></qt>") - .tqarg( subject ? TQString::fromUtf8( subject ) : TQString(), + .arg( subject ? TQString::fromUtf8( subject ) : TQString(), TQString::fromLocal8Bit( err.asString() ) ); KMessageBox::error( parent, msg, i18n("Certificate Listing Failed" ) ); } @@ -266,7 +266,7 @@ void CertificateInfoWidgetImpl::startCertificateDump() { this, TQT_SLOT( slotDumpProcessExited(KProcess*) ) ); if ( !proc->start( KProcess::NotifyOnExit, (KProcess::Communication)(KProcess::Stdout | KProcess::Stderr) ) ) { - TQString wmsg = i18n("Failed to execute gpgsm:\n%1").tqarg( i18n( "program not found" ) ); + TQString wmsg = i18n("Failed to execute gpgsm:\n%1").arg( i18n( "program not found" ) ); dumpView->setText( TQStyleSheet::escape( wmsg ) ); delete proc; } @@ -294,9 +294,9 @@ void CertificateInfoWidgetImpl::slotDumpProcessExited(KProcess* proc) { { TQString wmsg = i18n("Failed to execute gpgsm:\n%1"); if ( rc == -1 ) - wmsg = wmsg.tqarg( i18n( "program cannot be executed" ) ); + wmsg = wmsg.arg( i18n( "program cannot be executed" ) ); else - wmsg = wmsg.tqarg( strerror(rc) ); + wmsg = wmsg.arg( strerror(rc) ); dumpView->setText( TQStyleSheet::escape( wmsg ) ); } } @@ -328,7 +328,7 @@ void CertificateInfoWidgetImpl::updateChainView() { item = new TQListViewItem( pathView, Kleo::DN( (*it++).userID(0).id() ).prettyDN() ); else { item = new TQListViewItem( pathView, i18n("Issuer certificate not found ( %1)") - .tqarg( Kleo::DN( (*it).issuerName() ).prettyDN() ) ); + .arg( Kleo::DN( (*it).issuerName() ).prettyDN() ) ); item->setOpen( true ); // TQt bug: doesn't open after setEnabled( false ) :/ item->setEnabled( false ); } diff --git a/certmanager/certificatewizard.ui b/certmanager/certificatewizard.ui index ebc1170ef..54b5f877d 100644 --- a/certmanager/certificatewizard.ui +++ b/certmanager/certificatewizard.ui @@ -82,7 +82,7 @@ The key pair will be generated in a decentralized manner. Please contact your lo <property name="text"> <string>On this page, you will configure the cryptographic key length and the type of certificate to create.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -226,7 +226,7 @@ The key pair will be generated in a decentralized manner. Please contact your lo <property name="text"> <string>On this page, you will enter some personal data that will be stored in your certificate and that will help other people to determine that it is actually you who is sending a message.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -322,7 +322,7 @@ Once you are done with your settings, click a kmail composer will be opened; you can add detailed information for the CA there.</p><qt></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -485,7 +485,7 @@ Your key pair has now been created and stored locally. The corresponding certifi If you want to change anything, press Back and make your changes; otherwise, press Finish to send the certificate request to the CA. </qt></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> diff --git a/certmanager/certificatewizardimpl.cpp b/certmanager/certificatewizardimpl.cpp index af1907d1a..d0545159c 100644 --- a/certmanager/certificatewizardimpl.cpp +++ b/certmanager/certificatewizardimpl.cpp @@ -88,10 +88,10 @@ static TQString attributeLabel( const TQString & attr, bool required ) { if ( !label.isEmpty() ) if ( required ) return i18n("Format string for the labels in the \"Your Personal Data\" page - required field", - "*%1 (%2):").tqarg( label, attr ); + "*%1 (%2):").arg( label, attr ); else return i18n("Format string for the labels in the \"Your Personal Data\" page", - "%1 (%2):").tqarg( label, attr ); + "%1 (%2):").arg( label, attr ); else if ( required ) return '*' + attr + ':'; @@ -196,7 +196,7 @@ void CertificateWizardImpl::slotGenerateCertificate() TQString certParms; certParms += "<GnupgKeyParms format=\"internal\">\n"; certParms += "Key-Type: RSA\n"; - certParms += TQString( "Key-Length: %1\n" ).tqarg( keyLengths[keyLengthCB->currentItem()] ); + certParms += TQString( "Key-Length: %1\n" ).arg( keyLengths[keyLengthCB->currentItem()] ); certParms += "Key-Usage: "; if ( signOnlyCB->isChecked() ) certParms += "Sign"; @@ -255,7 +255,7 @@ void CertificateWizardImpl::slotGenerateCertificate() if ( err ) KMessageBox::error( this, i18n( "Could not start certificate generation: %1" ) - .tqarg( TQString::fromLocal8Bit( err.asString() ) ), + .arg( TQString::fromLocal8Bit( err.asString() ) ), i18n( "Certificate Manager Error" ) ); else { generatePB->setEnabled( false ); @@ -278,7 +278,7 @@ void CertificateWizardImpl::slotResult( const GpgME::KeyGenerationResult & res, if ( !res.error().isCanceled() ) KMessageBox::error( this, i18n( "Could not generate certificate: %1" ) - .tqarg( TQString::fromLatin1( res.error().asString() ) ), + .arg( TQString::fromLatin1( res.error().asString() ) ), i18n( "Certificate Manager Error" ) ); } else { // next will stay enabled until the user clicks Generate @@ -434,7 +434,7 @@ void CertificateWizardImpl::sendCertificate( const TQString& email, const TQByte if ( result != 0 ) { kdDebug() << "Couldn't connect to KMail\n"; KMessageBox::error( this, - i18n( "DCOP Communication Error, unable to send certificate using KMail.\n%1" ).tqarg( error ) ); + i18n( "DCOP Communication Error, unable to send certificate using KMail.\n%1" ).arg( error ) ); return; } @@ -481,7 +481,7 @@ void CertificateWizardImpl::accept() if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel( this, i18n( "A file named \"%1\" already exists. " - "Are you sure you want to overwrite it?" ).tqarg( url.prettyURL() ), + "Are you sure you want to overwrite it?" ).arg( url.prettyURL() ), i18n( "Overwrite File?" ), i18n( "&Overwrite" ) ) ) return; diff --git a/certmanager/certmanager.cpp b/certmanager/certmanager.cpp index a357e8526..fdf33f3a6 100644 --- a/certmanager/certmanager.cpp +++ b/certmanager/certmanager.cpp @@ -523,7 +523,7 @@ void CertManager::slotRefreshKeysResult( const GpgME::Error & err ) { return; if ( err ) KMessageBox::error( this, i18n("An error occurred while trying to refresh " - "keys:\n%1").tqarg( TQString::fromLocal8Bit( err.asString() ) ), + "keys:\n%1").arg( TQString::fromLocal8Bit( err.asString() ) ), i18n("Refreshing Keys Failed") ); } @@ -532,7 +532,7 @@ static void showKeyListError( TQWidget * parent, const GpgME::Error & err ) { const TQString msg = i18n( "<qt><p>An error occurred while fetching " "the certificates from the backend:</p>" "<p><b>%1</b></p></qt>" ) - .tqarg( TQString::fromLocal8Bit( err.asString() ) ); + .arg( TQString::fromLocal8Bit( err.asString() ) ); KMessageBox::error( parent, msg, i18n( "Certificate Listing Failed" ) ); } @@ -705,8 +705,8 @@ static void showCertificateDownloadError( TQWidget * parent, const GpgME::Error const TQString msg = i18n( "<qt><p>An error occurred while trying " "to download the certificate %1:</p>" "<p><b>%2</b></p></qt>" ) - .tqarg( certDisplayName ) - .tqarg( TQString::fromLocal8Bit( err.asString() ) ); + .arg( certDisplayName ) + .arg( TQString::fromLocal8Bit( err.asString() ) ); KMessageBox::error( parent, msg, i18n( "Certificate Download Failed" ) ); } @@ -773,8 +773,8 @@ static void showCertificateImportError( TQWidget * parent, const GpgME::Error & const TQString msg = i18n( "<qt><p>An error occurred while trying " "to import the certificate %1:</p>" "<p><b>%2</b></p></qt>" ) - .tqarg( certDisplayName ) - .tqarg( TQString::fromLocal8Bit( err.asString() ) ); + .arg( certDisplayName ) + .arg( TQString::fromLocal8Bit( err.asString() ) ); KMessageBox::error( parent, msg, i18n( "Certificate Import Failed" ) ); } @@ -810,50 +810,50 @@ void CertManager::slotCertificateImportResult( const GpgME::ImportResult & res ) const TQString boldLine = i18n("<tr><td align=\"right\"><b>%1</b></td><td>%2</td></tr>"); TQStringList lines; - lines.push_back( normalLine.tqarg( i18n("Total number processed:"), + lines.push_back( normalLine.arg( i18n("Total number processed:"), TQString::number( res.numConsidered() ) ) ); - lines.push_back( normalLine.tqarg( i18n("Imported:"), + lines.push_back( normalLine.arg( i18n("Imported:"), TQString::number( res.numImported() ) ) ); if ( res.newSignatures() ) - lines.push_back( normalLine.tqarg( i18n("New signatures:"), + lines.push_back( normalLine.arg( i18n("New signatures:"), TQString::number( res.newSignatures() ) ) ); if ( res.newUserIDs() ) - lines.push_back( normalLine.tqarg( i18n("New user IDs:"), + lines.push_back( normalLine.arg( i18n("New user IDs:"), TQString::number( res.newUserIDs() ) ) ); if ( res.numKeysWithoutUserID() ) - lines.push_back( normalLine.tqarg( i18n("Keys without user IDs:"), + lines.push_back( normalLine.arg( i18n("Keys without user IDs:"), TQString::number( res.numKeysWithoutUserID() ) ) ); if ( res.newSubkeys() ) - lines.push_back( normalLine.tqarg( i18n("New subkeys:"), + lines.push_back( normalLine.arg( i18n("New subkeys:"), TQString::number( res.newSubkeys() ) ) ); if ( res.newRevocations() ) - lines.push_back( boldLine.tqarg( i18n("Newly revoked:"), + lines.push_back( boldLine.arg( i18n("Newly revoked:"), TQString::number( res.newRevocations() ) ) ); if ( res.notImported() ) - lines.push_back( boldLine.tqarg( i18n("Not imported:"), + lines.push_back( boldLine.arg( i18n("Not imported:"), TQString::number( res.notImported() ) ) ); if ( res.numUnchanged() ) - lines.push_back( normalLine.tqarg( i18n("Unchanged:"), + lines.push_back( normalLine.arg( i18n("Unchanged:"), TQString::number( res.numUnchanged() ) ) ); if ( res.numSecretKeysConsidered() ) - lines.push_back( normalLine.tqarg( i18n("Secret keys processed:"), + lines.push_back( normalLine.arg( i18n("Secret keys processed:"), TQString::number( res.numSecretKeysConsidered() ) ) ); if ( res.numSecretKeysImported() ) - lines.push_back( normalLine.tqarg( i18n("Secret keys imported:"), + lines.push_back( normalLine.arg( i18n("Secret keys imported:"), TQString::number( res.numSecretKeysImported() ) ) ); if ( res.numSecretKeysConsidered() - res.numSecretKeysImported() - res.numSecretKeysUnchanged() > 0 ) - lines.push_back( boldLine.tqarg( i18n("Secret keys <em>not</em> imported:"), + lines.push_back( boldLine.arg( i18n("Secret keys <em>not</em> imported:"), TQString::number( res.numSecretKeysConsidered() - res.numSecretKeysImported() - res.numSecretKeysUnchanged() ) ) ); if ( res.numSecretKeysUnchanged() ) - lines.push_back( normalLine.tqarg( i18n("Secret keys unchanged:"), + lines.push_back( normalLine.arg( i18n("Secret keys unchanged:"), TQString::number( res.numSecretKeysUnchanged() ) ) ); KMessageBox::information( this, i18n( "<qt><p>Detailed results of importing %1:</p>" "<table>%2</table></qt>" ) - .tqarg( displayName ).tqarg( lines.join( TQString() ) ), + .arg( displayName ).arg( lines.join( TQString() ) ), i18n( "Certificate Import Result" ) ); disconnectJobFromStatusBarProgress( res.error() ); @@ -875,7 +875,7 @@ void CertManager::slotDirmngrExited() { if ( !mDirmngrProc->normalExit() ) KMessageBox::error( this, i18n( "The GpgSM process that tried to import the CRL file ended prematurely because of an unexpected error." ), i18n( "Certificate Manager Error" ) ); else if ( mDirmngrProc->exitStatus() ) - KMessageBox::error( this, i18n( "An error occurred when trying to import the CRL file. The output from GpgSM was:\n%1").tqarg( mErrorbuffer ), i18n( "Certificate Manager Error" ) ); + KMessageBox::error( this, i18n( "An error occurred when trying to import the CRL file. The output from GpgSM was:\n%1").arg( mErrorbuffer ), i18n( "Certificate Manager Error" ) ); else KMessageBox::information( this, i18n( "CRL file imported successfully." ), i18n( "Certificate Manager Information" ) ); @@ -935,7 +935,7 @@ bool CertManager::connectAndStartDirmngr( const char * slot, const char * proces this, TQT_SLOT(slotStderr(KProcess*,char*,int)) ); if( !mDirmngrProc->start( KProcess::NotifyOnExit, KProcess::Stderr ) ) { delete mDirmngrProc; mDirmngrProc = 0; - KMessageBox::error( this, i18n( "Unable to start %1 process. Please check your installation." ).tqarg( processname ), i18n( "Certificate Manager Error" ) ); + KMessageBox::error( this, i18n( "Unable to start %1 process. Please check your installation." ).arg( processname ), i18n( "Certificate Manager Error" ) ); return false; } return true; @@ -992,7 +992,7 @@ void CertManager::slotClearCRLsResult() { if ( !mDirmngrProc->normalExit() ) KMessageBox::error( this, i18n( "The DirMngr process that tried to clear the CRL cache ended prematurely because of an unexpected error." ), i18n( "Certificate Manager Error" ) ); else if ( mDirmngrProc->exitStatus() ) - KMessageBox::error( this, i18n( "An error occurred when trying to clear the CRL cache. The output from DirMngr was:\n%1").tqarg( mErrorbuffer ), i18n( "Certificate Manager Error" ) ); + KMessageBox::error( this, i18n( "An error occurred when trying to clear the CRL cache. The output from DirMngr was:\n%1").arg( mErrorbuffer ), i18n( "Certificate Manager Error" ) ); else KMessageBox::information( this, i18n( "CRL cache cleared successfully." ), i18n( "Certificate Manager Information" ) ); delete mDirmngrProc; mDirmngrProc = 0; @@ -1003,7 +1003,7 @@ static void showDeleteError( TQWidget * parent, const GpgME::Error & err ) { const TQString msg = i18n("<qt><p>An error occurred while trying to delete " "the certificates:</p>" "<p><b>%1</b></p></qt>") - .tqarg( TQString::fromLocal8Bit( err.asString() ) ); + .arg( TQString::fromLocal8Bit( err.asString() ) ); KMessageBox::error( parent, msg, i18n("Certificate Deletion Failed") ); } @@ -1076,7 +1076,7 @@ void CertManager::slotDeleteCertificate() { const TQString msg = keysToDelete.size() > keys.size() ? i18n("Do you really want to delete this certificate and the %1 certificates it certified?", "Do you really want to delete these %n certificates and the %1 certificates they certified?", - keys.size() ).tqarg( keysToDelete.size() - keys.size() ) + keys.size() ).arg( keysToDelete.size() - keys.size() ) : i18n("Do you really want to delete this certificate?", "Do you really want to delete these %n certificates?", keys.size() ) ; @@ -1098,7 +1098,7 @@ void CertManager::slotDeleteCertificate() { "the certificates:</p>" "<p><b>%1</b><p></qt>" ); KMessageBox::error( this, - str.tqarg( i18n("Operation not supported by the backend.") ), + str.arg( i18n("Operation not supported by the backend.") ), i18n("Certificate Deletion Failed") ); } @@ -1206,7 +1206,7 @@ static void showCertificateExportError( TQWidget * parent, const GpgME::Error & const TQString msg = i18n("<qt><p>An error occurred while trying to export " "the certificate:</p>" "<p><b>%1</b></p></qt>") - .tqarg( TQString::fromLocal8Bit( err.asString() ) ); + .arg( TQString::fromLocal8Bit( err.asString() ) ); KMessageBox::error( parent, msg, i18n("Certificate Export Failed") ); } @@ -1239,7 +1239,7 @@ static bool checkOverwrite( const KURL& url, bool& overwrite, TQWidget* w ) KMessageBox::warningContinueCancel( w, i18n( "A file named \"%1\" already exists. " - "Are you sure you want to overwrite it?" ).tqarg( url.prettyURL() ), + "Are you sure you want to overwrite it?" ).arg( url.prettyURL() ), i18n( "Overwrite File?" ), i18n( "&Overwrite" ) ) ) return false; @@ -1301,7 +1301,7 @@ static void showSecretKeyExportError( TQWidget * parent, const GpgME::Error & er const TQString msg = i18n("<qt><p>An error occurred while trying to export " "the secret key:</p>" "<p><b>%1</b></p></qt>") - .tqarg( TQString::fromLocal8Bit( err.asString() ) ); + .arg( TQString::fromLocal8Bit( err.asString() ) ); KMessageBox::error( parent, msg, i18n("Secret-Key Export Failed") ); } diff --git a/certmanager/certmanager.h b/certmanager/certmanager.h index 6df2a9f61..07f9aa9e1 100644 --- a/certmanager/certmanager.h +++ b/certmanager/certmanager.h @@ -137,7 +137,7 @@ private slots: void slotConfigureGpgME(); void slotContextMenu(Kleo::KeyListViewItem*, const TQPoint& point); void slotDropped(const KURL::List&); - /** Schedule a tqrepaint for the listview items. E.g. when the + /** Schedule a repaint for the listview items. E.g. when the colour config has changed */ void slotRepaint(); /** Schedule a validating keylisting for the selected items (or diff --git a/certmanager/conf/appearanceconfigwidget.cpp b/certmanager/conf/appearanceconfigwidget.cpp index 309d03be1..57a767419 100644 --- a/certmanager/conf/appearanceconfigwidget.cpp +++ b/certmanager/conf/appearanceconfigwidget.cpp @@ -139,7 +139,7 @@ private: setText( 0, name ); } - void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment ); + void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ); private: TQColor mForegroundColor, mBackgroundColor; @@ -152,7 +152,7 @@ private: bool mDirty; }; -void CategoryListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment ) { +void CategoryListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ) { TQColorGroup _cg = cg; TQFont font = p->font(); if ( mHasFont ) @@ -172,7 +172,7 @@ void CategoryListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, in if ( mBackgroundColor.isValid() ) _cg.setColor( TQColorGroup::Base, mBackgroundColor ); - TQListViewItem::paintCell( p, _cg, column, width, tqalignment ); + TQListViewItem::paintCell( p, _cg, column, width, alignment ); } //// @@ -227,7 +227,7 @@ void AppearanceConfigWidget::slotDefaultClicked() if ( !item ) return; item->setDefaultAppearance(); - item->tqrepaint(); + item->repaint(); slotSelectionChanged( item ); emit changed(); } @@ -280,7 +280,7 @@ void AppearanceConfigWidget::slotForegroundClicked() { int result = KColorDialog::getColor( fg ); if ( result == KColorDialog::Accepted ) { item->setForegroundColor( fg ); - item->tqrepaint(); + item->repaint(); emit changed(); } } @@ -294,7 +294,7 @@ void AppearanceConfigWidget::slotBackgroundClicked() { int result = KColorDialog::getColor( bg ); if ( result == KColorDialog::Accepted ) { item->setBackgroundColor( bg ); - item->tqrepaint(); + item->repaint(); emit changed(); } } @@ -308,7 +308,7 @@ void AppearanceConfigWidget::slotFontClicked() { int result = KFontDialog::getFont( font ); if ( result == KFontDialog::Accepted ) { item->setFont( font ); - item->tqrepaint(); + item->repaint(); emit changed(); } } @@ -320,7 +320,7 @@ void AppearanceConfigWidget::defaults() for ( ; lvit.current() ; ++lvit ) { CategoryListViewItem* item = static_cast<CategoryListViewItem *>( lvit.current() ); item->setDefaultAppearance(); - item->tqrepaint(); + item->repaint(); } emit changed(); } @@ -330,7 +330,7 @@ void AppearanceConfigWidget::slotItalicClicked() CategoryListViewItem* item = static_cast<CategoryListViewItem*>(categoriesLV->selectedItem() ); if ( item ) { item->toggleItalic(); - item->tqrepaint(); + item->repaint(); emit changed(); } } @@ -340,7 +340,7 @@ void AppearanceConfigWidget::slotBoldClicked() CategoryListViewItem* item = static_cast<CategoryListViewItem*>(categoriesLV->selectedItem() ); if ( item ) { item->toggleBold(); - item->tqrepaint(); + item->repaint(); emit changed(); } } @@ -350,7 +350,7 @@ void AppearanceConfigWidget::slotStrikeoutClicked() CategoryListViewItem* item = static_cast<CategoryListViewItem*>(categoriesLV->selectedItem() ); if ( item ) { item->toggleStrikeout(); - item->tqrepaint(); + item->repaint(); emit changed(); } } diff --git a/certmanager/conf/configuredialog.cpp b/certmanager/conf/configuredialog.cpp index 2aa622d08..db9c7739f 100644 --- a/certmanager/conf/configuredialog.cpp +++ b/certmanager/conf/configuredialog.cpp @@ -52,9 +52,9 @@ ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal // the KCMultiDialog starts with the size of the first kcm, not // the largest one. This way at least after the first showing of // the largest kcm the size is kept. - const KConfigGroup tqgeometry( KGlobal::config(), "Geometry" ); - const int width = tqgeometry.readNumEntry( "ConfigureDialogWidth" ); - const int height = tqgeometry.readNumEntry( "ConfigureDialogHeight" ); + const KConfigGroup geometry( KGlobal::config(), "Geometry" ); + const int width = geometry.readNumEntry( "ConfigureDialogWidth" ); + const int height = geometry.readNumEntry( "ConfigureDialogHeight" ); if ( width != 0 && height != 0 ) { setMinimumSize( width, height ); } @@ -62,9 +62,9 @@ ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal } void ConfigureDialog::hideEvent( TQHideEvent * ) { - KConfigGroup tqgeometry( KGlobal::config(), "Geometry" ); - tqgeometry.writeEntry( "ConfigureDialogWidth", width() ); - tqgeometry.writeEntry( "ConfigureDialogHeight",height() ); + KConfigGroup geometry( KGlobal::config(), "Geometry" ); + geometry.writeEntry( "ConfigureDialogWidth", width() ); + geometry.writeEntry( "ConfigureDialogHeight",height() ); } ConfigureDialog::~ConfigureDialog() { diff --git a/certmanager/conf/dirservconfigpage.cpp b/certmanager/conf/dirservconfigpage.cpp index 436ef28ec..9d82d86e7 100644 --- a/certmanager/conf/dirservconfigpage.cpp +++ b/certmanager/conf/dirservconfigpage.cpp @@ -283,11 +283,11 @@ Kleo::CryptoConfigEntry* DirectoryServicesConfigurationPage::configEntry( const { Kleo::CryptoConfigEntry* entry = mConfig->entry( componentName, groupName, entryName ); if ( !entry ) { - KMessageBox::error( this, i18n( "Backend error: gpgconf does not seem to know the entry for %1/%2/%3" ).tqarg( componentName, groupName, entryName ) ); + KMessageBox::error( this, i18n( "Backend error: gpgconf does not seem to know the entry for %1/%2/%3" ).arg( componentName, groupName, entryName ) ); return 0; } if( entry->argType() != argType || entry->isList() != isList ) { - KMessageBox::error( this, i18n( "Backend error: gpgconf has wrong type for %1/%2/%3: %4 %5" ).tqarg( componentName, groupName, entryName ).tqarg( entry->argType() ).tqarg( entry->isList() ) ); + KMessageBox::error( this, i18n( "Backend error: gpgconf has wrong type for %1/%2/%3: %4 %5" ).arg( componentName, groupName, entryName ).arg( entry->argType() ).arg( entry->isList() ) ); return 0; } return entry; diff --git a/certmanager/hierarchyanalyser.cpp b/certmanager/hierarchyanalyser.cpp index fe0835ebf..9e2c388f1 100644 --- a/certmanager/hierarchyanalyser.cpp +++ b/certmanager/hierarchyanalyser.cpp @@ -69,7 +69,7 @@ const std::vector<GpgME::Key> & HierarchyAnalyser::subjectsForIssuer( const char std::vector<GpgME::Key> HierarchyAnalyser::subjectsForIssuerRecursive( const char * issuer_dn ) const { std::vector<GpgME::Key> keys = subjectsForIssuer( issuer_dn ); - for ( unsigned int i = 0 ; i < keys.size() ; ++i ) // can't use iterators here, since appending would tqinvalidate them + for ( unsigned int i = 0 ; i < keys.size() ; ++i ) // can't use iterators here, since appending would invalidate them if ( const char * fpr = keys[i].primaryFingerprint() ) { const std::vector<GpgME::Key> & tmp = subjectsForIssuer( fpr ); std::copy( tmp.begin(), tmp.end(), std::back_inserter( keys ) ); diff --git a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp index a2d1e5518..c50796b46 100644 --- a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp +++ b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp @@ -90,7 +90,7 @@ KWatchGnuPGMainWindow::~KWatchGnuPGMainWindow() void KWatchGnuPGMainWindow::slotClear() { mCentralWidget->clear(); - mCentralWidget->append( tqtr("[%1] Log cleared").tqarg( TQDateTime::currentDateTime().toString(Qt::ISODate) ) ); + mCentralWidget->append( tqtr("[%1] Log cleared").arg( TQDateTime::currentDateTime().toString(Qt::ISODate) ) ); } void KWatchGnuPGMainWindow::createActions() @@ -135,7 +135,7 @@ void KWatchGnuPGMainWindow::startWatcher() kapp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput); } mCentralWidget->append(tqtr("[%1] Log stopped") - .tqarg( TQDateTime::currentDateTime().toString(Qt::ISODate))); + .arg( TQDateTime::currentDateTime().toString(Qt::ISODate))); } mWatcher->clearArguments(); KConfig* config = kapp->config(); @@ -148,7 +148,7 @@ void KWatchGnuPGMainWindow::startWatcher() KMessageBox::sorry( this, i18n("The watchgnupg logging process could not be started.\nPlease install watchgnupg somewhere in your $PATH.\nThis log window is now completely useless." ) ); } else { mCentralWidget->append( tqtr("[%1] Log started") - .tqarg( TQDateTime::currentDateTime().toString(Qt::ISODate) ) ); + .arg( TQDateTime::currentDateTime().toString(Qt::ISODate) ) ); } connect( mWatcher, TQT_SIGNAL( processExited(KProcess*) ), this, TQT_SLOT( slotWatcherExited() ) ); @@ -176,7 +176,7 @@ void KWatchGnuPGMainWindow::setGnuPGConfig() entry->setStringValue( TQString("socket://")+ config->readEntry("Socket", WATCHGNUPGSOCKET )); - logclients << TQString("%1 (%2)").tqarg(*it).tqarg(comp->description()); + logclients << TQString("%1 (%2)").arg(*it).arg(comp->description()); } entry = group->entry("debug-level"); if( entry ) { @@ -237,7 +237,7 @@ void KWatchGnuPGMainWindow::slotSaveAs() if( KMessageBox::Yes != KMessageBox::warningYesNo( this, i18n("The file named \"%1\" already " "exists. Are you sure you want " - "to overwrite it?").tqarg(filename), + "to overwrite it?").arg(filename), i18n("Overwrite File"), i18n("Overwrite"), KStdGuiItem::cancel() ) ) { return; } diff --git a/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp b/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp index 472f7e642..e47909e28 100644 --- a/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp +++ b/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp @@ -432,13 +432,13 @@ Kleo::CryptoBackend::Protocol * Kleo::ChiasmusBackend::protocol( const char * na bool Kleo::ChiasmusBackend::checkForOpenPGP( TQString * reason ) const { if ( reason ) - *reason = i18n( "Unsupported protocol \"%1\"" ).tqarg( "OpenPGP" ); + *reason = i18n( "Unsupported protocol \"%1\"" ).arg( "OpenPGP" ); return false; } bool Kleo::ChiasmusBackend::checkForSMIME( TQString * reason ) const { if ( reason ) - *reason = i18n( "Unsupported protocol \"%1\"" ).tqarg( "SMIME" ); + *reason = i18n( "Unsupported protocol \"%1\"" ).arg( "SMIME" ); return false; } @@ -454,7 +454,7 @@ bool Kleo::ChiasmusBackend::checkForChiasmus( TQString * reason ) const { const TQFileInfo fi( KShell::tildeExpand( chiasmus ) ); if ( !fi.isExecutable() ) { if ( reason ) - *reason = i18n( "File \"%1\" does not exist or is not executable." ).tqarg( chiasmus ); + *reason = i18n( "File \"%1\" does not exist or is not executable." ).arg( chiasmus ); return false; } @@ -467,7 +467,7 @@ bool Kleo::ChiasmusBackend::checkForProtocol( const char * name, TQString * reas if ( qstricmp( name, "Chiasmus" ) == 0 ) return checkForChiasmus( reason ); if ( reason ) - *reason = i18n( "Unsupported protocol \"%1\"" ).tqarg( name ); + *reason = i18n( "Unsupported protocol \"%1\"" ).arg( name ); return 0; } diff --git a/certmanager/lib/backends/chiasmus/chiasmusjob.cpp b/certmanager/lib/backends/chiasmus/chiasmusjob.cpp index 9daaa620d..edfe9be52 100644 --- a/certmanager/lib/backends/chiasmus/chiasmusjob.cpp +++ b/certmanager/lib/backends/chiasmus/chiasmusjob.cpp @@ -208,9 +208,9 @@ void Kleo::ChiasmusJob::showErrorDialog( TQWidget * parent, const TQString & cap const TQString msg = ( mMode == Encrypt ? i18n( "Encryption failed: %1" ) : i18n( "Decryption failed: %1" ) ) - .tqarg( TQString::fromLocal8Bit( mError.asString() ) ); + .arg( TQString::fromLocal8Bit( mError.asString() ) ); if ( !mStderr.isEmpty() ) { - const TQString details = i18n( "The following was received on stderr:\n%1" ).tqarg( mStderr ); + const TQString details = i18n( "The following was received on stderr:\n%1" ).arg( mStderr ); KMessageBox::detailedError( parent, msg, details, caption ); } else { KMessageBox::error( parent, msg, caption ); diff --git a/certmanager/lib/backends/chiasmus/chiasmuslibrary.cpp b/certmanager/lib/backends/chiasmus/chiasmuslibrary.cpp index a57685f28..002bf0182 100644 --- a/certmanager/lib/backends/chiasmus/chiasmuslibrary.cpp +++ b/certmanager/lib/backends/chiasmus/chiasmuslibrary.cpp @@ -71,7 +71,7 @@ Kleo::ChiasmusLibrary::main_func Kleo::ChiasmusLibrary::chiasmus( TQString * rea if ( !mXiaLibrary ) { if ( reason ) *reason = i18n( "Failed to load %1: %2" ) - .tqarg( libfile,KLibLoader::self()->lastErrorMessage() ); + .arg( libfile,KLibLoader::self()->lastErrorMessage() ); kdDebug(5150) << "ChiasmusLibrary: loading \"" << libfile << "\" failed: " << KLibLoader::self()->lastErrorMessage() << endl; return 0; @@ -79,7 +79,7 @@ Kleo::ChiasmusLibrary::main_func Kleo::ChiasmusLibrary::chiasmus( TQString * rea if ( !mXiaLibrary->hasSymbol( "Chiasmus" ) ) { if ( reason ) *reason = i18n( "Failed to load %1: %2" ) - .tqarg( libfile, i18n( "Library does not contain the symbol \"Chiasmus\"." ) ); + .arg( libfile, i18n( "Library does not contain the symbol \"Chiasmus\"." ) ); kdDebug(5150) << "ChiasmusLibrary: loading \"" << libfile << "\" failed: " << "Library does not contain the symbol \"Chiasmus\"." << endl; return 0; diff --git a/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp b/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp index eccdf9219..677fc6ec2 100644 --- a/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp +++ b/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp @@ -96,7 +96,7 @@ void Kleo::ObtainKeysJob::slotPerform( bool async ) { return; } - emit progress( i18n( "Scanning directory %1..." ).tqarg( mKeyPaths[mIndex] ), + emit progress( i18n( "Scanning directory %1..." ).arg( mKeyPaths[mIndex] ), mIndex, mKeyPaths.size() ); const TQDir dir( KShell::tildeExpand( mKeyPaths[mIndex] ) ); diff --git a/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp b/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp index 57811c6e5..53142fad8 100644 --- a/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp +++ b/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp @@ -45,11 +45,11 @@ #include <assert.h> struct Kleo::GnuPGProcessBase::Private { - Private() : useStatusFD( false ), statnot( 0 ) { + Private() : usetStatusFD( false ), statnot( 0 ) { statusFD[0] = statusFD[1] = -1; } - bool useStatusFD; + bool usetStatusFD; int statusFD[2]; TQSocketNotifier * statnot; TQCString statusBuffer; @@ -66,13 +66,13 @@ Kleo::GnuPGProcessBase::~GnuPGProcessBase() { delete d; d = 0; } -void Kleo::GnuPGProcessBase::setUseStatusFD( bool use ) { +void Kleo::GnuPGProcessBase::setUsetStatusFD( bool use ) { assert( d ); - d->useStatusFD = use; + d->usetStatusFD = use; } bool Kleo::GnuPGProcessBase::start( RunMode runmode, Communication comm ) { - if ( d->useStatusFD ) { + if ( d->usetStatusFD ) { // set up the status-fd. This should be in setupCommunication(), // but then it's too late: we need the fd of the pipe to pass it // as argument to the --status-fd option: @@ -100,7 +100,7 @@ bool Kleo::GnuPGProcessBase::start( RunMode runmode, Communication comm ) { int Kleo::GnuPGProcessBase::setupCommunication( Communication comm ) { if ( int ok = KProcess::setupCommunication( comm ) ) return ok; - if ( d->useStatusFD ) { + if ( d->usetStatusFD ) { // base class impl returned error, so close our fd's, too ::close( d->statusFD[0] ); ::close( d->statusFD[1] ); @@ -110,7 +110,7 @@ int Kleo::GnuPGProcessBase::setupCommunication( Communication comm ) { } int Kleo::GnuPGProcessBase::commSetupDoneP() { - if ( d->useStatusFD ) { + if ( d->usetStatusFD ) { ::close( d->statusFD[1] ); // close the input end of the pipe, we're the reader d->statnot = new TQSocketNotifier( d->statusFD[0], TQSocketNotifier::Read, this ); connect( d->statnot, TQT_SIGNAL(activated(int)), TQT_SLOT(slotChildStatus(int)) ); @@ -119,20 +119,20 @@ int Kleo::GnuPGProcessBase::commSetupDoneP() { } int Kleo::GnuPGProcessBase::commSetupDoneC() { - if ( d->useStatusFD ) + if ( d->usetStatusFD ) ::fcntl( d->statusFD[1], F_SETFD, 0 ); return KProcess::commSetupDoneC(); } void Kleo::GnuPGProcessBase::slotChildStatus( int fd ) { if ( !childStatus(fd) ) - closeStatus(); + closetStatus(); } -bool Kleo::GnuPGProcessBase::closeStatus() { - if ( !d->useStatusFD ) +bool Kleo::GnuPGProcessBase::closetStatus() { + if ( !d->usetStatusFD ) return false; - d->useStatusFD = false; + d->usetStatusFD = false; delete d->statnot; d->statnot = 0; ::close( d->statusFD[0] ); d->statusFD[0] = -1; return true; @@ -144,7 +144,7 @@ int Kleo::GnuPGProcessBase::childStatus( int fd ) { if ( len > 0 ) { buf[len] = 0; d->statusBuffer += buf; - parseStatusOutput(); + parsetStatusOutput(); } return len; } @@ -153,7 +153,7 @@ static TQString fromHexEscapedUtf8( const TQCString & str ) { return KURL::decode_string( str.data(), 106 /* utf-8 */ ); } -void Kleo::GnuPGProcessBase::parseStatusOutput() { +void Kleo::GnuPGProcessBase::parsetStatusOutput() { static const char startToken[] = "[GNUPG:] "; static const int startTokenLen = sizeof startToken / sizeof *startToken - 1; diff --git a/certmanager/lib/backends/qgpgme/gnupgprocessbase.h b/certmanager/lib/backends/qgpgme/gnupgprocessbase.h index c012b3075..0cf9000a9 100644 --- a/certmanager/lib/backends/qgpgme/gnupgprocessbase.h +++ b/certmanager/lib/backends/qgpgme/gnupgprocessbase.h @@ -52,12 +52,12 @@ namespace Kleo { GnuPGProcessBase( TQObject * parent=0, const char * name=0 ); ~GnuPGProcessBase(); - void setUseStatusFD( bool use ); + void setUsetStatusFD( bool use ); /*! reimplementation */ bool start( RunMode runmode, Communication comm ); - bool closeStatus(); + bool closetStatus(); signals: void status( Kleo::GnuPGProcessBase * proc, const TQString & type, const TQStringList & args ); @@ -77,7 +77,7 @@ namespace Kleo { void slotChildStatus( int fd ); private: - void parseStatusOutput(); + void parsetStatusOutput(); private: class Private; diff --git a/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp b/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp index 9594edfa2..27680585b 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp @@ -88,15 +88,15 @@ static bool check( GpgME::Context::Protocol proto, TQString * reason ) { // error, check why: const GpgME::EngineInfo ei = GpgME::engineInfo( proto ); if ( ei.isNull() ) - *reason = i18n("GPGME was compiled without support for %1.").tqarg( proto == GpgME::Context::CMS ? "S/MIME" : "OpenPGP" ); + *reason = i18n("GPGME was compiled without support for %1.").arg( proto == GpgME::Context::CMS ? "S/MIME" : "OpenPGP" ); else if ( ei.fileName() && !ei.version() ) - *reason = i18n("Engine %1 is not installed properly.").tqarg( TQFile::decodeName( ei.fileName() ) ); + *reason = i18n("Engine %1 is not installed properly.").arg( TQFile::decodeName( ei.fileName() ) ); else if ( ei.fileName() && ei.version() && ei.requiredVersion() ) *reason = i18n("Engine %1 version %2 installed, " "but at least version %3 is required.") - .tqarg( TQFile::decodeName( ei.fileName() ), ei.version(), ei.requiredVersion() ); + .arg( TQFile::decodeName( ei.fileName() ), ei.version(), ei.requiredVersion() ); else - *reason = i18n("Unknown problem with engine for protocol %1.").tqarg( proto == GpgME::Context::CMS ? "S/MIME" : "OpenPGP" ); + *reason = i18n("Unknown problem with engine for protocol %1.").arg( proto == GpgME::Context::CMS ? "S/MIME" : "OpenPGP" ); return false; } @@ -114,7 +114,7 @@ bool Kleo::QGpgMEBackend::checkForProtocol( const char * name, TQString * reason if ( qstricmp( name, SMIME ) == 0 ) return check( GpgME::Context::CMS, reason ); if ( reason ) - *reason = i18n( "Unsupported protocol \"%1\"" ).tqarg( name ); + *reason = i18n( "Unsupported protocol \"%1\"" ).arg( name ); return false; } diff --git a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp index c2493ebe4..d083947e9 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp @@ -89,11 +89,11 @@ void QGpgMECryptoConfig::runGpgConf( bool showErrors ) if ( showErrors && rc != 0 ) { TQString wmsg = i18n("<qt>Failed to execute gpgconf:<br>%1</qt>"); if ( rc == -1 ) - wmsg = wmsg.tqarg( i18n( "program not found" ) ); + wmsg = wmsg.arg( i18n( "program not found" ) ); else if ( rc == -2 ) - wmsg = wmsg.tqarg( i18n( "program cannot be executed" ) ); + wmsg = wmsg.arg( i18n( "program cannot be executed" ) ); else - wmsg = wmsg.tqarg( strerror(rc) ); + wmsg = wmsg.arg( strerror(rc) ); kdWarning(5150) << wmsg << endl; // to see it from test_cryptoconfig.cpp KMessageBox::error(0, wmsg); } @@ -306,7 +306,7 @@ void QGpgMECryptoConfigComponent::sync( bool runtime ) } else if( rc != 0 ) // Happens due to bugs in gpgconf (e.g. issues 104/115) { - TQString wmsg = i18n( "Error from gpgconf while saving configuration: %1" ).tqarg( TQString::fromLocal8Bit( strerror( rc ) ) ); + TQString wmsg = i18n( "Error from gpgconf while saving configuration: %1" ).arg( TQString::fromLocal8Bit( strerror( rc ) ) ); kdWarning(5150) << k_funcinfo << ":" << strerror( rc ) << endl; KMessageBox::error(0, wmsg); } diff --git a/certmanager/lib/backends/qgpgme/qgpgmejob.cpp b/certmanager/lib/backends/qgpgme/qgpgmejob.cpp index e55f237dc..61da793ed 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmejob.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmejob.cpp @@ -276,21 +276,21 @@ char * Kleo::QGpgMEJob::getPassphrase( const char * useridHint, const char * /*d TQString msg = previousWasBad ? i18n( "You need a passphrase to unlock the secret key for user:<br/> %1 (retry)" ) : i18n( "You need a passphrase to unlock the secret key for user:<br/> %1" ); - msg = msg.tqarg( TQString::fromUtf8( useridHint ) ) + "<br/><br/>"; + msg = msg.arg( TQString::fromUtf8( useridHint ) ) + "<br/><br/>"; msg.prepend( "<qt>" ); msg += i18n( "This dialog will reappear every time the passphrase is needed. For a more secure solution that also allows caching the passphrase, use gpg-agent." ) + "<br/>"; const TQString gpgAgent = KStandardDirs::findExe( "gpg-agent" ); if ( !gpgAgent.isEmpty() ) { msg += i18n( "gpg-agent was found in %1, but does not appear to be running." ) - .tqarg( gpgAgent ); + .arg( gpgAgent ); } else { msg += i18n( "gpg-agent is part of gnupg-%1, which you can download from %2" ) - .tqarg( "1.9" ) - .tqarg( "http://www.gnupg.org/download" ); // add #gnupg2 if you can make this a real link + .arg( "1.9" ) + .arg( "http://www.gnupg.org/download" ); // add #gnupg2 if you can make this a real link } msg += "<br/>"; msg += i18n( "For information on how to set up gpg-agent, see %1" ) - .tqarg( "http://kmail.kde.org/kmail-pgpmime-howto.html" ); + .arg( "http://kmail.kde.org/kmail-pgpmime-howto.html" ); msg += "<br/><br/>"; msg += i18n( "Enter passphrase:" ); Kleo::PassphraseDialog dlg( msg, i18n("Passphrase Dialog") ); diff --git a/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp index d1d2591da..c6370674b 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp @@ -196,7 +196,7 @@ void Kleo::QGpgMEKeyListJob::showErrorDialog( TQWidget * parent, const TQString const TQString msg = i18n( "<qt><p>An error occurred while fetching " "the keys from the backend:</p>" "<p><b>%1</b></p></qt>" ) - .tqarg( TQString::fromLocal8Bit( mResult.error().asString() ) ); + .arg( TQString::fromLocal8Bit( mResult.error().asString() ) ); KMessageBox::error( parent, msg, caption ); } diff --git a/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp b/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp index 95789725d..c2e21bb9b 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp @@ -151,9 +151,9 @@ TQString Kleo::QGpgMEProgressTokenMapper::map( const TQString & token, int subto const Desc & desc = it2->second; TQString result = i18n( desc.display ); if ( desc.useCur ) - result = result.tqarg( cur ); + result = result.arg( cur ); if ( desc.useTot ) - result = result.tqarg( tot ); + result = result.arg( tot ); return result; } diff --git a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp index 781e0513f..63453a4e5 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp @@ -105,7 +105,7 @@ GpgME::Error Kleo::QGpgMERefreshKeysJob::startAProcess() { commandLineLength -= patLength + 1; } - mProcess->setUseStatusFD( true ); + mProcess->setUsetStatusFD( true ); connect( mProcess, TQT_SIGNAL(processExited(KProcess*)), TQT_SLOT(slotProcessExited(KProcess*)) ); diff --git a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp index 8f2fd20d2..b753899a0 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp @@ -86,7 +86,7 @@ GpgME::Error Kleo::QGpgMESecretKeyExportJob::start( const TQStringList & pattern *mProcess << "--p12-charset" << mCharset; *mProcess << patterns.front().utf8(); - mProcess->setUseStatusFD( true ); + mProcess->setUsetStatusFD( true ); connect( mProcess, TQT_SIGNAL(processExited(KProcess*)), TQT_SLOT(slotProcessExited(KProcess*)) ); diff --git a/certmanager/lib/cryptplugwrapper.cpp b/certmanager/lib/cryptplugwrapper.cpp index 3bce3d136..6f07c954b 100644 --- a/certmanager/lib/cryptplugwrapper.cpp +++ b/certmanager/lib/cryptplugwrapper.cpp @@ -522,7 +522,7 @@ bool CryptPlugWrapper::initialize( IniStatus* iniStatus, TQString* errorMsg ) if( !_cp->initialize() ) { _iniStatus = IniStatus_InitError; kdDebug(5150) << "Error while executing function 'initialize' on plugin " << _libName << endl; - _lastError = i18n("Error while initializing plugin \"%1\"").tqarg( _libName ); + _lastError = i18n("Error while initializing plugin \"%1\"").arg( _libName ); if ( errorMsg ) *errorMsg = _lastError; delete _cp; _cp = 0; diff --git a/certmanager/lib/kleo/cryptobackendfactory.cpp b/certmanager/lib/kleo/cryptobackendfactory.cpp index b79e1772b..0d3cb1e96 100644 --- a/certmanager/lib/kleo/cryptobackendfactory.cpp +++ b/certmanager/lib/kleo/cryptobackendfactory.cpp @@ -154,7 +154,7 @@ void Kleo::CryptoBackendFactory::scanForBackends( TQStringList * reasons ) { if ( (*it)->supportsProtocol( protocol ) && !(*it)->checkForProtocol( protocol, &reason ) ) { if ( reasons ) { reasons->push_back( i18n("While scanning for %1 support in backend %2:") - .tqarg( protocol, (*it)->displayName() ) ); + .arg( protocol, (*it)->displayName() ) ); reasons->push_back( " " + reason ); } } diff --git a/certmanager/lib/kleo/hierarchicalkeylistjob.cpp b/certmanager/lib/kleo/hierarchicalkeylistjob.cpp index a5944315a..ffd3c6db9 100644 --- a/certmanager/lib/kleo/hierarchicalkeylistjob.cpp +++ b/certmanager/lib/kleo/hierarchicalkeylistjob.cpp @@ -131,7 +131,7 @@ void Kleo::HierarchicalKeyListJob::slotResult( const GpgME::KeyListResult & res #if 0 // FIXME const int current = mIt - mKeys.begin(); const int total = mKeys.size(); - emit progress( i18n("progress info: \"%1 of %2\"","%1/%2").tqarg( current ).tqarg( total ), current, total ); + emit progress( i18n("progress info: \"%1 of %2\"","%1/%2").arg( current ).arg( total ), current, total ); #endif } diff --git a/certmanager/lib/kleo/multideletejob.cpp b/certmanager/lib/kleo/multideletejob.cpp index e83f923ee..7d1a27302 100644 --- a/certmanager/lib/kleo/multideletejob.cpp +++ b/certmanager/lib/kleo/multideletejob.cpp @@ -92,7 +92,7 @@ void Kleo::MultiDeleteJob::slotResult( const GpgME::Error & err ) { const int current = mIt - mKeys.begin(); const int total = mKeys.size(); - emit progress( i18n("progress info: \"%1 of %2\"","%1/%2").tqarg( current ).tqarg( total ), current, total ); + emit progress( i18n("progress info: \"%1 of %2\"","%1/%2").arg( current ).arg( total ), current, total ); } GpgME::Error Kleo::MultiDeleteJob::startAJob() { diff --git a/certmanager/lib/tests/test_gnupgprocessbase.cpp b/certmanager/lib/tests/test_gnupgprocessbase.cpp index 6e6bf7c80..ec88fd813 100644 --- a/certmanager/lib/tests/test_gnupgprocessbase.cpp +++ b/certmanager/lib/tests/test_gnupgprocessbase.cpp @@ -109,7 +109,7 @@ void GnuPGViewer::slotProcessExited( KProcess * proc ) { if ( !proc ) return; if ( proc->normalExit() ) - append( TQString( "<b>Process exit: return code %1</b>" ).arg ( proc->exiStatus() ) ); + append( TQString( "<b>Process exit: return code %1</b>" ).arg ( proc->exitStatus() ) ); else append( "<b>Process exit: killed</b>" ); } @@ -127,7 +127,7 @@ int main( int argc, char** argv ) { for ( int i = 1 ; i < argc ; ++i ) gpg << argv[i]; - gpg.setUseStatusFD( true ); + gpg.setUsetStatusFD( true ); GnuPGViewer * gv = new GnuPGViewer(); gv->setProcess( &gpg ); diff --git a/certmanager/lib/tests/test_keygen.cpp b/certmanager/lib/tests/test_keygen.cpp index 8acef90f0..7e3fa8876 100644 --- a/certmanager/lib/tests/test_keygen.cpp +++ b/certmanager/lib/tests/test_keygen.cpp @@ -137,7 +137,7 @@ void KeyGenerator::slotResult( const GpgME::KeyGenerationResult & res, const TQB if ( res.error() ) showError( res.error() ); else - KMessageBox::information( this, TQString("Key generated successfully, %1 bytes long").tqarg( keyData.size() ), + KMessageBox::information( this, TQString("Key generated successfully, %1 bytes long").arg( keyData.size() ), "Key Generation Finished" ); } diff --git a/certmanager/lib/tests/test_keylister.cpp b/certmanager/lib/tests/test_keylister.cpp index ca31b39ab..363ec26a9 100644 --- a/certmanager/lib/tests/test_keylister.cpp +++ b/certmanager/lib/tests/test_keylister.cpp @@ -104,7 +104,7 @@ void CertListView::slotResult( const GpgME::KeyListResult & result ) { TQMessageBox::information( this, "Key Listing Result", "KeyListResult is null!" ); else if ( result.error() ) TQMessageBox::critical( this, "Key Listing Result", - TQString("KeyListResult Error: %1").tqarg( result.error().asString() ) ); + TQString("KeyListResult Error: %1").arg( result.error().asString() ) ); else if ( result.isTruncated() ) TQMessageBox::information( this, "Key Listing Result", "KeyListResult is truncated!" ); else diff --git a/certmanager/lib/ui/backendconfigwidget.cpp b/certmanager/lib/ui/backendconfigwidget.cpp index 1207ed0f0..33582e290 100644 --- a/certmanager/lib/ui/backendconfigwidget.cpp +++ b/certmanager/lib/ui/backendconfigwidget.cpp @@ -150,7 +150,7 @@ private: // second one is implementation name (gpg, gpgsm...) const TQString impName = protocol ? protocol->displayName() : i18n( "failed" ); return i18n( "Items in Kleo::BackendConfigWidget listview (1: protocol; 2: implementation name)", - "%1 (%2)" ).tqarg( protoName, impName ); + "%1 (%2)" ).arg( protoName, impName ); } const CryptoBackend::Protocol* mProtocol; // can be 0 diff --git a/certmanager/lib/ui/cryptoconfigmodule.cpp b/certmanager/lib/ui/cryptoconfigmodule.cpp index c7604e84e..d1f6f0aca 100644 --- a/certmanager/lib/ui/cryptoconfigmodule.cpp +++ b/certmanager/lib/ui/cryptoconfigmodule.cpp @@ -134,7 +134,7 @@ Kleo::CryptoConfigModule::CryptoConfigModule( Kleo::CryptoConfig* config, TQWidg "properly. It did not return any components. " "Try running \"%1\" on the command line for more " "information.") - .tqarg( components.empty() ? "gpgconf --list-components" : "gpgconf --list-options gpg" ); + .arg( components.empty() ? "gpgconf --list-components" : "gpgconf --list-options gpg" ); TQLabel * label = new TQLabel( msg, vbox ); label->setAlignment( TQt::WordBreak ); label->setMinimumHeight( fontMetrics().lineSpacing() * 5 ); @@ -356,7 +356,7 @@ TQString Kleo::CryptoConfigEntryGUI::description() const { TQString descr = mEntry->description(); if ( descr.isEmpty() ) // shouldn't happen - descr = TQString( "<%1>" ).tqarg( mName ); + descr = TQString( "<%1>" ).arg( mName ); return descr; } diff --git a/certmanager/lib/ui/kdhorizontalline.cpp b/certmanager/lib/ui/kdhorizontalline.cpp index 07dc7ef89..c901a2fd1 100644 --- a/certmanager/lib/ui/kdhorizontalline.cpp +++ b/certmanager/lib/ui/kdhorizontalline.cpp @@ -134,11 +134,11 @@ void KDHorizontalLine::paintEvent( TQPaintEvent * e ) { const int h = fm.height(); const int tw = fm.width( mTitle, mLenVisible ) + fm.width(TQChar(' ')); int x; - if ( mAlign & AlignHCenter ) // center tqalignment + if ( mAlign & AlignHCenter ) // center alignment x = frameRect().width()/2 - tw/2; - else if ( mAlign & AlignRight ) // right tqalignment + else if ( mAlign & AlignRight ) // right alignment x = frameRect().width() - tw; - else if ( mAlign & AlignLeft ) // left tqalignment + else if ( mAlign & AlignLeft ) // left alignment x = 0; else { // auto align if( TQApplication::reverseLayout() ) diff --git a/certmanager/lib/ui/kdhorizontalline.h b/certmanager/lib/ui/kdhorizontalline.h index c62a18ddf..530b89081 100644 --- a/certmanager/lib/ui/kdhorizontalline.h +++ b/certmanager/lib/ui/kdhorizontalline.h @@ -55,7 +55,7 @@ public: TQString title() const { return mTitle; } - /*! \reimp to hard-code the frame tqshape */ + /*! \reimp to hard-code the frame shape */ void setFrameStyle( int style ); TQSize sizeHint() const; diff --git a/certmanager/lib/ui/keylistview.cpp b/certmanager/lib/ui/keylistview.cpp index 075833b21..100334f20 100644 --- a/certmanager/lib/ui/keylistview.cpp +++ b/certmanager/lib/ui/keylistview.cpp @@ -173,7 +173,7 @@ Kleo::KeyListView::KeyListView( const ColumnStrategy * columnStrategy, const Dis Kleo::KeyListView::~KeyListView() { d->updateTimer->stop(); - // need to clear here, since in ~TQListView, our tqchildren won't have + // need to clear here, since in ~TQListView, our children won't have // a valid listView() pointing to us anymore, and their dtors try to // unregister from us. clear(); @@ -395,7 +395,7 @@ Kleo::KeyListViewItem::KeyListViewItem( KeyListViewItem * parent, KeyListViewIte } Kleo::KeyListViewItem::~KeyListViewItem() { - // delete the tqchildren first... When tqchildren are deleted in the + // delete the children first... When children are deleted in the // TQLVI dtor, they don't have listView() anymore, thus they don't // call deregister( this ), leading to stale entries in the // itemMap... @@ -428,7 +428,7 @@ void Kleo::KeyListViewItem::setKey( const GpgME::Key & key ) { if ( const TQPixmap * pix = cs->pixmap( key, i ) ) setPixmap( i, *pix ); } - tqrepaint(); + repaint(); } TQString Kleo::KeyListViewItem::toolTip( int col ) const { @@ -444,10 +444,10 @@ int Kleo::KeyListViewItem::compare( TQListViewItem * item, int col, bool ascendi return listView()->columnStrategy()->compare( this->key(), that->key(), col ); } -void Kleo::KeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment ) { +void Kleo::KeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ) { const KeyListView::DisplayStrategy * ds = listView() ? listView()->displayStrategy() : 0 ; if ( !ds ) { - TQListViewItem::paintCell( p, cg, column, width, tqalignment ); + TQListViewItem::paintCell( p, cg, column, width, alignment ); return; } const TQColor fg = ds->keyForeground( key(), cg.text() ); @@ -459,7 +459,7 @@ void Kleo::KeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, i _cg.setColor( TQColorGroup::Text, fg ); _cg.setColor( TQColorGroup::Base, bg ); - TQListViewItem::paintCell( p, _cg, column, width, tqalignment ); + TQListViewItem::paintCell( p, _cg, column, width, alignment ); } void Kleo::KeyListViewItem::insertItem( TQListViewItem * qlvi ) { @@ -536,10 +536,10 @@ int Kleo::SubkeyKeyListViewItem::compare( TQListViewItem * item, int col, bool a return listView()->columnStrategy()->subkeyCompare( this->subkey(), that->subkey(), col ); } -void Kleo::SubkeyKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment ) { +void Kleo::SubkeyKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ) { const KeyListView::DisplayStrategy * ds = listView() ? listView()->displayStrategy() : 0 ; if ( !ds ) { - TQListViewItem::paintCell( p, cg, column, width, tqalignment ); + TQListViewItem::paintCell( p, cg, column, width, alignment ); return; } const TQColor fg = ds->subkeyForeground( subkey(), cg.text() ); @@ -551,7 +551,7 @@ void Kleo::SubkeyKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & _cg.setColor( TQColorGroup::Text, fg ); _cg.setColor( TQColorGroup::Base, bg ); - TQListViewItem::paintCell( p, _cg, column, width, tqalignment ); + TQListViewItem::paintCell( p, _cg, column, width, alignment ); } @@ -615,10 +615,10 @@ int Kleo::UserIDKeyListViewItem::compare( TQListViewItem * item, int col, bool a } -void Kleo::UserIDKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment ) { +void Kleo::UserIDKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ) { const KeyListView::DisplayStrategy * ds = listView() ? listView()->displayStrategy() : 0 ; if ( !ds ) { - TQListViewItem::paintCell( p, cg, column, width, tqalignment ); + TQListViewItem::paintCell( p, cg, column, width, alignment ); return; } const TQColor fg = ds->useridForeground( userID(), cg.text() ); @@ -630,7 +630,7 @@ void Kleo::UserIDKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & _cg.setColor( TQColorGroup::Text, fg ); _cg.setColor( TQColorGroup::Base, bg ); - TQListViewItem::paintCell( p, _cg, column, width, tqalignment ); + TQListViewItem::paintCell( p, _cg, column, width, alignment ); } @@ -693,10 +693,10 @@ int Kleo::SignatureKeyListViewItem::compare( TQListViewItem * item, int col, boo return listView()->columnStrategy()->signatureCompare( this->signature(), that->signature(), col ); } -void Kleo::SignatureKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment ) { +void Kleo::SignatureKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ) { const KeyListView::DisplayStrategy * ds = listView() ? listView()->displayStrategy() : 0 ; if ( !ds ) { - TQListViewItem::paintCell( p, cg, column, width, tqalignment ); + TQListViewItem::paintCell( p, cg, column, width, alignment ); return; } const TQColor fg = ds->signatureForeground( signature(), cg.text() ); @@ -708,7 +708,7 @@ void Kleo::SignatureKeyListViewItem::paintCell( TQPainter * p, const TQColorGrou _cg.setColor( TQColorGroup::Text, fg ); _cg.setColor( TQColorGroup::Base, bg ); - TQListViewItem::paintCell( p, _cg, column, width, tqalignment ); + TQListViewItem::paintCell( p, _cg, column, width, alignment ); } diff --git a/certmanager/lib/ui/keylistview.h b/certmanager/lib/ui/keylistview.h index 38ad0f5ab..ada8354e2 100644 --- a/certmanager/lib/ui/keylistview.h +++ b/certmanager/lib/ui/keylistview.h @@ -91,7 +91,7 @@ namespace Kleo { /*! \reimp */ int rtti() const { return RTTI; } /*! \reimp */ - void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment ); + void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ); /*! \reimp */ void insertItem( TQListViewItem * item ); /*! \reimp */ @@ -127,7 +127,7 @@ namespace Kleo { /*! \reimp */ int rtti() const { return RTTI; } /*! \reimp */ - void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment ); + void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ); private: GpgME::Subkey mSubkey; @@ -159,7 +159,7 @@ namespace Kleo { /*! \reimp */ int rtti() const { return RTTI; } /*! \reimp */ - void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment ); + void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ); private: GpgME::UserID mUserID; @@ -191,7 +191,7 @@ namespace Kleo { /*! \reimp */ int rtti() const { return RTTI; } /*! \reimp */ - void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment ); + void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ); private: GpgME::UserID::Signature mSignature; diff --git a/certmanager/lib/ui/keyrequester.cpp b/certmanager/lib/ui/keyrequester.cpp index 3c1e264cd..c3bcf0244 100644 --- a/certmanager/lib/ui/keyrequester.cpp +++ b/certmanager/lib/ui/keyrequester.cpp @@ -231,7 +231,7 @@ static void showKeyListError( TQWidget * parent, const GpgME::Error & err ) { const TQString msg = i18n( "<qt><p>An error occurred while fetching " "the keys from the backend:</p>" "<p><b>%1</b></p></qt>" ) - .tqarg( TQString::fromLocal8Bit( err.asString() ) ); + .arg( TQString::fromLocal8Bit( err.asString() ) ); KMessageBox::error( parent, msg, i18n( "Key Listing Failed" ) ); } diff --git a/certmanager/lib/ui/keyselectiondialog.cpp b/certmanager/lib/ui/keyselectiondialog.cpp index b05d9ea28..d88d80b3f 100644 --- a/certmanager/lib/ui/keyselectiondialog.cpp +++ b/certmanager/lib/ui/keyselectiondialog.cpp @@ -248,7 +248,7 @@ namespace { "Created: %2\n" "Expiry: %3\n" "Fingerprint: %4" ) - .tqarg( uid ? TQString::fromUtf8( uid ) : i18n("unknown"), + .arg( uid ? TQString::fromUtf8( uid ) : i18n("unknown"), creation, expiry, fpr ? TQString::fromLatin1( fpr ) : i18n("unknown") ); else @@ -257,10 +257,10 @@ namespace { "Expiry: %3\n" "Fingerprint: %4\n" "Issuer: %5" ) - .tqarg( uid ? Kleo::DN( uid ).prettyDN() : i18n("unknown"), + .arg( uid ? Kleo::DN( uid ).prettyDN() : i18n("unknown"), creation, expiry, fpr ? TQString::fromLatin1( fpr ) : i18n("unknown") ) - .tqarg( issuer ? Kleo::DN( issuer ).prettyDN() : i18n("unknown") ); + .arg( issuer ? Kleo::DN( issuer ).prettyDN() : i18n("unknown") ); } const TQPixmap * ColumnStrategy::pixmap( const GpgME::Key & key, int col ) const { @@ -374,11 +374,11 @@ void Kleo::KeySelectionDialog::init( bool rememberChoice, bool extendedSelection KActiveLabel *textLabel = new KActiveLabel( text, page ); disconnect( textLabel, TQT_SIGNAL(linkClicked(const TQString&)), textLabel, TQT_SLOT(openLink(const TQString&)) ); connect( textLabel, TQT_SIGNAL(linkClicked(const TQString&)), TQT_SLOT(slotStartCertificateManager(const TQString&)) ); - textLabel->setAlignment( textLabel->tqalignment() | TQt::WordBreak ); + textLabel->setAlignment( textLabel->alignment() | TQt::WordBreak ); mTopLayout->addWidget( textLabel ); } else { KActiveLabel *textLabel = new KActiveLabel( text, page ); - textLabel->setAlignment( textLabel->tqalignment() | TQt::WordBreak ); + textLabel->setAlignment( textLabel->alignment() | TQt::WordBreak ); mTopLayout->addWidget( textLabel ); } } @@ -567,7 +567,7 @@ static void showKeyListError( TQWidget * parent, const GpgME::Error & err ) { const TQString msg = i18n( "<qt><p>An error occurred while fetching " "the keys from the backend:</p>" "<p><b>%1</b></p></qt>" ) - .tqarg( TQString::fromLocal8Bit( err.asString() ) ); + .arg( TQString::fromLocal8Bit( err.asString() ) ); KMessageBox::error( parent, msg, i18n( "Key Listing Failed" ) ); } diff --git a/certmanager/lib/ui/messagebox.cpp b/certmanager/lib/ui/messagebox.cpp index 2dfe083d5..5917fdee8 100644 --- a/certmanager/lib/ui/messagebox.cpp +++ b/certmanager/lib/ui/messagebox.cpp @@ -127,7 +127,7 @@ private: if ( const int err = file.status() ) KMessageBox::error( this, i18n("Couldn't save to file \"%1\": %2") - .tqarg( file.name(), TQString::fromLocal8Bit( strerror( err ) ) ), + .arg( file.name(), TQString::fromLocal8Bit( strerror( err ) ) ), i18n("File Save Error") ); } void slotUser2() { @@ -159,7 +159,7 @@ void MessageBox::auditLog( TQWidget * parent, const Job * job, const TQString & if ( err.code() != GPG_ERR_NO_DATA ) { KMessageBox::information( parent, i18n("An error occurred while trying to retrieve the GnuPG Audit Log:\n%1") - .tqarg( TQString::fromLocal8Bit( err.asString() ) ), + .arg( TQString::fromLocal8Bit( err.asString() ) ), i18n("GnuPG Audit Log Error") ); return; } @@ -194,7 +194,7 @@ void MessageBox::auditLog( TQWidget * parent, const TQString & log ) { static TQString to_information_string( const SigningResult & result ) { return result.error() - ? i18n("Signing failed: %1").tqarg( TQString::fromLocal8Bit( result.error().asString() ) ) + ? i18n("Signing failed: %1").arg( TQString::fromLocal8Bit( result.error().asString() ) ) : i18n("Signing successful") ; } @@ -204,7 +204,7 @@ static TQString to_error_string( const SigningResult & result ) { static TQString to_information_string( const EncryptionResult & result ) { return result.error() - ? i18n("Encryption failed: %1").tqarg( TQString::fromLocal8Bit( result.error().asString() ) ) + ? i18n("Encryption failed: %1").arg( TQString::fromLocal8Bit( result.error().asString() ) ) : i18n("Encryption successful") ; } diff --git a/certmanager/lib/ui/progressdialog.cpp b/certmanager/lib/ui/progressdialog.cpp index e0149b8f3..d6552922c 100644 --- a/certmanager/lib/ui/progressdialog.cpp +++ b/certmanager/lib/ui/progressdialog.cpp @@ -83,7 +83,7 @@ void Kleo::ProgressDialog::slotProgress( const TQString & what, int current, int else if ( what.isEmpty() ) setLabelText( mBaseText ); else - setLabelText( i18n( "%1: %2" ).tqarg( mBaseText, what ) ); + setLabelText( i18n( "%1: %2" ).arg( mBaseText, what ) ); setProgress( current, total ); } diff --git a/certmanager/storedtransferjob.cpp b/certmanager/storedtransferjob.cpp index b111b081f..fd9e601b8 100644 --- a/certmanager/storedtransferjob.cpp +++ b/certmanager/storedtransferjob.cpp @@ -49,7 +49,7 @@ void StoredTransferJob::slotData( KIO::Job *, const TQByteArray &data ) if ( data.size() == 0 ) return; unsigned int oldSize = m_data.size(); - m_data.tqresize( oldSize + data.size(), TQGArray::SpeedOptim ); + m_data.resize( oldSize + data.size(), TQGArray::SpeedOptim ); memcpy( m_data.data() + oldSize, data.data(), data.size() ); } diff --git a/indexlib/boost-compat/config/abi/borland_prefix.hpp b/indexlib/boost-compat/config/abi/borland_prefix.hpp index f8d23b7a2..c911a735e 100644 --- a/indexlib/boost-compat/config/abi/borland_prefix.hpp +++ b/indexlib/boost-compat/config/abi/borland_prefix.hpp @@ -8,7 +8,7 @@ // -b (on or off - effect emum sizes) // -Vx (on or off - empty members) // -Ve (on or off - empty base classes) -// -aX (tqalignment - 5 options). +// -aX (alignment - 5 options). // -pX (Calling convention - 4 options) // -VmX (member pointer size and tqlayout - 5 options) // -VC (on or off, changes name mangling) diff --git a/indexlib/boost-compat/config/user.hpp b/indexlib/boost-compat/config/user.hpp index c83e9af6b..5a4a9d477 100644 --- a/indexlib/boost-compat/config/user.hpp +++ b/indexlib/boost-compat/config/user.hpp @@ -67,12 +67,12 @@ // BOOST_DISABLE_ABI_HEADERS: Stops boost headers from including any // prefix/suffix headers that normally control things like struct -// packing and tqalignment. +// packing and alignment. // #define BOOST_DISABLE_ABI_HEADERS // BOOST_ABI_PREFIX: A prefix header to include in place of whatever // boost.config would normally select, any replacement should set up -// struct packing and tqalignment options as required. +// struct packing and alignment options as required. // #define BOOST_ABI_PREFIX my-header-name // BOOST_ABI_SUFFIX: A suffix header to include in place of whatever diff --git a/kaddressbook/addresseditwidget.cpp b/kaddressbook/addresseditwidget.cpp index 32ecdc9a7..09047fa64 100644 --- a/kaddressbook/addresseditwidget.cpp +++ b/kaddressbook/addresseditwidget.cpp @@ -273,7 +273,7 @@ AddressEditDialog::AddressEditDialog( const KABC::Address::List &list, mTypeCombo = new AddressTypeCombo( mAddressList, page ); topLayout->addMultiCellWidget( mTypeCombo, 0, 0, 0, 1 ); - TQLabel *label = new TQLabel( i18n( "<streetLabel>:", "%1:" ).tqarg( KABC::Address::streetLabel() ), page ); + TQLabel *label = new TQLabel( i18n( "<streetLabel>:", "%1:" ).arg( KABC::Address::streetLabel() ), page ); label->setAlignment( TQt::AlignTop | TQt::AlignLeft ); topLayout->addWidget( label, 1, 0 ); mStreetTextEdit = new TQTextEdit( page ); @@ -284,31 +284,31 @@ AddressEditDialog::AddressEditDialog( const KABC::Address::List &list, TabPressEater *eater = new TabPressEater( TQT_TQOBJECT(this) ); mStreetTextEdit->installEventFilter( eater ); - label = new TQLabel( i18n( "<postOfficeBoxLabel>:", "%1:" ).tqarg( KABC::Address::postOfficeBoxLabel() ), page ); + label = new TQLabel( i18n( "<postOfficeBoxLabel>:", "%1:" ).arg( KABC::Address::postOfficeBoxLabel() ), page ); topLayout->addWidget( label, 2 , 0 ); mPOBoxEdit = new KLineEdit( page ); label->setBuddy( mPOBoxEdit ); topLayout->addWidget( mPOBoxEdit, 2, 1 ); - label = new TQLabel( i18n( "<localityLabel>:", "%1:" ).tqarg( KABC::Address::localityLabel() ), page ); + label = new TQLabel( i18n( "<localityLabel>:", "%1:" ).arg( KABC::Address::localityLabel() ), page ); topLayout->addWidget( label, 3, 0 ); mLocalityEdit = new KLineEdit( page ); label->setBuddy( mLocalityEdit ); topLayout->addWidget( mLocalityEdit, 3, 1 ); - label = new TQLabel( i18n( "<regionLabel>:", "%1:" ).tqarg( KABC::Address::regionLabel() ), page ); + label = new TQLabel( i18n( "<regionLabel>:", "%1:" ).arg( KABC::Address::regionLabel() ), page ); topLayout->addWidget( label, 4, 0 ); mRegionEdit = new KLineEdit( page ); label->setBuddy( mRegionEdit ); topLayout->addWidget( mRegionEdit, 4, 1 ); - label = new TQLabel( i18n( "<postalCodeLabel>:", "%1:" ).tqarg( KABC::Address::postalCodeLabel() ), page ); + label = new TQLabel( i18n( "<postalCodeLabel>:", "%1:" ).arg( KABC::Address::postalCodeLabel() ), page ); topLayout->addWidget( label, 5, 0 ); mPostalCodeEdit = new KLineEdit( page ); label->setBuddy( mPostalCodeEdit ); topLayout->addWidget( mPostalCodeEdit, 5, 1 ); - label = new TQLabel( i18n( "<countryLabel>:", "%1:" ).tqarg( KABC::Address::countryLabel() ), page ); + label = new TQLabel( i18n( "<countryLabel>:", "%1:" ).arg( KABC::Address::countryLabel() ), page ); topLayout->addWidget( label, 6, 0 ); mCountryCombo = new KComboBox( page ); mCountryCombo->setEditable( true ); diff --git a/kaddressbook/addresseeeditordialog.cpp b/kaddressbook/addresseeeditordialog.cpp index a742c3f76..5ac80b065 100644 --- a/kaddressbook/addresseeeditordialog.cpp +++ b/kaddressbook/addresseeeditordialog.cpp @@ -147,7 +147,7 @@ void AddresseeEditorDialog::slotCancel() void AddresseeEditorDialog::setTitle( const KABC::Addressee &addr ) { if ( !addr.realName().isEmpty() ) - setCaption( i18n( "Edit Contact '%1'" ).tqarg( addr.realName() ) ); + setCaption( i18n( "Edit Contact '%1'" ).arg( addr.realName() ) ); } #include "addresseeeditordialog.moc" diff --git a/kaddressbook/addresseeeditorwidget.cpp b/kaddressbook/addresseeeditorwidget.cpp index 658f90e0e..49013aa68 100644 --- a/kaddressbook/addresseeeditorwidget.cpp +++ b/kaddressbook/addresseeeditorwidget.cpp @@ -181,7 +181,7 @@ void AddresseeEditorWidget::setupTab1() tqlayout->addWidget( button, 0, 1 ); tqlayout->addWidget( mNameEdit, 0, 2 ); tqlayout->addWidget( mNameLabel, 0, 2 ); - label = new TQLabel( i18n( "<roleLabel>:", "%1:" ).tqarg( KABC::Addressee::roleLabel() ), tab1 ); + label = new TQLabel( i18n( "<roleLabel>:", "%1:" ).arg( KABC::Addressee::roleLabel() ), tab1 ); mRoleEdit = new KLineEdit( tab1 ); connect( mRoleEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( textChanged( const TQString& ) ) ); @@ -190,7 +190,7 @@ void AddresseeEditorWidget::setupTab1() tqlayout->addWidget( mRoleEdit, 1, 2 ); // Organization - label = new TQLabel( i18n( "<organizationLabel>:", "%1:" ).tqarg( KABC::Addressee::organizationLabel() ), tab1 ); + label = new TQLabel( i18n( "<organizationLabel>:", "%1:" ).arg( KABC::Addressee::organizationLabel() ), tab1 ); mOrgEdit = new KLineEdit( tab1 ); label->setBuddy( mOrgEdit ); connect( mOrgEdit, TQT_SIGNAL( textChanged( const TQString& ) ), @@ -256,7 +256,7 @@ void AddresseeEditorWidget::setupTab1() KIcon::SizeMedium ) ); homePageLayout->addWidget( label ); - label = new TQLabel( i18n( "<urlLabel>:", "%1:" ).tqarg( KABC::Addressee::urlLabel() ), tab1 ); + label = new TQLabel( i18n( "<urlLabel>:", "%1:" ).arg( KABC::Addressee::urlLabel() ), tab1 ); mURLEdit = new KLineEdit( tab1 ); connect( mURLEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( textChanged( const TQString& ) ) ); @@ -369,7 +369,7 @@ void AddresseeEditorWidget::setupTab2() label->setBuddy( mAssistantEdit ); tqlayout->addMultiCellWidget( mAssistantEdit, 1, 1, 4, 5 ); - label = new TQLabel( i18n( "<titleLabel>:", "%1:" ).tqarg( KABC::Addressee::titleLabel() ), tab2 ); + label = new TQLabel( i18n( "<titleLabel>:", "%1:" ).arg( KABC::Addressee::titleLabel() ), tab2 ); tqlayout->addWidget( label, 2, 3 ); mTitleEdit = new KLineEdit( tab2 ); connect( mTitleEdit, TQT_SIGNAL( textChanged( const TQString& ) ), diff --git a/kaddressbook/common/filter.cpp b/kaddressbook/common/filter.cpp index 910fc151e..932f6f108 100644 --- a/kaddressbook/common/filter.cpp +++ b/kaddressbook/common/filter.cpp @@ -147,7 +147,7 @@ void Filter::save( KConfig *config, const TQString &baseGroup, Filter::List &lis // remove the old filters uint count = config->readNumEntry( "Count" ); for ( uint i = 0; i < count; ++i ) - config->deleteGroup( TQString( "%1_%2" ).tqarg( baseGroup ).tqarg( i ) ); + config->deleteGroup( TQString( "%1_%2" ).arg( baseGroup ).arg( i ) ); } @@ -155,8 +155,8 @@ void Filter::save( KConfig *config, const TQString &baseGroup, Filter::List &lis Filter::List::Iterator iter; for ( iter = list.begin(); iter != list.end(); ++iter ) { if ( !(*iter).mInternal ) { - KConfigGroupSaver s( config, TQString( "%1_%2" ).tqarg( baseGroup ) - .tqarg( index ) ); + KConfigGroupSaver s( config, TQString( "%1_%2" ).arg( baseGroup ) + .arg( index ) ); (*iter).save( config ); index++; } @@ -179,7 +179,7 @@ Filter::List Filter::restore( KConfig *config, const TQString &baseGroup ) for ( int i = 0; i < count; i++ ) { { - KConfigGroupSaver s( config, TQString( "%1_%2" ).tqarg( baseGroup ).tqarg( i ) ); + KConfigGroupSaver s( config, TQString( "%1_%2" ).arg( baseGroup ).arg( i ) ); f.restore( config ); } diff --git a/kaddressbook/common/locationmap.cpp b/kaddressbook/common/locationmap.cpp index 0e1d4e9cf..2fbda71cb 100644 --- a/kaddressbook/common/locationmap.cpp +++ b/kaddressbook/common/locationmap.cpp @@ -72,7 +72,7 @@ TQString LocationMap::createUrl( const KABC::Address &addr ) %c country (in ISO format) */ - TQString urlTemplate = KABPrefs::instance()->locationMapURL().tqarg( KGlobal::locale()->country() ); + TQString urlTemplate = KABPrefs::instance()->locationMapURL().arg( KGlobal::locale()->country() ); if ( urlTemplate.isEmpty() ) { KMessageBox::error( 0, i18n( "No service provider available for map lookup!\nPlease add one in the configuration dialog." ) ); return TQString(); diff --git a/kaddressbook/contacteditorwidgetmanager.cpp b/kaddressbook/contacteditorwidgetmanager.cpp index 1e3677c55..7efea76f6 100644 --- a/kaddressbook/contacteditorwidgetmanager.cpp +++ b/kaddressbook/contacteditorwidgetmanager.cpp @@ -76,7 +76,7 @@ void ContactEditorWidgetManager::reload() mFactories.clear(); kdDebug(5720) << "ContactEditorWidgetManager::reload()" << endl; const KTrader::OfferList plugins = KTrader::self()->query( "KAddressBook/ContactEditorWidget", - TQString( "[X-KDE-KAddressBook-CEWPluginVersion] == %1" ).tqarg( KAB_CEW_PLUGIN_VERSION ) ); + TQString( "[X-KDE-KAddressBook-CEWPluginVersion] == %1" ).arg( KAB_CEW_PLUGIN_VERSION ) ); KTrader::OfferList::ConstIterator it; for ( it = plugins.begin(); it != plugins.end(); ++it ) { diff --git a/kaddressbook/distributionlisteditor.cpp b/kaddressbook/distributionlisteditor.cpp index 6d1f65650..c9ac1254b 100644 --- a/kaddressbook/distributionlisteditor.cpp +++ b/kaddressbook/distributionlisteditor.cpp @@ -261,7 +261,7 @@ void KPIM::DistributionListEditor::EditorWidget::slotOk() const KPIM::DistributionList existing = KPIM::DistributionList::findByName( d->addressBook, name ); if ( !existing.isEmpty() && existing.uid() != d->distListUid ) { - KMessageBox::error( this, i18n( "A distribution list with the name %1 already exists. Please choose another name." ).tqarg( name ), i18n( "Name in Use" ) ); + KMessageBox::error( this, i18n( "A distribution list with the name %1 already exists. Please choose another name." ).arg( name ), i18n( "Name in Use" ) ); return; } diff --git a/kaddressbook/distributionlistentryview.cpp b/kaddressbook/distributionlistentryview.cpp index f87ff133a..9d927a5d4 100644 --- a/kaddressbook/distributionlistentryview.cpp +++ b/kaddressbook/distributionlistentryview.cpp @@ -106,10 +106,10 @@ void KAB::DistributionListEntryView::setEntry( const KPIM::DistributionList& lis TQPixmap pixmap; pixmap.convertFromImage( m_entry.addressee.photo().data() ); m_imageLabel->setPixmap( pixmap.isNull() ? KGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop ) : pixmap ); - m_addresseeLabel->setText( i18n( "Formatted name, role, organization", "<qt><h2>%1</h2><p>%2<br/>%3</p></qt>" ).tqarg( m_entry.addressee.formattedName(), m_entry.addressee.role(), m_entry.addressee.organization() ) ); + m_addresseeLabel->setText( i18n( "Formatted name, role, organization", "<qt><h2>%1</h2><p>%2<br/>%3</p></qt>" ).arg( m_entry.addressee.formattedName(), m_entry.addressee.role(), m_entry.addressee.organization() ) ); m_distListLabel->setURL( m_list.name() ); m_distListLabel->setText( m_list.name() ); - m_resourceLabel->setText( i18n( "<b>Address book:</b> %1" ).tqarg( m_entry.addressee.resource() ? m_entry.addressee.resource()->resourceName() : TQString() ) ); + m_resourceLabel->setText( i18n( "<b>Address book:</b> %1" ).arg( m_entry.addressee.resource() ? m_entry.addressee.resource()->resourceName() : TQString() ) ); m_resourceLabel->setAlignment( TQt::SingleLine ); m_emailGroup = new TQVButtonGroup( this ); @@ -133,7 +133,7 @@ void KAB::DistributionListEntryView::setEntry( const KPIM::DistributionList& lis this, TQT_SLOT( emailButtonClicked( int ) ) ); m_radioLayout->addWidget( m_emailGroup, 0, 0 ); m_emailGroup->setShown( true ); - m_mainLayout->tqinvalidate(); + m_mainLayout->invalidate(); } diff --git a/kaddressbook/distributionlistpicker.cpp b/kaddressbook/distributionlistpicker.cpp index 9f8626fb9..aa59fe217 100644 --- a/kaddressbook/distributionlistpicker.cpp +++ b/kaddressbook/distributionlistpicker.cpp @@ -112,7 +112,7 @@ void KPIM::DistributionListPickerDialog::slotUser1() } else { - KMessageBox::error( this, i18n( "A distribution list with the the name %1 already exists. Please choose another name" ).tqarg( name ), i18n( "Name Exists" ) ); + KMessageBox::error( this, i18n( "A distribution list with the the name %1 already exists. Please choose another name" ).arg( name ), i18n( "Name Exists" ) ); } } while ( !validName ); diff --git a/kaddressbook/editors/imeditorwidget.cpp b/kaddressbook/editors/imeditorwidget.cpp index 9f468bfd6..d878454ac 100644 --- a/kaddressbook/editors/imeditorwidget.cpp +++ b/kaddressbook/editors/imeditorwidget.cpp @@ -64,7 +64,7 @@ bool IMAddressLVI::preferred() const } void IMAddressLVI::paintCell( TQPainter *p, const TQColorGroup &cg, - int column, int width, int tqalignment ) + int column, int width, int alignment ) { if ( mPreferred ) { TQFont font = p->font(); @@ -72,7 +72,7 @@ void IMAddressLVI::paintCell( TQPainter *p, const TQColorGroup &cg, p->setFont( font ); } - KListViewItem::paintCell( p, cg, column, width, tqalignment ); + KListViewItem::paintCell( p, cg, column, width, alignment ); } void IMAddressLVI::setAddress( const TQString &address ) @@ -85,7 +85,7 @@ void IMAddressLVI::setAddress( const TQString &address ) else { TQString nickname = address.section( TQChar( 0xE120 ), 0, 0 ); setText( 1, i18n( "<nickname> on <server>","%1 on %2" ) - .tqarg( nickname ).tqarg( serverOrGroup ) ); + .arg( nickname ).arg( serverOrGroup ) ); } mAddress = address; diff --git a/kaddressbook/editors/imeditorwidget.h b/kaddressbook/editors/imeditorwidget.h index 3c9b85cee..417e62f4d 100644 --- a/kaddressbook/editors/imeditorwidget.h +++ b/kaddressbook/editors/imeditorwidget.h @@ -116,7 +116,7 @@ class IMAddressLVI : public KListViewItem bool preferred() const; protected: - virtual void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment ); + virtual void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment ); private: KPluginInfo * mProtocol; diff --git a/kaddressbook/emaileditwidget.cpp b/kaddressbook/emaileditwidget.cpp index 3ed79f49d..3d94d3b7e 100644 --- a/kaddressbook/emaileditwidget.cpp +++ b/kaddressbook/emaileditwidget.cpp @@ -302,7 +302,7 @@ void EmailEditDialog::remove() { TQString address = mEmailListBox->currentText(); - TQString text = i18n( "<qt>Are you sure that you want to remove the email address <b>%1</b>?</qt>" ).tqarg( address ); + TQString text = i18n( "<qt>Are you sure that you want to remove the email address <b>%1</b>?</qt>" ).arg( address ); TQString caption = i18n( "Confirm Remove" ); if ( KMessageBox::warningContinueCancel( this, text, caption, KGuiItem( i18n("&Delete"), "editdelete") ) == KMessageBox::Continue) { diff --git a/kaddressbook/extensionmanager.cpp b/kaddressbook/extensionmanager.cpp index 6e854ebca..39727ecd6 100644 --- a/kaddressbook/extensionmanager.cpp +++ b/kaddressbook/extensionmanager.cpp @@ -217,7 +217,7 @@ void ExtensionManager::createExtensionWidgets() // load the other extensions const KTrader::OfferList plugins = KTrader::self()->query( "KAddressBook/Extension", - TQString( "[X-KDE-KAddressBook-ExtensionPluginVersion] == %1" ).tqarg( KAB_EXTENSIONWIDGET_PLUGIN_VERSION ) ); + TQString( "[X-KDE-KAddressBook-ExtensionPluginVersion] == %1" ).arg( KAB_EXTENSIONWIDGET_PLUGIN_VERSION ) ); KTrader::OfferList::ConstIterator it; for ( it = plugins.begin(); it != plugins.end(); ++it ) { diff --git a/kaddressbook/features/distributionlistwidget.cpp b/kaddressbook/features/distributionlistwidget.cpp index 035eba6ce..d279cc01f 100644 --- a/kaddressbook/features/distributionlistwidget.cpp +++ b/kaddressbook/features/distributionlistwidget.cpp @@ -343,7 +343,7 @@ void DistributionListWidget::editList() void DistributionListWidget::removeList() { int result = KMessageBox::warningContinueCancel( this, - i18n( "<qt>Delete distribution list <b>%1</b>?</qt>" ) .tqarg( mNameCombo->currentText() ), + i18n( "<qt>Delete distribution list <b>%1</b>?</qt>" ) .arg( mNameCombo->currentText() ), TQString(), KGuiItem( i18n("Delete"), "editdelete") ); if ( result != KMessageBox::Continue ) diff --git a/kaddressbook/features/resourceselection.cpp b/kaddressbook/features/resourceselection.cpp index a7f0d36dd..4972fd45d 100644 --- a/kaddressbook/features/resourceselection.cpp +++ b/kaddressbook/features/resourceselection.cpp @@ -247,7 +247,7 @@ void ResourceSelection::add() KABC::Resource *resource = mManager->createResource( type ); if ( !resource ) { KMessageBox::error( this, i18n("<qt>Unable to create an address book of type <b>%1</b>.</qt>") - .tqarg( type ) ); + .arg( type ) ); return; } @@ -298,7 +298,7 @@ void ResourceSelection::remove() int result = KMessageBox::warningContinueCancel( this, i18n( "<qt>Do you really want to remove the address book <b>%1</b>?</qt>" ) - .tqarg( item->resource()->resourceName() ), "", + .arg( item->resource()->resourceName() ), "", KGuiItem( i18n( "&Remove" ), "editdelete" ) ); if ( result == KMessageBox::Cancel ) return; diff --git a/kaddressbook/geowidget.cpp b/kaddressbook/geowidget.cpp index 427e33bd9..3f5a2972b 100644 --- a/kaddressbook/geowidget.cpp +++ b/kaddressbook/geowidget.cpp @@ -537,7 +537,7 @@ void GeoMapWidget::paintEvent( TQPaintEvent* ) TQPixmap pm( w, h ); TQPainter p; - p.tqbegin( &pm, this ); + p.begin( &pm, this ); p.setPen( TQColor( 255, 0, 0 ) ); p.setBrush( TQColor( 255, 0, 0 ) ); diff --git a/kaddressbook/interfaces/xxport.h b/kaddressbook/interfaces/xxport.h index 73710d82b..377263fce 100644 --- a/kaddressbook/interfaces/xxport.h +++ b/kaddressbook/interfaces/xxport.h @@ -95,7 +95,7 @@ class KDE_EXPORT XXPort : public TQObject, virtual public KXMLGUIClient /** Processes outstanding KApplication events. It should be called occasionally when the import/export filter is busy performing - a long operation (e.g. reading from slow external tqdevices). + a long operation (e.g. reading from slow external devices). @see: TQApplication::processEvents() */ void processEvents() const; diff --git a/kaddressbook/jumpbuttonbar.cpp b/kaddressbook/jumpbuttonbar.cpp index 11c9a9d1a..07bc98093 100644 --- a/kaddressbook/jumpbuttonbar.cpp +++ b/kaddressbook/jumpbuttonbar.cpp @@ -57,7 +57,7 @@ JumpButton::JumpButton( const TQString &firstChar, const TQString &lastChar, { setToggleButton( true ); if ( !lastChar.isEmpty() ) - setText( TQString( "%1 - %2" ).tqarg( firstChar.upper() ).tqarg( lastChar.upper() ) ); + setText( TQString( "%1 - %2" ).arg( firstChar.upper() ).arg( lastChar.upper() ) ); else setText( firstChar.upper() ); } diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index bc9ee1b6f..3c8a10d21 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp @@ -114,7 +114,7 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, TQWidget *parent, mAddressBook = new KABC::AddressBook; mAddressBook->addResource( new KABC::ResourceFile( file ) ); if ( !mAddressBook->load() ) { - KMessageBox::error( parent, i18n("Unable to load '%1'.").tqarg( file ) ); + KMessageBox::error( parent, i18n("Unable to load '%1'.").arg( file ) ); } } mAddressBook->setErrorHandler( new KABC::GuiErrorHandler( mWidget ) ); @@ -334,7 +334,7 @@ KAboutData *KABCore::createAboutData() return about; } -void KABCore::seStatusBar( KStatusBar *statusBar ) +void KABCore::setStatusBar( KStatusBar *statusBar ) { mStatusBar = statusBar; } @@ -640,7 +640,7 @@ void KABCore::setWhoAmI() } TQString text( i18n( "<qt>Do you really want to use <b>%1</b> as your new personal contact?</qt>" ) ); - if ( KMessageBox::questionYesNo( mWidget, text.tqarg( addrList[ 0 ].assembledName() ), TQString(), i18n("Use"), i18n("Do Not Use") ) == KMessageBox::Yes ) + if ( KMessageBox::questionYesNo( mWidget, text.arg( addrList[ 0 ].assembledName() ), TQString(), i18n("Use"), i18n("Do Not Use") ) == KMessageBox::Yes ) static_cast<KABC::StdAddressBook*>( KABC::StdAddressBook::self( true ) )->setWhoAmI( addrList[ 0 ] ); } @@ -720,7 +720,7 @@ void KABCore::newDistributionList() bool foundUnused = false; int i = 1; while ( !foundUnused ) { - name = i18n( "New Distribution List (%1)" ).tqarg( i++ ); + name = i18n( "New Distribution List (%1)" ).arg( i++ ); foundUnused = KPIM::DistributionList::findByName( addressBook(), name ).isEmpty(); } } @@ -897,7 +897,7 @@ void KABCore::save() if ( ticket ) { if ( !mAddressBook->save( ticket ) ) { KMessageBox::error( mWidget, - i18n( "<qt>Unable to save address book <b>%1</b>.</qt>" ).tqarg( it.current()->resourceName() ) ); + i18n( "<qt>Unable to save address book <b>%1</b>.</qt>" ).arg( it.current()->resourceName() ) ); mAddressBook->releaseSaveTicket( ticket ); } else { setModified( false ); @@ -905,7 +905,7 @@ void KABCore::save() } else { KMessageBox::error( mWidget, i18n( "<qt>Unable to get access for saving the address book <b>%1</b>.</qt>" ) - .tqarg( it.current()->resourceName() ) ); + .arg( it.current()->resourceName() ) ); } ++it; @@ -1634,7 +1634,7 @@ void KABCore::removeSelectedContactsFromDistList() "<b>Note:</b>The contacts will be not be removed from your addressbook nor from " "any other distribution list." "</qt>", - uids.count() ).tqarg( mSelectedDistributionList ), + uids.count() ).arg( mSelectedDistributionList ), names, TQString(), KStdGuiItem::del() ) == KMessageBox::Cancel ) { return; } @@ -1729,7 +1729,7 @@ void KABCore::setSelectedDistributionList( const TQString &name ) mSearchManager->setSelectedDistributionList( name ); mViewHeaderLabel->setText( name.isNull() ? i18n( "Contacts" ) : - i18n( "Distribution List: %1" ).tqarg( name ) ); + i18n( "Distribution List: %1" ).arg( name ) ); mDistListButtonWidget->setShown( !mSelectedDistributionList.isNull() ); if ( !name.isNull() ) { mDetailsStack->raiseWidget( mDistListEntryView ); diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h index 39f229a59..fb5d47331 100644 --- a/kaddressbook/kabcore.h +++ b/kaddressbook/kabcore.h @@ -140,7 +140,7 @@ class KDE_EXPORT KABCore : public KAB::Core static KAboutData *createAboutData(); - void seStatusBar( KStatusBar *statusBar ); + void setStatusBar( KStatusBar *statusBar ); KStatusBar *statusBar() const; diff --git a/kaddressbook/kabtools.cpp b/kaddressbook/kabtools.cpp index 3efa42772..db623dbad 100644 --- a/kaddressbook/kabtools.cpp +++ b/kaddressbook/kabtools.cpp @@ -43,7 +43,7 @@ static TQString uniqueFileName( const KABC::Addressee &addressee, TQStringList & name.replace( '/', '_' ); ++number; - uniquePart = TQString( "_%1" ).tqarg( number ); + uniquePart = TQString( "_%1" ).arg( number ); } while ( existingFiles.contains( name ) ); existingFiles.append( name ); diff --git a/kaddressbook/kaddressbook_part.cpp b/kaddressbook/kaddressbook_part.cpp index 5f978b4d1..063c6e60a 100644 --- a/kaddressbook/kaddressbook_part.cpp +++ b/kaddressbook/kaddressbook_part.cpp @@ -63,7 +63,7 @@ KAddressbookPart::KAddressbookPart( TQWidget *parentWidget, const char *widgetNa topLayout->addWidget( mCore->widget() ); KParts::StatusBarExtension *statusBar = new KParts::StatusBarExtension( this ); - mCore->seStatusBar( statusBar->statusBar() ); + mCore->setStatusBar( statusBar->statusBar() ); setXMLFile( "kaddressbook_part.rc" ); } diff --git a/kaddressbook/kaddressbookmain.cpp b/kaddressbook/kaddressbookmain.cpp index ae6a4b841..a3dc9d990 100644 --- a/kaddressbook/kaddressbookmain.cpp +++ b/kaddressbook/kaddressbookmain.cpp @@ -64,7 +64,7 @@ KAddressBookMain::KAddressBookMain( const TQString &file ) statusBar()->addWidget( progressWidget, 0, true ); - mCore->seStatusBar( statusBar() ); + mCore->setStatusBar( statusBar() ); setStandardToolBarMenuEnabled( true ); diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.cpp b/kaddressbook/kcmconfigs/kabconfigwidget.cpp index c418f15ed..f97749e22 100644 --- a/kaddressbook/kcmconfigs/kabconfigwidget.cpp +++ b/kaddressbook/kcmconfigs/kabconfigwidget.cpp @@ -171,7 +171,7 @@ void KABConfigWidget::restoreSettings() mFaxHook->setText( KABPrefs::instance()->faxHookApplication() ); mAddresseeWidget->restoreSettings(); mEditorCombo->setCurrentItem( KABPrefs::instance()->editorType() ); - mLocationMapURL->setCurrentText( KABPrefs::instance()->locationMapURL().tqarg( KGlobal::locale()->country() ) ); + mLocationMapURL->setCurrentText( KABPrefs::instance()->locationMapURL().arg( KGlobal::locale()->country() ) ); mLocationMapURL->lineEdit()->setCursorPosition( 0 ); KConfig config( "kabcrc", false, false ); diff --git a/kaddressbook/keywidget.cpp b/kaddressbook/keywidget.cpp index 739672fc7..8aceceecf 100644 --- a/kaddressbook/keywidget.cpp +++ b/kaddressbook/keywidget.cpp @@ -122,7 +122,7 @@ void KeyWidget::addKey() TQFile file( tmpFile ); if ( !file.open( IO_ReadOnly ) ) { TQString text( i18n( "<qt>Unable to open file <b>%1</b>.</qt>" ) ); - KMessageBox::error( this, text.tqarg( url.url() ) ); + KMessageBox::error( this, text.arg( url.url() ) ); return; } @@ -154,7 +154,7 @@ void KeyWidget::removeKey() TQString type = mKeyCombo->currentText(); TQString text = i18n( "<qt>Do you really want to remove the key <b>%1</b>?</qt>" ); - if ( KMessageBox::warningContinueCancel( this, text.tqarg( type ), "", KGuiItem( i18n("&Delete"), "editdelete") ) == KMessageBox::Cancel ) + if ( KMessageBox::warningContinueCancel( this, text.arg( type ), "", KGuiItem( i18n("&Delete"), "editdelete") ) == KMessageBox::Cancel ) return; mKeyList.remove( mKeyList.at( pos ) ); diff --git a/kaddressbook/ldapsearchdialog.cpp b/kaddressbook/ldapsearchdialog.cpp index 7893477f6..be7f899ea 100644 --- a/kaddressbook/ldapsearchdialog.cpp +++ b/kaddressbook/ldapsearchdialog.cpp @@ -361,15 +361,15 @@ TQString LDAPSearchDialog::makeFilter( const TQString& query, const TQString& at if ( attr == i18n( "Name" ) ) { result += startsWith ? "|(cn=%1*)(sn=%2*)" : "|(cn=*%1*)(sn=*%2*)"; - result = result.tqarg( query ).tqarg( query ); + result = result.arg( query ).arg( query ); } else { result += (startsWith ? "%1=%2*" : "%1=*%2*"); if ( attr == i18n( "Email" ) ) { - result = result.tqarg( "mail" ).tqarg( query ); + result = result.arg( "mail" ).arg( query ); } else if ( attr == i18n( "Home Number" ) ) { - result = result.tqarg( "homePhone" ).tqarg( query ); + result = result.arg( "homePhone" ).arg( query ); } else if ( attr == i18n( "Work Number" ) ) { - result = result.tqarg( "telephoneNumber" ).tqarg( query ); + result = result.arg( "telephoneNumber" ).arg( query ); } else { // Error? result = TQString(); @@ -573,7 +573,7 @@ KABC::Addressee::List LDAPSearchDialog::importContactsUnlessTheyExist( const TQV if ( existing.isEmpty() ) { addr.setUid( KApplication::randomString( 10 ) ); - addr.setNote( i18n( "arguments are host name, datetime", "Imported from LDAP directory %1 on %2" ).tqarg( d->itemToServer[cli], KGlobal::locale()->formatDateTime( now ) ) ); + addr.setNote( i18n( "arguments are host name, datetime", "Imported from LDAP directory %1 on %2" ).arg( d->itemToServer[cli], KGlobal::locale()->formatDateTime( now ) ) ); addr.setResource( resource ); mCore->addressBook()->insertAddressee( addr ); TQString displayString; diff --git a/kaddressbook/printing/ds_appearance.ui b/kaddressbook/printing/ds_appearance.ui index 989b360d8..9dc64b9e6 100644 --- a/kaddressbook/printing/ds_appearance.ui +++ b/kaddressbook/printing/ds_appearance.ui @@ -68,7 +68,7 @@ <property name="scaledContents"> <bool>false</bool> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignLeft</set> </property> </widget> @@ -138,7 +138,7 @@ <property name="text"> <string>Details font:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -149,7 +149,7 @@ <property name="text"> <string>Size:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -160,7 +160,7 @@ <property name="text"> <string>Body font:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -171,7 +171,7 @@ <property name="text"> <string>Size:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -182,7 +182,7 @@ <property name="text"> <string>Fixed font:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -203,7 +203,7 @@ <property name="text"> <string>Size:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -245,7 +245,7 @@ <property name="text"> <string>Contact header font:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -274,7 +274,7 @@ <property name="text"> <string>Size:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -285,7 +285,7 @@ <property name="text"> <string>Size:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -301,7 +301,7 @@ <property name="text"> <string>Headlines:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -400,7 +400,7 @@ <property name="text"> <string>Headline background color:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -411,7 +411,7 @@ <property name="text"> <string>Headline text color:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> diff --git a/kaddressbook/printing/mikesstyle.cpp b/kaddressbook/printing/mikesstyle.cpp index a3fea0f67..62f89d558 100644 --- a/kaddressbook/printing/mikesstyle.cpp +++ b/kaddressbook/printing/mikesstyle.cpp @@ -68,7 +68,7 @@ void MikesStyle::print( const KABC::Addressee::List &contacts, PrintProgress *pr mBoldFont = p.font(); mBoldFont.setBold( true ); TQFontMetrics fm( mFont ); - TQPaintDeviceMetrics metrics( p.tqdevice() ); + TQPaintDeviceMetrics metrics( p.device() ); int height = 0; KABC::Addressee::List::ConstIterator it; @@ -141,7 +141,7 @@ void MikesStyle::doPaint( TQPainter &painter, const KABC::Addressee &addr, { TQFontMetrics fm( font ); TQFontMetrics bfm( bFont ); - TQPaintDeviceMetrics metrics( painter.tqdevice() ); + TQPaintDeviceMetrics metrics( painter.device() ); int margin = 10; int width = metrics.width() - 10; int xPos = 5; @@ -205,7 +205,7 @@ void MikesStyle::paintTagLine( TQPainter &p, const TQFont &font ) TQFontMetrics fm( font ); TQString text = i18n( "Printed on %1 by KAddressBook (http://www.kde.org)" ) - .tqarg( KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime() ) ); + .arg( KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime() ) ); p.setPen( TQt::black ); p.drawText( 0, fm.height(), text ); diff --git a/kaddressbook/typecombo.h b/kaddressbook/typecombo.h index 2ff6591c7..e5cf64296 100644 --- a/kaddressbook/typecombo.h +++ b/kaddressbook/typecombo.h @@ -91,8 +91,8 @@ void TypeCombo<T>::updateTypes() } labelCount[ type ] = count; if ( count > 1 ) { - label = i18n("label (number)", "%1 (%2)").tqarg( label ) - .tqarg( TQString::number( count ) ); + label = i18n("label (number)", "%1 (%2)").arg( label ) + .arg( TQString::number( count ) ); } insertItem( label ); } diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp index b6ab807ba..c1f9da03d 100644 --- a/kaddressbook/viewmanager.cpp +++ b/kaddressbook/viewmanager.cpp @@ -307,7 +307,7 @@ void ViewManager::editView() void ViewManager::deleteView() { TQString text = i18n( "<qt>Are you sure that you want to delete the view <b>%1</b>?</qt>" ) - .tqarg( mActiveView->caption() ); + .arg( mActiveView->caption() ); TQString caption = i18n( "Confirm Delete" ); if ( KMessageBox::warningContinueCancel( this, text, caption, KGuiItem( i18n("&Delete"), "editdelete") ) == KMessageBox::Continue ) { @@ -348,7 +348,7 @@ void ViewManager::addView() firstConflict = false; } - newName = TQString( "%1 <%2>" ).tqarg( newName ).tqarg( numTries ); + newName = TQString( "%1 <%2>" ).arg( newName ).arg( numTries ); numTries++; } @@ -387,7 +387,7 @@ void ViewManager::scrollDown() void ViewManager::createViewFactories() { const KTrader::OfferList plugins = KTrader::self()->query( "KAddressBook/View", - TQString( "[X-KDE-KAddressBook-ViewPluginVersion] == %1" ).tqarg( KAB_VIEW_PLUGIN_VERSION ) ); + TQString( "[X-KDE-KAddressBook-ViewPluginVersion] == %1" ).arg( KAB_VIEW_PLUGIN_VERSION ) ); KTrader::OfferList::ConstIterator it; for ( it = plugins.begin(); it != plugins.end(); ++it ) { if ( !(*it)->hasServiceType( "KAddressBook/View" ) ) diff --git a/kaddressbook/views/cardview.cpp b/kaddressbook/views/cardview.cpp index 66ec75d16..44632e906 100644 --- a/kaddressbook/views/cardview.cpp +++ b/kaddressbook/views/cardview.cpp @@ -1392,7 +1392,7 @@ void CardView::setLayoutDirty( bool dirty ) { if ( d->mLayoutDirty != dirty ) { d->mLayoutDirty = dirty; - tqrepaint(); + repaint(); } } @@ -1400,7 +1400,7 @@ void CardView::setDrawCardBorder( bool enabled ) { if ( enabled != d->mDrawCardBorder ) { d->mDrawCardBorder = enabled; - tqrepaint(); + repaint(); } } @@ -1426,7 +1426,7 @@ void CardView::setDrawFieldLabels( bool enabled ) { if ( enabled != d->mDrawFieldLabels ) { d->mDrawFieldLabels = enabled; - tqrepaint(); + repaint(); } } diff --git a/kaddressbook/views/cardview.h b/kaddressbook/views/cardview.h index 4b6bbe7e1..7a007d956 100644 --- a/kaddressbook/views/cardview.h +++ b/kaddressbook/views/cardview.h @@ -87,7 +87,7 @@ class CardViewItem virtual void paintCard( TQPainter *p, TQColorGroup &cg ); /** - Repaints the card. This is done by sending a tqrepaint event to the + Repaints the card. This is done by sending a repaint event to the view with the clip rect defined as this card. */ virtual void repaintCard(); @@ -526,7 +526,7 @@ class CardView : public TQScrollView void contentsWheelEvent( TQWheelEvent* ); /** - Sets the tqlayout to dirty and calls for a tqrepaint. + Sets the tqlayout to dirty and calls for a repaint. */ void setLayoutDirty( bool dirty ); diff --git a/kaddressbook/views/configurecardviewdialog.cpp b/kaddressbook/views/configurecardviewdialog.cpp index de28c5d17..a8d4537fd 100644 --- a/kaddressbook/views/configurecardviewdialog.cpp +++ b/kaddressbook/views/configurecardviewdialog.cpp @@ -313,7 +313,7 @@ void CardViewLookNFeelPage::initGUI() void CardViewLookNFeelPage::updateFontLabel( TQFont fnt, TQLabel *l ) { l->setFont( fnt ); - l->setText( TQString( fnt.family() + " %1" ).tqarg( fnt.pointSize() ) ); + l->setText( TQString( fnt.family() + " %1" ).arg( fnt.pointSize() ) ); } #include "configurecardviewdialog.moc" diff --git a/kaddressbook/views/contactlistview.cpp b/kaddressbook/views/contactlistview.cpp index c2b527945..c59c47eee 100644 --- a/kaddressbook/views/contactlistview.cpp +++ b/kaddressbook/views/contactlistview.cpp @@ -82,17 +82,17 @@ void DynamicTip::maybeTip( const TQPoint &pos ) if (a.isEmpty()) return; - s += i18n("label: value", "%1: %2").tqarg(a.formattedNameLabel()) - .tqarg(a.formattedName()); + s += i18n("label: value", "%1: %2").arg(a.formattedNameLabel()) + .arg(a.formattedName()); s += '\n'; - s += i18n("label: value", "%1: %2").tqarg(a.organizationLabel()) - .tqarg(a.organization()); + s += i18n("label: value", "%1: %2").arg(a.organizationLabel()) + .arg(a.organization()); TQString notes = a.note().stripWhiteSpace(); if ( !notes.isEmpty() ) { notes += '\n'; - s += '\n' + i18n("label: value", "%1: \n").tqarg(a.noteLabel()); + s += '\n' + i18n("label: value", "%1: \n").arg(a.noteLabel()); TQFontMetrics fm( font() ); // Begin word wrap code based on TQMultiLineEdit code diff --git a/kaddressbook/views/kaddressbookcardview.cpp b/kaddressbook/views/kaddressbookcardview.cpp index 211b62dd4..7d95c043e 100644 --- a/kaddressbook/views/kaddressbookcardview.cpp +++ b/kaddressbook/views/kaddressbookcardview.cpp @@ -96,7 +96,7 @@ class AddresseeCardViewItem : public CardViewItem const KABC::Field::List::ConstIterator endIt( mFields.end() ); for ( ; it != endIt; ++it ) { // insert empty fields or not? not doing so saves a bit of memory and CPU - // (during tqgeometry calculations), but prevents having equally + // (during geometry calculations), but prevents having equally // wide label columns in all cards, unless CardViewItem/CardView search // globally for the widest label. (anders) diff --git a/kaddressbook/views/kaddressbooktableview.cpp b/kaddressbook/views/kaddressbooktableview.cpp index 19364d597..6fa731308 100644 --- a/kaddressbook/views/kaddressbooktableview.cpp +++ b/kaddressbook/views/kaddressbooktableview.cpp @@ -244,7 +244,7 @@ void KAddressBookTableView::refresh( const TQString &uid ) // Sometimes the background pixmap gets messed up when we add lots // of items. - mListView->tqrepaint(); + mListView->repaint(); if ( currentItem ) { mListView->setCurrentItem( currentItem ); diff --git a/kaddressbook/xxport/csv_xxport.cpp b/kaddressbook/xxport/csv_xxport.cpp index 22f6afadb..9c270a2e3 100644 --- a/kaddressbook/xxport/csv_xxport.cpp +++ b/kaddressbook/xxport/csv_xxport.cpp @@ -50,7 +50,7 @@ bool CSVXXPort::exportContacts( const KABC::AddresseeList &list, const TQString& return true; if( TQFileInfo(url.path()).exists() ) { - if(KMessageBox::questionYesNo( parentWidget(), i18n("Do you want to overwrite file \"%1\"").tqarg( url.path()) ) == KMessageBox::No) + if(KMessageBox::questionYesNo( parentWidget(), i18n("Do you want to overwrite file \"%1\"").arg( url.path()) ) == KMessageBox::No) return false; } @@ -58,8 +58,8 @@ bool CSVXXPort::exportContacts( const KABC::AddresseeList &list, const TQString& KTempFile tmpFile; if ( tmpFile.status() != 0 ) { TQString txt = i18n( "<qt>Unable to open file <b>%1</b>.%2.</qt>" ); - KMessageBox::error( parentWidget(), txt.tqarg( url.url() ) - .tqarg( strerror( tmpFile.status() ) ) ); + KMessageBox::error( parentWidget(), txt.arg( url.url() ) + .arg( strerror( tmpFile.status() ) ) ); return false; } @@ -71,7 +71,7 @@ bool CSVXXPort::exportContacts( const KABC::AddresseeList &list, const TQString& TQFile file( url.path() ); if ( !file.open( IO_WriteOnly ) ) { TQString txt = i18n( "<qt>Unable to open file <b>%1</b>.</qt>" ); - KMessageBox::error( parentWidget(), txt.tqarg( url.path() ) ); + KMessageBox::error( parentWidget(), txt.arg( url.path() ) ); return false; } diff --git a/kaddressbook/xxport/csvimportdialog.cpp b/kaddressbook/xxport/csvimportdialog.cpp index 14a40c611..72ae7e782 100644 --- a/kaddressbook/xxport/csvimportdialog.cpp +++ b/kaddressbook/xxport/csvimportdialog.cpp @@ -503,7 +503,7 @@ void CSVImportDialog::fillTable() else if ( code == Guess ) { TQTextCodec* codec = TQTextCodec::codecForContent( mFileArray.data(), mFileArray.size() ); if ( codec ) { - KMessageBox::information( this, i18n( "Using codec '%1'" ).tqarg( codec->name() ), i18n( "Encoding" ) ); + KMessageBox::information( this, i18n( "Using codec '%1'" ).arg( codec->name() ), i18n( "Encoding" ) ); inputStream.setCodec( codec ); } } @@ -663,7 +663,7 @@ void CSVImportDialog::reloadCodecs() for ( int i = 0; ( codec = TQTextCodec::codecForIndex( i ) ); i++ ) mCodecs.append( codec ); - mCodecCombo->insertItem( i18n( "Local (%1)" ).tqarg( TQTextCodec::codecForLocale()->name() ), Local ); + mCodecCombo->insertItem( i18n( "Local (%1)" ).arg( TQTextCodec::codecForLocale()->name() ), Local ); mCodecCombo->insertItem( i18n( "[guess]" ), Guess ); mCodecCombo->insertItem( i18n( "Latin1" ), Latin1 ); mCodecCombo->insertItem( i18n( "Unicode" ), Uni ); @@ -858,7 +858,7 @@ void CSVImportDialog::saveTemplate() fileName += ".desktop"; if( TQFileInfo(fileName).exists() ) { - if(KMessageBox::questionYesNo( this, i18n("Do you want to overwrite file \"%1\"").tqarg(fileName) ) == KMessageBox::No) + if(KMessageBox::questionYesNo( this, i18n("Do you want to overwrite file \"%1\"").arg(fileName) ) == KMessageBox::No) return; } TQString name = KInputDialog::getText( i18n( "Template Name" ), i18n( "Please enter a name for the template:" ) ); diff --git a/kaddressbook/xxport/gnokii_xxport.cpp b/kaddressbook/xxport/gnokii_xxport.cpp index f4d1e9dbd..9f7b628f4 100644 --- a/kaddressbook/xxport/gnokii_xxport.cpp +++ b/kaddressbook/xxport/gnokii_xxport.cpp @@ -63,7 +63,7 @@ extern "C" { #define GNOKII_CHECK_ERROR(error) \ do { \ if (error) \ - kdError() << TQString("ERROR %1: %2\n").tqarg(error).tqarg(gn_error_print(error));\ + kdError() << TQString("ERROR %1: %2\n").arg(error).arg(gn_error_print(error));\ } while (0) // Locale conversion routines: @@ -126,8 +126,8 @@ static TQString businit(void) { GNOKII_DEBUG( "Using new gnokii version." ); - GNOKII_DEBUG( TQString("Compiled with libgnokii version 0x%1\n").tqarg(TQString::number(LIBGNOKII_VERSION,16)) ); - GNOKII_DEBUG( TQString("Using libgnokii runtime version 0x%1\n").tqarg(TQString::number(gn_lib_version(),16)) ); + GNOKII_DEBUG( TQString("Compiled with libgnokii version 0x%1\n").arg(TQString::number(LIBGNOKII_VERSION,16)) ); + GNOKII_DEBUG( TQString("Using libgnokii runtime version 0x%1\n").arg(TQString::number(gn_lib_version(),16)) ); gn_error error = gn_lib_phoneprofile_load(NULL, &state); if (error) @@ -142,7 +142,7 @@ static TQString businit(void) "You might try to run \"gnokii --identify\" on the command line to " "check any cable/transport issues and to verify if your gnokii " "configuration is correct.</center></qt>") - .tqarg(gn_error_print(error)); + .arg(gn_error_print(error)); } // identify phone @@ -152,7 +152,7 @@ static TQString businit(void) imei = gn_lib_get_phone_imei(state); GNOKII_DEBUG( TQString("Found mobile phone: %1 %2, Revision: %3, IMEI: %4\n") - .tqarg(manufacturer, model, revision, imei) ); + .arg(manufacturer, model, revision, imei) ); return TQString(); } @@ -166,7 +166,7 @@ static gn_error read_phone_memstat( const gn_memory_type memtype, gn_memory_stat error = gn_lib_addressbook_memstat(state, memtype, &memstat->used, &memstat->free); GNOKII_DEBUG( TQString("\n\nMobile phone memory status: Type: %1, used=%2, free=%3, total=%4\n\n") - .tqarg(memtype).tqarg(memstat->used).tqarg(memstat->free).tqarg(memstat->used+memstat->free) ); + .arg(memtype).arg(memstat->used).arg(memstat->free).arg(memstat->used+memstat->free) ); return error; } @@ -176,13 +176,13 @@ static TQString buildPhoneInfoString( const gn_memory_status &memstat ) TQString format = TQString::fromLatin1("<tr><td><b>%1</b></td><td>%2</td></tr>"); return TQString::fromLatin1("<b>%1</b><br><table>%2%3%4%5%6</table><br>") - .tqarg(i18n("Mobile Phone information:")) - .tqarg(format.tqarg(i18n("Manufacturer")).tqarg(GN_FROM(manufacturer))) - .tqarg(format.tqarg(i18n("Phone model")).tqarg(GN_FROM(model))) - .tqarg(format.tqarg(i18n("Revision")).tqarg(GN_FROM(revision))) - .tqarg(format.tqarg(i18n("IMEI")).tqarg(GN_FROM(imei))) - .tqarg(format.tqarg(i18n("Phonebook status")) - .tqarg(i18n("%1 out of %2 contacts used").tqarg(memstat.used).tqarg(memstat.used+memstat.free))); + .arg(i18n("Mobile Phone information:")) + .arg(format.arg(i18n("Manufacturer")).arg(GN_FROM(manufacturer))) + .arg(format.arg(i18n("Phone model")).arg(GN_FROM(model))) + .arg(format.arg(i18n("Revision")).arg(GN_FROM(revision))) + .arg(format.arg(i18n("IMEI")).arg(GN_FROM(imei))) + .arg(format.arg(i18n("Phonebook status")) + .arg(i18n("%1 out of %2 contacts used").arg(memstat.used).arg(memstat.used+memstat.free))); } // read and evaluate all phone entries @@ -209,9 +209,9 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty progress->setTotalSteps(memstat.used); m_progressDlg->setLabel(i18n("<qt>Importing <b>%1</b> contacts from <b>%2</b> of the Mobile Phone.<br><br>%3</qt>") - .tqarg(memstat.used) - .tqarg(gn_memory_type2str(memtype)) - .tqarg(buildPhoneInfoString(memstat)) ); + .arg(memstat.used) + .arg(gn_memory_type2str(memtype)) + .arg(buildPhoneInfoString(memstat)) ); int num_read = 0; @@ -233,10 +233,10 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty const char *name = gn_lib_get_pb_name(state); const char *number = gn_lib_get_pb_number(state); - GNOKII_DEBUG(TQString("%1: %2, num=%3, location=%4, group=%5, count=%6\n").tqarg(i) - .tqarg(GN_FROM(name)).tqarg(GN_FROM(number)) - .tqarg(gn_lib_get_pb_location(state)).tqarg(gn_lib_get_pb_caller_group(state)) - .tqarg(subentries_count)); + GNOKII_DEBUG(TQString("%1: %2, num=%3, location=%4, group=%5, count=%6\n").arg(i) + .arg(GN_FROM(name)).arg(GN_FROM(number)) + .arg(gn_lib_get_pb_location(state)).arg(gn_lib_get_pb_caller_group(state)) + .arg(subentries_count)); KABC::Addressee *a = new KABC::Addressee(); // try to split Name into FamilyName and GivenName @@ -263,10 +263,10 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty } a->insertCustom(APP, "X_GSM_CALLERGROUP", s.setNum(gn_lib_get_pb_caller_group(state))); - a->insertCustom(APP, "X_GSM_STORE_AT", TQString("%1%2").tqarg(memtypestr).tqarg(gn_lib_get_pb_location(state))); + a->insertCustom(APP, "X_GSM_STORE_AT", TQString("%1%2").arg(memtypestr).arg(gn_lib_get_pb_location(state))); // set ProductId - a->setProductId(TQString("%1-%2-%3-%4").tqarg(APP).tqarg(model).tqarg(revision).tqarg(imei)); + a->setProductId(TQString("%1-%2-%3-%4").arg(APP).arg(model).arg(revision).arg(imei)); // evaluate timestamp (ignore timezone) TQDateTime datetime; @@ -276,7 +276,7 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty else datetime = TQDateTime( TQDate(ts.year, ts.month, ts.day), TQTime(ts.hour, ts.minute, ts.second) ); - GNOKII_DEBUG(TQString(" date=%1\n").tqarg(datetime.toString())); + GNOKII_DEBUG(TQString(" date=%1\n").arg(datetime.toString())); a->setRevision(datetime); if (!subentries_count) @@ -295,7 +295,7 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty TQString s = GN_FROM(number).simplifyWhiteSpace(); GNOKII_DEBUG(TQString(" Subentry#%1, entry_type=%2, number_type=%3, number=%4\n") - .tqarg(n).tqarg(entry_type).tqarg(number_type).tqarg(s)); + .arg(n).arg(entry_type).arg(number_type).arg(s)); if (s.isEmpty()) continue; switch(entry_type) { @@ -362,7 +362,7 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty break; default: GNOKII_DEBUG(TQString(" Not handled id=%1, entry=%2\n") - .tqarg(entry_type).tqarg(s)); + .arg(entry_type).arg(s)); break; } // switch() } // if(subentry) @@ -425,8 +425,8 @@ static gn_error xxport_phone_write_entry( int phone_location, gn_memory_type mem time.hour(), time.minute(), time.second(), 0 ); gn_lib_set_pb_date(state, ts); - GNOKII_DEBUG(TQString("Write #%1: name=%2, number=%3\n").tqarg(phone_location) - .tqarg(GN_FROM(gn_lib_get_pb_name(state))).tqarg(GN_FROM(gn_lib_get_pb_number(state)))); + GNOKII_DEBUG(TQString("Write #%1: name=%2, number=%3\n").arg(phone_location) + .arg(GN_FROM(gn_lib_get_pb_name(state))).arg(GN_FROM(gn_lib_get_pb_number(state)))); const KABC::Address homeAddr = addr->address(KABC::Address::Home); const KABC::Address workAddr = addr->address(KABC::Address::Work); @@ -467,7 +467,7 @@ static gn_error xxport_phone_write_entry( int phone_location, gn_memory_type mem // only one email allowed if we have URLS, notes, addresses (to avoid phone limitations) if (n && !addr->url().isEmpty() && !addr->note().isEmpty() && addr->addresses().count()) { GNOKII_DEBUG(TQString(" DROPPED email %1 in favor of URLs, notes and addresses.\n") - .tqarg(s)); + .arg(s)); continue; } gn_lib_set_pb_subentry(state, -1 /* index to append entry */, @@ -507,8 +507,8 @@ static gn_error xxport_phone_write_entry( int phone_location, gn_memory_type mem const char *number; gn_lib_get_pb_subentry(state, st, &entry_type, &number_type, &number); GNOKII_DEBUG(TQString(" SubTel #%1: entry_type=%2, number_type=%3, number=%4\n") - .tqarg(st).tqarg(entry_type) - .tqarg(number_type).tqarg(GN_FROM(number))); + .arg(st).arg(entry_type) + .arg(number_type).arg(GN_FROM(number))); } gn_error error = gn_lib_phonebook_write_entry(state, memtype, phone_location); @@ -656,9 +656,9 @@ bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQStri m_progressDlg->setButtonText(i18n("&Stop Export")); m_progressDlg->setLabel(i18n("<qt>Exporting <b>%1</b> contacts to the <b>%2</b> " "of the Mobile Phone.<br><br>%3</qt>") - .tqarg(list.count()) - .tqarg(gn_memory_type2str(memtype)) - .tqarg(buildPhoneInfoString(memstat)) ); + .arg(list.count()) + .arg(gn_memory_type2str(memtype)) + .arg(buildPhoneInfoString(memstat)) ); // Now run the loop... phone_entry_no = 1; @@ -682,7 +682,7 @@ try_next_phone_entry: break; GNOKII_DEBUG(TQString("Try to write entry '%1' at phone_entry_no=%2, phone_count=%3\n") - .tqarg(addr->realName()).tqarg(phone_entry_no).tqarg(phone_count)); + .arg(addr->realName()).arg(phone_entry_no).arg(phone_count)); error = GN_ERR_NONE; @@ -755,7 +755,7 @@ finish: delete m_progressDlg; if (!failedList.isEmpty()) { - GNOKII_DEBUG(TQString("Failed to export: %1\n").tqarg(failedList.join(", "))); + GNOKII_DEBUG(TQString("Failed to export: %1\n").arg(failedList.join(", "))); KMessageBox::informationList(parentWidget(), i18n("<qt>The following contacts could not be exported to the Mobile Phone. " "Possible Reasons for this problem could be:<br><ul>" @@ -801,7 +801,7 @@ static gn_data data; static void busterminate(void) { gn_sm_functions(GN_OP_Terminate, NULL, &state); - if (lockfile) gn_tqdevice_unlock(lockfile); + if (lockfile) gn_device_unlock(lockfile); } static TQString businit(void) @@ -830,7 +830,7 @@ static TQString businit(void) aux = gn_cfg_get(gn_cfg_info, "global", "use_locking"); // Defaults to 'no' if (aux && !strcmp(aux, "yes")) { - lockfile = gn_tqdevice_lock(state.config.port_tqdevice); + lockfile = gn_device_lock(state.config.port_device); if (lockfile == NULL) { return i18n("Gnokii reports a 'Lock File Error'.\n " "Please exit all other running instances of gnokii, check if you have " @@ -851,7 +851,7 @@ static TQString businit(void) "You might try to run \"gnokii --identify\" on the command line to " "check any cable/transport issues and to verify if your gnokii " "configuration is correct.</center></qt>") - .tqarg(gn_error_print(error)); + .arg(gn_error_print(error)); } // identify phone @@ -874,9 +874,9 @@ static TQString businit(void) GNOKII_CHECK_ERROR(error); GNOKII_DEBUG( TQString("Found mobile phone: %1 %2, Revision: %3, IMEI: %4\n") - .tqarg(manufacturer, model, revision, imei) ); + .arg(manufacturer, model, revision, imei) ); - PhoneProductId = TQString("%1-%2-%3-%4").tqarg(APP).tqarg(model).tqarg(revision).tqarg(imei); + PhoneProductId = TQString("%1-%2-%3-%4").arg(APP).arg(model).arg(revision).arg(imei); return TQString(); } @@ -908,7 +908,7 @@ static gn_error read_phone_memstat( const gn_memory_type memtype, gn_memory_stat } } GNOKII_DEBUG( TQString("\n\nMobile phone memory status: Type: %1, used=%2, free=%3, total=%4\n\n") - .tqarg(memtype).tqarg(memstat->used).tqarg(memstat->free).tqarg(memstat->used+memstat->free) ); + .arg(memtype).arg(memstat->used).arg(memstat->free).arg(memstat->used+memstat->free) ); return error; } @@ -946,13 +946,13 @@ static TQString buildPhoneInfoString( const gn_memory_status &memstat ) TQString format = TQString::fromLatin1("<tr><td><b>%1</b></td><td>%2</td></tr>"); return TQString::fromLatin1("<b>%1</b><br><table>%2%3%4%5%6</table><br>") - .tqarg(i18n("Mobile Phone information:")) - .tqarg(format.tqarg(i18n("Manufacturer")).tqarg(GN_FROM(manufacturer))) - .tqarg(format.tqarg(i18n("Phone model")).tqarg(GN_FROM(model))) - .tqarg(format.tqarg(i18n("Revision")).tqarg(GN_FROM(revision))) - .tqarg(format.tqarg(i18n("IMEI")).tqarg(GN_FROM(imei))) - .tqarg(format.tqarg(i18n("Phonebook status")) - .tqarg(i18n("%1 out of %2 contacts used").tqarg(memstat.used).tqarg(memstat.used+memstat.free))); + .arg(i18n("Mobile Phone information:")) + .arg(format.arg(i18n("Manufacturer")).arg(GN_FROM(manufacturer))) + .arg(format.arg(i18n("Phone model")).arg(GN_FROM(model))) + .arg(format.arg(i18n("Revision")).arg(GN_FROM(revision))) + .arg(format.arg(i18n("IMEI")).arg(GN_FROM(imei))) + .arg(format.arg(i18n("Phonebook status")) + .arg(i18n("%1 out of %2 contacts used").arg(memstat.used).arg(memstat.used+memstat.free))); } static TQString buildMemoryTypeString( gn_memory_type memtype ) @@ -989,9 +989,9 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty progress->setTotalSteps(memstat.used); m_progressDlg->setLabel(i18n("<qt>Importing <b>%1</b> contacts from <b>%2</b> of the Mobile Phone.<br><br>%3</qt>") - .tqarg(memstat.used) - .tqarg(buildMemoryTypeString(memtype)) - .tqarg(buildPhoneInfoString(memstat)) ); + .arg(memstat.used) + .arg(buildMemoryTypeString(memtype)) + .arg(buildPhoneInfoString(memstat)) ); int num_read = 0; @@ -1008,8 +1008,8 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty if (error == GN_ERR_INVALIDMEMORYTYPE) break; if (error == GN_ERR_NONE) { - GNOKII_DEBUG(TQString("%1: %2, num=%3, location=%4, group=%5, count=%6\n").tqarg(i).tqarg(GN_FROM(entry.name)) - .tqarg(GN_FROM(entry.number)).tqarg(entry.location).tqarg(entry.caller_group).tqarg(entry.subentries_count)); + GNOKII_DEBUG(TQString("%1: %2, num=%3, location=%4, group=%5, count=%6\n").arg(i).arg(GN_FROM(entry.name)) + .arg(GN_FROM(entry.number)).arg(entry.location).arg(entry.caller_group).arg(entry.subentries_count)); KABC::Addressee *a = new KABC::Addressee(); // try to split Name into FamilyName and GivenName @@ -1036,7 +1036,7 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty } a->insertCustom(APP, "X_GSM_CALLERGROUP", s.setNum(entry.caller_group)); - a->insertCustom(APP, "X_GSM_STORE_AT", TQString("%1%2").tqarg(memtypestr).tqarg(entry.location)); + a->insertCustom(APP, "X_GSM_STORE_AT", TQString("%1%2").arg(memtypestr).arg(entry.location)); // set ProductId a->setProductId(PhoneProductId); @@ -1048,7 +1048,7 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty else datetime = TQDateTime( TQDate(entry.date.year, entry.date.month, entry.date.day), TQTime(entry.date.hour, entry.date.minute, entry.date.second) ); - GNOKII_DEBUG(TQString(" date=%1\n").tqarg(datetime.toString())); + GNOKII_DEBUG(TQString(" date=%1\n").arg(datetime.toString())); a->setRevision(datetime); if (!entry.subentries_count) @@ -1059,8 +1059,8 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty for (int n=0; n<entry.subentries_count; n++) { TQString s = GN_FROM(entry.subentries[n].data.number).simplifyWhiteSpace(); GNOKII_DEBUG(TQString(" Subentry#%1, entry_type=%2, number_type=%3, number=%4\n") - .tqarg(n).tqarg(entry.subentries[n].entry_type) - .tqarg(entry.subentries[n].number_type).tqarg(s)); + .arg(n).arg(entry.subentries[n].entry_type) + .arg(entry.subentries[n].number_type).arg(s)); if (s.isEmpty()) continue; switch(entry.subentries[n].entry_type) { @@ -1127,7 +1127,7 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty break; default: GNOKII_DEBUG(TQString(" Not handled id=%1, entry=%2\n") - .tqarg(entry.subentries[n].entry_type).tqarg(s)); + .arg(entry.subentries[n].entry_type).arg(s)); break; } // switch() } // if(subentry) @@ -1191,8 +1191,8 @@ static gn_error xxport_phone_write_entry( int phone_location, gn_memory_type mem entry.date.minute = time.minute(); entry.date.second = time.second(); - GNOKII_DEBUG(TQString("Write #%1: name=%2, number=%3\n").tqarg(phone_location) - .tqarg(GN_FROM(entry.name)).tqarg(GN_FROM(entry.number))); + GNOKII_DEBUG(TQString("Write #%1: name=%2, number=%3\n").arg(phone_location) + .arg(GN_FROM(entry.name)).arg(GN_FROM(entry.number))); const KABC::Address homeAddr = addr->address(KABC::Address::Home); const KABC::Address workAddr = addr->address(KABC::Address::Work); @@ -1244,7 +1244,7 @@ static gn_error xxport_phone_write_entry( int phone_location, gn_memory_type mem // only one email allowed if we have URLS, notes, addresses (to avoid phone limitations) if (n && !addr->url().isEmpty() && !addr->note().isEmpty() && addr->addresses().count()) { GNOKII_DEBUG(TQString(" DROPPED email %1 in favor of URLs, notes and addresses.\n") - .tqarg(s)); + .arg(s)); continue; } subentry->entry_type = GN_PHONEBOOK_ENTRY_Email; @@ -1289,8 +1289,8 @@ static gn_error xxport_phone_write_entry( int phone_location, gn_memory_type mem for (int st=0; st<entry.subentries_count; st++) { gn_phonebook_subentry *subentry = &entry.subentries[st]; GNOKII_DEBUG(TQString(" SubTel #%1: entry_type=%2, number_type=%3, number=%4\n") - .tqarg(st).tqarg(subentry->entry_type) - .tqarg(subentry->number_type).tqarg(GN_FROM(subentry->data.number))); + .arg(st).arg(subentry->entry_type) + .arg(subentry->number_type).arg(GN_FROM(subentry->data.number))); } data.phonebook_entry = &entry; @@ -1309,7 +1309,7 @@ static gn_error xxport_phone_delete_entry( int phone_location, gn_memory_type me entry.memory_type = memtype; entry.location = phone_location; data.phonebook_entry = &entry; - GNOKII_DEBUG(TQString("Deleting entry %1\n").tqarg(phone_location)); + GNOKII_DEBUG(TQString("Deleting entry %1\n").arg(phone_location)); gn_error error = gn_sm_functions(GN_OP_WritePhonebook, &data, &state); GNOKII_CHECK_ERROR(error); return error; @@ -1447,9 +1447,9 @@ bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQStri m_progressDlg->setButtonText(i18n("&Stop Export")); m_progressDlg->setLabel(i18n("<qt>Exporting <b>%1</b> contacts to the <b>%2</b> " "of the Mobile Phone.<br><br>%3</qt>") - .tqarg(list.count()) - .tqarg(buildMemoryTypeString(memtype)) - .tqarg(buildPhoneInfoString(memstat)) ); + .arg(list.count()) + .arg(buildMemoryTypeString(memtype)) + .arg(buildPhoneInfoString(memstat)) ); // Now run the loop... phone_entry_no = 1; @@ -1473,7 +1473,7 @@ try_next_phone_entry: break; GNOKII_DEBUG(TQString("Try to write entry '%1' at phone_entry_no=%2, phone_count=%3\n") - .tqarg(addr->realName()).tqarg(phone_entry_no).tqarg(phone_count)); + .arg(addr->realName()).arg(phone_entry_no).arg(phone_count)); error = GN_ERR_NONE; @@ -1546,7 +1546,7 @@ finish: delete m_progressDlg; if (!failedList.isEmpty()) { - GNOKII_DEBUG(TQString("Failed to export: %1\n").tqarg(failedList.join(", "))); + GNOKII_DEBUG(TQString("Failed to export: %1\n").arg(failedList.join(", "))); KMessageBox::informationList(parentWidget(), i18n("<qt>The following contacts could not be exported to the Mobile Phone. " "Possible Reasons for this problem could be:<br><ul>" diff --git a/kaddressbook/xxport/kde2_xxport.cpp b/kaddressbook/xxport/kde2_xxport.cpp index 3b60ca5e1..309bb9b5b 100644 --- a/kaddressbook/xxport/kde2_xxport.cpp +++ b/kaddressbook/xxport/kde2_xxport.cpp @@ -49,7 +49,7 @@ KABC::AddresseeList KDE2XXPort::importContacts( const TQString& ) const { TQString fileName = locateLocal( "data", "kabc/std.vcf" ); if ( !TQFile::exists( fileName ) ) { - KMessageBox::sorry( parentWidget(), i18n( "<qt>Could not find a KDE 2 address book <b>%1</b>.</qt>" ).tqarg( fileName ) ); + KMessageBox::sorry( parentWidget(), i18n( "<qt>Could not find a KDE 2 address book <b>%1</b>.</qt>" ).arg( fileName ) ); return KABC::AddresseeList(); } diff --git a/kaddressbook/xxport/ldif_xxport.cpp b/kaddressbook/xxport/ldif_xxport.cpp index a51169e7d..30718a9f0 100644 --- a/kaddressbook/xxport/ldif_xxport.cpp +++ b/kaddressbook/xxport/ldif_xxport.cpp @@ -71,7 +71,7 @@ KABC::AddresseeList LDIFXXPort::importContacts( const TQString& ) const TQFile file( fileName ); if ( !file.open( IO_ReadOnly ) ) { TQString msg = i18n( "<qt>Unable to open <b>%1</b> for reading.</qt>" ); - KMessageBox::error( parentWidget(), msg.tqarg( fileName ) ); + KMessageBox::error( parentWidget(), msg.arg( fileName ) ); return addrList; } @@ -97,7 +97,7 @@ bool LDIFXXPort::exportContacts( const KABC::AddresseeList &list, const TQString return true; if( TQFileInfo(url.path()).exists() ) { - if(KMessageBox::questionYesNo( parentWidget(), i18n("Do you want to overwrite file \"%1\"").tqarg( url.path()) ) == KMessageBox::No) + if(KMessageBox::questionYesNo( parentWidget(), i18n("Do you want to overwrite file \"%1\"").arg( url.path()) ) == KMessageBox::No) return false; } @@ -106,8 +106,8 @@ bool LDIFXXPort::exportContacts( const KABC::AddresseeList &list, const TQString KTempFile tmpFile; if ( tmpFile.status() != 0 ) { TQString txt = i18n( "<qt>Unable to open file <b>%1</b>.%2.</qt>" ); - KMessageBox::error( parentWidget(), txt.tqarg( url.url() ) - .tqarg( strerror( tmpFile.status() ) ) ); + KMessageBox::error( parentWidget(), txt.arg( url.url() ) + .arg( strerror( tmpFile.status() ) ) ); return false; } @@ -121,7 +121,7 @@ bool LDIFXXPort::exportContacts( const KABC::AddresseeList &list, const TQString if ( !file.open( IO_WriteOnly ) ) { TQString txt = i18n( "<qt>Unable to open file <b>%1</b>.</qt>" ); - KMessageBox::error( parentWidget(), txt.tqarg( filename ) ); + KMessageBox::error( parentWidget(), txt.arg( filename ) ); return false; } diff --git a/kaddressbook/xxport/opera_xxport.cpp b/kaddressbook/xxport/opera_xxport.cpp index a115d8dfd..800f11fa6 100644 --- a/kaddressbook/xxport/opera_xxport.cpp +++ b/kaddressbook/xxport/opera_xxport.cpp @@ -55,7 +55,7 @@ KABC::AddresseeList OperaXXPort::importContacts( const TQString& ) const TQFile file( fileName ); if ( !file.open( IO_ReadOnly ) ) { TQString msg = i18n( "<qt>Unable to open <b>%1</b> for reading.</qt>" ); - KMessageBox::error( parentWidget(), msg.tqarg( fileName ) ); + KMessageBox::error( parentWidget(), msg.arg( fileName ) ); return addrList; } diff --git a/kaddressbook/xxport/pab_pablib.cpp b/kaddressbook/xxport/pab_pablib.cpp index 198e683fd..344647f6f 100644 --- a/kaddressbook/xxport/pab_pablib.cpp +++ b/kaddressbook/xxport/pab_pablib.cpp @@ -46,7 +46,7 @@ adr_t A; bool ret; if (!in.isOpen()) {TQString msg; - msg=i18n("Cannot open %1 for reading").tqarg(pabfile); + msg=i18n("Cannot open %1 for reading").arg(pabfile); // info->alert(msg); return false; } @@ -243,7 +243,7 @@ bool pab::knownPAB(void) content_t id; id=go(0); if (id!=PAB_FILE_ID) {TQString msg; - msg=i18n("%1 has no PAB id that I know of, cannot convert this").tqarg(pabfile); + msg=i18n("%1 has no PAB id that I know of, cannot convert this").arg(pabfile); // info->alert(msg); return false; } diff --git a/kaddressbook/xxport/pab_xxport.cpp b/kaddressbook/xxport/pab_xxport.cpp index 021f671c8..911e92ded 100644 --- a/kaddressbook/xxport/pab_xxport.cpp +++ b/kaddressbook/xxport/pab_xxport.cpp @@ -55,7 +55,7 @@ KABC::AddresseeList PABXXPort::importContacts( const TQString& ) const if ( fileName.isEmpty() ) return addrList; if ( !TQFile::exists( fileName ) ) { - KMessageBox::sorry( parentWidget(), i18n( "<qt>Could not find a MS Exchange Personal Address Book <b>%1</b>.</qt>" ).tqarg( fileName ) ); + KMessageBox::sorry( parentWidget(), i18n( "<qt>Could not find a MS Exchange Personal Address Book <b>%1</b>.</qt>" ).arg( fileName ) ); return addrList; } diff --git a/kaddressbook/xxport/vcard_xxport.cpp b/kaddressbook/xxport/vcard_xxport.cpp index 849b24407..022f6c5f2 100644 --- a/kaddressbook/xxport/vcard_xxport.cpp +++ b/kaddressbook/xxport/vcard_xxport.cpp @@ -250,15 +250,15 @@ KABC::AddresseeList VCardXXPort::importContacts( const TQString& ) const KIO::NetAccess::removeTempFile( fileName ); } else { TQString text = i18n( "<qt>When trying to read the vCard, there was an error opening the file '%1': %2</qt>" ); - text = text.tqarg( (*it).url() ); - text = text.tqarg( kapp->translate( "TQFile", + text = text.arg( (*it).url() ); + text = text.arg( kapp->translate( "TQFile", TQString(file.errorString()).latin1() ) ); KMessageBox::error( parentWidget(), text, caption ); anyFailures = true; } } else { TQString text = i18n( "<qt>Unable to access vCard: %1</qt>" ); - text = text.tqarg( KIO::NetAccess::lastErrorString() ); + text = text.arg( KIO::NetAccess::lastErrorString() ); KMessageBox::error( parentWidget(), text, caption ); anyFailures = true; } @@ -293,7 +293,7 @@ KABC::AddresseeList VCardXXPort::parseVCard( const TQByteArray &data ) const bool VCardXXPort::doExport( const KURL &url, const TQByteArray &data ) { if( TQFileInfo(url.path()).exists() ) { - if(KMessageBox::questionYesNo( parentWidget(), i18n("Do you want to overwrite file \"%1\"").tqarg( url.path()) ) == KMessageBox::No) + if(KMessageBox::questionYesNo( parentWidget(), i18n("Do you want to overwrite file \"%1\"").arg( url.path()) ) == KMessageBox::No) return false; } KTempFile tmpFile; @@ -315,7 +315,7 @@ KABC::AddresseeList VCardXXPort::parseVCard( const TQString &data ) const bool VCardXXPort::doExport( const KURL &url, const TQString &data ) { if( TQFileInfo(url.path()).exists() ) { - if(KMessageBox::questionYesNo( parentWidget(), i18n("Do you want to overwrite file \"%1\"").tqarg( url.path()) ) == KMessageBox::No) + if(KMessageBox::questionYesNo( parentWidget(), i18n("Do you want to overwrite file \"%1\"").arg( url.path()) ) == KMessageBox::No) return false; } KTempFile tmpFile; diff --git a/kaddressbook/xxportmanager.cpp b/kaddressbook/xxportmanager.cpp index 642f8bfe3..38a9a89a1 100644 --- a/kaddressbook/xxportmanager.cpp +++ b/kaddressbook/xxportmanager.cpp @@ -77,7 +77,7 @@ void XXPortManager::slotImport( const TQString &identifier, const TQString &data { KAB::XXPort *obj = mXXPortObjects[ identifier ]; if ( !obj ) { - KMessageBox::error( mCore->widget(), i18n( "<qt>No import plugin available for <b>%1</b>.</qt>" ).tqarg( identifier ) ); + KMessageBox::error( mCore->widget(), i18n( "<qt>No import plugin available for <b>%1</b>.</qt>" ).arg( identifier ) ); return; } @@ -101,7 +101,7 @@ void XXPortManager::slotExport( const TQString &identifier, const TQString &data { KAB::XXPort *obj = mXXPortObjects[ identifier ]; if ( !obj ) { - KMessageBox::error( mCore->widget(), i18n( "<qt>No export plugin available for <b>%1</b>.</qt>" ).tqarg( identifier ) ); + KMessageBox::error( mCore->widget(), i18n( "<qt>No export plugin available for <b>%1</b>.</qt>" ).arg( identifier ) ); return; } @@ -121,7 +121,7 @@ void XXPortManager::loadPlugins() mXXPortObjects.clear(); const KTrader::OfferList plugins = KTrader::self()->query( "KAddressBook/XXPort", - TQString( "[X-KDE-KAddressBook-XXPortPluginVersion] == %1" ).tqarg( KAB_XXPORT_PLUGIN_VERSION ) ); + TQString( "[X-KDE-KAddressBook-XXPortPluginVersion] == %1" ).arg( KAB_XXPORT_PLUGIN_VERSION ) ); KTrader::OfferList::ConstIterator it; for ( it = plugins.begin(); it != plugins.end(); ++it ) { if ( !(*it)->hasServiceType( "KAddressBook/XXPort" ) ) diff --git a/kalarm/alarmcalendar.cpp b/kalarm/alarmcalendar.cpp index 1de9e8323..f17cd7495 100644 --- a/kalarm/alarmcalendar.cpp +++ b/kalarm/alarmcalendar.cpp @@ -61,7 +61,7 @@ using namespace KCal; TQString AlarmCalendar::icalProductId() { - return TQString::fromLatin1("-//K Desktop Environment//NONSGML " KALARM_NAME " %1//EN").tqarg(KAlarm::currentCalendarVersionString()); + return TQString::fromLatin1("-//K Desktop Environment//NONSGML " KALARM_NAME " %1//EN").arg(KAlarm::currentCalendarVersionString()); } static const KAEvent::Status eventTypes[AlarmCalendar::NCALS] = { @@ -112,7 +112,7 @@ bool AlarmCalendar::initialiseCalendars() { kdError(5950) << "AlarmCalendar::initialiseCalendars(): '" << errorKey1 << "' calendar name = display calendar name\n"; TQString file = config->readPathEntry(errorKey1); - KAlarmApp::displayFatalError(i18n("%1: file name not permitted: %2").tqarg(errorKey1).tqarg(file)); + KAlarmApp::displayFatalError(i18n("%1: file name not permitted: %2").arg(errorKey1).arg(file)); return false; } if (activeCal == expiredCal) @@ -133,14 +133,14 @@ bool AlarmCalendar::initialiseCalendars() if (!errorKey1.isNull()) { kdError(5950) << "AlarmCalendar::initialiseCalendars(): calendar names clash: " << errorKey1 << ", " << errorKey2 << endl; - KAlarmApp::displayFatalError(i18n("%1, %2: file names must be different").tqarg(errorKey1).tqarg(errorKey2)); + KAlarmApp::displayFatalError(i18n("%1, %2: file names must be different").arg(errorKey1).arg(errorKey2)); return false; } if (!mCalendars[ACTIVE]->valid()) { TQString path = mCalendars[ACTIVE]->path(); kdError(5950) << "AlarmCalendar::initialiseCalendars(): invalid name: " << path << endl; - KAlarmApp::displayFatalError(i18n("Invalid calendar file name: %1").tqarg(path)); + KAlarmApp::displayFatalError(i18n("Invalid calendar file name: %1").arg(path)); return false; } return true; @@ -321,7 +321,7 @@ int AlarmCalendar::load() if (!KIO::NetAccess::download(mUrl, tmpFile, MainWindow::mainMainWindow())) { kdError(5950) << "AlarmCalendar::load(): Load failure" << endl; - KMessageBox::error(0, i18n("Cannot open calendar:\n%1").tqarg(mUrl.prettyURL())); + KMessageBox::error(0, i18n("Cannot open calendar:\n%1").arg(mUrl.prettyURL())); return -1; } kdDebug(5950) << "AlarmCalendar::load(): --- Downloaded to " << tmpFile << endl; @@ -338,7 +338,7 @@ int AlarmCalendar::load() if (!fi.size()) return 0; // file is zero length kdError(5950) << "AlarmCalendar::load(): Error loading calendar file '" << tmpFile << "'" << endl; - KMessageBox::error(0, i18n("Error loading calendar:\n%1\n\nPlease fix or delete the file.").tqarg(mUrl.prettyURL())); + KMessageBox::error(0, i18n("Error loading calendar:\n%1\n\nPlease fix or delete the file.").arg(mUrl.prettyURL())); // load() could have partially populated the calendar, so clear it out mCalendar->close(); delete mCalendar; @@ -383,7 +383,7 @@ bool AlarmCalendar::saveCal(const TQString& newFile) if (!mCalendar->save(saveFilename, new ICalFormat)) { kdError(5950) << "AlarmCalendar::saveCal(" << saveFilename << "): failed.\n"; - KMessageBox::error(0, i18n("Failed to save calendar to\n'%1'").tqarg(mICalUrl.prettyURL())); + KMessageBox::error(0, i18n("Failed to save calendar to\n'%1'").arg(mICalUrl.prettyURL())); return false; } @@ -392,7 +392,7 @@ bool AlarmCalendar::saveCal(const TQString& newFile) if (!KIO::NetAccess::upload(saveFilename, mICalUrl, MainWindow::mainMainWindow())) { kdError(5950) << "AlarmCalendar::saveCal(" << saveFilename << "): upload failed.\n"; - KMessageBox::error(0, i18n("Cannot upload calendar to\n'%1'").tqarg(mICalUrl.prettyURL())); + KMessageBox::error(0, i18n("Cannot upload calendar to\n'%1'").arg(mICalUrl.prettyURL())); return false; } } @@ -446,7 +446,7 @@ void AlarmCalendar::close() bool AlarmCalendar::importAlarms(TQWidget* parent) { KURL url = KFileDialog::getOpenURL(TQString::fromLatin1(":importalarms"), - TQString::fromLatin1("*.vcs *.ics|%1").tqarg(i18n("Calendar Files")), parent); + TQString::fromLatin1("*.vcs *.ics|%1").arg(i18n("Calendar Files")), parent); if (url.isEmpty()) { kdError(5950) << "AlarmCalendar::importAlarms(): Empty URL" << endl; @@ -468,7 +468,7 @@ bool AlarmCalendar::importAlarms(TQWidget* parent) if (!KStandardDirs::exists(filename)) { kdDebug(5950) << "AlarmCalendar::importAlarms(): File '" << url.prettyURL() << "' not found" << endl; - KMessageBox::error(parent, i18n("Could not load calendar '%1'.").tqarg(url.prettyURL())); + KMessageBox::error(parent, i18n("Could not load calendar '%1'.").arg(url.prettyURL())); return false; } } @@ -477,7 +477,7 @@ bool AlarmCalendar::importAlarms(TQWidget* parent) if (!KIO::NetAccess::download(url, filename, MainWindow::mainMainWindow())) { kdError(5950) << "AlarmCalendar::importAlarms(): Download failure" << endl; - KMessageBox::error(parent, i18n("Cannot download calendar:\n%1").tqarg(url.prettyURL())); + KMessageBox::error(parent, i18n("Cannot download calendar:\n%1").arg(url.prettyURL())); return false; } kdDebug(5950) << "--- Downloaded to " << filename << endl; @@ -490,7 +490,7 @@ bool AlarmCalendar::importAlarms(TQWidget* parent) if (!success) { kdDebug(5950) << "AlarmCalendar::importAlarms(): error loading calendar '" << filename << "'" << endl; - KMessageBox::error(parent, i18n("Could not load calendar '%1'.").tqarg(url.prettyURL())); + KMessageBox::error(parent, i18n("Could not load calendar '%1'.").arg(url.prettyURL())); } else { diff --git a/kalarm/alarmevent.cpp b/kalarm/alarmevent.cpp index 9acb722d1..d39567938 100644 --- a/kalarm/alarmevent.cpp +++ b/kalarm/alarmevent.cpp @@ -1000,7 +1000,7 @@ bool KAEvent::updateKCalEvent(Event& ev, bool checkUid, bool original, bool canc if (mEmailBcc) cats.append(EMAIL_BCC_CATEGORY); if (mKMailSerialNumber) - cats.append(TQString("%1%2").tqarg(KMAIL_SERNUM_CATEGORY).tqarg(mKMailSerialNumber)); + cats.append(TQString("%1%2").arg(KMAIL_SERNUM_CATEGORY).arg(mKMailSerialNumber)); if (mCopyToKOrganizer) cats.append(KORGANIZER_CATEGORY); if (mCommandXterm) @@ -1008,11 +1008,11 @@ bool KAEvent::updateKCalEvent(Event& ev, bool checkUid, bool original, bool canc else if (!mLogFile.isEmpty()) cats.append(LOG_CATEGORY + mLogFile); if (mLateCancel) - cats.append(TQString("%1%2").tqarg(mAutoClose ? AUTO_CLOSE_CATEGORY : LATE_CANCEL_CATEGORY).tqarg(mLateCancel)); + cats.append(TQString("%1%2").arg(mAutoClose ? AUTO_CLOSE_CATEGORY : LATE_CANCEL_CATEGORY).arg(mLateCancel)); if (mDeferDefaultMinutes) - cats.append(TQString("%1%2").tqarg(DEFER_CATEGORY).tqarg(mDeferDefaultMinutes)); + cats.append(TQString("%1%2").arg(DEFER_CATEGORY).arg(mDeferDefaultMinutes)); if (!mTemplateName.isEmpty() && mTemplateAfterTime >= 0) - cats.append(TQString("%1%2").tqarg(TEMPL_AFTER_TIME_CATEGORY).tqarg(mTemplateAfterTime)); + cats.append(TQString("%1%2").arg(TEMPL_AFTER_TIME_CATEGORY).arg(mTemplateAfterTime)); if (mArchive && !original) { TQStringList params; @@ -1032,7 +1032,7 @@ bool KAEvent::updateKCalEvent(Event& ev, bool checkUid, bool original, bool canc unit = 'H'; count /= 60; } - params += TQString("%1%2").tqarg(count).tqarg(unit); + params += TQString("%1%2").arg(count).arg(unit); } if (mArchiveRepeatAtLogin) params += AT_LOGIN_TYPE; @@ -1084,7 +1084,7 @@ bool KAEvent::updateKCalEvent(Event& ev, bool checkUid, bool original, bool canc { // Alarm repetition is normally held in the main alarm, but since // the main alarm has expired, store in a custom property. - TQString param = TQString("%1:%2").tqarg(mRepeatInterval).tqarg(mRepeatCount); + TQString param = TQString("%1:%2").arg(mRepeatInterval).arg(mRepeatCount); ev.setCustomProperty(APPNAME, REPEAT_PROPERTY, param); } @@ -1251,9 +1251,9 @@ Alarm* KAEvent::initKCalAlarm(Event& event, int startOffsetSecs, const TQStringL } if (!mAudioFile.isEmpty() && mSoundVolume >= 0) alarm->setCustomProperty(APPNAME, VOLUME_PROPERTY, - TQString::fromLatin1("%1;%2;%3").tqarg(TQString::number(mSoundVolume, 'f', 2)) - .tqarg(TQString::number(mFadeVolume, 'f', 2)) - .tqarg(mFadeSeconds)); + TQString::fromLatin1("%1;%2;%3").arg(TQString::number(mSoundVolume, 'f', 2)) + .arg(TQString::number(mFadeVolume, 'f', 2)) + .arg(mFadeSeconds)); break; case KAAlarm::PRE_ACTION_ALARM: setProcedureAlarm(alarm, mPreAction); @@ -1277,9 +1277,9 @@ Alarm* KAEvent::initKCalAlarm(Event& event, int startOffsetSecs, const TQStringL case T_MESSAGE: alarm->setDisplayAlarm(AlarmText::toCalendarText(mText)); alarm->setCustomProperty(APPNAME, FONT_COLOUR_PROPERTY, - TQString::fromLatin1("%1;%2;%3").tqarg(mBgColour.name()) - .tqarg(mFgColour.name()) - .tqarg(mDefaultFont ? TQString() : mFont.toString())); + TQString::fromLatin1("%1;%2;%3").arg(mBgColour.name()) + .arg(mFgColour.name()) + .arg(mDefaultFont ? TQString() : mFont.toString())); break; case T_COMMAND: if (mCommandScript) @@ -2093,7 +2093,7 @@ TQString KAEvent::recurrenceText(bool brief) const else { TQString mins; - return i18n("Hours and Minutes", "%1H %2M").tqarg(TQString::number(frequency/60)).tqarg(mins.sprintf("%02d", frequency%60)); + return i18n("Hours and Minutes", "%1H %2M").arg(TQString::number(frequency/60)).arg(mins.sprintf("%02d", frequency%60)); } case RecurrenceRule::rDaily: return i18n("1 Day", "%n Days", frequency); @@ -2125,7 +2125,7 @@ TQString KAEvent::repetitionText(bool brief) const if (mRepeatInterval % 60 == 0) return i18n("1 Hour", "%n Hours", mRepeatInterval/60); TQString mins; - return i18n("Hours and Minutes", "%1H %2M").tqarg(TQString::number(mRepeatInterval/60)).tqarg(mins.sprintf("%02d", mRepeatInterval%60)); + return i18n("Hours and Minutes", "%1H %2M").arg(TQString::number(mRepeatInterval/60)).arg(mins.sprintf("%02d", mRepeatInterval%60)); } if (mRepeatInterval % (7*1440)) return i18n("1 Day", "%n Days", mRepeatInterval/1440); @@ -2844,7 +2844,7 @@ void KAEvent::convertKCalEvents(KCal::Calendar& calendar, int version, bool adju Alarm* alarm = *alit; if (alarm->type() == Alarm::Display) alarm->setCustomProperty(APPNAME, FONT_COLOUR_PROPERTY, - TQString::fromLatin1("%1;;").tqarg(cats[0])); + TQString::fromLatin1("%1;;").arg(cats[0])); } cats.remove(cats.begin()); } @@ -2918,7 +2918,7 @@ void KAEvent::convertKCalEvents(KCal::Calendar& calendar, int version, bool adju while ((it = cats.find(TEMPL_DEF_TIME_CAT)) != cats.end()) { cats.remove(it); - cats.append(TQString("%1%2").tqarg(TEMPL_AFTER_TIME_CATEGORY).tqarg(0)); + cats.append(TQString("%1%2").arg(TEMPL_AFTER_TIME_CATEGORY).arg(0)); } } @@ -2937,7 +2937,7 @@ void KAEvent::convertKCalEvents(KCal::Calendar& calendar, int version, bool adju } if (addLateCancel) - cats.append(TQString("%1%2").tqarg(LATE_CANCEL_CATEGORY).tqarg(1)); + cats.append(TQString("%1%2").arg(LATE_CANCEL_CATEGORY).arg(1)); event->setCategories(cats); diff --git a/kalarm/alarmlistview.cpp b/kalarm/alarmlistview.cpp index 419f642a4..3e3db18d4 100644 --- a/kalarm/alarmlistview.cpp +++ b/kalarm/alarmlistview.cpp @@ -503,7 +503,7 @@ TQString AlarmListViewItem::alarmTimeText(const DateTime& dateTime) const { // Initialise the position of the hour within the time string, if leading // zeroes are omitted, so that displayed times can be aligned with each other. - mTimeHourPos = -1; // default = tqalignment isn't possible/sensible + mTimeHourPos = -1; // default = alignment isn't possible/sensible if (!TQApplication::reverseLayout()) // don't try to align right-to-left languages { TQString fmt = locale->timeFormat(); @@ -514,7 +514,7 @@ TQString AlarmListViewItem::alarmTimeText(const DateTime& dateTime) const } if (mTimeHourPos >= 0 && (int)time.length() > mTimeHourPos + 1 && time[mTimeHourPos].isDigit() && !time[mTimeHourPos + 1].isDigit()) - dateTimeText += '~'; // improve tqalignment of times with no leading zeroes + dateTimeText += '~'; // improve alignment of times with no leading zeroes dateTimeText += time; } return dateTimeText + ' '; @@ -531,7 +531,7 @@ TQString AlarmListViewItem::timeToAlarmText(const TQDateTime& now) const if (dateTime.isDateOnly()) { int days = now.date().daysTo(dateTime.date()); - return i18n("n days", " %1d ").tqarg(days); + return i18n("n days", " %1d ").arg(days); } int mins = (now.secsTo(dateTime.dateTime()) + 59) / 60; if (mins < 0) @@ -540,10 +540,10 @@ TQString AlarmListViewItem::timeToAlarmText(const TQDateTime& now) const minutes[0] = (mins%60) / 10 + '0'; minutes[1] = (mins%60) % 10 + '0'; if (mins < 24*60) - return i18n("hours:minutes", " %1:%2 ").tqarg(mins/60).tqarg(minutes); + return i18n("hours:minutes", " %1:%2 ").arg(mins/60).arg(minutes); int days = mins / (24*60); mins = mins % (24*60); - return i18n("days hours:minutes", " %1d %2:%3 ").tqarg(days).tqarg(mins/60).tqarg(minutes); + return i18n("days hours:minutes", " %1d %2:%3 ").arg(days).arg(mins/60).arg(minutes); } /****************************************************************************** diff --git a/kalarm/alarmtimewidget.cpp b/kalarm/alarmtimewidget.cpp index 2b65c7001..ffda682c2 100644 --- a/kalarm/alarmtimewidget.cpp +++ b/kalarm/alarmtimewidget.cpp @@ -104,7 +104,7 @@ void AlarmTimeWidget::init(int mode) connect(mDateEdit, TQT_SIGNAL(dateEntered(const TQDate&)), TQT_SLOT(dateTimeChanged())); static const TQString enterDateText = i18n("Enter the date to schedule the alarm."); TQWhatsThis::add(mDateEdit, ((mode & DEFER_TIME) ? enterDateText - : TQString("%1\n%2").tqarg(enterDateText).tqarg(recurText))); + : TQString("%1\n%2").arg(enterDateText).arg(recurText))); mAtTimeRadio->setFocusWidget(mDateEdit); // Time edit box and Any time checkbox @@ -115,8 +115,8 @@ void AlarmTimeWidget::init(int mode) connect(mTimeEdit, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(dateTimeChanged())); static const TQString enterTimeText = i18n("Enter the time to schedule the alarm."); TQWhatsThis::add(mTimeEdit, - ((mode & DEFER_TIME) ? TQString("%1\n\n%2").tqarg(enterTimeText).tqarg(TimeSpinBox::shiftWhatsThis()) - : TQString("%1\n%2\n\n%3").tqarg(enterTimeText).tqarg(recurText).tqarg(TimeSpinBox::shiftWhatsThis()))); + ((mode & DEFER_TIME) ? TQString("%1\n\n%2").arg(enterTimeText).arg(TimeSpinBox::shiftWhatsThis()) + : TQString("%1\n%2\n\n%3").arg(enterTimeText).arg(recurText).arg(TimeSpinBox::shiftWhatsThis()))); mAnyTime = -1; // current status is uninitialised if (mode & DEFER_TIME) @@ -147,8 +147,8 @@ void AlarmTimeWidget::init(int mode) mDelayTimeEdit->setFixedSize(mDelayTimeEdit->sizeHint()); connect(mDelayTimeEdit, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(delayTimeChanged(int))); TQWhatsThis::add(mDelayTimeEdit, - ((mode & DEFER_TIME) ? TQString("%1\n\n%2").tqarg(i18n_TimeAfterPeriod()).tqarg(TimeSpinBox::shiftWhatsThis()) - : TQString("%1\n%2\n\n%3").tqarg(i18n_TimeAfterPeriod()).tqarg(recurText).tqarg(TimeSpinBox::shiftWhatsThis()))); + ((mode & DEFER_TIME) ? TQString("%1\n\n%2").arg(i18n_TimeAfterPeriod()).arg(TimeSpinBox::shiftWhatsThis()) + : TQString("%1\n%2\n\n%3").arg(i18n_TimeAfterPeriod()).arg(recurText).arg(TimeSpinBox::shiftWhatsThis()))); mAfterTimeRadio->setFocusWidget(mDelayTimeEdit); // Set up the tqlayout, either narrow or wide diff --git a/kalarm/daemon.cpp b/kalarm/daemon.cpp index a970b94e1..4ad785552 100644 --- a/kalarm/daemon.cpp +++ b/kalarm/daemon.cpp @@ -221,7 +221,7 @@ void Daemon::registrationResult(bool reregister, int result, int version) failed = true; kdError(5950) << "Daemon::registrationResult(" << reregister << "): kalarmd reports incompatible version " << version << endl; errmsg = i18n("Cannot enable alarms.\nInstallation or configuration error: Alarm Daemon (%1) version is incompatible.") - .tqarg(TQString::fromLatin1(DAEMON_APP_NAME)); + .arg(TQString::fromLatin1(DAEMON_APP_NAME)); } else { @@ -236,8 +236,8 @@ void Daemon::registrationResult(bool reregister, int result, int version) kdError(5950) << "Daemon::registrationResult(" << reregister << "): registerApp dcop call: " << kapp->aboutData()->appName() << " not found\n"; KMessageBox::error(0, i18n("Alarms will be disabled if you stop KAlarm.\n" "(Installation or configuration error: %1 cannot locate %2 executable.)") - .tqarg(TQString::fromLatin1(DAEMON_APP_NAME)) - .tqarg(kapp->aboutData()->appName())); + .arg(TQString::fromLatin1(DAEMON_APP_NAME)) + .arg(kapp->aboutData()->appName())); break; case KAlarmd::FAILURE: default: @@ -248,7 +248,7 @@ void Daemon::registrationResult(bool reregister, int result, int version) if (!reregister) { errmsg = i18n("Cannot enable alarms:\nFailed to register with Alarm Daemon (%1)") - .tqarg(TQString::fromLatin1(DAEMON_APP_NAME)); + .arg(TQString::fromLatin1(DAEMON_APP_NAME)); } break; } @@ -304,7 +304,7 @@ void Daemon::checkIfStarted() if (err) { kdError(5950) << "Daemon::checkIfStarted(): failed to start daemon" << endl; - KMessageBox::error(0, i18n("Cannot enable alarms:\nFailed to start Alarm Daemon (%1)").tqarg(TQString::fromLatin1(DAEMON_APP_NAME))); + KMessageBox::error(0, i18n("Cannot enable alarms:\nFailed to start Alarm Daemon (%1)").arg(TQString::fromLatin1(DAEMON_APP_NAME))); } } diff --git a/kalarm/deferdlg.cpp b/kalarm/deferdlg.cpp index 8c7edd3ce..b2120f9de 100644 --- a/kalarm/deferdlg.cpp +++ b/kalarm/deferdlg.cpp @@ -107,7 +107,7 @@ void DeferAlarmDlg::slotOk() case KAEvent::LIMIT_NONE: break; // can't happen with a valid endTime } - KMessageBox::sorry(this, text.tqarg(endTime.formatLocale())); + KMessageBox::sorry(this, text.arg(endTime.formatLocale())); } else accept(); diff --git a/kalarm/editdlg.cpp b/kalarm/editdlg.cpp index acb7df637..7df529564 100644 --- a/kalarm/editdlg.cpp +++ b/kalarm/editdlg.cpp @@ -129,10 +129,10 @@ inline TQString recurText(const KAEvent& event) { TQString r; if (event.repeatCount()) - r = TQString::fromLatin1("%1 / %2").tqarg(event.recurrenceText()).tqarg(event.repetitionText()); + r = TQString::fromLatin1("%1 / %2").arg(event.recurrenceText()).arg(event.repetitionText()); else r = event.recurrenceText(); - return i18n("&Recurrence - [%1]").tqarg(r); + return i18n("&Recurrence - [%1]").arg(r); } // Collect these widget labels together to ensure consistent wording and @@ -295,8 +295,8 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par tqlayout->addWidget(mTemplateTimeGroup); grid = new TQGridLayout(mTemplateTimeGroup, 2, 2, marginHint(), spacingHint()); grid->addRowSpacing(0, fontMetrics().lineSpacing()/2); - // Get tqalignment to use in TQGridLayout (AlignAuto doesn't work correctly there) - int tqalignment = TQApplication::reverseLayout() ? TQt::AlignRight : TQt::AlignLeft; + // Get alignment to use in TQGridLayout (AlignAuto doesn't work correctly there) + int alignment = TQApplication::reverseLayout() ? TQt::AlignRight : TQt::AlignLeft; mTemplateDefaultTime = new RadioButton(i18n("&Default time"), mTemplateTimeGroup, "templateDefTimeButton"); mTemplateDefaultTime->setFixedSize(mTemplateDefaultTime->sizeHint()); @@ -304,7 +304,7 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par TQWhatsThis::add(mTemplateDefaultTime, i18n("Do not specify a start time for alarms based on this template. " "The normal default start time will be used.")); - grid->addWidget(mTemplateDefaultTime, 0, 0, tqalignment); + grid->addWidget(mTemplateDefaultTime, 0, 0, alignment); TQHBox* box = new TQHBox(mTemplateTimeGroup); box->setSpacing(spacingHint()); @@ -318,18 +318,18 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par mTemplateTime->setFixedSize(mTemplateTime->sizeHint()); mTemplateTime->setReadOnly(mReadOnly); TQWhatsThis::add(mTemplateTime, - TQString("%1\n\n%2").tqarg(i18n("Enter the start time for alarms based on this template.")) - .tqarg(TimeSpinBox::shiftWhatsThis())); + TQString("%1\n\n%2").arg(i18n("Enter the start time for alarms based on this template.")) + .arg(TimeSpinBox::shiftWhatsThis())); box->setStretchFactor(new TQWidget(box), 1); // left adjust the controls box->setFixedHeight(box->sizeHint().height()); - grid->addWidget(box, 0, 1, tqalignment); + grid->addWidget(box, 0, 1, alignment); mTemplateAnyTime = new RadioButton(i18n("An&y time"), mTemplateTimeGroup, "templateAnyTimeButton"); mTemplateAnyTime->setFixedSize(mTemplateAnyTime->sizeHint()); mTemplateAnyTime->setReadOnly(mReadOnly); TQWhatsThis::add(mTemplateAnyTime, - i18n("Set the '%1' option for alarms based on this template.").tqarg(i18n("Any time"))); - grid->addWidget(mTemplateAnyTime, 1, 0, tqalignment); + i18n("Set the '%1' option for alarms based on this template.").arg(i18n("Any time"))); + grid->addWidget(mTemplateAnyTime, 1, 0, alignment); box = new TQHBox(mTemplateTimeGroup); box->setSpacing(spacingHint()); @@ -345,10 +345,10 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par mTemplateTimeAfter->setFixedSize(mTemplateTimeAfter->sizeHint()); mTemplateTimeAfter->setReadOnly(mReadOnly); TQWhatsThis::add(mTemplateTimeAfter, - TQString("%1\n\n%2").tqarg(AlarmTimeWidget::i18n_TimeAfterPeriod()) - .tqarg(TimeSpinBox::shiftWhatsThis())); + TQString("%1\n\n%2").arg(AlarmTimeWidget::i18n_TimeAfterPeriod()) + .arg(TimeSpinBox::shiftWhatsThis())); box->setFixedHeight(box->sizeHint().height()); - grid->addWidget(box, 1, 1, tqalignment); + grid->addWidget(box, 1, 1, alignment); tqlayout->addStretch(); } @@ -363,7 +363,7 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par static const TQString reminderText = i18n("Enter how long in advance of the main alarm to display a reminder alarm."); mReminder = new Reminder(i18n("Rem&inder:"), i18n("Check to additionally display a reminder in advance of the main alarm time(s)."), - TQString("%1\n\n%2").tqarg(reminderText).tqarg(TimeSpinBox::shiftWhatsThis()), + TQString("%1\n\n%2").arg(reminderText).arg(TimeSpinBox::shiftWhatsThis()), true, true, mainPage); mReminder->setFixedSize(mReminder->sizeHint()); topLayout->addWidget(mReminder, 0, TQt::AlignAuto); @@ -626,7 +626,7 @@ void EditAlarmDlg::initEmail(TQWidget* parent) mEmailAttachList->setMinimumSize(mEmailAttachList->sizeHint()); mEmailAttachList->lineEdit()->setReadOnly(true); TQListBox* list = mEmailAttachList->listBox(); -TQRect rect = list->tqgeometry(); +TQRect rect = list->geometry(); list->setGeometry(rect.left() - 50, rect.top(), rect.width(), rect.height()); label->setBuddy(mEmailAttachList); TQWhatsThis::add(mEmailAttachList, @@ -1424,7 +1424,7 @@ void EditAlarmDlg::slotOk() mTabs->setCurrentPage(mMainPageIndex); mReminder->setFocusOnCount(); KMessageBox::sorry(this, i18n("Reminder period must be less than the recurrence interval, unless '%1' is checked." - ).tqarg(Reminder::i18n_first_recurrence_only())); + ).arg(Reminder::i18n_first_recurrence_only())); return; } } @@ -1479,15 +1479,15 @@ void EditAlarmDlg::slotTry() if (mCommandRadio->isOn() && mCmdOutputGroup->selectedId() != EXEC_IN_TERMINAL) { theApp()->commandMessage((ShellProcess*)proc, this); - KMessageBox::information(this, i18n("Command executed:\n%1").tqarg(text)); + KMessageBox::information(this, i18n("Command executed:\n%1").arg(text)); theApp()->commandMessage((ShellProcess*)proc, 0); } else if (mEmailRadio->isOn()) { TQString bcc; if (mEmailBcc->isChecked()) - bcc = i18n("\nBcc: %1").tqarg(Preferences::emailBccAddress()); - KMessageBox::information(this, i18n("Email sent to:\n%1%2").tqarg(mEmailAddresses.join("\n")).tqarg(bcc)); + bcc = i18n("\nBcc: %1").arg(Preferences::emailBccAddress()); + KMessageBox::information(this, i18n("Email sent to:\n%1%2").arg(mEmailAddresses.join("\n")).arg(bcc)); } } } @@ -1728,7 +1728,7 @@ bool EditAlarmDlg::checkEmailData() if (!bad.isEmpty()) { mEmailToEdit->setFocus(); - KMessageBox::error(this, i18n("Invalid email address:\n%1").tqarg(bad)); + KMessageBox::error(this, i18n("Invalid email address:\n%1").arg(bad)); return false; } } @@ -1752,7 +1752,7 @@ bool EditAlarmDlg::checkEmailData() break; // empty case -1: mEmailAttachList->setFocus(); - KMessageBox::error(this, i18n("Invalid email attachment:\n%1").tqarg(att)); + KMessageBox::error(this, i18n("Invalid email attachment:\n%1").arg(att)); return false; } } @@ -2012,7 +2012,7 @@ bool EditAlarmDlg::checkText(TQString& result, bool showErrorMessage) const default: break; } - if (KMessageBox::warningContinueCancel(const_cast<EditAlarmDlg*>(this), errmsg.tqarg(alarmtext)) + if (KMessageBox::warningContinueCancel(const_cast<EditAlarmDlg*>(this), errmsg.arg(alarmtext)) == KMessageBox::Cancel) return false; } diff --git a/kalarm/functions.cpp b/kalarm/functions.cpp index a4cf2b04a..9fb76f21f 100644 --- a/kalarm/functions.cpp +++ b/kalarm/functions.cpp @@ -633,7 +633,7 @@ void outputAlarmWarnings(TQWidget* parent, const KAEvent* event) if (event && event->action() == KAEvent::EMAIL && Preferences::emailAddress().isEmpty()) KMessageBox::information(parent, i18n("Please set the 'From' email address...", - "%1\nPlease set it in the Preferences dialog.").tqarg(KAMail::i18n_NeedFromEmailAddress())); + "%1\nPlease set it in the Preferences dialog.").arg(KAMail::i18n_NeedFromEmailAddress())); if (!Daemon::monitoringAlarms()) { @@ -705,7 +705,7 @@ TQString runKMail(bool minimise) TQCString dcopName; TQString errmsg; if (!runProgram("kmail", (minimise ? KMAIL_DCOP_WINDOW : ""), dcopName, errmsg)) - return i18n("Unable to start KMail\n(%1)").tqarg(errmsg); + return i18n("Unable to start KMail\n(%1)").arg(errmsg); return TQString(); } @@ -748,8 +748,8 @@ bool readConfigWindowSize(const char* window, TQSize& result) KConfig* config = KGlobal::config(); config->setGroup(TQString::fromLatin1(window)); TQWidget* desktop = TQT_TQWIDGET(KApplication::desktop()); - TQSize s = TQSize(config->readNumEntry(TQString::fromLatin1("Width %1").tqarg(desktop->width()), 0), - config->readNumEntry(TQString::fromLatin1("Height %1").tqarg(desktop->height()), 0)); + TQSize s = TQSize(config->readNumEntry(TQString::fromLatin1("Width %1").arg(desktop->width()), 0), + config->readNumEntry(TQString::fromLatin1("Height %1").arg(desktop->height()), 0)); if (s.isEmpty()) return false; result = s; @@ -765,8 +765,8 @@ void writeConfigWindowSize(const char* window, const TQSize& size) KConfig* config = KGlobal::config(); config->setGroup(TQString::fromLatin1(window)); TQWidget* desktop = TQT_TQWIDGET(KApplication::desktop()); - config->writeEntry(TQString::fromLatin1("Width %1").tqarg(desktop->width()), size.width()); - config->writeEntry(TQString::fromLatin1("Height %1").tqarg(desktop->height()), size.height()); + config->writeEntry(TQString::fromLatin1("Width %1").arg(desktop->width()), size.width()); + config->writeEntry(TQString::fromLatin1("Height %1").arg(desktop->height()), size.height()); config->sync(); } diff --git a/kalarm/kalarmapp.cpp b/kalarm/kalarmapp.cpp index 8ef9f6a54..25dd60f49 100644 --- a/kalarm/kalarmapp.cpp +++ b/kalarm/kalarmapp.cpp @@ -329,9 +329,9 @@ int KAlarmApp::newInstance() if (args->isSet("triggerEvent")) { function = EVENT_TRIGGER; option = "triggerEvent"; ++count; } if (args->isSet("cancelEvent")) { function = EVENT_CANCEL; option = "cancelEvent"; ++count; } if (!count) - USAGE(i18n("%1 requires %2, %3 or %4").tqarg(TQString::fromLatin1("--calendarURL")).tqarg(TQString::fromLatin1("--handleEvent")).tqarg(TQString::fromLatin1("--triggerEvent")).tqarg(TQString::fromLatin1("--cancelEvent"))) + USAGE(i18n("%1 requires %2, %3 or %4").arg(TQString::fromLatin1("--calendarURL")).arg(TQString::fromLatin1("--handleEvent")).arg(TQString::fromLatin1("--triggerEvent")).arg(TQString::fromLatin1("--cancelEvent"))) if (count > 1) - USAGE(i18n("%1, %2, %3 mutually exclusive").tqarg(TQString::fromLatin1("--handleEvent")).tqarg(TQString::fromLatin1("--triggerEvent")).tqarg(TQString::fromLatin1("--cancelEvent"))); + USAGE(i18n("%1, %2, %3 mutually exclusive").arg(TQString::fromLatin1("--handleEvent")).arg(TQString::fromLatin1("--triggerEvent")).arg(TQString::fromLatin1("--cancelEvent"))); if (!initCheck(true)) // open the calendar, don't register with daemon yet { exitCode = 1; @@ -341,7 +341,7 @@ int KAlarmApp::newInstance() { TQString calendarUrl = args->getOption("calendarURL"); if (KURL(calendarUrl).url() != AlarmCalendar::activeCalendar()->urlString()) - USAGE(i18n("%1: wrong calendar file").tqarg(TQString::fromLatin1("--calendarURL"))) + USAGE(i18n("%1: wrong calendar file").arg(TQString::fromLatin1("--calendarURL"))) } TQString eventID = args->getOption(option); args->clear(); // free up memory @@ -369,7 +369,7 @@ int KAlarmApp::newInstance() } if (!KAlarm::edit(eventID)) { - USAGE(i18n("%1: Event %2 not found, or not editable").tqarg(TQString::fromLatin1("--edit")).tqarg(eventID)) + USAGE(i18n("%1: Event %2 not found, or not editable").arg(TQString::fromLatin1("--edit")).arg(eventID)) exitCode = 1; break; } @@ -401,11 +401,11 @@ int KAlarmApp::newInstance() { kdDebug(5950)<<"KAlarmApp::newInstance(): file\n"; if (args->isSet("exec")) - USAGE(i18n("%1 incompatible with %2").tqarg(TQString::fromLatin1("--exec")).tqarg(TQString::fromLatin1("--file"))) + USAGE(i18n("%1 incompatible with %2").arg(TQString::fromLatin1("--exec")).arg(TQString::fromLatin1("--file"))) if (args->isSet("mail")) - USAGE(i18n("%1 incompatible with %2").tqarg(TQString::fromLatin1("--mail")).tqarg(TQString::fromLatin1("--file"))) + USAGE(i18n("%1 incompatible with %2").arg(TQString::fromLatin1("--mail")).arg(TQString::fromLatin1("--file"))) if (args->count()) - USAGE(i18n("message incompatible with %1").tqarg(TQString::fromLatin1("--file"))) + USAGE(i18n("message incompatible with %1").arg(TQString::fromLatin1("--file"))) alMessage = args->getOption("file"); action = KAEvent::FILE; } @@ -413,7 +413,7 @@ int KAlarmApp::newInstance() { kdDebug(5950)<<"KAlarmApp::newInstance(): exec\n"; if (args->isSet("mail")) - USAGE(i18n("%1 incompatible with %2").tqarg(TQString::fromLatin1("--mail")).tqarg(TQString::fromLatin1("--exec"))) + USAGE(i18n("%1 incompatible with %2").arg(TQString::fromLatin1("--mail")).arg(TQString::fromLatin1("--exec"))) alMessage = args->getOption("exec"); int n = args->count(); for (int i = 0; i < n; ++i) @@ -435,7 +435,7 @@ int KAlarmApp::newInstance() { TQString addr = TQString::fromLocal8Bit(*i); if (!KAMail::checkAddress(addr)) - USAGE(i18n("%1: invalid email address").tqarg(TQString::fromLatin1("--mail"))) + USAGE(i18n("%1: invalid email address").arg(TQString::fromLatin1("--mail"))) alAddresses += KCal::Person(TQString(), addr); } params = args->getOptionList("attach"); @@ -453,13 +453,13 @@ int KAlarmApp::newInstance() if (action != KAEvent::EMAIL) { if (args->isSet("subject")) - USAGE(i18n("%1 requires %2").tqarg(TQString::fromLatin1("--subject")).tqarg(TQString::fromLatin1("--mail"))) + USAGE(i18n("%1 requires %2").arg(TQString::fromLatin1("--subject")).arg(TQString::fromLatin1("--mail"))) if (args->isSet("from-id")) - USAGE(i18n("%1 requires %2").tqarg(TQString::fromLatin1("--from-id")).tqarg(TQString::fromLatin1("--mail"))) + USAGE(i18n("%1 requires %2").arg(TQString::fromLatin1("--from-id")).arg(TQString::fromLatin1("--mail"))) if (args->isSet("attach")) - USAGE(i18n("%1 requires %2").tqarg(TQString::fromLatin1("--attach")).tqarg(TQString::fromLatin1("--mail"))) + USAGE(i18n("%1 requires %2").arg(TQString::fromLatin1("--attach")).arg(TQString::fromLatin1("--mail"))) if (args->isSet("bcc")) - USAGE(i18n("%1 requires %2").tqarg(TQString::fromLatin1("--bcc")).tqarg(TQString::fromLatin1("--mail"))) + USAGE(i18n("%1 requires %2").arg(TQString::fromLatin1("--bcc")).arg(TQString::fromLatin1("--mail"))) } bool alarmNoTime = false; @@ -478,7 +478,7 @@ int KAlarmApp::newInstance() colourText.replace(0, 2, "#"); bgColour.setNamedColor(colourText); if (!bgColour.isValid()) - USAGE(i18n("Invalid %1 parameter").tqarg(TQString::fromLatin1("--color"))) + USAGE(i18n("Invalid %1 parameter").arg(TQString::fromLatin1("--color"))) } if (args->isSet("colorfg")) { @@ -489,14 +489,14 @@ int KAlarmApp::newInstance() colourText.replace(0, 2, "#"); fgColour.setNamedColor(colourText); if (!fgColour.isValid()) - USAGE(i18n("Invalid %1 parameter").tqarg(TQString::fromLatin1("--colorfg"))) + USAGE(i18n("Invalid %1 parameter").arg(TQString::fromLatin1("--colorfg"))) } if (args->isSet("time")) { TQCString dateTime = args->getOption("time"); if (!convWakeTime(dateTime, alarmTime, alarmNoTime)) - USAGE(i18n("Invalid %1 parameter").tqarg(TQString::fromLatin1("--time"))) + USAGE(i18n("Invalid %1 parameter").arg(TQString::fromLatin1("--time"))) } else alarmTime = TQDateTime::currentDateTime(); @@ -505,9 +505,9 @@ int KAlarmApp::newInstance() if (haveRecurrence) { if (args->isSet("login")) - USAGE(i18n("%1 incompatible with %2").tqarg(TQString::fromLatin1("--login")).tqarg(TQString::fromLatin1("--recurrence"))) + USAGE(i18n("%1 incompatible with %2").arg(TQString::fromLatin1("--login")).arg(TQString::fromLatin1("--recurrence"))) if (args->isSet("until")) - USAGE(i18n("%1 incompatible with %2").tqarg(TQString::fromLatin1("--until")).tqarg(TQString::fromLatin1("--recurrence"))) + USAGE(i18n("%1 incompatible with %2").arg(TQString::fromLatin1("--until")).arg(TQString::fromLatin1("--recurrence"))) TQCString rule = args->getOption("recurrence"); recurrence.set(TQString::fromLocal8Bit(static_cast<const char*>(rule))); } @@ -516,24 +516,24 @@ int KAlarmApp::newInstance() // Repeat count is specified int count; if (args->isSet("login")) - USAGE(i18n("%1 incompatible with %2").tqarg(TQString::fromLatin1("--login")).tqarg(TQString::fromLatin1("--interval"))) + USAGE(i18n("%1 incompatible with %2").arg(TQString::fromLatin1("--login")).arg(TQString::fromLatin1("--interval"))) bool ok; if (args->isSet("repeat")) { count = args->getOption("repeat").toInt(&ok); if (!ok || !count || count < -1 || (count < 0 && haveRecurrence)) - USAGE(i18n("Invalid %1 parameter").tqarg(TQString::fromLatin1("--repeat"))) + USAGE(i18n("Invalid %1 parameter").arg(TQString::fromLatin1("--repeat"))) } else if (haveRecurrence) - USAGE(i18n("%1 requires %2").tqarg(TQString::fromLatin1("--interval")).tqarg(TQString::fromLatin1("--repeat"))) + USAGE(i18n("%1 requires %2").arg(TQString::fromLatin1("--interval")).arg(TQString::fromLatin1("--repeat"))) else if (args->isSet("until")) { count = 0; TQCString dateTime = args->getOption("until"); if (!convWakeTime(dateTime, endTime, alarmNoTime)) - USAGE(i18n("Invalid %1 parameter").tqarg(TQString::fromLatin1("--until"))) + USAGE(i18n("Invalid %1 parameter").arg(TQString::fromLatin1("--until"))) if (endTime < alarmTime) - USAGE(i18n("%1 earlier than %2").tqarg(TQString::fromLatin1("--until")).tqarg(TQString::fromLatin1("--time"))) + USAGE(i18n("%1 earlier than %2").arg(TQString::fromLatin1("--until")).arg(TQString::fromLatin1("--time"))) } else count = -1; @@ -543,16 +543,16 @@ int KAlarmApp::newInstance() KARecurrence::Type recurType; if (!convInterval(args->getOption("interval"), recurType, interval, !haveRecurrence) || interval < 0) - USAGE(i18n("Invalid %1 parameter").tqarg(TQString::fromLatin1("--interval"))) + USAGE(i18n("Invalid %1 parameter").arg(TQString::fromLatin1("--interval"))) if (alarmNoTime && recurType == KARecurrence::MINUTELY) - USAGE(i18n("Invalid %1 parameter for date-only alarm").tqarg(TQString::fromLatin1("--interval"))) + USAGE(i18n("Invalid %1 parameter for date-only alarm").arg(TQString::fromLatin1("--interval"))) if (haveRecurrence) { // There is a also a recurrence specified, so set up a sub-repetition int longestInterval = recurrence.longestInterval(); if (count * interval > longestInterval) - USAGE(i18n("Invalid %1 and %2 parameters: repetition is longer than %3 interval").tqarg(TQString::fromLatin1("--interval")).tqarg(TQString::fromLatin1("--repeat")).tqarg(TQString::fromLatin1("--recurrence"))); + USAGE(i18n("Invalid %1 and %2 parameters: repetition is longer than %3 interval").arg(TQString::fromLatin1("--interval")).arg(TQString::fromLatin1("--repeat")).arg(TQString::fromLatin1("--recurrence"))); repeatCount = count; repeatInterval = interval; } @@ -566,9 +566,9 @@ int KAlarmApp::newInstance() else { if (args->isSet("repeat")) - USAGE(i18n("%1 requires %2").tqarg(TQString::fromLatin1("--repeat")).tqarg(TQString::fromLatin1("--interval"))) + USAGE(i18n("%1 requires %2").arg(TQString::fromLatin1("--repeat")).arg(TQString::fromLatin1("--interval"))) if (args->isSet("until")) - USAGE(i18n("%1 requires %2").tqarg(TQString::fromLatin1("--until")).tqarg(TQString::fromLatin1("--interval"))) + USAGE(i18n("%1 requires %2").arg(TQString::fromLatin1("--until")).arg(TQString::fromLatin1("--interval"))) } TQCString audioFile; @@ -582,11 +582,11 @@ int KAlarmApp::newInstance() { // Play a sound with the alarm if (audioRepeat && args->isSet("play")) - USAGE(i18n("%1 incompatible with %2").tqarg(TQString::fromLatin1("--play")).tqarg(TQString::fromLatin1("--play-repeat"))) + USAGE(i18n("%1 incompatible with %2").arg(TQString::fromLatin1("--play")).arg(TQString::fromLatin1("--play-repeat"))) if (args->isSet("beep")) - USAGE(i18n("%1 incompatible with %2").tqarg(TQString::fromLatin1("--beep")).tqarg(TQString::fromLatin1(audioRepeat ? "--play-repeat" : "--play"))) + USAGE(i18n("%1 incompatible with %2").arg(TQString::fromLatin1("--beep")).arg(TQString::fromLatin1(audioRepeat ? "--play-repeat" : "--play"))) if (args->isSet("speak")) - USAGE(i18n("%1 incompatible with %2").tqarg(TQString::fromLatin1("--speak")).tqarg(TQString::fromLatin1(audioRepeat ? "--play-repeat" : "--play"))) + USAGE(i18n("%1 incompatible with %2").arg(TQString::fromLatin1("--speak")).arg(TQString::fromLatin1(audioRepeat ? "--play-repeat" : "--play"))) audioFile = args->getOption(audioRepeat ? "play-repeat" : "play"); #ifndef WITHOUT_ARTS if (args->isSet("volume")) @@ -594,21 +594,21 @@ int KAlarmApp::newInstance() bool ok; int volumepc = args->getOption("volume").toInt(&ok); if (!ok || volumepc < 0 || volumepc > 100) - USAGE(i18n("Invalid %1 parameter").tqarg(TQString::fromLatin1("--volume"))) + USAGE(i18n("Invalid %1 parameter").arg(TQString::fromLatin1("--volume"))) audioVolume = static_cast<float>(volumepc) / 100; } #endif } #ifndef WITHOUT_ARTS else if (args->isSet("volume")) - USAGE(i18n("%1 requires %2 or %3").tqarg(TQString::fromLatin1("--volume")).tqarg(TQString::fromLatin1("--play")).tqarg(TQString::fromLatin1("--play-repeat"))) + USAGE(i18n("%1 requires %2 or %3").arg(TQString::fromLatin1("--volume")).arg(TQString::fromLatin1("--play")).arg(TQString::fromLatin1("--play-repeat"))) #endif if (args->isSet("speak")) { if (args->isSet("beep")) - USAGE(i18n("%1 incompatible with %2").tqarg(TQString::fromLatin1("--beep")).tqarg(TQString::fromLatin1("--speak"))) + USAGE(i18n("%1 incompatible with %2").arg(TQString::fromLatin1("--beep")).arg(TQString::fromLatin1("--speak"))) if (!mSpeechEnabled) - USAGE(i18n("%1 requires speech synthesis to be configured using KTTSD").tqarg(TQString::fromLatin1("--speak"))) + USAGE(i18n("%1 requires speech synthesis to be configured using KTTSD").arg(TQString::fromLatin1("--speak"))) } int reminderMinutes = 0; bool onceOnly = args->isSet("reminder-once"); @@ -616,18 +616,18 @@ int KAlarmApp::newInstance() { // Issue a reminder alarm in advance of the main alarm if (onceOnly && args->isSet("reminder")) - USAGE(i18n("%1 incompatible with %2").tqarg(TQString::fromLatin1("--reminder")).tqarg(TQString::fromLatin1("--reminder-once"))) + USAGE(i18n("%1 incompatible with %2").arg(TQString::fromLatin1("--reminder")).arg(TQString::fromLatin1("--reminder-once"))) TQString opt = onceOnly ? TQString::fromLatin1("--reminder-once") : TQString::fromLatin1("--reminder"); if (args->isSet("exec")) - USAGE(i18n("%1 incompatible with %2").tqarg(opt).tqarg(TQString::fromLatin1("--exec"))) + USAGE(i18n("%1 incompatible with %2").arg(opt).arg(TQString::fromLatin1("--exec"))) if (args->isSet("mail")) - USAGE(i18n("%1 incompatible with %2").tqarg(opt).tqarg(TQString::fromLatin1("--mail"))) + USAGE(i18n("%1 incompatible with %2").arg(opt).arg(TQString::fromLatin1("--mail"))) KARecurrence::Type recurType; TQString optval = args->getOption(onceOnly ? "reminder-once" : "reminder"); if (!convInterval(args->getOption(onceOnly ? "reminder-once" : "reminder"), recurType, reminderMinutes)) - USAGE(i18n("Invalid %1 parameter").tqarg(opt)) + USAGE(i18n("Invalid %1 parameter").arg(opt)) if (recurType == KARecurrence::MINUTELY && alarmNoTime) - USAGE(i18n("Invalid %1 parameter for date-only alarm").tqarg(opt)) + USAGE(i18n("Invalid %1 parameter for date-only alarm").arg(opt)) } int lateCancel = 0; @@ -636,10 +636,10 @@ int KAlarmApp::newInstance() KARecurrence::Type recurType; bool ok = convInterval(args->getOption("late-cancel"), recurType, lateCancel); if (!ok || lateCancel <= 0) - USAGE(i18n("Invalid %1 parameter").tqarg(TQString::fromLatin1("late-cancel"))) + USAGE(i18n("Invalid %1 parameter").arg(TQString::fromLatin1("late-cancel"))) } else if (args->isSet("auto-close")) - USAGE(i18n("%1 requires %2").tqarg(TQString::fromLatin1("--auto-close")).tqarg(TQString::fromLatin1("--late-cancel"))) + USAGE(i18n("%1 requires %2").arg(TQString::fromLatin1("--auto-close")).arg(TQString::fromLatin1("--late-cancel"))) int flags = KAEvent::DEFAULT_FONT; if (args->isSet("ack-confirm")) @@ -728,7 +728,7 @@ int KAlarmApp::newInstance() #endif if (!usage.isEmpty()) { - usage += i18n(": option(s) only valid with a message/%1/%2").tqarg(TQString::fromLatin1("--file")).tqarg(TQString::fromLatin1("--exec")); + usage += i18n(": option(s) only valid with a message/%1/%2").arg(TQString::fromLatin1("--file")).arg(TQString::fromLatin1("--exec")); break; } @@ -1759,7 +1759,7 @@ ShellProcess* KAlarmApp::doShellCommand(const TQString& command, const KAEvent& // Set up a logging process to write the command's output to. connect(proc, TQT_SIGNAL(receivedStdout(KProcess*,char*,int)), TQT_SLOT(slotCommandOutput(KProcess*,char*,int))); connect(proc, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)), TQT_SLOT(slotCommandOutput(KProcess*,char*,int))); - logproc = new ShellProcess(TQString::fromLatin1("cat >>%1").tqarg(event.logFile())); + logproc = new ShellProcess(TQString::fromLatin1("cat >>%1").arg(event.logFile())); connect(logproc, TQT_SIGNAL(shellExited(ShellProcess*)), TQT_SLOT(slotLogProcExited(ShellProcess*))); logproc->start(KProcess::Stdin); TQCString heading; diff --git a/kalarm/kamail.cpp b/kalarm/kamail.cpp index b50dcef0b..383d03caf 100644 --- a/kalarm/kamail.cpp +++ b/kalarm/kamail.cpp @@ -115,14 +115,14 @@ bool KAMail::send(const KAEvent& event, TQStringList& errmsgs, bool allowNotify) if (identity.isNull()) { kdError(5950) << "KAMail::send(): identity" << event.emailFromId() << "not found" << endl; - errmsgs = errors(i18n("Invalid 'From' email address.\nKMail identity '%1' not found.").tqarg(event.emailFromId())); + errmsgs = errors(i18n("Invalid 'From' email address.\nKMail identity '%1' not found.").arg(event.emailFromId())); return false; } from = identity.fullEmailAddr(); if (from.isEmpty()) { kdError(5950) << "KAMail::send(): identity" << identity.identityName() << "uoid" << identity.uoid() << ": no email address" << endl; - errmsgs = errors(i18n("Invalid 'From' email address.\nEmail identity '%1' has no email address").tqarg(identity.identityName())); + errmsgs = errors(i18n("Invalid 'From' email address.\nEmail identity '%1' has no email address").arg(identity.identityName())); return false; } } @@ -167,7 +167,7 @@ bool KAMail::send(const KAEvent& event, TQStringList& errmsgs, bool allowNotify) command = KStandardDirs::findExe(TQString::fromLatin1("mail")); if (command.isNull()) { - errmsgs = errors(i18n("%1 not found").tqarg(TQString::fromLatin1("sendmail"))); // give up + errmsgs = errors(i18n("%1 not found").arg(TQString::fromLatin1("sendmail"))); // give up return false; } @@ -387,14 +387,14 @@ TQString KAMail::initHeaders(const KAMailData& data, bool dateId) TQString from = data.from; from.replace(TQRegExp("^.*<"), TQString()).replace(TQRegExp(">.*$"), TQString()); message = TQString::fromLatin1(buff); - message += TQString::fromLatin1("\nMessage-Id: <%1.%2.%3>\n").tqarg(timenow).tqarg(tod.tv_usec).tqarg(from); + message += TQString::fromLatin1("\nMessage-Id: <%1.%2.%3>\n").arg(timenow).arg(tod.tv_usec).arg(from); } message += TQString::fromLatin1("From: ") + data.from; message += TQString::fromLatin1("\nTo: ") + data.event.emailAddresses(", "); if (!data.bcc.isEmpty()) message += TQString::fromLatin1("\nBcc: ") + data.bcc; message += TQString::fromLatin1("\nSubject: ") + data.event.emailSubject(); - message += TQString::fromLatin1("\nX-Mailer: %1/" KALARM_VERSION).tqarg(kapp->aboutData()->programName()); + message += TQString::fromLatin1("\nX-Mailer: %1/" KALARM_VERSION).arg(kapp->aboutData()->programName()); return message; } @@ -427,12 +427,12 @@ TQString KAMail::appendBodyAttachments(TQString& message, const KAEvent& event) TQCString boundary; boundary.sprintf("------------_%lu_-%lx=", 2*timenow, timenow); message += TQString::fromLatin1("\nMIME-Version: 1.0"); - message += TQString::fromLatin1("\nContent-Type: multipart/mixed;\n boundary=\"%1\"\n").tqarg(boundary.data()); + message += TQString::fromLatin1("\nContent-Type: multipart/mixed;\n boundary=\"%1\"\n").arg(boundary.data()); if (!event.message().isEmpty()) { // There is a message body - message += TQString::fromLatin1("\n--%1\nContent-Type: text/plain\nContent-Transfer-Encoding: 8bit\n\n").tqarg(boundary.data()); + message += TQString::fromLatin1("\n--%1\nContent-Type: text/plain\nContent-Transfer-Encoding: 8bit\n\n").arg(boundary.data()); message += event.message(); } @@ -446,12 +446,12 @@ TQString KAMail::appendBodyAttachments(TQString& message, const KAEvent& event) KIO::UDSEntry uds; if (!KIO::NetAccess::stat(url, uds, MainWindow::mainMainWindow())) { kdError(5950) << "KAMail::appendBodyAttachments(): not found: " << attachment << endl; - return i18n("Attachment not found:\n%1").tqarg(attachment); + return i18n("Attachment not found:\n%1").arg(attachment); } KFileItem fi(uds, url); if (fi.isDir() || !fi.isReadable()) { kdError(5950) << "KAMail::appendBodyAttachments(): not file/not readable: " << attachment << endl; - return attachError.tqarg(attachment); + return attachError.arg(attachment); } // Check if the attachment is a text file @@ -463,21 +463,21 @@ TQString KAMail::appendBodyAttachments(TQString& message, const KAEvent& event) text = (mimeType == textMimeTypes[i]); } - message += TQString::fromLatin1("\n--%1").tqarg(boundary.data()); - message += TQString::fromLatin1("\nContent-Type: %2; name=\"%3\"").tqarg(mimeType).tqarg(fi.text()); - message += TQString::fromLatin1("\nContent-Transfer-Encoding: %1").tqarg(TQString::fromLatin1(text ? "8bit" : "BASE64")); - message += TQString::fromLatin1("\nContent-Disposition: attachment; filename=\"%4\"\n\n").tqarg(fi.text()); + message += TQString::fromLatin1("\n--%1").arg(boundary.data()); + message += TQString::fromLatin1("\nContent-Type: %2; name=\"%3\"").arg(mimeType).arg(fi.text()); + message += TQString::fromLatin1("\nContent-Transfer-Encoding: %1").arg(TQString::fromLatin1(text ? "8bit" : "BASE64")); + message += TQString::fromLatin1("\nContent-Disposition: attachment; filename=\"%4\"\n\n").arg(fi.text()); // Read the file contents TQString tmpFile; if (!KIO::NetAccess::download(url, tmpFile, MainWindow::mainMainWindow())) { kdError(5950) << "KAMail::appendBodyAttachments(): load failure: " << attachment << endl; - return attachError.tqarg(attachment); + return attachError.arg(attachment); } TQFile file(tmpFile); if (!file.open(IO_ReadOnly) ) { kdDebug(5950) << "KAMail::appendBodyAttachments() tmp load error: " << attachment << endl; - return attachError.tqarg(attachment); + return attachError.arg(attachment); } TQIODevice::Offset size = file.size(); char* contents = new char [size + 1]; @@ -509,9 +509,9 @@ TQString KAMail::appendBodyAttachments(TQString& message, const KAEvent& event) } delete[] contents; if (atterror) - return attachError.tqarg(attachment); + return attachError.arg(attachment); } - message += TQString::fromLatin1("\n--%1--\n.\n").tqarg(boundary.data()); + message += TQString::fromLatin1("\n--%1--\n.\n").arg(boundary.data()); } return TQString(); } @@ -922,10 +922,10 @@ char* KAMail::base64Encode(const char* in, TQIODevice::Offset size, TQIODevice:: TQStringList KAMail::errors(const TQString& err, bool sendfail) { TQString error1 = sendfail ? i18n("Failed to send email") - : i18n("Error copying sent email to KMail %1 folder").tqarg(i18n_sent_mail()); + : i18n("Error copying sent email to KMail %1 folder").arg(i18n_sent_mail()); if (err.isEmpty()) return TQStringList(error1); - TQStringList errs(TQString::fromLatin1("%1:").tqarg(error1)); + TQStringList errs(TQString::fromLatin1("%1:").arg(error1)); errs += err; return errs; } diff --git a/kalarm/lib/dateedit.cpp b/kalarm/lib/dateedit.cpp index 6bc51aec5..2fef25de5 100644 --- a/kalarm/lib/dateedit.cpp +++ b/kalarm/lib/dateedit.cpp @@ -81,7 +81,7 @@ void DateEdit::pastLimitMessage(const TQDate& limit, const TQString& error, cons errString = i18n("today"); else errString = KGlobal::locale()->formatDate(limit, true); - errString = defaultError.tqarg(errString); + errString = defaultError.arg(errString); } KMessageBox::sorry(this, errString); } diff --git a/kalarm/lib/shellprocess.cpp b/kalarm/lib/shellprocess.cpp index a8c8228c3..b3df822e8 100644 --- a/kalarm/lib/shellprocess.cpp +++ b/kalarm/lib/shellprocess.cpp @@ -174,8 +174,8 @@ const TQCString& ShellProcess::shellPath() struct stat fileinfo; if (stat(envshell.data(), &fileinfo) != -1 // ensure file exists && !S_ISDIR(fileinfo.st_mode) // and it's not a directory - && !S_ISCHR(fileinfo.st_mode) // and it's not a character tqdevice - && !S_ISBLK(fileinfo.st_mode) // and it's not a block tqdevice + && !S_ISCHR(fileinfo.st_mode) // and it's not a character device + && !S_ISBLK(fileinfo.st_mode) // and it's not a block device #ifdef S_ISSOCK && !S_ISSOCK(fileinfo.st_mode) // and it's not a socket #endif diff --git a/kalarm/lib/spinbox2.h b/kalarm/lib/spinbox2.h index 292cd2a85..188cba526 100644 --- a/kalarm/lib/spinbox2.h +++ b/kalarm/lib/spinbox2.h @@ -115,7 +115,7 @@ class SpinBox2 : public TQFrame */ bool wrapping() const { return mSpinbox->wrapping(); } - /** Set the text tqalignment of the widget */ + /** Set the text alignment of the widget */ void setAlignment(int a) { mSpinbox->setAlignment(a); } /** Sets the button symbols to use (arrows or plus/minus). */ virtual void setButtonSymbols(TQSpinBox::ButtonSymbols); @@ -149,13 +149,13 @@ class SpinBox2 : public TQFrame /** Returns the specified value clamped to the range of the spin box. */ int bound(int val) const; - /** Returns the tqgeometry of the right-hand "up" button. */ + /** Returns the geometry of the right-hand "up" button. */ TQRect upRect() const { return mSpinbox->upRect(); } - /** Returns the tqgeometry of the right-hand "down" button. */ + /** Returns the geometry of the right-hand "down" button. */ TQRect downRect() const { return mSpinbox->downRect(); } - /** Returns the tqgeometry of the left-hand "up" button. */ + /** Returns the geometry of the left-hand "up" button. */ TQRect up2Rect() const; - /** Returns the tqgeometry of the left-hand "down" button. */ + /** Returns the geometry of the left-hand "down" button. */ TQRect down2Rect() const; /** Returns the unshifted step increment for the right-hand spin buttons, diff --git a/kalarm/mainwindow.cpp b/kalarm/mainwindow.cpp index d6597fe20..e9445d43a 100644 --- a/kalarm/mainwindow.cpp +++ b/kalarm/mainwindow.cpp @@ -294,7 +294,7 @@ void MainWindow::show() // Show error message now that the main window has been displayed. // Waiting until now lets the user easily associate the message with // the main window which is faulty. - KMessageBox::error(this, i18n("Failure to create menus\n(perhaps %1 missing or corrupted)").tqarg(TQString::fromLatin1(UI_FILE))); + KMessageBox::error(this, i18n("Failure to create menus\n(perhaps %1 missing or corrupted)").arg(TQString::fromLatin1(UI_FILE))); mMenuError = false; } } @@ -1023,8 +1023,8 @@ void MainWindow::initUndoMenu(KPopupMenu* menu, Undo::Type type) TQString actText = Undo::actionText(type, id); TQString descrip = Undo::description(type, id); TQString text = descrip.isEmpty() - ? i18n("Undo/Redo [action]", "%1 %2").tqarg(action).tqarg(actText) - : i18n("Undo [action]: message", "%1 %2: %3").tqarg(action).tqarg(actText).tqarg(descrip); + ? i18n("Undo/Redo [action]", "%1 %2").arg(action).arg(actText) + : i18n("Undo [action]: message", "%1 %2: %3").arg(action).arg(actText).arg(descrip); menu->insertItem(text, id); } } @@ -1043,7 +1043,7 @@ void MainWindow::slotUndoStatus(const TQString& undo, const TQString& redo) else { mActionUndo->setEnabled(true); - mActionUndo->setText(TQString("%1 %2").tqarg(undoText).tqarg(undo)); + mActionUndo->setText(TQString("%1 %2").arg(undoText).arg(undo)); } if (redo.isNull()) { @@ -1053,7 +1053,7 @@ void MainWindow::slotUndoStatus(const TQString& undo, const TQString& redo) else { mActionRedo->setEnabled(true); - mActionRedo->setText(TQString("%1 %2").tqarg(redoText).tqarg(redo)); + mActionRedo->setText(TQString("%1 %2").arg(redoText).arg(redo)); } } diff --git a/kalarm/messagewin.cpp b/kalarm/messagewin.cpp index 4849e5334..c1109b9d1 100644 --- a/kalarm/messagewin.cpp +++ b/kalarm/messagewin.cpp @@ -650,7 +650,7 @@ void MessageWin::setRemainingTextMinute() else if (mins % 60 == 1) text = i18n("in 1 hour 1 minute's time", "in %n hours 1 minute's time", mins/60); else - text = i18n("in 1 hour %1 minutes' time", "in %n hours %1 minutes' time", mins/60).tqarg(mins%60); + text = i18n("in 1 hour %1 minutes' time", "in %n hours %1 minutes' time", mins/60).arg(mins%60); mRemainingText->setText(text); } @@ -859,7 +859,7 @@ void MessageWin::slotPlayAudio() kdError(5950) << "MessageWin::playAudio(): Open failure: " << mAudioFile << endl; if (!haveErrorMessage(ErrMsg_AudioFile)) { - KMessageBox::error(this, i18n("Cannot open audio file:\n%1").tqarg(mAudioFile)); + KMessageBox::error(this, i18n("Cannot open audio file:\n%1").arg(mAudioFile)); clearErrorMessage(ErrMsg_AudioFile); } return; @@ -882,7 +882,7 @@ void MessageWin::slotPlayAudio() kdWarning(5950) << "Unable to set master volume (KMix: " << mKMixError << ")\n"; if (!haveErrorMessage(ErrMsg_Volume)) { - KMessageBox::information(this, i18n("Unable to set master volume\n(Error accessing KMix:\n%1)").tqarg(mKMixError), + KMessageBox::information(this, i18n("Unable to set master volume\n(Error accessing KMix:\n%1)").arg(mKMixError), TQString(), TQString::fromLatin1("KMixError")); clearErrorMessage(ErrMsg_Volume); } @@ -1207,7 +1207,7 @@ TQSize MessageWin::sizeHint() const if (!mWinModule) mWinModule = new KWinModule(0, KWinModule::INFO_DESKTOP); TQSize frame = frameGeometry().size(); - TQSize contents = tqgeometry().size(); + TQSize contents = geometry().size(); TQSize desktop = mWinModule->workArea().size(); TQSize maxSize(desktop.width() - (frame.width() - contents.width()), desktop.height() - (frame.height() - contents.height())); @@ -1246,10 +1246,10 @@ void MessageWin::showEvent(TQShowEvent* se) * To achieve this, move the window so that the OK button is as far away * from the cursor as possible. If the buttons are still too close to the * cursor, disable the buttons for a short time. - * N.B. This can't be done in show(), since the tqgeometry of the window + * N.B. This can't be done in show(), since the geometry of the window * is not known until it is displayed. Unfortunately by moving the * window in showEvent(), a flicker is unavoidable. - * See the TQt documentation on window tqgeometry for more details. + * See the TQt documentation on window geometry for more details. */ // PROBLEM: The frame size is not known yet! @@ -1267,7 +1267,7 @@ void MessageWin::showEvent(TQShowEvent* se) desk &= dw->screenGeometry(dw->screenNumber(cursor)); TQRect frame = frameGeometry(); - TQRect rect = tqgeometry(); + TQRect rect = geometry(); // Find the offsets from the outside of the frame to the edges of the OK button TQRect button(mOkButton->mapToParent(TQPoint(0, 0)), mOkButton->mapToParent(mOkButton->rect().bottomRight())); int buttonLeft = button.left() + rect.left() - frame.left(); @@ -1282,7 +1282,7 @@ void MessageWin::showEvent(TQShowEvent* se) // Find the enclosing rectangle for the new button positions // and check if the cursor is too near - TQRect buttons = mOkButton->tqgeometry().unite(mKAlarmButton->tqgeometry()); + TQRect buttons = mOkButton->geometry().unite(mKAlarmButton->geometry()); buttons.moveBy(rect.left() + x - frame.left(), rect.top() + y - frame.top()); int minDistance = proximityMultiple * mOkButton->height(); if ((abs(cursor.x() - buttons.left()) < minDistance diff --git a/kalarm/prefdlg.cpp b/kalarm/prefdlg.cpp index e259f3e56..3cde076b7 100644 --- a/kalarm/prefdlg.cpp +++ b/kalarm/prefdlg.cpp @@ -250,8 +250,8 @@ void PrefsTabBase::apply(bool syncToDisc) MiscPrefTab::MiscPrefTab(TQVBox* frame) : PrefsTabBase(frame) { - // Get tqalignment to use in TQGridLayout (AlignAuto doesn't work correctly there) - int tqalignment = TQApplication::reverseLayout() ? TQt::AlignRight : TQt::AlignLeft; + // Get alignment to use in TQGridLayout (AlignAuto doesn't work correctly there) + int alignment = TQApplication::reverseLayout() ? TQt::AlignRight : TQt::AlignLeft; TQGroupBox* group = new TQButtonGroup(i18n("Run Mode"), mPage, "modeGroup"); TQGridLayout* grid = new TQGridLayout(group, 6, 2, KDialog::marginHint(), KDialog::spacingHint()); @@ -269,7 +269,7 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame) "Notes:\n" "1. Alarms are displayed even when KAlarm is not running, since alarm monitoring is done by the alarm daemon.\n" "2. With this option selected, the system tray icon can be displayed or hidden independently of KAlarm.")); - grid->addMultiCellWidget(mRunOnDemand, 1, 1, 0, 2, tqalignment); + grid->addMultiCellWidget(mRunOnDemand, 1, 1, 0, 2, alignment); // Run-in-system-tray radio button mRunInSystemTray = new TQRadioButton(i18n("Run continuously in system &tray"), group, "runTray"); @@ -281,7 +281,7 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame) "1. With this option selected, closing the system tray icon will quit KAlarm.\n" "2. You do not need to select this option in order for alarms to be displayed, since alarm monitoring is done by the alarm daemon." " Running in the system tray simply provides easy access and a status indication.")); - grid->addMultiCellWidget(mRunInSystemTray, 2, 2, 0, 2, tqalignment); + grid->addMultiCellWidget(mRunInSystemTray, 2, 2, 0, 2, alignment); // Run continuously options mDisableAlarmsIfStopped = new TQCheckBox(i18n("Disa&ble alarms while not running"), group, "disableAl"); @@ -289,19 +289,19 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame) connect(mDisableAlarmsIfStopped, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotDisableIfStoppedToggled(bool))); TQWhatsThis::add(mDisableAlarmsIfStopped, i18n("Check to disable alarms whenever KAlarm is not running. Alarms will only appear while the system tray icon is visible.")); - grid->addMultiCellWidget(mDisableAlarmsIfStopped, 3, 3, 1, 2, tqalignment); + grid->addMultiCellWidget(mDisableAlarmsIfStopped, 3, 3, 1, 2, alignment); mQuitWarn = new TQCheckBox(i18n("Warn before &quitting"), group, "disableAl"); mQuitWarn->setFixedSize(mQuitWarn->sizeHint()); TQWhatsThis::add(mQuitWarn, i18n("Check to display a warning prompt before quitting KAlarm.")); - grid->addWidget(mQuitWarn, 4, 2, tqalignment); + grid->addWidget(mQuitWarn, 4, 2, alignment); mAutostartTrayIcon = new TQCheckBox(i18n("Autostart at &login"), group, "autoTray"); #ifdef AUTOSTART_BY_KALARMD connect(mAutostartTrayIcon, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotAutostartToggled(bool))); #endif - grid->addMultiCellWidget(mAutostartTrayIcon, 5, 5, 0, 2, tqalignment); + grid->addMultiCellWidget(mAutostartTrayIcon, 5, 5, 0, 2, alignment); // Autostart alarm daemon mAutostartDaemon = new TQCheckBox(i18n("Start alarm monitoring at lo&gin"), group, "startDaemon"); @@ -310,8 +310,8 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame) TQWhatsThis::add(mAutostartDaemon, i18n("Automatically start alarm monitoring whenever you start KDE, by running the alarm daemon (%1).\n\n" "This option should always be checked unless you intend to discontinue use of KAlarm.") - .tqarg(TQString::fromLatin1(DAEMON_APP_NAME))); - grid->addMultiCellWidget(mAutostartDaemon, 6, 6, 0, 2, tqalignment); + .arg(TQString::fromLatin1(DAEMON_APP_NAME))); + grid->addMultiCellWidget(mAutostartDaemon, 6, 6, 0, 2, alignment); group->setFixedHeight(group->sizeHint().height()); @@ -325,7 +325,7 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame) label->setBuddy(mStartOfDay); static const TQString startOfDayText = i18n("The earliest time of day at which a date-only alarm (i.e. " "an alarm with \"any time\" specified) will be triggered."); - TQWhatsThis::add(box, TQString("%1\n\n%2").tqarg(startOfDayText).tqarg(TimeSpinBox::shiftWhatsThis())); + TQWhatsThis::add(box, TQString("%1\n\n%2").arg(startOfDayText).arg(TimeSpinBox::shiftWhatsThis())); itemBox->setStretchFactor(new TQWidget(itemBox), 1); // left adjust the controls itemBox->setFixedHeight(box->sizeHint().height()); @@ -349,7 +349,7 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame) connect(mKeepExpired, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotExpiredToggled(bool))); TQWhatsThis::add(mKeepExpired, i18n("Check to store alarms after expiry or deletion (except deleted alarms which were never triggered).")); - grid->addMultiCellWidget(mKeepExpired, 1, 1, 0, 1, tqalignment); + grid->addMultiCellWidget(mKeepExpired, 1, 1, 0, 1, alignment); box = new TQHBox(group); box->setSpacing(KDialog::spacingHint()); @@ -365,14 +365,14 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame) mPurgeAfterLabel->setBuddy(mPurgeAfter); TQWhatsThis::add(box, i18n("Uncheck to store expired alarms indefinitely. Check to enter how long expired alarms should be stored.")); - grid->addWidget(box, 2, 1, tqalignment); + grid->addWidget(box, 2, 1, alignment); mClearExpired = new TQPushButton(i18n("Clear Expired Alar&ms"), group); mClearExpired->setFixedSize(mClearExpired->sizeHint()); connect(mClearExpired, TQT_SIGNAL(clicked()), TQT_SLOT(slotClearExpired())); TQWhatsThis::add(mClearExpired, i18n("Delete all existing expired alarms.")); - grid->addWidget(mClearExpired, 3, 1, tqalignment); + grid->addWidget(mClearExpired, 3, 1, alignment); group->setFixedHeight(group->sizeHint().height()); // Terminal window to use for command alarms @@ -404,7 +404,7 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame) cmd.replace("%w", "<command; sleep>"); cmd.replace("%C", "[command]"); cmd.replace("%W", "[command; sleep]"); - TQWhatsThis::add(radio, whatsThis.tqarg(cmd)); + TQWhatsThis::add(radio, whatsThis.arg(cmd)); grid->addWidget(radio, (row = index/3 + 1), index % 3, TQt::AlignAuto); ++index; } @@ -470,7 +470,7 @@ void MiscPrefTab::apply(bool syncToDisc) if (KStandardDirs::findExe(cmd).isEmpty()) { mXtermCommand->setFocus(); - if (KMessageBox::warningContinueCancel(this, i18n("Command to invoke terminal window not found:\n%1").tqarg(cmd)) + if (KMessageBox::warningContinueCancel(this, i18n("Command to invoke terminal window not found:\n%1").arg(cmd)) != KMessageBox::Continue) return; } @@ -618,10 +618,10 @@ EmailPrefTab::EmailPrefTab(TQVBox* frame) "your system is configured to use sendmail or a sendmail compatible mail transport agent.")); box = new TQHBox(mPage); // this is to allow left adjustment - mEmailCopyToKMail = new TQCheckBox(i18n("Co&py sent emails into KMail's %1 folder").tqarg(KAMail::i18n_sent_mail()), box); + mEmailCopyToKMail = new TQCheckBox(i18n("Co&py sent emails into KMail's %1 folder").arg(KAMail::i18n_sent_mail()), box); mEmailCopyToKMail->setFixedSize(mEmailCopyToKMail->sizeHint()); TQWhatsThis::add(mEmailCopyToKMail, - i18n("After sending an email, store a copy in KMail's %1 folder").tqarg(KAMail::i18n_sent_mail())); + i18n("After sending an email, store a copy in KMail's %1 folder").arg(KAMail::i18n_sent_mail())); box->setStretchFactor(new TQWidget(box), 1); // left adjust the controls box->setFixedHeight(box->sizeHint().height()); @@ -793,18 +793,18 @@ TQString EmailPrefTab::validate() TQString EmailPrefTab::validateAddr(ButtonGroup* group, TQLineEdit* addr, const TQString& msg) { - TQString errmsg = i18n("%1\nAre you sure you want to save your changes?").tqarg(msg); + TQString errmsg = i18n("%1\nAre you sure you want to save your changes?").arg(msg); switch (group->selectedId()) { case Preferences::MAIL_FROM_CONTROL_CENTRE: if (!KAMail::controlCentreAddress().isEmpty()) return TQString(); - errmsg = i18n("No email address is currently set in the KDE Control Center. %1").tqarg(errmsg); + errmsg = i18n("No email address is currently set in the KDE Control Center. %1").arg(errmsg); break; case Preferences::MAIL_FROM_KMAIL: if (KAMail::identitiesExist()) return TQString(); - errmsg = i18n("No KMail identities currently exist. %1").tqarg(errmsg); + errmsg = i18n("No KMail identities currently exist. %1").arg(errmsg); break; case Preferences::MAIL_FROM_ADDR: if (!addr->text().stripWhiteSpace().isEmpty()) @@ -887,9 +887,9 @@ void FontColourPrefTab::setDefaults() EditPrefTab::EditPrefTab(TQVBox* frame) : PrefsTabBase(frame) { - // Get tqalignment to use in TQLabel::setAlignment(tqalignment | TQt::WordBreak) + // Get alignment to use in TQLabel::setAlignment(alignment | TQt::WordBreak) // (AlignAuto doesn't work correctly there) - int tqalignment = TQApplication::reverseLayout() ? TQt::AlignRight : TQt::AlignLeft; + int alignment = TQApplication::reverseLayout() ? TQt::AlignRight : TQt::AlignLeft; int groupTopMargin = fontMetrics().lineSpacing()/2; TQString defsetting = i18n("The default setting for \"%1\" in the alarm edit dialog."); @@ -902,12 +902,12 @@ EditPrefTab::EditPrefTab(TQVBox* frame) mConfirmAck = new TQCheckBox(EditAlarmDlg::i18n_k_ConfirmAck(), group, "defConfAck"); mConfirmAck->setMinimumSize(mConfirmAck->sizeHint()); - TQWhatsThis::add(mConfirmAck, defsetting.tqarg(EditAlarmDlg::i18n_ConfirmAck())); + TQWhatsThis::add(mConfirmAck, defsetting.arg(EditAlarmDlg::i18n_ConfirmAck())); tqlayout->addWidget(mConfirmAck, 0, TQt::AlignAuto); mAutoClose = new TQCheckBox(LateCancelSelector::i18n_i_AutoCloseWinLC(), group, "defAutoClose"); mAutoClose->setMinimumSize(mAutoClose->sizeHint()); - TQWhatsThis::add(mAutoClose, defsetting.tqarg(LateCancelSelector::i18n_AutoCloseWin())); + TQWhatsThis::add(mAutoClose, defsetting.arg(LateCancelSelector::i18n_AutoCloseWin())); tqlayout->addWidget(mAutoClose, 0, TQt::AlignAuto); TQHBox* box = new TQHBox(group); @@ -942,14 +942,14 @@ EditPrefTab::EditPrefTab(TQVBox* frame) if (theApp()->speechEnabled()) mSound->insertItem(SoundPicker::i18n_Speak()); // index 3 mSound->setMinimumSize(mSound->sizeHint()); - TQWhatsThis::add(mSound, defsetting.tqarg(SoundPicker::i18n_Sound())); + TQWhatsThis::add(mSound, defsetting.arg(SoundPicker::i18n_Sound())); htqlayout->addWidget(mSound); htqlayout->addStretch(1); #ifndef WITHOUT_ARTS mSoundRepeat = new TQCheckBox(i18n("Repea&t sound file"), bgroup, "defRepeatSound"); mSoundRepeat->setMinimumSize(mSoundRepeat->sizeHint()); - TQWhatsThis::add(mSoundRepeat, i18n("sound file \"Repeat\" checkbox", "The default setting for sound file \"%1\" in the alarm edit dialog.").tqarg(SoundDlg::i18n_Repeat())); + TQWhatsThis::add(mSoundRepeat, i18n("sound file \"Repeat\" checkbox", "The default setting for sound file \"%1\" in the alarm edit dialog.").arg(SoundDlg::i18n_Repeat())); htqlayout->addWidget(mSoundRepeat); #endif @@ -978,13 +978,13 @@ EditPrefTab::EditPrefTab(TQVBox* frame) mCmdScript = new TQCheckBox(EditAlarmDlg::i18n_p_EnterScript(), group, "defCmdScript"); mCmdScript->setMinimumSize(mCmdScript->sizeHint()); - TQWhatsThis::add(mCmdScript, defsetting.tqarg(EditAlarmDlg::i18n_EnterScript())); + TQWhatsThis::add(mCmdScript, defsetting.arg(EditAlarmDlg::i18n_EnterScript())); tqlayout->addWidget(mCmdScript); tqlayout->addStretch(); mCmdXterm = new TQCheckBox(EditAlarmDlg::i18n_w_ExecInTermWindow(), group, "defCmdXterm"); mCmdXterm->setMinimumSize(mCmdXterm->sizeHint()); - TQWhatsThis::add(mCmdXterm, defsetting.tqarg(EditAlarmDlg::i18n_ExecInTermWindow())); + TQWhatsThis::add(mCmdXterm, defsetting.arg(EditAlarmDlg::i18n_ExecInTermWindow())); tqlayout->addWidget(mCmdXterm); // EMAIL ALARMS @@ -995,21 +995,21 @@ EditPrefTab::EditPrefTab(TQVBox* frame) // BCC email to sender mEmailBcc = new TQCheckBox(EditAlarmDlg::i18n_e_CopyEmailToSelf(), group, "defEmailBcc"); mEmailBcc->setMinimumSize(mEmailBcc->sizeHint()); - TQWhatsThis::add(mEmailBcc, defsetting.tqarg(EditAlarmDlg::i18n_CopyEmailToSelf())); + TQWhatsThis::add(mEmailBcc, defsetting.arg(EditAlarmDlg::i18n_CopyEmailToSelf())); tqlayout->addWidget(mEmailBcc, 0, TQt::AlignAuto); // MISCELLANEOUS // Show in KOrganizer mCopyToKOrganizer = new TQCheckBox(EditAlarmDlg::i18n_g_ShowInKOrganizer(), mPage, "defShowKorg"); mCopyToKOrganizer->setMinimumSize(mCopyToKOrganizer->sizeHint()); - TQWhatsThis::add(mCopyToKOrganizer, defsetting.tqarg(EditAlarmDlg::i18n_ShowInKOrganizer())); + TQWhatsThis::add(mCopyToKOrganizer, defsetting.arg(EditAlarmDlg::i18n_ShowInKOrganizer())); // Late cancellation box = new TQHBox(mPage); box->setSpacing(KDialog::spacingHint()); mLateCancel = new TQCheckBox(LateCancelSelector::i18n_n_CancelIfLate(), box, "defCancelLate"); mLateCancel->setMinimumSize(mLateCancel->sizeHint()); - TQWhatsThis::add(mLateCancel, defsetting.tqarg(LateCancelSelector::i18n_CancelIfLate())); + TQWhatsThis::add(mLateCancel, defsetting.arg(LateCancelSelector::i18n_CancelIfLate())); box->setStretchFactor(new TQWidget(box), 1); // left adjust the control // Recurrence @@ -1035,7 +1035,7 @@ EditPrefTab::EditPrefTab(TQVBox* frame) TQVBox* vbox = new TQVBox(mPage); // this is to control the TQWhatsThis text display area vbox->setSpacing(KDialog::spacingHint()); label = new TQLabel(i18n("In non-leap years, repeat yearly February 29th alarms on:"), vbox); - label->setAlignment(tqalignment | TQt::WordBreak); + label->setAlignment(alignment | TQt::WordBreak); itemBox = new TQHBox(vbox); itemBox->setSpacing(2*KDialog::spacingHint()); mFeb29 = new TQButtonGroup(itemBox); @@ -1179,7 +1179,7 @@ TQString EditPrefTab::validate() if (mSound->currentItem() == SoundPicker::PLAY_FILE && mSoundFile->text().isEmpty()) { mSoundFile->setFocus(); - return i18n("You must enter a sound file when %1 is selected as the default sound type").tqarg(SoundPicker::i18n_File());; + return i18n("You must enter a sound file when %1 is selected as the default sound type").arg(SoundPicker::i18n_File());; } return TQString(); } diff --git a/kalarm/recurrenceedit.cpp b/kalarm/recurrenceedit.cpp index 87fd43c8c..0e8727047 100644 --- a/kalarm/recurrenceedit.cpp +++ b/kalarm/recurrenceedit.cpp @@ -268,7 +268,7 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name mEndTimeEdit->setFixedSize(mEndTimeEdit->sizeHint()); mEndTimeEdit->setReadOnly(mReadOnly); static const TQString lastTimeText = i18n("Enter the last time to repeat the alarm."); - TQWhatsThis::add(mEndTimeEdit, TQString("%1\n\n%2").tqarg(lastTimeText).tqarg(TimeSpinBox::shiftWhatsThis())); + TQWhatsThis::add(mEndTimeEdit, TQString("%1\n\n%2").arg(lastTimeText).arg(TimeSpinBox::shiftWhatsThis())); mEndAnyTimeCheckBox = new CheckBox(i18n("Any time"), mRangeButtonGroup); mEndAnyTimeCheckBox->setFixedSize(mEndAnyTimeCheckBox->sizeHint()); mEndAnyTimeCheckBox->setReadOnly(mReadOnly); diff --git a/kalarm/sounddlg.cpp b/kalarm/sounddlg.cpp index d1cd97887..77894b7a7 100644 --- a/kalarm/sounddlg.cpp +++ b/kalarm/sounddlg.cpp @@ -119,8 +119,8 @@ SoundDlg::SoundDlg(const TQString& file, float volume, float fadeVolume, int fad int indentWidth = 3 * KDialog::spacingHint(); grid->addColSpacing(0, indentWidth); grid->addColSpacing(1, indentWidth); - // Get tqalignment to use in TQGridLayout (AlignAuto doesn't work correctly there) - int tqalignment = TQApplication::reverseLayout() ? TQt::AlignRight : TQt::AlignLeft; + // Get alignment to use in TQGridLayout (AlignAuto doesn't work correctly there) + int alignment = TQApplication::reverseLayout() ? TQt::AlignRight : TQt::AlignLeft; // 'Set volume' checkbox box = new TQHBox(group); @@ -146,12 +146,12 @@ SoundDlg::SoundDlg(const TQString& file, float volume, float fadeVolume, int fad connect(mFadeCheckbox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotFadeToggled(bool))); TQWhatsThis::add(mFadeCheckbox, i18n("Select to fade the volume when the sound file first starts to play.")); - grid->addMultiCellWidget(mFadeCheckbox, 2, 2, 1, 2, tqalignment); + grid->addMultiCellWidget(mFadeCheckbox, 2, 2, 1, 2, alignment); // Fade time mFadeBox = new TQHBox(group); mFadeBox->setSpacing(spacingHint()); - grid->addWidget(mFadeBox, 3, 2, tqalignment); + grid->addWidget(mFadeBox, 3, 2, alignment); TQLabel* label = new TQLabel(i18n("Time period over which to fade the sound", "Fade time:"), mFadeBox); label->setFixedSize(label->sizeHint()); mFadeTime = new SpinBox(1, 999, 1, mFadeBox); @@ -299,7 +299,7 @@ void SoundDlg::playSound() || !KIO::NetAccess::download(url, mLocalAudioFile, mmw)) { kdError(5950) << "SoundDlg::playAudio(): Open failure: " << mFileName << endl; - KMessageBox::error(this, i18n("Cannot open audio file:\n%1").tqarg(mFileName)); + KMessageBox::error(this, i18n("Cannot open audio file:\n%1").arg(mFileName)); return; } mPlayTimer = new TQTimer(this); diff --git a/kalarm/soundpicker.cpp b/kalarm/soundpicker.cpp index 485f0fdb1..3a3d17606 100644 --- a/kalarm/soundpicker.cpp +++ b/kalarm/soundpicker.cpp @@ -114,9 +114,9 @@ void SoundPicker::showSpeak(bool show) if (show == mSpeakShowing) return; // no change TQString whatsThis = "<p>" + i18n("Choose a sound to play when the message is displayed.") - + "<br>" + i18n("%1: the message is displayed silently.").tqarg("<b>" + i18n_None() + "</b>") - + "<br>" + i18n("%1: a simple beep is sounded.").tqarg("<b>" + i18n_Beep() + "</b>") - + "<br>" + i18n("%1: an audio file is played. You will be prompted to choose the file and set play options.").tqarg("<b>" + i18n_File() + "</b>"); + + "<br>" + i18n("%1: the message is displayed silently.").arg("<b>" + i18n_None() + "</b>") + + "<br>" + i18n("%1: a simple beep is sounded.").arg("<b>" + i18n_Beep() + "</b>") + + "<br>" + i18n("%1: an audio file is played. You will be prompted to choose the file and set play options.").arg("<b>" + i18n_File() + "</b>"); if (!show && mTypeCombo->currentItem() == SPEAK) mTypeCombo->setCurrentItem(NONE); if (mTypeCombo->count() == SPEAK+1) @@ -124,7 +124,7 @@ void SoundPicker::showSpeak(bool show) if (show) { mTypeCombo->insertItem(i18n_Speak()); - whatsThis += "<br>" + i18n("%1: the message text is spoken.").tqarg("<b>" + i18n_Speak() + "</b>") + "</p>"; + whatsThis += "<br>" + i18n("%1: the message text is spoken.").arg("<b>" + i18n_Speak() + "</b>") + "</p>"; } TQWhatsThis::add(mTypeBox, whatsThis + "</p>"); mSpeakShowing = show; @@ -283,7 +283,7 @@ TQString SoundPicker::browseFile(TQString& defaultDir, const TQString& initialFi defaultDir = kdeSoundDir; } #ifdef WITHOUT_ARTS - TQString filter = TQString::fromLatin1("*.wav *.mp3 *.ogg|%1\n*|%2").tqarg(i18n("Sound Files")).tqarg(i18n("All Files")); + TQString filter = TQString::fromLatin1("*.wav *.mp3 *.ogg|%1\n*|%2").arg(i18n("Sound Files")).arg(i18n("All Files")); #else TQStringList filters = KDE::PlayObjectFactory::mimeTypes(); TQString filter = filters.join(" "); diff --git a/kalarm/traywindow.cpp b/kalarm/traywindow.cpp index aac2806cd..81af39266 100644 --- a/kalarm/traywindow.cpp +++ b/kalarm/traywindow.cpp @@ -266,9 +266,9 @@ void TrayWindow::tooltipAlarmText(TQString& text) const minutes[0] = (mins%60) / 10 + '0'; minutes[1] = (mins%60) % 10 + '0'; if (Preferences::showTooltipAlarmTime()) - item.text += i18n("prefix + hours:minutes", "(%1%2:%3)").tqarg(prefix).tqarg(mins/60).tqarg(minutes); + item.text += i18n("prefix + hours:minutes", "(%1%2:%3)").arg(prefix).arg(mins/60).arg(minutes); else - item.text += i18n("prefix + hours:minutes", "%1%2:%3").tqarg(prefix).tqarg(mins/60).tqarg(minutes); + item.text += i18n("prefix + hours:minutes", "%1%2:%3").arg(prefix).arg(mins/60).arg(minutes); item.text += ' '; space = true; } @@ -326,13 +326,13 @@ bool TrayWindow::inSystemTray() const #ifdef HAVE_X11_HEADERS Window xParent; // receives parent window Window root; - Window* tqchildren = 0; - unsigned int ntqchildren; + Window* children = 0; + unsigned int nchildren; // Find the X parent window of the widget. This is not the same as the TQt parent widget. - if (!XQueryTree(qt_xdisplay(), winId(), &root, &xParent, &tqchildren, &ntqchildren)) + if (!XQueryTree(qt_xdisplay(), winId(), &root, &xParent, &children, &nchildren)) return true; // error determining its parent X window - if (tqchildren) - XFree(tqchildren); + if (children) + XFree(children); // If it is in the system tray, the system tray window will be its X parent. // Otherwise, the root window will be its X parent. @@ -353,7 +353,7 @@ void TrayTooltip::maybeTip(const TQPoint&) if (Daemon::monitoringAlarms()) text = kapp->aboutData()->programName(); else - text = i18n("%1 - disabled").tqarg(kapp->aboutData()->programName()); + text = i18n("%1 - disabled").arg(kapp->aboutData()->programName()); kdDebug(5950) << "TrayTooltip::maybeTip(): " << text << endl; if (Preferences::tooltipAlarmCount()) parent->tooltipAlarmText(text); diff --git a/kalarm/undo.cpp b/kalarm/undo.cpp index ead90e004..b2703d0f7 100644 --- a/kalarm/undo.cpp +++ b/kalarm/undo.cpp @@ -357,7 +357,7 @@ bool Undo::undo(Undo::Iterator it, Undo::Type type, TQWidget* parent, const TQSt case UndoItem::ERR_PROG: err = i18n("Program error"); break; default: err = i18n("Unknown error"); break; } - KMessageBox::sorry(parent, i18n("Undo-action: message", "%1: %2").tqarg(action).tqarg(err)); + KMessageBox::sorry(parent, i18n("Undo-action: message", "%1: %2").arg(action).arg(err)); return false; } diff --git a/kandy/RELEASENOTES b/kandy/RELEASENOTES index 8527e34e4..f40c0f818 100644 --- a/kandy/RELEASENOTES +++ b/kandy/RELEASENOTES @@ -1,7 +1,7 @@ Kandy 0.5.1 (18.11.2004) ------------------------ -+ Support of user-defined baud rates via setting in serial tqdevice configuration ++ Support of user-defined baud rates via setting in serial device configuration dialog. + Full support for SIM phone books starting with an entry != 1 and having an @@ -65,7 +65,7 @@ Kandy 0.5 (16.11.2004) + The GUI is heavily restructured and simplified. -+ All the improvements of Kandy 0.5 were tested with the following tqdevices: ++ All the improvements of Kandy 0.5 were tested with the following devices: + Phones: - Siemens ME45 - Siemens C65 diff --git a/kandy/configure.in.in b/kandy/configure.in.in index 7d1a00af0..c21c2e307 100644 --- a/kandy/configure.in.in +++ b/kandy/configure.in.in @@ -1,4 +1,4 @@ -# check for lockdev, optionally used to lock serial tqdevice +# check for lockdev, optionally used to lock serial device AH_TEMPLATE(HAVE_LOCKDEV) AC_CHECK_HEADERS(lockdev.h, HAVE_LOCKDEV_H=1, HAVE_LOCKDEV_H=) AC_SUBST(HAVE_LOCKDEV_H) diff --git a/kandy/src/atcommand.cpp b/kandy/src/atcommand.cpp index f03bb6794..2fcf5f24c 100644 --- a/kandy/src/atcommand.cpp +++ b/kandy/src/atcommand.cpp @@ -306,7 +306,7 @@ void ATCommand::extractParameters() TQStringList::ConstIterator end = paraList.end(); int argNum = 1; while(it != end) { - addParameter(new ATParameter(*it,i18n("Arg %1").tqarg(TQString::number(argNum++)), + addParameter(new ATParameter(*it,i18n("Arg %1").arg(TQString::number(argNum++)), false)); ++it; } diff --git a/kandy/src/kandy.cpp b/kandy/src/kandy.cpp index 5e68abe43..512f1550e 100644 --- a/kandy/src/kandy.cpp +++ b/kandy/src/kandy.cpp @@ -102,7 +102,7 @@ Kandy::~Kandy() void Kandy::load(const TQString& filename) { if (!mView->loadFile(filename)) { - KMessageBox::error(this,i18n("Could not load file %1").tqarg(filename)); + KMessageBox::error(this,i18n("Could not load file %1").arg(filename)); } mFilename = filename; @@ -113,7 +113,7 @@ void Kandy::save(const TQString & filename) { if (!filename.isEmpty()) { if (!mView->saveFile(filename)) { - KMessageBox::error(this,i18n("Could not save file %1.").tqarg(filename)); + KMessageBox::error(this,i18n("Could not save file %1.").arg(filename)); } else { mFilename = filename; setTitle(); @@ -300,7 +300,7 @@ bool Kandy::queryClose() { if (mView->isModified()) { switch (KMessageBox::warningYesNoCancel(this, - i18n("Save changes to profile %1?").tqarg(mFilename), TQString(), KStdGuiItem::save(), KStdGuiItem::discard())) { + i18n("Save changes to profile %1?").arg(mFilename), TQString(), KStdGuiItem::save(), KStdGuiItem::discard())) { case KMessageBox::Yes : fileSave(); return true; @@ -318,8 +318,8 @@ void Kandy::modemConnect() { if (!mScheduler->modem()->open()) { KMessageBox::sorry(this, - i18n("Cannot open modem tqdevice %1.") - .tqarg(KandyPrefs::serialDevice()), i18n("Modem Error")); + i18n("Cannot open modem device %1.") + .arg(KandyPrefs::serialDevice()), i18n("Modem Error")); return; } diff --git a/kandy/src/kandy.kcfg b/kandy/src/kandy.kcfg index f8d44ab35..a93f674b8 100644 --- a/kandy/src/kandy.kcfg +++ b/kandy/src/kandy.kcfg @@ -7,7 +7,7 @@ <group name="Serial Port"> <entry type="String" key="Serial Device"> - <label>Serial tqdevice</label> + <label>Serial device</label> <default>/dev/ttyS1</default> </entry> <entry type="String" key="Baud Rate"> diff --git a/kandy/src/kandyprefsdialog.cpp b/kandy/src/kandyprefsdialog.cpp index 1bb03eb1a..3be5ed72d 100644 --- a/kandy/src/kandyprefsdialog.cpp +++ b/kandy/src/kandyprefsdialog.cpp @@ -81,7 +81,7 @@ void KandyPrefsDialog::setupSerialTab() topLayout->setSpacing(spacingHint()); topLayout->setMargin(marginHint()); - // Define serial tqdevice + // Define serial device serialDevice = addWidString( KandyPrefs::self()->serialDeviceItem(), topFrame ); topLayout->addWidget(serialDevice->label(),0,0); diff --git a/kandy/src/kandyview.cpp b/kandy/src/kandyview.cpp index d47f5bcb7..3791e8939 100644 --- a/kandy/src/kandyview.cpp +++ b/kandy/src/kandyview.cpp @@ -250,7 +250,7 @@ void KandyView::executeCommand() if (p->userInput()) { bool ok = false; TQString value = KInputDialog::getText(TQString(), - i18n("Enter value for %1:").tqarg(p->name()),TQString(),&ok,this); + i18n("Enter value for %1:").arg(p->name()),TQString(),&ok,this); if (!ok) return; p->setValue(value); diff --git a/kandy/src/mobilemain.cpp b/kandy/src/mobilemain.cpp index de3e2b3e8..945ff7c47 100644 --- a/kandy/src/mobilemain.cpp +++ b/kandy/src/mobilemain.cpp @@ -169,7 +169,7 @@ bool MobileMain::queryClose() #if 0 if (m_view->isModified()) { switch (KMessageBox::warningYesNoCancel(this, - i18n("Save changes to profile %1?").tqarg(mFilename))) { + i18n("Save changes to profile %1?").arg(mFilename))) { case KMessageBox::Yes : fileSave(); return true; diff --git a/kandy/src/modem.cpp b/kandy/src/modem.cpp index 3956376a8..a7d246950 100644 --- a/kandy/src/modem.cpp +++ b/kandy/src/modem.cpp @@ -194,9 +194,9 @@ bool Modem::open() TQCString dev = TQFile::encodeName( (*prefs).serialDevice() ); const char *fdev = dev.data(); if ( ( fd = ::open( fdev, O_RDWR | O_NOCTTY | O_NONBLOCK ) ) == -1 ) { - emit errorMessage( i18n( "Unable to open tqdevice '%1'. " + emit errorMessage( i18n( "Unable to open device '%1'. " "Please check that you have sufficient permissions." ) - .tqarg( fdev ) ); + .arg( fdev ) ); return false; } @@ -204,7 +204,7 @@ bool Modem::open() if ( tcgetattr( fd, &init_tty ) == -1 ) { int errnumber = errno; emit errorMessage( i18n( "Communication setup failed (tcgetattr code: %1)" ) - .tqarg(strerror(errnumber)) ); + .arg(strerror(errnumber)) ); ::close( fd ); fd = 0; return false; @@ -279,7 +279,7 @@ bool Modem::lockDevice() #ifdef HAVE_LOCKDEV is_locked = !dev_lock( (*prefs).serialDevice().local8Bit() ); if (!is_locked) - emit errorMessage( i18n( "Unable to lock tqdevice '%1'." ).tqarg( + emit errorMessage( i18n( "Unable to lock device '%1'." ).arg( (*prefs).serialDevice() )); return is_locked; #else @@ -299,7 +299,7 @@ bool Modem::lockDevice() if ( ( lfd = ::open( TQFile::encodeName( fileName ), O_RDONLY ) ) < 0 ) { emit errorMessage( i18n( "Unable to open lock file '%1'.") - .tqarg( fileName ) ); + .arg( fileName ) ); return false; } @@ -307,7 +307,7 @@ bool Modem::lockDevice() if ( count < 0 ) { emit errorMessage( i18n( "Unable to read lock file '%1'.") - .tqarg( fileName ) ); + .arg( fileName ) ); ::close( lfd ); return false; } @@ -317,13 +317,13 @@ bool Modem::lockDevice() count = sscanf( buf, "%d", &pid ); if ( ( count != 1 ) || ( pid <= 0 ) ) { emit errorMessage( i18n( "Unable to get PID from file '%1'.") - .tqarg( fileName ) ); + .arg( fileName ) ); return false; } if ( !kill( (pid_t) pid, 0 ) ) { - emit errorMessage( i18n( "Process with PID %1, which is locking the tqdevice, is still running.") - .tqarg( pid ) ); + emit errorMessage( i18n( "Process with PID %1, which is locking the device, is still running.") + .arg( pid ) ); return false; } @@ -336,7 +336,7 @@ bool Modem::lockDevice() if ( ( lfd = creat( TQFile::encodeName( fileName ).data(), 0644 ) ) == -1 ) { emit errorMessage( i18n( "Unable to create lock file '%1'. " "Please check that you have sufficient permissions.") - .tqarg( fileName ) ); + .arg( fileName ) ); return false; } diff --git a/karm/doc/design b/karm/doc/design index b647f2822..be9a425fa 100644 --- a/karm/doc/design +++ b/karm/doc/design @@ -36,7 +36,7 @@ On Thursday 24 October 2002 06:37 pm, tomas pospisek wrote: > > --------------------------------------------------------------------- > > 1 Karm shall provide a hierarchical structure of tasks. If a task > > has at least one subtask it will be referred to as a parent task. -> > If a task has no tqchildren it will be referred to as a leaf task. +> > If a task has no children it will be referred to as a leaf task. > > If a task has no parent tasks it will be referred to as a root > > task. > > 2 A new task can be created as a child of any existing task. @@ -63,7 +63,7 @@ On Thursday 24 October 2002 06:37 pm, tomas pospisek wrote: > > --------------------------------------------------------------------- > > 1 Karm shall provide a hierarchical structure of tasks. If a task > > has at least one subtask it will be referred to as a parent task. -> > If a task has no tqchildren it will be referred to as a leaf task. +> > If a task has no children it will be referred to as a leaf task. > > If a task has no parent tasks it will be referred to as a root > > task. > > 2 A new task can be created as a child of any existing task. diff --git a/karm/idletimedetector.cpp b/karm/idletimedetector.cpp index c969bf149..bd0b253c2 100644 --- a/karm/idletimedetector.cpp +++ b/karm/idletimedetector.cpp @@ -72,7 +72,7 @@ void IdleTimeDetector::informOverrun(int idleSeconds) int id = TQMessageBox::warning( 0, i18n("Idle Detection"), i18n("Desktop has been idle since %1." - " What should we do?").tqarg(idleStartTQString), + " What should we do?").arg(idleStartTQString), i18n("Revert && Stop"), i18n("Revert && Continue"), i18n("Continue Timing"),0,2); diff --git a/karm/karm_part.cpp b/karm/karm_part.cpp index 7a392ab41..4cf841902 100644 --- a/karm/karm_part.cpp +++ b/karm/karm_part.cpp @@ -576,7 +576,7 @@ int karmPart::bookTime TQString karmPart::getError( int mkb ) const { if ( mkb <= KARM_MAX_ERROR_NO ) return m_error[ mkb ]; - else return i18n( "Invalid error number: %1" ).tqarg( mkb ); + else return i18n( "Invalid error number: %1" ).arg( mkb ); } int karmPart::totalMinutesForTaskId( const TQString& taskId ) diff --git a/karm/karmstorage.cpp b/karm/karmstorage.cpp index aecee470d..e895d2639 100644 --- a/karm/karmstorage.cpp +++ b/karm/karmstorage.cpp @@ -199,8 +199,8 @@ TQString KarmStorage::load (TaskView* view, const Preferences* preferences, TQSt // Complete the loading but return a message if ( !newParent ) err = i18n("Error loading \"%1\": could not find parent (uid=%2)") - .tqarg(task->name()) - .tqarg((*todo)->relatedToUid()); + .arg(task->name()) + .arg((*todo)->relatedToUid()); if (!err) task->move( newParent); } @@ -268,8 +268,8 @@ TQString KarmStorage::buildTaskView(KCal::ResourceCalendar *rc, TaskView *view) // Complete the loading but return a message if ( !newParent ) err = i18n("Error loading \"%1\": could not find parent (uid=%2)") - .tqarg(task->name()) - .tqarg((*todo)->relatedToUid()); + .arg(task->name()) + .arg((*todo)->relatedToUid()); if (!err) task->move( newParent); } @@ -391,12 +391,12 @@ TQString KarmStorage::loadFromFlatFile(TaskView* taskview, TQFile f(filename); if( !f.exists() ) - err = i18n("File \"%1\" not found.").tqarg(filename); + err = i18n("File \"%1\" not found.").arg(filename); if (!err) { if( !f.open( IO_ReadOnly ) ) - err = i18n("Could not open \"%1\".").tqarg(filename); + err = i18n("Could not open \"%1\".").arg(filename); } if (!err) @@ -667,7 +667,7 @@ TQString KarmStorage::exportcsvFile( TaskView *taskview, if (filename.isEmpty()) filename=rc.url.url(); TQFile f( filename ); if( !f.open( IO_WriteOnly ) ) { - err = i18n( "Could not open \"%1\"." ).tqarg( filename ); + err = i18n( "Could not open \"%1\"." ).arg( filename ); } if (!err) { @@ -809,13 +809,13 @@ long KarmStorage::printTaskHistory ( // write the time in seconds for the given task for the given day to s daykey = day.toString(TQString::fromLatin1("yyyyMMdd")); daytaskkey = TQString::fromLatin1("%1_%2") - .tqarg(daykey) - .tqarg(task->uid()); + .arg(daykey) + .arg(task->uid()); if (taskdaytotals.contains(daytaskkey)) { cell.push_back(TQString::fromLatin1("%1") - .tqarg(formatTime(taskdaytotals[daytaskkey]/60, rc.decimalMinutes))); + .arg(formatTime(taskdaytotals[daytaskkey]/60, rc.decimalMinutes))); sum += taskdaytotals[daytaskkey]; // in seconds if (daytotals.contains(daykey)) @@ -829,7 +829,7 @@ long KarmStorage::printTaskHistory ( } // Total for task - cell.push_back(TQString::fromLatin1("%1").tqarg(formatTime(sum/60, rc.decimalMinutes))); + cell.push_back(TQString::fromLatin1("%1").arg(formatTime(sum/60, rc.decimalMinutes))); // room for the recursive total time (that cannot be calculated now) cell.push_back(delim); @@ -865,7 +865,7 @@ long KarmStorage::printTaskHistory ( add += printTaskHistory( subTask, taskdaytotals, daytotals, from, to , level+1, matrix, rc ); } - cell[colrectot]=(TQString::fromLatin1("%1").tqarg(formatTime((add+sum)/60, rc.decimalMinutes ))); + cell[colrectot]=(TQString::fromLatin1("%1").arg(formatTime((add+sum)/60, rc.decimalMinutes ))); for (unsigned int i=0; i < cell.size(); i++) matrix[ownline]+=cell[i]; return add+sum; } @@ -917,11 +917,11 @@ TQString KarmStorage::exportcsvHistory ( TaskView *taskview, // header retval += i18n("Task History\n"); retval += i18n("From %1 to %2") - .tqarg(KGlobal::locale()->formatDate(from)) - .tqarg(KGlobal::locale()->formatDate(to)); + .arg(KGlobal::locale()->formatDate(from)) + .arg(KGlobal::locale()->formatDate(to)); retval += cr; retval += i18n("Printed on: %1") - .tqarg(KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime())); + .arg(KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime())); retval += cr; day=from; @@ -938,8 +938,8 @@ TQString KarmStorage::exportcsvHistory ( TaskView *taskview, { daykey = (*event).start().date().toString(TQString::fromLatin1("yyyyMMdd")); daytaskkey = TQString(TQString::fromLatin1("%1_%2")) - .tqarg(daykey) - .tqarg((*event).todoUid()); + .arg(daykey) + .arg((*event).todoUid()); if (taskdaytotals.contains(daytaskkey)) taskdaytotals.replace(daytaskkey, @@ -998,7 +998,7 @@ TQString KarmStorage::exportcsvHistory ( TaskView *taskview, if (daytotals.contains(daykey)) { retval += TQString::fromLatin1("%1") - .tqarg(formatTime(daytotals[daykey]/60, rc.decimalMinutes)); + .arg(formatTime(daytotals[daykey]/60, rc.decimalMinutes)); sum += daytotals[daykey]; // in seconds } retval += delim; @@ -1006,9 +1006,9 @@ TQString KarmStorage::exportcsvHistory ( TaskView *taskview, } retval += TQString::fromLatin1("%1%2%3%4") - .tqarg( formatTime( sum/60, rc.decimalMinutes ) ) - .tqarg( delim ).tqarg( delim ) - .tqarg( i18n( "Total" ) ); + .arg( formatTime( sum/60, rc.decimalMinutes ) ) + .arg( delim ).arg( delim ) + .arg( i18n( "Total" ) ); } // above taken from timekard.cpp @@ -1021,7 +1021,7 @@ TQString KarmStorage::exportcsvHistory ( TaskView *taskview, if (filename.isEmpty()) filename=rc.url.url(); TQFile f( filename ); if( !f.open( IO_WriteOnly ) ) { - err = i18n( "Could not open \"%1\"." ).tqarg( filename ); + err = i18n( "Could not open \"%1\"." ).arg( filename ); } if (!err) { diff --git a/karm/karmstorage.h b/karm/karmstorage.h index 3f03ddffa..7e8b04b1a 100644 --- a/karm/karmstorage.h +++ b/karm/karmstorage.h @@ -132,7 +132,7 @@ class KarmStorage * Read tasks and their total times from a text file (legacy storage). * * This reads from one of the two legacy file formats. In this version, - * the parent task times do not include the sum of all their tqchildren's + * the parent task times do not include the sum of all their children's * times. * * The format of the file is zero or more lines of: @@ -147,7 +147,7 @@ class KarmStorage * Reads tasks and their total times from text file (legacy). * * This is the older legacy format, where the task totals included the - * tqchildren totals. + * children totals. * * @see loadFromFlatFile */ diff --git a/karm/mainwindow.cpp b/karm/mainwindow.cpp index 8307dd1f7..eb6bd4fa9 100644 --- a/karm/mainwindow.cpp +++ b/karm/mainwindow.cpp @@ -63,8 +63,8 @@ MainWindow::MainWindow( const TQString &icsfile ) this, TQT_SLOT(slotSelectionChanged())); connect( _taskView, TQT_SIGNAL( updateButtons() ), this, TQT_SLOT(slotSelectionChanged())); - connect( _taskView, TQT_SIGNAL( seStatusBar( TQString ) ), - this, TQT_SLOT(seStatusBar( TQString ))); + connect( _taskView, TQT_SIGNAL( setStatusBar( TQString ) ), + this, TQT_SLOT(setStatusBar( TQString ))); loadGeometry(); @@ -134,7 +134,7 @@ void MainWindow::slotSelectionChanged() // actionAddComment->setEnabled( on ); //} -void MainWindow::seStatusBar(TQString qs) +void MainWindow::setStatusBar(TQString qs) { statusBar()->message(i18n(qs.ascii())); } @@ -202,10 +202,10 @@ void MainWindow::updateStatusBar( ) TQString time; time = formatTime( _sessionSum ); - statusBar()->changeItem( i18n("Session: %1").tqarg(time), 0 ); + statusBar()->changeItem( i18n("Session: %1").arg(time), 0 ); time = formatTime( _totalSum ); - statusBar()->changeItem( i18n("Total: %1" ).tqarg(time), 1); + statusBar()->changeItem( i18n("Total: %1" ).arg(time), 1); } void MainWindow::starStatusBar() @@ -610,7 +610,7 @@ int MainWindow::bookTime TQString MainWindow::getError( int mkb ) const { if ( mkb <= KARM_MAX_ERROR_NO ) return m_error[ mkb ]; - else return i18n( "Invalid error number: %1" ).tqarg( mkb ); + else return i18n( "Invalid error number: %1" ).arg( mkb ); } int MainWindow::totalMinutesForTaskId( const TQString& taskId ) diff --git a/karm/mainwindow.h b/karm/mainwindow.h index 9ff525b05..63479c929 100644 --- a/karm/mainwindow.h +++ b/karm/mainwindow.h @@ -89,7 +89,7 @@ class MainWindow : public KParts::MainWindow, virtual public KarmDCOPIface TQString importplannerfile( TQString filename ); public slots: - void seStatusBar( TQString ); + void setStatusBar( TQString ); void quit(); protected slots: diff --git a/karm/print.cpp b/karm/print.cpp index df8aabf54..536883687 100644 --- a/karm/print.cpp +++ b/karm/print.cpp @@ -25,10 +25,10 @@ void MyPrinter::print() if (setup(0L, i18n("Print Times"))) { // setup TQPainter painter(this); - TQPaintDeviceMetrics tqdeviceMetrics(this); + TQPaintDeviceMetrics deviceMetrics(this); TQFontMetrics metrics = painter.fontMetrics(); - pageHeight = tqdeviceMetrics.height(); - int pageWidth = tqdeviceMetrics.width(); + pageHeight = deviceMetrics.height(); + int pageWidth = deviceMetrics.width(); xMargin = margins().width(); yMargin = margins().height(); yoff = yMargin; @@ -36,7 +36,7 @@ void MyPrinter::print() // Calculate the totals // Note the totals are only calculated at the top most levels, as the - // totals are increased together with its tqchildren. + // totals are increased together with its children. int totalTotal = 0; int sessionTotal = 0; for (Task* task = _taskView->first_child(); @@ -79,7 +79,7 @@ void MyPrinter::print() painter.drawText(xMargin, yoff, pageWidth, height, TQPainter::AlignCenter, - i18n("KArm - %1").tqarg(now)); + i18n("KArm - %1").arg(now)); painter.setFont(origFont); yoff += height + 10; diff --git a/karm/task.cpp b/karm/task.cpp index 0750c7200..7d84bcd2c 100644 --- a/karm/task.cpp +++ b/karm/task.cpp @@ -164,13 +164,13 @@ void Task::setPercentComplete(const int percent, KarmStorage *storage) setPixmapProgress(); - // When parent marked as complete, mark all tqchildren as complete as well. + // When parent marked as complete, mark all children as complete as well. // Complete tasks are not displayed in the task view, so if a parent is - // marked as complete and some of the tqchildren are not, then we get an error + // marked as complete and some of the children are not, then we get an error // message. KArm actually keep chugging along in this case and displays the // child tasks just fine, so an alternative solution is to remove that error // message (from KarmStorage::load). But I think it makes more sense that - // if you mark a parent task as complete, then all tqchildren should be + // if you mark a parent task as complete, then all children should be // complete as well. // // This behavior is consistent with KOrganizer (as of 2003-09-24). diff --git a/karm/task.h b/karm/task.h index 165d60a8c..2d3d5a55a 100644 --- a/karm/task.h +++ b/karm/task.h @@ -208,7 +208,7 @@ class Task : public TQObject, public TQListViewItem /** tells you whether this task is the root of the task tree */ bool isRoot() const { return parent() == 0; } - /** remove Task with all it's tqchildren + /** remove Task with all it's children * @param activeTasks - list of aktive tasks * @param storage a pointer to a KarmStorage object. */ @@ -231,7 +231,7 @@ class Task : public TQObject, public TQListViewItem /** Return true if task is complete (percent complete equals 100). */ bool isComplete(); - /** Remove current task and all it's tqchildren from the view. */ + /** Remove current task and all it's children from the view. */ void removeFromView(); /** delivers when the task was started last */ diff --git a/karm/taskview.cpp b/karm/taskview.cpp index b4f655ff9..a7aff4061 100644 --- a/karm/taskview.cpp +++ b/karm/taskview.cpp @@ -255,7 +255,7 @@ void TaskView::refresh() t->setPixmapProgress(); } - // remove root decoration if there is no more tqchildren. + // remove root decoration if there is no more children. bool anyChilds = false; for(Task* child = first_child(); child; @@ -367,7 +367,7 @@ TQString TaskView::save() { kdDebug(5970) << "Entering TaskView::save" << endl; TQString err = _storage->save(this); - emit(seStatusBar(err)); + emit(setStatusBar(err)); return err; } @@ -613,7 +613,7 @@ void TaskView::editTask() // bool ok; // TQString comment = KLineEditDlg::getText(i18n("Comment"), -// i18n("Log comment for task '%1':").tqarg(task->name()), +// i18n("Log comment for task '%1':").arg(task->name()), // TQString(), &ok, this); // if ( ok ) // task->addComment( comment, _storage ); @@ -651,7 +651,7 @@ void TaskView::deleteTask(bool markingascomplete) response = KMessageBox::warningContinueCancel( 0, i18n( "Are you sure you want to delete " "the task named\n\"%1\" and its entire history?") - .tqarg(task->name()), + .arg(task->name()), i18n( "Deleting Task"), KStdGuiItem::del()); } else { @@ -659,7 +659,7 @@ void TaskView::deleteTask(bool markingascomplete) i18n( "Are you sure you want to delete the task named" "\n\"%1\" and its entire history?\n" "NOTE: all its subtasks and their history will also " - "be deleted.").tqarg(task->name()), + "be deleted.").arg(task->name()), i18n( "Deleting Task"), KStdGuiItem::del()); } } @@ -688,7 +688,7 @@ void TaskView::deleteTask(bool markingascomplete) save(); } - // remove root decoration if there is no more tqchildren. + // remove root decoration if there is no more children. refresh(); // Stop idle detection if no more counters are running diff --git a/karm/taskview.h b/karm/taskview.h index 988ad154d..9d6d84c04 100644 --- a/karm/taskview.h +++ b/karm/taskview.h @@ -142,11 +142,11 @@ class TaskView : public KListView KarmStorage* storage(); /** - * Delete task (and tqchildren) from view. + * Delete task (and children) from view. * * @param markingascomplete If false (the default), deletes history for - * current task and all tqchildren. If markingascomplete is true, then sets - * percent complete to 100 and removes task and all it's tqchildren from the + * current task and all children. If markingascomplete is true, then sets + * percent complete to 100 and removes task and all it's children from the * list view. */ void deleteTask(bool markingascomplete=false); @@ -201,7 +201,7 @@ class TaskView : public KListView void timersActive(); void timersInactive(); void tasksChanged( TQPtrList<Task> activeTasks ); - void seStatusBar( TQString ); + void setStatusBar( TQString ); private: // member variables IdleTimeDetector *_idleTimeDetector; diff --git a/karm/test/README b/karm/test/README index a5307e6ee..32a32f6e2 100644 --- a/karm/test/README +++ b/karm/test/README @@ -1,6 +1,6 @@ This directory holds automated tests for karm. -It's in very rough tqshape. +It's in very rough shape. How you start: diff --git a/karm/test/lifetest.php b/karm/test/lifetest.php index afd423ccb..1d809bdf9 100644 --- a/karm/test/lifetest.php +++ b/karm/test/lifetest.php @@ -132,7 +132,7 @@ else // the mouse can be in the way, so, move it out. This here even works with "focus strictly under mouse". system("xte 'mousemove 1 1'"); echo "\nStarting karm"; - $process=popen("karm --tqgeometry 200x100+0+0 /tmp/karmtest.ics >/dev/null 2>&1", 'w'); + $process=popen("karm --geometry 200x100+0+0 /tmp/karmtest.ics >/dev/null 2>&1", 'w'); $rc=1; while ($rc==1) system("dcop `dcop 2>/dev/null | grep karm` KarmDCOPIface version",$rc); echo "mainwindow is ready"; diff --git a/karm/test/script.cpp b/karm/test/script.cpp index 816314368..f9fa9d9e0 100644 --- a/karm/test/script.cpp +++ b/karm/test/script.cpp @@ -94,7 +94,7 @@ void Script::terminate() void Script::exit() { - m_status = m_proc->exiStatus(); + m_status = m_proc->exitStatus(); delete m_proc; m_proc = 0; } diff --git a/karm/timekard.cpp b/karm/timekard.cpp index 6ac410a26..984baf741 100644 --- a/karm/timekard.cpp +++ b/karm/timekard.cpp @@ -62,8 +62,8 @@ TQString TimeKard::totalsAsText(TaskView* taskview, bool justThisTask, WhichTime retval += KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime()); retval += cr + cr; retval += TQString(TQString::fromLatin1("%1 %2")) - .tqarg(i18n("Time"), timeWidth) - .tqarg(i18n("Task")); + .arg(i18n("Time"), timeWidth) + .arg(i18n("Task")); retval += cr; retval += line; @@ -92,10 +92,10 @@ TQString TimeKard::totalsAsText(TaskView* taskview, bool justThisTask, WhichTime // total buf.fill('-', reportWidth); - retval += TQString(TQString::fromLatin1("%1")).tqarg(buf, timeWidth) + cr; + retval += TQString(TQString::fromLatin1("%1")).arg(buf, timeWidth) + cr; retval += TQString(TQString::fromLatin1("%1 %2")) - .tqarg(formatTime(sum),timeWidth) - .tqarg(i18n("Total")); + .arg(formatTime(sum),timeWidth) + .arg(i18n("Total")); } else retval += i18n("No tasks."); @@ -110,8 +110,8 @@ void TimeKard::printTask(Task *task, TQString &s, int level, WhichTime which) s += buf.fill(' ', level); s += TQString(TQString::fromLatin1("%1 %2")) - .tqarg(formatTime(which == TotalTime?task->totalTime():task->totalSessionTime()), timeWidth) - .tqarg(task->name()); + .arg(formatTime(which == TotalTime?task->totalTime():task->totalSessionTime()), timeWidth) + .arg(task->name()); s += cr; for (Task* subTask = task->firstChild(); @@ -136,15 +136,15 @@ void TimeKard::printTaskHistory(const Task *task, { TQString daykey = day.toString(TQString::fromLatin1("yyyyMMdd")); TQString daytaskkey = TQString::fromLatin1("%1_%2") - .tqarg(daykey) - .tqarg(task->uid()); + .arg(daykey) + .arg(task->uid()); if (taskdaytotals.contains(daytaskkey)) { if ( !totalsOnly ) { s += TQString::fromLatin1("%1") - .tqarg(formatTime(taskdaytotals[daytaskkey]/60), timeWidth); + .arg(formatTime(taskdaytotals[daytaskkey]/60), timeWidth); } sectionsum += taskdaytotals[daytaskkey]; // in seconds @@ -162,12 +162,12 @@ void TimeKard::printTaskHistory(const Task *task, } // Total for task this section (e.g. week) - s += TQString::fromLatin1("%1").tqarg(formatTime(sectionsum/60), totalTimeWidth); + s += TQString::fromLatin1("%1").arg(formatTime(sectionsum/60), totalTimeWidth); // Task name TQString buf; s += buf.fill(' ', level + 1); - s += TQString::fromLatin1("%1").tqarg(task->name()); + s += TQString::fromLatin1("%1").arg(task->name()); s += cr; for (Task* subTask = task->firstChild(); @@ -223,8 +223,8 @@ TQString TimeKard::sectionHistoryAsText( { TQString daykey = (*event).start().date().toString(TQString::fromLatin1("yyyyMMdd")); TQString daytaskkey = TQString::fromLatin1("%1_%2") - .tqarg(daykey) - .tqarg((*event).todoUid()); + .arg(daykey) + .arg((*event).todoUid()); if (taskdaytotals.contains(daytaskkey)) taskdaytotals.replace(daytaskkey, @@ -246,7 +246,7 @@ TQString TimeKard::sectionHistoryAsText( // day headings for (TQDate day = sectionFrom; day <= sectionTo; day = day.addDays(1)) { - retval += TQString::fromLatin1("%1").tqarg(day.day(), timeWidth); + retval += TQString::fromLatin1("%1").arg(day.day(), timeWidth); } retval += cr; retval += line; @@ -287,7 +287,7 @@ TQString TimeKard::sectionHistoryAsText( if ( !totalsOnly ) { retval += TQString::fromLatin1("%1") - .tqarg(formatTime(daytotals[daykey]/60), timeWidth); + .arg(formatTime(daytotals[daykey]/60), timeWidth); } sum += daytotals[daykey]; // in seconds } @@ -299,8 +299,8 @@ TQString TimeKard::sectionHistoryAsText( } retval += TQString::fromLatin1("%1 %2") - .tqarg(formatTime(sum/60), totalTimeWidth) - .tqarg(i18n("Total")); + .arg(formatTime(sum/60), totalTimeWidth) + .arg(i18n("Total")); } return retval; } @@ -313,11 +313,11 @@ TQString TimeKard::historyAsText(TaskView* taskview, const TQDate& from, retval += totalsOnly ? i18n("Task Totals") : i18n("Task History"); retval += cr; retval += i18n("From %1 to %2") - .tqarg(KGlobal::locale()->formatDate(from)) - .tqarg(KGlobal::locale()->formatDate(to)); + .arg(KGlobal::locale()->formatDate(from)) + .arg(KGlobal::locale()->formatDate(to)); retval += cr; retval += i18n("Printed on: %1") - .tqarg(KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime())); + .arg(KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime())); if ( perWeek ) { @@ -353,7 +353,7 @@ TQDate Week::end() const TQString Week::name() const { - return i18n("Week of %1").tqarg(KGlobal::locale()->formatDate(start())); + return i18n("Week of %1").arg(KGlobal::locale()->formatDate(start())); } TQValueList<Week> Week::weeksFromDateRange(const TQDate& from, const TQDate& to) diff --git a/karm/tray.cpp b/karm/tray.cpp index 20c2f51e6..ac820abbb 100644 --- a/karm/tray.cpp +++ b/karm/tray.cpp @@ -59,9 +59,9 @@ KarmTray::KarmTray(MainWindow* parent) // this are experiments/tests /* for (int i=0; i<30; i++) - _tray->insertTitle(i 18n("bla ").tqarg(i)); + _tray->insertTitle(i 18n("bla ").arg(i)); for (int i=0; i<30; i++) - _tray->insertTitle2(i 18n("bli ").tqarg(i)); + _tray->insertTitle2(i 18n("bli ").arg(i)); */ // experimenting with menus for the tray /* diff --git a/kdgantt/KDGanttMinimizeSplitter.cpp b/kdgantt/KDGanttMinimizeSplitter.cpp index 09f0b8528..fb9eda893 100644 --- a/kdgantt/KDGanttMinimizeSplitter.cpp +++ b/kdgantt/KDGanttMinimizeSplitter.cpp @@ -108,7 +108,7 @@ void KDGanttSplitterHandle::mousePressEvent( TQMouseEvent *e ) _activeButton = onButton( e->pos() ); mouseOffset = s->pick(e->pos()); if ( _activeButton != 0) - tqrepaint(); + repaint(); updateCursor( e->pos() ); } } @@ -165,7 +165,7 @@ void KDGanttSplitterHandle::mouseReleaseEvent( TQMouseEvent *e ) s->moveSplitter( pos, id() ); } } - tqrepaint(); + repaint(); } int KDGanttSplitterHandle::onButton( const TQPoint& p ) @@ -319,7 +319,7 @@ void kdganttGeomCalc( TQMemArray<TQLayoutStruct> &chain, int start, int count, i such a license) and are (C) Trolltech AS. A splitter lets the user control the size of child widgets by - dragging the boundary between the tqchildren. Any number of widgets + dragging the boundary between the children. Any number of widgets may be controlled. To show a TQListBox, a TQListView and a TQTextEdit side by side: @@ -332,14 +332,14 @@ void kdganttGeomCalc( TQMemArray<TQLayoutStruct> &chain, int start, int count, i \endcode In KDGanttMinimizeSplitter, the boundary can be either horizontal or - vertical. The default is horizontal (the tqchildren are side by side) + vertical. The default is horizontal (the children are side by side) but you can use setOrientation( TQSplitter::Vertical ) to set it to vertical. Use setResizeMode() to specify that a widget should keep its size when the splitter is resized. - Although KDGanttMinimizeSplitter normally resizes the tqchildren only + Although KDGanttMinimizeSplitter normally resizes the children only at the end of a resize operation, if you call setOpaqueResize( TRUE ) the widgets are resized as often as possible. @@ -349,7 +349,7 @@ void kdganttGeomCalc( TQMemArray<TQLayoutStruct> &chain, int start, int count, i sizes set by the user. If you hide() a child, its space will be distributed among the other - tqchildren. It will be reinstated when you show() it again. It is also + children. It will be reinstated when you show() it again. It is also possible to reorder the widgets within the splitter using moveToFirst() and moveToLast(). */ @@ -400,7 +400,7 @@ KDGanttMinimizeSplitter::KDGanttMinimizeSplitter( Qt::Orientation o, TQWidget *p } /*! - Destroys the splitter and any tqchildren. + Destroys the splitter and any children. */ KDGanttMinimizeSplitter::~KDGanttMinimizeSplitter() { @@ -705,7 +705,7 @@ void KDGanttMinimizeSplitter::moveBefore( int pos, int id, bool upLeft ) } else { int dd, newLeft, nextPos; if( TQApplication::reverseLayout() && orient == Qt::Horizontal ) { - dd = w->tqgeometry().right() - pos; + dd = w->geometry().right() - pos; dd = TQMAX( pick(minSize(w)), TQMIN(dd, pick(w->maximumSize()))); newLeft = pos+1; nextPos = newLeft + dd; @@ -764,7 +764,7 @@ void KDGanttMinimizeSplitter::moveAfter( int pos, int id, bool upLeft ) newLeft = pos-dd+1; nextPos = newLeft - 1; } else { - right = pick( w->tqgeometry().bottomRight() ); + right = pick( w->geometry().bottomRight() ); dd = right - pos + 1; dd = TQMAX( pick(minSize(w)), TQMIN(dd, pick(w->maximumSize()))); /*newRight = pos+dd-1;*/ @@ -966,7 +966,7 @@ void KDGanttMinimizeSplitter::recalc( bool update ) // nested splitters; be nice maxl = maxt = 0; } else { - // KDGanttMinimizeSplitter with no tqchildren yet + // KDGanttMinimizeSplitter with no children yet maxl = TQWIDGETSIZE_MAX; } } else { diff --git a/kdgantt/KDGanttView.cpp b/kdgantt/KDGanttView.cpp index c7bfa0106..9598f8673 100644 --- a/kdgantt/KDGanttView.cpp +++ b/kdgantt/KDGanttView.cpp @@ -532,7 +532,7 @@ void KDGanttView::slotMouseButtonPressed ( int button, TQListViewItem * item, the fastest mode. If Medium, there is extra repainting after releasing the scrollbar. This provides fast scrolling with updated content - after scrolling. Recommended, when tqrepaint problems occur. + after scrolling. Recommended, when repaint problems occur. This is the default value after startup. If Always, there is an extra update after every move of the scrollbar. This entails slow scrolling with updated @@ -615,7 +615,7 @@ void KDGanttView::slotHeaderSizeChanged() // legend is cleared - reinit legend with list legendItem* li; for ( li = myLegendItems->first(); li; li = myLegendItems->next() ) { - myLegend->addLegendItem(li->tqshape, li->color, li->text ); + myLegend->addLegendItem(li->shape, li->color, li->text ); } } } @@ -766,25 +766,25 @@ bool KDGanttView::editable() const /*! - Saves the state of the Gantt view in an IO tqdevice in XML format. The saved + Saves the state of the Gantt view in an IO device in XML format. The saved data can be reloaded with \a loadProject(). - \param tqdevice a pointer to the IO tqdevice in which to store the Gantt + \param device a pointer to the IO device in which to store the Gantt view state. \return true if the data could be written, false if an error occurred \sa loadProject() */ -bool KDGanttView::saveProject( TQIODevice* tqdevice ) +bool KDGanttView::saveProject( TQIODevice* device ) { - Q_ASSERT( tqdevice ); + Q_ASSERT( device ); TQDomDocument doc = saveXML(); - if( tqdevice->isOpen() ) - tqdevice->close(); - if( tqdevice->open( IO_WriteOnly ) ) { - TQTextStream ts( tqdevice ); + if( device->isOpen() ) + device->close(); + if( device->open( IO_WriteOnly ) ) { + TQTextStream ts( device ); ts << doc.toString(); return true; } else @@ -796,30 +796,30 @@ bool KDGanttView::saveProject( TQIODevice* tqdevice ) Loads a previously saved state of the Gantt view. All current settings and items are discarded before loading the data. - \param tqdevice a pointer to the IO tqdevice from which to load the + \param device a pointer to the IO device from which to load the Gantt view state. \return true if the file could be read, false if an error occurred \sa saveProject() */ -bool KDGanttView::loadProject( TQIODevice* tqdevice ) +bool KDGanttView::loadProject( TQIODevice* device ) { - Q_ASSERT( tqdevice ); + Q_ASSERT( device ); - if( tqdevice->isOpen() ) - tqdevice->close(); - if( tqdevice->open( IO_ReadOnly ) ) { + if( device->isOpen() ) + device->close(); + if( device->open( IO_ReadOnly ) ) { TQDomDocument doc( "GanttView" ); TQString err; int errline, errcol; - if ( !doc.setContent( tqdevice, &err, &errline, &errcol ) ) { + if ( !doc.setContent( device, &err, &errline, &errcol ) ) { qDebug("KDGantt::Error parsing XML data at line %d. Message is:", errline ); qDebug("%s ", err.latin1()); - tqdevice->close(); + device->close(); return false; } - tqdevice->close(); + device->close(); return loadXML( doc ); } else return false; @@ -1209,7 +1209,7 @@ bool KDGanttView::showTaskLinks() const void KDGanttView::setFont(const TQFont& font) { myListView->setFont(font); - myListView->tqrepaint(); + myListView->repaint(); myTimeHeader->setFont(font); myLegend->setFont( font ); TQWidget::setFont( font ); @@ -1299,21 +1299,21 @@ bool KDGanttView::showTimeTablePopupMenu() const /*! - Sets the tqshapes for a certain type of Gantt item. Not all items use - all three tqshapes (e.g., only summary items use the middle tqshape). + Sets the shapes for a certain type of Gantt item. Not all items use + all three shapes (e.g., only summary items use the middle shape). - This setting overrides any tqshape settings made on individual items. + This setting overrides any shape settings made on individual items. These settings will be taken as initial values of any newly created item of this certain type. See also the documentation of the KDGanttViewItem class. - \param type the type of Gantt items for which to set the tqshapes - \param start the tqshape to use for the beginning of the item - \param middle the tqshape to use for the middle of the item - \param end the tqshape to use for the end of the item - \param overwriteExisting if true, overwrites existing tqshape settings + \param type the type of Gantt items for which to set the shapes + \param start the shape to use for the beginning of the item + \param middle the shape to use for the middle of the item + \param end the shape to use for the end of the item + \param overwriteExisting if true, overwrites existing shape settings in the individual items - \sa tqshapes() + \sa shapes() */ void KDGanttView::setShapes( KDGanttViewItem::Type type, KDGanttViewItem::Shape start, @@ -1337,18 +1337,18 @@ void KDGanttView::setShapes( KDGanttViewItem::Type type, /*! - Queries the tqshapes for a particular type of Gantt item. + Queries the shapes for a particular type of Gantt item. - \param type the type of Gantt items for which to query the tqshapes - \param start the start tqshape is returned in this parameter - \param middle the middle tqshape is returned in this parameter - \param end the end tqshape is returned in this parameter - \return true if there was a general tqshape set for the specified - type. If the return value is false, the values of the three tqshape + \param type the type of Gantt items for which to query the shapes + \param start the start shape is returned in this parameter + \param middle the middle shape is returned in this parameter + \param end the end shape is returned in this parameter + \return true if there was a general shape set for the specified + type. If the return value is false, the values of the three shape parameters are undefined. \sa setShapes() */ -bool KDGanttView::tqshapes( KDGanttViewItem::Type type, +bool KDGanttView::shapes( KDGanttViewItem::Type type, KDGanttViewItem::Shape& start, KDGanttViewItem::Shape& middle, KDGanttViewItem::Shape& end ) const @@ -1562,19 +1562,19 @@ void KDGanttView::clearLegend( ) /*! Adds an item to the legend. - \param tqshape the tqshape to display - \param tqshapeColor the color in which to display the tqshape + \param shape the shape to display + \param shapeColor the color in which to display the shape \param text the text to display \sa clearLegend() */ -void KDGanttView::addLegendItem( KDGanttViewItem::Shape tqshape, - const TQColor& tqshapeColor, +void KDGanttView::addLegendItem( KDGanttViewItem::Shape shape, + const TQColor& shapeColor, const TQString& text ) { - myLegend->addLegendItem( tqshape,tqshapeColor,text ); + myLegend->addLegendItem( shape,shapeColor,text ); legendItem* item = new legendItem; - item->tqshape = tqshape; - item->color = tqshapeColor; + item->shape = shape; + item->color = shapeColor; item->text = text; myLegendItems->append( item ); } @@ -3415,58 +3415,58 @@ TQDomDocument KDGanttView::saveXML( bool withPI ) const showTimeTablePopupMenu() ); // the Shapes element - TQDomElement tqshapesElement = doc.createElement( "Shapes" ); - docRoot.appendChild( tqshapesElement ); - TQDomElement tqshapesEventElement = doc.createElement( "Event" ); - tqshapesElement.appendChild( tqshapesEventElement ); + TQDomElement shapesElement = doc.createElement( "Shapes" ); + docRoot.appendChild( shapesElement ); + TQDomElement shapesEventElement = doc.createElement( "Event" ); + shapesElement.appendChild( shapesEventElement ); KDGanttViewItem::Shape start, middle, end; - if( tqshapes( KDGanttViewItem::Event, start, middle, end ) ) { - KDGanttXML::createStringNode( doc, tqshapesEventElement, "Start", - KDGanttViewItem::tqshapeToString( start ) ); - KDGanttXML::createStringNode( doc, tqshapesEventElement, "Middle", - KDGanttViewItem::tqshapeToString( middle ) ); - KDGanttXML::createStringNode( doc, tqshapesEventElement, "End", - KDGanttViewItem::tqshapeToString( end ) ); + if( shapes( KDGanttViewItem::Event, start, middle, end ) ) { + KDGanttXML::createStringNode( doc, shapesEventElement, "Start", + KDGanttViewItem::shapeToString( start ) ); + KDGanttXML::createStringNode( doc, shapesEventElement, "Middle", + KDGanttViewItem::shapeToString( middle ) ); + KDGanttXML::createStringNode( doc, shapesEventElement, "End", + KDGanttViewItem::shapeToString( end ) ); } else { - KDGanttXML::createStringNode( doc, tqshapesEventElement, "Start", + KDGanttXML::createStringNode( doc, shapesEventElement, "Start", "Undefined" ); - KDGanttXML::createStringNode( doc, tqshapesEventElement, "Middle", + KDGanttXML::createStringNode( doc, shapesEventElement, "Middle", "Undefined" ); - KDGanttXML::createStringNode( doc, tqshapesEventElement, "End", + KDGanttXML::createStringNode( doc, shapesEventElement, "End", "Undefined" ); } - TQDomElement tqshapesTaskElement = doc.createElement( "Task" ); - tqshapesElement.appendChild( tqshapesTaskElement ); - if( tqshapes( KDGanttViewItem::Task, start, middle, end ) ) { - KDGanttXML::createStringNode( doc, tqshapesTaskElement, "Start", - KDGanttViewItem::tqshapeToString( start ) ); - KDGanttXML::createStringNode( doc, tqshapesTaskElement, "Middle", - KDGanttViewItem::tqshapeToString( middle ) ); - KDGanttXML::createStringNode( doc, tqshapesTaskElement, "End", - KDGanttViewItem::tqshapeToString( end ) ); + TQDomElement shapesTaskElement = doc.createElement( "Task" ); + shapesElement.appendChild( shapesTaskElement ); + if( shapes( KDGanttViewItem::Task, start, middle, end ) ) { + KDGanttXML::createStringNode( doc, shapesTaskElement, "Start", + KDGanttViewItem::shapeToString( start ) ); + KDGanttXML::createStringNode( doc, shapesTaskElement, "Middle", + KDGanttViewItem::shapeToString( middle ) ); + KDGanttXML::createStringNode( doc, shapesTaskElement, "End", + KDGanttViewItem::shapeToString( end ) ); } else { - KDGanttXML::createStringNode( doc, tqshapesTaskElement, "Start", + KDGanttXML::createStringNode( doc, shapesTaskElement, "Start", "Undefined" ); - KDGanttXML::createStringNode( doc, tqshapesTaskElement, "Middle", + KDGanttXML::createStringNode( doc, shapesTaskElement, "Middle", "Undefined" ); - KDGanttXML::createStringNode( doc, tqshapesTaskElement, "End", + KDGanttXML::createStringNode( doc, shapesTaskElement, "End", "Undefined" ); } - TQDomElement tqshapesSummaryElement = doc.createElement( "Summary" ); - tqshapesElement.appendChild( tqshapesSummaryElement ); - if( tqshapes( KDGanttViewItem::Event, start, middle, end ) ) { - KDGanttXML::createStringNode( doc, tqshapesSummaryElement, "Start", - KDGanttViewItem::tqshapeToString( start ) ); - KDGanttXML::createStringNode( doc, tqshapesSummaryElement, "Middle", - KDGanttViewItem::tqshapeToString( middle ) ); - KDGanttXML::createStringNode( doc, tqshapesSummaryElement, "End", - KDGanttViewItem::tqshapeToString( end ) ); + TQDomElement shapesSummaryElement = doc.createElement( "Summary" ); + shapesElement.appendChild( shapesSummaryElement ); + if( shapes( KDGanttViewItem::Event, start, middle, end ) ) { + KDGanttXML::createStringNode( doc, shapesSummaryElement, "Start", + KDGanttViewItem::shapeToString( start ) ); + KDGanttXML::createStringNode( doc, shapesSummaryElement, "Middle", + KDGanttViewItem::shapeToString( middle ) ); + KDGanttXML::createStringNode( doc, shapesSummaryElement, "End", + KDGanttViewItem::shapeToString( end ) ); } else { - KDGanttXML::createStringNode( doc, tqshapesSummaryElement, "Start", + KDGanttXML::createStringNode( doc, shapesSummaryElement, "Start", "Undefined" ); - KDGanttXML::createStringNode( doc, tqshapesSummaryElement, "Middle", + KDGanttXML::createStringNode( doc, shapesSummaryElement, "Middle", "Undefined" ); - KDGanttXML::createStringNode( doc, tqshapesSummaryElement, "End", + KDGanttXML::createStringNode( doc, shapesSummaryElement, "End", "Undefined" ); } @@ -3604,7 +3604,7 @@ TQDomDocument KDGanttView::saveXML( bool withPI ) const TQDomElement legendItemElement = doc.createElement( "LegendItem" ); legendItemsElement.appendChild( legendItemElement ); KDGanttXML::createStringNode( doc, legendItemElement, "Shape", - KDGanttViewItem::tqshapeToString( current->tqshape ) ); + KDGanttViewItem::shapeToString( current->shape ) ); KDGanttXML::createColorNode( doc, legendItemElement, "Color", current->color ); KDGanttXML::createStringNode( doc, legendItemElement, "Text", @@ -3757,17 +3757,17 @@ void KDGanttView::editItem( KDGanttViewItem* item) /*! - This method returns the pixmap used for a certain tqshape, in the + This method returns the pixmap used for a certain shape, in the selected color and size. - \param tqshape the tqshape to generate - \param tqshapeColor the foreground color of the tqshape - \param backgroundColor the background color of the tqshape - \param itemSize the size of the tqshape - \return the generated tqshape pixmap + \param shape the shape to generate + \param shapeColor the foreground color of the shape + \param backgroundColor the background color of the shape + \param itemSize the size of the shape + \return the generated shape pixmap */ -TQPixmap KDGanttView::getPixmap( KDGanttViewItem::Shape tqshape, - const TQColor& tqshapeColor, +TQPixmap KDGanttView::getPixmap( KDGanttViewItem::Shape shape, + const TQColor& shapeColor, const TQColor& backgroundColor, int itemSize) { // 10 is a good value as size @@ -3777,11 +3777,11 @@ TQPixmap KDGanttView::getPixmap( KDGanttViewItem::Shape tqshape, p.fill( backgroundColor ); TQPainter paint (&p); TQBrush b = TQBrush ( TQt::SolidPattern ); - b.setColor( tqshapeColor ); + b.setColor( shapeColor ); paint.setBrush( b ); TQPen pen( TQt::black, 1 ) ; paint.setPen( pen ); - switch (tqshape) { + switch (shape) { case KDGanttViewItem::TriangleDown:{ TQPointArray arr = TQPointArray(3); arr.setPoint(0,-size/2,-hei); @@ -3864,8 +3864,8 @@ void KDGanttView::initDefaults() myDefaultColor [ getIndex( KDGanttViewItem::Summary ) ] = TQt::cyan;//summary myDefaultColorHL [ getIndex( KDGanttViewItem::Summary ) ] = TQt::red; - // setting the default tqshape types - // currently, we take for each item for all three tqshapes (start, middle, end) the same default tqshape + // setting the default shape types + // currently, we take for each item for all three shapes (start, middle, end) the same default shape for (i = 0;i<3;++i) { myDefaultShape [3*getIndex( KDGanttViewItem::Event )+ i] = KDGanttViewItem::Diamond; //event myDefaultShape [3*getIndex( KDGanttViewItem::Task ) +i] = KDGanttViewItem::Square; //task diff --git a/kdgantt/KDGanttView.h b/kdgantt/KDGanttView.h index 7f4bf57a5..b0acc96b0 100644 --- a/kdgantt/KDGanttView.h +++ b/kdgantt/KDGanttView.h @@ -193,7 +193,7 @@ public: KDGanttViewItem::Shape middle, KDGanttViewItem::Shape end, bool overwriteExisting = true ); - bool tqshapes( KDGanttViewItem::Type type, + bool shapes( KDGanttViewItem::Type type, KDGanttViewItem::Shape& start, KDGanttViewItem::Shape& middle, KDGanttViewItem::Shape& end ) const; @@ -228,7 +228,7 @@ public: TQPtrList<KDGanttViewTaskLinkGroup> taskLinkGroups() const; // Legend-related stuff - void addLegendItem( KDGanttViewItem::Shape tqshape, const TQColor& tqshapeColor, const TQString& text ); + void addLegendItem( KDGanttViewItem::Shape shape, const TQColor& shapeColor, const TQString& text ); void clearLegend(); // Header-related stuff void setHorizonStart( const TQDateTime& start ); @@ -298,7 +298,7 @@ public: void setWeekendDays( int start, int end ); void weekendDays( int& start, int& end ) const; - static TQPixmap getPixmap( KDGanttViewItem::Shape tqshape, const TQColor& tqshapeColor,const TQColor& backgroundColor, int itemSize); + static TQPixmap getPixmap( KDGanttViewItem::Shape shape, const TQColor& shapeColor,const TQColor& backgroundColor, int itemSize); void setHeaderVisible( bool ); bool headerVisible() const; @@ -422,7 +422,7 @@ private slots: void slot_lvDropped(TQDropEvent* e, KDGanttViewItem* droppedItem, KDGanttViewItem* itemBelowMouse ); private: struct legendItem { - KDGanttViewItem::Shape tqshape; + KDGanttViewItem::Shape shape; TQColor color; TQString text; }; diff --git a/kdgantt/KDGanttViewItem.cpp b/kdgantt/KDGanttViewItem.cpp index de80477a5..0bfc72794 100644 --- a/kdgantt/KDGanttViewItem.cpp +++ b/kdgantt/KDGanttViewItem.cpp @@ -52,20 +52,20 @@ directly. Instead, you should create items of one of the subclasses. This class provides methods common to all Gantt items. - The initialization of the tqshapes/colors of the item works as follows: + The initialization of the shapes/colors of the item works as follows: Shapes: - When a new item is created, the tqshapes are set to the default values + When a new item is created, the shapes are set to the default values for items of the type of this item, defined in the KDGanttView class with void setShapes( KDGanttViewItem::Type type, KDGanttViewItem::Shape start, KDGanttViewItem::Shape middle, KDGanttViewItem::Shape end ); If there is no default value defined for this type, - the tqshapes are set as follows: - For TaskViewItems all three tqshapes are set to Square. - For SummaryViewItems all three tqshapes are set to TriangleDown. - For EventViewItems all three tqshapes are set to Diamond. + the shapes are set as follows: + For TaskViewItems all three shapes are set to Square. + For SummaryViewItems all three shapes are set to TriangleDown. + For EventViewItems all three shapes are set to Diamond. Colors: When a new item is created, the colors are set to the default values @@ -75,7 +75,7 @@ const TQColor& middle, const TQColor& end ); If there is no default value defined for this type, - the colors of the tqshapes are set to the default color for items of this type, + the colors of the shapes are set to the default color for items of this type, defined in the KDGanttView class with: void setDefaultColor( KDGanttViewItem::Type type, const TQColor& ); The initial default color in the KDGanttView class is set to @@ -92,7 +92,7 @@ const TQColor& middle, const TQColor& end ); If there is no default value defined for this type, - the highlight colors of the tqshapes are set to the default color for + the highlight colors of the shapes are set to the default color for items of this type, defined in the KDGanttView class with: void setDefaultHighlightColor( KDGanttViewItem::Type type, const TQColor& ); The initial default highlight color in the KDGanttView class is set to red @@ -122,15 +122,15 @@ shown or not. In the other mode (set with setDisplaySubitemsAsGroup( true ); ), called "calendar mode", the item is displayed as follows: - If the item has no tqchildren, it is displayed as usual. - If the item is opened (i.e., its tqchildren are displayed), the + If the item has no children, it is displayed as usual. + If the item is opened (i.e., its children are displayed), the start/end time of this item is computed automatically according to - the earliest start time/latest end time of its tqchildren. The item - and its tqchildren are displayed as usual. - If the item is closed (i.e., its tqchildren are hidden in the left - list view), the item itself is hidden, and its tqchildren are displayed + the earliest start time/latest end time of its children. The item + and its children are displayed as usual. + If the item is closed (i.e., its children are hidden in the left + list view), the item itself is hidden, and its children are displayed on the timeline of this item instead. To control the painting of - overlapping tqchildren, call \a setPriority() for the childs. + overlapping children, call \a setPriority() for the childs. Blocking of user interaction to open item: If you want to block users to open items used as parents of calendar items, @@ -138,7 +138,7 @@ Example 1, Color: If you create an instance of a KDGanttView class and add a SummaryViewItem - without setting any color/tqshape values, you get an item with three tqshapes + without setting any color/shape values, you get an item with three shapes of the form TriangleDown in the color magenta. If the item is highlighted, the color will change to the highlight color red. @@ -147,12 +147,12 @@ \a KDGanttView::setCalendarMode( true ); \a KDGanttView::setDisplaySubitemsAsGroup( true ); Insert root items in the Gantt view. - Insert items as tqchildren of these root item in the Gantt view. + Insert items as children of these root item in the Gantt view. You may use any item type as parent and child; there are no limitations. It is, however, recommended to use KDGanttViewTaskItems - Actually, you may add child items to the tqchildren themselves. + Actually, you may add child items to the children themselves. Such a child behaves then like a parent. - Now set the start/end time of the tqchildren to specify a time + Now set the start/end time of the children to specify a time interval for these items. */ @@ -451,7 +451,7 @@ bool KDGanttViewItem::editable() const Useful to get a so called "calendar view" with many items in one row. When \a displaySubitemsAsGroup() is set to true, this item has a normal view, when it is expanded. If it is not expanded (and has at least one child), - the item itself is hidden, and all tqchildren are displayed instead. + the item itself is hidden, and all children are displayed instead. To manage the painting priority of the childs (if overlapping), you may set \a priority() of these items. @@ -735,7 +735,7 @@ TQString KDGanttViewItem::whatsThisText() const /*! Specifies whether this item should be shown highlighted. The user can also highlight items with the mouse. - If the item displays its subitems (tqchildren) as a group + If the item displays its subitems (children) as a group (displaySubitemsAsGroup() == true), all changes apply to all subitems as well. @@ -773,16 +773,16 @@ bool KDGanttViewItem::highlight() const /*! - Specifies the tqshapes to be used for this item. + Specifies the shapes to be used for this item. - It is advisable not to use this method, but rather set the tqshapes + It is advisable not to use this method, but rather set the shapes for all items of a type with KDGanttView::setShapes() in order to get a uniform Gantt view. - \param start the start tqshape - \param middle the middle tqshape - \param end the end tqshape - \sa tqshapes(), setColors(), colors() + \param start the start shape + \param middle the middle shape + \param end the end shape + \sa shapes(), setColors(), colors() */ void KDGanttViewItem::setShapes( Shape start, Shape middle, Shape end ) { @@ -799,20 +799,20 @@ void KDGanttViewItem::setShapes( Shape start, Shape middle, Shape end ) /*! - Creates tqshapes of the specified type \a tqshape. - The background tqshape color is set to black and the background tqshape - is slightly bit bigger than the foreground tqshape to have a black border - around the foreground tqshape. + Creates shapes of the specified type \a shape. + The background shape color is set to black and the background shape + is slightly bit bigger than the foreground shape to have a black border + around the foreground shape. - \param itemShape the foreground tqshape - \param middle itemShapeBack the background tqshape - \param tqshape the type of the tqshape + \param itemShape the foreground shape + \param middle itemShapeBack the background shape + \param shape the type of the shape (may be TriangleDown, TriangleUp, Diamond, Square, Circle) - \sa tqshapes(), setColors(), colors() + \sa shapes(), setColors(), colors() */ void KDGanttViewItem::createShape( KDCanvasPolygonItem* &itemShape, KDCanvasPolygonItem* &itemShapeBack, - Shape tqshape ) + Shape shape ) { if ( itemShape && type() == Task ) return; @@ -823,7 +823,7 @@ void KDGanttViewItem::createShape( KDCanvasPolygonItem* &itemShape, TQCanvasPolygonalItem * itemBack; int size = myItemSize+2; int hei = (myItemSize/3)/2; - switch (tqshape) { + switch (shape) { case TriangleDown: { item = new KDCanvasPolygon(myGanttView->myTimeTable, this,Type_is_KDGanttViewItem); @@ -912,8 +912,8 @@ void KDGanttViewItem::createShape( KDCanvasPolygonItem* &itemShape, break; } default: - // Uninitialized tqshape, can e.g. be the case with free-busy - // items which don't have any tqshapes + // Uninitialized shape, can e.g. be the case with free-busy + // items which don't have any shapes return; } item->setBrush(Qt::SolidPattern); @@ -927,14 +927,14 @@ void KDGanttViewItem::createShape( KDCanvasPolygonItem* &itemShape, /*! - Returns the tqshapes used for this item + Returns the shapes used for this item - \param start returns the start tqshape - \param middle returns the middle tqshape - \param end returns the end tqshape + \param start returns the start shape + \param middle returns the middle shape + \param end returns the end shape \sa setShapes(), setColors(), colors() */ -void KDGanttViewItem::tqshapes( Shape& start, Shape& middle, Shape& end ) const +void KDGanttViewItem::shapes( Shape& start, Shape& middle, Shape& end ) const { start = myStartShape; middle = myMiddleShape; @@ -943,16 +943,16 @@ void KDGanttViewItem::tqshapes( Shape& start, Shape& middle, Shape& end ) const /*! - Specifies the colors in which to draw the tqshapes of this item. + Specifies the colors in which to draw the shapes of this item. It is advisable not to use this method, but rather set the colors for all items of a type with KDGanttView::setColors() in order to get a uniform Gantt view. - \param start the color for the start tqshape - \param middle the color for the middle tqshape - \param end the color for the end tqshape - \sa colors(), setShapes(), tqshapes(), setDefaultColor(), defaultColor() + \param start the color for the start shape + \param middle the color for the middle shape + \param end the color for the end shape + \sa colors(), setShapes(), shapes(), setDefaultColor(), defaultColor() */ void KDGanttViewItem::setColors( const TQColor& start, const TQColor& middle, const TQColor& end ) @@ -980,7 +980,7 @@ void KDGanttViewItem::setColors( const TQColor& start, const TQColor& middle, \param start returns the start color \param middle returns the middle color \param end returns the end color - \sa setColors(), setShapes(), tqshapes(), setDefaultColor(), defaultColor() + \sa setColors(), setShapes(), shapes(), setDefaultColor(), defaultColor() */ void KDGanttViewItem::colors( TQColor& start, TQColor& middle, TQColor& end ) const { @@ -992,21 +992,21 @@ void KDGanttViewItem::colors( TQColor& start, TQColor& middle, TQColor& end ) co /*! - Specifies the highlight colors in which to draw the tqshapes of this item. + Specifies the highlight colors in which to draw the shapes of this item. It is advisable not to use this method, but rather set the highlight colors for all items of a type with KDGanttView::setHighlightColors() in order to get a uniform Gantt view. - If the item displays its subitems (tqchildren) as a group, + If the item displays its subitems (children) as a group, (displaySubitemsAsGroup() == true) all changes apply to all subitems as well. - \param start the highlight color for the start tqshape - \param middle the highlight color for the middle tqshape - \param end the highlight color for the end tqshape - \sa highlightColors(), setShapes(), tqshapes() + \param start the highlight color for the start shape + \param middle the highlight color for the middle shape + \param end the highlight color for the end shape + \sa highlightColors(), setShapes(), shapes() */ void KDGanttViewItem::setHighlightColors( const TQColor& start, const TQColor& middle, const TQColor& end ) { @@ -1032,7 +1032,7 @@ void KDGanttViewItem::setHighlightColors( const TQColor& start, const TQColor& m \param start returns the start highlight color \param middle returns the middle highlight color \param end returns the end highlight color - \sa setHighlightColors(), setShapes(), tqshapes() + \sa setHighlightColors(), setShapes(), shapes() */ void KDGanttViewItem::highlightColors( TQColor& start, TQColor& middle, TQColor& end ) const { @@ -1048,7 +1048,7 @@ void KDGanttViewItem::highlightColors( TQColor& start, TQColor& middle, TQColor& It is advisable not to use this method, but rather set the text color for all items with KDGanttView::setTextColor() in order to get a uniform Gantt view. - If the item displays its subitems (tqchildren) as a group, + If the item displays its subitems (children) as a group, (displaySubitemsAsGroup() == true) all changes apply to all subitems as well. \param color the text color @@ -1086,7 +1086,7 @@ TQColor KDGanttViewItem::textColor() const /*! \enum KDGanttViewItem::Shape - This enum is used in order to specify the tqshapes of a Gantt chart + This enum is used in order to specify the shapes of a Gantt chart item. */ @@ -1140,7 +1140,7 @@ const TQPixmap* KDGanttViewItem::pixmap( int column ) const for all items of a type with KDGanttView::setDefaultColor() in order to get a uniform Gantt view. - If the item displays its subitems (tqchildren) as a group, + If the item displays its subitems (children) as a group, (displaySubitemsAsGroup() == true) all changes apply to all subitems as well. @@ -1187,7 +1187,7 @@ TQColor KDGanttViewItem::defaultColor() const for all items of a type with KDGanttView::setDefaultHighlightColor() in order to get a uniform Gantt view. - If the item displays its subitems (tqchildren) as a group, + If the item displays its subitems (children) as a group, (displaySubitemsAsGroup() == true) all changes apply to all subitems as well. @@ -1226,7 +1226,7 @@ TQColor KDGanttViewItem::defaultHighlightColor() const /*! Returns the first child of this item. - \return the first child of this item, 0 if this item has no tqchildren + \return the first child of this item, 0 if this item has no children */ KDGanttViewItem* KDGanttViewItem::firstChild() const { @@ -1469,10 +1469,10 @@ void KDGanttViewItem::initColorAndShapes(Type t) setDefaultColor( myGanttView->defaultColor(myType)); // set default highlight color setDefaultHighlightColor(myGanttView->defaultHighlightColor(myType)); - // set tqshapes - if (!( tqshapeDefined = (myGanttView->tqshapes(myType,myStartShape,myMiddleShape,myEndShape)))) { + // set shapes + if (!( shapeDefined = (myGanttView->shapes(myType,myStartShape,myMiddleShape,myEndShape)))) { - //qDebug("KDGantt::KDGanttViewItem created with not user defined tqshapes"); + //qDebug("KDGantt::KDGanttViewItem created with not user defined shapes"); }; setShapes(myStartShape,myMiddleShape,myEndShape); @@ -1486,12 +1486,12 @@ void KDGanttViewItem::initColorAndShapes(Type t) floatStartShape = (KDCanvasPolygonItem*)new KDCanvasRectangle(myGanttView->myTimeTable,this,Type_is_KDGanttViewItem); floatEndShape = (KDCanvasPolygonItem*)new KDCanvasRectangle(myGanttView->myTimeTable,this,Type_is_KDGanttViewItem); - // set color of tqshapes + // set color of shapes if (!( colorDefined = (myGanttView->colors(myType,myStartColor,myMiddleColor,myEndColor)))) { }; setColors(defaultColor(),defaultColor(), defaultColor()); - // set highlight color of tqshapes + // set highlight color of shapes if (!( colorHLDefined = (myGanttView->highlightColors(myType,myStartColorHL,myMiddleColorHL,myEndColorHL)))) { }; @@ -1508,9 +1508,9 @@ void KDGanttViewItem::initColorAndShapes(Type t) } -TQString KDGanttViewItem::tqshapeToString( Shape tqshape ) +TQString KDGanttViewItem::shapeToString( Shape shape ) { - switch( tqshape ) { + switch( shape ) { case TriangleDown: return "TriangleDown"; case TriangleUp: @@ -1571,13 +1571,13 @@ void KDGanttViewItem::createNode( TQDomDocument& doc, KDGanttXML::createBoolNode( doc, itemElement, "Open", isOpen() ); KDGanttXML::createBoolNode( doc, itemElement, "Highlight", highlight() ); Shape startShape, middleShape, endShape; - tqshapes( startShape, middleShape, endShape ); + shapes( startShape, middleShape, endShape ); KDGanttXML::createStringNode( doc, itemElement, "StartShape", - tqshapeToString( startShape ) ); + shapeToString( startShape ) ); KDGanttXML::createStringNode( doc, itemElement, "MiddleShape", - tqshapeToString( middleShape ) ); + shapeToString( middleShape ) ); KDGanttXML::createStringNode( doc, itemElement, "EndShape", - tqshapeToString( endShape ) ); + shapeToString( endShape ) ); KDGanttXML::createColorNode( doc, itemElement, "DefaultColor", defaultColor() ); TQColor startColor, middleColor, endColor; colors( startColor, middleColor, endColor ); @@ -1944,9 +1944,9 @@ void KDGanttViewItem::showSubitemTree( int CoordY ) /*! - Returns the start time of the tqchildren of this item. + Returns the start time of the children of this item. - \return the start time of the tqchildren of this item + \return the start time of the children of this item */ TQDateTime KDGanttViewItem::myChildStartTime() { @@ -1978,9 +1978,9 @@ TQDateTime KDGanttViewItem::myChildStartTime() /*! - Returns the end time of the tqchildren of this item. + Returns the end time of the children of this item. - \return the end time of the tqchildren of this item + \return the end time of the children of this item */ TQDateTime KDGanttViewItem::myChildEndTime() { @@ -2044,7 +2044,7 @@ void KDGanttViewItem::setShowNoInformation( bool show ) /*! If the name of this item is \a name (i.e., listViewText() == name), the pointer to this item is returned. Otherwise, it looks for an - item with name \a name in the set of tqchildren and subtqchildren of + item with name \a name in the set of children and subchildren of this item. \param name the name of the item \return the pointer to the item with name \a name @@ -2365,37 +2365,37 @@ bool KDGanttViewItem::isCalendar( ) const /*! \var KDGanttViewItem::startShape - the tqshape at the beginning of the item + the shape at the beginning of the item */ /*! \var KDGanttViewItem::midShape - the tqshape in the middle of the item + the shape in the middle of the item */ /*! \var KDGanttViewItem::endShape - the tqshape at the end of the item + the shape at the end of the item */ /*! \var KDGanttViewItem::startShapeBack - the background tqshape at the beginning of the item + the background shape at the beginning of the item */ /*! \var KDGanttViewItem::midShapeBack - the background tqshape in the middle of the item + the background shape in the middle of the item */ /*! \var KDGanttViewItem::endShapeBack - the background tqshape at the end of the item + the background shape at the end of the item */ diff --git a/kdgantt/KDGanttViewItem.h b/kdgantt/KDGanttViewItem.h index 9e54755b8..e645029d8 100644 --- a/kdgantt/KDGanttViewItem.h +++ b/kdgantt/KDGanttViewItem.h @@ -146,7 +146,7 @@ public: //bool isCalendar( ) const; void setShapes( Shape start, Shape middle, Shape end ); - void tqshapes( Shape& start, Shape& middle, Shape& end ) const; + void shapes( Shape& start, Shape& middle, Shape& end ) const; void setDefaultColor( const TQColor& ); TQColor defaultColor() const; void setColors( const TQColor& start, const TQColor& middle, @@ -202,7 +202,7 @@ private: friend class KDGanttViewItemDrag; friend class itemAttributeDialog; - static TQString tqshapeToString( Shape tqshape ); + static TQString shapeToString( Shape shape ); static Shape stringToShape( const TQString& string ); static TQString typeToString( Type type ); @@ -242,7 +242,7 @@ private: bool isMyTextCanvas(TQCanvasItem *tc); TQPoint myTextOffset; TQString _name; - bool tqshapeDefined; + bool shapeDefined; int _priority; static TQDict<KDGanttViewItem> sItemDict; diff --git a/kdgantt/KDGanttViewItemDrag.cpp b/kdgantt/KDGanttViewItemDrag.cpp index 92c602011..158da0411 100644 --- a/kdgantt/KDGanttViewItemDrag.cpp +++ b/kdgantt/KDGanttViewItemDrag.cpp @@ -63,7 +63,7 @@ KDGanttViewItemDrag::KDGanttViewItemDrag( KDGanttViewItem* item , TQWidget *sour pix = *(item->pixmap()) ; else { KDGanttViewItem::Shape start, middle, end; - item->tqshapes( start, middle, end ); + item->shapes( start, middle, end ); TQColor st, mi, en; item->colors( st, mi, en ); pix =item->myGanttView->getPixmap( start, st, item->myGanttView->lvBackgroundColor(), 11 ); diff --git a/kdgantt/KDGanttViewSubwidgets.cpp b/kdgantt/KDGanttViewSubwidgets.cpp index 57bd2566d..77bc4db73 100644 --- a/kdgantt/KDGanttViewSubwidgets.cpp +++ b/kdgantt/KDGanttViewSubwidgets.cpp @@ -792,7 +792,7 @@ void KDTimeHeaderWidget::preparePopupMenu() if (flagZoomToFit) myPopupMenu->changeItem( 1, i18n("Zoom (Fit)")); else - myPopupMenu->changeItem( 1, i18n("Zoom (%1)").tqarg( TQString::number( zoomFactor(), 'f',3) ) ); + myPopupMenu->changeItem( 1, i18n("Zoom (%1)").arg( TQString::number( zoomFactor(), 'f',3) ) ); int i = 0; int id; while ( ( id = scalePopupMenu->idAt( i++ )) >= 0 ) { @@ -1140,7 +1140,7 @@ void KDTimeHeaderWidget::zoomToSelection( TQDateTime start, TQDateTime end) } flagDoNotRepaintAfterChange = false; updateTimeTable(); - tqrepaint(); + repaint(); moveTimeLineTo((getCoordX(start)-(viewWid-timeWid)/2)); // Since we have disconnected autoupdate of scrollbars, we must do it ourselves if (myGanttView && myGanttView->myCanvasView) @@ -2207,7 +2207,7 @@ void KDTimeHeaderWidget::computeTicks(bool doNotComputeRealScale) myGridMinorWidth = Width; // the width of this widget is the gridwidth * the amount of items Width *= minorItems; - // if size changed, reset tqgeometry + // if size changed, reset geometry if (width() != Width || height() != Height ) { resize( Width, Height ); @@ -2343,7 +2343,7 @@ void KDTimeHeaderWidget::computeTicks(bool doNotComputeRealScale) myGanttView->myTimeTable->setBlockUpdating( block ); updateTimeTable(); centerDateTime(myCenterDateTime); - tqrepaint(); + repaint(); } @@ -2489,7 +2489,7 @@ void KDTimeHeaderWidget::mouseReleaseEvent ( TQMouseEvent * ) //zoomToSelection( getDateTimeForIndex(start),getDateTimeForIndex(end) ); } mouseDown = false; - tqrepaint(); + repaint(); } @@ -2504,11 +2504,11 @@ void KDTimeHeaderWidget::mouseMoveEvent ( TQMouseEvent * e ) if ( mouseDown ) { if ( e->pos().y() < -height() || e->pos().y() > 2* height() ) { mouseDown = false; - tqrepaint(); + repaint(); return; } endMouseDown = e->pos().x(); - //tqrepaint; + //repaint; int val = -1; if (endMouseDown < -x() ) { val = myGanttView->myCanvasView->horizontalScrollBar()->value() - @@ -2661,10 +2661,10 @@ void KDLegendWidget::clearLegend ( ) } -void KDLegendWidget::addLegendItem( KDGanttViewItem::Shape tqshape, const TQColor& tqshapeColor, const TQString& text ) +void KDLegendWidget::addLegendItem( KDGanttViewItem::Shape shape, const TQColor& shapeColor, const TQString& text ) { TQLabel * temp; - TQPixmap p = KDGanttView::getPixmap( tqshape, tqshapeColor, TQt::white, 10); + TQPixmap p = KDGanttView::getPixmap( shape, shapeColor, TQt::white, 10); TQWidget *w = new TQWidget( myLegend ); w->setBackgroundColor( TQt::white ); TQHBoxLayout *lay = new TQHBoxLayout( w ,0, 6); @@ -2921,7 +2921,7 @@ void KDListView::drawAllContents(TQPainter * p, int cx, int cy, int cw, int ch) if ( tx < 0 ) tx = header()->cellPos( cell ); - // do any tqchildren of current need to be painted? + // do any children of current need to be painted? /* FIXME: painting branches doesn't work for some reason... if ( ih != ith && rootIsDecorated() && diff --git a/kdgantt/KDGanttViewSubwidgets.h b/kdgantt/KDGanttViewSubwidgets.h index 7b553222a..a21808504 100644 --- a/kdgantt/KDGanttViewSubwidgets.h +++ b/kdgantt/KDGanttViewSubwidgets.h @@ -337,7 +337,7 @@ public: KDLegendWidget ( TQWidget* parent, KDGanttMinimizeSplitter* legendParent ); void showMe(bool); bool isShown(); - void addLegendItem( KDGanttViewItem::Shape tqshape, const TQColor& tqshapeColor, const TQString& text ); + void addLegendItem( KDGanttViewItem::Shape shape, const TQColor& shapeColor, const TQString& text ); void clearLegend(); void setFont( TQFont ); void drawToPainter( TQPainter *p ); diff --git a/kdgantt/KDGanttViewTaskItem.cpp b/kdgantt/KDGanttViewTaskItem.cpp index a89f23603..605cb9919 100644 --- a/kdgantt/KDGanttViewTaskItem.cpp +++ b/kdgantt/KDGanttViewTaskItem.cpp @@ -43,7 +43,7 @@ This class represents calendar items in Gantt charts. - A calendar item in a Gantt chart has no start/end tqshape, + A calendar item in a Gantt chart has no start/end shape, it is displayed as a rectangle. You can set the colors as usual, where only the first argument of setColors( col, col, col ) diff --git a/kdgantt/itemAttributeDialog.ui b/kdgantt/itemAttributeDialog.ui index a98d65a11..5a34dbb5e 100644 --- a/kdgantt/itemAttributeDialog.ui +++ b/kdgantt/itemAttributeDialog.ui @@ -462,7 +462,7 @@ <property name="text"> <string>Text color:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> diff --git a/kdgantt/itemAttributeDialog.ui.h b/kdgantt/itemAttributeDialog.ui.h index 3ab24af83..8624d45d5 100644 --- a/kdgantt/itemAttributeDialog.ui.h +++ b/kdgantt/itemAttributeDialog.ui.h @@ -54,7 +54,7 @@ void itemAttributeDialog::ChangeText_clicked() myItem->setTextColor( c ); TQPixmap * pix = (TQPixmap *)ChangeText->pixmap(); pix->fill( myItem->textColor() ); - ChangeText->tqrepaint(); + ChangeText->repaint(); } @@ -62,7 +62,7 @@ void itemAttributeDialog::ChangeStart_clicked() { if ( !myItem) return; KDGanttViewItem::Shape start, middle, end; - myItem->tqshapes( start, middle, end ); + myItem->shapes( start, middle, end ); TQColor st, mi, en; myItem->colors( st, mi, en ); TQColor c = TQColorDialog::getColor( st, this ); @@ -79,7 +79,7 @@ void itemAttributeDialog::ChangeMiddle_clicked() { if ( !myItem) return; KDGanttViewItem::Shape start, middle, end; - myItem->tqshapes( start, middle, end ); + myItem->shapes( start, middle, end ); TQColor st, mi, en; myItem->colors( st, mi, en ); TQColor c = TQColorDialog::getColor( mi, this ); @@ -95,7 +95,7 @@ void itemAttributeDialog::ChangeEnd_clicked() { if ( !myItem) return; KDGanttViewItem::Shape start, middle, end; - myItem->tqshapes( start, middle, end ); + myItem->shapes( start, middle, end ); TQColor st, mi, en; myItem->colors( st, mi, en ); TQColor c = TQColorDialog::getColor( en, this ); @@ -244,7 +244,7 @@ void itemAttributeDialog::reset( KDGanttViewItem * item ) // DateEdit3->setRange(item->startTime().date(), item->endTime().date().addYears(10)); LineEdit1->setText( item->text() ); KDGanttViewItem::Shape start, middle, end; - item->tqshapes( start, middle, end ); + item->shapes( start, middle, end ); TQColor st, mi, en; item->colors( st, mi, en ); ChangeStart->setPixmap( KDGanttView::getPixmap( start, st, backgroundColor(), 10 ) ); @@ -272,7 +272,7 @@ void itemAttributeDialog::HighStart_clicked() { if ( !myItem) return; KDGanttViewItem::Shape start, middle, end; - myItem->tqshapes( start, middle, end ); + myItem->shapes( start, middle, end ); TQColor st, mi, en; myItem->highlightColors( st, mi, en ); TQColor c = TQColorDialog::getColor( st, this ); @@ -289,7 +289,7 @@ void itemAttributeDialog::HighMiddle_clicked() { if ( !myItem) return; KDGanttViewItem::Shape start, middle, end; - myItem->tqshapes( start, middle, end ); + myItem->shapes( start, middle, end ); TQColor st, mi, en; myItem->highlightColors( st, mi, en ); TQColor c = TQColorDialog::getColor( mi, this ); @@ -306,7 +306,7 @@ void itemAttributeDialog::HighEnd_clicked() { if ( !myItem) return; KDGanttViewItem::Shape start, middle, end; - myItem->tqshapes( start, middle, end ); + myItem->shapes( start, middle, end ); TQColor st, mi, en; myItem->highlightColors( st, mi, en ); TQColor c = TQColorDialog::getColor( en, this ); @@ -409,7 +409,7 @@ void itemAttributeDialog::LineEdit1_textChanged( const TQString & ) void itemAttributeDialog::StartBox_activated( const TQString & s ) { KDGanttViewItem::Shape start, middle, end; - myItem->tqshapes( start, middle, end ); + myItem->shapes( start, middle, end ); start = KDGanttViewItem::stringToShape( s ); myItem->setShapes( start, middle, end ); reset( myItem ); @@ -419,7 +419,7 @@ void itemAttributeDialog::StartBox_activated( const TQString & s ) void itemAttributeDialog::MiddleBox_activated( const TQString & s ) { KDGanttViewItem::Shape start, middle, end; - myItem->tqshapes( start, middle, end ); + myItem->shapes( start, middle, end ); middle = KDGanttViewItem::stringToShape( s ); myItem->setShapes( start, middle, end ); reset( myItem ); @@ -430,7 +430,7 @@ void itemAttributeDialog::MiddleBox_activated( const TQString & s ) void itemAttributeDialog::EndBox_activated( const TQString & s ) { KDGanttViewItem::Shape start, middle, end; - myItem->tqshapes( start, middle, end ); + myItem->shapes( start, middle, end ); end = KDGanttViewItem::stringToShape( s ); myItem->setShapes( start, middle, end ); reset( myItem ); diff --git a/kgantt/kgantt/itemedit.ui b/kgantt/kgantt/itemedit.ui index 1922a3d1e..8ebfc02b1 100644 --- a/kgantt/kgantt/itemedit.ui +++ b/kgantt/kgantt/itemedit.ui @@ -47,7 +47,7 @@ <property name="text"> <string>Item text:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignBottom|AlignLeft</set> </property> <property name="vAlign" stdset="0"> diff --git a/kgantt/kgantt/itemedit2.ui b/kgantt/kgantt/itemedit2.ui index 73532fe48..4e990183c 100644 --- a/kgantt/kgantt/itemedit2.ui +++ b/kgantt/kgantt/itemedit2.ui @@ -314,7 +314,7 @@ <property name="textFormat"> <enum>PlainText</enum> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignBottom|AlignLeft</set> </property> <property name="vAlign" stdset="0"> diff --git a/kioslaves/imap4/imap4.cc b/kioslaves/imap4/imap4.cc index 627f5eea6..8e15274f2 100644 --- a/kioslaves/imap4/imap4.cc +++ b/kioslaves/imap4/imap4.cc @@ -610,9 +610,9 @@ IMAP4Protocol::listDir (const KURL & _url) } if ( !selectInfo.alert().isNull() ) { if ( !myBox.isEmpty() ) { - warning( i18n( "Message from %1 while processing '%2': %3" ).tqarg( myHost, myBox, selectInfo.alert() ) ); + warning( i18n( "Message from %1 while processing '%2': %3" ).arg( myHost, myBox, selectInfo.alert() ) ); } else { - warning( i18n( "Message from %1: %2" ).tqarg( myHost, TQString(selectInfo.alert()) ) ); + warning( i18n( "Message from %1: %2" ).arg( myHost, TQString(selectInfo.alert()) ) ); } selectInfo.setAlert( 0 ); } @@ -934,7 +934,7 @@ IMAP4Protocol::mkdir (const KURL & _url, int) if ( ask && messageBox(QuestionYesNo, i18n("The following folder will be created on the server: %1 " - "What do you want to store in this folder?").tqarg( aBox ), + "What do you want to store in this folder?").arg( aBox ), i18n("Create Folder"), i18n("&Messages"), i18n("&Subfolders")) == KMessageBox::No ) { @@ -1272,8 +1272,8 @@ IMAP4Protocol::special (const TQByteArray & aData) completeQueue.removeRef (cmd); error(ERR_SLAVE_DEFINED, i18n("Unsubscribe of folder %1 " "failed. The server returned: %2") - .tqarg(_url.prettyURL()) - .tqarg(cmd->resultInfo())); + .arg(_url.prettyURL()) + .arg(cmd->resultInfo())); return; } completeQueue.removeRef (cmd); @@ -1293,8 +1293,8 @@ IMAP4Protocol::special (const TQByteArray & aData) completeQueue.removeRef (cmd); error(ERR_SLAVE_DEFINED, i18n("Subscribe of folder %1 " "failed. The server returned: %2") - .tqarg(_url.prettyURL()) - .tqarg(cmd->resultInfo())); + .arg(_url.prettyURL()) + .arg(cmd->resultInfo())); return; } completeQueue.removeRef (cmd); @@ -1361,7 +1361,7 @@ IMAP4Protocol::special (const TQByteArray & aData) { completeQueue.removeRef (cmd); error(ERR_COULD_NOT_WRITE, i18n("Changing the flags of message %1 " - "failed.").tqarg(_url.prettyURL())); + "failed.").arg(_url.prettyURL())); return; } completeQueue.removeRef (cmd); @@ -1373,7 +1373,7 @@ IMAP4Protocol::special (const TQByteArray & aData) { completeQueue.removeRef (cmd); error(ERR_COULD_NOT_WRITE, i18n("Changing the flags of message %1 " - "failed.").tqarg(_url.prettyURL())); + "failed.").arg(_url.prettyURL())); return; } completeQueue.removeRef (cmd); @@ -1404,7 +1404,7 @@ IMAP4Protocol::special (const TQByteArray & aData) { completeQueue.removeRef (cmd); error(ERR_COULD_NOT_WRITE, i18n("Changing the flags of message %1 " - "failed.").tqarg(_url.prettyURL())); + "failed.").arg(_url.prettyURL())); return; } completeQueue.removeRef (cmd); @@ -1451,9 +1451,9 @@ IMAP4Protocol::specialACLCommand( int command, TQDataStream& stream ) { error(ERR_SLAVE_DEFINED, i18n("Setting the Access Control List on folder %1 " "for user %2 failed. The server returned: %3") - .tqarg(_url.prettyURL()) - .tqarg(user) - .tqarg(cmd->resultInfo())); + .arg(_url.prettyURL()) + .arg(user) + .arg(cmd->resultInfo())); return; } completeQueue.removeRef (cmd); @@ -1470,9 +1470,9 @@ IMAP4Protocol::specialACLCommand( int command, TQDataStream& stream ) { error(ERR_SLAVE_DEFINED, i18n("Deleting the Access Control List on folder %1 " "for user %2 failed. The server returned: %3") - .tqarg(_url.prettyURL()) - .tqarg(user) - .tqarg(cmd->resultInfo())); + .arg(_url.prettyURL()) + .arg(user) + .arg(cmd->resultInfo())); return; } completeQueue.removeRef (cmd); @@ -1487,8 +1487,8 @@ IMAP4Protocol::specialACLCommand( int command, TQDataStream& stream ) { error(ERR_SLAVE_DEFINED, i18n("Retrieving the Access Control List on folder %1 " "failed. The server returned: %2") - .tqarg(_url.prettyURL()) - .tqarg(cmd->resultInfo())); + .arg(_url.prettyURL()) + .arg(cmd->resultInfo())); return; } // Returning information to the application from a special() command isn't easy. @@ -1514,8 +1514,8 @@ IMAP4Protocol::specialACLCommand( int command, TQDataStream& stream ) { error(ERR_SLAVE_DEFINED, i18n("Retrieving the Access Control List on folder %1 " "failed. The server returned: %2") - .tqarg(_url.prettyURL()) - .tqarg(cmd->resultInfo())); + .arg(_url.prettyURL()) + .arg(cmd->resultInfo())); return; } TQStringList lst = getResults(); @@ -1548,8 +1548,8 @@ IMAP4Protocol::specialSearchCommand( TQDataStream& stream ) { error(ERR_SLAVE_DEFINED, i18n("Searching of folder %1 " "failed. The server returned: %2") - .tqarg(aBox) - .tqarg(cmd->resultInfo())); + .arg(aBox) + .arg(cmd->resultInfo())); return; } completeQueue.removeRef(cmd); @@ -1582,9 +1582,9 @@ IMAP4Protocol::specialCustomCommand( TQDataStream& stream ) { error(ERR_SLAVE_DEFINED, i18n("Custom command %1:%2 " "failed. The server returned: %3") - .tqarg(command) - .tqarg(arguments) - .tqarg(cmd->resultInfo())); + .arg(command) + .arg(arguments) + .arg(cmd->resultInfo())); return; } completeQueue.removeRef(cmd); @@ -1665,9 +1665,9 @@ IMAP4Protocol::specialAnnotateMoreCommand( int command, TQDataStream& stream ) { error(ERR_SLAVE_DEFINED, i18n("Setting the annotation %1 on folder %2 " " failed. The server returned: %3") - .tqarg(entry) - .tqarg(_url.prettyURL()) - .tqarg(cmd->resultInfo())); + .arg(entry) + .arg(_url.prettyURL()) + .arg(cmd->resultInfo())); return; } completeQueue.removeRef (cmd); @@ -1689,9 +1689,9 @@ IMAP4Protocol::specialAnnotateMoreCommand( int command, TQDataStream& stream ) { error(ERR_SLAVE_DEFINED, i18n("Retrieving the annotation %1 on folder %2 " "failed. The server returned: %3") - .tqarg(entry) - .tqarg(_url.prettyURL()) - .tqarg(cmd->resultInfo())); + .arg(entry) + .arg(_url.prettyURL()) + .arg(cmd->resultInfo())); return; } // Returning information to the application from a special() command isn't easy. @@ -1726,8 +1726,8 @@ IMAP4Protocol::specialQuotaCommand( int command, TQDataStream& stream ) { error(ERR_SLAVE_DEFINED, i18n("Retrieving the quota root information on folder %1 " "failed. The server returned: %2") - .tqarg(_url.prettyURL()) - .tqarg(cmd->resultInfo())); + .arg(_url.prettyURL()) + .arg(cmd->resultInfo())); return; } infoMessage(getResults().join( "\r" )); @@ -2051,7 +2051,7 @@ bool IMAP4Protocol::makeLogin () { error(ERR_COULD_NOT_LOGIN, i18n("The server %1 supports neither " "IMAP4 nor IMAP4rev1.\nIt identified itself with: %2") - .tqarg(myHost).tqarg(greeting)); + .arg(myHost).arg(greeting)); closeConnection(); return false; } @@ -2102,7 +2102,7 @@ bool IMAP4Protocol::makeLogin () else { if (!hasCapability (TQString ("AUTH=") + myAuth)) { error (ERR_COULD_NOT_LOGIN, i18n("The authentication method %1 is not " - "supported by the server.").tqarg(myAuth)); + "supported by the server.").arg(myAuth)); closeConnection(); return false; } @@ -2144,14 +2144,14 @@ bool IMAP4Protocol::makeLogin () } if (!clientLogin (myUser, myPass, resultInfo)) error(KIO::ERR_COULD_NOT_AUTHENTICATE, i18n("Unable to login. Probably the " - "password is wrong.\nThe server %1 replied:\n%2").tqarg(myHost).tqarg(resultInfo)); + "password is wrong.\nThe server %1 replied:\n%2").arg(myHost).arg(resultInfo)); } else { #ifdef HAVE_LIBSASL2 if (!clientAuthenticate (this, authInfo, myHost, myAuth, mySSL, resultInfo)) error(KIO::ERR_COULD_NOT_AUTHENTICATE, i18n("Unable to authenticate via %1.\n" - "The server %2 replied:\n%3").tqarg(myAuth).tqarg(myHost).tqarg(resultInfo)); + "The server %2 replied:\n%3").arg(myAuth).arg(myHost).arg(resultInfo)); else { myUser = authInfo.username; myPass = authInfo.password; @@ -2701,7 +2701,7 @@ IMAP4Protocol::assureBox (const TQString & aBox, bool readonly) // not allowed to enter this folder error(ERR_ACCESS_DENIED, cmdInfo); } else { - error(ERR_SLAVE_DEFINED, i18n("Unable to open folder %1. The server replied: %2").tqarg(aBox).tqarg(cmdInfo)); + error(ERR_SLAVE_DEFINED, i18n("Unable to open folder %1. The server replied: %2").arg(aBox).arg(cmdInfo)); } } else { error(KIO::ERR_DOES_NOT_EXIST, aBox); diff --git a/kioslaves/imap4/imaplist.cc b/kioslaves/imap4/imaplist.cc index 13309089e..92918d8c1 100644 --- a/kioslaves/imap4/imaplist.cc +++ b/kioslaves/imap4/imaplist.cc @@ -124,9 +124,9 @@ void imapList::parseAttributes( parseString & str ) marked_ = true; else if (-1 != attribute.find ("\\unmarked")) unmarked_ = true; - else if (-1 != attribute.find ("\\hastqchildren")) + else if (-1 != attribute.find ("\\haschildren")) hasChildren_ = true; - else if (-1 != attribute.find ("\\hasnotqchildren")) + else if (-1 != attribute.find ("\\hasnochildren")) hasNoChildren_ = true; else kdDebug(7116) << "imapList::imapList: bogus attribute " << attribute << endl; diff --git a/kioslaves/imap4/imapparser.cc b/kioslaves/imap4/imapparser.cc index 328c0e566..674068628 100644 --- a/kioslaves/imap4/imapparser.cc +++ b/kioslaves/imap4/imapparser.cc @@ -443,7 +443,7 @@ imapParser::parseUntagged (parseString & result) } else if (tqstrncmp(what, "STATUS", what.size()) == 0) { - parseStatus (result); + parsetStatus (result); } break; @@ -845,7 +845,7 @@ void imapParser::parseSearch (parseString & result) } } -void imapParser::parseStatus (parseString & inWords) +void imapParser::parsetStatus (parseString & inWords) { lasStatus = imapInfo (); diff --git a/kioslaves/imap4/imapparser.h b/kioslaves/imap4/imapparser.h index 01eabd5ec..2cf9b3935 100644 --- a/kioslaves/imap4/imapparser.h +++ b/kioslaves/imap4/imapparser.h @@ -279,7 +279,7 @@ public: /** @brief parse a SEARCH line */ void parseSearch (parseString & result); /** @brief parse a STATUS line */ - void parseStatus (parseString & result); + void parsetStatus (parseString & result); /** @brief parse a EXISTS line */ void parseExists (ulong value, parseString & result); /** @brief parse a EXPUNGE line */ diff --git a/kioslaves/imap4/rfcdecoder.cc b/kioslaves/imap4/rfcdecoder.cc index 4eeb207d5..f91e9f8dc 100644 --- a/kioslaves/imap4/rfcdecoder.cc +++ b/kioslaves/imap4/rfcdecoder.cc @@ -653,13 +653,13 @@ rfcDecoder::decodeRFC2231String (const TQString & _str) { if (st.at (p) == 37) { - ch = st.tqat (p + 1).latin1 () - 48; + ch = st.at (p + 1).latin1 () - 48; if (ch > 16) ch -= 7; - ch2 = st.tqat (p + 2).latin1 () - 48; + ch2 = st.at (p + 2).latin1 () - 48; if (ch2 > 16) ch2 -= 7; - st.tqat (p) = ch * 16 + ch2; + st.at (p) = ch * 16 + ch2; st.remove (p + 1, 2); } p++; diff --git a/kioslaves/mbox/readmbox.cc b/kioslaves/mbox/readmbox.cc index f2af8716b..280bb4615 100644 --- a/kioslaves/mbox/readmbox.cc +++ b/kioslaves/mbox/readmbox.cc @@ -145,7 +145,7 @@ void ReadMBox::rewind() if( !m_stream ) return; //Rewinding not possible - m_stream->tqdevice()->reset(); + m_stream->device()->reset(); m_atend = m_stream->atEnd(); } diff --git a/kioslaves/mbox/stat.cc b/kioslaves/mbox/stat.cc index 6d5bf75a6..00285b149 100644 --- a/kioslaves/mbox/stat.cc +++ b/kioslaves/mbox/stat.cc @@ -50,7 +50,7 @@ KIO::UDSEntry Stat::stat( ReadMBox& mbox, const UrlInfo& info ) Stat::addAtom( entry, KIO::UDS_FILE_TYPE, S_IFREG ); Stat::addAtom( entry, KIO::UDS_MIME_TYPE, "message/rfc822" ); - url = TQString( "mbox:%1/%2" ).tqarg( info.filename(), mbox.currentID() ); + url = TQString( "mbox:%1/%2" ).arg( info.filename(), mbox.currentID() ); Stat::addAtom( entry, KIO::UDS_URL, url ); if( mbox.currentID().isEmpty() ) Stat::addAtom( entry, KIO::UDS_NAME, "foobar" ); @@ -79,7 +79,7 @@ KIO::UDSEntry Stat::statMessage( const UrlInfo& info ) { kdDebug() << "statMessage( " << info.url() << " )" << endl; KIO::UDSEntry entry; - TQString url = TQString( "mbox:%1" ).tqarg( info.url() ); + TQString url = TQString( "mbox:%1" ).arg( info.url() ); //Specific things for a message Stat::addAtom( entry, KIO::UDS_FILE_TYPE, S_IFREG ); diff --git a/kioslaves/sieve/sieve.cpp b/kioslaves/sieve/sieve.cpp index 1cec79c52..4e7e75d30 100644 --- a/kioslaves/sieve/sieve.cpp +++ b/kioslaves/sieve/sieve.cpp @@ -340,7 +340,7 @@ bool kio_sieveProtocol::connect(bool useTLSIfAvailable) if (isConnectionValid()) return true; - infoMessage(i18n("Connecting to %1...").tqarg( m_sServer)); + infoMessage(i18n("Connecting to %1...").arg( m_sServer)); if (m_connMode == CONNECTION_ORIENTED && m_shouldBeConnected) { error(ERR_CONNECTION_BROKEN, i18n("The connection to the server was lost.")); @@ -626,7 +626,7 @@ void kio_sieveProtocol::put(const KURL& url, int /*permissions*/, bool /*overwri error(ERR_UNSUPPORTED_PROTOCOL, i18n("A protocol error occurred " "while trying to negotiate script uploading.\n" "The server responded:\n%1") - .tqarg(r.getAction().right(r.getAction().length() - 3))); + .arg(r.getAction().right(r.getAction().length() - 3))); return; } }*/ @@ -672,7 +672,7 @@ void kio_sieveProtocol::put(const KURL& url, int /*permissions*/, bool /*overwri error(ERR_INTERNAL_SERVER, i18n("The script did not upload successfully.\n" "This is probably due to errors in the script.\n" - "The server responded:\n%1").tqarg(TQString(errmsg))); + "The server responded:\n%1").arg(TQString(errmsg))); // clear the rest of the incoming data receiveData(); @@ -680,7 +680,7 @@ void kio_sieveProtocol::put(const KURL& url, int /*permissions*/, bool /*overwri error(ERR_INTERNAL_SERVER, i18n("The script did not upload successfully.\n" "This is probably due to errors in the script.\n" - "The server responded:\n%1").tqarg(TQString(r.getKey()))); + "The server responded:\n%1").arg(TQString(r.getKey()))); } else error(ERR_INTERNAL_SERVER, i18n("The script did not upload successfully.\n" @@ -1016,7 +1016,7 @@ bool kio_sieveProtocol::saslInteract( void *in, AuthInfo &ai ) return true; } -#define SASLERROR error(ERR_COULD_NOT_AUTHENTICATE, i18n("An error occurred during authentication: %1").tqarg( \ +#define SASLERROR error(ERR_COULD_NOT_AUTHENTICATE, i18n("An error occurred during authentication: %1").arg( \ TQString::fromUtf8( sasl_errdetail( conn ) ))); bool kio_sieveProtocol::authenticate() @@ -1109,7 +1109,7 @@ bool kio_sieveProtocol::authenticate() sasl_dispose( &conn ); error(ERR_SLAVE_DEFINED, i18n("A protocol error occurred during authentication.\n" - "Choose a different authentication method to %1.").tqarg(mechusing)); + "Choose a different authentication method to %1.").arg(mechusing)); return false; } @@ -1121,7 +1121,7 @@ bool kio_sieveProtocol::authenticate() sasl_dispose( &conn ); error(ERR_UNSUPPORTED_PROTOCOL, i18n("A protocol error occurred during authentication.\n" - "Choose a different authentication method to %1.").tqarg(mechusing)); + "Choose a different authentication method to %1.").arg(mechusing)); return false; } @@ -1168,7 +1168,7 @@ bool kio_sieveProtocol::authenticate() return true; } else { // Authentication failed. - error(ERR_COULD_NOT_AUTHENTICATE, i18n("Authentication failed.\nMost likely the password is wrong.\nThe server responded:\n%1").tqarg( TQString(r.getAction()) ) ); + error(ERR_COULD_NOT_AUTHENTICATE, i18n("Authentication failed.\nMost likely the password is wrong.\nThe server responded:\n%1").arg( TQString(r.getAction()) ) ); return false; } } diff --git a/kitchensync/libqopensync/group.cpp b/kitchensync/libqopensync/group.cpp index 427a57c9e..bc94e2208 100644 --- a/kitchensync/libqopensync/group.cpp +++ b/kitchensync/libqopensync/group.cpp @@ -46,7 +46,7 @@ TQStringList GroupConfig::activeObjectTypes() const { Q_ASSERT( mGroup ); - const TQString fileName = TQString( "%1/filter.conf" ).tqarg( osync_group_get_configdir( mGroup ) ); + const TQString fileName = TQString( "%1/filter.conf" ).arg( osync_group_get_configdir( mGroup ) ); TQFile file( fileName ); if ( !file.open( IO_ReadOnly ) ) @@ -92,7 +92,7 @@ void GroupConfig::setActiveObjectTypes( const TQStringList &objectTypes ) element.appendChild( entry ); } - const TQString fileName = TQString( "%1/filter.conf" ).tqarg( osync_group_get_configdir( mGroup ) ); + const TQString fileName = TQString( "%1/filter.conf" ).arg( osync_group_get_configdir( mGroup ) ); TQFile file( fileName ); if ( !file.open( IO_WriteOnly ) ) diff --git a/kitchensync/libqopensync/member.cpp b/kitchensync/libqopensync/member.cpp index a2c2268e7..35cb04632 100644 --- a/kitchensync/libqopensync/member.cpp +++ b/kitchensync/libqopensync/member.cpp @@ -160,7 +160,7 @@ TQString Member::scanDevices( const TQString &query ) Q_ASSERT( mMember ); OSyncError *error = 0; - char *data = (char*)osync_member_call_plugin( mMember, "scan_tqdevices", const_cast<char*>( query.utf8().data() ), &error ); + char *data = (char*)osync_member_call_plugin( mMember, "scan_devices", const_cast<char*>( query.utf8().data() ), &error ); if ( error != 0 ) { osync_error_free( &error ); return TQString(); diff --git a/kitchensync/libqopensync/member.h b/kitchensync/libqopensync/member.h index 48a1164b1..6fa3ee737 100644 --- a/kitchensync/libqopensync/member.h +++ b/kitchensync/libqopensync/member.h @@ -107,7 +107,7 @@ class Member bool operator==( const Member& ) const; /** - This method can be used to query the plugin for scanning tqdevices. + This method can be used to query the plugin for scanning devices. The @param query is a plugin specific xml document as well as the return value. */ @@ -115,7 +115,7 @@ class Member /** This method can be used to test whether the plugin can connect - to the tqdevice with the given configuration. + to the device with the given configuration. */ bool testConnection( const TQString &configuration ); diff --git a/kitchensync/opensyncdbus/dbusclient.cpp b/kitchensync/opensyncdbus/dbusclient.cpp index 39cd1cc94..f53ee74e3 100644 --- a/kitchensync/opensyncdbus/dbusclient.cpp +++ b/kitchensync/opensyncdbus/dbusclient.cpp @@ -85,7 +85,7 @@ TQDBusMessage OpenSyncService::showMember( const TQDBusMessage &message ) if ( message.count() != 2 ) { return error( message, "arg_count", TQString("Wrong number of arguments. Expected 2, got %1.") - .tqarg( message.count() ) ); + .arg( message.count() ) ); } TQString groupName = message[ 0 ].toString(); @@ -111,14 +111,14 @@ TQDBusMessage OpenSyncService::showMember( const TQDBusMessage &message ) QSync::Group group = env.groupByName( groupName ); if ( !group.isValid() ) { return error( message, "group_name", TQString("Unknown group '%1'.") - .tqarg( groupName ) ); + .arg( groupName ) ); } QSync::Member member = group.memberById( memberId ); if ( !member.isValid() ) { return error( message, "member_id", - TQString("Unknown member id '%1' in group '%2'.").tqarg( groupName ) - .tqarg( memberId ) ); + TQString("Unknown member id '%1' in group '%2'.").arg( groupName ) + .arg( memberId ) ); } reply.append( memberId ); @@ -136,7 +136,7 @@ TQDBusMessage OpenSyncService::showGroup( const TQDBusMessage &message ) if ( message.count() != 1 ) { return error( message, "arg_count", TQString("Wrong number of arguments. Expected 1, got %1") - .tqarg( message.count() ) ); + .arg( message.count() ) ); } TQString groupName = message[ 0 ].toString(); @@ -156,7 +156,7 @@ TQDBusMessage OpenSyncService::showGroup( const TQDBusMessage &message ) QSync::Group group = env.groupByName( groupName ); if ( !group.isValid() ) { return error( message, "group_name", TQString("Unknown group '%1'") - .tqarg( groupName ) ); + .arg( groupName ) ); } QSync::Group::Iterator it( &group ); diff --git a/kitchensync/src/aboutpage.cpp b/kitchensync/src/aboutpage.cpp index 97ee86c0b..723f29743 100644 --- a/kitchensync/src/aboutpage.cpp +++ b/kitchensync/src/aboutpage.cpp @@ -55,11 +55,11 @@ AboutPage::AboutPage( TQWidget *parent ) TQString location = locate( "data", "kitchensync/about/main.html" ); TQString content = readFile( location ); - content = content.tqarg( locate( "data", "libtdepim/about/kde_infopage.css" ) ); + content = content.arg( locate( "data", "libtdepim/about/kde_infopage.css" ) ); if ( kapp->reverseLayout() ) - content = content.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "libtdepim/about/kde_infopage_rtl.css" ) ); + content = content.arg( "@import \"%1\";" ).arg( locate( "data", "libtdepim/about/kde_infopage_rtl.css" ) ); else - content = content.tqarg( "" ); + content = content.arg( "" ); KHTMLPart *part = new KHTMLPart( this ); tqlayout->addWidget( part->view() ); @@ -70,8 +70,8 @@ AboutPage::AboutPage( TQWidget *parent ) TQString catchPhrase( i18n( "Get Synchronized!" ) ); TQString quickDescription( i18n( "The KDE Synchronization Tool" ) ); - part->write( content.tqarg( TQFont().pointSize() + 2 ).tqarg( appName ) - .tqarg( catchPhrase ).tqarg( quickDescription ).tqarg( htmlText() ) ); + part->write( content.arg( TQFont().pointSize() + 2 ).arg( appName ) + .arg( catchPhrase ).arg( quickDescription ).arg( htmlText() ) ); part->end(); connect( part->browserExtension(), @@ -111,29 +111,29 @@ TQString AboutPage::htmlText() const "<tr><td><a href=\"%1\"><img width=\"%1\" height=\"%1\" src=\"%1\" /></a></td>" "<td><a href=\"%1\">%1</a><br><span id=\"subtext\"><nobr>%1</td></tr>" "</table>" ) - .tqarg( kapp->aboutData()->version() ) - .tqarg( i18n( "KitchenSync synchronizes your e-mail, addressbook, calendar, to-do list and more." ) ) - .tqarg( "help:/kitchensync" ) - .tqarg( iconSize ) - .tqarg( iconSize ) - .tqarg( handbook_icon_path ) - .tqarg( "help:/kitchensync" ) - .tqarg( i18n( "Read Manual" ) ) - .tqarg( i18n( "Learn more about KitchenSync and its components" ) ) - .tqarg( "http://pim.kde.org" ) - .tqarg( iconSize ) - .tqarg( iconSize ) - .tqarg( html_icon_path ) - .tqarg( "http://pim.kde.org" ) - .tqarg( i18n( "Visit KitchenSync Website" ) ) - .tqarg( i18n( "Access online resources and tutorials" ) ) - .tqarg( "exec:/addGroup" ) - .tqarg( iconSize ) - .tqarg( iconSize ) - .tqarg( wizard_icon_path ) - .tqarg( "exec:/addGroup" ) - .tqarg( i18n( "Add Synchronization Group" ) ) - .tqarg( i18n( "Create group of tqdevices for synchronization" ) ); + .arg( kapp->aboutData()->version() ) + .arg( i18n( "KitchenSync synchronizes your e-mail, addressbook, calendar, to-do list and more." ) ) + .arg( "help:/kitchensync" ) + .arg( iconSize ) + .arg( iconSize ) + .arg( handbook_icon_path ) + .arg( "help:/kitchensync" ) + .arg( i18n( "Read Manual" ) ) + .arg( i18n( "Learn more about KitchenSync and its components" ) ) + .arg( "http://pim.kde.org" ) + .arg( iconSize ) + .arg( iconSize ) + .arg( html_icon_path ) + .arg( "http://pim.kde.org" ) + .arg( i18n( "Visit KitchenSync Website" ) ) + .arg( i18n( "Access online resources and tutorials" ) ) + .arg( "exec:/addGroup" ) + .arg( iconSize ) + .arg( iconSize ) + .arg( wizard_icon_path ) + .arg( "exec:/addGroup" ) + .arg( i18n( "Add Synchronization Group" ) ) + .arg( i18n( "Create group of devices for synchronization" ) ); return info; } diff --git a/kitchensync/src/configguievo2.cpp b/kitchensync/src/configguievo2.cpp index 0c79fedf0..716bce78a 100644 --- a/kitchensync/src/configguievo2.cpp +++ b/kitchensync/src/configguievo2.cpp @@ -60,9 +60,9 @@ TQString ConfigGuiEvo2::save() const { TQString config = "<config>\n"; - config += TQString( "<address_path>%1</address_path>\n" ).tqarg( mAddressPath->url() ); - config += TQString( "<calendar_path>%1</calendar_path>\n" ).tqarg( mCalendarPath->url() ); - config += TQString( "<tasks_path>%1</tasks_path>\n" ).tqarg( mTasksPath->url() ); + config += TQString( "<address_path>%1</address_path>\n" ).arg( mAddressPath->url() ); + config += TQString( "<calendar_path>%1</calendar_path>\n" ).arg( mCalendarPath->url() ); + config += TQString( "<tasks_path>%1</tasks_path>\n" ).arg( mTasksPath->url() ); config += "</config>"; diff --git a/kitchensync/src/configguigpe.cpp b/kitchensync/src/configguigpe.cpp index 118aed14a..c6e6627f8 100644 --- a/kitchensync/src/configguigpe.cpp +++ b/kitchensync/src/configguigpe.cpp @@ -68,11 +68,11 @@ TQString ConfigGuiGpe::save() const { TQString config = "<config>"; - config += TQString( "<use_local>%1</use_local>" ).tqarg( mConnectionMode->currentItem() == 0 ); - config += TQString( "<use_ssh>%1</use_ssh>" ).tqarg( mConnectionMode->currentItem() == 1 ); - config += TQString( "<handheld_ip>%1</handheld_ip>" ).tqarg( mIP->text() ); - config += TQString( "<handheld_port>%1</handheld_port>" ).tqarg( mPort->value() ); - config += TQString( "<handheld_user>%1</handheld_user>" ).tqarg( mUser->text() ); + config += TQString( "<use_local>%1</use_local>" ).arg( mConnectionMode->currentItem() == 0 ); + config += TQString( "<use_ssh>%1</use_ssh>" ).arg( mConnectionMode->currentItem() == 1 ); + config += TQString( "<handheld_ip>%1</handheld_ip>" ).arg( mIP->text() ); + config += TQString( "<handheld_port>%1</handheld_port>" ).arg( mPort->value() ); + config += TQString( "<handheld_user>%1</handheld_user>" ).arg( mUser->text() ); config += "</config>"; diff --git a/kitchensync/src/configguijescs.cpp b/kitchensync/src/configguijescs.cpp index b7a94c447..158eb2253 100644 --- a/kitchensync/src/configguijescs.cpp +++ b/kitchensync/src/configguijescs.cpp @@ -61,13 +61,13 @@ TQString ConfigGuiJescs::save() const int delNotifyState; TQString config = "<config>\n"; - config += TQString( "<url>%1</url>\n" ).tqarg( mUrl->text() ); - config += TQString( "<username>%1</username>\n" ).tqarg( mUsername->text() ); - config += TQString( "<password>%1</password>\n" ).tqarg( mPassword->text() ); + config += TQString( "<url>%1</url>\n" ).arg( mUrl->text() ); + config += TQString( "<username>%1</username>\n" ).arg( mUsername->text() ); + config += TQString( "<password>%1</password>\n" ).arg( mPassword->text() ); if ( mDelNotify->isChecked() ) { delNotifyState = 1; } else { delNotifyState = 0; } - config += TQString( "<del_notify>%1</del_notify>\n" ).tqarg( delNotifyState ); + config += TQString( "<del_notify>%1</del_notify>\n" ).arg( delNotifyState ); config += "</config>"; diff --git a/kitchensync/src/configguildap.cpp b/kitchensync/src/configguildap.cpp index fd9dad4b6..417e58d0b 100644 --- a/kitchensync/src/configguildap.cpp +++ b/kitchensync/src/configguildap.cpp @@ -93,26 +93,26 @@ TQString ConfigGuiLdap::save() const { TQString config = "<config>\n"; - config += TQString( "<servername>%1</servername>\n" ).tqarg( mLdapWidget->host() ); - config += TQString( "<serverport>%1</serverport>\n" ).tqarg( mLdapWidget->port() ); - config += TQString( "<binddn>%1</binddn>\n" ).tqarg( mLdapWidget->bindDN() ); - config += TQString( "<password>%1</password>\n" ).tqarg( mLdapWidget->password() ); - config += TQString( "<anonymous>%1</anonymous>\n" ).tqarg( mLdapWidget->isAuthAnon() ? "1" : "0" ); - config += TQString( "<searchbase>%1</searchbase>\n" ).tqarg( mLdapWidget->dn() ); - config += TQString( "<searchfilter>%1</searchfilter>\n" ).tqarg( mLdapWidget->filter() ); - config += TQString( "<storebase>%1</storebase>\n" ).tqarg( mLdapWidget->dn() ); - config += TQString( "<keyattr>%1</keyattr>\n" ).tqarg( mKeyAttribute->text() ); + config += TQString( "<servername>%1</servername>\n" ).arg( mLdapWidget->host() ); + config += TQString( "<serverport>%1</serverport>\n" ).arg( mLdapWidget->port() ); + config += TQString( "<binddn>%1</binddn>\n" ).arg( mLdapWidget->bindDN() ); + config += TQString( "<password>%1</password>\n" ).arg( mLdapWidget->password() ); + config += TQString( "<anonymous>%1</anonymous>\n" ).arg( mLdapWidget->isAuthAnon() ? "1" : "0" ); + config += TQString( "<searchbase>%1</searchbase>\n" ).arg( mLdapWidget->dn() ); + config += TQString( "<searchfilter>%1</searchfilter>\n" ).arg( mLdapWidget->filter() ); + config += TQString( "<storebase>%1</storebase>\n" ).arg( mLdapWidget->dn() ); + config += TQString( "<keyattr>%1</keyattr>\n" ).arg( mKeyAttribute->text() ); TQStringList scopes; scopes << "base" << "one" << "sub"; - config += TQString( "<scope>%1</scope>\n" ).tqarg( scopes[ mSearchScope->currentItem() ] ); + config += TQString( "<scope>%1</scope>\n" ).arg( scopes[ mSearchScope->currentItem() ] ); config += TQString( "<authmech>SIMPLE</authmech>\n" ); - config += TQString( "<encryption>%1</encryption>\n" ).tqarg( mEncryption->isChecked() ? "1" : "0" ); + config += TQString( "<encryption>%1</encryption>\n" ).arg( mEncryption->isChecked() ? "1" : "0" ); - config += TQString( "<ldap_read>%1</ldap_read>\n" ).tqarg( mReadLdap->isChecked() ? "1" : "0" ); - config += TQString( "<ldap_write>%1</ldap_write>\n" ).tqarg( mWriteLdap->isChecked() ? "1" : "0" ); + config += TQString( "<ldap_read>%1</ldap_read>\n" ).arg( mReadLdap->isChecked() ? "1" : "0" ); + config += TQString( "<ldap_write>%1</ldap_write>\n" ).arg( mWriteLdap->isChecked() ? "1" : "0" ); config += "</config>"; diff --git a/kitchensync/src/configguimoto.cpp b/kitchensync/src/configguimoto.cpp index e461a808f..c44a2b406 100644 --- a/kitchensync/src/configguimoto.cpp +++ b/kitchensync/src/configguimoto.cpp @@ -43,7 +43,7 @@ void ConfigGuiMoto::load( const TQString &xml ) TQDomNode node; for( node = docElement.firstChild(); !node.isNull(); node = node.nextSibling() ) { TQDomElement element = node.toElement(); - if ( element.tagName() == "tqdevice" ) { + if ( element.tagName() == "device" ) { mDeviceString->setText( element.text() ); } } @@ -53,7 +53,7 @@ TQString ConfigGuiMoto::save() const { TQString config = "<config>\n"; - config += TQString( "<tqdevice>%1</tqdevice>\n" ).tqarg( mDeviceString->text() ); + config += TQString( "<device>%1</device>\n" ).arg( mDeviceString->text() ); config += "</config>"; diff --git a/kitchensync/src/configguiopie.cpp b/kitchensync/src/configguiopie.cpp index c74623345..64bd816f2 100644 --- a/kitchensync/src/configguiopie.cpp +++ b/kitchensync/src/configguiopie.cpp @@ -105,7 +105,7 @@ void ConfigGuiOpie::load( const TQString &xml ) mDeviceIP->setText( e.text() ); } else if ( e.tagName() == "port" ) { mPort->setValue( e.text().toInt() ); - } else if ( e.tagName() == "tqdevice" ) { + } else if ( e.tagName() == "device" ) { if ( e.text() == "opie" ) mDeviceType->setCurrentItem( 0 ); else @@ -126,7 +126,7 @@ TQString ConfigGuiOpie::save() const xml += "<username>" + mUserName->text() + "</username>"; xml += "<password>" + mPassword->text() + "</password>"; xml += "<url>" + mDeviceIP->text() + "</url>"; - xml += "<tqdevice>" + TQString( mDeviceType->currentItem() == 0 ? "opie" : "qtopia2" ) + "</tqdevice>"; + xml += "<device>" + TQString( mDeviceType->currentItem() == 0 ? "opie" : "qtopia2" ) + "</device>"; xml += "<port>" + TQString::number( mPort->value() ) + "</port>"; xml += "<conntype>" + TQString( mConnectionType->currentItem() == 0 ? "scp" : "ftp" ) + "</conntype>"; xml += "</config>"; diff --git a/kitchensync/src/configguisunbird.cpp b/kitchensync/src/configguisunbird.cpp index 041a8d1c0..99e86f3c7 100644 --- a/kitchensync/src/configguisunbird.cpp +++ b/kitchensync/src/configguisunbird.cpp @@ -140,10 +140,10 @@ TQString ConfigGuiSunbird::save() const for ( uint i = 0; i < mLocalList.count(); ++i ) { LocalCalendar *lcal = mLocalList[ i ]; config += TQString( "<file " ); - config += TQString( "path=\"%1\" " ).tqarg( lcal->mPathRequester->url() ); + config += TQString( "path=\"%1\" " ).arg( lcal->mPathRequester->url() ); if ( lcal->mDaysCheckBox->isChecked() ) { - config += TQString( "deletedaysold=\"%1\" " ).tqarg( lcal->mDaysSpinBox->value() ); + config += TQString( "deletedaysold=\"%1\" " ).arg( lcal->mDaysSpinBox->value() ); } if ( lcal->mDefaultCheckBox->isChecked() ) { config += TQString( "default=\"1\" " ); @@ -154,12 +154,12 @@ TQString ConfigGuiSunbird::save() const for ( uint i = 0; i < mWebdavList.count(); ++i ) { WebdavCalendar *wcal = mWebdavList[ i ]; config += TQString( "<webdav " ); - config += TQString( "username=\"%1\" " ).tqarg( wcal->mUsername->text() ); - config += TQString( "password=\"%1\" " ).tqarg( wcal->mPassword->text() ); - config += TQString( "url=\"%1\" " ).tqarg( wcal->mUrl->text() ); + config += TQString( "username=\"%1\" " ).arg( wcal->mUsername->text() ); + config += TQString( "password=\"%1\" " ).arg( wcal->mPassword->text() ); + config += TQString( "url=\"%1\" " ).arg( wcal->mUrl->text() ); if ( wcal->mDaysCheckBox->isChecked() ) { - config += TQString( "deletedaysold=\"%1\" " ).tqarg( wcal->mDaysSpinBox->value() ); + config += TQString( "deletedaysold=\"%1\" " ).arg( wcal->mDaysSpinBox->value() ); } if ( wcal->mDefaultCheckBox->isChecked() ) { config += TQString( "default=\"1\" " ); diff --git a/kitchensync/src/configguisynce.cpp b/kitchensync/src/configguisynce.cpp index 898300769..b83e85683 100644 --- a/kitchensync/src/configguisynce.cpp +++ b/kitchensync/src/configguisynce.cpp @@ -60,10 +60,10 @@ TQString ConfigGuiSynce::save() const { TQString config = "<config>\n"; - config += TQString( "<contact>%1</contact>\n" ).tqarg( mContacts->isChecked() ? "1" : "0" ); - config += TQString( "<todos>%1</todos>\n" ).tqarg( mTodos->isChecked() ? "1" : "0" ); - config += TQString( "<calendar>%1</calendar>\n" ).tqarg( mCalendar->isChecked() ? "1" : "0" ); - config += TQString( "<file>%1</file>\n" ).tqarg( mFile->text() ); + config += TQString( "<contact>%1</contact>\n" ).arg( mContacts->isChecked() ? "1" : "0" ); + config += TQString( "<todos>%1</todos>\n" ).arg( mTodos->isChecked() ? "1" : "0" ); + config += TQString( "<calendar>%1</calendar>\n" ).arg( mCalendar->isChecked() ? "1" : "0" ); + config += TQString( "<file>%1</file>\n" ).arg( mFile->text() ); config += "</config>"; diff --git a/kitchensync/src/configguisyncmlobex.cpp b/kitchensync/src/configguisyncmlobex.cpp index 61833b4eb..372cf9261 100644 --- a/kitchensync/src/configguisyncmlobex.cpp +++ b/kitchensync/src/configguisyncmlobex.cpp @@ -246,7 +246,7 @@ TQString ConfigGuiSyncmlObex::save() const ConnectionTypeList::ConstIterator it; for ( it = mConnectionTypes.begin(); it != mConnectionTypes.end(); it++ ) { if ( mConnection->currentText() == (*it).second ) { - xml += "<type>" + TQString("%1").tqarg((*it).first) + "</type>\n"; + xml += "<type>" + TQString("%1").arg((*it).first) + "</type>\n"; break; } } @@ -264,7 +264,7 @@ TQString ConfigGuiSyncmlObex::save() const SyncmlVersionList::ConstIterator itVersion; for ( itVersion = mSyncmlVersions.begin(); itVersion != mSyncmlVersions.end(); itVersion++ ) { if ( mSyncmlVersion->currentText() == (*itVersion).second ) { - xml += "<version>" + TQString("%1").tqarg((*itVersion).first) + "</version>\n"; + xml += "<version>" + TQString("%1").arg((*itVersion).first) + "</version>\n"; break; } } diff --git a/kitchensync/src/genericdiffalgo.cpp b/kitchensync/src/genericdiffalgo.cpp index 209382ed7..21b83f454 100644 --- a/kitchensync/src/genericdiffalgo.cpp +++ b/kitchensync/src/genericdiffalgo.cpp @@ -57,11 +57,11 @@ void GenericDiffAlgo::run() for ( uint i = 0; i < lines; ++i ) { if ( i < leftList.count() && i < rightList.count() ) { if ( !compareString( leftList[ i ], rightList[ i ] ) ) - conflictField( i18n( "Line %1" ).tqarg( i ), leftList[ i ], rightList[ i ] ); + conflictField( i18n( "Line %1" ).arg( i ), leftList[ i ], rightList[ i ] ); } else if ( i < leftList.count() && i >= rightList.count() ) { - additionalLeftField( i18n( "Line %1" ).tqarg( i ), leftList[ i ] ); + additionalLeftField( i18n( "Line %1" ).arg( i ), leftList[ i ] ); } else if ( i >= leftList.count() && i < rightList.count() ) { - additionalRightField( i18n( "Line %1" ).tqarg( i ), rightList[ i ] ); + additionalRightField( i18n( "Line %1" ).arg( i ), rightList[ i ] ); } } diff --git a/kitchensync/src/groupconfig.cpp b/kitchensync/src/groupconfig.cpp index 1cb95ebd2..cfedcbfad 100644 --- a/kitchensync/src/groupconfig.cpp +++ b/kitchensync/src/groupconfig.cpp @@ -131,7 +131,7 @@ void GroupConfig::updateMembers() QSync::Member member = *it; MemberInfo mi( member ); TQFrame *page = mMemberView->addPage( mi.name(), - TQString( "%1 (%2)" ).tqarg( mi.name() ).tqarg(member.pluginName()), mi.desktopIcon() ); + TQString( "%1 (%2)" ).arg( mi.name() ).arg(member.pluginName()), mi.desktopIcon() ); TQBoxLayout *pageLayout = new TQVBoxLayout( page ); mConfigPages.append( page ); @@ -165,7 +165,7 @@ void GroupConfig::addMember() QSync::Result result = SyncProcessManager::self()->addMember( mProcess, plugin ); if ( result.isError() ) { KMessageBox::error( this, i18n("Error adding member %1\n%2\nType: %3") - .tqarg( plugin.name() ).tqarg( result.message() ).tqarg( result.type() ) ); + .arg( plugin.name() ).arg( result.message() ).arg( result.type() ) ); } else { updateMembers(); diff --git a/kitchensync/src/groupitem.cpp b/kitchensync/src/groupitem.cpp index acfd73e5f..5409fc171 100644 --- a/kitchensync/src/groupitem.cpp +++ b/kitchensync/src/groupitem.cpp @@ -139,11 +139,11 @@ void GroupItem::update() { clear(); - mGroupName->setText( i18n( "Group: %1" ).tqarg( mSyncProcess->group().name() ) ); + mGroupName->setText( i18n( "Group: %1" ).arg( mSyncProcess->group().name() ) ); TQDateTime dateTime = mSyncProcess->group().lastSynchronization(); if ( dateTime.isValid() ) - mTime->setText( i18n( "Last synchronized on: %1" ).tqarg( KGlobal::locale()->formatDateTime( dateTime ) ) ); + mTime->setText( i18n( "Last synchronized on: %1" ).arg( KGlobal::locale()->formatDateTime( dateTime ) ) ); else mTime->setText( i18n( "Not synchronized yet" ) ); @@ -157,7 +157,7 @@ void GroupItem::update() for ( ; memberIt != memberEndIt; ++memberIt ) { MemberItem *item = new MemberItem( mBox, mSyncProcess, *memberIt ); item->show(); - item->seStatusMessage( i18n( "Ready" ) ); + item->setStatusMessage( i18n( "Ready" ) ); mMemberItems.append( item ); } } @@ -189,14 +189,14 @@ void GroupItem::change( const QSync::SyncChangeUpdate &update ) switch ( update.type() ) { case QSync::SyncChangeUpdate::Received: mProcessedItems++; - mStatus->setText( i18n( "%1 entries read" ).tqarg( mProcessedItems ) ); + mStatus->setText( i18n( "%1 entries read" ).arg( mProcessedItems ) ); break; case QSync::SyncChangeUpdate::ReceivedInfo: mStatus->setText( i18n( "Receive information" ) ); break; case QSync::SyncChangeUpdate::Sent: mProcessedItems--; - mStatus->setText( i18n( "%1 entries written" ).tqarg( mMaxProcessedItems - mProcessedItems ) ); + mStatus->setText( i18n( "%1 entries written" ).arg( mMaxProcessedItems - mProcessedItems ) ); mProgressBar->show(); @@ -286,31 +286,31 @@ void GroupItem::member( const QSync::SyncMemberUpdate &update ) if ( (*it)->member() == update.member() ) { switch ( update.type() ) { case QSync::SyncMemberUpdate::Connected: - (*it)->seStatusMessage( i18n( "Connected" ) ); + (*it)->setStatusMessage( i18n( "Connected" ) ); break; case QSync::SyncMemberUpdate::SentChanges: - (*it)->seStatusMessage( i18n( "Changes read" ) ); + (*it)->setStatusMessage( i18n( "Changes read" ) ); break; case QSync::SyncMemberUpdate::CommittedAll: - (*it)->seStatusMessage( i18n( "Changes written" ) ); + (*it)->setStatusMessage( i18n( "Changes written" ) ); break; case QSync::SyncMemberUpdate::Disconnected: - (*it)->seStatusMessage( i18n( "Disconnected" ) ); + (*it)->setStatusMessage( i18n( "Disconnected" ) ); break; case QSync::SyncMemberUpdate::ConnectError: - (*it)->seStatusMessage( i18n( "Error: %1" ).tqarg( update.result().message() ) ); + (*it)->setStatusMessage( i18n( "Error: %1" ).arg( update.result().message() ) ); break; case QSync::SyncMemberUpdate::GetChangesError: - (*it)->seStatusMessage( i18n( "Error: %1" ).tqarg( update.result().message() ) ); + (*it)->setStatusMessage( i18n( "Error: %1" ).arg( update.result().message() ) ); break; case QSync::SyncMemberUpdate::CommittedAllError: - (*it)->seStatusMessage( i18n( "Error: %1" ).tqarg( update.result().message() ) ); + (*it)->setStatusMessage( i18n( "Error: %1" ).arg( update.result().message() ) ); break; case QSync::SyncMemberUpdate::SyncDoneError: - (*it)->seStatusMessage( i18n( "Error: %1" ).tqarg( update.result().message() ) ); + (*it)->setStatusMessage( i18n( "Error: %1" ).arg( update.result().message() ) ); break; case QSync::SyncMemberUpdate::DisconnectedError: - (*it)->seStatusMessage( i18n( "Error: %1" ).tqarg( update.result().message() ) ); + (*it)->setStatusMessage( i18n( "Error: %1" ).arg( update.result().message() ) ); break; default: break; @@ -381,7 +381,7 @@ MemberItem::MemberItem( TQWidget *parent, SyncProcess *process, mDescription->setText( plugin.longName() ); } -void MemberItem::seStatusMessage( const TQString &msg ) +void MemberItem::setStatusMessage( const TQString &msg ) { mStatus->setText( msg ); } diff --git a/kitchensync/src/groupitem.h b/kitchensync/src/groupitem.h index 338c733df..94eb0fc35 100644 --- a/kitchensync/src/groupitem.h +++ b/kitchensync/src/groupitem.h @@ -97,7 +97,7 @@ class MemberItem : public TQWidget SyncProcess* syncProcess() const { return mSyncProcess; } QSync::Member member() const { return mMember; } - void seStatusMessage( const TQString &msg ); + void setStatusMessage( const TQString &msg ); private: SyncProcess *mSyncProcess; diff --git a/kitchensync/src/htmldiffalgodisplay.cpp b/kitchensync/src/htmldiffalgodisplay.cpp index 9558eaecd..1b4c2fe1b 100644 --- a/kitchensync/src/htmldiffalgodisplay.cpp +++ b/kitchensync/src/htmldiffalgodisplay.cpp @@ -45,13 +45,13 @@ void HTMLDiffAlgoDisplay::begin() mText.append( "<html>" ); mText.append( TQString( "<body text=\"%1\" bgcolor=\"%2\">" ) - .tqarg( KGlobalSettings::textColor().name() ) - .tqarg( KGlobalSettings::baseColor().name() ) ); + .arg( KGlobalSettings::textColor().name() ) + .arg( KGlobalSettings::baseColor().name() ) ); mText.append( "<center><table>" ); mText.append( TQString( "<tr><th></th><th align=\"center\">%1</th><td> </td><th align=\"center\">%2</th></tr>" ) - .tqarg( mLeftTitle ) - .tqarg( mRightTitle ) ); + .arg( mLeftTitle ) + .arg( mRightTitle ) ); } void HTMLDiffAlgoDisplay::end() @@ -76,22 +76,22 @@ void HTMLDiffAlgoDisplay::setRightSourceTitle( const TQString &title ) void HTMLDiffAlgoDisplay::additionalLeftField( const TQString &id, const TQString &value ) { mText.append( TQString( "<tr><td align=\"right\"><b>%1:</b></td><td bgcolor=\"#9cff83\">%2</td><td></td><td></td></tr>" ) - .tqarg( id ) - .tqarg( textToHTML( value ) ) ); + .arg( id ) + .arg( textToHTML( value ) ) ); } void HTMLDiffAlgoDisplay::additionalRightField( const TQString &id, const TQString &value ) { mText.append( TQString( "<tr><td align=\"right\"><b>%1:</b></td><td></td><td></td><td bgcolor=\"#9cff83\">%2</td></tr>" ) - .tqarg( id ) - .tqarg( textToHTML( value ) ) ); + .arg( id ) + .arg( textToHTML( value ) ) ); } void HTMLDiffAlgoDisplay::conflictField( const TQString &id, const TQString &leftValue, const TQString &rightValue ) { mText.append( TQString( "<tr><td align=\"right\"><b>%1:</b></td><td bgcolor=\"#ff8686\">%2</td><td></td><td bgcolor=\"#ff8686\">%3</td></tr>" ) - .tqarg( id ) - .tqarg( textToHTML( leftValue ) ) - .tqarg( textToHTML( rightValue ) ) ); + .arg( id ) + .arg( textToHTML( leftValue ) ) + .arg( textToHTML( rightValue ) ) ); } diff --git a/kitchensync/src/mainwidget.cpp b/kitchensync/src/mainwidget.cpp index 8dbef8cab..51543c059 100644 --- a/kitchensync/src/mainwidget.cpp +++ b/kitchensync/src/mainwidget.cpp @@ -141,7 +141,7 @@ void MainWidget::deleteGroup() SyncProcess *syncProcess = mGroupView->selectedSyncProcess(); if ( syncProcess ) { int result = KMessageBox::warningContinueCancel( this, - i18n("Delete synchronization group '%1'?").tqarg( syncProcess->group().name() ) ); + i18n("Delete synchronization group '%1'?").arg( syncProcess->group().name() ) ); if ( result == KMessageBox::Continue ) { SyncProcessManager::self()->remove( syncProcess ); enableActions(); diff --git a/kitchensync/src/memberconfig.cpp b/kitchensync/src/memberconfig.cpp index c2216546c..37755a504 100644 --- a/kitchensync/src/memberconfig.cpp +++ b/kitchensync/src/memberconfig.cpp @@ -51,7 +51,7 @@ void MemberConfig::loadData() if ( error ) { KMessageBox::error( this, i18n("Unable to read config from plugin '%1':\n%2") - .tqarg( mMember.pluginName() ).tqarg( error.message() ) ); + .arg( mMember.pluginName() ).arg( error.message() ) ); } else { TQString txt = TQString::fromUtf8( cfg.data(), cfg.size() ); mGui->load( txt ); @@ -65,7 +65,7 @@ void MemberConfig::saveData() TQString txt = mGui->save(); if ( txt.isEmpty() ) { - KMessageBox::sorry( this, i18n("Configuration of %1 is empty.").tqarg( mMember.pluginName() ) ); + KMessageBox::sorry( this, i18n("Configuration of %1 is empty.").arg( mMember.pluginName() ) ); } else { TQByteArray cfg = txt.utf8(); cfg.truncate(cfg.size() - 1); /* discard NUL terminator */ diff --git a/kitchensync/src/syncprocessmanager.cpp b/kitchensync/src/syncprocessmanager.cpp index 67fe3095c..fda111efd 100644 --- a/kitchensync/src/syncprocessmanager.cpp +++ b/kitchensync/src/syncprocessmanager.cpp @@ -47,7 +47,7 @@ SyncProcessManager::SyncProcessManager() QSync::Result result = mEnvironment->initialize(); if ( result.isError() ) { KMessageBox::error( 0, i18n("Error initializing OpenSync.\n%1") - .tqarg( result.message() ) ); + .arg( result.message() ) ); } else { init( mEnvironment ); } diff --git a/kmail/ChangeLog b/kmail/ChangeLog index 8c7c6664c..8dddd3001 100644 --- a/kmail/ChangeLog +++ b/kmail/ChangeLog @@ -184,7 +184,7 @@ please visit http://webcvs.kde.org Do the right thing when sending to "me@there (John Doe)" Waldo's folderless-acount-segv-fix More against destroyed last char in message - Better long/normal folder-list tqgeometry bugfix + Better long/normal folder-list geometry bugfix Don't quit while sending, and show a label while you send. 1999-02-03 Sven Radej <radej@kde.org> (KMail-1.0.16) @@ -553,7 +553,7 @@ Sun Sep 6 18:28:45 1998 Markus Wuebben <markus@kde.org> quoted text to catch smileys at the beginning of the line ;-) - * Main window configuration (tqgeometry, etc.) is now + * Main window configuration (geometry, etc.) is now stored again. * Composer: changed completion key from Ctrl-. to Ctrl-T diff --git a/kmail/Mainpage.dox b/kmail/Mainpage.dox index 05802ef7c..cdab18acb 100644 --- a/kmail/Mainpage.dox +++ b/kmail/Mainpage.dox @@ -589,11 +589,11 @@ Strategy: case. These are messages that have neither an In-Reply-To header nor a References header and have a subject that is not prefixed. In case there is a perfect parent, the current sort cache item is - appended to the parents list of unsorted tqchildren, or to that of + appended to the parents list of unsorted children, or to that of root, if there is not. A sort cache item is created in the mSortCache for the parent, if it is not already there. Messages with a parent of -1 are appended to the "unparented" list, which is later traversed and - its elements threaded. Messages with -2 as the parent are tqchildren of + its elements threaded. Messages with -2 as the parent are children of root as well, as noted above, and will remain so. Once the end of the file is reached, we should have a nicely filled @@ -677,13 +677,13 @@ Strategy: cache items happen at the same time. As previously mentioned (or not) each sort cache item holds a list of its - sorted and one of its unsorted tqchildren. Starting with the root node the + sorted and one of its unsorted children. Starting with the root node the unsorted list is first qsorted, and then merged with the list of already - sorted tqchildren. To achieve that, the heads of both lists are compared and + sorted children. To achieve that, the heads of both lists are compared and the one with the "better" key is added to the list view next by creating a KMHeaderListItem for it. That header item receives both its sort key as well as its id from the sort cache item. Should the current sort cache item have - tqchildren, it is added to the end of a queue of nodes to repeat these steps + children, it is added to the end of a queue of nodes to repeat these steps on after the current level is sorted. This way, a breadth first merge sort is performed on the sort cache items and header items are created at each node. @@ -714,7 +714,7 @@ What happens when a message arrives in the folder? After those house keeping tasks are performed, the list of as of yet imper- fectly threaded messages is traversed and our newly arrived message is considered as a new parent for each item on it. This is especially important - to ensure that parents arriving out of order after their tqchildren still end + to ensure that parents arriving out of order after their children still end up as parents. If necessary, the entries in the .sorted file of rethreaded messages are updated. An entry for the new message itself is appended to the .sorted file as well. @@ -732,9 +732,9 @@ What happens when a message is removed from the folder? In this case the msgRemoved slot kicks in and updates the headers list. First the sort cache item and header item representing our message are removed from the data structures and the ids of all items after it in the store decre- - mented. Then a list of tqchildren of the message is assembled containing those - tqchildren that have to be reparented now that our message has gone away. If - one of those tqchildren has been marked as toBeDeleted, it is simply added to + mented. Then a list of children of the message is assembled containing those + children that have to be reparented now that our message has gone away. If + one of those children has been marked as toBeDeleted, it is simply added to root at top level, because there is no need to find a parent for it if it is to go away as well. This is an optimization to avoid rethreading all messages in a thread when deleting several messages in a thread, or even the @@ -743,7 +743,7 @@ What happens when a message is removed from the folder? can be avoided. Note that that does not work when moving messages via filter action. - That list of tqchildren is then traversed and a new parent found for each one + That list of children is then traversed and a new parent found for each one using, again, findParent and findParentBySubject. When a message becomes imperfectly threaded in the process, it is added to the corresponding list. diff --git a/kmail/accountdialog.cpp b/kmail/accountdialog.cpp index 3712346ec..fd29fa197 100644 --- a/kmail/accountdialog.cpp +++ b/kmail/accountdialog.cpp @@ -1191,7 +1191,7 @@ void AccountDialog::setupSettings() mPop.loginEdit->setText( ap.login() ); mPop.passwordEdit->setText( ap.passwd()); mPop.hostEdit->setText( ap.host() ); - mPop.portEdit->setText( TQString("%1").tqarg( ap.port() ) ); + mPop.portEdit->setText( TQString("%1").arg( ap.port() ) ); mPop.usePipeliningCheck->setChecked( ap.usePipelining() ); mPop.storePasswordCheck->setChecked( ap.storePasswd() ); mPop.leaveOnServerCheck->setChecked( ap.leaveOnServer() ); @@ -1256,7 +1256,7 @@ void AccountDialog::setupSettings() mImap.loginEdit->setText( ai.login() ); mImap.passwordEdit->setText( ai.passwd()); mImap.hostEdit->setText( ai.host() ); - mImap.portEdit->setText( TQString("%1").tqarg( ai.port() ) ); + mImap.portEdit->setText( TQString("%1").arg( ai.port() ) ); mImap.autoExpungeCheck->setChecked( ai.autoExpunge() ); mImap.hiddenFoldersCheck->setChecked( ai.hiddenFolders() ); mImap.subscribedFoldersCheck->setChecked( ai.onlySubscribedFolders() ); @@ -1309,7 +1309,7 @@ void AccountDialog::setupSettings() mImap.loginEdit->setText( ai.login() ); mImap.passwordEdit->setText( ai.passwd()); mImap.hostEdit->setText( ai.host() ); - mImap.portEdit->setText( TQString("%1").tqarg( ai.port() ) ); + mImap.portEdit->setText( TQString("%1").arg( ai.port() ) ); #if 0 mImap.resourceCheck->setChecked( ai.resource() ); #endif @@ -2293,7 +2293,7 @@ NamespaceEditDialog::NamespaceEditDialog( TQWidget *parent, } else { ns = i18n("Shared"); } - setCaption( i18n("Edit Namespace '%1'").tqarg(ns) ); + setCaption( i18n("Edit Namespace '%1'").arg(ns) ); TQGrid* grid = new TQGrid( 2, page ); mBg = new TQButtonGroup( 0 ); diff --git a/kmail/accountmanager.cpp b/kmail/accountmanager.cpp index a086292a8..0610622f7 100644 --- a/kmail/accountmanager.cpp +++ b/kmail/accountmanager.cpp @@ -100,7 +100,7 @@ void AccountManager::readConfig(void) acctType = "pop"; acctName = config->readEntry("Name"); id = config->readUnsignedNumEntry("Id", 0); - if (acctName.isEmpty()) acctName = i18n("Account %1").tqarg(i); + if (acctName.isEmpty()) acctName = i18n("Account %1").arg(i); acct = create(acctType, acctName, id); if (!acct) continue; add(acct); @@ -155,7 +155,7 @@ void AccountManager::processNextCheck( bool _newMail ) if ( mAcctChecking.isEmpty() ) { // all checks finished, display summary if ( mDisplaySummary ) - KPIM::BroadcastStatus::instance()->seStatusMsgTransmissionCompleted( + KPIM::BroadcastStatus::instance()->setStatusMsgTransmissionCompleted( mTotalNewMailsArrived ); emit checkedMail( mNewMailArrived, mInteractive, mTotalNewInFolder ); mTotalNewMailsArrived = 0; @@ -183,7 +183,7 @@ void AccountManager::processNextCheck( bool _newMail ) TQString tmp = i18n("Account %1 has no mailbox defined:\n" "mail checking aborted;\n" "check your account settings.") - .tqarg(curAccount->name()); + .arg(curAccount->name()); KMessageBox::information(0,tmp); emit checkedMail( false, mInteractive, mTotalNewInFolder ); mTotalNewMailsArrived = 0; @@ -222,8 +222,8 @@ void AccountManager::processNextCheck( bool _newMail ) connect( curAccount, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ), this, TQT_SLOT( processNextCheck( bool ) ) ); - KPIM::BroadcastStatus::instance()->seStatusMsg( - i18n("Checking account %1 for new mail").tqarg(curAccount->name())); + KPIM::BroadcastStatus::instance()->setStatusMsg( + i18n("Checking account %1 for new mail").arg(curAccount->name())); kdDebug(5006) << "processing next mail check for " << curAccount->name() << endl; diff --git a/kmail/accountwizard.cpp b/kmail/accountwizard.cpp index 6a188fbb5..caafcb353 100644 --- a/kmail/accountwizard.cpp +++ b/kmail/accountwizard.cpp @@ -516,7 +516,7 @@ void AccountWizard::checkPopCapabilities( const TQString &server, int port ) connect( mServerTest, TQT_SIGNAL( capabilities( const TQStringList&, const TQStringList& ) ), this, TQT_SLOT( popCapabilities( const TQStringList&, const TQStringList& ) ) ); - mAuthInfoLabel = createInfoLabel( i18n( "Check for supported security capabilities of %1..." ).tqarg( server ) ); + mAuthInfoLabel = createInfoLabel( i18n( "Check for supported security capabilities of %1..." ).arg( server ) ); } void AccountWizard::checkImapCapabilities( const TQString &server, int port ) @@ -527,7 +527,7 @@ void AccountWizard::checkImapCapabilities( const TQString &server, int port ) connect( mServerTest, TQT_SIGNAL( capabilities( const TQStringList&, const TQStringList& ) ), this, TQT_SLOT( imapCapabilities( const TQStringList&, const TQStringList& ) ) ); - mAuthInfoLabel = createInfoLabel( i18n( "Check for supported security capabilities of %1..." ).tqarg( server ) ); + mAuthInfoLabel = createInfoLabel( i18n( "Check for supported security capabilities of %1..." ).arg( server ) ); } void AccountWizard::checkSmtpCapabilities( const TQString &server, int port ) @@ -540,7 +540,7 @@ void AccountWizard::checkSmtpCapabilities( const TQString &server, int port ) this, TQT_SLOT( smtpCapabilities( const TQStringList&, const TQStringList&, const TQString&, const TQString&, const TQString& ) ) ); - mAuthInfoLabel = createInfoLabel( i18n( "Check for supported security capabilities of %1..." ).tqarg( server ) ); + mAuthInfoLabel = createInfoLabel( i18n( "Check for supported security capabilities of %1..." ).arg( server ) ); } void AccountWizard::popCapabilities( const TQStringList &capaNormalList, diff --git a/kmail/actionscheduler.cpp b/kmail/actionscheduler.cpp index f699ff906..215e54511 100644 --- a/kmail/actionscheduler.cpp +++ b/kmail/actionscheduler.cpp @@ -454,7 +454,7 @@ void ActionScheduler::messageFetched( KMMessage *msg ) serNumS.setNum( msg->getMsgSerNum() ); KMMessage *newMsg = new KMMessage; newMsg->fromString(msg->asString()); - newMsg->seStatus(msg->status()); + newMsg->setStatus(msg->status()); newMsg->setComplete(msg->isComplete()); newMsg->setHeaderField( "X-KMail-Filtered", serNumS ); mSrcFolder->addMsg( newMsg ); @@ -625,7 +625,7 @@ void ActionScheduler::actionMessage(KMFilterAction::ReturnCode res) if (msg) { if ( FilterLog::instance()->isLogging() ) { TQString logText( i18n( "<b>Applying filter action:</b> %1" ) - .tqarg( mFilterAction->displayString() ) ); + .arg( mFilterAction->displayString() ) ); FilterLog::instance()->add( logText, FilterLog::appliedAction ); } KMFilterAction *action = mFilterAction; @@ -786,19 +786,19 @@ TQString ActionScheduler::debug() TQValueList<ActionScheduler*>::iterator it; int i = 1; for ( it = schedulerList->begin(); it != schedulerList->end(); ++it ) { - res.append( TQString( "ActionScheduler #%1.\n" ).tqarg( i ) ); + res.append( TQString( "ActionScheduler #%1.\n" ).arg( i ) ); if ((*it)->mAccount && kmkernel->find( (*it)->mAccountId )) { res.append( TQString( "Account %1, Name %2.\n" ) - .tqarg( (*it)->mAccountId ) - .tqarg( kmkernel->acctMgr()->find( (*it)->mAccountId )->name() ) ); + .arg( (*it)->mAccountId ) + .arg( kmkernel->acctMgr()->find( (*it)->mAccountId )->name() ) ); } - res.append( TQString( "mExecuting %1, " ).tqarg( (*it)->mExecuting ? "true" : "false" ) ); - res.append( TQString( "mExecutingLock %1, " ).tqarg( (*it)->mExecutingLock ? "true" : "false" ) ); - res.append( TQString( "mFetchExecuting %1.\n" ).tqarg( (*it)->mFetchExecuting ? "true" : "false" ) ); - res.append( TQString( "mOriginalSerNum %1.\n" ).tqarg( (*it)->mOriginalSerNum ) ); - res.append( TQString( "mMessageIt %1.\n" ).tqarg( ((*it)->mMessageIt != 0) ? *(*it)->mMessageIt : 0 ) ); - res.append( TQString( "mSerNums count %1, " ).tqarg( (*it)->mSerNums.count() ) ); - res.append( TQString( "mFetchSerNums count %1.\n" ).tqarg( (*it)->mFetchSerNums.count() ) ); + res.append( TQString( "mExecuting %1, " ).arg( (*it)->mExecuting ? "true" : "false" ) ); + res.append( TQString( "mExecutingLock %1, " ).arg( (*it)->mExecutingLock ? "true" : "false" ) ); + res.append( TQString( "mFetchExecuting %1.\n" ).arg( (*it)->mFetchExecuting ? "true" : "false" ) ); + res.append( TQString( "mOriginalSerNum %1.\n" ).arg( (*it)->mOriginalSerNum ) ); + res.append( TQString( "mMessageIt %1.\n" ).arg( ((*it)->mMessageIt != 0) ? *(*it)->mMessageIt : 0 ) ); + res.append( TQString( "mSerNums count %1, " ).arg( (*it)->mSerNums.count() ) ); + res.append( TQString( "mFetchSerNums count %1.\n" ).arg( (*it)->mFetchSerNums.count() ) ); res.append( TQString( "mResult " ) ); if ((*it)->mResult == ResultOk) res.append( TQString( "ResultOk.\n" ) ); diff --git a/kmail/antispamconfig.cpp b/kmail/antispamconfig.cpp index 500529953..0cb047fd4 100644 --- a/kmail/antispamconfig.cpp +++ b/kmail/antispamconfig.cpp @@ -59,7 +59,7 @@ void AntiSpamConfig::readConfig() KConfigGroup general( &config, "General" ); unsigned int totalTools = general.readUnsignedNumEntry( "tools", 0 ); for ( unsigned int i = 1; i <= totalTools; ++i ) { - KConfigGroup tool( &config, TQString("Spamtool #%1").tqarg( i ) ); + KConfigGroup tool( &config, TQString("Spamtool #%1").arg( i ) ); if ( tool.hasKey( "ScoreHeader" ) ) { TQString name = tool.readEntry( "ScoreName" ); TQCString header = tool.readEntry( "ScoreHeader" ).latin1(); diff --git a/kmail/antispamwizard.cpp b/kmail/antispamwizard.cpp index e0b40fc67..533ee379a 100644 --- a/kmail/antispamwizard.cpp +++ b/kmail/antispamwizard.cpp @@ -495,7 +495,7 @@ void AntiSpamWizard::checkToolAvailability() bool found = false; for ( TQValueListIterator<SpamToolConfig> it = mToolList.begin(); it != mToolList.end(); ++it ) { - TQString text( i18n("Scanning for %1...").tqarg( (*it).getId() ) ); + TQString text( i18n("Scanning for %1...").arg( (*it).getId() ) ); mInfoPage->setScanProgressText( text ); if ( (*it).isSpamTool() && (*it).isServerBased() ) { // check the configured account for pattern in <server> @@ -702,7 +702,7 @@ void AntiSpamWizard::ConfigReader::readAndMergeConfig() int registeredTools = general.readNumEntry( "tools", 0 ); for (int i = 1; i <= registeredTools; i++) { - KConfigGroup toolConfig( mConfig, groupName.tqarg( i ) ); + KConfigGroup toolConfig( mConfig, groupName.arg( i ) ); if( !toolConfig.readBoolEntry( "HeadersOnly", false ) ) mToolList.append( readToolConfig( toolConfig ) ); } @@ -714,7 +714,7 @@ void AntiSpamWizard::ConfigReader::readAndMergeConfig() int user_registeredTools = user_general.readNumEntry( "tools", 0 ); for (int i = 1; i <= user_registeredTools; i++) { - KConfigGroup toolConfig( mConfig, groupName.tqarg( i ) ); + KConfigGroup toolConfig( mConfig, groupName.arg( i ) ); if( !toolConfig.readBoolEntry( "HeadersOnly", false ) ) mergeToolConfig( readToolConfig( toolConfig ) ); } diff --git a/kmail/attachmentcollector.cpp b/kmail/attachmentcollector.cpp index 688af6233..b902f596f 100644 --- a/kmail/attachmentcollector.cpp +++ b/kmail/attachmentcollector.cpp @@ -65,7 +65,7 @@ void KMail::AttachmentCollector::collectAttachmentsFrom( partNode * node ) { continue; } if ( isInSkipList( node ) ) { - node = node->next( false ); // skip even the tqchildren + node = node->next( false ); // skip even the children continue; } if ( isInExclusionList( node ) ) { diff --git a/kmail/backupjob.cpp b/kmail/backupjob.cpp index af9a75c38..fd53997b3 100644 --- a/kmail/backupjob.cpp +++ b/kmail/backupjob.cpp @@ -148,7 +148,7 @@ void BackupJob::abort( const TQString &errorMessage ) // The progressmanager will delete it } - TQString text = i18n( "Failed to archive the folder '%1'." ).tqarg( mRootFolder->name() ); + TQString text = i18n( "Failed to archive the folder '%1'." ).arg( mRootFolder->name() ); text += "\n" + errorMessage; KMessageBox::sorry( mParentWidget, text, i18n( "Archiving failed." ) ); deleteLater(); @@ -165,19 +165,19 @@ void BackupJob::finish() } } - mProgressItem->seStatus( i18n( "Archiving finished" ) ); + mProgressItem->setStatus( i18n( "Archiving finished" ) ); mProgressItem->setComplete(); mProgressItem = 0; TQFileInfo archiveFileInfo( mMailArchivePath.path() ); TQString text = i18n( "Archiving folder '%1' successfully completed. " "The archive was written to the file '%2'." ) - .tqarg( mRootFolder->name() ).tqarg( mMailArchivePath.path() ); + .arg( mRootFolder->name() ).arg( mMailArchivePath.path() ); text += "\n" + i18n( "1 message of size %1 was archived.", "%n messages with the total size of %1 were archived.", mArchivedMessages ) - .tqarg( KIO::convertSize( mArchivedSize ) ); + .arg( KIO::convertSize( mArchivedSize ) ); text += "\n" + i18n( "The archive file has a size of %1." ) - .tqarg( KIO::convertSize( archiveFileInfo.size() ) ); + .arg( KIO::convertSize( archiveFileInfo.size() ) ); KMessageBox::information( mParentWidget, text, i18n( "Archiving finished." ) ); if ( mDeleteFoldersAfterCompletion ) { @@ -213,7 +213,7 @@ void BackupJob::archiveNextMessage() KMMsgDict::instance()->getLocation( serNum, &folder, &mMessageIndex ); if ( mMessageIndex == -1 ) { kdWarning(5006) << "Failed to get message location for sernum " << serNum << endl; - abort( i18n( "Unable to retrieve a message for folder '%1'." ).tqarg( mCurrentFolder->name() ) ); + abort( i18n( "Unable to retrieve a message for folder '%1'." ).arg( mCurrentFolder->name() ) ); return; } @@ -223,7 +223,7 @@ void BackupJob::archiveNextMessage() KMMessage *message = mCurrentFolder->getMsg( mMessageIndex ); if ( !message ) { kdWarning(5006) << "Failed to retrieve message with index " << mMessageIndex << endl; - abort( i18n( "Unable to retrieve a message for folder '%1'." ).tqarg( mCurrentFolder->name() ) ); + abort( i18n( "Unable to retrieve a message for folder '%1'." ).arg( mCurrentFolder->name() ) ); return; } @@ -249,7 +249,7 @@ void BackupJob::archiveNextMessage() kdWarning(5006) << "Message with subject " << mCurrentMessage->subject() << " is neither complete nor has a parent!" << endl; abort( i18n( "Internal error while trying to retrieve a message from folder '%1'." ) - .tqarg( mCurrentFolder->name() ) ); + .arg( mCurrentFolder->name() ) ); } mProgressItem->setProgress( ( mProgressItem->progress() + 5 ) ); @@ -318,7 +318,7 @@ void BackupJob::processCurrentMessage() if ( !mArchive->writeFile( fileName, user, group, messageSize, permissions, accessTime, modificationTime, creationTime, messageString ) ) { - abort( i18n( "Failed to write a message into the archive folder '%1'." ).tqarg( mCurrentFolder->name() ) ); + abort( i18n( "Failed to write a message into the archive folder '%1'." ).arg( mCurrentFolder->name() ) ); return; } @@ -357,7 +357,7 @@ void BackupJob::folderJobFinished( KMail::FolderJob *job ) if ( job->error() ) { if ( mCurrentFolder ) - abort( i18n( "Downloading a message in folder '%1' failed." ).tqarg( mCurrentFolder->name() ) ); + abort( i18n( "Downloading a message in folder '%1' failed." ).arg( mCurrentFolder->name() ) ); else abort( i18n( "Downloading a message in the current folder failed." ) ); } @@ -388,9 +388,9 @@ void BackupJob::archiveNextFolder() mCurrentFolder = mPendingFolders.take( 0 ); kdDebug(5006) << "===> Archiving next folder: " << mCurrentFolder->name() << endl; - mProgressItem->seStatus( i18n( "Archiving folder %1" ).tqarg( mCurrentFolder->name() ) ); + mProgressItem->setStatus( i18n( "Archiving folder %1" ).arg( mCurrentFolder->name() ) ); if ( mCurrentFolder->open( "BackupJob" ) != 0 ) { - abort( i18n( "Unable to open folder '%1'.").tqarg( mCurrentFolder->name() ) ); + abort( i18n( "Unable to open folder '%1'.").arg( mCurrentFolder->name() ) ); return; } mCurrentFolderOpen = true; @@ -411,7 +411,7 @@ void BackupJob::archiveNextFolder() success = false; if ( !success ) { abort( i18n( "Unable to create folder structure for folder '%1' within archive file." ) - .tqarg( mCurrentFolder->name() ) ); + .arg( mCurrentFolder->name() ) ); return; } @@ -423,7 +423,7 @@ void BackupJob::archiveNextFolder() << " at index " << i << "!" << endl; // TODO: handle error in a nicer way. this is _very_ bad abort( i18n( "Unable to backup messages in folder '%1', the index file is corrupted." ) - .tqarg( mCurrentFolder->name() ) ); + .arg( mCurrentFolder->name() ) ); return; } else diff --git a/kmail/bodyvisitor.h b/kmail/bodyvisitor.h index 1f236c4a7..a436fb443 100644 --- a/kmail/bodyvisitor.h +++ b/kmail/bodyvisitor.h @@ -60,7 +60,7 @@ namespace KMail { protected: /** - * Checks if one of the parents needs loaded tqchildren + * Checks if one of the parents needs loaded children * This is e.g. needed for multipart/signed where all parts have to be loaded */ static bool parentNeedsLoading( KMMessagePart * part ); diff --git a/kmail/cachedimapjob.cpp b/kmail/cachedimapjob.cpp index ec7dece78..5e5232d42 100644 --- a/kmail/cachedimapjob.cpp +++ b/kmail/cachedimapjob.cpp @@ -234,7 +234,7 @@ void CachedImapJob::slotDeleteNextMessages( KIO::Job* job ) KURL url = mAccount->getUrl(); url.setPath( mFolder->imapPath() + - TQString::fromLatin1(";UID=%1").tqarg(uids) ); + TQString::fromLatin1(";UID=%1").arg(uids) ); KIO::SimpleJob *simpleJob = KIO::file_delete( url, false ); KIO::Scheduler::assignJobToSlave( mAccount->slave(), simpleJob ); @@ -311,7 +311,7 @@ void CachedImapJob::slotGetNextMessage(KIO::Job * job) mFolder->addMsgInternal( mMsg, true, &index ); if ( kmkernel->iCalIface().isResourceFolder( mFolder->folder() ) ) { - mFolder->seStatus( index, KMMsgStatusRead, false ); + mFolder->setStatus( index, KMMsgStatusRead, false ); } emit messageRetrieved( mMsg ); @@ -341,7 +341,7 @@ void CachedImapJob::slotGetNextMessage(KIO::Job * job) if( mfd.flags > 0 ) KMFolderImap::flagsToStatus(mMsg, mfd.flags, true, GlobalSettings::allowLocalFlags() ? mFolder->permanentFlags() : INT_MAX); KURL url = mAccount->getUrl(); - url.setPath(mFolder->imapPath() + TQString(";UID=%1;SECTION=BODY.PEEK[]").tqarg(mfd.uid)); + url.setPath(mFolder->imapPath() + TQString(";UID=%1;SECTION=BODY.PEEK[]").arg(mfd.uid)); ImapAccountBase::jobData jd( url.url(), mFolder->folder() ); jd.cancellable = true; @@ -408,10 +408,10 @@ void CachedImapJob::slotPutNextMessage() unsigned int i = 0; for( char *ch = cstr.data(); *ch; ch++ ) { if ( *ch == '\n' ) { - mData.tqat(i) = '\r'; + mData.at(i) = '\r'; i++; } - mData.tqat(i) = *ch; i++; + mData.at(i) = *ch; i++; } jd.data = mData; jd.msgList.append( mMsg ); @@ -539,7 +539,7 @@ void CachedImapJob::slotAddNextSubfolder( KIO::Job * job ) if ( job->error() && !silentUpload ) { TQString myError = "<p><b>" + i18n("Error while uploading folder") - + "</b></p><p>" + i18n("Could not make the folder <b>%1</b> on the server.").tqarg((*it).items[0]) + + "</b></p><p>" + i18n("Could not make the folder <b>%1</b> on the server.").arg((*it).items[0]) + "</p><p>" + i18n("This could be because you do not have permission to do this, or because the folder is already present on the server; the error message from the server communication is here:") + "</p>"; mAccount->handleJobError( job, myError ); } @@ -597,8 +597,8 @@ void CachedImapJob::slotAddNextSubfolder( KIO::Job * job ) TQDataStream stream( packedArgs, IO_WriteOnly ); const TQString command = TQString( "X-CREATE-SPECIAL" ); - const TQString argument = TQString( "%1 %2" ).tqarg( Scalix::Utils::contentsTypeToScalixId( folder->contentsType() ) ) - .tqarg( path ); + const TQString argument = TQString( "%1 %2" ).arg( Scalix::Utils::contentsTypeToScalixId( folder->contentsType() ) ) + .arg( path ); stream << (int) 'X' << 'N' << command << argument; @@ -626,7 +626,7 @@ void CachedImapJob::slotDeleteNextFolder( KIO::Job *job ) mAccount->removeDeletedFolder( (*it).path ); if( job->error() ) { - mAccount->handleJobError( job, i18n( "Error while deleting folder %1 on the server: " ).tqarg( (*it).path ) + '\n' ); + mAccount->handleJobError( job, i18n( "Error while deleting folder %1 on the server: " ).arg( (*it).path ) + '\n' ); delete this; return; } @@ -679,7 +679,7 @@ void CachedImapJob::slotCheckUidValidityResult(KIO::Job * job) if( job->error() ) { mErrorCode = job->error(); - mAccount->handleJobError( job, i18n( "Error while reading folder %1 on the server: " ).tqarg( (*it).parent->label() ) + '\n' ); + mAccount->handleJobError( job, i18n( "Error while reading folder %1 on the server: " ).arg( (*it).parent->label() ) + '\n' ); delete this; return; } @@ -813,7 +813,7 @@ void CachedImapJob::slotSubscribtionChange1Failed( const TQString &errorMessage "from the folder list after the next sync since it is unsubscribed on the server.\n" "You can try to manually subscribe to the folder yourself.\n\n" "%2" ) - .tqarg( mFolder->label() ).tqarg( errorMessage ) ); + .arg( mFolder->label() ).arg( errorMessage ) ); delete this; } @@ -854,7 +854,7 @@ void CachedImapJob::slotRenameFolderResult( KIO::Job *job ) if( job->error() ) { revertLabelChange(); - const TQString errorMessage = i18n( "Error while trying to rename folder %1" ).tqarg( mFolder->label() ); + const TQString errorMessage = i18n( "Error while trying to rename folder %1" ).arg( mFolder->label() ); mAccount->handleJobError( job, errorMessage ); delete this; } else { diff --git a/kmail/callback.cpp b/kmail/callback.cpp index 0b94a5d1f..7a7a583f2 100644 --- a/kmail/callback.cpp +++ b/kmail/callback.cpp @@ -94,13 +94,13 @@ bool Callback::mailICal( const TQString& to, const TQString &iCal, msg->setSubject( subject ); if ( GlobalSettings::self()->exchangeCompatibleInvitations() ) { if ( status == TQString("cancel") ) - msg->setSubject( i18n( "Declined: %1" ).tqarg(subject).replace("Answer: ","") ); + msg->setSubject( i18n( "Declined: %1" ).arg(subject).replace("Answer: ","") ); else if ( status == TQString("tentative") ) - msg->setSubject( i18n( "Tentative: %1" ).tqarg(subject).replace("Answer: ","") ); + msg->setSubject( i18n( "Tentative: %1" ).arg(subject).replace("Answer: ","") ); else if ( status == TQString("accepted") ) - msg->setSubject( i18n( "Accepted: %1" ).tqarg(subject).replace("Answer: ","") ); + msg->setSubject( i18n( "Accepted: %1" ).arg(subject).replace("Answer: ","") ); else if ( status == TQString("delegated") ) - msg->setSubject( i18n( "Delegated: %1" ).tqarg(subject).replace("Answer: ","") ); + msg->setSubject( i18n( "Delegated: %1" ).arg(subject).replace("Answer: ","") ); } msg->setTo( to ); msg->setFrom( receiver() ); diff --git a/kmail/compactionjob.cpp b/kmail/compactionjob.cpp index aa563c46e..fd89f4584 100644 --- a/kmail/compactionjob.cpp +++ b/kmail/compactionjob.cpp @@ -96,8 +96,8 @@ int MboxCompactionJob::executeNow( bool silent ) if (!storage->compactable()) { kdDebug(5006) << storage->location() << " compaction skipped." << endl; if ( !mSilent ) { - TQString str = i18n( "For safety reasons, compaction has been disabled for %1" ).tqarg( mbox->label() ); - BroadcastStatus::instance()->seStatusMsg( str ); + TQString str = i18n( "For safety reasons, compaction has been disabled for %1" ).arg( mbox->label() ); + BroadcastStatus::instance()->setStatusMsg( str ); } return 0; } @@ -173,11 +173,11 @@ void MboxCompactionJob::done( int rc ) mbox->close("mboxcompact", true); mbox->setAutoCreateIndex( autoCreate ); mbox->setNeedsCompacting( false ); // We are clean now - str = i18n( "Folder \"%1\" successfully compacted" ).tqarg( mSrcFolder->label() ); + str = i18n( "Folder \"%1\" successfully compacted" ).arg( mSrcFolder->label() ); kdDebug(5006) << str << endl; } else { mbox->close("mboxcompact"); - str = i18n( "Error occurred while compacting \"%1\". Compaction aborted." ).tqarg( mSrcFolder->label() ); + str = i18n( "Error occurred while compacting \"%1\". Compaction aborted." ).arg( mSrcFolder->label() ); kdDebug(5006) << "Error occurred while compacting " << mbox->location() << endl; kdDebug(5006) << "Compaction aborted." << endl; TQFile::remove( mTempName ); @@ -185,7 +185,7 @@ void MboxCompactionJob::done( int rc ) mErrorCode = rc; if ( !mSilent ) - BroadcastStatus::instance()->seStatusMsg( str ); + BroadcastStatus::instance()->setStatusMsg( str ); mFolderOpen = false; deleteLater(); // later, because of the "return mErrorCode" @@ -256,9 +256,9 @@ void MaildirCompactionJob::done( int rc ) mCancellable = false; TQString str; if ( !rc ) { - str = i18n( "Folder \"%1\" successfully compacted" ).tqarg( mSrcFolder->label() ); + str = i18n( "Folder \"%1\" successfully compacted" ).arg( mSrcFolder->label() ); } else { - str = i18n( "Error occurred while compacting \"%1\". Compaction aborted." ).tqarg( mSrcFolder->label() ); + str = i18n( "Error occurred while compacting \"%1\". Compaction aborted." ).arg( mSrcFolder->label() ); } mErrorCode = rc; storage->setNeedsCompacting( false ); @@ -266,7 +266,7 @@ void MaildirCompactionJob::done( int rc ) if ( storage->isOpened() ) storage->updateIndex(); if ( !mSilent ) - BroadcastStatus::instance()->seStatusMsg( str ); + BroadcastStatus::instance()->setStatusMsg( str ); mFolderOpen = false; deleteLater(); // later, because of the "return mErrorCode" diff --git a/kmail/configuredialog.cpp b/kmail/configuredialog.cpp index 6dd25347d..538b6205f 100644 --- a/kmail/configuredialog.cpp +++ b/kmail/configuredialog.cpp @@ -233,9 +233,9 @@ ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal // the KCMultiDialog starts with the size of the first kcm, not // the largest one. This way at least after the first showing of // the largest kcm the size is kept. - KConfigGroup tqgeometry( KMKernel::config(), "Geometry" ); - int width = tqgeometry.readNumEntry( "ConfigureDialogWidth" ); - int height = tqgeometry.readNumEntry( "ConfigureDialogHeight" ); + KConfigGroup geometry( KMKernel::config(), "Geometry" ); + int width = geometry.readNumEntry( "ConfigureDialogWidth" ); + int height = geometry.readNumEntry( "ConfigureDialogHeight" ); if ( width != 0 && height != 0 ) { setMinimumSize( width, height ); } @@ -243,9 +243,9 @@ ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal } void ConfigureDialog::hideEvent( TQHideEvent *ev ) { - KConfigGroup tqgeometry( KMKernel::config(), "Geometry" ); - tqgeometry.writeEntry( "ConfigureDialogWidth", width() ); - tqgeometry.writeEntry( "ConfigureDialogHeight",height() ); + KConfigGroup geometry( KMKernel::config(), "Geometry" ); + geometry.writeEntry( "ConfigureDialogWidth", width() ); + geometry.writeEntry( "ConfigureDialogHeight",height() ); KDialogBase::hideEvent( ev ); } @@ -451,7 +451,7 @@ void IdentityPage::slotRemoveIdentity() if ( !item ) return; TQString msg = i18n("<qt>Do you really want to remove the identity named " - "<b>%1</b>?</qt>").tqarg( item->identity().identityName() ); + "<b>%1</b>?</qt>").arg( item->identity().identityName() ); if( KMessageBox::warningContinueCancel( this, msg, i18n("Remove Identity"), KGuiItem(i18n("&Remove"),"editdelete") ) == KMessageBox::Continue ) if ( im->removeIdentity( item->identity().identityName() ) ) { @@ -742,7 +742,7 @@ static inline TQString uniqueName( const TQStringList & list, while ( list.find( result ) != list.end() ) { result = i18n("%1: name; %2: number appended to it to make it unique " "among a list of names", "%1 %2") - .tqarg( name ).tqarg( suffix ); + .arg( name ).arg( suffix ); suffix++; } return result; @@ -830,7 +830,7 @@ void AccountsPage::SendingTab::slotAddTransport() "Configure->Accounts->Sending listview, \"type\" " "column, first row, to indicate that this is the " "default transport", "%1 (Default)") - .tqarg( transportInfo->type ); + .arg( transportInfo->type ); GlobalSettings::self()->setDefaultTransport( transportInfo->name ); } (void) new TQListViewItem( mTransportList, lastItem, transportInfo->name, @@ -1364,7 +1364,7 @@ void AccountsPage::ReceivingTab::slotRemoveSelectedAccount() { if ( !acct ) { // ### FIXME: see above KMessageBox::sorry( this, i18n("<qt>Unable to locate account <b>%1</b>.</qt>") - .tqarg(listItem->text(0)) ); + .arg(listItem->text(0)) ); return; } @@ -1444,7 +1444,7 @@ void AccountsPage::ReceivingTab::save() { kmkernel->acctMgr()->writeConfig( true ); if ( (*it) && !kmkernel->acctMgr()->remove(*it) ) KMessageBox::sorry( this, i18n("<qt>Unable to locate account <b>%1</b>.</qt>") - .tqarg( (*it)->name() ) ); + .arg( (*it)->name() ) ); } mAccountsToDelete.clear(); @@ -1941,33 +1941,33 @@ AppearancePageLayoutTab::AppearancePageLayoutTab( TQWidget * parent, const char void AppearancePage::LayoutTab::doLoadOther() { const KConfigGroup reader( KMKernel::config(), "Reader" ); - const KConfigGroup tqgeometry( KMKernel::config(), "Geometry" ); + const KConfigGroup geometry( KMKernel::config(), "Geometry" ); - loadWidget( mFolderListGroup, tqgeometry, folderListMode ); + loadWidget( mFolderListGroup, geometry, folderListMode ); loadWidget( mMIMETreeLocationGroup, reader, mimeTreeLocation ); loadWidget( mMIMETreeModeGroup, reader, mimeTreeMode ); - loadWidget( mReaderWindowModeGroup, tqgeometry, readerWindowMode ); + loadWidget( mReaderWindowModeGroup, geometry, readerWindowMode ); mFavoriteFolderViewCB->setChecked( GlobalSettings::self()->enableFavoriteFolderView() ); } void AppearancePage::LayoutTab::installProfile( KConfig * profile ) { const KConfigGroup reader( profile, "Reader" ); - const KConfigGroup tqgeometry( profile, "Geometry" ); + const KConfigGroup geometry( profile, "Geometry" ); - loadProfile( mFolderListGroup, tqgeometry, folderListMode ); + loadProfile( mFolderListGroup, geometry, folderListMode ); loadProfile( mMIMETreeLocationGroup, reader, mimeTreeLocation ); loadProfile( mMIMETreeModeGroup, reader, mimeTreeMode ); - loadProfile( mReaderWindowModeGroup, tqgeometry, readerWindowMode ); + loadProfile( mReaderWindowModeGroup, geometry, readerWindowMode ); } void AppearancePage::LayoutTab::save() { KConfigGroup reader( KMKernel::config(), "Reader" ); - KConfigGroup tqgeometry( KMKernel::config(), "Geometry" ); + KConfigGroup geometry( KMKernel::config(), "Geometry" ); - saveButtonGroup( mFolderListGroup, tqgeometry, folderListMode ); + saveButtonGroup( mFolderListGroup, geometry, folderListMode ); saveButtonGroup( mMIMETreeLocationGroup, reader, mimeTreeLocation ); saveButtonGroup( mMIMETreeModeGroup, reader, mimeTreeMode ); - saveButtonGroup( mReaderWindowModeGroup, tqgeometry, readerWindowMode ); + saveButtonGroup( mReaderWindowModeGroup, geometry, readerWindowMode ); GlobalSettings::self()->setEnableFavoriteFolderView( mFavoriteFolderViewCB->isChecked() ); } @@ -2058,7 +2058,7 @@ AppearancePageHeadersTab::AppearancePageHeadersTab( TQWidget * parent, const cha for ( int i = 0 ; i < numDateDisplayConfig ; i++ ) { TQString buttonLabel = i18n(dateDisplayConfig[i].displayName); if ( buttonLabel.contains("%1") ) - buttonLabel = buttonLabel.tqarg( DateFormatter::formatCurrentDate( dateDisplayConfig[i].dateDisplay ) ); + buttonLabel = buttonLabel.arg( DateFormatter::formatCurrentDate( dateDisplayConfig[i].dateDisplay ) ); radio = new TQRadioButton( buttonLabel, mDateDisplay ); mDateDisplay->insert( radio, i ); if ( dateDisplayConfig[i].dateDisplay == DateFormatter::Custom ) { @@ -2115,16 +2115,16 @@ AppearancePageHeadersTab::AppearancePageHeadersTab( TQWidget * parent, const cha void AppearancePage::HeadersTab::doLoadOther() { KConfigGroup general( KMKernel::config(), "General" ); - KConfigGroup tqgeometry( KMKernel::config(), "Geometry" ); + KConfigGroup geometry( KMKernel::config(), "Geometry" ); // "General Options": - mNestedMessagesCheck->setChecked( tqgeometry.readBoolEntry( "nestedMessages", false ) ); + mNestedMessagesCheck->setChecked( geometry.readBoolEntry( "nestedMessages", false ) ); mMessageSizeCheck->setChecked( general.readBoolEntry( "showMessageSize", false ) ); mCryptoIconsCheck->setChecked( general.readBoolEntry( "showCryptoIcons", false ) ); mAttachmentCheck->setChecked( general.readBoolEntry( "showAttachmentIcon", true ) ); // "Message Header Threading Options": - int num = tqgeometry.readNumEntry( "nestingPolicy", 3 ); + int num = geometry.readNumEntry( "nestingPolicy", 3 ); if ( num < 0 || num > 3 ) num = 3; mNestingPolicy->setButton( num ); @@ -2152,10 +2152,10 @@ void AppearancePage::HeadersTab::setDateDisplay( int num, const TQString & forma void AppearancePage::HeadersTab::installProfile( KConfig * profile ) { KConfigGroup general( profile, "General" ); - KConfigGroup tqgeometry( profile, "Geometry" ); + KConfigGroup geometry( profile, "Geometry" ); - if ( tqgeometry.hasKey( "nestedMessages" ) ) - mNestedMessagesCheck->setChecked( tqgeometry.readBoolEntry( "nestedMessages" ) ); + if ( geometry.hasKey( "nestedMessages" ) ) + mNestedMessagesCheck->setChecked( geometry.readBoolEntry( "nestedMessages" ) ); if ( general.hasKey( "showMessageSize" ) ) mMessageSizeCheck->setChecked( general.readBoolEntry( "showMessageSize" ) ); @@ -2164,8 +2164,8 @@ void AppearancePage::HeadersTab::installProfile( KConfig * profile ) { if ( general.hasKey( "showAttachmentIcon" ) ) mAttachmentCheck->setChecked( general.readBoolEntry( "showAttachmentIcon" ) ); - if ( tqgeometry.hasKey( "nestingPolicy" ) ) { - int num = tqgeometry.readNumEntry( "nestingPolicy" ); + if ( geometry.hasKey( "nestingPolicy" ) ) { + int num = geometry.readNumEntry( "nestingPolicy" ); if ( num < 0 || num > 3 ) num = 3; mNestingPolicy->setButton( num ); } @@ -2177,16 +2177,16 @@ void AppearancePage::HeadersTab::installProfile( KConfig * profile ) { void AppearancePage::HeadersTab::save() { KConfigGroup general( KMKernel::config(), "General" ); - KConfigGroup tqgeometry( KMKernel::config(), "Geometry" ); + KConfigGroup geometry( KMKernel::config(), "Geometry" ); - if ( tqgeometry.readBoolEntry( "nestedMessages", false ) + if ( geometry.readBoolEntry( "nestedMessages", false ) != mNestedMessagesCheck->isChecked() ) { int result = KMessageBox::warningContinueCancel( this, i18n("Changing the global threading setting will override " "all folder specific values."), TQString(), KStdGuiItem::cont(), "threadOverride" ); if ( result == KMessageBox::Continue ) { - tqgeometry.writeEntry( "nestedMessages", mNestedMessagesCheck->isChecked() ); + geometry.writeEntry( "nestedMessages", mNestedMessagesCheck->isChecked() ); // remove all threadMessagesOverride keys from all [Folder-*] groups: TQStringList groups = KMKernel::config()->groupList().grep( TQRegExp("^Folder-") ); kdDebug(5006) << "groups.count() == " << groups.count() << endl; @@ -2197,7 +2197,7 @@ void AppearancePage::HeadersTab::save() { } } - tqgeometry.writeEntry( "nestingPolicy", + geometry.writeEntry( "nestingPolicy", mNestingPolicy->id( mNestingPolicy->selected() ) ); general.writeEntry( "showMessageSize", mMessageSizeCheck->isChecked() ); general.writeEntry( "showCryptoIcons", mCryptoIconsCheck->isChecked() ); @@ -3304,7 +3304,7 @@ void ComposerPage::CharsetTab::slotVerifyCharset( TQString & charset ) { if ( charset.lower() == TQString::fromLatin1("locale") ) { charset = TQString::fromLatin1("%1 (locale)") - .tqarg( TQString( kmkernel->networkCodec()->mimeName() ).lower() ); + .arg( TQString( kmkernel->networkCodec()->mimeName() ).lower() ); return; } @@ -3328,7 +3328,7 @@ void ComposerPage::CharsetTab::doLoadOther() { if ( (*it) == TQString::fromLatin1("locale") ) { TQCString cset = kmkernel->networkCodec()->mimeName(); KPIM::kAsciiToLower( cset.data() ); - (*it) = TQString("%1 (locale)").tqarg( TQString(cset) ); + (*it) = TQString("%1 (locale)").arg( TQString(cset) ); } mCharsetListEditor->setStringList( charsets ); @@ -3815,7 +3815,7 @@ SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char * "exploits. <a href=\"whatsthis:%1\">More about " "HTML mails...</a> <a href=\"whatsthis:%2\">More " "about external references...</a>") - .tqarg(htmlWhatsThis).tqarg(externalWhatsThis), + .arg(htmlWhatsThis).arg(externalWhatsThis), group ); vlay->addWidget( group ); @@ -3890,7 +3890,7 @@ SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char * label = new KActiveLabel( i18n("<b>WARNING:</b> Unconditionally returning " "confirmations undermines your privacy. " "<a href=\"whatsthis:%1\">More...</a>") - .tqarg(receiptWhatsThis), + .arg(receiptWhatsThis), group ); vlay->addWidget( group ); @@ -4358,7 +4358,7 @@ void SecurityPage::SMimeTab::doLoadOther() { TQString systemProxy = TQString::fromLocal8Bit( getenv( "http_proxy" ) ); if ( systemProxy.isEmpty() ) systemProxy = i18n( "no proxy" ); - mWidget->systemHTTPProxy->setText( i18n( "(Current system setting: %1)" ).tqarg( systemProxy ) ); + mWidget->systemHTTPProxy->setText( i18n( "(Current system setting: %1)" ).arg( systemProxy ) ); bool honor = e.mHonorHTTPProxy && e.mHonorHTTPProxy->boolValue(); mWidget->honorHTTPProxyRB->setChecked( honor ); mWidget->useCustomHTTPProxyRB->setChecked( !honor ); @@ -4482,11 +4482,11 @@ Kleo::CryptoConfigEntry* SMIMECryptoConfigEntries::configEntry( const char* comp { Kleo::CryptoConfigEntry* entry = mConfig->entry( componentName, groupName, entryName ); if ( !entry ) { - kdWarning(5006) << TQString( "Backend error: gpgconf doesn't seem to know the entry for %1/%2/%3" ).tqarg( componentName, groupName, entryName ) << endl; + kdWarning(5006) << TQString( "Backend error: gpgconf doesn't seem to know the entry for %1/%2/%3" ).arg( componentName, groupName, entryName ) << endl; return 0; } if( entry->argType() != argType || entry->isList() != isList ) { - kdWarning(5006) << TQString( "Backend error: gpgconf has wrong type for %1/%2/%3: %4 %5" ).tqarg( componentName, groupName, entryName ).tqarg( entry->argType() ).tqarg( entry->isList() ) << endl; + kdWarning(5006) << TQString( "Backend error: gpgconf has wrong type for %1/%2/%3: %4 %5" ).arg( componentName, groupName, entryName ).arg( entry->argType() ).arg( entry->isList() ) << endl; return 0; } return entry; @@ -5135,7 +5135,7 @@ void MiscPage::GroupwareTab::save() { // Inbox folder of the selected account KMAccount* acct = mAccountCombo->currentAccount(); if ( acct ) { - folderId = TQString( ".%1.directory/INBOX" ).tqarg( acct->id() ); + folderId = TQString( ".%1.directory/INBOX" ).arg( acct->id() ); GlobalSettings::self()->setTheIMAPResourceAccount( acct->id() ); } } diff --git a/kmail/configuredialog_p.cpp b/kmail/configuredialog_p.cpp index ccc0230b1..93f6123cc 100644 --- a/kmail/configuredialog_p.cpp +++ b/kmail/configuredialog_p.cpp @@ -225,7 +225,7 @@ NewLanguageDialog::NewLanguageDialog( LanguageItemList & suppressedLangs, if ( suppressedAcronyms.find( acronym ) == suppressedAcronyms.end() ) { // not found: TQString displayname = TQString::fromLatin1("%1 (%2)") - .tqarg( name ).tqarg( acronym ); + .arg( name ).arg( acronym ); TQPixmap flag( locate("locale", acronym + flagPng ) ); mComboBox->insertItem( flag, displayname ); } @@ -255,7 +255,7 @@ int LanguageComboBox::insertLanguage( const TQString & language ) KSimpleConfig entry( locate("locale", language + entryDesktop) ); entry.setGroup( "KCM Locale" ); TQString name = entry.readEntry( "Name" ); - TQString output = TQString::fromLatin1("%1 (%2)").tqarg( name ).tqarg( language ); + TQString output = TQString::fromLatin1("%1 (%2)").arg( name ).arg( language ); insertItem( TQPixmap( locate("locale", language + flagPng ) ), output ); return listBox()->index( listBox()->findItem(output) ); } @@ -269,7 +269,7 @@ TQString LanguageComboBox::language() const void LanguageComboBox::setLanguage( const TQString & language ) { - TQString parenthizedLanguage = TQString::fromLatin1("(%1)").tqarg( language ); + TQString parenthizedLanguage = TQString::fromLatin1("(%1)").arg( language ); for (int i = 0; i < count(); i++) // ### FIXME: use .endWith(): if ( text(i).find( parenthizedLanguage ) >= 0 ) { diff --git a/kmail/copyfolderjob.cpp b/kmail/copyfolderjob.cpp index 9be07213e..a83b1cd6c 100644 --- a/kmail/copyfolderjob.cpp +++ b/kmail/copyfolderjob.cpp @@ -67,7 +67,7 @@ CopyFolderJob::~CopyFolderJob() /* * The basic strategy is to first create the target folder, then copy all the mail - * from the source to the target folder, then recurse for each of the folder's tqchildren + * from the source to the target folder, then recurse for each of the folder's children */ void CopyFolderJob::execute() { @@ -113,7 +113,7 @@ void CopyFolderJob::slotCopyCompleted( KMCommand* command ) rollback(); return; } - // if we have tqchildren, recurse + // if we have children, recurse if ( mStorage->folder()->child() ) { slotCopyNextChild(); } else { @@ -144,7 +144,7 @@ void CopyFolderJob::slotCopyNextChild( bool success ) mNextChildFolder = static_cast<KMFolder*>(node); ++mChildFolderNodeIterator; } else { - // no more tqchildren, we are done + // no more children, we are done emit folderCopyComplete( true ); deleteLater(); return; diff --git a/kmail/csshelper.cpp b/kmail/csshelper.cpp index 86166dbc2..3fe2fd78b 100644 --- a/kmail/csshelper.cpp +++ b/kmail/csshelper.cpp @@ -77,7 +77,7 @@ namespace KMail { TQFont defaultFont = mBodyFont; defaultFont.setItalic( true ); for ( int i = 0 ; i < 3 ; ++i ) { - const TQString key = TQString( "quote%1-font" ).tqarg( i+1 ); + const TQString key = TQString( "quote%1-font" ).arg( i+1 ); mQuoteFont[i] = fonts.readFontEntry( key, &defaultFont ); } } diff --git a/kmail/customtemplates.cpp b/kmail/customtemplates.cpp index 279c71ae6..6a0a7f4cf 100644 --- a/kmail/customtemplates.cpp +++ b/kmail/customtemplates.cpp @@ -117,7 +117,7 @@ CustomTemplates::CustomTemplates( TQWidget *parent, const char *name ) "<i>Universal</i> which can be used for all kind of operations. " "You cannot bind keyboard shortcut to <i>Universal</i> templates.</p>" "</qt>" ); - mHelp->setText( i18n( "<a href=\"whatsthis:%1\">How does this work?</a>" ).tqarg( help ) ); + mHelp->setText( i18n( "<a href=\"whatsthis:%1\">How does this work?</a>" ).arg( help ) ); const TQString toToolTip = i18n( "Additional recipients of the message when forwarding" ); const TQString ccToolTip = i18n( "Additional recipients who get a copy of the message when forwarding" ); diff --git a/kmail/customtemplates_base.ui b/kmail/customtemplates_base.ui index c72ccec05..73300edd9 100644 --- a/kmail/customtemplates_base.ui +++ b/kmail/customtemplates_base.ui @@ -260,7 +260,7 @@ <property name="text"> <string>Shortc&ut:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -282,7 +282,7 @@ <property name="text"> <string>&Template type:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> diff --git a/kmail/distributionlistdialog.cpp b/kmail/distributionlistdialog.cpp index 26f720ad6..5dcb81d20 100644 --- a/kmail/distributionlistdialog.cpp +++ b/kmail/distributionlistdialog.cpp @@ -196,7 +196,7 @@ void DistributionListDialog::slotUser1() #endif KMessageBox::information( this, i18n( "<qt>Distribution list with the given name <b>%1</b> " - "already exists. Please select a different name.</qt>" ).tqarg( name ) ); + "already exists. Please select a different name.</qt>" ).arg( name ) ); return; } diff --git a/kmail/expirejob.cpp b/kmail/expirejob.cpp index 65de61a33..a208b918b 100644 --- a/kmail/expirejob.cpp +++ b/kmail/expirejob.cpp @@ -162,7 +162,7 @@ void ExpireJob::done() moving = true; str = i18n( "Removing 1 old message from folder %1...", "Removing %n old messages from folder %1...", count ) - .tqarg( mSrcFolder->label() ); + .arg( mSrcFolder->label() ); } else { // Expire by moving mMoveToFolder = @@ -170,7 +170,7 @@ void ExpireJob::done() if ( !mMoveToFolder ) { str = i18n( "Cannot expire messages from folder %1: destination " "folder %2 not found" ) - .tqarg( mSrcFolder->label(), mSrcFolder->expireToFolderId() ); + .arg( mSrcFolder->label(), mSrcFolder->expireToFolderId() ); kdWarning(5006) << str << endl; } else { kdDebug(5006) << "ExpireJob: finished expiring in folder " @@ -185,12 +185,12 @@ void ExpireJob::done() str = i18n( "Moving 1 old message from folder %1 to folder %2...", "Moving %n old messages from folder %1 to folder %2...", count ) - .tqarg( mSrcFolder->label(), mMoveToFolder->label() ); + .arg( mSrcFolder->label(), mMoveToFolder->label() ); } } } if ( !str.isEmpty() ) - BroadcastStatus::instance()->seStatusMsg( str ); + BroadcastStatus::instance()->setStatusMsg( str ); KConfigGroup group( KMKernel::config(), "Folder-" + mSrcFolder->idString() ); group.writeEntry( "Current", -1 ); // i.e. make it invalid, the serial number will be used @@ -213,38 +213,38 @@ void ExpireJob::slotMessagesMoved( KMCommand *command ) msg = i18n( "Removed 1 old message from folder %1.", "Removed %n old messages from folder %1.", mRemovedMsgs.count() ) - .tqarg( mSrcFolder->label() ); + .arg( mSrcFolder->label() ); } else { msg = i18n( "Moved 1 old message from folder %1 to folder %2.", "Moved %n old messages from folder %1 to folder %2.", mRemovedMsgs.count() ) - .tqarg( mSrcFolder->label(), mMoveToFolder->label() ); + .arg( mSrcFolder->label(), mMoveToFolder->label() ); } break; case KMCommand::Failed: if ( mSrcFolder->expireAction() == KMFolder::ExpireDelete ) { msg = i18n( "Removing old messages from folder %1 failed." ) - .tqarg( mSrcFolder->label() ); + .arg( mSrcFolder->label() ); } else { msg = i18n( "Moving old messages from folder %1 to folder %2 failed." ) - .tqarg( mSrcFolder->label(), mMoveToFolder->label() ); + .arg( mSrcFolder->label(), mMoveToFolder->label() ); } break; case KMCommand::Canceled: if ( mSrcFolder->expireAction() == KMFolder::ExpireDelete ) { msg = i18n( "Removing old messages from folder %1 was canceled." ) - .tqarg( mSrcFolder->label() ); + .arg( mSrcFolder->label() ); } else { msg = i18n( "Moving old messages from folder %1 to folder %2 was " "canceled." ) - .tqarg( mSrcFolder->label(), mMoveToFolder->label() ); + .arg( mSrcFolder->label(), mMoveToFolder->label() ); } default: ; } - BroadcastStatus::instance()->seStatusMsg( msg ); + BroadcastStatus::instance()->setStatusMsg( msg ); deleteLater(); } diff --git a/kmail/favoritefolderview.cpp b/kmail/favoritefolderview.cpp index e1689a9af..6715f4865 100644 --- a/kmail/favoritefolderview.cpp +++ b/kmail/favoritefolderview.cpp @@ -253,7 +253,7 @@ void FavoriteFolderView::itemClicked(TQListViewItem * item) if ( !item ) return; if ( !item->isSelected() ) item->setSelected( true ); - item->tqrepaint(); + item->repaint(); handleGroupwareFolder( static_cast<KMFolderTreeItem*>( item ) ); } @@ -267,11 +267,11 @@ void FavoriteFolderView::folderTreeSelectionChanged(KMFolder * folder) fti->setSelected( true ); setCurrentItem( fti ); ensureItemVisible( fti ); - fti->tqrepaint(); + fti->repaint(); found = true; } else if ( fti->folder() != folder && fti->isSelected() ) { fti->setSelected( false ); - fti->tqrepaint(); + fti->repaint(); } } blockSignals( false ); @@ -405,13 +405,13 @@ TQString FavoriteFolderView::prettyName(KMFolderTreeItem * fti) if ( fti->protocol() == KFolderTreeItem::Local || fti->protocol() == KFolderTreeItem::NONE ) { name = i18n( "Local Inbox" ); } else { - name = i18n( "Inbox of %1" ).tqarg( accountFti->text( 0 ) ); + name = i18n( "Inbox of %1" ).arg( accountFti->text( 0 ) ); } } else { if ( fti->protocol() != KFolderTreeItem::Local && fti->protocol() != KFolderTreeItem::NONE ) { - name = i18n( "%1 on %2" ).tqarg( fti->text( 0 ) ).tqarg( accountFti->text( 0 ) ); + name = i18n( "%1 on %2" ).arg( fti->text( 0 ) ).arg( accountFti->text( 0 ) ); } else { - name = i18n( "%1 (local)" ).tqarg( fti->text( 0 ) ); + name = i18n( "%1 (local)" ).arg( fti->text( 0 ) ); } } return name; @@ -524,7 +524,7 @@ void FavoriteFolderView::refresh() KMFolderTreeItem* fti = static_cast<KMFolderTreeItem*>(it.current()); if (!fti || !fti->folder()) continue; - fti->tqrepaint(); + fti->repaint(); } update(); } diff --git a/kmail/filterlogdlg.cpp b/kmail/filterlogdlg.cpp index 33bfa8d39..fef3b89ce 100644 --- a/kmail/filterlogdlg.cpp +++ b/kmail/filterlogdlg.cpp @@ -257,7 +257,7 @@ void FilterLogDialog::slotUser2() KMessageBox::error( this, i18n( "Could not write the file %1:\n" "\"%2\" is the detailed error description." ) - .tqarg( fileName, + .arg( fileName, TQString::fromLocal8Bit( strerror( errno ) ) ), i18n( "KMail Error" ) ); } diff --git a/kmail/folderdiaacltab.cpp b/kmail/folderdiaacltab.cpp index 63b67ffc4..b6c3e2c1d 100644 --- a/kmail/folderdiaacltab.cpp +++ b/kmail/folderdiaacltab.cpp @@ -244,7 +244,7 @@ static TQString permissionsToUserString( unsigned int permissions, const TQStrin if ( internalRightsList.isEmpty() ) return i18n( "Custom Permissions" ); // not very helpful, but shouldn't happen else - return i18n( "Custom Permissions (%1)" ).tqarg( internalRightsList ); + return i18n( "Custom Permissions (%1)" ).arg( internalRightsList ); } void KMail::FolderDiaACLTab::ListViewItem::setPermissions( unsigned int permissions ) @@ -453,7 +453,7 @@ void KMail::FolderDiaACLTab::load() KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->parentFolder(); if ( folder && folder->storage() == mImapAccount->rootFolder() ) return; // nothing to be done for the (virtual) account folder - mLabel->setText( i18n( "Connecting to server %1, please wait..." ).tqarg( mImapAccount->host() ) ); + mLabel->setText( i18n( "Connecting to server %1, please wait..." ).arg( mImapAccount->host() ) ); ImapAccountBase::ConnectionState state = mImapAccount->makeConnection(); if ( state == ImapAccountBase::Error ) { // Cancelled by user, or slave can't start slotConnectionResult( -1, TQString() ); @@ -471,7 +471,7 @@ void KMail::FolderDiaACLTab::slotConnectionResult( int errorCode, const TQString this, TQT_SLOT( slotConnectionResult(int, const TQString&) ) ); if ( errorCode ) { if ( errorCode == -1 ) // unspecified error - mLabel->setText( i18n( "Error connecting to server %1" ).tqarg( mImapAccount->host() ) ); + mLabel->setText( i18n( "Error connecting to server %1" ).arg( mImapAccount->host() ) ); else // Connection error (error message box already shown by the account) mLabel->setText( KIO::buildErrorString( errorCode, errorMsg ) ); @@ -521,7 +521,7 @@ void KMail::FolderDiaACLTab::slotReceivedACL( KMFolder* folder, KIO::Job* job, c if ( job->error() == KIO::ERR_UNSUPPORTED_ACTION ) mLabel->setText( i18n( "This IMAP server does not have support for access control lists (ACL)" ) ); else - mLabel->setText( i18n( "Error retrieving access control list (ACL) from server\n%1" ).tqarg( job->errorString() ) ); + mLabel->setText( i18n( "Error retrieving access control list (ACL) from server\n%1" ).arg( job->errorString() ) ); return; } diff --git a/kmail/folderdiaquotatab.cpp b/kmail/folderdiaquotatab.cpp index 7c133bb8f..133a2b1a5 100644 --- a/kmail/folderdiaquotatab.cpp +++ b/kmail/folderdiaquotatab.cpp @@ -117,7 +117,7 @@ void KMail::FolderDiaQuotaTab::load() KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->parentFolder(); if ( folder && folder->storage() == mImapAccount->rootFolder() ) return; // nothing to be done for the (virtual) account folder - mLabel->setText( i18n( "Connecting to server %1, please wait..." ).tqarg( mImapAccount->host() ) ); + mLabel->setText( i18n( "Connecting to server %1, please wait..." ).arg( mImapAccount->host() ) ); ImapAccountBase::ConnectionState state = mImapAccount->makeConnection(); if ( state == ImapAccountBase::Error ) { // Cancelled by user, or slave can't start slotConnectionResult( -1, TQString() ); @@ -136,7 +136,7 @@ void KMail::FolderDiaQuotaTab::slotConnectionResult( int errorCode, const TQStri this, TQT_SLOT( slotConnectionResult(int, const TQString&) ) ); if ( errorCode ) { if ( errorCode == -1 ) // unspecified error - mLabel->setText( i18n( "Error connecting to server %1" ).tqarg( mImapAccount->host() ) ); + mLabel->setText( i18n( "Error connecting to server %1" ).arg( mImapAccount->host() ) ); else // Connection error (error message box already shown by the account) mLabel->setText( KIO::buildErrorString( errorCode, errorMsg ) ); @@ -162,7 +162,7 @@ void KMail::FolderDiaQuotaTab::slotReceivedQuotaInfo( KMFolder* folder, if ( job->error() == KIO::ERR_UNSUPPORTED_ACTION ) mLabel->setText( i18n( "This account does not have support for quota information." ) ); else - mLabel->setText( i18n( "Error retrieving quota information from server\n%1" ).tqarg( job->errorString() ) ); + mLabel->setText( i18n( "Error retrieving quota information from server\n%1" ).arg( job->errorString() ) ); } else { mQuotaInfo = info; } diff --git a/kmail/folderrequester.cpp b/kmail/folderrequester.cpp index 242037b9a..ca6271c8e 100644 --- a/kmail/folderrequester.cpp +++ b/kmail/folderrequester.cpp @@ -104,7 +104,7 @@ void FolderRequester::setFolder( const TQString &idString ) setFolder( folder ); } else { if ( !idString.isEmpty() ) { - edit->setText( i18n( "Unknown folder '%1'" ).tqarg( idString ) ); + edit->setText( i18n( "Unknown folder '%1'" ).arg( idString ) ); } else { edit->setText( i18n( "Please select a folder" ) ); } diff --git a/kmail/foldershortcutdialog.cpp b/kmail/foldershortcutdialog.cpp index 9095a647b..770b6cfc6 100644 --- a/kmail/foldershortcutdialog.cpp +++ b/kmail/foldershortcutdialog.cpp @@ -56,7 +56,7 @@ FolderShortcutDialog::FolderShortcutDialog( KMFolder *folder, TQWidget *parent, const char *name ) : KDialogBase( parent, name, true, - i18n( "Shortcut for Folder %1" ).tqarg( folder->label() ), + i18n( "Shortcut for Folder %1" ).arg( folder->label() ), KDialogBase::Ok | KDialogBase::Cancel ), mFolder( folder ), mMainWidget( mainwidget ) { diff --git a/kmail/folderstorage.cpp b/kmail/folderstorage.cpp index 57241cd4b..bfc36b70a 100644 --- a/kmail/folderstorage.cpp +++ b/kmail/folderstorage.cpp @@ -174,7 +174,7 @@ void FolderStorage::markNewAsUnread() if (!(msgBase = getMsgBase(i))) continue; if (msgBase->isNew()) { - msgBase->seStatus(KMMsgStatusUnread); + msgBase->setStatus(KMMsgStatusUnread); msgBase->setDirty(true); } } @@ -503,7 +503,7 @@ KMMessage* FolderStorage::getMsg(int idx) kdDebug(5006) << "Error: " << location() << " Index file is inconsistent with folder file. This should never happen." << endl; - // We can't recreate the index at this point, since that would tqinvalidate the current + // We can't recreate the index at this point, since that would invalidate the current // message list and delete KMMsgBase or KMMessage objects that are in use. // Do it later in KMFolderIndex::readIndexHeader() instead. mCompactable = false; // Don't compact @@ -1040,24 +1040,24 @@ void FolderStorage::setRDict( KMMsgDictREntry *rentry ) const } //----------------------------------------------------------------------------- -void FolderStorage::seStatus(int idx, KMMsgStatus status, bool toggle) +void FolderStorage::setStatus(int idx, KMMsgStatus status, bool toggle) { KMMsgBase *msg = getMsgBase(idx); if ( msg ) { if (toggle) msg->toggleStatus(status, idx); else - msg->seStatus(status, idx); + msg->setStatus(status, idx); } } //----------------------------------------------------------------------------- -void FolderStorage::seStatus(TQValueList<int>& ids, KMMsgStatus status, bool toggle) +void FolderStorage::setStatus(TQValueList<int>& ids, KMMsgStatus status, bool toggle) { for ( TQValueList<int>::Iterator it = ids.begin(); it != ids.end(); ++it ) { - FolderStorage::seStatus(*it, status, toggle); + FolderStorage::setStatus(*it, status, toggle); } } diff --git a/kmail/folderstorage.h b/kmail/folderstorage.h index 390675a25..3aeefbc4c 100644 --- a/kmail/folderstorage.h +++ b/kmail/folderstorage.h @@ -71,7 +71,7 @@ typedef TQValueList<TQ_UINT32> SerNumList; * * @section Accounts * The accounts (of KMail) that are fed into the folder are - * represented as the tqchildren of the folder. They are only stored here + * represented as the children of the folder. They are only stored here * during runtime to have a reference for which accounts point to a * specific folder. */ @@ -109,10 +109,10 @@ public: /** Specify, that the folder can't contain mails. */ virtual void setNoContent(bool aNoContent); - /** Returns, if the folder can't have tqchildren */ + /** Returns, if the folder can't have children */ virtual bool noChildren() const { return mNoChildren; } - /** Specify, that the folder can't have tqchildren */ + /** Specify, that the folder can't have children */ virtual void setNoChildren( bool aNoChildren ); enum ChildrenState { @@ -120,11 +120,11 @@ public: HasNoChildren, ChildrenUnknown }; - /** Returns if the folder has tqchildren, - * has no tqchildren or we don't know */ + /** Returns if the folder has children, + * has no children or we don't know */ virtual ChildrenState hasChildren() const { return mHasChildren; } - /** Specify if the folder has tqchildren */ + /** Specify if the folder has children */ virtual void setHasChildren( ChildrenState state ) { mHasChildren = state; } @@ -245,7 +245,7 @@ public: * be reflected in the UI. */ virtual bool isCloseToQuota() const; - /** Called by KMMsgBase::seStatus when status of a message has changed + /** Called by KMMsgBase::setStatus when status of a message has changed required to keep the number unread messages variable current. */ virtual void msgStatusChanged( const KMMsgStatus oldStatus, const KMMsgStatus newStatus, @@ -364,10 +364,10 @@ public: void deregisterFromMessageDict(); /** Set the status of the message at index @p idx to @p status. */ - virtual void seStatus(int idx, KMMsgStatus status, bool toggle=false); + virtual void setStatus(int idx, KMMsgStatus status, bool toggle=false); /** Set the status of the message(s) in the TQValueList @p ids to @p status. */ - virtual void seStatus(TQValueList<int>& ids, KMMsgStatus status, bool toggle=false); + virtual void setStatus(TQValueList<int>& ids, KMMsgStatus status, bool toggle=false); void removeJobs(); diff --git a/kmail/foldertreebase.cpp b/kmail/foldertreebase.cpp index 8557388ac..68c881f05 100644 --- a/kmail/foldertreebase.cpp +++ b/kmail/foldertreebase.cpp @@ -179,10 +179,10 @@ void FolderTreeBase::slotUpdateCounts(KMFolder * folder, bool force /* = false*/ } // set it - bool tqrepaint = false; + bool repaint = false; if (fti->unreadCount() != count) { fti->adjustUnreadCount( count ); - tqrepaint = true; + repaint = true; } if (isTotalActive() || force) { @@ -196,7 +196,7 @@ void FolderTreeBase::slotUpdateCounts(KMFolder * folder, bool force /* = false*/ // set it if ( count != fti->totalCount() ) { fti->setTotalCount(count); - tqrepaint = true; + repaint = true; } } if ( isSizeActive() || force ) { @@ -204,7 +204,7 @@ void FolderTreeBase::slotUpdateCounts(KMFolder * folder, bool force /* = false*/ TQ_INT64 size = folder->storage()->folderSize(); if ( size != fti->folderSize() ) { fti->setFolderSize( size ); - tqrepaint = true; + repaint = true; } } } @@ -213,8 +213,8 @@ void FolderTreeBase::slotUpdateCounts(KMFolder * folder, bool force /* = false*/ } if (fti->parent() && !fti->parent()->isOpen()) - tqrepaint = false; // we're not visible - if (tqrepaint) { + repaint = false; // we're not visible + if (repaint) { fti->setNeedsRepaint( true ); emit triggerRefresh(); } diff --git a/kmail/folderutil.cpp b/kmail/folderutil.cpp index 40b543be7..0c2554dc0 100644 --- a/kmail/folderutil.cpp +++ b/kmail/folderutil.cpp @@ -92,7 +92,7 @@ void KMail::FolderUtil::deleteFolder( KMFolder *folderToDelete, TQWidget *parent KMessageBox::information(parent, i18n("<qt>The folder you deleted was associated with the account " "<b>%1</b> which delivered mail into it. The folder the account " - "delivers new mail into was reset to the main Inbox folder.</qt>").tqarg( (*it)->name())); + "delivers new mail into was reset to the main Inbox folder.</qt>").arg( (*it)->name())); } } if (folderToDelete->folderType() == KMFolderTypeImap) diff --git a/kmail/folderviewtooltip.h b/kmail/folderviewtooltip.h index 096d22764..dfc3bbbaf 100644 --- a/kmail/folderviewtooltip.h +++ b/kmail/folderviewtooltip.h @@ -32,15 +32,15 @@ class FolderViewToolTip : public TQToolTip item->updateCount(); TQString tipText = i18n("<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4" ) - .tqarg( item->folder()->prettyURL().replace( " ", " " ) ) - .tqarg( item->totalCount() < 0 ? "-" : TQString::number( item->totalCount() ) ) - .tqarg( item->unreadCount() < 0 ? "-" : TQString::number( item->unreadCount() ) ) - .tqarg( KIO::convertSize( item->folderSize() ) ); + .arg( item->folder()->prettyURL().replace( " ", " " ) ) + .arg( item->totalCount() < 0 ? "-" : TQString::number( item->totalCount() ) ) + .arg( item->unreadCount() < 0 ? "-" : TQString::number( item->unreadCount() ) ) + .arg( KIO::convertSize( item->folderSize() ) ); if ( KMFolderCachedImap* imap = dynamic_cast<KMFolderCachedImap*>( item->folder()->storage() ) ) { QuotaInfo info = imap->quotaInfo(); if ( info.isValid() && !info.isEmpty() ) - tipText += i18n("<br>Quota: %1").tqarg( info.toString() ); + tipText += i18n("<br>Quota: %1").arg( info.toString() ); } tip( TQRect( headerRect.left(), itemRect.top(), headerRect.width(), itemRect.height() ), tipText ); diff --git a/kmail/headeritem.cpp b/kmail/headeritem.cpp index 14d467327..7decd39f2 100644 --- a/kmail/headeritem.cpp +++ b/kmail/headeritem.cpp @@ -145,7 +145,7 @@ TQ_UINT32 HeaderItem::msgSerNum() const // Update this item to summarise a new folder and message -//Opens all tqchildren in the thread +//Opens all children in the thread void HeaderItem::setOpenRecursive( bool open ) { if (open){ @@ -458,7 +458,7 @@ TQString HeaderItem::generate_key( KMHeaders *headers, int column = sortOrder & ((1 << 5) - 1); TQString ret = TQChar( (char)sortOrder ); - TQString sortArrival = TQString( "%1" ).tqarg( msg->getMsgSerNum(), 0, 36 ); + TQString sortArrival = TQString( "%1" ).arg( msg->getMsgSerNum(), 0, 36 ); while (sortArrival.length() < 7) sortArrival = '0' + sortArrival; if (column == paintInfo->dateCol) { diff --git a/kmail/headeritem.h b/kmail/headeritem.h index 2142cf71b..34dee4de0 100644 --- a/kmail/headeritem.h +++ b/kmail/headeritem.h @@ -80,20 +80,20 @@ public: /** Returns whether the item has other items below it. */ bool hasChildren() const { return mSortedChildren.count() || mUnsortedCount; } - /** The sorted tqchildren are an array of sortcache items we know are below the + /** The sorted children are an array of sortcache items we know are below the * current one and are already properly sorted (as read from the cache ) */ const TQPtrList<SortCacheItem> *sortedChildren() const { return &mSortedChildren; } - /** The unsorted tqchildren are an array of sortcache items we know are below the + /** The unsorted children are an array of sortcache items we know are below the * current one, but are yet to be threaded and sorted properly. */ SortCacheItem **unsortedChildren(int &count) const { count = mUnsortedCount; return mUnsortedChildren; } - /** Add an item to this itme's list of already sorted tqchildren. */ + /** Add an item to this itme's list of already sorted children. */ void addSortedChild(SortCacheItem *i) { i->mParent = this; mSortedChildren.append(i); } - /** Add an item to this itme's list of unsorted tqchildren. */ + /** Add an item to this itme's list of unsorted children. */ void addUnsortedChild(SortCacheItem *i) { i->mParent = this; if(!mUnsortedChildren) @@ -104,7 +104,7 @@ public: mUnsortedChildren[mUnsortedCount++] = i; } - /** Clear the sorted and unsorted tqchildren datastructures. */ + /** Clear the sorted and unsorted children datastructures. */ void clearChildren() { mSortedChildren.clear(); free( mUnsortedChildren ); @@ -185,7 +185,7 @@ public: // Return the serial number of the message associated with this item; TQ_UINT32 msgSerNum() const; - /** Expands all tqchildren of the list view item. */ + /** Expands all children of the list view item. */ void setOpenRecursive( bool open ); /** Returns the text of the list view item. */ diff --git a/kmail/headerstyle.cpp b/kmail/headerstyle.cpp index 405f802b1..ab3ae9364 100644 --- a/kmail/headerstyle.cpp +++ b/kmail/headerstyle.cpp @@ -82,10 +82,10 @@ namespace KMail { static TQString convertToHtmlBlock( const TQString & str, bool useSpan=false ) { TQString dir = directionOf( str ); TQString format = "<%1 dir=\"%3\">%4</%2>"; - return format.tqarg( useSpan ? "span" : "div" ) - .tqarg( useSpan ? "span" : "div" ) - .tqarg( dir ) - .tqarg( LinkLocator::convertToHtml( str ) ); + return format.arg( useSpan ? "span" : "div" ) + .arg( useSpan ? "span" : "div" ) + .arg( dir ) + .arg( LinkLocator::convertToHtml( str ) ); } #endif @@ -262,13 +262,13 @@ namespace KMail { return headerStr + "</div>"; } - headerStr = TQString("<div class=\"header\" dir=\"%1\">").tqarg(dir); + headerStr = TQString("<div class=\"header\" dir=\"%1\">").arg(dir); //case HdrLong: if ( strategy->showHeader( "subject" ) ) headerStr += TQString("<div dir=\"%1\"><b style=\"font-size:130%\">" + strToHtml(message->subject()) + "</b></div>\n") - .tqarg(subjectDir); + .arg(subjectDir); if ( strategy->showHeader( "date" ) ) headerStr.append(i18n("Date: ") + strToHtml(dateString)+"<br>\n"); @@ -408,9 +408,9 @@ namespace KMail { } } TQString titleText = i18n("%1% probability of being spam.\n\nFull report:\n%2") - .tqarg( TQString::number( percent ), filterHeader ); + .arg( TQString::number( percent ), filterHeader ); return TQString("<img src=\"%1\" width=\"%2\" height=\"%3\" style=\"border: 1px solid black;\" title=\"%4\"> ") - .tqarg( imgToDataUrl( meterBar, "PPM" ), TQString::number( 20 ), + .arg( imgToDataUrl( meterBar, "PPM" ), TQString::number( 20 ), TQString::number( 5 ), titleText ); } @@ -430,7 +430,7 @@ namespace KMail { // of the application tqlayout. TQString dir = ( TQApplication::reverseLayout() ? "rtl" : "ltr" ); - TQString headerStr = TQString("<div class=\"fancy header\" dir=\"%1\">\n").tqarg(dir); + TQString headerStr = TQString("<div class=\"fancy header\" dir=\"%1\">\n").arg(dir); // However, the direction of the message subject within the header is // determined according to the contents of the subject itself. Since @@ -494,7 +494,7 @@ namespace KMail { if ( !presence.isEmpty() ) { TQString presenceIcon = TQString::fromLatin1( " <img src=\"%1\"/>" ) - .tqarg( imgToDataUrl( imProxy->presenceIcon( kabcUid ).convertToImage() ) ); + .arg( imgToDataUrl( imProxy->presenceIcon( kabcUid ).convertToImage() ) ); presence += presenceIcon; } } @@ -585,26 +585,26 @@ namespace KMail { { //kdDebug( 5006 ) << "Got a photo: " << photoURL << endl; userHTML = TQString("<img src=\"%1\" width=\"%2\" height=\"%3\">") - .tqarg( photoURL ).tqarg( photoWidth ).tqarg( photoHeight ); + .arg( photoURL ).arg( photoWidth ).arg( photoHeight ); if ( presence.isEmpty() ) { userHTML = TQString("<div class=\"senderpic\">") + userHTML + "</div>"; } else { userHTML = TQString( "<div class=\"senderpic\">" "<a href=\"im:%1\">%2<div class=\"senderstatus\">" "<span name=\"presence-%3\">%4</span></div></a>" - "</div>" ).tqarg( kabcUid ) - .tqarg( userHTML ) - .tqarg( kabcUid ) - .tqarg( presence ); + "</div>" ).arg( kabcUid ) + .arg( userHTML ) + .arg( kabcUid ) + .arg( presence ); } } else { // we don't have a photo, just show presence, if we have it if ( !presence.isEmpty() ) userHTML = TQString( "<a href=\"im:%1\"><div class=\"senderstatus\">" "<span name=\"presence-%2\">%3</span></div></a>" ) - .tqarg( kabcUid ) - .tqarg( kabcUid ) - .tqarg( presence ); + .arg( kabcUid ) + .arg( kabcUid ) + .arg( presence ); } #if 0 // Disabled 'Launch IM' link in headers - Will @@ -719,12 +719,12 @@ namespace KMail { "margin: 0px 0px 3px 0px;" "\" class=\"curtime\">%4<br />%5<br />%6</div>" ) - .tqarg( bg_color ) - .tqarg( color ) - .tqarg( bg_image ) - .tqarg( i18n( "Now:" ) ) - .tqarg( currTime.toString( tformat ) ) - .tqarg( timeofday ) + .arg( bg_color ) + .arg( color ) + .arg( bg_image ) + .arg( i18n( "Now:" ) ) + .arg( currTime.toString( tformat ) ) + .arg( timeofday ) ); } else { @@ -739,8 +739,8 @@ namespace KMail { ( GlobalSettings::self()->showEmoticons() ? LinkLocator::ReplaceSmileys : 0 ); headerStr += TQString("<div dir=\"%1\">%2</div>\n") - .tqarg(subjectDir) - .tqarg(message->subject().isEmpty()? + .arg(subjectDir) + .arg(message->subject().isEmpty()? i18n("No Subject") : strToHtml( message->subject(), flags )); } @@ -755,11 +755,11 @@ namespace KMail { fromStr = message->fromStrip(); // let's use that headerStr += TQString("<tr><th>%1</th>\n" "<td>") - .tqarg(i18n("From: ")) + .arg(i18n("From: ")) + KMMessage::emailAddrAsAnchor( fromStr, false ) + ( !message->headerField( "Resent-From" ).isEmpty() ? " " + i18n("(resent from %1)") - .tqarg( KMMessage::emailAddrAsAnchor( + .arg( KMMessage::emailAddrAsAnchor( message->headerField( "Resent-From" ),false) ) : TQString("") ) + ( !vCardName.isEmpty() ? " <a href=\"" + vCardName + "\">" @@ -781,37 +781,37 @@ namespace KMail { if ( strategy->showHeader( "to" ) ) headerStr.append(TQString("<tr><th>%1</th>\n" "<td>%2</td></tr>\n") - .tqarg(i18n("To: ")) - .tqarg(KMMessage::emailAddrAsAnchor(message->to(),false))); + .arg(i18n("To: ")) + .arg(KMMessage::emailAddrAsAnchor(message->to(),false))); // cc line, if any if ( strategy->showHeader( "cc" ) && !message->cc().isEmpty()) headerStr.append(TQString("<tr><th>%1</th>\n" "<td>%2</td></tr>\n") - .tqarg(i18n("CC: ")) - .tqarg(KMMessage::emailAddrAsAnchor(message->cc(),false))); + .arg(i18n("CC: ")) + .arg(KMMessage::emailAddrAsAnchor(message->cc(),false))); // Bcc line, if any if ( strategy->showHeader( "bcc" ) && !message->bcc().isEmpty()) headerStr.append(TQString("<tr><th>%1</th>\n" "<td>%2</td></tr>\n") - .tqarg(i18n("BCC: ")) - .tqarg(KMMessage::emailAddrAsAnchor(message->bcc(),false))); + .arg(i18n("BCC: ")) + .arg(KMMessage::emailAddrAsAnchor(message->bcc(),false))); if ( strategy->showHeader( "date" ) ) headerStr.append(TQString("<tr><th>%1</th>\n" "<td dir=\"%2\">%3</td></tr>\n") - .tqarg(i18n("Date: ")) - .tqarg( directionOf( message->dateStr() ) ) - .tqarg(strToHtml(dateString))); + .arg(i18n("Date: ")) + .arg( directionOf( message->dateStr() ) ) + .arg(strToHtml(dateString))); if ( GlobalSettings::self()->showUserAgent() ) { if ( strategy->showHeader( "user-agent" ) ) { if ( !message->headerField("User-Agent").isEmpty() ) { headerStr.append(TQString("<tr><th>%1</th>\n" "<td>%2</td></tr>\n") - .tqarg(i18n("User-Agent: ")) - .tqarg( strToHtml( message->headerField("User-Agent") ) ) ); + .arg(i18n("User-Agent: ")) + .arg( strToHtml( message->headerField("User-Agent") ) ) ); } } @@ -819,8 +819,8 @@ namespace KMail { if ( !message->headerField("X-Mailer").isEmpty() ) { headerStr.append(TQString("<tr><th>%1</th>\n" "<td>%2</td></tr>\n") - .tqarg(i18n("X-Mailer: ")) - .tqarg( strToHtml( message->headerField("X-Mailer") ) ) ); + .arg(i18n("X-Mailer: ")) + .arg( strToHtml( message->headerField("X-Mailer") ) ) ); } } } @@ -829,19 +829,19 @@ namespace KMail { /* if( strategy->showHeader( "status" ) ) headerStr.append( TQString( "<tr><th>%1</th>\n" "<td dir=\"%2\">%3</td></tr>\n") - .tqarg(i18n("Sender status: ")) - .tqarg( directionOf( onlineStatus ) ) - .tqarg(onlineStatus)); + .arg(i18n("Sender status: ")) + .arg( directionOf( onlineStatus ) ) + .arg(onlineStatus)); */ headerStr.append( TQString("<tr><td colspan=\"2\"><div id=\"attachmentInjectionPoint\"></div></td></tr>" ) ); headerStr.append( TQString( "</table></td><td align=\"center\" valign=\"top\">%1%2</td></tr></table>\n" ) - .tqarg(timeHTML) - .tqarg(userHTML) ); + .arg(timeHTML) + .arg(userHTML) ); if ( !spamHTML.isEmpty() ) headerStr.append( TQString( "<div class=\"spamheader\" dir=\"%1\"><b>%2</b> <span style=\"padding-left: 20px;\">%3</span></div>\n") - .tqarg( subjectDir, i18n("Spam Status:"), spamHTML ) ); + .arg( subjectDir, i18n("Spam Status:"), spamHTML ) ); headerStr += "</div>\n\n"; return headerStr; @@ -854,7 +854,7 @@ namespace KMail { buffer.open( IO_WriteOnly ); image.save( &buffer, fmt ); return TQString::fromLatin1("data:image/%1;base64,%2") - .tqarg( fmt, KCodecs::base64Encode( ba ).data() ); + .arg( fmt, KCodecs::base64Encode( ba ).data() ); } // ##################### diff --git a/kmail/identitydialog.cpp b/kmail/identitydialog.cpp index f32c014ae..c24552643 100644 --- a/kmail/identitydialog.cpp +++ b/kmail/identitydialog.cpp @@ -434,9 +434,9 @@ namespace KMail { mXFaceConfigurator->tqlayout()->setMargin( KDialog::marginHint() ); tabWidget->addTab( mXFaceConfigurator, i18n("&Picture") ); - KConfigGroup tqgeometry( KMKernel::config(), "Geometry" ); - if ( tqgeometry.hasKey( "Identity Dialog size" ) ) - resize( tqgeometry.readSizeEntry( "Identity Dialog size" ) ); + KConfigGroup geometry( KMKernel::config(), "Geometry" ); + if ( geometry.hasKey( "Identity Dialog size" ) ) + resize( geometry.readSizeEntry( "Identity Dialog size" ) ); mNameEdit->setFocus(); connect( tabWidget, TQT_SIGNAL(currentChanged(TQWidget*)), @@ -444,8 +444,8 @@ namespace KMail { } IdentityDialog::~IdentityDialog() { - KConfigGroup tqgeometry( KMKernel::config(), "Geometry" ); - tqgeometry.writeEntry( "Identity Dialog size", size() ); + KConfigGroup geometry( KMKernel::config(), "Geometry" ); + geometry.writeEntry( "Identity Dialog size", size() ); } void IdentityDialog::slotAboutToShow( TQWidget * w ) { @@ -527,7 +527,7 @@ void IdentityDialog::slotOk() { for ( TQStringList::const_iterator it = aliases.begin(), end = aliases.end() ; it != end ; ++it ) { if ( !isValidSimpleEmailAddress( *it ) ) { TQString errorMsg( simpleEmailAddressErrorMsg()); - KMessageBox::sorry( this, errorMsg, i18n("Invalid Email Alias \"%1\"").tqarg( *it ) ); + KMessageBox::sorry( this, errorMsg, i18n("Invalid Email Alias \"%1\"").arg( *it ) ); return; } } @@ -580,7 +580,7 @@ void IdentityDialog::slotOk() { } if ( err ) - if ( KMessageBox::warningContinueCancel( this, msg.tqarg( email ), + if ( KMessageBox::warningContinueCancel( this, msg.arg( email ), i18n("Email Address Not Found in Key/Certificates"), KStdGuiItem::cont(), "warn_email_not_in_certificate" ) != KMessageBox::Continue) @@ -612,7 +612,7 @@ void IdentityDialog::slotOk() { void IdentityDialog::setIdentity( KPIM::Identity & ident ) { - setCaption( i18n("Edit Identity \"%1\"").tqarg( ident.identityName() ) ); + setCaption( i18n("Edit Identity \"%1\"").arg( ident.identityName() ) ); // "General" tab: mNameEdit->setText( ident.fullName() ); @@ -641,7 +641,7 @@ void IdentityDialog::slotOk() { "\"%1\" does not exist (anymore); " "therefore, the default sent-mail folder " "will be used.") - .tqarg( ident.identityName() ) ) ) + .arg( ident.identityName() ) ) ) mFccCombo->setFolder( kmkernel->sentFolder() ); else mFccCombo->setFolder( ident.fcc() ); @@ -652,7 +652,7 @@ void IdentityDialog::slotOk() { "\"%1\" does not exist (anymore); " "therefore, the default drafts folder " "will be used.") - .tqarg( ident.identityName() ) ) ) + .arg( ident.identityName() ) ) ) mDraftsCombo->setFolder( kmkernel->draftsFolder() ); else mDraftsCombo->setFolder( ident.drafts() ); @@ -663,14 +663,14 @@ void IdentityDialog::slotOk() { "\"%1\" does not exist (anymore); " "therefore, the default templates folder " "will be used.") - .tqarg( ident.identityName() ) ) ) + .arg( ident.identityName() ) ) ) mTemplatesCombo->setFolder( kmkernel->templatesFolder() ); else mTemplatesCombo->setFolder( ident.templates() ); // "Templates" tab: uint identity = ident.uoid(); - TQString iid = TQString("IDENTITY_%1").tqarg( identity ); + TQString iid = TQString("IDENTITY_%1").arg( identity ); Templates t( iid ); mCustom->setChecked(t.useCustomTemplates()); mWidget->loadFromIdentity( identity ); @@ -709,7 +709,7 @@ void IdentityDialog::slotOk() { mTemplatesCombo->folder()->idString() : TQString() ); // "Templates" tab: uint identity = ident.uoid(); - TQString iid = TQString("IDENTITY_%1").tqarg( identity ); + TQString iid = TQString("IDENTITY_%1").arg( identity ); Templates t( iid ); kdDebug() << "use custom templates for identity " << identity << ": " << mCustom->isChecked() << endl; t.setUseCustomTemplates(mCustom->isChecked()); diff --git a/kmail/identitylistview.cpp b/kmail/identitylistview.cpp index 5ce6f38c8..7a5134457 100644 --- a/kmail/identitylistview.cpp +++ b/kmail/identitylistview.cpp @@ -83,7 +83,7 @@ namespace KMail { setText( 0, i18n("%1: identity name. Used in the config " "dialog, section Identity, to indicate the " "default identity", "%1 (Default)") - .tqarg( ident.identityName() ) ); + .arg( ident.identityName() ) ); else setText( 0, ident.identityName() ); setText( 1, ident.fullEmailAddr() ); diff --git a/kmail/imapaccountbase.cpp b/kmail/imapaccountbase.cpp index df90dfdb2..605d5c02a 100644 --- a/kmail/imapaccountbase.cpp +++ b/kmail/imapaccountbase.cpp @@ -318,7 +318,7 @@ namespace KMail { mSlave = KIO::Scheduler::getConnectedSlave( getUrl(), slaveConfig() ); if ( !mSlave ) { KMessageBox::error(0, i18n("Could not start process for %1.") - .tqarg( getUrl().protocol() ) ); + .arg( getUrl().protocol() ) ); return Error; } if ( mSlave->isConnected() ) { @@ -354,7 +354,7 @@ namespace KMail { checkDone( false, CheckOK ); } if ( showStatusMsg ) - BroadcastStatus::instance()->seStatusMsgTransmissionCompleted( + BroadcastStatus::instance()->setStatusMsgTransmissionCompleted( name(), newMails); } @@ -400,7 +400,7 @@ namespace KMail { if (job->error()) { if ( !(*it).quiet ) - handleJobError( job, i18n( "Error while trying to subscribe to %1:" ).tqarg( path ) + '\n' ); + handleJobError( job, i18n( "Error while trying to subscribe to %1:" ).arg( path ) + '\n' ); emit subscriptionChangeFailed( job->errorString() ); // ## emit subscriptionChanged here in case anyone needs it to support continue/cancel } @@ -735,7 +735,7 @@ namespace KMail { if ( !done ) { TQString msg = i18n("KMail has detected a prefix entry in the " "configuration of the account \"%1\" which is obsolete with the " - "support of IMAP namespaces.").tqarg( name() ); + "support of IMAP namespaces.").arg( name() ); if ( list.contains( "" ) ) { // replace empty entry with the old prefix list.remove( "" ); @@ -879,13 +879,13 @@ namespace KMail { KMMessage* msg = jd.msgList.first(); // Use double-quotes around the subject to keep the sentence readable, // but don't use double quotes around the sender since from() might return a double-quoted name already - const TQString subject = msg->subject().isEmpty() ? i18n( "<unknown>" ) : TQString("\"%1\"").tqarg( msg->subject() ); + const TQString subject = msg->subject().isEmpty() ? i18n( "<unknown>" ) : TQString("\"%1\"").arg( msg->subject() ); const TQString from = msg->from().isEmpty() ? i18n( "<unknown>" ) : msg->from(); TQString myError = "<p><b>" + i18n("Error while uploading message") + "</b></p><p>" - + i18n("Could not upload the message dated %1 from <i>%2</i> with subject <i>%3</i> to the server.").tqarg( msg->dateStr(), TQStyleSheet::escape( from ), TQStyleSheet::escape( subject ) ) + + i18n("Could not upload the message dated %1 from <i>%2</i> with subject <i>%3</i> to the server.").arg( msg->dateStr(), TQStyleSheet::escape( from ), TQStyleSheet::escape( subject ) ) + "</p><p>" - + i18n("The destination folder was: <b>%1</b>.").tqarg( TQStyleSheet::escape( folder->prettyURL() ) ) + + i18n("The destination folder was: <b>%1</b>.").arg( TQStyleSheet::escape( folder->prettyURL() ) ) + "</p><p>" + i18n("The server reported:") + "</p>"; return handleJobError( job, myError ); @@ -908,7 +908,7 @@ namespace KMail { } readOnly = folder->isReadOnly(); } - error = i18n("The folder is too close to its quota limit. (%1)").tqarg( quotaAsString ); + error = i18n("The folder is too close to its quota limit. (%1)").arg( quotaAsString ); if ( readOnly ) { error += i18n("\nSince you do not have write privileges on this folder, " "please ask the owner of the folder to free up some space in it."); @@ -961,11 +961,11 @@ namespace KMail { KMessageBox::information( TQT_TQWIDGET(kapp->activeWindow()), msg, caption, "kmailConnectionBrokenErrorDialog" ); // Show it in the status bar, in case the user has ticked "don't show again" if ( errorCode == KIO::ERR_CONNECTION_BROKEN ) - KPIM::BroadcastStatus::instance()->seStatusMsg( - i18n( "The connection to account %1 was broken." ).tqarg( name() ) ); + KPIM::BroadcastStatus::instance()->setStatusMsg( + i18n( "The connection to account %1 was broken." ).arg( name() ) ); else if ( errorCode == KIO::ERR_SERVER_TIMEOUT ) - KPIM::BroadcastStatus::instance()->seStatusMsg( - i18n( "The connection to account %1 timed out." ).tqarg( name() ) ); + KPIM::BroadcastStatus::instance()->setStatusMsg( + i18n( "The connection to account %1 timed out." ).arg( name() ) ); } else { if ( !errors.isEmpty() ) KMessageBox::detailedError( TQT_TQWIDGET(kapp->activeWindow()), msg, errors.join("\n").prepend("<qt>"), caption ); @@ -1141,10 +1141,10 @@ namespace KMail { void ImapAccountBase::constructParts( TQDataStream & stream, int count, KMMessagePart* parentKMPart, DwBodyPart * parent, const DwMessage * dwmsg ) { - int tqchildren; + int children; for (int i = 0; i < count; i++) { - stream >> tqchildren; + stream >> children; KMMessagePart* part = new KMMessagePart( stream ); part->setParent( parentKMPart ); mBodyPartList.append( part ); @@ -1173,7 +1173,7 @@ namespace KMail { if ( !parentKMPart ) parentKMPart = part; - if (tqchildren > 0) + if (children > 0) { DwBodyPart* newparent = dwpart; const DwMessage* newmsg = dwmsg; @@ -1188,7 +1188,7 @@ namespace KMail { if ( part->partSpecifier().endsWith(".HEADER") ) // we don't want headers as parent newParentKMPart = parentKMPart; - constructParts( stream, tqchildren, newParentKMPart, newparent, newmsg ); + constructParts( stream, children, newParentKMPart, newparent, newmsg ); } } } diff --git a/kmail/imapaccountbase.h b/kmail/imapaccountbase.h index d9f3e7cb3..4cca259ff 100644 --- a/kmail/imapaccountbase.h +++ b/kmail/imapaccountbase.h @@ -267,9 +267,9 @@ namespace KMail { /** * Called when we're completely done checking mail for this account - * When @p seStatusMsg is true a status msg is shown + * When @p setStatusMsg is true a status msg is shown */ - void postProcessNewMail( bool seStatusMsg = true ); + void postProcessNewMail( bool setStatusMsg = true ); /** * Check whether we're checking for new mail diff --git a/kmail/imapjob.cpp b/kmail/imapjob.cpp index 693414164..ab57da23a 100644 --- a/kmail/imapjob.cpp +++ b/kmail/imapjob.cpp @@ -140,10 +140,10 @@ void ImapJob::init( JobType jt, TQString sets, KMFolderImap* folder, for ( char *ch = cstr.data(); *ch; ch++ ) { if ( *ch == '\n' && (prevChar != '\r') ) { - jd.data.tqat( i ) = '\r'; + jd.data.at( i ) = '\r'; i++; } - jd.data.tqat( i ) = *ch; + jd.data.at( i ) = *ch; prevChar = *ch; i++; } @@ -191,7 +191,7 @@ void ImapJob::init( JobType jt, TQString sets, KMFolderImap* folder, "ImapJobCopyMove"+ProgressManager::getUniqueID(), i18n("Server operation"), i18n("Source folder: %1 - Destination folder: %2") - .tqarg( TQStyleSheet::escape( msg_parent->prettyURL() ), + .arg( TQStyleSheet::escape( msg_parent->prettyURL() ), TQStyleSheet::escape( mDestFolder->prettyURL() ) ), true, account->useSSL() || account->useTLS() ); @@ -369,7 +369,7 @@ void ImapJob::slotGetMessageResult( KIO::Job * job ) { TQString errorStr = i18n( "Error while retrieving messages from the server." ); if ( (*it).progressItem ) - (*it).progressItem->seStatus( errorStr ); + (*it).progressItem->setStatus( errorStr ); account->handleJobError( job, errorStr ); return; } else { @@ -540,12 +540,12 @@ void ImapJob::slotPutMessageResult( KIO::Job *job ) if (job->error()) { if ( (*it).progressItem ) - (*it).progressItem->seStatus( i18n("Uploading message data failed.") ); + (*it).progressItem->setStatus( i18n("Uploading message data failed.") ); account->handlePutError( job, *it, mDestFolder ); return; } else { if ( (*it).progressItem ) - (*it).progressItem->seStatus( i18n("Uploading message data completed.") ); + (*it).progressItem->setStatus( i18n("Uploading message data completed.") ); if ( mParentProgressItem ) { mParentProgressItem->incCompletedItems(); @@ -651,7 +651,7 @@ void ImapJob::slotCopyMessageResult( KIO::Job *job ) mErrorCode = job->error(); TQString errStr = i18n("Error while copying messages."); if ( (*it).progressItem ) - (*it).progressItem->seStatus( errStr ); + (*it).progressItem->setStatus( errStr ); if ( account->handleJobError( job, errStr ) ) deleteLater(); return; diff --git a/kmail/importjob.cpp b/kmail/importjob.cpp index 783c2dd5c..3a7de1981 100644 --- a/kmail/importjob.cpp +++ b/kmail/importjob.cpp @@ -78,7 +78,7 @@ void KMail::ImportJob::finish() mProgressItem->setComplete(); mProgressItem = 0; TQString text = i18n( "Importing the archive file '%1' into the folder '%2' succeeded." ) - .tqarg( mArchiveFile.path() ).tqarg( mRootFolder->name() ); + .arg( mArchiveFile.path() ).arg( mRootFolder->name() ); text += "\n" + i18n( "1 message was imported.", "%n messages were imported.", mNumberOfImportedMessages ); KMessageBox::information( mParentWidget, text, i18n( "Import finished." ) ); deleteLater(); @@ -95,7 +95,7 @@ void KMail::ImportJob::abort( const TQString &errorMessage ) return; mAborted = true; - TQString text = i18n( "Failed to import the archive into folder '%1'." ).tqarg( mRootFolder->name() ); + TQString text = i18n( "Failed to import the archive into folder '%1'." ).arg( mRootFolder->name() ); text += "\n" + errorMessage; if ( mProgressItem ) { mProgressItem->setComplete(); @@ -111,7 +111,7 @@ KMFolder * KMail::ImportJob::createSubFolder( KMFolder *parent, const TQString & KMFolder *newFolder = FolderUtil::createSubFolder( parent, parent->child(), folderName, TQString(), KMFolderTypeMaildir ); if ( !newFolder ) { - abort( i18n( "Unable to create subfolder for folder '%1'." ).tqarg( parent->name() ) ); + abort( i18n( "Unable to create subfolder for folder '%1'." ).arg( parent->name() ) ); return 0; } else { @@ -207,11 +207,11 @@ void KMail::ImportJob::importNextMessage() } mCurrentFolder = folder; if ( mCurrentFolder->open( "ImportJob" ) != 0 ) { - abort( i18n( "Unable to open folder '%1'." ).tqarg( mCurrentFolder->name() ) ); + abort( i18n( "Unable to open folder '%1'." ).arg( mCurrentFolder->name() ) ); return; } kdDebug(5006) << "importNextMessage(): Current folder of queue is now: " << mCurrentFolder->name() << endl; - mProgressItem->seStatus( i18n( "Importing folder %1" ).tqarg( mCurrentFolder->name() ) ); + mProgressItem->setStatus( i18n( "Importing folder %1" ).arg( mCurrentFolder->name() ) ); } mProgressItem->setProgress( ( mProgressItem->progress() + 5 ) ); @@ -221,7 +221,7 @@ void KMail::ImportJob::importNextMessage() messages.files.removeFirst(); mCurrentMessage = new KMMessage(); - mCurrentMessage->fromByteArray( mCurrentMessageFile->data(), true /* seStatus */ ); + mCurrentMessage->fromByteArray( mCurrentMessageFile->data(), true /* setStatus */ ); int retIndex; // If this is not an IMAP folder, we can add the message directly. Otherwise, the whole thing is @@ -231,7 +231,7 @@ void KMail::ImportJob::importNextMessage() // uploaded. if ( mCurrentFolder->folderType() != KMFolderTypeImap ) { if ( mCurrentFolder->addMsg( mCurrentMessage, &retIndex ) != 0 ) { - abort( i18n( "Failed to add a message to the folder '%1'." ).tqarg( mCurrentFolder->name() ) ); + abort( i18n( "Failed to add a message to the folder '%1'." ).arg( mCurrentFolder->name() ) ); return; } messageAdded(); @@ -284,7 +284,7 @@ KMFolder* KMail::ImportJob::getOrCreateSubFolder( KMFolder *parentFolder, const mode_t subFolderPermissions ) { if ( !parentFolder->createChildFolder() ) { - abort( i18n( "Unable to create subfolder for folder '%1'." ).tqarg( parentFolder->name() ) ); + abort( i18n( "Unable to create subfolder for folder '%1'." ).arg( parentFolder->name() ) ); return 0; } @@ -334,7 +334,7 @@ void KMail::ImportJob::importNextDirectory() const TQString folderName = folderNameForDirectoryName( entry->name() ); if ( folderName.isEmpty() ) { - abort( i18n( "Unexpected subdirectory named '%1'." ).tqarg( entry->name() ) ); + abort( i18n( "Unexpected subdirectory named '%1'." ).arg( entry->name() ) ); return; } KMFolder *subFolder = getOrCreateSubFolder( currentFolder, folderName, entry->permissions() ); @@ -368,12 +368,12 @@ void KMail::ImportJob::start() else if ( !mimeType->patterns().grep( "zip", false ).isEmpty() ) mArchive = new KZip( mArchiveFile.path() ); else { - abort( i18n( "The file '%1' does not appear to be a valid archive." ).tqarg( mArchiveFile.path() ) ); + abort( i18n( "The file '%1' does not appear to be a valid archive." ).arg( mArchiveFile.path() ) ); return; } if ( !mArchive->open( IO_ReadOnly ) ) { - abort( i18n( "Unable to open archive file '%1'" ).tqarg( mArchiveFile.path() ) ); + abort( i18n( "Unable to open archive file '%1'" ).arg( mArchiveFile.path() ) ); return; } diff --git a/kmail/index.cpp b/kmail/index.cpp index 674588f24..bb1e2ac67 100644 --- a/kmail/index.cpp +++ b/kmail/index.cpp @@ -550,7 +550,7 @@ void KMMsgIndex::Search::act() { TQString terms; for ( KMSearchRule* rule = pat->first(); rule; rule = pat->next() ) { Q_ASSERT( rule->function() == KMSearchRule::FuncContains ); - terms += TQString::fromLatin1( " %1 " ).tqarg( rule->contents() ); + terms += TQString::fromLatin1( " %1 " ).arg( rule->contents() ); } mValues = kmkernel->msgIndex()->simpleSearch( terms, 0 ); diff --git a/kmail/kcursorsaver.h b/kmail/kcursorsaver.h index ec02eb946..a4efe26de 100644 --- a/kmail/kcursorsaver.h +++ b/kmail/kcursorsaver.h @@ -13,9 +13,9 @@ class KCursorSaver : public TQt { public: - /// constructor taking TQCursor tqshapes - KCursorSaver(TQt::CursorShape tqshape) { - TQApplication::setOverrideCursor( TQCursor(tqshape) ); + /// constructor taking TQCursor shapes + KCursorSaver(TQt::CursorShape shape) { + TQApplication::setOverrideCursor( TQCursor(shape) ); inited = true; } diff --git a/kmail/keyresolver.cpp b/kmail/keyresolver.cpp index c6abdd95e..a9f8dc6dc 100644 --- a/kmail/keyresolver.cpp +++ b/kmail/keyresolver.cpp @@ -308,7 +308,7 @@ static std::vector<GpgME::Key> trustedOrConfirmed( const std::vector<GpgME::Key> "for encryption.") : i18n("One or more of the OpenPGP encryption keys or S/MIME " "certificates for recipient \"%1\" is not fully trusted " - "for encryption.").tqarg(address) ; + "for encryption.").arg(address) ; if ( !fishies.empty() ) { // certificates can't have marginal trust @@ -651,7 +651,7 @@ Kpgp::Result Kleo::KeyResolver::checkKeyNearExpiry( const GpgME::Key & key, cons "<p>expired less than a day ago.</p>", "<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>" "<p>expired %n days ago.</p>", - daysSinceExpiry ) ).tqarg( TQString::fromUtf8( key.userID(0).id() ), + daysSinceExpiry ) ).arg( TQString::fromUtf8( key.userID(0).id() ), key.shortKeyID() ) : ( ca ? ( key.isRoot() @@ -698,7 +698,7 @@ Kpgp::Result Kleo::KeyResolver::checkKeyNearExpiry( const GpgME::Key & key, cons "<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>" "<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>" "<p>expired %n days ago.</p>", - daysSinceExpiry ) ) ).tqarg( Kleo::DN( orig.userID(0).id() ).prettyDN(), + daysSinceExpiry ) ) ).arg( Kleo::DN( orig.userID(0).id() ).prettyDN(), orig.issuerSerial(), Kleo::DN( key.userID(0).id() ).prettyDN() ) : ( mine ? sign @@ -716,7 +716,7 @@ Kpgp::Result Kleo::KeyResolver::checkKeyNearExpiry( const GpgME::Key & key, cons "<p>expired less than a day ago.</p>", "<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number %2)</p>" "<p>expired %n days ago.</p>", - daysSinceExpiry ) ).tqarg( Kleo::DN( key.userID(0).id() ).prettyDN(), + daysSinceExpiry ) ).arg( Kleo::DN( key.userID(0).id() ).prettyDN(), key.issuerSerial() ) ); d->alreadyWarnedFingerprints.insert( subkey.fingerprint() ); if ( KMessageBox::warningContinueCancel( 0, msg, @@ -759,7 +759,7 @@ Kpgp::Result Kleo::KeyResolver::checkKeyNearExpiry( const GpgME::Key & key, cons "<p>expires in less than a day.</p>", "<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>" "<p>expires in less than %n days.</p>", - daysTillExpiry ) ).tqarg( TQString::fromUtf8( key.userID(0).id() ), + daysTillExpiry ) ).arg( TQString::fromUtf8( key.userID(0).id() ), key.shortKeyID() ) : ( ca ? ( key.isRoot() @@ -806,7 +806,7 @@ Kpgp::Result Kleo::KeyResolver::checkKeyNearExpiry( const GpgME::Key & key, cons "<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>" "<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>" "<p>expires in less than %n days.</p>", - daysTillExpiry ) ) ).tqarg( Kleo::DN( orig.userID(0).id() ).prettyDN(), + daysTillExpiry ) ) ).arg( Kleo::DN( orig.userID(0).id() ).prettyDN(), orig.issuerSerial(), Kleo::DN( key.userID(0).id() ).prettyDN() ) : ( mine ? sign @@ -824,7 +824,7 @@ Kpgp::Result Kleo::KeyResolver::checkKeyNearExpiry( const GpgME::Key & key, cons "<p>expires in less than a day.</p>", "<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number %2)</p>" "<p>expires in less than %n days.</p>", - daysTillExpiry ) ).tqarg( Kleo::DN( key.userID(0).id() ).prettyDN(), + daysTillExpiry ) ).arg( Kleo::DN( key.userID(0).id() ).prettyDN(), key.issuerSerial() ) ); d->alreadyWarnedFingerprints.insert( subkey.fingerprint() ); if ( KMessageBox::warningContinueCancel( 0, msg, @@ -1628,7 +1628,7 @@ std::vector<GpgME::Key> Kleo::KeyResolver::getEncryptionKeys( const TQString & p "There is a problem with the " "encryption certificate(s) for \"%1\".\n\n" "Please re-select the certificate(s) which should " - "be used for this recipient.").tqarg(person), + "be used for this recipient.").arg(person), keys ); } bool canceled = false; @@ -1680,13 +1680,13 @@ std::vector<GpgME::Key> Kleo::KeyResolver::getEncryptionKeys( const TQString & p "Select the certificate(s) which should " "be used for this recipient. If there is no suitable certificate in the list " "you can also search for external certificates by clicking the button: search for external certificates.</qt>") - .tqarg( TQStyleSheet::escape(person) ) + .arg( TQStyleSheet::escape(person) ) : i18n("if in your language something like " "'certificate(s)' isn't possible please " "use the plural in the translation", "More than one certificate matches \"%1\".\n\n" "Select the certificate(s) which should " - "be used for this recipient.").tqarg( TQStyleSheet::escape(person) ), + "be used for this recipient.").arg( TQStyleSheet::escape(person) ), matchingKeys ), address, canceled ); // we can ignore 'canceled' here, since trustedOrConfirmed() returns // an empty vector when canceled == true, and we'd just do the same @@ -1797,7 +1797,7 @@ void Kleo::KeyResolver::saveContactPreference( const TQString& email, const Cont KABC::Addressee addr; if ( res.isEmpty() ) { bool ok = true; - TQString fullName = KInputDialog::getText( i18n( "Name Selection" ), i18n( "Which name shall the contact '%1' have in your addressbook?" ).tqarg( email ), TQString(), &ok ); + TQString fullName = KInputDialog::getText( i18n( "Name Selection" ), i18n( "Which name shall the contact '%1' have in your addressbook?" ).arg( email ), TQString(), &ok ); if ( ok ) { addr.setNameFromString( fullName ); addr.insertEmail( email, true ); diff --git a/kmail/khtmlparthtmlwriter.cpp b/kmail/khtmlparthtmlwriter.cpp index 2b53e6094..3c8ee388d 100644 --- a/kmail/khtmlparthtmlwriter.cpp +++ b/kmail/khtmlparthtmlwriter.cpp @@ -86,7 +86,7 @@ namespace KMail { mHtmlPart->view()->viewport()->setUpdatesEnabled( true ); mHtmlPart->view()->setUpdatesEnabled( true ); - mHtmlPart->view()->viewport()->tqrepaint( false ); + mHtmlPart->view()->viewport()->repaint( false ); mState = Ended; } diff --git a/kmail/kmaccount.cpp b/kmail/kmaccount.cpp index fa013b8d0..72a68c655 100644 --- a/kmail/kmaccount.cpp +++ b/kmail/kmaccount.cpp @@ -45,8 +45,8 @@ using KMail::FolderJob; KMPrecommand::KMPrecommand(const TQString &precommand, TQObject *parent) : TQObject(parent), mPrecommand(precommand) { - BroadcastStatus::instance()->seStatusMsg( - i18n("Executing precommand %1").tqarg(precommand )); + BroadcastStatus::instance()->setStatusMsg( + i18n("Executing precommand %1").arg(precommand )); mPrecommandProcess.setUseShell(true); mPrecommandProcess << precommand; @@ -66,7 +66,7 @@ bool KMPrecommand::start() { bool ok = mPrecommandProcess.start( KProcess::NotifyOnExit ); if (!ok) KMessageBox::error(0, i18n("Could not execute precommand '%1'.") - .tqarg(mPrecommand)); + .arg(mPrecommand)); return ok; } @@ -77,7 +77,7 @@ void KMPrecommand::precommandExited(KProcess *p) int exitCode = p->normalExit() ? p->exitStatus() : -1; if (exitCode) KMessageBox::error(0, i18n("The precommand exited with code %1:\n%2") - .tqarg(exitCode).tqarg(strerror(exitCode))); + .arg(exitCode).arg(strerror(exitCode))); emit finished(!exitCode); } @@ -233,10 +233,10 @@ bool KMAccount::processNewMsg(KMMessage* aMsg) // This is only valid for pop accounts and produces wrong stati for imap. if ( type() != "cachedimap" && type() != "imap" ) { if ( aMsg->isOld() ) - aMsg->seStatus(KMMsgStatusUnread); // -sanders - // aMsg->seStatus(KMMsgStatusRead); + aMsg->setStatus(KMMsgStatusUnread); // -sanders + // aMsg->setStatus(KMMsgStatusRead); else - aMsg->seStatus(KMMsgStatusNew); + aMsg->setStatus(KMMsgStatusNew); } /* TQFile fileD0( "testdat_xx-kmaccount-0" ); @@ -377,8 +377,8 @@ bool KMAccount::runPrecommand(const TQString &precommand) KMPrecommand precommandProcess(precommand, this); - BroadcastStatus::instance()->seStatusMsg( - i18n("Executing precommand %1").tqarg(precommand )); + BroadcastStatus::instance()->setStatusMsg( + i18n("Executing precommand %1").arg(precommand )); connect(&precommandProcess, TQT_SIGNAL(finished(bool)), TQT_SLOT(precommandExited(bool))); diff --git a/kmail/kmaccount.h b/kmail/kmaccount.h index e5c1f4e78..1c12042bc 100644 --- a/kmail/kmaccount.h +++ b/kmail/kmaccount.h @@ -208,7 +208,7 @@ public: virtual void setHasInbox( bool has ) { mHasInbox = has; } /** - * If this account is a disconnected IMAP account, tqinvalidate it. + * If this account is a disconnected IMAP account, invalidate it. */ virtual void invalidateIMAPFolders(); diff --git a/kmail/kmacctimap.cpp b/kmail/kmacctimap.cpp index 6690bd008..e57543d30 100644 --- a/kmail/kmacctimap.cpp +++ b/kmail/kmacctimap.cpp @@ -69,7 +69,7 @@ KMAcctImap::KMAcctImap(AccountManager* aOwner, const TQString& aAccountName, uin connect(&mErrorTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotResetConnectionError())); TQString serNumUri = locateLocal( "data", "kmail/unfiltered." + - TQString("%1").tqarg(KAccount::id()) ); + TQString("%1").arg(KAccount::id()) ); KConfig config( serNumUri ); TQStringList serNums = config.readListEntry( "unfiltered" ); mFilterSerNumsToSave.setAutoDelete( false ); @@ -88,7 +88,7 @@ KMAcctImap::~KMAcctImap() killAllJobs( true ); TQString serNumUri = locateLocal( "data", "kmail/unfiltered." + - TQString("%1").tqarg(KAccount::id()) ); + TQString("%1").arg(KAccount::id()) ); KConfig config( serNumUri ); TQStringList serNums; TQDictIterator<int> it( mFilterSerNumsToSave ); @@ -297,7 +297,7 @@ void KMAcctImap::processNewMail(bool interactive) mMailCheckProgressItem = ProgressManager::createProgressItem( "MailCheckAccount" + name(), - i18n("Checking account: %1" ).tqarg( TQStyleSheet::escape( name() ) ), + i18n("Checking account: %1" ).arg( TQStyleSheet::escape( name() ) ), TQString(), // status true, // can be canceled useSSL() || useTLS() ); @@ -395,7 +395,7 @@ void KMAcctImap::postProcessNewMail( KMFolder * folder ) if ( mMailCheckProgressItem ) { mMailCheckProgressItem->incCompletedItems(); mMailCheckProgressItem->updateProgress(); - mMailCheckProgressItem->seStatus( folder->prettyURL() + i18n(" completed") ); + mMailCheckProgressItem->setStatus( folder->prettyURL() + i18n(" completed") ); } mCountRemainChecks--; @@ -434,7 +434,7 @@ void KMAcctImap::postProcessNewMail( KMFolder * folder ) // It's possible that the message has been deleted or moved into a // different folder, or that the serNum is stale if ( !folder ) { - mFilterSerNumsToSave.remove( TQString( "%1" ).tqarg( *filterIt ) ); + mFilterSerNumsToSave.remove( TQString( "%1" ).arg( *filterIt ) ); ++filterIt; continue; } @@ -443,7 +443,7 @@ void KMAcctImap::postProcessNewMail( KMFolder * folder ) if (!imapFolder || !imapFolder->folder()->isSystemFolder() || !(imapFolder->imapPath() == "/INBOX/") ) { // sanity checking - mFilterSerNumsToSave.remove( TQString( "%1" ).tqarg( *filterIt ) ); + mFilterSerNumsToSave.remove( TQString( "%1" ).arg( *filterIt ) ); ++filterIt; continue; } @@ -452,7 +452,7 @@ void KMAcctImap::postProcessNewMail( KMFolder * folder ) msg = folder->getMsg( idx ); if (!msg) { // sanity checking - mFilterSerNumsToSave.remove( TQString( "%1" ).tqarg( *filterIt ) ); + mFilterSerNumsToSave.remove( TQString( "%1" ).arg( *filterIt ) ); ++filterIt; continue; } @@ -473,7 +473,7 @@ void KMAcctImap::postProcessNewMail( KMFolder * folder ) TQT_SLOT(slotFilterMsg(KMMessage*))); job->start(); } else { - mFilterSerNumsToSave.remove( TQString( "%1" ).tqarg( *filterIt ) ); + mFilterSerNumsToSave.remove( TQString( "%1" ).arg( *filterIt ) ); if (slotFilterMsg(msg) == 2) break; } } @@ -498,7 +498,7 @@ void KMAcctImap::postProcessNewMail( KMFolder * folder ) //----------------------------------------------------------------------------- void KMAcctImap::slotFiltered(TQ_UINT32 serNum) { - mFilterSerNumsToSave.remove( TQString( "%1" ).tqarg( serNum ) ); + mFilterSerNumsToSave.remove( TQString( "%1" ).arg( serNum ) ); } //----------------------------------------------------------------------------- @@ -584,7 +584,7 @@ void KMAcctImap::execFilters(TQ_UINT32 serNum) if ( findIt != mFilterSerNums.end() ) return; mFilterSerNums.append( serNum ); - mFilterSerNumsToSave.insert( TQString( "%1" ).tqarg( serNum ), (const int *)1 ); + mFilterSerNumsToSave.insert( TQString( "%1" ).arg( serNum ), (const int *)1 ); } int KMAcctImap::slotFilterMsg( KMMessage *msg ) @@ -596,7 +596,7 @@ int KMAcctImap::slotFilterMsg( KMMessage *msg ) msg->setTransferInProgress(false); TQ_UINT32 serNum = msg->getMsgSerNum(); if ( serNum ) - mFilterSerNumsToSave.remove( TQString( "%1" ).tqarg( serNum ) ); + mFilterSerNumsToSave.remove( TQString( "%1" ).arg( serNum ) ); int filterResult = kmkernel->filterMgr()->process(msg, KMFilterMgr::Inbound, diff --git a/kmail/kmacctlocal.cpp b/kmail/kmacctlocal.cpp index 9af6e2cae..d1e15f83a 100644 --- a/kmail/kmacctlocal.cpp +++ b/kmail/kmacctlocal.cpp @@ -103,7 +103,7 @@ bool KMAcctLocal::preProcess() if ( precommand().isEmpty() ) { TQFileInfo fi( location() ); if ( fi.size() == 0 ) { - BroadcastStatus::instance()->seStatusMsgTransmissionCompleted( mName, 0 ); + BroadcastStatus::instance()->setStatusMsgTransmissionCompleted( mName, 0 ); checkDone( mHasNewMail, CheckOK ); return false; } @@ -119,13 +119,13 @@ bool KMAcctLocal::preProcess() if (!mFolder) { checkDone( mHasNewMail, CheckError ); - BroadcastStatus::instance()->seStatusMsg( i18n( "Transmission failed." )); + BroadcastStatus::instance()->setStatusMsg( i18n( "Transmission failed." )); return false; } //BroadcastStatus::instance()->reset(); - BroadcastStatus::instance()->seStatusMsg( - i18n("Preparing transmission from \"%1\"...").tqarg(mName)); + BroadcastStatus::instance()->setStatusMsg( + i18n("Preparing transmission from \"%1\"...").arg(mName)); Q_ASSERT( !mMailCheckProgressItem ); @@ -133,7 +133,7 @@ bool KMAcctLocal::preProcess() mMailCheckProgressItem = KPIM::ProgressManager::createProgressItem( "MailCheck" + mName, escapedName, - i18n("Preparing transmission from \"%1\"...").tqarg( escapedName ), + i18n("Preparing transmission from \"%1\"...").arg( escapedName ), false, // cannot be canceled false ); // no tls/ssl @@ -142,7 +142,7 @@ bool KMAcctLocal::preProcess() { kdDebug(5006) << "cannot run precommand " << precommand() << endl; checkDone( mHasNewMail, CheckError ); - BroadcastStatus::instance()->seStatusMsg( i18n( "Running precommand failed." )); + BroadcastStatus::instance()->setStatusMsg( i18n( "Running precommand failed." )); return false; } @@ -155,7 +155,7 @@ bool KMAcctLocal::preProcess() kdDebug(5006) << "cannot open file " << mMailFolder->path() << "/" << mMailFolder->name() << endl; checkDone( mHasNewMail, CheckError ); - BroadcastStatus::instance()->seStatusMsg( i18n( "Transmission failed." )); + BroadcastStatus::instance()->setStatusMsg( i18n( "Transmission failed." )); return false; } @@ -164,8 +164,8 @@ bool KMAcctLocal::preProcess() mMailFolder->close("acctlocalMail"); checkDone( mHasNewMail, CheckError ); TQString errMsg = i18n( "Transmission failed: Could not lock %1." ) - .tqarg( mMailFolder->location() ); - BroadcastStatus::instance()->seStatusMsg( errMsg ); + .arg( mMailFolder->location() ); + BroadcastStatus::instance()->setStatusMsg( errMsg ); return false; } @@ -177,9 +177,9 @@ bool KMAcctLocal::preProcess() // prepare the static parts of the status message: mStatusMsgStub = i18n("Moving message %3 of %2 from %1.") - .tqarg(mMailFolder->location()).tqarg( mNumMsgs ); + .arg(mMailFolder->location()).arg( mNumMsgs ); - //BroadcastStatus::instance()->seStatusProgressEnable( "L" + mName, true ); + //BroadcastStatus::instance()->setStatusProgressEnable( "L" + mName, true ); return true; } @@ -192,11 +192,11 @@ bool KMAcctLocal::fetchMsg() /* This causes mail eating if (kmkernel->mailCheckAborted()) break; */ - const TQString statusMsg = mStatusMsgStub.tqarg( mMsgsFetched ); - //BroadcastStatus::instance()->seStatusMsg( statusMsg ); + const TQString statusMsg = mStatusMsgStub.arg( mMsgsFetched ); + //BroadcastStatus::instance()->setStatusMsg( statusMsg ); mMailCheckProgressItem->incCompletedItems(); mMailCheckProgressItem->updateProgress(); - mMailCheckProgressItem->seStatus( statusMsg ); + mMailCheckProgressItem->setStatus( statusMsg ); msg = mMailFolder->take(0); if (msg) @@ -214,7 +214,7 @@ bool KMAcctLocal::fetchMsg() fileD0.close(); // If data is 0 we just create a zero length file. } #endif - msg->seStatus(msg->headerField("Status").latin1(), + msg->setStatus(msg->headerField("Status").latin1(), msg->headerField("X-Status").latin1()); msg->setEncryptionStateChar( msg->headerField( "X-KMail-EncryptionState" ).at(0) ); msg->setSignatureStateChar( msg->headerField( "X-KMail-SignatureState" ).at(0)); @@ -244,16 +244,16 @@ void KMAcctLocal::postProcess() KMessageBox::queuedMessageBox( 0, KMessageBox::Information, i18n( "<qt>Cannot remove mail from " "mailbox <b>%1</b>:<br>%2</qt>" ) - .tqarg( mMailFolder->location() ) - .tqarg( strerror( rc ) ) ); + .arg( mMailFolder->location() ) + .arg( strerror( rc ) ) ); } if( mMailCheckProgressItem ) { // do this only once... - BroadcastStatus::instance()->seStatusMsgTransmissionCompleted( mName, mNumMsgs ); - mMailCheckProgressItem->seStatus( + BroadcastStatus::instance()->setStatusMsgTransmissionCompleted( mName, mNumMsgs ); + mMailCheckProgressItem->setStatus( i18n( "Fetched 1 message from mailbox %1.", "Fetched %n messages from mailbox %1.", - mNumMsgs ).tqarg( mMailFolder->location() ) ); + mNumMsgs ).arg( mMailFolder->location() ) ); mMailCheckProgressItem->setComplete(); mMailCheckProgressItem = 0; } diff --git a/kmail/kmacctmaildir.cpp b/kmail/kmacctmaildir.cpp index bcf29f118..b3c5d31c7 100644 --- a/kmail/kmacctmaildir.cpp +++ b/kmail/kmacctmaildir.cpp @@ -86,7 +86,7 @@ void KMAcctMaildir::processNewMail(bool) TQFileInfo fi( location() ); if ( !fi.exists() ) { checkDone( hasNewMail, CheckOK ); - BroadcastStatus::instance()->seStatusMsgTransmissionCompleted( mName, 0 ); + BroadcastStatus::instance()->setStatusMsgTransmissionCompleted( mName, 0 ); return; } } @@ -102,19 +102,19 @@ void KMAcctMaildir::processNewMail(bool) if (!mFolder) { checkDone( hasNewMail, CheckError ); - BroadcastStatus::instance()->seStatusMsg( i18n( "Transmission failed." )); + BroadcastStatus::instance()->setStatusMsg( i18n( "Transmission failed." )); return; } - BroadcastStatus::instance()->seStatusMsg( - i18n("Preparing transmission from \"%1\"...").tqarg(mName)); + BroadcastStatus::instance()->setStatusMsg( + i18n("Preparing transmission from \"%1\"...").arg(mName)); Q_ASSERT( !mMailCheckProgressItem ); TQString escapedName = TQStyleSheet::escape( mName ); mMailCheckProgressItem = KPIM::ProgressManager::createProgressItem( "MailCheck" + mName, escapedName, - i18n("Preparing transmission from \"%1\"...").tqarg( escapedName ), + i18n("Preparing transmission from \"%1\"...").arg( escapedName ), false, // cannot be canceled false ); // no tls/ssl @@ -123,18 +123,18 @@ void KMAcctMaildir::processNewMail(bool) { kdDebug(5006) << "cannot run precommand " << precommand() << endl; checkDone( hasNewMail, CheckError ); - BroadcastStatus::instance()->seStatusMsg( i18n( "Transmission failed." )); + BroadcastStatus::instance()->setStatusMsg( i18n( "Transmission failed." )); return; } rc = mailFolder.open("acctmaildirMail"); if (rc) { - TQString aStr = i18n("<qt>Cannot open folder <b>%1</b>.</qt>").tqarg( mailFolder.location() ); + TQString aStr = i18n("<qt>Cannot open folder <b>%1</b>.</qt>").arg( mailFolder.location() ); KMessageBox::sorry(0, aStr); kdDebug(5006) << "cannot open folder " << mailFolder.location() << endl; checkDone( hasNewMail, CheckError ); - BroadcastStatus::instance()->seStatusMsg( i18n( "Transmission failed." )); + BroadcastStatus::instance()->setStatusMsg( i18n( "Transmission failed." )); return; } @@ -148,7 +148,7 @@ void KMAcctMaildir::processNewMail(bool) // prepare the static parts of the status message: TQString statusMsgStub = i18n("Moving message %3 of %2 from %1.") - .tqarg(mailFolder.location()).tqarg(num); + .arg(mailFolder.location()).arg(num); mMailCheckProgressItem->setTotalItems( num ); @@ -156,21 +156,21 @@ void KMAcctMaildir::processNewMail(bool) { if( kmkernel->mailCheckAborted() ) { - BroadcastStatus::instance()->seStatusMsg( i18n("Transmission aborted.") ); + BroadcastStatus::instance()->setStatusMsg( i18n("Transmission aborted.") ); num = i; addedOk = false; } if (!addedOk) break; - TQString statusMsg = statusMsgStub.tqarg(i); + TQString statusMsg = statusMsgStub.arg(i); mMailCheckProgressItem->incCompletedItems(); mMailCheckProgressItem->updateProgress(); - mMailCheckProgressItem->seStatus( statusMsg ); + mMailCheckProgressItem->setStatus( statusMsg ); msg = mailFolder.take(0); if (msg) { - msg->seStatus(msg->headerField("Status").latin1(), + msg->setStatus(msg->headerField("Status").latin1(), msg->headerField("X-Status").latin1()); msg->setEncryptionStateChar( msg->headerField( "X-KMail-EncryptionState" ).at(0)); msg->setSignatureStateChar( msg->headerField( "X-KMail-SignatureState" ).at(0)); @@ -188,18 +188,18 @@ void KMAcctMaildir::processNewMail(bool) } if( mMailCheckProgressItem ) { // do this only once... - BroadcastStatus::instance()->seStatusMsgTransmissionCompleted( num ); - mMailCheckProgressItem->seStatus( + BroadcastStatus::instance()->setStatusMsgTransmissionCompleted( num ); + mMailCheckProgressItem->setStatus( i18n( "Fetched 1 message from maildir folder %1.", "Fetched %n messages from maildir folder %1.", - num ).tqarg(mailFolder.location() ) ); + num ).arg(mailFolder.location() ) ); mMailCheckProgressItem->setComplete(); mMailCheckProgressItem = 0; } if (addedOk) { - BroadcastStatus::instance()->seStatusMsgTransmissionCompleted( mName, num ); + BroadcastStatus::instance()->setStatusMsgTransmissionCompleted( mName, num ); } // else warning is written already diff --git a/kmail/kmailicalifaceimpl.cpp b/kmail/kmailicalifaceimpl.cpp index 45654d276..abf480c99 100644 --- a/kmail/kmailicalifaceimpl.cpp +++ b/kmail/kmailicalifaceimpl.cpp @@ -682,8 +682,8 @@ static TQString subresourceLabelForPresentation( const KMFolder * folder ) remainder.pop_front(); remainder.pop_front(); label = i18n("%1's %2") - .tqarg( parts[2] ) - .tqarg( remainder.join( TQString::fromLatin1("/") ) ); + .arg( parts[2] ) + .arg( remainder.join( TQString::fromLatin1("/") ) ); } // Another special case is our own folders, under the imap INBOX, make // those prettier too @@ -698,15 +698,15 @@ static TQString subresourceLabelForPresentation( const KMFolder * folder ) // Fix kolab issue 2531 folder->storage() )->account() can be null if( folder->storage() && static_cast<const KMFolderCachedImap*>( folder->storage() )->account() ) { label = i18n( "My %1 (%2)") - .tqarg( remainder.join( TQString::fromLatin1("/") ), + .arg( remainder.join( TQString::fromLatin1("/") ), static_cast<const KMFolderCachedImap*>( folder->storage() )->account()->name() ); } else { label = i18n("My %1") - .tqarg( remainder.join( TQString::fromLatin1("/") ) ); + .arg( remainder.join( TQString::fromLatin1("/") ) ); } } else { label = i18n("My %1") - .tqarg( remainder.join( TQString::fromLatin1("/") ) ); + .arg( remainder.join( TQString::fromLatin1("/") ) ); } break; } @@ -1776,7 +1776,7 @@ void KMailICalIfaceImpl::readConfig() // No subfolder was found, so ask if we can make them msg = i18n("KMail will now create the required groupware folders" " as subfolders of %1; if you do not want this, cancel" - " and the IMAP resource will be disabled").tqarg(parentFolderName); + " and the IMAP resource will be disabled").arg(parentFolderName); } else { // Some subfolders were found, be more precise TQString operations = "<ul>"; @@ -1784,17 +1784,17 @@ void KMailICalIfaceImpl::readConfig() if ( i != KMail::ContentsTypeMail ) { TQString typeName = localizedDefaultFolderName( static_cast<KMail::FolderContentsType>( i ) ); if ( results[i].found == StandardFolderSearchResult::NotFound ) - operations += "<li>" + i18n( "%1: no folder found. It will be created." ).tqarg( typeName ) + "</li>"; + operations += "<li>" + i18n( "%1: no folder found. It will be created." ).arg( typeName ) + "</li>"; else if ( results[i].found == StandardFolderSearchResult::FoundByType || results[i].found == StandardFolderSearchResult::FoundByName ) operations += "<li>" + i18n( "%1: found folder %2. It will be set as the main groupware folder." ). - tqarg( typeName ).tqarg( results[i].folder->label() ) + "</li>"; + arg( typeName ).arg( results[i].folder->label() ) + "</li>"; } } operations += "</ul>"; msg = i18n("<qt>KMail found the following groupware folders in %1 and needs to perform the following operations: %2" "<br>If you do not want this, cancel" - " and the IMAP resource will be disabled").tqarg(parentFolderName, operations); + " and the IMAP resource will be disabled").arg(parentFolderName, operations); } @@ -1991,7 +1991,7 @@ KMFolder* KMailICalIfaceImpl::initFolder( KMail::FolderContentsType contentsType labels << (*it)->prettyURL(); const TQString selected = KInputDialog::getItem( i18n("Default folder"), i18n("There are multiple %1 default folders, please choose one:") - .tqarg( localizedDefaultFolderName( contentsType ) ), labels ); + .arg( localizedDefaultFolderName( contentsType ) ), labels ); if ( !selected.isEmpty() ) result.folder = result.folders[ labels.findIndex( selected ) ]; } @@ -2017,7 +2017,7 @@ KMFolder* KMailICalIfaceImpl::initFolder( KMail::FolderContentsType contentsType if( folder->canAccess() != 0 ) { KMessageBox::sorry(0, i18n("You do not have read/write permission to your %1 folder.") - .tqarg( folderName( itemType ) ) ); + .arg( folderName( itemType ) ) ); return 0; } folder->storage()->setContentsType( contentsType ); diff --git a/kmail/kmcommands.cpp b/kmail/kmcommands.cpp index 508964519..341a35208 100644 --- a/kmail/kmcommands.cpp +++ b/kmail/kmcommands.cpp @@ -595,14 +595,14 @@ KMCommand::Result KMUrlCopyCommand::execute() clip->setText( address ); clip->setSelectionMode( false ); clip->setText( address ); - KPIM::BroadcastStatus::instance()->seStatusMsg( i18n( "Address copied to clipboard." )); + KPIM::BroadcastStatus::instance()->setStatusMsg( i18n( "Address copied to clipboard." )); } else { // put the url into the mouse selection and the clipboard clip->setSelectionMode( true ); clip->setText( mUrl.url() ); clip->setSelectionMode( false ); clip->setText( mUrl.url() ); - KPIM::BroadcastStatus::instance()->seStatusMsg( i18n( "URL copied to clipboard." )); + KPIM::BroadcastStatus::instance()->setStatusMsg( i18n( "URL copied to clipboard." )); } return OK; @@ -640,7 +640,7 @@ KMCommand::Result KMUrlSaveCommand::execute() { if (KMessageBox::warningContinueCancel(0, i18n("<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>") - .tqarg(saveUrl.prettyURL()), i18n("Save to File"), i18n("&Replace")) + .arg(saveUrl.prettyURL()), i18n("Save to File"), i18n("&Replace")) != KMessageBox::Continue) return Canceled; } @@ -753,8 +753,8 @@ KMCommand::Result KMShowMsgSrcCommand::execute() viewer->resize(TQApplication::desktop()->screenGeometry(scnum).width()/2, 2*TQApplication::desktop()->screenGeometry(scnum).height()/3); } else { - viewer->resize(TQApplication::desktop()->tqgeometry().width()/2, - 2*TQApplication::desktop()->tqgeometry().height()/3); + viewer->resize(TQApplication::desktop()->geometry().width()/2, + 2*TQApplication::desktop()->geometry().height()/3); } viewer->show(); @@ -963,7 +963,7 @@ void KMSaveMsgCommand::slotSaveResult(KIO::Job *job) { if (KMessageBox::warningContinueCancel(0, i18n("File %1 exists.\nDo you want to replace it?") - .tqarg(mUrl.prettyURL()), i18n("Save to File"), i18n("&Replace")) + .arg(mUrl.prettyURL()), i18n("Save to File"), i18n("&Replace")) == KMessageBox::Continue) { mOffset = 0; @@ -1397,12 +1397,12 @@ KMCommand::Result KMForwardDigestCommand::execute() msgPartText += "--"; msgPartText += TQString::fromLatin1( boundary ); msgPartText += "\nContent-Type: MESSAGE/RFC822"; - msgPartText += TQString( "; CHARSET=%1" ).tqarg( TQString(msg->charset()) ); + msgPartText += TQString( "; CHARSET=%1" ).arg( TQString(msg->charset()) ); msgPartText += '\n'; DwHeaders dwh; dwh.MessageId().CreateDefault(); - msgPartText += TQString( "Content-ID: %1\n" ).tqarg( dwh.MessageId().AsString().c_str() ); - msgPartText += TQString( "Content-Description: %1" ).tqarg( msg->subject() ); + msgPartText += TQString( "Content-ID: %1\n" ).arg( dwh.MessageId().AsString().c_str() ); + msgPartText += TQString( "Content-Description: %1" ).arg( msg->subject() ); if ( !msg->subject().contains( "(fwd)" ) ) msgPartText += " (fwd)"; msgPartText += "\n\n"; @@ -1430,7 +1430,7 @@ KMCommand::Result KMForwardDigestCommand::execute() msgPart->setSubtypeStr( tmp ); msgPart->setName( "unnamed" ); msgPart->setCte( DwMime::kCte7bit ); // does it have to be 7bit? - msgPart->setContentDescription( TQString( "Digest of %1 messages." ).tqarg( msgCnt ) ); + msgPart->setContentDescription( TQString( "Digest of %1 messages." ).arg( msgCnt ) ); // THIS HAS TO BE AFTER setCte()!!!! msgPart->setBodyEncoded( TQCString( msgPartText.ascii() ) ); KCursorSaver busy( KBusyPtr::busy() ); @@ -1690,7 +1690,7 @@ KMCommand::Result KMSeStatusCommand::execute() TQMapIterator< KMFolder*, TQValueList<int> > it2 = folderMap.begin(); while ( it2 != folderMap.end() ) { KMFolder *f = it2.key(); - f->seStatus( (*it2), mStatus, mToggle ); + f->setStatus( (*it2), mStatus, mToggle ); ++it2; } //kapp->dcopClient()->emitDCOPSignal( "unreadCountChanged()", TQByteArray() ); @@ -1741,8 +1741,8 @@ KMCommand::Result KMFilterActionCommand::execute() if ( diff < 10 || !( msgCount % 20 ) || msgCount <= 10 ) { progressItem->updateProgress(); TQString statusMsg = i18n("Filtering message %1 of %2"); - statusMsg = statusMsg.tqarg( msgCount ).tqarg( msgCountToFilter ); - KPIM::BroadcastStatus::instance()->seStatusMsg( statusMsg ); + statusMsg = statusMsg.arg( msgCount ).arg( msgCountToFilter ); + KPIM::BroadcastStatus::instance()->setStatusMsg( statusMsg ); KApplication::kApplication()->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 50 ); } @@ -1995,7 +1995,7 @@ KMCommand::Result KMCopyCommand::execute() // corrupt IMAP cache, see FolderStorage::getMsg() if ( msg == 0 ) { KMessageBox::error( parentWidget(), i18n("Corrupt IMAP cache detected in folder %1. " - "Copying of messages aborted.").tqarg( srcFolder->prettyURL() ) ); + "Copying of messages aborted.").arg( srcFolder->prettyURL() ) ); deleteLater(); return Failed; } @@ -2015,7 +2015,7 @@ KMCommand::Result KMCopyCommand::execute() // make sure the attachment state is only calculated when it's complete if (!newMsg->isComplete()) newMsg->setReadyToShow(false); - newMsg->seStatus(msg->status()); + newMsg->setStatus(msg->status()); if (srcFolder && !newMsg->isComplete()) { @@ -2453,7 +2453,7 @@ KMCommand::Result KMUrlClickedCommand::execute() (mUrl.protocol() == "smb") || (mUrl.protocol() == "fish") || (mUrl.protocol() == "news")) { - KPIM::BroadcastStatus::instance()->seStatusMsg( i18n("Opening URL...")); + KPIM::BroadcastStatus::instance()->setStatusMsg( i18n("Opening URL...")); KMimeType::Ptr mime = KMimeType::findByURL( mUrl ); if (mime->name() == "application/x-desktop" || mime->name() == "application/x-executable" || @@ -2461,7 +2461,7 @@ KMCommand::Result KMUrlClickedCommand::execute() mime->name() == "application/x-shellscript" ) { if (KMessageBox::warningYesNo( 0, i18n( "<qt>Do you really want to execute <b>%1</b>?</qt>" ) - .tqarg( mUrl.prettyURL() ), TQString(), i18n("Execute"), KStdGuiItem::cancel() ) != KMessageBox::Yes) + .arg( mUrl.prettyURL() ), TQString(), i18n("Execute"), KStdGuiItem::cancel() ) != KMessageBox::Yes) return Canceled; } KRun * runner = new KRun( mUrl ); @@ -2605,7 +2605,7 @@ void KMSaveAttachmentsCommand::slotSaveAll() ++unnamedAtmCount; s = i18n("filename for the %1-th unnamed attachment", "attachment.%1") - .tqarg( unnamedAtmCount ); + .arg( unnamedAtmCount ); } curUrl.setFileName( s ); } else { @@ -2644,7 +2644,7 @@ void KMSaveAttachmentsCommand::slotSaveAll() if ( KIO::NetAccess::exists( curUrl, false, parentWidget() ) ) { if ( KMessageBox::warningContinueCancel( parentWidget(), i18n( "A file named %1 already exists. Do you want to overwrite it?" ) - .tqarg( curUrl.fileName() ), + .arg( curUrl.fileName() ), i18n( "File Already Exists" ), i18n("&Overwrite") ) == KMessageBox::Cancel) { continue; } @@ -2752,8 +2752,8 @@ KMCommand::Result KMSaveAttachmentsCommand::saveItem( partNode *node, KMessageBox::error( parentWidget(), i18n( "%2 is detailed error description", "Could not write the file %1:\n%2" ) - .tqarg( file.name() ) - .tqarg( TQString::fromLocal8Bit( strerror( errno ) ) ), + .arg( file.name() ) + .arg( TQString::fromLocal8Bit( strerror( errno ) ) ), i18n( "KMail Error" ) ); return Failed; } @@ -2777,7 +2777,7 @@ KMCommand::Result KMSaveAttachmentsCommand::saveItem( partNode *node, { KMessageBox::error( parentWidget(), i18n( "Could not write the file %1." ) - .tqarg( url.path() ), + .arg( url.path() ), i18n( "KMail Error" ) ); return Failed; } @@ -3012,7 +3012,7 @@ KMCommand::Result KMIMChatCommand::execute() nameList.append( (*it).realName() ); } TQString names = nameList.join( TQString::fromLatin1( ",\n" ) ); - apology = apology.tqarg( names ); + apology = apology.arg( names ); } KMessageBox::sorry( parentWidget(), apology ); @@ -3452,7 +3452,7 @@ KMCommand::Result KMDeleteAttachmentCommand::doAttachmentModify() KMMessage *newMsg = new KMMessage(); newMsg->fromDwString( msg->asDwString() ); - newMsg->seStatus( msg->status() ); + newMsg->setStatus( msg->status() ); storeChangedMessage( newMsg ); return OK; @@ -3543,7 +3543,7 @@ void KMEditAttachmentCommand::editDone(KMail::EditorWatcher * watcher) KMMessage *newMsg = new KMMessage(); newMsg->fromDwString( msg->asDwString() ); - newMsg->seStatus( msg->status() ); + newMsg->setStatus( msg->status() ); storeChangedMessage( newMsg ); } @@ -3563,8 +3563,8 @@ KMCommand::Result CreateTodoCommand::execute() KMail::KorgHelper::ensureRunning(); - TQString txt = i18n("From: %1\nTo: %2\nSubject: %3").tqarg( msg->from() ) - .tqarg( msg->to() ).tqarg( msg->subject() ); + TQString txt = i18n("From: %1\nTo: %2\nSubject: %3").arg( msg->from() ) + .arg( msg->to() ).arg( msg->subject() ); KTempFile tf; tf.setAutoDelete( true ); @@ -3573,7 +3573,7 @@ KMCommand::Result CreateTodoCommand::execute() tf.close(); KCalendarIface_stub *iface = new KCalendarIface_stub( kapp->dcopClient(), "korganizer", "CalendarIface" ); - iface->openTodoEditor( i18n("Mail: %1").tqarg( msg->subject() ), txt, uri, + iface->openTodoEditor( i18n("Mail: %1").arg( msg->subject() ), txt, uri, tf.name(), TQStringList(), "message/rfc822", true ); delete iface; diff --git a/kmail/kmcomposewin.cpp b/kmail/kmcomposewin.cpp index 12c2e6147..31fff2ade 100644 --- a/kmail/kmcomposewin.cpp +++ b/kmail/kmcomposewin.cpp @@ -868,7 +868,7 @@ void KMComposeWin::slotContinueAutoSave() i18n("Autosaving the message as %1 " "failed.\n" "Reason: %2" ) - .tqarg( filename, strerror( status ) ), + .arg( filename, strerror( status ) ), i18n("Autosaving Failed") ); mLastAutoSaveErrno = status; } @@ -1109,7 +1109,7 @@ void KMComposeWin::rethinkFields(bool fromSlot) else mAtmListView->hide(); resize(this->size()); - tqrepaint(); + repaint(); mHeadersArea->setMaximumHeight( mHeadersArea->sizeHint().height() ); mGrid->activate(); @@ -1625,9 +1625,9 @@ void KMComposeWin::setupStatusBar(void) statusBar()->insertItem("", 0, 1); statusBar()->setItemAlignment(0, AlignLeft | AlignVCenter); - statusBar()->insertItem(i18n( " Spellcheck: %1 ").tqarg( " " ), 3, 0, true ); - statusBar()->insertItem(i18n( " Column: %1 ").tqarg(" "), 2, 0, true); - statusBar()->insertItem(i18n( " Line: %1 ").tqarg(" "), 1, 0, true); + statusBar()->insertItem(i18n( " Spellcheck: %1 ").arg( " " ), 3, 0, true ); + statusBar()->insertItem(i18n( " Column: %1 ").arg(" "), 2, 0, true); + statusBar()->insertItem(i18n( " Line: %1 ").arg(" "), 1, 0, true); } @@ -1638,9 +1638,9 @@ void KMComposeWin::updateCursorPosition() TQString temp; line = mEditor->currentLine(); col = mEditor->currentColumn(); - temp = i18n(" Line: %1 ").tqarg(line+1); + temp = i18n(" Line: %1 ").arg(line+1); statusBar()->changeItem(temp,1); - temp = i18n(" Column: %1 ").tqarg(col+1); + temp = i18n(" Column: %1 ").arg(col+1); statusBar()->changeItem(temp,2); } @@ -2399,14 +2399,14 @@ bool KMComposeWin::addAttach(const KURL aUrl) if ( !aUrl.isValid() ) { KMessageBox::sorry( this, i18n( "<qt><p>KMail could not recognize the location of the attachment (%1);</p>" "<p>you have to specify the full path if you wish to attach a file.</p></qt>" ) - .tqarg( aUrl.prettyURL() ) ); + .arg( aUrl.prettyURL() ) ); return false; } const int maxAttachmentSize = GlobalSettings::maximumAttachmentSize(); const uint maximumAttachmentSizeInByte = maxAttachmentSize*1024*1024; if ( aUrl.isLocalFile() && TQFileInfo( aUrl.pathOrURL() ).size() > maximumAttachmentSizeInByte ) { - KMessageBox::sorry( this, i18n( "<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</p>" ).tqarg( maxAttachmentSize ) ); + KMessageBox::sorry( this, i18n( "<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</p>" ).arg( maxAttachmentSize ) ); return false; } @@ -3114,7 +3114,7 @@ static void showExportError( TQWidget * w, const GpgME::Error & err ) { const TQString msg = i18n("<qt><p>An error occurred while trying to export " "the key from the backend:</p>" "<p><b>%1</b></p></qt>") - .tqarg( TQString::fromLocal8Bit( err.asString() ) ); + .arg( TQString::fromLocal8Bit( err.asString() ) ); KMessageBox::error( w, msg, i18n("Key Export Failed") ); } @@ -3153,7 +3153,7 @@ void KMComposeWin::slotPublicKeyExportResult( const GpgME::Error & err, const TQ // create message part KMMessagePart * msgPart = new KMMessagePart(); - msgPart->setName( i18n("OpenPGP key 0x%1").tqarg( mFingerprint ) ); + msgPart->setName( i18n("OpenPGP key 0x%1").arg( mFingerprint ) ); msgPart->setTypeStr("application"); msgPart->setSubtypeStr("pgp-keys"); TQValueList<int> dummy; @@ -4279,7 +4279,7 @@ bool KMComposeWin::saveDraftOrTemplate( const TQString &folderName, "identify \"%1\" does not exist (anymore); " "therefore, the default drafts or templates " "folder will be used.") - .tqarg( id.identityName() ) ); + .arg( id.identityName() ) ); } } if ( imapTheFolder && imapTheFolder->noContent() ) @@ -4463,7 +4463,7 @@ bool KMComposeWin::checkRecipientNumber() const GlobalSettings::self()->tooManyRecipients() && mRecipientsEditor->recipients().count() > thresHold ) { if ( KMessageBox::questionYesNo( mMainWidget, - i18n("You are trying to send the mail to more than %1 recipients. Send message anyway?").tqarg(thresHold), + i18n("You are trying to send the mail to more than %1 recipients. Send message anyway?").arg(thresHold), i18n("Too many receipients"), i18n("&Send as Is"), i18n("&Edit Recipients")) == KMessageBox::No ) { diff --git a/kmail/kmedit.cpp b/kmail/kmedit.cpp index bcc95d0a8..4b45adc8b 100644 --- a/kmail/kmedit.cpp +++ b/kmail/kmedit.cpp @@ -607,7 +607,7 @@ void KMEdit::slotExternalEditorTempFileChanged( const TQString & fileName ) { insertLine(TQString::fromLocal8Bit(KPIM::kFileToString( fileName, true, false )), -1); setAutoUpdate(true); - tqrepaint(); + repaint(); } void KMEdit::slotExternalEditorDone( KProcess * proc ) { diff --git a/kmail/kmfilter.cpp b/kmail/kmfilter.cpp index 4441b8611..28a64633d 100644 --- a/kmail/kmfilter.cpp +++ b/kmail/kmfilter.cpp @@ -113,7 +113,7 @@ KMFilter::ReturnCode KMFilter::execActions( KMMessage* msg, bool& stopIt ) const if ( FilterLog::instance()->isLogging() ) { TQString logText( i18n( "<b>Applying filter action:</b> %1" ) - .tqarg( (*it)->displayString() ) ); + .arg( (*it)->displayString() ) ); FilterLog::instance()->add( logText, FilterLog::appliedAction ); } @@ -123,7 +123,7 @@ KMFilter::ReturnCode KMFilter::execActions( KMMessage* msg, bool& stopIt ) const case KMFilterAction::CriticalError: if ( FilterLog::instance()->isLogging() ) { TQString logText = TQString( "<font color=#FF0000>%1</font>" ) - .tqarg( i18n( "A critical error occurred. Processing stops here." ) ); + .arg( i18n( "A critical error occurred. Processing stops here." ) ); FilterLog::instance()->add( logText, FilterLog::appliedAction ); } // in case it's a critical error: return immediately! @@ -131,7 +131,7 @@ KMFilter::ReturnCode KMFilter::execActions( KMMessage* msg, bool& stopIt ) const case KMFilterAction::ErrorButGoOn: if ( FilterLog::instance()->isLogging() ) { TQString logText = TQString( "<font color=#FF0000>%1</font>" ) - .tqarg( i18n( "A problem was found while applying this action." ) ); + .arg( i18n( "A problem was found while applying this action." ) ); FilterLog::instance()->add( logText, FilterLog::appliedAction ); } default: @@ -262,7 +262,7 @@ void KMFilter::readConfig(KConfig* config) numActions = config->readNumEntry("actions",0); if (numActions > FILTER_MAX_ACTIONS) { numActions = FILTER_MAX_ACTIONS ; - KMessageBox::information( 0, i18n("<qt>Too many filter actions in filter rule <b>%1</b>.</qt>").tqarg( mPattern.name() ) ); + KMessageBox::information( 0, i18n("<qt>Too many filter actions in filter rule <b>%1</b>.</qt>").arg( mPattern.name() ) ); } for ( i=0 ; i < numActions ; i++ ) { @@ -287,7 +287,7 @@ void KMFilter::readConfig(KConfig* config) } else KMessageBox::information( 0 /* app-global modal dialog box */, i18n("<qt>Unknown filter action <b>%1</b><br>in filter rule <b>%2</b>.<br>Ignoring it.</qt>") - .tqarg( config->readEntry( actName ) ).tqarg( mPattern.name() ) ); + .arg( config->readEntry( actName ) ).arg( mPattern.name() ) ); } mAccounts = config->readIntListEntry( "accounts-set" ); diff --git a/kmail/kmfilteraction.cpp b/kmail/kmfilteraction.cpp index 86a7a3e4f..6ea0dd9f6 100644 --- a/kmail/kmfilteraction.cpp +++ b/kmail/kmfilteraction.cpp @@ -185,7 +185,7 @@ const TQString KMFilterActionWithUOID::argsAsString() const const TQString KMFilterActionWithUOID::displayString() const { // FIXME after string freeze: - // return i18n("").tqarg( ); + // return i18n("").arg( ); return label() + " \"" + TQStyleSheet::escape( argsAsString() ) + "\""; } @@ -236,7 +236,7 @@ const TQString KMFilterActionWithString::argsAsString() const const TQString KMFilterActionWithString::displayString() const { // FIXME after string freeze: - // return i18n("").tqarg( ); + // return i18n("").arg( ); return label() + " \"" + TQStyleSheet::escape( argsAsString() ) + "\""; } @@ -483,11 +483,11 @@ TQString KMFilterActionWithCommand::substituteCommandLineArgsFor( KMMessage *aMs } tf->close(); } - // TQString( "%0 and %1 and %1" ).tqarg( 0 ).tqarg( 1 ) + // TQString( "%0 and %1 and %1" ).arg( 0 ).arg( 1 ) // returns "0 and 1 and %1", so we must call .arg as // many times as there are %n's, regardless of their multiplicity. if ((*it) == -1) result.replace( "%-1", tempFileName ); - else result = result.tqarg( tempFileName ); + else result = result.arg( tempFileName ); } // And finally, replace the %{foo} with the content of the foo @@ -810,7 +810,7 @@ KMFilterAction::ReturnCode KMFilterActionSeStatus::process(KMMessage* msg) const if ( idx < 1 ) return ErrorButGoOn; KMMsgStatus status = stati[idx-1] ; - msg->seStatus( status ); + msg->setStatus( status ); return GoOn; } @@ -843,7 +843,7 @@ const TQString KMFilterActionSeStatus::argsAsString() const const TQString KMFilterActionSeStatus::displayString() const { // FIXME after string freeze: - // return i18n("").tqarg( ); + // return i18n("").arg( ); return label() + " \"" + TQStyleSheet::escape( argsAsString() ) + "\""; } @@ -938,7 +938,7 @@ const TQString KMFilterActionFakeDisposition::argsAsString() const const TQString KMFilterActionFakeDisposition::displayString() const { // FIXME after string freeze: - // return i18n("").tqarg( ); + // return i18n("").arg( ); return label() + " \"" + TQStyleSheet::escape( argsAsString() ) + "\""; } @@ -1123,7 +1123,7 @@ const TQString KMFilterActionAddHeader::argsAsString() const const TQString KMFilterActionAddHeader::displayString() const { // FIXME after string freeze: - // return i18n("").tqarg( ); + // return i18n("").arg( ); return label() + " \"" + TQStyleSheet::escape( argsAsString() ) + "\""; } @@ -1299,7 +1299,7 @@ const TQString KMFilterActionRewriteHeader::argsAsString() const const TQString KMFilterActionRewriteHeader::displayString() const { // FIXME after string freeze: - // return i18n("").tqarg( ); + // return i18n("").arg( ); return label() + " \"" + TQStyleSheet::escape( argsAsString() ) + "\""; } @@ -1617,9 +1617,9 @@ const TQString KMFilterActionForward::argsAsString() const const TQString KMFilterActionForward::displayString() const { if ( mTemplate.isEmpty() ) - return i18n( "Forward to %1 with default template " ).tqarg( mParameter ); + return i18n( "Forward to %1 with default template " ).arg( mParameter ); else - return i18n( "Forward to %1 with template %2" ).tqarg( mParameter, mTemplate ); + return i18n( "Forward to %1 with template %2" ).arg( mParameter, mTemplate ); } //============================================================================= @@ -1878,7 +1878,7 @@ const TQString KMFilterActionWithTest::argsAsString() const const TQString KMFilterActionWithTest::displayString() const { // FIXME after string freeze: - // return i18n("").tqarg( ); + // return i18n("").arg( ); return label() + " \"" + TQStyleSheet::escape( argsAsString() ) + "\""; } @@ -1955,7 +1955,7 @@ const TQString KMFilterActionWithUrl::argsAsString() const const TQString KMFilterActionWithUrl::displayString() const { // FIXME after string freeze: - // return i18n("").tqarg( ); + // return i18n("").arg( ); return label() + " \"" + TQStyleSheet::escape( argsAsString() ) + "\""; } diff --git a/kmail/kmfilterdlg.cpp b/kmail/kmfilterdlg.cpp index 5a9ed3175..d484102a6 100644 --- a/kmail/kmfilterdlg.cpp +++ b/kmail/kmfilterdlg.cpp @@ -339,11 +339,11 @@ KMFilterDlg::KMFilterDlg(TQWidget* parent, const char* name, bool popFilter, boo connect( this, TQT_SIGNAL(finished()), this, TQT_SLOT(slotFinished()) ); - KConfigGroup tqgeometry( KMKernel::config(), "Geometry"); + KConfigGroup geometry( KMKernel::config(), "Geometry"); const char * configKey = bPopFilter ? "popFilterDialogSize" : "filterDialogSize"; - if ( tqgeometry.hasKey( configKey ) ) - resize( tqgeometry.readSizeEntry( configKey ) ); + if ( geometry.hasKey( configKey ) ) + resize( geometry.readSizeEntry( configKey ) ); else adjustSize(); @@ -356,8 +356,8 @@ void KMFilterDlg::slotFinished() { } void KMFilterDlg::slotSaveSize() { - KConfigGroup tqgeometry( KMKernel::config(), "Geometry" ); - tqgeometry.writeEntry( bPopFilter ? "popFilterDialogSize" : "filterDialogSize", size() ); + KConfigGroup geometry( KMKernel::config(), "Geometry" ); + geometry.writeEntry( bPopFilter ? "popFilterDialogSize" : "filterDialogSize", size() ); } /** Set action of popFilter */ @@ -558,7 +558,7 @@ void KMFilterDlg::slotUpdateAccountList() TQCheckListItem *listItem = new TQCheckListItem( mAccountList, top, a->name(), TQCheckListItem::CheckBox ); listItem->setText( 1, a->type() ); - listItem->setText( 2, TQString( "%1" ).tqarg( a->id() ) ); + listItem->setText( 2, TQString( "%1" ).arg( a->id() ) ); if ( mFilter ) listItem->setOn( mFilter->applyOnAccount( a->id() ) ); top = listItem; @@ -682,7 +682,7 @@ void KMFilterListBox::createFilter( const TQCString & field, KMFilter *newFilter = new KMFilter(0, bPopFilter); newFilter->pattern()->append( newRule ); - newFilter->pattern()->setName( TQString("<%1>:%2").tqarg( TQString(field) ).tqarg( TQString(value) ) ); + newFilter->pattern()->setName( TQString("<%1>:%2").arg( TQString(field) ).arg( TQString(value) ) ); KMFilterActionDesc *desc = (*kmkernel->filterActionDict())["transfer"]; if ( desc ) @@ -712,7 +712,7 @@ void KMFilterListBox::slotUpdateFilterName() if ( mFilterList.at(mIdxSelItem)->isAutoNaming() ) { // auto-naming of patterns if ( !p->isEmpty() && p->first() && !p->first()->field().stripWhiteSpace().isEmpty() ) - shouldBeName = TQString( "<%1>: %2" ).tqarg( TQString(p->first()->field()) ).tqarg( TQString(p->first()->contents()) ); + shouldBeName = TQString( "<%1>: %2" ).arg( TQString(p->first()->field()) ).arg( TQString(p->first()->contents()) ); else shouldBeName = "<" + i18n("unnamed") + ">"; p->setName( shouldBeName ); @@ -946,7 +946,7 @@ void KMFilterListBox::slotRename() ( i18n("Rename Filter"), i18n("Rename filter \"%1\" to:\n(leave the field empty for automatic naming)") - .tqarg( filter->pattern()->name() ) /*label*/, + .arg( filter->pattern()->name() ) /*label*/, filter->pattern()->name() /* initial value */, &okPressed, topLevelWidget(), 0, validator ); diff --git a/kmail/kmfolder.cpp b/kmail/kmfolder.cpp index 3315c99ee..de6814ca9 100644 --- a/kmail/kmfolder.cpp +++ b/kmail/kmfolder.cpp @@ -80,7 +80,7 @@ KMFolder::KMFolder( KMFolderDir* aParent, const TQString& aFolderName, dirinfo.setFile( mStorage->location() ); if ( !dirinfo.exists() ) { int rc = mStorage->create(); - TQString msg = i18n("<qt>Error while creating file <b>%1</b>:<br>%2</qt>").tqarg(aFolderName).tqarg(strerror(rc)); + TQString msg = i18n("<qt>Error while creating file <b>%1</b>:<br>%2</qt>").arg(aFolderName).arg(strerror(rc)); if ( rc ) { KMessageBox::information(0, msg); } @@ -272,7 +272,7 @@ KMFolderDir* KMFolder::createChildFolder() { if (mkdir(TQFile::encodeName(childDir), S_IRWXU) != 0 && chmod(TQFile::encodeName(childDir), S_IRWXU) != 0) { - TQString wmsg = TQString(" '%1': %2").tqarg(childDir).tqarg(strerror(errno)); + TQString wmsg = TQString(" '%1': %2").arg(childDir).arg(strerror(errno)); KMessageBox::information(0,i18n("Failed to create folder") + wmsg); return 0; } @@ -828,15 +828,15 @@ int KMFolder::writeIndex( bool createEmptyIndex ) return mStorage->writeIndex( createEmptyIndex ); } -void KMFolder::seStatus( int idx, KMMsgStatus status, bool toggle ) +void KMFolder::setStatus( int idx, KMMsgStatus status, bool toggle ) { - mStorage->seStatus( idx, status, toggle ); + mStorage->setStatus( idx, status, toggle ); } -void KMFolder::seStatus( TQValueList<int>& ids, KMMsgStatus status, +void KMFolder::setStatus( TQValueList<int>& ids, KMMsgStatus status, bool toggle ) { - mStorage->seStatus( ids, status, toggle); + mStorage->setStatus( ids, status, toggle); } void KMFolder::setIconPaths( const TQString &normalPath, @@ -929,7 +929,7 @@ bool KMFolder::isValidName( const TQString &folderName, TQString &message ) } } if ( !delimiter.isEmpty() && folderName.find( delimiter ) != -1 ) { - message = i18n( "Your IMAP server does not allow the character '%1'; please choose another folder name." ).tqarg( delimiter ); + message = i18n( "Your IMAP server does not allow the character '%1'; please choose another folder name." ).arg( delimiter ); return false; } } diff --git a/kmail/kmfolder.h b/kmail/kmfolder.h index 82d586a23..abf0a2da3 100644 --- a/kmail/kmfolder.h +++ b/kmail/kmfolder.h @@ -60,7 +60,7 @@ typedef TQValueList<TQ_UINT32> SerNumList; * * @section Accounts * The accounts (of KMail) that are fed into the folder are - * represented as the tqchildren of the folder. They are only stored here + * represented as the children of the folder. They are only stored here * during runtime to have a reference for which accounts point to a * specific folder. */ @@ -169,10 +169,10 @@ public: /** Specify, that the folder can't contain mails. */ void setNoContent(bool aNoContent); - /** Returns, if the folder can't have tqchildren */ + /** Returns, if the folder can't have children */ bool noChildren() const; - /** Specify, that the folder can't have tqchildren */ + /** Specify, that the folder can't have children */ void setNoChildren(bool aNoChildren); /** Read message at given index. Indexing starts at zero */ @@ -273,7 +273,7 @@ public: contained by this folder */ int countUnreadRecursive(); - /** Called by KMMsgBase::seStatus when status of a message has changed + /** Called by KMMsgBase::setStatus when status of a message has changed required to keep the number unread messages variable current. */ void msgStatusChanged( const KMMsgStatus oldStatus, const KMMsgStatus newStatus, @@ -490,10 +490,10 @@ public: int writeIndex( bool createEmptyIndex = false ); /** Set the status of the message at index @p idx to @p status. */ - void seStatus(int idx, KMMsgStatus status, bool toggle=false); + void setStatus(int idx, KMMsgStatus status, bool toggle=false); /** Set the status of the message(s) in the TQValueList @p ids to @p status. */ - void seStatus(TQValueList<int>& ids, KMMsgStatus status, bool toggle=false); + void setStatus(TQValueList<int>& ids, KMMsgStatus status, bool toggle=false); /** Icon related methods */ bool useCustomIcons() const { return mUseCustomIcons; } diff --git a/kmail/kmfoldercachedimap.cpp b/kmail/kmfoldercachedimap.cpp index a55d22561..02bec8ed0 100644 --- a/kmail/kmfoldercachedimap.cpp +++ b/kmail/kmfoldercachedimap.cpp @@ -215,7 +215,7 @@ KMFolderCachedImap::KMFolderCachedImap( KMFolder* folder, const char* aName ) KMessageBox::error( 0, i18n( "The UID cache file for folder %1 could not be read. There " "could be a problem with file system permission, or it is corrupted." - ).tqarg( folder->prettyURL() ) ); + ).arg( folder->prettyURL() ) ); // try to unlink it, in case it was corruped. If it couldn't be read // because of permissions, this will fail, which is fine unlink( TQFile::encodeName( uidCacheLocation() ) ); @@ -486,7 +486,7 @@ int KMFolderCachedImap::writeUidCache() } KMessageBox::error( 0, i18n( "The UID cache file for folder %1 could not be written. There " - "could be a problem with file system permission." ).tqarg( folder()->prettyURL() ) ); + "could be a problem with file system permission." ).arg( folder()->prettyURL() ) ); return -1; } @@ -739,7 +739,7 @@ void KMFolderCachedImap::slotTroubleshoot() TQString str = i18n("Are you sure you want to refresh the IMAP cache of " "the folder %1 and all its subfolders?\nThis will " "remove all changes you have done locally to your " - "folders.").tqarg( label() ); + "folders.").arg( label() ); TQString s1 = i18n("Refresh IMAP Cache"); TQString s2 = i18n("&Refresh"); if( KMessageBox::warningContinueCancel( 0, str, s1, s2 ) == @@ -774,7 +774,7 @@ void KMFolderCachedImap::slotTroubleshoot() void KMFolderCachedImap::serverSync( bool recurse, bool quotaOnly ) { if( mSyncState != SYNC_STATE_INITIAL ) { - if( KMessageBox::warningYesNo( 0, i18n("Folder %1 is not in initial sync state (state was %2). Do you want to reset it to initial sync state and sync anyway?" ).tqarg( imapPath() ).tqarg( mSyncState ), TQString(), i18n("Reset && Sync"), KStdGuiItem::cancel() ) == KMessageBox::Yes ) { + if( KMessageBox::warningYesNo( 0, i18n("Folder %1 is not in initial sync state (state was %2). Do you want to reset it to initial sync state and sync anyway?" ).arg( imapPath() ).arg( mSyncState ), TQString(), i18n("Reset && Sync"), KStdGuiItem::cancel() ) == KMessageBox::Yes ) { mSyncState = SYNC_STATE_INITIAL; } else return; } @@ -899,14 +899,14 @@ void KMFolderCachedImap::serverSyncInternal() // Cancelled by user, or slave can't start // kdDebug(5006) << "makeConnection said Error, aborting." << endl; // We stop here. We're already in SYNC_STATE_INITIAL for the next time. - newState( mProgress, i18n( "Error connecting to server %1" ).tqarg( mAccount->host() ) ); + newState( mProgress, i18n( "Error connecting to server %1" ).arg( mAccount->host() ) ); close("cachedimap"); emit folderComplete(this, false); break; } else if ( cs == ImapAccountBase::Connecting ) { mAccount->setAnnotationCheckPassed( false ); // kdDebug(5006) << "makeConnection said Connecting, waiting for signal." << endl; - newState( mProgress, i18n("Connecting to %1").tqarg( mAccount->host() ) ); + newState( mProgress, i18n("Connecting to %1").arg( mAccount->host() ) ); // We'll wait for the connectionResult signal from the account. connect( mAccount, TQT_SIGNAL( connectionResult(int, const TQString&) ), this, TQT_SLOT( slotConnectionResult(int, const TQString&) ) ); @@ -1478,7 +1478,7 @@ void KMFolderCachedImap::uploadNewMessages() && !(mUserRights & KMail::ACLJobs::Insert) ) { // write access revoked KMessageBox::information( 0, i18n("<p>Your access rights to folder <b>%1</b> have been restricted, " - "it will no longer be possible to add messages to this folder.</p>").tqarg( folder()->prettyURL() ), + "it will no longer be possible to add messages to this folder.</p>").arg( folder()->prettyURL() ), i18n("Acces rights revoked"), "KMailACLRevocationNotification" ); } } @@ -1618,18 +1618,18 @@ void KMFolderCachedImap::slotImapStatusChanged(KMFolder* folder, const TQString& } // This is not perfect, what if the status didn't really change? Oh well ... -void KMFolderCachedImap::seStatus( int idx, KMMsgStatus status, bool toggle) +void KMFolderCachedImap::setStatus( int idx, KMMsgStatus status, bool toggle) { - KMFolderMaildir::seStatus( idx, status, toggle ); + KMFolderMaildir::setStatus( idx, status, toggle ); const KMMsgBase *msg = getMsgBase( idx ); Q_ASSERT( msg ); if ( msg ) mUIDsOfLocallyChangedStatuses.insert( msg->UID() ); } -void KMFolderCachedImap::seStatus(TQValueList<int>& ids, KMMsgStatus status, bool toggle) +void KMFolderCachedImap::setStatus(TQValueList<int>& ids, KMMsgStatus status, bool toggle) { - KMFolderMaildir::seStatus(ids, status, toggle); + KMFolderMaildir::setStatus(ids, status, toggle); for (TQValueList<int>::iterator it = ids.begin(); it != ids.end(); it++ ) { const KMMsgBase *msg = getMsgBase( *it ); Q_ASSERT( msg ); @@ -1706,7 +1706,7 @@ bool KMFolderCachedImap::deleteMessages() if ( KMessageBox::warningYesNo( 0, i18n( "<qt><p>Mails on the server in folder <b>%1</b> were deleted. " "Do you want to delete them locally?<br>UIDs: %2</p></qt>" ) - .tqarg( folder()->prettyURL() ).tqarg( uids.join(",") ) ) == KMessageBox::Yes ) + .arg( folder()->prettyURL() ).arg( uids.join(",") ) ) == KMessageBox::Yes ) #endif removeMsg( msgsForDeletion ); } @@ -2055,7 +2055,7 @@ void KMFolderCachedImap::listNamespaces() mNamespacesToList.pop_front(); mSyncState = SYNC_STATE_LIST_SUBFOLDERS2; - newState( mProgress, i18n("Retrieving folders for namespace %1").tqarg(ns)); + newState( mProgress, i18n("Retrieving folders for namespace %1").arg(ns)); KMail::ListJob* job = new KMail::ListJob( mAccount, type, this, mAccount->addPathToNamespace( ns ) ); job->setNamespace( ns ); @@ -2297,7 +2297,7 @@ void KMFolderCachedImap::listDirectory2() // (could be that the folder was deleted & recreated meanwhile from another client...) if ( !locallyDeleted && mAccount->isPreviouslyDeletedFolder( subfolderPath ) ) { locallyDeleted = KMessageBox::warningYesNo( - 0, i18n( "<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it from the server?</p></qt>" ).tqarg( mSubfolderNames[i] ), TQString(), KStdGuiItem::del(), KStdGuiItem::cancel() ) == KMessageBox::Yes; + 0, i18n( "<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it from the server?</p></qt>" ).arg( mSubfolderNames[i] ), TQString(), KStdGuiItem::del(), KStdGuiItem::cancel() ) == KMessageBox::Yes; } if ( locallyDeleted ) { @@ -2596,7 +2596,7 @@ void KMFolderCachedImap::resetSyncState() KPIM::ProgressItem *progressItem = mAccount->mailCheckProgressItem(); TQString str = i18n("Aborted"); if (progressItem) - progressItem->seStatus( str ); + progressItem->setStatus( str ); emit statusMsg( str ); emit syncStateChanged(); } @@ -2618,9 +2618,9 @@ void KMFolderCachedImap::newState( int progress, const TQString& syncStatus ) if ( mAccount->imapFolder() == this ) str = syncStatus; else - str = TQString( "%1: %2" ).tqarg( label() ).tqarg( syncStatus ); + str = TQString( "%1: %2" ).arg( label() ).arg( syncStatus ); if( progressItem ) - progressItem->seStatus( str ); + progressItem->setStatus( str ); emit statusMsg( str ); } if( progressItem ) @@ -2809,7 +2809,7 @@ void KMFolderCachedImap::slotGetAnnotationResult( KIO::Job* job ) // that's when the imap server doesn't support annotations if ( GlobalSettings::self()->theIMAPResourceStorageFormat() == GlobalSettings::EnumTheIMAPResourceStorageFormat::XML && (uint)GlobalSettings::self()->theIMAPResourceAccount() == mAccount->id() ) - KMessageBox::error( 0, i18n( "The IMAP server %1 does not have support for IMAP annotations. The XML storage cannot be used on this server; please re-configure KMail differently." ).tqarg( mAccount->host() ) ); + KMessageBox::error( 0, i18n( "The IMAP server %1 does not have support for IMAP annotations. The XML storage cannot be used on this server; please re-configure KMail differently." ).arg( mAccount->host() ) ); mAccount->setHasNoAnnotationSupport(); } else @@ -2837,7 +2837,7 @@ void KMFolderCachedImap::slotMultiUrlGetAnnotationResult( KIO::Job* job ) // that's when the imap server doesn't support annotations if ( GlobalSettings::self()->theIMAPResourceStorageFormat() == GlobalSettings::EnumTheIMAPResourceStorageFormat::XML && (uint)GlobalSettings::self()->theIMAPResourceAccount() == mAccount->id() ) - KMessageBox::error( 0, i18n( "The IMAP server %1 doesn't have support for imap annotations. The XML storage cannot be used on this server, please re-configure KMail differently" ).tqarg( mAccount->host() ) ); + KMessageBox::error( 0, i18n( "The IMAP server %1 doesn't have support for imap annotations. The XML storage cannot be used on this server, please re-configure KMail differently" ).arg( mAccount->host() ) ); mAccount->setHasNoAnnotationSupport(); } else @@ -3063,7 +3063,7 @@ KMCommand* KMFolderCachedImap::rescueUnsyncedMessages() bool manualMove = true; while ( GlobalSettings::autoLostFoundMove() ) { // find the inbox of this account - KMFolder *inboxFolder = kmkernel->findFolderById( TQString(".%1.directory/INBOX").tqarg( account()->id() ) ); + KMFolder *inboxFolder = kmkernel->findFolderById( TQString(".%1.directory/INBOX").arg( account()->id() ) ); if ( !inboxFolder ) { kdWarning(5006) << k_funcinfo << "inbox not found!" << endl; break; @@ -3119,7 +3119,7 @@ KMCommand* KMFolderCachedImap::rescueUnsyncedMessages() "on the server or you do not " "have sufficient access rights on the folder to upload them.</p>" "<p>All affected messages will therefore be moved to <b>%2</b> " - "to avoid data loss.</p>").tqarg( folder()->prettyURL() ).tqarg( dest->prettyURL() ), + "to avoid data loss.</p>").arg( folder()->prettyURL() ).arg( dest->prettyURL() ), i18n("Insufficient access rights") ); manualMove = false; break; @@ -3132,7 +3132,7 @@ KMCommand* KMFolderCachedImap::rescueUnsyncedMessages() "have sufficient access rights on the folder now to upload them. " "Please contact your administrator to allow upload of new messages " "to you, or move them out of this folder.</p> " - "<p>Do you want to move these messages to another folder now?</p>").tqarg( folder()->prettyURL() ) ); + "<p>Do you want to move these messages to another folder now?</p>").arg( folder()->prettyURL() ) ); if ( KMessageBox::warningYesNo( 0, msg, TQString(), i18n("Move"), i18n("Do Not Move") ) == KMessageBox::Yes ) { KMail::KMFolderSelDlg dlg( kmkernel->getKMMainWidget(), i18n("Move Messages to Folder"), true ); diff --git a/kmail/kmfoldercachedimap.h b/kmail/kmfoldercachedimap.h index bd084f00a..a25637b3a 100644 --- a/kmail/kmfoldercachedimap.h +++ b/kmail/kmfoldercachedimap.h @@ -285,8 +285,8 @@ public: void setACLList( const ACLList& arr ); // Reimplemented so the mStatusChangedLocally bool can be set - virtual void seStatus( int id, KMMsgStatus status, bool toggle ); - virtual void seStatus( TQValueList<int>& ids, KMMsgStatus status, bool toggle ); + virtual void setStatus( int id, KMMsgStatus status, bool toggle ); + virtual void setStatus( TQValueList<int>& ids, KMMsgStatus status, bool toggle ); TQString annotationFolderType() const { return mAnnotationFolderType; } @@ -590,7 +590,7 @@ private: bool mSharedSeenFlagsChanged; /** - * UIDs added by seStatus. Indicates that the client has changed + * UIDs added by setStatus. Indicates that the client has changed * the status of those mails. The mail flags for changed mails will be * uploaded to the server, overwriting the server's notion of the status * of the mails in this folder. diff --git a/kmail/kmfolderdia.cpp b/kmail/kmfolderdia.cpp index 6e7b6b34e..dead2a984 100644 --- a/kmail/kmfolderdia.cpp +++ b/kmail/kmfolderdia.cpp @@ -100,7 +100,7 @@ KMFolderDialog::KMFolderDialog(KMFolder *aFolder, KMFolderDir *aFolderDir, TQStringList folderNames; TQValueList<TQGuardedPtr<KMFolder> > folders; - // get all folders but search and folders that can not have tqchildren + // get all folders but search and folders that can not have children aParent->createFolderList(&folderNames, &folders, true, true, true, false, true, false); diff --git a/kmail/kmfolderdir.cpp b/kmail/kmfolderdir.cpp index 0c88bd2d1..980d0b14b 100644 --- a/kmail/kmfolderdir.cpp +++ b/kmail/kmfolderdir.cpp @@ -206,7 +206,7 @@ bool KMFolderDir::reload(void) if (!dir.cd(fldPath, TRUE)) { - TQString msg = i18n("<qt>Cannot enter folder <b>%1</b>.</qt>").tqarg(fldPath); + TQString msg = i18n("<qt>Cannot enter folder <b>%1</b>.</qt>").arg(fldPath); KMessageBox::information(0, msg); return FALSE; } @@ -214,7 +214,7 @@ bool KMFolderDir::reload(void) TQFileInfoList* fiList=(TQFileInfoList*)dir.entryInfoList(); if (!fiList) { - TQString msg = i18n("<qt>Folder <b>%1</b> is unreadable.</qt>").tqarg(fldPath); + TQString msg = i18n("<qt>Folder <b>%1</b> is unreadable.</qt>").arg(fldPath); KMessageBox::information(0, msg); return FALSE; } @@ -258,7 +258,7 @@ bool KMFolderDir::reload(void) // For this to be a cached IMAP folder, it must be in the KMail dimap // subdir and must be have a uidcache file or be a maildir folder TQString maildir(fname + "/new"); - TQString imapcachefile = TQString::fromLatin1(".%1.uidcache").tqarg(fname); + TQString imapcachefile = TQString::fromLatin1(".%1.uidcache").arg(fname); if ( dir.exists( imapcachefile) || dir.exists( maildir ) ) { folder = new KMFolder( this, fname, KMFolderTypeCachedImap ); diff --git a/kmail/kmfolderdir.h b/kmail/kmfolderdir.h index 687f95637..6d33add36 100644 --- a/kmail/kmfolderdir.h +++ b/kmail/kmfolderdir.h @@ -55,7 +55,7 @@ public: /** Returns the folder manager that manages this folder */ virtual KMFolderMgr* manager() const; - /** Returns the folder whose tqchildren we are holding */ + /** Returns the folder whose children we are holding */ KMFolder* owner() const { return mOwner; } virtual KMFolderDirType type() const { return mDirType; } diff --git a/kmail/kmfolderimap.cpp b/kmail/kmfolderimap.cpp index 51e5762e8..6d3d468ec 100644 --- a/kmail/kmfolderimap.cpp +++ b/kmail/kmfolderimap.cpp @@ -245,7 +245,7 @@ void KMFolderImap::remove() jd.progressItem = ProgressManager::createProgressItem( "ImapFolderRemove" + ProgressManager::getUniqueID(), i18n("Removing folder"), - i18n( "URL: %1" ).tqarg( TQStyleSheet::escape( folder()->prettyURL() ) ), + i18n( "URL: %1" ).arg( TQStyleSheet::escape( folder()->prettyURL() ) ), false, account()->useSSL() || account()->useTLS() ); account()->insertJob(job, jd); @@ -488,7 +488,7 @@ int KMFolderImap::addMsg(TQPtrList<KMMessage>& msgList, TQValueList<int>& aIndex mAddMessageProgressItem = ProgressManager::createProgressItem( "Uploading"+ProgressManager::getUniqueID(), i18n("Uploading message data"), - i18n("Destination folder: %1").tqarg( TQStyleSheet::escape( folder()->prettyURL() ) ), + i18n("Destination folder: %1").arg( TQStyleSheet::escape( folder()->prettyURL() ) ), true, account()->useSSL() || account()->useTLS() ); mAddMessageProgressItem->setTotalItems( msgList.count() ); @@ -849,7 +849,7 @@ void KMFolderImap::slotListResult( const TQStringList& subfolderNames, // update progress account()->listDirProgressItem()->incCompletedItems(); account()->listDirProgressItem()->updateProgress(); - account()->listDirProgressItem()->seStatus( folder()->prettyURL() + i18n(" completed") ); + account()->listDirProgressItem()->setStatus( folder()->prettyURL() + i18n(" completed") ); f->initializeFrom( this, subfolderPaths[i], subfolderMimeTypes[i] ); f->setChildrenState( subfolderAttributes[i] ); @@ -1003,11 +1003,11 @@ bool KMFolderImap::mailCheckInProgress() const //----------------------------------------------------------------------------- void KMFolderImap::setChildrenState( TQString attributes ) { - // update tqchildren state - if ( attributes.find( "hastqchildren", 0, false ) != -1 ) + // update children state + if ( attributes.find( "haschildren", 0, false ) != -1 ) { setHasChildren( FolderStorage::HasChildren ); - } else if ( attributes.find( "hasnotqchildren", 0, false ) != -1 || + } else if ( attributes.find( "hasnochildren", 0, false ) != -1 || attributes.find( "noinferiors", 0, false ) != -1 ) { setHasChildren( FolderStorage::HasNoChildren ); @@ -1073,7 +1073,7 @@ void KMFolderImap::checkValidity() mMailCheckProgressItem->setProgress(0); } if ( account()->mailCheckProgressItem() ) { - account()->mailCheckProgressItem()->seStatus( folder()->prettyURL() ); + account()->mailCheckProgressItem()->setStatus( folder()->prettyURL() ); } ImapAccountBase::jobData jd( url.url() ); KIO::SimpleJob *job = KIO::get(url, false, false); @@ -1231,7 +1231,7 @@ void KMFolderImap::reallyGetFolder(const TQString &startUid) if (startUid.isEmpty()) { if ( mMailCheckProgressItem ) - mMailCheckProgressItem->seStatus( i18n("Retrieving message status") ); + mMailCheckProgressItem->setStatus( i18n("Retrieving message status") ); url.setPath(imapPath() + ";SECTION=UID FLAGS"); KIO::SimpleJob *job = KIO::listDir(url, false); KIO::Scheduler::assignJobToSlave(account()->slave(), job); @@ -1246,7 +1246,7 @@ void KMFolderImap::reallyGetFolder(const TQString &startUid) } else { mContentState = imapDownloadInProgress; if ( mMailCheckProgressItem ) - mMailCheckProgressItem->seStatus( i18n("Retrieving messages") ); + mMailCheckProgressItem->setStatus( i18n("Retrieving messages") ); url.setPath(imapPath() + ";UID=" + startUid + ":*;SECTION=ENVELOPE"); KIO::SimpleJob *newJob = KIO::get(url, false, false); @@ -1271,7 +1271,7 @@ void KMFolderImap::slotListFolderResult(KIO::Job * job) if (job->error()) { account()->handleJobError( job, - i18n("Error while listing the contents of the folder %1.").tqarg( label() ) ); + i18n("Error while listing the contents of the folder %1.").arg( label() ) ); account()->removeJob(it); finishMailCheck( "listfolder", imapNoInformation ); return; @@ -1341,7 +1341,7 @@ void KMFolderImap::slotListFolderResult(KIO::Job * job) mMailCheckProgressItem->setCompletedItems( 0 ); mMailCheckProgressItem->setTotalItems( jd.total ); mMailCheckProgressItem->setProgress( 0 ); - mMailCheckProgressItem->seStatus( i18n("Retrieving messages") ); + mMailCheckProgressItem->setStatus( i18n("Retrieving messages") ); } TQStringList sets; @@ -1460,7 +1460,7 @@ void KMFolderImap::seenFlagToStatus(KMMsgBase * msg, int flags, bool newMsg) const KMMsgStatus oldStatus = msg->status(); if ( (flags & 1) && (oldStatus & KMMsgStatusOld) == 0 ) - msg->seStatus( KMMsgStatusOld ); + msg->setStatus( KMMsgStatusOld ); // In case the message does not have the seen flag set, override our local // notion that it is read. Otherwise the count of unread messages and the @@ -1468,10 +1468,10 @@ void KMFolderImap::seenFlagToStatus(KMMsgBase * msg, int flags, bool newMsg) if ( msg->isOfUnknownStatus() || (!(flags&1) && !(oldStatus&(KMMsgStatusNew|KMMsgStatusUnread)) ) ) { if (newMsg) { if ( (oldStatus & KMMsgStatusNew) == 0 ) - msg->seStatus( KMMsgStatusNew ); + msg->setStatus( KMMsgStatusNew ); } else { if ( (oldStatus & KMMsgStatusUnread) == 0 ) - msg->seStatus( KMMsgStatusUnread ); + msg->setStatus( KMMsgStatusUnread ); } } } @@ -1596,14 +1596,14 @@ void KMFolderImap::slotGetMessagesData(KIO::Job * job, const TQByteArray & data) } // Transfer the status, if it is cached. if ( md ) { - msg->seStatus( md->status() ); + msg->setStatus( md->status() ); } else if ( !account()->hasCapability("uidplus") ) { // see if we have cached the msgIdMD5 and get the status + // serial number from there TQString id = msg->msgIdMD5(); if ( mMetaDataMap.find( id ) ) { md = mMetaDataMap[id]; - msg->seStatus( md->status() ); + msg->setStatus( md->status() ); if ( md->serNum() != 0 && serNum == 0 ) { msg->setMsgSerNum( md->serNum() ); } @@ -1880,15 +1880,15 @@ void KMFolderImap::deleteMessage(const TQPtrList<KMMessage>& msgList) } //----------------------------------------------------------------------------- -void KMFolderImap::seStatus(int idx, KMMsgStatus status, bool toggle) +void KMFolderImap::setStatus(int idx, KMMsgStatus status, bool toggle) { TQValueList<int> ids; ids.append(idx); - seStatus(ids, status, toggle); + setStatus(ids, status, toggle); } -void KMFolderImap::seStatus(TQValueList<int>& _ids, KMMsgStatus status, bool toggle) +void KMFolderImap::setStatus(TQValueList<int>& _ids, KMMsgStatus status, bool toggle) { - FolderStorage::seStatus(_ids, status, toggle); + FolderStorage::setStatus(_ids, status, toggle); TQValueList<int> ids; if ( mUploadAllFlags ) { kdDebug(5006) << k_funcinfo << "Migrating all flags to the server" << endl; @@ -2284,7 +2284,7 @@ void KMFolderImap::setSubfolderState( imapState state ) mSubfolderState = state; if ( state == imapNoInformation && folder()->child() ) { - // pass through to tqchildren + // pass through to children KMFolderNode* node; TQPtrListIterator<KMFolderNode> it( *folder()->child() ); for ( ; (node = it.current()); ) diff --git a/kmail/kmfolderimap.h b/kmail/kmfolderimap.h index 47ddfbdfb..14b7d3b95 100644 --- a/kmail/kmfolderimap.h +++ b/kmail/kmfolderimap.h @@ -184,12 +184,12 @@ public: * Change the status of the message indicated by @p index * Overloaded function for the following one */ - virtual void seStatus(int idx, KMMsgStatus status, bool toggle); + virtual void setStatus(int idx, KMMsgStatus status, bool toggle); /** * Change the status of several messages indicated by @p ids */ - virtual void seStatus(TQValueList<int>& _ids, KMMsgStatus status, bool toggle); + virtual void setStatus(TQValueList<int>& _ids, KMMsgStatus status, bool toggle); /** generates sets of uids */ static TQStringList makeSets( TQValueList<ulong>&, bool sort = true); @@ -290,7 +290,7 @@ public: /** * Mark the folder as already removed from the server * If set to true the folder will only be deleted locally - * This will recursively be applied to all tqchildren + * This will recursively be applied to all children */ void setAlreadyRemoved(bool removed); diff --git a/kmail/kmfolderindex.cpp b/kmail/kmfolderindex.cpp index 21e51fcb5..e1c1b811f 100644 --- a/kmail/kmfolderindex.cpp +++ b/kmail/kmfolderindex.cpp @@ -288,7 +288,7 @@ bool KMFolderIndex::readIndex() #ifdef OBSOLETE else if (mi->isNew()) { - mi->seStatus(KMMsgStatusUnread); + mi->setStatus(KMMsgStatusUnread); mi->setDirty(false); } #endif @@ -369,7 +369,7 @@ bool KMFolderIndex::readIndexHeader(int *gv) "The mail index for '%1' is from an unknown version of KMail (%2).\n" "This index can be regenerated from your mail folder, but some " "information, including status flags, may be lost. Do you wish " - "to downgrade your index file?") .tqarg(name()) .tqarg(indexVersion), TQString(), i18n("Downgrade"), i18n("Do Not Downgrade") ); + "to downgrade your index file?") .arg(name()) .arg(indexVersion), TQString(), i18n("Downgrade"), i18n("Do Not Downgrade") ); kapp->restoreOverrideCursor(); if (r == KMessageBox::Yes) createIndexFromContents(); @@ -527,7 +527,7 @@ void KMFolderIndex::recreateIndex( bool readIndexAfterwards ) kapp->setOverrideCursor(KCursor::arrowCursor()); KMessageBox::information(0, i18n("The mail index for '%1' is corrupted and will be regenerated now, " - "but some information, like status flags, might get lost.").tqarg(name())); + "but some information, like status flags, might get lost.").arg(name())); kapp->restoreOverrideCursor(); createIndexFromContents(); if ( readIndexAfterwards ) { @@ -562,10 +562,10 @@ void KMFolderIndex::updateInvitationAndAddressFieldsFromContents() msg.fromDwString( msgString, false ); msg.updateInvitationState(); if ( msg.status() & KMMsgStatusHasInvitation ) { - msgInfo->seStatus( msgInfo->status() | KMMsgStatusHasInvitation ); + msgInfo->setStatus( msgInfo->status() | KMMsgStatusHasInvitation ); } if ( msg.status() & KMMsgStatusHasNoInvitation ) { - msgInfo->seStatus( msgInfo->status() | KMMsgStatusHasNoInvitation ); + msgInfo->setStatus( msgInfo->status() | KMMsgStatusHasNoInvitation ); } msgInfo->setFrom( msg.from() ); msgInfo->setTo( msg.to() ); diff --git a/kmail/kmfoldermaildir.cpp b/kmail/kmfoldermaildir.cpp index 61f40e8bd..2b4d155db 100644 --- a/kmail/kmfoldermaildir.cpp +++ b/kmail/kmfoldermaildir.cpp @@ -87,11 +87,11 @@ int KMFolderMaildir::canAccess() KCursorSaver idle(KBusyPtr::idle()); if ( nRetVal == ENOENT ) KMessageBox::sorry(0, i18n("Error opening %1; this folder is missing.") - .tqarg(sBadFolderName)); + .arg(sBadFolderName)); else KMessageBox::sorry(0, i18n("Error opening %1; either this is not a valid " "maildir folder, or you do not have sufficient access permissions.") - .tqarg(sBadFolderName)); + .arg(sBadFolderName)); return nRetVal; } @@ -122,7 +122,7 @@ int KMFolderMaildir::open(const char *) TQString str; mIndexStream = 0; str = i18n("Folder `%1' changed; recreating index.") - .tqarg(name()); + .arg(name()); emit statusMsg(str); } else { mIndexStream = fopen(TQFile::encodeName(indexLocation()), "r+"); // index file @@ -310,7 +310,7 @@ int KMFolderMaildir::compact( unsigned int startIndex, int nbMessages, const TQS // we can't have any New messages at this point if (mi->isNew()) { - mi->seStatus(KMMsgStatusUnread); + mi->setStatus(KMMsgStatusUnread); setDirty( true ); } #endif @@ -385,7 +385,7 @@ if( fileD0.open( IO_WriteOnly ) ) { msgParent->getMsg( idx ); } - aMsg->seStatusFields(); + aMsg->setStatusFields(); if (aMsg->headerField("Content-Type").isEmpty()) // This might be added by aMsg->removeHeaderField("Content-Type"); // the line above @@ -506,7 +506,7 @@ if( fileD0.open( IO_WriteOnly ) ) { error |= appendToFolderIdsFile( idx ); if (error) { - kdDebug(5006) << "Error: Could not add message to folder (No space left on tqdevice?)" << endl; + kdDebug(5006) << "Error: Could not add message to folder (No space left on device?)" << endl; if (ftell(mIndexStream) > revert) { kdDebug(5006) << "Undoing changes" << endl; truncate( TQFile::encodeName(indexLocation()), revert ); @@ -519,7 +519,7 @@ if( fileD0.open( IO_WriteOnly ) ) { if (busy) kmkernel->kbp()->idle(); KMessageBox::sorry(0, i18n("Unable to add message to folder.\n" - "(No space left on tqdevice or insufficient quota?)\n" + "(No space left on device or insufficient quota?)\n" "Free space and sufficient quota are required to continue safely.")); if (busy) kmkernel->kbp()->busy(); */ diff --git a/kmail/kmfoldermaildir.h b/kmail/kmfoldermaildir.h index c16d64f0b..1f8dc6ab3 100644 --- a/kmail/kmfoldermaildir.h +++ b/kmail/kmfoldermaildir.h @@ -56,7 +56,7 @@ public: virtual void removeMsg(TQPtrList<KMMessage> msgList, bool imapQuiet = FALSE) { return KMFolderIndex::removeMsg(msgList, imapQuiet); } - // Called by KMMsgBase::seStatus when status of a message has changed + // Called by KMMsgBase::setStatus when status of a message has changed // required to keep the number unread messages variable current. virtual void msgStatusChanged( const KMMsgStatus oldStatus, const KMMsgStatus newStatus, diff --git a/kmail/kmfoldermbox.cpp b/kmail/kmfoldermbox.cpp index c876e9a1e..b82c3a29d 100644 --- a/kmail/kmfoldermbox.cpp +++ b/kmail/kmfoldermbox.cpp @@ -109,7 +109,7 @@ int KMFolderMbox::open(const char *owner) if (!mStream) { KNotifyClient::event( 0, "warning", - i18n("Cannot open file \"%1\":\n%2").tqarg(location()).tqarg(strerror(errno))); + i18n("Cannot open file \"%1\":\n%2").arg(location()).arg(strerror(errno))); kdDebug(5006) << "Cannot open folder `" << location() << "': " << strerror(errno) << endl; mOpenCount = 0; return errno; @@ -137,8 +137,8 @@ int KMFolderMbox::open(const char *owner) "of KMail</a> for " "information about how to prevent this " "problem from happening again.</p></qt>") - .tqarg("help:/kmail/faq.html#faq-index-regeneration") - .tqarg(name()); + .arg("help:/kmail/faq.html#faq-index-regeneration") + .arg(name()); // When KMail is starting up we have to show a non-blocking message // box so that the initialization can continue. We don't show a // queued message box when KMail isn't starting up because queued @@ -164,7 +164,7 @@ int KMFolderMbox::open(const char *owner) TQString str; mIndexStream = 0; str = i18n("Folder `%1' changed. Recreating index.") - .tqarg(name()); + .arg(name()); emit statusMsg(str); } else { mIndexStream = fopen(TQFile::encodeName(indexLocation()), "r+"); // index file @@ -297,7 +297,7 @@ void KMFolderMbox::sync() if (mOpenCount > 0) if (!mStream || fsync(fileno(mStream)) || !mIndexStream || fsync(fileno(mIndexStream))) { - kmkernel->emergencyExit( i18n("Could not sync index file <b>%1</b>: %2").tqarg( indexLocation() ).tqarg(errno ? TQString::fromLocal8Bit(strerror(errno)) : i18n("Internal error. Please copy down the details and report a bug."))); + kmkernel->emergencyExit( i18n("Could not sync index file <b>%1</b>: %2").arg( indexLocation() ).arg(errno ? TQString::fromLocal8Bit(strerror(errno)) : i18n("Internal error. Please copy down the details and report a bug."))); } } @@ -682,7 +682,7 @@ int KMFolderMbox::createIndexFromContents() replyToIdStr, replyToAuxIdStr, msgIdStr, KMMsgEncryptionStateUnknown, KMMsgSignatureStateUnknown, KMMsgMDNStateUnknown, charset, offs, size, sizeServer, uid ); - mi->seStatus(status, xstatus); + mi->setStatus(status, xstatus); mi->setDate( dateStr.stripWhiteSpace().data() ); mi->setDirty(false); mMsgList.append(mi, mExportsSernums ); @@ -979,7 +979,7 @@ if( fileD0.open( IO_WriteOnly ) ) { fileD0.close(); // If data is 0 we just create a zero length file. } */ - aMsg->seStatusFields(); + aMsg->setStatusFields(); /* TQFile fileD1( "testdat_xx-kmfoldermbox-1" ); if( fileD1.open( IO_WriteOnly ) ) { @@ -1047,7 +1047,7 @@ if( fileD1.open( IO_WriteOnly ) ) { if (busy) kmkernel->kbp()->idle(); KMessageBox::sorry(0, i18n("Unable to add message to folder.\n" - "(No space left on tqdevice or insufficient quota?)\n" + "(No space left on device or insufficient quota?)\n" "Free space and sufficient quota are required to continue safely.")); if (busy) kmkernel->kbp()->busy(); kmkernel->kbp()->idle(); @@ -1118,7 +1118,7 @@ if( fileD1.open( IO_WriteOnly ) ) { error |= appendToFolderIdsFile( idx ); if (error) { - kdWarning(5006) << "Error: Could not add message to folder (No space left on tqdevice?)" << endl; + kdWarning(5006) << "Error: Could not add message to folder (No space left on device?)" << endl; if (ftell(mIndexStream) > revert) { kdWarning(5006) << "Undoing changes" << endl; truncate( TQFile::encodeName(indexLocation()), revert ); @@ -1126,14 +1126,14 @@ if( fileD1.open( IO_WriteOnly ) ) { if ( errno ) kmkernel->emergencyExit( i18n("Could not add message to folder:") + TQString::fromLocal8Bit(strerror(errno))); else - kmkernel->emergencyExit( i18n("Could not add message to folder (No space left on tqdevice?)") ); + kmkernel->emergencyExit( i18n("Could not add message to folder (No space left on device?)") ); /* This code may not be 100% reliable bool busy = kmkernel->kbp()->isBusy(); if (busy) kmkernel->kbp()->idle(); KMessageBox::sorry(0, i18n("Unable to add message to folder.\n" - "(No space left on tqdevice or insufficient quota?)\n" + "(No space left on device or insufficient quota?)\n" "Free space and sufficient quota are required to continue safely.")); if (busy) kmkernel->kbp()->busy(); */ @@ -1240,7 +1240,7 @@ int KMFolderMbox::compact( bool silent ) // KMHeaders::setFolderInfoStatus which will override the message, so save/restore it TQString statusMsg = BroadcastStatus::instance()->statusMsg(); emit changed(); - BroadcastStatus::instance()->seStatusMsg( statusMsg ); + BroadcastStatus::instance()->setStatusMsg( statusMsg ); return rc; } diff --git a/kmail/kmfoldermbox.h b/kmail/kmfoldermbox.h index 8cc8830bd..68b52acad 100644 --- a/kmail/kmfoldermbox.h +++ b/kmail/kmfoldermbox.h @@ -39,7 +39,7 @@ using KMail::AttachmentStrategy; * * Accounts: * The accounts (of KMail) that are fed into the folder are - * represented as the tqchildren of the folder. They are only stored here + * represented as the children of the folder. They are only stored here * during runtime to have a reference for which accounts point to a * specific folder. */ diff --git a/kmail/kmfoldermgr.cpp b/kmail/kmfoldermgr.cpp index c4df4904d..34958e5a7 100644 --- a/kmail/kmfoldermgr.cpp +++ b/kmail/kmfoldermgr.cpp @@ -146,7 +146,7 @@ void KMFolderMgr::setBasePath(const TQString& aBasePath) if ( !info.isDir() ) { KMessageBox::sorry(0, i18n("'%1' does not appear to be a folder.\n" "Please move the file out of the way.") - .tqarg( mBasePath ) ); + .arg( mBasePath ) ); ::exit(-1); } if ( !info.isReadable() || !info.isWritable() ) { @@ -154,7 +154,7 @@ void KMFolderMgr::setBasePath(const TQString& aBasePath) "incorrect;\n" "please make sure that you can view and modify " "the content of this folder.") - .tqarg( mBasePath ) ); + .arg( mBasePath ) ); ::exit(-1); } } else { @@ -163,7 +163,7 @@ void KMFolderMgr::setBasePath(const TQString& aBasePath) KMessageBox::sorry(0, i18n("KMail could not create folder '%1';\n" "please make sure that you can view and " "modify the content of the folder '%2'.") - .tqarg( mBasePath ).tqarg( TQDir::homeDirPath() ) ); + .arg( mBasePath ).arg( TQDir::homeDirPath() ) ); ::exit(-1); } } @@ -326,7 +326,7 @@ KMFolder* KMFolderMgr::findOrCreate(const TQString& aFolderName, bool sysFldr, folder = createFolder(aFolderName, sysFldr, type); if (!folder) { - KMessageBox::error(0,(i18n("Cannot create file `%1' in %2.\nKMail cannot start without it.").tqarg(aFolderName).tqarg(mBasePath))); + KMessageBox::error(0,(i18n("Cannot create file `%1' in %2.\nKMail cannot start without it.").arg(aFolderName).arg(mBasePath))); exit(-1); } if ( id > 0 ) @@ -402,7 +402,7 @@ void KMFolderMgr::removeFolderAux(KMFolder* aFolder, bool success) // aFolder will be deleted by the next call! aFolder->parent()->remove(aFolder); - // update the tqchildren state + // update the children state if ( parentF ) { if ( parentF != aFolder ) diff --git a/kmail/kmfoldertree.cpp b/kmail/kmfoldertree.cpp index 2c59b3981..a0fe190d5 100644 --- a/kmail/kmfoldertree.cpp +++ b/kmail/kmfoldertree.cpp @@ -267,14 +267,14 @@ void KMFolderTreeItem::slotIconsChanged() else setPixmap( 0, normalIcon( iconSize() ) ); emit iconChanged( this ); - tqrepaint(); + repaint(); } void KMFolderTreeItem::slotNameChanged() { setText( 0, mFolder->label() ); emit nameChanged( this ); - tqrepaint(); + repaint(); } void KMFolderTreeItem::slotNoContentChanged() @@ -556,7 +556,7 @@ void KMFolderTree::reload(bool openFolders) int top = contentsY(); mLastItem = 0; - // tqinvalidate selected drop item + // invalidate selected drop item oldSelected = 0; // remember last KMFolder* last = currentFolder(); @@ -743,7 +743,7 @@ void KMFolderTree::addDirectory( KMFolderDir *fdir, KMFolderTreeItem* parent ) // create new child fti = new KMFolderTreeItem( parent, folder->label(), folder ); - // set folders explicitely to exandable when they have tqchildren + // set folders explicitely to exandable when they have children // this way we can do a listing for IMAP folders when the user expands them // even when the child folders are not created yet if ( folder->storage()->hasChildren() == FolderStorage::HasChildren ) { @@ -800,7 +800,7 @@ void KMFolderTree::delayedUpdate() continue; if ( fti->needsRepaint() ) { - fti->tqrepaint(); + fti->repaint(); fti->setNeedsRepaint( false ); } } @@ -918,7 +918,7 @@ bool KMFolderTree::checkUnreadFolder (KMFolderTreeItem* fti, bool confirm) // parameter (kept in the config file for kmail) if ( KMessageBox::questionYesNo( this, i18n( "<qt>Go to the next unread message in folder <b>%1</b>?</qt>" ) - .tqarg( fti->folder()->label() ), + .arg( fti->folder()->label() ), i18n( "Go to Next Unread Message" ), i18n("Go To"), i18n("Do Not Go To"), // defaults "AskNextFolder", @@ -1280,7 +1280,7 @@ void KMFolderTree::addChildFolder( KMFolder *folder, TQWidget * parent ) const TQString message = i18n( "<qt>Cannot create folder under <b>%1</b> because of insufficient " "permissions on the server. If you think you should be able to create " "subfolders here, ask your administrator to grant you rights to do so." - "</qt> " ).tqarg(aFolder->label()); + "</qt> " ).arg(aFolder->label()); KMessageBox::error( this, message ); return; } @@ -1419,7 +1419,7 @@ void KMFolderTree::openFolder() autoopen_timer.stop(); if ( dropItem && !dropItem->isOpen() ) { dropItem->setOpen( true ); - dropItem->tqrepaint(); + dropItem->repaint(); } } @@ -1987,7 +1987,7 @@ void KMFolderTree::moveOrCopyFolder( TQValueList<TQGuardedPtr<KMFolder> > source if ( parent->hasNamedFolder( sourceFolderName ) || sourceFolderNames.contains( sourceFolderName ) ) { KMessageBox::error( this, i18n("<qt>Cannot move or copy folder <b>%1</b> here because a folder with the same name already exists.</qt>") - .tqarg( sourceFolderName ) ); + .arg( sourceFolderName ) ); setDragEnabled( true ); return; } @@ -1998,7 +1998,7 @@ void KMFolderTree::moveOrCopyFolder( TQValueList<TQGuardedPtr<KMFolder> > source while ( f ) { if ( f->moveInProgress() ) { KMessageBox::error( this, i18n("<qt>Cannot move or copy folder <b>%1</b> because it is not completely copied itself.</qt>") - .tqarg( sourceFolderName ) ); + .arg( sourceFolderName ) ); setDragEnabled( true ); return; } diff --git a/kmail/kmheaders.cpp b/kmail/kmheaders.cpp index 1e9e5d132..7b5d2a3c5 100644 --- a/kmail/kmheaders.cpp +++ b/kmail/kmheaders.cpp @@ -719,7 +719,7 @@ void KMHeaders::setFolder( KMFolder *aFolder, bool forceJumpToUnread ) disconnect(mFolder, TQT_SIGNAL(closed()), this, TQT_SLOT(folderClosed())); disconnect( mFolder, TQT_SIGNAL( statusMsg( const TQString& ) ), - BroadcastStatus::instance(), TQT_SLOT( seStatusMsg( const TQString& ) ) ); + BroadcastStatus::instance(), TQT_SLOT( setStatusMsg( const TQString& ) ) ); disconnect(mFolder, TQT_SIGNAL(viewConfigChanged()), this, TQT_SLOT(reset())); writeSortOrder(); mFolder->close("kmheaders"); @@ -752,7 +752,7 @@ void KMHeaders::setFolder( KMFolder *aFolder, bool forceJumpToUnread ) connect(mFolder, TQT_SIGNAL(closed()), this, TQT_SLOT(folderClosed())); connect(mFolder, TQT_SIGNAL(statusMsg(const TQString&)), - BroadcastStatus::instance(), TQT_SLOT( seStatusMsg( const TQString& ) ) ); + BroadcastStatus::instance(), TQT_SLOT( setStatusMsg( const TQString& ) ) ); connect(mFolder, TQT_SIGNAL(numUnreadMsgsChanged(KMFolder*)), this, TQT_SLOT(setFolderInfoStatus())); connect(mFolder, TQT_SIGNAL(viewConfigChanged()), this, TQT_SLOT(reset())); @@ -935,9 +935,9 @@ void KMHeaders::msgAdded(int id) } if (parent && mFolder->getMsgBase(parent->id())->isWatched()) - mFolder->getMsgBase(id)->seStatus( KMMsgStatusWatched ); + mFolder->getMsgBase(id)->setStatus( KMMsgStatusWatched ); else if (parent && mFolder->getMsgBase(parent->id())->isIgnored()) - mFolder->getMsgBase(id)->seStatus( KMMsgStatusIgnored ); + mFolder->getMsgBase(id)->setStatus( KMMsgStatusIgnored ); if (parent) hi = new HeaderItem( parent->item(), id ); else @@ -1115,7 +1115,7 @@ void KMHeaders::msgRemoved(int id, TQString msgId ) if ( mSubjThreading && removedItem->sortCacheItem()->subjectThreadingList() ) removedItem->sortCacheItem()->subjectThreadingList()->removeRef( removedItem->sortCacheItem() ); - // Reparent tqchildren of item. + // Reparent children of item. TQListViewItem *myParent = removedItem; TQListViewItem *myChild = myParent->firstChild(); TQListViewItem *threadRoot = myParent; @@ -1214,7 +1214,7 @@ void KMHeaders::msgHeaderChanged(KMFolder*, int msgId) HeaderItem *item = mItems[msgId]; if (item) { item->irefresh(); - item->tqrepaint(); + item->repaint(); } } @@ -1399,11 +1399,11 @@ void KMHeaders::setFolderInfoStatus () else str = unread ? i18n( "1 unread", "%n unread", unread ) : i18n( "0 unread" ); const int count = mFolder->count(); - str = count ? i18n( "1 message, %1.", "%n messages, %1.", count ).tqarg( str ) + str = count ? i18n( "1 message, %1.", "%n messages, %1.", count ).arg( str ) : i18n( "0 messages" ); // no need for "0 unread" to be added here if ( mFolder->isReadOnly() ) - str = i18n("%1 = n messages, m unread.", "%1 Folder is read-only.").tqarg( str ); - BroadcastStatus::instance()->seStatusMsg(str); + str = i18n("%1 = n messages, m unread.", "%1 Folder is read-only.").arg( str ); + BroadcastStatus::instance()->setStatusMsg(str); } //----------------------------------------------------------------------------- @@ -1451,8 +1451,8 @@ void KMHeaders::applyFiltersOnMsg() if ( msgCountToFilter - msgCount < 10 || !( msgCount % 20 ) || msgCount <= 10 ) { progressItem->updateProgress(); TQString statusMsg = i18n("Filtering message %1 of %2"); - statusMsg = statusMsg.tqarg( msgCount ).tqarg( msgCountToFilter ); - KPIM::BroadcastStatus::instance()->seStatusMsg( statusMsg ); + statusMsg = statusMsg.arg( msgCount ).arg( msgCountToFilter ); + KPIM::BroadcastStatus::instance()->setStatusMsg( statusMsg ); KApplication::kApplication()->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 50 ); } @@ -1523,7 +1523,7 @@ void KMHeaders::deleteMsg () this, TQT_SLOT( slotMoveCompleted( KMCommand * ) ) ); command->start(); - BroadcastStatus::instance()->seStatusMsg(""); + BroadcastStatus::instance()->setStatusMsg(""); // triggerUpdate(); } @@ -1620,11 +1620,11 @@ void KMHeaders::slotMoveCompleted( KMCommand *command ) if ( command->result() == KMCommand::OK ) { // make sure the current item is shown makeHeaderVisible(); - BroadcastStatus::instance()->seStatusMsg( + BroadcastStatus::instance()->setStatusMsg( deleted ? i18n("Messages deleted successfully.") : i18n("Messages moved successfully") ); } else { /* The move failed or the user canceled it; reset the state of all - * messages involved and tqrepaint. + * messages involved and repaint. * * Note: This potentially resets too many items if there is more than one * move going on. Oh well, I suppose no animals will be harmed. @@ -1643,10 +1643,10 @@ void KMHeaders::slotMoveCompleted( KMCommand *command ) } triggerUpdate(); if ( command->result() == KMCommand::Failed ) - BroadcastStatus::instance()->seStatusMsg( + BroadcastStatus::instance()->setStatusMsg( deleted ? i18n("Deleting messages failed.") : i18n("Moving messages failed.") ); else - BroadcastStatus::instance()->seStatusMsg( + BroadcastStatus::instance()->setStatusMsg( deleted ? i18n("Deleting messages canceled.") : i18n("Moving messages canceled.") ); } mOwner->updateMessageActions(); @@ -1714,7 +1714,7 @@ void KMHeaders::setSelected( TQListViewItem *item, bool selected ) KListView::setSelected( item, selected ); // If the item is the parent of a closed thread recursively select - // tqchildren . + // children . if ( isThreaded() && !item->isOpen() && item->firstChild() ) { TQListViewItem *nextRoot = item->itemBelow(); TQListViewItemIterator it( item->firstChild() ); @@ -1828,7 +1828,7 @@ void KMHeaders::selectNextMessage() temp->firstChild(); temp = temp->parent(); } - lvi->tqrepaint(); + lvi->repaint(); /* test to see if we need to unselect messages on back track */ (below->isSelected() ? setSelected(lvi, false) : setSelected(below, true)); setCurrentItem(below); @@ -1866,7 +1866,7 @@ void KMHeaders::selectPrevMessage() temp->firstChild(); temp = temp->parent(); } - lvi->tqrepaint(); + lvi->repaint(); /* test to see if we need to unselect messages on back track */ (above->isSelected() ? setSelected(lvi, false) : setSelected(above, true)); setCurrentItem(above); @@ -1997,7 +1997,7 @@ int KMHeaders::findUnread(bool aDirNext, int aStartAt, bool onlyNew, bool accept // first unread item. // // Find the ancestor of the unread item closest to the - // root and recursively sort all of that ancestors tqchildren. + // root and recursively sort all of that ancestors children. if (item) { TQListViewItem *next = item; while (next->parent()) @@ -2135,10 +2135,10 @@ void KMHeaders::highlightMessage(TQListViewItem* lvi, bool markitread) return; } - BroadcastStatus::instance()->seStatusMsg(""); + BroadcastStatus::instance()->setStatusMsg(""); if (markitread && idx >= 0) setMsgRead(idx); mItems[idx]->irefresh(); - mItems[idx]->tqrepaint(); + mItems[idx]->repaint(); emit selected( msg ); setFolderInfoStatus(); } @@ -2151,7 +2151,7 @@ void KMHeaders::highlightCurrentThread() for ( it.toFirst() ; it.current() ; ++it ) { TQListViewItem *lvi = *it; lvi->setSelected( true ); - lvi->tqrepaint(); + lvi->repaint(); } } @@ -2192,7 +2192,7 @@ void KMHeaders::updateMessageList( bool set_selection, bool forceJumpToUnread ) noRepaint = false; KListView::setSorting( mSortCol, !mSortDescending ); if (!mFolder) { - tqrepaint(); + repaint(); return; } readSortOrder( set_selection, forceJumpToUnread ); @@ -2290,7 +2290,7 @@ void KMHeaders::contentsMousePressEvent(TQMouseEvent* e) if ( rootDecoClicked ) { // Check if our item is the parent of a closed thread and if so, if the root // decoration of the item was clicked (i.e. the +/- sign) which would expand - // the thread. In that case, deselect all tqchildren, so opening the thread + // the thread. In that case, deselect all children, so opening the thread // doesn't cause a flicker. if ( !lvi->isOpen() && lvi->firstChild() ) { TQListViewItem *nextRoot = lvi->itemBelow(); @@ -2315,7 +2315,7 @@ void KMHeaders::contentsMousePressEvent(TQMouseEvent* e) } if ( rootDecoClicked ) { - // select the thread's tqchildren after closing if the parent is selected + // select the thread's children after closing if the parent is selected if ( lvi && !lvi->isOpen() && lvi->isSelected() ) setSelected( lvi, true ); } @@ -2324,7 +2324,7 @@ void KMHeaders::contentsMousePressEvent(TQMouseEvent* e) if ( lvi != currentItem() ) highlightMessage( lvi ); /* Explicitely set selection state. This is necessary because we want to - * also select all tqchildren of closed threads when the parent is selected. */ + * also select all children of closed threads when the parent is selected. */ // unless ctrl mask, set selected if it isn't already if ( !( e->state() & ControlButton ) && !wasSelected ) @@ -2813,9 +2813,9 @@ bool KMHeaders::writeSortOrder() if (sortStream && ferror(sortStream)) { fclose(sortStream); unlink(TQFile::encodeName(sortFile)); - kdWarning(5006) << "Error: Failure modifying " << sortFile << " (No space left on tqdevice?)" << endl; + kdWarning(5006) << "Error: Failure modifying " << sortFile << " (No space left on device?)" << endl; kdWarning(5006) << __FILE__ << ":" << __LINE__ << endl; - kmkernel->emergencyExit( i18n("Failure modifying %1\n(No space left on tqdevice?)").tqarg( sortFile )); + kmkernel->emergencyExit( i18n("Failure modifying %1\n(No space left on device?)").arg( sortFile )); } fclose(sortStream); ::rename(TQFile::encodeName(tempName), TQFile::encodeName(sortFile)); @@ -2853,9 +2853,9 @@ void KMHeaders::appendItemToSortFile(HeaderItem *khi) if (sortStream && ferror(sortStream)) { fclose(sortStream); unlink(TQFile::encodeName(sortFile)); - kdWarning(5006) << "Error: Failure modifying " << sortFile << " (No space left on tqdevice?)" << endl; + kdWarning(5006) << "Error: Failure modifying " << sortFile << " (No space left on device?)" << endl; kdWarning(5006) << __FILE__ << ":" << __LINE__ << endl; - kmkernel->emergencyExit( i18n("Failure modifying %1\n(No space left on tqdevice?)").tqarg( sortFile )); + kmkernel->emergencyExit( i18n("Failure modifying %1\n(No space left on device?)").arg( sortFile )); } fclose(sortStream); } else { @@ -3321,7 +3321,7 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread ) qsort(unsorted, unsorted_count, sizeof(SortCacheItem *), //sort compare_SortCacheItem); - /* The sorted list now contains all sorted tqchildren of this item, while + /* The sorted list now contains all sorted children of this item, while * the (aptly named) unsorted array contains all as of yet unsorted * ones. It has just been qsorted, so it is in itself sorted. These two * sorted lists are now merged into one. */ @@ -3353,11 +3353,11 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread ) if(threaded && i->item()) { // If the parent is watched or ignored, propagate that to it's - // tqchildren + // children if (mFolder->getMsgBase(i->id())->isWatched()) - mFolder->getMsgBase(new_kci->id())->seStatus(KMMsgStatusWatched); + mFolder->getMsgBase(new_kci->id())->setStatus(KMMsgStatusWatched); if (mFolder->getMsgBase(i->id())->isIgnored()) - mFolder->getMsgBase(new_kci->id())->seStatus(KMMsgStatusIgnored); + mFolder->getMsgBase(new_kci->id())->setStatus(KMMsgStatusIgnored); khi = new HeaderItem(i->item(), new_kci->id(), new_kci->key()); } else { khi = new HeaderItem(this, new_kci->id(), new_kci->key()); @@ -3499,7 +3499,7 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread ) if ( sortStream ) fclose(sortStream); unlink(TQFile::encodeName(sortFile)); - kdWarning(5006) << "Error: Failure modifying " << sortFile << " (No space left on tqdevice?)" << endl; + kdWarning(5006) << "Error: Failure modifying " << sortFile << " (No space left on device?)" << endl; kdWarning(5006) << __FILE__ << ":" << __LINE__ << endl; return true; diff --git a/kmail/kmheaders.h b/kmail/kmheaders.h index 6541d4a99..3dce0a664 100644 --- a/kmail/kmheaders.h +++ b/kmail/kmheaders.h @@ -286,12 +286,12 @@ public slots: virtual void ensureCurrentItemVisible(); /** Select an item and if it is the parent of a closed thread, also - recursively select its tqchildren. */ + recursively select its children. */ virtual void setSelected(TQListViewItem *item, bool selected); /** Select several items by message index * and if they are the parent of a closed thread, also - * recursively select their tqchildren. */ + * recursively select their children. */ void setSelectedByIndex(TQValueList<int> items, bool selected); /** switch a column with the given id (see KPaintInfo enum) diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp index a7624d844..ef6ee4f73 100644 --- a/kmail/kmkernel.cpp +++ b/kmail/kmkernel.cpp @@ -947,7 +947,7 @@ int KMKernel::dcopAddMessage( const TQString & foldername,const KURL & msgUrl, if ( !MsgStatusFlags.isEmpty() ) { KMMsgStatus status = strToStatus(MsgStatusFlags); - if (status) msg->seStatus(status); + if (status) msg->setStatus(status); } int index; @@ -1060,7 +1060,7 @@ int KMKernel::dcopAddMessage_fastImport( const TQString & foldername, if( !MsgStatusFlags.isEmpty() ) { KMMsgStatus status = strToStatus(MsgStatusFlags); - if (status) msg->seStatus(status); + if (status) msg->setStatus(status); } if ( mAddMsgCurrentFolder->addMsg( msg, &index ) == 0 ) { @@ -1211,9 +1211,9 @@ TQString KMKernel::debugSernum( TQ_UINT32 serialNumber ) msg = folder->getMsgBase( idx ); if (msg) { res.append( TQString( " subject %s,\n sender %s,\n date %s.\n" ) - .tqarg( msg->subject() ) - .tqarg( msg->fromStrip() ) - .tqarg( msg->dateStr() ) ); + .arg( msg->subject() ) + .arg( msg->fromStrip() ) + .arg( msg->dateStr() ) ); } else { res.append( TQString( "Invalid serial number." ) ); } @@ -1243,7 +1243,7 @@ void KMKernel::stopNetworkJobs() return; GlobalSettings::setNetworkState( GlobalSettings::EnumNetworkState::Offline ); - BroadcastStatus::instance()->seStatusMsg( i18n("KMail is set to be offline; all network jobs are suspended")); + BroadcastStatus::instance()->setStatusMsg( i18n("KMail is set to be offline; all network jobs are suspended")); emit onlineStatusChanged( (GlobalSettings::EnumNetworkState::type)GlobalSettings::networkState() ); } @@ -1253,7 +1253,7 @@ void KMKernel::resumeNetworkJobs() return; GlobalSettings::setNetworkState( GlobalSettings::EnumNetworkState::Online ); - BroadcastStatus::instance()->seStatusMsg( i18n("KMail is set to be online; all network jobs resumed")); + BroadcastStatus::instance()->setStatusMsg( i18n("KMail is set to be online; all network jobs resumed")); emit onlineStatusChanged( (GlobalSettings::EnumNetworkState::type)GlobalSettings::networkState() ); if ( kmkernel->msgSender()->sendImmediate() ) { @@ -1360,7 +1360,7 @@ void KMKernel::testDir(const char *_name) KMessageBox::sorry(0, i18n("KMail could not create folder '%1';\n" "please make sure that you can view and " "modify the content of the folder '%2'.") - .tqarg( foldersPath ).tqarg( TQDir::homeDirPath() ) ); + .arg( foldersPath ).arg( TQDir::homeDirPath() ) ); ::exit(-1); } } @@ -1369,7 +1369,7 @@ void KMKernel::testDir(const char *_name) "incorrect;\n" "please make sure that you can view and modify " "the content of this folder.") - .tqarg( foldersPath ) ); + .arg( foldersPath ) ); ::exit(-1); } } @@ -1673,7 +1673,7 @@ void KMKernel::cleanupImapFolders() cfld = static_cast<KMFolderCachedImap*>(the_dimapFolderMgr->createFolder(TQString::number(acct->id()), false, KMFolderTypeCachedImap)->storage()); if (!cfld) { - KMessageBox::error(0,(i18n("Cannot create file `%1' in %2.\nKMail cannot start without it.").tqarg(acct->name()).tqarg(the_dimapFolderMgr->basePath()))); + KMessageBox::error(0,(i18n("Cannot create file `%1' in %2.\nKMail cannot start without it.").arg(acct->name()).arg(the_dimapFolderMgr->basePath()))); exit(-1); } cfld->folder()->setId( acct->id() ); @@ -1884,8 +1884,8 @@ bool KMKernel::transferMail( TQString & destinationDir ) "the same name in <i>%7</i>.<p>" "<strong>Would you like %3 to move the mail " "files now?</strong></qt>" ) - .tqarg( kmailName, kmailName, kmailName ) - .tqarg( dir, destinationDir, dir, destinationDir ); + .arg( kmailName, kmailName, kmailName ) + .arg( dir, destinationDir, dir, destinationDir ); } else { msg = i18n( "%1-%3 is the application name, %4-%6 are folder path", "<qt>The <i>%4</i> folder exists. " @@ -1894,8 +1894,8 @@ bool KMKernel::transferMail( TQString & destinationDir ) "this folder for you.<p>" "<strong>Would you like %3 to move the mail " "files now?</strong></qt>" ) - .tqarg( kmailName, kmailName, kmailName ) - .tqarg( dir, destinationDir, dir ); + .arg( kmailName, kmailName, kmailName ) + .arg( dir, destinationDir, dir ); } TQString title = i18n( "Migrate Mail Files?" ); TQString buttonText = i18n( "Move" ); @@ -2047,7 +2047,7 @@ void KMKernel::slotResult(KIO::Job *job) { if (KMessageBox::warningContinueCancel(0, i18n("File %1 exists.\nDo you want to replace it?") - .tqarg((*it).url.prettyURL()), i18n("Save to File"), i18n("&Replace")) + .arg((*it).url.prettyURL()), i18n("Save to File"), i18n("&Replace")) == KMessageBox::Continue) byteArrayToRemoteFile((*it).data, (*it).url, true); } @@ -2135,7 +2135,7 @@ void KMKernel::emergencyExit( const TQString& reason ) mesg = i18n("KMail encountered a fatal error and will terminate now"); } else { mesg = i18n("KMail encountered a fatal error and will " - "terminate now.\nThe error was:\n%1").tqarg( reason ); + "terminate now.\nThe error was:\n%1").arg( reason ); } kdWarning() << mesg << endl; diff --git a/kmail/kmlineeditspell.cpp b/kmail/kmlineeditspell.cpp index db2763b93..c078cfe7a 100644 --- a/kmail/kmlineeditspell.cpp +++ b/kmail/kmlineeditspell.cpp @@ -132,7 +132,7 @@ void KMLineEdit::dropEvent( TQDropEvent *event ) KIO::NetAccess::removeTempFile( fileName ); } else { TQString caption( i18n( "vCard Import Failed" ) ); - TQString text = i18n( "<qt>Unable to access <b>%1</b>.</qt>" ).tqarg( (*it).url() ); + TQString text = i18n( "<qt>Unable to access <b>%1</b>.</qt>" ).arg( (*it).url() ); KMessageBox::error( parentWidget(), text, caption ); } } diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp index 36556a1de..392f348b7 100644 --- a/kmail/kmmainwidget.cpp +++ b/kmail/kmmainwidget.cpp @@ -287,13 +287,13 @@ void KMMainWidget::destruct() //----------------------------------------------------------------------------- void KMMainWidget::readPreConfig(void) { - const KConfigGroup tqgeometry( KMKernel::config(), "Geometry" ); + const KConfigGroup geometry( KMKernel::config(), "Geometry" ); const KConfigGroup reader( KMKernel::config(), "Reader" ); - mLongFolderList = tqgeometry.readEntry( "FolderList", "long" ) != "short"; - mReaderWindowActive = tqgeometry.readEntry( "readerWindowMode", "below" ) != "hide"; - mReaderWindowBelow = tqgeometry.readEntry( "readerWindowMode", "below" ) == "below"; - mThreadPref = tqgeometry.readBoolEntry( "nestedMessages", false ); + mLongFolderList = geometry.readEntry( "FolderList", "long" ) != "short"; + mReaderWindowActive = geometry.readEntry( "readerWindowMode", "below" ) != "hide"; + mReaderWindowBelow = geometry.readEntry( "readerWindowMode", "below" ) == "below"; + mThreadPref = geometry.readBoolEntry( "nestedMessages", false ); mHtmlPref = reader.readBoolEntry( "htmlMail", false ); mHtmlLoadExtPref = reader.readBoolEntry( "htmlLoadExternal", false ); @@ -516,7 +516,7 @@ void KMMainWidget::writeConfig(void) { TQString s; KConfig *config = KMKernel::config(); - KConfigGroup tqgeometry( config, "Geometry" ); + KConfigGroup geometry( config, "Geometry" ); if (mMsgView) mMsgView->writeConfig(); @@ -527,24 +527,24 @@ void KMMainWidget::writeConfig(void) if ( mFavoriteFolderView ) mFavoriteFolderView->writeConfig(); - tqgeometry.writeEntry( "MainWin", this->tqgeometry().size() ); + geometry.writeEntry( "MainWin", this->geometry().size() ); const TQValueList<int> widths = ( mLongFolderList ? mPanner1 : mPanner2 )->sizes(); const TQValueList<int> heights = ( mLongFolderList ? mPanner2 : mPanner1 )->sizes(); - tqgeometry.writeEntry( "FolderPaneWidth", widths[0] ); - tqgeometry.writeEntry( "HeaderPaneWidth", widths[1] ); + geometry.writeEntry( "FolderPaneWidth", widths[0] ); + geometry.writeEntry( "HeaderPaneWidth", widths[1] ); // Only save when the widget is shown (to avoid saving a wrong value) if ( mSearchAndHeaders && mSearchAndHeaders->isShown() ) { - tqgeometry.writeEntry( "HeaderPaneHeight", heights[0] ); - tqgeometry.writeEntry( "ReaderPaneHeight", heights[1] ); + geometry.writeEntry( "HeaderPaneHeight", heights[0] ); + geometry.writeEntry( "ReaderPaneHeight", heights[1] ); } // save the state of the unread/total-columns - tqgeometry.writeEntry( "UnreadColumn", mFolderTree->unreadIndex() ); - tqgeometry.writeEntry( "TotalColumn", mFolderTree->totalIndex() ); - tqgeometry.writeEntry( "SizeColumn", mFolderTree->sizeIndex() ); + geometry.writeEntry( "UnreadColumn", mFolderTree->unreadIndex() ); + geometry.writeEntry( "TotalColumn", mFolderTree->totalIndex() ); + geometry.writeEntry( "SizeColumn", mFolderTree->sizeIndex() ); } @@ -950,7 +950,7 @@ void KMMainWidget::slotMailChecked( bool newMail, bool sendOnCheck, summary += "<br>" + i18n( "1 new message in %1", "%n new messages in %1", newInFolder.find( *it ).data() ) - .tqarg( folder->prettyURL() ); + .arg( folder->prettyURL() ); } } } @@ -965,7 +965,7 @@ void KMMainWidget::slotMailChecked( bool newMail, bool sendOnCheck, if ( GlobalSettings::self()->verboseNewMailNotification() ) { summary = i18n( "%1 is a list of the number of new messages per folder", "<b>New mail arrived</b><br>%1" ) - .tqarg( summary ); + .arg( summary ); } else { summary = i18n( "New mail arrived" ); @@ -1097,7 +1097,7 @@ void KMMainWidget::modifyFolder( KMFolderTreeItem* folderItem ) KMFolder* folder = folderItem->folder(); KMFolderTree* folderTree = static_cast<KMFolderTree *>( folderItem->listView() ); KMFolderDialog props( folder, folder->parent(), folderTree, - i18n("Properties of Folder %1").tqarg( folder->label() ) ); + i18n("Properties of Folder %1").arg( folder->label() ) ); props.exec(); updateFolderMenu(); //Kolab issue 2152 @@ -1129,7 +1129,7 @@ void KMMainWidget::slotExpireFolder() KConfigGroupSaver saver(config, "General"); if (config->readBoolEntry("warn-before-expire", true)) { - str = i18n("<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>").tqarg(TQStyleSheet::escape( mFolder->label() )); + str = i18n("<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>").arg(TQStyleSheet::escape( mFolder->label() )); if (KMessageBox::warningContinueCancel(this, str, i18n("Expire Folder"), i18n("&Expire")) != KMessageBox::Continue) return; @@ -1152,7 +1152,7 @@ void KMMainWidget::slotEmptyFolder() TQString text = (isTrash) ? i18n("Are you sure you want to empty the trash folder?") : i18n("<qt>Are you sure you want to move all messages from " - "folder <b>%1</b> to the trash?</qt>").tqarg( TQStyleSheet::escape( mFolder->label() ) ); + "folder <b>%1</b> to the trash?</qt>").arg( TQStyleSheet::escape( mFolder->label() ) ); if (KMessageBox::warningContinueCancel(this, text, title, KGuiItem( title, "edittrash")) != KMessageBox::Continue) return; @@ -1170,7 +1170,7 @@ void KMMainWidget::slotEmptyFolder() if (mMsgView) mMsgView->clearCache(); if ( !isTrash ) - BroadcastStatus::instance()->seStatusMsg(i18n("Moved all messages to the trash")); + BroadcastStatus::instance()->setStatusMsg(i18n("Moved all messages to the trash")); updateMessageActions(); @@ -1209,14 +1209,14 @@ void KMMainWidget::slotRemoveFolder() title = i18n("Delete Search"); str = i18n("<qt>Are you sure you want to delete the search <b>%1</b>?<br>" "Any messages it shows will still be available in their original folder.</qt>") - .tqarg( TQStyleSheet::escape( mFolder->label() ) ); + .arg( TQStyleSheet::escape( mFolder->label() ) ); } else { title = i18n("Delete Folder"); if ( mFolder->count() == 0 ) { if ( !mFolder->child() || mFolder->child()->isEmpty() ) { str = i18n("<qt>Are you sure you want to delete the empty folder " "<b>%1</b>?</qt>") - .tqarg( TQStyleSheet::escape( mFolder->label() ) ); + .arg( TQStyleSheet::escape( mFolder->label() ) ); } else { str = i18n("<qt>Are you sure you want to delete the empty folder " @@ -1224,7 +1224,7 @@ void KMMainWidget::slotRemoveFolder() "not be empty and their contents will be discarded as well. " "<p><b>Beware</b> that discarded messages are not saved " "into your Trash folder and are permanently deleted.</qt>") - .tqarg( TQStyleSheet::escape( mFolder->label() ) ); + .arg( TQStyleSheet::escape( mFolder->label() ) ); } } else { if ( !mFolder->child() || mFolder->child()->isEmpty() ) { @@ -1232,14 +1232,14 @@ void KMMainWidget::slotRemoveFolder() "<b>%1</b>, discarding its contents? " "<p><b>Beware</b> that discarded messages are not saved " "into your Trash folder and are permanently deleted.</qt>") - .tqarg( TQStyleSheet::escape( mFolder->label() ) ); + .arg( TQStyleSheet::escape( mFolder->label() ) ); } else { str = i18n("<qt>Are you sure you want to delete the folder <b>%1</b> " "and all its subfolders, discarding their contents? " "<p><b>Beware</b> that discarded messages are not saved " "into your Trash folder and are permanently deleted.</qt>") - .tqarg( TQStyleSheet::escape( mFolder->label() ) ); + .arg( TQStyleSheet::escape( mFolder->label() ) ); } } } @@ -1270,7 +1270,7 @@ void KMMainWidget::slotCompactFolder() // setCurrentItemByIndex will override the statusbar message, so save/restore it TQString statusMsg = BroadcastStatus::instance()->statusMsg(); mHeaders->setCurrentItemByIndex(idx); - BroadcastStatus::instance()->seStatusMsg( statusMsg ); + BroadcastStatus::instance()->setStatusMsg( statusMsg ); } } @@ -1636,7 +1636,7 @@ void KMMainWidget::updateListFilterAction() mListFilterAction->setEnabled( false ); else { mListFilterAction->setEnabled( true ); - mListFilterAction->setText( i18n( "Filter on Mailing-List %1..." ).tqarg( lname ) ); + mListFilterAction->setText( i18n( "Filter on Mailing-List %1..." ).arg( lname ) ); } } @@ -3514,8 +3514,8 @@ void KMMainWidget::slotMemInfo() { "Memory allocated, not used: %3\n" "Memory total allocated : %4\n" "Max. freeable memory : %5\n") - .tqarg(mi.hblks).tqarg(fmt(mi.uordblks)).tqarg(fmt(mi.fordblks)) - .tqarg(fmt(mi.arena)).tqarg(fmt(mi.keepcost)); + .arg(mi.hblks).arg(fmt(mi.uordblks)).arg(fmt(mi.fordblks)) + .arg(fmt(mi.arena)).arg(fmt(mi.keepcost)); KMessageBox::information(0, s, "Malloc information", s); #endif } @@ -3649,7 +3649,7 @@ void KMMainWidget::removeDuplicates() "Removed %n duplicate messages.", numDuplicates ); else msg = i18n("No duplicate messages found."); - BroadcastStatus::instance()->seStatusMsg( msg ); + BroadcastStatus::instance()->setStatusMsg( msg ); } @@ -3712,13 +3712,13 @@ void KMMainWidget::initializeFilterActions() TQValueListConstIterator<KMFilter*> it = kmkernel->filterMgr()->filters().constBegin(); for ( ;it != kmkernel->filterMgr()->filters().constEnd(); ++it ) { if (!(*it)->isEmpty() && (*it)->configureShortcut()) { - filterName = TQString("Filter %1").tqarg((*it)->name()); + filterName = TQString("Filter %1").arg((*it)->name()); normalizedName = filterName.replace(" ", "_"); if (action(normalizedName.utf8())) continue; filterCommand = new KMMetaFilterActionCommand(*it, mHeaders, this); mFilterCommands.append(filterCommand); - TQString as = i18n("Filter %1").tqarg((*it)->name()); + TQString as = i18n("Filter %1").arg((*it)->name()); TQString icon = (*it)->icon(); if ( icon.isEmpty() ) icon = "gear"; @@ -3801,8 +3801,8 @@ void KMMainWidget::slotShortcutChanged( KMFolder *folder ) FolderShortcutCommand *c = new FolderShortcutCommand( this, folder ); mFolderShortcutCommands.insert( folder->idString(), c ); - TQString actionlabel = TQString( "FolderShortcut %1").tqarg( folder->prettyURL() ); - TQString actionname = TQString( "FolderShortcut %1").tqarg( folder->idString() ); + TQString actionlabel = TQString( "FolderShortcut %1").arg( folder->prettyURL() ); + TQString actionname = TQString( "FolderShortcut %1").arg( folder->idString() ); TQString normalizedName = actionname.replace(" ", "_"); KAction* action = new KAction(actionlabel, folder->shortcut(), c, TQT_SLOT(start()), diff --git a/kmail/kmmessage.cpp b/kmail/kmmessage.cpp index ecf1e763a..469858a41 100644 --- a/kmail/kmmessage.cpp +++ b/kmail/kmmessage.cpp @@ -351,7 +351,7 @@ void KMMessage::removePrivateHeaderFields() { } //----------------------------------------------------------------------------- -void KMMessage::seStatusFields() +void KMMessage::setStatusFields() { char str[2] = { 0, 0 }; @@ -394,8 +394,8 @@ DwMediaType& KMMessage::dwContentType() return mMsg->Headers().ContentType(); } -void KMMessage::fromByteArray( const TQByteArray & ba, bool seStatus ) { - return fromDwString( DwString( ba.data(), ba.size() ), seStatus ); +void KMMessage::fromByteArray( const TQByteArray & ba, bool setStatus ) { + return fromDwString( DwString( ba.data(), ba.size() ), setStatus ); } void KMMessage::fromString( const TQCString & str, bool aSeStatus ) { @@ -410,10 +410,10 @@ void KMMessage::fromDwString(const DwString& str, bool aSeStatus) mMsg->Parse(); if (aSeStatus) { - seStatus(headerField("Status").latin1(), headerField("X-Status").latin1()); + setStatus(headerField("Status").latin1(), headerField("X-Status").latin1()); setEncryptionStateChar( headerField("X-KMail-EncryptionState").at(0) ); setSignatureStateChar( headerField("X-KMail-SignatureState").at(0) ); - setMDNSentState( static_cast<KMMsgMDNSentState>( headerField("X-KMail-MDN-Sent").tqat(0).latin1() ) ); + setMDNSentState( static_cast<KMMsgMDNSentState>( headerField("X-KMail-MDN-Sent").at(0).latin1() ) ); } if ( invitationState() == KMMsgInvitationUnknown && readyToShow() ) updateInvitationState(); @@ -1081,7 +1081,7 @@ KMMessage* KMMessage::createReply( KMail::ReplyStrategy replyStrategy, parser.process( this ); } } - // seStatus(KMMsgStatusReplied); + // setStatus(KMMsgStatusReplied); msg->link(this, KMMsgStatusReplied); if ( parent() && parent()->putRepliesInSameFolder() ) @@ -1141,14 +1141,14 @@ KMMessage* KMMessage::createRedirect( const TQString &toStr ) // X-KMail-Redirect-From: content TQString strByWayOf = TQString("%1 (by way of %2 <%3>)") - .tqarg( from() ) - .tqarg( ident.fullName() ) - .tqarg( ident.primaryEmailAddress() ); + .arg( from() ) + .arg( ident.fullName() ) + .arg( ident.primaryEmailAddress() ); // Resent-From: content TQString strFrom = TQString("%1 <%2>") - .tqarg( ident.fullName() ) - .tqarg( ident.primaryEmailAddress() ); + .arg( ident.fullName() ) + .arg( ident.primaryEmailAddress() ); // format the current date to be used in Resent-Date: TQString origDate = msg->headerField( "Date" ); @@ -3160,7 +3160,7 @@ void KMMessage::bodyPart(int aIdx, KMMessagePart* aPart) const if ( DwBodyPart *part = dwBodyPart( aIdx ) ) { KMMessage::bodyPart(part, aPart); if( aPart->name().isEmpty() ) - aPart->setName( i18n("Attachment: %1").tqarg( aIdx ) ); + aPart->setName( i18n("Attachment: %1").arg( aIdx ) ); } } @@ -3193,7 +3193,7 @@ bool KMMessage::deleteBodyPart( int partIndex ) dummyPart.duplicate( part ); TQString comment = i18n("This attachment has been deleted."); if ( !part.fileName().isEmpty() ) - comment = i18n( "The attachment '%1' has been deleted." ).tqarg( part.fileName() ); + comment = i18n( "The attachment '%1' has been deleted." ).arg( part.fileName() ); dummyPart.setContentDescription( comment ); dummyPart.setBodyEncodedBinary( TQByteArray() ); TQCString cd = dummyPart.contentDisposition(); @@ -4037,7 +4037,7 @@ void KMMessage::readConfig() int languageNr = config->readNumEntry("reply-current-language",0); { // area for config group "KMMessage #n" - KConfigGroupSaver saver(config, TQString("KMMessage #%1").tqarg(languageNr)); + KConfigGroupSaver saver(config, TQString("KMMessage #%1").arg(languageNr)); sReplyLanguage = config->readEntry("language",KGlobal::locale()->language()); sReplyStr = config->readEntry("phrase-reply", i18n("On %D, you wrote:")); @@ -4145,11 +4145,11 @@ void KMMessage::setCharset( const TQCString &charset, DwEntity *entity ) //----------------------------------------------------------------------------- -void KMMessage::seStatus(const KMMsgStatus aStatus, int idx) +void KMMessage::setStatus(const KMMsgStatus aStatus, int idx) { if (mStatus == aStatus) return; - KMMsgBase::seStatus(aStatus, idx); + KMMsgBase::setStatus(aStatus, idx); } void KMMessage::setEncryptionState(const KMMsgEncryptionState s, int idx) @@ -4347,11 +4347,11 @@ void KMMessage::updateInvitationState() cntType += '/'; cntType += mMsg->Headers().ContentType().SubtypeStr().c_str(); if ( cntType.lower() == "text/calendar" ) { - seStatus( KMMsgStatusHasInvitation ); + setStatus( KMMsgStatusHasInvitation ); return; } } - seStatus( KMMsgStatusHasNoInvitation ); + setStatus( KMMsgStatusHasNoInvitation ); return; } @@ -4364,7 +4364,7 @@ void KMMessage::updateAttachmentState( DwBodyPart* part ) if ( !part ) { // kdDebug(5006) << "updateAttachmentState - no part!" << endl; - seStatus( KMMsgStatusHasNoAttach ); + setStatus( KMMsgStatusHasNoAttach ); return; } @@ -4404,7 +4404,7 @@ void KMMessage::updateAttachmentState( DwBodyPart* part ) part->Headers().ContentType().Subtype() != DwMime::kSubtypePgpSignature && part->Headers().ContentType().Subtype() != DwMime::kSubtypePkcs7Signature ) ) { - seStatus( KMMsgStatusHasAttach ); + setStatus( KMMsgStatusHasAttach ); } return; } @@ -4429,7 +4429,7 @@ void KMMessage::updateAttachmentState( DwBodyPart* part ) if ( part->Next() ) updateAttachmentState( part->Next() ); else if ( attachmentState() == KMMsgAttachmentUnknown ) - seStatus( KMMsgStatusHasNoAttach ); + setStatus( KMMsgStatusHasNoAttach ); } void KMMessage::setBodyFromUnicode( const TQString &str, DwEntity *entity ) diff --git a/kmail/kmmessage.h b/kmail/kmmessage.h index ffae3ff09..dbf34b1cd 100644 --- a/kmail/kmmessage.h +++ b/kmail/kmmessage.h @@ -150,13 +150,13 @@ public: } /** Mark the message as deleted */ - void del() { seStatus(KMMsgStatusDeleted); } + void del() { setStatus(KMMsgStatusDeleted); } /** Undelete the message. Same as touch */ - void undel() { seStatus(KMMsgStatusOld); } + void undel() { setStatus(KMMsgStatusOld); } /** Touch the message - mark it as read */ - void touch() { seStatus(KMMsgStatusOld); } + void touch() { setStatus(KMMsgStatusOld); } /** Create a new message that is a reply to this message, filling all required header fields with the proper values. The returned message @@ -210,9 +210,9 @@ public: void sanitizeHeaders( const TQStringList& whiteList = TQStringList() ); /** Parse the string and create this message from it. */ - void fromDwString(const DwString& str, bool seStatus=false); - void fromString(const TQCString& str, bool seStatus=false); - void fromByteArray(const TQByteArray & ba, bool seStatus=false); + void fromDwString(const DwString& str, bool setStatus=false); + void fromString(const TQCString& str, bool setStatus=false); + void fromByteArray(const TQByteArray & ba, bool setStatus=false); /** Return the entire message contents in the DwString. This function is *fast* even for large message since it does *not* involve a @@ -669,7 +669,7 @@ public: /** Set "Status" and "X-Status" fields of the message from the * internal message status. */ - void seStatusFields(); + void setStatusFields(); /** Generates the Message-Id. It uses either the Message-Id suffix * defined by the user or the given email address as suffix. The address @@ -825,8 +825,8 @@ public: /** Status of the message. */ KMMsgStatus status() const { return mStatus; } /** Set status and mark dirty. */ - void seStatus(const KMMsgStatus status, int idx = -1); - void seStatus(const char* s1, const char* s2=0) { KMMsgBase::seStatus(s1, s2); } + void setStatus(const KMMsgStatus status, int idx = -1); + void setStatus(const char* s1, const char* s2=0) { KMMsgBase::setStatus(s1, s2); } /** Set encryption status of the message. */ void setEncryptionState(const KMMsgEncryptionState, int idx = -1); diff --git a/kmail/kmmsgbase.cpp b/kmail/kmmsgbase.cpp index db57a1bf1..0f7e2890d 100644 --- a/kmail/kmmsgbase.cpp +++ b/kmail/kmmsgbase.cpp @@ -150,7 +150,7 @@ void KMMsgBase::toggleStatus(const KMMsgStatus aStatus, int idx) } //----------------------------------------------------------------------------- -void KMMsgBase::seStatus(const KMMsgStatus aStatus, int idx) +void KMMsgBase::setStatus(const KMMsgStatus aStatus, int idx) { mDirty = true; KMMsgStatus oldStatus = status(); @@ -267,40 +267,40 @@ void KMMsgBase::seStatus(const KMMsgStatus aStatus, int idx) //----------------------------------------------------------------------------- -void KMMsgBase::seStatus(const char* aStatusStr, const char* aXStatusStr) +void KMMsgBase::setStatus(const char* aStatusStr, const char* aXStatusStr) { // first try to find status from "X-Status" field if given if (aXStatusStr) { - if (strchr(aXStatusStr, 'N')) seStatus(KMMsgStatusNew); - if (strchr(aXStatusStr, 'U')) seStatus(KMMsgStatusUnread); - if (strchr(aXStatusStr, 'O')) seStatus(KMMsgStatusOld); - if (strchr(aXStatusStr, 'R')) seStatus(KMMsgStatusRead); - if (strchr(aXStatusStr, 'D')) seStatus(KMMsgStatusDeleted); - if (strchr(aXStatusStr, 'A')) seStatus(KMMsgStatusReplied); - if (strchr(aXStatusStr, 'F')) seStatus(KMMsgStatusForwarded); - if (strchr(aXStatusStr, 'Q')) seStatus(KMMsgStatusQueued); - if (strchr(aXStatusStr, 'K')) seStatus(KMMsgStatusTodo); - if (strchr(aXStatusStr, 'S')) seStatus(KMMsgStatusSent); - if (strchr(aXStatusStr, 'G')) seStatus(KMMsgStatusFlag); - if (strchr(aXStatusStr, 'P')) seStatus(KMMsgStatusSpam); - if (strchr(aXStatusStr, 'H')) seStatus(KMMsgStatusHam); - if (strchr(aXStatusStr, 'T')) seStatus(KMMsgStatusHasAttach); - if (strchr(aXStatusStr, 'C')) seStatus(KMMsgStatusHasNoAttach); + if (strchr(aXStatusStr, 'N')) setStatus(KMMsgStatusNew); + if (strchr(aXStatusStr, 'U')) setStatus(KMMsgStatusUnread); + if (strchr(aXStatusStr, 'O')) setStatus(KMMsgStatusOld); + if (strchr(aXStatusStr, 'R')) setStatus(KMMsgStatusRead); + if (strchr(aXStatusStr, 'D')) setStatus(KMMsgStatusDeleted); + if (strchr(aXStatusStr, 'A')) setStatus(KMMsgStatusReplied); + if (strchr(aXStatusStr, 'F')) setStatus(KMMsgStatusForwarded); + if (strchr(aXStatusStr, 'Q')) setStatus(KMMsgStatusQueued); + if (strchr(aXStatusStr, 'K')) setStatus(KMMsgStatusTodo); + if (strchr(aXStatusStr, 'S')) setStatus(KMMsgStatusSent); + if (strchr(aXStatusStr, 'G')) setStatus(KMMsgStatusFlag); + if (strchr(aXStatusStr, 'P')) setStatus(KMMsgStatusSpam); + if (strchr(aXStatusStr, 'H')) setStatus(KMMsgStatusHam); + if (strchr(aXStatusStr, 'T')) setStatus(KMMsgStatusHasAttach); + if (strchr(aXStatusStr, 'C')) setStatus(KMMsgStatusHasNoAttach); } // Merge the contents of the "Status" field if (aStatusStr) { if ((aStatusStr[0]== 'R' && aStatusStr[1]== 'O') || (aStatusStr[0]== 'O' && aStatusStr[1]== 'R')) { - seStatus( KMMsgStatusOld ); - seStatus( KMMsgStatusRead ); + setStatus( KMMsgStatusOld ); + setStatus( KMMsgStatusRead ); } else if (aStatusStr[0] == 'R') - seStatus(KMMsgStatusRead); + setStatus(KMMsgStatusRead); else if (aStatusStr[0] == 'D') - seStatus(KMMsgStatusDeleted); + setStatus(KMMsgStatusDeleted); else - seStatus(KMMsgStatusNew); + setStatus(KMMsgStatusNew); } } @@ -587,8 +587,8 @@ TQCString KMMsgBase::toUsAscii(const TQString& _str, bool *ok) TQString result = _str; int len = result.length(); for (int i = 0; i < len; i++) - if (result.tqat(i).tqunicode() >= 128) { - result.tqat(i) = '?'; + if (result.at(i).tqunicode() >= 128) { + result.at(i) = '?'; all_ok = false; } if (ok) @@ -800,7 +800,7 @@ TQCString KMMsgBase::encodeRFC2047String(const TQString& _str, unsigned int nonAscii = 0; unsigned int strLength(_str.length()); for (unsigned int i = 0; i < strLength; i++) - if (_str.tqat(i).tqunicode() >= 128) nonAscii++; + if (_str.at(i).tqunicode() >= 128) nonAscii++; bool useBase64 = (nonAscii * 6 > strLength); unsigned int start, stop, p, pos = 0, encLength; @@ -813,17 +813,17 @@ TQCString KMMsgBase::encodeRFC2047String(const TQString& _str, start = pos; p = pos; while (p < strLength) { - if (!breakLine && (_str.tqat(p) == ' ' || dontQuote.find(_str.tqat(p)) != -1)) + if (!breakLine && (_str.at(p) == ' ' || dontQuote.find(_str.at(p)) != -1)) start = p + 1; - if (_str.tqat(p).tqunicode() >= 128 || _str.tqat(p).tqunicode() < 32) + if (_str.at(p).tqunicode() >= 128 || _str.at(p).tqunicode() < 32) break; p++; } if (breakLine || p < strLength) { - while (dontQuote.find(_str.tqat(start)) != -1) start++; + while (dontQuote.find(_str.at(start)) != -1) start++; stop = start; - while (stop < strLength && dontQuote.find(_str.tqat(stop)) == -1) + while (stop < strLength && dontQuote.find(_str.at(stop)) == -1) stop++; result += _str.mid(pos, start - pos).latin1(); encLength = encodeRFC2047Quoted(codec->fromUnicode(_str. @@ -843,7 +843,7 @@ TQCString KMMsgBase::encodeRFC2047String(const TQString& _str, stop = start + dif; } p = stop; - while (p > start && _str.tqat(p) != ' ') p--; + while (p > start && _str.at(p) != ' ') p--; if (p > start) stop = p; if (result.right(3) == "?= ") start--; if (result.right(5) == "?=\n ") { @@ -956,13 +956,13 @@ TQString KMMsgBase::decodeRFC2231String(const TQCString& _str) p = 0; while (p < (int)st.length()) { - if (st.tqat(p) == 37) + if (st.at(p) == 37) { - ch = st.tqat(p+1) - 48; + ch = st.at(p+1) - 48; if (ch > 16) ch -= 7; - ch2 = st.tqat(p+2) - 48; + ch2 = st.at(p+2) - 48; if (ch2 > 16) ch2 -= 7; - st.tqat(p) = ch * 16 + ch2; + st.at(p) = ch * 16 + ch2; st.remove( p+1, 2 ); } p++; @@ -1193,7 +1193,7 @@ retry: } if(type == t) { // This works because the TQString constructor does a memcpy. - // Otherwise we would need to be concerned about the tqalignment. + // Otherwise we would need to be concerned about the alignment. if(l) ret = TQString((TQChar *)(g_chunk + g_chunk_offset), l/2); break; @@ -1477,7 +1477,7 @@ TQString KMMsgBase::replacePrefixes( const TQString& str, // 1. is anchored to the beginning of str (sans whitespace) // 2. matches at least one of the part regexps in prefixRegExps TQString bigRegExp = TQString::fromLatin1("^(?:\\s+|(?:%1))+\\s*") - .tqarg( prefixRegExps.join(")|(?:") ); + .arg( prefixRegExps.join(")|(?:") ); TQRegExp rx( bigRegExp, false /*case insens.*/ ); if ( !rx.isValid() ) { kdWarning(5006) << "KMMessage::replacePrefixes(): bigRegExp = \"" diff --git a/kmail/kmmsgbase.h b/kmail/kmmsgbase.h index 6ad1315dc..a135edc58 100644 --- a/kmail/kmmsgbase.h +++ b/kmail/kmmsgbase.h @@ -220,9 +220,9 @@ public: /** Set status and mark dirty. Optional optimization: @p idx may * specify the index of this message within the parent folder. */ - virtual void seStatus(const KMMsgStatus status, int idx = -1); + virtual void setStatus(const KMMsgStatus status, int idx = -1); virtual void toggleStatus(const KMMsgStatus status, int idx = -1); - virtual void seStatus(const char* statusField, const char* xstatusField=0); + virtual void setStatus(const char* statusField, const char* xstatusField=0); /** Encryption status of the message. */ virtual KMMsgEncryptionState encryptionState() const = 0; diff --git a/kmail/kmmsginfo.cpp b/kmail/kmmsginfo.cpp index c2ce09582..bcea46791 100644 --- a/kmail/kmmsginfo.cpp +++ b/kmail/kmmsginfo.cpp @@ -666,11 +666,11 @@ void KMMsgInfo::setFileName(const TQString& file) } //----------------------------------------------------------------------------- -void KMMsgInfo::seStatus(const KMMsgStatus aStatus, int idx) +void KMMsgInfo::setStatus(const KMMsgStatus aStatus, int idx) { if(aStatus == status()) return; - KMMsgBase::seStatus(aStatus, idx); //base does more "stuff" + KMMsgBase::setStatus(aStatus, idx); //base does more "stuff" } //----------------------------------------------------------------------------- diff --git a/kmail/kmmsginfo.h b/kmail/kmmsginfo.h index ce15e3127..8f557f25b 100644 --- a/kmail/kmmsginfo.h +++ b/kmail/kmmsginfo.h @@ -91,7 +91,7 @@ public: void setMsgSizeServer(size_t sz); void setFolderOffset(off_t offs); void setFileName(const TQString& file); - virtual void seStatus(const KMMsgStatus status, int idx = -1); + virtual void setStatus(const KMMsgStatus status, int idx = -1); virtual void setDate(time_t aUnixTime); virtual void setSubject(const TQString&); virtual void setXMark(const TQString&); @@ -107,7 +107,7 @@ public: virtual void setTo( const TQString &to ); /** Grr.. c++! */ - virtual void seStatus(const char* s1, const char* s2=0) { KMMsgBase::seStatus(s1, s2); } + virtual void setStatus(const char* s1, const char* s2=0) { KMMsgBase::setStatus(s1, s2); } virtual void setDate(const char* s1) { KMMsgBase::setDate(s1); } virtual bool dirty(void) const; diff --git a/kmail/kmmsgpartdlg.cpp b/kmail/kmmsgpartdlg.cpp index 16d188d7c..3af55f520 100644 --- a/kmail/kmmsgpartdlg.cpp +++ b/kmail/kmmsgpartdlg.cpp @@ -89,7 +89,7 @@ KMMsgPartDialog::KMMsgPartDialog( const TQString & caption, "<p>normally, you do not need to touch this setting, since the " "type of the file is automatically checked; but, sometimes, %1 " "may not detect the type correctly -- here is where you can fix " - "that.</p></qt>").tqarg( kapp->aboutData()->programName() ); + "that.</p></qt>").arg( kapp->aboutData()->programName() ); TQWhatsThis::add( mMimeType, msg ); // row 1: Size label: @@ -102,7 +102,7 @@ KMMsgPartDialog::KMMsgPartDialog( const TQString & caption, "because calculating the exact size would take too much time; " "when this is the case, it will be made visible by adding " "\"(est.)\" to the size displayed.</p></qt>") - .tqarg( kapp->aboutData()->programName() ); + .arg( kapp->aboutData()->programName() ); TQWhatsThis::add( mSize, msg ); // row 2: "Name" lineedit and label: @@ -148,7 +148,7 @@ KMMsgPartDialog::KMMsgPartDialog( const TQString & caption, "binary data, but consists of pure text -- in this case, choosing " "\"quoted-printable\" over the default \"base64\" will save up " "to 25% in resulting message size.</p></qt>") - .tqarg( kapp->aboutData()->programName() ); + .arg( kapp->aboutData()->programName() ); TQWhatsThis::add( label, msg ); TQWhatsThis::add( mEncoding, msg ); @@ -210,7 +210,7 @@ void KMMsgPartDialog::setMimeType( const TQString & mimeType ) { void KMMsgPartDialog::setMimeType( const TQString & type, const TQString & subtype ) { - setMimeType( TQString::fromLatin1("%1/%2").tqarg(type).tqarg(subtype) ); + setMimeType( TQString::fromLatin1("%1/%2").arg(type).arg(subtype) ); } void KMMsgPartDialog::setMimeTypeList( const TQStringList & mimeTypes ) { @@ -221,7 +221,7 @@ void KMMsgPartDialog::setSize( KIO::filesize_t size, bool estimated ) { TQString text = KIO::convertSize( size ); if ( estimated ) text = i18n("%1: a filesize incl. unit (e.g. \"1.3 KB\")", - "%1 (est.)").tqarg( text ); + "%1 (est.)").arg( text ); mSize->setText( text ); } diff --git a/kmail/kmpopfiltercnfrmdlg.cpp b/kmail/kmpopfiltercnfrmdlg.cpp index 2cd29768e..ed406209f 100644 --- a/kmail/kmpopfiltercnfrmdlg.cpp +++ b/kmail/kmpopfiltercnfrmdlg.cpp @@ -292,7 +292,7 @@ KMPopFilterCnfrmDlg::KMPopFilterCnfrmDlg(TQPtrList<KMPopHeaders> *aHeaders, cons TQLabel *l = new TQLabel(i18n("Messages to filter found on POP Account: <b>%1</b><p>" "The messages shown exceed the maximum size limit you defined for this account.<br>You can select " - "what you want to do with them by checking the appropriate button.").tqarg(aAccount), w); + "what you want to do with them by checking the appropriate button.").arg(aAccount), w); vbl->addWidget(l); TQVGroupBox *upperBox = new TQVGroupBox(i18n("Messages Exceeding Size"), w); @@ -360,7 +360,7 @@ KMPopFilterCnfrmDlg::KMPopFilterCnfrmDlg(TQPtrList<KMPopHeaders> *aHeaders, cons } if(rulesetCount) - lowerBox->setTitle(i18n("Ruleset Filtered Messages: %1").tqarg(rulesetCount)); + lowerBox->setTitle(i18n("Ruleset Filtered Messages: %1").arg(rulesetCount)); // connect signals and slots connect(lv, TQT_SIGNAL(pressed(TQListViewItem*, const TQPoint&, int)), diff --git a/kmail/kmreaderwin.cpp b/kmail/kmreaderwin.cpp index e7eee3445..0892fbf37 100644 --- a/kmail/kmreaderwin.cpp +++ b/kmail/kmreaderwin.cpp @@ -150,7 +150,7 @@ NewByteArray& NewByteArray::appendNULL() { TQByteArray::detach(); uint len1 = size(); - if ( !TQByteArray::tqresize( len1 + 1 ) ) + if ( !TQByteArray::resize( len1 + 1 ) ) return *this; *(data() + len1) = '\0'; return *this; @@ -162,7 +162,7 @@ NewByteArray& NewByteArray::operator+=( const char * newData ) TQByteArray::detach(); uint len1 = size(); uint len2 = tqstrlen( newData ); - if ( !TQByteArray::tqresize( len1 + len2 ) ) + if ( !TQByteArray::resize( len1 + len2 ) ) return *this; memcpy( data() + len1, newData, len2 ); return *this; @@ -174,7 +174,7 @@ NewByteArray& NewByteArray::operator+=( const TQByteArray & newData ) TQByteArray::detach(); uint len1 = size(); uint len2 = newData.size(); - if ( !TQByteArray::tqresize( len1 + len2 ) ) + if ( !TQByteArray::resize( len1 + len2 ) ) return *this; memcpy( data() + len1, newData.data(), len2 ); return *this; @@ -186,7 +186,7 @@ NewByteArray& NewByteArray::operator+=( const TQCString & newData ) TQByteArray::detach(); uint len1 = size(); uint len2 = newData.length(); // forget about the trailing 0x00 ! - if ( !TQByteArray::tqresize( len1 + len2 ) ) + if ( !TQByteArray::resize( len1 + len2 ) ) return *this; memcpy( data() + len1, newData.data(), len2 ); return *this; @@ -207,7 +207,7 @@ void KMReaderWin::objectTreeToDecryptedMsg( partNode* node, int recCount ) { kdDebug(5006) << TQString("-------------------------------------------------" ) << endl; - kdDebug(5006) << TQString("KMReaderWin::objectTreeToDecryptedMsg( %1 ) START").tqarg( recCount ) << endl; + kdDebug(5006) << TQString("KMReaderWin::objectTreeToDecryptedMsg( %1 ) START").arg( recCount ) << endl; if( node ) { kdDebug(5006) << node->typeString() << '/' << node->subTypeString() << endl; @@ -309,10 +309,10 @@ kdDebug(5006) << " new Content-Type = " << headers->ContentType( // B) Store the body of this part. if( headers && bIsMultipart && dataNode->firstChild() ) { -kdDebug(5006) << "is valid Multipart, processing tqchildren:" << endl; +kdDebug(5006) << "is valid Multipart, processing children:" << endl; TQCString boundary = headers->ContentType().Boundary().c_str(); curNode = dataNode->firstChild(); - // store tqchildren of multipart + // store children of multipart while( curNode ) { kdDebug(5006) << "--boundary" << endl; if( resultingData.size() && @@ -323,7 +323,7 @@ kdDebug(5006) << "--boundary" << endl; resultingData += boundary; resultingData += "\n"; // note: We are processing a harmless multipart that is *not* - // to be replaced by one of it's tqchildren, therefor + // to be replaced by one of it's children, therefor // we set their doStoreHeaders to true. objectTreeToDecryptedMsg( curNode, resultingData, @@ -336,7 +336,7 @@ kdDebug(5006) << "--boundary--" << endl; resultingData += "\n--"; resultingData += boundary; resultingData += "--\n\n"; -kdDebug(5006) << "Multipart processing tqchildren - DONE" << endl; +kdDebug(5006) << "Multipart processing children - DONE" << endl; } else if( part ){ // store simple part kdDebug(5006) << "is Simple part or invalid Multipart, storing body data .. DONE" << endl; @@ -360,7 +360,7 @@ kdDebug(5006) << " Root node will NOT be replaced." << endl recCount + 1 ); } } - kdDebug(5006) << TQString("\nKMReaderWin::objectTreeToDecryptedMsg( %1 ) END").tqarg( recCount ) << endl; + kdDebug(5006) << TQString("\nKMReaderWin::objectTreeToDecryptedMsg( %1 ) END").arg( recCount ) << endl; } @@ -1285,11 +1285,11 @@ void KMReaderWin::displaySplashPage( const TQString &info ) TQString location = locate("data", "kmail/about/main.html"); TQString content = KPIM::kFileToString(location); - content = content.tqarg( locate( "data", "libtdepim/about/kde_infopage.css" ) ); + content = content.arg( locate( "data", "libtdepim/about/kde_infopage.css" ) ); if ( kapp->reverseLayout() ) - content = content.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "libtdepim/about/kde_infopage_rtl.css" ) ); + content = content.arg( "@import \"%1\";" ).arg( locate( "data", "libtdepim/about/kde_infopage_rtl.css" ) ); else - content = content.tqarg( "" ); + content = content.arg( "" ); mViewer->begin(KURL( location )); @@ -1297,7 +1297,7 @@ void KMReaderWin::displaySplashPage( const TQString &info ) TQString appTitle = i18n("KMail"); TQString catchPhrase = ""; //not enough space for a catch phrase at default window size i18n("Part of the Kontact Suite"); TQString quickDescription = i18n("The email client for the K Desktop Environment."); - mViewer->write(content.tqarg(fontSize).tqarg(appTitle).tqarg(catchPhrase).tqarg(quickDescription).tqarg(info)); + mViewer->write(content.arg(fontSize).arg(appTitle).arg(catchPhrase).arg(quickDescription).arg(info)); mViewer->end(); } @@ -1345,41 +1345,41 @@ void KMReaderWin::displayAboutPage() "<p>We hope that you will enjoy KMail.</p>\n" "<p>Thank you,</p>\n" "<p style='margin-bottom: 0px'> The KMail Team</p>") - .tqarg(KMAIL_VERSION) // KMail version - .tqarg("help:/kmail/index.html") // KMail help:// URL - .tqarg("http://kontact.kde.org/kmail/") // KMail homepage URL - .tqarg("1.8").tqarg("3.4"); // prior KMail and KDE version + .arg(KMAIL_VERSION) // KMail version + .arg("help:/kmail/index.html") // KMail help:// URL + .arg("http://kontact.kde.org/kmail/") // KMail homepage URL + .arg("1.8").arg("3.4"); // prior KMail and KDE version TQString featureItems; for ( int i = 0 ; i < numKMailNewFeatures ; i++ ) - featureItems += i18n("<li>%1</li>\n").tqarg( i18n( kmailNewFeatures[i] ) ); + featureItems += i18n("<li>%1</li>\n").arg( i18n( kmailNewFeatures[i] ) ); - info = info.tqarg( featureItems ); + info = info.arg( featureItems ); if( kmkernel->firstStart() ) { - info = info.tqarg( i18n("<p>Please take a moment to fill in the KMail " + info = info.arg( i18n("<p>Please take a moment to fill in the KMail " "configuration panel at Settings->Configure " "KMail.\n" "You need to create at least a default identity and " "an incoming as well as outgoing mail account." "</p>\n") ); } else { - info = info.tqarg( TQString() ); + info = info.arg( TQString() ); } if ( ( numKMailChanges > 1 ) || ( numKMailChanges == 1 && strlen(kmailChanges[0]) > 0 ) ) { TQString changesText = i18n("<p><span style='font-size:125%; font-weight:bold;'>" "Important changes</span> (compared to KMail %1):</p>\n") - .tqarg("1.8"); + .arg("1.8"); changesText += "<ul>\n"; for ( int i = 0 ; i < numKMailChanges ; i++ ) - changesText += i18n("<li>%1</li>\n").tqarg( i18n( kmailChanges[i] ) ); + changesText += i18n("<li>%1</li>\n").arg( i18n( kmailChanges[i] ) ); changesText += "</ul>\n"; - info = info.tqarg( changesText ); + info = info.arg( changesText ); } else - info = info.tqarg(""); // remove the %8 + info = info.arg(""); // remove the %8 displaySplashPage( info ); } @@ -2142,7 +2142,7 @@ void KMReaderWin::setMsgPart( KMMessagePart* aMsgPart, bool aHTML, } htmlWriter()->queue("</body></html>"); htmlWriter()->flush(); - mMainWindow->setCaption(i18n("View Attachment: %1").tqarg(pname)); + mMainWindow->setCaption(i18n("View Attachment: %1").arg(pname)); } else if (kasciistricmp(aMsgPart->typeStr(), "image")==0 || (kasciistricmp(aMsgPart->typeStr(), "application")==0 && kasciistricmp(aMsgPart->subtypeStr(), "postscript")==0)) @@ -2178,7 +2178,7 @@ void KMReaderWin::setMsgPart( KMMessagePart* aMsgPart, bool aHTML, "\" border=\"0\">\n" "</body></html>\n" ); htmlWriter()->end(); - setCaption( i18n("View Attachment: %1").tqarg( pname ) ); + setCaption( i18n("View Attachment: %1").arg( pname ) ); show(); delete iio; } else { @@ -2198,7 +2198,7 @@ void KMReaderWin::setMsgPart( KMMessagePart* aMsgPart, bool aHTML, htmlWriter()->queue( "</pre>" ); htmlWriter()->queue("</body></html>"); htmlWriter()->flush(); - mMainWindow->setCaption(i18n("View Attachment: %1").tqarg(pname)); + mMainWindow->setCaption(i18n("View Attachment: %1").arg(pname)); } // ---Sven's view text, html and image attachments in html widget end --- } @@ -2287,14 +2287,14 @@ void KMReaderWin::openAttachment( int id, const TQString & name ) if ( filenameText.isEmpty() ) filenameText = msgPart.name(); if ( offer ) { - open_text = i18n("&Open with '%1'").tqarg( offer->name() ); + open_text = i18n("&Open with '%1'").arg( offer->name() ); } else { open_text = i18n("&Open With..."); } const TQString text = i18n("Open attachment '%1'?\n" "Note that opening an attachment may compromise " "your system's security.") - .tqarg( filenameText ); + .arg( filenameText ); const int choice = KMessageBox::questionYesNoCancel( this, text, i18n("Open Attachment?"), KStdGuiItem::saveAs(), open_text, TQString::fromLatin1("askSave") + mimetype->name() ); // dontAskAgainName @@ -2738,7 +2738,7 @@ void KMReaderWin::fillCommandInfo( partNode *node, KMMessage **msg, int *nodeId void KMReaderWin::slotDeleteAttachment(partNode * node) { if ( KMessageBox::warningContinueCancel( this, - i18n("Deleting an attachment might tqinvalidate any digital signature on this message."), + i18n("Deleting an attachment might invalidate any digital signature on this message."), i18n("Delete Attachment"), KStdGuiItem::del(), "DeleteAttachmentSignatureWarning" ) != KMessageBox::Continue ) { return; @@ -2794,7 +2794,7 @@ void KMReaderWin::disconnectMsgAdded() void KMReaderWin::slotEditAttachment(partNode * node) { if ( KMessageBox::warningContinueCancel( this, - i18n("Modifying an attachment might tqinvalidate any digital signature on this message."), + i18n("Modifying an attachment might invalidate any digital signature on this message."), i18n("Edit Attachment"), KGuiItem( i18n("Edit"), "edit" ), "EditAttachmentSignatureWarning" ) != KMessageBox::Continue ) { return; @@ -2828,12 +2828,12 @@ void KMReaderWin::scrollToAttachment( const partNode *node ) DOM::Document doc = mViewer->htmlDocument(); // The anchors for this are created in ObjectTreeParser::parseObjectTree() - mViewer->gotoAnchor( TQString::fromLatin1( "att%1" ).tqarg( node->nodeId() ) ); + mViewer->gotoAnchor( TQString::fromLatin1( "att%1" ).arg( node->nodeId() ) ); // Remove any old color markings which might be there const partNode *root = node->topLevelParent(); for ( int i = 0; i <= root->totalChildCount() + 1; i++ ) { - DOM::Element attachmentDiv = doc.getElementById( TQString( "attachmentDiv%1" ).tqarg( i + 1 ) ); + DOM::Element attachmentDiv = doc.getElementById( TQString( "attachmentDiv%1" ).arg( i + 1 ) ); if ( !attachmentDiv.isNull() ) attachmentDiv.removeAttribute( "style" ); } @@ -2845,14 +2845,14 @@ void KMReaderWin::scrollToAttachment( const partNode *node ) // Now, color the div of the attachment in yellow, so that the user sees what happened. // We created a special marked div for this in writeAttachmentMarkHeader() in ObjectTreeParser, // find and modify that now. - DOM::Element attachmentDiv = doc.getElementById( TQString( "attachmentDiv%1" ).tqarg( node->nodeId() ) ); + DOM::Element attachmentDiv = doc.getElementById( TQString( "attachmentDiv%1" ).arg( node->nodeId() ) ); if ( attachmentDiv.isNull() ) { kdWarning( 5006 ) << "Could not find attachment div for attachment " << node->nodeId() << endl; return; } attachmentDiv.setAttribute( "style", TQString( "border:2px solid %1" ) - .tqarg( cssHelper()->pgpWarnColor().name() ) ); + .arg( cssHelper()->pgpWarnColor().name() ) ); // Update rendering, otherwise the rendering is not updated when the user clicks on an attachment // that causes scrolling and the open attachment dialog @@ -2931,8 +2931,8 @@ TQString KMReaderWin::renderAttachments(partNode * node, const TQColor &bgColor align = "right"; if ( node->msgPart().typeStr().lower() == "message" || node == mRootNode ) html += TQString::fromLatin1("<div style=\"background:%1; %2" - "vertical-align:middle; float:%3; %4\">").tqarg( bgColor.name() ).tqarg( margin ) - .tqarg( align ).tqarg( visibility ); + "vertical-align:middle; float:%3; %4\">").arg( bgColor.name() ).arg( margin ) + .arg( align ).arg( visibility ); html += subHtml; if ( node->msgPart().typeStr().lower() == "message" || node == mRootNode ) html += "</div>"; @@ -2941,7 +2941,7 @@ TQString KMReaderWin::renderAttachments(partNode * node, const TQColor &bgColor partNode::AttachmentDisplayInfo info = node->attachmentDisplayInfo(); if ( info.displayInHeader ) { html += "<div style=\"float:left;\">"; - html += TQString::fromLatin1( "<span style=\"white-space:nowrap; border-width: 0px; border-left-width: 5px; border-color: %1; 2px; border-left-style: solid;\">" ).tqarg( bgColor.name() ); + html += TQString::fromLatin1( "<span style=\"white-space:nowrap; border-width: 0px; border-left-width: 5px; border-color: %1; 2px; border-left-style: solid;\">" ).arg( bgColor.name() ); TQString fileName = writeMessagePartToTempFile( &node->msgPart(), node->nodeId() ); TQString href = node->asHREF( "header" ); html += TQString::fromLatin1( "<a href=\"" ) + href + diff --git a/kmail/kmsender.cpp b/kmail/kmsender.cpp index 8870976f9..eec0d6e00 100644 --- a/kmail/kmsender.cpp +++ b/kmail/kmsender.cpp @@ -77,10 +77,10 @@ KMSender::~KMSender() } //----------------------------------------------------------------------------- -void KMSender::seStatusMsg(const TQString &msg) +void KMSender::setStatusMsg(const TQString &msg) { if ( mProgressItem ) - mProgressItem->seStatus(msg); + mProgressItem->setStatus(msg); } //----------------------------------------------------------------------------- @@ -164,7 +164,7 @@ bool KMSender::doSend(KMMessage* aMsg, short sendNow) KMFolder * const outbox = kmkernel->outboxFolder(); const KMFolderOpener openOutbox( outbox, "outbox" ); - aMsg->seStatus(KMMsgStatusQueued); + aMsg->setStatus(KMMsgStatusQueued); if ( const int err = outbox->addMsg(aMsg) ) { Q_UNUSED( err ); @@ -314,8 +314,8 @@ void KMSender::doSendMsg() mCurrentMsg->addBodyPart( &msgPart ); } } - mCurrentMsg->seStatus(KMMsgStatusSent); - mCurrentMsg->seStatus(KMMsgStatusRead); // otherwise it defaults to new on imap + mCurrentMsg->setStatus(KMMsgStatusSent); + mCurrentMsg->setStatus(KMMsgStatusRead); // otherwise it defaults to new on imap mCurrentMsg->updateAttachmentState(); mCurrentMsg->updateInvitationState(); @@ -387,7 +387,7 @@ void KMSender::doSendMsg() "\"outbox\" to the \"sent-mail\" folder failed.\n" "Possible reasons are lack of disk space or write permission. " "Please try to fix the problem and move the message manually.") - .tqarg(mCurrentMsg->subject())); + .arg(mCurrentMsg->subject())); cleanup(); return; } @@ -400,7 +400,7 @@ void KMSender::doSendMsg() default: break; } - seStatusByLink( mCurrentMsg ); + setStatusByLink( mCurrentMsg ); if (mCurrentMsg->parent() && !imapSentFolder) { // for speed optimization, this code assumes that mCurrentMsg is the // last one in it's parent folder; make sure that's really the case: @@ -435,7 +435,7 @@ void KMSender::doSendMsg() "identity '%1' in the Identities " "section of the configuration dialog " "and then try again." ) - .tqarg( id.identityName() ) ); + .arg( id.identityName() ) ); mOutboxFolder->unGetMsg( mFailedMessages ); mCurrentMsg = 0; } @@ -450,12 +450,12 @@ void KMSender::doSendMsg() sentFolder->close("sentFolder"); if ( someSent ) { if ( mSentMessages == mTotalMessages ) { - seStatusMsg(i18n("%n queued message successfully sent.", + setStatusMsg(i18n("%n queued message successfully sent.", "%n queued messages successfully sent.", mSentMessages)); } else { - seStatusMsg(i18n("%1 of %2 queued messages successfully sent.") - .tqarg(mSentMessages).tqarg( mTotalMessages )); + setStatusMsg(i18n("%1 of %2 queued messages successfully sent.") + .arg(mSentMessages).arg( mTotalMessages )); } } cleanup(); @@ -536,7 +536,7 @@ void KMSender::doSendMsg() } bool KMSender::runPrecommand( const TQString & cmd ) { - seStatusMsg( i18n("Executing precommand %1").tqarg( cmd ) ); + setStatusMsg( i18n("Executing precommand %1").arg( cmd ) ); mPrecommand = new KMPrecommand( cmd ); connect( mPrecommand, TQT_SIGNAL(finished(bool)), TQT_SLOT(slotPrecommandFinished(bool)) ); @@ -554,7 +554,7 @@ void KMSender::sendProcStarted(bool success) if (mSendProc) mSendProc->finish(); else - seStatusMsg(i18n("Unrecognized transport protocol. Unable to send message.")); + setStatusMsg(i18n("Unrecognized transport protocol. Unable to send message.")); mSendProc = 0; mSendProcStarted = false; cleanup(); @@ -595,9 +595,9 @@ void KMSender::doSendMsgAux() // start sending the current message - seStatusMsg(i18n("%3: subject of message","Sending message %1 of %2: %3") - .tqarg(mSentMessages+mFailedMessages+1).tqarg(mTotalMessages) - .tqarg(mCurrentMsg->subject())); + setStatusMsg(i18n("%3: subject of message","Sending message %1 of %2: %3") + .arg(mSentMessages+mFailedMessages+1).arg(mTotalMessages) + .arg(mCurrentMsg->subject())); TQStringList to, cc, bcc; TQString sender; extractSenderToCCAndBcc( mCurrentMsg, &sender, &to, &cc, &bcc ); @@ -614,7 +614,7 @@ void KMSender::doSendMsgAux() mOutboxFolder->unGetMsg( mFailedMessages ); mCurrentMsg = 0; cleanup(); - seStatusMsg(i18n("Failed to send (some) queued messages.")); + setStatusMsg(i18n("Failed to send (some) queued messages.")); return; } // Do *not* add code here, after send(). It can happen that this method @@ -696,10 +696,10 @@ void KMSender::slotIdle() "fix the problem (e.g. a broken address) or remove the message " "from the 'outbox' folder.\n" "The following transport protocol was used:\n %2") - .tqarg(errString) - .tqarg(mMethodStr); + .arg(errString) + .arg(mMethodStr); if (!errString.isEmpty()) KMessageBox::error(0,msg); - seStatusMsg( i18n( "Sending aborted." ) ); + setStatusMsg( i18n( "Sending aborted." ) ); } else { if (!mSendProc->sendOk()) { if ( mCurrentMsg ) @@ -724,8 +724,8 @@ void KMSender::slotIdle() "from the 'outbox' folder.</p>" "<p>The following transport protocol was used: %2</p>" "<p>Do you want me to continue sending the remaining messages?</p>") - .tqarg(errString) - .tqarg(mMethodStr); + .arg(errString) + .arg(mMethodStr); res = KMessageBox::warningYesNo( 0 , msg , i18n( "Continue Sending" ), i18n( "&Continue Sending" ), i18n("&Abort Sending") ); @@ -735,8 +735,8 @@ void KMSender::slotIdle() "fix the problem (e.g. a broken address) or remove the message " "from the 'outbox' folder.\n" "The following transport protocol was used:\n %2") - .tqarg(errString) - .tqarg(mMethodStr); + .arg(errString) + .arg(mMethodStr); KMessageBox::error(0,msg); } if (res == KMessageBox::Yes) { @@ -744,7 +744,7 @@ void KMSender::slotIdle() doSendMsg(); return; } else { - seStatusMsg( i18n( "Sending aborted." ) ); + setStatusMsg( i18n( "Sending aborted." ) ); } } } else { @@ -845,7 +845,7 @@ KMSendProc* KMSender::createSendProcFromString( const TQString & transport ) } //----------------------------------------------------------------------------- -void KMSender::seStatusByLink(const KMMessage *aMsg) +void KMSender::setStatusByLink(const KMMessage *aMsg) { int n = 0; while (1) { @@ -867,7 +867,7 @@ void KMSender::seStatusByLink(const KMMessage *aMsg) new KMDeleteMsgCommand( folder, folder->getMsg( index ) ); cmd->start(); } else { - folder->seStatus(index, status); + folder->setStatus(index, status); } } else { kdWarning(5006) << k_funcinfo << "Cannot update linked message, it could not be found!" << endl; @@ -905,7 +905,7 @@ void KMSendProc::failed(const TQString &aMsg) //----------------------------------------------------------------------------- void KMSendProc::statusMsg(const TQString& aMsg) { - if (mSender) mSender->seStatusMsg(aMsg); + if (mSender) mSender->setStatusMsg(aMsg); } //============================================================================= @@ -934,8 +934,8 @@ bool KMSendSendmail::doStart() { "Please remove it from there if you do not want the message to " "be resent.\n" "The following transport protocol was used:\n %2") - .tqarg(str + "\n") - .tqarg("sendmail://"); + .arg(str + "\n") + .arg("sendmail://"); KMessageBox::information(0,msg); return false; } @@ -978,7 +978,7 @@ bool KMSendSendmail::doSend( const TQString & sender, const TQStringList & to, c if ( !mMailerProc->start( KProcess::NotifyOnExit, KProcess::All ) ) { KMessageBox::information( 0, i18n("Failed to execute mailer program %1") - .tqarg( mSender->transportInfo()->host ) ); + .arg( mSender->transportInfo()->host ) ); return false; } mMsgPos = mMsgStr.data(); diff --git a/kmail/kmsender.h b/kmail/kmsender.h index a94059761..36153a2a5 100644 --- a/kmail/kmsender.h +++ b/kmail/kmsender.h @@ -105,10 +105,10 @@ public: private: /** sets a status msg and emits statusMsg() */ - void seStatusMsg(const TQString&); + void setStatusMsg(const TQString&); /** sets replied/forwarded status in the linked message for @p aMsg. */ - void seStatusByLink(const KMMessage *aMsg); + void setStatusByLink(const KMMessage *aMsg); /** Emit progress info - calculates a percent value based on the amount of bytes sent */ void emitProgressInfo( int currentFileProgress ); diff --git a/kmail/kmstartup.cpp b/kmail/kmstartup.cpp index a6ac84769..264e4b05d 100644 --- a/kmail/kmstartup.cpp +++ b/kmail/kmstartup.cpp @@ -165,7 +165,7 @@ void lockOrDie() { // On linux with /proc we can even check that it's really kmail and not something else char path_buffer[MAXPATHLEN + 1]; path_buffer[MAXPATHLEN] = 0; - const TQString procPath = TQString("/proc/%1/exe").tqarg(oldPid); + const TQString procPath = TQString("/proc/%1/exe").arg(oldPid); const int length = readlink (procPath.latin1(), path_buffer, MAXPATHLEN); if ( length == -1 ) // not such pid first_instance = true; @@ -199,17 +199,17 @@ void lockOrDie() { "this machine. Running %2 more than once " "can cause the loss of mail. You should not start %1 " "unless you are sure that it is not already running.") - .tqarg( programName, programName ); + .arg( programName, programName ); // TQString::arg( st ) only replaces the first occurrence of %1 // with st while TQString::arg( s1, s2 ) replacess all occurrences // of %1 with s1 and all occurrences of %2 with s2. So don't - // even think about changing the above to .tqarg( programName ). + // even think about changing the above to .arg( programName ). else msg = i18n("%1 seems to be running on another display on this " "machine. Running %1 and %2 at the same " "time can cause the loss of mail. You should not start %2 " "unless you are sure that %1 is not running.") - .tqarg( oldProgramName, programName ); + .arg( oldProgramName, programName ); } else { if ( oldAppName == appName ) @@ -217,19 +217,19 @@ void lockOrDie() { "than once can cause the loss of mail. You should not " "start %1 on this computer unless you are sure that it is " "not already running on %2.") - .tqarg( programName, oldHostName ); + .arg( programName, oldHostName ); else msg = i18n("%1 seems to be running on %3. Running %1 and %2 at the " "same time can cause the loss of mail. You should not " "start %2 on this computer unless you are sure that %1 is " "not running on %3.") - .tqarg( oldProgramName, programName, oldHostName ); + .arg( oldProgramName, programName, oldHostName ); } KCursorSaver idle( KBusyPtr::idle() ); if ( KMessageBox::No == KMessageBox::warningYesNo( 0, msg, TQString(), - i18n("Start %1").tqarg( programName ), + i18n("Start %1").arg( programName ), i18n("Exit") ) ) { exit(1); } diff --git a/kmail/kmtransport.cpp b/kmail/kmtransport.cpp index 407a0bd99..c9efd8a31 100644 --- a/kmail/kmtransport.cpp +++ b/kmail/kmtransport.cpp @@ -145,7 +145,7 @@ void KMTransportInfo::writeConfig(int id) "but should not be considered secure from decryption efforts " "if access to the configuration file is obtained.\n" "Do you want to store the password for account '%1' in the " - "configuration file?").tqarg( name ), + "configuration file?").arg( name ), i18n("KWallet Not Available"), KGuiItem( i18n("Store Password") ), KGuiItem( i18n("Do Not Store Password") ) ) diff --git a/kmail/listjob.cpp b/kmail/listjob.cpp index e9e4a9361..67a21fc65 100644 --- a/kmail/listjob.cpp +++ b/kmail/listjob.cpp @@ -118,7 +118,7 @@ void ListJob::execute() i18n("retrieving folders"), false, mAccount->useSSL() || mAccount->useTLS() ); - mParentProgressItem->seStatus( escapedStatus ); + mParentProgressItem->setStatus( escapedStatus ); } // make the URL @@ -174,7 +174,7 @@ void ListJob::slotListResult( KIO::Job* job ) if ( job->error() ) { mAccount->handleJobError( job, - i18n( "Error while listing folder %1: " ).tqarg((*it).path), + i18n( "Error while listing folder %1: " ).arg((*it).path), true ); } else { diff --git a/kmail/localsubscriptiondialog.cpp b/kmail/localsubscriptiondialog.cpp index ca5f2cc9a..3b6f55dc8 100644 --- a/kmail/localsubscriptiondialog.cpp +++ b/kmail/localsubscriptiondialog.cpp @@ -72,7 +72,7 @@ void LocalSubscriptionDialog::processFolderListing() uint done = 0; for (uint i = mCount; i < mFolderNames.count(); ++i) { - // give the dialog a chance to tqrepaint + // give the dialog a chance to repaint if (done == 1000) { emit listChanged(); diff --git a/kmail/managesievescriptsdialog.cpp b/kmail/managesievescriptsdialog.cpp index ba32c0089..3af5d7426 100644 --- a/kmail/managesievescriptsdialog.cpp +++ b/kmail/managesievescriptsdialog.cpp @@ -253,7 +253,7 @@ void KMail::ManageSieveScriptsDialog::slotDeleteScript() { u.setFileName( mContextMenuItem->text( 0 ) ); - if ( KMessageBox::warningContinueCancel( this, i18n( "Really delete script \"%1\" from the server?" ).tqarg( u.fileName() ), + if ( KMessageBox::warningContinueCancel( this, i18n( "Really delete script \"%1\" from the server?" ).arg( u.fileName() ), i18n( "Delete Sieve Script Confirmation" ), KStdGuiItem::del() ) != KMessageBox::Continue ) diff --git a/kmail/messagecomposer.cpp b/kmail/messagecomposer.cpp index d3a0233d6..f14366184 100644 --- a/kmail/messagecomposer.cpp +++ b/kmail/messagecomposer.cpp @@ -2038,7 +2038,7 @@ bool MessageComposer::processStructuringInfo( const TQString bugURL, i18n( "<qt><p>Error: The backend did not return " "any encoded data.</p>" "<p>Please report this bug:<br>%2</p></qt>" ) - .tqarg( bugURL ) ); + .arg( bugURL ) ); bOk = false; } resultingPart.setBodyEncodedBinary( resultingBody ); diff --git a/kmail/networkaccount.cpp b/kmail/networkaccount.cpp index 23ebea559..145ab2b2d 100644 --- a/kmail/networkaccount.cpp +++ b/kmail/networkaccount.cpp @@ -224,7 +224,7 @@ namespace KMail { "but should not be considered secure from decryption efforts " "if access to the configuration file is obtained.\n" "Do you want to store the password for account '%1' in the " - "configuration file?").tqarg( name() ), + "configuration file?").arg( name() ), i18n("KWallet Not Available"), KGuiItem( i18n("Store Password") ), KGuiItem( i18n("Do Not Store Password") ) ) diff --git a/kmail/newfolderdialog.cpp b/kmail/newfolderdialog.cpp index b5848dcc8..12c5cb00f 100644 --- a/kmail/newfolderdialog.cpp +++ b/kmail/newfolderdialog.cpp @@ -66,7 +66,7 @@ NewFolderDialog::NewFolderDialog( TQWidget* parent, KMFolder *folder ) { setWFlags( getWFlags() | WDestructiveClose ); if ( mFolder ) { - setCaption( i18n("New Subfolder of %1").tqarg( mFolder->prettyURL() ) ); + setCaption( i18n("New Subfolder of %1").arg( mFolder->prettyURL() ) ); } TQWidget* privateLayoutWidget = new TQWidget( this, "mTopLevelLayout" ); privateLayoutWidget->setGeometry( TQRect( 10, 10, 260, 80 ) ); @@ -213,14 +213,14 @@ void NewFolderDialog::slotOk() && ( selectedFolderDir == mFolder->parent() ) && ( mFolder->storage()->name() == fldName ) ) ) ) { - const TQString message = i18n( "<qt>Failed to create folder <b>%1</b>, folder already exists.</qt>" ).tqarg(fldName); + const TQString message = i18n( "<qt>Failed to create folder <b>%1</b>, folder already exists.</qt>" ).arg(fldName); KMessageBox::error( this, message ); return; } /* Ok, obvious errors caught, let's try creating it for real. */ const TQString message = i18n( "<qt>Failed to create folder <b>%1</b>." - "</qt> " ).tqarg(fldName); + "</qt> " ).arg(fldName); TQString namespaceName; if ( mNamespacesComboBox ) { diff --git a/kmail/objecttreeparser.cpp b/kmail/objecttreeparser.cpp index 518610d99..0b974a531 100644 --- a/kmail/objecttreeparser.cpp +++ b/kmail/objecttreeparser.cpp @@ -272,7 +272,7 @@ namespace KMail { ProcessResult processResult; if ( mReader ) { - htmlWriter()->queue( TQString::fromLatin1("<a name=\"att%1\"/>").tqarg( node->nodeId() ) ); + htmlWriter()->queue( TQString::fromLatin1("<a name=\"att%1\"/>").arg( node->nodeId() ) ); } if ( const Interface::BodyPartFormatter * formatter @@ -686,11 +686,11 @@ namespace KMail { switch ( cryptPlugError ) { case NOT_INITIALIZED: errorMsg = i18n( "Crypto plug-in \"%1\" is not initialized." ) - .tqarg( cryptPlugLibName ); + .arg( cryptPlugLibName ); break; case CANT_VERIFY_SIGNATURES: errorMsg = i18n( "Crypto plug-in \"%1\" cannot verify signatures." ) - .tqarg( cryptPlugLibName ); + .arg( cryptPlugLibName ); break; case NO_PLUGIN: if ( cryptPlugDisplayName.isEmpty() ) @@ -698,14 +698,14 @@ namespace KMail { else errorMsg = i18n( "%1 is either 'OpenPGP' or 'S/MIME'", "No %1 plug-in was found." ) - .tqarg( cryptPlugDisplayName ); + .arg( cryptPlugDisplayName ); break; } messagePart.errorText = i18n( "The message is signed, but the " "validity of the signature cannot be " "verified.<br />" "Reason: %1" ) - .tqarg( errorMsg ); + .arg( errorMsg ); } if ( mReader ) @@ -887,9 +887,9 @@ bool ObjectTreeParser::okDecryptMIME( partNode& data, + "</div>"; if ( !passphraseError ) aErrorText = i18n("Crypto plug-in \"%1\" could not decrypt the data.") - .tqarg( cryptPlugLibName ) + .arg( cryptPlugLibName ) + "<br />" - + i18n("Error: %1").tqarg( aErrorText ); + + i18n("Error: %1").arg( aErrorText ); } } } @@ -901,11 +901,11 @@ bool ObjectTreeParser::okDecryptMIME( partNode& data, switch ( cryptPlugError ) { case NOT_INITIALIZED: aErrorText = i18n( "Crypto plug-in \"%1\" is not initialized." ) - .tqarg( cryptPlugLibName ); + .arg( cryptPlugLibName ); break; case CANT_DECRYPT: aErrorText = i18n( "Crypto plug-in \"%1\" cannot decrypt messages." ) - .tqarg( cryptPlugLibName ); + .arg( cryptPlugLibName ); break; case NO_PLUGIN: aErrorText = i18n( "No appropriate crypto plug-in was found." ); @@ -1656,7 +1656,7 @@ namespace KMail { const GpgME::ImportResult res = import->exec( certData ); if ( res.error() ) { htmlWriter()->queue( i18n( "Sorry, certificate could not be imported.<br>" - "Reason: %1").tqarg( TQString::fromLocal8Bit( res.error().asString() ) ) ); + "Reason: %1").arg( TQString::fromLocal8Bit( res.error().asString() ) ) ); return true; } @@ -1696,14 +1696,14 @@ namespace KMail { for ( std::vector<GpgME::Import>::const_iterator it = imports.begin() ; it != imports.end() ; ++it ) { if ( (*it).error() ) htmlWriter()->queue( i18n( "Failed: %1 (%2)" ) - .tqarg( (*it).fingerprint(), + .arg( (*it).fingerprint(), TQString::fromLocal8Bit( (*it).error().asString() ) ) ); else if ( (*it).status() & ~GpgME::Import::ContainedSecretKey ) { if ( (*it).status() & GpgME::Import::ContainedSecretKey ) { - htmlWriter()->queue( i18n( "New or changed: %1 (secret key available)" ).tqarg( (*it).fingerprint() ) ); + htmlWriter()->queue( i18n( "New or changed: %1 (secret key available)" ).arg( (*it).fingerprint() ) ); } else { - htmlWriter()->queue( i18n( "New or changed: %1" ).tqarg( (*it).fingerprint() ) ); + htmlWriter()->queue( i18n( "New or changed: %1" ).arg( (*it).fingerprint() ) ); } } htmlWriter()->queue( "<br>" ); @@ -2054,7 +2054,7 @@ bool ObjectTreeParser::processApplicationMsTnefSubtype( partNode *node, ProcessR TQString fileName = mReader->writeMessagePartToTempFile( msgPart, partNum ); - TQString href = TQString( "attachment:%1?place=body" ).tqarg( partNum ); + TQString href = TQString( "attachment:%1?place=body" ).arg( partNum ); TQString iconName; if( inlineImage ) @@ -2280,7 +2280,7 @@ static TQString writeSimpleSigstatHeader( const PartMetaData &block ) if ( addr.isEmpty() ) { html += i18n( "Signature is valid." ); } else { - html += i18n( "Signed by <a href=\"mailto:%1\">%2</a>." ).tqarg( addr, name ); + html += i18n( "Signed by <a href=\"mailto:%1\">%2</a>." ).arg( addr, name ); } } else { // should not happen @@ -2307,7 +2307,7 @@ static TQString makeShowAuditLogLink( const GpgME::Error & err, const TQString & //kdDebug(5006) << "makeShowAuditLogLink: not showing link (not available)" << endl; return i18n("No Audit Log available"); } else { - return i18n("Error Retrieving Audit Log: %1").tqarg( TQString::fromLocal8Bit( err.asString() ) ); + return i18n("Error Retrieving Audit Log: %1").arg( TQString::fromLocal8Bit( err.asString() ) ); } } @@ -2371,7 +2371,7 @@ TQString ObjectTreeParser::writeSigstatHeader( PartMetaData & block, else { htmlStr += i18n("Encrypted message (decryption not possible)"); if( !block.errorText.isEmpty() ) - htmlStr += "<br />" + i18n("Reason: %1").tqarg( block.errorText ); + htmlStr += "<br />" + i18n("Reason: %1").arg( block.errorText ); } htmlStr += "</td></tr><tr class=\"encrB\"><td>"; } @@ -2428,13 +2428,13 @@ TQString ObjectTreeParser::writeSigstatHeader( PartMetaData & block, if( isSMIME ) startKeyHREF = TQString("<a href=\"kmail:showCertificate#%1 ### %2 ### %3\">") - .tqarg( cryptProto->displayName(), + .arg( cryptProto->displayName(), cryptProto->name(), block.keyId ); TQString keyWithWithoutURL = isSMIME ? TQString("%1%2</a>") - .tqarg( startKeyHREF, + .arg( startKeyHREF, cannotCheckSignature ? i18n("[Details]") : ("0x" + block.keyId) ) : "0x" + TQString::fromUtf8( block.keyId ); @@ -2486,7 +2486,7 @@ TQString ObjectTreeParser::writeSigstatHeader( PartMetaData & block, i18n("Warning:") + "</u> " + i18n("Sender's mail address is not stored " - "in the %1 used for signing.").tqarg(certificate) + + "in the %1 used for signing.").arg(certificate) + "<br />" + i18n("sender: ") + msgFrom + @@ -2512,7 +2512,7 @@ TQString ObjectTreeParser::writeSigstatHeader( PartMetaData & block, "</u> " + i18n("No mail address is stored in the %1 used for signing, " "so we cannot compare it to the sender's address %2.") - .tqarg(certificate,msgFrom); + .arg(certificate,msgFrom); } if( !greenCaseWarning.isEmpty() ) { if( !statusStr.isEmpty() ) @@ -2535,7 +2535,7 @@ TQString ObjectTreeParser::writeSigstatHeader( PartMetaData & block, if( cannotCheckSignature ) { htmlStr += i18n( "Not enough information to check " "signature. %1" ) - .tqarg( keyWithWithoutURL ); + .arg( keyWithWithoutURL ); } else { @@ -2553,26 +2553,26 @@ TQString ObjectTreeParser::writeSigstatHeader( PartMetaData & block, htmlStr += i18n( "Message was signed with unknown key." ); else htmlStr += i18n( "Message was signed by %1." ) - .tqarg( signer ); + .arg( signer ); } else { TQDateTime created = block.creationTime; if( created.isValid() ) { if( signer.isEmpty() ) { if( onlyShowKeyURL ) htmlStr += i18n( "Message was signed with key %1." ) - .tqarg( keyWithWithoutURL ); + .arg( keyWithWithoutURL ); else htmlStr += i18n( "Message was signed on %1 with key %2." ) - .tqarg( KGlobal::locale()->formatDateTime( created ), + .arg( KGlobal::locale()->formatDateTime( created ), keyWithWithoutURL ); } else { if( onlyShowKeyURL ) htmlStr += i18n( "Message was signed with key %1." ) - .tqarg( keyWithWithoutURL ); + .arg( keyWithWithoutURL ); else htmlStr += i18n( "Message was signed by %3 on %1 with key %2" ) - .tqarg( KGlobal::locale()->formatDateTime( created ), + .arg( KGlobal::locale()->formatDateTime( created ), keyWithWithoutURL, signer ); } @@ -2580,10 +2580,10 @@ TQString ObjectTreeParser::writeSigstatHeader( PartMetaData & block, else { if( signer.isEmpty() || onlyShowKeyURL ) htmlStr += i18n( "Message was signed with key %1." ) - .tqarg( keyWithWithoutURL ); + .arg( keyWithWithoutURL ); else htmlStr += i18n( "Message was signed by %2 with key %1." ) - .tqarg( keyWithWithoutURL, + .arg( keyWithWithoutURL, signer ); } } @@ -2621,11 +2621,11 @@ TQString ObjectTreeParser::writeSigstatHeader( PartMetaData & block, TQDateTime created = block.creationTime; if ( created.isValid() ) htmlStr += i18n( "Message was signed on %1 with unknown key %2." ) - .tqarg( KGlobal::locale()->formatDateTime( created ), + .arg( KGlobal::locale()->formatDateTime( created ), keyWithWithoutURL ); else htmlStr += i18n( "Message was signed with unknown key %1." ) - .tqarg( keyWithWithoutURL ); + .arg( keyWithWithoutURL ); } else htmlStr += i18n( "Message was signed with unknown key." ); @@ -2663,10 +2663,10 @@ TQString ObjectTreeParser::writeSigstatHeader( PartMetaData & block, simpleHtmlStr += writeSimpleSigstatHeader( block ); if( !block.keyId.isEmpty() ) htmlStr += i18n( "Message was signed by %2 (Key ID: %1)." ) - .tqarg( keyWithWithoutURL, + .arg( keyWithWithoutURL, signer ); else - htmlStr += i18n( "Message was signed by %1." ).tqarg( signer ); + htmlStr += i18n( "Message was signed by %1." ).arg( signer ); htmlStr += "<br />"; switch( block.keyTrust ) @@ -2707,10 +2707,10 @@ TQString ObjectTreeParser::writeSigstatHeader( PartMetaData & block, simpleHtmlStr += writeSimpleSigstatHeader( block ); if( !block.keyId.isEmpty() ) htmlStr += i18n( "Message was signed by %2 (Key ID: %1)." ) - .tqarg( keyWithWithoutURL, + .arg( keyWithWithoutURL, signer ); else - htmlStr += i18n( "Message was signed by %1." ).tqarg( signer ); + htmlStr += i18n( "Message was signed by %1." ).arg( signer ); htmlStr += "<br />"; htmlStr += i18n("Warning: The signature is bad."); frame = "</td></tr>" @@ -2763,7 +2763,7 @@ void ObjectTreeParser::writeAttachmentMarkHeader( partNode *node ) if ( !mReader ) return; - htmlWriter()->queue( TQString( "<div id=\"attachmentDiv%1\">\n" ).tqarg( node->nodeId() ) ); + htmlWriter()->queue( TQString( "<div id=\"attachmentDiv%1\">\n" ).arg( node->nodeId() ) ); } //----------------------------------------------------------------------------- @@ -2798,7 +2798,7 @@ void ObjectTreeParser::writeBodyStr( const TQCString& aStr, const TQTextCodec *a bool isPgpMessage = false; // true if the message contains at least one // PGP MESSAGE or one PGP SIGNED MESSAGE block TQString dir = ( TQApplication::reverseLayout() ? "rtl" : "ltr" ); - TQString headerStr = TQString("<div dir=\"%1\">").tqarg(dir); + TQString headerStr = TQString("<div dir=\"%1\">").arg(dir); inlineSignatureState = KMMsgNotSigned; inlineEncryptionState = KMMsgNotEncrypted; @@ -2970,7 +2970,7 @@ TQString ObjectTreeParser::quotedHTML( const TQString& s, bool decorate ) const unsigned int length = s.length(); // skip leading empty lines - for ( pos = 0; pos < length && s.tqat(pos) <= TQChar(' '); pos++ ) { ; } + for ( pos = 0; pos < length && s.at(pos) <= TQChar(' '); pos++ ) { ; } while (pos > 0 && (s[pos-1] == ' ' || s[pos-1] == '\t')) pos--; beg = pos; @@ -3051,8 +3051,8 @@ TQString ObjectTreeParser::quotedHTML( const TQString& s, bool decorate ) htmlStr += "<div class=\"quotelevelmark\" >" ; htmlStr += TQString( "<a href=\"kmail:levelquote?%1 \">" "<img src=\"%2\" alt=\"\" title=\"\"/></a>" ) - .tqarg(-1) - .tqarg( mExpandIcon ); + .arg(-1) + .arg( mExpandIcon ); htmlStr += "</div><br/>"; htmlStr += quoteEnd; } @@ -3060,8 +3060,8 @@ TQString ObjectTreeParser::quotedHTML( const TQString& s, bool decorate ) htmlStr += "<div class=\"quotelevelmark\" >" ; htmlStr += TQString( "<a href=\"kmail:levelquote?%1 \">" "<img src=\"%2\" alt=\"\" title=\"\"/></a>" ) - .tqarg(actQuoteLevel) - .tqarg( mCollapseIcon); + .arg(actQuoteLevel) + .arg( mCollapseIcon); htmlStr += "</div>"; if ( actQuoteLevel < 3 ) htmlStr += quoteFontTag[actQuoteLevel]; @@ -3085,7 +3085,7 @@ TQString ObjectTreeParser::quotedHTML( const TQString& s, bool decorate ) // ignore ^M DOS linebreaks if( !line.replace('\015', "").isEmpty() ) { - htmlStr +=TQString( "<div dir=\"%1\">" ).tqarg( line.isRightToLeft() ? "rtl":"ltr" ); + htmlStr +=TQString( "<div dir=\"%1\">" ).arg( line.isRightToLeft() ? "rtl":"ltr" ); htmlStr += LinkLocator::convertToHtml( line, convertFlags ); htmlStr += TQString( "</div>" ); } diff --git a/kmail/objecttreeparser.h b/kmail/objecttreeparser.h index b864ea618..f9e71427a 100644 --- a/kmail/objecttreeparser.h +++ b/kmail/objecttreeparser.h @@ -169,13 +169,13 @@ namespace KMail { KMail::CSSHelper * cssHelper() const { return mCSSHelper; } /** Parse beginning at a given node and recursively parsing - the tqchildren of that node and it's next sibling. */ + the children of that node and it's next sibling. */ // Function is called internally by "parseMsg(KMMessage* msg)" // and it will be replaced once KMime is alive. void parseObjectTree( partNode * node ); private: - /** Standard tqchildren handling a.k.a. multipart/mixed (w/o + /** Standard children handling a.k.a. multipart/mixed (w/o kroupware hacks) */ void stdChildHandling( partNode * child ); diff --git a/kmail/partNode.cpp b/kmail/partNode.cpp index 29cdac078..705a0e2cc 100644 --- a/kmail/partNode.cpp +++ b/kmail/partNode.cpp @@ -209,7 +209,7 @@ void partNode::buildObjectTree( bool processSiblings ) && curNode->dwPart()->Next() ) ) { curNode = curNode->mRoot; } - // we might have to leave when all tqchildren have been processed + // we might have to leave when all children have been processed if( this == curNode && !processSiblings ) return; // store next node @@ -279,7 +279,7 @@ KMMsgEncryptionState partNode::overallEncryptionState() const { KMMsgEncryptionState myState = KMMsgEncryptionStateUnknown; if( mEncryptionState == KMMsgNotEncrypted ) { - // NOTE: tqchildren are tested ONLY when parent is not encrypted + // NOTE: children are tested ONLY when parent is not encrypted if( mChild ) myState = mChild->overallEncryptionState(); else @@ -320,7 +320,7 @@ KMMsgSignatureState partNode::overallSignatureState() const { KMMsgSignatureState myState = KMMsgSignatureStateUnknown; if( mSignatureState == KMMsgNotSigned ) { - // tqchildren are tested ONLY when parent is not signed + // children are tested ONLY when parent is not signed if( mChild ) myState = mChild->overallSignatureState(); else @@ -746,7 +746,7 @@ void partNode::setDisplayedHidden( bool displayedHidden ) TQString partNode::asHREF( const TQString &place ) const { - return TQString( "attachment:%1?place=%2" ).tqarg( nodeId() ).tqarg( place ); + return TQString( "attachment:%1?place=%2" ).arg( nodeId() ).arg( place ); } partNode::AttachmentDisplayInfo partNode::attachmentDisplayInfo() const diff --git a/kmail/partNode.h b/kmail/partNode.h index a043e1403..242223a31 100644 --- a/kmail/partNode.h +++ b/kmail/partNode.h @@ -150,10 +150,10 @@ public: return mEncryptionState; } - // look at the encryption states of all tqchildren and return result + // look at the encryption states of all children and return result KMMsgEncryptionState overallEncryptionState() const ; - // look at the signature states of all tqchildren and return result + // look at the signature states of all children and return result KMMsgSignatureState overallSignatureState() const ; void setSignatureState( KMMsgSignatureState state ) { diff --git a/kmail/partnodebodypart.cpp b/kmail/partnodebodypart.cpp index d7e6c95d0..45ce28620 100644 --- a/kmail/partnodebodypart.cpp +++ b/kmail/partnodebodypart.cpp @@ -49,8 +49,8 @@ TQString KMail::PartNodeBodyPart::makeLink( const TQString & path ) const { static const int utf8 = 106; // FIXME: use a PRNG for the first arg, instead of a serial number return TQString( "x-kmail:/bodypart/%1/%2/%3" ) - .tqarg( serial++ ).tqarg( mPartNode.nodeId() ) - .tqarg( KURL::encode_string_no_slash( path, utf8 ) ); + .arg( serial++ ).arg( mPartNode.nodeId() ) + .arg( KURL::encode_string_no_slash( path, utf8 ) ); } TQString KMail::PartNodeBodyPart::asText() const { diff --git a/kmail/popaccount.cpp b/kmail/popaccount.cpp index 15efb0e87..8caba1e44 100644 --- a/kmail/popaccount.cpp +++ b/kmail/popaccount.cpp @@ -167,7 +167,7 @@ void PopAccount::processNewMail(bool _interactive) } TQString seenUidList = locateLocal( "data", "kmail/" + mLogin + ":" + "@" + - mHost + ":" + TQString("%1").tqarg(mPort) ); + mHost + ":" + TQString("%1").arg(mPort) ); KConfig config( seenUidList ); TQStringList uidsOfSeenMsgs = config.readListEntry( "seenUidList" ); TQValueList<int> timeOfSeenMsgs = config.readIntListEntry( "seenUidTimeList" ); @@ -370,7 +370,7 @@ void PopAccount::startJob() if (!runPrecommand(precommand())) { KMessageBox::sorry(0, - i18n("Could not execute precommand: %1").tqarg(precommand()), + i18n("Could not execute precommand: %1").arg(precommand()), i18n("KMail Error Message")); checkDone( false, CheckError ); return; @@ -401,7 +401,7 @@ void PopAccount::startJob() mMailCheckProgressItem = KPIM::ProgressManager::createProgressItem( "MailCheck" + mName, escapedName, - i18n("Preparing transmission from \"%1\"...").tqarg( escapedName ), + i18n("Preparing transmission from \"%1\"...").arg( escapedName ), true, // can be canceled useSSL() || useTLS() ); connect( mMailCheckProgressItem, TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem* ) ), @@ -496,7 +496,7 @@ void PopAccount::slotJobFinished() { "the UIDL command: this command is required to determine, in a reliable way, " "which of the mails on the server KMail has already seen before;\n" "the feature to leave the mails on the server will therefore not " - "work properly.").tqarg(NetworkAccount::name()) ); + "work properly.").arg(NetworkAccount::name()) ); // An attempt to work around buggy pop servers, these seem to be popular. mUidsOfNextSeenMsgsDict = mUidsOfSeenMsgsDict; } @@ -747,21 +747,21 @@ void PopAccount::slotJobFinished() { if ( !idsOfMsgsToDelete.isEmpty() ) { stage = Dele; if ( mMailCheckProgressItem ) - mMailCheckProgressItem->seStatus( + mMailCheckProgressItem->setStatus( i18n( "Fetched 1 message from %1. Deleting messages from server...", "Fetched %n messages from %1. Deleting messages from server...", numMsgs ) - .tqarg( mHost ) ); + .arg( mHost ) ); url.setPath("/remove/" + idsOfMsgsToDelete.join(",")); kdDebug(5006) << "url: " << url.prettyURL() << endl; } else { stage = Quit; if ( mMailCheckProgressItem ) - mMailCheckProgressItem->seStatus( + mMailCheckProgressItem->setStatus( i18n( "Fetched 1 message from %1. Terminating transmission...", "Fetched %n messages from %1. Terminating transmission...", numMsgs ) - .tqarg( mHost ) ); + .arg( mHost ) ); url.setPath(TQString("/commit")); kdDebug(5006) << "url: " << url.prettyURL() << endl; } @@ -777,11 +777,11 @@ void PopAccount::slotJobFinished() { } idsOfMsgsToDelete.clear(); if ( mMailCheckProgressItem ) - mMailCheckProgressItem->seStatus( + mMailCheckProgressItem->setStatus( i18n( "Fetched 1 message from %1. Terminating transmission...", "Fetched %n messages from %1. Terminating transmission...", numMsgs ) - .tqarg( mHost ) ); + .arg( mHost ) ); KURL url = getUrl(); url.setPath(TQString("/commit")); job = KIO::get( url, false, false ); @@ -798,7 +798,7 @@ void PopAccount::slotJobFinished() { if( mMailCheckProgressItem ) { // do this only once... bool canceled = !kmkernel || kmkernel->mailCheckAborted() || mMailCheckProgressItem->canceled(); int numMessages = canceled ? indexOfCurrentMsg : idsOfMsgs.count(); - BroadcastStatus::instance()->seStatusMsgTransmissionCompleted( + BroadcastStatus::instance()->setStatusMsgTransmissionCompleted( this->name(), numMessages, numBytes, numBytesRead, numBytesToRead, mLeaveOnServer, mMailCheckProgressItem ); // set mMailCheckProgressItem = 0 before calling setComplete() to prevent // a race condition @@ -841,7 +841,7 @@ void PopAccount::saveUidList() seenUidTimeList.append( mTimeOfNextSeenMsgsMap[it.currentKey()] ); } TQString seenUidList = locateLocal( "data", "kmail/" + mLogin + ":" + "@" + - mHost + ":" + TQString("%1").tqarg(mPort) ); + mHost + ":" + TQString("%1").arg(mPort) ); KConfig config( seenUidList ); config.writeEntry( "seenUidList", uidsOfNextSeenMsgs ); config.writeEntry( "seenUidTimeList", seenUidTimeList ); @@ -867,7 +867,7 @@ void PopAccount::slotGetNextMsg() curMsgStrm = new TQDataStream( curMsgData, IO_WriteOnly ); curMsgLen = nextLen; ++indexOfCurrentMsg; - kdDebug(5006) << TQString("Length of message about to get %1").tqarg( nextLen ) << endl; + kdDebug(5006) << TQString("Length of message about to get %1").arg( nextLen ) << endl; mMsgsPendingDownload.remove( next.key() ); } } @@ -904,16 +904,16 @@ void PopAccount::slotData( KIO::Job* job, const TQByteArray &data) { msg = i18n("Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 " "(%7 KB remain on the server).") - .tqarg(indexOfCurrentMsg+1).tqarg(numMsgs).tqarg(numBytesRead/1024) - .tqarg(numBytesToRead/1024).tqarg(mLogin).tqarg(mHost).tqarg(numBytes/1024); + .arg(indexOfCurrentMsg+1).arg(numMsgs).arg(numBytesRead/1024) + .arg(numBytesToRead/1024).arg(mLogin).arg(mHost).arg(numBytes/1024); } else { msg = i18n("Fetching message %1 of %2 (%3 of %4 KB) for %5@%6.") - .tqarg(indexOfCurrentMsg+1).tqarg(numMsgs).tqarg(numBytesRead/1024) - .tqarg(numBytesToRead/1024).tqarg(mLogin).tqarg(mHost); + .arg(indexOfCurrentMsg+1).arg(numMsgs).arg(numBytesRead/1024) + .arg(numBytesToRead/1024).arg(mLogin).arg(mHost); } - mMailCheckProgressItem->seStatus( msg ); + mMailCheckProgressItem->setStatus( msg ); mMailCheckProgressItem->setProgress( (numBytesToRead <= 100) ? 50 // We never know what the server tells us // This way of dividing is required for > 21MB of mail diff --git a/kmail/quotajobs.h b/kmail/quotajobs.h index 58b2af575..e53a4f18e 100644 --- a/kmail/quotajobs.h +++ b/kmail/quotajobs.h @@ -73,8 +73,8 @@ class QuotaInfo { if ( isValid() && !isEmpty() ) { readConfig(); int factor = static_cast<int> ( pow( 1000, mFactor ) ); - return i18n("%1 of %2 %3 used").tqarg( mCurrent.toInt() / factor ) - .tqarg( mMax.toInt() / factor ).tqarg( mUnits ); + return i18n("%1 of %2 %3 used").arg( mCurrent.toInt() / factor ) + .arg( mMax.toInt() / factor ).arg( mUnits ); } return TQString(); } diff --git a/kmail/recipientseditor.cpp b/kmail/recipientseditor.cpp index 1b39cee80..6b6b6819a 100644 --- a/kmail/recipientseditor.cpp +++ b/kmail/recipientseditor.cpp @@ -742,9 +742,9 @@ void RecipientsToolTip::maybeTip( const TQPoint & p ) text.append( "</qt>" ); - TQRect tqgeometry( p + TQPoint( 2, 2 ), TQPoint( 400, 100 ) ); + TQRect geometry( p + TQPoint( 2, 2 ), TQPoint( 400, 100 ) ); - tip( TQRect( p.x() - 20, p.y() - 20, 40, 40 ), text, tqgeometry ); + tip( TQRect( p.x() - 20, p.y() - 20, 40, 40 ), text, geometry ); } @@ -915,8 +915,8 @@ void RecipientsEditor::setRecipientString( const TQString &str, if ( count++ > GlobalSettings::self()->maximumRecipients() ) { KMessageBox::sorry( this, i18n("Truncating recipients list to %1 of %2 entries.") - .tqarg( GlobalSettings::self()->maximumRecipients() ) - .tqarg( r.count() ) ); + .arg( GlobalSettings::self()->maximumRecipients() ) + .arg( r.count() ) ); break; } addRecipient( *it, type ); diff --git a/kmail/recipientspicker.cpp b/kmail/recipientspicker.cpp index dcf43f794..60ffffbef 100644 --- a/kmail/recipientspicker.cpp +++ b/kmail/recipientspicker.cpp @@ -783,7 +783,7 @@ void RecipientsPicker::pick( Recipient::Type type ) "recipients is %1. Please adapt the selection.", "You selected %n recipients. The maximum supported number of " "recipients is %1. Please adapt the selection.", count) - .tqarg( GlobalSettings::self()->maximumRecipients() ) ); + .arg( GlobalSettings::self()->maximumRecipients() ) ); return; } diff --git a/kmail/renamejob.cpp b/kmail/renamejob.cpp index ed8aa5cb7..7715c5871 100644 --- a/kmail/renamejob.cpp +++ b/kmail/renamejob.cpp @@ -220,7 +220,7 @@ void RenameJob::folderCopyComplete(bool success) config->writeEntry( it.key(), it.data() ); } mNewFolder->readConfig( config ); - // make sure the tqchildren state is correct + // make sure the children state is correct if ( mNewFolder->child() && ( mNewFolder->storage()->hasChildren() == FolderStorage::HasNoChildren ) ) mNewFolder->storage()->updateChildrenState(); diff --git a/kmail/rulewidgethandlermanager.cpp b/kmail/rulewidgethandlermanager.cpp index 4dc7eb6bf..fd5c811fa 100644 --- a/kmail/rulewidgethandlermanager.cpp +++ b/kmail/rulewidgethandlermanager.cpp @@ -228,7 +228,7 @@ void KMail::RuleWidgetHandlerManager::unregisterHandler( const RuleWidgetHandler } namespace { - /** Returns the number of immediate tqchildren of parent with the given object + /** Returns the number of immediate children of parent with the given object name. Used by RuleWidgetHandlerManager::createWidgets(). */ int childCount( const TQObject *parent, const char *objName ) diff --git a/kmail/searchjob.cpp b/kmail/searchjob.cpp index 1a979d4f9..154bfdfe7 100644 --- a/kmail/searchjob.cpp +++ b/kmail/searchjob.cpp @@ -252,7 +252,7 @@ void SearchJob::slotSearchFolder() // so we need to download all messages and check TQString question = i18n("To execute your search all messages of the folder %1 " "have to be downloaded from the server. This may take some time. " - "Do you want to continue your search?").tqarg( mFolder->label() ); + "Do you want to continue your search?").arg( mFolder->label() ); if ( KMessageBox::warningContinueCancel( 0, question, i18n("Continue Search"), i18n("&Search"), "continuedownloadingforsearch" ) != KMessageBox::Continue ) @@ -267,7 +267,7 @@ void SearchJob::slotSearchFolder() mProgress = ProgressManager::createProgressItem( "ImapSearchDownload" + ProgressManager::getUniqueID(), i18n("Downloading emails from IMAP server"), - i18n( "URL: %1" ).tqarg( TQStyleSheet::escape( mFolder->folder()->prettyURL() ) ), + i18n( "URL: %1" ).arg( TQStyleSheet::escape( mFolder->folder()->prettyURL() ) ), true, mAccount->useSSL() || mAccount->useTLS() ); mProgress->setTotalItems( numMsgs ); diff --git a/kmail/searchwindow.cpp b/kmail/searchwindow.cpp index 1a5da2688..eac720214 100644 --- a/kmail/searchwindow.cpp +++ b/kmail/searchwindow.cpp @@ -418,17 +418,17 @@ void SearchWindow::updStatus(void) if(!mStopped) { genMsg = i18n("Done."); detailMsg = i18n("%n match in %1", "%n matches in %1", - numMatches).tqarg(procMsg); + numMatches).arg(procMsg); } else { genMsg = i18n("Search canceled."); detailMsg = i18n("%n match so far in %1", "%n matches so far in %1", - numMatches).tqarg(procMsg); + numMatches).arg(procMsg); } } else { procMsg = i18n("%n message", "%n messages", numProcessed); genMsg = i18n("%n match", "%n matches", numMatches); detailMsg = i18n("Searching in %1. %2 searched so far") - .tqarg(folderName).tqarg(procMsg); + .arg(folderName).arg(procMsg); } mStatusBar->changeItem(genMsg, 0); @@ -497,7 +497,7 @@ void SearchWindow::slotSearch() while ((folder = mgr->find(fullName))) { if (folder->storage()->inherits("KMFolderSearch")) break; - fullName = TQString("%1 %2").tqarg(baseName).tqarg(++count); + fullName = TQString("%1 %2").arg(baseName).arg(++count); } if (!folder) diff --git a/kmail/sievedebugdialog.cpp b/kmail/sievedebugdialog.cpp index 1d33e2aac..bc5d2cca0 100644 --- a/kmail/sievedebugdialog.cpp +++ b/kmail/sievedebugdialog.cpp @@ -253,7 +253,7 @@ void SieveDebugDialog::slotDiagNextAccount() KMAccount *acc = mAccountList.first(); mAccountList.pop_front(); - mEdit->append( i18n( "Collecting data for account '%1'...\n" ).tqarg( acc->name() ) ); + mEdit->append( i18n( "Collecting data for account '%1'...\n" ).arg( acc->name() ) ); mEdit->append( i18n( "------------------------------------------------------------\n" ) ); mAccountBase = dynamic_cast<KMail::ImapAccountBase *>( acc ); if ( mAccountBase ) @@ -295,7 +295,7 @@ void SieveDebugDialog::slotDiagNextScript() TQString scriptFile = mScriptList.first(); mScriptList.pop_front(); - mEdit->append( i18n( "Contents of script '%1':\n" ).tqarg( scriptFile ) ); + mEdit->append( i18n( "Contents of script '%1':\n" ).arg( scriptFile ) ); mUrl = urlFromAccount( mAccountBase ); mUrl.setFileName( scriptFile ); @@ -324,7 +324,7 @@ void SieveDebugDialog::slotGetScript( SieveJob * /* job */, bool success, mEdit->append( i18n( "------------------------------------------------------------\n" "%1\n" - "------------------------------------------------------------\n\n" ).tqarg( script ) ); + "------------------------------------------------------------\n\n" ).arg( script ) ); } // Fetch next script @@ -363,7 +363,7 @@ void SieveDebugDialog::slotGetScriptList( SieveJob *job, bool success, for ( TQStringList::const_iterator it = scriptList.begin(); it != scriptList.end(); ++it ) mEdit->append( "* " + *it + "\n" ); mEdit->append( "\n" ); - mEdit->append( i18n( "Active script: %1\n\n" ).tqarg( activeScript ) ); + mEdit->append( i18n( "Active script: %1\n\n" ).arg( activeScript ) ); } // Handle next job: dump scripts for this server diff --git a/kmail/snippetdlgbase.ui b/kmail/snippetdlgbase.ui index 429b598b9..f49212ad9 100644 --- a/kmail/snippetdlgbase.ui +++ b/kmail/snippetdlgbase.ui @@ -110,7 +110,7 @@ <property name="text"> <string>&Snippet:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop</set> </property> <property name="buddy" stdset="0"> diff --git a/kmail/snippetwidget.cpp b/kmail/snippetwidget.cpp index afa610df8..2c81c6d28 100644 --- a/kmail/snippetwidget.cpp +++ b/kmail/snippetwidget.cpp @@ -145,7 +145,7 @@ void SnippetWidget::slotAdd() SnippetItem* SnippetWidget::makeItem( SnippetItem* parent, const TQString& name, const TQString& text, const KShortcut& shortcut ) { SnippetItem * item = new SnippetItem(parent, name, text); - const TQString actionName = i18n("Snippet %1").tqarg(name); + const TQString actionName = i18n("Snippet %1").arg(name); const TQString normalizedName = TQString(actionName).replace(" ", "_"); if ( !mActionCollection->action(normalizedName.utf8().data() ) ) { KAction * action = new KAction( actionName, shortcut, item, @@ -352,8 +352,8 @@ void SnippetWidget::writeConfig() SnippetGroup * group = dynamic_cast<SnippetGroup*>(item); if (group) { //kdDebug(5006) << "-->GROUP " << item->getName() << group->getId() << " " << iGroupCount<< endl; - strKeyName=TQString("snippetGroupName_%1").tqarg(iGroupCount); - strKeyId=TQString("snippetGroupId_%1").tqarg(iGroupCount); + strKeyName=TQString("snippetGroupName_%1").arg(iGroupCount); + strKeyId=TQString("snippetGroupId_%1").arg(iGroupCount); _cfg->writeEntry(strKeyName, group->getName()); _cfg->writeEntry(strKeyId, group->getId()); @@ -361,9 +361,9 @@ void SnippetWidget::writeConfig() iGroupCount++; } else if (dynamic_cast<SnippetItem*>(item)) { //kdDebug(5006) << "-->ITEM " << item->getName() << item->getParent() << " " << iSnipCount << endl; - strKeyName=TQString("snippetName_%1").tqarg(iSnipCount); - strKeyText=TQString("snippetText_%1").tqarg(iSnipCount); - strKeyId=TQString("snippetParent_%1").tqarg(iSnipCount); + strKeyName=TQString("snippetName_%1").arg(iSnipCount); + strKeyText=TQString("snippetText_%1").arg(iSnipCount); + strKeyId=TQString("snippetParent_%1").arg(iSnipCount); _cfg->writeEntry(strKeyName, item->getName()); _cfg->writeEntry(strKeyText, item->getText()); @@ -373,7 +373,7 @@ void SnippetWidget::writeConfig() assert( action ); const KShortcut& sc = action->shortcut(); if (!sc.isNull() ) { - _cfg->writeEntry( TQString("snippetShortcut_%1").tqarg(iSnipCount), sc.toString() ); + _cfg->writeEntry( TQString("snippetShortcut_%1").arg(iSnipCount), sc.toString() ); } iSnipCount++; } else { @@ -389,8 +389,8 @@ void SnippetWidget::writeConfig() for ( it = _mapSaved.begin(); it != _mapSaved.end(); ++it ) { //write the saved variable values if (it.data().length()<=0) continue; //is the saved value has no length -> no need to save it - strKeyName=TQString("snippetSavedName_%1").tqarg(iCount); - strKeyText=TQString("snippetSavedVal_%1").tqarg(iCount); + strKeyName=TQString("snippetSavedName_%1").arg(iCount); + strKeyText=TQString("snippetSavedVal_%1").arg(iCount); _cfg->writeEntry(strKeyName, it.key()); _cfg->writeEntry(strKeyText, it.data()); @@ -434,8 +434,8 @@ void SnippetWidget::initConfig() int iCount = _cfg->readNumEntry("snippetGroupCount", -1); for ( int i=0; i<iCount; i++) { //read the group-list - strKeyName=TQString("snippetGroupName_%1").tqarg(i); - strKeyId=TQString("snippetGroupId_%1").tqarg(i); + strKeyName=TQString("snippetGroupName_%1").arg(i); + strKeyId=TQString("snippetGroupId_%1").arg(i); TQString strNameVal=""; int iIdVal=-1; @@ -460,9 +460,9 @@ void SnippetWidget::initConfig() if (iCount != -1) { iCount = _cfg->readNumEntry("snippetCount", 0); for ( int i=0; i<iCount; i++) { //read the snippet-list - strKeyName=TQString("snippetName_%1").tqarg(i); - strKeyText=TQString("snippetText_%1").tqarg(i); - strKeyId=TQString("snippetParent_%1").tqarg(i); + strKeyName=TQString("snippetName_%1").arg(i); + strKeyText=TQString("snippetText_%1").arg(i); + strKeyId=TQString("snippetParent_%1").arg(i); TQString strNameVal=""; TQString strTextVal=""; @@ -474,7 +474,7 @@ void SnippetWidget::initConfig() //kdDebug(5006) << "Read item " << strNameVal << " " << iParentVal << endl; if (strNameVal != "" && strTextVal != "" && iParentVal != -1) { - KShortcut shortcut( _cfg->readEntry( TQString("snippetShortcut_%1").tqarg(i), TQString() ) ); + KShortcut shortcut( _cfg->readEntry( TQString("snippetShortcut_%1").arg(i), TQString() ) ); item = makeItem( SnippetItem::findGroupById(iParentVal, _list), strNameVal, strTextVal, shortcut ); //kdDebug(5006) << "Created item " << item->getName() << " " << item->getParent() << endl; _list.append(item); @@ -487,8 +487,8 @@ void SnippetWidget::initConfig() iCount = _cfg->readNumEntry("snippetSavedCount", 0); for ( int i=1; i<=iCount; i++) { //read the saved-values and store in TQMap - strKeyName=TQString("snippetSavedName_%1").tqarg(i); - strKeyText=TQString("snippetSavedVal_%1").tqarg(i); + strKeyName=TQString("snippetSavedName_%1").arg(i); + strKeyText=TQString("snippetSavedVal_%1").arg(i); TQString strNameVal=""; TQString strTextVal=""; @@ -586,7 +586,7 @@ TQString SnippetWidget::parseText(TQString text, TQString del) if ( strName != del+del ) { //if not doubel-delimiter if (iInMeth == 0) { //if input-method "single" is selected if ( mapVar[strName].length() <= 0 ) { // and not already in map - strMsg=i18n("Please enter the value for <b>%1</b>:").tqarg(strName); + strMsg=i18n("Please enter the value for <b>%1</b>:").arg(strName); strNew = showSingleVarDialog( strName, &_mapSaved, rSingle ); if (strNew=="") return ""; //user clicked Cancle @@ -729,7 +729,7 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ bool bReturn = false; //resize the textedits if (iWidth > 1) { - TQRect r = dlg.tqgeometry(); + TQRect r = dlg.geometry(); r.setHeight(iBasicHeight + iOneHeight*mapVar2Te.count()); r.setWidth(iWidth); dlg.setGeometry(r); @@ -750,9 +750,9 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ } bReturn = true; - iBasicHeight = dlg.tqgeometry().height() - layoutVar->tqgeometry().height(); - iOneHeight = layoutVar->tqgeometry().height() / mapVar2Te.count(); - iWidth = dlg.tqgeometry().width(); + iBasicHeight = dlg.geometry().height() - layoutVar->geometry().height(); + iOneHeight = layoutVar->geometry().height() / mapVar2Te.count(); + iWidth = dlg.geometry().width(); } //do some cleanup @@ -799,7 +799,7 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri labTop = new TQLabel( &dlg, "label" ); layoutTop->addWidget(labTop, 0, 0); - labTop->setText(i18n("Enter the replacement values for %1:").tqarg( var )); + labTop->setText(i18n("Enter the replacement values for %1:").arg( var )); tqlayout->addMultiCellLayout( layoutTop, 0, 0, 0, 1 ); @@ -849,7 +849,7 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri strReturn = te->text(); //copy the entered values back the the given map - dlgSize = dlg.tqgeometry(); + dlgSize = dlg.geometry(); } //do some cleanup diff --git a/kmail/subscriptiondialog.cpp b/kmail/subscriptiondialog.cpp index 5b9fbf7ee..992ce2c48 100644 --- a/kmail/subscriptiondialog.cpp +++ b/kmail/subscriptiondialog.cpp @@ -374,7 +374,7 @@ void SubscriptionDialog::doSave() if( !a->onlySubscribedFolders() ) { int result = KMessageBox::questionYesNoCancel( this, i18n("Currently subscriptions are not used for server. %1\nDo you want to enable subscriptions?") - .tqarg( a->name() ), + .arg( a->name() ), i18n("Enable Subscriptions?"), i18n("Enable"), i18n("Do Not Enable")); switch(result) { case KMessageBox::Yes: @@ -414,7 +414,7 @@ void SubscriptionDialog::processItems() uint done = 0; for (uint i = mCount; i < mFolderNames.count(); ++i) { - // give the dialog a chance to tqrepaint + // give the dialog a chance to repaint if (done == 1000) { emit listChanged(); diff --git a/kmail/templateparser.cpp b/kmail/templateparser.cpp index f3d48fecc..2feebf4e1 100644 --- a/kmail/templateparser.cpp +++ b/kmail/templateparser.cpp @@ -261,7 +261,7 @@ void TemplateParser::processWithTemplate( const TQString &tmpl ) } else if ( mDebug ) { KMessageBox::error( 0, i18n( "Cannot insert content from file %1: %2" ). - tqarg( path ).tqarg( file.errorString() ) ); + arg( path ).arg( file.errorString() ) ); } } else if ( cmd.startsWith( "SYSTEM=" ) ) { @@ -294,7 +294,7 @@ void TemplateParser::processWithTemplate( const TQString &tmpl ) } else if ( mDebug ) { KMessageBox::error( 0, i18n( "Cannot insert content from file %1: %2"). - tqarg( path ).tqarg(file.errorString() )); + arg( path ).arg(file.errorString() )); } } else if ( cmd.startsWith( "QUOTEPIPE=" ) ) { @@ -396,7 +396,7 @@ void TemplateParser::processWithTemplate( const TQString &tmpl ) kdDebug() << "Command: OTEXTSIZE" << endl; i += strlen( "OTEXTSIZE" ); if ( mOrigMsg ) { - TQString str = TQString( "%1" ).tqarg( mOrigMsg->body().length() ); + TQString str = TQString( "%1" ).arg( mOrigMsg->body().length() ); body.append( str ); } @@ -967,7 +967,7 @@ void TemplateParser::addProcessedBodyToMessage( const TQString &body ) DwParameter *nameParameter = new DwParameter; nameParameter->SetAttribute( "name" ); nameParameter->SetValue( Util::dwString( KMMsgBase::encodeRFC2231StringAutoDetectCharset( - i18n( "Attachment %1" ).tqarg( attachmentNumber ) ) ) ); + i18n( "Attachment %1" ).arg( attachmentNumber ) ) ) ); ct.AddParameter( nameParameter ); } } @@ -1059,7 +1059,7 @@ TQString TemplateParser::findTemplate() TQString iid; if ( mIdentity ) { - iid = TQString("IDENTITY_%1").tqarg( mIdentity ); // templates ID for that identity + iid = TQString("IDENTITY_%1").arg( mIdentity ); // templates ID for that identity } else { iid = "IDENTITY_NO_IDENTITY"; // templates ID for no identity @@ -1148,11 +1148,11 @@ TQString TemplateParser::pipe( const TQString &cmd, const TQString &buf ) if ( mPipeErr.isEmpty() ) { KMessageBox::error( 0, i18n( "Pipe command exit with status %1: %2"). - tqarg( mPipeRc ).tqarg( cmd ) ); + arg( mPipeRc ).arg( cmd ) ); } else { KMessageBox::detailedError( 0, i18n( "Pipe command exit with status %1: %2" ). - tqarg( mPipeRc ).tqarg( cmd ), mPipeErr ); + arg( mPipeRc ).arg( cmd ), mPipeErr ); } } @@ -1163,11 +1163,11 @@ TQString TemplateParser::pipe( const TQString &cmd, const TQString &buf ) if ( mPipeErr.isEmpty() ) { KMessageBox::error( 0, i18n( "Pipe command killed by signal %1: %2" ). - tqarg( -(mPipeRc) ).tqarg( cmd ) ); + arg( -(mPipeRc) ).arg( cmd ) ); } else { KMessageBox::detailedError( 0, i18n( "Pipe command killed by signal %1: %2" ). - tqarg( -(mPipeRc) ).tqarg( cmd ), mPipeErr ); + arg( -(mPipeRc) ).arg( cmd ), mPipeErr ); } } } @@ -1179,7 +1179,7 @@ TQString TemplateParser::pipe( const TQString &cmd, const TQString &buf ) if ( mDebug ) { KMessageBox::error( 0, i18n( "Pipe command did not finish within %1 seconds: %2" ). - tqarg( PipeTimeout ).tqarg( cmd ) ); + arg( PipeTimeout ).arg( cmd ) ); } } @@ -1190,11 +1190,11 @@ TQString TemplateParser::pipe( const TQString &cmd, const TQString &buf ) if ( mDebug ) { if ( mPipeErr.isEmpty() ) { KMessageBox::error( 0, - i18n( "Cannot write to process stdin: %1" ).tqarg( cmd ) ); + i18n( "Cannot write to process stdin: %1" ).arg( cmd ) ); } else { KMessageBox::detailedError( 0, i18n( "Cannot write to process stdin: %1" ). - tqarg( cmd ), mPipeErr ); + arg( cmd ), mPipeErr ); } } } @@ -1202,7 +1202,7 @@ TQString TemplateParser::pipe( const TQString &cmd, const TQString &buf ) } else if ( mDebug ) { KMessageBox::error( 0, i18n( "Cannot start pipe command from template: %1" ). - tqarg( cmd ) ); + arg( cmd ) ); } return mPipeOut; diff --git a/kmail/templatesconfiguration.cpp b/kmail/templatesconfiguration.cpp index 6f39a29c0..8b4f37e8f 100644 --- a/kmail/templatesconfiguration.cpp +++ b/kmail/templatesconfiguration.cpp @@ -102,7 +102,7 @@ TemplatesConfiguration::TemplatesConfiguration( TQWidget *parent, const char *na "if they are specified.</p>" "</qt>" ); } - mHelp->setText( i18n( "<a href=\"whatsthis:%1\">How does this work?</a>" ).tqarg( help ) ); + mHelp->setText( i18n( "<a href=\"whatsthis:%1\">How does this work?</a>" ).arg( help ) ); } void TemplatesConfiguration::slotTextChanged() @@ -163,7 +163,7 @@ void TemplatesConfiguration::saveToGlobal() void TemplatesConfiguration::loadFromIdentity( uint id ) { - Templates t( TQString("IDENTITY_%1").tqarg( id ) ); + Templates t( TQString("IDENTITY_%1").arg( id ) ); TQString str; @@ -215,7 +215,7 @@ void TemplatesConfiguration::loadFromIdentity( uint id ) void TemplatesConfiguration::saveToIdentity( uint id ) { - Templates t( TQString("IDENTITY_%1").tqarg( id ) ); + Templates t( TQString("IDENTITY_%1").arg( id ) ); t.setTemplateNewMessage( strOrBlank( textEdit_new->text() ) ); t.setTemplateReply( strOrBlank( textEdit_reply->text() ) ); @@ -231,7 +231,7 @@ void TemplatesConfiguration::loadFromFolder( TQString id, uint identity ) Templates* tid = 0; if ( identity ) { - tid = new Templates( TQString("IDENTITY_%1").tqarg( identity ) ); + tid = new Templates( TQString("IDENTITY_%1").arg( identity ) ); } TQString str; @@ -344,7 +344,7 @@ void TemplatesConfiguration::loadFromPhrases() "---------- %1 ----------\n" "%TEXT\n" "-------------------------------------------------------\n" - ) ).tqarg( convertPhrases( str ) ) ); + ) ).arg( convertPhrases( str ) ) ); } else { textEdit_forward->setText( defaultForward() ); @@ -400,7 +400,7 @@ void TemplatesConfiguration::importFromPhrases() "\n" "%TEXT\n" "-------------------------------------------------------\n" - ) ).tqarg( convertPhrases( str ) ) ); + ) ).arg( convertPhrases( str ) ) ); } else { GlobalSettings::self()->setTemplateForward( defaultForward() ); diff --git a/kmail/templatesconfiguration_base.ui b/kmail/templatesconfiguration_base.ui index a6419987f..fb45fd023 100644 --- a/kmail/templatesconfiguration_base.ui +++ b/kmail/templatesconfiguration_base.ui @@ -284,7 +284,7 @@ <property name="text"> <string>&Quote indicator:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> diff --git a/kmail/urlhandlermanager.cpp b/kmail/urlhandlermanager.cpp index 7b88c0291..ad9c22eb2 100644 --- a/kmail/urlhandlermanager.cpp +++ b/kmail/urlhandlermanager.cpp @@ -561,7 +561,7 @@ namespace { TQString displayName, libName, keyId; if ( !foundSMIMEData( url.path() + '#' + url.ref(), displayName, libName, keyId ) ) return TQString(); - return i18n("Show certificate 0x%1").tqarg( keyId ); + return i18n("Show certificate 0x%1").arg( keyId ); } } @@ -689,8 +689,8 @@ namespace { if ( name.isEmpty() ) name = msgPart.name(); if ( !name.isEmpty() ) - return i18n( "Attachment: %1" ).tqarg( name ); - return i18n( "Attachment #%1 (unnamed)" ).tqarg( KMReaderWin::msgPartFromUrl( url ) ); + return i18n( "Attachment: %1" ).arg( name ); + return i18n( "Attachment #%1 (unnamed)" ).arg( KMReaderWin::msgPartFromUrl( url ) ); } } diff --git a/kmail/util.cpp b/kmail/util.cpp index d153e9d37..bbf15ba56 100644 --- a/kmail/util.cpp +++ b/kmail/util.cpp @@ -146,7 +146,7 @@ void KMail::Util::append( TQByteArray& that, const TQByteArray& str ) that.detach(); uint len1 = that.size(); uint len2 = str.size(); - if ( that.tqresize( len1 + len2, TQGArray::SpeedOptim ) ) + if ( that.resize( len1 + len2, TQGArray::SpeedOptim ) ) memcpy( that.data() + len1, str.data(), len2 ); } @@ -157,7 +157,7 @@ void KMail::Util::append( TQByteArray& that, const char* str ) that.detach(); uint len1 = that.size(); uint len2 = tqstrlen(str); - if ( that.tqresize( len1 + len2, TQGArray::SpeedOptim ) ) + if ( that.resize( len1 + len2, TQGArray::SpeedOptim ) ) memcpy( that.data() + len1, str, len2 ); } @@ -166,7 +166,7 @@ void KMail::Util::append( TQByteArray& that, const TQCString& str ) that.detach(); uint len1 = that.size(); uint len2 = str.size() - 1; - if ( that.tqresize( len1 + len2, TQGArray::SpeedOptim ) ) + if ( that.resize( len1 + len2, TQGArray::SpeedOptim ) ) memcpy( that.data() + len1, str.data(), len2 ); } @@ -180,13 +180,13 @@ void KMail::Util::insert( TQByteArray& that, uint index, const char* s ) int nlen = olen + len; if ( index >= olen ) { // insert after end of string that.detach(); - if ( that.tqresize(nlen+index-olen, TQGArray::SpeedOptim ) ) { + if ( that.resize(nlen+index-olen, TQGArray::SpeedOptim ) ) { memset( that.data()+olen, ' ', index-olen ); memcpy( that.data()+index, s, len ); } } else { that.detach(); - if ( that.tqresize(nlen, TQGArray::SpeedOptim ) ) { // normal insert + if ( that.resize(nlen, TQGArray::SpeedOptim ) ) { // normal insert memmove( that.data()+index+len, that.data()+index, olen-index ); memcpy( that.data()+index, s, len ); } diff --git a/kmail/util.h b/kmail/util.h index 0d1e263f7..9f291a2e0 100644 --- a/kmail/util.h +++ b/kmail/util.h @@ -206,7 +206,7 @@ namespace Util { KMessageBox::warningContinueCancel( w, i18n( "A file named \"%1\" already exists. " - "Are you sure you want to overwrite it?" ).tqarg( url.prettyURL() ), + "Are you sure you want to overwrite it?" ).arg( url.prettyURL() ), i18n( "Overwrite File?" ), i18n( "&Overwrite" ) ) ) return false; diff --git a/kmail/vacation.cpp b/kmail/vacation.cpp index 7011185d5..d3d374aea 100644 --- a/kmail/vacation.cpp +++ b/kmail/vacation.cpp @@ -475,12 +475,12 @@ namespace KMail { " { keep; stop; }\n" ); // FIXME? if ( !domain.isEmpty() ) // FIXME - script += TQString::fromLatin1( "if not address :domain :contains \"from\" \"%1\" { keep; stop; }\n" ).tqarg( domain ); + script += TQString::fromLatin1( "if not address :domain :contains \"from\" \"%1\" { keep; stop; }\n" ).arg( domain ); script += "vacation "; script += addressesArgument; if ( notificationInterval > 0 ) - script += TQString::fromLatin1(":days %1 ").tqarg( notificationInterval ); + script += TQString::fromLatin1(":days %1 ").arg( notificationInterval ); script += TQString::fromLatin1("text:\n"); script += dotstuff( messageText.isEmpty() ? defaultMessageText() : messageText ); script += TQString::fromLatin1( "\n.\n;\n" ); @@ -573,7 +573,7 @@ namespace KMail { "\n" "Yours sincerely,\n" "-- <enter your name and email address here>\n") - .tqarg( KGlobal::locale()->formatDate( TQDate::currentDate().addDays( 1 ) ) ); + .arg( KGlobal::locale()->formatDate( TQDate::currentDate().addDays( 1 ) ) ); } int Vacation::defaultNotificationInterval() { diff --git a/kmail/warningconfiguration.ui b/kmail/warningconfiguration.ui index 12d1c405f..f16a157be 100644 --- a/kmail/warningconfiguration.ui +++ b/kmail/warningconfiguration.ui @@ -103,7 +103,7 @@ It is recommended to leave this option turned on for maximum security. <property name="text"> <string>For signing</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> @@ -114,7 +114,7 @@ It is recommended to leave this option turned on for maximum security. <property name="text"> <string>For encryption</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> diff --git a/kmail/xfaceconfigurator.cpp b/kmail/xfaceconfigurator.cpp index afd9f5fe6..d329ef362 100644 --- a/kmail/xfaceconfigurator.cpp +++ b/kmail/xfaceconfigurator.cpp @@ -147,7 +147,7 @@ namespace KMail { mFromFileBtn = new TQPushButton( i18n("Select File..."), page ); TQWhatsThis::add( mFromFileBtn, i18n("Use this to select an image file to create the picture from. " - "The image should be of high contrast and nearly quadratic tqshape. " + "The image should be of high contrast and nearly quadratic shape. " "A light background helps improve the result." ) ); mFromFileBtn->setAutoDefault( false ); page_vlay->addWidget( mFromFileBtn, 1 ); diff --git a/kmailcvt/filter_evolution.cxx b/kmailcvt/filter_evolution.cxx index 713a1bf70..900b134bd 100644 --- a/kmailcvt/filter_evolution.cxx +++ b/kmailcvt/filter_evolution.cxx @@ -73,7 +73,7 @@ void FilterEvolution::import(FilterInfo *info) info->setOverall((int) ((float) currentDir / numSubDirs * 100)); } } - info->addLog( i18n("Finished importing emails from %1").tqarg( mailDir )); + info->addLog( i18n("Finished importing emails from %1").arg( mailDir )); info->setCurrent(100); info->setOverall(100); } @@ -121,7 +121,7 @@ void FilterEvolution::importMBox(FilterInfo *info, const TQString& mboxName, con bool first_msg = true; TQString tmp_from = mboxName; if (!mbox.open(IO_ReadOnly)) { - info->alert(i18n("Unable to open %1, skipping").tqarg(mboxName)); + info->alert(i18n("Unable to open %1, skipping").arg(mboxName)); } else { TQFileInfo filenameInfo(mboxName); @@ -142,7 +142,7 @@ void FilterEvolution::importMBox(FilterInfo *info, const TQString& mboxName, con } else info->setTo(targetDir); - info->addLog(i18n("Importing emails from %1...").tqarg(tmp_from)); + info->addLog(i18n("Importing emails from %1...").arg(tmp_from)); TQByteArray input(MAX_LINE); long l = 0; diff --git a/kmailcvt/filter_evolution_v2.cxx b/kmailcvt/filter_evolution_v2.cxx index e80d7a84a..d60953195 100644 --- a/kmailcvt/filter_evolution_v2.cxx +++ b/kmailcvt/filter_evolution_v2.cxx @@ -87,7 +87,7 @@ void FilterEvolution_v2::import(FilterInfo *info) /** import last but not least all archives from the root-dir */ importDirContents(info, true, mailDir, TQString(), TQString()); - info->addLog( i18n("Finished importing emails from %1").tqarg( mailDir )); + info->addLog( i18n("Finished importing emails from %1").arg( mailDir )); if(count_duplicates > 0) { info->addLog( i18n("1 duplicate message not imported", "%n duplicate messages not imported", count_duplicates)); } @@ -121,7 +121,7 @@ void FilterEvolution_v2::importDirContents(FilterInfo *info, bool root, if (temp_mailfile.endsWith(".cmeta") || temp_mailfile.endsWith(".ev-summary") || temp_mailfile.endsWith(".ev-summary-meta") || temp_mailfile.endsWith(".ibex.index") || temp_mailfile.endsWith(".ibex.index.data") ) {} else { - info->addLog( i18n("Start import file %1...").tqarg( temp_mailfile ) ); + info->addLog( i18n("Start import file %1...").arg( temp_mailfile ) ); if (!root) importMBox(info, (dirName + "/" + temp_mailfile) , KMailRootDir, KMailSubDir); else @@ -157,7 +157,7 @@ void FilterEvolution_v2::importMBox(FilterInfo *info, const TQString& mboxName, TQFile mbox(mboxName); bool first_msg = true; if (!mbox.open(IO_ReadOnly)) { - info->alert(i18n("Unable to open %1, skipping").tqarg(mboxName)); + info->alert(i18n("Unable to open %1, skipping").arg(mboxName)); } else { TQFileInfo filenameInfo(mboxName); diff --git a/kmailcvt/filter_kmail_maildir.cxx b/kmailcvt/filter_kmail_maildir.cxx index df67aaa1d..2a1961567 100644 --- a/kmailcvt/filter_kmail_maildir.cxx +++ b/kmailcvt/filter_kmail_maildir.cxx @@ -80,7 +80,7 @@ void FilterKMail_maildir::import( FilterInfo *info ) } } - info->addLog( i18n("Finished importing emails from %1").tqarg( mailDir )); + info->addLog( i18n("Finished importing emails from %1").arg( mailDir )); if (count_duplicates > 0) { info->addLog( i18n("1 duplicate message not imported", "%n duplicate messages not imported", count_duplicates)); } @@ -125,7 +125,7 @@ TQString FilterKMail_maildir::getMessageFlags( FilterInfo *info, const TQString& TQFile mailfile( fileName ); if (! mailfile.open( IO_ReadOnly ) ) { - info->alert( i18n("Unable to open %1, skipping").tqarg( fileName ) ); + info->alert( i18n("Unable to open %1, skipping").arg( fileName ) ); return status_flag; } else { @@ -193,7 +193,7 @@ void FilterKMail_maildir::importFiles( FilterInfo *info, const TQString& dirName if(_path.endsWith("cur")) _path.remove(_path.length() - 4 , 4); TQString _info = _path; - info->addLog(i18n("Import folder %1...").tqarg(_info.remove(0,12))); + info->addLog(i18n("Import folder %1...").arg(_info.remove(0,12))); info->setFrom(_info); info->setTo(_path); generatedPath = true; @@ -203,12 +203,12 @@ void FilterKMail_maildir::importFiles( FilterInfo *info, const TQString& dirName if(info->removeDupMsg) { if(! addMessage( info, _path, dir.filePath(*mailFile), msg_flag )) { - info->addLog( i18n("Could not import %1").tqarg( *mailFile ) ); + info->addLog( i18n("Could not import %1").arg( *mailFile ) ); } info->setCurrent((int) ((float) currentFile / numFiles * 100)); } else { if(! addMessage_fastImport( info, _path, dir.filePath(*mailFile), msg_flag )) { - info->addLog( i18n("Could not import %1").tqarg( *mailFile ) ); + info->addLog( i18n("Could not import %1").arg( *mailFile ) ); } info->setCurrent((int) ((float) currentFile / numFiles * 100)); } diff --git a/kmailcvt/filter_lnotes.cxx b/kmailcvt/filter_lnotes.cxx index 648f361d4..4bd3c423f 100644 --- a/kmailcvt/filter_lnotes.cxx +++ b/kmailcvt/filter_lnotes.cxx @@ -61,7 +61,7 @@ void FilterLNotes::import(FilterInfo *info) { for ( TQStringList::Iterator filename = filenames.begin(); filename != filenames.end(); ++filename ) { ++currentFile; - info->addLog( i18n("Importing emails from %1").tqarg(*filename) ); + info->addLog( i18n("Importing emails from %1").arg(*filename) ); ImportLNotes( *filename ); inf->setOverall( 100 * currentFile / totalFiles ); if ( info->shouldTerminate() ) @@ -85,7 +85,7 @@ void FilterLNotes::ImportLNotes(const TQString& file) { TQFile f(file); if (! f.open( IO_ReadOnly ) ) { - inf->alert( i18n("Unable to open %1, skipping").tqarg( file ) ); + inf->alert( i18n("Unable to open %1, skipping").arg( file ) ); } else { int ch = 0; @@ -106,7 +106,7 @@ void FilterLNotes::ImportLNotes(const TQString& file) { // open temp output file tempfile = new KTempFile; state = 1; - inf->setCurrent(i18n("Message %1").tqarg(n++)); + inf->setCurrent(i18n("Message %1").arg(n++)); if ( inf->shouldTerminate() ) return; // fall through diff --git a/kmailcvt/filter_mailapp.cxx b/kmailcvt/filter_mailapp.cxx index ebc34fd60..a93519770 100644 --- a/kmailcvt/filter_mailapp.cxx +++ b/kmailcvt/filter_mailapp.cxx @@ -59,7 +59,7 @@ void FilterMailApp::import(FilterInfo *info) if ( info->shouldTerminate() ) break; TQFile mbox( *filename ); if (! mbox.open( IO_ReadOnly ) ) { - info->alert( i18n("Unable to open %1, skipping").tqarg( *filename ) ); + info->alert( i18n("Unable to open %1, skipping").arg( *filename ) ); } else { TQFileInfo filenameInfo( *filename ); kdDebug() << "importing filename " << *filename << endl; @@ -67,7 +67,7 @@ void FilterMailApp::import(FilterInfo *info) TQString folderName(name[name.count() - 2]); info->setCurrent(0); - info->addLog( i18n("Importing emails from %1...").tqarg( *filename ) ); + info->addLog( i18n("Importing emails from %1...").arg( *filename ) ); info->setFrom( *filename ); info->setTo( folderName ); @@ -123,10 +123,10 @@ void FilterMailApp::import(FilterInfo *info) if ( info->shouldTerminate() ) break; } - info->addLog( i18n("Finished importing emails from %1").tqarg( *filename ) ); + info->addLog( i18n("Finished importing emails from %1").arg( *filename ) ); if (count_duplicates > 0) { info->addLog( i18n("1 duplicate message not imported to folder %1 in KMail", - "%n duplicate messages not imported to folder %1 in KMail", count_duplicates).tqarg(folderName)); + "%n duplicate messages not imported to folder %1 in KMail", count_duplicates).arg(folderName)); } count_duplicates = 0; mbox.close(); diff --git a/kmailcvt/filter_mbox.cxx b/kmailcvt/filter_mbox.cxx index d60c06273..76b376683 100644 --- a/kmailcvt/filter_mbox.cxx +++ b/kmailcvt/filter_mbox.cxx @@ -51,13 +51,13 @@ void FilterMBox::import(FilterInfo *info) for ( TQStringList::Iterator filename = filenames.begin(); filename != filenames.end(); ++filename, ++currentFile) { TQFile mbox( *filename ); if (! mbox.open( IO_ReadOnly ) ) { - info->alert( i18n("Unable to open %1, skipping").tqarg( *filename ) ); + info->alert( i18n("Unable to open %1, skipping").arg( *filename ) ); } else { TQFileInfo filenameInfo( *filename ); TQString folderName( "MBOX-" + filenameInfo.baseName(TRUE) ); info->setCurrent(0); - info->addLog( i18n("Importing emails from %1...").tqarg( *filename ) ); + info->addLog( i18n("Importing emails from %1...").arg( *filename ) ); info->setFrom( *filename ); info->setTo( folderName ); @@ -129,11 +129,11 @@ void FilterMBox::import(FilterInfo *info) if ( info->shouldTerminate() ) break; } - info->addLog( i18n("Finished importing emails from %1").tqarg( *filename )); + info->addLog( i18n("Finished importing emails from %1").arg( *filename )); if (count_duplicates > 0) { info->addLog( i18n("1 duplicate message not imported to folder %1 in KMail", "%n duplicate messages not imported to folder %1 in KMail", - count_duplicates).tqarg(folderName)); + count_duplicates).arg(folderName)); } if (info->shouldTerminate()) info->addLog( i18n("Finished import, canceled by user.")); count_duplicates = 0; diff --git a/kmailcvt/filter_oe.cxx b/kmailcvt/filter_oe.cxx index 3cd84137a..a87ee39af 100644 --- a/kmailcvt/filter_oe.cxx +++ b/kmailcvt/filter_oe.cxx @@ -64,7 +64,7 @@ void FilterOE::import(FilterInfo *info) TQDir dir (mailDir); TQStringList files = dir.entryList("*.[dDmM][bB][xX]", TQDir::Files, TQDir::Name); if (files.isEmpty()) { - info->alert(i18n("No Outlook Express mailboxes found in directory %1.").tqarg(mailDir)); + info->alert(i18n("No Outlook Express mailboxes found in directory %1.").arg(mailDir)); return; } @@ -116,7 +116,7 @@ void FilterOE::importMailBox( FilterInfo *info, const TQString& fileName) info->setFrom(mailfileinfo.fileName()); if (!mailfile.open(IO_ReadOnly)) { - info->addLog(i18n("Unable to open mailbox %1").tqarg(fileName)); + info->addLog(i18n("Unable to open mailbox %1").arg(fileName)); return; } TQDataStream mailbox(&mailfile); @@ -127,7 +127,7 @@ void FilterOE::importMailBox( FilterInfo *info, const TQString& fileName) mailbox >> sig_block1 >> sig_block2; if (sig_block1 == OE4_SIG_1 && sig_block2 == OE4_SIG_2) { folderName = "OE-Import/" + mailfileinfo.baseName(TRUE); - info->addLog(i18n("Importing OE4 Mailbox %1").tqarg( "../" + _nameOfFile)); + info->addLog(i18n("Importing OE4 Mailbox %1").arg( "../" + _nameOfFile)); info->setTo(folderName); mbxImport(info, mailbox); return; @@ -141,13 +141,13 @@ void FilterOE::importMailBox( FilterInfo *info, const TQString& fileName) TQString _tmpFolder = getFolderName(_nameOfFile); if(!_tmpFolder.isEmpty()) folderName = "OE-Import/" + _tmpFolder; } - info->addLog(i18n("Importing OE5+ Mailbox %1").tqarg( "../" + _nameOfFile)); + info->addLog(i18n("Importing OE5+ Mailbox %1").arg( "../" + _nameOfFile)); info->setTo(folderName); dbxImport(info, mailbox); return; } else if (sig_block2 == OE5_FOLDER_SIG_2) { if(!parsedFolder) { - info->addLog(i18n("Importing OE5+ Folder file %1").tqarg( "../" + _nameOfFile)); + info->addLog(i18n("Importing OE5+ Folder file %1").arg( "../" + _nameOfFile)); currentIsFolderFile = true; dbxImport(info, mailbox); currentIsFolderFile = false; @@ -156,7 +156,7 @@ void FilterOE::importMailBox( FilterInfo *info, const TQString& fileName) } } } - // info->addLog(i18n("File %1 does not seem to be an Outlook Express mailbox").tqarg("../" + _nameOfFile)); + // info->addLog(i18n("File %1 does not seem to be an Outlook Express mailbox").arg("../" + _nameOfFile)); } /* ------------------- MBX support ------------------- */ @@ -167,7 +167,7 @@ void FilterOE::mbxImport( FilterInfo *info, TQDataStream& ds) // Read the header ds >> msgCount >> lastMsgNum >> fileSize; - ds.tqdevice()->at( ds.tqdevice()->at() + 64 ); // Skip 0's + ds.device()->at( ds.device()->at() + 64 ); // Skip 0's kdDebug() << "This mailbox has " << msgCount << " messages" << endl; if (msgCount == 0) return; // Don't import empty mailbox @@ -212,9 +212,9 @@ void FilterOE::dbxImport( FilterInfo *info, TQDataStream& ds) { // Get item count & offset of index TQ_UINT32 itemCount, indexPtr; - ds.tqdevice()->at(0xc4); + ds.device()->at(0xc4); ds >> itemCount; - ds.tqdevice()->at(0xe4); + ds.device()->at(0xe4); ds >> indexPtr; kdDebug() << "Item count is " << itemCount << ", Index at " << indexPtr << endl; @@ -223,7 +223,7 @@ void FilterOE::dbxImport( FilterInfo *info, TQDataStream& ds) totalEmails = itemCount; currentEmail = 0; // Parse the indexes - ds.tqdevice()->at(indexPtr); + ds.device()->at(indexPtr); dbxReadIndex(info, ds, indexPtr); } @@ -234,8 +234,8 @@ void FilterOE::dbxReadIndex( FilterInfo *info, TQDataStream& ds, int filePos) TQ_UINT32 self, unknown, nextIndexPtr, parent, indexCount; TQ_UINT8 unknown2, ptrCount; TQ_UINT16 unknown3; - int wasAt = ds.tqdevice()->at(); - ds.tqdevice()->at(filePos); + int wasAt = ds.device()->at(); + ds.device()->at(filePos); kdDebug() << "Reading index of file " << folderName << endl; @@ -260,7 +260,7 @@ void FilterOE::dbxReadIndex( FilterInfo *info, TQDataStream& ds, int filePos) dbxReadIndex(info, ds, nextIndexPtr); } - ds.tqdevice()->at(wasAt); // Restore file position to same as when function called + ds.device()->at(wasAt); // Restore file position to same as when function called } void FilterOE::dbxReadDataBlock( FilterInfo *info, TQDataStream& ds, int filePos) @@ -268,11 +268,11 @@ void FilterOE::dbxReadDataBlock( FilterInfo *info, TQDataStream& ds, int filePos TQ_UINT32 curOffset, blockSize; TQ_UINT16 unknown; TQ_UINT8 count, unknown2; - int wasAt = ds.tqdevice()->at(); + int wasAt = ds.device()->at(); TQString folderEntry[4]; - ds.tqdevice()->at(filePos); + ds.device()->at(filePos); ds >> curOffset >> blockSize >> unknown >> count >> unknown2; // _dbx_email_headerstruct kdDebug() << "Data block has " << (int) count << " elements" << endl; @@ -284,7 +284,7 @@ void FilterOE::dbxReadDataBlock( FilterInfo *info, TQDataStream& ds, int filePos ds >> type >> value; value &= 0xffffff; - ds.tqdevice()->at(ds.tqdevice()->at() - 1); // We only wanted 3 bytes + ds.device()->at(ds.device()->at() - 1); // We only wanted 3 bytes if(!currentIsFolderFile) { if (type == 0x84) { // It's an email! @@ -292,12 +292,12 @@ void FilterOE::dbxReadDataBlock( FilterInfo *info, TQDataStream& ds, int filePos dbxReadEmail(info, ds, value); ++count0x84; } else if( type == 0x04) { - int currentFilePos = ds.tqdevice()->at(); - ds.tqdevice()->at(filePos + 12 + value + (count*4) ); + int currentFilePos = ds.device()->at(); + ds.device()->at(filePos + 12 + value + (count*4) ); TQ_UINT32 newOFF; ds >> newOFF; kdDebug() << "**** Offset of emaildata (0x04) " << newOFF << endl; - ds.tqdevice()->at(currentFilePos); + ds.device()->at(currentFilePos); dbxReadEmail(info, ds, newOFF); ++count0x04; } @@ -324,7 +324,7 @@ void FilterOE::dbxReadDataBlock( FilterInfo *info, TQDataStream& ds, int filePos if(currentIsFolderFile) { folderStructure.append(folderEntry); } - ds.tqdevice()->at(wasAt); // Restore file position to same as when function called + ds.device()->at(wasAt); // Restore file position to same as when function called } void FilterOE::dbxReadEmail( FilterInfo *info, TQDataStream& ds, int filePos) @@ -335,8 +335,8 @@ void FilterOE::dbxReadEmail( FilterInfo *info, TQDataStream& ds, int filePos) TQ_UINT8 intCount, unknown; KTempFile tmp; bool _break = false; - int wasAt = ds.tqdevice()->at(); - ds.tqdevice()->at(filePos); + int wasAt = ds.device()->at(); + ds.device()->at(filePos); do { ds >> self >> nextAddressOffset >> blockSize >> intCount >> unknown >> nextAddress; // _dbx_block_hdrstruct @@ -348,7 +348,7 @@ void FilterOE::dbxReadEmail( FilterInfo *info, TQDataStream& ds, int filePos) _break = true; break; } - ds.tqdevice()->at(nextAddress); + ds.device()->at(nextAddress); } while (nextAddress != 0); tmp.close(); @@ -361,7 +361,7 @@ void FilterOE::dbxReadEmail( FilterInfo *info, TQDataStream& ds, int filePos) currentEmail++; int currentPercentage = (int) ( ( (float) currentEmail / totalEmails ) * 100 ); info->setCurrent(currentPercentage); - ds.tqdevice()->at(wasAt); + ds.device()->at(wasAt); } tmp.unlink(); } @@ -371,18 +371,18 @@ TQString FilterOE::parseFolderString( TQDataStream& ds, int filePos ) { char tmp; TQString returnString; - int wasAt = ds.tqdevice()->at(); - ds.tqdevice()->at(filePos); + int wasAt = ds.device()->at(); + ds.device()->at(filePos); // read while != 0x00 - while( !ds.tqdevice()->atEnd() ) { - tmp = ds.tqdevice()->getch(); + while( !ds.device()->atEnd() ) { + tmp = ds.device()->getch(); if( tmp != 0x00) { returnString += tmp; } else break; } - ds.tqdevice()->at(wasAt); + ds.device()->at(wasAt); return returnString; } diff --git a/kmailcvt/filter_opera.cxx b/kmailcvt/filter_opera.cxx index cc5832179..65e2eae4b 100644 --- a/kmailcvt/filter_opera.cxx +++ b/kmailcvt/filter_opera.cxx @@ -84,9 +84,9 @@ void FilterOpera::import(FilterInfo *info) info->setCurrent(0); TQFile operaArchiv( importDir.filePath(*mailFile) ); if (! operaArchiv.open( IO_ReadOnly ) ) { - info->alert( i18n("Unable to open %1, skipping").tqarg( *mailFile ) ); + info->alert( i18n("Unable to open %1, skipping").arg( *mailFile ) ); } else { - info->addLog( i18n("Importing emails from %1...").tqarg( *mailFile ) ); + info->addLog( i18n("Importing emails from %1...").arg( *mailFile ) ); TQFileInfo filenameInfo( importDir.filePath(*mailFile) ); TQString folderName( "OPERA-" + importDir.dirName() ); @@ -138,7 +138,7 @@ void FilterOpera::import(FilterInfo *info) if ( info->shouldTerminate() ) break; } - info->addLog( i18n("Finished importing emails from %1").tqarg( *mailFile )); + info->addLog( i18n("Finished importing emails from %1").arg( *mailFile )); if (count_duplicates > 0) { info->addLog( i18n("1 duplicate message not imported", "%n duplicate messages not imported", count_duplicates)); } diff --git a/kmailcvt/filter_outlook.cxx b/kmailcvt/filter_outlook.cxx index 7d6a9b8c4..a5a9f407c 100644 --- a/kmailcvt/filter_outlook.cxx +++ b/kmailcvt/filter_outlook.cxx @@ -54,8 +54,8 @@ void FilterOutlook::import(FilterInfo *info) TQDir importDir (outlookDir); TQStringList files = importDir.entryList("*.[pP][sS][tT]", TQDir::Files, TQDir::Name); for ( TQStringList::Iterator pstFile = files.begin(); pstFile != files.end(); ++pstFile) { - info->addLog( i18n("Importing emails from %1...").tqarg( *pstFile ) ); + info->addLog( i18n("Importing emails from %1...").arg( *pstFile ) ); info->addLog( i18n("1 duplicate message not imported", "%n duplicate messages not imported", count_duplicates)); - info->alert( i18n("Unable to open %1, skipping").tqarg( *pstFile ) ); + info->alert( i18n("Unable to open %1, skipping").arg( *pstFile ) ); } } diff --git a/kmailcvt/filter_plain.cxx b/kmailcvt/filter_plain.cxx index a0dbad135..04abea3d3 100644 --- a/kmailcvt/filter_plain.cxx +++ b/kmailcvt/filter_plain.cxx @@ -64,11 +64,11 @@ void FilterPlain::import(FilterInfo *info) */ if(info->removeDupMsg) { if(! addMessage( info, "PLAIN-" + dir.dirName(), dir.filePath(*mailFile) )) { - info->addLog( i18n("Could not import %1").tqarg( *mailFile ) ); + info->addLog( i18n("Could not import %1").arg( *mailFile ) ); } } else { if( ! addMessage_fastImport( info, "PLAIN-" + dir.dirName(), dir.filePath(*mailFile) )) { - info->addLog( i18n("Could not import %1").tqarg( *mailFile ) ); + info->addLog( i18n("Could not import %1").arg( *mailFile ) ); } } @@ -77,7 +77,7 @@ void FilterPlain::import(FilterInfo *info) if ( info->shouldTerminate() ) break; } - info->addLog( i18n("Finished importing emails from %1").tqarg( mailDir )); + info->addLog( i18n("Finished importing emails from %1").arg( mailDir )); if (count_duplicates > 0) { info->addLog( i18n("1 duplicate message not imported", "%n duplicate messages not imported", count_duplicates)); } diff --git a/kmailcvt/filter_pmail.cxx b/kmailcvt/filter_pmail.cxx index 982d713a9..699e3adb3 100644 --- a/kmailcvt/filter_pmail.cxx +++ b/kmailcvt/filter_pmail.cxx @@ -76,7 +76,7 @@ void FilterPMail::import(FilterInfo *info) info->addLog(i18n("Importing 'UNIX' mail folders ('.mbx')...")); processFiles("*.[mM][bB][xX]", &FilterPMail::importUnixMailFolder); - info->addLog( i18n("Finished importing emails from %1").tqarg( chosenDir )); + info->addLog( i18n("Finished importing emails from %1").arg( chosenDir )); info->setCurrent(100); info->setOverall(100); } @@ -162,7 +162,7 @@ void FilterPMail::importMailFolder(const TQString& file) long l = 0; TQFile f(file); if (!f.open(IO_ReadOnly)) { - inf->alert(i18n("Unable to open %1, skipping").tqarg(file)); + inf->alert(i18n("Unable to open %1, skipping").arg(file)); } else { // Get folder name l = f.readBlock((char *) &pmm_head, sizeof(pmm_head)); @@ -172,7 +172,7 @@ void FilterPMail::importMailFolder(const TQString& file) else folder.append(pmm_head.folder); inf->setTo(folder); - inf->addLog(i18n("Importing %1").tqarg("../" + TQString(pmm_head.folder))); + inf->addLog(i18n("Importing %1").arg("../" + TQString(pmm_head.folder))); TQByteArray input(MAX_LINE); bool first_msg = true; @@ -232,7 +232,7 @@ void FilterPMail::importUnixMailFolder(const TQString& file) s.replace( TQRegExp("MBX$"), "PMG"); f.setName(s); if (! f.open( IO_ReadOnly ) ) { - inf->alert( i18n("Unable to open %1, skipping").tqarg( s ) ); + inf->alert( i18n("Unable to open %1, skipping").arg( s ) ); return; } else { f.readBlock((char *) &pmg_head, sizeof(pmg_head)); @@ -250,9 +250,9 @@ void FilterPMail::importUnixMailFolder(const TQString& file) /** Read in the mbox */ f.setName(file); if (! f.open( IO_ReadOnly ) ) { - inf->alert( i18n("Unable to open %1, skipping").tqarg( s ) ); + inf->alert( i18n("Unable to open %1, skipping").arg( s ) ); } else { - inf->addLog(i18n("Importing %1").tqarg("../" + TQString(pmg_head.folder))); + inf->addLog(i18n("Importing %1").arg("../" + TQString(pmg_head.folder))); l = f.readLine( line.data(),MAX_LINE); // read the first line which is unneeded while ( ! f.atEnd() ) { KTempFile tempfile; @@ -276,7 +276,7 @@ void FilterPMail::importUnixMailFolder(const TQString& file) tempfile.unlink(); n++; - inf->setCurrent(i18n("Message %1").tqarg(n)); + inf->setCurrent(i18n("Message %1").arg(n)); inf->setCurrent( (int) ( ( (float) f.at() / f.size() ) * 100 ) ); } } @@ -291,7 +291,7 @@ bool FilterPMail::parseFolderMatrix() TQFile hierarch(chosenDir + "/hierarch.pm"); if (! hierarch.open( IO_ReadOnly ) ) { - inf->alert( i18n("Unable to open %1, skipping").tqarg( chosenDir + "hierarch.pm" ) ); + inf->alert( i18n("Unable to open %1, skipping").arg( chosenDir + "hierarch.pm" ) ); return false; } else { TQStringList tmpList; diff --git a/kmailcvt/filter_sylpheed.cxx b/kmailcvt/filter_sylpheed.cxx index 47c134b47..9d6b219ae 100644 --- a/kmailcvt/filter_sylpheed.cxx +++ b/kmailcvt/filter_sylpheed.cxx @@ -75,7 +75,7 @@ void FilterSylpheed::import( FilterInfo *info ) } } - info->addLog( i18n("Finished importing emails from %1").tqarg( mailDir )); + info->addLog( i18n("Finished importing emails from %1").arg( mailDir )); if (count_duplicates > 0) { info->addLog( i18n("1 duplicate message not imported", "%n duplicate messages not imported", count_duplicates)); } @@ -137,7 +137,7 @@ void FilterSylpheed::importFiles( FilterInfo *info, const TQString& dirName) _tmp = _tmp.remove(_tmp.length() - _mfile.length() -1, _mfile.length()+1); _path += _tmp.remove( mailDir ,TRUE); TQString _info = _path; - info->addLog(i18n("Import folder %1...").tqarg(_info.remove(0,15))); + info->addLog(i18n("Import folder %1...").arg(_info.remove(0,15))); info->setFrom(_info); info->setTo(_path); @@ -150,12 +150,12 @@ void FilterSylpheed::importFiles( FilterInfo *info, const TQString& dirName) if(info->removeDupMsg) { if(! addMessage( info, _path, dir.filePath(*mailFile), flags )) { - info->addLog( i18n("Could not import %1").tqarg( *mailFile ) ); + info->addLog( i18n("Could not import %1").arg( *mailFile ) ); } info->setCurrent((int) ((float) currentFile / numFiles * 100)); } else { if(! addMessage_fastImport( info, _path, dir.filePath(*mailFile), flags )) { - info->addLog( i18n("Could not import %1").tqarg( *mailFile ) ); + info->addLog( i18n("Could not import %1").arg( *mailFile ) ); } info->setCurrent((int) ((float) currentFile / numFiles * 100)); } diff --git a/kmailcvt/filter_thebat.cxx b/kmailcvt/filter_thebat.cxx index 04dcdb127..52cd98589 100644 --- a/kmailcvt/filter_thebat.cxx +++ b/kmailcvt/filter_thebat.cxx @@ -81,7 +81,7 @@ void FilterTheBat::import( FilterInfo *info ) } } - info->addLog( i18n("Finished importing emails from %1").tqarg( mailDir )); + info->addLog( i18n("Finished importing emails from %1").arg( mailDir )); if (count_duplicates > 0) { info->addLog( i18n("1 duplicate message not imported", "%n duplicate messages not imported", count_duplicates)); } @@ -148,7 +148,7 @@ void FilterTheBat::importFiles( FilterInfo *info, const TQString& FileName) TQValueList<long> offsets; if (!tbb.open(IO_ReadOnly)) { - info->alert(i18n("Unable to open %1, skipping").tqarg(FileName)); + info->alert(i18n("Unable to open %1, skipping").arg(FileName)); } else { // BUILD the index of messages : // We need this really ugly way, because read with tbb.readLine() @@ -182,7 +182,7 @@ void FilterTheBat::importFiles( FilterInfo *info, const TQString& FileName) offsets.append(endOfEmail); } } - // info->addLog(i18n("--COUNTED: %1").tqarg(count)); + // info->addLog(i18n("--COUNTED: %1").arg(count)); // IMPORT the messages: if(!offsets.empty() || (offsets.empty() && (tbb.size() > 3128))) { @@ -196,7 +196,7 @@ void FilterTheBat::importFiles( FilterInfo *info, const TQString& FileName) _tmp = _tmp.remove(_tmp.length() - 13, 13); _path += _tmp.remove( mailDir ,TRUE); TQString _info = _path; - info->addLog(i18n("Import folder %1...").tqarg(_info.remove(0,14))); + info->addLog(i18n("Import folder %1...").arg(_info.remove(0,14))); info->setTo(_path); info->setFrom("../" + _info + "/messages.tbb"); diff --git a/kmailcvt/filter_thunderbird.cxx b/kmailcvt/filter_thunderbird.cxx index 301d29d0e..ea739dac1 100644 --- a/kmailcvt/filter_thunderbird.cxx +++ b/kmailcvt/filter_thunderbird.cxx @@ -91,12 +91,12 @@ void FilterThunderbird::import(FilterInfo *info) TQString temp_mailfile = *mailFile; if (temp_mailfile.endsWith(".msf") || temp_mailfile.endsWith("msgFilterRules.dat")) {} else { - info->addLog( i18n("Start import file %1...").tqarg( temp_mailfile ) ); + info->addLog( i18n("Start import file %1...").arg( temp_mailfile ) ); importMBox(info, mailDir + temp_mailfile , temp_mailfile, TQString()); } } - info->addLog( i18n("Finished importing emails from %1").tqarg( mailDir )); + info->addLog( i18n("Finished importing emails from %1").arg( mailDir )); if(count_duplicates > 0) { info->addLog( i18n("1 duplicate message not imported", "%n duplicate messages not imported", count_duplicates)); } @@ -126,7 +126,7 @@ void FilterThunderbird::importDirContents(FilterInfo *info, const TQString& dirN TQString temp_mailfile = *mailFile; if (temp_mailfile.endsWith(".msf") || temp_mailfile.endsWith("msgFilterRules.dat")) {} else { - info->addLog( i18n("Start import file %1...").tqarg( temp_mailfile ) ); + info->addLog( i18n("Start import file %1...").arg( temp_mailfile ) ); importMBox(info, (dirName + "/" + temp_mailfile) , KMailRootDir, KMailSubDir); } } @@ -158,7 +158,7 @@ void FilterThunderbird::importMBox(FilterInfo *info, const TQString& mboxName, c TQFile mbox(mboxName); bool first_msg = true; if (!mbox.open(IO_ReadOnly)) { - info->alert(i18n("Unable to open %1, skipping").tqarg(mboxName)); + info->alert(i18n("Unable to open %1, skipping").arg(mboxName)); } else { TQFileInfo filenameInfo(mboxName); diff --git a/kmailcvt/filters.cxx b/kmailcvt/filters.cxx index 47bcc02a8..7f9a5f97b 100644 --- a/kmailcvt/filters.cxx +++ b/kmailcvt/filters.cxx @@ -47,7 +47,7 @@ FilterInfo::~FilterInfo() { } -void FilterInfo::seStatusMsg( const TQString& status ) +void FilterInfo::setStatusMsg( const TQString& status ) { m_dlg->_texStatus->setText( status ); } @@ -150,16 +150,16 @@ bool Filter::addMessage( FilterInfo* info, const TQString& folderName, switch ( int( reply ) ) { case -1: - info->alert( i18n( "Cannot make folder %1 in KMail" ).tqarg( folderName ) ); + info->alert( i18n( "Cannot make folder %1 in KMail" ).arg( folderName ) ); return false; case -2: - info->alert( i18n( "Cannot add message to folder %1 in KMail" ).tqarg( folderName ) ); + info->alert( i18n( "Cannot add message to folder %1 in KMail" ).arg( folderName ) ); return false; case -4: count_duplicates++; return false; case 0: - info->alert( i18n( "Error while adding message to folder %1 in KMail" ).tqarg( folderName ) ); + info->alert( i18n( "Error while adding message to folder %1 in KMail" ).arg( folderName ) ); return false; } return true; @@ -185,13 +185,13 @@ bool Filter::addMessage_fastImport( FilterInfo* info, const TQString& folderName switch ( int( reply ) ) { case -1: - info->alert( i18n( "Cannot make folder %1 in KMail" ).tqarg( folderName ) ); + info->alert( i18n( "Cannot make folder %1 in KMail" ).arg( folderName ) ); return false; case -2: - info->alert( i18n( "Cannot add message to folder %1 in KMail" ).tqarg( folderName ) ); + info->alert( i18n( "Cannot add message to folder %1 in KMail" ).arg( folderName ) ); return false; case 0: - info->alert( i18n( "Error while adding message to folder %1 in KMail" ).tqarg( folderName ) ); + info->alert( i18n( "Error while adding message to folder %1 in KMail" ).arg( folderName ) ); return false; } return true; diff --git a/kmailcvt/filters.hxx b/kmailcvt/filters.hxx index db539428d..d6c33f422 100644 --- a/kmailcvt/filters.hxx +++ b/kmailcvt/filters.hxx @@ -36,7 +36,7 @@ class FilterInfo FilterInfo(KImportPageDlg *dlg, TQWidget *parent, bool _removeDupMsg); ~FilterInfo(); - void seStatusMsg( const TQString& status ); + void setStatusMsg( const TQString& status ); void setFrom( const TQString& from ); void setTo( const TQString& to ); void setCurrent( const TQString& current ); diff --git a/kmailcvt/kimportpagedlg.ui b/kmailcvt/kimportpagedlg.ui index be68e6225..475b6ff1e 100644 --- a/kmailcvt/kimportpagedlg.ui +++ b/kmailcvt/kimportpagedlg.ui @@ -114,7 +114,7 @@ <property name="text"> <string>Importing in progress...</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop</set> </property> </widget> diff --git a/kmailcvt/kmailcvt.cpp b/kmailcvt/kmailcvt.cpp index cf10f7fb1..e24f9a205 100644 --- a/kmailcvt/kmailcvt.cpp +++ b/kmailcvt/kmailcvt.cpp @@ -73,10 +73,10 @@ void KMailCVT::next() { setFinishEnabled( currentPage(), false ); // Start import FilterInfo *info = new FilterInfo(importpage, this, selfilterpage->removeDupMsg_checked()); - info->seStatusMsg(i18n("Import in progress")); + info->setStatusMsg(i18n("Import in progress")); info->clear(); // Clear info from last time selectedFilter->import(info); - info->seStatusMsg(i18n("Import finished")); + info->setStatusMsg(i18n("Import finished")); // Cleanup delete info; // Enable finish & back buttons diff --git a/kmailcvt/kselfilterpage.cpp b/kmailcvt/kselfilterpage.cpp index a562219a3..b8af0d0b3 100644 --- a/kmailcvt/kselfilterpage.cpp +++ b/kmailcvt/kselfilterpage.cpp @@ -75,7 +75,7 @@ void KSelFilterPage::filterSelected(int i) TQString info = mFilterList.at(i)->info(); TQString author = mFilterList.at(i)->author(); if(!author.isEmpty()) - info += i18n("<p><i>Written by %1.</i></p>").tqarg(author); + info += i18n("<p><i>Written by %1.</i></p>").arg(author); mDesc->setText(info); } diff --git a/kmailcvt/kselfilterpagedlg.ui b/kmailcvt/kselfilterpagedlg.ui index c4406e01f..84ed15ce7 100644 --- a/kmailcvt/kselfilterpagedlg.ui +++ b/kmailcvt/kselfilterpagedlg.ui @@ -96,7 +96,7 @@ This program will help you import your email from your previous email program in <property name="textFormat"> <enum>RichText</enum> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop|AlignLeft</set> </property> <property name="vAlign" stdset="0"> diff --git a/kmobile/DESIGN b/kmobile/DESIGN index 96dea2b1b..287a3d9a2 100644 --- a/kmobile/DESIGN +++ b/kmobile/DESIGN @@ -7,10 +7,10 @@ "kmobile" is suite to easily access "Mobile Devices", which means, that you have one single interface to access -any type of mobile tqdevice (e.g. cellular phone, PDAs, +any type of mobile device (e.g. cellular phone, PDAs, MP3-Players, Digital Cameras and a lot more). -Each of this tqdevices have different types of information, +Each of this devices have different types of information, (capatibilities) which can be: - An addressbook - A collection of notes @@ -18,28 +18,28 @@ Each of this tqdevices have different types of information, - a file storage section (e.g. pictures in digital cameras) - and more -The whole interface is pretty extendable. Each tqdevice has -a tqdevice driver, which reports the capatibilities of the -connected tqdevice to the higher level. -So, if you once write a tqdevice driver, you can access it's +The whole interface is pretty extendable. Each device has +a device driver, which reports the capatibilities of the +connected device to the higher level. +So, if you once write a device driver, you can access it's contents from any KDE application later. Currently the whole interface is divided into 3 sections: -a) The low-level tqdevice driver +a) The low-level device driver b) A mid-layer, which is realized in the "kmobile" application c) A userland library, to which KDE applications should link. Here is some background info: -a) The low-level tqdevice driver (libkmobile_xxxx.so) +a) The low-level device driver (libkmobile_xxxx.so) The low-level driver has to be derived from the KMobileDevice class (#include <kmobiledevice.h>). The drivers should be located below the -directory /tqdevice, and you can find a sample implementation in -/tqdevice/skeleton-directory. See below for some hints on how to -write such a tqdevice driver. +directory /device, and you can find a sample implementation in +/device/skeleton-directory. See below for some hints on how to +write such a device driver. b) The mid-layer (kmobile) @@ -47,7 +47,7 @@ b) The mid-layer (kmobile) The mid-layer handles the main functionality, which is entirely implemented in the kmobile application. All low-level drivers are loaded by kmobile only, and then all low-level functions -to any tqdevice is made available to other applications +to any device is made available to other applications with a DCOP interface. Normal KDE applications should prefer the userland library (see below) instead of using direct DCOP calls. Nevertheless, the DCOP interface might be very interesting to write @@ -56,14 +56,14 @@ standalone command line tools. c) The userland library (libkmobileclient.so) -Any KDE application which wants to access mobile tqdevices +Any KDE application which wants to access mobile devices should #include <kmobileclient.h> and link to the libkmobileclient.la library. libkmobileclient translates all calls to DCOP calls and -makes accessing mobile tqdevices completely transparent to the +makes accessing mobile devices completely transparent to the application. One sample program which uses the client library is the kmobile -kioslave. In Konqueror you might access any mobile tqdevice directly +kioslave. In Konqueror you might access any mobile device directly by giving "mobile:/" as the URL. @@ -72,7 +72,7 @@ by giving "mobile:/" as the URL. HINTS FOR DRIVER DEVELOPERS: ---------------------------- -- KMobile tqdevice drivers are very similiar to kioslaves. Refer +- KMobile device drivers are very similiar to kioslaves. Refer at the kioslave documentation if needed. - derive your driver only from the KMobileDevice class (#include <kmobiledevice.h>) @@ -86,8 +86,8 @@ HINTS FOR DRIVER DEVELOPERS: all calls to your driver, so you always will have a clean state - use lockDevice("/dev/ttyS1") and unlockDevice("/dev/ttyS1") to - lock those tqdevices system-wide (creates /var/lock/LCK..<devname> files), - and to prevent other applications to access the same physical ports/tqdevices + lock those devices system-wide (creates /var/lock/LCK..<devname> files), + and to prevent other applications to access the same physical ports/devices - use the helper functions createDirEntry() and createFileEntry() to create the right UDSEntries for listEntries(), stat(), ... diff --git a/kmobile/TODO b/kmobile/TODO index 308ce6744..457393bbc 100644 --- a/kmobile/TODO +++ b/kmobile/TODO @@ -1,7 +1,7 @@ DONE: ----- -- tqdevices:/ kioslave integration -- show per-tqdevice icons in konqueror (same as in the kmobile view) +- devices:/ kioslave integration +- show per-device icons in konqueror (same as in the kmobile view) - fix mimetypes and their location under /share/mimelnk - kioslaves: cellphone:/, organizer:/, pda:/, (camera:/ not activated) - system tray plugin @@ -10,11 +10,11 @@ DONE: TODO: ----- - fix doubled loading of plugins -- where do I get the tqdevice name from the kmobile unique process? +- where do I get the device name from the kmobile unique process? - finish the functions which are available to client apps. - kitchensync driver/plugin (starting...) - a plugin for the left side of the "Open File Dialog". -> - makes direct access to mobile tqdevices really easy + makes direct access to mobile devices really easy - make the daemon a KDED (KDE Meta Daemon) module (tdelibs/kded/HOWTO, README.kded) - more drivers (always) diff --git a/kmobile/devices/digicam/libkmobile_digicam.desktop b/kmobile/devices/digicam/libkmobile_digicam.desktop index 6e39cce6b..adb3c9ab9 100644 --- a/kmobile/devices/digicam/libkmobile_digicam.desktop +++ b/kmobile/devices/digicam/libkmobile_digicam.desktop @@ -107,6 +107,6 @@ Comment[uk]=Цей драйвер підтримує багато цифрови Comment[zh_CN]=此驱动程序支持许多数码相机 Comment[zh_TW]=此驅動程式支援許多數位相機 Type=Service -ServiceTypes=kdetqdevice/mobiletqdevice +ServiceTypes=kdedevice/mobiledevice X-KDE-Library=libkmobile_digicam Icon=mobile_camera diff --git a/kmobile/devices/gammu/libkmobile_gammu.desktop b/kmobile/devices/gammu/libkmobile_gammu.desktop index daaa2372f..f706b6806 100644 --- a/kmobile/devices/gammu/libkmobile_gammu.desktop +++ b/kmobile/devices/gammu/libkmobile_gammu.desktop @@ -101,6 +101,6 @@ Comment[uk]=Цей драйвер підтримує багато мобільн Comment[zh_CN]=此驱动程序通过 gammu 库支持许多诺基亚和其它移动电话 Comment[zh_TW]=此驅動程式支援許多 NOKIA 及其他手機，使用 gammu 函式庫 Type=Service -ServiceTypes=kdetqdevice/mobiletqdevice +ServiceTypes=kdedevice/mobiledevice X-KDE-Library=libkmobile_gammu Icon=mobile_phone diff --git a/kmobile/devices/gnokii/gnokii_mobile.cpp b/kmobile/devices/gnokii/gnokii_mobile.cpp index c4f31579b..48c3b8ae2 100644 --- a/kmobile/devices/gnokii/gnokii_mobile.cpp +++ b/kmobile/devices/gnokii/gnokii_mobile.cpp @@ -48,7 +48,7 @@ #define GNOKII_CHECK_ERROR(error) \ do { \ if (error) \ - PRINT_DEBUG << TQString("ERROR %1: %2\n").tqarg(error).tqarg(gn_error_print(error));\ + PRINT_DEBUG << TQString("ERROR %1: %2\n").arg(error).arg(gn_error_print(error));\ } while (0) @@ -74,16 +74,16 @@ static gn_calnote_list calnote_list; /** - * The KDE gnokii mobile tqdevice driver. + * The KDE gnokii mobile device driver. */ KMobileGnokii::KMobileGnokii(TQObject *obj, const char *name, const TQStringList &args ) : KMobileDevice(obj, name, args) { - // set initial tqdevice info + // set initial device info setClassType( Phone ); - m_tqdeviceName = i18n("Mobile Phone accessed via GNOKII"); - m_tqdeviceRevision = ""; + m_deviceName = i18n("Mobile Phone accessed via GNOKII"); + m_deviceRevision = ""; m_connectionName = "/dev/ircomm0"; setCapabilities( hasAddressBook | hasNotes ); @@ -103,8 +103,8 @@ KMobileGnokii::KMobileGnokii(TQObject *obj, const char *name, const TQStringList m_baud = "9600"; } - PRINT_DEBUG << TQString("Using GNOKII configuration: %1 %2 %3 %4\n").tqarg(m_modelnr) - .tqarg(m_connection).tqarg(m_port).tqarg(m_baud); + PRINT_DEBUG << TQString("Using GNOKII configuration: %1 %2 %3 %4\n").arg(m_modelnr) + .arg(m_connection).arg(m_port).arg(m_baud); saveDeviceConfiguration(); saveGnokiiConfiguration(); @@ -148,7 +148,7 @@ bool KMobileGnokii::setGnokiiStateMachine() { // set the state machine to our configuration qstrncpy( state.config.model, m_modelnr.utf8(), sizeof(state.config.model)-1 ); - qstrncpy( state.config.port_tqdevice, m_port.utf8(), sizeof(state.config.port_tqdevice)-1 ); + qstrncpy( state.config.port_device, m_port.utf8(), sizeof(state.config.port_device)-1 ); state.config.connection_type = connectionToValue(m_connection); state.config.serial_baudrate = m_baud.toUInt(); return true; @@ -206,7 +206,7 @@ bool KMobileGnokii::loadDeviceConfiguration() static void busterminate(void) { gn_sm_functions(GN_OP_Terminate, NULL, &state); - if (lockfile) gn_tqdevice_unlock(lockfile); + if (lockfile) gn_device_unlock(lockfile); } static TQString businit(void) @@ -222,7 +222,7 @@ static TQString businit(void) aux = gn_cfg_get(gn_cfg_info, "global", "use_locking"); // Defaults to 'no' if (aux && !strcmp(aux, "yes")) { - lockfile = gn_tqdevice_lock(state.config.port_tqdevice); + lockfile = gn_device_lock(state.config.port_device); if (lockfile == NULL) { return i18n("Lock file error.\n " "Please exit all other running instances of gnokii and try again."); @@ -237,7 +237,7 @@ static TQString businit(void) state.config.require_dcd = old_dcd; if (error != GN_ERR_NONE) { busterminate(); - return i18n("Mobile phone interface initialization failed:\n%1").tqarg(gn_error_print(error)); + return i18n("Mobile phone interface initialization failed:\n%1").arg(gn_error_print(error)); } // model @@ -265,9 +265,9 @@ static TQString businit(void) data.imei = NULL; GNOKII_DEBUG( TQString("Found mobile phone: Model: %1, Revision: %2, IMEI: %3\n") - .tqarg(model).tqarg(revision).tqarg(imei) ); + .arg(model).arg(revision).arg(imei) ); - PhoneProductId = TQString("%1-%2-%3-%4").tqarg(APP).tqarg(model).tqarg(revision).tqarg(imei); + PhoneProductId = TQString("%1-%2-%3-%4").arg(APP).arg(model).arg(revision).arg(imei); return TQString(); } @@ -299,7 +299,7 @@ static gn_error read_phone_memstat( gn_memory_type memtype, gn_memory_status *me } } GNOKII_DEBUG( TQString("\n\nMobile phone memory status: Type: %1, used=%2, free=%3, total=%4\n\n") - .tqarg(memtype).tqarg(memstat->used).tqarg(memstat->free).tqarg(memstat->used+memstat->free) ); + .arg(memtype).arg(memstat->used).arg(memstat->free).arg(memstat->used+memstat->free) ); return error; } @@ -372,8 +372,8 @@ static gn_error read_phone_entry_highlevel( int index, const gn_memory_type memt if (error != GN_ERR_NONE) return error; - GNOKII_DEBUG(TQString("%1: %2, num=%3, location=%4, group=%5, count=%6\n").tqarg(index).tqarg(entry.name) - .tqarg(entry.number).tqarg(entry.location).tqarg(entry.caller_group).tqarg(entry.subentries_count)); + GNOKII_DEBUG(TQString("%1: %2, num=%3, location=%4, group=%5, count=%6\n").arg(index).arg(entry.name) + .arg(entry.number).arg(entry.location).arg(entry.caller_group).arg(entry.subentries_count)); // try to split Name into FamilyName and GivenName s = TQString(entry.name).simplifyWhiteSpace(); @@ -395,7 +395,7 @@ static gn_error read_phone_entry_highlevel( int index, const gn_memory_type memt } a->insertCustom(APP, "X_GSM_CALLERGROUP", s.setNum(entry.caller_group)); - a->insertCustom(APP, "X_GSM_STORE_AT", TQString("%1_%2").tqarg(GN_MT_ME).tqarg(entry.location)); + a->insertCustom(APP, "X_GSM_STORE_AT", TQString("%1_%2").arg(GN_MT_ME).arg(entry.location)); // set ProductId a->setProductId(PhoneProductId); @@ -407,7 +407,7 @@ static gn_error read_phone_entry_highlevel( int index, const gn_memory_type memt else datetime = TQDateTime( TQDate(entry.date.year, entry.date.month, entry.date.day), TQTime(entry.date.hour, entry.date.minute, entry.date.second) ); - GNOKII_DEBUG(TQString(" date=%1\n").tqarg(datetime.toString())); + GNOKII_DEBUG(TQString(" date=%1\n").arg(datetime.toString())); a->setRevision(datetime); if (!entry.subentries_count) @@ -418,8 +418,8 @@ static gn_error read_phone_entry_highlevel( int index, const gn_memory_type memt for (int n=0; n<entry.subentries_count; n++) { TQString s = TQString(entry.subentries[n].data.number).simplifyWhiteSpace(); GNOKII_DEBUG(TQString(" Subentry#%1, entry_type=%2, number_type=%3, number=%4\n") - .tqarg(n).tqarg(entry.subentries[n].entry_type) - .tqarg(entry.subentries[n].number_type).tqarg(s)); + .arg(n).arg(entry.subentries[n].entry_type) + .arg(entry.subentries[n].number_type).arg(s)); if (s.isEmpty()) continue; switch(entry.subentries[n].entry_type) { @@ -478,7 +478,7 @@ static gn_error read_phone_entry_highlevel( int index, const gn_memory_type memt break; default: GNOKII_DEBUG(TQString(" Not handled id=%1, entry=%2\n") - .tqarg(entry.subentries[n].entry_type).tqarg(s)); + .arg(entry.subentries[n].entry_type).arg(s)); break; } // switch() } // for(subentry) @@ -493,7 +493,7 @@ static gn_error read_phone_entry_highlevel( int index, const gn_memory_type memt -// connect the tqdevice and ask user to turn tqdevice on (if necessary) +// connect the device and ask user to turn device on (if necessary) bool KMobileGnokii::connectDevice(TQWidget * /*parent*/) { if (connected()) @@ -501,18 +501,18 @@ bool KMobileGnokii::connectDevice(TQWidget * /*parent*/) TQString err = businit(); m_connected = err.isEmpty(); - PRINT_DEBUG << TQString("connectDevice() : %1\n").tqarg(m_connected ? "Ok" : err); + PRINT_DEBUG << TQString("connectDevice() : %1\n").arg(m_connected ? "Ok" : err); return m_connected; } -// disconnect the tqdevice and return true, if sucessful +// disconnect the device and return true, if sucessful bool KMobileGnokii::disconnectDevice(TQWidget * /*parent*/) { if (!connected()) return true; busterminate(); m_connected = false; - PRINT_DEBUG << TQString("disconnectDevice() : %1\n").tqarg("done"); + PRINT_DEBUG << TQString("disconnectDevice() : %1\n").arg("done"); return true; } @@ -545,9 +545,9 @@ TQString KMobileGnokii::iconFileName() const // return a unique ID, e.g. the IMEI number of phones, or a serial number // this String is used to have a unique identification for syncronisation. -TQString KMobileGnokii::tqdeviceUniqueID() +TQString KMobileGnokii::deviceUniqueID() { - return TQString("GNOKII-IMEI-%1").tqarg(TQString::fromLocal8Bit(imei)); + return TQString("GNOKII-IMEI-%1").arg(TQString::fromLocal8Bit(imei)); } @@ -587,7 +587,7 @@ int KMobileGnokii::numAddresses() int KMobileGnokii::readAddress( int index, KABC::Addressee &addr ) { - PRINT_DEBUG << TQString("############ GET ADDRESS #%1\n").tqarg(index); + PRINT_DEBUG << TQString("############ GET ADDRESS #%1\n").arg(index); // index is zero-based, but in gnokii the first address starts at 1 if (index<0 || index>=numAddresses()) return KIO::ERR_DOES_NOT_EXIST; @@ -609,7 +609,7 @@ int KMobileGnokii::readAddress( int index, KABC::Addressee &addr ) int KMobileGnokii::storeAddress( int, const KABC::Addressee &, bool ) { - /* XXX: this is a read-only tqdevice */ + /* XXX: this is a read-only device */ return KIO::ERR_WRITE_ACCESS_DENIED; } @@ -870,8 +870,8 @@ int KMobileGnokii::readNote( int index, TQString ¬e ) "DeviceClassName: %3\n" "Device Driver : %4\n" "Device Revision: %5\n") - .tqarg(index).tqarg(index) - .tqarg(tqdeviceClassName()).tqarg(tqdeviceName()).tqarg(revision()); + .arg(index).arg(index) + .arg(deviceClassName()).arg(deviceName()).arg(revision()); return 0; } diff --git a/kmobile/devices/gnokii/gnokii_mobile.h b/kmobile/devices/gnokii/gnokii_mobile.h index 96f32a5c0..e3fe7bdef 100644 --- a/kmobile/devices/gnokii/gnokii_mobile.h +++ b/kmobile/devices/gnokii/gnokii_mobile.h @@ -43,13 +43,13 @@ public: bool connectDevice(TQWidget *parent); bool disconnectDevice(TQWidget *parent); - // provide a tqdevice-specific configure dialog + // provide a device-specific configure dialog bool configDialog(TQWidget *parent); // filename and path to gnokii-icon TQString iconFileName() const; - TQString tqdeviceUniqueID(); + TQString deviceUniqueID(); /* * Addressbook / Phonebook support diff --git a/kmobile/devices/gnokii/gnokiiconfigui.ui b/kmobile/devices/gnokii/gnokiiconfigui.ui index 255b6fb67..e7f6bb31d 100644 --- a/kmobile/devices/gnokii/gnokiiconfigui.ui +++ b/kmobile/devices/gnokii/gnokiiconfigui.ui @@ -127,7 +127,7 @@ <cstring>textLabel2</cstring> </property> <property name="text"> - <string>Please configure your Gnokii mobile tqdevice</string> + <string>Please configure your Gnokii mobile device</string> </property> </widget> <spacer row="2" column="0"> diff --git a/kmobile/devices/gnokii/libkmobile_gnokii.desktop b/kmobile/devices/gnokii/libkmobile_gnokii.desktop index 986eded04..7e732ecd2 100644 --- a/kmobile/devices/gnokii/libkmobile_gnokii.desktop +++ b/kmobile/devices/gnokii/libkmobile_gnokii.desktop @@ -101,6 +101,6 @@ Comment[uk]=Цей драйвер підтримує багато мобільн Comment[zh_CN]=此驱动程序通过 gnokii 库支持许多诺基亚和其它移动电话 Comment[zh_TW]=此驅動程式支援許多 NOKIA 及其他手機，使用 gnokii 函式庫 Type=Service -ServiceTypes=kdetqdevice/mobiletqdevice +ServiceTypes=kdedevice/mobiledevice X-KDE-Library=libkmobile_gnokii Icon=mobile_phone diff --git a/kmobile/devices/skeleton/libkmobile_skeleton.desktop b/kmobile/devices/skeleton/libkmobile_skeleton.desktop index 2b22ca6eb..72943d15a 100644 --- a/kmobile/devices/skeleton/libkmobile_skeleton.desktop +++ b/kmobile/devices/skeleton/libkmobile_skeleton.desktop @@ -102,6 +102,6 @@ Comment[uk]=Прототип мобільного пристрою Comment[zh_CN]=移动万能设备 Comment[zh_TW]=行動通訊空殼裝置 Type=Service -ServiceTypes=kdetqdevice/mobiletqdevice +ServiceTypes=kdedevice/mobiledevice X-KDE-Library=libkmobile_skeleton Icon=mobile_unknown diff --git a/kmobile/devices/skeleton/skeleton.cpp b/kmobile/devices/skeleton/skeleton.cpp index b5073de87..e6b1d9c59 100644 --- a/kmobile/devices/skeleton/skeleton.cpp +++ b/kmobile/devices/skeleton/skeleton.cpp @@ -43,16 +43,16 @@ TQObject *KMobileSkeleton::createObject( TQObject *parent, const char *name, /** - * The KDE skeleton mobile tqdevice driver. + * The KDE skeleton mobile device driver. */ KMobileSkeleton::KMobileSkeleton(TQObject *obj, const char *name, const TQStringList &args ) : KMobileDevice(obj, name, args) { - // set initial tqdevice info + // set initial device info setClassType( Phone ); - m_tqdeviceName = i18n("LX-50-Moohoo Addressbook (Skeleton)"); - m_tqdeviceRevision = "0.1"; + m_deviceName = i18n("LX-50-Moohoo Addressbook (Skeleton)"); + m_deviceRevision = "0.1"; setCapabilities( hasAddressBook | hasNotes ); } @@ -60,26 +60,26 @@ KMobileSkeleton::~KMobileSkeleton() { } -// connect the tqdevice and ask user to turn tqdevice on (if necessary) +// connect the device and ask user to turn device on (if necessary) bool KMobileSkeleton::connectDevice(TQWidget *parent) { if (KMessageBox::Continue != KMessageBox::warningContinueCancel(parent, - i18n("Please turn on your %1 on now and press continue to proceed.").tqarg(m_tqdeviceName), - m_tqdeviceClassName ) ) + i18n("Please turn on your %1 on now and press continue to proceed.").arg(m_deviceName), + m_deviceClassName ) ) return false; // connect it now... m_connected = true; return m_connected; } -// disconnect the tqdevice and return true, if sucessful +// disconnect the device and return true, if sucessful bool KMobileSkeleton::disconnectDevice(TQWidget *) { m_connected = true; return true; } -// returns true, if this tqdevice is read-only (default: false) +// returns true, if this device is read-only (default: false) bool KMobileSkeleton::isReadOnly() const { return true; @@ -87,7 +87,7 @@ bool KMobileSkeleton::isReadOnly() const // return a unique ID, e.g. the IMEI number of phones, or a serial number // this String is used to have a unique identification for syncronisation. -TQString KMobileSkeleton::tqdeviceUniqueID() +TQString KMobileSkeleton::deviceUniqueID() { return TQString::fromLocal8Bit("SkElEtOn-123456789"); } @@ -112,7 +112,7 @@ int KMobileSkeleton::readAddress( int index, KABC::Addressee &addr ) return KIO::ERR_DOES_NOT_EXIST; // now build our own sample name - addr.setFamilyName(TQString("Meyer_%1").tqarg(index+1)); + addr.setFamilyName(TQString("Meyer_%1").arg(index+1)); addr.setGivenName("Peter"); addr.setFormattedName("Peter "+addr.familyName()); addr.setNickName("PeterM"); @@ -132,7 +132,7 @@ int KMobileSkeleton::readAddress( int index, KABC::Addressee &addr ) int KMobileSkeleton::storeAddress( int, const KABC::Addressee &, bool ) { - /* this is a read-only tqdevice */ + /* this is a read-only device */ return KIO::ERR_WRITE_ACCESS_DENIED; } @@ -156,8 +156,8 @@ int KMobileSkeleton::readNote( int index, TQString ¬e ) "DeviceClassName: %3\n" "Device Driver : %4\n" "Device Revision: %5\n") - .tqarg(index).tqarg(index) - .tqarg(tqdeviceClassName()).tqarg(tqdeviceName()).tqarg(revision()); + .arg(index).arg(index) + .arg(deviceClassName()).arg(deviceName()).arg(revision()); return 0; } diff --git a/kmobile/devices/skeleton/skeleton.h b/kmobile/devices/skeleton/skeleton.h index 6ae0287b9..ab3ce7701 100644 --- a/kmobile/devices/skeleton/skeleton.h +++ b/kmobile/devices/skeleton/skeleton.h @@ -42,14 +42,14 @@ public: bool connectDevice(TQWidget *parent); bool disconnectDevice(TQWidget *parent); - // returns true, if this tqdevice is read-only (default: false) + // returns true, if this device is read-only (default: false) bool isReadOnly() const; // you may provide your own icon() implementation to display // an appropriate Pixmap (e.g. a Palm Pilot or a Zaurus image). TQString iconFileName() const; - TQString tqdeviceUniqueID(); + TQString deviceUniqueID(); /* * Addressbook / Phonebook support diff --git a/kmobile/kioslave/kio_mobile.cpp b/kmobile/kioslave/kio_mobile.cpp index ed570196d..d8216bcd3 100644 --- a/kmobile/kioslave/kio_mobile.cpp +++ b/kmobile/kioslave/kio_mobile.cpp @@ -78,13 +78,13 @@ KMobileProtocol::~KMobileProtocol() } /* - * getDeviceAndRessource("mobile:/<tqdevicename>/<resource>/...") - split + * getDeviceAndRessource("mobile:/<devicename>/<resource>/...") - split */ int KMobileProtocol::getDeviceAndRessource(const TQString &_path, TQString &devName, TQString &resource, TQString &devPath, KMobileDevice::Capabilities &devCaps) { -// PRINT_DEBUG << TQString("###getDeviceAndRessource### %1\n").tqarg(_path); +// PRINT_DEBUG << TQString("###getDeviceAndRessource### %1\n").arg(_path); TQStringList path = TQStringList::split('/', _path, false); devName = resource = devPath = TQString(); @@ -140,7 +140,7 @@ void createDirEntry(KIO::UDSEntry& entry, const TQString& name, const TQString& addAtom(entry, KIO::UDS_URL, 0, url); addAtom(entry, KIO::UDS_USER, 0, getenv("USER")); addAtom(entry, KIO::UDS_GROUP, 0, getenv("USER")); - PRINT_DEBUG << TQString("createDirEntry: File: %1 MIME: %2 URL: %3\n").tqarg(name).tqarg(mime).tqarg(url); + PRINT_DEBUG << TQString("createDirEntry: File: %1 MIME: %2 URL: %3\n").arg(name).arg(mime).arg(url); // addAtom(entry, KIO::UDS_SIZE, 0); addAtom(entry, KIO::UDS_GUESSED_MIME_TYPE, 0, mime); } @@ -159,7 +159,7 @@ void createFileEntry(KIO::UDSEntry& entry, const TQString& name, const TQString& addAtom(entry, KIO::UDS_MIME_TYPE, 0, mime); if (size) addAtom(entry, KIO::UDS_SIZE, size); addAtom(entry, KIO::UDS_GUESSED_MIME_TYPE, 0, mime); - PRINT_DEBUG << TQString("createFileEntry: File: %1, Size: %2, MIME: %3\n").tqarg(name).tqarg(size).tqarg(mime); + PRINT_DEBUG << TQString("createFileEntry: File: %1, Size: %2, MIME: %3\n").arg(name).arg(size).arg(mime); } @@ -169,7 +169,7 @@ void createFileEntry(KIO::UDSEntry& entry, const TQString& name, const TQString& void KMobileProtocol::get(const KURL &url) { PRINT_DEBUG << "###############################\n"; - PRINT_DEBUG << TQString("get(%1)\n").tqarg(url.path()); + PRINT_DEBUG << TQString("get(%1)\n").arg(url.path()); KMobileDevice::Capabilities devCaps; TQString devName, resource, devPath; @@ -227,16 +227,16 @@ void KMobileProtocol::get(const KURL &url) /* - * listRoot() - gives listing of all tqdevices + * listRoot() - gives listing of all devices */ void KMobileProtocol::listRoot(const KURL& url) { - PRINT_DEBUG << TQString("########## listRoot(%1) for %2:/\n").tqarg(url.path()).tqarg(url.protocol()); + PRINT_DEBUG << TQString("########## listRoot(%1) for %2:/\n").arg(url.path()).arg(url.protocol()); KIO::UDSEntry entry; - TQStringList tqdeviceNames = m_dev.tqdeviceNames(); - unsigned int dirs = tqdeviceNames.count(); + TQStringList deviceNames = m_dev.deviceNames(); + unsigned int dirs = deviceNames.count(); totalSize(dirs); int classMask = KMobileDevice::Unclassified; @@ -251,7 +251,7 @@ void KMobileProtocol::listRoot(const KURL& url) for (unsigned int i=0; i<dirs; i++) { - TQString devName = tqdeviceNames[i]; + TQString devName = deviceNames[i]; if (classMask != KMobileDevice::Unclassified && m_dev.classType(devName) != classMask) @@ -307,12 +307,12 @@ TQString KMobileProtocol::entryMimeType(int cap) } /* - * listTopDeviceDir("mobile:/<tqdevicename>") - sub-directory of a tqdevices + * listTopDeviceDir("mobile:/<devicename>") - sub-directory of a devices */ void KMobileProtocol::listTopDeviceDir(const TQString &devName) { - PRINT_DEBUG << TQString("listTopDeviceDir(%1)\n").tqarg(devName); + PRINT_DEBUG << TQString("listTopDeviceDir(%1)\n").arg(devName); KIO::UDSEntry entry; unsigned int caps = m_dev.capabilities(devName); @@ -325,7 +325,7 @@ void KMobileProtocol::listTopDeviceDir(const TQString &devName) TQString filename = m_dev.nameForCap(devName, cap); TQString mimetype = folderMimeType(cap); - createDirEntry(entry, filename, TQString("mobile:/%1/%2/").tqarg(devName).tqarg(filename), mimetype); + createDirEntry(entry, filename, TQString("mobile:/%1/%2/").arg(devName).arg(filename), mimetype); listEntry(entry, false); } listEntry(entry, true); @@ -334,13 +334,13 @@ void KMobileProtocol::listTopDeviceDir(const TQString &devName) /* - * listEntries("mobile:/<tqdevicename>/<resource>") - resources of a tqdevice + * listEntries("mobile:/<devicename>/<resource>") - resources of a device */ void KMobileProtocol::listEntries(const TQString &devName, const TQString &resource, const TQString &devPath, const KMobileDevice::Capabilities devCaps) { - PRINT_DEBUG << TQString("listEntries(%1,%2,%3)\n").tqarg(devName).tqarg(resource).tqarg(devPath); + PRINT_DEBUG << TQString("listEntries(%1,%2,%3)\n").arg(devName).arg(resource).arg(devPath); switch (devCaps) { case KMobileDevice::hasAddressBook: listAddressBook(devName, resource); break; @@ -351,16 +351,16 @@ void KMobileProtocol::listEntries(const TQString &devName, case KMobileDevice::hasFileStorage: listFileStorage(devName, resource, devPath); break; default: error( ERR_CANNOT_ENTER_DIRECTORY, - TQString("/%1/%2").tqarg(devName).tqarg(resource) ); + TQString("/%1/%2").arg(devName).arg(resource) ); } } /* - * listAddressBook("mobile:/<tqdevicename>/Addressbook) - list the addressbook + * listAddressBook("mobile:/<devicename>/Addressbook) - list the addressbook */ void KMobileProtocol::listAddressBook(const TQString &devName, const TQString &resource) { - PRINT_DEBUG << TQString("listAddressBook(%1)\n").tqarg(devName); + PRINT_DEBUG << TQString("listAddressBook(%1)\n").arg(devName); KIO::UDSEntry entry; @@ -382,11 +382,11 @@ void KMobileProtocol::listAddressBook(const TQString &devName, const TQString &r name = "_" + rx.cap(1); #endif - TQString filename = TQString("%1%2.vcf").tqarg(i,fieldwidth).tqarg(name); + TQString filename = TQString("%1%2.vcf").arg(i,fieldwidth).arg(name); for (int p=0; p<fieldwidth; p++) { if (filename[p]==' ') filename[p]='0'; else break; } - TQString url = TQString("mobile:/%1/%2/%3").tqarg(devName).tqarg(resource).tqarg(filename); + TQString url = TQString("mobile:/%1/%2/%3").arg(devName).arg(resource).arg(filename); createFileEntry(entry, filename, url, entryMimeType(KMobileDevice::hasAddressBook), 400 /*content.utf8().length()*/ ); @@ -403,7 +403,7 @@ void KMobileProtocol::listAddressBook(const TQString &devName, const TQString &r */ int KMobileProtocol::getVCard( const TQString &devName, TQCString &result, TQString &mime, const TQString &path ) { - PRINT_DEBUG << TQString("getVCard(%1)\n").tqarg(path); + PRINT_DEBUG << TQString("getVCard(%1)\n").arg(path); int index = path.find('.'); if (index>0) @@ -421,11 +421,11 @@ int KMobileProtocol::getVCard( const TQString &devName, TQCString &result, TQStr } /* - * listCalendar("mobile:/<tqdevicename>/Calendar) - list the calendar entries + * listCalendar("mobile:/<devicename>/Calendar) - list the calendar entries */ void KMobileProtocol::listCalendar( const TQString &devName, const TQString &resource) { - PRINT_DEBUG << TQString("listCalendar(%1)\n").tqarg(devName); + PRINT_DEBUG << TQString("listCalendar(%1)\n").arg(devName); KIO::UDSEntry entry; @@ -433,8 +433,8 @@ void KMobileProtocol::listCalendar( const TQString &devName, const TQString &res totalSize(entries); for (int i=0; i<entries; i++) { - TQString filename = TQString("%1_%2.vcs").tqarg(i).tqarg(i18n("calendar")); - TQString url = TQString("mobile:/%1/%2/%3").tqarg(devName).tqarg(resource).tqarg(filename); + TQString filename = TQString("%1_%2.vcs").arg(i).arg(i18n("calendar")); + TQString url = TQString("mobile:/%1/%2/%3").arg(devName).arg(resource).arg(filename); createFileEntry(entry, filename, url, entryMimeType(KMobileDevice::hasCalendar)); listEntry(entry, false); @@ -450,7 +450,7 @@ void KMobileProtocol::listCalendar( const TQString &devName, const TQString &res */ int KMobileProtocol::getCalendar( const TQString &devName, TQCString &result, TQString &mime, const TQString &path) { - PRINT_DEBUG << TQString("getCalendar(%1, #%2)\n").tqarg(devName).tqarg(path); + PRINT_DEBUG << TQString("getCalendar(%1, #%2)\n").arg(devName).arg(path); /* TODO */ Q_UNUSED(result); @@ -460,11 +460,11 @@ int KMobileProtocol::getCalendar( const TQString &devName, TQCString &result, TQ /* - * listNotes("mobile:/<tqdevicename>/Notes) - list the notes + * listNotes("mobile:/<devicename>/Notes) - list the notes */ void KMobileProtocol::listNotes( const TQString &devName, const TQString &resource) { - PRINT_DEBUG << TQString("listNotes(%1)\n").tqarg(devName); + PRINT_DEBUG << TQString("listNotes(%1)\n").arg(devName); KIO::UDSEntry entry; @@ -474,8 +474,8 @@ void KMobileProtocol::listNotes( const TQString &devName, const TQString &resour TQString note /*= m_dev.readNote(devName, i)*/; - TQString filename = TQString("%1_%2.txt").tqarg(i).tqarg(i18n("note")); - TQString url = TQString("mobile:/%1/%2/%3").tqarg(devName).tqarg(resource).tqarg(filename); + TQString filename = TQString("%1_%2.txt").arg(i).arg(i18n("note")); + TQString url = TQString("mobile:/%1/%2/%3").arg(devName).arg(resource).arg(filename); createFileEntry(entry, filename, url, entryMimeType(KMobileDevice::hasNotes), 0 /*note.utf8().length()*/); @@ -492,7 +492,7 @@ void KMobileProtocol::listNotes( const TQString &devName, const TQString &resour */ int KMobileProtocol::getNote( const TQString &devName, TQCString &result, TQString &mime, const TQString &path ) { - PRINT_DEBUG << TQString("getNote(%1)\n").tqarg(path); + PRINT_DEBUG << TQString("getNote(%1)\n").arg(path); int index = path.find('_'); if (index>0) @@ -510,14 +510,14 @@ int KMobileProtocol::getNote( const TQString &devName, TQCString &result, TQStri } /* - * listFileStorage("mobile:/<tqdevicename>/Files) - list the files on the tqdevice + * listFileStorage("mobile:/<devicename>/Files) - list the files on the device */ void KMobileProtocol::listFileStorage(const TQString &devName, const TQString &resource, const TQString &devPath) { - PRINT_DEBUG << TQString("listFileStorage(%1,%2)\n").tqarg(devName).tqarg(devPath); + PRINT_DEBUG << TQString("listFileStorage(%1,%2)\n").arg(devName).arg(devPath); /* TODO */ - error( KIO::ERR_DOES_NOT_EXIST, TQString("/%1/%2/%3").tqarg(devName).tqarg(resource).tqarg(devPath) ); + error( KIO::ERR_DOES_NOT_EXIST, TQString("/%1/%2/%3").arg(devName).arg(resource).arg(devPath) ); } /* @@ -525,7 +525,7 @@ void KMobileProtocol::listFileStorage(const TQString &devName, const TQString &r */ int KMobileProtocol::getFileStorage(const TQString &devName, TQCString &result, TQString &mime, const TQString &path) { - PRINT_DEBUG << TQString("getFileStorage(%1)\n").tqarg(path); + PRINT_DEBUG << TQString("getFileStorage(%1)\n").arg(path); /* TODO */ Q_UNUSED(devName); @@ -541,7 +541,7 @@ int KMobileProtocol::getFileStorage(const TQString &devName, TQCString &result, void KMobileProtocol::stat( const KURL &url ) { PRINT_DEBUG << "###############################\n"; - PRINT_DEBUG << TQString("stat(%1)\n").tqarg(url.path()); + PRINT_DEBUG << TQString("stat(%1)\n").arg(url.path()); KMobileDevice::Capabilities devCaps; TQString devName, resource, devPath; @@ -555,7 +555,7 @@ void KMobileProtocol::stat( const KURL &url ) TQStringList path = TQStringList::split('/', url.path(), false); TQString filename = (path.count()>0) ? path[path.count()-1] : "/"; TQString fullPath = path.join("/"); - TQString fullUrl = TQString("mobile:/%1").tqarg(fullPath); + TQString fullUrl = TQString("mobile:/%1").arg(fullPath); UDSEntry entry; @@ -577,7 +577,7 @@ void KMobileProtocol::stat( const KURL &url ) void KMobileProtocol::mimetype(const KURL &url) { PRINT_DEBUG << "###############################\n"; - PRINT_DEBUG << TQString("mimetype(%1)\n").tqarg(url.path()); + PRINT_DEBUG << TQString("mimetype(%1)\n").arg(url.path()); KMobileDevice::Capabilities devCaps; TQString devName, resource, devPath; @@ -599,7 +599,7 @@ void KMobileProtocol::mimetype(const KURL &url) void KMobileProtocol::listDir(const KURL &url) { PRINT_DEBUG << "###############################\n"; - PRINT_DEBUG << TQString("listDir(%1)\n").tqarg(url.path()); + PRINT_DEBUG << TQString("listDir(%1)\n").arg(url.path()); if (!m_dev.isKMobileAvailable()) { error( KIO::ERR_CONNECTION_BROKEN, i18n("KDE Mobile Device Manager") ); @@ -622,7 +622,7 @@ void KMobileProtocol::listDir(const KURL &url) #if 0 if (!dev) { - error( KIO::ERR_DOES_NOT_EXIST, TQString("/%1").tqarg(devName) ); + error( KIO::ERR_DOES_NOT_EXIST, TQString("/%1").arg(devName) ); return; } #endif diff --git a/kmobile/kioslave/mimetypes/mobile_device.desktop b/kmobile/kioslave/mimetypes/mobile_device.desktop index a04b0b8fe..4462b124d 100644 --- a/kmobile/kioslave/mimetypes/mobile_device.desktop +++ b/kmobile/kioslave/mimetypes/mobile_device.desktop @@ -58,7 +58,7 @@ Comment[zh_CN]=移动设备 Comment[zh_TW]=行動裝置 Icon=kmobile Type=MimeType -MimeType=kdetqdevice/mobiletqdevice +MimeType=kdedevice/mobiledevice Patterns= X-KDE-AutoEmbed=true diff --git a/kmobile/kmobile.cpp b/kmobile/kmobile.cpp index 8bd1da8a9..d76282541 100644 --- a/kmobile/kmobile.cpp +++ b/kmobile/kmobile.cpp @@ -77,7 +77,7 @@ KMobile::KMobile() connect(m_view, TQT_SIGNAL(signalChangeStatusbar(const TQString&)), this, TQT_SLOT(changeStatusbar(const TQString&))); - // restore all configured tqdevices + // restore all configured devices restoreAll(); // setup the system tray @@ -105,13 +105,13 @@ void KMobile::setupActions() KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(optionsPreferences()), actionCollection()); new KAction(i18n("&Add Device..."), "folder_new", 0, - TQT_TQOBJECT(this), TQT_SLOT(addDevice()), actionCollection(), "tqdevice_add"); - new KAction( KGuiItem( i18n("&Remove Device"), "edittrash", i18n("Remove this tqdevice") ), - "Delete", TQT_TQOBJECT(this), TQT_SLOT(removeDevice()), actionCollection(), "tqdevice_remove"); + TQT_TQOBJECT(this), TQT_SLOT(addDevice()), actionCollection(), "device_add"); + new KAction( KGuiItem( i18n("&Remove Device"), "edittrash", i18n("Remove this device") ), + "Delete", TQT_TQOBJECT(this), TQT_SLOT(removeDevice()), actionCollection(), "device_remove"); new KAction(i18n("Re&name Device..."), 0, Key_F2, - TQT_TQOBJECT(this), TQT_SLOT(renameDevice()), actionCollection(), "tqdevice_rename"); + TQT_TQOBJECT(this), TQT_SLOT(renameDevice()), actionCollection(), "device_rename"); new KAction(i18n("&Configure Device..."), "configure", 0, - TQT_TQOBJECT(this), TQT_SLOT(configDevice()), actionCollection(), "tqdevice_configure"); + TQT_TQOBJECT(this), TQT_SLOT(configDevice()), actionCollection(), "device_configure"); createGUI(); @@ -240,7 +240,7 @@ void KMobile::optionsPreferences() void KMobile::renameDevice() { - // rename the current selected tqdevice + // rename the current selected device TQIconViewItem *item = m_view->currentItem(); if (item) item->rename(); @@ -258,7 +258,7 @@ void KMobile::addDevice() dialog->setCaption( i18n("Add New Mobile or Portable Device") ); - dialog->helpText->setText( i18n("Please select the category to which your new tqdevice belongs:") ); + dialog->helpText->setText( i18n("Please select the category to which your new device belongs:") ); dialog->addButton->setText( i18n("&Scan for New Devices...") ); dialog->addButton->setDisabled(true); dialog->iconView->connect( dialog->iconView, TQT_SIGNAL(doubleClicked(TQIconViewItem*)), @@ -273,7 +273,7 @@ void KMobile::addDevice() for ( it = list.begin(); it != list.end(); ++it ) { ptr = *it; kdDebug() << TQString("LIBRARY: '%1', NAME: '%2', ICON: '%3', COMMENT: '%4'\n") - .tqarg(ptr->library()).tqarg(ptr->name()).tqarg(ptr->icon()).tqarg(ptr->comment()); + .arg(ptr->library()).arg(ptr->name()).arg(ptr->icon()).arg(ptr->comment()); TQString iconName = ptr->icon(); if (iconName.isEmpty()) @@ -297,13 +297,13 @@ void KMobile::addDevice() ptr = list[index]; - // add the new tqdevice to the list + // add the new device to the list if (!m_view->addNewDevice(m_config, ptr)) { KMessageBox::error(this, TQString("<qt>KMobile could not load the <b>%1</b> Device Driver.<p>" "Please use the Skeleton- or Gnokii Device Driver during development.<p>" "This driver will still be visible, but you won't be able to access it " - "from Konqueror or any other application.</qt>").tqarg(ptr->name()), + "from Konqueror or any other application.</qt>").arg(ptr->name()), kapp->name()); } @@ -313,7 +313,7 @@ void KMobile::addDevice() #if 0 /* * show dialog to user, in which he may choose and select one of the already - * configured mobile tqdevices. + * configured mobile devices. */ KMobileDevice * KMobileFactory::chooseDeviceDialog( TQWidget *parent, enum KMobileDevice::ClassType /*type*/, enum KMobileDevice::Capabilities /*caps*/ ) @@ -322,24 +322,24 @@ KMobileDevice * KMobileFactory::chooseDeviceDialog( TQWidget *parent, m_parent = parent; - // do we already have some tqdevices configured ? + // do we already have some devices configured ? num = readDevicesList(); if (!num) { int answ; answ = KMessageBox::questionYesNo(parent, - i18n( "<qt>You have no mobile tqdevices configured yet.<p>" - "Do you want to add a tqdevice now ?</qt>" ), + i18n( "<qt>You have no mobile devices configured yet.<p>" + "Do you want to add a device now ?</qt>" ), i18n( "KDE Mobile Device Access" ), KStdGuiItem::add(), i18n("Do Not Add") ); if (answ != KMessageBox::Yes) return 0L; - // add a new tqdevice + // add a new device addDeviceDialog(parent); } num = readDevicesList(); if (!num) return 0L; - // let the user select one of the configured tqdevices + // let the user select one of the configured devices KMobile_selectiondialog *dialog = new KMobile_selectiondialog(parent); if (!dialog) return 0L; @@ -357,7 +357,7 @@ KMobileDevice * KMobileFactory::chooseDeviceDialog( TQWidget *parent, continue; // kdDebug() << TQString("LIBRARY: '%1', NAME: '%2', ICON: '%3', COMMENT: '%4' #%5\n") - // .tqarg(ptr->library()).tqarg(ptr->name()).tqarg(ptr->icon()).tqarg(ptr->comment()).tqarg(i); + // .arg(ptr->library()).arg(ptr->name()).arg(ptr->icon()).arg(ptr->comment()).arg(i); TQString iconName = ptr->icon(); if (iconName.isEmpty()) @@ -384,7 +384,7 @@ KMobileDevice * KMobileFactory::chooseDeviceDialog( TQWidget *parent, void KMobile::removeDevice() { - // remove the current selected tqdevice + // remove the current selected device TQIconViewItem *item = m_view->currentItem(); if (item) m_view->removeDevice( item->text() ); @@ -392,7 +392,7 @@ void KMobile::removeDevice() void KMobile::configDevice() { - // configure the current selected tqdevice + // configure the current selected device TQIconViewItem *item = m_view->currentItem(); if (item) m_view->configDevice( item->text() ); diff --git a/kmobile/kmobile_selectiondialog.ui b/kmobile/kmobile_selectiondialog.ui index 621ec83df..2ad24ec41 100644 --- a/kmobile/kmobile_selectiondialog.ui +++ b/kmobile/kmobile_selectiondialog.ui @@ -32,7 +32,7 @@ <cstring>helpText</cstring> </property> <property name="text"> - <string><b>Select mobile tqdevice:</b></string> + <string><b>Select mobile device:</b></string> </property> </widget> <widget class="TQIconView" row="1" column="0" rowspan="1" colspan="3"> diff --git a/kmobile/kmobileclient.cpp b/kmobile/kmobileclient.cpp index 901aaf094..9c95efe8f 100644 --- a/kmobile/kmobileclient.cpp +++ b/kmobile/kmobileclient.cpp @@ -36,10 +36,10 @@ KMobileClient::KMobileClient() m_kmobileObj = "kmobileIface"; bool ok = attach(); - PRINT_DEBUG << TQString("attached to DCOP server %1\n").tqarg(ok?"sucessful.":"failed."); + PRINT_DEBUG << TQString("attached to DCOP server %1\n").arg(ok?"sucessful.":"failed."); // m_clientAppId = registerAs("kmobileclient"); -// PRINT_DEBUG << TQString("registered as DCOP client %1\n").tqarg(m_clientAppId); +// PRINT_DEBUG << TQString("registered as DCOP client %1\n").arg(m_clientAppId); isKMobileAvailable(); } @@ -54,7 +54,7 @@ KMobileClient::~KMobileClient() bool KMobileClient::isKMobileAvailable() { bool available = isApplicationRegistered(m_kmobileApp); - PRINT_DEBUG << TQString("KMobile DCOP server: %1\n").tqarg(available?"available.":"not available"); + PRINT_DEBUG << TQString("KMobile DCOP server: %1\n").arg(available?"available.":"not available"); if (!available) { startKMobileApplication(); // check again... @@ -73,7 +73,7 @@ bool KMobileClient::startKMobileApplication() TQCString replyType; TQByteArray replyData; bool ok = call("klauncher", "klauncher", "tdeinit_exec_wait(TQString,TQStringList)", data, replyType, replyData); - PRINT_DEBUG << TQString("DCOP-CALL to klauncher: %1\n").tqarg(ok?"ok.":"failed."); + PRINT_DEBUG << TQString("DCOP-CALL to klauncher: %1\n").arg(ok?"ok.":"failed."); return ok; } @@ -93,7 +93,7 @@ bool KMobileClient::startKMobileApplication() TQCString replyType; \ TQByteArray replyData; \ bool ok = call(m_kmobileApp, m_kmobileObj, FUNC, data, replyType, replyData, KMOBILECLIENT_USE_EVENTLOOP, KMOBILECLIENT_TIMEOUT); \ - PRINT_DEBUG << TQString("DCOP-CALL to %1: %2\n").tqarg(FUNC).tqarg(ok?"ok.":"FAILED.") + PRINT_DEBUG << TQString("DCOP-CALL to %1: %2\n").arg(FUNC).arg(ok?"ok.":"FAILED.") #define RETURN_TYPE( FUNC, PARAMS, RETURN_TYPE ) \ PREPARE( FUNC, PARAMS ); \ @@ -122,110 +122,110 @@ bool KMobileClient::startKMobileApplication() -TQStringList KMobileClient::tqdeviceNames() +TQStringList KMobileClient::deviceNames() { if (!isKMobileAvailable()) return TQStringList(); - RETURN_TYPE( "tqdeviceNames()", TQString::fromLatin1(""), TQStringList ); + RETURN_TYPE( "deviceNames()", TQString::fromLatin1(""), TQStringList ); } -void KMobileClient::removeDevice( TQString tqdeviceName ) +void KMobileClient::removeDevice( TQString deviceName ) { - PREPARE( "removeDevice(TQString)", tqdeviceName ); + PREPARE( "removeDevice(TQString)", deviceName ); Q_UNUSED(ok); } -void KMobileClient::configDevice( TQString tqdeviceName ) +void KMobileClient::configDevice( TQString deviceName ) { - PREPARE( "configDevice(TQString)", tqdeviceName ); + PREPARE( "configDevice(TQString)", deviceName ); Q_UNUSED(ok); } -bool KMobileClient::connectDevice( TQString tqdeviceName ) +bool KMobileClient::connectDevice( TQString deviceName ) { - RETURN_BOOL( "connectDevice(TQString)", tqdeviceName ); + RETURN_BOOL( "connectDevice(TQString)", deviceName ); } -bool KMobileClient::disconnectDevice( TQString tqdeviceName ) +bool KMobileClient::disconnectDevice( TQString deviceName ) { - RETURN_BOOL( "disconnectDevice(TQString)", tqdeviceName ); + RETURN_BOOL( "disconnectDevice(TQString)", deviceName ); } -bool KMobileClient::connected( TQString tqdeviceName ) +bool KMobileClient::connected( TQString deviceName ) { - RETURN_BOOL( "connected(TQString)", tqdeviceName ); + RETURN_BOOL( "connected(TQString)", deviceName ); } -TQString KMobileClient::tqdeviceClassName( TQString tqdeviceName ) +TQString KMobileClient::deviceClassName( TQString deviceName ) { - RETURN_TQSTRING( "tqdeviceClassName(TQString)", tqdeviceName ); + RETURN_TQSTRING( "deviceClassName(TQString)", deviceName ); } -TQString KMobileClient::tqdeviceName( TQString tqdeviceName ) +TQString KMobileClient::deviceName( TQString deviceName ) { - RETURN_TQSTRING( "tqdeviceName(TQString)", tqdeviceName ); + RETURN_TQSTRING( "deviceName(TQString)", deviceName ); } -TQString KMobileClient::revision( TQString tqdeviceName ) +TQString KMobileClient::revision( TQString deviceName ) { - RETURN_TQSTRING( "revision(TQString)", tqdeviceName ); + RETURN_TQSTRING( "revision(TQString)", deviceName ); } -int KMobileClient::classType( TQString tqdeviceName ) +int KMobileClient::classType( TQString deviceName ) { - RETURN_INT( "classType(TQString)", tqdeviceName ); + RETURN_INT( "classType(TQString)", deviceName ); } -int KMobileClient::capabilities( TQString tqdeviceName ) +int KMobileClient::capabilities( TQString deviceName ) { - RETURN_INT( "capabilities(TQString)", tqdeviceName ); + RETURN_INT( "capabilities(TQString)", deviceName ); } -TQString KMobileClient::nameForCap( TQString tqdeviceName, int cap ) +TQString KMobileClient::nameForCap( TQString deviceName, int cap ) { - RETURN_TQSTRING( "nameForCap(TQString,int)", tqdeviceName << cap ); + RETURN_TQSTRING( "nameForCap(TQString,int)", deviceName << cap ); } -TQString KMobileClient::iconFileName( TQString tqdeviceName ) +TQString KMobileClient::iconFileName( TQString deviceName ) { - RETURN_TQSTRING( "iconFileName(TQString)", tqdeviceName ); + RETURN_TQSTRING( "iconFileName(TQString)", deviceName ); } -int KMobileClient::numAddresses( TQString tqdeviceName ) +int KMobileClient::numAddresses( TQString deviceName ) { - RETURN_INT( "numAddresses(TQString)", tqdeviceName ); + RETURN_INT( "numAddresses(TQString)", deviceName ); } -TQString KMobileClient::readAddress( TQString tqdeviceName, int index ) +TQString KMobileClient::readAddress( TQString deviceName, int index ) { - RETURN_TQSTRING( "readAddress(TQString,int)", tqdeviceName << index ); + RETURN_TQSTRING( "readAddress(TQString,int)", deviceName << index ); } -bool KMobileClient::storeAddress( TQString tqdeviceName, int index, TQString vcard, bool append ) +bool KMobileClient::storeAddress( TQString deviceName, int index, TQString vcard, bool append ) { - RETURN_BOOL( "storeAddress(TQString,int,TQString,bool)", tqdeviceName << index << vcard << append ); + RETURN_BOOL( "storeAddress(TQString,int,TQString,bool)", deviceName << index << vcard << append ); } -int KMobileClient::numCalendarEntries( TQString tqdeviceName ) +int KMobileClient::numCalendarEntries( TQString deviceName ) { - RETURN_INT( "numCalendarEntries(TQString)", tqdeviceName ); + RETURN_INT( "numCalendarEntries(TQString)", deviceName ); } -int KMobileClient::numNotes( TQString tqdeviceName ) +int KMobileClient::numNotes( TQString deviceName ) { - RETURN_INT( "numNotes(TQString)", tqdeviceName ); + RETURN_INT( "numNotes(TQString)", deviceName ); } -TQString KMobileClient::readNote( TQString tqdeviceName, int index ) +TQString KMobileClient::readNote( TQString deviceName, int index ) { - RETURN_TQSTRING( "readNote(TQString,int)", tqdeviceName << index ); + RETURN_TQSTRING( "readNote(TQString,int)", deviceName << index ); } -bool KMobileClient::storeNote( TQString tqdeviceName, int index, TQString note ) +bool KMobileClient::storeNote( TQString deviceName, int index, TQString note ) { - RETURN_BOOL( "storeNote(TQString,int,TQString)", tqdeviceName << index << note ); + RETURN_BOOL( "storeNote(TQString,int,TQString)", deviceName << index << note ); } diff --git a/kmobile/kmobileclient.h b/kmobile/kmobileclient.h index 6e5f26b78..8456776c6 100644 --- a/kmobile/kmobileclient.h +++ b/kmobile/kmobileclient.h @@ -24,34 +24,34 @@ public: /** * DCOP implementation */ - TQStringList tqdeviceNames(); + TQStringList deviceNames(); - void removeDevice( TQString tqdeviceName ); - void configDevice( TQString tqdeviceName ); + void removeDevice( TQString deviceName ); + void configDevice( TQString deviceName ); - bool connectDevice( TQString tqdeviceName ); - bool disconnectDevice( TQString tqdeviceName ); - bool connected( TQString tqdeviceName ); + bool connectDevice( TQString deviceName ); + bool disconnectDevice( TQString deviceName ); + bool connected( TQString deviceName ); - TQString tqdeviceClassName( TQString tqdeviceName ); - TQString tqdeviceName( TQString tqdeviceName ); - TQString revision( TQString tqdeviceName ); - int classType( TQString tqdeviceName ); + TQString deviceClassName( TQString deviceName ); + TQString deviceName( TQString deviceName ); + TQString revision( TQString deviceName ); + int classType( TQString deviceName ); - int capabilities( TQString tqdeviceName ); - TQString nameForCap( TQString tqdeviceName, int cap ); + int capabilities( TQString deviceName ); + TQString nameForCap( TQString deviceName, int cap ); - TQString iconFileName( TQString tqdeviceName ); + TQString iconFileName( TQString deviceName ); - int numAddresses( TQString tqdeviceName ); - TQString readAddress( TQString tqdeviceName, int index ); - bool storeAddress( TQString tqdeviceName, int index, TQString vcard, bool append ); + int numAddresses( TQString deviceName ); + TQString readAddress( TQString deviceName, int index ); + bool storeAddress( TQString deviceName, int index, TQString vcard, bool append ); - int numCalendarEntries( TQString tqdeviceName ); + int numCalendarEntries( TQString deviceName ); - int numNotes( TQString tqdeviceName ); - TQString readNote( TQString tqdeviceName, int index ); - bool storeNote( TQString tqdeviceName, int index, TQString note ); + int numNotes( TQString deviceName ); + TQString readNote( TQString deviceName, int index ); + bool storeNote( TQString deviceName, int index, TQString note ); private: TQCString m_clientAppId; diff --git a/kmobile/kmobiledevice.cpp b/kmobile/kmobiledevice.cpp index a4d807da0..36c6bacb7 100644 --- a/kmobile/kmobiledevice.cpp +++ b/kmobile/kmobiledevice.cpp @@ -44,7 +44,7 @@ #define PRINT_DEBUG kdDebug(KMOBILEDEVICE_DEBUG_AREA) << "KMobileDevice: " /** - * The base plugin class of all mobile tqdevice drivers. + * The base plugin class of all mobile device drivers. */ KMobileDevice::KMobileDevice(TQObject *obj, const char *name, const TQStringList &args) @@ -53,8 +53,8 @@ KMobileDevice::KMobileDevice(TQObject *obj, const char *name, const TQStringList { setClassType(Unclassified); setCapabilities(hasNothing); - m_tqdeviceName = i18n("Unknown Device"); - m_tqdeviceRevision = i18n("n/a"); /* not available */ + m_deviceName = i18n("Unknown Device"); + m_deviceRevision = i18n("n/a"); /* not available */ m_connectionName = i18n("Unknown Connection"); // set the config file name @@ -63,7 +63,7 @@ KMobileDevice::KMobileDevice(TQObject *obj, const char *name, const TQStringList m_config = new KConfig(); else m_config = new KConfig(m_configFileName); - PRINT_DEBUG << TQString("name of config file is %1\n").tqarg(m_configFileName); + PRINT_DEBUG << TQString("name of config file is %1\n").arg(m_configFileName); } KMobileDevice::~KMobileDevice() @@ -78,20 +78,20 @@ bool KMobileDevice::connected() } // returns e.g. "Nokia mobile phone", "MP3 Player", "Handspring Organizer" -TQString KMobileDevice::tqdeviceClassName() const +TQString KMobileDevice::deviceClassName() const { - return m_tqdeviceClassName; + return m_deviceClassName; } -// returns real tqdevice name, e.g. "Nokia 6310" or "Rio MP3 Player" -TQString KMobileDevice::tqdeviceName() const +// returns real device name, e.g. "Nokia 6310" or "Rio MP3 Player" +TQString KMobileDevice::deviceName() const { - return m_tqdeviceName; + return m_deviceName; } TQString KMobileDevice::revision() const { - return m_tqdeviceRevision; + return m_deviceRevision; } bool KMobileDevice::isSlowDevice() const @@ -107,15 +107,15 @@ bool KMobileDevice::isReadOnly() const bool KMobileDevice::configDialog( TQWidget *parent ) { KMessageBox::information( parent, - i18n("This tqdevice does not need any configuration."), - tqdeviceName() ); + i18n("This device does not need any configuration."), + deviceName() ); return true; } void KMobileDevice::setClassType( enum ClassType ct ) { m_classType = ct; - m_tqdeviceClassName = defaultClassName(ct); + m_deviceClassName = defaultClassName(ct); } enum KMobileDevice::ClassType KMobileDevice::classType() const @@ -239,7 +239,7 @@ int KMobileDevice::storeNote( int, const TQString & ) /* * File storage support - * @param fileName path and name of a file in the mobile tqdevice, e.g. "/MYFILE.TXT", "/mp3/song1.mp3" + * @param fileName path and name of a file in the mobile device, e.g. "/MYFILE.TXT", "/mp3/song1.mp3" */ static @@ -260,7 +260,7 @@ void KMobileDevice::createDirEntry(KIO::UDSEntry& entry, const TQString& name, c addAtom(entry, KIO::UDS_ACCESS, 0500); addAtom(entry, KIO::UDS_MIME_TYPE, 0, mime); addAtom(entry, KIO::UDS_URL, 0, url); - PRINT_DEBUG << TQString("createDirEntry: File: %1 MIME: %2 URL: %3\n").tqarg(name).tqarg(mime).tqarg(url); + PRINT_DEBUG << TQString("createDirEntry: File: %1 MIME: %2 URL: %3\n").arg(name).arg(mime).arg(url); // addAtom(entry, KIO::UDS_SIZE, 0); addAtom(entry, KIO::UDS_GUESSED_MIME_TYPE, 0, mime); } @@ -276,7 +276,7 @@ void KMobileDevice::createFileEntry(KIO::UDSEntry& entry, const TQString& name, addAtom(entry, KIO::UDS_MIME_TYPE, 0, mime); if (size) addAtom(entry, KIO::UDS_SIZE, size); addAtom(entry, KIO::UDS_GUESSED_MIME_TYPE, 0, mime); - PRINT_DEBUG << TQString("createFileEntry: File: %1, Size: %2, MIME: %3\n").tqarg(name).tqarg(size).tqarg(mime); + PRINT_DEBUG << TQString("createFileEntry: File: %1, Size: %2, MIME: %3\n").arg(name).arg(size).arg(mime); } @@ -339,7 +339,7 @@ void KMobileDevice::special( const TQByteArray & ) /* - * tqdevice locking/unlocking functions + * device locking/unlocking functions */ #ifdef HAVE_BAUDBOY_H @@ -374,7 +374,7 @@ void KMobileDevice::special( const TQByteArray & ) #define DEVICE_LOCK_PATH_PREFIX "/var/lock/LCK.." -bool KMobileDevice::lockDevice(const TQString &tqdevice, TQString &err_reason) +bool KMobileDevice::lockDevice(const TQString &device, TQString &err_reason) { #ifdef HAVE_BAUDBOY_H return ttylock(device.local8bit()) == EXIT_SUCCESS; @@ -383,9 +383,9 @@ bool KMobileDevice::lockDevice(const TQString &tqdevice, TQString &err_reason) return !dev_lock(device.local8bit()); # else int pid = -1; - TQStringList all = TQStringList::split('/', tqdevice); + TQStringList all = TQStringList::split('/', device); if (!all.count()) { - err_reason = i18n("Invalid tqdevice (%1)").tqarg(tqdevice); + err_reason = i18n("Invalid device (%1)").arg(device); return false; } TQString lockName = DEVICE_LOCK_PATH_PREFIX + all[all.count()-1]; @@ -393,7 +393,7 @@ bool KMobileDevice::lockDevice(const TQString &tqdevice, TQString &err_reason) if (file.exists() && file.open(IO_ReadOnly)) { if (file.size() == 0) { err_reason = i18n("Unable to read lockfile %s. Please check for reason and " - "remove the lockfile by hand.").tqarg(lockName); + "remove the lockfile by hand.").arg(lockName); PRINT_DEBUG << err_reason; return false; } @@ -406,16 +406,16 @@ bool KMobileDevice::lockDevice(const TQString &tqdevice, TQString &err_reason) file.close(); if (pid > 0 && kill((pid_t)pid, 0) < 0 && errno == ESRCH) { - PRINT_DEBUG << TQString("Lockfile %1 is stale. Overriding it..\n").tqarg(lockName); + PRINT_DEBUG << TQString("Lockfile %1 is stale. Overriding it..\n").arg(lockName); sleep(1); if (!file.remove()) { PRINT_DEBUG << TQString("Overriding failed, please check the permissions\n"); - PRINT_DEBUG << TQString("Cannot lock tqdevice %1\n").tqarg(tqdevice); - err_reason = i18n("Lockfile %1 is stale. Please check permissions.").tqarg(lockName); + PRINT_DEBUG << TQString("Cannot lock device %1\n").arg(device); + err_reason = i18n("Lockfile %1 is stale. Please check permissions.").arg(lockName); return false; } } else { - err_reason = i18n("Device %1 already locked.").tqarg(tqdevice); + err_reason = i18n("Device %1 already locked.").arg(device); return false; } } @@ -424,22 +424,22 @@ bool KMobileDevice::lockDevice(const TQString &tqdevice, TQString &err_reason) int fd = open(lockName.local8Bit(), O_CREAT | O_EXCL | O_WRONLY, 0644); if (fd == -1) { if (errno == EEXIST) - err_reason = i18n("Device %1 seems to be locked by unknown process.").tqarg(tqdevice); + err_reason = i18n("Device %1 seems to be locked by unknown process.").arg(device); else if (errno == EACCES) err_reason = i18n("Please check permission on lock directory."); else if (errno == ENOENT) - err_reason = i18n("Cannot create lockfile %1. Please check for existence of path.").tqarg(lockName); + err_reason = i18n("Cannot create lockfile %1. Please check for existence of path.").arg(lockName); else - err_reason = i18n("Could not create lockfile %1. Error-Code is %2.").tqarg(lockName).tqarg(errno); + err_reason = i18n("Could not create lockfile %1. Error-Code is %2.").arg(lockName).arg(errno); return false; } TQString lockText; - lockText = TQString("%1 kmobile\n").tqarg(getpid(),10); + lockText = TQString("%1 kmobile\n").arg(getpid(),10); write(fd, lockText.utf8(), lockText.utf8().length()); close(fd); PRINT_DEBUG << TQString("%1: Device %2 locked with lockfile %3.\n") - .tqarg(tqdeviceName()).tqarg(tqdevice).tqarg(lockName); + .arg(deviceName()).arg(device).arg(lockName); err_reason = TQString(); @@ -448,7 +448,7 @@ bool KMobileDevice::lockDevice(const TQString &tqdevice, TQString &err_reason) #endif } -bool KMobileDevice::unlockDevice(const TQString &tqdevice) +bool KMobileDevice::unlockDevice(const TQString &device) { #ifdef HAVE_BAUDBOY_H return ttyunlock(device.local8bit()) == EXIT_SUCCESS; @@ -456,7 +456,7 @@ bool KMobileDevice::unlockDevice(const TQString &tqdevice) # ifdef HAVE_LOCKDEV_H return 0 <= dev_unlock(device.local8bit(), getpid()); # else - TQStringList all = TQStringList::split('/', tqdevice); + TQStringList all = TQStringList::split('/', device); if (!all.count()) return false; TQString lockName = DEVICE_LOCK_PATH_PREFIX + all[all.count()-1]; TQFile file(lockName); diff --git a/kmobile/kmobiledevice.h b/kmobile/kmobiledevice.h index 94b73b77e..b0b1a6540 100644 --- a/kmobile/kmobiledevice.h +++ b/kmobile/kmobiledevice.h @@ -37,20 +37,20 @@ class KConfig; -#define KMOBILE_MIMETYPE_DEVICE "kdetqdevice/mobiletqdevice" -#define KMOBILE_MIMETYPE_DEVICE_KONTQUEROR(name) TQString("kdetqdevice/kmobile_%1").tqarg(name) +#define KMOBILE_MIMETYPE_DEVICE "kdedevice/mobiledevice" +#define KMOBILE_MIMETYPE_DEVICE_KONTQUEROR(name) TQString("kdedevice/kmobile_%1").arg(name) #define KMOBILE_MIMETYPE_INODE "inode/" #define KMOBILE_ICON_UNKNOWN "mobile_unknown" /** - * @short Represents the base class for dynamically loaded mobile tqdevice drivers. + * @short Represents the base class for dynamically loaded mobile device drivers. * - * KMobileDevice is the base class for all hardware tqdevice drivers. + * KMobileDevice is the base class for all hardware device drivers. * Every derived class has to add additional functionality. * * For a KMobileSomeDevice driver you have to write the following code: * <pre> - * K_EXPORT_COMPONENT_FACTORY( libkmobile_sometqdevice, KMobileSomeDevice() ); + * K_EXPORT_COMPONENT_FACTORY( libkmobile_somedevice, KMobileSomeDevice() ); * TQObject *KMobileSomeDevice::createObject( TQObject *parent, const char *name, * const char *, const TQStringList &args ) * { @@ -95,34 +95,34 @@ public: virtual bool disconnectDevice( TQWidget *parent = 0 ) = 0; /** - * Returns true, if the tqdevice is currently connected and the link is online. + * Returns true, if the device is currently connected and the link is online. */ virtual bool connected(); /** - * Returns the classname, to which the tqdevice belongs. Examples are e.g. + * Returns the classname, to which the device belongs. Examples are e.g. * "Nokia mobile phone", "MP3 Player", "Handspring Organizer" */ - virtual TQString tqdeviceClassName() const; + virtual TQString deviceClassName() const; /** - * Returns the real tqdevices name, e.g. "Nokia 6310" or "Rio MP3 Player" + * Returns the real devices name, e.g. "Nokia 6310" or "Rio MP3 Player" */ - virtual TQString tqdeviceName() const; + virtual TQString deviceName() const; /** - * Returns the hardware revision of the tqdevices, e.g. "Revision 1.2" + * Returns the hardware revision of the devices, e.g. "Revision 1.2" */ virtual TQString revision() const; /** - * Returns an unique ID for the tqdevice, e.g. IMEI number on phones, or serial number. + * Returns an unique ID for the device, e.g. IMEI number on phones, or serial number. * The returned String is used to have a unique identification for syncronisation. */ - virtual TQString tqdeviceUniqueID() = 0; + virtual TQString deviceUniqueID() = 0; /** - * Returns true, if the tqdevice is connected via a slow connection. + * Returns true, if the device is connected via a slow connection. * Good examples for slow connections are serial or infrared ports. */ virtual bool isSlowDevice() const; @@ -133,7 +133,7 @@ public: virtual bool isReadOnly() const; /** - * Pop-up a tqdevice-specific configuration dialog. + * Pop-up a device-specific configuration dialog. * * @param parent The parent widget. It will be used as parent for the configuration dialog. */ @@ -158,14 +158,14 @@ public: static TQString defaultIconFileName( ClassType ct = Unclassified ); static TQString defaultClassName( ClassType ct = Unclassified ); - // The capabilities of this tqdevice (bitmapped value) + // The capabilities of this device (bitmapped value) enum Capabilities { hasNothing = 0, // not supported hasAddressBook = 1, // mobile phones, organizers, ... hasCalendar = 2, // organizers, mobile phones, ... hasNotes = 4, // organizers, mobile phones, ... hasFileStorage = 8, // organizers, handhelds, mp3-player, ... - hasAnyCapability = 0xffff // used to select tqdevices independent of the capatibilities + hasAnyCapability = 0xffff // used to select devices independent of the capatibilities }; int capabilities() const; const TQString nameForCap(int cap) const; @@ -206,7 +206,7 @@ public: */ /** - * helper functions for the kmobile tqdevice drivers + * helper functions for the kmobile device drivers */ void createDirEntry(KIO::UDSEntry& entry, const TQString& name, const TQString& url, const TQString& mime) const; @@ -471,7 +471,7 @@ signals: void connectionChanged( bool conn_established ); protected: - // only available to sub-classed tqdevice drivers: + // only available to sub-classed device drivers: void setClassType( enum ClassType ct ); void setCapabilities( int caps ); KConfig *config() const { return m_config; }; @@ -479,21 +479,21 @@ protected: /** - * Lock/Unlock serial ports and other tqdevices - * @param tqdevice Name of a tqdevice port (e.g. /dev/ttyS1, ttyS1, /dev/ircomm0) - * Returns true, if tqdevice could be locked or unlocked + * Lock/Unlock serial ports and other devices + * @param device Name of a device port (e.g. /dev/ttyS1, ttyS1, /dev/ircomm0) + * Returns true, if device could be locked or unlocked */ - bool lockDevice(const TQString &tqdevice, TQString &err_reason); - bool unlockDevice(const TQString &tqdevice); + bool lockDevice(const TQString &device, TQString &err_reason); + bool unlockDevice(const TQString &device); protected: - TQMutex m_mutex; // mutex to syncronize DCOP accesses to this tqdevice + TQMutex m_mutex; // mutex to syncronize DCOP accesses to this device TQString m_configFileName; - KConfig *m_config; // this is where this tqdevice should store it's configuration + KConfig *m_config; // this is where this device should store it's configuration enum ClassType m_classType; - TQString m_tqdeviceClassName; // e.g. "Nokia mobile phone", "MP3 Player", "Handspring Organizer" - TQString m_tqdeviceName; // e.g. "Nokia 6310", "Opie" - TQString m_tqdeviceRevision; // e.g. "Revision 1.2" or "n/a" + TQString m_deviceClassName; // e.g. "Nokia mobile phone", "MP3 Player", "Handspring Organizer" + TQString m_deviceName; // e.g. "Nokia 6310", "Opie" + TQString m_deviceRevision; // e.g. "Revision 1.2" or "n/a" TQString m_connectionName; // e.g. "IRDA", "USB", "Cable", "gnokii", "gammu", ... int m_caps; // see enum Capabilities bool m_connected; diff --git a/kmobile/kmobileiface.h b/kmobile/kmobileiface.h index 5d39f236c..60974b268 100644 --- a/kmobile/kmobileiface.h +++ b/kmobile/kmobileiface.h @@ -16,40 +16,40 @@ class kmobileIface : virtual public DCOPObject public: k_dcop: - virtual TQStringList tqdeviceNames() = 0; + virtual TQStringList deviceNames() = 0; - virtual void removeDevice( TQString tqdeviceName ) = 0; - virtual void configDevice( TQString tqdeviceName ) = 0; + virtual void removeDevice( TQString deviceName ) = 0; + virtual void configDevice( TQString deviceName ) = 0; - virtual bool connectDevice( TQString tqdeviceName ) = 0; - virtual bool disconnectDevice( TQString tqdeviceName ) = 0; - virtual bool connected( TQString tqdeviceName ) = 0; + virtual bool connectDevice( TQString deviceName ) = 0; + virtual bool disconnectDevice( TQString deviceName ) = 0; + virtual bool connected( TQString deviceName ) = 0; - virtual TQString tqdeviceClassName( TQString tqdeviceName ) = 0; - virtual TQString tqdeviceName( TQString tqdeviceName ) = 0; - virtual TQString revision( TQString tqdeviceName ) = 0; - virtual int classType( TQString tqdeviceName ) = 0; + virtual TQString deviceClassName( TQString deviceName ) = 0; + virtual TQString deviceName( TQString deviceName ) = 0; + virtual TQString revision( TQString deviceName ) = 0; + virtual int classType( TQString deviceName ) = 0; - virtual int capabilities( TQString tqdeviceName ) = 0; - virtual TQString nameForCap( TQString tqdeviceName, int cap ) = 0; + virtual int capabilities( TQString deviceName ) = 0; + virtual TQString nameForCap( TQString deviceName, int cap ) = 0; - virtual TQString iconFileName( TQString tqdeviceName ) = 0; + virtual TQString iconFileName( TQString deviceName ) = 0; - virtual int numAddresses( TQString tqdeviceName ) = 0; - virtual TQString readAddress( TQString tqdeviceName, int index ) = 0; - virtual bool storeAddress( TQString tqdeviceName, int index, TQString vcard, bool append ) = 0; + virtual int numAddresses( TQString deviceName ) = 0; + virtual TQString readAddress( TQString deviceName, int index ) = 0; + virtual bool storeAddress( TQString deviceName, int index, TQString vcard, bool append ) = 0; - virtual int numCalendarEntries( TQString tqdeviceName ) = 0; + virtual int numCalendarEntries( TQString deviceName ) = 0; - virtual int numNotes( TQString tqdeviceName ) = 0; - virtual TQString readNote( TQString tqdeviceName, int index ) = 0; - virtual bool storeNote( TQString tqdeviceName, int index, TQString note ) = 0; + virtual int numNotes( TQString deviceName ) = 0; + virtual TQString readNote( TQString deviceName, int index ) = 0; + virtual bool storeNote( TQString deviceName, int index, TQString note ) = 0; /* - * DCOP functions for the tqdevices:/ kioslave + * DCOP functions for the devices:/ kioslave */ k_dcop: - virtual TQStringList kio_tqdevices_tqdeviceInfo(TQString tqdeviceName) = 0; + virtual TQStringList kio_devices_deviceInfo(TQString deviceName) = 0; }; #endif // _KMOBILEIFACE_H_ diff --git a/kmobile/kmobileitem.cpp b/kmobile/kmobileitem.cpp index 3778f1c16..d895a3666 100644 --- a/kmobile/kmobileitem.cpp +++ b/kmobile/kmobileitem.cpp @@ -37,9 +37,9 @@ KMobileItem::KMobileItem(TQIconView *parent, KConfig *_config, KService::Ptr ser Q_CHECK_PTR(service); if (service) { setText(service->name()); - m_tqdeviceDesktopFile = service->desktopEntryName(); - m_tqdeviceConfigFile = TQString("kmobile_%1_rc").tqarg(text()); - m_tqdeviceConfigFile = m_tqdeviceConfigFile.replace(' ', ""); + m_deviceDesktopFile = service->desktopEntryName(); + m_deviceConfigFile = TQString("kmobile_%1_rc").arg(text()); + m_deviceConfigFile = m_deviceConfigFile.replace(' ', ""); m_iconName = service->icon(); }; @@ -75,8 +75,8 @@ void KMobileItem::configSave() const { config->setGroup( config_SectionName() ); config->writeEntry( "Name", text() ); - config->writeEntry( "Config", m_tqdeviceConfigFile ); - config->writeEntry( "DesktopFile", m_tqdeviceDesktopFile ); + config->writeEntry( "Config", m_deviceConfigFile ); + config->writeEntry( "DesktopFile", m_deviceDesktopFile ); config->writeEntry( "IconName", m_iconName ); config->sync(); } @@ -85,12 +85,12 @@ bool KMobileItem::configLoad(int idx) { config->setGroup( config_SectionName(idx) ); setText( config->readEntry("Name") ); - m_tqdeviceConfigFile = config->readEntry( "Config" ); - m_tqdeviceDesktopFile = config->readEntry( "DesktopFile" ); + m_deviceConfigFile = config->readEntry( "Config" ); + m_deviceDesktopFile = config->readEntry( "DesktopFile" ); m_iconName = config->readEntry( "IconName" ); - if (text().isEmpty() || m_tqdeviceConfigFile.isEmpty() || - m_tqdeviceDesktopFile.isEmpty() || m_iconName.isEmpty() ) + if (text().isEmpty() || m_deviceConfigFile.isEmpty() || + m_deviceDesktopFile.isEmpty() || m_iconName.isEmpty() ) return false; return true; @@ -104,7 +104,7 @@ TQPixmap KMobileItem::getIcon() const TQString KMobileItem::config_SectionName(int idx) const { if (idx == -1) idx = index(); - return TQString("MobileDevice_%1").tqarg(idx); + return TQString("MobileDevice_%1").arg(idx); } /* this MimeType is used by konqueror */ @@ -125,7 +125,7 @@ void KMobileItem::writeKonquMimeFile() const TQString comment; if (m_dev) - comment = m_dev->tqdeviceClassName(); + comment = m_dev->deviceClassName(); if (comment.isEmpty()) comment = KMobileDevice::defaultClassName(KMobileDevice::Unclassified); @@ -142,7 +142,7 @@ void KMobileItem::writeKonquMimeFile() const /* - * get a list of all services providing a libkmobile tqdevice driver + * get a list of all services providing a libkmobile device driver */ KTrader::OfferList KMobileItem::getMobileDevicesList() { @@ -158,16 +158,16 @@ KService::Ptr KMobileItem::getServicePtr() const KService::Ptr ptr; for ( it = list.begin(); it != list.end(); ++it ) { KService::Ptr ptr = *it; - if (ptr->desktopEntryName() == m_tqdeviceDesktopFile) + if (ptr->desktopEntryName() == m_deviceDesktopFile) return ptr; } PRINT_DEBUG << TQString("Service for library '%1' not found in KService list\n") - .tqarg(m_tqdeviceDesktopFile); + .arg(m_deviceDesktopFile); return 0L; } /* - * loads & initializes the tqdevice and returns a pointer to it. + * loads & initializes the device and returns a pointer to it. */ bool KMobileItem::driverAvailable() { @@ -178,15 +178,15 @@ bool KMobileItem::driverAvailable() if (!ptr) return false; - PRINT_DEBUG << TQString("Loading library %1\n").tqarg(ptr->library()); + PRINT_DEBUG << TQString("Loading library %1\n").arg(ptr->library()); KLibFactory *factory = KLibLoader::self()->factory( ptr->library().utf8() ); if (!factory) return false; m_dev = static_cast<KMobileDevice *>(factory->create(this, ptr->name().utf8(), - "KMobileDevice", TQStringList(m_tqdeviceConfigFile))); + "KMobileDevice", TQStringList(m_deviceConfigFile))); PRINT_DEBUG << TQString("Got KMobileDevice object at 0x%1, configfile=%2\n") - .tqarg((unsigned long)m_dev, 0, 16).tqarg(m_tqdeviceConfigFile); + .arg((unsigned long)m_dev, 0, 16).arg(m_deviceConfigFile); return (m_dev != 0); } diff --git a/kmobile/kmobileitem.h b/kmobile/kmobileitem.h index e82a5cb15..ba2042659 100644 --- a/kmobile/kmobileitem.h +++ b/kmobile/kmobileitem.h @@ -44,8 +44,8 @@ private slots: private: KConfig *config; - TQString m_tqdeviceConfigFile; - TQString m_tqdeviceDesktopFile; + TQString m_deviceConfigFile; + TQString m_deviceDesktopFile; TQString m_iconName; }; diff --git a/kmobile/kmobileui.rc b/kmobile/kmobileui.rc index 9b259334a..95af1dd3b 100644 --- a/kmobile/kmobileui.rc +++ b/kmobile/kmobileui.rc @@ -8,22 +8,22 @@ </Menu> <Menu name="Device"> <text>&Device</text> - <Action name="tqdevice_add" /> - <Action name="tqdevice_remove" /> + <Action name="device_add" /> + <Action name="device_remove" /> <Separator/> - <Action name="tqdevice_rename" /> - <Action name="tqdevice_changeicon" /> + <Action name="device_rename" /> + <Action name="device_changeicon" /> <Separator/> - <Action name="tqdevice_configure" /> + <Action name="device_configure" /> </Menu> </MenuBar> <ToolBar noMerge="1" name="mainToolBar" fullWidth="true" > <text>Main Toolbar</text> <Action name="file_save" /> <Separator/> - <Action name="tqdevice_add" /> - <Action name="tqdevice_remove" /> + <Action name="device_add" /> + <Action name="device_remove" /> <Separator/> - <Action name="tqdevice_configure"/> + <Action name="device_configure"/> </ToolBar> </kpartgui> diff --git a/kmobile/kmobileview.cpp b/kmobile/kmobileview.cpp index 26ac4d0b3..3770dc0dd 100644 --- a/kmobile/kmobileview.cpp +++ b/kmobile/kmobileview.cpp @@ -49,10 +49,10 @@ KMobileView::~KMobileView() bool KMobileView::addNewDevice(KConfig *config, KService::Ptr service) { - kdDebug() << "New mobile tqdevice item:\n"; + kdDebug() << "New mobile device item:\n"; kdDebug() << TQString("LIBRARY: '%1', NAME: '%2', ICON: '%3', COMMENT: '%4'\n") - .tqarg(service->library()).tqarg(service->name()).tqarg(service->icon()) - .tqarg(service->comment()); + .arg(service->library()).arg(service->name()).arg(service->icon()) + .arg(service->comment()); KMobileItem *it; it = new KMobileItem(this, config, service); @@ -89,10 +89,10 @@ void KMobileView::restoreAll() emit signalChangeStatusbar( i18n("Configuration restored") ); } -KMobileItem *KMobileView::findDevice( const TQString &tqdeviceName ) const +KMobileItem *KMobileView::findDevice( const TQString &deviceName ) const { for ( TQIconViewItem *item = firstItem(); item; item = item->nextItem() ) { - if (item->text() == tqdeviceName) + if (item->text() == deviceName) return static_cast<KMobileItem *>(item); } return 0L; @@ -119,7 +119,7 @@ void KMobileView::slotDoubleClicked( TQIconViewItem * item ) #define MUTEX_UNLOCK(dev) dev->m_mutex.unlock(); } -TQStringList KMobileView::tqdeviceNames() +TQStringList KMobileView::deviceNames() { TQStringList names; for ( TQIconViewItem *item = firstItem(); item; item = item->nextItem() ) { @@ -128,15 +128,15 @@ TQStringList KMobileView::tqdeviceNames() return names; } -void KMobileView::removeDevice( TQString tqdeviceName ) +void KMobileView::removeDevice( TQString deviceName ) { - delete findDevice(tqdeviceName); - emit signalChangeStatusbar( i18n("%1 removed").tqarg(tqdeviceName) ); + delete findDevice(deviceName); + emit signalChangeStatusbar( i18n("%1 removed").arg(deviceName) ); } -void KMobileView::configDevice( TQString tqdeviceName ) +void KMobileView::configDevice( TQString deviceName ) { - KMobileItem *dev = findDevice(tqdeviceName); + KMobileItem *dev = findDevice(deviceName); if (!dev || !dev->driverAvailable()) return; MUTEX_LOCK(dev->m_dev); @@ -145,9 +145,9 @@ void KMobileView::configDevice( TQString tqdeviceName ) } -bool KMobileView::connectDevice( TQString tqdeviceName ) +bool KMobileView::connectDevice( TQString deviceName ) { - KMobileItem *dev = findDevice(tqdeviceName); + KMobileItem *dev = findDevice(deviceName); if (!dev || !dev->driverAvailable()) return false; bool connected; @@ -155,14 +155,14 @@ bool KMobileView::connectDevice( TQString tqdeviceName ) connected = dev->m_dev->connectDevice(); MUTEX_UNLOCK(dev->m_dev); emit signalChangeStatusbar( - connected ? i18n("Connection to %1 established").tqarg(tqdeviceName) - : i18n("Connection to %1 failed").tqarg(tqdeviceName) ); + connected ? i18n("Connection to %1 established").arg(deviceName) + : i18n("Connection to %1 failed").arg(deviceName) ); return connected; } -bool KMobileView::disconnectDevice( TQString tqdeviceName ) +bool KMobileView::disconnectDevice( TQString deviceName ) { - KMobileItem *dev = findDevice(tqdeviceName); + KMobileItem *dev = findDevice(deviceName); if (!dev || !dev->driverAvailable()) return true; bool disconnected; @@ -170,14 +170,14 @@ bool KMobileView::disconnectDevice( TQString tqdeviceName ) disconnected = dev->m_dev->disconnectDevice(); MUTEX_UNLOCK(dev->m_dev); emit signalChangeStatusbar( - disconnected ? i18n("%1 disconnected").tqarg(tqdeviceName) - : i18n("Disconnection of %1 failed").tqarg(tqdeviceName) ); + disconnected ? i18n("%1 disconnected").arg(deviceName) + : i18n("Disconnection of %1 failed").arg(deviceName) ); return disconnected; } -bool KMobileView::connected( TQString tqdeviceName ) +bool KMobileView::connected( TQString deviceName ) { - KMobileItem *dev = findDevice(tqdeviceName); + KMobileItem *dev = findDevice(deviceName); if (!dev || !dev->driverAvailable()) return false; bool conn; @@ -188,33 +188,33 @@ bool KMobileView::connected( TQString tqdeviceName ) } -TQString KMobileView::tqdeviceClassName( TQString tqdeviceName ) +TQString KMobileView::deviceClassName( TQString deviceName ) { - KMobileItem *dev = findDevice(tqdeviceName); + KMobileItem *dev = findDevice(deviceName); if (!dev || !dev->driverAvailable()) return TQString(); TQString cn; MUTEX_LOCK(dev->m_dev); - cn = dev->m_dev->tqdeviceClassName(); + cn = dev->m_dev->deviceClassName(); MUTEX_UNLOCK(dev->m_dev); return cn; } -TQString KMobileView::tqdeviceName( TQString tqdeviceName ) +TQString KMobileView::deviceName( TQString deviceName ) { - KMobileItem *dev = findDevice(tqdeviceName); + KMobileItem *dev = findDevice(deviceName); if (!dev || !dev->driverAvailable()) return TQString(); TQString dn; MUTEX_LOCK(dev->m_dev); - dn = dev->m_dev->tqdeviceName(); + dn = dev->m_dev->deviceName(); MUTEX_UNLOCK(dev->m_dev); return dn; } -TQString KMobileView::revision( TQString tqdeviceName ) +TQString KMobileView::revision( TQString deviceName ) { - KMobileItem *dev = findDevice(tqdeviceName); + KMobileItem *dev = findDevice(deviceName); if (!dev || !dev->driverAvailable()) return TQString(); TQString rev; @@ -224,9 +224,9 @@ TQString KMobileView::revision( TQString tqdeviceName ) return rev; } -int KMobileView::classType( TQString tqdeviceName ) +int KMobileView::classType( TQString deviceName ) { - KMobileItem *dev = findDevice(tqdeviceName); + KMobileItem *dev = findDevice(deviceName); if (!dev || !dev->driverAvailable()) return KMobileDevice::Unclassified; int ct; @@ -236,9 +236,9 @@ int KMobileView::classType( TQString tqdeviceName ) return ct; } -int KMobileView::capabilities( TQString tqdeviceName ) +int KMobileView::capabilities( TQString deviceName ) { - KMobileItem *dev = findDevice(tqdeviceName); + KMobileItem *dev = findDevice(deviceName); if (!dev || !dev->driverAvailable()) return KMobileDevice::hasNothing; int cap; @@ -248,9 +248,9 @@ int KMobileView::capabilities( TQString tqdeviceName ) return cap; } -TQString KMobileView::nameForCap( TQString tqdeviceName, int cap ) +TQString KMobileView::nameForCap( TQString deviceName, int cap ) { - KMobileItem *dev = findDevice(tqdeviceName); + KMobileItem *dev = findDevice(deviceName); if (!dev || !dev->driverAvailable()) return TQString(); TQString nc; @@ -260,9 +260,9 @@ TQString KMobileView::nameForCap( TQString tqdeviceName, int cap ) return nc; } -TQString KMobileView::iconFileName( TQString tqdeviceName ) +TQString KMobileView::iconFileName( TQString deviceName ) { - KMobileItem *dev = findDevice(tqdeviceName); + KMobileItem *dev = findDevice(deviceName); if (!dev || !dev->driverAvailable()) return TQString(); TQString fn; @@ -272,9 +272,9 @@ TQString KMobileView::iconFileName( TQString tqdeviceName ) return fn; } -int KMobileView::numAddresses( TQString tqdeviceName ) +int KMobileView::numAddresses( TQString deviceName ) { - KMobileItem *dev = findDevice(tqdeviceName); + KMobileItem *dev = findDevice(deviceName); if (!dev || !dev->driverAvailable()) return 0; int num; @@ -284,9 +284,9 @@ int KMobileView::numAddresses( TQString tqdeviceName ) return num; } -TQString KMobileView::readAddress( TQString tqdeviceName, int index ) +TQString KMobileView::readAddress( TQString deviceName, int index ) { - KMobileItem *dev = findDevice(tqdeviceName); + KMobileItem *dev = findDevice(deviceName); if (!dev || !dev->driverAvailable()) return TQString(); @@ -304,14 +304,14 @@ TQString KMobileView::readAddress( TQString tqdeviceName, int index ) return TQString(); emit signalChangeStatusbar( i18n("Read addressbook entry %1 from %2") - .tqarg(index).tqarg(tqdeviceName) ); + .arg(index).arg(deviceName) ); return str; } -bool KMobileView::storeAddress( TQString tqdeviceName, int index, TQString vcard, bool append ) +bool KMobileView::storeAddress( TQString deviceName, int index, TQString vcard, bool append ) { - KMobileItem *dev = findDevice(tqdeviceName); + KMobileItem *dev = findDevice(deviceName); if (!dev || !dev->driverAvailable()) return false; @@ -325,14 +325,14 @@ bool KMobileView::storeAddress( TQString tqdeviceName, int index, TQString vcard err = dev->m_dev->storeAddress(index, adr, append); MUTEX_UNLOCK(dev->m_dev); emit signalChangeStatusbar( - err ? i18n("Storing contact %1 on %2 failed").tqarg(index).tqarg(tqdeviceName) - : i18n("Contact %1 stored on %2").tqarg(index).tqarg(tqdeviceName) ); + err ? i18n("Storing contact %1 on %2 failed").arg(index).arg(deviceName) + : i18n("Contact %1 stored on %2").arg(index).arg(deviceName) ); return (err == 0); } -int KMobileView::numCalendarEntries( TQString tqdeviceName ) +int KMobileView::numCalendarEntries( TQString deviceName ) { - KMobileItem *dev = findDevice(tqdeviceName); + KMobileItem *dev = findDevice(deviceName); if (!dev || !dev->driverAvailable()) return 0; int num; @@ -342,9 +342,9 @@ int KMobileView::numCalendarEntries( TQString tqdeviceName ) return num; } -int KMobileView::numNotes( TQString tqdeviceName ) +int KMobileView::numNotes( TQString deviceName ) { - KMobileItem *dev = findDevice(tqdeviceName); + KMobileItem *dev = findDevice(deviceName); if (!dev || !dev->driverAvailable()) return 0; int num; @@ -354,9 +354,9 @@ int KMobileView::numNotes( TQString tqdeviceName ) return num; } -TQString KMobileView::readNote( TQString tqdeviceName, int index ) +TQString KMobileView::readNote( TQString deviceName, int index ) { - KMobileItem *dev = findDevice(tqdeviceName); + KMobileItem *dev = findDevice(deviceName); if (!dev || !dev->driverAvailable()) return TQString(); @@ -368,13 +368,13 @@ TQString KMobileView::readNote( TQString tqdeviceName, int index ) if (err) return TQString(); emit signalChangeStatusbar( i18n("Read note %1 from %2") - .tqarg(index).tqarg(tqdeviceName) ); + .arg(index).arg(deviceName) ); return note; } -bool KMobileView::storeNote( TQString tqdeviceName, int index, TQString note ) +bool KMobileView::storeNote( TQString deviceName, int index, TQString note ) { - KMobileItem *dev = findDevice(tqdeviceName); + KMobileItem *dev = findDevice(deviceName); if (!dev || !dev->driverAvailable()) return false; @@ -385,28 +385,28 @@ bool KMobileView::storeNote( TQString tqdeviceName, int index, TQString note ) if (err) return false; emit signalChangeStatusbar( i18n("Stored note %1 to %2") - .tqarg(index).tqarg(tqdeviceName) ); + .arg(index).arg(deviceName) ); return true; } /* - * DCOP Implementation for the tqdevices:/ kioslave + * DCOP Implementation for the devices:/ kioslave */ /* - * returns the information for the given tqdeviceName for usage in the - * the tqdevices kioslave. The TQStringList returned is comparable to the - * format of /etc/fstab file. Please refer to the tqdevices kioslave for + * returns the information for the given deviceName for usage in the + * the devices kioslave. The TQStringList returned is comparable to the + * format of /etc/fstab file. Please refer to the devices kioslave for * further information. - * If tqdeviceName is empty, this functions returns information for all - * active mobile tqdevices. - * (function is only used by the tqdevices kioslave - don't use elsewhere !) + * If deviceName is empty, this functions returns information for all + * active mobile devices. + * (function is only used by the devices kioslave - don't use elsewhere !) */ -TQStringList KMobileView::kio_tqdevices_tqdeviceInfo(TQString tqdeviceName) +TQStringList KMobileView::kio_devices_deviceInfo(TQString deviceName) { - TQStringList mobiles = tqdeviceNames(); + TQStringList mobiles = deviceNames(); if (mobiles.count() == 0) return mobiles; @@ -414,10 +414,10 @@ TQStringList KMobileView::kio_tqdevices_tqdeviceInfo(TQString tqdeviceName) for ( TQStringList::Iterator it = mobiles.begin(); it != mobiles.end(); ++it ) { TQString name = *it; - if (tqdeviceName.isEmpty()) + if (deviceName.isEmpty()) mountList << name; else - if (tqdeviceName!=name) + if (deviceName!=name) continue; KMobileItem *dev = findDevice(name); @@ -425,11 +425,11 @@ TQStringList KMobileView::kio_tqdevices_tqdeviceInfo(TQString tqdeviceName) mountList << name; mountList << " "; - mountList << TQString("mobile:/%1").tqarg(name); // KIO::encodeFileName() + mountList << TQString("mobile:/%1").arg(name); // KIO::encodeFileName() mountList << mime; mountList << "true"; // mountState mountList << "---"; - if (!tqdeviceName.isEmpty()) + if (!deviceName.isEmpty()) break; } return mountList; diff --git a/kmobile/kmobileview.h b/kmobile/kmobileview.h index 16d2b2e2d..ee8b1e532 100644 --- a/kmobile/kmobileview.h +++ b/kmobile/kmobileview.h @@ -34,44 +34,44 @@ public: /** * DCOP implementation */ - TQStringList tqdeviceNames(); + TQStringList deviceNames(); - void removeDevice( TQString tqdeviceName ); - void configDevice( TQString tqdeviceName ); + void removeDevice( TQString deviceName ); + void configDevice( TQString deviceName ); - bool connectDevice( TQString tqdeviceName ); - bool disconnectDevice( TQString tqdeviceName ); - bool connected( TQString tqdeviceName ); + bool connectDevice( TQString deviceName ); + bool disconnectDevice( TQString deviceName ); + bool connected( TQString deviceName ); - TQString tqdeviceClassName( TQString tqdeviceName ); - TQString tqdeviceName( TQString tqdeviceName ); - TQString revision( TQString tqdeviceName ); - int classType( TQString tqdeviceName ); + TQString deviceClassName( TQString deviceName ); + TQString deviceName( TQString deviceName ); + TQString revision( TQString deviceName ); + int classType( TQString deviceName ); - int capabilities( TQString tqdeviceName ); - TQString nameForCap( TQString tqdeviceName, int cap ); + int capabilities( TQString deviceName ); + TQString nameForCap( TQString deviceName, int cap ); - TQString iconFileName( TQString tqdeviceName ); + TQString iconFileName( TQString deviceName ); - int numAddresses( TQString tqdeviceName ); - TQString readAddress( TQString tqdeviceName, int index ); - bool storeAddress( TQString tqdeviceName, int index, TQString vcard, bool append ); + int numAddresses( TQString deviceName ); + TQString readAddress( TQString deviceName, int index ); + bool storeAddress( TQString deviceName, int index, TQString vcard, bool append ); - int numCalendarEntries( TQString tqdeviceName ); + int numCalendarEntries( TQString deviceName ); - int numNotes( TQString tqdeviceName ); - TQString readNote( TQString tqdeviceName, int index ); - bool storeNote( TQString tqdeviceName, int index, TQString note ); + int numNotes( TQString deviceName ); + TQString readNote( TQString deviceName, int index ); + bool storeNote( TQString deviceName, int index, TQString note ); - /* tqdevices kioslave support: */ - TQStringList kio_tqdevices_tqdeviceInfo(TQString tqdeviceName); + /* devices kioslave support: */ + TQStringList kio_devices_deviceInfo(TQString deviceName); public: void saveAll(); void restoreAll(); protected: - KMobileItem * findDevice( const TQString &tqdeviceName ) const; + KMobileItem * findDevice( const TQString &deviceName ) const; protected slots: void slotDoubleClicked( TQIconViewItem * item ); diff --git a/kmobile/libkmobile.desktop b/kmobile/libkmobile.desktop index f5a1e746a..b6444d2a8 100644 --- a/kmobile/libkmobile.desktop +++ b/kmobile/libkmobile.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=ServiceType -X-KDE-ServiceType=kdetqdevice/mobiletqdevice +X-KDE-ServiceType=kdedevice/mobiledevice Name=KDE Mobile Device Lowlevel Hardware Driver Name[af]=KDE draagbare toestel laevlak hardeware toestel Name[bs]=KDE hardverski drajver niskog nivoa za mobilne uređaje diff --git a/kmobile/main.cpp b/kmobile/main.cpp index c9d7d124d..1b03f9716 100644 --- a/kmobile/main.cpp +++ b/kmobile/main.cpp @@ -25,7 +25,7 @@ #include <klocale.h> static const char description[] = - I18N_NOOP("KDE mobile tqdevices manager"); + I18N_NOOP("KDE mobile devices manager"); static const char version[] = "0.1"; diff --git a/kmobile/systemtray.cpp b/kmobile/systemtray.cpp index c0c0bec03..7796a55b1 100644 --- a/kmobile/systemtray.cpp +++ b/kmobile/systemtray.cpp @@ -44,7 +44,7 @@ SystemTray::SystemTray(KMainWindow *parent, const char *name) : KSystemTray(pare setToolTip(); m_actionCollection = parent->actionCollection(); - KAction *addAction = m_actionCollection->action("tqdevice_add"); + KAction *addAction = m_actionCollection->action("device_add"); KPopupMenu* menu = contextMenu(); addAction->plug(menu); @@ -67,8 +67,8 @@ void SystemTray::contextMenuAboutToShow(KPopupMenu *menu) menu->idAt(pos)<=(SYSTEMTRAY_STARTID+1000)) menu->removeItemAt(pos); - // create menu entries for each mobile tqdevice and add it's icon - TQStringList list = main->mainView()->tqdeviceNames(); + // create menu entries for each mobile device and add it's icon + TQStringList list = main->mainView()->deviceNames(); for (unsigned int no=0; no<list.count(); no++) { TQString devName = list[no]; TQString iconName = main->mainView()->iconFileName(devName); diff --git a/kmobile/testlibkmobile.cpp b/kmobile/testlibkmobile.cpp index 774a191e7..e8ff85580 100644 --- a/kmobile/testlibkmobile.cpp +++ b/kmobile/testlibkmobile.cpp @@ -25,16 +25,16 @@ int main(int argc, char **argv) TQCString replyType; TQByteArray replyData; - ok = client->call("kmobile", "kmobileIface", "tqdeviceNames()", data, replyType, replyData); + ok = client->call("kmobile", "kmobileIface", "deviceNames()", data, replyType, replyData); TQDataStream reply(replyData, IO_ReadOnly); - TQStringList tqdeviceNames; - reply >> tqdeviceNames; + TQStringList deviceNames; + reply >> deviceNames; - kdDebug() << TQString("%1\n").tqarg(ok?"Ok":"Failure"); - kdDebug() << TQString("Number of currently registered drivers: %1\n").tqarg(tqdeviceNames.count()); - for (int i=0; i<tqdeviceNames.count(); i++) - kdDebug() << TQString("Device %1: %2\n").tqarg(i+1).tqarg(tqdeviceNames[i]); + kdDebug() << TQString("%1\n").arg(ok?"Ok":"Failure"); + kdDebug() << TQString("Number of currently registered drivers: %1\n").arg(deviceNames.count()); + for (int i=0; i<deviceNames.count(); i++) + kdDebug() << TQString("Device %1: %2\n").arg(i+1).arg(deviceNames[i]); // return app.exec(); } diff --git a/knode/articlewidget.cpp b/knode/articlewidget.cpp index 272df8363..2827d025d 100644 --- a/knode/articlewidget.cpp +++ b/knode/articlewidget.cpp @@ -290,9 +290,9 @@ void ArticleWidget::readConfig() mAttachmentStyle = conf->readEntry( "attachmentStyle", "inline" ); mHeaderStyle = conf->readEntry( "headerStyle", "fancy" ); KRadioAction *ra = 0; - ra = static_cast<KRadioAction*>( mActionCollection->action( TQString("view_attachments_%1").tqarg(mAttachmentStyle).latin1() ) ); + ra = static_cast<KRadioAction*>( mActionCollection->action( TQString("view_attachments_%1").arg(mAttachmentStyle).latin1() ) ); ra->setChecked( true ); - ra = static_cast<KRadioAction*>( mActionCollection->action( TQString("view_headers_%1").tqarg(mHeaderStyle).latin1() ) ); + ra = static_cast<KRadioAction*>( mActionCollection->action( TQString("view_headers_%1").arg(mHeaderStyle).latin1() ) ); ra->setChecked( true ); delete mCSSHelper; @@ -402,7 +402,7 @@ void ArticleWidget::displayArticle() // check if codec is available if ( text && !canDecodeText( text->contentType()->charset() ) ) { html += TQString("<table width=\"100%\" border=\"0\"><tr><td bgcolor=\"#FF0000\">%1</td></tr></table>") - .tqarg( i18n("Unknown charset. Default charset is used instead.") ); + .arg( i18n("Unknown charset. Default charset is used instead.") ); kdDebug(5003) << k_funcinfo << "unknown charset = " << text->contentType()->charset() << endl; } @@ -560,8 +560,8 @@ void ArticleWidget::displayHeader() if ( header ) { headerHtml += "<tr>"; headerHtml+=TQString( "<td align=\"right\" valign=\"top\"><b>%1</b></td><td width=\"100%\">%2</td></tr>" ) - .tqarg( toHtmlString( header->type(), None ) + ": " ) - .tqarg( toHtmlString( header->asUnicodeString() , ParseURL ) ); + .arg( toHtmlString( header->type(), None ) + ": " ) + .arg( toHtmlString( header->asUnicodeString() , ParseURL ) ); delete header; } } @@ -597,8 +597,8 @@ void ArticleWidget::displayHeader() if ( hb->is("From") ) { headerHtml += TQString( "<a href=\"mailto:%1\">%2</a>") - .tqarg( KPIM::getEmailAddress( hb->asUnicodeString() ) ) - .tqarg( toHtmlString( hb->asUnicodeString(), None ) ); + .arg( KPIM::getEmailAddress( hb->asUnicodeString() ) ) + .arg( toHtmlString( hb->asUnicodeString(), None ) ); KMime::Headers::Base *orgHdr = mArticle->getHeaderByType( "Organization" ); if ( orgHdr && !orgHdr->isEmpty() ) { headerHtml += " ("; @@ -636,7 +636,7 @@ void ArticleWidget::displayHeader() if ( !xfhead.isEmpty() ) { KPIM::KXFace xf; xface = TQString::fromLatin1( "<div class=\"senderpic\"><img src=\"%1\" width=\"48\" height=\"48\"/></div>" ) - .tqarg( imgToDataUrl( xf.toImage( xfhead ), "PNG" ) ); + .arg( imgToDataUrl( xf.toImage( xfhead ), "PNG" ) ); } // fancy header style @@ -660,7 +660,7 @@ void ArticleWidget::displayHeader() int refCnt = refs->count(), i = 1; TQCString id = refs->first(); id = id.mid( 1, id.length() - 2 ); // remove <> - html += TQString( "<b>%1</b>" ).tqarg( i18n("References:") ); + html += TQString( "<b>%1</b>" ).arg( i18n("References:") ); while ( i <= refCnt ) { html += " <a href=\"news:" + TQString::fromLatin1( id ) + "\">" + TQString::number( i ) + "</a>"; @@ -748,7 +748,7 @@ TQString ArticleWidget::displaySigHeader( Kpgp::Block* block ) TQString message; if ( signer.isEmpty() ) { message = i18n( "Message was signed with unknown key 0x%1." ) - .tqarg( TQString(signerKey) ); + .arg( TQString(signerKey) ); message += "<br/>"; message += i18n( "The validity of the signature cannot be verified." ); signClass = "signWarn"; @@ -769,10 +769,10 @@ TQString ArticleWidget::displaySigHeader( Kpgp::Block* block ) if( !signerKey.isEmpty() ) message += i18n( "Message was signed by %1 (Key ID: 0x%2)." ) - .tqarg( signer ) - .tqarg( TQString(signerKey) ); + .arg( signer ) + .arg( TQString(signerKey) ); else - message += i18n( "Message was signed by %1." ).tqarg( signer ); + message += i18n( "Message was signed by %1." ).arg( signer ); message += "<br/>"; if( block->goodSignature() ) { @@ -916,7 +916,7 @@ TQString ArticleWidget::imgToDataUrl( const TQImage &image, const char* fmt ) buffer.open( IO_WriteOnly ); image.save( &buffer, fmt ); return TQString::fromLatin1("data:image/%1;base64,%2") - .tqarg( fmt, TQString(KCodecs::base64Encode( ba )) ); + .arg( fmt, TQString(KCodecs::base64Encode( ba )) ); } @@ -1030,7 +1030,7 @@ void ArticleWidget::processJob( KNJobData * job ) if ( !job->canceled() ) { if ( !job->success() ) KMessageBox::error( this, i18n("An error occurred while downloading the article source:\n") - .tqarg( job->errorString() ) ); + .arg( job->errorString() ) ); else new KNSourceViewWindow( a->head() + "\n" + a->body() ); } diff --git a/knode/headerview.cpp b/knode/headerview.cpp index c3fa53073..0498b99c1 100644 --- a/knode/headerview.cpp +++ b/knode/headerview.cpp @@ -64,7 +64,7 @@ KNHeaderView::KNHeaderView(TQWidget *parent, const char *name) : setColumnAlignment( mPaintInfo.sizeCol, TQt::AlignRight ); setColumnAlignment( mPaintInfo.scoreCol, TQt::AlignRight ); - // due to our own column text squeezing we need to tqrepaint on column resizing + // due to our own column text squeezing we need to repaint on column resizing disconnect( header(), TQT_SIGNAL(sizeChange(int, int, int)) ); connect( header(), TQT_SIGNAL(sizeChange(int, int, int)), TQT_SLOT(slotSizeChanged(int, int, int)) ); @@ -534,7 +534,7 @@ TQDragObject* KNHeaderView::dragObject() void KNHeaderView::slotSizeChanged( int section, int, int newSize ) { - viewport()->tqrepaint( header()->sectionPos(section), 0, newSize, visibleHeight(), false); + viewport()->repaint( header()->sectionPos(section), 0, newSize, visibleHeight(), false); } diff --git a/knode/knaccountmanager.cpp b/knode/knaccountmanager.cpp index e8d1ef380..2dc8c931a 100644 --- a/knode/knaccountmanager.cpp +++ b/knode/knaccountmanager.cpp @@ -127,12 +127,12 @@ bool KNAccountManager::newAccount(KNNntpAccount *a) TQStringList entries(d.entryList("nntp.*", TQDir::Dirs)); int id = 1; - while (entries.findIndex(TQString("nntp.%1").tqarg(id))!=-1) + while (entries.findIndex(TQString("nntp.%1").arg(id))!=-1) ++id; a->setId(id); - dir = locateLocal("data",TQString("knode/nntp.%1/").tqarg(a->id())); + dir = locateLocal("data",TQString("knode/nntp.%1/").arg(a->id())); if (!dir.isNull()) { mAccounts.append(a); emit(accountAdded(a)); @@ -177,7 +177,7 @@ bool KNAccountManager::removeAccount(KNNntpAccount *a) } } dir.cdUp(); // directory should now be empty, deleting it - dir.rmdir(TQString("nntp.%1/").tqarg(a->id())); + dir.rmdir(TQString("nntp.%1/").arg(a->id())); } if(c_urrentAccount==a) setCurrentAccount(0); diff --git a/knode/knarticle.cpp b/knode/knarticle.cpp index e253d2ef8..fe475b1b3 100644 --- a/knode/knarticle.cpp +++ b/knode/knarticle.cpp @@ -209,7 +209,7 @@ void KNRemoteArticle::updateListItem() i_tem->setExpandable( (threadMode() && hasVisibleFollowUps()) ); - i_tem->tqrepaint(); //force tqrepaint + i_tem->repaint(); //force repaint } diff --git a/knode/knarticlefactory.cpp b/knode/knarticlefactory.cpp index 3a2a414e2..c260208e8 100644 --- a/knode/knarticlefactory.cpp +++ b/knode/knarticlefactory.cpp @@ -306,7 +306,7 @@ void KNArticleFactory::createForward(KNArticle *a) //--------------------------- <Body> ----------------------------- - TQString fwd = TQString("\n--------------- %1\n\n").tqarg(i18n("Forwarded message (begin)")); + TQString fwd = TQString("\n--------------- %1\n\n").arg(i18n("Forwarded message (begin)")); fwd+=( i18n("Subject") + ": " + a->subject()->asUnicodeString() + "\n" ); fwd+=( i18n("From") + ": " + a->from()->asUnicodeString() + "\n" ); @@ -321,7 +321,7 @@ void KNArticleFactory::createForward(KNArticle *a) fwd += (*it) + "\n"; } - fwd += TQString("\n--------------- %1\n").tqarg(i18n("Forwarded message (end)")); + fwd += TQString("\n--------------- %1\n").arg(i18n("Forwarded message (end)")); //--------------------------- </Body> ---------------------------- @@ -601,7 +601,7 @@ void KNArticleFactory::edit(KNLocalArticle *a) KMessageBox::information(knGlobals.topWidget, i18n("<qt>The signature generator program produced the " "following output:<br><br>%1</qt>") - .tqarg(id->getSigGeneratorStdErr())); + .arg(id->getSigGeneratorStdErr())); mCompList.append( com ); connect(com, TQT_SIGNAL(composerDone(KNComposer*)), this, TQT_SLOT(slotComposerDone(KNComposer*))); @@ -895,7 +895,7 @@ KNLocalArticle* KNArticleFactory::newArticle(KNCollection *col, TQString &sig, T KMessageBox::information(knGlobals.topWidget, i18n("<qt>The signature generator program produced the " "following output:<br><br>%1</qt>") - .tqarg(id->getSigGeneratorStdErr())); + .arg(id->getSigGeneratorStdErr())); } else sig=TQString(); @@ -1070,8 +1070,8 @@ KNSendErrorDialog::KNSendErrorDialog() TQVBox *page = makeVBoxMainWidget(); - new TQLabel(TQString("<b>%1</b><br>%2").tqarg(i18n("Errors occurred while sending these articles:")) - .tqarg(i18n("The unsent articles are stored in the \"Outbox\" folder.")), page); + new TQLabel(TQString("<b>%1</b><br>%2").arg(i18n("Errors occurred while sending these articles:")) + .arg(i18n("The unsent articles are stored in the \"Outbox\" folder.")), page); j_obs=new KNDialogListBox(true, page); e_rror=new TQLabel(TQString(), page); diff --git a/knode/knarticlefilter.cpp b/knode/knarticlefilter.cpp index 8a7236c4e..65acb7c0b 100644 --- a/knode/knarticlefilter.cpp +++ b/knode/knarticlefilter.cpp @@ -74,7 +74,7 @@ KNArticleFilter::~KNArticleFilter() bool KNArticleFilter::loadInfo() { if (i_d!=-1) { - TQString fname(locate("data",TQString( "knode/filters/%1.fltr" ).tqarg(i_d) ) ); + TQString fname(locate("data",TQString( "knode/filters/%1.fltr" ).arg(i_d) ) ); if (fname.isNull()) return false; @@ -94,7 +94,7 @@ bool KNArticleFilter::loadInfo() void KNArticleFilter::load() { - TQString fname(locate("data",TQString( "knode/filters/%1.fltr").tqarg(i_d) ) ); + TQString fname(locate("data",TQString( "knode/filters/%1.fltr").arg(i_d) ) ); if (fname.isNull()) return; @@ -141,7 +141,7 @@ void KNArticleFilter::save() KNHelper::displayInternalFileError(); return; } - KSimpleConfig conf(dir+TQString("%1.fltr").tqarg(i_d)); + KSimpleConfig conf(dir+TQString("%1.fltr").arg(i_d)); conf.setGroup("GENERAL"); conf.writeEntry("name", TQString(n_ame)); diff --git a/knode/knarticlemanager.cpp b/knode/knarticlemanager.cpp index 7673eabfd..f5a59c574 100644 --- a/knode/knarticlemanager.cpp +++ b/knode/knarticlemanager.cpp @@ -186,7 +186,7 @@ void KNArticleManager::showHdrs(bool clear) v_iew->clear(); knGlobals.top->setCursorBusy(true); - knGlobals.seStatusMsg(i18n(" Creating list...")); + knGlobals.setStatusMsg(i18n(" Creating list...")); knGlobals.top->secureProcessEvents(); if(g_roup) { @@ -324,7 +324,7 @@ void KNArticleManager::showHdrs(bool clear) knGlobals.top->articleViewer()->setArticle( 0 ); } - knGlobals.seStatusMsg(TQString()); + knGlobals.setStatusMsg(TQString()); updateStatusString(); knGlobals.top->setCursorBusy(false); } @@ -991,25 +991,25 @@ void KNArticleManager::updateStatusString() if (g_roup->status()==KNGroup::moderated) name += i18n(" (moderated)"); - knGlobals.seStatusMsg(i18n(" %1: %2 new , %3 displayed") - .tqarg(name).tqarg(g_roup->newCount()).tqarg(displCnt),SB_GROUP); + knGlobals.setStatusMsg(i18n(" %1: %2 new , %3 displayed") + .arg(name).arg(g_roup->newCount()).arg(displCnt),SB_GROUP); if(f_ilter) - knGlobals.seStatusMsg(i18n(" Filter: %1").tqarg(f_ilter->translatedName()), SB_FILTER); + knGlobals.setStatusMsg(i18n(" Filter: %1").arg(f_ilter->translatedName()), SB_FILTER); else - knGlobals.seStatusMsg(TQString(), SB_FILTER); + knGlobals.setStatusMsg(TQString(), SB_FILTER); } else if(f_older) { if(f_ilter) displCnt=f_ilter->count(); else displCnt=f_older->count(); - knGlobals.seStatusMsg(i18n(" %1: %2 displayed") - .tqarg(f_older->name()).tqarg(displCnt), SB_GROUP); - knGlobals.seStatusMsg(TQString(), SB_FILTER); + knGlobals.setStatusMsg(i18n(" %1: %2 displayed") + .arg(f_older->name()).arg(displCnt), SB_GROUP); + knGlobals.setStatusMsg(TQString(), SB_FILTER); } else { - knGlobals.seStatusMsg(TQString(), SB_GROUP); - knGlobals.seStatusMsg(TQString(), SB_FILTER); + knGlobals.setStatusMsg(TQString(), SB_GROUP); + knGlobals.setStatusMsg(TQString(), SB_FILTER); } } diff --git a/knode/kncleanup.cpp b/knode/kncleanup.cpp index 28993e7ce..3e79b4a62 100644 --- a/knode/kncleanup.cpp +++ b/knode/kncleanup.cpp @@ -56,13 +56,13 @@ void KNCleanUp::start() for ( TQValueList<KNArticleCollection*>::Iterator it = mColList.begin(); it != mColList.end(); ++it ) { if ( (*it)->type() == KNCollection::CTgroup ) { - d_lg->showMessage( i18n("Deleting expired articles in <b>%1</b>").tqarg( (*it)->name() ) ); + d_lg->showMessage( i18n("Deleting expired articles in <b>%1</b>").arg( (*it)->name() ) ); kapp->processEvents(); expireGroup( static_cast<KNGroup*>( (*it) ) ); d_lg->doProgress(); } else if ( (*it)->type() == KNCollection::CTfolder ) { - d_lg->showMessage( i18n("Compacting folder <b>%1</b>").tqarg( (*it)->name() ) ); + d_lg->showMessage( i18n("Compacting folder <b>%1</b>").arg( (*it)->name() ) ); kapp->processEvents(); compactFolder( static_cast<KNFolder*>( (*it) ) ); d_lg->doProgress(); @@ -187,7 +187,7 @@ void KNCleanUp::expireGroup( KNGroup *g, bool showResult ) if(showResult) KMessageBox::information(knGlobals.topWidget, - i18n("<b>%1</b><br>expired: %2<br>left: %3").tqarg(g->groupname()).tqarg(delCnt).tqarg(leftCnt)); + i18n("<b>%1</b><br>expired: %2<br>left: %3").arg(g->groupname()).arg(delCnt).arg(leftCnt)); } diff --git a/knode/kncomposer.cpp b/knode/kncomposer.cpp index d21f9b7fe..c2523d13a 100644 --- a/knode/kncomposer.cpp +++ b/knode/kncomposer.cpp @@ -969,7 +969,7 @@ void KNComposer::insertFile(TQFile *file, bool clear, bool box, TQString boxTitl ts.setCodec(codec); if (box) - temp = TQString::fromLatin1(",----[ %1 ]\n").tqarg(boxTitle); + temp = TQString::fromLatin1(",----[ %1 ]\n").arg(boxTitle); if (box && (v_iew->e_dit->wordWrap()!=TQMultiLineEdit::NoWrap)) { int wrapAt = v_iew->e_dit->wrapColumnOrWidth(); @@ -1374,18 +1374,18 @@ void KNComposer::slotUpdateStatusBar() else overwriteDesc = i18n(" INS "); - statusBar()->changeItem(i18n(" Type: %1 ").tqarg(typeDesc), 1); - statusBar()->changeItem(i18n(" Charset: %1 ").tqarg(TQString(c_harset)), 2); + statusBar()->changeItem(i18n(" Type: %1 ").arg(typeDesc), 1); + statusBar()->changeItem(i18n(" Charset: %1 ").arg(TQString(c_harset)), 2); statusBar()->changeItem(overwriteDesc, 3); - statusBar()->changeItem(i18n(" Column: %1 ").tqarg(v_iew->e_dit->currentColumn() + 1), 4); - statusBar()->changeItem(i18n(" Line: %1 ").tqarg(v_iew->e_dit->currentLine() + 1), 5); + statusBar()->changeItem(i18n(" Column: %1 ").arg(v_iew->e_dit->currentColumn() + 1), 4); + statusBar()->changeItem(i18n(" Line: %1 ").arg(v_iew->e_dit->currentLine() + 1), 5); } void KNComposer::slotUpdateCursorPos() { - statusBar()->changeItem(i18n(" Column: %1 ").tqarg(v_iew->e_dit->currentColumn() + 1), 4); - statusBar()->changeItem(i18n(" Line: %1 ").tqarg(v_iew->e_dit->currentLine() + 1), 5); + statusBar()->changeItem(i18n(" Column: %1 ").arg(v_iew->e_dit->currentColumn() + 1), 4); + statusBar()->changeItem(i18n(" Line: %1 ").arg(v_iew->e_dit->currentLine() + 1), 5); } @@ -2233,7 +2233,7 @@ void KNComposer::Editor::slotAddBox() } else { int l = currentLine(); int c = currentColumn(); - TQString s = TQString::fromLatin1(",----[ ]\n| %1\n`----").tqarg(textLine(l)); + TQString s = TQString::fromLatin1(",----[ ]\n| %1\n`----").arg(textLine(l)); insertLine(s,l); removeLine(l+3); setCursorPosition(l+1,c+2); @@ -2297,7 +2297,7 @@ void KNComposer::Editor::slotRemoveBox() setCursorPosition(l,c-2); setAutoUpdate(true); - tqrepaint(false); + repaint(false); } } @@ -2560,7 +2560,7 @@ KNComposer::AttachmentPropertiesDlg::AttachmentPropertiesDlg(KNAttachment *a, TQ fileL->addRowSpacing(0, fontMetrics().lineSpacing()-9); fileL->addWidget(new TQLabel(i18n("Name:"), fileGB) ,1,0); - fileL->addWidget(new TQLabel(TQString("<b>%1</b>").tqarg(a->name()), fileGB), 1,1, TQt::AlignLeft); + fileL->addWidget(new TQLabel(TQString("<b>%1</b>").arg(a->name()), fileGB), 1,1, TQt::AlignLeft); fileL->addWidget(new TQLabel(i18n("Size:"), fileGB), 2,0); fileL->addWidget(new TQLabel(a->contentSize(), fileGB), 2,1, TQt::AlignLeft); diff --git a/knode/knconfigwidgets.cpp b/knode/knconfigwidgets.cpp index 99f25d783..aa93af980 100644 --- a/knode/knconfigwidgets.cpp +++ b/knode/knconfigwidgets.cpp @@ -395,8 +395,8 @@ void KNConfig::NntpAccountListWidget::slotSelectionChanged() LBoxItem *it = static_cast<LBoxItem*>(l_box->item(curr)); if(it) { - s_erverInfo->setText(i18n("Server: %1").tqarg(it->account->server())); - p_ortInfo->setText(i18n("Port: %1").tqarg(it->account->port())); + s_erverInfo->setText(i18n("Server: %1").arg(it->account->server())); + p_ortInfo->setText(i18n("Port: %1").arg(it->account->port())); } else { s_erverInfo->setText(i18n("Server: ")); @@ -461,7 +461,7 @@ void KNConfig::NntpAccountListWidget::slotSubBtnClicked() KNConfig::NntpAccountConfDialog::NntpAccountConfDialog(KNNntpAccount *a, TQWidget *p, const char *n) - : KDialogBase(Tabbed, (a->id()!=-1)? i18n("Properties of %1").tqarg(a->name()):i18n("New Account"), + : KDialogBase(Tabbed, (a->id()!=-1)? i18n("Properties of %1").arg(a->name()):i18n("New Account"), Ok|Cancel|Help, Ok, p, n), a_ccount(a) { @@ -773,7 +773,7 @@ int KNConfig::AppearanceWidget::ColorListItem::width(const TQListBox *lb ) const KNConfig::AppearanceWidget::FontListItem::FontListItem( const TQString &name, const TQFont &font ) : TQListBoxText(name), f_ont(font) { - fontInfo = TQString("[%1 %2]").tqarg(f_ont.family()).tqarg(f_ont.pointSize()); + fontInfo = TQString("[%1 %2]").arg(f_ont.family()).arg(f_ont.pointSize()); } @@ -785,7 +785,7 @@ KNConfig::AppearanceWidget::FontListItem::~FontListItem() void KNConfig::AppearanceWidget::FontListItem::setFont(const TQFont &font) { f_ont = font; - fontInfo = TQString("[%1 %2]").tqarg(f_ont.family()).tqarg(f_ont.pointSize()); + fontInfo = TQString("[%1 %2]").arg(f_ont.family()).arg(f_ont.pointSize()); } @@ -896,7 +896,7 @@ void KNConfig::AppearanceWidget::defaults() colorItem->setColor(d_ata->defaultColor(i)); } c_List->triggerUpdate(true); - c_List->tqrepaint(true); + c_List->repaint(true); // default fonts FontListItem *fontItem; @@ -2158,7 +2158,7 @@ TQString KNConfig::XHeaderConfDialog::result() TQString value = v_alue->text(); // just in case someone pastes a newline value.replace( '\n', ' ' ); - return TQString( "X-%1: %2" ).tqarg( n_ame->text() ).tqarg( value ); + return TQString( "X-%1: %2" ).arg( n_ame->text() ).arg( value ); } diff --git a/knode/knconvert.cpp b/knode/knconvert.cpp index 2db7b6f30..8fdb4890c 100644 --- a/knode/knconvert.cpp +++ b/knode/knconvert.cpp @@ -73,7 +73,7 @@ KNConvert::KNConvert(const TQString &version) Unfortunately this version uses a different format for some data-files, so \ in order to keep your existing data it is necessary to convert it first. This is \ now done automatically by KNode. If you want to, a backup of your existing data \ -will be created before the conversion starts.").tqarg(KNODE_VERSION), w_1); +will be created before the conversion starts.").arg(KNODE_VERSION), w_1); w1L->addMultiCellWidget(l1, 0,0, 0,2); c_reateBkup=new TQCheckBox(i18n("Create backup of old data"), w_1); @@ -224,7 +224,7 @@ void KNConvert::slotTarExited(KProcess *proc) delete t_ar; t_ar = 0; if(success) - l_og.append(i18n("created backup of the old data-files in %1").tqarg(b_ackupPath->text())); + l_og.append(i18n("created backup of the old data-files in %1").arg(b_ackupPath->text())); else l_og.append(i18n("backup failed.")); @@ -402,7 +402,7 @@ int KNConvert::Converter04::convertFolder(TQString srcPrefix, TQString dstPrefix TQCString buff(size+10); srcMBox.at(oldIdx.so); int readBytes=srcMBox.readBlock(buff.data(), size); - buff.tqat(readBytes)='\0'; //terminate string; + buff.at(readBytes)='\0'; //terminate string; //remove "X-KNode-Overview" int pos=buff.find('\n'); diff --git a/knode/knfilterdialog.cpp b/knode/knfilterdialog.cpp index 729ec495c..e9ebf66e1 100644 --- a/knode/knfilterdialog.cpp +++ b/knode/knfilterdialog.cpp @@ -31,7 +31,7 @@ KNFilterDialog::KNFilterDialog(KNArticleFilter *f, TQWidget *parent, const char *name) - : KDialogBase(Plain, (f->id()==-1)? i18n("New Filter"):i18n("Properties of %1").tqarg(f->name()), + : KDialogBase(Plain, (f->id()==-1)? i18n("New Filter"):i18n("Properties of %1").arg(f->name()), Ok|Cancel|Help, Ok, parent, name), fltr(f) { diff --git a/knode/knfolder.cpp b/knode/knfolder.cpp index 58ac7d0fc..5be7535c2 100644 --- a/knode/knfolder.cpp +++ b/knode/knfolder.cpp @@ -44,7 +44,7 @@ KNFolder::KNFolder() KNFolder::KNFolder(int id, const TQString &name, KNFolder *parent) : KNArticleCollection(parent), i_d(id), i_ndexDirty(false), w_asOpen(true) { - TQString fname=path()+TQString("custom_%1").tqarg(i_d); + TQString fname=path()+TQString("custom_%1").arg(i_d); n_ame = name; m_boxFile.setName(fname+".mbox"); @@ -63,7 +63,7 @@ KNFolder::KNFolder(int id, const TQString &name, KNFolder *parent) KNFolder::KNFolder(int id, const TQString &name, const TQString &prefix, KNFolder *parent) : KNArticleCollection(parent), i_d(id), i_ndexDirty(false), w_asOpen(true) { - TQString fname=path()+TQString("%1_%2").tqarg(prefix).tqarg(i_d); + TQString fname=path()+TQString("%1_%2").arg(prefix).arg(i_d); n_ame = name; m_boxFile.setName(fname+".mbox"); @@ -193,7 +193,7 @@ bool KNFolder::loadHdrs() int pos1=0, pos2=0, cnt=0, byteCount; knGlobals.top->setCursorBusy(true); - knGlobals.seStatusMsg(i18n(" Loading folder...")); + knGlobals.setStatusMsg(i18n(" Loading folder...")); knGlobals.top->secureProcessEvents(); while(!i_ndexFile.atEnd()) { @@ -284,7 +284,7 @@ bool KNFolder::loadHdrs() clear(); closeFiles(); - knGlobals.seStatusMsg(TQString()); + knGlobals.setStatusMsg(TQString()); knGlobals.top->setCursorBusy(false); return false; } @@ -297,7 +297,7 @@ bool KNFolder::loadHdrs() c_ount=cnt; updateListItem(); - knGlobals.seStatusMsg(TQString()); + knGlobals.setStatusMsg(TQString()); knGlobals.top->setCursorBusy(false); return true; @@ -356,7 +356,7 @@ bool KNFolder::loadArticle(KNLocalArticle *a) } //set content - buff.tqat(readBytes)='\0'; //terminate string + buff.at(readBytes)='\0'; //terminate string a->setContent(buff); a->parse(); diff --git a/knode/knfoldermanager.cpp b/knode/knfoldermanager.cpp index 7041f4562..661e1b6cf 100644 --- a/knode/knfoldermanager.cpp +++ b/knode/knfoldermanager.cpp @@ -294,7 +294,7 @@ void KNFolderManager::importFromMBox(KNFolder *f) if (file) { knGlobals.top->setCursorBusy(true); - knGlobals.seStatusMsg(i18n(" Importing articles...")); + knGlobals.setStatusMsg(i18n(" Importing articles...")); knGlobals.top->secureProcessEvents(); if (!file->atEnd()) { // search for the first article... @@ -326,7 +326,7 @@ void KNFolderManager::importFromMBox(KNFolder *f) int readBytes=file->readBlock(buff.data(), size); if (readBytes != -1) { - buff.tqat(readBytes)='\0'; //terminate string + buff.at(readBytes)='\0'; //terminate string art = new KNLocalArticle(0); art->setEditDisabled(true); art->setContent(buff); @@ -345,7 +345,7 @@ void KNFolderManager::importFromMBox(KNFolder *f) int readBytes=file->readBlock(buff.data(), size); if (readBytes != -1) { - buff.tqat(readBytes)='\0'; //terminate string + buff.at(readBytes)='\0'; //terminate string art = new KNLocalArticle(0); art->setEditDisabled(true); art->setContent(buff); @@ -360,13 +360,13 @@ void KNFolderManager::importFromMBox(KNFolder *f) } } - knGlobals.seStatusMsg(i18n(" Storing articles...")); + knGlobals.setStatusMsg(i18n(" Storing articles...")); knGlobals.top->secureProcessEvents(); if (!list.isEmpty()) knGlobals.articleManager()->moveIntoFolder(list, f); - knGlobals.seStatusMsg(TQString()); + knGlobals.setStatusMsg(TQString()); knGlobals.top->setCursorBusy(false); } @@ -391,7 +391,7 @@ void KNFolderManager::exportToMBox(KNFolder *f) if (file) { knGlobals.top->setCursorBusy(true); - knGlobals.seStatusMsg(i18n(" Exporting articles...")); + knGlobals.setStatusMsg(i18n(" Exporting articles...")); knGlobals.top->secureProcessEvents(); TQTextStream ts(file); @@ -415,7 +415,7 @@ void KNFolderManager::exportToMBox(KNFolder *f) knGlobals.top->secureProcessEvents(); } - knGlobals.seStatusMsg(TQString()); + knGlobals.setStatusMsg(TQString()); knGlobals.top->setCursorBusy(false); } } diff --git a/knode/knglobals.cpp b/knode/knglobals.cpp index 7a6f0c222..eaf026e8d 100644 --- a/knode/knglobals.cpp +++ b/knode/knglobals.cpp @@ -134,8 +134,8 @@ KNMemoryManager* KNGlobals::memoryManager() } -void KNGlobals::seStatusMsg(const TQString &text, int id) +void KNGlobals::setStatusMsg(const TQString &text, int id) { if(top) - top->seStatusMsg(text, id); + top->setStatusMsg(text, id); } diff --git a/knode/knglobals.h b/knode/knglobals.h index c8371b46e..9db4f22ef 100644 --- a/knode/knglobals.h +++ b/knode/knglobals.h @@ -75,8 +75,8 @@ class KDE_EXPORT KNGlobals { KNScoringManager *scoringManager(); KNMemoryManager *memoryManager(); - /** forwarded to top->seStatusMsg() if available */ - void seStatusMsg(const TQString& text = TQString(), int id = SB_MAIN); + /** forwarded to top->setStatusMsg() if available */ + void setStatusMsg(const TQString& text = TQString(), int id = SB_MAIN); private: KSharedConfig::Ptr c_onfig; diff --git a/knode/kngroup.cpp b/knode/kngroup.cpp index c0ba082b5..c42aab078 100644 --- a/knode/kngroup.cpp +++ b/knode/kngroup.cpp @@ -71,7 +71,7 @@ void KNGroup::updateListItem() if(!l_istItem) return; l_istItem->setTotalCount( c_ount ); l_istItem->setUnreadCount( c_ount - r_eadCount - i_gnoreCount ); - l_istItem->tqrepaint(); + l_istItem->repaint(); } @@ -904,7 +904,7 @@ void KNGroup::scoreArticles(bool onlynew) kdDebug(5003) << "scoring " << newCount() << " articles" << endl; kdDebug(5003) << "(total " << length() << " article in group)" << endl; knGlobals.top->setCursorBusy(true); - knGlobals.seStatusMsg(i18n(" Scoring...")); + knGlobals.setStatusMsg(i18n(" Scoring...")); int defScore; KScoringManager *sm = knGlobals.scoringManager(); @@ -936,7 +936,7 @@ void KNGroup::scoreArticles(bool onlynew) incReadCount(); } - knGlobals.seStatusMsg(TQString()); + knGlobals.setStatusMsg(TQString()); knGlobals.top->setCursorBusy(false); //kdDebug(5003) << KNScorableArticle::notifyC->collection() << endl; @@ -951,7 +951,7 @@ void KNGroup::reorganize() kdDebug(5003) << "KNGroup::reorganize()" << endl; knGlobals.top->setCursorBusy(true); - knGlobals.seStatusMsg(i18n(" Reorganizing headers...")); + knGlobals.setStatusMsg(i18n(" Reorganizing headers...")); for(int idx=0; idx<length(); idx++) { KNRemoteArticle *a = at(idx); @@ -964,8 +964,8 @@ void KNGroup::reorganize() buildThreads(length()); saveStaticData(length(), true); saveDynamicData(length(), true); - knGlobals.top->headerView()->tqrepaint(); - knGlobals.seStatusMsg(TQString()); + knGlobals.top->headerView()->repaint(); + knGlobals.setStatusMsg(TQString()); knGlobals.top->setCursorBusy(false); } @@ -1052,7 +1052,7 @@ TQString KNGroup::prepareForExecution() if (knGlobals.groupManager()->loadHeaders(this)) return TQString(); else - return i18n("Cannot load saved headers: %1").tqarg(groupname()); + return i18n("Cannot load saved headers: %1").arg(groupname()); } //*************************************************************************** diff --git a/knode/kngroup.h b/knode/kngroup.h index 76a9d0dd1..fef5c6d62 100644 --- a/knode/kngroup.h +++ b/knode/kngroup.h @@ -124,7 +124,7 @@ class KNGroup : public KNArticleCollection , public KNJobItem { KNConfig::Identity* identity()const { return i_dentity; } void setIdentity(KNConfig::Identity *i) { i_dentity=i; } Status status()const { return s_tatus; } - void seStatus(Status s) { s_tatus=s; } + void setStatus(Status s) { s_tatus=s; } void showProperties(); // cleanup configuration diff --git a/knode/kngroupbrowser.cpp b/knode/kngroupbrowser.cpp index a3bcb89f4..3aa9677bb 100644 --- a/knode/kngroupbrowser.cpp +++ b/knode/kngroupbrowser.cpp @@ -358,7 +358,7 @@ void KNGroupBrowser::slotFilter(const TQString &txt) lastFilter = filtertxt; incrementalFilter = !isRegexp; - leftLabel->setText(i18n("Groups on %1: (%2 displayed)").tqarg(a_ccount->name()).tqarg(matchList->count())); + leftLabel->setText(i18n("Groups on %1: (%2 displayed)").arg(a_ccount->name()).arg(matchList->count())); arrowBtn1->setEnabled(false); arrowBtn2->setEnabled(false); diff --git a/knode/kngroupmanager.cpp b/knode/kngroupmanager.cpp index ea24f7930..271a689d3 100644 --- a/knode/kngroupmanager.cpp +++ b/knode/kngroupmanager.cpp @@ -435,7 +435,7 @@ void KNGroupManager::subscribeGroup(const KNGroupInfo *gi, KNNntpAccount *a) grp=new KNGroup(a); grp->setGroupname(gi->name); grp->setDescription(gi->description); - grp->seStatus(gi->status); + grp->setStatus(gi->status); grp->saveInfo(); mGroupList.append( grp ); emit groupAdded(grp); @@ -449,7 +449,7 @@ bool KNGroupManager::unsubscribeGroup(KNGroup *g) if(!g) return false; if((g->isLocked()) || (g->lockedArticles()>0)) { - KMessageBox::sorry(knGlobals.topWidget, i18n("The group \"%1\" is being updated currently.\nIt is not possible to unsubscribe from it at the moment.").tqarg(g->groupname())); + KMessageBox::sorry(knGlobals.topWidget, i18n("The group \"%1\" is being updated currently.\nIt is not possible to unsubscribe from it at the moment.").arg(g->groupname())); return false; } @@ -596,7 +596,7 @@ void KNGroupManager::processJob(KNJobData *j) for ( KNGroupInfo* inf = d->groups->first(); inf; inf = d->groups->next() ) if ( inf->name == (*it)->groupname() ) { (*it)->setDescription( inf->description ); - (*it)->seStatus( inf->status ); + (*it)->setStatus( inf->status ); break; } } diff --git a/knode/kngrouppropdlg.cpp b/knode/kngrouppropdlg.cpp index a49e03a9e..3ad2fee7a 100644 --- a/knode/kngrouppropdlg.cpp +++ b/knode/kngrouppropdlg.cpp @@ -30,7 +30,7 @@ KNGroupPropDlg::KNGroupPropDlg(KNGroup *group, TQWidget *parent, const char *name ) - : KDialogBase(Tabbed, i18n("Properties of %1").tqarg(group->groupname()), + : KDialogBase(Tabbed, i18n("Properties of %1").arg(group->groupname()), Ok|Cancel|Help, Ok, parent, name), g_rp(group), n_ickChanged(false) { diff --git a/knode/knhdrviewitem.cpp b/knode/knhdrviewitem.cpp index cf2713b8d..6330b89ab 100644 --- a/knode/knhdrviewitem.cpp +++ b/knode/knhdrviewitem.cpp @@ -114,7 +114,7 @@ int KNHdrViewItem::compare( TQListViewItem *i, int col, bool ) const } -void KNHdrViewItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment ) +void KNHdrViewItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment ) { int xText = 0, xPM = 3, yPM = 0; TQColor base; @@ -159,7 +159,7 @@ void KNHdrViewItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column, TQString t2; TQFont f2; if (countUnreadInThread() > 0 && column == paintInfo->subCol && !isOpen()) { - t2 = TQString( " (%1)" ).tqarg( countUnreadInThread() ); + t2 = TQString( " (%1)" ).arg( countUnreadInThread() ); f2 = p->font(); f2.setBold( true ); cntWidth = TQFontMetrics( f2 ).width( t2, -1 ); @@ -172,7 +172,7 @@ void KNHdrViewItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column, else mShowToolTip[column] = false; - p->drawText( xText, 0, width - xText - 5, height(), tqalignment | AlignVCenter, t ); + p->drawText( xText, 0, width - xText - 5, height(), alignment | AlignVCenter, t ); if (cntWidth) { TQFont orig = p->font(); p->setFont( f2 ); @@ -183,7 +183,7 @@ void KNHdrViewItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column, pen.setColor( cg.link() ); } p->setPen( pen ); - p->drawText( xText + TQFontMetrics( orig ).width( t, -1 ), 0, width - xText - 5, height(), tqalignment | AlignVCenter, t2 ); + p->drawText( xText + TQFontMetrics( orig ).width( t, -1 ), 0, width - xText - 5, height(), alignment | AlignVCenter, t2 ); } } } diff --git a/knode/knhdrviewitem.h b/knode/knhdrviewitem.h index 163a45070..476c6d53c 100644 --- a/knode/knhdrviewitem.h +++ b/knode/knhdrviewitem.h @@ -33,7 +33,7 @@ class KNHdrViewItem : public KListViewItem { virtual int compare(TQListViewItem *i, int col, bool ascending) const; - void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment); + void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment); int width(const TQFontMetrics &fm, const TQListView *lv, int column); virtual TQString text( int col ) const; diff --git a/knode/knjobdata.cpp b/knode/knjobdata.cpp index 81c2595ea..fefd96b12 100644 --- a/knode/knjobdata.cpp +++ b/knode/knjobdata.cpp @@ -95,7 +95,7 @@ void KNJobData::cancel() mJob = 0; } if ( mProgressItem ) { - mProgressItem->seStatus( "Canceled" ); + mProgressItem->setStatus( "Canceled" ); mProgressItem->setComplete(); mProgressItem = 0; } @@ -140,7 +140,7 @@ void KNJobData::slotJobPercent( KIO::Job*, unsigned long percent ) void KNJobData::slotJobInfoMessage( KIO::Job*, const TQString &msg ) { kdDebug(5003) << k_funcinfo << "Status: " << msg << endl; - seStatus( msg ); + setStatus( msg ); } diff --git a/knode/knjobdata.h b/knode/knjobdata.h index 7f14dc7b9..5d9352ad5 100644 --- a/knode/knjobdata.h +++ b/knode/knjobdata.h @@ -115,7 +115,7 @@ class KNJobData : public TQObject void createProgressItem(); // safe forwards to the progress item - void seStatus( const TQString &msg ) { if ( mProgressItem ) mProgressItem->seStatus( msg ); } + void setStatus( const TQString &msg ) { if ( mProgressItem ) mProgressItem->setStatus( msg ); } void setProgress( unsigned int progress ) { if ( mProgressItem ) mProgressItem->setProgress( progress ); } void setComplete() { if ( mProgressItem ) { mProgressItem->setComplete(); mProgressItem = 0; } } diff --git a/knode/knmainwidget.cpp b/knode/knmainwidget.cpp index 57e6f0bec..701bee288 100644 --- a/knode/knmainwidget.cpp +++ b/knode/knmainwidget.cpp @@ -253,7 +253,7 @@ KNMainWidget::KNMainWidget( KXMLGUIClient* client, bool detachable, TQWidget* pa c_olView->setFocus(); - seStatusMsg(); + setStatusMsg(); if( firstStart() ) { // open the config dialog on the first start show(); // the settings dialog must appear in front of the main window! @@ -315,7 +315,7 @@ void KNMainWidget::iniStatusBar() //================================== GUI ================================= -void KNMainWidget::seStatusMsg(const TQString& text, int id) +void KNMainWidget::setStatusMsg(const TQString& text, int id) { KMainWindow *mainWin = dynamic_cast<KMainWindow*>(topLevelWidget()); KStatusBar *bar = mainWin ? mainWin->statusBar() : 0; @@ -324,13 +324,13 @@ void KNMainWidget::seStatusMsg(const TQString& text, int id) bar->clear(); if (text.isEmpty() && (id==SB_MAIN)) { if (knGlobals.netAccess()->currentMsg().isEmpty()) - BroadcastStatus::instance()->seStatusMsg(i18n(" Ready")); + BroadcastStatus::instance()->setStatusMsg(i18n(" Ready")); else - BroadcastStatus::instance()->seStatusMsg(knGlobals.netAccess()->currentMsg()); + BroadcastStatus::instance()->setStatusMsg(knGlobals.netAccess()->currentMsg()); } else { switch(id) { case SB_MAIN: - BroadcastStatus::instance()->seStatusMsg(text); break; + BroadcastStatus::instance()->setStatusMsg(text); break; case SB_GROUP: s_tatusGroup->setText(text); break; case SB_FILTER: @@ -340,7 +340,7 @@ void KNMainWidget::seStatusMsg(const TQString& text, int id) } -void KNMainWidget::seStatusHelpMsg(const TQString& text) +void KNMainWidget::setStatusHelpMsg(const TQString& text) { KMainWindow *mainWin = dynamic_cast<KMainWindow*>(topLevelWidget()); KStatusBar *bar = mainWin ? mainWin->statusBar() : 0; @@ -775,7 +775,7 @@ bool KNMainWidget::firstStart() emailConf.setGroup("Defaults"); TQString group = emailConf.readEntry("Profile","Default"); - emailConf.setGroup(TQString("PROFILE_%1").tqarg(group)); + emailConf.setGroup(TQString("PROFILE_%1").arg(group)); KNConfig::Identity *id=knGlobals.configManager()->identity(); id->setName(emailConf.readEntry("FullName")); id->setEmail(emailConf.readEntry("EmailAddress").latin1()); @@ -1511,7 +1511,7 @@ void KNMainWidget::slotGrpUnsubscribe() kdDebug(5003) << "KNMainWidget::slotGrpUnsubscribe()" << endl; if(g_rpManager->currentGroup()) { if(KMessageBox::Yes==KMessageBox::questionYesNo(knGlobals.topWidget, - i18n("Do you really want to unsubscribe from %1?").tqarg(g_rpManager->currentGroup()->groupname()), TQString(), i18n("Unsubscribe"), KStdGuiItem::cancel())) + i18n("Do you really want to unsubscribe from %1?").arg(g_rpManager->currentGroup()->groupname()), TQString(), i18n("Unsubscribe"), KStdGuiItem::cancel())) if (g_rpManager->unsubscribeGroup(g_rpManager->currentGroup())) slotCollectionSelected(0); } @@ -1588,7 +1588,7 @@ void KNMainWidget::slotFolDelete() KMessageBox::sorry(knGlobals.topWidget, i18n("You cannot delete a standard folder.")); else if( KMessageBox::Continue==KMessageBox::warningContinueCancel(knGlobals.topWidget, - i18n("Do you really want to delete this folder and all its tqchildren?"),"",KGuiItem(i18n("&Delete"),"editdelete")) ) { + i18n("Do you really want to delete this folder and all its children?"),"",KGuiItem(i18n("&Delete"),"editdelete")) ) { if(!f_olManager->deleteFolder(f_olManager->currentFolder())) KMessageBox::sorry(knGlobals.topWidget, @@ -1639,7 +1639,7 @@ void KNMainWidget::slotFolEmpty() return; } if( KMessageBox::Continue == KMessageBox::warningContinueCancel( - this, i18n("Do you really want to delete all articles in %1?").tqarg(f_olManager->currentFolder()->name()),"",KGuiItem(i18n("&Delete"),"editdelete")) ) + this, i18n("Do you really want to delete all articles in %1?").arg(f_olManager->currentFolder()->name()),"",KGuiItem(i18n("&Delete"),"editdelete")) ) f_olManager->emptyFolder(f_olManager->currentFolder()); } } @@ -1948,7 +1948,7 @@ void KNMainWidget::slotFetchArticleWithID() TQString id = dlg->messageId().simplifyWhiteSpace(); if (id.find(TQRegExp("*@*",false,true))!=-1) { if (id.find(TQRegExp("<*>",false,true))==-1) // add "<>" when necessary - id = TQString("<%1>").tqarg(id); + id = TQString("<%1>").arg(id); if(!KNArticleWindow::raiseWindowForArticle(id.latin1())) { //article not yet opened KNRemoteArticle *a=new KNRemoteArticle(g_rpManager->currentGroup()); diff --git a/knode/knmainwidget.h b/knode/knmainwidget.h index 6a6e8ed1a..fffd22b45 100644 --- a/knode/knmainwidget.h +++ b/knode/knmainwidget.h @@ -73,8 +73,8 @@ public: void prepareShutdown(); //GUI - void seStatusMsg(const TQString& = TQString(), int id=SB_MAIN); - void seStatusHelpMsg(const TQString& text); + void setStatusMsg(const TQString& = TQString(), int id=SB_MAIN); + void setStatusHelpMsg(const TQString& text); void updateCaption(); void setCursorBusy(bool b=true); void blockUI(bool b=true); diff --git a/knode/knmemorymanager.cpp b/knode/knmemorymanager.cpp index 365e9f8c9..37a639287 100644 --- a/knode/knmemorymanager.cpp +++ b/knode/knmemorymanager.cpp @@ -162,7 +162,7 @@ void KNMemoryManager::checkMemoryUsageCollections() for ( TQValueList<CollectionItem*>::Iterator it = tempList.begin(); it != tempList.end(); ) { if ( c_ollCacheSize <= maxSize ) break; - // unloadHeaders() will remove the cache entry and thus tqinvalidate the iterator! + // unloadHeaders() will remove the cache entry and thus invalidate the iterator! c = (*it)->col; ++it; @@ -191,7 +191,7 @@ void KNMemoryManager::checkMemoryUsageArticles() for ( TQValueList<ArticleItem*>::Iterator it = mArtList.begin(); it != mArtList.end(); ) { if ( a_rtCacheSize <= maxSize ) break; - // unloadArticle() will remove the cache entry and thus tqinvalidate the iterator! + // unloadArticle() will remove the cache entry and thus invalidate the iterator! KNArticle *art = (*it)->art; ++it; knGlobals.articleManager()->unloadArticle( art, false ); // *try* to unload diff --git a/knode/knnetaccess.cpp b/knode/knnetaccess.cpp index 1b67d62ea..92e7de23d 100644 --- a/knode/knnetaccess.cpp +++ b/knode/knnetaccess.cpp @@ -102,7 +102,7 @@ void KNNetAccess::addJob(KNJobData *job) if ( !job->account()->readyForLogin() ) { mWalletQueue.append( job ); knGlobals.accountManager()->loadPasswordsAsync(); - job->seStatus( i18n( "Waiting for KWallet..." ) ); + job->setStatus( i18n( "Waiting for KWallet..." ) ); return; } @@ -332,7 +332,7 @@ void KNNetAccess::threadDoneNntp() currentNntpJob = 0L; currMsg = TQString(); - knGlobals.seStatusMsg(); + knGlobals.setStatusMsg(); tmp->setComplete(); tmp->notifyConsumer(); @@ -359,7 +359,7 @@ void KNNetAccess::threadDoneSmtp() currentSmtpJob = 0L; if (!currentNntpJob) { currMsg = TQString(); - knGlobals.seStatusMsg(); + knGlobals.setStatusMsg(); } tmp->setComplete(); @@ -398,53 +398,53 @@ void KNNetAccess::slotThreadSignal(int i) break; case KNProtocolClient::TSconnect: currMsg = i18n(" Connecting to server..."); - knGlobals.seStatusMsg(currMsg); - currentNntpJob->seStatus(currMsg); + knGlobals.setStatusMsg(currMsg); + currentNntpJob->setStatus(currMsg); break; case KNProtocolClient::TSloadGrouplist: currMsg = i18n(" Loading group list from disk..."); - knGlobals.seStatusMsg(currMsg); - currentNntpJob->seStatus(currMsg); + knGlobals.setStatusMsg(currMsg); + currentNntpJob->setStatus(currMsg); break; case KNProtocolClient::TSwriteGrouplist: currMsg = i18n(" Writing group list to disk..."); - knGlobals.seStatusMsg(currMsg); - currentNntpJob->seStatus(currMsg); + knGlobals.setStatusMsg(currMsg); + currentNntpJob->setStatus(currMsg); break; case KNProtocolClient::TSdownloadGrouplist: currMsg = i18n(" Downloading group list..."); - knGlobals.seStatusMsg(currMsg); - currentNntpJob->seStatus(currMsg); + knGlobals.setStatusMsg(currMsg); + currentNntpJob->setStatus(currMsg); break; case KNProtocolClient::TSdownloadNewGroups: currMsg = i18n(" Looking for new groups..."); - knGlobals.seStatusMsg(currMsg); - currentNntpJob->seStatus(currMsg); + knGlobals.setStatusMsg(currMsg); + currentNntpJob->setStatus(currMsg); break; case KNProtocolClient::TSdownloadDesc: currMsg = i18n(" Downloading group descriptions..."); - knGlobals.seStatusMsg(currMsg); - currentNntpJob->seStatus(currMsg); + knGlobals.setStatusMsg(currMsg); + currentNntpJob->setStatus(currMsg); break; case KNProtocolClient::TSdownloadNew: currMsg = i18n(" Downloading new headers..."); - knGlobals.seStatusMsg(currMsg); - currentNntpJob->seStatus(currMsg); + knGlobals.setStatusMsg(currMsg); + currentNntpJob->setStatus(currMsg); break; case KNProtocolClient::TSsortNew: currMsg = i18n(" Sorting..."); - knGlobals.seStatusMsg(currMsg); - currentNntpJob->seStatus(currMsg); + knGlobals.setStatusMsg(currMsg); + currentNntpJob->setStatus(currMsg); break; case KNProtocolClient::TSdownloadArticle: currMsg = i18n(" Downloading article..."); - knGlobals.seStatusMsg(currMsg); - currentNntpJob->seStatus(currMsg); + knGlobals.setStatusMsg(currMsg); + currentNntpJob->setStatus(currMsg); break; case KNProtocolClient::TSsendArticle: currMsg = i18n(" Sending article..."); - knGlobals.seStatusMsg(currMsg); - currentNntpJob->seStatus(currMsg); + knGlobals.setStatusMsg(currMsg); + currentNntpJob->setStatus(currMsg); break; case KNProtocolClient::TSjobStarted: currentNntpJob->setProgress(0); @@ -477,7 +477,7 @@ void KNNetAccess::slotPasswordsChanged() { TQValueList<KNJobData*>::ConstIterator it; for ( it = mWalletQueue.begin(); it != mWalletQueue.end(); ++it ) { - (*it)->seStatus( i18n("Waiting...") ); + (*it)->setStatus( i18n("Waiting...") ); if ( (*it)->type() == KNJobData::JTmail ) smtpJobQueue.append( (*it) ); else diff --git a/knode/knnntpaccount.cpp b/knode/knnntpaccount.cpp index 8aa5f1b76..ba1657c0c 100644 --- a/knode/knnntpaccount.cpp +++ b/knode/knnntpaccount.cpp @@ -174,7 +174,7 @@ void KNNntpAccount::saveInfo() TQString KNNntpAccount::path() { - TQString dir(locateLocal("data","knode/")+TQString("nntp.%1/").tqarg(i_d)); + TQString dir(locateLocal("data","knode/")+TQString("nntp.%1/").arg(i_d)); if (dir.isNull()) KNHelper::displayInternalFileError(); return (dir); diff --git a/knode/knnntpclient.cpp b/knode/knnntpclient.cpp index fbd8ce51d..efc3b18c3 100644 --- a/knode/knnntpclient.cpp +++ b/knode/knnntpclient.cpp @@ -336,7 +336,7 @@ void KNNntpClient::doFetchNewHeaders() sendSignal(TSdownloadNew); errorPrefix=i18n("No new articles could be retrieved for\n%1/%2.\nThe following error occurred:\n") - .tqarg(account.server()).tqarg(target->groupname()); + .arg(account.server()).arg(target->groupname()); cmd="GROUP "; cmd+=target->groupname().utf8(); @@ -482,7 +482,7 @@ void KNNntpClient::doFetchArticle() job->setErrorString( errorPrefix + getCurrentLine() + i18n("<br><br>The article you requested is not available on your news server." "<br>You could try to get it from <a href=\"http://groups.google.com/groups?selm=%1\">groups.google.com</a>.") - .tqarg( msgId ) ); + .arg( msgId ) ); } return; } @@ -638,7 +638,7 @@ bool KNNntpClient::openConnection() #ifndef NDEBUG qDebug("knode: Authorization failed"); #endif - job->setErrorString(i18n("Authentication failed.\nCheck your username and password.\n\n%1").tqarg(getCurrentLine())); + job->setErrorString(i18n("Authentication failed.\nCheck your username and password.\n\n%1").arg(getCurrentLine())); job->setAuthError(true); closeConnection(); return false; @@ -695,7 +695,7 @@ bool KNNntpClient::sendCommand(const TQCString &cmd, int &rep) //qDebug("knode: Password required"); if (!account.pass().length()) { - job->setErrorString(i18n("Authentication failed.\nCheck your username and password.\n\n%1").tqarg(getCurrentLine())); + job->setErrorString(i18n("Authentication failed.\nCheck your username and password.\n\n%1").arg(getCurrentLine())); job->setAuthError(true); closeConnection(); return false; @@ -716,7 +716,7 @@ bool KNNntpClient::sendCommand(const TQCString &cmd, int &rep) if (!KNProtocolClient::sendCommand(cmd,rep)) // retry the original command return false; } else { - job->setErrorString(i18n("Authentication failed.\nCheck your username and password.\n\n%1").tqarg(getCurrentLine())); + job->setErrorString(i18n("Authentication failed.\nCheck your username and password.\n\n%1").arg(getCurrentLine())); job->setAuthError(true); closeConnection(); return false; @@ -729,7 +729,7 @@ bool KNNntpClient::sendCommand(const TQCString &cmd, int &rep) void KNNntpClient::handleErrors() { if (errorPrefix.isEmpty()) - job->setErrorString(i18n("An error occurred:\n%1").tqarg(getCurrentLine())); + job->setErrorString(i18n("An error occurred:\n%1").arg(getCurrentLine())); else job->setErrorString(errorPrefix + getCurrentLine()); diff --git a/knode/knprotocolclient.cpp b/knode/knprotocolclient.cpp index dd0db677a..330199bde 100644 --- a/knode/knprotocolclient.cpp +++ b/knode/knprotocolclient.cpp @@ -201,11 +201,11 @@ bool KNProtocolClient::openConnection() if (ks.status() == IO_LookupError) { job->setErrorString(i18n("Unable to resolve hostname")); } else if (ks.status() == IO_ConnectError) { - job->setErrorString(i18n("Unable to connect:\n%1").tqarg(KExtendedSocket::strError(ks.status(), errno))); + job->setErrorString(i18n("Unable to connect:\n%1").arg(KExtendedSocket::strError(ks.status(), errno))); } else if (ks.status() == IO_TimeOutError) job->setErrorString(i18n("A delay occurred which exceeded the\ncurrent timeout limit.")); else - job->setErrorString(i18n("Unable to connect:\n%1").tqarg(KExtendedSocket::strError(ks.status(), errno))); + job->setErrorString(i18n("Unable to connect:\n%1").arg(KExtendedSocket::strError(ks.status(), errno))); closeSocket(); return false; @@ -432,7 +432,7 @@ bool KNProtocolClient::checkNextResponse(int code) void KNProtocolClient::handleErrors() { if (errorPrefix.isEmpty()) - job->setErrorString(i18n("An error occurred:\n%1").tqarg(thisLine)); + job->setErrorString(i18n("An error occurred:\n%1").arg(thisLine)); else job->setErrorString(errorPrefix + thisLine); diff --git a/knode/knserverinfo.cpp b/knode/knserverinfo.cpp index c0351349b..d314a7710 100644 --- a/knode/knserverinfo.cpp +++ b/knode/knserverinfo.cpp @@ -111,7 +111,7 @@ void KNServerInfo::saveConf(KConfig *conf) "but should not be considered secure from decryption efforts " "if access to the configuration file is obtained.\n" "Do you want to store the password for server '%1' in the " - "configuration file?").tqarg( server() ), + "configuration file?").arg( server() ), i18n("KWallet Not Available"), KGuiItem( i18n("Store Password") ), KGuiItem( i18n("Do Not Store Password") ) ) diff --git a/knode/utilities.cpp b/knode/utilities.cpp index 2297387bf..6d3493362 100644 --- a/knode/utilities.cpp +++ b/knode/utilities.cpp @@ -167,7 +167,7 @@ TQFile* KNSaveHelper::getFile(const TQString &dialogTitle) if (url.isLocalFile()) { if (TQFileInfo(url.path()).exists() && (KMessageBox::warningContinueCancel(knGlobals.topWidget, - i18n("<qt>A file named <b>%1</b> already exists.<br>Do you want to replace it?</qt>").tqarg(url.path()), + i18n("<qt>A file named <b>%1</b> already exists.<br>Do you want to replace it?</qt>").arg(url.path()), dialogTitle, i18n("&Replace")) != KMessageBox::Continue)) { return 0; } @@ -293,7 +293,7 @@ int KNHelper::selectDialog(TQWidget *parent, const TQString &caption, const TQSt return ret; } -// **** window tqgeometry managing ********************************************* +// **** window geometry managing ********************************************* void KNHelper::saveWindowSize(const TQString &name, const TQSize &s) { diff --git a/knotes/ChangeLog b/knotes/ChangeLog index 41ff85579..95990a9d2 100644 --- a/knotes/ChangeLog +++ b/knotes/ChangeLog @@ -3,7 +3,7 @@ ChangeLog for KNotes 2006/07/10 Michael Brade <brade@kde.org> - * added DCOP methods to get and change tqgeometry: + * added DCOP methods to get and change geometry: height(), width(), move(), resize() 2006/06/10 Michael Brade <brade@kde.org> @@ -631,7 +631,7 @@ ChangeLog for KNotes - removed the size setting from the local note config dialog - #20172: separate font settings for title and body * don't reload the display setting if changing e.g. only the color - - the note's tqgeometry could have been changed already + the note's geometry could have been changed already * fixed some bugs introduced by the QTextEdit port 2001/06/10 Michael Brade <brade@informatik.uni-muenchen.de> @@ -922,7 +922,7 @@ Mon Nov 17 21:32:28 1997 Didier Belot <dib@avo.fr> Sat Nov 22 13:13:05 1997 Matthias Ettrich <ettrich@kde.org> - * sessionmanagement: uses kwm properties now, not only tqgeometry info + * sessionmanagement: uses kwm properties now, not only geometry info * look: pretty thin border. KPostit does no longer inherit QMultiline but simply QFrame. New class: KPostitMultilineEdit. New QMessage box for warning. Icon+Miniicon. diff --git a/knotes/knote.cpp b/knotes/knote.cpp index 0571bb1bc..e22ab4285 100644 --- a/knotes/knote.cpp +++ b/knotes/knote.cpp @@ -393,7 +393,7 @@ void KNote::slotKill( bool force ) m_blockEmitDataChanged = true; if ( !force && KMessageBox::warningContinueCancel( this, - i18n("<qt>Do you really want to delete note <b>%1</b>?</qt>").tqarg( m_label->text() ), + i18n("<qt>Do you really want to delete note <b>%1</b>?</qt>").arg( m_label->text() ), i18n("Confirm Delete"), KGuiItem( i18n("&Delete"), "editdelete" ), "ConfirmDeleteNote" ) @@ -804,7 +804,7 @@ void KNote::slotPreferences() void KNote::slotSend() { // pop up dialog to get the IP - KNoteHostDlg hostDlg( i18n("Send \"%1\"").tqarg( name() ), this ); + KNoteHostDlg hostDlg( i18n("Send \"%1\"").arg( name() ), this ); aboutToEnterEventLoop(); bool ok = (hostDlg.exec() == TQDialog::Accepted); eventLoopLeft(); @@ -891,7 +891,7 @@ void KNote::slotSaveAs() if ( file.exists() && KMessageBox::warningContinueCancel( this, i18n("<qt>A file named <b>%1</b> already exists.<br>" - "Are you sure you want to overwrite it?</qt>").tqarg( TQFileInfo(file).fileName() ) ) + "Are you sure you want to overwrite it?</qt>").arg( TQFileInfo(file).fileName() ) ) != KMessageBox::Continue ) { m_blockEmitDataChanged = false; @@ -986,7 +986,7 @@ void KNote::slotUpdateDesktopActions() int count = wm_root.numberOfDesktops(); for ( int n = 1; n <= count; n++ ) - desktops.append( TQString("&%1 %2").tqarg( n ).tqarg( TQString::fromUtf8(wm_root.desktopName( n )) ) ); + desktops.append( TQString("&%1 %2").arg( n ).arg( TQString::fromUtf8(wm_root.desktopName( n )) ) ); m_toDesktop->setItems( desktops ); diff --git a/knotes/knotebutton.cpp b/knotes/knotebutton.cpp index 002dd0f61..be141088d 100644 --- a/knotes/knotebutton.cpp +++ b/knotes/knotebutton.cpp @@ -49,13 +49,13 @@ KNoteButton::~KNoteButton() void KNoteButton::enterEvent( TQEvent * ) { m_flat = false; - tqrepaint( false ); + repaint( false ); } void KNoteButton::leaveEvent( TQEvent * ) { m_flat = true; - tqrepaint(); + repaint(); } TQSize KNoteButton::sizeHint() const diff --git a/knotes/knoteprinter.cpp b/knotes/knoteprinter.cpp index a94e46310..c58031671 100644 --- a/knotes/knoteprinter.cpp +++ b/knotes/knoteprinter.cpp @@ -71,7 +71,7 @@ void KNotePrinter::doPrint( KPrinter& printer, TQPainter& painter, { const int margin = 40; // pt - TQPaintDeviceMetrics metrics( painter.tqdevice() ); + TQPaintDeviceMetrics metrics( painter.device() ); int marginX = margin * metrics.logicalDpiX() / 72; int marginY = margin * metrics.logicalDpiY() / 72; @@ -117,7 +117,7 @@ void KNotePrinter::printNote( const TQString& name, const TQString& content ) co KPrinter printer; printer.setFullPage( true ); - if ( !printer.setup( 0, i18n("Print %1").tqarg(name) ) ) + if ( !printer.setup( 0, i18n("Print %1").arg(name) ) ) return; TQPainter painter; painter.begin( &printer ); diff --git a/knotes/knoteslegacy.cpp b/knotes/knoteslegacy.cpp index 129517b30..006e35cdf 100644 --- a/knotes/knoteslegacy.cpp +++ b/knotes/knoteslegacy.cpp @@ -156,7 +156,7 @@ bool KNotesLegacy::convertKNotes1Config( Journal *journal, TQDir& noteDir, config.readConfig(); config.setVersion( KNOTES_VERSION ); - // get the tqgeometry + // get the geometry config.setWidth( props[3].toUInt() ); config.setHeight( props[4].toUInt() ); diff --git a/knotes/knotesnetrecv.cpp b/knotes/knotesnetrecv.cpp index 5c0be183a..9120336a8 100644 --- a/knotes/knotesnetrecv.cpp +++ b/knotes/knotesnetrecv.cpp @@ -66,8 +66,8 @@ KNotesNetworkReceiver::KNotesNetworkReceiver( KBufferedSocket *s ) // Add the remote IP or hostname and the date to the title, to help the // user guess who wrote it. m_titleAddon = TQString(" [%1, %2]") - .tqarg( m_sock->peerAddress().nodeName() ) - .tqarg( date ); + .arg( m_sock->peerAddress().nodeName() ) + .arg( date ); // Setup the communications connect( m_sock, TQT_SIGNAL(readyRead()), TQT_SLOT(slotDataAvailable()) ); diff --git a/knotes/knotesnetsend.cpp b/knotes/knotesnetsend.cpp index ca3005d6a..42ff66fc9 100644 --- a/knotes/knotesnetsend.cpp +++ b/knotes/knotesnetsend.cpp @@ -91,7 +91,7 @@ void KNotesNetworkSender::slotReadyWrite() void KNotesNetworkSender::slotError( int err ) { KMessageBox::sorry( 0, i18n("Communication error: %1") - .tqarg( TQString(KNetwork::KSocketBase::errorString( static_cast<KSocketBase::SocketError>(err) )) ) + .arg( TQString(KNetwork::KSocketBase::errorString( static_cast<KSocketBase::SocketError>(err) )) ) ); slotClosed(); } diff --git a/knotes/resourcelocal.cpp b/knotes/resourcelocal.cpp index a4e2cf70c..53ea68ac8 100644 --- a/knotes/resourcelocal.cpp +++ b/knotes/resourcelocal.cpp @@ -89,7 +89,7 @@ bool ResourceLocal::save() i18n("<qt>Unable to save the notes to <b>%1</b>. " "Check that there is sufficient disk space." "<br>There should be a backup in the same directory " - "though.</qt>").tqarg( mURL.path() ) ); + "though.</qt>").arg( mURL.path() ) ); return false; } diff --git a/kode/enum.cpp b/kode/enum.cpp index 8a41f58b6..64bf8f790 100644 --- a/kode/enum.cpp +++ b/kode/enum.cpp @@ -41,9 +41,9 @@ TQString Enum::declaration() const for ( it = mEnums.begin(); it != mEnums.end(); ++it, ++value ) { if ( mCombinable ) { if ( it == mEnums.begin() ) - retval += TQString( " %1 = %2" ).tqarg( *it ).tqarg( 1 << value ); + retval += TQString( " %1 = %2" ).arg( *it ).arg( 1 << value ); else - retval += TQString( ", %1 = %2" ).tqarg( *it ).tqarg( 1 << value ); + retval += TQString( ", %1 = %2" ).arg( *it ).arg( 1 << value ); } else { if ( it == mEnums.begin() ) retval += " " + *it; diff --git a/kode/kwsdl/kung/binaryinputfield.cpp b/kode/kwsdl/kung/binaryinputfield.cpp index 8d897c4c5..049736c16 100644 --- a/kode/kwsdl/kung/binaryinputfield.cpp +++ b/kode/kwsdl/kung/binaryinputfield.cpp @@ -131,7 +131,7 @@ void BinaryWidget::setData( const TQByteArray &data ) part->openURL( KURL( file.name() ) ); mMainWidget = part->widget(); } else { - mMainWidget = new TQLabel( i18n( "No part found for visualization of mimetype %1" ).tqarg( mimetype ), this ); + mMainWidget = new TQLabel( i18n( "No part found for visualization of mimetype %1" ).arg( mimetype ), this ); } mData = data; @@ -154,7 +154,7 @@ void BinaryWidget::load() if ( KIO::NetAccess::download( url, tempFile, this ) ) { TQFile file( tempFile ); if ( !file.open( IO_ReadOnly ) ) { - KMessageBox::error( this, i18n( "Unable to open file %1" ).tqarg( url.url() ) ); + KMessageBox::error( this, i18n( "Unable to open file %1" ).arg( url.url() ) ); return; } diff --git a/kode/kwsdl/kung/inputfield.cpp b/kode/kwsdl/kung/inputfield.cpp index a8a1c66f3..7bdd4cdeb 100644 --- a/kode/kwsdl/kung/inputfield.cpp +++ b/kode/kwsdl/kung/inputfield.cpp @@ -25,7 +25,7 @@ #include "inputfield.h" InputField::InputField( const TQString &name ) - : TQObject( 0, TQString( "InputField( %1 )" ).tqarg( name ).latin1() ), + : TQObject( 0, TQString( "InputField( %1 )" ).arg( name ).latin1() ), mName( name ) { } diff --git a/konsolekalendar/konsolekalendar.cpp b/konsolekalendar/konsolekalendar.cpp index ca68b82ca..3c7d2f003 100644 --- a/konsolekalendar/konsolekalendar.cpp +++ b/konsolekalendar/konsolekalendar.cpp @@ -84,7 +84,7 @@ bool KonsoleKalendar::createCalendar() if ( m_variables->isDryRun() ) { cout << i18n( "Create Calendar <Dry Run>: %1" ). - tqarg( m_variables->getCalendarFile() ).local8Bit().data() + arg( m_variables->getCalendarFile() ).local8Bit().data() << endl; } else { kdDebug() << "konsolekalendar.cpp::createCalendar() | " @@ -94,7 +94,7 @@ bool KonsoleKalendar::createCalendar() if ( m_variables->isVerbose() ) { cout << i18n( "Create Calendar <Verbose>: %1" ). - tqarg( m_variables->getCalendarFile() ).local8Bit().data() + arg( m_variables->getCalendarFile() ).local8Bit().data() << endl; } @@ -272,11 +272,11 @@ bool KonsoleKalendar::showInstance() } else { if ( firstdate == lastdate ) { title = i18n( "Events: %1" ) - .tqarg( firstdate.toString( Qt::TextDate ) ); + .arg( firstdate.toString( Qt::TextDate ) ); } else { title = i18n( "Events: %1 - %2" ) - .tqarg( firstdate.toString( Qt::TextDate ) ) - .tqarg( lastdate.toString( Qt::TextDate ) ); + .arg( firstdate.toString( Qt::TextDate ) ) + .arg( lastdate.toString( Qt::TextDate ) ); } htmlSettings.setEventView( true ); } @@ -435,15 +435,15 @@ bool KonsoleKalendar::isEvent( TQDateTime startdate, void KonsoleKalendar::printSpecs() { cout << i18n( " What: %1" ). - tqarg( m_variables->getSummary() ).local8Bit().data() + arg( m_variables->getSummary() ).local8Bit().data() << endl; cout << i18n( " Begin: %1" ). - tqarg( m_variables->getStartDateTime().toString( Qt::TextDate ) ).local8Bit().data() + arg( m_variables->getStartDateTime().toString( Qt::TextDate ) ).local8Bit().data() << endl; cout << i18n( " End: %1" ). - tqarg( m_variables->getEndDateTime().toString( Qt::TextDate ) ).local8Bit().data() + arg( m_variables->getEndDateTime().toString( Qt::TextDate ) ).local8Bit().data() << endl; if ( m_variables->getFloating() == true ) { @@ -452,10 +452,10 @@ void KonsoleKalendar::printSpecs() } cout << i18n( " Desc: %1" ). - tqarg( m_variables->getDescription() ).local8Bit().data() + arg( m_variables->getDescription() ).local8Bit().data() << endl; cout << i18n( " Location: %1" ). - tqarg( m_variables->getLocation() ).local8Bit().data() + arg( m_variables->getLocation() ).local8Bit().data() << endl; } diff --git a/konsolekalendar/konsolekalendaradd.cpp b/konsolekalendar/konsolekalendaradd.cpp index 8ef25f6db..36e23629c 100644 --- a/konsolekalendar/konsolekalendaradd.cpp +++ b/konsolekalendar/konsolekalendaradd.cpp @@ -91,14 +91,14 @@ bool KonsoleKalendarAdd::addEvent() if ( m_variables->getCalendar()->addEvent( event ) ) { cout << i18n( "Success: \"%1\" inserted" ). - tqarg( m_variables->getSummary() ).local8Bit().data() + arg( m_variables->getSummary() ).local8Bit().data() << endl; m_variables->getCalendar()->save(); } else { cout << i18n( "Failure: \"%1\" not inserted" ). - tqarg( m_variables->getSummary() ).local8Bit().data() + arg( m_variables->getSummary() ).local8Bit().data() << endl; status = false; } @@ -142,15 +142,15 @@ bool KonsoleKalendarAdd::addImportedCalendar() void KonsoleKalendarAdd::printSpecs() { cout << i18n( " What: %1" ). - tqarg( m_variables->getSummary() ).local8Bit().data() + arg( m_variables->getSummary() ).local8Bit().data() << endl; cout << i18n( " Begin: %1" ). - tqarg( m_variables->getStartDateTime().toString( Qt::TextDate ) ).local8Bit().data() + arg( m_variables->getStartDateTime().toString( Qt::TextDate ) ).local8Bit().data() << endl; cout << i18n( " End: %1" ). - tqarg( m_variables->getEndDateTime().toString( Qt::TextDate ) ).local8Bit().data() + arg( m_variables->getEndDateTime().toString( Qt::TextDate ) ).local8Bit().data() << endl; if ( m_variables->getFloating() == true ) { @@ -159,10 +159,10 @@ void KonsoleKalendarAdd::printSpecs() } cout << i18n( " Desc: %1" ). - tqarg( m_variables->getDescription() ).local8Bit().data() + arg( m_variables->getDescription() ).local8Bit().data() << endl; cout << i18n( " Location: %1" ). - tqarg( m_variables->getLocation() ).local8Bit().data() + arg( m_variables->getLocation() ).local8Bit().data() << endl; } diff --git a/konsolekalendar/konsolekalendarchange.cpp b/konsolekalendar/konsolekalendarchange.cpp index 5ba9d2769..338ed1e54 100644 --- a/konsolekalendar/konsolekalendarchange.cpp +++ b/konsolekalendar/konsolekalendarchange.cpp @@ -108,14 +108,14 @@ bool KonsoleKalendarChange::changeEvent() if ( m_variables->getCalendar()->addEvent( event ) ) { cout << i18n( "Success: \"%1\" changed" ) - .tqarg( event->summary() ).local8Bit().data() + .arg( event->summary() ).local8Bit().data() << endl; m_variables->getCalendar()->save(); status = true; } else { cout << i18n( "Failure: \"%1\" not changed" ) - .tqarg( event->summary() ).local8Bit().data() + .arg( event->summary() ).local8Bit().data() << endl; } } @@ -128,53 +128,53 @@ bool KonsoleKalendarChange::changeEvent() void KonsoleKalendarChange::printSpecs( Event *event ) { cout << i18n( " UID: %1" ). - tqarg( event->uid() ).local8Bit().data() + arg( event->uid() ).local8Bit().data() << endl; cout << i18n( " What: %1" ). - tqarg( event->summary() ).local8Bit().data() + arg( event->summary() ).local8Bit().data() << endl; cout << i18n( " Begin: %1" ). - tqarg( event->dtStart().toString( Qt::TextDate ) ).local8Bit().data() + arg( event->dtStart().toString( Qt::TextDate ) ).local8Bit().data() << endl; cout << i18n( " End: %1" ). - tqarg( event->dtEnd().toString( Qt::TextDate ) ).local8Bit().data() + arg( event->dtEnd().toString( Qt::TextDate ) ).local8Bit().data() << endl; cout << i18n( " Desc: %1" ). - tqarg( event->description() ).local8Bit().data() + arg( event->description() ).local8Bit().data() << endl; cout << i18n( " Location: %1" ). - tqarg( event->location() ).local8Bit().data() + arg( event->location() ).local8Bit().data() << endl; } void KonsoleKalendarChange::printSpecs() { cout << i18n( " UID: %1" ). - tqarg( m_variables->getUID() ).local8Bit().data() + arg( m_variables->getUID() ).local8Bit().data() << endl; cout << i18n( " What: %1" ). - tqarg( m_variables->getSummary() ).local8Bit().data() + arg( m_variables->getSummary() ).local8Bit().data() << endl; cout << i18n( " Begin: %1" ). - tqarg( m_variables->getStartDateTime().toString( Qt::TextDate ) ).local8Bit().data() + arg( m_variables->getStartDateTime().toString( Qt::TextDate ) ).local8Bit().data() << endl; cout << i18n( " End: %1" ). - tqarg( m_variables->getEndDateTime().toString( Qt::TextDate ) ).local8Bit().data() + arg( m_variables->getEndDateTime().toString( Qt::TextDate ) ).local8Bit().data() << endl; cout << i18n( " Desc: %1" ). - tqarg( m_variables->getDescription() ).local8Bit().data() + arg( m_variables->getDescription() ).local8Bit().data() << endl; cout << i18n( " Location: %1" ). - tqarg( m_variables->getLocation() ).local8Bit().data() + arg( m_variables->getLocation() ).local8Bit().data() << endl; } diff --git a/konsolekalendar/konsolekalendardelete.cpp b/konsolekalendar/konsolekalendardelete.cpp index 160e87e1a..65b8d4254 100644 --- a/konsolekalendar/konsolekalendardelete.cpp +++ b/konsolekalendar/konsolekalendardelete.cpp @@ -78,7 +78,7 @@ bool KonsoleKalendarDelete::deleteEvent() m_variables->getCalendar()->deleteEvent( event ); cout << i18n( "Success: \"%1\" deleted" ) - .tqarg( event->summary() ).local8Bit().data() + .arg( event->summary() ).local8Bit().data() << endl; m_variables->getCalendar()->save(); @@ -93,26 +93,26 @@ bool KonsoleKalendarDelete::deleteEvent() void KonsoleKalendarDelete::printSpecs( Event *event ) { cout << i18n( " UID: %1" ). - tqarg( m_variables->getUID() ).local8Bit().data() + arg( m_variables->getUID() ).local8Bit().data() << endl; cout << i18n( " What: %1" ). - tqarg( event->summary() ).local8Bit().data() + arg( event->summary() ).local8Bit().data() << endl; cout << i18n( " Begin: %1" ). - tqarg( event->dtStart().toString( Qt::TextDate ) ).local8Bit().data() + arg( event->dtStart().toString( Qt::TextDate ) ).local8Bit().data() << endl; cout << i18n( " End: %1" ). - tqarg( event->dtEnd().toString( Qt::TextDate ) ).local8Bit().data() + arg( event->dtEnd().toString( Qt::TextDate ) ).local8Bit().data() << endl; cout << i18n( " Desc: %1" ). - tqarg( event->description() ).local8Bit().data() + arg( event->description() ).local8Bit().data() << endl; cout << i18n( " Location: %1" ). - tqarg( event->location() ).local8Bit().data() + arg( event->location() ).local8Bit().data() << endl; } diff --git a/konsolekalendar/main.cpp b/konsolekalendar/main.cpp index 124862fed..02aa5b6e2 100644 --- a/konsolekalendar/main.cpp +++ b/konsolekalendar/main.cpp @@ -241,22 +241,22 @@ int main( int argc, char *argv[] ) if ( args->isSet( "export-list" ) ) { cout << endl; cout << i18n( "%1 supports these export formats:" ). - tqarg( progDisplay ).local8Bit().data() + arg( progDisplay ).local8Bit().data() << endl; cout << i18n( " %1 [Default]" ). - tqarg( "Text" ).local8Bit().data() + arg( "Text" ).local8Bit().data() << endl; cout << i18n( " %1 (like %2, but more compact)" ). - tqarg( "Short", "Text" ).local8Bit().data() + arg( "Short", "Text" ).local8Bit().data() << endl; cout << i18n( " %1" ). - tqarg( "HTML" ).local8Bit().data() + arg( "HTML" ).local8Bit().data() << endl; cout << i18n( " %1 (like %2, but in a month view)" ). - tqarg( "HTMLmonth", "HTML" ).local8Bit().data() + arg( "HTMLmonth", "HTML" ).local8Bit().data() << endl; cout << i18n( " %1 (Comma-Separated Values)" ). - tqarg( "CSV" ).local8Bit().data() + arg( "CSV" ).local8Bit().data() << endl; cout << endl; return 0; @@ -315,7 +315,7 @@ int main( int argc, char *argv[] ) variables.setExportType( ExportTypeTextShort ); } else { cout << i18n( "Invalid Export Type Specified: %1" ). - tqarg( option ).local8Bit().data() + arg( option ).local8Bit().data() << endl; return 1; } @@ -475,7 +475,7 @@ int main( int argc, char *argv[] ) startdate = TQDate::fromString( option, Qt::ISODate ); if ( !startdate.isValid() ) { cout << i18n( "Invalid Start Date Specified: %1" ). - tqarg( option ).local8Bit().data() + arg( option ).local8Bit().data() << endl; return 1; } @@ -500,7 +500,7 @@ int main( int argc, char *argv[] ) starttime = TQTime::fromString( option, Qt::ISODate ); if ( !starttime.isValid() ) { cout << i18n( "Invalid Start Time Specified: %1" ). - tqarg( option ).local8Bit().data() + arg( option ).local8Bit().data() << endl; return 1; } @@ -530,7 +530,7 @@ int main( int argc, char *argv[] ) enddate = TQDate::fromString( option, Qt::ISODate ); if ( !enddate.isValid() ) { cout << i18n( "Invalid End Date Specified: %1" ). - tqarg( option ).local8Bit().data() + arg( option ).local8Bit().data() << endl; return 1; } @@ -554,7 +554,7 @@ int main( int argc, char *argv[] ) if ( !ok ) { cout << i18n( "Invalid Date Count Specified: %1" ). - tqarg( option ).local8Bit().data() + arg( option ).local8Bit().data() << endl; return 1; } @@ -582,7 +582,7 @@ int main( int argc, char *argv[] ) endtime = TQTime::fromString( option, Qt::ISODate ); if ( !endtime.isValid() ) { cout << i18n( "Invalid End Time Specified: %1" ). - tqarg( option ).local8Bit().data() + arg( option ).local8Bit().data() << endl; return 1; } @@ -682,12 +682,12 @@ int main( int argc, char *argv[] ) if ( remote ) { cout << i18n( "Attempting to create a remote file %1" ). - tqarg( variables.getCalendarFile() ).local8Bit().data() << endl; + arg( variables.getCalendarFile() ).local8Bit().data() << endl; return 1; } else { if ( exists ) { cout << i18n( "Calendar %1 already exists" ). - tqarg( variables.getCalendarFile() ).local8Bit().data() + arg( variables.getCalendarFile() ).local8Bit().data() << endl; return 1; } @@ -695,12 +695,12 @@ int main( int argc, char *argv[] ) if ( konsolekalendar->createCalendar() ) { cout << i18n( "Calendar %1 successfully created" ). - tqarg( variables.getCalendarFile() ).local8Bit().data() + arg( variables.getCalendarFile() ).local8Bit().data() << endl; return 0; } else { cout << i18n( "Unable to create calendar: %1" ). - tqarg( variables.getCalendarFile() ).local8Bit().data() + arg( variables.getCalendarFile() ).local8Bit().data() << endl; return 1; } @@ -708,7 +708,7 @@ int main( int argc, char *argv[] ) if ( !exists ) { cout << i18n( "Calendar file not found %1" ). - tqarg( variables.getCalendarFile() ).local8Bit().data() + arg( variables.getCalendarFile() ).local8Bit().data() << endl; cout << i18n( "Try --create to create new calendar file" ).local8Bit().data() << endl; @@ -894,17 +894,17 @@ int main( int argc, char *argv[] ) */ TQString prodId = "-//K Desktop Environment//NONSGML %1 %2//EN"; CalFormat::setApplication( progDisplay, - prodId.tqarg( progDisplay ).tqarg( progVersion ) ); + prodId.arg( progDisplay ).arg( progVersion ) ); if ( importFile ) { if ( konsolekalendar->importCalendar() ) { cout << i18n( "Calendar %1 successfully imported" ). - tqarg( variables.getImportFile() ).local8Bit().data() + arg( variables.getImportFile() ).local8Bit().data() << endl; return 0; } else { cout << i18n( "Unable to import calendar: %1" ). - tqarg( variables.getImportFile() ).local8Bit().data() + arg( variables.getImportFile() ).local8Bit().data() << endl; return 1; } @@ -971,7 +971,7 @@ int main( int argc, char *argv[] ) << endl; if ( !konsolekalendar->showInstance() ) { cout << i18n( "Cannot open specified export file: %1" ). - tqarg( variables.getExportFile() ).local8Bit().data() + arg( variables.getExportFile() ).local8Bit().data() << endl; return 1; } diff --git a/kontact/interfaces/core.cpp b/kontact/interfaces/core.cpp index ed8848c61..92e0f624d 100644 --- a/kontact/interfaces/core.cpp +++ b/kontact/interfaces/core.cpp @@ -86,10 +86,10 @@ KParts::ReadOnlyPart *Core::createPart( const char *libname ) d->lastErrorMessage = KLibLoader::self()->lastErrorMessage(); break; case KParts::ComponentFactory::ErrNoFactory: - d->lastErrorMessage = i18n( "Program error: the library %1 does not provide a factory." ).tqarg( libname ); + d->lastErrorMessage = i18n( "Program error: the library %1 does not provide a factory." ).arg( libname ); break; case KParts::ComponentFactory::ErrNoComponent: - d->lastErrorMessage = i18n( "Program error: the library %1 does not support creating components of the specified type" ).tqarg( libname ); + d->lastErrorMessage = i18n( "Program error: the library %1 does not support creating components of the specified type" ).arg( libname ); break; } kdWarning(5601) << d->lastErrorMessage << endl; diff --git a/kontact/interfaces/summary.cpp b/kontact/interfaces/summary.cpp index ece3a5775..6192dd4c4 100644 --- a/kontact/interfaces/summary.cpp +++ b/kontact/interfaces/summary.cpp @@ -109,8 +109,8 @@ void Summary::dragEnterEvent( TQDragEnterEvent *event ) void Summary::dropEvent( TQDropEvent *event ) { - int tqalignment = (event->pos().y() < (height() / 2) ? TQt::AlignTop : TQt::AlignBottom); - emit summaryWidgetDropped( this, event->source(), tqalignment ); + int alignment = (event->pos().y() < (height() / 2) ? TQt::AlignTop : TQt::AlignBottom); + emit summaryWidgetDropped( this, event->source(), alignment ); } #include "summary.moc" diff --git a/kontact/interfaces/summary.h b/kontact/interfaces/summary.h index f50507ce7..f490f517e 100644 --- a/kontact/interfaces/summary.h +++ b/kontact/interfaces/summary.h @@ -74,7 +74,7 @@ class KDE_EXPORT Summary : public TQWidget signals: void message( const TQString &message ); - void summaryWidgetDropped( TQWidget *target, TQWidget *widget, int tqalignment ); + void summaryWidgetDropped( TQWidget *target, TQWidget *widget, int alignment ); protected: virtual void mousePressEvent( TQMouseEvent* ); diff --git a/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp b/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp index 34bec493e..88a975b70 100644 --- a/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp +++ b/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp @@ -171,7 +171,7 @@ void KAddressbookPlugin::processDropEvent( TQDropEvent *event ) } KMessageBox::sorry( core(), i18n( "Cannot handle drop events of type '%1'." ) - .tqarg( event->format() ) ); + .arg( event->format() ) ); } diff --git a/kontact/plugins/kmail/summarywidget.cpp b/kontact/plugins/kmail/summarywidget.cpp index 3a0b16591..76b2b759c 100644 --- a/kontact/plugins/kmail/summarywidget.cpp +++ b/kontact/plugins/kmail/summarywidget.cpp @@ -142,7 +142,7 @@ void SummaryWidget::updateFolderList( const TQStringList& folders ) TQLabel *label = new TQLabel( TQString( i18n("%1: number of unread messages " "%2: total number of messages", "%1 / %2") ) - .tqarg( numUnreadMsg ).tqarg( numMsg ), this ); + .arg( numUnreadMsg ).arg( numMsg ), this ); label->setAlignment( AlignLeft ); label->show(); mLayout->addWidget( label, counter, 2 ); @@ -166,7 +166,7 @@ bool SummaryWidget::eventFilter( TQObject *obj, TQEvent* e ) if ( obj->inherits( "KURLLabel" ) ) { KURLLabel* label = static_cast<KURLLabel*>( TQT_TQWIDGET(obj) ); if ( e->type() == TQEvent::Enter ) - emit message( i18n( "Open Folder: \"%1\"" ).tqarg( label->text() ) ); + emit message( i18n( "Open Folder: \"%1\"" ).arg( label->text() ) ); if ( e->type() == TQEvent::Leave ) emit message( TQString() ); } diff --git a/kontact/plugins/knotes/summarywidget.cpp b/kontact/plugins/knotes/summarywidget.cpp index 2f598990f..309904a9b 100644 --- a/kontact/plugins/knotes/summarywidget.cpp +++ b/kontact/plugins/knotes/summarywidget.cpp @@ -103,7 +103,7 @@ void KNotesSummaryWidget::updateView() KURLLabel *urlLabel = new KURLLabel( (*it)->uid(), newtext, this ); urlLabel->installEventFilter( this ); urlLabel->setTextFormat(RichText); - urlLabel->setAlignment( urlLabel->tqalignment() | TQt::WordBreak ); + urlLabel->setAlignment( urlLabel->alignment() | TQt::WordBreak ); mLayout->addWidget( urlLabel, counter, 1 ); mLabels.append( urlLabel ); @@ -140,7 +140,7 @@ bool KNotesSummaryWidget::eventFilter( TQObject *obj, TQEvent* e ) if ( obj->inherits( "KURLLabel" ) ) { KURLLabel* label = static_cast<KURLLabel*>( TQT_TQWIDGET(obj) ); if ( e->type() == TQEvent::Enter ) - emit message( i18n( "Read Note: \"%1\"" ).tqarg( label->text() ) ); + emit message( i18n( "Read Note: \"%1\"" ).arg( label->text() ) ); if ( e->type() == TQEvent::Leave ) emit message( TQString() ); } diff --git a/kontact/plugins/korganizer/korganizerplugin.cpp b/kontact/plugins/korganizer/korganizerplugin.cpp index 6d39d413a..2262dcef3 100644 --- a/kontact/plugins/korganizer/korganizerplugin.cpp +++ b/kontact/plugins/korganizer/korganizerplugin.cpp @@ -195,7 +195,7 @@ void KOrganizerPlugin::processDropEvent( TQDropEvent *event ) KCal::Incidence *i = incidences.first(); TQString summary; if ( dynamic_cast<KCal::Journal*>( i ) ) - summary = i18n( "Note: %1" ).tqarg( i->summary() ); + summary = i18n( "Note: %1" ).arg( i->summary() ); else summary = i->summary(); interface()->openEventEditor( summary, i->description(), TQString() ); @@ -219,22 +219,22 @@ void KOrganizerPlugin::processDropEvent( TQDropEvent *event ) i18n("Drops of multiple mails are not supported." ) ); } else { KPIM::MailSummary mail = mails.first(); - TQString txt = i18n("From: %1\nTo: %2\nSubject: %3").tqarg( mail.from() ) - .tqarg( mail.to() ).tqarg( mail.subject() ); + TQString txt = i18n("From: %1\nTo: %2\nSubject: %3").arg( mail.from() ) + .arg( mail.to() ).arg( mail.subject() ); KTempFile tf; tf.setAutoDelete( true ); TQString uri = TQString::fromLatin1("kmail:") + TQString::number( mail.serialNumber() ); tf.file()->writeBlock( event->encodedData( "message/rfc822" ) ); tf.close(); - interface()->openEventEditor( i18n("Mail: %1").tqarg( mail.subject() ), txt, + interface()->openEventEditor( i18n("Mail: %1").arg( mail.subject() ), txt, uri, tf.name(), TQStringList(), "message/rfc822" ); } return; } KMessageBox::sorry( core(), i18n("Cannot handle drop events of type '%1'.") - .tqarg( event->format() ) ); + .arg( event->format() ) ); } bool KOrganizerPlugin::queryClose() const { diff --git a/kontact/plugins/korganizer/summarywidget.cpp b/kontact/plugins/korganizer/summarywidget.cpp index c4c4dad9c..ee8eefdcd 100644 --- a/kontact/plugins/korganizer/summarywidget.cpp +++ b/kontact/plugins/korganizer/summarywidget.cpp @@ -191,14 +191,14 @@ void SummaryWidget::updateView() // Fill Event Summary Field TQString newtext = ev->summary(); if ( ev->isMultiDay() && !ev->doesFloat() ) { - newtext.append( TQString(" (%1/%2)").tqarg( dayof ).tqarg( span ) ); + newtext.append( TQString(" (%1/%2)").arg( dayof ).arg( span ) ); } KURLLabel *urlLabel = new KURLLabel( this ); urlLabel->setText( newtext ); urlLabel->setURL( ev->uid() ); urlLabel->installEventFilter( this ); - urlLabel->setAlignment( urlLabel->tqalignment() | TQt::WordBreak ); + urlLabel->setAlignment( urlLabel->alignment() | TQt::WordBreak ); mLayout->addWidget( urlLabel, counter, 2 ); mLabels.append( urlLabel ); @@ -225,8 +225,8 @@ void SummaryWidget::updateView() } } datestr = i18n( "Time from - to", "%1 - %2" ) - .tqarg( KGlobal::locale()->formatTime( sST ) ) - .tqarg( KGlobal::locale()->formatTime( sET ) ); + .arg( KGlobal::locale()->formatTime( sST ) ) + .arg( KGlobal::locale()->formatTime( sET ) ); label = new TQLabel( datestr, this ); label->setAlignment( AlignLeft | AlignVCenter ); mLayout->addWidget( label, counter, 3 ); @@ -288,7 +288,7 @@ bool SummaryWidget::eventFilter( TQObject *obj, TQEvent* e ) if ( obj->inherits( "KURLLabel" ) ) { KURLLabel* label = static_cast<KURLLabel*>( TQT_TQWIDGET(obj) ); if ( e->type() == TQEvent::Enter ) - emit message( i18n( "Edit Appointment: \"%1\"" ).tqarg( label->text() ) ); + emit message( i18n( "Edit Appointment: \"%1\"" ).arg( label->text() ) ); if ( e->type() == TQEvent::Leave ) emit message( TQString() ); } diff --git a/kontact/plugins/korganizer/todoplugin.cpp b/kontact/plugins/korganizer/todoplugin.cpp index c17b153f5..e3ff2ba8f 100644 --- a/kontact/plugins/korganizer/todoplugin.cpp +++ b/kontact/plugins/korganizer/todoplugin.cpp @@ -187,7 +187,7 @@ void TodoPlugin::processDropEvent( TQDropEvent *event ) KCal::Incidence *i = incidences.first(); TQString summary; if ( dynamic_cast<KCal::Journal*>( i ) ) - summary = i18n( "Note: %1" ).tqarg( i->summary() ); + summary = i18n( "Note: %1" ).arg( i->summary() ); else summary = i->summary(); interface()->openTodoEditor( summary, i->description(), TQString() ); @@ -210,8 +210,8 @@ void TodoPlugin::processDropEvent( TQDropEvent *event ) i18n("Drops of multiple mails are not supported." ) ); } else { KPIM::MailSummary mail = mails.first(); - TQString txt = i18n("From: %1\nTo: %2\nSubject: %3").tqarg( mail.from() ) - .tqarg( mail.to() ).tqarg( mail.subject() ); + TQString txt = i18n("From: %1\nTo: %2\nSubject: %3").arg( mail.from() ) + .arg( mail.to() ).arg( mail.subject() ); KTempFile tf; tf.setAutoDelete( true ); @@ -219,14 +219,14 @@ void TodoPlugin::processDropEvent( TQDropEvent *event ) mail.messageId(); tf.file()->writeBlock( event->encodedData( "message/rfc822" ) ); tf.close(); - interface()->openTodoEditor( i18n("Mail: %1").tqarg( mail.subject() ), + interface()->openTodoEditor( i18n("Mail: %1").arg( mail.subject() ), txt, uri, tf.name(), TQStringList(), "message/rfc822", false ); } return; } KMessageBox::sorry( core(), i18n("Cannot handle drop events of type '%1'.") - .tqarg( event->format() ) ); + .arg( event->format() ) ); } #include "todoplugin.moc" diff --git a/kontact/plugins/korganizer/todosummarywidget.cpp b/kontact/plugins/korganizer/todosummarywidget.cpp index ed21f40bf..7171e539f 100644 --- a/kontact/plugins/korganizer/todosummarywidget.cpp +++ b/kontact/plugins/korganizer/todosummarywidget.cpp @@ -253,7 +253,7 @@ bool TodoSummaryWidget::eventFilter( TQObject *obj, TQEvent* e ) if ( obj->inherits( "KURLLabel" ) ) { KURLLabel* label = static_cast<KURLLabel*>( TQT_TQWIDGET(obj) ); if ( e->type() == TQEvent::Enter ) - emit message( i18n( "Edit To-do: \"%1\"" ).tqarg( label->text() ) ); + emit message( i18n( "Edit To-do: \"%1\"" ).arg( label->text() ) ); if ( e->type() == TQEvent::Leave ) emit message( TQString() ); } diff --git a/kontact/plugins/kpilot/summarywidget.cpp b/kontact/plugins/kpilot/summarywidget.cpp index ff6d41852..d2180a634 100644 --- a/kontact/plugins/kpilot/summarywidget.cpp +++ b/kontact/plugins/kpilot/summarywidget.cpp @@ -101,7 +101,7 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name ) mConduitsTextLabel->setAlignment( AlignAuto | AlignTop | ExpandTabs ); mLayout->addWidget( mConduitsTextLabel, row, 0 ); mConduitsLabel = new TQLabel( i18n( "No information available" ), this ); - mConduitsLabel->setAlignment( mConduitsLabel->tqalignment() | TQt::WordBreak ); + mConduitsLabel->setAlignment( mConduitsLabel->alignment() | TQt::WordBreak ); mLayout->addMultiCellWidget( mConduitsLabel, row, row, 1, 3 ); // widgets shown if kpilotDaemon is not running @@ -202,7 +202,7 @@ void SummaryWidget::showSyncLog( const TQString &filename ) TQFile f(filename); if ( !f.open( IO_ReadOnly ) ) { - KMessageBox::error( this, i18n( "Unable to open Hotsync log %1." ).tqarg( filename ) ); + KMessageBox::error( this, i18n( "Unable to open Hotsync log %1." ).arg( filename ) ); return; } diff --git a/kontact/plugins/specialdates/sdsummarywidget.cpp b/kontact/plugins/specialdates/sdsummarywidget.cpp index 9b5c27efe..1b8475080 100644 --- a/kontact/plugins/specialdates/sdsummarywidget.cpp +++ b/kontact/plugins/specialdates/sdsummarywidget.cpp @@ -595,7 +595,7 @@ bool SDSummaryWidget::eventFilter( TQObject *obj, TQEvent* e ) if ( obj->inherits( "KURLLabel" ) ) { KURLLabel* label = static_cast<KURLLabel*>( TQT_TQWIDGET(obj) ); if ( e->type() == TQEvent::Enter ) - emit message( i18n( "Mail to:\"%1\"" ).tqarg( label->text() ) ); + emit message( i18n( "Mail to:\"%1\"" ).arg( label->text() ) ); if ( e->type() == TQEvent::Leave ) emit message( TQString() ); } diff --git a/kontact/plugins/summary/dropwidget.cpp b/kontact/plugins/summary/dropwidget.cpp index 63c1d3ceb..4b5373b34 100644 --- a/kontact/plugins/summary/dropwidget.cpp +++ b/kontact/plugins/summary/dropwidget.cpp @@ -36,9 +36,9 @@ void DropWidget::dragEnterEvent( TQDragEnterEvent *event ) void DropWidget::dropEvent( TQDropEvent *event ) { - int tqalignment = ( event->pos().x() < (width() / 2) ? TQt::AlignLeft : TQt::AlignRight ); - tqalignment |= ( event->pos().y() < (height() / 2) ? TQt::AlignTop : TQt::AlignBottom ); - emit summaryWidgetDropped( this, event->source(), tqalignment ); + int alignment = ( event->pos().x() < (width() / 2) ? TQt::AlignLeft : TQt::AlignRight ); + alignment |= ( event->pos().y() < (height() / 2) ? TQt::AlignTop : TQt::AlignBottom ); + emit summaryWidgetDropped( this, event->source(), alignment ); } #include "dropwidget.moc" diff --git a/kontact/plugins/summary/dropwidget.h b/kontact/plugins/summary/dropwidget.h index e2d11c9ee..c4fe2c8b2 100644 --- a/kontact/plugins/summary/dropwidget.h +++ b/kontact/plugins/summary/dropwidget.h @@ -33,7 +33,7 @@ class DropWidget : public TQWidget DropWidget( TQWidget *parent, const char *name = 0 ); signals: - void summaryWidgetDropped( TQWidget *target, TQWidget *widget, int tqalignment ); + void summaryWidgetDropped( TQWidget *target, TQWidget *widget, int alignment ); protected: virtual void dragEnterEvent( TQDragEnterEvent* ); diff --git a/kontact/plugins/summary/kcmkontactsummary.cpp b/kontact/plugins/summary/kcmkontactsummary.cpp index 076692948..bf0197cb9 100644 --- a/kontact/plugins/summary/kcmkontactsummary.cpp +++ b/kontact/plugins/summary/kcmkontactsummary.cpp @@ -120,7 +120,7 @@ void KCMKontactSummary::load() { KTrader::OfferList offers = KTrader::self()->query( TQString::fromLatin1( "Kontact/Plugin" ), - TQString( "[X-KDE-KontactPluginVersion] == %1" ).tqarg( KONTACT_PLUGIN_VERSION ) ); + TQString( "[X-KDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) ); TQStringList activeSummaries; diff --git a/kontact/plugins/summary/summaryview_part.cpp b/kontact/plugins/summary/summaryview_part.cpp index 9caeeb6d6..97bb4c53f 100644 --- a/kontact/plugins/summary/summaryview_part.cpp +++ b/kontact/plugins/summary/summaryview_part.cpp @@ -136,8 +136,8 @@ void SummaryViewPart::updateWidgets() KPIM::IdentityManager idm( true, this ); const KPIM::Identity &id = idm.defaultIdentity(); - TQString currentUser = i18n( "Summary for %1" ).tqarg( id.fullName() ); - mUsernameLabel->setText( TQString::fromLatin1( "<b>%1</b>" ).tqarg( currentUser ) ); + TQString currentUser = i18n( "Summary for %1" ).arg( id.fullName() ); + mUsernameLabel->setText( TQString::fromLatin1( "<b>%1</b>" ).arg( currentUser ) ); mSummaries.clear(); @@ -177,7 +177,7 @@ void SummaryViewPart::updateWidgets() mSummaries.insert( plugin->identifier(), summary ); connect( summary, TQT_SIGNAL( message( const TQString& ) ), - BroadcastStatus::instance(), TQT_SLOT( seStatusMsg( const TQString& ) ) ); + BroadcastStatus::instance(), TQT_SLOT( setStatusMsg( const TQString& ) ) ); connect( summary, TQT_SIGNAL( summaryWidgetDropped( TQWidget*, TQWidget*, int ) ), this, TQT_SLOT( summaryWidgetMoved( TQWidget*, TQWidget*, int ) ) ); @@ -241,7 +241,7 @@ void SummaryViewPart::updateWidgets() mRightColumn->addStretch(); } -void SummaryViewPart::summaryWidgetMoved( TQWidget *target, TQWidget *widget, int tqalignment ) +void SummaryViewPart::summaryWidgetMoved( TQWidget *target, TQWidget *widget, int alignment ) { if ( target == widget ) return; @@ -266,17 +266,17 @@ void SummaryViewPart::summaryWidgetMoved( TQWidget *target, TQWidget *widget, in if ( target == mFrame ) { int pos = 0; - if ( tqalignment & TQt::AlignTop ) + if ( alignment & TQt::AlignTop ) pos = 0; - if ( tqalignment & TQt::AlignLeft ) { - if ( tqalignment & TQt::AlignBottom ) + if ( alignment & TQt::AlignLeft ) { + if ( alignment & TQt::AlignBottom ) pos = mLeftColumnSummaries.count(); mLeftColumn->insertWidget( pos, widget ); mLeftColumnSummaries.insert( mLeftColumnSummaries.at( pos ), widgetName( widget ) ); } else { - if ( tqalignment & TQt::AlignBottom ) + if ( alignment & TQt::AlignBottom ) pos = mRightColumnSummaries.count(); mRightColumn->insertWidget( pos, widget ); @@ -288,7 +288,7 @@ void SummaryViewPart::summaryWidgetMoved( TQWidget *target, TQWidget *widget, in int targetPos = mLeftColumn->findWidget( target ); if ( targetPos != -1 ) { - if ( tqalignment == TQt::AlignBottom ) + if ( alignment == TQt::AlignBottom ) targetPos++; mLeftColumn->insertWidget( targetPos, widget ); @@ -296,7 +296,7 @@ void SummaryViewPart::summaryWidgetMoved( TQWidget *target, TQWidget *widget, in } else { targetPos = mRightColumn->findWidget( target ); - if ( tqalignment == TQt::AlignBottom ) + if ( alignment == TQt::AlignBottom ) targetPos++; mRightColumn->insertWidget( targetPos, widget ); @@ -317,7 +317,7 @@ void SummaryViewPart::slotAdjustPalette() void SummaryViewPart::setDate( const TQDate& newDate ) { TQString date( "<b>%1</b>" ); - date = date.tqarg( KGlobal::locale()->formatDate( newDate ) ); + date = date.arg( KGlobal::locale()->formatDate( newDate ) ); mDateLabel->setText( date ); } diff --git a/kontact/plugins/summary/summaryview_part.h b/kontact/plugins/summary/summaryview_part.h index 5a99b947d..28a591dde 100644 --- a/kontact/plugins/summary/summaryview_part.h +++ b/kontact/plugins/summary/summaryview_part.h @@ -76,7 +76,7 @@ class SummaryViewPart : public KParts::ReadOnlyPart protected slots: void slotConfigure(); void updateWidgets(); - void summaryWidgetMoved( TQWidget *target, TQWidget *widget, int tqalignment ); + void summaryWidgetMoved( TQWidget *target, TQWidget *widget, int alignment ); private: void initGUI( Kontact::Core *core ); diff --git a/kontact/plugins/weather/summarywidget.cpp b/kontact/plugins/weather/summarywidget.cpp index a0ff4341c..bf7624e4b 100644 --- a/kontact/plugins/weather/summarywidget.cpp +++ b/kontact/plugins/weather/summarywidget.cpp @@ -101,7 +101,7 @@ void SummaryWidget::updateView() for ( it = dataList.begin(); it != dataList.end(); ++it ) { TQString cover; for ( uint i = 0; i < (*it).cover().count(); ++i ) - cover += TQString( "- %1\n" ).tqarg( (*it).cover()[ i ] ); + cover += TQString( "- %1\n" ).arg( (*it).cover()[ i ] ); TQImage img; img = (*it).icon(); @@ -121,7 +121,7 @@ void SummaryWidget::updateView() this, TQT_SLOT( showReport( const TQString& ) ) ); TQLabel* label = new TQLabel( this ); - label->setText( TQString( "%1 (%2)" ).tqarg( (*it).name() ).tqarg( (*it).temperature() ) ); + label->setText( TQString( "%1 (%2)" ).arg( (*it).name() ).arg( (*it).temperature() ) ); TQFont font = label->font(); font.setBold( true ); label->setFont( font ); @@ -133,12 +133,12 @@ void SummaryWidget::updateView() labelText = TQString( "<b>%1:</b> %2<br>" "<b>%3:</b> %4<br>" "<b>%5:</b> %6" ) - .tqarg( i18n( "Last updated on" ) ) - .tqarg( (*it).date() ) - .tqarg( i18n( "Wind Speed" ) ) - .tqarg( (*it).windSpeed() ) - .tqarg( i18n( "Rel. Humidity" ) ) - .tqarg( (*it).relativeHumidity() ); + .arg( i18n( "Last updated on" ) ) + .arg( (*it).date() ) + .arg( i18n( "Wind Speed" ) ) + .arg( (*it).windSpeed() ) + .arg( i18n( "Rel. Humidity" ) ) + .arg( (*it).relativeHumidity() ); TQToolTip::add( label, labelText.replace( " ", " " ) ); diff --git a/kontact/src/aboutdialog.cpp b/kontact/src/aboutdialog.cpp index 1d52da2f1..8f6be2b04 100644 --- a/kontact/src/aboutdialog.cpp +++ b/kontact/src/aboutdialog.cpp @@ -81,7 +81,7 @@ void AboutDialog::addAboutData( const TQString &title, const TQString &icon, text += "<p><b>" + about->programName() + "</b><br>"; - text += i18n( "Version %1</p>" ).tqarg( about->version() ); + text += i18n( "Version %1</p>" ).arg( about->version() ); if ( !about->shortDescription().isEmpty() ) { text += "<p>" + about->shortDescription() + "<br>" + @@ -163,13 +163,13 @@ void AboutDialog::addLicenseText( const KAboutData *about ) TQPixmap pixmap = KGlobal::iconLoader()->loadIcon( "signature", KIcon::Desktop, 48 ); - TQString title = i18n( "%1 License" ).tqarg( about->programName() ); + TQString title = i18n( "%1 License" ).arg( about->programName() ); TQFrame *topFrame = addPage( title, TQString(), pixmap ); TQBoxLayout *topLayout = new TQVBoxLayout( topFrame ); KTextBrowser *textBrowser = new KTextBrowser( topFrame ); - textBrowser->setText( TQString( "<pre>%1</pre>" ).tqarg( about->license() ) ); + textBrowser->setText( TQString( "<pre>%1</pre>" ).arg( about->license() ) ); topLayout->addWidget( textBrowser ); } diff --git a/kontact/src/kcmkontact.cpp b/kontact/src/kcmkontact.cpp index 5de81055e..889994e9a 100644 --- a/kontact/src/kcmkontact.cpp +++ b/kontact/src/kcmkontact.cpp @@ -115,7 +115,7 @@ void PluginSelection::readConfig() { const KTrader::OfferList offers = KTrader::self()->query( TQString::fromLatin1( "Kontact/Plugin" ), - TQString( "[X-KDE-KontactPluginVersion] == %1" ).tqarg( KONTACT_PLUGIN_VERSION ) ); + TQString( "[X-KDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) ); int activeComponent = 0; mPluginCombo->clear(); diff --git a/kontact/src/main.cpp b/kontact/src/main.cpp index 5cf0bfd50..20c6f5456 100644 --- a/kontact/src/main.cpp +++ b/kontact/src/main.cpp @@ -77,7 +77,7 @@ static void listPlugins() KInstance instance( "kontact" ); // Can't use KontactApp since it's too late for adding cmdline options KTrader::OfferList offers = KTrader::self()->query( TQString::fromLatin1( "Kontact/Plugin" ), - TQString( "[X-KDE-KontactPluginVersion] == %1" ).tqarg( KONTACT_PLUGIN_VERSION ) ); + TQString( "[X-KDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) ); for ( KService::List::Iterator it = offers.begin(); it != offers.end(); ++it ) { KService::Ptr service = (*it); // skip summary only plugins diff --git a/kontact/src/mainwindow.cpp b/kontact/src/mainwindow.cpp index 06664d41e..88be77c73 100644 --- a/kontact/src/mainwindow.cpp +++ b/kontact/src/mainwindow.cpp @@ -125,7 +125,7 @@ void MainWindow::initGUI() KTrader::OfferList offers = KTrader::self()->query( TQString::fromLatin1( "Kontact/Plugin" ), - TQString( "[X-KDE-KontactPluginVersion] == %1" ).tqarg( KONTACT_PLUGIN_VERSION ) ); + TQString( "[X-KDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) ); mPluginInfos = KPluginInfo::fromServices( offers, Prefs::self()->config(), "Plugins" ); KPluginInfo::List::Iterator it; @@ -136,7 +136,7 @@ void MainWindow::initGUI() TQT_TQOBJECT(this), TQT_SLOT(slotActionTriggered()), actionCollection(), (*it)->pluginName().latin1() ); action->setName( (*it)->pluginName().latin1() ); - action->setWhatsThis( i18n( "Switch to plugin %1" ).tqarg( (*it)->name() ) ); + action->setWhatsThis( i18n( "Switch to plugin %1" ).arg( (*it)->name() ) ); TQVariant hasPartProp = (*it)->property( "X-KDE-KontactPluginHasPart" ); if ( !hasPartProp.isValid() || hasPartProp.toBool() ) { @@ -267,7 +267,7 @@ void MainWindow::initWidgets() initAboutScreen(); TQString loading = i18n( "<h2 style='text-align:center; margin-top: 0px; margin-bottom: 0px'>%1</h2>" ) - .tqarg( i18n("Loading Kontact...") ); + .arg( i18n("Loading Kontact...") ); paintAboutScreen( loading ); @@ -290,11 +290,11 @@ void MainWindow::paintAboutScreen( const TQString& msg ) { TQString location = locate( "data", "kontact/about/main.html" ); TQString content = KPIM::kFileToString( location ); - content = content.tqarg( locate( "data", "libtdepim/about/kde_infopage.css" ) ); + content = content.arg( locate( "data", "libtdepim/about/kde_infopage.css" ) ); if ( kapp->reverseLayout() ) - content = content.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "libtdepim/about/kde_infopage_rtl.css" ) ); + content = content.arg( "@import \"%1\";" ).arg( locate( "data", "libtdepim/about/kde_infopage_rtl.css" ) ); else - content = content.tqarg( "" ); + content = content.arg( "" ); mIntroPart->begin( KURL( location ) ); @@ -302,8 +302,8 @@ void MainWindow::paintAboutScreen( const TQString& msg ) TQString catchPhrase( i18n( "Get Organized!" ) ); TQString quickDescription( i18n( "The KDE Personal Information Management Suite" ) ); - mIntroPart->write( content.tqarg( TQFont().pointSize() + 2 ).tqarg( appName ) - .tqarg( catchPhrase ).tqarg( quickDescription ).tqarg( msg ) ); + mIntroPart->write( content.arg( TQFont().pointSize() + 2 ).arg( appName ) + .arg( catchPhrase ).arg( quickDescription ).arg( msg ) ); mIntroPart->end(); } @@ -629,7 +629,7 @@ void MainWindow::updateShortcuts() ++it; if ( isPluginLoadedByAction( action ) ) { loadedActions.append( action ); - TQString shortcut = TQString( "CTRL+%1" ).tqarg( i ); + TQString shortcut = TQString( "CTRL+%1" ).arg( i ); action->setShortcut( KShortcut( shortcut ) ); i++; } else { @@ -794,7 +794,7 @@ void MainWindow::selectPlugin( Kontact::Plugin *plugin ) if ( !part ) { KApplication::restoreOverrideCursor(); KMessageBox::error( this, i18n( "Cannot load part for %1." ) - .tqarg( plugin->title() ) + .arg( plugin->title() ) + "\n" + lastErrorMessage() ); plugin->setDisabled( true ); mSidePane->updatePlugins(); @@ -848,7 +848,7 @@ void MainWindow::selectPlugin( Kontact::Plugin *plugin ) topDock()->moveDockWindow( navigatorToolBar, -1 ); } - setCaption( i18n( "Plugin dependent window title" ,"%1 - Kontact" ).tqarg( plugin->title() ) ); + setCaption( i18n( "Plugin dependent window title" ,"%1 - Kontact" ).arg( plugin->title() ) ); if ( newAction ) { mNewActions->setIcon( newAction->icon() ); @@ -1178,30 +1178,30 @@ TQString MainWindow::introductionString() "<td><a href=\"%1\">%1</a><br><span id=\"subtext\"><nobr>%1</td></tr>" "</table>" "<p style=\"margin-bottom: 0px\"> <a href=\"%1\">Skip this introduction</a></p>" ) - .tqarg( kapp->aboutData()->version() ) - .tqarg( i18n( "Kontact handles your e-mail, addressbook, calendar, to-do list and more." ) ) - .tqarg( "exec:/help?kontact" ) - .tqarg( iconSize ) - .tqarg( iconSize ) - .tqarg( handbook_icon_path ) - .tqarg( "exec:/help?kontact" ) - .tqarg( i18n( "Read Manual" ) ) - .tqarg( i18n( "Learn more about Kontact and its components" ) ) - .tqarg( "http://kontact.org" ) - .tqarg( iconSize ) - .tqarg( iconSize ) - .tqarg( html_icon_path ) - .tqarg( "http://kontact.org" ) - .tqarg( i18n( "Visit Kontact Website" ) ) - .tqarg( i18n( "Access online resources and tutorials" ) ) - .tqarg( "exec:/gwwizard" ) - .tqarg( iconSize ) - .tqarg( iconSize ) - .tqarg( wizard_icon_path ) - .tqarg( "exec:/gwwizard" ) - .tqarg( i18n( "Configure Kontact as Groupware Client" ) ) - .tqarg( i18n( "Prepare Kontact for use in corporate networks" ) ) - .tqarg( "exec:/switch" ); + .arg( kapp->aboutData()->version() ) + .arg( i18n( "Kontact handles your e-mail, addressbook, calendar, to-do list and more." ) ) + .arg( "exec:/help?kontact" ) + .arg( iconSize ) + .arg( iconSize ) + .arg( handbook_icon_path ) + .arg( "exec:/help?kontact" ) + .arg( i18n( "Read Manual" ) ) + .arg( i18n( "Learn more about Kontact and its components" ) ) + .arg( "http://kontact.org" ) + .arg( iconSize ) + .arg( iconSize ) + .arg( html_icon_path ) + .arg( "http://kontact.org" ) + .arg( i18n( "Visit Kontact Website" ) ) + .arg( i18n( "Access online resources and tutorials" ) ) + .arg( "exec:/gwwizard" ) + .arg( iconSize ) + .arg( iconSize ) + .arg( wizard_icon_path ) + .arg( "exec:/gwwizard" ) + .arg( i18n( "Configure Kontact as Groupware Client" ) ) + .arg( i18n( "Prepare Kontact for use in corporate networks" ) ) + .arg( "exec:/switch" ); return info; } diff --git a/kontact/src/profiledialog.cpp b/kontact/src/profiledialog.cpp index c58377806..89e241be9 100644 --- a/kontact/src/profiledialog.cpp +++ b/kontact/src/profiledialog.cpp @@ -140,7 +140,7 @@ void Kontact::ProfileDialog::profileLoaded( const TQString& id ) const Kontact::Profile profile = Kontact::ProfileManager::self()->profileById( id ); if ( profile.isNull() ) return; - KMessageBox::information( this, i18n("The profile \"%1\" was successfully loaded. Some profile settings require a restart to get activated.").tqarg( profile.name() ), i18n("Profile Loaded") ); + KMessageBox::information( this, i18n("The profile \"%1\" was successfully loaded. Some profile settings require a restart to get activated.").arg( profile.name() ), i18n("Profile Loaded") ); } void Kontact::ProfileDialog::saveToSelectedProfile() @@ -148,7 +148,7 @@ void Kontact::ProfileDialog::saveToSelectedProfile() const Kontact::Profile profile = Kontact::ProfileManager::self()->profileById( selectedProfile() ); if ( profile.isNull() ) return; - if ( KMessageBox::Yes != KMessageBox::warningYesNo( this, i18n("The profile \"%1\" will be overwritten with the current settings. Are you sure?").tqarg( profile.name() ), i18n("Save to Profile"), KStdGuiItem::overwrite(), KStdGuiItem::cancel() ) ) + if ( KMessageBox::Yes != KMessageBox::warningYesNo( this, i18n("The profile \"%1\" will be overwritten with the current settings. Are you sure?").arg( profile.name() ), i18n("Save to Profile"), KStdGuiItem::overwrite(), KStdGuiItem::cancel() ) ) return; Kontact::ProfileManager::self()->saveToProfile( profile.id() ); } @@ -158,7 +158,7 @@ void Kontact::ProfileDialog::deleteSelectedProfile() const Kontact::Profile profile = Kontact::ProfileManager::self()->profileById( selectedProfile() ); if ( profile.isNull() ) return; - if ( KMessageBox::Yes != KMessageBox::warningYesNo( this, i18n("Do you really want to delete the profile \"%1\"? All profile settings will be lost!").tqarg( profile.name() ), i18n("Delete Profile"), KStdGuiItem::del(), KStdGuiItem::cancel() ) ) + if ( KMessageBox::Yes != KMessageBox::warningYesNo( this, i18n("Do you really want to delete the profile \"%1\"? All profile settings will be lost!").arg( profile.name() ), i18n("Delete Profile"), KStdGuiItem::del(), KStdGuiItem::cancel() ) ) return; Kontact::ProfileManager::self()->removeProfile( profile ); } @@ -175,7 +175,7 @@ void Kontact::ProfileDialog::exportSelectedProfile() const Kontact::ProfileManager::ExportError error = Kontact::ProfileManager::self()->exportProfileToDirectory( id, path ); if ( error == Kontact::ProfileManager::SuccessfulExport ) { - KMessageBox::information( this, i18n("The profile \"%1\" was successfully exported.").tqarg( profile.name() ), i18n("Profile Exported") ); + KMessageBox::information( this, i18n("The profile \"%1\" was successfully exported.").arg( profile.name() ), i18n("Profile Exported") ); } else { diff --git a/korganizer/actionmanager.cpp b/korganizer/actionmanager.cpp index 1d61545f0..10a791a95 100644 --- a/korganizer/actionmanager.cpp +++ b/korganizer/actionmanager.cpp @@ -872,7 +872,7 @@ bool ActionManager::openURL( const KURL &url,bool merge ) mFile = url.path(); if ( !KStandardDirs::exists( mFile ) ) { mMainWindow->showStatusMessage( i18n("New calendar '%1'.") - .tqarg( url.prettyURL() ) ); + .arg( url.prettyURL() ) ); mCalendarView->setModified(); } else { bool success = mCalendarView->openCalendar( mFile, merge ); @@ -906,7 +906,7 @@ bool ActionManager::openURL( const KURL &url,bool merge ) return success; } else { TQString msg; - msg = i18n("Cannot download calendar from '%1'.").tqarg( url.prettyURL() ); + msg = i18n("Cannot download calendar from '%1'.").arg( url.prettyURL() ); KMessageBox::error( dialogParent(), msg ); return false; } @@ -945,7 +945,7 @@ bool ActionManager::addResource( const KURL &mUrl ) resource->setResourceName( name ); manager->add( resource ); mMainWindow->showStatusMessage( i18n( "Added calendar resource for URL '%1'." ) - .tqarg( name ) ); + .arg( name ) ); // we have to call resourceAdded manually, because for in-process changes // the dcop signals are not connected, so the resource's signals would not // be connected otherwise @@ -953,7 +953,7 @@ bool ActionManager::addResource( const KURL &mUrl ) mCalendarResources->resourceAdded( resource ); } else { TQString msg = i18n("Unable to create calendar resource '%1'.") - .tqarg( name ); + .arg( name ); KMessageBox::error( dialogParent(), msg ); } return true; @@ -964,10 +964,10 @@ void ActionManager::showStatusMessageOpen( const KURL &url, bool merge ) { if ( merge ) { mMainWindow->showStatusMessage( i18n("Merged calendar '%1'.") - .tqarg( url.prettyURL() ) ); + .arg( url.prettyURL() ) ); } else { mMainWindow->showStatusMessage( i18n("Opened calendar '%1'.") - .tqarg( url.prettyURL() ) ); + .arg( url.prettyURL() ) ); } } @@ -1018,7 +1018,7 @@ bool ActionManager::saveURL() if ( !mURL.isLocalFile() ) { if ( !KIO::NetAccess::upload( mFile, mURL, view() ) ) { TQString msg = i18n("Cannot upload calendar to '%1'") - .tqarg( mURL.prettyURL() ); + .arg( mURL.prettyURL() ); KMessageBox::error( dialogParent() ,msg ); return false; } @@ -1030,7 +1030,7 @@ bool ActionManager::saveURL() mAutoSaveTimer->start( 1000*60*KOPrefs::instance()->mAutoSaveInterval ); } - mMainWindow->showStatusMessage( i18n("Saved calendar '%1'.").tqarg( mURL.prettyURL() ) ); + mMainWindow->showStatusMessage( i18n("Saved calendar '%1'.").arg( mURL.prettyURL() ) ); return true; } @@ -1061,7 +1061,7 @@ void ActionManager::exportHTML( HTMLExportSettings *settings ) return; kdDebug()<<" settings->outputFile() :"<<settings->outputFile()<<endl; if ( TQFileInfo( settings->outputFile() ).exists() ) { - if(KMessageBox::questionYesNo( dialogParent(), i18n("Do you want to overwrite file \"%1\"").tqarg( settings->outputFile()) ) == KMessageBox::No) + if(KMessageBox::questionYesNo( dialogParent(), i18n("Do you want to overwrite file \"%1\"").arg( settings->outputFile()) ) == KMessageBox::No) return; } settings->setEMail( KOPrefs::instance()->email() ); @@ -1136,7 +1136,7 @@ bool ActionManager::saveAsURL( const KURL &url ) setTitle(); if ( mRecent ) mRecent->addURL( mURL ); } else { - KMessageBox::sorry( dialogParent(), i18n("Unable to save calendar to the file %1.").tqarg( mFile ), i18n("Error") ); + KMessageBox::sorry( dialogParent(), i18n("Unable to save calendar to the file %1.").arg( mFile ), i18n("Error") ); kdDebug(5850) << "ActionManager::saveAsURL() failed" << endl; mURL = URLOrig; mFile = fileOrig; @@ -1702,7 +1702,7 @@ void ActionManager::openEventEditor( const TQString & summary, attData = file; } else { if ( KMessageBox::warningContinueCancel( 0, - i18n("Removing attachments from an email might tqinvalidate its signature."), + i18n("Removing attachments from an email might invalidate its signature."), i18n("Remove Attachments"), KStdGuiItem::cont(), "BodyOnlyInlineAttachment" ) != KMessageBox::Continue ) return; @@ -1892,7 +1892,7 @@ void ActionManager::updateUndoAction( const TQString &text ) } else { mUndoAction->setEnabled( true ); if ( text.isEmpty() ) mUndoAction->setText( i18n("Undo") ); - else mUndoAction->setText( i18n("Undo (%1)").tqarg( text ) ); + else mUndoAction->setText( i18n("Undo (%1)").arg( text ) ); } } @@ -1904,7 +1904,7 @@ void ActionManager::updateRedoAction( const TQString &text ) } else { mRedoAction->setEnabled( true ); if ( text.isEmpty() ) mRedoAction->setText( i18n("Redo") ); - else mRedoAction->setText( i18n( "Redo (%1)" ).tqarg( text ) ); + else mRedoAction->setText( i18n( "Redo (%1)" ).arg( text ) ); } } @@ -1983,7 +1983,7 @@ bool ActionManager::saveResourceCalendar() int result = KMessageBox::warningContinueCancel( view(), i18n( "Saving of '%1' failed. Check that the resource is " "properly configured.\nIgnore problem and continue without " - "saving or cancel save?" ).tqarg( (*it)->resourceName() ), + "saving or cancel save?" ).arg( (*it)->resourceName() ), i18n("Save Error"), KStdGuiItem::dontSave() ); if ( result == KMessageBox::Cancel ) return false; } @@ -2006,7 +2006,7 @@ void ActionManager::importCalendar( const KURL &url ) { if ( !url.isValid() ) { KMessageBox::error( dialogParent(), - i18n("URL '%1' is invalid.").tqarg( url.prettyURL() ) ); + i18n("URL '%1' is invalid.").arg( url.prettyURL() ) ); return; } diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 56f3007e2..84af159b9 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp @@ -487,7 +487,7 @@ bool CalendarView::openCalendar(const TQString& filename, bool merge) // have become partially populated. Clear it out. if ( !merge ) mCalendar->close(); - KMessageBox::error(this,i18n("Could not load calendar '%1'.").tqarg(filename)); + KMessageBox::error(this,i18n("Could not load calendar '%1'.").arg(filename)); return false; } @@ -776,8 +776,8 @@ void CalendarView::incidenceChanged( Incidence *oldIncidence, if ( todo->isCompleted() || modification == KOGlobals::COMPLETION_MODIFIED_WITH_RECURRENCE ) { TQString timeStr = KGlobal::locale()->formatTime( TQTime::currentTime() ); - TQString description = i18n( "To-do completed: %1 (%2)" ).tqarg( - newIncidence->summary() ).tqarg( timeStr ); + TQString description = i18n( "To-do completed: %1 (%2)" ).arg( + newIncidence->summary() ).arg( timeStr ); Journal::List journals = calendar()->journals( TQDate::currentDate() ); Journal *journal; @@ -787,7 +787,7 @@ void CalendarView::incidenceChanged( Incidence *oldIncidence, journal->setDtStart( TQDateTime::currentDateTime() ); TQString dateStr = KGlobal::locale()->formatDate( TQDate::currentDate() ); - journal->setSummary( i18n("Journal of %1").tqarg( dateStr ) ); + journal->setSummary( i18n("Journal of %1").arg( dateStr ) ); journal->setDescription( description ); //TODO: recorded to-dos should save into the standard resource always @@ -844,7 +844,7 @@ void CalendarView::checkForFilteredChange( Incidence *incidence ) // user so that he isn't surprised if his new event doesn't show up KMessageBox::information( this, i18n("The item \"%1\" is filtered by " "your current filter rules, so it will be hidden and not " - "appear in the view.").tqarg( incidence->summary() ), + "appear in the view.").arg( incidence->summary() ), i18n("Filter Applied"), "ChangedIncidenceFiltered" ); } } @@ -901,7 +901,7 @@ void CalendarView::updateUnmanagedViews() int CalendarView::msgItemDelete( Incidence *incidence ) { return KMessageBox::warningContinueCancel(this, - i18n("The item \"%1\" will be permanently deleted.").tqarg( incidence->summary() ), + i18n("The item \"%1\" will be permanently deleted.").arg( incidence->summary() ), i18n("KOrganizer Confirmation"), KGuiItem(i18n("&Delete"),"editdelete")); } @@ -925,7 +925,7 @@ void CalendarView::edit_cut() "Do you want to cut just this item and " "make all its sub-to-dos independent, or " "cut the to-do with all its sub-to-dos?" - ).tqarg( incidence->summary() ), + ).arg( incidence->summary() ), i18n("KOrganizer Confirmation"), i18n("Cut Only This"), i18n("Cut All")); @@ -935,7 +935,7 @@ void CalendarView::edit_cut() incidences.append( incidence ); makeChildrenIndependent( incidence ); } else if ( km == KMessageBox::No ) { // all - // load incidence + tqchildren + grandtqchildren... + // load incidence + children + grandchildren... getIncidenceHierarchy( incidence, incidences ); } @@ -962,7 +962,7 @@ void CalendarView::edit_copy() i18n("The item \"%1\" has sub-to-dos. " "Do you want to copy just this item or " "copy the to-do with all its sub-to-dos?" - ).tqarg( incidence->summary() ), + ).arg( incidence->summary() ), i18n("KOrganizer Confirmation"), i18n("Copy Only This"), i18n("Copy All")); @@ -971,7 +971,7 @@ void CalendarView::edit_copy() if ( km == KMessageBox::Yes ) { // only one incidences.append( incidence ); } else if ( km == KMessageBox::No ) { // all - // load incidence + tqchildren + grandtqchildren... + // load incidence + children + grandchildren... getIncidenceHierarchy( incidence, incidences ); } @@ -1585,7 +1585,7 @@ void CalendarView::schedule_publish(Incidence *incidence) KMessageBox::information( this, i18n("The item information was successfully sent."), i18n("Publishing"), "IncidencePublishSuccess" ); } else { - KMessageBox::error( this, i18n("Unable to publish the item '%1'").tqarg( incidence->summary() ) ); + KMessageBox::error( this, i18n("Unable to publish the item '%1'").arg( incidence->summary() ) ); } } delete publishdlg; @@ -1661,7 +1661,7 @@ void CalendarView::schedule_forward( Incidence *incidence ) } else { KMessageBox::error( this, - i18n( "Unable to forward the item '%1'" ).tqarg( incidence->summary() ), + i18n( "Unable to forward the item '%1'" ).arg( incidence->summary() ), i18n( "Forwarding Error" ) ); } } @@ -1727,16 +1727,16 @@ void CalendarView::schedule(Scheduler::Method method, Incidence *incidence) if ( scheduler.performTransaction( incidence, method ) ) { KMessageBox::information( this, i18n("The groupware message for item '%1'" "was successfully sent.\nMethod: %2") - .tqarg( incidence->summary() ) - .tqarg( Scheduler::methodName( method ) ), + .arg( incidence->summary() ) + .arg( Scheduler::methodName( method ) ), i18n("Sending Free/Busy"), "FreeBusyPublishSuccess" ); } else { KMessageBox::error( this, i18n("Groupware message sending failed. " "%2 is request/reply/add/cancel/counter/etc.", "Unable to send the item '%1'.\nMethod: %2") - .tqarg( incidence->summary() ) - .tqarg( Scheduler::methodName( method ) ) ); + .arg( incidence->summary() ) + .arg( Scheduler::methodName( method ) ) ); } } @@ -1817,7 +1817,7 @@ void CalendarView::exportICalendar() if ( TQFile( filename ).exists() ) { if ( KMessageBox::No == KMessageBox::warningYesNo( this, - i18n( "Do you want to overwrite %1?").tqarg(filename) ) ) { + i18n( "Do you want to overwrite %1?").arg(filename) ) ) { return; } } @@ -1845,7 +1845,7 @@ void CalendarView::exportVCalendar() if ( TQFile( filename ).exists() ) { if ( KMessageBox::No == KMessageBox::warningYesNo( this, - i18n( "Do you want to overwrite %1?").tqarg(filename ) ) ) { + i18n( "Do you want to overwrite %1?").arg(filename ) ) ) { return; } } @@ -2334,7 +2334,7 @@ void CalendarView::deleteTodoIncidence ( Todo *todo, bool force ) "Do you want to delete just this item and " "make all its sub-to-dos independent, or " "delete the to-do with all its sub-to-dos?" - ).tqarg( todo->summary() ), + ).arg( todo->summary() ), i18n("KOrganizer Confirmation"), i18n("Delete Only This"), i18n("Delete All")); @@ -2367,7 +2367,7 @@ void CalendarView::deleteIncidence(Incidence *incidence, bool force) KMessageBox::information( this, i18n("The item \"%1\" is marked read-only " "and cannot be deleted; it probably belongs to " "a read-only calendar resource.") - .tqarg(incidence->summary()), + .arg(incidence->summary()), i18n("Removing not possible"), "deleteReadOnlyIncidence" ); } @@ -2377,7 +2377,7 @@ void CalendarView::deleteIncidence(Incidence *incidence, bool force) CanDeleteIncidenceVisitor v; // Let the visitor do special things for special incidence types. - // e.g. todos with tqchildren cannot be deleted, so act(..) returns false + // e.g. todos with children cannot be deleted, so act(..) returns false if ( !v.act( incidence, this ) ) return; //If it is a todo, there are specific delete function @@ -2397,15 +2397,15 @@ void CalendarView::deleteIncidence(Incidence *incidence, bool force) km = KMessageBox::warningContinueCancel(this, i18n("The calendar item \"%1\" recurs over multiple dates; " "are you sure you want to delete it " - "and all its recurrences?").tqarg( incidence->summary() ), + "and all its recurrences?").arg( incidence->summary() ), i18n("KOrganizer Confirmation"), i18n("Delete All") ); } else { km = KOMessageBox::fourBtnMsgBox( this, TQMessageBox::Warning, i18n("The calendar item \"%1\" recurs over multiple dates. " "Do you want to delete only the current one on %2, only all " "future recurrences, or all its recurrences?" ) - .tqarg( incidence->summary() ) - .tqarg( KGlobal::locale()->formatDate(itemDate)), + .arg( incidence->summary() ) + .arg( KGlobal::locale()->formatDate(itemDate)), i18n("KOrganizer Confirmation"), i18n("Delete C&urrent"), i18n("Delete &Future"), i18n("Delete &All")); @@ -2524,14 +2524,14 @@ void CalendarView::purgeCompleted() if ( aTodo && !aTodo->relatedTo() ) rootTodos.append( aTodo ); } - // now that we have a list of all root todos, check them and their tqchildren + // now that we have a list of all root todos, check them and their children for ( it = rootTodos.begin(); it != rootTodos.end(); ++it ) { purgeCompletedSubTodos( *it, allDeleted ); } endMultiModify(); if ( !allDeleted ) { KMessageBox::information( this, i18n("Unable to purge to-dos with " - "uncompleted tqchildren."), i18n("Delete To-do"), + "uncompleted children."), i18n("Delete To-do"), "UncompletedChildrenPurgeTodos" ); } } @@ -2577,7 +2577,7 @@ void CalendarView::addIncidenceOn( Incidence *incadd, const TQDate &dt ) { if ( !incadd || !mChanger ) { KMessageBox::sorry(this, i18n("Unable to copy the item to %1.") - .tqarg( dt.toString() ), i18n("Copying Failed") ); + .arg( dt.toString() ), i18n("Copying Failed") ); return; } Incidence *incidence = mCalendar->incidence( incadd->uid() ); @@ -2621,7 +2621,7 @@ void CalendarView::moveIncidenceTo( Incidence *incmove, const TQDate &dt ) { if ( !incmove || !mChanger ) { KMessageBox::sorry( this, i18n("Unable to move the item to %1.") - .tqarg( dt.toString() ), i18n("Moving Failed") ); + .arg( dt.toString() ), i18n("Moving Failed") ); return; } Incidence *incidence = mCalendar->incidence( incmove->uid() ); @@ -2794,16 +2794,16 @@ void CalendarView::selectWeek( const TQDate &date ) } void CalendarView::getIncidenceHierarchy( Incidence *inc, - Incidence::List &tqchildren ) + Incidence::List &children ) { // protecion against looping hierarchies - if ( inc && !tqchildren.contains( inc ) ) { + if ( inc && !children.contains( inc ) ) { Incidence::List::ConstIterator it; Incidence::List immediateChildren = inc->relations(); for ( it = immediateChildren.constBegin(); it != immediateChildren.constEnd(); ++it ) { - getIncidenceHierarchy( *it, tqchildren ); + getIncidenceHierarchy( *it, children ); } - tqchildren.append( inc ); + children.append( inc ); } } diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h index c10d92414..131cd878f 100644 --- a/korganizer/calendarview.h +++ b/korganizer/calendarview.h @@ -454,10 +454,10 @@ class KDE_EXPORT CalendarView : public KOrg::CalendarViewBase, public Calendar:: */ void appointment_delete(); - /* frees the selected to-do's tqchildren from it's relation, update the view */ + /* frees the selected to-do's children from it's relation, update the view */ void todo_unsub(); - /* frees an incidence's tqchildren from it's relation, without update the view + /* frees an incidence's children from it's relation, without update the view Works with any incidence type, although currently we only pass to-dos */ bool incidence_unsub( Incidence *inc ); @@ -465,7 +465,7 @@ class KDE_EXPORT CalendarView : public KOrg::CalendarViewBase, public Calendar:: /** Make all sub-to-dos of the selected todo independent, update the view */ bool makeSubTodosIndependent ( ); - /** Make all tqchildren of incidence independent, not update the view + /** Make all children of incidence independent, not update the view Works with any incidence type, although currently we only pass to-dos */ bool makeChildrenIndependent( Incidence *inc ); diff --git a/korganizer/eventarchiver.cpp b/korganizer/eventarchiver.cpp index 51e25517d..be6854413 100644 --- a/korganizer/eventarchiver.cpp +++ b/korganizer/eventarchiver.cpp @@ -99,7 +99,7 @@ void EventArchiver::run( Calendar* calendar, const TQDate& limitDate, TQWidget* KMessageBox::information( widget, i18n( "Unable to archive to-do \"%1\" because at least one of its " - "sub-to-dos does not meet the archival requirements." ).tqarg( (*it)->summary() ), + "sub-to-dos does not meet the archival requirements." ).arg( (*it)->summary() ), i18n( "Archive To-do" ), "UncompletedChildrenArchiveTodos" ); } else if ( todoComplete ) { @@ -118,7 +118,7 @@ void EventArchiver::run( Calendar* calendar, const TQDate& limitDate, TQWidget* KMessageBox::information( widget, i18n( "There are no incidences available to archive before the specified cut-off date %1. " - "Archiving will not be performed." ).tqarg( KGlobal::locale()->formatDate( limitDate ) ), + "Archiving will not be performed." ).arg( KGlobal::locale()->formatDate( limitDate ) ), "ArchiverNoIncidences" ); } return; @@ -147,7 +147,7 @@ void EventArchiver::deleteIncidences( Calendar* calendar, const TQDate& limitDat int result = KMessageBox::warningContinueCancelList( widget, i18n("Delete all items before %1 without saving?\n" "The following items will be deleted:") - .tqarg(KGlobal::locale()->formatDate(limitDate)), incidenceStrs, + .arg(KGlobal::locale()->formatDate(limitDate)), incidenceStrs, i18n("Delete Old Items"),KStdGuiItem::del()); if (result != KMessageBox::Continue) return; @@ -216,7 +216,7 @@ void EventArchiver::archiveIncidences( Calendar* calendar, const TQDate& /*limit // Save archive calendar if ( !archiveStore.save() ) { - KMessageBox::error(widget,i18n("Cannot write archive file %1.").tqarg( archiveStore.fileName() )); + KMessageBox::error(widget,i18n("Cannot write archive file %1.").arg( archiveStore.fileName() )); return; } diff --git a/korganizer/filtereditdialog.cpp b/korganizer/filtereditdialog.cpp index aceb6d27c..c8251ca61 100644 --- a/korganizer/filtereditdialog.cpp +++ b/korganizer/filtereditdialog.cpp @@ -186,7 +186,7 @@ void FilterEdit::filterSelected(CalFilter *filter) } void FilterEdit::bNewPressed() { - CalFilter *newFilter = new CalFilter( i18n("New Filter %1").tqarg(mFilters->count()) ); + CalFilter *newFilter = new CalFilter( i18n("New Filter %1").arg(mFilters->count()) ); mFilters->append( newFilter ); updateFilterList(); mRulesList->setSelected(mRulesList->count()-1, true); diff --git a/korganizer/freebusymanager.cpp b/korganizer/freebusymanager.cpp index 62c4e6ef3..59775f070 100644 --- a/korganizer/freebusymanager.cpp +++ b/korganizer/freebusymanager.cpp @@ -245,7 +245,7 @@ void FreeBusyManager::publishFreeBusy() if ( !targetURL.isValid() ) { KMessageBox::sorry( 0, i18n( "<qt>The target URL '%1' provided is invalid." - "</qt>" ).tqarg( targetURL.prettyURL() ), i18n("Invalid URL") ); + "</qt>" ).arg( targetURL.prettyURL() ), i18n("Invalid URL") ); mBrokenUrl = true; return; } @@ -353,8 +353,8 @@ void FreeBusyManager::slotUploadFreeBusyResult(KIO::Job *_job) "URL '%1'. There might be a problem with the access rights, or " "you specified an incorrect URL. The system said: <em>%2</em>." "<br>Please check the URL or contact your system administrator." - "</qt>" ).tqarg( job->destURL().prettyURL() ) - .tqarg( job->errorString() ) ); + "</qt>" ).arg( job->destURL().prettyURL() ) + .arg( job->errorString() ) ); // Delete temp file KURL src = job->srcURL(); Q_ASSERT( src.isLocalFile() ); diff --git a/korganizer/freebusymanager.h b/korganizer/freebusymanager.h index 1cda25fa3..d8fcc9522 100644 --- a/korganizer/freebusymanager.h +++ b/korganizer/freebusymanager.h @@ -92,7 +92,7 @@ class FreeBusyManager : public TQObject, public KCal::FreeBusyCache /** KOrganizer downloads somebody else's free/busy list The call is asynchronous, and upon download, the - tqreceivers slot specified by member will be called. + receivers slot specified by member will be called. The slot should be of type "member(const TQString&, KCal::FreeBusy*)" Return true if a download is initiated, and false otherwise diff --git a/korganizer/freebusyurldialog.cpp b/korganizer/freebusyurldialog.cpp index 67f23d35e..eac14271b 100644 --- a/korganizer/freebusyurldialog.cpp +++ b/korganizer/freebusyurldialog.cpp @@ -66,7 +66,7 @@ FreeBusyUrlWidget::FreeBusyUrlWidget( KCal::Attendee *attendee, TQWidget *parent TQLabel *label = new TQLabel( i18n("Location of Free/Busy information for %1 <%2>:") - .tqarg( mAttendee->name() ).tqarg( mAttendee->email() ), this ); + .arg( mAttendee->name() ).arg( mAttendee->email() ), this ); topLayout->addWidget( label ); mUrlEdit = new KLineEdit( this ); diff --git a/korganizer/history.cpp b/korganizer/history.cpp index 002f84a6b..0b9e5d995 100644 --- a/korganizer/history.cpp +++ b/korganizer/history.cpp @@ -182,7 +182,7 @@ void History::EntryDelete::redo() TQString History::EntryDelete::text() { - return i18n("Delete %1").tqarg(mIncidence->type().data()); + return i18n("Delete %1").arg(mIncidence->type().data()); } @@ -211,7 +211,7 @@ void History::EntryAdd::redo() TQString History::EntryAdd::text() { - return i18n("Add %1").tqarg(mIncidence->type().data()); + return i18n("Add %1").arg(mIncidence->type().data()); } @@ -248,7 +248,7 @@ void History::EntryEdit::redo() TQString History::EntryEdit::text() { - return i18n("Edit %1").tqarg(mNewIncidence->type().data()); + return i18n("Edit %1").arg(mNewIncidence->type().data()); } History::MultiEntry::MultiEntry( Calendar *calendar, const TQString &text ) diff --git a/korganizer/importdialog.cpp b/korganizer/importdialog.cpp index 4db3a069b..ee638fc77 100644 --- a/korganizer/importdialog.cpp +++ b/korganizer/importdialog.cpp @@ -46,7 +46,7 @@ ImportDialog::ImportDialog( const KURL &url, TQWidget *parent, bool isPart ) TQVBoxLayout *topLayout = new TQVBoxLayout( topFrame, 0, spacingHint() ); TQString txt = i18n("Import calendar/event at '%1' into KOrganizer.") - .tqarg( mUrl.prettyURL() ); + .arg( mUrl.prettyURL() ); topLayout->addWidget( new TQLabel( txt, topFrame ) ); diff --git a/korganizer/incidencechanger.cpp b/korganizer/incidencechanger.cpp index c3517e75f..20f409e77 100644 --- a/korganizer/incidencechanger.cpp +++ b/korganizer/incidencechanger.cpp @@ -132,7 +132,7 @@ kdDebug(5850)<<"IncidenceChanger::deleteIncidence for incidence \""<<incidence-> if ( me->status() == KCal::Attendee::Accepted || me->status() == KCal::Attendee::Delegated ) notifyOrganizer = true; Attendee *newMe = new Attendee( *me ); - newMe->seStatus( KCal::Attendee::Declined ); + newMe->setStatus( KCal::Attendee::Declined ); tmp->clearAttendees(); tmp->addAttendee( newMe ); break; diff --git a/korganizer/journalentry.cpp b/korganizer/journalentry.cpp index a9660cea9..7808dcbb5 100644 --- a/korganizer/journalentry.cpp +++ b/korganizer/journalentry.cpp @@ -86,7 +86,7 @@ JournalDateEntry::~JournalDateEntry() void JournalDateEntry::setDate(const TQDate &date) { TQString dtstring = TQString( "<qt><center><b><i>%1</i></b> " ) - .tqarg( KGlobal::locale()->formatDate(date) ); + .arg( KGlobal::locale()->formatDate(date) ); dtstring += " <font size=\"-1\"><a href=\"#\">" + i18n("[Add Journal Entry]") + @@ -259,8 +259,8 @@ void JournalEntry::deleteItem() { /* KMessageBox::ButtonCode *code = KMessageBox::warningContinueCancel(this, i18n("The journal \"%1\" on %2 will be permanently deleted.") - .tqarg( mJournal->summary() ) - .tqarg( mJournal->dtStartStr() ), + .arg( mJournal->summary() ) + .arg( mJournal->dtStartStr() ), i18n("KOrganizer Confirmation"), KStdGuiItem::del() ); if ( code == KMessageBox::Yes ) {*/ if ( mJournal ) diff --git a/korganizer/kdatenavigator.cpp b/korganizer/kdatenavigator.cpp index c97ec9f76..087804103 100644 --- a/korganizer/kdatenavigator.cpp +++ b/korganizer/kdatenavigator.cpp @@ -121,8 +121,8 @@ void KDateNavigator::setBaseDate( const TQDate &date ) dates.append( date ); mNavigatorBar->selectDates( dates ); - tqrepaint(); - mDayMatrix->tqrepaint(); + repaint(); + mDayMatrix->repaint(); } } @@ -135,7 +135,7 @@ TQSizePolicy KDateNavigator::sizePolicy () const void KDateNavigator::updateToday() { mDayMatrix->recalculateToday(); - mDayMatrix->tqrepaint(); + mDayMatrix->repaint(); } TQDate KDateNavigator::startDate() const @@ -188,21 +188,21 @@ void KDateNavigator::updateDates() if ( weeknumstart != weeknumend ) { weeknum = i18n("start/end week number of line in date picker", "%1/%2") - .tqarg( weeknumstart ).tqarg( weeknumend ); + .arg( weeknumstart ).arg( weeknumend ); } else { weeknum.setNum( weeknumstart ); } mWeeknos[i]->setText( weeknum ); } -// each updateDates is followed by an updateView -> tqrepaint is issued there ! -// mDayMatrix->tqrepaint(); +// each updateDates is followed by an updateView -> repaint is issued there ! +// mDayMatrix->repaint(); } void KDateNavigator::updateDayMatrix() { mDayMatrix->updateView(); - mDayMatrix->tqrepaint(); + mDayMatrix->repaint(); } void KDateNavigator::setUpdateNeeded() @@ -228,7 +228,7 @@ void KDateNavigator::updateView() // kdDebug(5850) << "KDateNavigator::updateView(), view " << this << endl; updateDayMatrix(); - tqrepaint(); + repaint(); } void KDateNavigator::updateConfig() diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp index a05a82d2c..346bb9d80 100644 --- a/korganizer/koagenda.cpp +++ b/korganizer/koagenda.cpp @@ -296,7 +296,7 @@ void KOAgenda::init() setMinimumSize( 30, int( mGridSpacingY + 1 ) ); // setMaximumHeight(mGridSpacingY * mRows + 5); - // Disable horizontal scrollbar. This is a hack. The tqgeometry should be + // Disable horizontal scrollbar. This is a hack. The geometry should be // controlled in a way that the contents horizontally always fits. Then it is // not necessary to turn off the scrollbar. setHScrollBarMode( AlwaysOff ); @@ -1708,7 +1708,7 @@ void KOAgenda::insertMultiItem( Event *event, const TQDate &qd, int XBegin, int cellYBottom = rows() - 1; } - newtext = TQString("(%1/%2): ").tqarg( count ).tqarg( width ); + newtext = TQString("(%1/%2): ").arg( count ).arg( width ); newtext.append( event->summary() ); current = insertItem( event, qd, cellX, cellYTop, cellYBottom, count, width ); diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp index b8cd33fdf..751c9659e 100644 --- a/korganizer/koagendaitem.cpp +++ b/korganizer/koagendaitem.cpp @@ -562,7 +562,7 @@ void KOAgendaItem::addAttendee( const TQString &newAttendee ) KPIM::getNameAndMail( newAttendee, name, email ); if ( !( name.isEmpty() && email.isEmpty() ) ) { mIncidence->addAttendee(new Attendee(name,email)); - KMessageBox::information( this, i18n("Attendee \"%1\" added to the calendar item \"%2\"").tqarg(KPIM::normalizedAddress(name, email, TQString())).tqarg(text()), i18n("Attendee added"), "AttendeeDroppedAdded" ); + KMessageBox::information( this, i18n("Attendee \"%1\" added to the calendar item \"%2\"").arg(KPIM::normalizedAddress(name, email, TQString())).arg(text()), i18n("Attendee added"), "AttendeeDroppedAdded" ); } } @@ -739,9 +739,9 @@ void KOAgendaItem::paintEvent( TQPaintEvent *ev ) TQRect visRect = visibleRect(); // when scrolling horizontally in the side-by-side view, the repainted area is clipped // to the newly visible area, which is a problem since the content changes when visRect - // changes, so tqrepaint the full item in that case + // changes, so repaint the full item in that case if ( ev->rect() != visRect && visRect.isValid() && ev->rect().isValid() ) { - tqrepaint( visRect ); + repaint( visRect ); return; } @@ -838,8 +838,8 @@ void KOAgendaItem::paintEvent( TQPaintEvent *ev ) if ( !isMultiItem() ) { shortH = KGlobal::locale()->formatTime(mIncidence->dtStart().time()); if (mIncidence->type() != "Todo") - longH = i18n("%1 - %2").tqarg(shortH) - .tqarg(KGlobal::locale()->formatTime(mIncidence->dtEnd().time())); + longH = i18n("%1 - %2").arg(shortH) + .arg(KGlobal::locale()->formatTime(mIncidence->dtEnd().time())); else longH = shortH; } else if ( !mMultiItemInfo->mFirstMultiItem ) { @@ -847,7 +847,7 @@ void KOAgendaItem::paintEvent( TQPaintEvent *ev ) longH = shortH; } else { shortH = KGlobal::locale()->formatTime(mIncidence->dtEnd().time()); - longH = i18n("- %1").tqarg(shortH); + longH = i18n("- %1").arg(shortH); } KWordWrap *ww = KWordWrap::formatText( fm, @@ -937,8 +937,8 @@ void KOAgendaItem::paintEvent( TQPaintEvent *ev ) (mIncidence->dtStart() != mIncidence->dtEnd()) ) { // multi days shortH = longH = i18n("%1 - %2") - .tqarg(KGlobal::locale()->formatDate(mIncidence->dtStart().date())) - .tqarg(KGlobal::locale()->formatDate(mIncidence->dtEnd().date())); + .arg(KGlobal::locale()->formatDate(mIncidence->dtStart().date())) + .arg(KGlobal::locale()->formatDate(mIncidence->dtEnd().date())); // paint headline p.fillRect( 0, 0, width(), (ft/2) + margin + hlHeight, diff --git a/korganizer/koagendaitem.h b/korganizer/koagendaitem.h index 23a36acf9..c95a9f4fb 100644 --- a/korganizer/koagendaitem.h +++ b/korganizer/koagendaitem.h @@ -53,7 +53,7 @@ struct MultiItemInfo /* The KOAgendaItem has to make sure that it receives all mouse events, which are to be used for dragging and resizing. That means it has to be installed as - eventfiler for its tqchildren, if it has tqchildren, and it has to pass mouse + eventfiler for its children, if it has children, and it has to pass mouse events from the cildren to itself. See eventFilter(). diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp index 7b48d9cca..e48796c7c 100644 --- a/korganizer/koagendaview.cpp +++ b/korganizer/koagendaview.cpp @@ -476,7 +476,7 @@ void KOAgendaView::zoomInVertically( ) mTimeLabels->updateConfig(); mTimeLabels->positionChanged(); - mTimeLabels->tqrepaint(); + mTimeLabels->repaint(); updateView(); } @@ -493,7 +493,7 @@ void KOAgendaView::zoomOutVertically( ) mTimeLabels->updateConfig(); mTimeLabels->positionChanged(); - mTimeLabels->tqrepaint(); + mTimeLabels->repaint(); updateView(); } @@ -627,8 +627,8 @@ void KOAgendaView::createDayLabels( bool force ) int dW = calsys->dayOfWeek(date); TQString veryLongStr = KGlobal::locale()->formatDate( date ); TQString longstr = i18n( "short_weekday date (e.g. Mon 13)","%1 %2" ) - .tqarg( calsys->weekDayName( dW, true ) ) - .tqarg( calsys->day(date) ); + .arg( calsys->weekDayName( dW, true ) ) + .arg( calsys->day(date) ); TQString shortstr = TQString::number(calsys->day(date)); KOAlternateLabel *dayLabel = new KOAlternateLabel(shortstr, @@ -783,7 +783,7 @@ void KOAgendaView::updateConfig() { // kdDebug(5850) << "KOAgendaView::updateConfig()" << endl; - // update config for tqchildren + // update config for children mTimeLabels->updateConfig(); mAgenda->updateConfig(); mAllDayAgenda->updateConfig(); @@ -793,7 +793,7 @@ void KOAgendaView::updateConfig() mTimeLabels->positionChanged(); // for some reason, this needs to be called explicitly - mTimeLabels->tqrepaint(); + mTimeLabels->repaint(); updateTimeBarWidth(); diff --git a/korganizer/koapp.cpp b/korganizer/koapp.cpp index dcebd48be..e20c42db1 100644 --- a/korganizer/koapp.cpp +++ b/korganizer/koapp.cpp @@ -57,7 +57,7 @@ using namespace std; KOrganizerApp::KOrganizerApp() : KUniqueApplication() { TQString prodId = "-//K Desktop Environment//NONSGML KOrganizer %1//EN"; - CalFormat::setApplication( "KOrganizer", prodId.tqarg( korgVersion ) ); + CalFormat::setApplication( "KOrganizer", prodId.arg( korgVersion ) ); } KOrganizerApp::~KOrganizerApp() diff --git a/korganizer/koattendeeeditor.cpp b/korganizer/koattendeeeditor.cpp index 6e3b78153..36037ea95 100644 --- a/korganizer/koattendeeeditor.cpp +++ b/korganizer/koattendeeeditor.cpp @@ -309,7 +309,7 @@ void KOAttendeeEditor::readEvent(KCal::Incidence * incidence) delete mOrganizerCombo; mOrganizerCombo = 0; } - mOrganizerLabel->setText( i18n( "Organizer: %1" ).tqarg( incidence->organizer().fullName() ) ); + mOrganizerLabel->setText( i18n( "Organizer: %1" ).arg( incidence->organizer().fullName() ) ); } Attendee::List al = incidence->attendees(); @@ -430,7 +430,7 @@ void KOAttendeeEditor::updateAttendee() a->setUid( mUid ); a->setEmail( email ); a->setRole( Attendee::Role( mRoleCombo->currentItem() ) ); - a->seStatus( Attendee::PartStat( mStatusCombo->currentItem() ) ); + a->setStatus( Attendee::PartStat( mStatusCombo->currentItem() ) ); a->setRSVP( mRsvpButton->isChecked() ); updateCurrentItem(); @@ -477,9 +477,9 @@ void KOAttendeeEditor::fillAttendeeInput( KCal::Attendee *a ) if ( a->status() == Attendee::Delegated ) { if ( !a->delegate().isEmpty() ) - mDelegateLabel->setText( i18n( "Delegated to %1" ).tqarg( a->delegate() ) ); + mDelegateLabel->setText( i18n( "Delegated to %1" ).arg( a->delegate() ) ); else if ( !a->delegator().isEmpty() ) - mDelegateLabel->setText( i18n( "Delegated from %1" ).tqarg( a->delegator() ) ); + mDelegateLabel->setText( i18n( "Delegated from %1" ).arg( a->delegator() ) ); else mDelegateLabel->setText( i18n( "Not delegated" ) ); } diff --git a/korganizer/kocore.cpp b/korganizer/kocore.cpp index 957e6c08d..7503d2de4 100644 --- a/korganizer/kocore.cpp +++ b/korganizer/kocore.cpp @@ -67,7 +67,7 @@ KTrader::OfferList KOCore::availablePlugins( const TQString &type, int version ) TQString constraint; if ( version >= 0 ) { constraint = TQString("[X-KDE-PluginInterfaceVersion] == %1") - .tqarg( TQString::number( version ) ); + .arg( TQString::number( version ) ); } return KTrader::self()->query( type, constraint ); diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp index 718cc5c04..431b4b3d7 100644 --- a/korganizer/kodaymatrix.cpp +++ b/korganizer/kodaymatrix.cpp @@ -386,15 +386,15 @@ void KODayMatrix::mouseReleaseEvent( TQMouseEvent *e ) mSelEnd = mSelInit; if (tmp != mSelStart) { mSelStart = tmp; - tqrepaint(); + repaint(); } } else { mSelStart = mSelInit; - //tqrepaint only if selection has changed + //repaint only if selection has changed if (tmp != mSelEnd) { mSelEnd = tmp; - tqrepaint(); + repaint(); } } @@ -415,15 +415,15 @@ void KODayMatrix::mouseMoveEvent( TQMouseEvent *e ) mSelEnd = mSelInit; if ( tmp != mSelStart ) { mSelStart = tmp; - tqrepaint(); + repaint(); } } else { mSelStart = mSelInit; - //tqrepaint only if selection has changed + //repaint only if selection has changed if ( tmp != mSelEnd ) { mSelEnd = tmp; - tqrepaint(); + repaint(); } } } @@ -564,7 +564,7 @@ void KODayMatrix::paintEvent( TQPaintEvent * ) TQColorGroup cg = tqpalette().active(); - p.tqbegin( &pm, this ); + p.begin( &pm, this ); pm.fill( cg.base() ); // draw topleft frame diff --git a/korganizer/kodaymatrix.h b/korganizer/kodaymatrix.h index 37a48ebd2..d24264253 100644 --- a/korganizer/kodaymatrix.h +++ b/korganizer/kodaymatrix.h @@ -132,7 +132,7 @@ class KODayMatrix: public TQFrame, public KCal::Calendar::Observer /** updates the day matrix to start with the given date. Does all the necessary * checks for holidays or events on a day and stores them for display later on. - * Does NOT update the view visually. Call tqrepaint() for this. + * Does NOT update the view visually. Call repaint() for this. * * @param actdate recalculates the day matrix to show NUMDAYS starting from this * date. @@ -162,7 +162,7 @@ class KODayMatrix: public TQFrame, public KCal::Calendar::Observer /** sets the actual to be displayed selection in the day matrix starting from * start and ending with end. Theview must be manually updated by calling - * tqrepaint. (?) + * repaint. (?) */ void setSelectedDaysFrom( const TQDate &start, const TQDate &end ); @@ -313,7 +313,7 @@ class KODayMatrix: public TQFrame, public KCal::Calendar::Observer int mTodayMarginWidth; /** stores actual size of each day in the widget so that I don't need to ask this data - * on every tqrepaint. + * on every repaint. */ TQRect mDaySize; diff --git a/korganizer/kodialogmanager.cpp b/korganizer/kodialogmanager.cpp index 91e0e27d0..83ceec0ea 100644 --- a/korganizer/kodialogmanager.cpp +++ b/korganizer/kodialogmanager.cpp @@ -111,8 +111,8 @@ KODialogManager::~KODialogManager() void KODialogManager::errorSaveIncidence( TQWidget *parent, Incidence *incidence ) { KMessageBox::sorry( parent, i18n("Unable to save %1 \"%2\".") - .tqarg( i18n( incidence->type() ) ) - .tqarg( incidence->summary() ) ); + .arg( i18n( incidence->type() ) ) + .arg( incidence->summary() ) ); } void KODialogManager::showOptionsDialog() diff --git a/korganizer/koeditoralarms.cpp b/korganizer/koeditoralarms.cpp index 4211e93a9..6d91d1187 100644 --- a/korganizer/koeditoralarms.cpp +++ b/korganizer/koeditoralarms.cpp @@ -167,13 +167,13 @@ void AlarmListViewItem::construct() if ( offset % (24*60) == 0 && offset>0 ) { // divides evenly into days? useoffset = offset / (24*60); - offsetstr = offsetstr.tqarg( i18n("1 day", "%n days", useoffset ) ); + offsetstr = offsetstr.arg( i18n("1 day", "%n days", useoffset ) ); } else if (offset % 60 == 0 && offset>0 ) { // divides evenly into hours? useoffset = offset / 60; - offsetstr = offsetstr.tqarg( i18n("1 hour", "%n hours", useoffset ) ); + offsetstr = offsetstr.arg( i18n("1 hour", "%n hours", useoffset ) ); } else { useoffset = offset; - offsetstr = offsetstr.tqarg( i18n("1 minute", "%n minutes", useoffset ) ); + offsetstr = offsetstr.arg( i18n("1 minute", "%n minutes", useoffset ) ); } setText( ColAlarmOffset, offsetstr ); diff --git a/korganizer/koeditorattachments.cpp b/korganizer/koeditorattachments.cpp index fe67a54ec..ed358947e 100644 --- a/korganizer/koeditorattachments.cpp +++ b/korganizer/koeditorattachments.cpp @@ -718,7 +718,7 @@ void KOEditorAttachments::slotRemove() if ( KMessageBox::questionYesNo( this, - i18n( "<qt>Do you really want to remove these attachments?<p>%1</qt>" ).tqarg( labelsStr ), + i18n( "<qt>Do you really want to remove these attachments?<p>%1</qt>" ).arg( labelsStr ), i18n( "Remove Attachment?" ), KStdGuiItem::yes(), KStdGuiItem::no(), "calendarRemoveAttachments" ) != KMessageBox::Yes ) { diff --git a/korganizer/koeditordetails.cpp b/korganizer/koeditordetails.cpp index be9a7fbaf..adeb9bb00 100644 --- a/korganizer/koeditordetails.cpp +++ b/korganizer/koeditordetails.cpp @@ -329,7 +329,7 @@ void KOEditorDetails::writeEvent(Incidence *event) bool skip = false; if ( attendee->email().endsWith( "example.net" ) ) { if ( KMessageBox::warningYesNo( this, i18n("%1 does not look like a valid email address. " - "Are you sure you want to invite this participant?").tqarg( attendee->email() ), + "Are you sure you want to invite this participant?").arg( attendee->email() ), i18n("Invalid email address") ) != KMessageBox::Yes ) { skip = true; } @@ -407,7 +407,7 @@ void KOEditorDetails::changeStatusForMe(Attendee::PartStat status) AttendeeListItem *item = static_cast<AttendeeListItem*>( it.current() ); for ( TQStringList::ConstIterator it2( myEmails.begin() ), end( myEmails.end() ); it2 != end; ++it2 ) { if ( item->data()->email() == *it2 ) { - item->data()->seStatus( status ); + item->data()->setStatus( status ); item->updateItem(); } } diff --git a/korganizer/koeditorfreebusy.cpp b/korganizer/koeditorfreebusy.cpp index e3f88f14e..807901b83 100644 --- a/korganizer/koeditorfreebusy.cpp +++ b/korganizer/koeditorfreebusy.cpp @@ -699,7 +699,7 @@ void KOEditorFreeBusy::updateStatusSummary() mStatusSummaryLabel->setText( i18n( "Of the %1 participants, %2 have accepted, %3" " have tentatively accepted, and %4 have declined.") - .tqarg( total ).tqarg( accepted ).tqarg( tentative ).tqarg( declined ) ); + .arg( total ).arg( accepted ).arg( tentative ).arg( declined ) ); } else { mStatusSummaryLabel->hide(); } @@ -783,7 +783,7 @@ void KOEditorFreeBusy::writeEvent(KCal::Event * event) bool skip = false; if ( attendee->email().endsWith( "example.net" ) ) { if ( KMessageBox::warningYesNo( this, i18n("%1 does not look like a valid email address. " - "Are you sure you want to invite this participant?").tqarg( attendee->email() ), + "Are you sure you want to invite this participant?").arg( attendee->email() ), i18n("Invalid email address") ) != KMessageBox::Yes ) { skip = true; } @@ -852,8 +852,8 @@ void KOEditorFreeBusy::clearSelection() const KDGanttViewItem *item = mGanttView->selectedItem(); if ( item ) mGanttView->setSelected( item, false ); - mGanttView->tqrepaint(); - item->tqrepaint(); + mGanttView->repaint(); + item->repaint(); } void KOEditorFreeBusy::setSelected( int index ) @@ -890,7 +890,7 @@ void KOEditorFreeBusy::changeStatusForMe(KCal::Attendee::PartStat status) { for ( TQStringList::ConstIterator it2( myEmails.begin() ), end( myEmails.end() ); it2 != end; ++it2 ) { if ( item->attendee()->email() == *it2 ) { - item->attendee()->seStatus( status ); + item->attendee()->setStatus( status ); item->updateItem(); } } @@ -912,7 +912,7 @@ void KOEditorFreeBusy::showAttendeeStatusMenu() popup.setItemChecked( currentAttendee()->status(), true ); int status = popup.exec( TQCursor::pos() ); if ( status >= 0 ) { - currentAttendee()->seStatus( (Attendee::PartStat)status ); + currentAttendee()->setStatus( (Attendee::PartStat)status ); updateCurrentItem(); updateAttendeeInput(); } diff --git a/korganizer/koeditorgeneral.cpp b/korganizer/koeditorgeneral.cpp index 8e4cb166c..fb8b4bc57 100644 --- a/korganizer/koeditorgeneral.cpp +++ b/korganizer/koeditorgeneral.cpp @@ -426,7 +426,7 @@ void KOEditorGeneral::updateAlarmWidgets( Incidence *incidence ) remStr = remStr.left( maxLen ); remStr += etc; } - mAlarmInfoLabel->setText( i18n( "Triggers %1" ).tqarg( remStr ) ); + mAlarmInfoLabel->setText( i18n( "Triggers %1" ).arg( remStr ) ); } } else { // alarm count is 1 Alarm *alarm = mAlarmList.first(); @@ -465,7 +465,7 @@ void KOEditorGeneral::updateAlarmWidgets( Incidence *incidence ) mSimpleAlarmBox->hide(); if ( incidence ) { TQString remStr = IncidenceFormatter::reminderStringList( incidence ).first(); - mAlarmInfoLabel->setText( i18n( "Triggers %1" ).tqarg( remStr ) ); + mAlarmInfoLabel->setText( i18n( "Triggers %1" ).arg( remStr ) ); } } } @@ -497,7 +497,7 @@ void KOEditorGeneral::readIncidence( Incidence *incidence, Calendar *calendar ) TQString resLabel = IncidenceFormatter::resourceString( calendar, incidence ); if ( !resLabel.isEmpty() ) { - mResourceLabel->setText( i18n( "Calendar: %1" ).tqarg( resLabel ) ); + mResourceLabel->setText( i18n( "Calendar: %1" ).arg( resLabel ) ); mResourceLabel->show(); } } diff --git a/korganizer/koeditorgeneralevent.cpp b/korganizer/koeditorgeneralevent.cpp index 793b90d70..cec2e7214 100644 --- a/korganizer/koeditorgeneralevent.cpp +++ b/korganizer/koeditorgeneralevent.cpp @@ -479,8 +479,8 @@ void KOEditorGeneralEvent::emitDateTimeStr() to = l->formatDateTime(mCurrEndDateTime); } - TQString str = i18n("From: %1 To: %2 %3").tqarg(from).tqarg(to) - .tqarg(mDurationLabel->text()); + TQString str = i18n("From: %1 To: %2 %3").arg(from).arg(to) + .arg(mDurationLabel->text()); emit dateTimeStrChanged(str); } @@ -493,14 +493,14 @@ bool KOEditorGeneralEvent::validateInput() if (!mStartTimeEdit->inputIsValid()) { KMessageBox::sorry( 0, i18n("Please specify a valid start time, for example '%1'.") - .tqarg( KGlobal::locale()->formatTime( TQTime::currentTime() ) ) ); + .arg( KGlobal::locale()->formatTime( TQTime::currentTime() ) ) ); return false; } if (!mEndTimeEdit->inputIsValid()) { KMessageBox::sorry( 0, i18n("Please specify a valid end time, for example '%1'.") - .tqarg( KGlobal::locale()->formatTime( TQTime::currentTime() ) ) ); + .arg( KGlobal::locale()->formatTime( TQTime::currentTime() ) ) ); return false; } } @@ -508,14 +508,14 @@ bool KOEditorGeneralEvent::validateInput() if (!mStartDateEdit->date().isValid()) { KMessageBox::sorry( 0, i18n("Please specify a valid start date, for example '%1'.") - .tqarg( KGlobal::locale()->formatDate( TQDate::currentDate() ) ) ); + .arg( KGlobal::locale()->formatDate( TQDate::currentDate() ) ) ); return false; } if (!mEndDateEdit->date().isValid()) { KMessageBox::sorry( 0, i18n("Please specify a valid end date, for example '%1'.") - .tqarg( KGlobal::locale()->formatDate( TQDate::currentDate() ) ) ); + .arg( KGlobal::locale()->formatDate( TQDate::currentDate() ) ) ); return false; } diff --git a/korganizer/koeditorgeneraljournal.cpp b/korganizer/koeditorgeneraljournal.cpp index b14aa7e58..de97376d7 100644 --- a/korganizer/koeditorgeneraljournal.cpp +++ b/korganizer/koeditorgeneraljournal.cpp @@ -196,7 +196,7 @@ bool KOEditorGeneralJournal::validateInput() if (!mDateEdit->date().isValid()) { KMessageBox::sorry( 0, i18n("Please specify a valid date, for example '%1'.") - .tqarg( KGlobal::locale()->formatDate( TQDate::currentDate() ) ) ); + .arg( KGlobal::locale()->formatDate( TQDate::currentDate() ) ) ); return false; } diff --git a/korganizer/koeditorgeneraltodo.cpp b/korganizer/koeditorgeneraltodo.cpp index 7f4684e10..5ba7188ba 100644 --- a/korganizer/koeditorgeneraltodo.cpp +++ b/korganizer/koeditorgeneraltodo.cpp @@ -206,7 +206,7 @@ void KOEditorGeneralTodo::initCompletion( TQWidget *parent, TQBoxLayout *topLayo i18n( "Use this combobox to set the completion percentage of the to-do." ) ); for ( int i = 0; i <= 100; i+=10 ) { // xgettext:no-c-format - TQString label = i18n( "Percent complete", "%1 %" ).tqarg( i ); + TQString label = i18n( "Percent complete", "%1 %" ).arg( i ); mCompletedCombo->insertItem( label ); } connect( mCompletedCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(completedChanged(int)) ); @@ -569,18 +569,18 @@ void KOEditorGeneralTodo::dateChanged() TQString dateTimeStr = ""; if ( mStartCheck->isChecked() ) { - dateTimeStr += i18n("Start: %1").tqarg( + dateTimeStr += i18n("Start: %1").arg( l->formatDate( mStartDateEdit->date() ) ); if ( mTimeButton->isChecked() ) - dateTimeStr += TQString(" %1").tqarg( + dateTimeStr += TQString(" %1").arg( l->formatTime( mStartTimeEdit->getTime() ) ); } if ( mDueCheck->isChecked() ) { - dateTimeStr += i18n(" Due: %1").tqarg( + dateTimeStr += i18n(" Due: %1").arg( l->formatDate( mDueDateEdit->date() ) ); if ( mTimeButton->isChecked() ) - dateTimeStr += TQString(" %1").tqarg( + dateTimeStr += TQString(" %1").arg( l->formatTime( mDueTimeEdit->getTime() ) ); } diff --git a/korganizer/koeditorrecurrence.cpp b/korganizer/koeditorrecurrence.cpp index b93f6d196..c2e108a8e 100644 --- a/korganizer/koeditorrecurrence.cpp +++ b/korganizer/koeditorrecurrence.cpp @@ -824,7 +824,7 @@ void RecurrenceRangeWidget::setDateTimes( const TQDateTime &start, const TQDateTime & ) { mStartDateLabel->setText( i18n("Begins on: %1") - .tqarg( KGlobal::locale()->formatDate( start.date() ) ) ); + .arg( KGlobal::locale()->formatDate( start.date() ) ) ); } ///////////////////////// RecurrenceRangeDialog /////////////////////////// @@ -1394,8 +1394,8 @@ bool KOEditorRecurrence::validateInput() mEventStartDt.isValid() && ((mRecurrenceRange->endDate())<mEventStartDt.date()) ) { KMessageBox::sorry( 0, i18n("The end date '%1' of the recurrence must be after the start date '%2' of the event.") - .tqarg( KGlobal::locale()->formatDate( mRecurrenceRange->endDate() ) ) - .tqarg( KGlobal::locale()->formatDate( mEventStartDt.date() ) ) ); + .arg( KGlobal::locale()->formatDate( mRecurrenceRange->endDate() ) ) + .arg( KGlobal::locale()->formatDate( mEventStartDt.date() ) ) ); return false; } int recurrenceType = mRecurrenceChooser->type(); diff --git a/korganizer/koeventeditor.cpp b/korganizer/koeventeditor.cpp index 27bcb827e..c24af1a06 100644 --- a/korganizer/koeventeditor.cpp +++ b/korganizer/koeventeditor.cpp @@ -285,7 +285,7 @@ bool KOEventEditor::processInput() // add dummy event at the position of the counter proposal Event *event = mEvent->clone(); event->clearAttendees(); - event->setSummary( i18n("My counter proposal for: %1").tqarg( mEvent->summary() ) ); + event->setSummary( i18n("My counter proposal for: %1").arg( mEvent->summary() ) ); mChanger->addIncidence( event, mResource, mSubResource, this ); } else { if ( mRecurIncidence && mRecurIncidenceAfterDissoc ) { diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp index a9746dbe9..2596f0b66 100644 --- a/korganizer/koeventviewer.cpp +++ b/korganizer/koeventviewer.cpp @@ -62,7 +62,7 @@ void KOEventViewer::message( const TQString &link ) if ( link.startsWith( "kmail:" ) ) { ttStr = i18n( "Open the message in KMail" ); } else if ( link.startsWith( "mailto:" ) ) { - ttStr = i18n( "Send an email message to %1" ).tqarg( link.mid( 7 ) ); + ttStr = i18n( "Send an email message to %1" ).arg( link.mid( 7 ) ); } else if ( link.startsWith( "uid:" ) ) { ttStr = i18n( "Lookup the contact in KAddressbook" ); } else if ( link.startsWith( "ATTACH:" ) ) { @@ -70,7 +70,7 @@ void KOEventViewer::message( const TQString &link ) tmp.remove( TQRegExp( "^ATTACH://" ) ); TQString uid = tmp.section( ':', 0, 0 ); TQString name = tmp.section( ':', -1, -1 ); - ttStr = i18n( "View attachment \"%1\"" ).tqarg( name ); + ttStr = i18n( "View attachment \"%1\"" ).arg( name ); mAttachLink = link; } else { // no special URI, let KDE handle it ttStr = i18n( "Launch a viewer on the link" ); @@ -85,7 +85,7 @@ void KOEventViewer::readSettings( KConfig * config ) // With each restart of KOrganizer the font site gets halfed. What should this // be good for? #if 0 - config->setGroup( TQString("EventViewer-%1").tqarg( name() ) ); + config->setGroup( TQString("EventViewer-%1").arg( name() ) ); int zoomFactor = config->readNumEntry("ZoomFactor", pointSize() ); zoomTo( zoomFactor/2 ); kdDebug(5850) << " KOEventViewer: restoring the pointSize: "<< pointSize() @@ -98,7 +98,7 @@ void KOEventViewer::writeSettings( KConfig * config ) { if ( config ) { kdDebug(5850) << " KOEventViewer: saving the zoomFactor: "<< pointSize() << endl; - config->setGroup( TQString("EventViewer-%1").tqarg( name() ) ); + config->setGroup( TQString("EventViewer-%1").arg( name() ) ); config->writeEntry("ZoomFactor", pointSize() ); } } diff --git a/korganizer/kogroupware.cpp b/korganizer/kogroupware.cpp index 28f62dd45..0673ec6ec 100644 --- a/korganizer/kogroupware.cpp +++ b/korganizer/kogroupware.cpp @@ -163,7 +163,7 @@ void KOGroupware::incomingDirChanged( const TQString& path ) if ( !message ) { TQString errorMessage; if (mFormat.exception()) - errorMessage = i18n( "Error message: %1" ).tqarg( mFormat.exception()->message() ); + errorMessage = i18n( "Error message: %1" ).arg( mFormat.exception()->message() ); kdDebug(5850) << "MailScheduler::retrieveTransactions() Error parsing " << errorMessage << endl; KMessageBox::detailedError( mView, @@ -191,13 +191,13 @@ void KOGroupware::incomingDirChanged( const TQString& path ) for ( it = attendees.begin(); it != attendees.end(); ++it ) { if( (*it)->email() == receiver ) { if ( action.startsWith( "accepted" ) ) - (*it)->seStatus( KCal::Attendee::Accepted ); + (*it)->setStatus( KCal::Attendee::Accepted ); else if ( action.startsWith( "tentative" ) ) - (*it)->seStatus( KCal::Attendee::Tentative ); + (*it)->setStatus( KCal::Attendee::Tentative ); else if ( KOPrefs::instance()->outlookCompatCounterProposals() && action.startsWith( "counter" ) ) - (*it)->seStatus( KCal::Attendee::Tentative ); + (*it)->setStatus( KCal::Attendee::Tentative ); else if ( action.startsWith( "delegated" ) ) - (*it)->seStatus( KCal::Attendee::Delegated ); + (*it)->setStatus( KCal::Attendee::Delegated ); break; } } @@ -401,7 +401,7 @@ void KOGroupware::sendCounterProposal(KCal::Calendar *calendar, KCal::Event * ol return; if ( KOPrefs::instance()->outlookCompatCounterProposals() ) { Incidence* tmp = oldEvent->clone(); - tmp->setSummary( i18n("Counter proposal: %1").tqarg( newEvent->summary() ) ); + tmp->setSummary( i18n("Counter proposal: %1").arg( newEvent->summary() ) ); tmp->setDescription( newEvent->description() ); tmp->addComment( i18n("Proposed new meeting time: %1 - %2"). arg( IncidenceFormatter::dateToString( newEvent->dtStart() ), diff --git a/korganizer/kogroupwareprefspage.ui b/korganizer/kogroupwareprefspage.ui index 1eb5fc662..76bd7c6c2 100644 --- a/korganizer/kogroupwareprefspage.ui +++ b/korganizer/kogroupwareprefspage.ui @@ -41,7 +41,7 @@ <property name="text"> <string>By publishing Free/Busy information, you allow others to take your calendar into account when inviting you for a meeting. Only the times you have already busy are published, not why they are busy. For Kolab2 Server leave this disabled (the information is generated on the server).</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -319,7 +319,7 @@ Ask the server administrator for this information.</string> <property name="text"> <string>By retrieving Free/Busy information that others have published, you can take their calendar into account when inviting them to a meeting.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> diff --git a/korganizer/koincidenceeditor.cpp b/korganizer/koincidenceeditor.cpp index 0a027181b..55afba9ed 100644 --- a/korganizer/koincidenceeditor.cpp +++ b/korganizer/koincidenceeditor.cpp @@ -172,12 +172,12 @@ void KOIncidenceEditor::slotLoadTemplate( const TQString& templateName ) if ( fileName.isEmpty() ) { KMessageBox::error( this, i18n("Unable to find template '%1'.") - .tqarg( fileName ) ); + .arg( fileName ) ); } else { ICalFormat format; if ( !format.load( &cal, fileName ) ) { KMessageBox::error( this, i18n("Error loading template file '%1'.") - .tqarg( fileName ) ); + .arg( fileName ) ); return; } } diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp index 24ffb2025..f6b12b596 100644 --- a/korganizer/kolistview.cpp +++ b/korganizer/kolistview.cpp @@ -299,7 +299,7 @@ void KOListView::showDates( bool show ) mListView->setColumnWidth( 1, oldColWidth1 ); mListView->setColumnWidth( 3, oldColWidth3 ); } - mListView->tqrepaint(); + mListView->repaint(); } void KOListView::showDates() diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp index 669049d74..5c9edbcab 100644 --- a/korganizer/komonthview.cpp +++ b/korganizer/komonthview.cpp @@ -425,8 +425,8 @@ void MonthViewCell::setDate( const TQDate &date ) TQString text; if ( KOGlobals::self()->calendarSystem()->day( date ) == 1 ) { text = i18n("'Month day' for month view cells", "%1 %2") - .tqarg( KOGlobals::self()->calendarSystem()->monthName( date, true ) ) - .tqarg( KOGlobals::self()->calendarSystem()->day(mDate) ); + .arg( KOGlobals::self()->calendarSystem()->monthName( date, true ) ) + .arg( KOGlobals::self()->calendarSystem()->day(mDate) ); TQFontMetrics fm( mLabel->font() ); mLabel->resize( mLabelSize + TQSize( fm.width( text ), 0 ) ); } else { @@ -976,8 +976,8 @@ void KOMonthView::showDates( const TQDate &start, const TQDate & ) mStartDate = mStartDate.addDays( -weekdayCol ); mLabel->setText( i18n( "monthname year", "%1 %2" ) - .tqarg( calSys->monthName( start ) ) - .tqarg( calSys->year( start ) ) ); + .arg( calSys->monthName( start ) ) + .arg( calSys->year( start ) ) ); showLabel( !KOPrefs::instance()->fullViewMonth() ); diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp index 5b431f8e4..a7c4eea21 100644 --- a/korganizer/koprefs.cpp +++ b/korganizer/koprefs.cpp @@ -364,7 +364,7 @@ TQStringList KOPrefs::fullEmails() { TQStringList fullEmails; // The user name and email from the config dialog: - fullEmails << TQString("%1 <%2>").tqarg( fullName() ).tqarg( email() ); + fullEmails << TQString("%1 <%2>").arg( fullName() ).arg( email() ); TQStringList::Iterator it; // Grab emails from the email identities @@ -377,7 +377,7 @@ TQStringList KOPrefs::fullEmails() // Add emails configured in korganizer lst = mAdditionalMails; for ( it = lst.begin(); it != lst.end(); ++it ) { - fullEmails << TQString("%1 <%2>").tqarg( fullName() ).tqarg( *it ); + fullEmails << TQString("%1 <%2>").arg( fullName() ).arg( *it ); } // Add emails from the user's kaddressbook entry KABC::Addressee me = KABC::StdAddressBook::self()->whoAmI(); diff --git a/korganizer/korgac/alarmdialog.cpp b/korganizer/korgac/alarmdialog.cpp index cd46bbe43..bf9c29a2e 100644 --- a/korganizer/korgac/alarmdialog.cpp +++ b/korganizer/korgac/alarmdialog.cpp @@ -566,7 +566,7 @@ void AlarmDialog::slotSave() if ( !incidence ) { continue; } - config->setGroup( TQString("Incidence-%1").tqarg(numReminders + 1) ); + config->setGroup( TQString("Incidence-%1").arg(numReminders + 1) ); config->writeEntry( "UID", incidence->uid() ); config->writeEntry( "RemindAt", item->mRemindAt ); ++numReminders; diff --git a/korganizer/korgac/koalarmclient.cpp b/korganizer/korgac/koalarmclient.cpp index 93c0602aa..5b3ee4e9a 100644 --- a/korganizer/korgac/koalarmclient.cpp +++ b/korganizer/korgac/koalarmclient.cpp @@ -71,7 +71,7 @@ KOAlarmClient::KOAlarmClient( TQObject *parent, const char *name ) config->setGroup( "General" ); int numReminders = config->readNumEntry( "Reminders", 0 ); for ( int i = 1; i <= numReminders; ++i ) { - TQString group( TQString( "Incidence-%1" ).tqarg( i ) ); + TQString group( TQString( "Incidence-%1" ).arg( i ) ); config->setGroup( group ); TQString uid = config->readEntry( "UID" ); TQDateTime dt = config->readDateTimeEntry( "RemindAt" ); diff --git a/korganizer/kotodoviewitem.cpp b/korganizer/kotodoviewitem.cpp index 06b98b0bd..e7fad7dae 100644 --- a/korganizer/kotodoviewitem.cpp +++ b/korganizer/kotodoviewitem.cpp @@ -240,7 +240,7 @@ bool KOTodoViewItem::isAlternate() #endif } -void KOTodoViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment) +void KOTodoViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment) { TQColorGroup _cg = cg; // If no todo is set, just don't paint anything... @@ -275,6 +275,6 @@ void KOTodoViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, KGlobalSettings::highlightColor() ); p->restore(); } else { - TQCheckListItem::paintCell(p, _cg, column, width, tqalignment); + TQCheckListItem::paintCell(p, _cg, column, width, alignment); } } diff --git a/korganizer/kotodoviewitem.h b/korganizer/kotodoviewitem.h index d2e679757..774a45d78 100644 --- a/korganizer/kotodoviewitem.h +++ b/korganizer/kotodoviewitem.h @@ -66,7 +66,7 @@ class KOTodoViewItem : public TQCheckListItem bool isAlternate(); int compare( TQListViewItem *i, int col, bool ascending ) const; virtual void paintCell(TQPainter *p, const TQColorGroup &cg, - int column, int width, int tqalignment); + int column, int width, int alignment); protected: void paintBranches(TQPainter *p,const TQColorGroup & cg,int w,int y,int h); diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp index fd8e5742b..6287890c8 100644 --- a/korganizer/kowhatsnextview.cpp +++ b/korganizer/kowhatsnextview.cpp @@ -106,8 +106,8 @@ void KOWhatsNextView::updateView() mText += KGlobal::locale()->formatDate( mStartDate ); } else { mText += i18n("Date from - to", "%1 - %2") - .tqarg( KGlobal::locale()->formatDate( mStartDate ) ) - .tqarg( KGlobal::locale()->formatDate( mEndDate ) ); + .arg( KGlobal::locale()->formatDate( mStartDate ) ) + .arg( KGlobal::locale()->formatDate( mEndDate ) ); } mText+="</h2>\n"; @@ -281,14 +281,14 @@ void KOWhatsNextView::appendEvent( Incidence *ev, const TQDateTime &start, if ( starttime.date().daysTo( endtime.date() ) >= 1 ) { mText += i18n("date from - to", "%1 - %2") - .tqarg( KGlobal::locale()->formatDateTime( starttime ) ) - .tqarg( KGlobal::locale()->formatDateTime( endtime ) ); + .arg( KGlobal::locale()->formatDateTime( starttime ) ) + .arg( KGlobal::locale()->formatDateTime( endtime ) ); } else { /*if (reply) */ mText += i18n("date, from - to", "%1, %2 - %3") - .tqarg( KGlobal::locale()->formatDate( starttime.date(), true ) ) - .tqarg( KGlobal::locale()->formatTime( starttime.time() ) ) - .tqarg( KGlobal::locale()->formatTime( endtime.time() ) ); + .arg( KGlobal::locale()->formatDate( starttime.date(), true ) ) + .arg( KGlobal::locale()->formatTime( starttime.time() ) ) + .arg( KGlobal::locale()->formatTime( endtime.time() ) ); } } // } diff --git a/korganizer/mailscheduler.cpp b/korganizer/mailscheduler.cpp index f810e9843..671e15d3d 100644 --- a/korganizer/mailscheduler.cpp +++ b/korganizer/mailscheduler.cpp @@ -86,7 +86,7 @@ bool MailScheduler::performTransaction( IncidenceBase *incidence, TQString subject; Incidence *inc = dynamic_cast<Incidence*>( incidence ); if ( inc && method == Counter ) - subject = i18n( "Counter proposal: %1" ).tqarg( inc->summary() ); + subject = i18n( "Counter proposal: %1" ).arg( inc->summary() ); status = mailer.mailOrganizer( incidence, messageText, subject ); } return status; diff --git a/korganizer/multiagendaview.cpp b/korganizer/multiagendaview.cpp index 998936226..7370f6f18 100644 --- a/korganizer/multiagendaview.cpp +++ b/korganizer/multiagendaview.cpp @@ -536,7 +536,7 @@ void MultiAgendaView::zoomView( const int delta, const TQPoint & pos, const Qt:: mTimeLabels->updateConfig(); mTimeLabels->positionChanged(); - mTimeLabels->tqrepaint(); + mTimeLabels->repaint(); } // KDE4: not needed, use existing TQSplitter signals instead diff --git a/korganizer/navigatorbar.cpp b/korganizer/navigatorbar.cpp index ba8842042..322daf928 100644 --- a/korganizer/navigatorbar.cpp +++ b/korganizer/navigatorbar.cpp @@ -174,8 +174,8 @@ void NavigatorBar::selectDates( const KCal::DateList &dateList ) mHasMinWidth = true; // set the label text at the top of the navigator - mMonth->setText( i18n( "monthname", "%1" ).tqarg( calSys->monthName( mDate ) ) ); - mYear->setText( i18n( "4 digit year", "%1" ).tqarg( calSys->yearString( mDate, false ) ) ); + mMonth->setText( i18n( "monthname", "%1" ).arg( calSys->monthName( mDate ) ) ); + mYear->setText( i18n( "4 digit year", "%1" ).arg( calSys->yearString( mDate, false ) ) ); } } diff --git a/korganizer/plugins/datenums/datenums.cpp b/korganizer/plugins/datenums/datenums.cpp index b0a25ce4a..af022837e 100644 --- a/korganizer/plugins/datenums/datenums.cpp +++ b/korganizer/plugins/datenums/datenums.cpp @@ -56,8 +56,8 @@ TQString Datenums::shortText(const TQDate &date) return TQString::number( KOGlobals::self()->calendarSystem()->daysInYear(date) - doy ); break; case 2: // both day of year and days till end of year - return i18n("dayOfYear / daysTillEndOfYear", "%1 / %2").tqarg( doy ) - .tqarg(KOGlobals::self()->calendarSystem()->daysInYear(date) - doy); + return i18n("dayOfYear / daysTillEndOfYear", "%1 / %2").arg( doy ) + .arg(KOGlobals::self()->calendarSystem()->daysInYear(date) - doy); break; case 0: // only day of year default: diff --git a/korganizer/plugins/hebrew/hebrew.cpp b/korganizer/plugins/hebrew/hebrew.cpp index e36925aa5..8a9f37bd4 100644 --- a/korganizer/plugins/hebrew/hebrew.cpp +++ b/korganizer/plugins/hebrew/hebrew.cpp @@ -81,8 +81,8 @@ TQString Hebrew::shortText(const TQDate & date) hebrew_day_number, hebrew_year); KCalendarSystem *cal = KCalendarSystemFactory::create("hebrew"); - label_text = TQString("%1 %2").tqarg(cal->dayString(date, false)) - .tqarg(cal->monthName(date)); + label_text = TQString("%1 %2").arg(cal->dayString(date, false)) + .arg(cal->monthName(date)); if (holidays.count()) { diff --git a/korganizer/plugins/printing/year/yearprint.cpp b/korganizer/plugins/printing/year/yearprint.cpp index 5c36772fb..0c124bbeb 100644 --- a/korganizer/plugins/printing/year/yearprint.cpp +++ b/korganizer/plugins/printing/year/yearprint.cpp @@ -177,8 +177,8 @@ void CalPrintYear::print( TQPainter &p, int width, int height ) title = i18n("date from -\nto", "%1 -\n%2"); } drawHeader( p, title - .tqarg( locale->formatDate( start ) ) - .tqarg( locale->formatDate( end ) ), + .arg( locale->formatDate( start ) ) + .arg( locale->formatDate( end ) ), calsys->addMonths( start, -1), calsys->addMonths( start, monthsPerPage ), headerBox ); diff --git a/korganizer/printing/calprintdefaultplugins.cpp b/korganizer/printing/calprintdefaultplugins.cpp index fbb06795f..caa2e69ef 100644 --- a/korganizer/printing/calprintdefaultplugins.cpp +++ b/korganizer/printing/calprintdefaultplugins.cpp @@ -346,13 +346,13 @@ void CalPrintIncidence::print( TQPainter &p, int width, int height ) if ( offset % (24*60) == 0 && offset>0 ) { // divides evenly into days? useoffset = offset / (24*60); - offsetstr = offsetstr.tqarg( i18n("1 day", "%n days", useoffset ) ); + offsetstr = offsetstr.arg( i18n("1 day", "%n days", useoffset ) ); } else if (offset % 60 == 0 && offset>0 ) { // divides evenly into hours? useoffset = offset / 60; - offsetstr = offsetstr.tqarg( i18n("1 hour", "%n hours", useoffset ) ); + offsetstr = offsetstr.arg( i18n("1 hour", "%n hours", useoffset ) ); } else { useoffset = offset; - offsetstr = offsetstr.tqarg( i18n("1 minute", "%n minutes", useoffset ) ); + offsetstr = offsetstr.arg( i18n("1 minute", "%n minutes", useoffset ) ); } alarmStrings << offsetstr; } @@ -481,24 +481,24 @@ void CalPrintIncidence::print( TQPainter &p, int width, int height ) datesString = ""; if ( (*rit)->dtStart().isValid() ) { datesString += i18n( - "Start Date: %1\n").tqarg( + "Start Date: %1\n").arg( KGlobal::locale()->formatDate( (*rit)->dtStart().date(), true ) ); if ( !(*rit)->doesFloat() ) { datesString += i18n( - "Start Time: %1\n").tqarg( + "Start Time: %1\n").arg( KGlobal::locale()->formatTime((*rit)->dtStart().time(), false, false) ); } } if ( (*rit)->dtEnd().isValid() ) { subitemString += i18n( - "Due Date: %1\n").tqarg( + "Due Date: %1\n").arg( KGlobal::locale()->formatDate( (*rit)->dtEnd().date(), true ) ); if ( !(*rit)->doesFloat() ) { subitemString += i18n( - "subitem due time", "Due Time: %1\n").tqarg( + "subitem due time", "Due Time: %1\n").arg( KGlobal::locale()->formatTime((*rit)->dtEnd().time(), false, false) ); } @@ -511,12 +511,12 @@ void CalPrintIncidence::print( TQPainter &p, int width, int height ) subitemString += "\n"; } subitemString += i18n( "subitem Status: statusString", - "Status: %1\n").tqarg( statusString ); + "Status: %1\n").arg( statusString ); subitemString += IncidenceFormatter::recurrenceString((*rit)) + "\n"; subitemString += i18n( "subitem Priority: N", - "Priority: %1\n").tqarg( (*rit)->priority() ); + "Priority: %1\n").arg( (*rit)->priority() ); subitemString += i18n( "subitem Secrecy: secrecyString", - "Secrecy: %1\n").tqarg( (*rit)->secrecyStr() ); + "Secrecy: %1\n").arg( (*rit)->secrecyStr() ); subitemString += "\n"; } drawBoxWithCaption( p, notesBox, i18n("Subitems:"), @@ -562,8 +562,8 @@ void CalPrintIncidence::print( TQPainter &p, int width, int height ) "'Name (Role): Status', e.g. 'Reinhold Kainhofer " "<reinhold@kainhofer.com> (Participant): Awaiting Response'", "%1 (%2): %3") - .tqarg( (*ait)->fullName() ) - .tqarg( (*ait)->roleStr() ).tqarg( (*ait)->statusStr() ); + .arg( (*ait)->fullName() ) + .arg( (*ait)->roleStr() ).arg( (*ait)->statusStr() ); } drawBoxWithCaption( p, attendeesBox, i18n("Attendees:"), attendeeString, /*sameLine=*/false, /*expand=*/false, captionFont, textFont ); @@ -572,11 +572,11 @@ void CalPrintIncidence::print( TQPainter &p, int width, int height ) if ( mShowOptions ) { TQString optionsString; if ( !(*it)->statusStr().isEmpty() ) { - optionsString += i18n("Status: %1").tqarg( (*it)->statusStr() ); + optionsString += i18n("Status: %1").arg( (*it)->statusStr() ); optionsString += "\n"; } if ( !(*it)->secrecyStr().isEmpty() ) { - optionsString += i18n("Secrecy: %1").tqarg( (*it)->secrecyStr() ); + optionsString += i18n("Secrecy: %1").arg( (*it)->secrecyStr() ); optionsString += "\n"; } if ( (*it)->type() == "Event" ) { @@ -936,7 +936,7 @@ void CalPrintWeek::print( TQPainter &p, int width, int height ) } else { title = i18n("date from-\nto", "%1 -\n%2");; } - title = title.tqarg( line1 ).tqarg( line2 ); + title = title.arg( line1 ).arg( line2 ); drawHeader( p, title, curWeek.addDays( -6 ), TQDate(), headerBox ); drawWeek( p, curWeek, weekBox ); @@ -959,7 +959,7 @@ void CalPrintWeek::print( TQPainter &p, int width, int height ) } else { title = i18n("date from -\nto (week number)", "%1 -\n%2 (Week %3)"); } - title = title.tqarg( line1 ).tqarg( line2 ).tqarg( curWeek.weekNumber() ); + title = title.arg( line1 ).arg( line2 ).arg( curWeek.weekNumber() ); drawHeader( p, title, curWeek, TQDate(), headerBox ); TQRect weekBox( headerBox ); @@ -1121,8 +1121,8 @@ void CalPrintMonth::print( TQPainter &p, int width, int height ) do { TQString title( i18n("monthname year", "%1 %2") ); - title = title.tqarg( calSys->monthName( curMonth ) ) - .tqarg( curMonth.year() ); + title = title.arg( calSys->monthName( curMonth ) ) + .arg( curMonth.year() ); TQDate tmp( fromMonth ); int weekdayCol = weekdayColumn( tmp.dayOfWeek() ); tmp = tmp.addDays( -weekdayCol ); diff --git a/korganizer/printing/calprintpluginbase.cpp b/korganizer/printing/calprintpluginbase.cpp index 52be67ec1..22d6a0653 100644 --- a/korganizer/printing/calprintpluginbase.cpp +++ b/korganizer/printing/calprintpluginbase.cpp @@ -560,7 +560,7 @@ int CalPrintPluginBase::drawFooter( TQPainter &p, TQRect &footbox ) TQFontMetrics fm( p.font() ); TQString dateStr = KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), false ); p.drawText( footbox, TQt::AlignCenter | TQt::AlignVCenter | TQt::SingleLine, - i18n( "print date: formatted-datetime", "printed: %1" ).tqarg( dateStr ) ); + i18n( "print date: formatted-datetime", "printed: %1" ).arg( dateStr ) ); p.setFont( oldfont ); return footbox.bottom(); @@ -933,9 +933,9 @@ void CalPrintPluginBase::drawDayBox( TQPainter &p, const TQDate &qd, if ( fullDate && mCalSys ) { dayNumStr = i18n("weekday month date", "%1 %2 %3") - .tqarg( mCalSys->weekDayName( qd ) ) - .tqarg( mCalSys->monthName( qd ) ) - .tqarg( qd.day() ); + .arg( mCalSys->weekDayName( qd ) ) + .arg( mCalSys->monthName( qd ) ) + .arg( qd.day() ); // dayNumStr = local->formatDate(qd); } else { dayNumStr = TQString::number( qd.day() ); @@ -984,7 +984,7 @@ void CalPrintPluginBase::drawDayBox( TQPainter &p, const TQDate &qd, TQString str; if ( !currEvent->location().isEmpty() ) { str = i18n( "summary, location", "%1, %2" ). - tqarg( currEvent->summary() ).tqarg( currEvent->location() ); + arg( currEvent->summary() ).arg( currEvent->location() ); } else { str = currEvent->summary(); } @@ -1008,7 +1008,7 @@ void CalPrintPluginBase::drawDayBox( TQPainter &p, const TQDate &qd, TQString summaryStr; if ( !todo->location().isEmpty() ) { summaryStr = i18n( "summary, location", "%1, %2" ). - tqarg( todo->summary() ).tqarg( todo->location() ); + arg( todo->summary() ).arg( todo->location() ); } else { summaryStr = todo->summary(); } @@ -1026,7 +1026,7 @@ void CalPrintPluginBase::drawDayBox( TQPainter &p, const TQDate &qd, } else { str = summaryStr; } - drawIncidence( p, box, timeText, i18n("To-do: %1").tqarg( str ), textY ); + drawIncidence( p, box, timeText, i18n("To-do: %1").arg( str ), textY ); } } @@ -1572,7 +1572,7 @@ void CalPrintPluginBase::drawTodo( int &count, Todo *todo, TQPainter &p, } //now, write the percentage - outStr = i18n( "%1%" ).tqarg( todo->percentComplete() ); + outStr = i18n( "%1%" ).arg( todo->percentComplete() ); rect = p.boundingRect( posPercentComplete+lwidth+3, y, x + width, -1, TQt::AlignTop | TQt::AlignLeft, outStr ); p.drawText( rect, TQt::AlignTop | TQt::AlignLeft, outStr ); @@ -1648,7 +1648,7 @@ void CalPrintPluginBase::drawJournalField( TQPainter &p, TQString field, TQStrin { if ( text.isEmpty() ) return; - TQString entry( field.tqarg( text ) ); + TQString entry( field.arg( text ) ); TQRect rect( p.boundingRect( x, y, width, -1, TQt::WordBreak, entry) ); if ( rect.bottom() > pageHeight) { @@ -1677,8 +1677,8 @@ void CalPrintPluginBase::drawJournal( Journal * journal, TQPainter &p, int x, in headerText = dateText; } else { headerText = i18n("Description - date", "%1 - %2") - .tqarg( journal->summary() ) - .tqarg( dateText ); + .arg( journal->summary() ) + .arg( dateText ); } TQRect rect( p.boundingRect( x, y, width, -1, TQt::WordBreak, headerText) ); @@ -1717,15 +1717,15 @@ void CalPrintPluginBase::drawSplitHeaderRight( TQPainter &p, const TQDate &fd, if ( mCalSys ) { if ( fd.month() == td.month() ) { title = i18n("Date range: Month dayStart - dayEnd", "%1 %2 - %3") - .tqarg( mCalSys->monthName( fd.month(), false ) ) - .tqarg( mCalSys->dayString( fd, false ) ) - .tqarg( mCalSys->dayString( td, false ) ); + .arg( mCalSys->monthName( fd.month(), false ) ) + .arg( mCalSys->dayString( fd, false ) ) + .arg( mCalSys->dayString( td, false ) ); } else { title = i18n("Date range: monthStart dayStart - monthEnd dayEnd", "%1 %2 - %3 %4") - .tqarg( mCalSys->monthName( fd.month(), false ) ) - .tqarg( mCalSys->dayString( fd, false ) ) - .tqarg( mCalSys->monthName( td.month(), false ) ) - .tqarg( mCalSys->dayString( td, false ) ); + .arg( mCalSys->monthName( fd.month(), false ) ) + .arg( mCalSys->dayString( fd, false ) ) + .arg( mCalSys->monthName( td.month(), false ) ) + .arg( mCalSys->dayString( td, false ) ); } } diff --git a/korganizer/resourceview.cpp b/korganizer/resourceview.cpp index a4475a4c2..04927bd0d 100644 --- a/korganizer/resourceview.cpp +++ b/korganizer/resourceview.cpp @@ -70,12 +70,12 @@ static TQString labelFromSubResName( ResourceCalendar *resource, const TQString TQString label; if ( (int)reply > 1 ) { if( resource && !resource->resourceName().isEmpty() ) { - label = i18n( "My %1 (%2)" ).tqarg( subRes, resource->resourceName() ); + label = i18n( "My %1 (%2)" ).arg( subRes, resource->resourceName() ); } else { - label = i18n( "My %1" ).tqarg( subRes ); + label = i18n( "My %1" ).arg( subRes ); } } else { - label = i18n( "My %1" ).tqarg( subRes ); + label = i18n( "My %1" ).arg( subRes ); } return label; } @@ -238,18 +238,18 @@ void ResourceItem::setStandardResource( bool std ) { if ( mIsStandardResource != std ) { mIsStandardResource = std; - tqrepaint(); + repaint(); } } void ResourceItem::paintCell(TQPainter *p, const TQColorGroup &cg, - int column, int width, int tqalignment) + int column, int width, int alignment) { TQFont oldFont = p->font(); TQFont newFont = oldFont; newFont.setBold( mIsStandardResource && !mIsSubresource ); p->setFont( newFont ); - TQCheckListItem::paintCell( p, cg, column, width, tqalignment ); + TQCheckListItem::paintCell( p, cg, column, width, alignment ); p->setFont( oldFont ); /* TQColorGroup _cg = cg; if(!mResource) return; @@ -376,7 +376,7 @@ void ResourceView::addResource() if ( !item->resource()->addSubresource( folderName, parentId ) ) { KMessageBox::error( this, - i18n( "<qt>Unable to create subresource <b>%1</b>.</qt>" ).tqarg( folderName ) ); + i18n( "<qt>Unable to create subresource <b>%1</b>.</qt>" ).arg( folderName ) ); } return; } @@ -398,7 +398,7 @@ void ResourceView::addResource() if( !resource ) { KMessageBox::error( this, - i18n( "<qt>Unable to create resource of type <b>%1</b>.</qt>" ).tqarg( type ) ); + i18n( "<qt>Unable to create resource of type <b>%1</b>.</qt>" ).arg( type ) ); return; } @@ -414,7 +414,7 @@ void ResourceView::addResource() if ( resource->isActive() && ( !resource->open() || !resource->load() ) ) { // ### There is a resourceLoadError() signal declared in ResourceCalendar // but no subclass seems to make use of it. We could do better. - KMessageBox::error( this, i18n("Unable to create the resource.").tqarg( type ) ); + KMessageBox::error( this, i18n("Unable to create the resource.").arg( type ) ); success = false; } } @@ -573,7 +573,7 @@ void ResourceView::removeResource() i18n ("<qt>Failed to remove the subresource <b>%1</b>. The " "reason could be that it is a built-in one which cannot " "be removed, or that the removal of the underlying storage " - "folder failed.</qt>").tqarg( item->resource()->name() ) ); + "folder failed.</qt>").arg( item->resource()->name() ) ); return; } else { mCalendar->resourceManager()->remove( item->resource() ); @@ -632,7 +632,7 @@ void ResourceView::editResource() } else { KMessageBox::sorry( this, - i18n ("<qt>Cannot edit the subresource <b>%1</b>.</qt>").tqarg( item->resource()->name() ) ); + i18n ("<qt>Cannot edit the subresource <b>%1</b>.</qt>").arg( item->resource()->name() ) ); } } else { KRES::ConfigDialog dlg( this, TQString("calendar"), resource, "KRES::ConfigDialog" ); diff --git a/korganizer/resourceview.h b/korganizer/resourceview.h index e5bb9d3e6..6734c4bcb 100644 --- a/korganizer/resourceview.h +++ b/korganizer/resourceview.h @@ -69,7 +69,7 @@ class ResourceItem : public TQCheckListItem void update(); virtual void paintCell(TQPainter *p, const TQColorGroup &cg, - int column, int width, int tqalignment); + int column, int width, int alignment); void setResourceColor(TQColor& color); TQColor &resourceColor() {return mResourceColor;} diff --git a/korganizer/timelabels.cpp b/korganizer/timelabels.cpp index c2802acb3..38c587289 100644 --- a/korganizer/timelabels.cpp +++ b/korganizer/timelabels.cpp @@ -197,7 +197,7 @@ void TimeLabels::updateConfig() sFont.setPointSize( sFont.pointSize()/2 ); TQFontMetrics fmS( sFont ); mMiniWidth += fmS.width( test ) + frameWidth()*2+4 ; - // update tqgeometry restrictions based on new settings + // update geometry restrictions based on new settings setFixedWidth( mMiniWidth ); // update HourSize @@ -237,7 +237,7 @@ void TimeLabels::setAgenda( KOAgenda* agenda ) } -/** This is called in response to tqrepaint() */ +/** This is called in response to repaint() */ void TimeLabels::paintEvent(TQPaintEvent*) { // kdDebug(5850) << "paintevent..." << endl; diff --git a/korn/accountmanager.cpp b/korn/accountmanager.cpp index ddadf7c23..a791c53d4 100644 --- a/korn/accountmanager.cpp +++ b/korn/accountmanager.cpp @@ -53,14 +53,14 @@ AccountManager::~AccountManager() void AccountManager::readConfig( KConfig* config, const int index ) { - KConfigGroup *masterGroup = new KConfigGroup( config, TQString( "korn-%1" ).tqarg( index ) ); + KConfigGroup *masterGroup = new KConfigGroup( config, TQString( "korn-%1" ).arg( index ) ); TQStringList dcop = masterGroup->readListEntry( "dcop", ',' ); KConfigGroup *accountGroup; int counter = 0; - while( config->hasGroup( TQString( "korn-%1-%2" ).tqarg( index ).tqarg( counter ) ) ) + while( config->hasGroup( TQString( "korn-%1-%2" ).arg( index ).arg( counter ) ) ) { - accountGroup = new KConfigGroup( config, TQString( "korn-%1-%2" ).tqarg( index ).tqarg( counter ) ); + accountGroup = new KConfigGroup( config, TQString( "korn-%1-%2" ).arg( index ).arg( counter ) ); const Protocol *proto = Protocols::getProto( accountGroup->readEntry( "protocol" ) ); if( !proto ) @@ -144,7 +144,7 @@ void AccountManager::writeConfig( KConfig* config, const int index ) TQMap< KMailDrop*, Dropinfo* >::Iterator it; for( it = _dropInfo->begin(); it != _dropInfo->end(); ++it ) { - config->setGroup( TQString( "korn-%1-%2" ).tqarg( index ).tqarg( it.data()->index ) ); + config->setGroup( TQString( "korn-%1-%2" ).arg( index ).arg( it.data()->index ) ); config->writeEntry( "reset", it.data()->reset ); } } @@ -155,9 +155,9 @@ TQString AccountManager::getTooltip() const TQMap< KMailDrop*, Dropinfo* >::Iterator it; for( it = _dropInfo->begin(); it != _dropInfo->end(); ++it ) if( it.key()->valid() ) - result.append( TQString( "%1: %2" ).tqarg( it.key()->realName() ).tqarg( it.data()->msgnr - it.data()->reset )); + result.append( TQString( "%1: %2" ).arg( it.key()->realName() ).arg( it.data()->msgnr - it.data()->reset )); else - result.append( TQString( "%1: invalid" ).tqarg( it.key()->realName() ) ); + result.append( TQString( "%1: invalid" ).arg( it.key()->realName() ) ); result.sort(); return result.join( TQChar( '\n' ) ); } diff --git a/korn/boxcontainer.cpp b/korn/boxcontainer.cpp index 72719812d..934a47c53 100644 --- a/korn/boxcontainer.cpp +++ b/korn/boxcontainer.cpp @@ -39,9 +39,9 @@ BoxContainer::~BoxContainer() void BoxContainer::readConfig( KConfig* config ) { int counter = 0; - while( config->hasGroup( TQString( "korn-%1" ).tqarg( counter ) ) ) + while( config->hasGroup( TQString( "korn-%1" ).arg( counter ) ) ) { - config->setGroup( TQString( "korn-%1" ).tqarg( counter ) ); + config->setGroup( TQString( "korn-%1" ).arg( counter ) ); BoxContainerItem *item = newBoxInstance(); item->readConfig( config, counter ); addItem( item ); diff --git a/korn/boxcontaineritem.cpp b/korn/boxcontaineritem.cpp index 8c9989532..7a0c4637c 100644 --- a/korn/boxcontaineritem.cpp +++ b/korn/boxcontaineritem.cpp @@ -81,7 +81,7 @@ BoxContainerItem::~BoxContainerItem() void BoxContainerItem::readConfig( KConfig* config, const int index ) { //Read information about how the thing have to look like - config->setGroup( TQString( "korn-%1" ).tqarg( index ) ); + config->setGroup( TQString( "korn-%1" ).arg( index ) ); if( config->readBoolEntry( "hasnormalicon", false ) ) _icons[ 0 ] = new TQString( config->readEntry( "normalicon", "" ) ); else @@ -216,8 +216,8 @@ void BoxContainerItem::showPassivePopup( TQWidget* parent, TQPtrList< KornMailSu { KPassivePopup *popup = new KPassivePopup( parent, "Passive popup" ); - TQVBox *mainvtqlayout = popup->standardView( i18n( "KOrn - %1/%2 (total: %3)" ).tqarg( TQString(objId()) ).tqarg( accountName ) - .tqarg( total ), "", TQPixmap(), 0 ); + TQVBox *mainvtqlayout = popup->standardView( i18n( "KOrn - %1/%2 (total: %3)" ).arg( TQString(objId()) ).arg( accountName ) + .arg( total ), "", TQPixmap(), 0 ); TQGrid *maingtqlayout = new TQGrid( date ? 3 : 2 ,mainvtqlayout, "Grid-Layout" ); TQLabel *title = new TQLabel( i18n("From"), maingtqlayout, "from_label" ); @@ -339,7 +339,7 @@ TQPixmap BoxContainerItem::calcComplexPixmap( const TQPixmap &icon, const TQColo //Make a transparent number; first make a white number on a black background. //This pixmap also is the base alpha-channel, the foreground colour is added later. numberPixmap.fill( TQt::black ); - p.tqbegin( &numberPixmap, false ); + p.begin( &numberPixmap, false ); p.setPen( TQt::white ); if( font ) p.setFont( *font ); diff --git a/korn/dcopdrop.cpp b/korn/dcopdrop.cpp index 9fa7caa85..407a6ff06 100644 --- a/korn/dcopdrop.cpp +++ b/korn/dcopdrop.cpp @@ -159,7 +159,7 @@ int DCOPDrop::addMessage( const TQString& subject, const TQString& message ) ++_counter; mailsubject->setSubject( subject ); - mailsubject->setSender( TQString( "DCOP: %1" ).tqarg( *_name ) ); + mailsubject->setSender( TQString( "DCOP: %1" ).arg( *_name ) ); mailsubject->setHeader( message, true ); mailsubject->setSize( message.length() ); mailsubject->setDate( TQDateTime::currentDateTime().toTime_t() ); diff --git a/korn/dockeditem.cpp b/korn/dockeditem.cpp index 5ff6fb8af..9d30717f0 100644 --- a/korn/dockeditem.cpp +++ b/korn/dockeditem.cpp @@ -81,7 +81,7 @@ void DockedItem::slotShowPassivePopup( TQPtrList< KornMailSubject >* list, int t void DockedItem::slotShowPassivePopup( const TQString& message, const TQString& name ) { - KPassivePopup::message( i18n( "Korn - %1/%2" ).tqarg( TQString(objId()) ).tqarg( name ), message, _systemtray, "Passive error message" ); + KPassivePopup::message( i18n( "Korn - %1/%2" ).arg( TQString(objId()) ).arg( name ), message, _systemtray, "Passive error message" ); } void DockedItem::doPopup() diff --git a/korn/hvitem.cpp b/korn/hvitem.cpp index bf621445f..d2453b64c 100644 --- a/korn/hvitem.cpp +++ b/korn/hvitem.cpp @@ -71,7 +71,7 @@ void HVItem::slotShowPassivePopup( TQPtrList< KornMailSubject >* list, int total void HVItem::slotShowPassivePopup( const TQString& errorMessage, const TQString& name ) { - KPassivePopup::message( TQString( "korn-%1-%2" ).tqarg( TQString(objId()) ).tqarg( name ), errorMessage, _label, "Passive error message" ); + KPassivePopup::message( TQString( "korn-%1-%2" ).arg( TQString(objId()) ).arg( name ), errorMessage, _label, "Passive error message" ); } void HVItem::doPopup() diff --git a/korn/imap_proto.cpp b/korn/imap_proto.cpp index 304fed5ed..caedb4597 100644 --- a/korn/imap_proto.cpp +++ b/korn/imap_proto.cpp @@ -68,9 +68,9 @@ void Imap_Protocol::readEntries( TQMap< TQString, TQString >* map, TQMap< TQStri if( map->contains( "ssl" ) && *map->find( "ssl" ) == "true" ) map->insert( "encryption", "ssl" ); if( metadata->contains( "tls" ) ) - map->insert( "encryption", TQString( "tls=%1" ).tqarg( *metadata->find( "tls" ) ) ); + map->insert( "encryption", TQString( "tls=%1" ).arg( *metadata->find( "tls" ) ) ); if( metadata->contains( "auth" ) ) - map->insert( "auth", TQString( "auth=%1" ).tqarg( *metadata->find( "auth" ) ) ); + map->insert( "auth", TQString( "auth=%1" ).arg( *metadata->find( "auth" ) ) ); } void Imap_Protocol::writeEntries( TQMap< TQString, TQString >* map ) const diff --git a/korn/kconf_update/korn-3-4-config_change.cpp b/korn/kconf_update/korn-3-4-config_change.cpp index 7ff7a922c..7eff3ad38 100644 --- a/korn/kconf_update/korn-3-4-config_change.cpp +++ b/korn/kconf_update/korn-3-4-config_change.cpp @@ -175,8 +175,8 @@ int main( int, char** ) { if( numboxes > -1 && interesting_group.cap( 1 ).toInt() < numboxes ) { - currentGroup1 = TQString( "[korn-%1]" ).tqarg( interesting_group.cap( 1 ) ); - currentGroup2 = TQString( "[korn-%1-0]" ).tqarg( interesting_group.cap( 1 ) ); + currentGroup1 = TQString( "[korn-%1]" ).arg( interesting_group.cap( 1 ) ); + currentGroup2 = TQString( "[korn-%1-0]" ).arg( interesting_group.cap( 1 ) ); } tobe_deleted.append( line ); continue; diff --git a/korn/keditlistboxman.cpp b/korn/keditlistboxman.cpp index d5ae323a5..d3dce86e0 100644 --- a/korn/keditlistboxman.cpp +++ b/korn/keditlistboxman.cpp @@ -109,9 +109,9 @@ void KEditListBoxManager::readNames() int number = 0; this->clear(); - while( _config->hasGroup( _groupName->tqarg( number ) ) ) + while( _config->hasGroup( _groupName->arg( number ) ) ) { - _config->setGroup( _groupName->tqarg( number ) ); + _config->setGroup( _groupName->arg( number ) ); this->insertItem( _config->readEntry( "name", TQString() ) ); ++number; } @@ -138,7 +138,7 @@ void KEditListBoxManager::slotChanged() //First check if the item was moved up - _config->setGroup( _groupName->tqarg( this->currentItem() ) ); + _config->setGroup( _groupName->arg( this->currentItem() ) ); if( this->currentItem() > 0 && this->text( this->currentItem() - 1 ) == _config->readEntry( "name", TQString() ) ) changeItem( this->currentItem() - 1, this->currentItem() ); //moved down @@ -158,10 +158,10 @@ void KEditListBoxManager::slotAdded( const TQString& name ) return; int number = 0; - while( _config->hasGroup( _groupName->tqarg( number ) ) ) + while( _config->hasGroup( _groupName->arg( number ) ) ) ++number; - _config->setGroup( _groupName->tqarg( number ) ); + _config->setGroup( _groupName->arg( number ) ); _config->writeEntry( "name", name ); emit setDefaults( name, number, _config ); @@ -180,12 +180,12 @@ void KEditListBoxManager::slotRemoved( const TQString& name ) int subnumber = 0; while( true ) { - if( !_config->hasGroup( _groupName->tqarg( number ) ) ) + if( !_config->hasGroup( _groupName->arg( number ) ) ) { number = -1; //not found break; } - _config->setGroup( _groupName->tqarg( number ) ); + _config->setGroup( _groupName->arg( number ) ); if( name == _config->readEntry( "name", TQString() ) ) break; //found @@ -195,16 +195,16 @@ void KEditListBoxManager::slotRemoved( const TQString& name ) if( number < 0 ) //failure return; //do nothing - _config->deleteGroup( _groupName->tqarg( number ), true, false ); + _config->deleteGroup( _groupName->arg( number ), true, false ); emit elementDeleted( number ); - while( _subGroupName && _config->hasGroup( _subGroupName->tqarg( number ).tqarg( subnumber ) ) ) + while( _subGroupName && _config->hasGroup( _subGroupName->arg( number ).arg( subnumber ) ) ) { - _config->deleteGroup( _subGroupName->tqarg( number ).tqarg( subnumber ) ); + _config->deleteGroup( _subGroupName->arg( number ).arg( subnumber ) ); ++subnumber; } //rotate groups - while( _config->hasGroup( _groupName->tqarg( number + 1 ) ) ) + while( _config->hasGroup( _groupName->arg( number + 1 ) ) ) { moveItem( number + 1, number ); @@ -224,17 +224,17 @@ void KEditListBoxManager::moveItem( int src, int dest ) TQMap<TQString, TQString>::iterator it; int subnumber = 0; - *srcList = _config->entryMap( _groupName->tqarg( src ) ); - _config->deleteGroup( _groupName->tqarg( src ) ); + *srcList = _config->entryMap( _groupName->arg( src ) ); + _config->deleteGroup( _groupName->arg( src ) ); - _config->setGroup( _groupName->tqarg( dest ) ); + _config->setGroup( _groupName->arg( dest ) ); for( it = srcList->begin(); it != srcList->end(); ++it ) _config->writeEntry( it.key(), it.data() ); - while( _subGroupName && _config->hasGroup( _subGroupName->tqarg( src ).tqarg( subnumber ) ) ) + while( _subGroupName && _config->hasGroup( _subGroupName->arg( src ).arg( subnumber ) ) ) { - _config->deleteGroup( _subGroupName->tqarg( dest ).tqarg( subnumber ) ); - _config->setGroup( _subGroupName->tqarg( dest ).tqarg( subnumber ) ); + _config->deleteGroup( _subGroupName->arg( dest ).arg( subnumber ) ); + _config->setGroup( _subGroupName->arg( dest ).arg( subnumber ) ); for( it = srcList->begin(); it != srcList->end(); ++it ) _config->writeEntry( it.key(), it.data() ); @@ -253,33 +253,33 @@ void KEditListBoxManager::changeItem( int first, int last ) TQMap<TQString, TQString>::iterator it; int subnumber = 0; - *firstList = _config->entryMap( _groupName->tqarg( first ) ); - *lastList = _config->entryMap( _groupName->tqarg( last ) ); - _config->deleteGroup( _groupName->tqarg( first ) ); - _config->deleteGroup( _groupName->tqarg( last ) ); + *firstList = _config->entryMap( _groupName->arg( first ) ); + *lastList = _config->entryMap( _groupName->arg( last ) ); + _config->deleteGroup( _groupName->arg( first ) ); + _config->deleteGroup( _groupName->arg( last ) ); - _config->setGroup( _groupName->tqarg( last ) ); + _config->setGroup( _groupName->arg( last ) ); for( it = firstList->begin(); it != firstList->end(); ++it ) _config->writeEntry( it.key(), it.data() ); - _config->setGroup( _groupName->tqarg( first ) ); + _config->setGroup( _groupName->arg( first ) ); for( it = lastList->begin(); it != lastList->end(); ++it ) _config->writeEntry( it.key(), it.data() ); while( _subGroupName && ( - _config->hasGroup( _subGroupName->tqarg( first ).tqarg( subnumber ) ) || - _config->hasGroup( _subGroupName->tqarg( last ).tqarg( subnumber ) ) ) ) + _config->hasGroup( _subGroupName->arg( first ).arg( subnumber ) ) || + _config->hasGroup( _subGroupName->arg( last ).arg( subnumber ) ) ) ) { - *firstList = _config->entryMap( _subGroupName->tqarg( first ).tqarg( subnumber ) ); - *lastList = _config->entryMap( _subGroupName->tqarg( last ).tqarg( subnumber ) ); - _config->deleteGroup( _subGroupName->tqarg( first ).tqarg( subnumber ) ); - _config->deleteGroup( _subGroupName->tqarg( last ).tqarg( subnumber ) ); + *firstList = _config->entryMap( _subGroupName->arg( first ).arg( subnumber ) ); + *lastList = _config->entryMap( _subGroupName->arg( last ).arg( subnumber ) ); + _config->deleteGroup( _subGroupName->arg( first ).arg( subnumber ) ); + _config->deleteGroup( _subGroupName->arg( last ).arg( subnumber ) ); - _config->setGroup( _subGroupName->tqarg( last ).tqarg( subnumber ) ); + _config->setGroup( _subGroupName->arg( last ).arg( subnumber ) ); for( it = firstList->begin(); it != firstList->end(); ++it ) _config->writeEntry( it.key(), it.data() ); - _config->setGroup( _subGroupName->tqarg( first ).tqarg( subnumber ) ); + _config->setGroup( _subGroupName->arg( first ).arg( subnumber ) ); for( it = lastList->begin(); it != lastList->end(); ++it ) _config->writeEntry( it.key(), it.data() ); @@ -294,7 +294,7 @@ void KEditListBoxManager::changeItem( int first, int last ) void KEditListBoxManager::changedText() { - _config->setGroup( _groupName->tqarg( this->currentItem() ) ); + _config->setGroup( _groupName->arg( this->currentItem() ) ); _config->writeEntry( "name", this->currentText() ); } diff --git a/korn/kio.cpp b/korn/kio.cpp index 0977eb603..8015595c0 100644 --- a/korn/kio.cpp +++ b/korn/kio.cpp @@ -96,7 +96,7 @@ KKioDrop::KKioDrop() _protocol = Protocols::firstProtocol()->getKIOProtocol(); //The first protocol is the default _kurl->setPort( _protocol->defaultPort( _ssl ) ); - //Creating tqchildren and connect them to the outside world; this class passes the messages for them... + //Creating children and connect them to the outside world; this class passes the messages for them... //This class handles all the counting. _count = new KIO_Count( this, "kio_count" ); @@ -134,7 +134,7 @@ KKioDrop::KKioDrop( KConfigGroup* ) _protocol = Protocols::firstProtocol()->getKIOProtocol(); //The first protocol is the default _kurl->setPort( _protocol->defaultPort( _ssl ) ); - //Creating tqchildren and connect them to the outside world; this class passes the messages for them... + //Creating children and connect them to the outside world; this class passes the messages for them... //This class handles all the counting. _count = new KIO_Count( this, "kio_count" ); diff --git a/korn/kio_count.cpp b/korn/kio_count.cpp index a1635fd9f..a1f8e825c 100644 --- a/korn/kio_count.cpp +++ b/korn/kio_count.cpp @@ -86,8 +86,8 @@ void KIO_Count::count( KKioDrop *drop ) if( ! ( _slave = KIO::Scheduler::getConnectedSlave( kurl, metadata ) ) ) //Forcing reload { - kdWarning() << i18n( "Not able to open a kio slave for %1." ).tqarg( _protocol->configName() ) << endl; - _kio->emitShowPassivePopup( i18n( "Not able to open a kio slave for %1." ).tqarg( _protocol->configName() ) ); + kdWarning() << i18n( "Not able to open a kio slave for %1." ).arg( _protocol->configName() ) << endl; + _kio->emitShowPassivePopup( i18n( "Not able to open a kio slave for %1." ).arg( _protocol->configName() ) ); _valid = false; _kio->emitValidChanged(); _slave = 0; @@ -207,8 +207,8 @@ void KIO_Count::result( KIO::Job* job ) //This could be very useful by resolving bugs. if( job->error() ) { - kdError() << i18n( "The next KIO-error occurred by counting: %1" ).tqarg( job->errorString() ) << endl; - _kio->emitShowPassivePopup( i18n( "The next KIO-error occurred by counting: %1" ).tqarg( job->errorString() ) ); + kdError() << i18n( "The next KIO-error occurred by counting: %1" ).arg( job->errorString() ) << endl; + _kio->emitShowPassivePopup( i18n( "The next KIO-error occurred by counting: %1" ).arg( job->errorString() ) ); _valid = false; _kio->emitValidChanged(); } diff --git a/korn/kio_delete.cpp b/korn/kio_delete.cpp index 576463bef..db27e28d9 100644 --- a/korn/kio_delete.cpp +++ b/korn/kio_delete.cpp @@ -182,7 +182,7 @@ void KIO_Delete::slotResult( KIO::Job* job ) { if( job->error() ) { - kdWarning() << i18n( "An error occurred when deleting email: %1." ).tqarg( job->errorString() ) << endl; + kdWarning() << i18n( "An error occurred when deleting email: %1." ).arg( job->errorString() ) << endl; _valid = false; } diff --git a/korn/kio_read.cpp b/korn/kio_read.cpp index c14377c0b..b92da304c 100644 --- a/korn/kio_read.cpp +++ b/korn/kio_read.cpp @@ -77,7 +77,7 @@ void KIO_Read::slotResult( KIO::Job* job ) kdWarning() << i18n( "Unknown job returned; I will try if this one will do... " ) << endl; if( job->error() ) - kdWarning() << i18n( "An error occurred when fetching the requested email: %1." ).tqarg( job->errorString() ) << endl; + kdWarning() << i18n( "An error occurred when fetching the requested email: %1." ).arg( job->errorString() ) << endl; _kio->emitReadMailReady( _message ); diff --git a/korn/kio_single_subject.cpp b/korn/kio_single_subject.cpp index fad2790b5..02a6a103d 100644 --- a/korn/kio_single_subject.cpp +++ b/korn/kio_single_subject.cpp @@ -138,7 +138,7 @@ void KIO_Single_Subject::slotResult( KIO::Job *job ) if( job->error() ) { - kdWarning() << i18n( "Error when fetching %1: %2" ).tqarg( *_name ).tqarg( job->errorString() ) << endl; + kdWarning() << i18n( "Error when fetching %1: %2" ).arg( *_name ).arg( job->errorString() ) << endl; } else { KornMailSubject * mailSubject = new KornMailSubject( new KornStringId( *_name ), 0 ); parseMail( _message, mailSubject, _protocol->fullMessage() ); diff --git a/korn/kio_subjects.cpp b/korn/kio_subjects.cpp index 2e1e33855..2de6ac59a 100644 --- a/korn/kio_subjects.cpp +++ b/korn/kio_subjects.cpp @@ -101,8 +101,8 @@ void KIO_Subjects::getConnection( ) if( ! ( _slave = KIO::Scheduler::getConnectedSlave( kurl, metadata ) ) ) { - kdWarning() << i18n( "Not able to open a kio-slave for %1." ).tqarg( _protocol->configName() ); - _kio->emitShowPassivePopup( i18n( "Not able to open a kio-slave for %1." ).tqarg( _protocol->configName() ) ); + kdWarning() << i18n( "Not able to open a kio-slave for %1." ).arg( _protocol->configName() ); + _kio->emitShowPassivePopup( i18n( "Not able to open a kio-slave for %1." ).arg( _protocol->configName() ) ); _valid = false; _kio->emitValidChanged(); _slave = 0; diff --git a/korn/kmail_proto.cpp b/korn/kmail_proto.cpp index 1ff68213b..fb6166c31 100644 --- a/korn/kmail_proto.cpp +++ b/korn/kmail_proto.cpp @@ -99,7 +99,7 @@ TQMap< TQString, TQString > * KMail_Protocol::createConfig( KConfigGroup* config { //Construct metadata if( kmailconfig.hasKey( "auth" ) ) - metadata += TQString( "auth=%1," ).tqarg( kmailconfig.readEntry( "auth" ) ); + metadata += TQString( "auth=%1," ).arg( kmailconfig.readEntry( "auth" ) ); if( !kmailconfig.hasKey( "use-tls" ) ) metadata += "tls=auto"; else @@ -124,7 +124,7 @@ TQMap< TQString, TQString > * KMail_Protocol::createConfig( KConfigGroup* config { //Constructing metadata if( kmailconfig.hasKey( "auth" ) ) - metadata += TQString( "auth=%1," ).tqarg( kmailconfig.readEntry( "auth" ) ); + metadata += TQString( "auth=%1," ).arg( kmailconfig.readEntry( "auth" ) ); if( !kmailconfig.hasKey( "use-tls" ) ) metadata += "tls=auto"; else @@ -185,9 +185,9 @@ void KMail_Protocol::configFields( TQPtrVector< TQWidget >* vector, const TQObje int nummer = kmailFirstGroup - 1; KConfig kmailconfig( "kmailrc", true, false ); - while( kmailconfig.hasGroup( TQString( kmailGroupName ).tqarg( ++nummer ) ) ) + while( kmailconfig.hasGroup( TQString( kmailGroupName ).arg( ++nummer ) ) ) { - kmailconfig.setGroup( TQString( kmailGroupName ).tqarg( nummer ) ); + kmailconfig.setGroup( TQString( kmailGroupName ).arg( nummer ) ); type = kmailconfig.readEntry( kmailKeyType, TQString() ); name = kmailconfig.readEntry( kmailKeyName, TQString() ); if( type == "imap" || type == "cachedimap" || type == "pop" || type == "local" ) @@ -224,9 +224,9 @@ TQString KMail_Protocol::getTypeAndConfig( const TQString& kmailname, KConfig &k id = -1; - while( kmailconfig.hasGroup( TQString( kmailGroupName ).tqarg( ++nummer ) ) ) + while( kmailconfig.hasGroup( TQString( kmailGroupName ).arg( ++nummer ) ) ) { - kmailconfig.setGroup( TQString( kmailGroupName ).tqarg( nummer ) ); + kmailconfig.setGroup( TQString( kmailGroupName ).arg( nummer ) ); if( kmailconfig.readEntry( kmailKeyName, TQString() ) == kmailname ) { id = kmailconfig.readNumEntry( kmailKeyId, 0 ); diff --git a/korn/kornboxcfg.ui b/korn/kornboxcfg.ui index deea15915..78bd0367f 100644 --- a/korn/kornboxcfg.ui +++ b/korn/kornboxcfg.ui @@ -161,7 +161,7 @@ <property name="text"> <string>Normal</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> @@ -201,7 +201,7 @@ <property name="text"> <string>New Mail</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> @@ -455,7 +455,7 @@ <property name="text"> <string>Left</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> @@ -518,7 +518,7 @@ <property name="text"> <string>Right</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> @@ -745,7 +745,7 @@ <property name="text"> <string>Mousebutton</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> @@ -860,7 +860,7 @@ <property name="text"> <string>Middle</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> diff --git a/korn/kornboxcfgimpl.cpp b/korn/kornboxcfgimpl.cpp index 4cb911bef..ab6671427 100644 --- a/korn/kornboxcfgimpl.cpp +++ b/korn/kornboxcfgimpl.cpp @@ -78,7 +78,7 @@ void KornBoxCfgImpl::readConfig( KConfig * config, const int index ) _config = config; _index = index; - _config->setGroup( TQString( "korn-%1" ).tqarg( index ) ); + _config->setGroup( TQString( "korn-%1" ).arg( index ) ); readViewConfig(); readEventConfig(); @@ -88,7 +88,7 @@ void KornBoxCfgImpl::readConfig( KConfig * config, const int index ) void KornBoxCfgImpl::writeConfig( KConfig * config, const int index ) { - config->setGroup( TQString( "korn-%1" ).tqarg( index ) ); + config->setGroup( TQString( "korn-%1" ).arg( index ) ); writeViewConfig( config ); writeEventConfig( config ); @@ -155,7 +155,7 @@ void KornBoxCfgImpl::readEventConfig() void KornBoxCfgImpl::readAccountsConfig() { - elbAccounts->setGroupName( TQString( "korn-%1-%2" ).tqarg( _index ) ); + elbAccounts->setGroupName( TQString( "korn-%1-%2" ).arg( _index ) ); elbAccounts->setConfig( _config ); } @@ -250,10 +250,10 @@ void KornBoxCfgImpl::slotEditBox() connect( _base, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotDialogDestroyed() ) ); _group = new KConfigGroup( _config, TQString( "korn-%1-%2" ). - tqarg( _index ).tqarg(elbAccounts->listBox()->currentItem() ) ); + arg( _index ).arg(elbAccounts->listBox()->currentItem() ) ); TQMap< TQString, TQString > *map = new TQMap< TQString, TQString >( _config->entryMap( TQString( "korn-%1-%2" ). - tqarg( _index ).tqarg(elbAccounts->listBox()->currentItem() ) ) ); + arg( _index ).arg(elbAccounts->listBox()->currentItem() ) ) ); widget->readConfig( _group, map, _index, elbAccounts->listBox()->currentItem() ); delete map; diff --git a/korn/korncfgimpl.cpp b/korn/korncfgimpl.cpp index 0616e6fee..b61cf32c7 100644 --- a/korn/korncfgimpl.cpp +++ b/korn/korncfgimpl.cpp @@ -91,10 +91,10 @@ void KornCfgImpl::slotDialogDestroyed() void KornCfgImpl::slotElementsSwapped( int box1, int box2 ) { int accountnumber1 = 0, accountnumber2 = 0; - while( _config->hasGroup( TQString( "korn-%1-%2" ).tqarg( box1 ).tqarg( accountnumber1 ) ) ) + while( _config->hasGroup( TQString( "korn-%1-%2" ).arg( box1 ).arg( accountnumber1 ) ) ) ++accountnumber1; - while( _config->hasGroup( TQString( "korn-%1-%2" ).tqarg( box2 ).tqarg( accountnumber2 ) ) ) + while( _config->hasGroup( TQString( "korn-%1-%2" ).arg( box2 ).arg( accountnumber2 ) ) ) ++accountnumber2; KOrnPassword::swapKOrnWalletPasswords( box1, accountnumber1, box2, accountnumber2 ); @@ -103,7 +103,7 @@ void KornCfgImpl::slotElementsSwapped( int box1, int box2 ) void KornCfgImpl::slotElementDeleted( int box ) { int accountnumber = 0; - while( _config->hasGroup( TQString( "korn-%1-%2" ).tqarg( box ).tqarg( accountnumber ) ) ) + while( _config->hasGroup( TQString( "korn-%1-%2" ).arg( box ).arg( accountnumber ) ) ) { KOrnPassword::deleteKOrnPassword( box, accountnumber ); ++accountnumber; @@ -161,7 +161,7 @@ void KornCfgImpl::slotSetDefaults( const TQString& name, const int index, KConfi config->writeEntry( "passivedate", false ); config->writeEntry( "numaccounts", 1 ); config->writeEntry( "dcop", TQStringList() ); - config->setGroup( TQString( "korn-%1-0" ).tqarg( index ) ); + config->setGroup( TQString( "korn-%1-0" ).arg( index ) ); config->writeEntry( "name", name ); config->writeEntry( "protocol", "mbox" ); config->writeEntry( "server", TQString() ); @@ -236,12 +236,12 @@ void KornCfgImpl::rewritePasswords() int account = 0 - 1; KConfigGroup *group; - while( _config->hasGroup( TQString( "korn-%1" ).tqarg( ++box ) ) ) + while( _config->hasGroup( TQString( "korn-%1" ).arg( ++box ) ) ) { account = 0 - 1; - while( _config->hasGroup( TQString( "korn-%1-%2" ).tqarg( box ).tqarg( ++account ) ) ) + while( _config->hasGroup( TQString( "korn-%1-%2" ).arg( box ).arg( ++account ) ) ) { - group = new KConfigGroup( _config, TQString( "korn-%1-%2" ).tqarg( box ).tqarg( account ) ); + group = new KConfigGroup( _config, TQString( "korn-%1-%2" ).arg( box ).arg( account ) ); KOrnPassword::rewritePassword( box, account, *group, chUseWallet->isChecked() ); delete group; } diff --git a/korn/password.cpp b/korn/password.cpp index bc997d51a..f0ae5d8f3 100644 --- a/korn/password.cpp +++ b/korn/password.cpp @@ -52,7 +52,7 @@ TQString KOrnPassword::readKMailPassword( int accountnr, const KConfigBase& fall return KMailDecrypt( fallbackConfig.readEntry( "pass" )); m_wallet->setFolder( "kmail" ); - if( m_wallet->readPassword( TQString( "account-%1" ).tqarg( accountnr ), password ) != 0 ) + if( m_wallet->readPassword( TQString( "account-%1" ).arg( accountnr ), password ) != 0 ) return fallbackConfig.readEntry( "password" ); return password; @@ -95,7 +95,7 @@ bool KOrnPassword::deleteKOrnPassword( int box, int account ) m_wallet->setFolder( "korn" ); //Write to wallet - if( m_wallet->removeEntry( TQString( "account-%1-%2" ).tqarg( box ).tqarg( account ) ) != 0 ) + if( m_wallet->removeEntry( TQString( "account-%1-%2" ).arg( box ).arg( account ) ) != 0 ) //Writing failed return false; @@ -201,7 +201,7 @@ bool KOrnPassword::readKOrnPassword( int box, int account, TQString& password ) return false; m_wallet->setFolder( "korn" ); - if( m_wallet->readPassword( TQString( "account-%1-%2" ).tqarg( box ).tqarg( account ), password ) != 0 ) + if( m_wallet->readPassword( TQString( "account-%1-%2" ).arg( box ).arg( account ), password ) != 0 ) //Error during reading the password: use the one in the config file return false; @@ -228,7 +228,7 @@ bool KOrnPassword::writeKOrnPassword( int box, int account, const TQString& pass m_wallet->setFolder( "korn" ); //Write to wallet - if( m_wallet->writePassword( TQString( "account-%1-%2" ).tqarg( box ).tqarg( account ), password ) != 0 ) + if( m_wallet->writePassword( TQString( "account-%1-%2" ).arg( box ).arg( account ), password ) != 0 ) //Writing failed return false; diff --git a/korn/polldrop.cpp b/korn/polldrop.cpp index 7cc6bc572..8d05a03be 100644 --- a/korn/polldrop.cpp +++ b/korn/polldrop.cpp @@ -52,7 +52,7 @@ void KPollableDrop::timerEvent( TQTimerEvent *ev ) { if( _timerRunning && (ev->timerId() == _timerId) ) { // this event is ours. - recheck(); // should be reimplemented by tqchildren. + recheck(); // should be reimplemented by children. } else { TQObject::timerEvent( ev ); diff --git a/korn/pop3_proto.cpp b/korn/pop3_proto.cpp index c4ecd6b16..b42a63ec2 100644 --- a/korn/pop3_proto.cpp +++ b/korn/pop3_proto.cpp @@ -67,7 +67,7 @@ void Pop3_Protocol::readEntries( TQMap< TQString, TQString >* map, TQMap< TQStri if( map->contains( "ssl" ) && *map->find( "ssl" ) == "true" ) map->insert( "encryption", "ssl" ); if( metadata->contains( "tls" ) ) - map->insert( "encryption", TQString( "tls=%1" ).tqarg( *metadata->find( "tls" ) ) ); + map->insert( "encryption", TQString( "tls=%1" ).arg( *metadata->find( "tls" ) ) ); if( metadata->contains( "auth" ) ) map->insert( "auth", TQString( "auth=APOP" ) ); } diff --git a/korn/subjectsdlg.cpp b/korn/subjectsdlg.cpp index 43e5102dc..5c96cbba5 100644 --- a/korn/subjectsdlg.cpp +++ b/korn/subjectsdlg.cpp @@ -88,7 +88,7 @@ KornSubjectsDlg::KornSubjectsDlg( TQWidget *parent ) _list->addColumn(i18n("Date")); _list->addColumn(i18n("Size (Bytes)")); - // column 3 contains a number (change tqalignment) + // column 3 contains a number (change alignment) _list->setColumnAlignment(3, TQt::AlignRight); _list->setItemMargin(3); @@ -204,7 +204,7 @@ void KornSubjectsDlg::showMessage(TQListViewItem * item ) void KornSubjectsDlg::showSubjectsDlg( const TQString& name ) { - setCaption( i18n("Mails in Box: %1").tqarg( name ) ); + setCaption( i18n("Mails in Box: %1").arg( name ) ); // load the subjects reloadSubjects(); diff --git a/kresources/birthdays/resourcekabc.cpp b/kresources/birthdays/resourcekabc.cpp index fde979ed5..7102c8be4 100644 --- a/kresources/birthdays/resourcekabc.cpp +++ b/kresources/birthdays/resourcekabc.cpp @@ -169,7 +169,7 @@ bool ResourceKABC::doLoad() email_1 = (*it).fullEmail(); uid_1 = (*it).uid(); if (name_1.isEmpty()) name_1 = (*it).realName(); - summary = i18n("%1's birthday").tqarg( name_1 ); + summary = i18n("%1's birthday").arg( name_1 ); Event *ev = new Event(); @@ -276,10 +276,10 @@ bool ResourceKABC::doLoad() name_2 = spouse.realName(); } summary = i18n("insert names of both spouses", - "%1's & %2's anniversary").tqarg( name_1 ).tqarg( name_2 ); + "%1's & %2's anniversary").arg( name_1 ).arg( name_2 ); } else { summary = i18n("only one spouse in addressbook, insert the name", - "%1's anniversary").tqarg( name_1 ); + "%1's anniversary").arg( name_1 ); } Event *ev = new Event(); diff --git a/kresources/blogging/xmlrpcjob.cpp b/kresources/blogging/xmlrpcjob.cpp index ae2b1b802..19582ec35 100644 --- a/kresources/blogging/xmlrpcjob.cpp +++ b/kresources/blogging/xmlrpcjob.cpp @@ -171,14 +171,14 @@ kdDebug() << m_str_response << endl; // TODO: Set the error of the job m_response.clear(); m_response << TQVariant( i18n( "Unknown type of XML markup received. " - "Markup: \n %1" ).tqarg( m_str_response ) ); + "Markup: \n %1" ).arg( m_str_response ) ); m_responseType = XMLRPCUnknownResponse; } } else { // TODO: if we can't parse the XML response, set the correct error message! // emit fault( -1, i18n( "Received invalid XML markup: %1 at %2:%3" ) -// .tqarg( errMsg ).tqarg( errLine ).tqarg( errCol ), m_id ); +// .arg( errMsg ).arg( errLine ).arg( errCol ), m_id ); } TransferJob::slotFinished(); diff --git a/kresources/caldav/job.cpp b/kresources/caldav/job.cpp index c79ef06ac..8e49041f6 100644 --- a/kresources/caldav/job.cpp +++ b/kresources/caldav/job.cpp @@ -82,7 +82,7 @@ void CalDavJob::processError(const caldav_error* err) { if (-401 == code) { // unauthorized error_string = i18n("Unauthorized. Username or password incorrect."); } else if (-599 <= code && code <= -300) { - error_string = i18n("HTTP error %1. Please ensure that the URL is a valid CalDAV resource.").tqarg(-code); + error_string = i18n("HTTP error %1. Please ensure that the URL is a valid CalDAV resource.").arg(-code); } else { error_string = err->str; } @@ -98,7 +98,7 @@ void CalDavJob::processTasksError(const caldav_error* err) { if (-401 == code) { // unauthorized error_string = i18n("Unauthorized. Username or password incorrect."); } else if (-599 <= code && code <= -300) { - error_string = i18n("HTTP error %1. Please ensure that the URL is a valid CalDAV resource.").tqarg(-code); + error_string = i18n("HTTP error %1. Please ensure that the URL is a valid CalDAV resource.").arg(-code); } else { error_string = err->str; } @@ -114,7 +114,7 @@ void CalDavJob::processJournalsError(const caldav_error* err) { if (-401 == code) { // unauthorized error_string = i18n("Unauthorized. Username or password incorrect."); } else if (-599 <= code && code <= -300) { - error_string = i18n("HTTP error %1. Please ensure that the URL is a valid CalDAV resource.").tqarg(-code); + error_string = i18n("HTTP error %1. Please ensure that the URL is a valid CalDAV resource.").arg(-code); } else { error_string = err->str; } diff --git a/kresources/caldav/resource.cpp b/kresources/caldav/resource.cpp index fc5bc75e6..daf7ebdeb 100644 --- a/kresources/caldav/resource.cpp +++ b/kresources/caldav/resource.cpp @@ -147,7 +147,7 @@ bool ResourceCalDav::doLoad() { return true; // Silently fail; the user has obviously not responded to a dialog and we don't need to pop up more of them! } - log(TQString("doLoad(%1)").tqarg(syncCache)); + log(TQString("doLoad(%1)").arg(syncCache)); clearCache(); @@ -168,7 +168,7 @@ bool ResourceCalDav::doLoad() { bool ResourceCalDav::doSave() { bool syncCache = true; - log(TQString("doSave(%1)").tqarg(syncCache)); + log(TQString("doSave(%1)").arg(syncCache)); if (!hasChanges()) { log("no changes"); @@ -378,7 +378,7 @@ void ResourceCalDav::loadFinished() { TQCString newpass; if (KPasswordDialog::getPassword (newpass, TQString("<b>") + i18n("Remote authorization required") + TQString("</b><p>") + i18n("Please input the password for") + TQString(" ") + mPrefs->getusername(), NULL) != 1) { log("load error: " + loader->errorString() ); - loadError(TQString("[%1] ").tqarg(abs(loader->errorNumber())) + loader->errorString()); + loadError(TQString("[%1] ").arg(abs(loader->errorNumber())) + loader->errorString()); } else { // Set new password and try again @@ -388,12 +388,12 @@ void ResourceCalDav::loadFinished() { } else { log("load error: " + loader->errorString() ); - loadError(TQString("[%1] ").tqarg(abs(loader->errorNumber())) + loader->errorString()); + loadError(TQString("[%1] ").arg(abs(loader->errorNumber())) + loader->errorString()); } } else { log("load error: " + loader->errorString() ); - loadError(TQString("[%1] ").tqarg(abs(loader->errorNumber())) + loader->errorString()); + loadError(TQString("[%1] ").arg(abs(loader->errorNumber())) + loader->errorString()); } } else { log("successful event load"); @@ -426,7 +426,7 @@ void ResourceCalDav::loadFinished() { // TQCString newpass; // if (KPasswordDialog::getPassword (newpass, TQString("<b>") + i18n("Remote authorization required") + TQString("</b><p>") + i18n("Please input the password for") + TQString(" ") + mPrefs->getusername(), NULL) != 1) { // log("load error: " + loader->tasksErrorString() ); -// loadError(TQString("[%1] ").tqarg(abs(loader->tasksErrorNumber())) + loader->tasksErrorString()); +// loadError(TQString("[%1] ").arg(abs(loader->tasksErrorNumber())) + loader->tasksErrorString()); // } // else { // // Set new password and try again @@ -436,12 +436,12 @@ void ResourceCalDav::loadFinished() { } else { log("load error: " + loader->tasksErrorString() ); - loadError(TQString("[%1] ").tqarg(abs(loader->tasksErrorNumber())) + loader->tasksErrorString()); + loadError(TQString("[%1] ").arg(abs(loader->tasksErrorNumber())) + loader->tasksErrorString()); } } else { log("load error: " + loader->tasksErrorString() ); - loadError(TQString("[%1] ").tqarg(abs(loader->tasksErrorNumber())) + loader->tasksErrorString()); + loadError(TQString("[%1] ").arg(abs(loader->tasksErrorNumber())) + loader->tasksErrorString()); } } else { log("successful tasks load"); @@ -474,7 +474,7 @@ void ResourceCalDav::loadFinished() { // TQCString newpass; // if (KPasswordDialog::getPassword (newpass, TQString("<b>") + i18n("Remote authorization required") + TQString("</b><p>") + i18n("Please input the password for") + TQString(" ") + mPrefs->getusername(), NULL) != 1) { // log("load error: " + loader->journalsErrorString() ); -// loadError(TQString("[%1] ").tqarg(abs(loader->journalsErrorNumber())) + loader->journalsErrorString()); +// loadError(TQString("[%1] ").arg(abs(loader->journalsErrorNumber())) + loader->journalsErrorString()); // } // else { // // Set new password and try again @@ -484,12 +484,12 @@ void ResourceCalDav::loadFinished() { } else { log("load error: " + loader->journalsErrorString() ); - loadError(TQString("[%1] ").tqarg(abs(loader->journalsErrorNumber())) + loader->journalsErrorString()); + loadError(TQString("[%1] ").arg(abs(loader->journalsErrorNumber())) + loader->journalsErrorString()); } } else { log("load error: " + loader->journalsErrorString() ); - loadError(TQString("[%1] ").tqarg(abs(loader->journalsErrorNumber())) + loader->journalsErrorString()); + loadError(TQString("[%1] ").arg(abs(loader->journalsErrorNumber())) + loader->journalsErrorString()); } } else { log("successful journals load"); @@ -971,7 +971,7 @@ void ResourceCalDav::writingFinished() { TQCString newpass; if (KPasswordDialog::getPassword (newpass, TQString("<b>") + i18n("Remote authorization required") + TQString("</b><p>") + i18n("Please input the password for") + TQString(" ") + mPrefs->getusername(), NULL) != 1) { log("write error: " + mWriter->errorString()); - saveError(TQString("[%1] ").tqarg(abs(mWriter->errorNumber())) + mWriter->errorString()); + saveError(TQString("[%1] ").arg(abs(mWriter->errorNumber())) + mWriter->errorString()); } else { // Set new password and try again @@ -981,12 +981,12 @@ void ResourceCalDav::writingFinished() { } else { log("write error: " + mWriter->errorString()); - saveError(TQString("[%1] ").tqarg(abs(mWriter->errorNumber())) + mWriter->errorString()); + saveError(TQString("[%1] ").arg(abs(mWriter->errorNumber())) + mWriter->errorString()); } } else { log("write error: " + mWriter->errorString()); - saveError(TQString("[%1] ").tqarg(abs(mWriter->errorNumber())) + mWriter->errorString()); + saveError(TQString("[%1] ").arg(abs(mWriter->errorNumber())) + mWriter->errorString()); } } else { log("success"); diff --git a/kresources/carddav/job.cpp b/kresources/carddav/job.cpp index a842b00a4..994964afb 100644 --- a/kresources/carddav/job.cpp +++ b/kresources/carddav/job.cpp @@ -69,7 +69,7 @@ void CardDavJob::processError(const carddav_error* err) { if (-401 == code) { // unauthorized error_string = i18n("Unauthorized. Username or password incorrect."); } else if (-599 <= code && code <= -300) { - error_string = i18n("HTTP error %1. Maybe, URL is not a CardDAV resource.").tqarg(-code); + error_string = i18n("HTTP error %1. Maybe, URL is not a CardDAV resource.").arg(-code); } else { error_string = err->str; } diff --git a/kresources/carddav/resource.cpp b/kresources/carddav/resource.cpp index 2648ca7a6..a708eef02 100644 --- a/kresources/carddav/resource.cpp +++ b/kresources/carddav/resource.cpp @@ -144,7 +144,7 @@ bool ResourceCardDav::load() { return true; // Silently fail; the user has obviously not responded to a dialog and we don't need to pop up more of them! } - log(TQString("doLoad(%1)").tqarg(syncCache)); + log(TQString("doLoad(%1)").arg(syncCache)); // FIXME KABC //clearCache(); @@ -166,7 +166,7 @@ bool ResourceCardDav::load() { bool ResourceCardDav::doSave() { bool syncCache = true; - log(TQString("doSave(%1)").tqarg(syncCache)); + log(TQString("doSave(%1)").arg(syncCache)); if (!hasChanges()) { log("no changes"); @@ -372,7 +372,7 @@ void ResourceCardDav::loadFinished() { TQCString newpass; if (KPasswordDialog::getPassword (newpass, TQString("<b>") + i18n("Remote authorization required") + TQString("</b><p>") + i18n("Please input the password for") + TQString(" ") + mPrefs->getusername(), NULL) != 1) { log("load error: " + loader->errorString() ); - addressBook()->error(TQString("[%1] ").tqarg(abs(loader->errorNumber())) + loader->errorString()); + addressBook()->error(TQString("[%1] ").arg(abs(loader->errorNumber())) + loader->errorString()); } else { // Set new password and try again @@ -382,12 +382,12 @@ void ResourceCardDav::loadFinished() { } else { log("load error: " + loader->errorString() ); - addressBook()->error(TQString("[%1] ").tqarg(abs(loader->errorNumber())) + loader->errorString()); + addressBook()->error(TQString("[%1] ").arg(abs(loader->errorNumber())) + loader->errorString()); } } else { log("load error: " + loader->errorString() ); - addressBook()->error(TQString("[%1] ").tqarg(abs(loader->errorNumber())) + loader->errorString()); + addressBook()->error(TQString("[%1] ").arg(abs(loader->errorNumber())) + loader->errorString()); } } else { log("successful load"); @@ -641,7 +641,7 @@ void ResourceCardDav::writingFinished() { TQCString newpass; if (KPasswordDialog::getPassword (newpass, TQString("<b>") + i18n("Remote authorization required") + TQString("</b><p>") + i18n("Please input the password for") + TQString(" ") + mPrefs->getusername(), NULL) != 1) { log("write error: " + mWriter->errorString()); - addressBook()->error(TQString("[%1] ").tqarg(abs(mWriter->errorNumber())) + mWriter->errorString()); + addressBook()->error(TQString("[%1] ").arg(abs(mWriter->errorNumber())) + mWriter->errorString()); } else { // Set new password and try again @@ -651,12 +651,12 @@ void ResourceCardDav::writingFinished() { } else { log("write error: " + mWriter->errorString()); - addressBook()->error(TQString("[%1] ").tqarg(abs(mWriter->errorNumber())) + mWriter->errorString()); + addressBook()->error(TQString("[%1] ").arg(abs(mWriter->errorNumber())) + mWriter->errorString()); } } else { log("write error: " + mWriter->errorString()); - addressBook()->error(TQString("[%1] ").tqarg(abs(mWriter->errorNumber())) + mWriter->errorString()); + addressBook()->error(TQString("[%1] ").arg(abs(mWriter->errorNumber())) + mWriter->errorString()); } } else { log("success"); diff --git a/kresources/egroupware/kabc_resourcexmlrpc.cpp b/kresources/egroupware/kabc_resourcexmlrpc.cpp index 1247975f7..222c4f4f2 100644 --- a/kresources/egroupware/kabc_resourcexmlrpc.cpp +++ b/kresources/egroupware/kabc_resourcexmlrpc.cpp @@ -393,7 +393,7 @@ void ResourceXMLRPC::deleteContactFinished( const TQValueList<TQVariant>&, void ResourceXMLRPC::fault( int error, const TQString &errorMsg, const TQVariant& ) { - TQString msg = i18n( "<qt>Server sent error %1: <b>%2</b></qt>" ).tqarg( error ).tqarg( errorMsg ); + TQString msg = i18n( "<qt>Server sent error %1: <b>%2</b></qt>" ).arg( error ).arg( errorMsg ); if ( addressBook() ) addressBook()->error( msg ); @@ -408,7 +408,7 @@ void ResourceXMLRPC::addContactFault( int, const TQString &errorMsg, mAddrMap.remove( addr.uid() ); TQString msg = i18n( "Unable to add contact %1 to server. (%2)" ); - addressBook()->error( msg.tqarg( addr.formattedName(), errorMsg ) ); + addressBook()->error( msg.arg( addr.formattedName(), errorMsg ) ); } void ResourceXMLRPC::updateContactFault( int, const TQString &errorMsg, @@ -417,7 +417,7 @@ void ResourceXMLRPC::updateContactFault( int, const TQString &errorMsg, KABC::Addressee addr = mAddrMap[ id.toString() ]; TQString msg = i18n( "Unable to update contact %1 on server. (%2)" ); - addressBook()->error( msg.tqarg( addr.formattedName(), errorMsg ) ); + addressBook()->error( msg.arg( addr.formattedName(), errorMsg ) ); } void ResourceXMLRPC::deleteContactFault( int, const TQString &errorMsg, @@ -437,7 +437,7 @@ void ResourceXMLRPC::deleteContactFault( int, const TQString &errorMsg, mAddrMap.insert( addr.uid(), addr ); TQString msg = i18n( "Unable to delete contact %1 from server. (%2)" ); - addressBook()->error( msg.tqarg( addr.formattedName(), errorMsg ) ); + addressBook()->error( msg.arg( addr.formattedName(), errorMsg ) ); } TQString ResourceXMLRPC::addrTypesToTypeStr( int typeMask ) diff --git a/kresources/egroupware/todostatemapper.cpp b/kresources/egroupware/todostatemapper.cpp index 81c517d0c..531b298f5 100644 --- a/kresources/egroupware/todostatemapper.cpp +++ b/kresources/egroupware/todostatemapper.cpp @@ -153,7 +153,7 @@ TQString TodoStateMapper::toRemote( int localState ) else if ( localState == 100 ) return "done"; else - return TQString( "%1%" ).tqarg( localState ); + return TQString( "%1%" ).arg( localState ); } TQString TodoStateMapper::filename() diff --git a/kresources/egroupware/xmlrpciface.cpp b/kresources/egroupware/xmlrpciface.cpp index 09176ae6b..fd12d174d 100644 --- a/kresources/egroupware/xmlrpciface.cpp +++ b/kresources/egroupware/xmlrpciface.cpp @@ -113,7 +113,7 @@ void Query::slotResult( KIO::Job *job ) if ( !doc.setContent( data, false, &errMsg, &errLine, &errCol ) ) { emit fault( -1, i18n( "Received invalid XML markup: %1 at %2:%3" ) - .tqarg( errMsg ).tqarg( errLine ).tqarg( errCol ), m_id ); + .arg( errMsg ).arg( errLine ).arg( errCol ), m_id ); emit finished( this ); return ; } diff --git a/kresources/groupwise/kabc_resourcegroupwise.cpp b/kresources/groupwise/kabc_resourcegroupwise.cpp index 8526f1feb..d14d1a419 100644 --- a/kresources/groupwise/kabc_resourcegroupwise.cpp +++ b/kresources/groupwise/kabc_resourcegroupwise.cpp @@ -287,7 +287,7 @@ bool ResourceGroupwise::asyncLoad() if ( !mProgress ) { mProgress = KPIM::ProgressManager::instance()->createProgressItem( - KPIM::ProgressManager::getUniqueID(), i18n( "Loading GroupWise resource %1" ).tqarg( resourceName() ), TQString(), true /*CanBeCancelled*/, mPrefs->url().startsWith("https" ) ); + KPIM::ProgressManager::getUniqueID(), i18n( "Loading GroupWise resource %1" ).arg( resourceName() ), TQString(), true /*CanBeCancelled*/, mPrefs->url().startsWith("https" ) ); connect( mProgress, TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), TQT_SLOT( cancelLoad() ) ); } @@ -708,7 +708,7 @@ KURL ResourceGroupwise::createAccessUrl( BookType bookType, AccessMode mode, uns if ( mode == Update && lastSequenceNumber > 0 && lastPORebuildTime > 0 ) { - query += TQString::fromLatin1( "&update=true&lastSeqNo=%1&PORebuildTime=%2" ).tqarg( lastSequenceNumber ).tqarg( lastPORebuildTime );; + query += TQString::fromLatin1( "&update=true&lastSeqNo=%1&PORebuildTime=%2" ).arg( lastSequenceNumber ).arg( lastPORebuildTime );; } url.setQuery( query ); return url; diff --git a/kresources/groupwise/kioslave/groupwise.cpp b/kresources/groupwise/kioslave/groupwise.cpp index 7e9324b23..e257ba71e 100644 --- a/kresources/groupwise/kioslave/groupwise.cpp +++ b/kresources/groupwise/kioslave/groupwise.cpp @@ -117,7 +117,7 @@ void Groupwise::get( const KURL &url ) getAddressbook( url ); } else { TQString error = i18n("Unknown path. Known paths are '/freebusy/', " - "'/calendar/' and '/addressbook/'.") + TQString(" path was %1" ).tqarg( url.url() ); + "'/calendar/' and '/addressbook/'.") + TQString(" path was %1" ).arg( url.url() ); errorMessage( error ); } @@ -419,7 +419,7 @@ void Groupwise::slotReadAddressBookProcessedSize( int size ) void Groupwise::slotServerErrorMessage( const TQString & serverErrorMessage, bool fatal ) { kdDebug() << "Groupwise::slotJobErrorMessage()" << serverErrorMessage << ( fatal ? ", FATAL!" : ", proceeding" ) << endl; - errorMessage( i18n( "An error occurred while communicating with the GroupWise server:\n%1" ).tqarg( serverErrorMessage ) ); + errorMessage( i18n( "An error occurred while communicating with the GroupWise server:\n%1" ).arg( serverErrorMessage ) ); } #include "groupwise.moc" diff --git a/kresources/groupwise/soap/contactconverter.cpp b/kresources/groupwise/soap/contactconverter.cpp index 34c934fe5..69c4b90f2 100644 --- a/kresources/groupwise/soap/contactconverter.cpp +++ b/kresources/groupwise/soap/contactconverter.cpp @@ -402,7 +402,7 @@ KABC::Addressee ContactConverter::convertFromContact( ngwt__Contact* contact ) // TODO: map protocol to KDE's set of known protocol names (need to know the set of services in use elsewhere) if ( protocol == "nov" ) protocol = "groupwise"; - addr.insertCustom( TQString::fromLatin1("messaging/%1").tqarg( protocol ), + addr.insertCustom( TQString::fromLatin1("messaging/%1").arg( protocol ), TQString::fromLatin1( "All" ), addresses.join( TQChar( 0xE000 ) ) ); } diff --git a/kresources/groupwise/soap/groupwiseserver.cpp b/kresources/groupwise/soap/groupwiseserver.cpp index 2b4f9827e..130895cdc 100644 --- a/kresources/groupwise/soap/groupwiseserver.cpp +++ b/kresources/groupwise/soap/groupwiseserver.cpp @@ -132,7 +132,7 @@ int GroupwiseServer::gSoapOpen( struct soap *soap, const char *, errorMessage = TQString::fromLatin1( strerror( errno ) ); perror( 0 ); soap->error = SOAP_TCP_ERROR; - mErrorText = i18n("Connect failed: %1.").tqarg( errorMessage ); + mErrorText = i18n("Connect failed: %1.").arg( errorMessage ); return SOAP_INVALID_SOCKET; } @@ -149,7 +149,7 @@ int GroupwiseServer::gSoapOpen( struct soap *soap, const char *, if ( rc == -3 ) errorMessage = TQString::fromLatin1( "Connection timed out. Check host and port number" ); } - mErrorText = i18n("Connect failed: %1.").tqarg( errorMessage ); + mErrorText = i18n("Connect failed: %1.").arg( errorMessage ); soap->error =SOAP_TCP_ERROR; return SOAP_INVALID_SOCKET; } diff --git a/kresources/groupwise/soap/gwjobs.cpp b/kresources/groupwise/soap/gwjobs.cpp index 24c0c0dc8..47aa67745 100644 --- a/kresources/groupwise/soap/gwjobs.cpp +++ b/kresources/groupwise/soap/gwjobs.cpp @@ -121,7 +121,7 @@ void ReadAddressBooksJob::readAddressBook( std::string &id ) &itemsRequest, &itemsResponse ); if ( result != 0 ) { soap_print_fault( mSoap, stderr ); - mServer->emitErrorMessage( i18n("Unable to read GroupWise address book: %1" ).tqarg( id.c_str() ), false ); + mServer->emitErrorMessage( i18n("Unable to read GroupWise address book: %1" ).arg( id.c_str() ), false ); return; } @@ -613,7 +613,7 @@ void ReadCalendarJob::readCalendarFolder( const std::string &id, ReadItemCounts else { kdDebug() << " readCursor got no Items in Response!" << endl; - mServer->emitErrorMessage( i18n("Unable to read GroupWise address book: reading %1 returned no items." ).tqarg( id.c_str() ), false ); + mServer->emitErrorMessage( i18n("Unable to read GroupWise address book: reading %1 returned no items." ).arg( id.c_str() ), false ); break; } } diff --git a/kresources/groupwise/soap/incidenceconverter.cpp b/kresources/groupwise/soap/incidenceconverter.cpp index 7610e8116..8d21e4da7 100644 --- a/kresources/groupwise/soap/incidenceconverter.cpp +++ b/kresources/groupwise/soap/incidenceconverter.cpp @@ -470,7 +470,7 @@ void IncidenceConverter::setAttendees( KCal::Incidence *incidence, KCal::Attendee::List::ConstIterator it; for( it = attendees.begin(); it != attendees.end(); ++it ) { if ( !to.isEmpty() ) - to += TQString::fromLatin1( "; %1" ).tqarg( (*it)->name() ); + to += TQString::fromLatin1( "; %1" ).arg( (*it)->name() ); kdDebug() << "IncidenceConverter::setAttendees(), adding " << (*it)->fullName() << endl; TQString uuid; @@ -635,7 +635,7 @@ void IncidenceConverter::getAttendees( ngwt__CalendarItem *item, KCal::Incidence // set our status if ( emailsMatch( stringToTQString(recipient->email), mFromEmail ) ) if ( item->status->accepted ) - attendee->seStatus( ( *item->status->accepted ) ? KCal::Attendee::Accepted : KCal::Attendee::NeedsAction ); + attendee->setStatus( ( *item->status->accepted ) ? KCal::Attendee::Accepted : KCal::Attendee::NeedsAction ); else kdDebug() << "---- found ourselves, but not accepted" << endl; else diff --git a/kresources/groupwise/soap/ksslsocket.cpp b/kresources/groupwise/soap/ksslsocket.cpp index 8119e3e7c..e38f00d04 100644 --- a/kresources/groupwise/soap/ksslsocket.cpp +++ b/kresources/groupwise/soap/ksslsocket.cpp @@ -325,7 +325,7 @@ int KSSLSocket::verifyCertificate() "does not match the one the " "certificate was issued to."); result = messageBox( KIO::SlaveBase::WarningYesNoCancel, - msg.tqarg(ourHost), + msg.arg(ourHost), i18n("Server Authentication"), i18n("&Details"), KStdGuiItem::cont().text() ); @@ -335,7 +335,7 @@ int KSSLSocket::verifyCertificate() TQString msg = i18n("The server certificate failed the " "authenticity test (%1)."); result = messageBox( KIO::SlaveBase::WarningYesNoCancel, - msg.tqarg(ourHost), + msg.arg(ourHost), i18n("Server Authentication"), i18n("&Details"), KStdGuiItem::cont().text() ); diff --git a/kresources/groupwise/soap/soapC.cpp b/kresources/groupwise/soap/soapC.cpp index 658040e41..13f91309b 100644 --- a/kresources/groupwise/soap/soapC.cpp +++ b/kresources/groupwise/soap/soapC.cpp @@ -11148,7 +11148,7 @@ static const struct soap_code_map soap_codes_ngwt__VersionEventType[] = { (long)created, "created" }, { (long)deleteVersion, "deleteVersion" }, { (long)endAccess, "endAccess" }, - { (long)reseStatus, "reseStatus" }, + { (long)resetStatus, "resetStatus" }, { (long)restore, "restore" }, { (long)retrieve, "retrieve" }, { (long)securityModified, "securityModified" }, diff --git a/kresources/groupwise/soap/soapStub.h b/kresources/groupwise/soap/soapStub.h index 7fdb0f68c..f41b9f7a7 100644 --- a/kresources/groupwise/soap/soapStub.h +++ b/kresources/groupwise/soap/soapStub.h @@ -241,7 +241,7 @@ enum ngwt__StatusTrackingOptions {None = 0, Delivered = 1, DeliveredAndOpened = #ifndef SOAP_TYPE_ngwt__VersionEventType #define SOAP_TYPE_ngwt__VersionEventType (384) /* ngwt:VersionEventType */ -enum ngwt__VersionEventType {archive_ = 0, checkIn = 1, checkOut = 2, copyIn = 3, copyOut = 4, copyVersion = 5, created = 6, deleteVersion = 7, endAccess = 8, reseStatus = 9, restore = 10, retrieve = 11, securityModified = 12, versionDownloaded = 13, viewed = 14, unknown = 15}; +enum ngwt__VersionEventType {archive_ = 0, checkIn = 1, checkOut = 2, copyIn = 3, copyOut = 4, copyVersion = 5, created = 6, deleteVersion = 7, endAccess = 8, resetStatus = 9, restore = 10, retrieve = 11, securityModified = 12, versionDownloaded = 13, viewed = 14, unknown = 15}; #endif #ifndef SOAP_TYPE_ngwt__VersionStatus diff --git a/kresources/groupwise/soap/stdsoap2.h b/kresources/groupwise/soap/stdsoap2.h index 7dee722a1..4ff4725a7 100644 --- a/kresources/groupwise/soap/stdsoap2.h +++ b/kresources/groupwise/soap/stdsoap2.h @@ -1350,8 +1350,8 @@ struct soap std::ostream *os; std::istream *is; #else - void *os; /* preserve tqalignment */ - void *is; /* preserve tqalignment */ + void *os; /* preserve alignment */ + void *is; /* preserve alignment */ #endif #ifndef UNDER_CE int sendfd; diff --git a/kresources/kolab/kabc/contact.cpp b/kresources/kolab/kabc/contact.cpp index 3bb0054ed..796099025 100644 --- a/kresources/kolab/kabc/contact.cpp +++ b/kresources/kolab/kabc/contact.cpp @@ -293,12 +293,12 @@ TQDate Contact::anniversary() const return mAnniversary; } -void Contact::setChildren( const TQString& tqchildren ) +void Contact::setChildren( const TQString& children ) { - mChildren = tqchildren; + mChildren = children; } -TQString Contact::tqchildren() const +TQString Contact::children() const { return mChildren; } @@ -619,7 +619,7 @@ bool Contact::loadAttribute( TQDomElement& element ) } break; case 'c': - if ( tagName == "tqchildren" ) { + if ( tagName == "children" ) { setChildren( element.text() ); return true; } @@ -798,7 +798,7 @@ bool Contact::saveAttributes( TQDomElement& element ) const writeString( element, "x-logo", mLogoAttachmentName ); if ( !sound().isNull() ) writeString( element, "x-sound", mSoundAttachmentName ); - writeString( element, "tqchildren", tqchildren() ); + writeString( element, "children", children() ); writeString( element, "gender", gender() ); writeString( element, "language", language() ); savePhoneAttributes( element ); @@ -1146,7 +1146,7 @@ void Contact::setFields( const KABC::Addressee* addressee ) // mailer, timezone, productId, sortString, agent, rfc2426 name() // Things KAddressBook can't handle, so they are saved as unhandled tags: - // initials, tqchildren, gender, language + // initials, children, gender, language } // The loading is: xml -> Contact -> addressee, this is the second part diff --git a/kresources/kolab/kabc/contact.h b/kresources/kolab/kabc/contact.h index 60c399335..6e0de80bc 100644 --- a/kresources/kolab/kabc/contact.h +++ b/kresources/kolab/kabc/contact.h @@ -154,8 +154,8 @@ public: TQString soundAttachmentName() const { return mSoundAttachmentName; } TQByteArray sound() const { return mSound; } - void setChildren( const TQString& tqchildren ); - TQString tqchildren() const; + void setChildren( const TQString& children ); + TQString children() const; void setGender( const TQString& gender ); TQString gender() const; diff --git a/kresources/kolab/kcal/incidence.cpp b/kresources/kolab/kcal/incidence.cpp index 9155ad43c..2617da4a1 100644 --- a/kresources/kolab/kcal/incidence.cpp +++ b/kresources/kolab/kcal/incidence.cpp @@ -1030,7 +1030,7 @@ void Incidence::loadAttachments() TQString Incidence::productID() const { - return TQString( "KOrganizer %1, Kolab resource" ).tqarg( korgVersion ); + return TQString( "KOrganizer %1, Kolab resource" ).arg( korgVersion ); } // Unhandled KCal::Incidence fields: diff --git a/kresources/kolab/kcal/resourcekolab.cpp b/kresources/kolab/kcal/resourcekolab.cpp index 8fa16eea3..edd94303c 100644 --- a/kresources/kolab/kcal/resourcekolab.cpp +++ b/kresources/kolab/kcal/resourcekolab.cpp @@ -423,7 +423,7 @@ void ResourceKolab::resolveConflict( KCal::Incidence* inc, const TQString& subre addedIncidence = inc; } else if ( result == 0 ) { // take both addedIncidence = inc; - addedIncidence->setSummary( i18n("Copy of: %1").tqarg( addedIncidence->summary() ) ); + addedIncidence->setSummary( i18n("Copy of: %1").arg( addedIncidence->summary() ) ); addedIncidence->setUid( CalFormat::createUniqueId() ); localIncidence = local; } @@ -604,24 +604,24 @@ bool ResourceKolab::addIncidence( KCal::Incidence* incidence, const TQString& _s } text += "<font></b><br>"; if ( !incidence->summary().isEmpty() ) - text += i18n( "<b>Summary:</b> %1" ).tqarg( incidence->summary() ) + "<br>"; + text += i18n( "<b>Summary:</b> %1" ).arg( incidence->summary() ) + "<br>"; if ( !incidence->location().isEmpty() ) - text += i18n( "<b>Location:</b> %1" ).tqarg( incidence->location() ); + text += i18n( "<b>Location:</b> %1" ).arg( incidence->location() ); text += "<br>"; if ( !incidence->doesFloat() ) text += i18n( "<b>Start:</b> %1, %2" ) - .tqarg( incidence->dtStartDateStr(), incidence->dtStartTimeStr() ); + .arg( incidence->dtStartDateStr(), incidence->dtStartTimeStr() ); else - text += i18n( "<b>Start:</b> %1" ).tqarg( incidence->dtStartDateStr() ); + text += i18n( "<b>Start:</b> %1" ).arg( incidence->dtStartDateStr() ); text += "<br>"; if ( incidence->type() == "Event" ) { Event* event = static_cast<Event*>( incidence ); if ( event->hasEndDate() ) { if ( !event->doesFloat() ) { text += i18n( "<b>End:</b> %1, %2" ) - .tqarg( event->dtEndDateStr(), event->dtEndTimeStr() ); + .arg( event->dtEndDateStr(), event->dtEndTimeStr() ); } else { - text += i18n( "<b>End:</b> %1" ).tqarg( event->dtEndDateStr() ); + text += i18n( "<b>End:</b> %1" ).arg( event->dtEndDateStr() ); } } text += "<br>"; diff --git a/kresources/kolab/kcal/task.cpp b/kresources/kolab/kcal/task.cpp index 488daf4af..ccbb03e58 100644 --- a/kresources/kolab/kcal/task.cpp +++ b/kresources/kolab/kcal/task.cpp @@ -126,7 +126,7 @@ int Task::percentCompleted() const return mPercentCompleted; } -void Task::seStatus( KCal::Incidence::Status status ) +void Task::setStatus( KCal::Incidence::Status status ) { mStatus = status; } @@ -234,17 +234,17 @@ bool Task::loadAttribute( TQDomElement& element ) setPercentCompleted( percent ); } else if ( tagName == "status" ) { if ( element.text() == "in-progress" ) - seStatus( KCal::Incidence::StatusInProcess ); + setStatus( KCal::Incidence::StatusInProcess ); else if ( element.text() == "completed" ) - seStatus( KCal::Incidence::StatusCompleted ); + setStatus( KCal::Incidence::StatusCompleted ); else if ( element.text() == "waiting-on-someone-else" ) - seStatus( KCal::Incidence::StatusNeedsAction ); + setStatus( KCal::Incidence::StatusNeedsAction ); else if ( element.text() == "deferred" ) // Guessing a status here - seStatus( KCal::Incidence::StatusCanceled ); + setStatus( KCal::Incidence::StatusCanceled ); else // Default - seStatus( KCal::Incidence::StatusNone ); + setStatus( KCal::Incidence::StatusNone ); } else if ( tagName == "due-date" ) { setDueDate( element.text() ); } else if ( tagName == "parent" ) { @@ -374,7 +374,7 @@ void Task::setFields( const KCal::Todo* task ) setPriority( task->priority() ); setPercentCompleted( task->percentComplete() ); - seStatus( task->status() ); + setStatus( task->status() ); setHasStartDate( task->hasStartDate() ); if ( task->hasDueDate() ) { @@ -447,7 +447,7 @@ void Task::saveTo( KCal::Todo* task ) task->setPriority( priority() ); task->setPercentComplete( percentCompleted() ); - task->seStatus( status() ); + task->setStatus( status() ); task->setHasStartDate( hasStartDate() ); task->setHasDueDate( hasDueDate() ); if ( hasDueDate() ) diff --git a/kresources/kolab/kcal/task.h b/kresources/kolab/kcal/task.h index 981c56ab7..38a12a70e 100644 --- a/kresources/kolab/kcal/task.h +++ b/kresources/kolab/kcal/task.h @@ -77,7 +77,7 @@ public: virtual void setPercentCompleted( int percent ); virtual int percentCompleted() const; - virtual void seStatus( KCal::Incidence::Status status ); + virtual void setStatus( KCal::Incidence::Status status ); virtual KCal::Incidence::Status status() const; virtual void setParent( const TQString& parentUid ); diff --git a/kresources/kolab/knotes/note.cpp b/kresources/kolab/knotes/note.cpp index ea5f6b285..e456e43be 100644 --- a/kresources/kolab/knotes/note.cpp +++ b/kresources/kolab/knotes/note.cpp @@ -225,5 +225,5 @@ void Note::saveTo( KCal::Journal* journal ) TQString Note::productID() const { - return TQString( "KNotes %1, Kolab resource" ).tqarg( KNOTES_VERSION ); + return TQString( "KNotes %1, Kolab resource" ).arg( KNOTES_VERSION ); } diff --git a/kresources/kolab/shared/resourcekolabbase.cpp b/kresources/kolab/shared/resourcekolabbase.cpp index 1599acaa0..d88c2125e 100644 --- a/kresources/kolab/shared/resourcekolabbase.cpp +++ b/kresources/kolab/shared/resourcekolabbase.cpp @@ -126,8 +126,8 @@ static TQString plainTextBody() " Groupware format.\nFor a list of such email clients please" " visit\n%1" ); const char * url = "http://www.kolab.org/kolab2-clients.html"; - TQString firstPartTextUntranslated = TQString::fromLatin1( firstPartTextToTranslate ).tqarg( url ); - TQString firstPartText = i18n( firstPartTextToTranslate ).tqarg( url ); + TQString firstPartTextUntranslated = TQString::fromLatin1( firstPartTextToTranslate ).arg( url ); + TQString firstPartText = i18n( firstPartTextToTranslate ).arg( url ); if ( firstPartText != firstPartTextUntranslated ) { firstPartText.append("\n\n-----------------------------------------------------\n\n"); firstPartText.append( firstPartTextUntranslated ); @@ -190,7 +190,7 @@ bool ResourceKolabBase::kmailUpdate( const TQString& resource, TQString ResourceKolabBase::configFile( const TQString& type ) const { return locateLocal( "config", - TQString( "kresources/kolab/%1rc" ).tqarg( type ) ); + TQString( "kresources/kolab/%1rc" ).arg( type ) ); } bool ResourceKolabBase::connectToKMail() const diff --git a/kresources/lib/folderlister.cpp b/kresources/lib/folderlister.cpp index eec969c26..affc6af57 100644 --- a/kresources/lib/folderlister.cpp +++ b/kresources/lib/folderlister.cpp @@ -137,7 +137,7 @@ void FolderLister::readConfig( KPIM::GroupwarePrefsBase *newprefs ) for ( int i=0; i<nr; ++i ) { TQStringList l( newprefs->folder( i ) ); -// TQStringList l( cfgg.readListEntry( TQString("Folder%1").tqarg( i ) ) ); +// TQStringList l( cfgg.readListEntry( TQString("Folder%1").arg( i ) ) ); Entry e; if ( l.count()>0 ) { e.id = l.first(); @@ -186,7 +186,7 @@ void FolderLister::writeConfig( GroupwarePrefsBase *newprefs ) lst << (*it).name; lst += contentTypeToStrings( (*it).type ); newprefs->setFolder( nr, lst ); -// cfgg.writeEntry( TQString("Folder%1").tqarg( nr ), lst ); +// cfgg.writeEntry( TQString("Folder%1").arg( nr ), lst ); if ( (*it).active ) active.append( (*it).id ); nr++; } diff --git a/kresources/remote/resourceremote.cpp b/kresources/remote/resourceremote.cpp index 18b8782e1..229dd86bf 100644 --- a/kresources/remote/resourceremote.cpp +++ b/kresources/remote/resourceremote.cpp @@ -330,7 +330,7 @@ void ResourceRemote::dump() const void ResourceRemote::addInfoText( TQString &txt ) const { txt += "<br>"; - txt += i18n("URL: %1").tqarg( mDownloadUrl.prettyURL() ); + txt += i18n("URL: %1").arg( mDownloadUrl.prettyURL() ); } bool ResourceRemote::setValue( const TQString &key, const TQString &value ) diff --git a/kresources/scalix/kabc/contact.cpp b/kresources/scalix/kabc/contact.cpp index 762d4b9fe..9f38674ef 100644 --- a/kresources/scalix/kabc/contact.cpp +++ b/kresources/scalix/kabc/contact.cpp @@ -103,19 +103,19 @@ TQString Contact::toXml( const KABC::Addressee &addr ) comment = addr.formattedName(); display = emails[ i ]; } else { - comment = custom( TQString( "email%1_address_with_comment" ).tqarg( i + 1 ), addr ); - display = custom( TQString( "email%1_display_name" ).tqarg( i + 1 ), addr ); + comment = custom( TQString( "email%1_address_with_comment" ).arg( i + 1 ), addr ); + display = custom( TQString( "email%1_display_name" ).arg( i + 1 ), addr ); } } - xml += TQString( "<email%1_address_type>" ).tqarg( i + 1 ) + type + - TQString( "</email%1_address_type>" ).tqarg( i + 1 ) +"\n"; - xml += TQString( "<email%1_address>" ).tqarg( i + 1 ) + address + - TQString( "</email%1_address>" ).tqarg( i + 1 ) +"\n"; - xml += TQString( "<email%1_address_with_comment>" ).tqarg( i + 1 ) + comment + - TQString( "</email%1_address_with_comment>" ).tqarg( i + 1 ) + "\n"; - xml += TQString( "<email%1_display_name>" ).tqarg( i + 1 ) + display + - TQString( "</email%1_display_name>" ).tqarg( i + 1 ) + "\n"; + xml += TQString( "<email%1_address_type>" ).arg( i + 1 ) + type + + TQString( "</email%1_address_type>" ).arg( i + 1 ) +"\n"; + xml += TQString( "<email%1_address>" ).arg( i + 1 ) + address + + TQString( "</email%1_address>" ).arg( i + 1 ) +"\n"; + xml += TQString( "<email%1_address_with_comment>" ).arg( i + 1 ) + comment + + TQString( "</email%1_address_with_comment>" ).arg( i + 1 ) + "\n"; + xml += TQString( "<email%1_display_name>" ).arg( i + 1 ) + display + + TQString( "</email%1_display_name>" ).arg( i + 1 ) + "\n"; } KABC::PhoneNumber phone = addr.phoneNumber( KABC::PhoneNumber::Home ); diff --git a/kresources/scalix/kcal/resourcescalix.cpp b/kresources/scalix/kcal/resourcescalix.cpp index 21f05f04e..eeebb32f8 100644 --- a/kresources/scalix/kcal/resourcescalix.cpp +++ b/kresources/scalix/kcal/resourcescalix.cpp @@ -325,7 +325,7 @@ void ResourceScalix::resolveConflict( KCal::Incidence* inc, const TQString& subr } else if ( result == 0 ) { // take both localIncidence = local->clone(); localIncidence->recreate(); - localIncidence->setSummary( i18n("Copy of: %1").tqarg(localIncidence->summary()) ); + localIncidence->setSummary( i18n("Copy of: %1").arg(localIncidence->summary()) ); addedIncidence = inc; } bool silent = mSilent; diff --git a/kresources/scalix/kioslave/scalix.cpp b/kresources/scalix/kioslave/scalix.cpp index acfa088e6..c5631f78c 100644 --- a/kresources/scalix/kioslave/scalix.cpp +++ b/kresources/scalix/kioslave/scalix.cpp @@ -104,14 +104,14 @@ void Scalix::retrieveFreeBusy( const KURL &url ) TQByteArray packedArgs; TQDataStream stream( packedArgs, IO_WriteOnly ); - const TQString argument = TQString( "BEGIN:VFREEBUSY\nATTENDEE:MAILTO:%1\nEND:VFREEBUSY" ).tqarg( requestUser ); - const TQString command = TQString( "X-GET-ICAL-FREEBUSY {%1}" ).tqarg( argument.length() ); + const TQString argument = TQString( "BEGIN:VFREEBUSY\nATTENDEE:MAILTO:%1\nEND:VFREEBUSY" ).arg( requestUser ); + const TQString command = TQString( "X-GET-ICAL-FREEBUSY {%1}" ).arg( argument.length() ); stream << (int) 'X' << 'E' << command << argument; - TQString imapUrl = TQString( "imap://%1@%3/" ).tqarg( url.pass().isEmpty() ? + TQString imapUrl = TQString( "imap://%1@%3/" ).arg( url.pass().isEmpty() ? url.user() : url.user() + ":" + url.pass() ) - .tqarg( url.host() ); + .arg( url.host() ); mFreeBusyData = TQString(); @@ -173,13 +173,13 @@ void Scalix::publishFreeBusy( const KURL &url ) TQDataStream stream( packedArgs, IO_WriteOnly ); const TQString argument = TQString::fromUtf8( data ); - const TQString command = TQString( "X-PUT-ICAL-FREEBUSY Calendar {%1}" ).tqarg( argument.length() ); + const TQString command = TQString( "X-PUT-ICAL-FREEBUSY Calendar {%1}" ).arg( argument.length() ); stream << (int) 'X' << 'E' << command << argument; - TQString imapUrl = TQString( "imap://%1@%3/" ).tqarg( url.pass().isEmpty() ? + TQString imapUrl = TQString( "imap://%1@%3/" ).arg( url.pass().isEmpty() ? url.user() : url.user() + ":" + url.pass() ) - .tqarg( url.host() ); + .arg( url.host() ); KIO::SimpleJob *job = KIO::special( imapUrl, packedArgs, false ); connect( job, TQT_SIGNAL( result( KIO::Job* ) ), diff --git a/kresources/scalix/scalixadmin/jobs.cpp b/kresources/scalix/scalixadmin/jobs.cpp index 2d6823918..f1bce9f2c 100644 --- a/kresources/scalix/scalixadmin/jobs.cpp +++ b/kresources/scalix/scalixadmin/jobs.cpp @@ -73,7 +73,7 @@ SetPasswordJob* Scalix::setPassword( KIO::Slave* slave, const KURL& url, TQByteArray packedArgs; TQDataStream stream( packedArgs, IO_WriteOnly ); stream << (int)'X' << (int)'N' - << TQString( "X-SCALIX-PASSWORD" ) << TQString( "%1 %2" ).tqarg( oldPassword ).tqarg( newPassword ); + << TQString( "X-SCALIX-PASSWORD" ) << TQString( "%1 %2" ).arg( oldPassword ).arg( newPassword ); SetPasswordJob* job = new SetPasswordJob( url, packedArgs, false ); KIO::Scheduler::assignJobToSlave( slave, job ); @@ -95,7 +95,7 @@ SetDelegateJob* Scalix::setDelegate( KIO::Slave* slave, const KURL& url, const T TQByteArray packedArgs; TQDataStream stream( packedArgs, IO_WriteOnly ); stream << (int)'X' << (int)'N' - << TQString( "X-SET-DELEGATE" ) << TQString( "%1 %2" ).tqarg( email ).tqarg( types.join( " " ) ); + << TQString( "X-SET-DELEGATE" ) << TQString( "%1 %2" ).arg( email ).arg( types.join( " " ) ); SetDelegateJob* job = new SetDelegateJob( url, packedArgs, false ); KIO::Scheduler::assignJobToSlave( slave, job ); @@ -164,9 +164,9 @@ GetOtherUsersJob* Scalix::getOtherUsers( KIO::Slave* slave, const KURL& url ) SetOutOfOfficeJob* Scalix::setOutOfOffice( KIO::Slave* slave, const KURL& url, bool enabled, const TQString& msg ) { const TQString argument = msg; - const TQString command = TQString( "X-SET-OUT-OF-OFFICE %1 %2 {%3}" ).tqarg( enabled ? "ENABLED" : "DISABLED" ) - .tqarg( "UTF-8" ) - .tqarg( msg.utf8().length() ); + const TQString command = TQString( "X-SET-OUT-OF-OFFICE %1 %2 {%3}" ).arg( enabled ? "ENABLED" : "DISABLED" ) + .arg( "UTF-8" ) + .arg( msg.utf8().length() ); TQByteArray packedArgs; TQDataStream stream( packedArgs, IO_WriteOnly ); diff --git a/kresources/scalix/scalixadmin/ldapview.cpp b/kresources/scalix/scalixadmin/ldapview.cpp index b52c0aad9..adf2fe3fa 100644 --- a/kresources/scalix/scalixadmin/ldapview.cpp +++ b/kresources/scalix/scalixadmin/ldapview.cpp @@ -85,8 +85,8 @@ void LdapView::setQuery( const TQString &query ) void LdapView::entryAdded( const KABC::LdapObject &obj ) { - const TQString text = TQString( "%1 (%2)" ).tqarg( TQString(obj.attrs[ "surname" ].first()) ) - .tqarg( TQString(obj.attrs[ "mail" ].first()) ); + const TQString text = TQString( "%1 (%2)" ).arg( TQString(obj.attrs[ "surname" ].first()) ) + .arg( TQString(obj.attrs[ "mail" ].first()) ); new LdapItem( this, text, obj.attrs[ "mail" ].first() ); } diff --git a/kresources/scalix/scalixadmin/passwordpage.cpp b/kresources/scalix/scalixadmin/passwordpage.cpp index 51b11f6ff..e75d3fdd2 100644 --- a/kresources/scalix/scalixadmin/passwordpage.cpp +++ b/kresources/scalix/scalixadmin/passwordpage.cpp @@ -179,7 +179,7 @@ void PasswordPage::finished( KIO::Job* job ) group.writeEntry( "pass", KStringHandler::obscure( newPassword ) ); } - KConfigGroup fileGroup( &config, TQString( "Folder-%1" ).tqarg( group.readNumEntry( "Folder" ) ) ); + KConfigGroup fileGroup( &config, TQString( "Folder-%1" ).arg( group.readNumEntry( "Folder" ) ) ); fileGroup.writeEntry( "pass", KStringHandler::obscure( newPassword ) ); } } diff --git a/kresources/scalix/scalixadmin/settings.cpp b/kresources/scalix/scalixadmin/settings.cpp index d5c5cdb1c..52f72296f 100644 --- a/kresources/scalix/scalixadmin/settings.cpp +++ b/kresources/scalix/scalixadmin/settings.cpp @@ -92,8 +92,8 @@ TQString Settings::rulesWizardUrl() const TQString url = group.readEntry( "rulesWizardUrl" ); if ( url.isEmpty() ) { KConfigGroup group( &config, "Account" ); - url = TQString( "http://%1/Scalix/rw/?username=%2" ).tqarg( group.readEntry( "host" ) ) - .tqarg( group.readEntry( "user" ) ); + url = TQString( "http://%1/Scalix/rw/?username=%2" ).arg( group.readEntry( "host" ) ) + .arg( group.readEntry( "user" ) ); } return url; diff --git a/kresources/scalix/shared/resourcescalixbase.cpp b/kresources/scalix/shared/resourcescalixbase.cpp index c9bfca350..c9c7ee11d 100644 --- a/kresources/scalix/shared/resourcescalixbase.cpp +++ b/kresources/scalix/shared/resourcescalixbase.cpp @@ -130,7 +130,7 @@ bool ResourceScalixBase::kmailUpdate( const TQString& resource, TQString ResourceScalixBase::configFile( const TQString& type ) const { return locateLocal( "config", - TQString( "kresources/scalix/%1rc" ).tqarg( type ) ); + TQString( "kresources/scalix/%1rc" ).arg( type ) ); } bool ResourceScalixBase::connectToKMail() const diff --git a/kresources/slox/kcalresourceslox.cpp b/kresources/slox/kcalresourceslox.cpp index 39e3be399..0b712b66f 100644 --- a/kresources/slox/kcalresourceslox.cpp +++ b/kresources/slox/kcalresourceslox.cpp @@ -177,7 +177,7 @@ bool KCalResourceSlox::doLoad() TQString p = KURL( mPrefs->url() ).protocol(); if ( p != "http" && p != "https" && p != "webdav" && p != "webdavs" ) { - TQString err = i18n("Non-http protocol: '%1'").tqarg( p ); + TQString err = i18n("Non-http protocol: '%1'").arg( p ); kdDebug() << "KCalResourceSlox::load(): " << err << endl; loadError( err ); return false; @@ -629,11 +629,11 @@ void KCalResourceSlox::parseMembersAttribute( const TQDomElement &e, TQString status = memberElement.attribute( "confirm" ); if ( !status.isEmpty() ) { if ( status == "accept" ) { - a->seStatus( Attendee::Accepted ); + a->setStatus( Attendee::Accepted ); } else if ( status == "decline" ) { - a->seStatus( Attendee::Declined ); + a->setStatus( Attendee::Declined ); } else { - a->seStatus( Attendee::NeedsAction ); + a->setStatus( Attendee::NeedsAction ); } } } else { diff --git a/ktnef/gui/ktnefmain.cpp b/ktnef/gui/ktnefmain.cpp index df9dfa67d..ccb1bb54f 100644 --- a/ktnef/gui/ktnefmain.cpp +++ b/ktnef/gui/ktnefmain.cpp @@ -230,7 +230,7 @@ void KTNEFMain::extractAllFiles() for (;it.current();++it) if (!parser_->extractFileTo(it.current()->name(), dir)) { - TQString msg = i18n( "Unable to extract file \"%1\"" ).tqarg( it.current()->name() ); + TQString msg = i18n( "Unable to extract file \"%1\"" ).arg( it.current()->name() ); TQMessageBox::critical(this,i18n("Error"),msg,TQMessageBox::Ok|TQMessageBox::Default,0); return; } @@ -301,7 +301,7 @@ void KTNEFMain::extractTo(const TQString& dirname) for (;it.current();++it) if (!parser_->extractFileTo(it.current()->name(), dir)) { - TQString msg = i18n("Unable to extract file \"%1\"").tqarg( it.current()->name() ); + TQString msg = i18n("Unable to extract file \"%1\"").arg( it.current()->name() ); TQMessageBox::critical(this,i18n("Error"),msg,TQMessageBox::Ok|TQMessageBox::Default,0); return; } diff --git a/ktnef/gui/qwmf.cpp b/ktnef/gui/qwmf.cpp index 7e5193be2..bc31584c1 100644 --- a/ktnef/gui/qwmf.cpp +++ b/ktnef/gui/qwmf.cpp @@ -762,7 +762,7 @@ void TQWinMetaFile::extTextOut( long num, short* parm ) mPainter.translate( -parm[ 1 ], -parm[ 0 ] ); } - // tqalignment + // alignment if ( mTextAlign & 0x06 ) x -= ( width / 2 ); if ( mTextAlign & 0x08 ) @@ -939,10 +939,10 @@ void TQWinMetaFile::createBrushIndirect( long, short* parm ) Qt::FDiagPattern, /* hatched */ Qt::Dense4Pattern, /* should be custom bitmap pattern */ Qt::HorPattern, /* should be BS_INDEXED (?) */ - Qt::VerPattern, /* should be tqdevice-independent bitmap */ - Qt::Dense6Pattern, /* should be tqdevice-independent packed-bitmap */ + Qt::VerPattern, /* should be device-independent bitmap */ + Qt::Dense6Pattern, /* should be device-independent packed-bitmap */ Qt::Dense2Pattern, /* should be BS_PATTERN8x8 */ - Qt::Dense3Pattern /* should be tqdevice-independent BS_DIBPATTERN8x8 */ + Qt::Dense3Pattern /* should be device-independent BS_DIBPATTERN8x8 */ }; Qt::BrushStyle style; short arg; @@ -994,7 +994,7 @@ void TQWinMetaFile::createPenIndirect( long, short* parm ) handle->pen.setCapStyle( Qt::RoundCap ); //int width = 0; - // TODO : width of pen proportional to tqdevice context width + // TODO : width of pen proportional to device context width // DOESN'T WORK /* TQRect devRec; diff --git a/ktnef/gui/qwmf.h b/ktnef/gui/qwmf.h index 2ac861d77..e61eeabaf 100644 --- a/ktnef/gui/qwmf.h +++ b/ktnef/gui/qwmf.h @@ -60,7 +60,7 @@ public: virtual bool load( TQBuffer &buffer ); /** - * Paint metafile to given paint-tqdevice using absolute or relative coordinate. + * Paint metafile to given paint-device using absolute or relative coordinate. * abosute coord. reset the world transfomation Matrix * relative coord. use the existing world transfomation Matrix * Returns true on success. @@ -124,9 +124,9 @@ public: // should be protected but cannot void setPixel( long num, short* parms ); // Set raster operation mode void setRop( long num, short* parms ); - /* save tqdevice context */ + /* save device context */ void saveDC( long num, short* parms ); - /* restore tqdevice context */ + /* restore device context */ void restoreDC( long num, short* parms ); /* clipping region is the intersection of this region and the original region */ void intersectClipRect( long num, short* parms ); @@ -136,7 +136,7 @@ public: // should be protected but cannot /****************** Text *******************/ /* set text color */ void setTextColor( long num, short* parms ); - /* set text tqalignment */ + /* set text alignment */ void setTextAlign( long num, short* parms ); /* draw text */ void textOut( long num, short* parms ); diff --git a/ktnef/gui/wmfstruct.h b/ktnef/gui/wmfstruct.h index 5e50f022e..33a4a67c2 100644 --- a/ktnef/gui/wmfstruct.h +++ b/ktnef/gui/wmfstruct.h @@ -43,7 +43,7 @@ struct WmfEnhMetaHeader DWORD iType; // Record type EMR_HEADER DWORD nSize; // Record size in bytes. This may be greater // than the sizeof( ENHMETAHEADER ). - RECTL rclBounds; // Inclusive-inclusive bounds in tqdevice units + RECTL rclBounds; // Inclusive-inclusive bounds in device units RECTL rclFrame; // Inclusive-inclusive Picture Frame of metafile // in .01 mm units DWORD dSignature; // Signature. Must be ENHMETA_SIGNATURE. @@ -58,8 +58,8 @@ struct WmfEnhMetaHeader DWORD offDescription; // Offset to the metafile description record. // This is 0 if there is no description string DWORD nPalEntries; // Number of entries in the metafile palette. - SIZEL szlDevice; // Size of the reference tqdevice in pels - SIZEL szlMillimeters; // Size of the reference tqdevice in millimeters + SIZEL szlDevice; // Size of the reference device in pels + SIZEL szlMillimeters; // Size of the reference device in millimeters }; #define ENHMETA_SIGNATURE 0x464D4520 diff --git a/ktnef/ktnef/ktnefparser.h b/ktnef/ktnef/ktnefparser.h index 92c44dc22..fc93391cf 100644 --- a/ktnef/ktnef/ktnefparser.h +++ b/ktnef/ktnef/ktnefparser.h @@ -34,7 +34,7 @@ public: ~KTNEFParser(); bool openFile(const TQString& filename); - bool openDevice( TQIODevice *tqdevice ); + bool openDevice( TQIODevice *device ); bool extractFile(const TQString& filename); bool extractFileTo(const TQString& filename, const TQString& dirname); bool extractAll(); diff --git a/ktnef/lib/ktnefparser.cpp b/ktnef/lib/ktnefparser.cpp index a05e05721..3edd7b6ad 100644 --- a/ktnef/lib/ktnefparser.cpp +++ b/ktnef/lib/ktnefparser.cpp @@ -70,7 +70,7 @@ public: defaultdir_ = "/tmp/"; current_ = 0; deleteDevice_ = false; - tqdevice_ = 0; + device_ = 0; message_ = new KTNEFMessage; } ~ParserPrivate() @@ -79,7 +79,7 @@ public: } TQDataStream stream_; - TQIODevice *tqdevice_; + TQIODevice *device_; bool deleteDevice_; TQString defaultdir_; KTNEFAttach *current_; @@ -105,8 +105,8 @@ KTNEFMessage* KTNEFParser::message() const void KTNEFParser::deleteDevice() { if ( d->deleteDevice_ ) - delete d->tqdevice_; - d->tqdevice_ = 0; + delete d->device_; + d->device_ = 0; d->deleteDevice_ = false; } @@ -124,7 +124,7 @@ bool KTNEFParser::decodeMessage() // read data length d->stream_ >> i2; // offset after reading the value - off = d->tqdevice_->at() + i2; + off = d->device_->at() + i2; switch ( tag ) { case attAIDOWNER: @@ -158,11 +158,11 @@ bool KTNEFParser::decodeMessage() kdDebug() << "Message MAPI Properties" << " (length=" << i2 << ")" << endl; { int nProps = d->message_->properties().count(); - i2 += d->tqdevice_->at(); + i2 += d->device_->at(); readMAPIProperties( d->message_->properties(), 0 ); - d->tqdevice_->at( i2 ); + d->device_->at( i2 ); kdDebug() << "Properties: " << d->message_->properties().count() << endl; - value = TQString( "< %1 properties >" ).tqarg( d->message_->properties().count() - nProps ); + value = TQString( "< %1 properties >" ).arg( d->message_->properties().count() - nProps ); } break; case attTNEFVERSION: @@ -171,7 +171,7 @@ bool KTNEFParser::decodeMessage() break; case attFROM: d->message_->addProperty( 0x0024, MAPI_TYPE_STRING8, readTNEFAddress( d->stream_ ) ); - d->tqdevice_->at( d->tqdevice_->at() - i2 ); + d->device_->at( d->device_->at() - i2 ); value = readTNEFData( d->stream_, i2 ); kdDebug() << "Message From" << " (length=" << i2 << ")" << endl; break; @@ -212,7 +212,7 @@ bool KTNEFParser::decodeMessage() recipTable << formatRecipient( props ); } d->message_->addProperty( 0x0E12, MAPI_TYPE_STRING8, recipTable ); - d->tqdevice_->at( d->tqdevice_->at() - i2 ); + d->device_->at( d->device_->at() - i2 ); value = readTNEFData( d->stream_, i2 ); } kdDebug() << "Message Recipient Table" << " (length=" << i2 << ")" << endl; @@ -242,13 +242,13 @@ bool KTNEFParser::decodeMessage() break; } // skip data - if ( d->tqdevice_->at() != off && !d->tqdevice_->at( off ) ) + if ( d->device_->at() != off && !d->device_->at( off ) ) return false; // get checksum d->stream_ >> u; // add TNEF attribute d->message_->addAttribute( tag, type, value, true ); - //kdDebug() << "stream: " << d->tqdevice_->at() << endl; + //kdDebug() << "stream: " << d->device_->at() << endl; return true; } @@ -273,15 +273,15 @@ bool KTNEFParser::decodeAttachment() break; case attATTACHDATA: d->current_->setSize( i ); - d->current_->setOffset( d->tqdevice_->at() ); - d->tqdevice_->at( d->tqdevice_->at() + i ); - value = TQString( "< size=%1 >" ).tqarg( i ); + d->current_->setOffset( d->device_->at() ); + d->device_->at( d->device_->at() + i ); + value = TQString( "< size=%1 >" ).arg( i ); kdDebug() << "Attachment Data: size=" << i << endl; break; case attATTACHMENT: // try to get attachment info - i += d->tqdevice_->at(); + i += d->device_->at(); readMAPIProperties( d->current_->properties(), d->current_ ); - d->tqdevice_->at( i ); + d->device_->at( i ); d->current_->setIndex( d->current_->property( MAPI_TAG_INDEX ).toUInt() ); d->current_->setDisplaySize( d->current_->property( MAPI_TAG_SIZE ).toUInt() ); str = d->current_->property( MAPI_TAG_DISPLAYNAME ).toString(); @@ -292,7 +292,7 @@ bool KTNEFParser::decodeAttachment() if ( !str.isEmpty() ) d->current_->setMimeTag( str ); d->current_->setExtension( d->current_->property( MAPI_TAG_EXTENSION ).toString() ); - value = TQString( "< %1 properties >" ).tqarg( d->current_->properties().count() ); + value = TQString( "< %1 properties >" ).arg( d->current_->properties().count() ); break; case attATTACHMODDATE: value = readTNEFDate( d->stream_ ); @@ -304,8 +304,8 @@ bool KTNEFParser::decodeAttachment() break; case attATTACHMETAFILE: kdDebug() << "Attachment Metafile: size=" << i << endl; - //value = TQString( "< size=%1 >" ).tqarg( i ); - //d->tqdevice_->at( d->tqdevice_->at()+i ); + //value = TQString( "< size=%1 >" ).arg( i ); + //d->device_->at( d->device_->at()+i ); value = readTNEFData( d->stream_, i ); break; default: @@ -316,7 +316,7 @@ bool KTNEFParser::decodeAttachment() d->stream_ >> u; // u <- checksum // add TNEF attribute d->current_->addAttribute( tag, type, value, true ); - //kdDebug() << "stream: " << d->tqdevice_->at() << endl; + //kdDebug() << "stream: " << d->device_->at() << endl; return true; } @@ -339,19 +339,19 @@ bool KTNEFParser::parseDevice() d->current_ = 0; } - if ( !d->tqdevice_->open( IO_ReadOnly ) ) { - kdDebug() << "Couldn't open tqdevice" << endl; + if ( !d->device_->open( IO_ReadOnly ) ) { + kdDebug() << "Couldn't open device" << endl; return false; } - d->stream_.setDevice( d->tqdevice_ ); + d->stream_.setDevice( d->device_ ); d->stream_.setByteOrder( TQDataStream::LittleEndian ); d->stream_ >> i; if (i == TNEF_SIGNATURE) { d->stream_ >> u; kdDebug().form( "Attachment cross reference key: 0x%04x\n",u ); - //kdDebug() << "stream: " << d->tqdevice_->at() << endl; + //kdDebug() << "stream: " << d->device_->at() << endl; while (!d->stream_.eof()) { d->stream_ >> c; @@ -364,7 +364,7 @@ bool KTNEFParser::parseDevice() if (!decodeAttachment()) goto end; break; default: - kdDebug() << "Unknown Level: " << c << ", at offset " << d->tqdevice_->at() << endl; + kdDebug() << "Unknown Level: " << c << ", at offset " << d->device_->at() << endl; goto end; } } @@ -381,7 +381,7 @@ bool KTNEFParser::parseDevice() else { kdDebug() << "This is not a TNEF file" << endl; -end: d->tqdevice_->close(); +end: d->device_->close(); return false; } } @@ -396,9 +396,9 @@ bool KTNEFParser::extractFile(const TQString& filename) bool KTNEFParser::extractAttachmentTo(KTNEFAttach *att, const TQString& dirname) { TQString filename = dirname + "/" + att->name(); - if (!d->tqdevice_->isOpen()) + if (!d->device_->isOpen()) return false; - if (!d->tqdevice_->at(att->offset())) + if (!d->device_->at(att->offset())) return false; KSaveFile saveFile( filename ); TQFile *outfile = saveFile.file(); @@ -411,7 +411,7 @@ bool KTNEFParser::extractAttachmentTo(KTNEFAttach *att, const TQString& dirname) bool ok(true); while (ok && len > 0) { - n = d->tqdevice_->readBlock(buf,TQMIN(sz,len)); + n = d->device_->readBlock(buf,TQMIN(sz,len)); if (n < 0) ok = false; else @@ -447,15 +447,15 @@ bool KTNEFParser::openFile(const TQString& filename) deleteDevice(); delete d->message_; d->message_ = new KTNEFMessage(); - d->tqdevice_ = TQT_TQIODEVICE(new TQFile( filename )); + d->device_ = TQT_TQIODEVICE(new TQFile( filename )); d->deleteDevice_ = true; return parseDevice(); } -bool KTNEFParser::openDevice( TQIODevice *tqdevice ) +bool KTNEFParser::openDevice( TQIODevice *device ) { deleteDevice(); - d->tqdevice_ = tqdevice; + d->device_ = device; return parseDevice(); } @@ -482,12 +482,12 @@ void KTNEFParser::checkCurrent( int key ) if (!mimetype) return; // FIXME if ( mimetype->name() == "application/octet-stream" && d->current_->size() > 0 ) { - int oldOffset = d->tqdevice_->at(); + int oldOffset = d->device_->at(); TQByteArray buffer( TQMIN( 32, d->current_->size() ) ); - d->tqdevice_->at( d->current_->offset() ); - d->tqdevice_->readBlock( buffer.data(), buffer.size() ); + d->device_->at( d->current_->offset() ); + d->device_->readBlock( buffer.data(), buffer.size() ); mimetype = KMimeType::findByContent( buffer ); - d->tqdevice_->at( oldOffset ); + d->device_->at( oldOffset ); } d->current_->setMimeTag( mimetype->name() ); } @@ -791,20 +791,20 @@ bool KTNEFParser::readMAPIProperties( TQMap<int,KTNEFProperty*>& props, KTNEFAtt TQByteArray data = mapi.value.toByteArray(); int len = data.size(); ALIGN( len, 4 ); - d->tqdevice_->at( d->tqdevice_->at()-len ); + d->device_->at( d->device_->at()-len ); TQ_UINT32 interface_ID; d->stream_ >> interface_ID; if ( interface_ID == MAPI_IID_IMessage ) { // embedded TNEF file attach->unsetDataParser(); - attach->setOffset( d->tqdevice_->at()+12 ); + attach->setOffset( d->device_->at()+12 ); attach->setSize( data.size()-16 ); attach->setMimeTag( "application/ms-tnef" ); attach->setDisplayName( "Embedded Message" ); kdDebug() << "MAPI Embedded Message: size=" << data.size() << endl; } - d->tqdevice_->at( d->tqdevice_->at() + ( len-4 ) ); + d->device_->at( d->device_->at() + ( len-4 ) ); break; } else if ( mapi.type == MAPI_TYPE_BINARY && attach && attach->offset() < 0 ) @@ -813,8 +813,8 @@ bool KTNEFParser::readMAPIProperties( TQMap<int,KTNEFProperty*>& props, KTNEFAtt int len = mapi.value.toByteArray().size(); ALIGN( len, 4 ) attach->setSize( len ); - attach->setOffset( d->tqdevice_->at() - len ); - attach->addAttribute( attATTACHDATA, atpBYTE, TQString( "< size=%1 >" ).tqarg( len ), false ); + attach->setOffset( d->device_->at() - len ); + attach->addAttribute( attATTACHDATA, atpBYTE, TQString( "< size=%1 >" ).arg( len ), false ); } } kdDebug().form( "MAPI data: size=%d\n", mapi.value.toByteArray().size() ); @@ -827,7 +827,7 @@ bool KTNEFParser::readMAPIProperties( TQMap<int,KTNEFProperty*>& props, KTNEFAtt if ( mapi.name.type == 0 ) mapiname = TQString().sprintf( " [name = 0x%04x]", mapi.name.value.toUInt() ); else - mapiname = TQString( " [name = %1]" ).tqarg( mapi.name.value.toString() ); + mapiname = TQString( " [name = %1]" ).arg( mapi.name.value.toString() ); } switch ( mapi.type & 0x0FFF ) { @@ -860,7 +860,7 @@ bool KTNEFParser::readMAPIProperties( TQMap<int,KTNEFProperty*>& props, KTNEFAtt p = new KTNEFProperty( key, ( mapi.type & 0x0FFF ), mapi.value, mapi.name.value ); props[ p->key() ] = p; } - //kdDebug() << "stream: " << d->tqdevice_->at() << endl; + //kdDebug() << "stream: " << d->device_->at() << endl; } if ( foundAttachment && attach ) diff --git a/ktnef/tests/mapi_attach_data_obj.tnef b/ktnef/tests/mapi_attach_data_obj.tnef Binary files differindex 66f7890c3..d1de851a9 100644 --- a/ktnef/tests/mapi_attach_data_obj.tnef +++ b/ktnef/tests/mapi_attach_data_obj.tnef diff --git a/libemailfunctions/networkstatus.cpp b/libemailfunctions/networkstatus.cpp index e5e311f94..25e7cdf1c 100644 --- a/libemailfunctions/networkstatus.cpp +++ b/libemailfunctions/networkstatus.cpp @@ -50,7 +50,7 @@ NetworkStatus::~NetworkStatus() group.writeEntry( "Online", mStatus == Online ); } -void NetworkStatus::seStatus( Status status ) +void NetworkStatus::setStatus( Status status ) { mStatus = status; @@ -69,10 +69,10 @@ void NetworkStatus::onlineStatusChanged() if ( reply.isValid() ) { int status = reply; if ( status == 3 ) - seStatus( Online ); + setStatus( Online ); else { if ( mStatus != Offline ) - seStatus( Offline ); + setStatus( Offline ); } } } diff --git a/libemailfunctions/networkstatus.h b/libemailfunctions/networkstatus.h index 7a8b3c1b2..0aee114e0 100644 --- a/libemailfunctions/networkstatus.h +++ b/libemailfunctions/networkstatus.h @@ -60,7 +60,7 @@ class NetworkStatus : public TQObject, public DCOPObject * * @param status The new status. */ - void seStatus( Status status ); + void setStatus( Status status ); /** * Returns the current status. diff --git a/libkcal/attachmenthandler.cpp b/libkcal/attachmenthandler.cpp index 009c57785..47ba6d1ce 100644 --- a/libkcal/attachmenthandler.cpp +++ b/libkcal/attachmenthandler.cpp @@ -70,7 +70,7 @@ Attachment *AttachmentHandler::find( TQWidget *parent, const TQString &attachmen if ( !a ) { KMessageBox::error( parent, - i18n( "No attachment named \"%1\" found in the incidence." ).tqarg( attachmentName ) ); + i18n( "No attachment named \"%1\" found in the incidence." ).arg( attachmentName ) ); return 0; } @@ -101,7 +101,7 @@ Attachment *AttachmentHandler::find( TQWidget *parent, KMessageBox::error( parent, i18n( "The incidence that owns the attachment named \"%1\" could not be found. " - "Perhaps it was removed from your calendar?" ).tqarg( attachmentName ) ); + "Perhaps it was removed from your calendar?" ).arg( attachmentName ) ); return 0; } diff --git a/libkcal/attendee.cpp b/libkcal/attendee.cpp index d129bc36b..9aa3d46f7 100644 --- a/libkcal/attendee.cpp +++ b/libkcal/attendee.cpp @@ -53,7 +53,7 @@ bool KCal::operator==( const Attendee& a1, const Attendee& a2 ) a1.delegator() == a2.delegator() ); } -void Attendee::seStatus( Attendee::PartStat s ) +void Attendee::setStatus( Attendee::PartStat s ) { mStatus = s; } diff --git a/libkcal/attendee.h b/libkcal/attendee.h index bf29fb485..5a914af2b 100644 --- a/libkcal/attendee.h +++ b/libkcal/attendee.h @@ -96,7 +96,7 @@ class LIBKCAL_EXPORT Attendee : public Person /** Set status. See enum for definitions of possible values. */ - void seStatus( PartStat s ); + void setStatus( PartStat s ); /** Return status. diff --git a/libkcal/calendar.cpp b/libkcal/calendar.cpp index 6fbb39c31..ad5030a15 100644 --- a/libkcal/calendar.cpp +++ b/libkcal/calendar.cpp @@ -474,7 +474,7 @@ bool Calendar::deleteIncidence( Incidence *incidence ) { if ( beginChange( incidence ) ) { if (incidence->hasRecurrenceID()) { - // Delete this event's UID from the parent's list of tqchildren + // Delete this event's UID from the parent's list of children Incidence *parentIncidence; IncidenceList il = incidence->childIncidences(); IncidenceListIterator it; @@ -483,7 +483,7 @@ bool Calendar::deleteIncidence( Incidence *incidence ) parentIncidence->deleteChildIncidence(incidence->uid()); } else { - // Delete all tqchildren as well + // Delete all children as well IncidenceList il = incidence->childIncidences(); IncidenceListIterator it; for ( it = il.begin(); it != il.end(); ++it ) { @@ -861,7 +861,7 @@ void Calendar::setupRelations( Incidence *forincidence ) } else { // Not found, put this in the mOrphans list // Note that the mOrphans dict might have several entries with the same key! That are - // multiple tqchildren that wait for the parent incidence to be inserted. + // multiple children that wait for the parent incidence to be inserted. mOrphans.insert( forincidence->relatedToUid(), forincidence ); mOrphanUids.insert( forincidence->uid(), forincidence ); } diff --git a/libkcal/calendarlocal.cpp b/libkcal/calendarlocal.cpp index f49f527ca..fd7025f76 100644 --- a/libkcal/calendarlocal.cpp +++ b/libkcal/calendarlocal.cpp @@ -229,7 +229,7 @@ bool CalendarLocal::addTodo( Todo *todo ) bool CalendarLocal::deleteTodo( Todo *todo ) { - // Handle orphaned tqchildren + // Handle orphaned children removeRelations( todo ); if ( mTodoList.removeRef( todo ) ) { diff --git a/libkcal/calformat.cpp b/libkcal/calformat.cpp index 5035622b3..e506b8dfe 100644 --- a/libkcal/calformat.cpp +++ b/libkcal/calformat.cpp @@ -70,9 +70,9 @@ TQString CalFormat::createUniqueId() TQTime::currentTime().minute() + TQTime::currentTime().second() + TQTime::currentTime().msec(); TQString uidStr = TQString("%1-%2.%3") - .tqarg(mApplication) - .tqarg(KApplication::random()) - .tqarg(hashTime); + .arg(mApplication) + .arg(KApplication::random()) + .arg(hashTime); return uidStr; } diff --git a/libkcal/confirmsavedialog.cpp b/libkcal/confirmsavedialog.cpp index 298341488..9b7f4d31d 100644 --- a/libkcal/confirmsavedialog.cpp +++ b/libkcal/confirmsavedialog.cpp @@ -40,7 +40,7 @@ ConfirmSaveDialog::ConfirmSaveDialog( const TQString &destination, TQLabel *label = new TQLabel( i18n("You have requested to save the following objects to '%1':") - .tqarg( destination ), topFrame ); + .arg( destination ), topFrame ); topLayout->addWidget( label ); mListView = new KListView( topFrame ); diff --git a/libkcal/convertqtopia.cpp b/libkcal/convertqtopia.cpp index 4af6affa7..0e4b4352c 100644 --- a/libkcal/convertqtopia.cpp +++ b/libkcal/convertqtopia.cpp @@ -105,7 +105,7 @@ int main(int argc,char **argv) } else { bool success = icalendarFormat.save( &cal, outputFile ); if ( !success ) { - std::cerr << i18n( "Error saving to '%1'." ).tqarg( outputFile ).local8Bit() + std::cerr << i18n( "Error saving to '%1'." ).arg( outputFile ).local8Bit() << std::endl; return 1; } diff --git a/libkcal/exceptions.cpp b/libkcal/exceptions.cpp index 0394a4003..99c804ddf 100644 --- a/libkcal/exceptions.cpp +++ b/libkcal/exceptions.cpp @@ -38,7 +38,7 @@ Exception::~Exception() TQString Exception::message() { if ( mMessage.isEmpty() ) { - return i18n( "%1 Error" ).tqarg( CalFormat::application() ); + return i18n( "%1 Error" ).arg( CalFormat::application() ); } else { return mMessage; } diff --git a/libkcal/htmlexport.cpp b/libkcal/htmlexport.cpp index 4bedf8806..de436e0d3 100644 --- a/libkcal/htmlexport.cpp +++ b/libkcal/htmlexport.cpp @@ -147,8 +147,8 @@ void HtmlExport::createMonthView(TQTextStream *ts) while ( start < toDate() ) { // Write header - *ts << "<h2>" << (i18n("month_year","%1 %2").tqarg(KGlobal::locale()->calendar()->monthName(start)) - .tqarg(start.year())) << "</h2>\n"; + *ts << "<h2>" << (i18n("month_year","%1 %2").arg(KGlobal::locale()->calendar()->monthName(start)) + .arg(start.year())) << "</h2>\n"; if ( KGlobal::locale()->weekStartDay() == 1 ) { start = start.addDays(1 - start.dayOfWeek()); } else { @@ -459,7 +459,7 @@ void HtmlExport::createTodo (TQTextStream *ts,Todo *todo) *ts << " <td"; if (completed) *ts << " class=\"done\""; *ts << ">\n"; - *ts << " " << i18n("%1 %").tqarg(todo->percentComplete()) << "\n"; + *ts << " " << i18n("%1 %").arg(todo->percentComplete()) << "\n"; *ts << " </td>\n"; if ( mSettings->taskDueDate() ) { @@ -618,20 +618,20 @@ void HtmlExport::createFooter( TQTextStream *ts ) TQString mail, name, credit, creditURL;*/ if (!mSettings->eMail().isEmpty()) { if (!mSettings->name().isEmpty()) - trailer += i18n("by <a href=\"mailto:%1\">%2</a> ").tqarg( mSettings->eMail() ).tqarg( mSettings->name() ); + trailer += i18n("by <a href=\"mailto:%1\">%2</a> ").arg( mSettings->eMail() ).arg( mSettings->name() ); else - trailer += i18n("by <a href=\"mailto:%1\">%2</a> ").tqarg( mSettings->eMail() ).tqarg( mSettings->eMail() ); + trailer += i18n("by <a href=\"mailto:%1\">%2</a> ").arg( mSettings->eMail() ).arg( mSettings->eMail() ); } else { if (!mSettings->name().isEmpty()) - trailer += i18n("by %1 ").tqarg( mSettings->name() ); + trailer += i18n("by %1 ").arg( mSettings->name() ); } if (!mSettings->creditName().isEmpty()) { if (!mSettings->creditURL().isEmpty()) trailer += i18n("with <a href=\"%1\">%2</a>") - .tqarg( mSettings->creditURL() ) - .tqarg( mSettings->creditName() ); + .arg( mSettings->creditURL() ) + .arg( mSettings->creditName() ); else - trailer += i18n("with %1").tqarg( mSettings->creditName() ); + trailer += i18n("with %1").arg( mSettings->creditName() ); } *ts << "<p>" << trailer << "</p>\n"; } @@ -706,7 +706,7 @@ void HtmlExport::addHoliday( const TQDate &date, const TQString &name) if ( mHolidayMap[date].isEmpty() ) { mHolidayMap[date] = name; } else { - mHolidayMap[date] = i18n("list of holidays", "%1, %2").tqarg(mHolidayMap[date]).tqarg(name); + mHolidayMap[date] = i18n("list of holidays", "%1, %2").arg(mHolidayMap[date]).arg(name); } } diff --git a/libkcal/icalformat.cpp b/libkcal/icalformat.cpp index cdf2f43f4..deb38a60d 100644 --- a/libkcal/icalformat.cpp +++ b/libkcal/icalformat.cpp @@ -117,7 +117,7 @@ bool ICalFormat::save( Calendar *calendar, const TQString &fileName ) kdDebug(5800) << "ICalFormat::save() errno: " << strerror( file.status() ) << endl; setException( new ErrorFormat( ErrorFormat::SaveError, - i18n( "Error saving to '%1'." ).tqarg( fileName ) ) ); + i18n( "Error saving to '%1'." ).arg( fileName ) ) ); return false; } @@ -128,7 +128,7 @@ bool ICalFormat::save( Calendar *calendar, const TQString &fileName ) if ( !file.close() ) { kdDebug(5800) << "KSaveFile: close: status was " << file.status() << ". See errno.h." << endl; setException(new ErrorFormat(ErrorFormat::SaveError, - i18n("Could not save '%1'").tqarg(fileName))); + i18n("Could not save '%1'").arg(fileName))); return false; } diff --git a/libkcal/icalformatimpl.cpp b/libkcal/icalformatimpl.cpp index 0af7b4c52..db3177fd2 100644 --- a/libkcal/icalformatimpl.cpp +++ b/libkcal/icalformatimpl.cpp @@ -1438,7 +1438,7 @@ void ICalFormatImpl::readIncidence(icalcomponent *parent, icaltimezone *tz, Inci default: stat = Incidence::StatusNone; break; } if (stat != Incidence::StatusX) - incidence->seStatus(stat); + incidence->setStatus(stat); break; } @@ -2166,7 +2166,7 @@ bool ICalFormatImpl::populate( Calendar *cal, icalcomponent *calendar ) if (todo) { if (todo->hasRecurrenceID()) { TQString originalUid = todo->uid(); - todo->setUid(originalUid + TQString("-recur-%1").tqarg(todo->recurrenceID().toTime_t())); + todo->setUid(originalUid + TQString("-recur-%1").arg(todo->recurrenceID().toTime_t())); if (!cal->todo(todo->uid())) { if ( !cal->addTodo( todo ) ) { cal->endBatchAdding(); @@ -2208,7 +2208,7 @@ bool ICalFormatImpl::populate( Calendar *cal, icalcomponent *calendar ) if (event) { if (event->hasRecurrenceID()) { TQString originalUid = event->uid(); - event->setUid(originalUid + TQString("-recur-%1").tqarg(event->recurrenceID().toTime_t())); + event->setUid(originalUid + TQString("-recur-%1").arg(event->recurrenceID().toTime_t())); if (!cal->event(event->uid())) { cal->addEvent(event); if (!cal->event(originalUid)) { @@ -2246,7 +2246,7 @@ bool ICalFormatImpl::populate( Calendar *cal, icalcomponent *calendar ) if (journal) { if (journal->hasRecurrenceID()) { TQString originalUid = journal->uid(); - journal->setUid(originalUid + TQString("-recur-%1").tqarg(journal->recurrenceID().toTime_t())); + journal->setUid(originalUid + TQString("-recur-%1").arg(journal->recurrenceID().toTime_t())); if (!cal->journal(journal->uid())) { cal->addJournal(journal); if (!cal->event(originalUid)) { diff --git a/libkcal/incidence.cpp b/libkcal/incidence.cpp index b26b62147..e509cc05a 100644 --- a/libkcal/incidence.cpp +++ b/libkcal/incidence.cpp @@ -738,7 +738,7 @@ int Incidence::priority() const return mPriority; } -void Incidence::seStatus(Incidence::Status status) +void Incidence::setStatus(Incidence::Status status) { if (mReadOnly || status == StatusX) return; mStatus = status; diff --git a/libkcal/incidence.h b/libkcal/incidence.h index c1aa402b6..20579ce7f 100644 --- a/libkcal/incidence.h +++ b/libkcal/incidence.h @@ -381,7 +381,7 @@ class LIBKCAL_EXPORT Incidence : public IncidenceBase, public Recurrence::Observ Sets the incidence status to a standard status value. See separate enum. Note that StatusX cannot be specified. */ - void seStatus( Status status ); + void setStatus( Status status ); /** Sets the incidence status to a non-standard status value. @param status non-standard status string. If empty, diff --git a/libkcal/incidenceformatter.cpp b/libkcal/incidenceformatter.cpp index a220cd191..063ccf072 100644 --- a/libkcal/incidenceformatter.cpp +++ b/libkcal/incidenceformatter.cpp @@ -248,10 +248,10 @@ static TQString displayViewFormatAttendeeRoleList( Incidence *incidence, Attende } tmpStr += displayViewLinkPerson( a->email(), a->name(), a->uid() ); if ( !a->delegator().isEmpty() ) { - tmpStr += i18n(" (delegated by %1)" ).tqarg( a->delegator() ); + tmpStr += i18n(" (delegated by %1)" ).arg( a->delegator() ); } if ( !a->delegate().isEmpty() ) { - tmpStr += i18n(" (delegated to %1)" ).tqarg( a->delegate() ); + tmpStr += i18n(" (delegated to %1)" ).arg( a->delegate() ); } tmpStr += "<br>"; } @@ -359,7 +359,7 @@ static TQString displayViewFormatCategories( Incidence *incidence ) static TQString displayViewFormatCreationDate( Incidence *incidence ) { return i18n( "Creation date: %1" ). - tqarg( IncidenceFormatter::dateTimeToString( incidence->created(), false, true ) ); + arg( IncidenceFormatter::dateTimeToString( incidence->created(), false, true ) ); } static TQString displayViewFormatBirthday( Event *event ) @@ -502,14 +502,14 @@ static TQString displayViewFormatEvent( Calendar *calendar, Event *event, tmpStr += "<td><b>" + i18n( "Date:" ) + "</b></td>"; tmpStr += "<td>" + i18n("<beginDate> - <endDate>","%1 - %2"). - tqarg( IncidenceFormatter::dateToString( startDt, false ) ). - tqarg( IncidenceFormatter::dateToString( endDt, false ) ) + + arg( IncidenceFormatter::dateToString( startDt, false ) ). + arg( IncidenceFormatter::dateToString( endDt, false ) ) + "</td>"; } else { tmpStr += "<td><b>" + i18n( "Date:" ) + "</b></td>"; tmpStr += "<td>" + i18n("date as string","%1"). - tqarg( IncidenceFormatter::dateToString( startDt, false ) ) + + arg( IncidenceFormatter::dateToString( startDt, false ) ) + "</td>"; } } else { @@ -517,14 +517,14 @@ static TQString displayViewFormatEvent( Calendar *calendar, Event *event, tmpStr += "<td><b>" + i18n( "Date:" ) + "</b></td>"; tmpStr += "<td>" + i18n("<beginDate> - <endDate>","%1 - %2"). - tqarg( IncidenceFormatter::dateToString( startDt, false ) ). - tqarg( IncidenceFormatter::dateToString( endDt, false ) ) + + arg( IncidenceFormatter::dateToString( startDt, false ) ). + arg( IncidenceFormatter::dateToString( endDt, false ) ) + "</td>"; } else { tmpStr += "<td><b>" + i18n( "Date:" ) + "</b></td>"; tmpStr += "<td>" + i18n("date as string","%1"). - tqarg( IncidenceFormatter::dateToString( startDt, false ) ) + + arg( IncidenceFormatter::dateToString( startDt, false ) ) + "</td>"; tmpStr += "</tr><tr>"; @@ -532,8 +532,8 @@ static TQString displayViewFormatEvent( Calendar *calendar, Event *event, if ( event->hasEndDate() && startDt != endDt ) { tmpStr += "<td>" + i18n("<beginTime> - <endTime>","%1 - %2"). - tqarg( IncidenceFormatter::timeToString( startDt, true ) ). - tqarg( IncidenceFormatter::timeToString( endDt, true ) ) + + arg( IncidenceFormatter::timeToString( startDt, true ) ). + arg( IncidenceFormatter::timeToString( endDt, true ) ) + "</td>"; } else { tmpStr += "<td>" + @@ -750,7 +750,7 @@ static TQString displayViewFormatTodo( Calendar *calendar, Todo *todo, } else { tmpStr += "<td><b>" + i18n( "Percent Done:" ) + "</b></td>"; tmpStr += "<td>"; - tmpStr += i18n( "%1%" ).tqarg( todo->percentComplete() ); + tmpStr += i18n( "%1%" ).arg( todo->percentComplete() ); } tmpStr += "</td>"; tmpStr += "</tr>"; @@ -833,11 +833,11 @@ static TQString displayViewFormatFreeBusy( Calendar * /*calendar*/, FreeBusy *fb TQString tmpStr = htmlAddTag( "h2", htmlAddTag( "b", i18n("Free/Busy information for %1"). - tqarg( fb->organizer().fullName() ) ) ); + arg( fb->organizer().fullName() ) ) ); tmpStr += htmlAddTag( "h4", i18n("Busy times in date range %1 - %2:"). - tqarg( IncidenceFormatter::dateToString( fb->dtStart(), true ) ). - tqarg( IncidenceFormatter::dateToString( fb->dtEnd(), true ) ) ); + arg( IncidenceFormatter::dateToString( fb->dtStart(), true ) ). + arg( IncidenceFormatter::dateToString( fb->dtEnd(), true ) ) ); TQValueList<Period> periods = fb->busyPeriods(); @@ -860,19 +860,19 @@ static TQString displayViewFormatFreeBusy( Calendar * /*calendar*/, FreeBusy *fb cont += i18n("1 second", "%n seconds", dur); } text += i18n("startDate for duration", "%1 for %2"). - tqarg( IncidenceFormatter::dateTimeToString( per.start(), false, true ) ). - tqarg( cont ); + arg( IncidenceFormatter::dateTimeToString( per.start(), false, true ) ). + arg( cont ); text += "<br>"; } else { if ( per.start().date() == per.end().date() ) { text += i18n("date, fromTime - toTime ", "%1, %2 - %3"). - tqarg( IncidenceFormatter::dateToString( per.start().date(), true ) ). - tqarg( IncidenceFormatter::timeToString( per.start(), true ) ). - tqarg( IncidenceFormatter::timeToString( per.end(), true ) ); + arg( IncidenceFormatter::dateToString( per.start().date(), true ) ). + arg( IncidenceFormatter::timeToString( per.start(), true ) ). + arg( IncidenceFormatter::timeToString( per.end(), true ) ); } else { text += i18n("fromDateTime - toDateTime", "%1 - %2"). - tqarg( IncidenceFormatter::dateTimeToString( per.start(), false, true ) ). - tqarg( IncidenceFormatter::dateTimeToString( per.end(), false, true ) ); + arg( IncidenceFormatter::dateTimeToString( per.start(), false, true ) ). + arg( IncidenceFormatter::dateTimeToString( per.end(), false, true ) ); } text += "<br>"; } @@ -969,11 +969,11 @@ static TQString eventStartTimeStr( Event *event ) TQString tmp; if ( !event->doesFloat() ) { tmp = i18n( "%1: Start Date, %2: Start Time", "%1 %2" ). - tqarg( IncidenceFormatter::dateToString( event->dtStart(), true ), + arg( IncidenceFormatter::dateToString( event->dtStart(), true ), IncidenceFormatter::timeToString( event->dtStart(), true ) ); } else { tmp = i18n( "%1: Start Date", "%1 (all day)" ). - tqarg( IncidenceFormatter::dateToString( event->dtStart(), true ) ); + arg( IncidenceFormatter::dateToString( event->dtStart(), true ) ); } return tmp; } @@ -984,11 +984,11 @@ static TQString eventEndTimeStr( Event *event ) if ( event->hasEndDate() && event->dtEnd().isValid() ) { if ( !event->doesFloat() ) { tmp = i18n( "%1: End Date, %2: End Time", "%1 %2" ). - tqarg( IncidenceFormatter::dateToString( event->dtEnd(), true ), + arg( IncidenceFormatter::dateToString( event->dtEnd(), true ), IncidenceFormatter::timeToString( event->dtEnd(), true ) ); } else { tmp = i18n( "%1: End Date", "%1 (all day)" ). - tqarg( IncidenceFormatter::dateToString( event->dtEnd(), true ) ); + arg( IncidenceFormatter::dateToString( event->dtEnd(), true ) ); } } return tmp; @@ -1106,13 +1106,13 @@ static TQString rsvpRequestedStr( bool rsvpRequested, const TQString &role ) if ( role.isEmpty() ) { return i18n( "Your response is requested" ); } else { - return i18n( "Your response as <b>%1</b> is requested" ).tqarg( role ); + return i18n( "Your response as <b>%1</b> is requested" ).arg( role ); } } else { if ( role.isEmpty() ) { return i18n( "No response is necessary" ); } else { - return i18n( "No response as <b>%1</b> is necessary" ).tqarg( role ); + return i18n( "No response as <b>%1</b> is necessary" ).arg( role ); } } } @@ -1124,7 +1124,7 @@ static TQString myStatusStr( Incidence *incidence ) if ( a && a->status() != Attendee::NeedsAction && a->status() != Attendee::Delegated ) { ret = i18n( "(<b>Note</b>: the Organizer preset your response to <b>%1</b>)" ). - tqarg( Attendee::statusName( a->status() ) ); + arg( Attendee::statusName( a->status() ) ); } return ret; } @@ -1302,7 +1302,7 @@ static TQString invitationDetailsEvent( Event* event, bool noHtmlMode ) } TQString dir = ( TQApplication::reverseLayout() ? "rtl" : "ltr" ); - TQString html = TQString("<div dir=\"%1\">\n").tqarg(dir); + TQString html = TQString("<div dir=\"%1\">\n").arg(dir); html += "<table border=\"0\" cellpadding=\"1\" cellspacing=\"1\">\n"; @@ -1413,7 +1413,7 @@ static TQString invitationDetailsTodo( Todo *todo, bool noHtmlMode ) } TQString dir = ( TQApplication::reverseLayout() ? "rtl" : "ltr" ); - TQString html = TQString("<div dir=\"%1\">\n").tqarg(dir); + TQString html = TQString("<div dir=\"%1\">\n").arg(dir); html += "<table border=\"0\" cellpadding=\"1\" cellspacing=\"1\">\n"; // Invitation summary & location rows @@ -1511,19 +1511,19 @@ static TQString invitationDetailsFreeBusy( FreeBusy *fb, bool /*noHtmlMode*/ ) cont += i18n("1 second", "%n seconds", dur); } html += invitationRow( TQString(), i18n("startDate for duration", "%1 for %2") - .tqarg( KGlobal::locale()->formatDateTime( per.start(), false ) ) - .tqarg(cont) ); + .arg( KGlobal::locale()->formatDateTime( per.start(), false ) ) + .arg(cont) ); } else { TQString cont; if ( per.start().date() == per.end().date() ) { cont = i18n("date, fromTime - toTime ", "%1, %2 - %3") - .tqarg( KGlobal::locale()->formatDate( per.start().date() ) ) - .tqarg( KGlobal::locale()->formatTime( per.start().time() ) ) - .tqarg( KGlobal::locale()->formatTime( per.end().time() ) ); + .arg( KGlobal::locale()->formatDate( per.start().date() ) ) + .arg( KGlobal::locale()->formatTime( per.start().time() ) ) + .arg( KGlobal::locale()->formatTime( per.end().time() ) ); } else { cont = i18n("fromDateTime - toDateTime", "%1 - %2") - .tqarg( KGlobal::locale()->formatDateTime( per.start(), false ) ) - .tqarg( KGlobal::locale()->formatDateTime( per.end(), false ) ); + .arg( KGlobal::locale()->formatDateTime( per.start(), false ) ) + .arg( KGlobal::locale()->formatDateTime( per.end(), false ) ); } html += invitationRow( TQString(), cont ); @@ -1565,7 +1565,7 @@ static TQString invitationHeaderEvent( Event *event, Incidence *existingIncidenc case Scheduler::Request: if ( existingIncidence && event->revision() > 0 ) { return i18n( "This invitation has been updated by the organizer %1" ). - tqarg( event->organizer().fullName() ); + arg( event->organizer().fullName() ); } if ( iamOrganizer( event ) ) { return i18n( "I created this invitation" ); @@ -1578,17 +1578,17 @@ static TQString invitationHeaderEvent( Event *event, Incidence *existingIncidenc } if ( senderIsOrganizer( event, sender ) ) { if ( !orgStr.isEmpty() ) { - return i18n( "You received an invitation from %1" ).tqarg( orgStr ); + return i18n( "You received an invitation from %1" ).arg( orgStr ); } else { return i18n( "You received an invitation" ); } } else { if ( !orgStr.isEmpty() ) { return i18n( "You received an invitation from %1 as a representative of %2" ). - tqarg( sender, orgStr ); + arg( sender, orgStr ); } else { return i18n( "You received an invitation from %1 as the organizer's representative" ). - tqarg( sender ); + arg( sender ); } } } @@ -1602,7 +1602,7 @@ static TQString invitationHeaderEvent( Event *event, Incidence *existingIncidenc { if ( replyMeansCounter( event ) ) { return i18n( "%1 makes this counter proposal" ). - tqarg( firstAttendeeName( event, i18n( "Sender" ) ) ); + arg( firstAttendeeName( event, i18n( "Sender" ) ) ); } Attendee::List attendees = event->attendees(); @@ -1625,36 +1625,36 @@ static TQString invitationHeaderEvent( Event *event, Incidence *existingIncidenc switch( attendee->status() ) { case Attendee::NeedsAction: - return i18n( "%1 indicates this invitation still needs some action" ).tqarg( attendeeName ); + return i18n( "%1 indicates this invitation still needs some action" ).arg( attendeeName ); case Attendee::Accepted: if ( event->revision() > 0 ) { if ( !sender.isEmpty() ) { - return i18n( "This invitation has been updated by attendee %1" ).tqarg( sender ); + return i18n( "This invitation has been updated by attendee %1" ).arg( sender ); } else { return i18n( "This invitation has been updated by an attendee" ); } } else { if ( delegatorName.isEmpty() ) { - return i18n( "%1 accepts this invitation" ).tqarg( attendeeName ); + return i18n( "%1 accepts this invitation" ).arg( attendeeName ); } else { return i18n( "%1 accepts this invitation on behalf of %2" ). - tqarg( attendeeName ).tqarg( delegatorName ); + arg( attendeeName ).arg( delegatorName ); } } case Attendee::Tentative: if ( delegatorName.isEmpty() ) { return i18n( "%1 tentatively accepts this invitation" ). - tqarg( attendeeName ); + arg( attendeeName ); } else { return i18n( "%1 tentatively accepts this invitation on behalf of %2" ). - tqarg( attendeeName ).tqarg( delegatorName ); + arg( attendeeName ).arg( delegatorName ); } case Attendee::Declined: if ( delegatorName.isEmpty() ) { - return i18n( "%1 declines this invitation" ).tqarg( attendeeName ); + return i18n( "%1 declines this invitation" ).arg( attendeeName ); } else { return i18n( "%1 declines this invitation on behalf of %2" ). - tqarg( attendeeName ).tqarg( delegatorName ); + arg( attendeeName ).arg( delegatorName ); } case Attendee::Delegated: { TQString delegate, dummy; @@ -1664,16 +1664,16 @@ static TQString invitationHeaderEvent( Event *event, Incidence *existingIncidenc } if ( !delegate.isEmpty() ) { return i18n( "%1 has delegated this invitation to %2" ). - tqarg( attendeeName ) .tqarg( delegate ); + arg( attendeeName ) .arg( delegate ); } else { - return i18n( "%1 has delegated this invitation" ).tqarg( attendeeName ); + return i18n( "%1 has delegated this invitation" ).arg( attendeeName ); } } case Attendee::Completed: return i18n( "This invitation is now completed" ); case Attendee::InProcess: return i18n( "%1 is still processing the invitation" ). - tqarg( attendeeName ); + arg( attendeeName ); default: return i18n( "Unknown response to this invitation" ); } @@ -1682,15 +1682,15 @@ static TQString invitationHeaderEvent( Event *event, Incidence *existingIncidenc case Scheduler::Counter: return i18n( "%1 makes this counter proposal" ). - tqarg( firstAttendeeName( event, i18n( "Sender" ) ) ); + arg( firstAttendeeName( event, i18n( "Sender" ) ) ); case Scheduler::Declinecounter: return i18n( "%1 declines the counter proposal" ). - tqarg( firstAttendeeName( event, i18n( "Sender" ) ) ); + arg( firstAttendeeName( event, i18n( "Sender" ) ) ); case Scheduler::NoMethod: return i18n("Error: iMIP message with unknown method: '%1'"). - tqarg( msg->method() ); + arg( msg->method() ); } return TQString(); } @@ -1708,7 +1708,7 @@ static TQString invitationHeaderTodo( Todo *todo, Incidence *existingIncidence, case Scheduler::Request: if ( existingIncidence && todo->revision() > 0 ) { return i18n( "This task has been updated by the organizer %1" ). - tqarg( todo->organizer().fullName() ); + arg( todo->organizer().fullName() ); } else { if ( iamOrganizer( todo ) ) { return i18n( "I created this task" ); @@ -1721,17 +1721,17 @@ static TQString invitationHeaderTodo( Todo *todo, Incidence *existingIncidence, } if ( senderIsOrganizer( todo, sender ) ) { if ( !orgStr.isEmpty() ) { - return i18n( "You have been assigned this task by %1" ).tqarg( orgStr ); + return i18n( "You have been assigned this task by %1" ).arg( orgStr ); } else { return i18n( "You have been assigned this task" ); } } else { if ( !orgStr.isEmpty() ) { return i18n( "You have been assigned this task by %1 as a representative of %2" ). - tqarg( sender, orgStr ); + arg( sender, orgStr ); } else { return i18n( "You have been assigned this task by %1 as the organizer's representative" ). - tqarg( sender ); + arg( sender ); } } } @@ -1746,7 +1746,7 @@ static TQString invitationHeaderTodo( Todo *todo, Incidence *existingIncidence, { if ( replyMeansCounter( todo ) ) { return i18n( "%1 makes this counter proposal" ). - tqarg( firstAttendeeName( todo, i18n( "Sender" ) ) ); + arg( firstAttendeeName( todo, i18n( "Sender" ) ) ); } Attendee::List attendees = todo->attendees(); @@ -1769,14 +1769,14 @@ static TQString invitationHeaderTodo( Todo *todo, Incidence *existingIncidence, switch( attendee->status() ) { case Attendee::NeedsAction: - return i18n( "%1 indicates this task assignment still needs some action" ).tqarg( attendeeName ); + return i18n( "%1 indicates this task assignment still needs some action" ).arg( attendeeName ); case Attendee::Accepted: if ( todo->revision() > 0 ) { if ( !sender.isEmpty() ) { if ( todo->isCompleted() ) { - return i18n( "This task has been completed by assignee %1" ).tqarg( sender ); + return i18n( "This task has been completed by assignee %1" ).arg( sender ); } else { - return i18n( "This task has been updated by assignee %1" ).tqarg( sender ); + return i18n( "This task has been updated by assignee %1" ).arg( sender ); } } else { if ( todo->isCompleted() ) { @@ -1787,26 +1787,26 @@ static TQString invitationHeaderTodo( Todo *todo, Incidence *existingIncidence, } } else { if ( delegatorName.isEmpty() ) { - return i18n( "%1 accepts this task" ).tqarg( attendeeName ); + return i18n( "%1 accepts this task" ).arg( attendeeName ); } else { return i18n( "%1 accepts this task on behalf of %2" ). - tqarg( attendeeName ).tqarg( delegatorName ); + arg( attendeeName ).arg( delegatorName ); } } case Attendee::Tentative: if ( delegatorName.isEmpty() ) { return i18n( "%1 tentatively accepts this task" ). - tqarg( attendeeName ); + arg( attendeeName ); } else { return i18n( "%1 tentatively accepts this task on behalf of %2" ). - tqarg( attendeeName ).tqarg( delegatorName ); + arg( attendeeName ).arg( delegatorName ); } case Attendee::Declined: if ( delegatorName.isEmpty() ) { - return i18n( "%1 declines this task" ).tqarg( attendeeName ); + return i18n( "%1 declines this task" ).arg( attendeeName ); } else { return i18n( "%1 declines this task on behalf of %2" ). - tqarg( attendeeName ).tqarg( delegatorName ); + arg( attendeeName ).arg( delegatorName ); } case Attendee::Delegated: { TQString delegate, dummy; @@ -1816,17 +1816,17 @@ static TQString invitationHeaderTodo( Todo *todo, Incidence *existingIncidence, } if ( !delegate.isEmpty() ) { return i18n( "%1 has delegated this request for the task to %2" ). - tqarg( attendeeName ).tqarg( delegate ); + arg( attendeeName ).arg( delegate ); } else { return i18n( "%1 has delegated this request for the task" ). - tqarg( attendeeName ); + arg( attendeeName ); } } case Attendee::Completed: return i18n( "The request for this task is now completed" ); case Attendee::InProcess: return i18n( "%1 is still processing the task" ). - tqarg( attendeeName ); + arg( attendeeName ); default: return i18n( "Unknown response to this task" ); } @@ -1835,15 +1835,15 @@ static TQString invitationHeaderTodo( Todo *todo, Incidence *existingIncidence, case Scheduler::Counter: return i18n( "%1 makes this counter proposal" ). - tqarg( firstAttendeeName( todo, i18n( "Sender" ) ) ); + arg( firstAttendeeName( todo, i18n( "Sender" ) ) ); case Scheduler::Declinecounter: return i18n( "%1 declines the counter proposal" ). - tqarg( firstAttendeeName( todo, i18n( "Sender" ) ) ); + arg( firstAttendeeName( todo, i18n( "Sender" ) ) ); case Scheduler::NoMethod: return i18n( "Error: iMIP message with unknown method: '%1'" ). - tqarg( msg->method() ); + arg( msg->method() ); } return TQString(); } @@ -1908,7 +1908,7 @@ static TQString invitationHeaderJournal( Journal *journal, ScheduleMessage *msg return i18n( "Sender declines the counter proposal" ); case Scheduler::NoMethod: return i18n("Error: iMIP message with unknown method: '%1'"). - tqarg( msg->method() ); + arg( msg->method() ); } return TQString(); } @@ -1933,7 +1933,7 @@ static TQString invitationHeaderFreeBusy( FreeBusy *fb, ScheduleMessage *msg ) case Scheduler::NoMethod: default: return i18n("Error: Free/Busy iMIP message with unknown method: '%1'"). - tqarg( msg->method() ); + arg( msg->method() ); } } @@ -1967,10 +1967,10 @@ static TQString invitationAttendees( Incidence *incidence ) tmpStr += "<td>"; tmpStr += invitationPerson( a->email(), a->name(), TQString() ); if ( !a->delegator().isEmpty() ) { - tmpStr += i18n(" (delegated by %1)" ).tqarg( a->delegator() ); + tmpStr += i18n(" (delegated by %1)" ).arg( a->delegator() ); } if ( !a->delegate().isEmpty() ) { - tmpStr += i18n(" (delegated to %1)" ).tqarg( a->delegate() ); + tmpStr += i18n(" (delegated to %1)" ).arg( a->delegate() ); } tmpStr += "</td>"; tmpStr += "<td>" + a->statusStr() + "</td>"; @@ -2156,10 +2156,10 @@ class IncidenceFormatter::IncidenceCompareVisitor return; if ( oldEvent->dtStart() != newEvent->dtStart() || oldEvent->doesFloat() != newEvent->doesFloat() ) mChanges += i18n( "The invitation starting time has been changed from %1 to %2" ) - .tqarg( eventStartTimeStr( oldEvent ) ).tqarg( eventStartTimeStr( newEvent ) ); + .arg( eventStartTimeStr( oldEvent ) ).arg( eventStartTimeStr( newEvent ) ); if ( oldEvent->dtEnd() != newEvent->dtEnd() || oldEvent->doesFloat() != newEvent->doesFloat() ) mChanges += i18n( "The invitation ending time has been changed from %1 to %2" ) - .tqarg( eventEndTimeStr( oldEvent ) ).tqarg( eventEndTimeStr( newEvent ) ); + .arg( eventEndTimeStr( oldEvent ) ).arg( eventEndTimeStr( newEvent ) ); } void compareTodos( Todo *newTodo, Todo *oldTodo ) @@ -2175,10 +2175,10 @@ class IncidenceFormatter::IncidenceCompareVisitor mChanges += i18n( "The task is no longer completed" ); } if ( oldTodo->percentComplete() != newTodo->percentComplete() ) { - const TQString oldPer = i18n( "%1%" ).tqarg( oldTodo->percentComplete() ); - const TQString newPer = i18n( "%1%" ).tqarg( newTodo->percentComplete() ); + const TQString oldPer = i18n( "%1%" ).arg( oldTodo->percentComplete() ); + const TQString newPer = i18n( "%1%" ).arg( newTodo->percentComplete() ); mChanges += i18n( "The task completed percentage has changed from %1 to %2" ). - tqarg( oldPer, newPer ); + arg( oldPer, newPer ); } if ( !oldTodo->hasStartDate() && newTodo->hasStartDate() ) { @@ -2190,7 +2190,7 @@ class IncidenceFormatter::IncidenceCompareVisitor if ( oldTodo->hasStartDate() && newTodo->hasStartDate() && oldTodo->dtStart() != newTodo->dtStart() ) { mChanges += i18n( "The task starting time has been changed from %1 to %2" ). - tqarg( dateTimeToString( oldTodo->dtStart(), oldTodo->doesFloat(), false ), + arg( dateTimeToString( oldTodo->dtStart(), oldTodo->doesFloat(), false ), dateTimeToString( newTodo->dtStart(), newTodo->doesFloat(), false ) ); } @@ -2203,7 +2203,7 @@ class IncidenceFormatter::IncidenceCompareVisitor if ( oldTodo->hasDueDate() && newTodo->hasDueDate() && oldTodo->dtDue() != newTodo->dtDue() ) { mChanges += i18n( "The task due time has been changed from %1 to %2" ). - tqarg( dateTimeToString( oldTodo->dtDue(), oldTodo->doesFloat(), false ), + arg( dateTimeToString( oldTodo->dtDue(), oldTodo->doesFloat(), false ), dateTimeToString( newTodo->dtDue(), newTodo->doesFloat(), false ) ); } } @@ -2213,22 +2213,22 @@ class IncidenceFormatter::IncidenceCompareVisitor if ( !oldInc || !newInc ) return; if ( oldInc->summary() != newInc->summary() ) - mChanges += i18n( "The summary has been changed to: \"%1\"" ).tqarg( newInc->summary() ); + mChanges += i18n( "The summary has been changed to: \"%1\"" ).arg( newInc->summary() ); if ( oldInc->location() != newInc->location() ) - mChanges += i18n( "The location has been changed to: \"%1\"" ).tqarg( newInc->location() ); + mChanges += i18n( "The location has been changed to: \"%1\"" ).arg( newInc->location() ); if ( oldInc->description() != newInc->description() ) - mChanges += i18n( "The description has been changed to: \"%1\"" ).tqarg( newInc->description() ); + mChanges += i18n( "The description has been changed to: \"%1\"" ).arg( newInc->description() ); Attendee::List oldAttendees = oldInc->attendees(); Attendee::List newAttendees = newInc->attendees(); for ( Attendee::List::ConstIterator it = newAttendees.constBegin(); it != newAttendees.constEnd(); ++it ) { Attendee *oldAtt = oldInc->attendeeByMail( (*it)->email() ); if ( !oldAtt ) { - mChanges += i18n( "Attendee %1 has been added" ).tqarg( (*it)->fullName() ); + mChanges += i18n( "Attendee %1 has been added" ).arg( (*it)->fullName() ); } else { if ( oldAtt->status() != (*it)->status() ) mChanges += i18n( "The status of attendee %1 has been changed to: %2" ). - tqarg( (*it)->fullName() ).tqarg( (*it)->statusStr() ); + arg( (*it)->fullName() ).arg( (*it)->statusStr() ); } } if ( method == Scheduler::Request ) { @@ -2237,7 +2237,7 @@ class IncidenceFormatter::IncidenceCompareVisitor if ( (*it)->email() != oldInc->organizer().email() ) { Attendee *newAtt = newInc->attendeeByMail( (*it)->email() ); if ( !newAtt ) { - mChanges += i18n( "Attendee %1 has been removed" ).tqarg( (*it)->fullName() ); + mChanges += i18n( "Attendee %1 has been removed" ).arg( (*it)->fullName() ); } } } @@ -2255,12 +2255,12 @@ TQString InvitationFormatterHelper::makeLink( const TQString &id, const TQString { if ( !id.startsWith( "ATTACH:" ) ) { TQString res = TQString( "<a href=\"%1\"><b>%2</b></a>" ). - tqarg( generateLinkURL( id ), text ); + arg( generateLinkURL( id ), text ); return res; } else { // draw the attachment links in non-bold face TQString res = TQString( "<a href=\"%1\">%2</a>" ). - tqarg( generateLinkURL( id ), text ); + arg( generateLinkURL( id ), text ); return res; } } @@ -2431,7 +2431,7 @@ TQString IncidenceFormatter::formatICalInvitationHelper( TQString invitation, TQString tableHead = TQString::fromLatin1( "<div align=\"center\">" "<table width=\"80%\" cellpadding=\"1\" cellspacing=\"0\" %1>" - "<tr><td>").tqarg(tableStyle); + "<tr><td>").arg(tableStyle); html += tableHead; InvitationHeaderVisitor headerVisitor; @@ -2459,7 +2459,7 @@ TQString IncidenceFormatter::formatICalInvitationHelper( TQString invitation, if ( compareVisitor.act( incBase, existingIncidence, msg->method() ) ) { html += "<p align=\"left\">"; if ( !sender.isEmpty() ) { - html += i18n( "The following changes have been made by %1:" ).tqarg( sender ); + html += i18n( "The following changes have been made by %1:" ).arg( sender ); } else { html += i18n( "The following changes have been made by an attendee:" ); } @@ -2514,10 +2514,10 @@ TQString IncidenceFormatter::formatICalInvitationHelper( TQString invitation, if ( rsvpRec && inc ) { if ( inc->revision() == 0 ) { html += i18n( "Your <b>%1</b> response has already been recorded" ). - tqarg( ea->statusStr() ); + arg( ea->statusStr() ); } else { html += i18n( "Your status for this invitation is <b>%1</b>" ). - tqarg( ea->statusStr() ); + arg( ea->statusStr() ); } rsvpReq = false; } else if ( msg->method() == Scheduler::Cancel ) { @@ -2627,7 +2627,7 @@ TQString IncidenceFormatter::formatICalInvitationHelper( TQString invitation, if ( ea && ( ea->status() != Attendee::NeedsAction ) && ( ea->status() == a->status() ) ) { if ( inc && inc->revision() > 0 ) { html += "<br><u><i>"; - html += i18n( "The response has been recorded [%1]" ).tqarg( ea->statusStr() ); + html += i18n( "The response has been recorded [%1]" ).arg( ea->statusStr() ); html += "</i></u>"; } } else { @@ -2926,13 +2926,13 @@ TQString IncidenceFormatter::msTNEFToVPart( const TQByteArray& tnef ) Attendee *attendee = new Attendee( s, s, true ); if( bIsReply ) { if( bCompatMethodAccepted ) - attendee->seStatus( Attendee::Accepted ); + attendee->setStatus( Attendee::Accepted ); if( bCompatMethodDeclined ) - attendee->seStatus( Attendee::Declined ); + attendee->setStatus( Attendee::Declined ); if( bCompatMethodAcceptedCond ) - attendee->seStatus(Attendee::Tentative); + attendee->setStatus(Attendee::Tentative); } else { - attendee->seStatus( Attendee::NeedsAction ); + attendee->setStatus( Attendee::NeedsAction ); attendee->setRole( Attendee::ReqParticipant ); } event->addAttendee(attendee); @@ -2947,13 +2947,13 @@ TQString IncidenceFormatter::msTNEFToVPart( const TQByteArray& tnef ) true ); if( bIsReply ) { if( bCompatMethodAccepted ) - attendee->seStatus( Attendee::Accepted ); + attendee->setStatus( Attendee::Accepted ); if( bCompatMethodAcceptedCond ) - attendee->seStatus( Attendee::Declined ); + attendee->setStatus( Attendee::Declined ); if( bCompatMethodDeclined ) - attendee->seStatus( Attendee::Tentative ); + attendee->setStatus( Attendee::Tentative ); } else { - attendee->seStatus(Attendee::NeedsAction); + attendee->setStatus(Attendee::NeedsAction); attendee->setRole(Attendee::ReqParticipant); } event->addAttendee(attendee); @@ -3218,20 +3218,20 @@ TQString IncidenceFormatter::ToolTipVisitor::dateRangeText( Event *event, const tmp = "<br>" + i18n("Event start", "<i>From:</i> %1"); if (event->doesFloat()) - ret += tmp.tqarg( IncidenceFormatter::dateToString( startDt, false ).replace(" ", " ") ); + ret += tmp.arg( IncidenceFormatter::dateToString( startDt, false ).replace(" ", " ") ); else - ret += tmp.tqarg( IncidenceFormatter::dateToString( startDt ).replace(" ", " ") ); + ret += tmp.arg( IncidenceFormatter::dateToString( startDt ).replace(" ", " ") ); tmp = "<br>" + i18n("Event end","<i>To:</i> %1"); if (event->doesFloat()) - ret += tmp.tqarg( IncidenceFormatter::dateToString( endDt, false ).replace(" ", " ") ); + ret += tmp.arg( IncidenceFormatter::dateToString( endDt, false ).replace(" ", " ") ); else - ret += tmp.tqarg( IncidenceFormatter::dateToString( endDt ).replace(" ", " ") ); + ret += tmp.arg( IncidenceFormatter::dateToString( endDt ).replace(" ", " ") ); } else { ret += "<br>"+i18n("<i>Date:</i> %1"). - tqarg( IncidenceFormatter::dateToString( startDt, false ).replace(" ", " ") ); + arg( IncidenceFormatter::dateToString( startDt, false ).replace(" ", " ") ); if ( !event->doesFloat() ) { const TQString dtStartTime = IncidenceFormatter::timeToString( startDt, true ).replace( " ", " " ); @@ -3240,11 +3240,11 @@ TQString IncidenceFormatter::ToolTipVisitor::dateRangeText( Event *event, const if ( dtStartTime == dtEndTime ) { // to prevent 'Time: 17:00 - 17:00' tmp = "<br>" + i18n("time for event, to prevent ugly line breaks", "<i>Time:</i> %1"). - tqarg( dtStartTime ); + arg( dtStartTime ); } else { tmp = "<br>" + i18n("time range for event, to prevent ugly line breaks", "<i>Time:</i> %1 - %2"). - tqarg( dtStartTime, dtEndTime ); + arg( dtStartTime, dtEndTime ); } ret += tmp; } @@ -3267,7 +3267,7 @@ TQString IncidenceFormatter::ToolTipVisitor::dateRangeText( Todo *todo, const TQ } ret += "<br>" + i18n("<i>Start:</i> %1"). - tqarg( IncidenceFormatter::dateTimeToString( startDt, floats, false ). + arg( IncidenceFormatter::dateTimeToString( startDt, floats, false ). replace( " ", " " ) ); } @@ -3282,7 +3282,7 @@ TQString IncidenceFormatter::ToolTipVisitor::dateRangeText( Todo *todo, const TQ } ret += "<br>" + i18n("<i>Due:</i> %1"). - tqarg( IncidenceFormatter::dateTimeToString( dueDt, floats, false ). + arg( IncidenceFormatter::dateTimeToString( dueDt, floats, false ). replace( " ", " " ) ); } @@ -3300,7 +3300,7 @@ TQString IncidenceFormatter::ToolTipVisitor::dateRangeText( Todo *todo, const TQ ret += todo->completedStr().replace( " ", " " ); } else { ret += "<i>" + i18n( "Percent Done:" ) + "</i>" + " "; - ret += i18n( "%1%" ).tqarg( todo->percentComplete() ); + ret += i18n( "%1%" ).arg( todo->percentComplete() ); } return ret; @@ -3312,7 +3312,7 @@ TQString IncidenceFormatter::ToolTipVisitor::dateRangeText( Journal*journal ) if (journal->dtStart().isValid() ) { ret += "<br>" + i18n("<i>Date:</i> %1"). - tqarg( IncidenceFormatter::dateToString( journal->dtStart(), false ) ); + arg( IncidenceFormatter::dateToString( journal->dtStart(), false ) ); } return ret; } @@ -3320,9 +3320,9 @@ TQString IncidenceFormatter::ToolTipVisitor::dateRangeText( Journal*journal ) TQString IncidenceFormatter::ToolTipVisitor::dateRangeText( FreeBusy *fb ) { TQString tmp( "<br>" + i18n("<i>Period start:</i> %1") ); - TQString ret = tmp.tqarg( KGlobal::locale()->formatDateTime( fb->dtStart() ) ); + TQString ret = tmp.arg( KGlobal::locale()->formatDateTime( fb->dtStart() ) ); tmp = "<br>" + i18n("<i>Period start:</i> %1"); - ret += tmp.tqarg( KGlobal::locale()->formatDateTime( fb->dtEnd() ) ); + ret += tmp.arg( KGlobal::locale()->formatDateTime( fb->dtEnd() ) ); return ret; } @@ -3349,7 +3349,7 @@ bool IncidenceFormatter::ToolTipVisitor::visit( Journal *journal ) bool IncidenceFormatter::ToolTipVisitor::visit( FreeBusy *fb ) { mResult = "<qt><b>" + i18n("Free/Busy information for %1") - .tqarg(fb->organizer().fullName()) + "</b>"; + .arg(fb->organizer().fullName()) + "</b>"; mResult += dateRangeText( fb ); mResult += "</qt>"; return !mResult.isEmpty(); @@ -3405,10 +3405,10 @@ static TQString tooltipFormatAttendeeRoleList( Incidence *incidence, Attendee::R } tmpStr += tooltipPerson( a->email(), a->name() ); if ( !a->delegator().isEmpty() ) { - tmpStr += i18n(" (delegated by %1)" ).tqarg( a->delegator() ); + tmpStr += i18n(" (delegated by %1)" ).arg( a->delegator() ); } if ( !a->delegate().isEmpty() ) { - tmpStr += i18n(" (delegated to %1)" ).tqarg( a->delegate() ); + tmpStr += i18n(" (delegated to %1)" ).arg( a->delegate() ); } tmpStr += sep; i++; @@ -3588,13 +3588,13 @@ static TQString mailBodyIncidence( Incidence *incidence ) { TQString body; if ( !incidence->summary().isEmpty() ) { - body += i18n("Summary: %1\n").tqarg( incidence->summary() ); + body += i18n("Summary: %1\n").arg( incidence->summary() ); } if ( !incidence->organizer().isEmpty() ) { - body += i18n("Organizer: %1\n").tqarg( incidence->organizer().fullName() ); + body += i18n("Organizer: %1\n").arg( incidence->organizer().fullName() ); } if ( !incidence->location().isEmpty() ) { - body += i18n("Location: %1\n").tqarg( incidence->location() ); + body += i18n("Location: %1\n").arg( incidence->location() ); } return body; } @@ -3608,26 +3608,26 @@ bool IncidenceFormatter::MailBodyVisitor::visit( Event *event ) mResult = mailBodyIncidence( event ); mResult += i18n("Start Date: %1\n"). - tqarg( IncidenceFormatter::dateToString( event->dtStart(), true ) ); + arg( IncidenceFormatter::dateToString( event->dtStart(), true ) ); if ( !event->doesFloat() ) { mResult += i18n("Start Time: %1\n"). - tqarg( IncidenceFormatter::timeToString( event->dtStart(), true ) ); + arg( IncidenceFormatter::timeToString( event->dtStart(), true ) ); } if ( event->dtStart() != event->dtEnd() ) { mResult += i18n("End Date: %1\n"). - tqarg( IncidenceFormatter::dateToString( event->dtEnd(), true ) ); + arg( IncidenceFormatter::dateToString( event->dtEnd(), true ) ); } if ( !event->doesFloat() ) { mResult += i18n("End Time: %1\n"). - tqarg( IncidenceFormatter::timeToString( event->dtEnd(), true ) ); + arg( IncidenceFormatter::timeToString( event->dtEnd(), true ) ); } if ( event->doesRecur() ) { Recurrence *recur = event->recurrence(); // TODO: Merge these two to one of the form "Recurs every 3 days" mResult += i18n("Recurs: %1\n") - .tqarg( recurrence[ recur->recurrenceType() ] ); + .arg( recurrence[ recur->recurrenceType() ] ); mResult += i18n("Frequency: %1\n") - .tqarg( event->recurrence()->frequency() ); + .arg( event->recurrence()->frequency() ); if ( recur->duration() > 0 ) { mResult += i18n ("Repeats once", "Repeats %n times", recur->duration()); @@ -3641,7 +3641,7 @@ bool IncidenceFormatter::MailBodyVisitor::visit( Event *event ) } else { endstr = KGlobal::locale()->formatDateTime( recur->endDateTime() ); } - mResult += i18n("Repeat until: %1\n").tqarg( endstr ); + mResult += i18n("Repeat until: %1\n").arg( endstr ); } else { mResult += i18n("Repeats forever\n"); } @@ -3652,13 +3652,13 @@ bool IncidenceFormatter::MailBodyVisitor::visit( Event *event ) mResult += i18n("This recurring meeting has been cancelled on the following days:\n"); DateList::ConstIterator ex_iter; for ( ex_iter = exceptions.begin(); ex_iter != exceptions.end(); ++ex_iter ) { - mResult += i18n(" %1\n").tqarg( KGlobal::locale()->formatDate(* ex_iter ) ); + mResult += i18n(" %1\n").arg( KGlobal::locale()->formatDate(* ex_iter ) ); } } } TQString details = event->description(); if ( !details.isEmpty() ) { - mResult += i18n("Details:\n%1\n").tqarg( details ); + mResult += i18n("Details:\n%1\n").arg( details ); } return !mResult.isEmpty(); } @@ -3669,23 +3669,23 @@ bool IncidenceFormatter::MailBodyVisitor::visit( Todo *todo ) if ( todo->hasStartDate() ) { mResult += i18n("Start Date: %1\n"). - tqarg( IncidenceFormatter::dateToString( todo->dtStart( false ), true ) ); + arg( IncidenceFormatter::dateToString( todo->dtStart( false ), true ) ); if ( !todo->doesFloat() ) { mResult += i18n("Start Time: %1\n"). - tqarg( IncidenceFormatter::timeToString( todo->dtStart( false ),true ) ); + arg( IncidenceFormatter::timeToString( todo->dtStart( false ),true ) ); } } if ( todo->hasDueDate() ) { mResult += i18n("Due Date: %1\n"). - tqarg( IncidenceFormatter::dateToString( todo->dtDue(), true ) ); + arg( IncidenceFormatter::dateToString( todo->dtDue(), true ) ); if ( !todo->doesFloat() ) { mResult += i18n("Due Time: %1\n"). - tqarg( IncidenceFormatter::timeToString( todo->dtDue(), true ) ); + arg( IncidenceFormatter::timeToString( todo->dtDue(), true ) ); } } TQString details = todo->description(); if ( !details.isEmpty() ) { - mResult += i18n("Details:\n%1\n").tqarg( details ); + mResult += i18n("Details:\n%1\n").arg( details ); } return !mResult.isEmpty(); } @@ -3694,13 +3694,13 @@ bool IncidenceFormatter::MailBodyVisitor::visit( Journal *journal ) { mResult = mailBodyIncidence( journal ); mResult += i18n("Date: %1\n"). - tqarg( IncidenceFormatter::dateToString( journal->dtStart(), true ) ); + arg( IncidenceFormatter::dateToString( journal->dtStart(), true ) ); if ( !journal->doesFloat() ) { mResult += i18n("Time: %1\n"). - tqarg( IncidenceFormatter::timeToString( journal->dtStart(), true ) ); + arg( IncidenceFormatter::timeToString( journal->dtStart(), true ) ); } if ( !journal->description().isEmpty() ) - mResult += i18n("Text of the journal:\n%1\n").tqarg( journal->description() ); + mResult += i18n("Text of the journal:\n%1\n").arg( journal->description() ); return !mResult.isEmpty(); } @@ -3813,9 +3813,9 @@ TQString IncidenceFormatter::recurrenceString( Incidence *incidence ) case Recurrence::rMinutely: recurStr = i18n( "Recurs every minute", "Recurs every %n minutes", recur->frequency() ); if ( recur->duration() != -1 ) { - txt = i18n( "%1 until %2" ).tqarg( recurStr ).tqarg( recurEnd( incidence ) ); + txt = i18n( "%1 until %2" ).arg( recurStr ).arg( recurEnd( incidence ) ); if ( recur->duration() > 0 ) { - txt += i18n( " (%1 occurrences)" ).tqarg( recur->duration() ); + txt += i18n( " (%1 occurrences)" ).arg( recur->duration() ); } return txt; } @@ -3824,9 +3824,9 @@ TQString IncidenceFormatter::recurrenceString( Incidence *incidence ) case Recurrence::rHourly: recurStr = i18n( "Recurs hourly", "Recurs every %n hours", recur->frequency() ); if ( recur->duration() != -1 ) { - txt = i18n( "%1 until %2" ).tqarg( recurStr ).tqarg( recurEnd( incidence ) ); + txt = i18n( "%1 until %2" ).arg( recurStr ).arg( recurEnd( incidence ) ); if ( recur->duration() > 0 ) { - txt += i18n( " (%1 occurrences)" ).tqarg( recur->duration() ); + txt += i18n( " (%1 occurrences)" ).arg( recur->duration() ); } return txt; } @@ -3836,9 +3836,9 @@ TQString IncidenceFormatter::recurrenceString( Incidence *incidence ) recurStr = i18n( "Recurs daily", "Recurs every %n days", recur->frequency() ); if ( recur->duration() != -1 ) { - txt = i18n( "%1 until %2" ).tqarg( recurStr ).tqarg( recurEnd( incidence ) ); + txt = i18n( "%1 until %2" ).arg( recurStr ).arg( recurEnd( incidence ) ); if ( recur->duration() > 0 ) { - txt += i18n( " (%1 occurrences)" ).tqarg( recur->duration() ); + txt += i18n( " (%1 occurrences)" ).arg( recur->duration() ); } return txt; } @@ -3863,13 +3863,13 @@ TQString IncidenceFormatter::recurrenceString( Incidence *incidence ) } if ( recur->duration() != -1 ) { txt = i18n( "%1 on %2 until %3" ). - tqarg( recurStr ).tqarg( dayNames ).tqarg( recurEnd( incidence ) ); + arg( recurStr ).arg( dayNames ).arg( recurEnd( incidence ) ); if ( recur->duration() > 0 ) { - txt += i18n( " (%1 occurrences)" ).tqarg( recur->duration() ); + txt += i18n( " (%1 occurrences)" ).arg( recur->duration() ); } return txt; } - txt = i18n( "%1 on %2" ).tqarg( recurStr ).tqarg( dayNames ); + txt = i18n( "%1 on %2" ).arg( recurStr ).arg( dayNames ); return txt; } case Recurrence::rMonthlyPos: @@ -3880,19 +3880,19 @@ TQString IncidenceFormatter::recurrenceString( Incidence *incidence ) KCal::RecurrenceRule::WDayPos rule = recur->monthPositions()[0]; if ( recur->duration() != -1 ) { txt = i18n( "%1 on the %2 %3 until %4" ). - tqarg( recurStr ). - tqarg( dayList[rule.pos() + 31] ). - tqarg( calSys->weekDayName( rule.day(), false ) ). - tqarg( recurEnd( incidence ) ); + arg( recurStr ). + arg( dayList[rule.pos() + 31] ). + arg( calSys->weekDayName( rule.day(), false ) ). + arg( recurEnd( incidence ) ); if ( recur->duration() > 0 ) { - txt += i18n( " (%1 occurrences)" ).tqarg( recur->duration() ); + txt += i18n( " (%1 occurrences)" ).arg( recur->duration() ); } return txt; } txt = i18n( "%1 on the %2 %3" ). - tqarg( recurStr ). - tqarg( dayList[rule.pos() + 31] ). - tqarg( calSys->weekDayName( rule.day(), false ) ); + arg( recurStr ). + arg( dayList[rule.pos() + 31] ). + arg( calSys->weekDayName( rule.day(), false ) ); return txt; } else { return recurStr; @@ -3907,15 +3907,15 @@ TQString IncidenceFormatter::recurrenceString( Incidence *incidence ) int days = recur->monthDays()[0]; if ( recur->duration() != -1 ) { txt = i18n( "%1 on the %2 day until %3" ). - tqarg( recurStr ). - tqarg( dayList[days + 31] ). - tqarg( recurEnd( incidence ) ); + arg( recurStr ). + arg( dayList[days + 31] ). + arg( recurEnd( incidence ) ); if ( recur->duration() > 0 ) { - txt += i18n( " (%1 occurrences)" ).tqarg( recur->duration() ); + txt += i18n( " (%1 occurrences)" ).arg( recur->duration() ); } return txt; } - txt = i18n( "%1 on the %2 day" ).tqarg( recurStr ).tqarg( dayList[days + 31] ); + txt = i18n( "%1 on the %2 day" ).arg( recurStr ).arg( dayList[days + 31] ); return txt; } else { return recurStr; @@ -3929,33 +3929,33 @@ TQString IncidenceFormatter::recurrenceString( Incidence *incidence ) if ( recur->duration() != -1 ) { if ( !recur->yearDates().isEmpty() ) { txt = i18n( "%1 on %2 %3 until %4" ). - tqarg( recurStr ). - tqarg( calSys->monthName( recur->yearMonths()[0], recur->startDate().year() ) ). - tqarg( dayList[ recur->yearDates()[0] + 31 ] ). - tqarg( recurEnd( incidence ) ); + arg( recurStr ). + arg( calSys->monthName( recur->yearMonths()[0], recur->startDate().year() ) ). + arg( dayList[ recur->yearDates()[0] + 31 ] ). + arg( recurEnd( incidence ) ); if ( recur->duration() > 0 ) { - txt += i18n( " (%1 occurrences)" ).tqarg( recur->duration() ); + txt += i18n( " (%1 occurrences)" ).arg( recur->duration() ); } return txt; } } if ( !recur->yearDates().isEmpty() ) { txt = i18n( "%1 on %2 %3" ). - tqarg( recurStr ). - tqarg( calSys->monthName( recur->yearMonths()[0], recur->startDate().year() ) ). - tqarg( dayList[ recur->yearDates()[0] + 31 ] ); + arg( recurStr ). + arg( calSys->monthName( recur->yearMonths()[0], recur->startDate().year() ) ). + arg( dayList[ recur->yearDates()[0] + 31 ] ); return txt; } else { if ( !recur->yearMonths().isEmpty() ) { txt = i18n( "Recurs yearly on %1 %2" ). - tqarg( calSys->monthName( recur->yearMonths()[0], + arg( calSys->monthName( recur->yearMonths()[0], recur->startDate().year() ) ). - tqarg( dayList[ recur->startDate().day() + 31 ] ); + arg( dayList[ recur->startDate().day() + 31 ] ); } else { txt = i18n( "Recurs yearly on %1 %2" ). - tqarg( calSys->monthName( recur->startDate().month(), + arg( calSys->monthName( recur->startDate().month(), recur->startDate().year() ) ). - tqarg( dayList[ recur->startDate().day() + 31 ] ); + arg( dayList[ recur->startDate().day() + 31 ] ); } return txt; } @@ -3967,15 +3967,15 @@ TQString IncidenceFormatter::recurrenceString( Incidence *incidence ) if ( !recur->yearDays().isEmpty() ) { if ( recur->duration() != -1 ) { txt = i18n( "%1 on day %2 until %3" ). - tqarg( recurStr ). - tqarg( recur->yearDays()[0] ). - tqarg( recurEnd( incidence ) ); + arg( recurStr ). + arg( recur->yearDays()[0] ). + arg( recurEnd( incidence ) ); if ( recur->duration() > 0 ) { - txt += i18n( " (%1 occurrences)" ).tqarg( recur->duration() ); + txt += i18n( " (%1 occurrences)" ).arg( recur->duration() ); } return txt; } - txt = i18n( "%1 on day %2" ).tqarg( recurStr ).tqarg( recur->yearDays()[0] ); + txt = i18n( "%1 on day %2" ).arg( recurStr ).arg( recur->yearDays()[0] ); return txt; } else { return recurStr; @@ -3989,21 +3989,21 @@ TQString IncidenceFormatter::recurrenceString( Incidence *incidence ) KCal::RecurrenceRule::WDayPos rule = recur->yearPositions()[0]; if ( recur->duration() != -1 ) { txt = i18n( "%1 on the %2 %3 of %4 until %5" ). - tqarg( recurStr ). - tqarg( dayList[rule.pos() + 31] ). - tqarg( calSys->weekDayName( rule.day(), false ) ). - tqarg( calSys->monthName( recur->yearMonths()[0], recur->startDate().year() ) ). - tqarg( recurEnd( incidence ) ); + arg( recurStr ). + arg( dayList[rule.pos() + 31] ). + arg( calSys->weekDayName( rule.day(), false ) ). + arg( calSys->monthName( recur->yearMonths()[0], recur->startDate().year() ) ). + arg( recurEnd( incidence ) ); if ( recur->duration() > 0 ) { - txt += i18n( " (%1 occurrences)" ).tqarg( recur->duration() ); + txt += i18n( " (%1 occurrences)" ).arg( recur->duration() ); } return txt; } txt = i18n( "%1 on the %2 %3 of %4" ). - tqarg( recurStr ). - tqarg( dayList[rule.pos() + 31] ). - tqarg( calSys->weekDayName( rule.day(), false ) ). - tqarg( calSys->monthName( recur->yearMonths()[0], recur->startDate().year() ) ); + arg( recurStr ). + arg( dayList[rule.pos() + 31] ). + arg( calSys->weekDayName( rule.day(), false ) ). + arg( calSys->monthName( recur->yearMonths()[0], recur->startDate().year() ) ); return txt; } else { return recurStr; @@ -4184,18 +4184,18 @@ TQStringList IncidenceFormatter::reminderStringList( Incidence *incidence, bool } if ( offset == 0 ) { if ( !atStr.isEmpty() ) { - remStr = i18n( "reminder occurs at datetime", "at %1" ).tqarg( atStr ); + remStr = i18n( "reminder occurs at datetime", "at %1" ).arg( atStr ); } } else { - remStr = offsetStr.tqarg( secs2Duration( offset ) ); + remStr = offsetStr.arg( secs2Duration( offset ) ); } if ( alarm->repeatCount() > 0 ) { TQString countStr = i18n( "repeats once", "repeats %n times", alarm->repeatCount() ); TQString intervalStr = i18n( "interval is N days/hours/minutes", "interval is %1" ). - tqarg( secs2Duration( alarm->snoozeTime().asSeconds() ) ); + arg( secs2Duration( alarm->snoozeTime().asSeconds() ) ); TQString repeatStr = i18n( "(repeat string, interval string)", "(%1, %2)" ). - tqarg( countStr, intervalStr ); + arg( countStr, intervalStr ); remStr = remStr + ' ' + repeatStr; } diff --git a/libkcal/qtopiaformat.cpp b/libkcal/qtopiaformat.cpp index 7b7954b71..d417f9ea4 100644 --- a/libkcal/qtopiaformat.cpp +++ b/libkcal/qtopiaformat.cpp @@ -294,7 +294,7 @@ bool TQtopiaFormat::save( Calendar *calendar, const TQString &fileName ) TQFile file( fileName ); if (!file.open( IO_WriteOnly ) ) { setException(new ErrorFormat(ErrorFormat::SaveError, - i18n("Could not open file '%1'").tqarg(fileName))); + i18n("Could not open file '%1'").arg(fileName))); return false; } TQTextStream ts( &file ); diff --git a/libkcal/resourcecached.cpp b/libkcal/resourcecached.cpp index c61fa009d..dacab7e9d 100644 --- a/libkcal/resourcecached.cpp +++ b/libkcal/resourcecached.cpp @@ -689,12 +689,12 @@ void ResourceCached::addInfoText( TQString &txt ) const if ( mLastLoad.isValid() ) { txt += "<br>"; txt += i18n("Last loaded: %1") - .tqarg( KGlobal::locale()->formatDateTime( mLastLoad ) ); + .arg( KGlobal::locale()->formatDateTime( mLastLoad ) ); } if ( mLastSave.isValid() ) { txt += "<br>"; txt += i18n("Last saved: %1") - .tqarg( KGlobal::locale()->formatDateTime( mLastSave ) ); + .arg( KGlobal::locale()->formatDateTime( mLastSave ) ); } } diff --git a/libkcal/resourcecalendar.cpp b/libkcal/resourcecalendar.cpp index d398357d7..9f611e75e 100644 --- a/libkcal/resourcecalendar.cpp +++ b/libkcal/resourcecalendar.cpp @@ -74,7 +74,7 @@ TQString ResourceCalendar::infoText() const KRES::Factory *factory = KRES::Factory::self( "calendar" ); TQString t = factory->typeName( type() ); - txt += i18n("Type: %1").tqarg( t ); + txt += i18n("Type: %1").arg( t ); addInfoText( txt ); @@ -172,7 +172,7 @@ void ResourceCalendar::loadError( const TQString &err ) mReceivedLoadError = true; - TQString msg = i18n("Error while loading %1.\n") .tqarg( resourceName() ); + TQString msg = i18n("Error while loading %1.\n") .arg( resourceName() ); if ( !err.isEmpty() ) { msg += err; } @@ -209,7 +209,7 @@ void ResourceCalendar::saveError( const TQString &err ) mReceivedSaveError = true; - TQString msg = i18n("Error while saving %1.\n") .tqarg( resourceName() ); + TQString msg = i18n("Error while saving %1.\n") .arg( resourceName() ); if ( !err.isEmpty() ) { msg += err; } diff --git a/libkcal/resourcelocalconfig.cpp b/libkcal/resourcelocalconfig.cpp index e237037c2..50c909bf0 100644 --- a/libkcal/resourcelocalconfig.cpp +++ b/libkcal/resourcelocalconfig.cpp @@ -88,7 +88,7 @@ void ResourceLocalConfig::saveSettings( KRES::Resource *resource ) for( int i = 0; file.exists(); ++i ) file.setName( saveFolder + "/std" + TQString::number(i) + ".ics" ); - KMessageBox::information( this, i18n( "You did not specify a URL for this resource. Therefore, the resource will be saved in %1. It is still possible to change this location by editing the resource properties." ).tqarg( file.name() ) ); + KMessageBox::information( this, i18n( "You did not specify a URL for this resource. Therefore, the resource will be saved in %1. It is still possible to change this location by editing the resource properties." ).arg( file.name() ) ); url = file.name(); } diff --git a/libkcal/scheduler.cpp b/libkcal/scheduler.cpp index e0d44f530..6e3cf3850 100644 --- a/libkcal/scheduler.cpp +++ b/libkcal/scheduler.cpp @@ -60,7 +60,7 @@ TQString ScheduleMessage::statusName(ScheduleMessage::Status status) case RequestUpdate: return i18n("Updated Request"); default: - return i18n("Unknown Status: %1").tqarg(TQString::number(status)); + return i18n("Unknown Status: %1").arg(TQString::number(status)); } } @@ -576,7 +576,7 @@ bool Scheduler::acceptReply(IncidenceBase *incidence,ScheduleMessage::Status /* if (attIn->email().lower()==attEv->email().lower()) { //update attendee-info kdDebug(5800) << "Scheduler::acceptTransaction update attendee" << endl; - attEv->seStatus(attIn->status()); + attEv->setStatus(attIn->status()); attEv->setDelegate(attIn->delegate()); attEv->setDelegator(attIn->delegator()); ret = true; @@ -590,12 +590,12 @@ bool Scheduler::acceptReply(IncidenceBase *incidence,ScheduleMessage::Status /* bool attendeeAdded = false; for ( Attendee::List::ConstIterator it = attendeesNew.constBegin(); it != attendeesNew.constEnd(); ++it ) { Attendee* attNew = *it; - TQString msg = i18n("%1 wants to attend %2 but was not invited.").tqarg( attNew->fullName() ) - .tqarg( ev ? ev->summary() : to->summary() ); + TQString msg = i18n("%1 wants to attend %2 but was not invited.").arg( attNew->fullName() ) + .arg( ev ? ev->summary() : to->summary() ); if ( !attNew->delegator().isEmpty() ) - msg = i18n("%1 wants to attend %2 on behalf of %3.").tqarg( attNew->fullName() ) - .tqarg( ev ? ev->summary() : to->summary() ) - .tqarg( attNew->delegator() ); + msg = i18n("%1 wants to attend %2 on behalf of %3.").arg( attNew->fullName() ) + .arg( ev ? ev->summary() : to->summary() ) + .arg( attNew->delegator() ); if ( KMessageBox::questionYesNo( 0, msg, i18n("Uninvited attendee"), KGuiItem(i18n("Accept Attendance")), KGuiItem(i18n("Reject Attendance")) ) != KMessageBox::Yes ) diff --git a/libkcal/vcalformat.cpp b/libkcal/vcalformat.cpp index 8335ee769..9c7a0f1cd 100644 --- a/libkcal/vcalformat.cpp +++ b/libkcal/vcalformat.cpp @@ -722,7 +722,7 @@ Todo *VCalFormat::VTodoToEvent(VObject *vtodo) a->setRSVP(vObjectStringZValue(vp)); // is there a status property? if ((vp = isAPropertyOf(vo, VCStatusProp)) != 0) - a->seStatus(readStatus(vObjectStringZValue(vp))); + a->setStatus(readStatus(vObjectStringZValue(vp))); // add the attendee anEvent->addAttendee(a); } @@ -937,7 +937,7 @@ Event* VCalFormat::VEventToEvent(VObject *vevent) a->setRSVP(vObjectStringZValue(vp)); // is there a status property? if ((vp = isAPropertyOf(vo, VCStatusProp)) != 0) - a->seStatus(readStatus(vObjectStringZValue(vp))); + a->setStatus(readStatus(vObjectStringZValue(vp))); // add the attendee anEvent->addAttendee(a); } @@ -1210,10 +1210,10 @@ Event* VCalFormat::VEventToEvent(VObject *vevent) TQString tmpStr(s = fakeCString(vObjectUStringZValue(vo))); deleteStr(s); // TODO: Define Event status -// anEvent->seStatus(tmpStr); +// anEvent->setStatus(tmpStr); } else -// anEvent->seStatus("NEEDS ACTION"); +// anEvent->setStatus("NEEDS ACTION"); #endif // secrecy diff --git a/libkcal/versit/readme.txt b/libkcal/versit/readme.txt index e51acb6dd..f5529dd35 100644 --- a/libkcal/versit/readme.txt +++ b/libkcal/versit/readme.txt @@ -228,9 +228,9 @@ Use the API isAPropertyOf() to query if a name match the name of VObject tree can be pretty printed with the printVObject() function. The output of pretty printing a VObject representation of the input test file "vobject.vcf" is shown below. Note that the indentation -indicates the tree hirerarchy where the immediate tqchildren nodes +indicates the tree hirerarchy where the immediate children nodes of a parent node is all at the same indentation level and the -immediate tqchildren nodes are the immediate properties of the +immediate children nodes are the immediate properties of the associated parent nodes. In the following, {N,FN,ORG,TITLE,...} are immediate properties of VCARD. {F and G} are properties of N with value {"Alden" and "Roland"} respectively; FN has no property diff --git a/libkmime/kmime_headers.cpp b/libkmime/kmime_headers.cpp index 3a454551d..649e1e614 100644 --- a/libkmime/kmime_headers.cpp +++ b/libkmime/kmime_headers.cpp @@ -1174,7 +1174,7 @@ void References::append(const TQCString &s) for (int i=1;i<=3;i++) { // include the last three ids if (!lst.isEmpty()) { temp = lst.last(); - r_ef.insert(insPos,(TQString(" %1").tqarg(temp)).latin1()); + r_ef.insert(insPos,(TQString(" %1").arg(temp)).latin1()); lst.remove(temp); } else break; @@ -1183,7 +1183,7 @@ void References::append(const TQCString &s) while (!lst.isEmpty()) { // now insert the rest, up to 1000 characters temp = lst.last(); if ((15+r_ef.length()+temp.length())<1000) { - r_ef.insert(insPos,(TQString(" %1").tqarg(temp)).latin1()); + r_ef.insert(insPos,(TQString(" %1").arg(temp)).latin1()); lst.remove(temp); } else return; diff --git a/libkmime/kmime_parsers.cpp b/libkmime/kmime_parsers.cpp index bd07c2375..202ce4bf4 100644 --- a/libkmime/kmime_parsers.cpp +++ b/libkmime/kmime_parsers.cpp @@ -391,7 +391,7 @@ bool YENCEncoded::parse() ch+=256; if (totalSize>=yencSize) break; - binary.tqat(totalSize++)=ch; + binary.at(totalSize++)=ch; lineLength++; } else @@ -404,7 +404,7 @@ bool YENCEncoded::parse() ch+=256; if (totalSize>=yencSize) break; - binary.tqat(totalSize++)=ch; + binary.at(totalSize++)=ch; lineLength++; pos++; } diff --git a/libkmime/kmime_util.cpp b/libkmime/kmime_util.cpp index eecf1ba09..d4c8943fc 100644 --- a/libkmime/kmime_util.cpp +++ b/libkmime/kmime_util.cpp @@ -72,7 +72,7 @@ bool isUsAscii(const TQString &s) { uint sLength = s.length(); for (uint i=0; i<sLength; i++) - if (s.tqat(i).latin1()<=0) // c==0: non-latin1, c<0: non-us-ascii + if (s.at(i).latin1()<=0) // c==0: non-latin1, c<0: non-us-ascii return false; return true; @@ -683,14 +683,14 @@ DateFormatter::fancy(time_t otime) const if ( diff < 24 * 60 * 60 ) { if ( old.date().year() == mDate.date().year() && old.date().dayOfYear() == mDate.date().dayOfYear() ) - return i18n( "Today %1" ).tqarg( locale-> + return i18n( "Today %1" ).arg( locale-> formatTime( old.time(), true ) ); } if ( diff < 2 * 24 * 60 * 60 ) { TQDateTime yesterday( mDate.addDays( -1 ) ); if ( old.date().year() == yesterday.date().year() && old.date().dayOfYear() == yesterday.date().dayOfYear() ) - return i18n( "Yesterday %1" ).tqarg( locale-> + return i18n( "Yesterday %1" ).arg( locale-> formatTime( old.time(), true) ); } for ( int i = 3; i < 7; i++ ) diff --git a/libkpgp/kpgp.cpp b/libkpgp/kpgp.cpp index 6035112c8..08557a727 100644 --- a/libkpgp/kpgp.cpp +++ b/libkpgp/kpgp.cpp @@ -313,7 +313,7 @@ Module::clearsign( Block& block, Kpgp::Result Module::encrypt( Block& block, - const TQStringList& tqreceivers, const KeyID& keyId, + const TQStringList& receivers, const KeyID& keyId, bool sign, const TQCString& charset ) { KeyIDList encryptionKeyIds; // list of keys which are used for encryption @@ -324,8 +324,8 @@ Module::encrypt( Block& block, setUser( keyId ); - if( !tqreceivers.empty() ) { - Kpgp::Result result = getEncryptionKeys( encryptionKeyIds, tqreceivers, + if( !receivers.empty() ) { + Kpgp::Result result = getEncryptionKeys( encryptionKeyIds, receivers, keyId ); if( Kpgp::Ok != result ) { return result; @@ -371,7 +371,7 @@ Module::encrypt( Block& block, TQString str = i18n("%1 = 'signing failed' error message", "%1\nDo you want to send the message unsigned, " "or cancel sending the message?") - .tqarg( pgp->lastErrorMessage() ); + .arg( pgp->lastErrorMessage() ); TQApplication::setOverrideCursor( TQCursor(TQCursor::ArrowCursor) ); int ret = KMessageBox::warningContinueCancel( 0, str, i18n("PGP Warning"), @@ -389,7 +389,7 @@ Module::encrypt( Block& block, TQString str = i18n("%1 = 'bad keys' error message", "%1\nDo you want to encrypt anyway, leave the " "message as-is, or cancel sending the message?") - .tqarg( pgp->lastErrorMessage() ); + .arg( pgp->lastErrorMessage() ); TQApplication::setOverrideCursor( TQCursor(TQCursor::ArrowCursor) ); int ret = KMessageBox::warningYesNoCancel( 0, str, @@ -416,7 +416,7 @@ Module::encrypt( Block& block, TQString str = i18n("%1 = 'missing keys' error message", "%1\nDo you want to leave the message as-is, " "or cancel sending the message?") - .tqarg( pgp->lastErrorMessage() ); + .arg( pgp->lastErrorMessage() ); TQApplication::setOverrideCursor( TQCursor(TQCursor::ArrowCursor) ); int ret = KMessageBox::warningContinueCancel( 0, str, i18n("PGP Warning"), @@ -432,10 +432,10 @@ Module::encrypt( Block& block, if( status & ERROR ) { // show error dialog errMsg = i18n( "The following error occurred:\n%1" ) - .tqarg( pgp->lastErrorMessage() ); + .arg( pgp->lastErrorMessage() ); TQString details = i18n( "This is the error message of %1:\n%2" ) - .tqarg( ( pgpType == tGPG ) ? "GnuPG" : "PGP" ) - .tqarg( block.error().data() ); + .arg( ( pgpType == tGPG ) ? "GnuPG" : "PGP" ) + .arg( block.error().data() ); TQApplication::setOverrideCursor( TQCursor(TQCursor::ArrowCursor) ); KMessageBox::detailedSorry( 0, errMsg, details ); TQApplication::restoreOverrideCursor(); @@ -1216,7 +1216,7 @@ Module::getEncryptionKeys( const TQString& person ) "encryption key(s) for \"%1\".\n\n" "Please re-select the key(s) which should " "be used for this recipient." - ).tqarg(person), + ).arg(person), keyIds, allowedKeys ); if( !keyIds.isEmpty() ) { @@ -1280,7 +1280,7 @@ Module::getEncryptionKeys( const TQString& person ) "found for \"%1\".\n\n" "Select the key(s) which should " "be used for this recipient." - ).tqarg(person), + ).arg(person), KeyIDList(), allowedKeys ); if( !keyIds.isEmpty() ) { @@ -1305,7 +1305,7 @@ Module::getEncryptionKeys( const TQString& person ) "More than one key matches \"%1\".\n\n" "Select the key(s) which should " "be used for this recipient." - ).tqarg(person), + ).arg(person), KeyIDList(), allowedKeys ); if( !keyIds.isEmpty() ) { @@ -1744,7 +1744,7 @@ Module::readAddressData() addressDataDict.clear(); for( int i=1; i<=num; i++ ) { - KConfigGroup addrGroup( config, TQString("Address #%1").tqarg(i).local8Bit() ); + KConfigGroup addrGroup( config, TQString("Address #%1").arg(i).local8Bit() ); address = addrGroup.readEntry( "Address" ); data.keyIds = KeyIDList::fromStringList( addrGroup.readListEntry( "Key IDs" ) ); data.encrPref = (EncryptPref) addrGroup.readNumEntry( "EncryptionPreference", @@ -1769,7 +1769,7 @@ Module::writeAddressData() for ( i=1, it = addressDataDict.begin(); it != addressDataDict.end(); ++it, i++ ) { - KConfigGroup addrGroup( config, TQString("Address #%1").tqarg(i).local8Bit() ); + KConfigGroup addrGroup( config, TQString("Address #%1").arg(i).local8Bit() ); addrGroup.writeEntry( "Address", it.key() ); addrGroup.writeEntry( "Key IDs", it.data().keyIds.toStringList() ); addrGroup.writeEntry( "EncryptionPreference", it.data().encrPref ); diff --git a/libkpgp/kpgp.h b/libkpgp/kpgp.h index f9f492360..967254b6b 100644 --- a/libkpgp/kpgp.h +++ b/libkpgp/kpgp.h @@ -123,7 +123,7 @@ public: Ok if everything is o.k. */ Kpgp::Result encrypt( Block& block, - const TQStringList& tqreceivers, const KeyID& keyId, + const TQStringList& receivers, const KeyID& keyId, bool sign, const TQCString& charset = 0 ); /** Determines the keys which should be used for encrypting the message diff --git a/libkpgp/kpgpbase2.cpp b/libkpgp/kpgpbase2.cpp index 4ba4043f4..fdafa130e 100644 --- a/libkpgp/kpgpbase2.cpp +++ b/libkpgp/kpgpbase2.cpp @@ -66,7 +66,7 @@ Base2::encsign( Block& block, const KeyIDList& recipients, const char *passphrase ) { TQCString cmd; - int exiStatus = 0; + int exitStatus = 0; if(!recipients.isEmpty() && passphrase != 0) cmd = PGP2 " +batchmode +language=en +verbose=1 -seat"; @@ -100,12 +100,12 @@ Base2::encsign( Block& block, const KeyIDList& recipients, clear(); input = block.text(); - exiStatus = run(cmd.data(), passphrase); + exitStatus = run(cmd.data(), passphrase); if( !output.isEmpty() ) block.setProcessedText( output ); block.setError( error ); - if(exiStatus != 0) + if(exitStatus != 0) status = ERROR; #if 0 @@ -139,12 +139,12 @@ Base2::encsign( Block& block, const KeyIDList& recipients, errMsg = i18n("Could not find public keys matching the userid(s)\n" "%1;\n" "the message is not encrypted.") - .tqarg( badkeys.data() ); + .arg( badkeys.data() ); else errMsg = i18n("Could not find public keys matching the userid(s)\n" "%1;\n" "these persons will not be able to read the message.") - .tqarg( badkeys.data() ); + .arg( badkeys.data() ); status |= MISSINGKEY; status |= ERROR; } @@ -171,13 +171,13 @@ Base2::encsign( Block& block, const KeyIDList& recipients, "for userid(s)\n" "%1.\n" "The message is not encrypted.") - .tqarg( badkeys.data() ); + .arg( badkeys.data() ); else errMsg = i18n("Public keys not certified with trusted signature " "for userid(s)\n" "%1;\n" "these persons will not be able to read the message.") - .tqarg( badkeys.data() ); + .arg( badkeys.data() ); status |= BADKEYS; status |= ERROR; return status; @@ -218,7 +218,7 @@ Base2::encsign( Block& block, const KeyIDList& recipients, } //kdDebug(5100) << "status = " << status << endl; - block.seStatus( status ); + block.setStatus( status ); return status; } @@ -227,11 +227,11 @@ int Base2::decrypt( Block& block, const char *passphrase ) { int index, index2; - int exiStatus = 0; + int exitStatus = 0; clear(); input = block.text(); - exiStatus = run(PGP2 " +batchmode +language=en -f", passphrase); + exitStatus = run(PGP2 " +batchmode +language=en -f", passphrase); if( !output.isEmpty() ) block.setProcessedText( output ); block.setError( error ); @@ -249,16 +249,16 @@ Base2::decrypt( Block& block, const char *passphrase ) index1 = input.find('\n', index1); index2 = input.find("\n\n", index1); input.remove(index1, index2 - index1); - exiStatus = run(PGP2 " +batchmode +language=en -f", passphrase); + exitStatus = run(PGP2 " +batchmode +language=en -f", passphrase); if( !output.isEmpty() ) block.setProcessedText( output ); block.setError( error ); } - if(exiStatus == -1) { + if(exitStatus == -1) { errMsg = i18n("error running PGP"); status = RUN_ERR; - block.seStatus( status ); + block.setStatus( status ); return status; } @@ -448,7 +448,7 @@ Base2::decrypt( Block& block, const char *passphrase ) index = error.find('\'', index) + 1; index2 = error.find('\'', index); block.setSignatureUserId( i18n("The keyring file %1 does not exist.\n" - "Please check your PGP setup.").tqarg(TQString(error.mid(index, index2-index))) ); + "Please check your PGP setup.").arg(TQString(error.mid(index, index2-index))) ); } else { @@ -457,7 +457,7 @@ Base2::decrypt( Block& block, const char *passphrase ) } } //kdDebug(5100) << "status = " << status << endl; - block.seStatus( status ); + block.setStatus( status ); return status; } @@ -467,13 +467,13 @@ Base2::readPublicKey( const KeyID& keyID, const bool readTrust /* = false */, Key* key /* = 0 */ ) { - int exiStatus = 0; + int exitStatus = 0; status = 0; - exiStatus = run( PGP2 " +batchmode +language=en +verbose=0 -kvc -f 0x" + + exitStatus = run( PGP2 " +batchmode +language=en +verbose=0 -kvc -f 0x" + keyID, 0, true ); - if(exiStatus != 0) { + if(exitStatus != 0) { status = ERROR; return 0; } @@ -487,10 +487,10 @@ Base2::readPublicKey( const KeyID& keyID, if( readTrust ) { - exiStatus = run( PGP2 " +batchmode +language=en +verbose=0 -kc -f", + exitStatus = run( PGP2 " +batchmode +language=en +verbose=0 -kc -f", 0, true ); - if(exiStatus != 0) { + if(exitStatus != 0) { status = ERROR; return 0; } @@ -512,14 +512,14 @@ Base2::publicKeys( const TQStringList & patterns ) KeyList Base2::doGetPublicKeys( const TQCString & cmd, const TQStringList & patterns ) { - int exiStatus = 0; + int exitStatus = 0; KeyList publicKeys; status = 0; if ( patterns.isEmpty() ) { - exiStatus = run( cmd, 0, true ); + exitStatus = run( cmd, 0, true ); - if ( exiStatus != 0 ) { + if ( exitStatus != 0 ) { status = ERROR; return KeyList(); } @@ -533,10 +533,10 @@ Base2::doGetPublicKeys( const TQCString & cmd, const TQStringList & patterns ) for ( TQStringList::ConstIterator it = patterns.begin(); it != patterns.end(); ++it ) { - exiStatus = run( cmd + " " + KProcess::quote( *it ).local8Bit(), + exitStatus = run( cmd + " " + KProcess::quote( *it ).local8Bit(), 0, true ); - if ( exiStatus != 0 ) { + if ( exitStatus != 0 ) { status = ERROR; return KeyList(); } @@ -576,16 +576,16 @@ int Base2::signKey(const KeyID& keyID, const char *passphrase) { TQCString cmd; - int exiStatus = 0; + int exitStatus = 0; cmd = PGP2 " +batchmode +language=en -ks -f "; cmd += addUserId(); cmd += " 0x" + keyID; status = 0; - exiStatus = run(cmd.data(),passphrase); + exitStatus = run(cmd.data(),passphrase); - if (exiStatus != 0) + if (exitStatus != 0) status = ERROR; return status; @@ -594,16 +594,16 @@ Base2::signKey(const KeyID& keyID, const char *passphrase) TQCString Base2::getAsciiPublicKey(const KeyID& keyID) { - int exiStatus = 0; + int exitStatus = 0; if (keyID.isEmpty()) return TQCString(); status = 0; - exiStatus = run( PGP2 " +batchmode +force +language=en -kxaf 0x" + keyID, + exitStatus = run( PGP2 " +batchmode +force +language=en -kxaf 0x" + keyID, 0, true ); - if(exiStatus != 0) { + if(exitStatus != 0) { status = ERROR; return TQCString(); } diff --git a/libkpgp/kpgpbase5.cpp b/libkpgp/kpgpbase5.cpp index 52a70f01d..0e5837326 100644 --- a/libkpgp/kpgpbase5.cpp +++ b/libkpgp/kpgpbase5.cpp @@ -66,7 +66,7 @@ Base5::encsign( Block& block, const KeyIDList& recipients, const char *passphrase ) { TQCString cmd; - int exiStatus = 0; + int exitStatus = 0; int index; // used to work around a bug in pgp5. pgp5 treats files // with non ascii chars (umlauts, etc...) as binary files, but @@ -116,10 +116,10 @@ Base5::encsign( Block& block, const KeyIDList& recipients, } //We have to do this otherwise it's all in vain - exiStatus = run(cmd.data(), passphrase); + exitStatus = run(cmd.data(), passphrase); block.setError( error ); - if(exiStatus != 0) + if(exitStatus != 0) status = ERROR; // now parse the returned info @@ -156,7 +156,7 @@ Base5::encsign( Block& block, const KeyIDList& recipients, else errMsg = i18n("The following key(s) are not trusted:\n%1\n" "Their owner(s) will not be able to decrypt the message.") - .tqarg(TQString(aStr)); + .arg(TQString(aStr)); status |= ERROR; status |= BADKEYS; } @@ -167,9 +167,9 @@ Base5::encsign( Block& block, const KeyIDList& recipients, int index2 = error.find('\n',index); errMsg = i18n("Missing encryption key(s) for:\n%1") - .tqarg(TQString(error.mid(index,index2-index))); + .arg(TQString(error.mid(index,index2-index))); // errMsg = TQString("Missing encryption key(s) for: %1") -// .tqarg(error.mid(index,index2-index)); +// .arg(error.mid(index,index2-index)); status |= ERROR; status |= MISSINGKEY; } @@ -185,7 +185,7 @@ Base5::encsign( Block& block, const KeyIDList& recipients, } block.setProcessedText( output ); - block.seStatus( status ); + block.setStatus( status ); return status; } @@ -193,19 +193,19 @@ Base5::encsign( Block& block, const KeyIDList& recipients, int Base5::decrypt( Block& block, const char *passphrase ) { - int exiStatus = 0; + int exitStatus = 0; clear(); input = block.text(); - exiStatus = run("pgpv -f +batchmode=1", passphrase); + exitStatus = run("pgpv -f +batchmode=1", passphrase); if( !output.isEmpty() ) block.setProcessedText( output ); block.setError( error ); - if(exiStatus == -1) { + if(exitStatus == -1) { errMsg = i18n("Error running PGP"); status = RUN_ERR; - block.seStatus( status ); + block.setStatus( status ); return status; } @@ -313,7 +313,7 @@ Base5::decrypt( Block& block, const char *passphrase ) } //kdDebug(5100) << "status = " << status << endl; - block.seStatus( status ); + block.setStatus( status ); return status; } @@ -321,12 +321,12 @@ Base5::decrypt( Block& block, const char *passphrase ) Key* Base5::readPublicKey( const KeyID& keyId, const bool readTrust, Key* key ) { - int exiStatus = 0; + int exitStatus = 0; status = 0; - exiStatus = run( "pgpk -ll 0x" + keyId, 0, true ); + exitStatus = run( "pgpk -ll 0x" + keyId, 0, true ); - if(exiStatus != 0) { + if(exitStatus != 0) { status = ERROR; return 0; } @@ -340,9 +340,9 @@ Base5::readPublicKey( const KeyID& keyId, const bool readTrust, Key* key ) if( readTrust ) { - exiStatus = run( "pgpk -c 0x" + keyId, 0, true ); + exitStatus = run( "pgpk -c 0x" + keyId, 0, true ); - if(exiStatus != 0) { + if(exitStatus != 0) { status = ERROR; return 0; } @@ -357,7 +357,7 @@ Base5::readPublicKey( const KeyID& keyId, const bool readTrust, Key* key ) KeyList Base5::publicKeys( const TQStringList & patterns ) { - int exiStatus = 0; + int exitStatus = 0; TQCString cmd = "pgpk -ll"; for ( TQStringList::ConstIterator it = patterns.begin(); @@ -366,9 +366,9 @@ Base5::publicKeys( const TQStringList & patterns ) cmd += KProcess::quote( *it ).local8Bit(); } status = 0; - exiStatus = run( cmd, 0, true ); + exitStatus = run( cmd, 0, true ); - if(exiStatus != 0) { + if(exitStatus != 0) { status = ERROR; return KeyList(); } @@ -386,7 +386,7 @@ Base5::publicKeys( const TQStringList & patterns ) KeyList Base5::secretKeys( const TQStringList & patterns ) { - int exiStatus = 0; + int exitStatus = 0; status = 0; TQCString cmd = "pgpk -ll"; @@ -396,9 +396,9 @@ Base5::secretKeys( const TQStringList & patterns ) cmd += KProcess::quote( *it ).local8Bit(); } status = 0; - exiStatus = run( cmd, 0, true ); + exitStatus = run( cmd, 0, true ); - if(exiStatus != 0) { + if(exitStatus != 0) { status = ERROR; return KeyList(); } @@ -415,15 +415,15 @@ Base5::secretKeys( const TQStringList & patterns ) TQCString Base5::getAsciiPublicKey(const KeyID& keyID) { - int exiStatus = 0; + int exitStatus = 0; if (keyID.isEmpty()) return TQCString(); status = 0; - exiStatus = run( "pgpk -xa 0x" + keyID, 0, true ); + exitStatus = run( "pgpk -xa 0x" + keyID, 0, true ); - if(exiStatus != 0) { + if(exitStatus != 0) { status = ERROR; return TQCString(); } @@ -436,7 +436,7 @@ int Base5::signKey(const KeyID& keyID, const char *passphrase) { TQCString cmd; - int exiStatus = 0; + int exitStatus = 0; if(passphrase == 0) return false; @@ -445,9 +445,9 @@ Base5::signKey(const KeyID& keyID, const char *passphrase) cmd += addUserId(); status = 0; - exiStatus = run(cmd.data(), passphrase); + exitStatus = run(cmd.data(), passphrase); - if (exiStatus != 0) + if (exitStatus != 0) status = ERROR; return status; diff --git a/libkpgp/kpgpbase6.cpp b/libkpgp/kpgpbase6.cpp index 0b5073931..7fada7cc6 100644 --- a/libkpgp/kpgpbase6.cpp +++ b/libkpgp/kpgpbase6.cpp @@ -49,19 +49,19 @@ int Base6::decrypt( Block& block, const char *passphrase ) { int index, index2; - int exiStatus = 0; + int exitStatus = 0; clear(); input = block.text(); - exiStatus = run( PGP6 " +batchmode +language=C -f", passphrase); + exitStatus = run( PGP6 " +batchmode +language=C -f", passphrase); if( !output.isEmpty() ) block.setProcessedText( output ); block.setError( error ); - if(exiStatus == -1) { + if(exitStatus == -1) { errMsg = i18n("error running PGP"); status = RUN_ERR; - block.seStatus( status ); + block.setStatus( status ); return status; } @@ -180,7 +180,7 @@ Base6::decrypt( Block& block, const char *passphrase ) } } //kdDebug(5100) << "status = " << status << endl; - block.seStatus( status ); + block.setStatus( status ); return status; } @@ -190,13 +190,13 @@ Base6::readPublicKey( const KeyID& keyID, const bool readTrust /* = false */, Key* key /* = 0 */ ) { - int exiStatus = 0; + int exitStatus = 0; status = 0; - exiStatus = run( PGP6 " +batchmode -compatible +verbose=0 +language=C -kvvc " + exitStatus = run( PGP6 " +batchmode -compatible +verbose=0 +language=C -kvvc " "0x" + keyID, 0, true ); - if(exiStatus != 0) { + if(exitStatus != 0) { status = ERROR; return 0; } @@ -210,10 +210,10 @@ Base6::readPublicKey( const KeyID& keyID, if( readTrust ) { - exiStatus = run( PGP6 " +batchmode -compatible +verbose=0 +language=C -kc " + exitStatus = run( PGP6 " +batchmode -compatible +verbose=0 +language=C -kc " "0x" + keyID, 0, true ); - if(exiStatus != 0) { + if(exitStatus != 0) { status = ERROR; return 0; } @@ -238,13 +238,13 @@ TQStrList Base6::pubKeys() { int index, index2; - int exiStatus = 0; + int exitStatus = 0; int compatibleMode = 1; status = 0; - exiStatus = run("pgp +batchmode +language=C -kv -f"); + exitStatus = run("pgp +batchmode +language=C -kv -f"); - if(exiStatus != 0) { + if(exitStatus != 0) { status = ERROR; return 0; } @@ -319,9 +319,9 @@ Base6::pubKeys() } // Also look for pgp key groups - exiStatus = run("pgp +batchmode +language=C -gv -f"); + exitStatus = run("pgp +batchmode +language=C -gv -f"); - if(exiStatus != 0) { + if(exitStatus != 0) { status = ERROR; return 0; } @@ -352,11 +352,11 @@ Base6::secretKeys( const TQStringList & patterns ) int Base6::isVersion6() { - int exiStatus = 0; + int exitStatus = 0; - exiStatus = run( PGP6, 0, true ); + exitStatus = run( PGP6, 0, true ); - if(exiStatus == -1) { + if(exitStatus == -1) { errMsg = i18n("error running PGP"); status = RUN_ERR; return 0; diff --git a/libkpgp/kpgpbaseG.cpp b/libkpgp/kpgpbaseG.cpp index adbc84b98..a6af30538 100644 --- a/libkpgp/kpgpbaseG.cpp +++ b/libkpgp/kpgpbaseG.cpp @@ -73,7 +73,7 @@ BaseG::encsign( Block& block, const KeyIDList& recipients, const char *passphrase ) { TQCString cmd; - int exiStatus = 0; + int exitStatus = 0; if(!recipients.isEmpty() && passphrase != 0) cmd = "--batch --armor --sign --encrypt --textmode"; @@ -109,12 +109,12 @@ BaseG::encsign( Block& block, const KeyIDList& recipients, clear(); input = block.text(); - exiStatus = runGpg(cmd.data(), passphrase); + exitStatus = runGpg(cmd.data(), passphrase); if( !output.isEmpty() ) block.setProcessedText( output ); block.setError( error ); - if( exiStatus != 0 ) + if( exitStatus != 0 ) { // this error message is later hopefully overwritten errMsg = i18n( "Unknown error." ); @@ -153,12 +153,12 @@ BaseG::encsign( Block& block, const KeyIDList& recipients, errMsg = i18n("Could not find public keys matching the userid(s)\n" "%1;\n" "the message is not encrypted.") - .tqarg( badkeys.data() ); + .arg( badkeys.data() ); else errMsg = i18n("Could not find public keys matching the userid(s)\n" "%1;\n" "these persons will not be able to read the message.") - .tqarg( badkeys.data() ); + .arg( badkeys.data() ); status |= MISSINGKEY; status |= ERROR; } @@ -199,7 +199,7 @@ BaseG::encsign( Block& block, const KeyIDList& recipients, } //kdDebug(5100) << "status = " << status << endl; - block.seStatus( status ); + block.setStatus( status ); return status; } @@ -208,19 +208,19 @@ int BaseG::decrypt( Block& block, const char *passphrase ) { int index, index2; - int exiStatus = 0; + int exitStatus = 0; clear(); input = block.text(); - exiStatus = runGpg("--batch --decrypt", passphrase); + exitStatus = runGpg("--batch --decrypt", passphrase); if( !output.isEmpty() && ( error.find( "gpg: quoted printable" ) == -1 ) ) block.setProcessedText( output ); block.setError( error ); - if(exiStatus == -1) { + if(exitStatus == -1) { errMsg = i18n("Error running gpg"); status = RUN_ERR; - block.seStatus( status ); + block.setStatus( status ); return status; } @@ -361,7 +361,7 @@ BaseG::decrypt( Block& block, const char *passphrase ) } } //kdDebug(5100) << "status = " << status << endl; - block.seStatus( status ); + block.setStatus( status ); return status; } @@ -371,15 +371,15 @@ BaseG::readPublicKey( const KeyID& keyID, const bool readTrust /* = false */, Key* key /* = 0 */ ) { - int exiStatus = 0; + int exitStatus = 0; status = 0; if( readTrust ) - exiStatus = runGpg( "--batch --list-public-keys --with-fingerprint --with-colons --fixed-list-mode 0x" + keyID, 0, true ); + exitStatus = runGpg( "--batch --list-public-keys --with-fingerprint --with-colons --fixed-list-mode 0x" + keyID, 0, true ); else - exiStatus = runGpg( "--batch --list-public-keys --with-fingerprint --with-colons --fixed-list-mode --no-expensive-trust-checks 0x" + keyID, 0, true ); + exitStatus = runGpg( "--batch --list-public-keys --with-fingerprint --with-colons --fixed-list-mode --no-expensive-trust-checks 0x" + keyID, 0, true ); - if(exiStatus != 0) { + if(exitStatus != 0) { status = ERROR; return 0; } @@ -405,7 +405,7 @@ BaseG::readPublicKey( const KeyID& keyID, KeyList BaseG::publicKeys( const TQStringList & patterns ) { - int exiStatus = 0; + int exitStatus = 0; // the option --with-colons should be used for interprocess communication // with gpg (according to Werner Koch) @@ -417,9 +417,9 @@ BaseG::publicKeys( const TQStringList & patterns ) cmd += KProcess::quote( *it ).local8Bit(); } status = 0; - exiStatus = runGpg( cmd, 0, true ); + exitStatus = runGpg( cmd, 0, true ); - if(exiStatus != 0) { + if(exitStatus != 0) { status = ERROR; return KeyList(); } @@ -437,7 +437,7 @@ BaseG::publicKeys( const TQStringList & patterns ) KeyList BaseG::secretKeys( const TQStringList & patterns ) { - int exiStatus = 0; + int exitStatus = 0; // the option --with-colons should be used for interprocess communication // with gpg (according to Werner Koch) @@ -449,9 +449,9 @@ BaseG::secretKeys( const TQStringList & patterns ) cmd += KProcess::quote( *it ).local8Bit(); } status = 0; - exiStatus = runGpg( cmd, 0, true ); + exitStatus = runGpg( cmd, 0, true ); - if(exiStatus != 0) { + if(exitStatus != 0) { status = ERROR; return KeyList(); } @@ -470,7 +470,7 @@ int BaseG::signKey(const KeyID& keyID, const char *passphrase) { TQCString cmd; - int exiStatus = 0; + int exitStatus = 0; cmd = "--batch"; cmd += addUserId(); @@ -478,9 +478,9 @@ BaseG::signKey(const KeyID& keyID, const char *passphrase) cmd += keyID; status = 0; - exiStatus = runGpg(cmd.data(), passphrase); + exitStatus = runGpg(cmd.data(), passphrase); - if (exiStatus != 0) + if (exitStatus != 0) status = ERROR; return status; @@ -490,15 +490,15 @@ BaseG::signKey(const KeyID& keyID, const char *passphrase) TQCString BaseG::getAsciiPublicKey(const KeyID& keyID) { - int exiStatus = 0; + int exitStatus = 0; if (keyID.isEmpty()) return TQCString(); status = 0; - exiStatus = runGpg("--batch --armor --export 0x" + keyID, 0, true); + exitStatus = runGpg("--batch --armor --export 0x" + keyID, 0, true); - if(exiStatus != 0) { + if(exitStatus != 0) { status = ERROR; return TQCString(); } diff --git a/libkpgp/kpgpblock.cpp b/libkpgp/kpgpblock.cpp index ba1d8fec2..f1c6a5aef 100644 --- a/libkpgp/kpgpblock.cpp +++ b/libkpgp/kpgpblock.cpp @@ -122,7 +122,7 @@ Block::clearsign( const TQCString& keyId, const TQCString& charset ) } Kpgp::Result -Block::encrypt( const TQStringList& tqreceivers, const TQCString& keyId, +Block::encrypt( const TQStringList& receivers, const TQCString& keyId, const bool sign, const TQCString& charset ) { Kpgp::Module *pgp = Kpgp::Module::getKpgp(); @@ -130,7 +130,7 @@ Block::encrypt( const TQStringList& tqreceivers, const TQCString& keyId, if( pgp == 0 ) return Kpgp::Failure; - return pgp->encrypt( *this, tqreceivers, keyId, sign, charset ); + return pgp->encrypt( *this, receivers, keyId, sign, charset ); } } // namespace Kpgp diff --git a/libkpgp/kpgpblock.h b/libkpgp/kpgpblock.h index c5af0241c..82001a1de 100644 --- a/libkpgp/kpgpblock.h +++ b/libkpgp/kpgpblock.h @@ -103,7 +103,7 @@ class KDE_EXPORT Block void setProcessedText( const TQCString& str ); int status() const; - void seStatus( const int status ); + void setStatus( const int status ); BlockType type(); @@ -169,7 +169,7 @@ class KDE_EXPORT Block false if there was an unresolvable error or if encryption was canceled true if everything is o.k. */ - Kpgp::Result encrypt( const TQStringList& tqreceivers, const TQCString& keyId, + Kpgp::Result encrypt( const TQStringList& receivers, const TQCString& keyId, const bool sign, const TQCString& charset = TQCString() ); private: @@ -235,7 +235,7 @@ Block::status() const } inline void -Block::seStatus( const int status ) +Block::setStatus( const int status ) { mStatus = status; } diff --git a/libkpgp/kpgpui.cpp b/libkpgp/kpgpui.cpp index a9c62d83e..193238544 100644 --- a/libkpgp/kpgpui.cpp +++ b/libkpgp/kpgpui.cpp @@ -76,7 +76,7 @@ PassphraseDialog::PassphraseDialog( TQWidget *parent, if (keyID.isNull()) label = new TQLabel(i18n("Please enter your OpenPGP passphrase:"),rightArea); else - label = new TQLabel(i18n("Please enter the OpenPGP passphrase for\n\"%1\":").tqarg(keyID), + label = new TQLabel(i18n("Please enter the OpenPGP passphrase for\n\"%1\":").arg(keyID), rightArea); lineedit = new KPasswordEdit( rightArea ); lineedit->setEchoMode(TQLineEdit::Password); @@ -461,7 +461,7 @@ void KeySelectionDialog::initKeylist( const KeyList& keyList, childItem = new TQListViewItem( primaryUserID, "", i18n( "Fingerprint: %1" ) - .tqarg( beautifyFingerprint( (*it)->primaryFingerprint() ) ) ); + .arg( beautifyFingerprint( (*it)->primaryFingerprint() ) ) ); if( primaryUserID->isSelected() && mListView->isMultiSelection() ) { mListView->setSelected( childItem, true ); } @@ -543,15 +543,15 @@ TQString KeySelectionDialog::keyInfo( const Kpgp::Key *key ) const if( remark.isEmpty() ) { return " " + i18n("creation date and status of an OpenPGP key", "Creation date: %1, Status: %2") - .tqarg( KGlobal::locale()->formatDate( dt.date(), true ) ) - .tqarg( status ); + .arg( KGlobal::locale()->formatDate( dt.date(), true ) ) + .arg( status ); } else { return " " + i18n("creation date, status and remark of an OpenPGP key", "Creation date: %1, Status: %2 (%3)") - .tqarg( KGlobal::locale()->formatDate( dt.date(), true ) ) - .tqarg( status ) - .tqarg( remark ); + .arg( KGlobal::locale()->formatDate( dt.date(), true ) ) + .arg( status ) + .arg( remark ); } } @@ -1014,7 +1014,7 @@ bool KeySelectionDialog::checkKeys( const TQValueList<TQListViewItem*>& keys ) c ++it ) { kdDebug(5100) << "Checking key 0x" << getKeyId( *it ) << "...\n"; pProgressDlg->setLabel( i18n("Checking key 0x%1...") - .tqarg( TQString( getKeyId( *it ) ) ) ); + .arg( TQString( getKeyId( *it ) ) ) ); kapp->processEvents(); keysAllowed = keysAllowed && ( -1 != keyAdmissibility( *it, AllowExpensiveTrustCheck ) ); pProgressDlg->progressBar()->advance( 1 ); @@ -1543,7 +1543,7 @@ KeyApprovalDialog::slotChangeEncryptionKey( int nr ) "Select the key(s) which should " "be used to encrypt the message " "for\n%1") - .tqarg( mAddressLabels[nr-1]->text() ), + .arg( mAddressLabels[nr-1]->text() ), keyIds, mAddressLabels[nr-1]->text(), mAllowedKeys ); @@ -1670,7 +1670,7 @@ void CipherTextDialog::setMinimumSize() gc.readBoolEntry("XineramaPlacementEnabled", true)) { maxWidth = TQApplication::desktop()->screenGeometry(TQApplication::desktop()->screenNumber(parentWidget())).width()-100; } else { - maxWidth = TQApplication::desktop()->tqgeometry().width()-100; + maxWidth = TQApplication::desktop()->geometry().width()-100; } #endif diff --git a/libkpimexchange/core/exchangeaccount.cpp b/libkpimexchange/core/exchangeaccount.cpp index 23ea8b6f5..a22710535 100644 --- a/libkpimexchange/core/exchangeaccount.cpp +++ b/libkpimexchange/core/exchangeaccount.cpp @@ -249,7 +249,7 @@ void ExchangeAccount::slotFolderResult( KIO::Job *job ) if ( job->error() ) { kdError() << "Error: Cannot get well-know folder names; " << job->error() << endl; TQString text = i18n("ExchangeAccount\nError accessing '%1': %2") - .tqarg( baseURL().prettyURL() ).tqarg( job->errorString() ); + .arg( baseURL().prettyURL() ).arg( job->errorString() ); KMessageBox::error( 0, text ); mError = true; return; diff --git a/libkpimexchange/core/exchangedownload.cpp b/libkpimexchange/core/exchangedownload.cpp index e5a09b530..60879d266 100644 --- a/libkpimexchange/core/exchangedownload.cpp +++ b/libkpimexchange/core/exchangedownload.cpp @@ -182,8 +182,8 @@ void ExchangeDownload::slotSearchResult( KIO::Job *job ) kdError() << "ExchangeDownload::slotSearchResult() error: " << job->error() << endl; TQString text = i18n("ExchangeDownload\nError accessing '%1': %2") - .tqarg( mAccount->calendarURL().prettyURL() ) - .tqarg( job->errorString() ); + .arg( mAccount->calendarURL().prettyURL() ) + .arg( job->errorString() ); KMessageBox::error( 0, text ); finishUp( ExchangeClient::CommunicationError, job ); return; @@ -231,7 +231,7 @@ void ExchangeDownload::handleAppointments( const TQDomDocument &response, item = item.nextSibling().toElement() ) { //kdDebug() << "Current item:" << item.tagName() << endl; TQDomNodeList propstats = item.elementsByTagNameNS( "DAV:", "propstat" ); - // kdDebug() << "Item has " << propstats.count() << " propstat tqchildren" << endl; + // kdDebug() << "Item has " << propstats.count() << " propstat children" << endl; for( uint i=0; i < propstats.count(); i++ ) { TQDomElement propstat = propstats.item(i).toElement(); TQDomElement prop = propstat.namedItem( "prop" ).toElement(); diff --git a/libkpimexchange/core/exchangeprogress.cpp b/libkpimexchange/core/exchangeprogress.cpp index 911e8f59d..bee71b572 100644 --- a/libkpimexchange/core/exchangeprogress.cpp +++ b/libkpimexchange/core/exchangeprogress.cpp @@ -65,7 +65,7 @@ void ExchangeProgress::slotTransferFinished() void ExchangeProgress::updateLabel() { progressBar()->setValue( m_finished ); - TQString str = i18n( "Downloading, %1 of %2" ).tqarg( m_finished ).tqarg( m_total ); + TQString str = i18n( "Downloading, %1 of %2" ).arg( m_finished ).arg( m_total ); setLabel( str ); } diff --git a/libkpimexchange/core/exchangeupload.cpp b/libkpimexchange/core/exchangeupload.cpp index 4317a2565..d317976d0 100644 --- a/libkpimexchange/core/exchangeupload.cpp +++ b/libkpimexchange/core/exchangeupload.cpp @@ -253,9 +253,9 @@ void ExchangeUpload::startUpload( const KURL &url ) if ( tzOffset == 0 ) offsetString = "Z"; else if ( tzOffset > 0 ) - offsetString = TQString( "+%1:%2" ).tqarg(tzOffset/60, 2).tqarg( tzOffset%60, 2 ); + offsetString = TQString( "+%1:%2" ).arg(tzOffset/60, 2).arg( tzOffset%60, 2 ); else - offsetString = TQString( "-%1:%2" ).tqarg((-tzOffset)/60, 2).tqarg( (-tzOffset)%60, 2 ); + offsetString = TQString( "-%1:%2" ).arg((-tzOffset)/60, 2).arg( (-tzOffset)%60, 2 ); offsetString = offsetString.replace( TQRegExp(" "), "0" ); kdDebug() << "Timezone offset: " << tzOffset << " : " << offsetString << endl; diff --git a/libkpimidentities/identity.cpp b/libkpimidentities/identity.cpp index 6eb33669a..bb947b3bd 100644 --- a/libkpimidentities/identity.cpp +++ b/libkpimidentities/identity.cpp @@ -102,7 +102,7 @@ TQString Signature::textFromCommand( bool * ok ) const if ( rc != 0 ) { if ( ok ) *ok = false; TQString wmsg = i18n("<qt>Failed to execute signature script<br><b>%1</b>:<br>%2</qt>") - .tqarg( mUrl ).tqarg( strerror(rc) ); + .arg( mUrl ).arg( strerror(rc) ); KMessageBox::error(0, wmsg); return TQString(); } diff --git a/libkpimidentities/identitycombo.cpp b/libkpimidentities/identitycombo.cpp index 1b250fa34..5ddc01975 100644 --- a/libkpimidentities/identitycombo.cpp +++ b/libkpimidentities/identitycombo.cpp @@ -93,7 +93,7 @@ void IdentityCombo::reloadCombo() { TQStringList identities = mIdentityManager->identities(); // the IM should prevent this from happening: assert( !identities.isEmpty() ); - identities.first() = i18n("%1 (Default)").tqarg( identities.first() ); + identities.first() = i18n("%1 (Default)").arg( identities.first() ); clear(); insertStringList( identities ); } diff --git a/libkpimidentities/identitymanager.cpp b/libkpimidentities/identitymanager.cpp index 363a135ae..2935fe0a2 100644 --- a/libkpimidentities/identitymanager.cpp +++ b/libkpimidentities/identitymanager.cpp @@ -201,7 +201,7 @@ void IdentityManager::writeConfig() const { int i = 0; for ( ConstIterator it = mIdentities.begin() ; it != mIdentities.end() ; ++it, ++i ) { - KConfigGroup cg( mConfig, TQString::fromLatin1("Identity #%1").tqarg(i) ); + KConfigGroup cg( mConfig, TQString::fromLatin1("Identity #%1").arg(i) ); (*it).writeConfig( &cg ); if ( (*it).isDefault() ) { // remember which one is default: diff --git a/libksieve/shared/error.cpp b/libksieve/shared/error.cpp index 9fe79c1da..faf20bcc6 100644 --- a/libksieve/shared/error.cpp +++ b/libksieve/shared/error.cpp @@ -129,7 +129,7 @@ namespace KSieve { "follow \"text:\" on the same line"); break; case NumberOutOfRange: - err = i18n("Parse error: Number out of Range (must be smaller than %1)").tqarg(UINT_MAX); + err = i18n("Parse error: Number out of Range (must be smaller than %1)").arg(UINT_MAX); break; case InvalidUTF8: err = i18n("Parse error: Invalid UTF-8 sequence"); @@ -188,51 +188,51 @@ namespace KSieve { err = i18n("\"require\" must be first command"); break; case RequireMissingForCommand: - err = i18n("\"require\" missing for command \"%1\"").tqarg(mStringOne); + err = i18n("\"require\" missing for command \"%1\"").arg(mStringOne); break; case RequireMissingForTest: - err = i18n("\"require\" missing for test \"%1\"").tqarg(mStringOne); + err = i18n("\"require\" missing for test \"%1\"").arg(mStringOne); break; case RequireMissingForComparator: - err = i18n("\"require\" missing for comparator \"%1\"").tqarg(mStringOne); + err = i18n("\"require\" missing for comparator \"%1\"").arg(mStringOne); break; case UnsupportedCommand: - err = i18n("Command \"%1\" not supported").tqarg(mStringOne); + err = i18n("Command \"%1\" not supported").arg(mStringOne); break; case UnsupportedTest: - err = i18n("Test \"%1\" not supported").tqarg(mStringOne); + err = i18n("Test \"%1\" not supported").arg(mStringOne); break; case UnsupportedComparator: - err = i18n("Comparator \"%1\" not supported").tqarg(mStringOne); + err = i18n("Comparator \"%1\" not supported").arg(mStringOne); break; case TestNestingTooDeep: - err = i18n("Site Policy Limit Violation: Test nesting too deep (max. %1)").tqarg( mStringOne.toUInt() ); + err = i18n("Site Policy Limit Violation: Test nesting too deep (max. %1)").arg( mStringOne.toUInt() ); break; case BlockNestingTooDeep: - err = i18n("Site Policy Limit Violation: Block nesting too deep (max. %1)").tqarg( mStringOne.toUInt() ); + err = i18n("Site Policy Limit Violation: Block nesting too deep (max. %1)").arg( mStringOne.toUInt() ); break; case InvalidArgument: - err = i18n("Invalid Argument \"%1\" to \"%2\"").tqarg(mStringOne).tqarg(mStringTwo); + err = i18n("Invalid Argument \"%1\" to \"%2\"").arg(mStringOne).arg(mStringTwo); break; case ConflictingArguments: - err = i18n("Conflicting Arguments: \"%1\" and \"%2\"").tqarg(mStringOne).tqarg(mStringTwo); + err = i18n("Conflicting Arguments: \"%1\" and \"%2\"").arg(mStringOne).arg(mStringTwo); break; case ArgumentsRepeated: - err = i18n("Argument \"%1\" Repeated").tqarg(mStringOne); + err = i18n("Argument \"%1\" Repeated").arg(mStringOne); break; case CommandOrderingConstraintViolation: - err = i18n("Command \"%1\" violates command ordering constraints").tqarg(mStringOne); + err = i18n("Command \"%1\" violates command ordering constraints").arg(mStringOne); break; // runtime errors: case IncompatibleActionsRequested: - err = i18n("Incompatible Actions \"%1\" and \"%2\" requested").tqarg(mStringOne).tqarg(mStringTwo); + err = i18n("Incompatible Actions \"%1\" and \"%2\" requested").arg(mStringOne).arg(mStringTwo); break; case MailLoopDetected: err = i18n("Mail Loop detected"); break; case TooManyActions: - err = i18n("Site Policy Limit Violation: Too many Actions requested (max. %1)").tqarg( mStringOne.toUInt() ); + err = i18n("Site Policy Limit Violation: Too many Actions requested (max. %1)").arg( mStringOne.toUInt() ); break; default: err = i18n("Unknown error"); diff --git a/libksieve/tests/parsertest.cpp b/libksieve/tests/parsertest.cpp index f4efcee58..ea718e4d2 100644 --- a/libksieve/tests/parsertest.cpp +++ b/libksieve/tests/parsertest.cpp @@ -397,7 +397,7 @@ public: write( multiLine ? "string type=\"multiline\"" : "string type=\"quoted\"", string ); } void numberArgument( unsigned long number, char quantifier ) { - const TQString txt = "number" + ( quantifier ? TQString(" quantifier=\"%1\"").tqarg( quantifier ) : TQString() ) ; + const TQString txt = "number" + ( quantifier ? TQString(" quantifier=\"%1\"").arg( quantifier ) : TQString() ) ; write( txt.latin1(), TQString::number( number ) ); } void commandStart( const TQString & identifier ) { diff --git a/libtdenetwork/libgpgme-copy/assuan/assuan-uds.c b/libtdenetwork/libgpgme-copy/assuan/assuan-uds.c index e9e81016c..77945fb50 100644 --- a/libtdenetwork/libgpgme-copy/assuan/assuan-uds.c +++ b/libtdenetwork/libgpgme-copy/assuan/assuan-uds.c @@ -46,7 +46,7 @@ #ifdef USE_DESCRIPTOR_PASSING /* Provide replacement for missing CMSG maccros. We assume that - size_t matches the tqalignment requirement. */ + size_t matches the alignment requirement. */ #define MY_ALIGN(n) ((((n))+ sizeof(size_t)-1) & (size_t)~(sizeof(size_t)-1)) #ifndef CMSG_SPACE #define CMSG_SPACE(n) (MY_ALIGN(sizeof(struct cmsghdr)) + MY_ALIGN((n))) diff --git a/libtdenetwork/libgpgme-copy/gpgme/ChangeLog b/libtdenetwork/libgpgme-copy/gpgme/ChangeLog index cb2393938..c9665e2a2 100644 --- a/libtdenetwork/libgpgme-copy/gpgme/ChangeLog +++ b/libtdenetwork/libgpgme-copy/gpgme/ChangeLog @@ -5218,7 +5218,7 @@ * types.h: Add ulong typedef. * rungpg.c (do_reaping,_gpgme_gpg_housecleaning): New. - (_gpgme_gpg_release): Reap tqchildren. + (_gpgme_gpg_release): Reap children. * io.h, posix-io.c (_gpgme_io_kill): New. * w32-io.c (_gpgme_io_kill): New (dummy). diff --git a/libtdenetwork/qgpgme/dataprovider.cpp b/libtdenetwork/qgpgme/dataprovider.cpp index 052b84c48..a37684d0d 100644 --- a/libtdenetwork/qgpgme/dataprovider.cpp +++ b/libtdenetwork/qgpgme/dataprovider.cpp @@ -30,7 +30,7 @@ static bool resizeAndInit( TQByteArray & ba, size_t newSize ) { const size_t oldSize = ba.size(); - bool ok = ba.tqresize( newSize ); + bool ok = ba.resize( newSize ); if ( ok ) memset( ba.data() + oldSize, 0, newSize - oldSize ); return ok; diff --git a/libtdepim/addresseeview.cpp b/libtdepim/addresseeview.cpp index 23f01eb5e..b3bccffad 100644 --- a/libtdepim/addresseeview.cpp +++ b/libtdepim/addresseeview.cpp @@ -151,11 +151,11 @@ void AddresseeView::enableLinks( int linkMask ) TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *proxy, LinkMask linkMask, bool internalLoading, FieldMask fieldMask ) { - TQString image = TQString( "contact_%1_image" ).tqarg( addr.uid() ); + TQString image = TQString( "contact_%1_image" ).arg( addr.uid() ); // Style strings from Gentix; this is just an initial version. // - // These will be substituted into various HTML strings with .tqarg(). + // These will be substituted into various HTML strings with .arg(). // Search for @STYLE@ to find where. Note how we use %1 as a // placeholder where we fill in something else (in this case, // the global background color). @@ -165,12 +165,12 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr "style=\"" "padding-right: 2px; " "border-right: #000 dashed 1px; " - "background: %1;\"").tqarg(backgroundColor); + "background: %1;\"").arg(backgroundColor); TQString backgroundColor2 = KGlobalSettings::baseColor().name(); TQString cellStyle2 = TQString::fromLatin1( "style=\"" "padding-left: 2px; " - "background: %1;\"").tqarg(backgroundColor2); + "background: %1;\"").arg(backgroundColor2); TQString tableStyle = TQString::fromLatin1( "style=\"" "border: solid 1px; " @@ -216,8 +216,8 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr if ( date.isValid() ) dynamicPart += rowFmtStr - .tqarg( KABC::Addressee::birthdayLabel() ) - .tqarg( KGlobal::locale()->formatDate( date, true ) ); + .arg( KABC::Addressee::birthdayLabel() ) + .arg( KGlobal::locale()->formatDate( date, true ) ); } if ( fieldMask & PhoneFields ) { @@ -235,15 +235,15 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr if ( linkMask & PhoneLinks ) { TQString smsURL; if ( (*phoneIt).type() & KABC::PhoneNumber::Cell ) - smsURL = TQString(" (<a href=\"sms:%1\">%2</a>)" ).tqarg( number ).tqarg( i18n( "SMS") ); + smsURL = TQString(" (<a href=\"sms:%1\">%2</a>)" ).arg( number ).arg( i18n( "SMS") ); dynamicPart += rowFmtStr - .tqarg( (*phoneIt).typeLabel().replace( " ", " " ) ) - .tqarg( TQString::fromLatin1( "<a href=\"%1\">%2</a>%3" ).tqarg( url ).tqarg( number ).tqarg( smsURL ) ); + .arg( (*phoneIt).typeLabel().replace( " ", " " ) ) + .arg( TQString::fromLatin1( "<a href=\"%1\">%2</a>%3" ).arg( url ).arg( number ).arg( smsURL ) ); } else { dynamicPart += rowFmtStr - .tqarg( (*phoneIt).typeLabel().replace( " ", " " ) ) - .tqarg( number ); + .arg( (*phoneIt).typeLabel().replace( " ", " " ) ) + .arg( number ); } } } @@ -257,11 +257,11 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr TQUrl::encode( fullEmail ); if ( linkMask & EmailLinks ) { - dynamicPart += rowFmtStr.tqarg( type ) - .tqarg( TQString::fromLatin1( "<a href=\"mailto:%1\">%2</a>" ) - .tqarg( fullEmail, TQStyleSheet::escape( *emailIt ) ) ); + dynamicPart += rowFmtStr.arg( type ) + .arg( TQString::fromLatin1( "<a href=\"mailto:%1\">%2</a>" ) + .arg( fullEmail, TQStyleSheet::escape( *emailIt ) ) ); } else { - dynamicPart += rowFmtStr.tqarg( type ).tqarg( *emailIt ); + dynamicPart += rowFmtStr.arg( type ).arg( *emailIt ); } } } @@ -276,7 +276,7 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr } else { url = addr.url().prettyURL(); } - dynamicPart += rowFmtStr.tqarg( i18n("Homepage") ).tqarg( url ); + dynamicPart += rowFmtStr.arg( i18n("Homepage") ).arg( url ); } TQString blog = addr.custom( "KADDRESSBOOK", "BlogFeed" ); @@ -284,7 +284,7 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr if ( linkMask & URLLinks ) { blog = KStringHandler::tagURLs( blog ); } - dynamicPart += rowFmtStr.tqarg( i18n("Blog Feed") ).tqarg( blog ); + dynamicPart += rowFmtStr.arg( i18n("Blog Feed") ).arg( blog ); } } @@ -303,12 +303,12 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr if ( linkMask & AddressLinks ) { dynamicPart += rowFmtStr - .tqarg( KABC::Address::typeLabel( (*addrIt).type() ) ) - .tqarg( link ); + .arg( KABC::Address::typeLabel( (*addrIt).type() ) ) + .arg( link ); } else { dynamicPart += rowFmtStr - .tqarg( KABC::Address::typeLabel( (*addrIt).type() ) ) - .tqarg( formattedAddress ); + .arg( KABC::Address::typeLabel( (*addrIt).type() ) ) + .arg( formattedAddress ); } } else { TQString link = "<a href=\"addr:" + (*addrIt).id() + "\">" + @@ -316,12 +316,12 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr if ( linkMask & AddressLinks ) { dynamicPart += rowFmtStr - .tqarg( KABC::Address::typeLabel( (*addrIt).type() ) ) - .tqarg( link ); + .arg( KABC::Address::typeLabel( (*addrIt).type() ) ) + .arg( link ); } else { dynamicPart += rowFmtStr - .tqarg( KABC::Address::typeLabel( (*addrIt).type() ) ) - .tqarg( (*addrIt).label().replace( '\n', "<br>" ) ); + .arg( KABC::Address::typeLabel( (*addrIt).type() ) ) + .arg( (*addrIt).label().replace( '\n', "<br>" ) ); } } } @@ -333,7 +333,7 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr // the data afterwards (keeps us safe from possible % signs // in either one). notes = TQStyleSheet::escape( addr.note() ); - notes = rowFmtStr.tqarg( i18n( "Notes" ) ).tqarg( notes.replace( '\n', "<br>" ) ) ; + notes = rowFmtStr.arg( i18n( "Notes" ) ).arg( notes.replace( '\n', "<br>" ) ) ; } TQString customData; @@ -371,7 +371,7 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr if ( keyIt != titleMap.end() ) key = keyIt.data(); - customData += rowFmtStr.tqarg( key ).tqarg( TQStyleSheet::escape( value ) ) ; + customData += rowFmtStr.arg( key ).arg( TQStyleSheet::escape( value ) ) ; } } } @@ -385,7 +385,7 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr const TQString imAddress = addr.custom( "KADDRESSBOOK", "X-IMAddress" ); if ( !imAddress.isEmpty() ) { - customData += rowFmtStr.tqarg( i18n( "IM Address" ) ).tqarg( TQStyleSheet::escape( imAddress ) ) ; + customData += rowFmtStr.arg( i18n( "IM Address" ) ).arg( TQStyleSheet::escape( imAddress ) ) ; } if ( proxy ) { @@ -393,7 +393,7 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr // set image source to either a TQMimeSourceFactory key or a data:/ URL TQString imgSrc; if ( internalLoading ) { - imgSrc = TQString::fromLatin1( "im_status_%1_image").tqarg( addr.uid() ); + imgSrc = TQString::fromLatin1( "im_status_%1_image").arg( addr.uid() ); TQMimeSourceFactory::defaultFactory()->setPixmap( imgSrc, proxy->presenceIcon( addr.uid() ) ); } else imgSrc = pixmapAsDataUrl( proxy->presenceIcon( addr.uid() ) ); @@ -407,10 +407,10 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr // append our status to the rest of the dynamic part of the addressee dynamicPart += rowFmtStr - .tqarg( i18n( "Presence" ) ) - .tqarg( imStatus - .tqarg( imgSrc ) - .tqarg( proxy->presenceString( addr.uid() ) ) + .arg( i18n( "Presence" ) ) + .arg( imStatus + .arg( imgSrc ) + .arg( proxy->presenceString( addr.uid() ) ) ); } } @@ -424,44 +424,44 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr TQString strAddr = TQString::fromLatin1( "<div align=\"center\">" "<table cellpadding=\"1\" cellspacing=\"0\" %1>" - "<tr>").tqarg(tableStyle); + "<tr>").arg(tableStyle); strAddr.append( TQString::fromLatin1( "<td align=\"right\" valign=\"top\" width=\"30%\" rowspan=\"3\" %2>") - .tqarg( cellStyle ) ); + .arg( cellStyle ) ); strAddr.append( TQString::fromLatin1( "<img src=\"%1\" width=\"50\" vspace=\"1\">" // image "</td>") - .tqarg( image ) ); + .arg( image ) ); strAddr.append( TQString::fromLatin1( "<td align=\"left\" width=\"70%\" %2>") - .tqarg( cellStyle2 ) ); + .arg( cellStyle2 ) ); strAddr.append( TQString::fromLatin1( "<font size=\"+2\"><b>%2</b></font></td>" // name "</tr>") - .tqarg( name ) ); + .arg( name ) ); strAddr.append( TQString::fromLatin1( "<tr>" "<td align=\"left\" width=\"70%\" %2>") - .tqarg( cellStyle2 ) ); + .arg( cellStyle2 ) ); strAddr.append( TQString::fromLatin1( "%3</td>" // role "</tr>") - .tqarg( role ) ); + .arg( role ) ); strAddr.append( TQString::fromLatin1( "<tr>" "<td align=\"left\" width=\"70%\" %2>") - .tqarg( cellStyle2 ) ); + .arg( cellStyle2 ) ); strAddr.append( TQString::fromLatin1( "%4</td>" // organization "</tr>") - .tqarg( organization ) ); + .arg( organization ) ); strAddr.append( TQString::fromLatin1( "<tr><td %2>") - .tqarg( cellStyle ) ); + .arg( cellStyle ) ); strAddr.append( TQString::fromLatin1( " </td><td %2> </td></tr>") - .tqarg( cellStyle2 ) ); + .arg( cellStyle2 ) ); strAddr.append( dynamicPart ); strAddr.append( notes ); strAddr.append( customData ); @@ -476,7 +476,7 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr if ( !label.isEmpty() ) addrBookName = label; } - strAddr.append( i18n( "<p><b>Address book</b>: %1</p>" ).tqarg( addrBookName ) ); + strAddr.append( i18n( "<p><b>Address book</b>: %1</p>" ).arg( addrBookName ) ); } return strAddr; } @@ -532,11 +532,11 @@ void AddresseeView::updateView() "%3" // dynamic part "</body>" "</html>" ) - .tqarg( KGlobalSettings::textColor().name() ) - .tqarg( KGlobalSettings::baseColor().name() ) - .tqarg( strAddr ); + .arg( KGlobalSettings::textColor().name() ) + .arg( KGlobalSettings::baseColor().name() ) + .arg( strAddr ); - TQString imageURL = TQString( "contact_%1_image" ).tqarg( mAddressee.uid() ); + TQString imageURL = TQString( "contact_%1_image" ).arg( mAddressee.uid() ); KABC::Picture picture = mAddressee.photo(); if ( picture.isIntern() && !picture.data().isNull() ) @@ -690,27 +690,27 @@ void AddresseeView::slotHighlighted( const TQString &link ) TQString email = link.mid( 7 ); emit emailHighlighted( email ); - emit highlightedMessage( i18n( "Send mail to '%1'" ).tqarg( email ) ); + emit highlightedMessage( i18n( "Send mail to '%1'" ).arg( email ) ); } else if ( link.startsWith( "phone:" ) ) { TQString number = link.mid( 8 ); emit phoneNumberHighlighted( strippedNumber( number ) ); - emit highlightedMessage( i18n( "Call number %1" ).tqarg( number ) ); + emit highlightedMessage( i18n( "Call number %1" ).arg( number ) ); } else if ( link.startsWith( "fax:" ) ) { TQString number = link.mid( 6 ); emit faxNumberHighlighted( strippedNumber( number ) ); - emit highlightedMessage( i18n( "Send fax to %1" ).tqarg( number ) ); + emit highlightedMessage( i18n( "Send fax to %1" ).arg( number ) ); } else if ( link.startsWith( "addr:" ) ) { emit highlightedMessage( i18n( "Show address on map" ) ); } else if ( link.startsWith( "sms:" ) ) { TQString number = link.mid( 6 ); - emit highlightedMessage( i18n( "Send SMS to %1" ).tqarg( number ) ); + emit highlightedMessage( i18n( "Send SMS to %1" ).arg( number ) ); } else if ( link.startsWith( "http:" ) || link.startsWith( "https:" ) ) { emit urlHighlighted( link ); - emit highlightedMessage( i18n( "Open URL %1" ).tqarg( link ) ); + emit highlightedMessage( i18n( "Open URL %1" ).arg( link ) ); } else if ( link.startsWith( "im:" ) ) { - emit highlightedMessage( i18n( "Chat with %1" ).tqarg( mAddressee.realName() ) ); + emit highlightedMessage( i18n( "Chat with %1" ).arg( mAddressee.realName() ) ); } else emit highlightedMessage( "" ); } diff --git a/libtdepim/addressesdialog.cpp b/libtdepim/addressesdialog.cpp index a8d993bf8..2a3cca2f4 100644 --- a/libtdepim/addressesdialog.cpp +++ b/libtdepim/addressesdialog.cpp @@ -912,7 +912,7 @@ AddressesDialog::saveAs() KMessageBox::information( 0, i18n( "<qt>Distribution list with the given name <b>%1</b> " "already exists. Please select a different name.</qt>" ) - .tqarg( name ) ); + .arg( name ) ); return; } diff --git a/libtdepim/addresspicker.ui b/libtdepim/addresspicker.ui index 9dd43bc0a..a11680ff8 100644 --- a/libtdepim/addresspicker.ui +++ b/libtdepim/addresspicker.ui @@ -181,7 +181,7 @@ <property name="text"> <string>&Selected Addresses</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignCenter</set> </property> <property name="buddy" stdset="0"> @@ -200,7 +200,7 @@ <property name="text"> <string>&Address Book</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignCenter</set> </property> <property name="buddy" stdset="0"> diff --git a/libtdepim/broadcaststatus.cpp b/libtdepim/broadcaststatus.cpp index f87503f97..c48d7f414 100644 --- a/libtdepim/broadcaststatus.cpp +++ b/libtdepim/broadcaststatus.cpp @@ -46,23 +46,23 @@ BroadcastStatus::~BroadcastStatus() instance_ = 0; } -void BroadcastStatus::seStatusMsg( const TQString& message ) +void BroadcastStatus::setStatusMsg( const TQString& message ) { mStatusMsg = message; if( !mTransientActive ) emit statusMsg( message ); } -void BroadcastStatus::seStatusMsgWithTimestamp( const TQString& message ) +void BroadcastStatus::setStatusMsgWithTimestamp( const TQString& message ) { KLocale* locale = KGlobal::locale(); - seStatusMsg( i18n( "%1 is a time, %2 is a status message", "[%1] %2" ) - .tqarg( locale->formatTime( TQTime::currentTime(), + setStatusMsg( i18n( "%1 is a time, %2 is a status message", "[%1] %2" ) + .arg( locale->formatTime( TQTime::currentTime(), true /* with seconds */ ) ) - .tqarg( message ) ); + .arg( message ) ); } -void BroadcastStatus::seStatusMsgTransmissionCompleted( int numMessages, +void BroadcastStatus::setStatusMsgTransmissionCompleted( int numMessages, int numBytes, int numBytesRead, int numBytesToRead, @@ -78,13 +78,13 @@ void BroadcastStatus::seStatusMsgTransmissionCompleted( int numMessages, "Transmission complete. %n new messages in %1 KB " "(%2 KB remaining on the server).", numMessages ) - .tqarg( numBytesRead / 1024 ) - .tqarg( numBytes / 1024 ); + .arg( numBytesRead / 1024 ) + .arg( numBytes / 1024 ); else statusMsg = i18n( "Transmission complete. %n message in %1 KB.", "Transmission complete. %n messages in %1 KB.", numMessages ) - .tqarg( numBytesRead / 1024 ); + .arg( numBytesRead / 1024 ); } else statusMsg = i18n( "Transmission complete. %n new message.", @@ -94,12 +94,12 @@ void BroadcastStatus::seStatusMsgTransmissionCompleted( int numMessages, else statusMsg = i18n( "Transmission complete. No new messages." ); - seStatusMsgWithTimestamp( statusMsg ); + setStatusMsgWithTimestamp( statusMsg ); if ( item ) - item->seStatus( statusMsg ); + item->setStatus( statusMsg ); } -void BroadcastStatus::seStatusMsgTransmissionCompleted( const TQString& account, +void BroadcastStatus::setStatusMsgTransmissionCompleted( const TQString& account, int numMessages, int numBytes, int numBytesRead, @@ -118,17 +118,17 @@ void BroadcastStatus::seStatusMsgTransmissionCompleted( const TQString& account, "%n new messages in %1 KB " "(%2 KB remaining on the server).", numMessages ) - .tqarg( numBytesRead / 1024 ) - .tqarg( numBytes / 1024 ) - .tqarg( account ); + .arg( numBytesRead / 1024 ) + .arg( numBytes / 1024 ) + .arg( account ); else statusMsg = i18n( "Transmission for account %2 complete. " "%n message in %1 KB.", "Transmission for account %2 complete. " "%n messages in %1 KB.", numMessages ) - .tqarg( numBytesRead / 1024 ) - .tqarg( account ); + .arg( numBytesRead / 1024 ) + .arg( account ); } else statusMsg = i18n( "Transmission for account %1 complete. " @@ -136,15 +136,15 @@ void BroadcastStatus::seStatusMsgTransmissionCompleted( const TQString& account, "Transmission for account %1 complete. " "%n new messages.", numMessages ) - .tqarg( account ); + .arg( account ); } else statusMsg = i18n( "Transmission for account %1 complete. No new messages.") - .tqarg( account ); + .arg( account ); - seStatusMsgWithTimestamp( statusMsg ); + setStatusMsgWithTimestamp( statusMsg ); if ( item ) - item->seStatus( statusMsg ); + item->setStatus( statusMsg ); } void BroadcastStatus::setTransienStatusMsg( const TQString& msg ) diff --git a/libtdepim/broadcaststatus.h b/libtdepim/broadcaststatus.h index 9173feaad..934d1cfa8 100644 --- a/libtdepim/broadcaststatus.h +++ b/libtdepim/broadcaststatus.h @@ -41,18 +41,18 @@ public: /** Return the instance of the singleton object for this class */ static BroadcastStatus *instance(); - /** Return the last status message from seStatusMsg() */ + /** Return the last status message from setStatusMsg() */ TQString statusMsg() const { return mStatusMsg; } /** Sets a status bar message with timestamp */ - void seStatusMsgWithTimestamp( const TQString& message ); + void setStatusMsgWithTimestamp( const TQString& message ); /** Sets a transmission completed status bar message */ - void seStatusMsgTransmissionCompleted( int numMessages, + void setStatusMsgTransmissionCompleted( int numMessages, int numBytes = -1, int numBytesRead = -1, int numBytesToRead = -1, bool mLeaveOnServer = false, KPIM::ProgressItem* progressItem = 0 ); // set the same status in this progress item - void seStatusMsgTransmissionCompleted( const TQString& account, + void setStatusMsgTransmissionCompleted( const TQString& account, int numMessages, int numBytes = -1, int numBytesRead = -1, @@ -63,7 +63,7 @@ public: public slots: /** Emit an update status bar signal. It's a slot so it can be hooked up to other signals. */ - void seStatusMsg( const TQString& message ); + void setStatusMsg( const TQString& message ); /** Set a status message that will go away again with the next call of @@ -78,7 +78,7 @@ public slots: signals: - /** Emitted when seStatusMsg is called. */ + /** Emitted when setStatusMsg is called. */ void statusMsg( const TQString& ); protected: diff --git a/libtdepim/clicklineedit.cpp b/libtdepim/clicklineedit.cpp index 28e66a0ba..352b26795 100644 --- a/libtdepim/clicklineedit.cpp +++ b/libtdepim/clicklineedit.cpp @@ -39,13 +39,13 @@ ClickLineEdit::~ClickLineEdit() {} void ClickLineEdit::setClickMessage( const TQString &msg ) { mClickMessage = msg; - tqrepaint(); + repaint(); } void ClickLineEdit::setText( const TQString &txt ) { mDrawClickMsg = txt.isEmpty(); - tqrepaint(); + repaint(); KLineEdit::setText( txt ); } @@ -67,7 +67,7 @@ void ClickLineEdit::focusInEvent( TQFocusEvent *ev ) if ( mDrawClickMsg == true ) { mDrawClickMsg = false; - tqrepaint(); + repaint(); } TQLineEdit::focusInEvent( ev ); } @@ -77,7 +77,7 @@ void ClickLineEdit::focusOutEvent( TQFocusEvent *ev ) if ( text().isEmpty() ) { mDrawClickMsg = true; - tqrepaint(); + repaint(); } TQLineEdit::focusOutEvent( ev ); } diff --git a/libtdepim/completionordereditor.cpp b/libtdepim/completionordereditor.cpp index 0ee36a290..68339f9e1 100644 --- a/libtdepim/completionordereditor.cpp +++ b/libtdepim/completionordereditor.cpp @@ -88,7 +88,7 @@ class LDAPCompletionItem : public CompletionItem { public: LDAPCompletionItem( LdapClient* ldapClient ) : mLdapClient( ldapClient ) {} - virtual TQString label() const { return i18n( "LDAP server %1" ).tqarg( mLdapClient->server().host() ); } + virtual TQString label() const { return i18n( "LDAP server %1" ).arg( mLdapClient->server().host() ); } virtual int completionWeight() const { return mLdapClient->completionWeight(); } virtual void save( CompletionOrderEditor* ); protected: @@ -102,7 +102,7 @@ void LDAPCompletionItem::save( CompletionOrderEditor* ) { KConfig * config = LdapSearch::config(); config->setGroup( "LDAP" ); - config->writeEntry( TQString( "SelectedCompletionWeight%1" ).tqarg( mLdapClient->clientNumber() ), + config->writeEntry( TQString( "SelectedCompletionWeight%1" ).arg( mLdapClient->clientNumber() ), mWeight ); config->sync(); } @@ -141,7 +141,7 @@ public: KABCImapSubResCompletionItem( ResourceABC* resource, const TQString& subResource ) : mResource( resource ), mSubResource( subResource ), mWeight( completionWeight() ) {} virtual TQString label() const { - return TQString( "%1 %2" ).tqarg( mResource->resourceName() ).tqarg( mResource->subresourceLabel( mSubResource ) ); + return TQString( "%1 %2" ).arg( mResource->resourceName() ).arg( mResource->subresourceLabel( mSubResource ) ); } virtual int completionWeight() const { return mResource->subresourceCompletionWeight( mSubResource ); diff --git a/libtdepim/csshelper.cpp b/libtdepim/csshelper.cpp index 379eb8ea0..a95daad6f 100644 --- a/libtdepim/csshelper.cpp +++ b/libtdepim/csshelper.cpp @@ -184,9 +184,9 @@ namespace KPIM { ? level % numQuoteLevels + 1 : kMin( level + 1, numQuoteLevels ) ; if ( level >= numQuoteLevels ) - return TQString( "<div class=\"deepquotelevel%1\">" ).tqarg( effectiveLevel ); + return TQString( "<div class=\"deepquotelevel%1\">" ).arg( effectiveLevel ); else - return TQString( "<div class=\"quotelevel%1\">" ).tqarg( effectiveLevel ); + return TQString( "<div class=\"quotelevel%1\">" ).arg( effectiveLevel ); } TQString CSSHelper::nonQuotedFontTag() const { @@ -214,8 +214,8 @@ namespace KPIM { TQString CSSHelper::printCssDefinitions( bool fixed ) const { const TQString headerFont = TQString( " font-family: \"%1\" ! important;\n" " font-size: %2pt ! important;\n" ) - .tqarg( mPrintFont.family() ) - .tqarg( mPrintFont.pointSize() ); + .arg( mPrintFont.family() ) + .arg( mPrintFont.pointSize() ); const TQColorGroup & cg = TQApplication::tqpalette().active(); const TQFont printFont = bodyFont( fixed, true /* print */ ); @@ -234,7 +234,7 @@ namespace KPIM { " color: #000000 ! important;\n" " background-color: #ffffff ! important\n" "}\n\n" ) - .tqarg( printFont.family(), + .arg( printFont.family(), TQString::number( printFont.pointSize() ) ) + TQString( "tr.textAtmH,\n" @@ -288,7 +288,7 @@ namespace KPIM { " display:none ! important;\n" "}\n\n" ) - .tqarg( headerFont, + .arg( headerFont, cg.background().name(), cg.foreground().name() ) + quoteCSS; @@ -300,13 +300,13 @@ namespace KPIM { const TQString linkColor = mLinkColor.name(); const TQString headerFont = TQString(" font-family: \"%1\" ! important;\n" " font-size: %2px ! important;\n") - .tqarg( mBodyFont.family() ) - .tqarg( pointsToPixel( helper->mMetrics, mBodyFont.pointSize() ) ); + .arg( mBodyFont.family() ) + .arg( pointsToPixel( helper->mMetrics, mBodyFont.pointSize() ) ); const TQString background = ( mBackingPixmapOn ? TQString( " background-image:url(file://%1) ! important;\n" ) - .tqarg( mBackingPixmapStr ) + .arg( mBackingPixmapStr ) : TQString( " background-color: %1 ! important;\n" ) - .tqarg( bgColor ) ); + .arg( bgColor ) ); const TQString bodyFontSize = TQString::number( pointsToPixel( helper->mMetrics, fontSize( fixed ) ) ) + "px" ; const TQColorGroup & cg = TQApplication::tqpalette().active(); @@ -322,7 +322,7 @@ namespace KPIM { for ( int i = 0 ; i < 3 ; ++i ) { quoteCSS += TQString( "div.quotelevel%1 {\n" " color: %2 ! important;\n" ) - .tqarg( TQString::number(i+1), mQuoteColor[i].name() ); + .arg( TQString::number(i+1), mQuoteColor[i].name() ); if ( mQuoteFont[i].italic() ) quoteCSS += " font-style: italic ! important;\n"; if ( mQuoteFont[i].bold() ) @@ -337,7 +337,7 @@ namespace KPIM { for ( int i = 0 ; i < 3 ; ++i ) { quoteCSS += TQString( "div.deepquotelevel%1 {\n" " color: %2 ! important;\n" ) - .tqarg( TQString::number(i+1), mQuoteColor[i].name() ); + .arg( TQString::number(i+1), mQuoteColor[i].name() ); if ( mQuoteFont[i].italic() ) quoteCSS += " font-style: italic ! important;\n"; if ( mQuoteFont[i].bold() ) @@ -354,7 +354,7 @@ namespace KPIM { " color: %3 ! important;\n" "%4" "}\n\n" ) - .tqarg( bodyFont( fixed ).family(), + .arg( bodyFont( fixed ).family(), bodyFontSize, fgColor, background ) @@ -392,7 +392,7 @@ namespace KPIM { "tr.rfc822H {\n" "%4" "}\n\n" ) - .tqarg( linkColor, fgColor, bgColor, headerFont ) + .arg( linkColor, fgColor, bgColor, headerFont ) + TQString( "table.encr {\n" " background-color: %1 ! important;\n" @@ -404,7 +404,7 @@ namespace KPIM { "}\n\n" "tr.encrB { background-color: %4 ! important; }\n\n" ) - .tqarg( cPgpEncrF.name(), + .arg( cPgpEncrF.name(), cPgpEncrH.name(), headerFont, cPgpEncrB.name() ) @@ -419,7 +419,7 @@ namespace KPIM { "}\n\n" "tr.signOkKeyOkB { background-color: %4 ! important; }\n\n" ) - .tqarg( cPgpOk1F.name(), + .arg( cPgpOk1F.name(), cPgpOk1H.name(), headerFont, cPgpOk1B.name() ) @@ -434,7 +434,7 @@ namespace KPIM { "}\n\n" "tr.signOkKeyBadB { background-color: %4 ! important; }\n\n" ) - .tqarg( cPgpOk0F.name(), + .arg( cPgpOk0F.name(), cPgpOk0H.name(), headerFont, cPgpOk0B.name() ) @@ -449,7 +449,7 @@ namespace KPIM { "}\n\n" "tr.signWarnB { background-color: %4 ! important; }\n\n" ) - .tqarg( cPgpWarnF.name(), + .arg( cPgpWarnF.name(), cPgpWarnH.name(), headerFont, cPgpWarnB.name() ) @@ -464,7 +464,7 @@ namespace KPIM { "}\n\n" "tr.signErrB { background-color: %4 ! important; }\n\n" ) - .tqarg( cPgpErrF.name(), + .arg( cPgpErrF.name(), cPgpErrH.name(), headerFont, cPgpErrB.name() ) @@ -472,7 +472,7 @@ namespace KPIM { TQString( "div.htmlWarn {\n" " border: 2px solid %1 ! important;\n" "}\n\n" ) - .tqarg( cHtmlWarning.name() ) + .arg( cHtmlWarning.name() ) + TQString( "div.header {\n" "%1" @@ -519,12 +519,12 @@ namespace KPIM { "}\n\n" ) - .tqarg( headerFont ) - .tqarg( cg.highlight().name(), + .arg( headerFont ) + .arg( cg.highlight().name(), cg.highlightedText().name(), cg.foreground().name(), cg.background().name() ) - .tqarg( cg.mid().name() ) + .arg( cg.mid().name() ) + quoteCSS; } diff --git a/libtdepim/embeddedurlpage.cpp b/libtdepim/embeddedurlpage.cpp index 3971bf367..3c32f8324 100644 --- a/libtdepim/embeddedurlpage.cpp +++ b/libtdepim/embeddedurlpage.cpp @@ -43,7 +43,7 @@ void EmbeddedURLPage::initGUI( const TQString &url, const TQString &/*mimetype*/ { TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); tqlayout->setAutoAdd( true ); - new TQLabel( i18n("Showing URL %1").tqarg( url ), this ); + new TQLabel( i18n("Showing URL %1").arg( url ), this ); } void EmbeddedURLPage::loadContents() diff --git a/libtdepim/htmldiffalgodisplay.cpp b/libtdepim/htmldiffalgodisplay.cpp index 726854e4e..4be6b6cde 100644 --- a/libtdepim/htmldiffalgodisplay.cpp +++ b/libtdepim/htmldiffalgodisplay.cpp @@ -45,13 +45,13 @@ void HTMLDiffAlgoDisplay::begin() mText.append( "<html>" ); mText.append( TQString( "<body text=\"%1\" bgcolor=\"%2\">" ) - .tqarg( KGlobalSettings::textColor().name() ) - .tqarg( KGlobalSettings::baseColor().name() ) ); + .arg( KGlobalSettings::textColor().name() ) + .arg( KGlobalSettings::baseColor().name() ) ); mText.append( "<center><table>" ); mText.append( TQString( "<tr><th></th><th align=\"center\">%1</th><td> </td><th align=\"center\">%2</th></tr>" ) - .tqarg( mLeftTitle ) - .tqarg( mRightTitle ) ); + .arg( mLeftTitle ) + .arg( mRightTitle ) ); } void HTMLDiffAlgoDisplay::end() @@ -76,22 +76,22 @@ void HTMLDiffAlgoDisplay::setRightSourceTitle( const TQString &title ) void HTMLDiffAlgoDisplay::additionalLeftField( const TQString &id, const TQString &value ) { mText.append( TQString( "<tr><td align=\"right\"><b>%1:</b></td><td bgcolor=\"#9cff83\">%2</td><td></td><td></td></tr>" ) - .tqarg( id ) - .tqarg( textToHTML( value ) ) ); + .arg( id ) + .arg( textToHTML( value ) ) ); } void HTMLDiffAlgoDisplay::additionalRightField( const TQString &id, const TQString &value ) { mText.append( TQString( "<tr><td align=\"right\"><b>%1:</b></td><td></td><td></td><td bgcolor=\"#9cff83\">%2</td></tr>" ) - .tqarg( id ) - .tqarg( textToHTML( value ) ) ); + .arg( id ) + .arg( textToHTML( value ) ) ); } void HTMLDiffAlgoDisplay::conflictField( const TQString &id, const TQString &leftValue, const TQString &rightValue ) { mText.append( TQString( "<tr><td align=\"right\"><b>%1:</b></td><td bgcolor=\"#ff8686\">%2</td><td></td><td bgcolor=\"#ff8686\">%3</td></tr>" ) - .tqarg( id ) - .tqarg( textToHTML( leftValue ) ) - .tqarg( textToHTML( rightValue ) ) ); + .arg( id ) + .arg( textToHTML( leftValue ) ) + .arg( textToHTML( rightValue ) ) ); } diff --git a/libtdepim/kaddrbook.cpp b/libtdepim/kaddrbook.cpp index 7854be1d1..230f4ef4b 100644 --- a/libtdepim/kaddrbook.cpp +++ b/libtdepim/kaddrbook.cpp @@ -74,7 +74,7 @@ void KAddrBookExternal::openEmail( const TQString &addr, TQWidget *parent ) { //TODO: Enable the better message at the next string unfreeze #if 0 TQString text = i18n("<qt>The email address <b>%1</b> cannot be " - "found in your addressbook.</qt>").tqarg( email ); + "found in your addressbook.</qt>").arg( email ); #else TQString text = email + " " + i18n( "is not in address book" ); #endif @@ -150,12 +150,12 @@ void KAddrBookExternal::addEmail( const TQString& addr, TQWidget *parent) { if ( KAddrBookExternal::addAddressee( a ) ) { TQString text = i18n("<qt>The email address <b>%1</b> was added to your " "addressbook; you can add more information to this " - "entry by opening the addressbook.</qt>").tqarg( addr ); + "entry by opening the addressbook.</qt>").arg( addr ); KMessageBox::information( parent, text, TQString(), "addedtokabc" ); } } else { TQString text = i18n("<qt>The email address <b>%1</b> is already in your " - "addressbook.</qt>").tqarg( addr ); + "addressbook.</qt>").arg( addr ); KMessageBox::information( parent, text, TQString(), "alreadyInAddressBook" ); } diff --git a/libtdepim/kcmdesignerfields.cpp b/libtdepim/kcmdesignerfields.cpp index 5f717b7c1..168f7f50b 100644 --- a/libtdepim/kcmdesignerfields.cpp +++ b/libtdepim/kcmdesignerfields.cpp @@ -176,7 +176,7 @@ void KCMDesignerFields::deleteFile() if ( item ) { PageItem *pageItem = static_cast<PageItem*>( item->parent() ? item->parent() : item ); if (KMessageBox::warningContinueCancel(this, - i18n( "<qt>Do you really want to delete '<b>%1</b>'?</qt>").tqarg( pageItem->text(0) ), "", KStdGuiItem::del() ) + i18n( "<qt>Do you really want to delete '<b>%1</b>'?</qt>").arg( pageItem->text(0) ), "", KStdGuiItem::del() ) == KMessageBox::Continue) KIO::NetAccess::del( pageItem->path(), 0 ); } @@ -316,10 +316,10 @@ void KCMDesignerFields::initGUI() "<p><b>Important:</b> The widget will edit custom fields with an" " application name of %2. To change the application name" " to be edited, set the widget name in TQt Designer.</p></qt>" ) - .tqarg( applicationName(), applicationName() ); + .arg( applicationName(), applicationName() ); KActiveLabel *activeLabel = new KActiveLabel( - i18n( "<a href=\"whatsthis:%1\">How does this work?</a>" ).tqarg(cwHowto), this ); + i18n( "<a href=\"whatsthis:%1\">How does this work?</a>" ).arg(cwHowto), this ); hbox->addWidget( activeLabel ); // ### why is this needed? Looks like a KActiveLabel bug... @@ -360,14 +360,14 @@ void KCMDesignerFields::updatePreview( TQListViewItem *item ) "<tr><td align=\"right\"><b>%5</b></td><td>%6</td></tr>" "<tr><td align=\"right\"><b>%7</b></td><td>%8</td></tr>" "</table></qt>" ) - .tqarg( i18n( "Key:" ) ) - .tqarg( item->text( 0 ).replace("X_","X-") ) - .tqarg( i18n( "Type:" ) ) - .tqarg( item->text( 1 ) ) - .tqarg( i18n( "Classname:" ) ) - .tqarg( item->text( 2 ) ) - .tqarg( i18n( "Description:" ) ) - .tqarg( item->text( 3 ) ); + .arg( i18n( "Key:" ) ) + .arg( item->text( 0 ).replace("X_","X-") ) + .arg( i18n( "Type:" ) ) + .arg( item->text( 1 ) ) + .arg( i18n( "Classname:" ) ) + .arg( item->text( 2 ) ) + .arg( i18n( "Description:" ) ) + .arg( item->text( 3 ) ); mPageDetails->setText( details ); diff --git a/libtdepim/kfileio.cpp b/libtdepim/kfileio.cpp index e167662bb..fa963e167 100644 --- a/libtdepim/kfileio.cpp +++ b/libtdepim/kfileio.cpp @@ -48,20 +48,20 @@ KDE_EXPORT TQCString kFileToString(const TQString &aFileName, bool aEnsureNL, bo if (!info.exists()) { if (aVerbose) - msgDialog(i18n("The specified file does not exist:\n%1").tqarg(aFileName)); + msgDialog(i18n("The specified file does not exist:\n%1").arg(aFileName)); return TQCString(); } if (info.isDir()) { if (aVerbose) - msgDialog(i18n("This is a folder and not a file:\n%1").tqarg(aFileName)); + msgDialog(i18n("This is a folder and not a file:\n%1").arg(aFileName)); return TQCString(); } if (!info.isReadable()) { if (aVerbose) msgDialog(i18n("You do not have read permissions " - "to the file:\n%1").tqarg(aFileName)); + "to the file:\n%1").arg(aFileName)); return TQCString(); } if (len <= 0) return TQCString(); @@ -71,13 +71,13 @@ KDE_EXPORT TQCString kFileToString(const TQString &aFileName, bool aEnsureNL, bo if (aVerbose) switch(file.status()) { case IO_ReadError: - msgDialog(i18n("Could not read file:\n%1").tqarg(aFileName)); + msgDialog(i18n("Could not read file:\n%1").arg(aFileName)); break; case IO_OpenError: - msgDialog(i18n("Could not open file:\n%1").tqarg(aFileName)); + msgDialog(i18n("Could not open file:\n%1").arg(aFileName)); break; default: - msgDialog(i18n("Error while reading file:\n%1").tqarg(aFileName)); + msgDialog(i18n("Error while reading file:\n%1").arg(aFileName)); } return TQCString(); } @@ -94,7 +94,7 @@ KDE_EXPORT TQCString kFileToString(const TQString &aFileName, bool aEnsureNL, bo if (readLen < len) { TQString msg = i18n("Could only read %1 bytes of %2.") - .tqarg(readLen).tqarg(len); + .arg(readLen).arg(len); msgDialog(msg); return TQCString(); } @@ -120,21 +120,21 @@ TQByteArray kFileToBytes(const TQString &aFileName, bool aVerbose) { if (aVerbose) msgDialog(i18n("The specified file does not exist:\n%1") - .tqarg(aFileName)); + .arg(aFileName)); return result; } if (info.isDir()) { if (aVerbose) msgDialog(i18n("This is a folder and not a file:\n%1") - .tqarg(aFileName)); + .arg(aFileName)); return result; } if (!info.isReadable()) { if (aVerbose) msgDialog(i18n("You do not have read permissions " - "to the file:\n%1").tqarg(aFileName)); + "to the file:\n%1").arg(aFileName)); return result; } if (len <= 0) return result; @@ -144,26 +144,26 @@ TQByteArray kFileToBytes(const TQString &aFileName, bool aVerbose) if (aVerbose) switch(file.status()) { case IO_ReadError: - msgDialog(i18n("Could not read file:\n%1").tqarg(aFileName)); + msgDialog(i18n("Could not read file:\n%1").arg(aFileName)); break; case IO_OpenError: - msgDialog(i18n("Could not open file:\n%1").tqarg(aFileName)); + msgDialog(i18n("Could not open file:\n%1").arg(aFileName)); break; default: - msgDialog(i18n("Error while reading file:\n%1").tqarg(aFileName)); + msgDialog(i18n("Error while reading file:\n%1").arg(aFileName)); } return result; } result.resize(len); readLen = file.readBlock(result.data(), len); - kdDebug(5300) << TQString( "len %1" ).tqarg(len) << endl; + kdDebug(5300) << TQString( "len %1" ).arg(len) << endl; if (readLen < len) { TQString msg; msg = i18n("Could only read %1 bytes of %2.") - .tqarg(readLen).tqarg(len); + .arg(readLen).arg(len); msgDialog(msg); return result; } @@ -191,7 +191,7 @@ KDE_EXPORT bool kBytesToFile(const char* aBuffer, int len, { TQString str; str = i18n("File %1 exists.\nDo you want to replace it?") - .tqarg(aFileName); + .arg(aFileName); rc = KMessageBox::warningContinueCancel(0, str, i18n("Save to File"), i18n("&Replace")); if (rc != KMessageBox::Continue) return FALSE; @@ -209,7 +209,7 @@ KDE_EXPORT bool kBytesToFile(const char* aBuffer, int len, if (!aVerbose) return FALSE; rc = KMessageBox::warningContinueCancel(0, i18n("Failed to make a backup copy of %1.\nContinue anyway?") - .tqarg(aFileName), + .arg(aFileName), i18n("Save to File"), KStdGuiItem::save() ); if (rc != KMessageBox::Continue) return FALSE; } @@ -221,14 +221,14 @@ KDE_EXPORT bool kBytesToFile(const char* aBuffer, int len, if (aVerbose) switch(file.status()) { case IO_WriteError: - msgDialog(i18n("Could not write to file:\n%1").tqarg(aFileName)); + msgDialog(i18n("Could not write to file:\n%1").arg(aFileName)); break; case IO_OpenError: msgDialog(i18n("Could not open file for writing:\n%1") - .tqarg(aFileName)); + .arg(aFileName)); break; default: - msgDialog(i18n("Error while writing file:\n%1").tqarg(aFileName)); + msgDialog(i18n("Error while writing file:\n%1").arg(aFileName)); } return FALSE; } @@ -238,13 +238,13 @@ KDE_EXPORT bool kBytesToFile(const char* aBuffer, int len, if (writeLen < 0) { if (aVerbose) - msgDialog(i18n("Could not write to file:\n%1").tqarg(aFileName)); + msgDialog(i18n("Could not write to file:\n%1").arg(aFileName)); return FALSE; } else if (writeLen < len) { TQString msg = i18n("Could only write %1 bytes of %2.") - .tqarg(writeLen).tqarg(len); + .arg(writeLen).arg(len); if (aVerbose) msgDialog(msg); return FALSE; @@ -283,7 +283,7 @@ TQString checkAndCorrectPermissionsIfPossible( const TQString &toCheck, if ( !fiToCheck.exists() ) { error.append( i18n("%1 does not exist") - .tqarg(toCheck) + "\n"); + .arg(toCheck) + "\n"); } // check the access bit of a folder. @@ -295,7 +295,7 @@ TQString checkAndCorrectPermissionsIfPossible( const TQString &toCheck, if ( !g.isReadable() ) { if ( chmod( toCheckEnc, statbuffer.st_mode + S_IXUSR ) != 0 ) { error.append( i18n("%1 is not accessible and that is " - "unchangeable.").tqarg(toCheck) + "\n"); + "unchangeable.").arg(toCheck) + "\n"); } else { kdDebug() << "Changed access bit for " << toCheck << endl; } @@ -316,7 +316,7 @@ TQString checkAndCorrectPermissionsIfPossible( const TQString &toCheck, // Lets try changing it. if ( chmod( toCheckEnc, statbuffer.st_mode + S_IRUSR ) != 0 ) { error.append( i18n("%1 is not readable and that is unchangeable.") - .tqarg(toCheck) + "\n"); + .arg(toCheck) + "\n"); } else { kdDebug() << "Changed the read bit for " << toCheck << endl; } @@ -332,7 +332,7 @@ TQString checkAndCorrectPermissionsIfPossible( const TQString &toCheck, // Lets try changing it. if ( chmod (toCheckEnc, statbuffer.st_mode + S_IWUSR ) != 0 ) { error.append( i18n("%1 is not writable and that is unchangeable.") - .tqarg(toCheck) + "\n"); + .arg(toCheck) + "\n"); } else { kdDebug() << "Changed the write bit for " << toCheck << endl; } @@ -346,7 +346,7 @@ TQString checkAndCorrectPermissionsIfPossible( const TQString &toCheck, // First check if the folder is readable for us. If not, we get // some ugly crashes. if ( !g.isReadable() ){ - error.append(i18n("Folder %1 is inaccessible.").tqarg(toCheck) + "\n"); + error.append(i18n("Folder %1 is inaccessible.").arg(toCheck) + "\n"); } else { const TQFileInfoList *list = g.entryInfoList(); TQFileInfoListIterator it( *list ); diff --git a/libtdepim/kfoldertree.cpp b/libtdepim/kfoldertree.cpp index de29d6a65..79ad6aa9c 100644 --- a/libtdepim/kfoldertree.cpp +++ b/libtdepim/kfoldertree.cpp @@ -198,7 +198,7 @@ void KFolderTreeItem::setFolderSize( TQ_INT64 aSize ) TQ_INT64 recursiveSize = recursiveFolderSize(); if ( recursiveSize != mSize ) { if ( mType != Root ) - size += TQString::fromLatin1(" + %1").tqarg( KIO::convertSize( recursiveSize - mSize ) ); + size += TQString::fromLatin1(" + %1").arg( KIO::convertSize( recursiveSize - mSize ) ); else size = KIO::convertSize( recursiveSize ); } @@ -351,7 +351,7 @@ void KFolderTreeItem::setFolderIsCloseToQuota( bool v ) { if ( mFolderIsCloseToQuota != v) { mFolderIsCloseToQuota = v; - tqrepaint(); + repaint(); } } @@ -535,7 +535,7 @@ void KFolderTree::setFullWidth( bool fullWidth ) //----------------------------------------------------------------------------- void KFolderTree::slotSizeChanged( int section, int, int newSize ) { - viewport()->tqrepaint( + viewport()->repaint( header()->sectionPos(section), 0, newSize, visibleHeight(), false ); } diff --git a/libtdepim/kimportdialog.cpp b/libtdepim/kimportdialog.cpp index da6c98fad..d7e5675eb 100644 --- a/libtdepim/kimportdialog.cpp +++ b/libtdepim/kimportdialog.cpp @@ -337,7 +337,7 @@ void KImportDialog::readFile( int rows ) if (x == mSeparator) { progress->setValue(progressValue++); - if (progressValue % 15 == 0) // try not to constantly tqrepaint + if (progressValue % 15 == 0) // try not to constantly repaint kapp->processEvents(); } diff --git a/libtdepim/kincidencechooser.cpp b/libtdepim/kincidencechooser.cpp index fee89bbb6..68ac5854b 100644 --- a/libtdepim/kincidencechooser.cpp +++ b/libtdepim/kincidencechooser.cpp @@ -265,9 +265,9 @@ void KIncidenceChooser::showDiff() } mDisplayDiff = new KPIM::HTMLDiffAlgoDisplay (this); if ( mInc1->summary().left( 20 ) != mInc2->summary().left( 20 ) ) - mDisplayDiff->setCaption( i18n( "Differences of %1 and %2").tqarg( mInc1->summary().left( 20 ) ).tqarg( mInc2->summary().left( 20 ) ) ); + mDisplayDiff->setCaption( i18n( "Differences of %1 and %2").arg( mInc1->summary().left( 20 ) ).arg( mInc2->summary().left( 20 ) ) ); else - mDisplayDiff->setCaption( i18n( "Differences of %1").tqarg( mInc1->summary().left( 20 ) ) ); + mDisplayDiff->setCaption( i18n( "Differences of %1").arg( mInc1->summary().left( 20 ) ) ); diff = new KPIM::CalendarDiffAlgo( mInc1, mInc2); diff->setLeftSourceTitle( i18n( "Local entry")); diff --git a/libtdepim/komposer/core/pluginmanager.cpp b/libtdepim/komposer/core/pluginmanager.cpp index 58cffa13d..2a55d7349 100644 --- a/libtdepim/komposer/core/pluginmanager.cpp +++ b/libtdepim/komposer/core/pluginmanager.cpp @@ -311,7 +311,7 @@ PluginManager::loadPluginInternal( const TQString &pluginId ) int error = 0; Plugin *plugin = KParts::ComponentFactory::createInstanceFromQuery<Komposer::Plugin>( TQString::fromLatin1( "Komposer/Plugin" ), - TQString::fromLatin1( "[X-KDE-PluginInfo-Name]=='%1'" ).tqarg( pluginId ), + TQString::fromLatin1( "[X-KDE-PluginInfo-Name]=='%1'" ).arg( pluginId ), this, 0, TQStringList(), &error ); if ( plugin ) { diff --git a/libtdepim/komposer/plugins/default/defaulteditor.cpp b/libtdepim/komposer/plugins/default/defaulteditor.cpp index 347db891c..105650eb0 100644 --- a/libtdepim/komposer/plugins/default/defaulteditor.cpp +++ b/libtdepim/komposer/plugins/default/defaulteditor.cpp @@ -87,7 +87,7 @@ DefaultEditor::changeSignature( const TQString &sig ) TQString text = m_textEdit->text(); int sigStart = text.findRev( "-- " ); - TQString sigText = TQString( "-- \n%1" ).tqarg( sig ); + TQString sigText = TQString( "-- \n%1" ).arg( sig ); text.replace( sigStart, text.length(), sigText ); } @@ -202,10 +202,10 @@ DefaultEditor::createActions( KActionCollection *ac ) connect( m_actionAlignJustify, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setAlignJustify(bool)) ); - m_actionAlignLeft->setExclusiveGroup( "tqalignment" ); - m_actionAlignCenter->setExclusiveGroup( "tqalignment" ); - m_actionAlignRight->setExclusiveGroup( "tqalignment" ); - m_actionAlignJustify->setExclusiveGroup( "tqalignment" ); + m_actionAlignLeft->setExclusiveGroup( "alignment" ); + m_actionAlignCenter->setExclusiveGroup( "alignment" ); + m_actionAlignRight->setExclusiveGroup( "alignment" ); + m_actionAlignJustify->setExclusiveGroup( "alignment" ); // // Tools @@ -244,7 +244,7 @@ DefaultEditor::updateCharFmt() void DefaultEditor::updateAligment() { - int align = m_textEdit->tqalignment(); + int align = m_textEdit->alignment(); switch ( align ) { case AlignRight: diff --git a/libtdepim/komposer/plugins/default/defaulteditorui.rc b/libtdepim/komposer/plugins/default/defaulteditorui.rc index de8c2e6d2..479fa8b06 100644 --- a/libtdepim/komposer/plugins/default/defaulteditorui.rc +++ b/libtdepim/komposer/plugins/default/defaulteditorui.rc @@ -24,7 +24,7 @@ <Action name="format_color"/> <DefineGroup name="format_chars_group" /> <Separator/> - <Menu name="tqalignment"><text>&Alignment</text> + <Menu name="alignment"><text>&Alignment</text> <Action name="format_align_left"/> <Action name="format_align_center"/> <Action name="format_align_right"/> diff --git a/libtdepim/kpixmapregionselectorwidget.cpp b/libtdepim/kpixmapregionselectorwidget.cpp index 04ef9c8f4..0697f667d 100644 --- a/libtdepim/kpixmapregionselectorwidget.cpp +++ b/libtdepim/kpixmapregionselectorwidget.cpp @@ -216,7 +216,7 @@ bool KPixmapRegionSelectorWidget::eventFilter(TQObject *obj, TQEvent *ev) if ( ev->type() == TQEvent::MouseButtonPress ) { TQMouseEvent *mev= (TQMouseEvent *)(ev); - //kdDebug() << TQString("click at %1,%2").tqarg( mev->x() ).tqarg( mev->y() ) << endl; + //kdDebug() << TQString("click at %1,%2").arg( mev->x() ).arg( mev->y() ) << endl; if ( mev->button() == Qt::RightButton ) { @@ -249,7 +249,7 @@ bool KPixmapRegionSelectorWidget::eventFilter(TQObject *obj, TQEvent *ev) { TQMouseEvent *mev= (TQMouseEvent *)(ev); - //kdDebug() << TQString("move to %1,%2").tqarg( mev->x() ).tqarg( mev->y() ) << endl; + //kdDebug() << TQString("move to %1,%2").arg( mev->x() ).arg( mev->y() ) << endl; if ( m_state == Resizing ) { @@ -421,7 +421,7 @@ void KPixmapRegionSelectorWidget::setMaximumWidgetSize(int width, int height) if (m_selectedRegion == m_originalPixmap.rect()) m_selectedRegion=TQRect(); // kdDebug() << TQString(" original Pixmap :") << m_originalPixmap.rect() << endl; -// kdDebug() << TQString(" unzoomed Pixmap : %1 x %2 ").tqarg(m_unzoomedPixmap.width()).tqarg(m_unzoomedPixmap.height()) << endl; +// kdDebug() << TQString(" unzoomed Pixmap : %1 x %2 ").arg(m_unzoomedPixmap.width()).arg(m_unzoomedPixmap.height()) << endl; if ( !m_originalPixmap.isNull() && ( m_originalPixmap.width() > m_maxWidth || diff --git a/libtdepim/kregexp3.cpp b/libtdepim/kregexp3.cpp index bffc491ea..d60946c28 100644 --- a/libtdepim/kregexp3.cpp +++ b/libtdepim/kregexp3.cpp @@ -64,7 +64,7 @@ TQString KRegExp3::replace( const TQString & str, pos = rx.search( replacementStr, pos ); #ifdef DEBUG_KREGEXP3 - kdDebug() << TQString(" Found match at pos %1").tqarg(pos) << endl; + kdDebug() << TQString(" Found match at pos %1").arg(pos) << endl; #endif if ( pos < 0 ) { @@ -88,13 +88,13 @@ TQString KRegExp3::replace( const TQString & str, backRefs << rx.cap(i).toInt(); #ifdef DEBUG_KREGEXP3 kdDebug() << TQString(" Found %1 at position %2 in the capturedTexts.") - .tqarg(backRefs.last()).tqarg(i) << endl; + .arg(backRefs.last()).arg(i) << endl; #endif break; } pos += rx.matchedLength(); #ifdef DEBUG_KREGEXP3 - kdDebug() << TQString(" Setting new pos to %1.").tqarg(pos) << endl; + kdDebug() << TQString(" Setting new pos to %1.").arg(pos) << endl; #endif oldpos = pos; } @@ -125,7 +125,7 @@ TQString KRegExp3::replace( const TQString & str, pos = search( str, pos ); #ifdef DEBUG_KREGEXP3 - kdDebug() << TQString(" Found match at pos %1").tqarg(pos) << endl; + kdDebug() << TQString(" Found match at pos %1").arg(pos) << endl; #endif if ( pos < 0 ) { @@ -168,7 +168,7 @@ TQString KRegExp3::replace( const TQString & str, } pos += matchedLength(); #ifdef DEBUG_KREGEXP3 - kdDebug() << TQString(" Setting new pos to %1.").tqarg(pos) << endl; + kdDebug() << TQString(" Setting new pos to %1.").arg(pos) << endl; #endif oldpos = pos; diff --git a/libtdepim/krsqueezedtextlabel.cpp b/libtdepim/krsqueezedtextlabel.cpp index ad674aa84..d024cd97c 100644 --- a/libtdepim/krsqueezedtextlabel.cpp +++ b/libtdepim/krsqueezedtextlabel.cpp @@ -75,11 +75,11 @@ void KRSqueezedTextLabel::squeezeTextToLabel() { } } -void KRSqueezedTextLabel::setAlignment( int tqalignment ) +void KRSqueezedTextLabel::setAlignment( int alignment ) { // save fullText and restore it TQString tmpFull(fullText); - TQLabel::setAlignment(tqalignment); + TQLabel::setAlignment(alignment); fullText = tmpFull; } diff --git a/libtdepim/kscoring.cpp b/libtdepim/kscoring.cpp index e97523772..3bcbd7fd4 100644 --- a/libtdepim/kscoring.cpp +++ b/libtdepim/kscoring.cpp @@ -1137,7 +1137,7 @@ TQString KScoringManager::findUniqueName() const while (nr < 99999999) { nr++; - ret = i18n("rule %1").tqarg(nr); + ret = i18n("rule %1").arg(nr); duplicated=false; TQPtrListIterator<KScoringRule> it(allRules); diff --git a/libtdepim/ksubscription.cpp b/libtdepim/ksubscription.cpp index e3c2ce4f4..f1c5b657a 100644 --- a/libtdepim/ksubscription.cpp +++ b/libtdepim/ksubscription.cpp @@ -133,7 +133,7 @@ void GroupItem::setVisible( bool b ) TQListViewItem::setVisible(b); else { - // leave it visible so that tqchildren remain visible + // leave it visible so that children remain visible setOpen(true); setEnabled(false); } @@ -775,7 +775,7 @@ void KSubscription::slotUpdateStatusLabel() activeItemCount()); else text = i18n("%1: (1 matching)", "%1: (%n matching)", activeItemCount()) - .tqarg(account()->name()); + .arg(account()->name()); leftLabel->setText(text); } diff --git a/libtdepim/ldapclient.cpp b/libtdepim/ldapclient.cpp index 563728da3..038824cad 100644 --- a/libtdepim/ldapclient.cpp +++ b/libtdepim/ldapclient.cpp @@ -49,7 +49,7 @@ static KStaticDeleter<KConfig> configDeleter; TQString LdapObject::toString() const { - TQString result = TQString::fromLatin1( "\ndn: %1\n" ).tqarg( dn ); + TQString result = TQString::fromLatin1( "\ndn: %1\n" ).arg( dn ); for ( LdapAttrMap::ConstIterator it = attrs.begin(); it != attrs.end(); ++it ) { TQString attr = it.key(); for ( LdapAttrValue::ConstIterator it2 = (*it).begin(); it2 != (*it).end(); ++it2 ) { @@ -278,53 +278,53 @@ void LdapSearch::readConfig( LdapServer &server, KConfig *config, int j, bool ac { TQString prefix; if ( active ) prefix = "Selected"; - TQString host = config->readEntry( prefix + TQString( "Host%1" ).tqarg( j ), "" ).stripWhiteSpace(); + TQString host = config->readEntry( prefix + TQString( "Host%1" ).arg( j ), "" ).stripWhiteSpace(); if ( !host.isEmpty() ) server.setHost( host ); - int port = config->readNumEntry( prefix + TQString( "Port%1" ).tqarg( j ), 389 ); + int port = config->readNumEntry( prefix + TQString( "Port%1" ).arg( j ), 389 ); server.setPort( port ); - TQString base = config->readEntry( prefix + TQString( "Base%1" ).tqarg( j ), "" ).stripWhiteSpace(); + TQString base = config->readEntry( prefix + TQString( "Base%1" ).arg( j ), "" ).stripWhiteSpace(); if ( !base.isEmpty() ) server.setBaseDN( base ); - TQString user = config->readEntry( prefix + TQString( "User%1" ).tqarg( j ) ).stripWhiteSpace(); + TQString user = config->readEntry( prefix + TQString( "User%1" ).arg( j ) ).stripWhiteSpace(); if ( !user.isEmpty() ) server.setUser( user ); - TQString bindDN = config->readEntry( prefix + TQString( "Bind%1" ).tqarg( j ) ).stripWhiteSpace(); + TQString bindDN = config->readEntry( prefix + TQString( "Bind%1" ).arg( j ) ).stripWhiteSpace(); if ( !bindDN.isEmpty() ) server.setBindDN( bindDN ); - TQString pwdBindDN = config->readEntry( prefix + TQString( "PwdBind%1" ).tqarg( j ) ); + TQString pwdBindDN = config->readEntry( prefix + TQString( "PwdBind%1" ).arg( j ) ); if ( !pwdBindDN.isEmpty() ) server.setPwdBindDN( pwdBindDN ); - server.setTimeLimit( config->readNumEntry( prefix + TQString( "TimeLimit%1" ).tqarg( j ) ) ); - server.setSizeLimit( config->readNumEntry( prefix + TQString( "SizeLimit%1" ).tqarg( j ) ) ); - server.setVersion( config->readNumEntry( prefix + TQString( "Version%1" ).tqarg( j ), 3 ) ); - server.setSecurity( config->readNumEntry( prefix + TQString( "Security%1" ).tqarg( j ) ) ); - server.setAuth( config->readNumEntry( prefix + TQString( "Auth%1" ).tqarg( j ) ) ); - server.setMech( config->readEntry( prefix + TQString( "Mech%1" ).tqarg( j ) ) ); + server.setTimeLimit( config->readNumEntry( prefix + TQString( "TimeLimit%1" ).arg( j ) ) ); + server.setSizeLimit( config->readNumEntry( prefix + TQString( "SizeLimit%1" ).arg( j ) ) ); + server.setVersion( config->readNumEntry( prefix + TQString( "Version%1" ).arg( j ), 3 ) ); + server.setSecurity( config->readNumEntry( prefix + TQString( "Security%1" ).arg( j ) ) ); + server.setAuth( config->readNumEntry( prefix + TQString( "Auth%1" ).arg( j ) ) ); + server.setMech( config->readEntry( prefix + TQString( "Mech%1" ).arg( j ) ) ); } void LdapSearch::writeConfig( const LdapServer &server, KConfig *config, int j, bool active ) { TQString prefix; if ( active ) prefix = "Selected"; - config->writeEntry( prefix + TQString( "Host%1" ).tqarg( j ), server.host() ); - config->writeEntry( prefix + TQString( "Port%1" ).tqarg( j ), server.port() ); - config->writeEntry( prefix + TQString( "Base%1" ).tqarg( j ), server.baseDN() ); - config->writeEntry( prefix + TQString( "User%1" ).tqarg( j ), server.user() ); - config->writeEntry( prefix + TQString( "Bind%1" ).tqarg( j ), server.bindDN() ); - config->writeEntry( prefix + TQString( "PwdBind%1" ).tqarg( j ), server.pwdBindDN() ); - config->writeEntry( prefix + TQString( "TimeLimit%1" ).tqarg( j ), server.timeLimit() ); - config->writeEntry( prefix + TQString( "SizeLimit%1" ).tqarg( j ), server.sizeLimit() ); - config->writeEntry( prefix + TQString( "Version%1" ).tqarg( j ), server.version() ); - config->writeEntry( prefix + TQString( "Security%1" ).tqarg( j ), server.security() ); - config->writeEntry( prefix + TQString( "Auth%1" ).tqarg( j ), server.auth() ); - config->writeEntry( prefix + TQString( "Mech%1" ).tqarg( j ), server.mech() ); + config->writeEntry( prefix + TQString( "Host%1" ).arg( j ), server.host() ); + config->writeEntry( prefix + TQString( "Port%1" ).arg( j ), server.port() ); + config->writeEntry( prefix + TQString( "Base%1" ).arg( j ), server.baseDN() ); + config->writeEntry( prefix + TQString( "User%1" ).arg( j ), server.user() ); + config->writeEntry( prefix + TQString( "Bind%1" ).arg( j ), server.bindDN() ); + config->writeEntry( prefix + TQString( "PwdBind%1" ).arg( j ), server.pwdBindDN() ); + config->writeEntry( prefix + TQString( "TimeLimit%1" ).arg( j ), server.timeLimit() ); + config->writeEntry( prefix + TQString( "SizeLimit%1" ).arg( j ), server.sizeLimit() ); + config->writeEntry( prefix + TQString( "Version%1" ).arg( j ), server.version() ); + config->writeEntry( prefix + TQString( "Security%1" ).arg( j ), server.security() ); + config->writeEntry( prefix + TQString( "Auth%1" ).arg( j ), server.auth() ); + config->writeEntry( prefix + TQString( "Mech%1" ).arg( j ), server.mech() ); } KConfig* LdapSearch::config() @@ -351,7 +351,7 @@ LdapSearch::LdapSearch() void LdapSearch::readWeighForClient( LdapClient *client, KConfig *config, int clientNumber ) { - const int completionWeight = config->readNumEntry( TQString( "SelectedCompletionWeight%1" ).tqarg( clientNumber ), -1 ); + const int completionWeight = config->readNumEntry( TQString( "SelectedCompletionWeight%1" ).arg( clientNumber ), -1 ); if ( completionWeight != -1 ) client->setCompletionWeight( completionWeight ); } @@ -442,7 +442,7 @@ void LdapSearch::startSearch( const TQString& txt ) * person entries without an email address to show up, while still not showing things * like structural entries in the ldap tree. */ TQString filter = TQString( "&(|(objectclass=person)(objectclass=groupOfNames)(mail=*))(|(cn=%1*)(mail=%2*)(mail=*@%3*)(givenName=%4*)(sn=%5*))" ) - .tqarg( mSearchText ).tqarg( mSearchText ).tqarg( mSearchText ).tqarg( mSearchText ).tqarg( mSearchText ); + .arg( mSearchText ).arg( mSearchText ).arg( mSearchText ).arg( mSearchText ).arg( mSearchText ); TQValueList< LdapClient* >::Iterator it; for ( it = mClients.begin(); it != mClients.end(); ++it ) { @@ -590,7 +590,7 @@ void LdapSearch::makeSearchData( TQStringList& ret, LdapResultList& resList ) ret.append( mail ); } else { //kdDebug(5300) << "LdapSearch::makeSearchData() name: \"" << name << "\" mail: \"" << mail << "\"" << endl; - ret.append( TQString( "%1 <%2>" ).tqarg( name ).tqarg( mail ) ); + ret.append( TQString( "%1 <%2>" ).arg( name ).arg( mail ) ); } LdapResult sr; diff --git a/libtdepim/ldapsearchdialog.cpp b/libtdepim/ldapsearchdialog.cpp index 0f991686c..941253a45 100644 --- a/libtdepim/ldapsearchdialog.cpp +++ b/libtdepim/ldapsearchdialog.cpp @@ -238,23 +238,23 @@ void LDAPSearchDialog::restoreSettings() for ( int j = 0; j < mNumHosts; ++j ) { KPIM::LdapServer ldapServer; - TQString host = config->readEntry( TQString( "SelectedHost%1" ).tqarg( j ), "" ); + TQString host = config->readEntry( TQString( "SelectedHost%1" ).arg( j ), "" ); if ( !host.isEmpty() ) ldapServer.setHost( host ); - int port = config->readUnsignedNumEntry( TQString( "SelectedPort%1" ).tqarg( j ) ); + int port = config->readUnsignedNumEntry( TQString( "SelectedPort%1" ).arg( j ) ); if ( port ) ldapServer.setPort( port ); - TQString base = config->readEntry( TQString( "SelectedBase%1" ).tqarg( j ), "" ); + TQString base = config->readEntry( TQString( "SelectedBase%1" ).arg( j ), "" ); if ( !base.isEmpty() ) ldapServer.setBaseDN( base ); - TQString bindDN = config->readEntry( TQString( "SelectedBind%1" ).tqarg( j ), "" ); + TQString bindDN = config->readEntry( TQString( "SelectedBind%1" ).arg( j ), "" ); if ( !bindDN.isEmpty() ) ldapServer.setBindDN( bindDN ); - TQString pwdBindDN = config->readEntry( TQString( "SelectedPwdBind%1" ).tqarg( j ), "" ); + TQString pwdBindDN = config->readEntry( TQString( "SelectedPwdBind%1" ).arg( j ), "" ); if ( !pwdBindDN.isEmpty() ) ldapServer.setPwdBindDN( pwdBindDN ); @@ -352,15 +352,15 @@ TQString LDAPSearchDialog::makeFilter( const TQString& query, const TQString& at if ( attr == i18n( "Name" ) ) { result += startsWith ? "|(cn=%1*)(sn=%2*)" : "|(cn=*%1*)(sn=*%2*)"; - result = result.tqarg( query ).tqarg( query ); + result = result.arg( query ).arg( query ); } else { result += (startsWith ? "%1=%2*" : "%1=*%2*"); if ( attr == i18n( "Email" ) ) { - result = result.tqarg( "mail" ).tqarg( query ); + result = result.arg( "mail" ).arg( query ); } else if ( attr == i18n( "Home Number" ) ) { - result = result.tqarg( "homePhone" ).tqarg( query ); + result = result.arg( "homePhone" ).arg( query ); } else if ( attr == i18n( "Work Number" ) ) { - result = result.tqarg( "telephoneNumber" ).tqarg( query ); + result = result.arg( "telephoneNumber" ).arg( query ); } else { // Error? result = TQString(); diff --git a/libtdepim/linklocator.cpp b/libtdepim/linklocator.cpp index 25a5a6644..8738788f4 100644 --- a/libtdepim/linklocator.cpp +++ b/libtdepim/linklocator.cpp @@ -362,7 +362,7 @@ TQString LinkLocator::pngToDataUrl( const TQString & iconPath ) TQByteArray ba = pngFile.readAll(); pngFile.close(); return TQString::fromLatin1("data:image/png;base64,%1") - .tqarg( KCodecs::base64Encode( ba ).data() ); + .arg( KCodecs::base64Encode( ba ).data() ); } @@ -422,7 +422,7 @@ TQString LinkLocator::getEmoticon() // for copy & paste) representing the smiley htmlRep = TQString("<img class=\"pimsmileyimg\" src=\"%1\" " "alt=\"%2\" title=\"%3\" width=\"16\" height=\"16\"/>") - .tqarg( dataUrl, + .arg( dataUrl, TQStyleSheet::escape( smiley ), TQStyleSheet::escape( smiley ) ); } @@ -445,7 +445,7 @@ TQString LinkLocator::highlightedText() if ( ch != '/' && ch != '*' && ch != '_' ) return TQString(); - TQRegExp re = TQRegExp( TQString("\\%1([0-9A-Za-z]+)\\%2").tqarg( ch ).tqarg( ch ) ); + TQRegExp re = TQRegExp( TQString("\\%1([0-9A-Za-z]+)\\%2").arg( ch ).arg( ch ) ); if ( re.search( mText, mPos ) == mPos ) { uint length = re.matchedLength(); // there must be a whitespace after the closing formating symbol diff --git a/libtdepim/overlaywidget.h b/libtdepim/overlaywidget.h index 9e611fb92..1ad9dfa36 100644 --- a/libtdepim/overlaywidget.h +++ b/libtdepim/overlaywidget.h @@ -37,7 +37,7 @@ namespace KPIM { /** * This is a widget that can align itself with another one, without using a tqlayout, * so that it can actually be on top of other widgets. - * Currently the only supported type of tqalignment is "right aligned, on top of the other widget". + * Currently the only supported type of alignment is "right aligned, on top of the other widget". * * OverlayWidget inherits TQHBox for convenience purposes (tqlayout, and frame) */ diff --git a/libtdepim/progressdialog.cpp b/libtdepim/progressdialog.cpp index b5b6c6ce3..b9e196143 100644 --- a/libtdepim/progressdialog.cpp +++ b/libtdepim/progressdialog.cpp @@ -209,7 +209,7 @@ void TransactionItem::setLabel( const TQString& label ) mItemLabel->setText( label ); } -void TransactionItem::seStatus( const TQString& status ) +void TransactionItem::setStatus( const TQString& status ) { mItemStatus->setText( status ); } @@ -358,7 +358,7 @@ void ProgressDialog::slotTransactionStatus( ProgressItem *item, { if ( mTransactionsToListviewItems.contains( item ) ) { TransactionItem *ti = mTransactionsToListviewItems[ item ]; - ti->seStatus( status ); + ti->setStatus( status ); } } diff --git a/libtdepim/progressdialog.h b/libtdepim/progressdialog.h index e144e34eb..91d92be57 100644 --- a/libtdepim/progressdialog.h +++ b/libtdepim/progressdialog.h @@ -90,7 +90,7 @@ public: void setProgress( int progress ); void setLabel( const TQString& ); - void seStatus( const TQString& ); + void setStatus( const TQString& ); void setCrypto( bool ); void setTotalSteps( int totalSteps ); diff --git a/libtdepim/progressmanager.cpp b/libtdepim/progressmanager.cpp index 2c6e1a3cf..0f3e39cae 100644 --- a/libtdepim/progressmanager.cpp +++ b/libtdepim/progressmanager.cpp @@ -84,7 +84,7 @@ void ProgressItem::cancel() if ( mCanceled || !mCanBeCanceled ) return; kdDebug(5300) << "ProgressItem::cancel() - " << label() << endl; mCanceled = true; - // Cancel all tqchildren. + // Cancel all children. TQValueList<ProgressItem*> kids = mChildren.keys(); TQValueList<ProgressItem*>::Iterator it( kids.begin() ); TQValueList<ProgressItem*>::Iterator end( kids.end() ); @@ -93,7 +93,7 @@ void ProgressItem::cancel() if ( kid->canBeCanceled() ) kid->cancel(); } - seStatus( i18n( "Aborting..." ) ); + setStatus( i18n( "Aborting..." ) ); emit progressItemCanceled( this ); } @@ -111,7 +111,7 @@ void ProgressItem::setLabel( const TQString& v ) emit progressItemLabel( this, mLabel ); } -void ProgressItem::seStatus( const TQString& v ) +void ProgressItem::setStatus( const TQString& v ) { mStatus = v; emit progressItemStatus( this, mStatus ); diff --git a/libtdepim/progressmanager.h b/libtdepim/progressmanager.h index bb8e864ad..2458d5ca0 100644 --- a/libtdepim/progressmanager.h +++ b/libtdepim/progressmanager.h @@ -76,7 +76,7 @@ class KDE_EXPORT ProgressItem : public TQObject * @p v will be interpreted as rich text, so it might have to be escaped. * @param v The status string. */ - void seStatus( const TQString& v ); + void setStatus( const TQString& v ); /** * @return Whether this item can be cancelled. @@ -132,7 +132,7 @@ class KDE_EXPORT ProgressItem : public TQObject * Reset the progress value of this item to 0 and the status string to * the empty string. */ - void reset() { setProgress( 0 ); seStatus( TQString() ); mCompleted = 0; } + void reset() { setProgress( 0 ); setStatus( TQString() ); mCompleted = 0; } void cancel(); @@ -310,8 +310,8 @@ class KDE_EXPORT ProgressManager : public TQObject * interpreted as rich text, so it might have to be escaped. * @param canBeCanceled can the user cancel this operation? * @param usesCrypto does the operation use secure transports (SSL) - * Cancelling the parent will cancel the tqchildren as well (if they can be - * cancelled) and ongoing tqchildren prevent parents from finishing. + * Cancelling the parent will cancel the children as well (if they can be + * cancelled) and ongoing children prevent parents from finishing. * @return The ProgressItem representing the operation. */ static ProgressItem * createProgressItem( ProgressItem* parent, @@ -360,7 +360,7 @@ class KDE_EXPORT ProgressManager : public TQObject * @return the only top level progressitem when there's only one. * Returns 0 if there is no item, or more than one top level item. * Since this is used to calculate the overall progress, it will also return - * 0 if there is an item which uses a busy indicator, since that will tqinvalidate + * 0 if there is an item which uses a busy indicator, since that will invalidate * the overall progress. */ ProgressItem* singleItem() const; diff --git a/libtdepim/qutf7codec.cpp b/libtdepim/qutf7codec.cpp index dc8ef2a2f..b0076172c 100644 --- a/libtdepim/qutf7codec.cpp +++ b/libtdepim/qutf7codec.cpp @@ -18,7 +18,7 @@ with any version of TQt by TrollTech AS, Norway. In this case, the use of this plugin doesn't cause the resulting executable to be covered by the GNU General Public License. - This exception does not however tqinvalidate any other reasons why the + This exception does not however invalidate any other reasons why the executable file might be covered by the GNU General Public License. */ diff --git a/libtdepim/qutf7codec.h b/libtdepim/qutf7codec.h index 4057d276c..ef7000ff4 100644 --- a/libtdepim/qutf7codec.h +++ b/libtdepim/qutf7codec.h @@ -18,7 +18,7 @@ with any version of TQt by TrollTech AS, Norway. In this case, the use of this plugin doesn't cause the resulting executable to be covered by the GNU General Public License. - This exception does not however tqinvalidate any other reasons why the + This exception does not however invalidate any other reasons why the executable file might be covered by the GNU General Public License. */ diff --git a/libtdepim/qutf7codecplugin.cpp b/libtdepim/qutf7codecplugin.cpp index 49eb92c8f..7702ed9f1 100644 --- a/libtdepim/qutf7codecplugin.cpp +++ b/libtdepim/qutf7codecplugin.cpp @@ -18,7 +18,7 @@ with any version of TQt by TrollTech AS, Norway. In this case, the use of this plugin doesn't cause the resulting executable to be covered by the GNU General Public License. - This exception does not however tqinvalidate any other reasons why the + This exception does not however invalidate any other reasons why the executable file might be covered by the GNU General Public License. */ diff --git a/libtdepim/sendsmsdialog.cpp b/libtdepim/sendsmsdialog.cpp index d7ffd57c8..0232a7823 100644 --- a/libtdepim/sendsmsdialog.cpp +++ b/libtdepim/sendsmsdialog.cpp @@ -68,13 +68,13 @@ void SendSMSDialog::updateMessageLength() int length = mText->length(); if( length > 480 ) - mMessageLength->setText( TQString( "%1/%2 (%3)" ).tqarg( length ).tqarg( 500 ).tqarg( 4 ) ); + mMessageLength->setText( TQString( "%1/%2 (%3)" ).arg( length ).arg( 500 ).arg( 4 ) ); else if( length > 320 ) - mMessageLength->setText( TQString( "%1/%2 (%3)" ).tqarg( length ).tqarg( 480 ).tqarg( 3 ) ); + mMessageLength->setText( TQString( "%1/%2 (%3)" ).arg( length ).arg( 480 ).arg( 3 ) ); else if( length > 160 ) - mMessageLength->setText( TQString( "%1/%2 (%3)" ).tqarg( length ).tqarg( 320 ).tqarg( 2 ) ); + mMessageLength->setText( TQString( "%1/%2 (%3)" ).arg( length ).arg( 320 ).arg( 2 ) ); else - mMessageLength->setText( TQString( "%1/%2" ).tqarg( length ).tqarg( 160 ) ); + mMessageLength->setText( TQString( "%1/%2" ).arg( length ).arg( 160 ) ); } void SendSMSDialog::updateButtons() diff --git a/mimelib/doc/msgcmp.html b/mimelib/doc/msgcmp.html index 2e8a3da77..48a7ab549 100644 --- a/mimelib/doc/msgcmp.html +++ b/mimelib/doc/msgcmp.html @@ -143,13 +143,13 @@ These features are the following: <P> <LI> Children. The preceding discussion about a component's parent is relevant - to an understanding of a component's tqchildren. A component's parse method - calls the parse methods of its tqchildren after it has executed its own parse - method (and, in some cases, created all of its tqchildren). Also, a component - typically calls the assemble method of its tqchildren before it executes its + to an understanding of a component's children. A component's parse method + calls the parse methods of its children after it has executed its own parse + method (and, in some cases, created all of its children). Also, a component + typically calls the assemble method of its children before it executes its own. A component's child may request that the component set its is-modified - flag. <B><TT>DwMessageComponent</TT></B> does not deal directly with tqchildren. - Derived classes bear all the responsibility for handling their tqchildren. + flag. <B><TT>DwMessageComponent</TT></B> does not deal directly with children. + Derived classes bear all the responsibility for handling their children. </UL> <H2> <FONT COLOR="navy"> Public Member Functions </FONT> @@ -174,7 +174,7 @@ The third constructor copies <B><TT>aStr</TT></B> to the new <B><TT>aParent</TT></B> as its parent. In typical cases, the virtual member function <B><TT>Parse()</TT></B> should be called immediately after this constructor to parse the new <B><TT>DwMessageComponent</TT></B> object and -all of its tqchildren into their broken-down representations. +all of its children into their broken-down representations. <P> <FONT COLOR="teal"><B> const DwMessageComponent& <A NAME="op_eq">operator =</A> (const DwMessageComponent& aCmp) </B></FONT> @@ -189,11 +189,11 @@ A pure virtual function which provides an interface to the parse method. The parse method, implemented in derived classes, is responsible for extracting the broken-down representation from the string representation. In some derived classes, such as <B><TT>DwHeaders</TT></B>, the parse method is also responsible -for creating the tqchildren of the object. (In the case of -<B><TT>DwHeaders</TT></B>, the tqchildren created are the +for creating the children of the object. (In the case of +<B><TT>DwHeaders</TT></B>, the children created are the <B><TT>DwField</TT></B> objects that represent the <I>field</I>s contained in the <I>headers</I>.) The <B><TT>Parse()</TT></B> function always calls -the <B><TT>Parse()</TT></B> function of all of its tqchildren. +the <B><TT>Parse()</TT></B> function of all of its children. <P> <FONT COLOR="teal"><B> virtual void <A NAME="Assemble">Assemble</A>() = 0 </B></FONT> @@ -203,11 +203,11 @@ The assemble method, implemented in derived classes, is responsible for creating the string representation from the broken-down representation. In other words, the assemble method is the opposite of the parse method. Before assembling its string representation, the assemble method calls the assemble method -of each of its tqchildren. In this way, the entire tree structure that represents +of each of its children. In this way, the entire tree structure that represents a message may be traversed. If the is-modifed flag for a <B><TT>DwMessageComponent</TT></B> is cleared, the <B><TT>Assemble()</TT></B> function will return immediately without calling -the <B><TT>Assemble()</TT></B> function of any of its tqchildren. +the <B><TT>Assemble()</TT></B> function of any of its children. <P> <FONT COLOR="teal"><B> virtual DwMessageComponent* <A NAME="Clone">Clone</A>() const = 0 </B></FONT> @@ -224,7 +224,7 @@ Sets the object's string representation. <B><TT>aCstr</TT></B> must be NUL-terminated. This member function does not invoke the parse method. Typically, the virtual member function <B><TT>Parse()</TT></B> should be called immediately after this member function to parse the -<B><TT>DwMessageComponent</TT></B> object and all of its tqchildren into their +<B><TT>DwMessageComponent</TT></B> object and all of its children into their broken-down representations. See also <B><TT>DwMessageComponent::Parse()</TT></B> <P> diff --git a/mimelib/mimelib/msgcmp.h b/mimelib/mimelib/msgcmp.h index de2c6d891..00b7cb9f7 100644 --- a/mimelib/mimelib/msgcmp.h +++ b/mimelib/mimelib/msgcmp.h @@ -109,16 +109,16 @@ //. //. \item //. Children. The preceding discussion about a component's parent is -//. relevant to an understanding of a component's tqchildren. A component's -//. parse method calls the parse methods of its tqchildren +//. relevant to an understanding of a component's children. A component's +//. parse method calls the parse methods of its children //. after it has executed its own parse method (and, in some cases, created -//. all of its tqchildren). +//. all of its children). //. Also, a component typically calls the assemble method of its -//. tqchildren before it executes its own. A component's child may request +//. children before it executes its own. A component's child may request //. that the component set its is-modified flag. -//. {\tt DwMessageComponent} does not deal directly with tqchildren. +//. {\tt DwMessageComponent} does not deal directly with children. //. Derived classes bear all the responsibility for handling their -//. tqchildren. +//. children. //. \end{enumerate} //============================================================================= //+ Noentry ~DwMessageComponent _PrintDebugInfo mString mIsModified mParent @@ -174,7 +174,7 @@ public: //. {\tt aParent} as its parent. In typical cases, the virtual //. member function {\tt Parse()} should be called immediately after //. this constructor to parse the new {\tt DwMessageComponent} object - //. and all of its tqchildren into their broken-down representations. + //. and all of its children into their broken-down representations. virtual ~DwMessageComponent(); @@ -188,10 +188,10 @@ public: //. responsible for extracting the broken-down representation from //. the string representation. In some derived classes, such as //. {\tt DwHeaders}, the parse method is also responsible for creating the - //. tqchildren of the object. (In the case of {\tt DwHeaders}, the tqchildren + //. children of the object. (In the case of {\tt DwHeaders}, the children //. created are the {\tt DwField} objects that represent the {\it field}s //. contained in the {\it headers}.) The {\tt Parse()} function always - //. calls the {\tt Parse()} function of all of its tqchildren. + //. calls the {\tt Parse()} function of all of its children. virtual void Assemble() = 0; //. A pure virtual function which provides an interface to the @@ -200,11 +200,11 @@ public: //. from the broken-down representation. In other words, the //. assemble method is the opposite of the parse method. Before //. assembling its string representation, the assemble method calls - //. the assemble method of each of its tqchildren. In this way, the + //. the assemble method of each of its children. In this way, the //. entire tree structure that represents a message may be traversed. //. If the is-modifed flag for a {\tt DwMessageComponent} is cleared, //. the {\tt Assemble()} function will return immediately without - //. calling the {\tt Assemble()} function of any of its tqchildren. + //. calling the {\tt Assemble()} function of any of its children. virtual DwMessageComponent* Clone() const = 0; //. Creates a new {\tt DwMessageComponent} on the free store that is of @@ -217,7 +217,7 @@ public: //. NUL-terminated. This member function does not invoke the parse //. method. Typically, the virtual member function {\tt Parse()} //. should be called immediately after this member function to parse - //. the {\tt DwMessageComponent} object and all of its tqchildren into + //. the {\tt DwMessageComponent} object and all of its children into //. their broken-down representations. See also //. {\tt DwMessageComponent::Parse()} diff --git a/plugins/kmail/bodypartformatter/text_calendar.cpp b/plugins/kmail/bodypartformatter/text_calendar.cpp index 0a2d2b30b..f31ed3a48 100644 --- a/plugins/kmail/bodypartformatter/text_calendar.cpp +++ b/plugins/kmail/bodypartformatter/text_calendar.cpp @@ -295,7 +295,7 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler } - Attendee* seStatusOnMyself( Incidence* incidence, Attendee* myself, + Attendee* setStatusOnMyself( Incidence* incidence, Attendee* myself, Attendee::PartStat status, const TQString &receiver ) const { Attendee* newMyself = 0; @@ -344,16 +344,16 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler TQString subject; switch ( type ) { case Answer: - subject = i18n( "Answer: %1" ).tqarg( summary ); + subject = i18n( "Answer: %1" ).arg( summary ); break; case Delegation: - subject = i18n( "Delegated: %1" ).tqarg( summary ); + subject = i18n( "Delegated: %1" ).arg( summary ); break; case Forward: - subject = i18n( "Forwarded: %1" ).tqarg( summary ); + subject = i18n( "Forwarded: %1" ).arg( summary ); break; case DeclineCounter: - subject = i18n( "Declined Counter Proposal: %1" ).tqarg( summary ); + subject = i18n( "Declined Counter Proposal: %1" ).arg( summary ); break; } @@ -434,13 +434,13 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler Q_ASSERT( event ); if ( !event->doesFloat() ) { if ( event->dtEnd() < now ) { - warnStr = i18n( "\"%1\" occurred already." ).tqarg( event->summary() ); + warnStr = i18n( "\"%1\" occurred already." ).arg( event->summary() ); } else if ( event->dtStart() <= now && now <= event->dtEnd() ) { - warnStr = i18n( "\"%1\" is currently in-progress." ).tqarg( event->summary() ); + warnStr = i18n( "\"%1\" is currently in-progress." ).arg( event->summary() ); } } else { if ( event->dtEnd().date() < today ) { - warnStr = i18n( "\"%1\" occurred already." ).tqarg( event->summary() ); + warnStr = i18n( "\"%1\" occurred already." ).arg( event->summary() ); } else if ( event->dtStart().date() <= today && today <= event->dtEnd().date() ) { warnStr = i18n( "\"%1\", happening all day today, is currently in-progress." ). arg( event->summary() ); @@ -451,19 +451,19 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler if ( !todo->doesFloat() ) { if ( todo->hasDueDate() ) { if ( todo->dtDue() < now ) { - warnStr = i18n( "\"%1\" is past due." ).tqarg( todo->summary() ); + warnStr = i18n( "\"%1\" is past due." ).arg( todo->summary() ); } else if ( todo->hasStartDate() && todo->dtStart() <= now && now <= todo->dtDue() ) { - warnStr = i18n( "\"%1\" is currently in-progress." ).tqarg( todo->summary() ); + warnStr = i18n( "\"%1\" is currently in-progress." ).arg( todo->summary() ); } } else if ( todo->hasStartDate() ) { if ( todo->dtStart() < now ) { - warnStr = i18n( "\"%1\" has already started." ).tqarg( todo->summary() ); + warnStr = i18n( "\"%1\" has already started." ).arg( todo->summary() ); } } } else { if ( todo->hasDueDate() ) { if ( todo->dtDue().date() < today) { - warnStr = i18n( "\"%1\" is past due." ).tqarg( todo->summary() ); + warnStr = i18n( "\"%1\" is past due." ).arg( todo->summary() ); } else if ( todo->hasStartDate() && todo->dtStart().date() <= today && today <= todo->dtDue().date() ) { warnStr = i18n( "\"%1\", happening all-day today, is currently in-progress." ). @@ -526,12 +526,12 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler } else if ( path.startsWith( "ATTACH:" ) ) { return false; } else { - queryStr = i18n( "%1?" ).tqarg( path ); + queryStr = i18n( "%1?" ).arg( path ); } if ( KMessageBox::warningYesNo( 0, - i18n( "%1\n%2" ).tqarg( warnStr ).tqarg( queryStr ) ) == KMessageBox::No ) { + i18n( "%1\n%2" ).arg( warnStr ).arg( queryStr ) ) == KMessageBox::No ) { return true; } } @@ -606,7 +606,7 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler } if ( ( myself && myself->RSVP() ) || heuristicalRSVP( incidence ) ) { - Attendee* newMyself = seStatusOnMyself( incidence, myself, status, receiver ); + Attendee* newMyself = setStatusOnMyself( incidence, myself, status, receiver ); if ( newMyself && status == Attendee::Delegated ) { newMyself->setDelegate( delegateString ); newMyself->setRSVP( delegatorRSVP ); @@ -649,7 +649,7 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler if ( status == Attendee::Delegated ) { incidence = icalToString( iCal ); myself = findMyself( incidence, receiver ); - myself->seStatus( status ); + myself->setStatus( status ); myself->setDelegate( delegateString ); TQString name, email; KPIM::getNameAndMail( delegateString, name, email ); @@ -820,7 +820,7 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler case KMessageBox::No: // means "send email" summary = incidence->summary(); if ( !summary.isEmpty() ) { - summary = i18n( "Re: %1" ).tqarg( summary ); + summary = i18n( "Re: %1" ).arg( summary ); } KApplication::kApplication()->invokeMailer( incidence->organizer().email(), summary ); diff --git a/plugins/kmail/bodypartformatter/text_vcard.cpp b/plugins/kmail/bodypartformatter/text_vcard.cpp index 69a098b96..ec3a3bfe5 100644 --- a/plugins/kmail/bodypartformatter/text_vcard.cpp +++ b/plugins/kmail/bodypartformatter/text_vcard.cpp @@ -104,7 +104,7 @@ namespace { writer->queue( contact ); TQString addToLinkText = i18n( "[Add this contact to the addressbook]" ); - TQString op = TQString::fromLatin1( "addToAddressBook:%1" ).tqarg( count ); + TQString op = TQString::fromLatin1( "addToAddressBook:%1" ).arg( count ); writer->queue( "<div align=\"center\"><a href=\"" + bodyPart->makeLink( op ) + @@ -195,7 +195,7 @@ namespace { if ( a.realName().isEmpty() ) { return i18n( "Add this contact to the address book." ); } else { - return i18n( "Add \"%1\" to the address book." ).tqarg( a.realName() ); + return i18n( "Add \"%1\" to the address book." ).arg( a.realName() ); } } diff --git a/wizards/kmailchanges.cpp b/wizards/kmailchanges.cpp index 160b63eae..191ea8436 100644 --- a/wizards/kmailchanges.cpp +++ b/wizards/kmailchanges.cpp @@ -176,7 +176,7 @@ void CreateDisconnectedImapAccount::apply() transportId = mExistingTransportId; } - c.setGroup( TQString("Account %1").tqarg( accountId ) ); + c.setGroup( TQString("Account %1").arg( accountId ) ); int uid; if ( mExistingAccountId < 0 ) { uid = kapp->random(); @@ -240,7 +240,7 @@ void CreateDisconnectedImapAccount::apply() } - c.setGroup( TQString("Folder-%1").tqarg( uid ) ); + c.setGroup( TQString("Folder-%1").arg( uid ) ); c.writeEntry( "isOpen", true ); c.setGroup( "AccountWizard" ); @@ -249,7 +249,7 @@ void CreateDisconnectedImapAccount::apply() c.setGroup( "Composer" ); c.writeEntry( "default-transport", mAccountName ); - c.setGroup( TQString("Transport %1").tqarg( transportId ) ); + c.setGroup( TQString("Transport %1").arg( transportId ) ); c.writeEntry( "name", mAccountName ); c.writeEntry( "host", mServer ); c.writeEntry( "type", "smtp" ); @@ -318,7 +318,7 @@ void CreateOnlineImapAccount::apply() uint accCnt = c.readNumEntry( "accounts", 0 ); c.writeEntry( "accounts", accCnt+1 ); - c.setGroup( TQString("Account %1").tqarg(accCnt+1) ); + c.setGroup( TQString("Account %1").arg(accCnt+1) ); int uid = kapp->random(); c.writeEntry( "Folder", uid ); c.writeEntry( "Id", uid ); @@ -354,12 +354,12 @@ void CreateOnlineImapAccount::apply() // locally unsubscribe the default folders c.writeEntry( "locally-subscribed-folders", true ); TQString groupwareFolders = TQString("/INBOX/%1/,/INBOX/%2/,/INBOX/%3/,/INBOX/%4/,/INBOX/%5/") - .tqarg( i18n(s_folderContentsType[0]) ).tqarg( i18n(s_folderContentsType[1]) ) - .tqarg( i18n(s_folderContentsType[2]) ).tqarg( i18n(s_folderContentsType[3]) ) - .tqarg( i18n(s_folderContentsType[4]) ); + .arg( i18n(s_folderContentsType[0]) ).arg( i18n(s_folderContentsType[1]) ) + .arg( i18n(s_folderContentsType[2]) ).arg( i18n(s_folderContentsType[3]) ) + .arg( i18n(s_folderContentsType[4]) ); c.writeEntry( "locallyUnsubscribedFolders", groupwareFolders ); - c.setGroup( TQString("Folder-%1").tqarg( uid ) ); + c.setGroup( TQString("Folder-%1").arg( uid ) ); c.writeEntry( "isOpen", true ); diff --git a/wizards/kolabkmailchanges.cpp b/wizards/kolabkmailchanges.cpp index 8f66e5b33..a77de3037 100644 --- a/wizards/kolabkmailchanges.cpp +++ b/wizards/kolabkmailchanges.cpp @@ -34,7 +34,7 @@ class KolabCustomWriter : public CreateDisconnectedImapAccount::CustomWriter { c.setGroup( "IMAP Resource" ); c.writeEntry( "TheIMAPResourceAccount", id ); - c.writeEntry( "TheIMAPResourceFolderParent", TQString(".%1.directory/INBOX").tqarg( id ) ); + c.writeEntry( "TheIMAPResourceFolderParent", TQString(".%1.directory/INBOX").arg( id ) ); } void writeIds( int, int ) {} }; diff --git a/wizards/kolabwizard.cpp b/wizards/kolabwizard.cpp index 36e99bfba..857ed3e9d 100644 --- a/wizards/kolabwizard.cpp +++ b/wizards/kolabwizard.cpp @@ -81,13 +81,13 @@ class SetupLDAPSearchAccount : public KConfigPropagator::Change bool hasMyServer = false; uint selHosts = c.readNumEntry("NumSelectedHosts", 0); for ( uint i = 0 ; i < selHosts && !hasMyServer; ++i ) - if ( c.readEntry( TQString("SelectedHost%1").tqarg(i) ) == host ) + if ( c.readEntry( TQString("SelectedHost%1").arg(i) ) == host ) hasMyServer = true; if ( !hasMyServer ) { c.writeEntry( "NumSelectedHosts", selHosts + 1 ); - c.writeEntry( TQString("SelectedHost%1").tqarg(selHosts), host); - c.writeEntry( TQString("SelectedBase%1").tqarg(selHosts), basedn); - c.writeEntry( TQString("SelectedPort%1").tqarg(selHosts), "389"); + c.writeEntry( TQString("SelectedHost%1").arg(selHosts), host); + c.writeEntry( TQString("SelectedBase%1").arg(selHosts), basedn); + c.writeEntry( TQString("SelectedPort%1").arg(selHosts), "389"); } } diff --git a/wizards/scalixkmailchanges.cpp b/wizards/scalixkmailchanges.cpp index 221e53d61..56c18afe9 100644 --- a/wizards/scalixkmailchanges.cpp +++ b/wizards/scalixkmailchanges.cpp @@ -34,7 +34,7 @@ class ScalixCustomWriter : public CreateDisconnectedImapAccount::CustomWriter { c.setGroup( "IMAP Resource" ); c.writeEntry( "TheIMAPResourceAccount", id ); - c.writeEntry( "TheIMAPResourceFolderParent", TQString(".%1.directory/INBOX").tqarg( id ) ); + c.writeEntry( "TheIMAPResourceFolderParent", TQString(".%1.directory/INBOX").arg( id ) ); c.writeEntry( "HideGroupwareFolders", false ); } void writeIds( int, int ) {} diff --git a/wizards/scalixwizard.cpp b/wizards/scalixwizard.cpp index b9ecfa10f..f7be16a64 100644 --- a/wizards/scalixwizard.cpp +++ b/wizards/scalixwizard.cpp @@ -74,13 +74,13 @@ class SetupLDAPSearchAccount : public KConfigPropagator::Change bool hasMyServer = false; uint selHosts = c.readNumEntry("NumSelectedHosts", 0); for ( uint i = 0 ; i < selHosts && !hasMyServer; ++i ) - if ( c.readEntry( TQString("SelectedHost%1").tqarg(i) ) == host ) + if ( c.readEntry( TQString("SelectedHost%1").arg(i) ) == host ) hasMyServer = true; if ( !hasMyServer ) { c.writeEntry( "NumSelectedHosts", selHosts + 1 ); - c.writeEntry( TQString("SelectedHost%1").tqarg(selHosts), host); - c.writeEntry( TQString("SelectedBase%1").tqarg(selHosts), basedn); - c.writeEntry( TQString("SelectedPort%1").tqarg(selHosts), "389"); + c.writeEntry( TQString("SelectedHost%1").arg(selHosts), host); + c.writeEntry( TQString("SelectedBase%1").arg(selHosts), basedn); + c.writeEntry( TQString("SelectedPort%1").arg(selHosts), "389"); } } |