diff options
| author | Timothy Pearson <[email protected]> | 2011-12-18 18:34:45 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2011-12-18 18:34:45 -0600 |
| commit | 0e00c0a86a4c9d7e80c7b66d91940cc7dcb79f78 (patch) | |
| tree | 4138783f7dad757fc5fbfaa8d66a355288d3125e | |
| parent | 9cc13dcbb01a96c9e60a07ca63c61d24b374f50d (diff) | |
| download | tdepim-0e00c0a86a4c9d7e80c7b66d91940cc7dcb79f78.tar.gz tdepim-0e00c0a86a4c9d7e80c7b66d91940cc7dcb79f78.zip | |
Rename old tq methods that no longer need a unique name
703 files changed, 6011 insertions, 6011 deletions
diff --git a/NewsLog.txt b/NewsLog.txt index 9bd2bde62..57403ecee 100644 --- a/NewsLog.txt +++ b/NewsLog.txt @@ -1108,7 +1108,7 @@ Friday, November 21st 2008 Problems addressed ------------------ -* kolab/issue2627 tqStatus line for audit log shown, even when it is not implemented. +* kolab/issue2627 Status line for audit log shown, even when it is not implemented. * kolab/issue2617 Kleopatra: After importing a p7c or p12 file the user is informed, that he has imported 0 certifictes. * kolab/issue2620 Kleopatra throws an error message, if no .gnupg exists and no agent is running. @@ -1125,7 +1125,7 @@ Sunday, November 9th 2008 Problems addressed ------------------ -* kolab/issue2627 tqStatus line for audit log shown, even when it is not implemented. +* kolab/issue2627 Status line for audit log shown, even when it is not implemented. *Support the /vendor/cmu/cyrus-imapd/sharedseen annotation available in Cyrus IMAP server 2.3.9 or higher which allows to share the seen flags between all users that have access to a folder. * Detect if the server supports shared seen flags. Also preserve the IMAP server capabilities in kmailrc so that detection also works without a prior sync. diff --git a/akregator/src/addfeedwidgetbase.ui b/akregator/src/addfeedwidgetbase.ui index 7d9a8a482..9ab8644b9 100644 --- a/akregator/src/addfeedwidgetbase.ui +++ b/akregator/src/addfeedwidgetbase.ui @@ -56,7 +56,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -75,7 +75,7 @@ <property name="name"> <cstring>urlEdit</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> @@ -115,7 +115,7 @@ <cstring>statusLabel</cstring> </property> <property name="text"> - <string>tqStatus</string> + <string>Status</string> </property> </widget> <spacer> @@ -128,7 +128,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>50</height> diff --git a/akregator/src/akregator_part.cpp b/akregator/src/akregator_part.cpp index 223db5a01..c62526904 100644 --- a/akregator/src/akregator_part.cpp +++ b/akregator/src/akregator_part.cpp @@ -428,7 +428,7 @@ bool Part::openFile() if (file.size() > 0) // don't backup empty files { - TQString backup = m_file + "-backup." + TQString::number(TQDateTime::tqcurrentDateTime().toTime_t()); + TQString backup = m_file + "-backup." + TQString::number(TQDateTime::currentDateTime().toTime_t()); copyFile(backup); @@ -444,7 +444,7 @@ bool Part::openFile() { if (file.size() > 0) // don't backup empty files { - TQString backup = m_file + "-backup." + TQString::number(TQDateTime::tqcurrentDateTime().toTime_t()); + 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") ); @@ -538,7 +538,7 @@ TQWidget* Part::getMainWindow() { // this is a dirty fix to get the main window used for the tray icon - TQWidgetList *l = kapp->tqtopLevelWidgets(); + TQWidgetList *l = kapp->topLevelWidgets(); TQWidgetListIt it( *l ); TQWidget *wid; diff --git a/akregator/src/akregator_view.cpp b/akregator/src/akregator_view.cpp index 3aa9dd2c6..e0ff06eba 100644 --- a/akregator/src/akregator_view.cpp +++ b/akregator/src/akregator_view.cpp @@ -366,7 +366,7 @@ View::View( Part *part, TQWidget *parent, ActionManagerImpl* actionManager, cons if (!Settings::resetQuickFilterOnNodeChange()) { - m_searchBar->slotSetqStatus(Settings::statusFilter()); + m_searchBar->slotSeStatus(Settings::statusFilter()); m_searchBar->slotSetText(Settings::textFilter()); } @@ -1186,7 +1186,7 @@ void View::slotArticleSelected(const Article& article) if (delay > 0) m_markReadTimer->start( delay*1000, true ); else - a.setqStatus(Article::Read); + a.seStatus(Article::Read); } } @@ -1370,7 +1370,7 @@ void View::slotSetSelectedArticleRead() return; for (TQValueList<Article>::Iterator it = articles.begin(); it != articles.end(); ++it) - (*it).setqStatus(Article::Read); + (*it).seStatus(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).setqStatus(Article::Unread); + (*it).seStatus(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).setqStatus(Article::New); + (*it).seStatus(Article::New); } void View::slotSetCurrentArticleReadDelayed() @@ -1429,7 +1429,7 @@ void View::slotSetCurrentArticleReadDelayed() if (article.isNull()) return; - article.setqStatus(Article::Read); + article.seStatus(Article::Read); } void View::slotMouseOverInfo(const KFileItem *kifi) @@ -1453,7 +1453,7 @@ void View::readProperties(KConfig* config) m_searchBar->slotSetText(config->readEntry("searchLine")); int statusfilter = config->readNumEntry("searchCombo", -1); if (statusfilter != -1) - m_searchBar->slotSetqStatus(statusfilter); + m_searchBar->slotSeStatus(statusfilter); } int selectedID = config->readNumEntry("selectedNodeID", -1); diff --git a/akregator/src/article.cpp b/akregator/src/article.cpp index 3b7f321a9..36ba87d63 100644 --- a/akregator/src/article.cpp +++ b/akregator/src/article.cpp @@ -55,7 +55,7 @@ struct Article::Private : public Shared 0001 0000 Keep */ - enum tqStatus {Deleted=0x01, Trash=0x02, New=0x04, Read=0x08, Keep=0x10}; + enum Status {Deleted=0x01, Trash=0x02, New=0x04, Read=0x08, Keep=0x10}; TQString guid; Backend::FeedStorage* archive; @@ -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->setqStatus(d->guid, d->status); + d->archive->seStatus(d->guid, d->status); } else { // article is not deleted, let's add it to the archive @@ -123,7 +123,7 @@ void Article::initialize(RSS::Article article, Backend::FeedStorage* archive) d->archive->setCommentsLink(d->guid, article.commentsLink().url()); d->archive->setGuidIsPermaLink(d->guid, article.guidIsPermaLink()); d->archive->setGuidIsHash(d->guid, article.meta("guidIsHash") == "true"); - d->pubDate = article.pubDate().isValid() ? article.pubDate() : TQDateTime::tqcurrentDateTime(); + d->pubDate = article.pubDate().isValid() ? article.pubDate() : TQDateTime::currentDateTime(); d->archive->setPubDate(d->guid, d->pubDate.toTime_t()); d->archive->setAuthor(d->guid, article.author()); @@ -157,7 +157,7 @@ void Article::initialize(RSS::Article article, Backend::FeedStorage* archive) int statusInt = status.toInt(); if (statusInt == New) statusInt = Unread; - setqStatus(statusInt); + seStatus(statusInt); } setKeep(article.meta("keep") == "true"); } @@ -210,9 +210,9 @@ void Article::setDeleted() if (isDeleted()) return; - setqStatus(Read); + seStatus(Read); d->status = Private::Deleted | Private::Read; - d->archive->setqStatus(d->guid, d->status); + d->archive->seStatus(d->guid, d->status); d->archive->setDeleted(d->guid); if (d->feed) @@ -299,13 +299,13 @@ int Article::status() const return Unread; } -void Article::setqStatus(int stat) +void Article::seStatus(int stat) { // use status() rather than statusBits() here to filter out status flags that we are not // interested in - int oldtqStatus = status(); + int oldStatus = status(); - if (oldtqStatus != stat) + if (oldStatus != stat) { switch (stat) { @@ -319,9 +319,9 @@ void Article::setqStatus(int stat) d->status = ( d->status | Private::New) & ~Private::Read; break; } - d->archive->setqStatus(d->guid, d->status); + d->archive->seStatus(d->guid, d->status); if (d->feed) - d->feed->setArticleChanged(*this, oldtqStatus); + 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->setqStatus(d->guid, d->status); + d->archive->seStatus(d->guid, d->status); if (d->feed) d->feed->setArticleChanged(*this); } diff --git a/akregator/src/article.h b/akregator/src/article.h index 8d1baa2a5..902aa47c6 100644 --- a/akregator/src/article.h +++ b/akregator/src/article.h @@ -57,7 +57,7 @@ namespace Akregator class Article { public: - enum tqStatus { Unread=0, Read, New }; + enum Status { Unread=0, Read, New }; typedef TQValueList<Article> List; Article(); @@ -80,7 +80,7 @@ namespace Akregator bool isNull() const; int status() const; - void setqStatus(int s); + void seStatus(int s); void offsetPubDate(int secs); diff --git a/akregator/src/articlefilter.cpp b/akregator/src/articlefilter.cpp index 21009190f..fc1ff29af 100644 --- a/akregator/src/articlefilter.cpp +++ b/akregator/src/articlefilter.cpp @@ -43,35 +43,35 @@ TQString Criterion::subjectToString(Subject subj) switch (subj) { case Title: - return TQString::tqfromLatin1("Title"); + return TQString::fromLatin1("Title"); case Link: - return TQString::tqfromLatin1("Link"); + return TQString::fromLatin1("Link"); case Author: - return TQString::tqfromLatin1("Author"); + return TQString::fromLatin1("Author"); case Description: - return TQString::tqfromLatin1("Description"); - case tqStatus: - return TQString::tqfromLatin1("Status"); + return TQString::fromLatin1("Description"); + case Status: + return TQString::fromLatin1("Status"); case KeepFlag: - return TQString::tqfromLatin1("KeepFlag"); + return TQString::fromLatin1("KeepFlag"); default: // should never happen (TM) - return TQString::tqfromLatin1("Description"); + return TQString::fromLatin1("Description"); } } Criterion::Subject Criterion::stringToSubject(const TQString& subjStr) { - if (subjStr == TQString::tqfromLatin1("Title")) + if (subjStr == TQString::fromLatin1("Title")) return Title; - else if (subjStr == TQString::tqfromLatin1("Link")) + else if (subjStr == TQString::fromLatin1("Link")) return Link; - else if (subjStr == TQString::tqfromLatin1("Description")) + else if (subjStr == TQString::fromLatin1("Description")) return Description; - else if (subjStr == TQString::tqfromLatin1("Author")) + else if (subjStr == TQString::fromLatin1("Author")) return Author; - else if (subjStr == TQString::tqfromLatin1("Status")) - return tqStatus; - else if (subjStr == TQString::tqfromLatin1("KeepFlag")) + else if (subjStr == TQString::fromLatin1("Status")) + return Status; + else if (subjStr == TQString::fromLatin1("KeepFlag")) return KeepFlag; // hopefully never reached @@ -83,27 +83,27 @@ TQString Criterion::predicateToString(Predicate pred) switch (pred) { case Contains: - return TQString::tqfromLatin1("Contains"); + return TQString::fromLatin1("Contains"); case Equals: - return TQString::tqfromLatin1("Equals"); + return TQString::fromLatin1("Equals"); case Matches: - return TQString::tqfromLatin1("Matches"); + return TQString::fromLatin1("Matches"); case Negation: - return TQString::tqfromLatin1("Negation"); + return TQString::fromLatin1("Negation"); default:// hopefully never reached - return TQString::tqfromLatin1("Contains"); + return TQString::fromLatin1("Contains"); } } Criterion::Predicate Criterion::stringToPredicate(const TQString& predStr) { - if (predStr == TQString::tqfromLatin1("Contains")) + if (predStr == TQString::fromLatin1("Contains")) return Contains; - else if (predStr == TQString::tqfromLatin1("Equals")) + else if (predStr == TQString::fromLatin1("Equals")) return Equals; - else if (predStr == TQString::tqfromLatin1("Matches")) + else if (predStr == TQString::fromLatin1("Matches")) return Matches; - else if (predStr == TQString::tqfromLatin1("Negation")) + else if (predStr == TQString::fromLatin1("Negation")) return Negation; // hopefully never reached @@ -124,24 +124,24 @@ Criterion::Criterion( Subject subject, Predicate predicate, const TQVariant &obj void Criterion::writeConfig(KConfig* config) const { - config->writeEntry(TQString::tqfromLatin1("subject"), subjectToString(m_subject)); + config->writeEntry(TQString::fromLatin1("subject"), subjectToString(m_subject)); - config->writeEntry(TQString::tqfromLatin1("predicate"), predicateToString(m_predicate)); + config->writeEntry(TQString::fromLatin1("predicate"), predicateToString(m_predicate)); - config->writeEntry(TQString::tqfromLatin1("objectType"), TQString(m_object.typeName())); + config->writeEntry(TQString::fromLatin1("objectType"), TQString(m_object.typeName())); - config->writeEntry(TQString::tqfromLatin1("objectValue"), m_object); + config->writeEntry(TQString::fromLatin1("objectValue"), m_object); } void Criterion::readConfig(KConfig* config) { - m_subject = stringToSubject(config->readEntry(TQString::tqfromLatin1("subject"))); - m_predicate = stringToPredicate(config->readEntry(TQString::tqfromLatin1("predicate"))); - TQVariant::Type type = TQVariant::nameToType(config->readEntry(TQString::tqfromLatin1("objType")).ascii()); + m_subject = stringToSubject(config->readEntry(TQString::fromLatin1("subject"))); + m_predicate = stringToPredicate(config->readEntry(TQString::fromLatin1("predicate"))); + TQVariant::Type type = TQVariant::nameToType(config->readEntry(TQString::fromLatin1("objType")).ascii()); if (type != TQVariant::Invalid) { - m_object = config->readPropertyEntry(TQString::tqfromLatin1("objectValue"), type); + m_object = config->readPropertyEntry(TQString::fromLatin1("objectValue"), type); } } @@ -163,7 +163,7 @@ bool Criterion::satisfiedBy( const Article &article ) const // ### Maybe use prettyURL here? concreteSubject = TQVariant(article.link().url()); break; - case tqStatus: + case Status: concreteSubject = TQVariant(article.status()); break; case KeepFlag: @@ -269,15 +269,15 @@ bool ArticleMatcher::matches( const Article &a ) const void ArticleMatcher::writeConfig(KConfig* config) const { - config->writeEntry(TQString::tqfromLatin1("matcherAssociation"), associationToString(m_association)); + config->writeEntry(TQString::fromLatin1("matcherAssociation"), associationToString(m_association)); - config->writeEntry(TQString::tqfromLatin1("matcherCriteriaCount"), m_criteria.count()); + config->writeEntry(TQString::fromLatin1("matcherCriteriaCount"), m_criteria.count()); int index = 0; for (TQValueList<Criterion>::ConstIterator it = m_criteria.begin(); it != m_criteria.end(); ++it) { - config->setGroup(config->group()+TQString::tqfromLatin1("_Criterion")+TQString::number(index)); + config->setGroup(config->group()+TQString::fromLatin1("_Criterion")+TQString::number(index)); (*it).writeConfig(config); ++index; } @@ -286,14 +286,14 @@ void ArticleMatcher::writeConfig(KConfig* config) const void ArticleMatcher::readConfig(KConfig* config) { m_criteria.clear(); - m_association = stringToAssociation(config->readEntry(TQString::tqfromLatin1("matcherAssociation"))); + m_association = stringToAssociation(config->readEntry(TQString::fromLatin1("matcherAssociation"))); - int count = config->readNumEntry(TQString::tqfromLatin1("matcherCriteriaCount"), 0); + int count = config->readNumEntry(TQString::fromLatin1("matcherCriteriaCount"), 0); for (int i = 0; i < count; ++i) { Criterion c; - config->setGroup(config->group()+TQString::tqfromLatin1("_Criterion")+TQString::number(i)); + config->setGroup(config->group()+TQString::fromLatin1("_Criterion")+TQString::number(i)); c.readConfig(config); m_criteria.append(c); } @@ -343,9 +343,9 @@ bool ArticleMatcher::allCriteriaMatch( const Article &a ) const ArticleMatcher::Association ArticleMatcher::stringToAssociation(const TQString& assocStr) { - if (assocStr == TQString::tqfromLatin1("LogicalAnd")) + if (assocStr == TQString::fromLatin1("LogicalAnd")) return LogicalAnd; - else if (assocStr == TQString::tqfromLatin1("LogicalOr")) + else if (assocStr == TQString::fromLatin1("LogicalOr")) return LogicalOr; else return None; @@ -356,11 +356,11 @@ TQString ArticleMatcher::associationToString(Association association) switch (association) { case LogicalAnd: - return TQString::tqfromLatin1("LogicalAnd"); + return TQString::fromLatin1("LogicalAnd"); case LogicalOr: - return TQString::tqfromLatin1("LogicalOr"); + return TQString::fromLatin1("LogicalOr"); default: - return TQString::tqfromLatin1("None"); + return TQString::fromLatin1("None"); } } @@ -408,13 +408,13 @@ TagMatcher::TagMatcher(const TagMatcher& other) : AbstractMatcher(other), d(0) void TagMatcher::writeConfig(KConfig* config) const { - config->writeEntry(TQString::tqfromLatin1("matcherType"), TQString::tqfromLatin1("TagMatcher")); - config->writeEntry(TQString::tqfromLatin1("matcherParams"), d->tagID); + config->writeEntry(TQString::fromLatin1("matcherType"), TQString::fromLatin1("TagMatcher")); + config->writeEntry(TQString::fromLatin1("matcherParams"), d->tagID); } void TagMatcher::readConfig(KConfig* config) { - d->tagID = config->readEntry(TQString::tqfromLatin1("matcherParams")); + d->tagID = config->readEntry(TQString::fromLatin1("matcherParams")); } bool TagMatcher::operator==(const AbstractMatcher& other) const @@ -449,7 +449,7 @@ SeStatusAction::SeStatusAction(int status) : m_status(status) void SeStatusAction::exec(Article& article) { if (!article.isNull()) - article.setqStatus(m_status); + article.seStatus(m_status); } int SeStatusAction::status() const @@ -457,20 +457,20 @@ int SeStatusAction::status() const return m_status; } -void SeStatusAction::setqStatus(int status) +void SeStatusAction::seStatus(int status) { m_status = status; } void SeStatusAction::writeConfig(KConfig* config) const { - config->writeEntry(TQString::tqfromLatin1("actionType"), TQString::tqfromLatin1("SeStatusAction")); - config->writeEntry(TQString::tqfromLatin1("actionParams"), m_status); + config->writeEntry(TQString::fromLatin1("actionType"), TQString::fromLatin1("SeStatusAction")); + config->writeEntry(TQString::fromLatin1("actionParams"), m_status); } void SeStatusAction::readConfig(KConfig* config) { - m_status = config->readNumEntry(TQString::tqfromLatin1("actionParams"), Article::Read); + m_status = config->readNumEntry(TQString::fromLatin1("actionParams"), Article::Read); } bool SeStatusAction::operator==(const AbstractAction& other) @@ -581,12 +581,12 @@ bool ArticleFilter::operator==(const ArticleFilter& other) const void ArticleFilterList::writeConfig(KConfig* config) const { - config->setGroup(TQString::tqfromLatin1("Filters")); - config->writeEntry(TQString::tqfromLatin1("count"), count()); + config->setGroup(TQString::fromLatin1("Filters")); + config->writeEntry(TQString::fromLatin1("count"), count()); int index = 0; for (ArticleFilterList::ConstIterator it = begin(); it != end(); ++it) { - config->setGroup(TQString::tqfromLatin1("Filters_")+TQString::number(index)); + config->setGroup(TQString::fromLatin1("Filters_")+TQString::number(index)); (*it).writeConfig(config); ++index; } @@ -595,11 +595,11 @@ void ArticleFilterList::writeConfig(KConfig* config) const void ArticleFilterList::readConfig(KConfig* config) { clear(); - config->setGroup(TQString::tqfromLatin1("Filters")); - int count = config->readNumEntry(TQString::tqfromLatin1("count"), 0); + config->setGroup(TQString::fromLatin1("Filters")); + int count = config->readNumEntry(TQString::fromLatin1("count"), 0); for (int i = 0; i < count; ++i) { - config->setGroup(TQString::tqfromLatin1("Filters_")+TQString::number(i)); + config->setGroup(TQString::fromLatin1("Filters_")+TQString::number(i)); ArticleFilter filter; filter.readConfig(config); append(filter); @@ -609,13 +609,13 @@ void ArticleFilterList::readConfig(KConfig* config) void AssignTagAction::readConfig(KConfig* config) { - m_tagID = config->readEntry(TQString::tqfromLatin1("actionParams")); + m_tagID = config->readEntry(TQString::fromLatin1("actionParams")); } void AssignTagAction::writeConfig(KConfig* config) const { - config->writeEntry(TQString::tqfromLatin1("actionType"), TQString::tqfromLatin1("AssignTagAction")); - config->writeEntry(TQString::tqfromLatin1("actionParams"), m_tagID); + config->writeEntry(TQString::fromLatin1("actionType"), TQString::fromLatin1("AssignTagAction")); + config->writeEntry(TQString::fromLatin1("actionParams"), m_tagID); } bool AssignTagAction::operator==(const AbstractAction& other) @@ -644,7 +644,7 @@ void DeleteAction::readConfig(KConfig* /*config*/) void DeleteAction::writeConfig(KConfig* config) const { - config->writeEntry(TQString::tqfromLatin1("actionType"), TQString::tqfromLatin1("DeleteAction")); + config->writeEntry(TQString::fromLatin1("actionType"), TQString::fromLatin1("DeleteAction")); } bool DeleteAction::operator==(const AbstractAction& other) @@ -661,27 +661,27 @@ void ArticleFilter::readConfig(KConfig* config) delete d->action; d->action = 0; - d->name = config->readEntry(TQString::tqfromLatin1("name")); - d->id = config->readNumEntry(TQString::tqfromLatin1("id"), 0); + d->name = config->readEntry(TQString::fromLatin1("name")); + d->id = config->readNumEntry(TQString::fromLatin1("id"), 0); - TQString matcherType = config->readEntry(TQString::tqfromLatin1("matcherType")); + TQString matcherType = config->readEntry(TQString::fromLatin1("matcherType")); - if (matcherType == TQString::tqfromLatin1("TagMatcher")) + if (matcherType == TQString::fromLatin1("TagMatcher")) d->matcher = new TagMatcher(); - else if (matcherType == TQString::tqfromLatin1("ArticleMatcher")) + else if (matcherType == TQString::fromLatin1("ArticleMatcher")) d->matcher = new ArticleMatcher(); if (d->matcher) d->matcher->readConfig(config); - TQString actionType = config->readEntry(TQString::tqfromLatin1("actionType")); + TQString actionType = config->readEntry(TQString::fromLatin1("actionType")); - if (actionType == TQString::tqfromLatin1("AssignTagAction")) + if (actionType == TQString::fromLatin1("AssignTagAction")) d->action = new AssignTagAction(); - else if (actionType == TQString::tqfromLatin1("DeleteAction")) + else if (actionType == TQString::fromLatin1("DeleteAction")) d->action = new DeleteAction(); - else if (actionType == TQString::tqfromLatin1("SeStatusAction")) + else if (actionType == TQString::fromLatin1("SeStatusAction")) d->action = new SeStatusAction(); if (d->action) @@ -690,8 +690,8 @@ void ArticleFilter::readConfig(KConfig* config) void ArticleFilter::writeConfig(KConfig* config) const { - config->writeEntry(TQString::tqfromLatin1("name"), d->name); - config->writeEntry(TQString::tqfromLatin1("id"), d->id); + config->writeEntry(TQString::fromLatin1("name"), d->name); + config->writeEntry(TQString::fromLatin1("id"), d->id); d->matcher->writeConfig(config); d->action->writeConfig(config); } diff --git a/akregator/src/articlefilter.h b/akregator/src/articlefilter.h index c39d72e8a..ddf05490e 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 setqStatus(int status); + void seStatus(int status); virtual void writeConfig(KConfig* config) const; virtual void readConfig(KConfig* config); @@ -259,7 +259,7 @@ class Criterion public: enum Subject { - Title, Description, Author, Link, tqStatus, KeepFlag + Title, Description, Author, Link, Status, KeepFlag }; static TQString subjectToString(Subject subj); diff --git a/akregator/src/articlelistview.cpp b/akregator/src/articlelistview.cpp index 0ec644ad7..3449ee9cf 100644 --- a/akregator/src/articlelistview.cpp +++ b/akregator/src/articlelistview.cpp @@ -564,9 +564,9 @@ void ArticleListView::paintInfoBox(const TQString &message) const uint x = (viewport()->width() - w - 30) / 2 ; const uint y = (viewport()->height() - h - 30) / 2 ; - p.setBrush( tqcolorGroup().background() ); + p.setBrush( colorGroup().background() ); p.drawRoundRect( x, y, w+30, h+30, (8*200)/w, (8*200)/h ); - t.draw( &p, x+15, y+15, TQRect(), tqcolorGroup() ); + t.draw( &p, x+15, y+15, TQRect(), colorGroup() ); } void ArticleListView::viewportPaintEvent(TQPaintEvent *e) diff --git a/akregator/src/dragobjects.cpp b/akregator/src/dragobjects.cpp index 5f48d5be2..1141d4652 100644 --- a/akregator/src/dragobjects.cpp +++ b/akregator/src/dragobjects.cpp @@ -43,7 +43,7 @@ bool ArticleDrag::canDecode(const TQMimeSource* e) bool ArticleDrag::decode(const TQMimeSource* e, TQValueList<ArticleDragItem>& articles) { articles.clear(); - TQByteArray array = e->tqencodedData("akregator/articles"); + TQByteArray array = e->encodedData("akregator/articles"); TQDataStream stream(array, IO_ReadOnly); @@ -68,7 +68,7 @@ const char* ArticleDrag::format(int i) const return 0; } -TQByteArray ArticleDrag::tqencodedData(const char* mime) const +TQByteArray ArticleDrag::encodedData(const char* mime) const { TQCString mimetype(mime); if (mimetype == "akregator/articles") @@ -86,7 +86,7 @@ TQByteArray ArticleDrag::tqencodedData(const char* mime) const } else { - return KURLDrag::tqencodedData(mime); + return KURLDrag::encodedData(mime); } } diff --git a/akregator/src/dragobjects.h b/akregator/src/dragobjects.h index ebe931f66..3b4d7f8d7 100644 --- a/akregator/src/dragobjects.h +++ b/akregator/src/dragobjects.h @@ -57,7 +57,7 @@ public: protected: - virtual TQByteArray tqencodedData(const char* mime) const; + virtual TQByteArray encodedData(const char* mime) const; virtual const char* format(int i) const; private: diff --git a/akregator/src/feed.cpp b/akregator/src/feed.cpp index 44d40977e..f24c48095 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).setqStatus(Article::Read); + (*it).seStatus(Article::Read); setNotificationMode(true, true); } } @@ -412,7 +412,7 @@ void Feed::slotAddToFetchQueue(FetchQueue* queue, bool intervalFetchOnly) queue->addFeed(this); else { - uint now = TQDateTime::tqcurrentDateTime().toTime_t(); + uint now = TQDateTime::currentDateTime().toTime_t(); // workaround for 3.5.x: if the last fetch went wrong, try again after 30 minutes // this fixes annoying behaviour of akregator, especially when the host is reachable @@ -464,9 +464,9 @@ void Feed::appendArticles(const RSS::Document &doc) d->addedArticlesNotify.append(mya); if (!mya.isDeleted() && !markImmediatelyAsRead()) - mya.setqStatus(Article::New); + mya.seStatus(Article::New); else - mya.setqStatus(Article::Read); + mya.seStatus(Article::Read); changed = true; } @@ -479,12 +479,12 @@ void Feed::appendArticles(const RSS::Document &doc) { mya.setKeep(old.keep()); int oldstatus = old.status(); - old.setqStatus(Article::Read); + old.seStatus(Article::Read); d->articles.remove(old.guid()); appendArticle(mya); - mya.setqStatus(oldstatus); + mya.seStatus(oldstatus); d->updatedArticlesNotify.append(mya); changed = true; @@ -519,7 +519,7 @@ bool Feed::usesExpiryByAge() const bool Feed::isExpired(const Article& a) const { - TQDateTime now = TQDateTime::tqcurrentDateTime(); + TQDateTime now = TQDateTime::currentDateTime(); int expiryAge = -1; // check whether the feed uses the global default and the default is limitArticleAge if ( d->archiveMode == globalDefault && Settings::archiveMode() == Settings::EnumArchiveMode::limitArticleAge) @@ -558,7 +558,7 @@ void Feed::fetch(bool followDiscovery) { if ((*it).status() == Article::New) { - (*it).setqStatus(Article::Unread); + (*it).seStatus(Article::Unread); } } @@ -579,7 +579,7 @@ void Feed::tryFetch() { d->fetchError = false; - d->loader = RSS::Loader::create( this, TQT_SLOT(fetchCompleted(Loader *, Document, tqStatus)) ); + d->loader = RSS::Loader::create( this, TQT_SLOT(fetchCompleted(Loader *, Document, Status)) ); //connect(d->loader, TQT_SIGNAL(progress(unsigned long)), this, TQT_SLOT(slotSetProgress(unsigned long))); d->loader->loadFrom( d->xmlUrl, new RSS::FileRetriever ); } @@ -595,7 +595,7 @@ void Feed::slotImageFetched(const TQPixmap& image) nodeModified(); } -void Feed::fetchCompleted(RSS::Loader *l, RSS::Document doc, RSS::tqStatus status) +void Feed::fetchCompleted(RSS::Loader *l, RSS::Document doc, RSS::Status status) { // Note that loader instances delete themselves d->loader = 0; @@ -618,7 +618,7 @@ void Feed::fetchCompleted(RSS::Loader *l, RSS::Document doc, RSS::tqStatus statu else { d->fetchError = true; - d->lastErrorFetch = TQDateTime::tqcurrentDateTime().toTime_t(); + d->lastErrorFetch = TQDateTime::currentDateTime().toTime_t(); emit fetchError(this); } return; @@ -647,7 +647,7 @@ void Feed::fetchCompleted(RSS::Loader *l, RSS::Document doc, RSS::tqStatus statu appendArticles(doc); - d->archive->setLastFetch( TQDateTime::tqcurrentDateTime().toTime_t()); + d->archive->setLastFetch( TQDateTime::currentDateTime().toTime_t()); emit fetched(this); } @@ -735,14 +735,14 @@ void Feed::setArticleDeleted(Article& a) articlesModified(); } -void Feed::setArticleChanged(Article& a, int oldtqStatus) +void Feed::setArticleChanged(Article& a, int oldStatus) { - if (oldtqStatus != -1) + if (oldStatus != -1) { - int newtqStatus = a.status(); - if (oldtqStatus == Article::Read && newtqStatus != Article::Read) + int newStatus = a.status(); + if (oldStatus == Article::Read && newStatus != Article::Read) setUnread(unread()+1); - else if (oldtqStatus != Article::Read && newtqStatus == Article::Read) + else if (oldStatus != Article::Read && newStatus == Article::Read) setUnread(unread()-1); } d->updatedArticlesNotify.append(a); diff --git a/akregator/src/feed.h b/akregator/src/feed.h index 663723cba..2c5bc7682 100644 --- a/akregator/src/feed.h +++ b/akregator/src/feed.h @@ -43,7 +43,7 @@ namespace KPIM { // needed for slot fetchCompleted() using RSS::Document; using RSS::Loader; -using RSS::tqStatus; +using RSS::Status; namespace Akregator { @@ -254,7 +254,7 @@ namespace Akregator private slots: - void fetchCompleted(Loader *loader, Document doc, tqStatus status); + void fetchCompleted(Loader *loader, Document doc, Status status); void slotImageFetched(const TQPixmap& image); private: @@ -265,10 +265,10 @@ namespace Akregator void setArticleDeleted(Article& a); /** notifies that article @c mya was changed - @param oldtqStatus if the status was changed, it contains the old status, -1 otherwise + @param oldStatus if the status was changed, it contains the old status, -1 otherwise To be called by @ref Article */ - void setArticleChanged(Article& a, int oldtqStatus=-1); + void setArticleChanged(Article& a, int oldStatus=-1); void enforceLimitArticleNumber(); diff --git a/akregator/src/feedstorage.h b/akregator/src/feedstorage.h index 32e6c0587..98176756a 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 setqStatus(const TQString& guid, int status) = 0; + virtual void seStatus(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 5ae572a82..6fe973954 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::setqStatus(const TQString& guid, int status) +void FeedStorageDummyImpl::seStatus(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)); - setqStatus(guid, source->status(guid)); + seStatus(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 bd71a11c8..fc9ab31f2 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 setqStatus(const TQString& guid, int status); + virtual void seStatus(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 1d2c6a5cf..824fc4db7 100644 --- a/akregator/src/folder.cpp +++ b/akregator/src/folder.cpp @@ -62,9 +62,9 @@ bool Folder::accept(TreeNodeVisitor* visitor) Folder* Folder::fromOPML(TQDomElement e) { - Folder* fg = new Folder(e.hasAttribute(TQString::tqfromLatin1("text")) ? e.attribute(TQString::tqfromLatin1("text")) : e.attribute(TQString::tqfromLatin1("title"))); - fg->setOpen( e.attribute(TQString::tqfromLatin1("isOpen")) != TQString::tqfromLatin1(("false"))); - fg->setId( e.attribute(TQString::tqfromLatin1("id")).toUInt() ); + Folder* fg = new Folder(e.hasAttribute(TQString::fromLatin1("text")) ? e.attribute(TQString::fromLatin1("text")) : e.attribute(TQString::fromLatin1("title"))); + fg->setOpen( e.attribute(TQString::fromLatin1("isOpen")) != TQString::fromLatin1(("false"))); + fg->setId( e.attribute(TQString::fromLatin1("id")).toUInt() ); return fg; } diff --git a/akregator/src/frame.cpp b/akregator/src/frame.cpp index 647f580cf..5cc95b8bd 100644 --- a/akregator/src/frame.cpp +++ b/akregator/src/frame.cpp @@ -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->setqStatus(i18n("Loading...")); + m_progressItem->seStatus(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->setqStatus(i18n("Loading canceled")); + m_progressItem->seStatus(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->setqStatus(i18n("Loading completed")); + m_progressItem->seStatus(i18n("Loading completed")); m_progressItem->setComplete(); m_progressItem = 0; } diff --git a/akregator/src/kcursorsaver.h b/akregator/src/kcursorsaver.h index e12d6e8d4..96c100e4c 100644 --- a/akregator/src/kcursorsaver.h +++ b/akregator/src/kcursorsaver.h @@ -18,7 +18,7 @@ class KCursorSaver : public TQt { public: /// constructor taking TQCursor tqshapes - KCursorSaver(TQt::tqCursorShape tqshape) { + KCursorSaver(TQt::CursorShape tqshape) { TQApplication::setOverrideCursor( TQCursor(tqshape) ); inited = true; } diff --git a/akregator/src/librss/article.cpp b/akregator/src/librss/article.cpp index 59949244b..244130535 100644 --- a/akregator/src/librss/article.cpp +++ b/akregator/src/librss/article.cpp @@ -78,35 +78,35 @@ Article::Article(const TQDomNode &node, Format format, Version version) : d(new TQDomNode n; for (n = node.firstChild(); !n.isNull(); n = n.nextSibling()) { const TQDomElement e = n.toElement(); - if ( (e.tagName()==TQString::tqfromLatin1("link")) && - (e.attribute(TQString::tqfromLatin1("rel"), TQString::tqfromLatin1("alternate")) == TQString::tqfromLatin1("alternate"))) + if ( (e.tagName()==TQString::fromLatin1("link")) && + (e.attribute(TQString::fromLatin1("rel"), TQString::fromLatin1("alternate")) == TQString::fromLatin1("alternate"))) { - d->link=n.toElement().attribute(TQString::tqfromLatin1("href")); + d->link=n.toElement().attribute(TQString::fromLatin1("href")); break; } } } else { - if (!(elemText = extractNode(node, TQString::tqfromLatin1("link"))).isNull()) + if (!(elemText = extractNode(node, TQString::fromLatin1("link"))).isNull()) d->link = elemText; } // prefer content/content:encoded over summary/description for feeds that provide it - TQString tagName=(format==AtomFeed)? TQString::tqfromLatin1("content"): TQString::tqfromLatin1("content:encoded"); + TQString tagName=(format==AtomFeed)? TQString::fromLatin1("content"): TQString::fromLatin1("content:encoded"); if (!(elemText = extractNode(node, tagName, false)).isNull()) d->description = elemText; if (d->description.isEmpty()) { - if (!(elemText = extractNode(node, TQString::tqfromLatin1("body"), false)).isNull()) + if (!(elemText = extractNode(node, TQString::fromLatin1("body"), false)).isNull()) d->description = elemText; if (d->description.isEmpty()) // 3rd try: see http://www.intertwingly.net/blog/1299.html { - if (!(elemText = extractNode(node, TQString::tqfromLatin1((format==AtomFeed)? "summary" : "description"), false)).isNull()) + if (!(elemText = extractNode(node, TQString::fromLatin1((format==AtomFeed)? "summary" : "description"), false)).isNull()) d->description = elemText; } } @@ -116,21 +116,21 @@ Article::Article(const TQDomNode &node, Format format, Version version) : d(new if (format == AtomFeed) { if (version == vAtom_1_0) - elemText = extractNode(node, TQString::tqfromLatin1("updated")); + elemText = extractNode(node, TQString::fromLatin1("updated")); else - elemText = extractNode(node, TQString::tqfromLatin1("issued")); + elemText = extractNode(node, TQString::fromLatin1("issued")); if (!elemText.isNull()) time = parseISO8601Date(elemText); } else { - elemText = extractNode(node, TQString::tqfromLatin1("pubDate")); + elemText = extractNode(node, TQString::fromLatin1("pubDate")); if (!elemText.isNull()) time = KRFCDate::parseDate(elemText); } - if (!(elemText = extractNode(node, TQString::tqfromLatin1("dc:date"))).isNull()) + if (!(elemText = extractNode(node, TQString::fromLatin1("dc:date"))).isNull()) { time = parseISO8601Date(elemText); } @@ -139,11 +139,11 @@ Article::Article(const TQDomNode &node, Format format, Version version) : d(new if (time != 0) d->pubDate.setTime_t(time); - if (!(elemText = extractNode(node, TQString::tqfromLatin1("wfw:comment"))).isNull()) { + if (!(elemText = extractNode(node, TQString::fromLatin1("wfw:comment"))).isNull()) { d->commentsLink = elemText; } - if (!(elemText = extractNode(node, TQString::tqfromLatin1("slash:comments"))).isNull()) { + if (!(elemText = extractNode(node, TQString::fromLatin1("slash:comments"))).isNull()) { d->numComments = elemText.toInt(); } @@ -152,19 +152,19 @@ Article::Article(const TQDomNode &node, Format format, Version version) : d(new // in RSS 1.0, we use <item about> attribute as ID // FIXME: pass format version instead of checking for attribute - if (!element.isNull() && element.hasAttribute(TQString::tqfromLatin1("rdf:about"))) + if (!element.isNull() && element.hasAttribute(TQString::fromLatin1("rdf:about"))) { - d->guid = element.attribute(TQString::tqfromLatin1("rdf:about")); // HACK: using ns properly did not work + d->guid = element.attribute(TQString::fromLatin1("rdf:about")); // HACK: using ns properly did not work d->guidIsPermaLink = false; } else { - tagName=(format==AtomFeed)? TQString::tqfromLatin1("id"): TQString::tqfromLatin1("guid"); + tagName=(format==AtomFeed)? TQString::fromLatin1("id"): TQString::fromLatin1("guid"); TQDomNode n = node.namedItem(tagName); if (!n.isNull()) { d->guidIsPermaLink = (format==AtomFeed)? false : true; - if (n.toElement().attribute(TQString::tqfromLatin1("isPermaLink"), "true") == "false") d->guidIsPermaLink = false; + if (n.toElement().attribute(TQString::fromLatin1("isPermaLink"), "true") == "false") d->guidIsPermaLink = false; if (!(elemText = extractNode(node, tagName)).isNull()) d->guid = elemText; } @@ -178,10 +178,10 @@ Article::Article(const TQDomNode &node, Format format, Version version) : d(new md5Machine.update(d->title.utf8()); md5Machine.update(d->description.utf8()); d->guid = TQString(md5Machine.hexDigest().data()); - d->meta[TQString::tqfromLatin1("guidIsHash")] = TQString::tqfromLatin1("true"); + d->meta[TQString::fromLatin1("guidIsHash")] = TQString::fromLatin1("true"); } - TQDomNode enclosure = element.namedItem(TQString::tqfromLatin1("enclosure")); + TQDomNode enclosure = element.namedItem(TQString::fromLatin1("enclosure")); if (enclosure.isElement()) d->enclosure = Enclosure::fromXML(enclosure.toElement()); @@ -191,12 +191,12 @@ Article::Article(const TQDomNode &node, Format format, Version version) : d(new { if (i.isElement()) { - if (i.toElement().tagName() == TQString::tqfromLatin1("metaInfo:meta")) + if (i.toElement().tagName() == TQString::fromLatin1("metaInfo:meta")) { - TQString type = i.toElement().attribute(TQString::tqfromLatin1("type")); + TQString type = i.toElement().attribute(TQString::fromLatin1("type")); d->meta[type] = i.toElement().text(); } - else if (i.toElement().tagName() == TQString::tqfromLatin1("category")) + else if (i.toElement().tagName() == TQString::fromLatin1("category")) { d->categories.append(Category::fromXML(i.toElement())); } diff --git a/akregator/src/librss/category.cpp b/akregator/src/librss/category.cpp index c020655ce..7f6c70c2e 100644 --- a/akregator/src/librss/category.cpp +++ b/akregator/src/librss/category.cpp @@ -64,8 +64,8 @@ bool Category::isNull() const Category Category::fromXML(const TQDomElement& e) { Category obj; - if (e.hasAttribute(TQString::tqfromLatin1("domain"))) - obj.d->domain = e.attribute(TQString::tqfromLatin1("domain")); + if (e.hasAttribute(TQString::fromLatin1("domain"))) + obj.d->domain = e.attribute(TQString::fromLatin1("domain")); obj.d->category = e.text(); obj.d->isNull = false; return obj; diff --git a/akregator/src/librss/document.cpp b/akregator/src/librss/document.cpp index 610cec4c8..6d6e10577 100644 --- a/akregator/src/librss/document.cpp +++ b/akregator/src/librss/document.cpp @@ -79,15 +79,15 @@ static TQString extractLink(const TQDomNode& node, Format format) TQDomNode n; for (n = node.firstChild(); !n.isNull(); n = n.nextSibling()) { const TQDomElement e = n.toElement(); - if ( (e.tagName() == TQString::tqfromLatin1("link")) - && (e.attribute(TQString::tqfromLatin1("rel"), TQString::tqfromLatin1("alternate")) == TQString::tqfromLatin1("alternate"))) + if ( (e.tagName() == TQString::fromLatin1("link")) + && (e.attribute(TQString::fromLatin1("rel"), TQString::fromLatin1("alternate")) == TQString::fromLatin1("alternate"))) { - return n.toElement().attribute(TQString::tqfromLatin1("href")); + return n.toElement().attribute(TQString::fromLatin1("href")); } } } - return extractNode(node, TQString::tqfromLatin1("link")); + return extractNode(node, TQString::fromLatin1("link")); } @@ -100,20 +100,20 @@ Document::Document(const TQDomDocument &doc) : d(new Private) TQString attr; // we should probably check that it ISN'T feed or rss, rather than check if it is xhtml - if (rootNode.toElement().tagName()==TQString::tqfromLatin1("html")) + if (rootNode.toElement().tagName()==TQString::fromLatin1("html")) d->valid=false; else d->valid=true; - attr = rootNode.toElement().attribute(TQString::tqfromLatin1("version"), TQString()); - if (rootNode.toElement().tagName()==TQString::tqfromLatin1("feed")) + attr = rootNode.toElement().attribute(TQString::fromLatin1("version"), TQString()); + if (rootNode.toElement().tagName()==TQString::fromLatin1("feed")) { d->format=AtomFeed; - if (attr == TQString::tqfromLatin1("0.3")) + if (attr == TQString::fromLatin1("0.3")) d->version = vAtom_0_3; - else if (attr == TQString::tqfromLatin1("0.2")) /* smt -> review */ + else if (attr == TQString::fromLatin1("0.2")) /* smt -> review */ d->version = vAtom_0_2; - else if (attr == TQString::tqfromLatin1("0.1")) /* smt -> review */ + else if (attr == TQString::fromLatin1("0.1")) /* smt -> review */ d->version = vAtom_0_1; else d->version = vAtom_1_0; @@ -121,13 +121,13 @@ Document::Document(const TQDomDocument &doc) : d(new Private) else { d->format=RSSFeed; - if (attr == TQString::tqfromLatin1("0.91")) + if (attr == TQString::fromLatin1("0.91")) d->version = v0_91; - else if (attr == TQString::tqfromLatin1("0.92")) + else if (attr == TQString::fromLatin1("0.92")) d->version = v0_92; - else if (attr == TQString::tqfromLatin1("0.93")) + else if (attr == TQString::fromLatin1("0.93")) d->version = v0_93; - else if (attr == TQString::tqfromLatin1("0.94")) + else if (attr == TQString::fromLatin1("0.94")) d->version = v0_94; else // otherwise, we just assume a RSS2 compatible feed. As rss2 is generally // backward-compatible, this should work @@ -137,7 +137,7 @@ Document::Document(const TQDomDocument &doc) : d(new Private) if (d->format==UnknownFormat) { - attr = rootNode.toElement().attribute(TQString::tqfromLatin1("xmlns"), TQString()); + attr = rootNode.toElement().attribute(TQString::fromLatin1("xmlns"), TQString()); if (!attr.isNull()) { /* * Hardcoding these URLs is actually a bad idea, since the DTD doesn't @@ -147,11 +147,11 @@ Document::Document(const TQDomDocument &doc) : d(new Private) * distinguish the RSS versions by analyzing the relationship between * the nodes. */ - if (attr == TQString::tqfromLatin1("http://my.netscape.com/rdf/simple/0.9/")) { + if (attr == TQString::fromLatin1("http://my.netscape.com/rdf/simple/0.9/")) { d->format=RSSFeed; d->version = v0_90; } - else if (attr == TQString::tqfromLatin1("http://purl.org/rss/1.0/")) { + else if (attr == TQString::fromLatin1("http://purl.org/rss/1.0/")) { d->format=RSSFeed; d->version = v1_0; } @@ -163,7 +163,7 @@ Document::Document(const TQDomDocument &doc) : d(new Private) if (d->format == AtomFeed) channelNode=rootNode; else - channelNode=rootNode.namedItem(TQString::tqfromLatin1("channel")); + channelNode=rootNode.namedItem(TQString::fromLatin1("channel")); if (!(elemText = extractTitle(channelNode)).isNull()) d->title = elemText; @@ -192,27 +192,27 @@ Document::Document(const TQDomDocument &doc) : d(new Private) else { // following is a HACK for broken 0.91 feeds like xanga.com's - if (!rootNode.namedItem(TQString::tqfromLatin1("item")).isNull()) + if (!rootNode.namedItem(TQString::fromLatin1("item")).isNull()) parentNode = rootNode; else parentNode = channelNode; } // image and textinput aren't supported by Atom.. handle in case feed provides - TQDomNode n = parentNode.namedItem(TQString::tqfromLatin1("image")); + TQDomNode n = parentNode.namedItem(TQString::fromLatin1("image")); if (!n.isNull()) d->image = new Image(n); - n = parentNode.namedItem(TQString::tqfromLatin1("textinput")); + n = parentNode.namedItem(TQString::fromLatin1("textinput")); if (!n.isNull()) d->textInput = new TextInput(n); // Our (hopefully faster) version of elementsByTagName() TQString tagName; if (d->format == AtomFeed) - tagName=TQString::tqfromLatin1("entry"); + tagName=TQString::fromLatin1("entry"); else - tagName=TQString::tqfromLatin1("item"); + tagName=TQString::fromLatin1("item"); for (n = parentNode.firstChild(); !n.isNull(); n = n.nextSibling()) { const TQDomElement e = n.toElement(); @@ -220,212 +220,212 @@ Document::Document(const TQDomDocument &doc) : d(new Private) d->articles.append(Article(e, d->format, d->version)); } - if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("copyright"))).isNull()) + if (!(elemText = extractNode(channelNode, TQString::fromLatin1("copyright"))).isNull()) d->copyright = elemText; if (d->format == AtomFeed) - elemText = rootNode.toElement().attribute(TQString::tqfromLatin1("xml:lang"), TQString()); + elemText = rootNode.toElement().attribute(TQString::fromLatin1("xml:lang"), TQString()); else - elemText = extractNode(channelNode, TQString::tqfromLatin1("language")); + elemText = extractNode(channelNode, TQString::fromLatin1("language")); if (!elemText.isNull()){ - if (elemText == TQString::tqfromLatin1("af")) + if (elemText == TQString::fromLatin1("af")) d->language = af; - else if (elemText == TQString::tqfromLatin1("sq")) + else if (elemText == TQString::fromLatin1("sq")) d->language = sq; - else if (elemText == TQString::tqfromLatin1("eu")) + else if (elemText == TQString::fromLatin1("eu")) d->language = eu; - else if (elemText == TQString::tqfromLatin1("be")) + else if (elemText == TQString::fromLatin1("be")) d->language = be; - else if (elemText == TQString::tqfromLatin1("bg")) + else if (elemText == TQString::fromLatin1("bg")) d->language = bg; - else if (elemText == TQString::tqfromLatin1("ca")) + else if (elemText == TQString::fromLatin1("ca")) d->language = ca; - else if (elemText == TQString::tqfromLatin1("zh-cn")) + else if (elemText == TQString::fromLatin1("zh-cn")) d->language = zh_cn; - else if (elemText == TQString::tqfromLatin1("zh-tw")) + else if (elemText == TQString::fromLatin1("zh-tw")) d->language = zh_tw; - else if (elemText == TQString::tqfromLatin1("hr")) + else if (elemText == TQString::fromLatin1("hr")) d->language = hr; - else if (elemText == TQString::tqfromLatin1("cs")) + else if (elemText == TQString::fromLatin1("cs")) d->language = cs; - else if (elemText == TQString::tqfromLatin1("da")) + else if (elemText == TQString::fromLatin1("da")) d->language = da; - else if (elemText == TQString::tqfromLatin1("nl")) + else if (elemText == TQString::fromLatin1("nl")) d->language = nl; - else if (elemText == TQString::tqfromLatin1("nl-be")) + else if (elemText == TQString::fromLatin1("nl-be")) d->language = nl_be; - else if (elemText == TQString::tqfromLatin1("nl-nl")) + else if (elemText == TQString::fromLatin1("nl-nl")) d->language = nl_nl; - else if (elemText == TQString::tqfromLatin1("en")) + else if (elemText == TQString::fromLatin1("en")) d->language = en; - else if (elemText == TQString::tqfromLatin1("en-au")) + else if (elemText == TQString::fromLatin1("en-au")) d->language = en_au; - else if (elemText == TQString::tqfromLatin1("en-bz")) + else if (elemText == TQString::fromLatin1("en-bz")) d->language = en_bz; - else if (elemText == TQString::tqfromLatin1("en-ca")) + else if (elemText == TQString::fromLatin1("en-ca")) d->language = en_ca; - else if (elemText == TQString::tqfromLatin1("en-ie")) + else if (elemText == TQString::fromLatin1("en-ie")) d->language = en_ie; - else if (elemText == TQString::tqfromLatin1("en-jm")) + else if (elemText == TQString::fromLatin1("en-jm")) d->language = en_jm; - else if (elemText == TQString::tqfromLatin1("en-nz")) + else if (elemText == TQString::fromLatin1("en-nz")) d->language = en_nz; - else if (elemText == TQString::tqfromLatin1("en-ph")) + else if (elemText == TQString::fromLatin1("en-ph")) d->language = en_ph; - else if (elemText == TQString::tqfromLatin1("en-za")) + else if (elemText == TQString::fromLatin1("en-za")) d->language = en_za; - else if (elemText == TQString::tqfromLatin1("en-tt")) + else if (elemText == TQString::fromLatin1("en-tt")) d->language = en_tt; - else if (elemText == TQString::tqfromLatin1("en-gb")) + else if (elemText == TQString::fromLatin1("en-gb")) d->language = en_gb; - else if (elemText == TQString::tqfromLatin1("en-us")) + else if (elemText == TQString::fromLatin1("en-us")) d->language = en_us; - else if (elemText == TQString::tqfromLatin1("en-zw")) + else if (elemText == TQString::fromLatin1("en-zw")) d->language = en_zw; - else if (elemText == TQString::tqfromLatin1("fo")) + else if (elemText == TQString::fromLatin1("fo")) d->language = fo; - else if (elemText == TQString::tqfromLatin1("fi")) + else if (elemText == TQString::fromLatin1("fi")) d->language = fi; - else if (elemText == TQString::tqfromLatin1("fr")) + else if (elemText == TQString::fromLatin1("fr")) d->language = fr; - else if (elemText == TQString::tqfromLatin1("fr-be")) + else if (elemText == TQString::fromLatin1("fr-be")) d->language = fr_be; - else if (elemText == TQString::tqfromLatin1("fr-ca")) + else if (elemText == TQString::fromLatin1("fr-ca")) d->language = fr_ca; - else if (elemText == TQString::tqfromLatin1("fr-fr")) + else if (elemText == TQString::fromLatin1("fr-fr")) d->language = fr_fr; - else if (elemText == TQString::tqfromLatin1("fr-lu")) + else if (elemText == TQString::fromLatin1("fr-lu")) d->language = fr_lu; - else if (elemText == TQString::tqfromLatin1("fr-mc")) + else if (elemText == TQString::fromLatin1("fr-mc")) d->language = fr_mc; - else if (elemText == TQString::tqfromLatin1("fr-ch")) + else if (elemText == TQString::fromLatin1("fr-ch")) d->language = fr_ch; - else if (elemText == TQString::tqfromLatin1("gl")) + else if (elemText == TQString::fromLatin1("gl")) d->language = gl; - else if (elemText == TQString::tqfromLatin1("gd")) + else if (elemText == TQString::fromLatin1("gd")) d->language = gd; - else if (elemText == TQString::tqfromLatin1("de")) + else if (elemText == TQString::fromLatin1("de")) d->language = de; - else if (elemText == TQString::tqfromLatin1("de-at")) + else if (elemText == TQString::fromLatin1("de-at")) d->language = de_at; - else if (elemText == TQString::tqfromLatin1("de-de")) + else if (elemText == TQString::fromLatin1("de-de")) d->language = de_de; - else if (elemText == TQString::tqfromLatin1("de-li")) + else if (elemText == TQString::fromLatin1("de-li")) d->language = de_li; - else if (elemText == TQString::tqfromLatin1("de-lu")) + else if (elemText == TQString::fromLatin1("de-lu")) d->language = de_lu; - else if (elemText == TQString::tqfromLatin1("de-ch")) + else if (elemText == TQString::fromLatin1("de-ch")) d->language = de_ch; - else if (elemText == TQString::tqfromLatin1("el")) + else if (elemText == TQString::fromLatin1("el")) d->language = el; - else if (elemText == TQString::tqfromLatin1("hu")) + else if (elemText == TQString::fromLatin1("hu")) d->language = hu; - else if (elemText == TQString::tqfromLatin1("is")) + else if (elemText == TQString::fromLatin1("is")) d->language = is; - else if (elemText == TQString::tqfromLatin1("id")) + else if (elemText == TQString::fromLatin1("id")) d->language = id; - else if (elemText == TQString::tqfromLatin1("ga")) + else if (elemText == TQString::fromLatin1("ga")) d->language = ga; - else if (elemText == TQString::tqfromLatin1("it")) + else if (elemText == TQString::fromLatin1("it")) d->language = it; - else if (elemText == TQString::tqfromLatin1("it-it")) + else if (elemText == TQString::fromLatin1("it-it")) d->language = it_it; - else if (elemText == TQString::tqfromLatin1("it-ch")) + else if (elemText == TQString::fromLatin1("it-ch")) d->language = it_ch; - else if (elemText == TQString::tqfromLatin1("ja")) + else if (elemText == TQString::fromLatin1("ja")) d->language = ja; - else if (elemText == TQString::tqfromLatin1("ko")) + else if (elemText == TQString::fromLatin1("ko")) d->language = ko; - else if (elemText == TQString::tqfromLatin1("mk")) + else if (elemText == TQString::fromLatin1("mk")) d->language = mk; - else if (elemText == TQString::tqfromLatin1("no")) + else if (elemText == TQString::fromLatin1("no")) d->language = no; - else if (elemText == TQString::tqfromLatin1("pl")) + else if (elemText == TQString::fromLatin1("pl")) d->language = pl; - else if (elemText == TQString::tqfromLatin1("pt")) + else if (elemText == TQString::fromLatin1("pt")) d->language = pt; - else if (elemText == TQString::tqfromLatin1("pt-br")) + else if (elemText == TQString::fromLatin1("pt-br")) d->language = pt_br; - else if (elemText == TQString::tqfromLatin1("pt-pt")) + else if (elemText == TQString::fromLatin1("pt-pt")) d->language = pt_pt; - else if (elemText == TQString::tqfromLatin1("ro")) + else if (elemText == TQString::fromLatin1("ro")) d->language = ro; - else if (elemText == TQString::tqfromLatin1("ro-mo")) + else if (elemText == TQString::fromLatin1("ro-mo")) d->language = ro_mo; - else if (elemText == TQString::tqfromLatin1("ro-ro")) + else if (elemText == TQString::fromLatin1("ro-ro")) d->language = ro_ro; - else if (elemText == TQString::tqfromLatin1("ru")) + else if (elemText == TQString::fromLatin1("ru")) d->language = ru; - else if (elemText == TQString::tqfromLatin1("ru-mo")) + else if (elemText == TQString::fromLatin1("ru-mo")) d->language = ru_mo; - else if (elemText == TQString::tqfromLatin1("ru-ru")) + else if (elemText == TQString::fromLatin1("ru-ru")) d->language = ru_ru; - else if (elemText == TQString::tqfromLatin1("sr")) + else if (elemText == TQString::fromLatin1("sr")) d->language = sr; - else if (elemText == TQString::tqfromLatin1("sk")) + else if (elemText == TQString::fromLatin1("sk")) d->language = sk; - else if (elemText == TQString::tqfromLatin1("sl")) + else if (elemText == TQString::fromLatin1("sl")) d->language = sl; - else if (elemText == TQString::tqfromLatin1("es")) + else if (elemText == TQString::fromLatin1("es")) d->language = es; - else if (elemText == TQString::tqfromLatin1("es-ar")) + else if (elemText == TQString::fromLatin1("es-ar")) d->language = es_ar; - else if (elemText == TQString::tqfromLatin1("es-bo")) + else if (elemText == TQString::fromLatin1("es-bo")) d->language = es_bo; - else if (elemText == TQString::tqfromLatin1("es-cl")) + else if (elemText == TQString::fromLatin1("es-cl")) d->language = es_cl; - else if (elemText == TQString::tqfromLatin1("es-co")) + else if (elemText == TQString::fromLatin1("es-co")) d->language = es_co; - else if (elemText == TQString::tqfromLatin1("es-cr")) + else if (elemText == TQString::fromLatin1("es-cr")) d->language = es_cr; - else if (elemText == TQString::tqfromLatin1("es-do")) + else if (elemText == TQString::fromLatin1("es-do")) d->language = es_do; - else if (elemText == TQString::tqfromLatin1("es-ec")) + else if (elemText == TQString::fromLatin1("es-ec")) d->language = es_ec; - else if (elemText == TQString::tqfromLatin1("es-sv")) + else if (elemText == TQString::fromLatin1("es-sv")) d->language = es_sv; - else if (elemText == TQString::tqfromLatin1("es-gt")) + else if (elemText == TQString::fromLatin1("es-gt")) d->language = es_gt; - else if (elemText == TQString::tqfromLatin1("es-hn")) + else if (elemText == TQString::fromLatin1("es-hn")) d->language = es_hn; - else if (elemText == TQString::tqfromLatin1("es-mx")) + else if (elemText == TQString::fromLatin1("es-mx")) d->language = es_mx; - else if (elemText == TQString::tqfromLatin1("es-ni")) + else if (elemText == TQString::fromLatin1("es-ni")) d->language = es_ni; - else if (elemText == TQString::tqfromLatin1("es-pa")) + else if (elemText == TQString::fromLatin1("es-pa")) d->language = es_pa; - else if (elemText == TQString::tqfromLatin1("es-py")) + else if (elemText == TQString::fromLatin1("es-py")) d->language = es_py; - else if (elemText == TQString::tqfromLatin1("es-pe")) + else if (elemText == TQString::fromLatin1("es-pe")) d->language = es_pe; - else if (elemText == TQString::tqfromLatin1("es-pr")) + else if (elemText == TQString::fromLatin1("es-pr")) d->language = es_pr; - else if (elemText == TQString::tqfromLatin1("es-es")) + else if (elemText == TQString::fromLatin1("es-es")) d->language = es_es; - else if (elemText == TQString::tqfromLatin1("es-uy")) + else if (elemText == TQString::fromLatin1("es-uy")) d->language = es_uy; - else if (elemText == TQString::tqfromLatin1("es-ve")) + else if (elemText == TQString::fromLatin1("es-ve")) d->language = es_ve; - else if (elemText == TQString::tqfromLatin1("sv")) + else if (elemText == TQString::fromLatin1("sv")) d->language = sv; - else if (elemText == TQString::tqfromLatin1("sv-fi")) + else if (elemText == TQString::fromLatin1("sv-fi")) d->language = sv_fi; - else if (elemText == TQString::tqfromLatin1("sv-se")) + else if (elemText == TQString::fromLatin1("sv-se")) d->language = sv_se; - else if (elemText == TQString::tqfromLatin1("tr")) + else if (elemText == TQString::fromLatin1("tr")) d->language = tr; - else if (elemText == TQString::tqfromLatin1("uk")) + else if (elemText == TQString::fromLatin1("uk")) d->language = uk; else d->language = UndefinedLanguage; } if (d->format == AtomFeed) - tagName=TQString::tqfromLatin1("issued"); // atom doesn't specify this for feeds + tagName=TQString::fromLatin1("issued"); // atom doesn't specify this for feeds // but some broken feeds do this else - tagName=TQString::tqfromLatin1("pubDate"); + tagName=TQString::fromLatin1("pubDate"); if (!(elemText = extractNode(channelNode, tagName)).isNull()) { time_t _time; @@ -441,7 +441,7 @@ Document::Document(const TQDomDocument &doc) : d(new Private) d->pubDate.setTime_t(_time); } - if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("dc:date"))).isNull()) { + if (!(elemText = extractNode(channelNode, TQString::fromLatin1("dc:date"))).isNull()) { time_t _time = parseISO8601Date(elemText); /* \bug This isn't really the right way since it will set the date to * Jan 1 1970, 1:00:00 if the passed date was invalid; this means that @@ -451,9 +451,9 @@ Document::Document(const TQDomDocument &doc) : d(new Private) } if (d->format == AtomFeed) - tagName=TQString::tqfromLatin1("modified"); + tagName=TQString::fromLatin1("modified"); else - tagName=TQString::tqfromLatin1("lastBuildDate"); + tagName=TQString::fromLatin1("lastBuildDate"); if (!(elemText = extractNode(channelNode, tagName)).isNull()) { time_t _time; if (d->format == AtomFeed) @@ -463,44 +463,44 @@ Document::Document(const TQDomDocument &doc) : d(new Private) d->lastBuildDate.setTime_t(_time); } - if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("rating"))).isNull()) + if (!(elemText = extractNode(channelNode, TQString::fromLatin1("rating"))).isNull()) d->rating = elemText; - if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("docs"))).isNull()) + if (!(elemText = extractNode(channelNode, TQString::fromLatin1("docs"))).isNull()) d->docs = elemText; - if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1((d->format == AtomFeed) ? "author" : "managingEditor"))).isNull()) + if (!(elemText = extractNode(channelNode, TQString::fromLatin1((d->format == AtomFeed) ? "author" : "managingEditor"))).isNull()) d->managingEditor = elemText; - if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("webMaster"))).isNull()) + if (!(elemText = extractNode(channelNode, TQString::fromLatin1("webMaster"))).isNull()) d->webMaster = elemText; - if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("ttl"))).isNull()) + if (!(elemText = extractNode(channelNode, TQString::fromLatin1("ttl"))).isNull()) d->ttl = elemText.toUInt(); - n = channelNode.namedItem(TQString::tqfromLatin1("skipHours")); + n = channelNode.namedItem(TQString::fromLatin1("skipHours")); if (!n.isNull()) for (TQDomElement e = n.firstChild().toElement(); !e.isNull(); e = e.nextSibling().toElement()) - if (e.tagName() == TQString::tqfromLatin1("hour")) + if (e.tagName() == TQString::fromLatin1("hour")) d->skipHours.append(e.text().toUInt()); - n = channelNode.namedItem(TQString::tqfromLatin1("skipDays")); + n = channelNode.namedItem(TQString::fromLatin1("skipDays")); if (!n.isNull()) { Day day; TQString elemText; for (TQDomElement e = n.firstChild().toElement(); !e.isNull(); e = e.nextSibling().toElement()) - if (e.tagName() == TQString::tqfromLatin1("day")) { + if (e.tagName() == TQString::fromLatin1("day")) { elemText = e.text().lower(); - if (elemText == TQString::tqfromLatin1("monday")) + if (elemText == TQString::fromLatin1("monday")) day = Monday; - else if (elemText == TQString::tqfromLatin1("tuesday")) + else if (elemText == TQString::fromLatin1("tuesday")) day = Tuesday; - else if (elemText == TQString::tqfromLatin1("wednesday")) + else if (elemText == TQString::fromLatin1("wednesday")) day = Wednesday; - else if (elemText == TQString::tqfromLatin1("thursday")) + else if (elemText == TQString::fromLatin1("thursday")) day = Thursday; - else if (elemText == TQString::tqfromLatin1("friday")) + else if (elemText == TQString::fromLatin1("friday")) day = Friday; - else if (elemText == TQString::tqfromLatin1("saturday")) + else if (elemText == TQString::fromLatin1("saturday")) day = Saturday; - else if (elemText == TQString::tqfromLatin1("sunday")) + else if (elemText == TQString::fromLatin1("sunday")) day = Sunday; else day = UndefinedDay; @@ -529,17 +529,17 @@ Version Document::version() const TQString Document::verbVersion() const { switch (d->version) { - case v0_90: return TQString::tqfromLatin1("0.90"); - case v0_91: return TQString::tqfromLatin1("0.91"); - case v0_92: return TQString::tqfromLatin1("0.92"); - case v0_93: return TQString::tqfromLatin1("0.93"); - case v0_94: return TQString::tqfromLatin1("0.94"); - case v1_0: return TQString::tqfromLatin1("1.0"); - case v2_0: return TQString::tqfromLatin1("2.0"); - case vAtom_0_3: return TQString::tqfromLatin1("0.3"); - case vAtom_0_2: return TQString::tqfromLatin1("0.2"); - case vAtom_0_1: return TQString::tqfromLatin1("0.1"); - case vAtom_1_0: return TQString::tqfromLatin1("1.0"); + case v0_90: return TQString::fromLatin1("0.90"); + case v0_91: return TQString::fromLatin1("0.91"); + case v0_92: return TQString::fromLatin1("0.92"); + case v0_93: return TQString::fromLatin1("0.93"); + case v0_94: return TQString::fromLatin1("0.94"); + case v1_0: return TQString::fromLatin1("1.0"); + case v2_0: return TQString::fromLatin1("2.0"); + case vAtom_0_3: return TQString::fromLatin1("0.3"); + case vAtom_0_2: return TQString::fromLatin1("0.2"); + case vAtom_0_1: return TQString::fromLatin1("0.1"); + case vAtom_1_0: return TQString::fromLatin1("1.0"); } return TQString(); } diff --git a/akregator/src/librss/enclosure.cpp b/akregator/src/librss/enclosure.cpp index 666162683..e048fa887 100644 --- a/akregator/src/librss/enclosure.cpp +++ b/akregator/src/librss/enclosure.cpp @@ -57,30 +57,30 @@ Enclosure Enclosure::fromXML(const TQDomElement& e) TQString url, type; int length = -1; - if (e.hasAttribute(TQString::tqfromLatin1("url"))) - url = e.attribute(TQString::tqfromLatin1("url")); + if (e.hasAttribute(TQString::fromLatin1("url"))) + url = e.attribute(TQString::fromLatin1("url")); - if (e.hasAttribute(TQString::tqfromLatin1("length"))) + if (e.hasAttribute(TQString::fromLatin1("length"))) { bool ok; - int c = e.attribute(TQString::tqfromLatin1("length")).toInt(&ok); + int c = e.attribute(TQString::fromLatin1("length")).toInt(&ok); length = ok ? c : -1; } - if (e.hasAttribute(TQString::tqfromLatin1("type"))) - type = e.attribute(TQString::tqfromLatin1("type")); + if (e.hasAttribute(TQString::fromLatin1("type"))) + type = e.attribute(TQString::fromLatin1("type")); return Enclosure(url, length, type); } TQDomElement Enclosure::toXML(TQDomDocument document) const { - TQDomElement e = document.createElement(TQString::tqfromLatin1("enclosure")); + TQDomElement e = document.createElement(TQString::fromLatin1("enclosure")); if (!d->url.isNull()) - e.setAttribute(TQString::tqfromLatin1("url"), d->url); + e.setAttribute(TQString::fromLatin1("url"), d->url); if (d->length != -1) - e.setAttribute(TQString::tqfromLatin1("length"), TQString::number(d->length)); + e.setAttribute(TQString::fromLatin1("length"), TQString::number(d->length)); if (!d->type.isNull()) - e.setAttribute(TQString::tqfromLatin1("type"), d->type); + e.setAttribute(TQString::fromLatin1("type"), d->type); return e; } diff --git a/akregator/src/librss/global.h b/akregator/src/librss/global.h index c714f5663..091018cb8 100644 --- a/akregator/src/librss/global.h +++ b/akregator/src/librss/global.h @@ -42,7 +42,7 @@ namespace RSS * Possible status values returned by the signal * Loader::loadingComplete(). */ - enum tqStatus { + enum Status { Success, /** * Nothing went wrong so far, but you still have to check * what values are returned by the classes since it's not diff --git a/akregator/src/librss/image.cpp b/akregator/src/librss/image.cpp index 98074be37..cb8d7c86b 100644 --- a/akregator/src/librss/image.cpp +++ b/akregator/src/librss/image.cpp @@ -48,17 +48,17 @@ Image::Image(const TQDomNode &node) : TQObject(), d(new Private) { TQString elemText; - if (!(elemText = extractNode(node, TQString::tqfromLatin1("title"))).isNull()) + if (!(elemText = extractNode(node, TQString::fromLatin1("title"))).isNull()) d->title = elemText; - if (!(elemText = extractNode(node, TQString::tqfromLatin1("url"))).isNull()) + if (!(elemText = extractNode(node, TQString::fromLatin1("url"))).isNull()) d->url = elemText; - if (!(elemText = extractNode(node, TQString::tqfromLatin1("link"))).isNull()) + if (!(elemText = extractNode(node, TQString::fromLatin1("link"))).isNull()) d->link = elemText; - if (!(elemText = extractNode(node, TQString::tqfromLatin1("description"))).isNull()) + if (!(elemText = extractNode(node, TQString::fromLatin1("description"))).isNull()) d->description = elemText; - if (!(elemText = extractNode(node, TQString::tqfromLatin1("height"))).isNull()) + if (!(elemText = extractNode(node, TQString::fromLatin1("height"))).isNull()) d->height = elemText.toUInt(); - if (!(elemText = extractNode(node, TQString::tqfromLatin1("width"))).isNull()) + if (!(elemText = extractNode(node, TQString::fromLatin1("width"))).isNull()) d->width = elemText.toUInt(); } diff --git a/akregator/src/librss/loader.cpp b/akregator/src/librss/loader.cpp index edc384323..5fad14094 100644 --- a/akregator/src/librss/loader.cpp +++ b/akregator/src/librss/loader.cpp @@ -268,7 +268,7 @@ Loader *Loader::create() Loader *Loader::create(TQObject *object, const char *slot) { Loader *loader = create(); - connect(loader, TQT_SIGNAL(loadingComplete(Loader *, Document, tqStatus)), + connect(loader, TQT_SIGNAL(loadingComplete(Loader *, Document, Status)), object, slot); return loader; } @@ -326,7 +326,7 @@ void Loader::slotRetrieverDone(const TQByteArray &data, bool success) d->retriever = NULL; Document rssDoc; - tqStatus status = Success; + Status status = Success; if (success) { TQDomDocument doc; diff --git a/akregator/src/librss/loader.h b/akregator/src/librss/loader.h index 2129bc792..59f47c9cd 100644 --- a/akregator/src/librss/loader.h +++ b/akregator/src/librss/loader.h @@ -211,8 +211,8 @@ namespace RSS * * \code * Loader *loader = Loader::create(); - * connect(loader, TQT_SIGNAL(loadingComplete(Loader *, Document, tqStatus)), - * this, TQT_SLOT(slotLoadingComplete(Loader *, Document, tqStatus))); + * connect(loader, TQT_SIGNAL(loadingComplete(Loader *, Document, Status)), + * this, TQT_SLOT(slotLoadingComplete(Loader *, Document, Status))); * loader->loadFrom("http://www.blah.org/foobar.rdf", new FileRetriever); * \endcode * @@ -236,7 +236,7 @@ namespace RSS * 'slotLoadingComplete' method might look like this: * * \code - * void MyClass::slotLoadingComplete(Loader *loader, Document doc, tqStatus status) + * void MyClass::slotLoadingComplete(Loader *loader, Document doc, Status status) * { * // Note that Loader::~Loader() is private, so you cannot delete Loader instances. * // You don't need to do that anyway since Loader instances delete themselves. @@ -322,9 +322,9 @@ namespace RSS * the case if you intend to call getPixmap() on Document::image()! * @param status A status byte telling whether there were any problems * while retrieving or parsing the data. - * @see Document, tqStatus + * @see Document, Status */ - void loadingComplete(Loader *loader, Document doc, tqStatus status); + void loadingComplete(Loader *loader, Document doc, Status status); private slots: void slotRetrieverDone(const TQByteArray &data, bool success); diff --git a/akregator/src/librss/testlibrss.cpp b/akregator/src/librss/testlibrss.cpp index 571717ae3..7d88c3d1f 100644 --- a/akregator/src/librss/testlibrss.cpp +++ b/akregator/src/librss/testlibrss.cpp @@ -19,12 +19,12 @@ static const KCmdLineOptions options[] = void Tester::test( const TQString &url ) { Loader *loader = Loader::create(); - connect( loader, TQT_SIGNAL( loadingComplete( Loader *, Document, tqStatus ) ), - this, TQT_SLOT( slotLoadingComplete( Loader *, Document, tqStatus ) ) ); + connect( loader, TQT_SIGNAL( loadingComplete( Loader *, Document, Status ) ), + this, TQT_SLOT( slotLoadingComplete( Loader *, Document, Status ) ) ); loader->loadFrom( url, new FileRetriever ); } -void Tester::slotLoadingComplete( Loader *loader, Document doc, tqStatus status ) +void Tester::slotLoadingComplete( Loader *loader, Document doc, Status status ) { if ( status == Success ) { diff --git a/akregator/src/librss/testlibrss.h b/akregator/src/librss/testlibrss.h index 18e18327d..3d3e963b8 100644 --- a/akregator/src/librss/testlibrss.h +++ b/akregator/src/librss/testlibrss.h @@ -10,7 +10,7 @@ using RSS::Loader; using RSS::Document; -using RSS::tqStatus; +using RSS::Status; class Tester : public TQObject { @@ -20,7 +20,7 @@ class Tester : public TQObject void test( const TQString &url ); private slots: - void slotLoadingComplete( Loader *loader, Document doc, tqStatus status ); + void slotLoadingComplete( Loader *loader, Document doc, Status status ); }; #endif diff --git a/akregator/src/librss/textinput.cpp b/akregator/src/librss/textinput.cpp index a12442fa3..04799fcaa 100644 --- a/akregator/src/librss/textinput.cpp +++ b/akregator/src/librss/textinput.cpp @@ -38,13 +38,13 @@ TextInput::TextInput(const TQDomNode &node) : d(new Private) { TQString elemText; - if (!(elemText = extractNode(node, TQString::tqfromLatin1("title"))).isNull()) + if (!(elemText = extractNode(node, TQString::fromLatin1("title"))).isNull()) d->title = elemText; - if (!(elemText = extractNode(node, TQString::tqfromLatin1("description"))).isNull()) + if (!(elemText = extractNode(node, TQString::fromLatin1("description"))).isNull()) d->description = elemText; - if (!(elemText = extractNode(node, TQString::tqfromLatin1("name")))) + if (!(elemText = extractNode(node, TQString::fromLatin1("name")))) d->name = elemText; - if (!(elemText = extractNode(node, TQString::tqfromLatin1("link"))).isNull()) + if (!(elemText = extractNode(node, TQString::fromLatin1("link"))).isNull()) d->link = elemText; } diff --git a/akregator/src/librss/tools_p.cpp b/akregator/src/librss/tools_p.cpp index c4daa0561..909d95805 100644 --- a/akregator/src/librss/tools_p.cpp +++ b/akregator/src/librss/tools_p.cpp @@ -69,8 +69,8 @@ static ContentFormat mapTypeToFormat(const TQString& modep, const TQString& type return HTML; if (type == TQString::fromUtf8("text") - || (type.tqstartsWith(TQString::fromUtf8("text/"), false) - && !type.tqstartsWith(TQString::fromUtf8("text/xml"), false)) + || (type.startsWith(TQString::fromUtf8("text/"), false) + && !type.startsWith(TQString::fromUtf8("text/xml"), false)) ) return Text; @@ -85,8 +85,8 @@ static ContentFormat mapTypeToFormat(const TQString& modep, const TQString& type if (xmltypes.contains(type) - || type.tqendsWith(TQString::fromUtf8("+xml"), false) - || type.tqendsWith(TQString::fromUtf8("/xml"), false)) + || type.endsWith(TQString::fromUtf8("+xml"), false) + || type.endsWith(TQString::fromUtf8("/xml"), false)) return XML; return Binary; @@ -145,7 +145,7 @@ TQString extractNode(const TQDomNode &parent, const TQString &elemName, bool isI TQString extractTitle(const TQDomNode & parent) { - TQDomNode node = parent.namedItem(TQString::tqfromLatin1("title")); + TQDomNode node = parent.namedItem(TQString::fromLatin1("title")); if (node.isNull()) return TQString(); diff --git a/akregator/src/mainwindow.cpp b/akregator/src/mainwindow.cpp index 2a820128f..77260872f 100644 --- a/akregator/src/mainwindow.cpp +++ b/akregator/src/mainwindow.cpp @@ -85,7 +85,7 @@ MainWindow::MainWindow() int statH=fontMetrics().height()+2; m_statusLabel = new KSqueezedTextLabel(this); m_statusLabel->setTextFormat(TQt::RichText); - m_statusLabel->tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Fixed )); + m_statusLabel->setSizePolicy(TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Fixed )); m_statusLabel->setMinimumWidth( 0 ); m_statusLabel->setFixedHeight( statH ); statusBar()->addWidget (m_statusLabel, 1, false); diff --git a/akregator/src/mk4storage/feedstoragemk4impl.cpp b/akregator/src/mk4storage/feedstoragemk4impl.cpp index 75ee1e2f1..32af90966 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::setqStatus(const TQString& guid, int status) +void FeedStorageMK4Impl::seStatus(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)); - setqStatus(guid, source->status(guid)); + seStatus(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 057ba2e73..6dff8283b 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 setqStatus(const TQString& guid, int status); + virtual void seStatus(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/mk4confwidgetbase.ui b/akregator/src/mk4storage/mk4confwidgetbase.ui index e2b8c63a3..9063bf0fe 100644 --- a/akregator/src/mk4storage/mk4confwidgetbase.ui +++ b/akregator/src/mk4storage/mk4confwidgetbase.ui @@ -90,7 +90,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>140</width> <height>20</height> diff --git a/akregator/src/pageviewer.cpp b/akregator/src/pageviewer.cpp index 7a0423913..2adb03c70 100644 --- a/akregator/src/pageviewer.cpp +++ b/akregator/src/pageviewer.cpp @@ -356,7 +356,7 @@ void PageViewer::slotCancelled( const TQString & /*errMsg*/ ) void PageViewer::urlSelected(const TQString &url, int button, int state, const TQString &_target, KParts::URLArgs args) { - if (url.tqstartsWith(TQString::tqfromLatin1( "javascript:" ), /*case-sensitive=*/false) ) + if (url.startsWith(TQString::fromLatin1( "javascript:" ), /*case-sensitive=*/false) ) { KHTMLPart::urlSelected(url,button,state,_target,args); } @@ -390,7 +390,7 @@ void PageViewer::slotPaletteOrFontChanged() if ( !obj ) // not all views have a browser extension ! return; - int id = obj->tqmetaObject()->findSlot("reparseConfiguration()"); + int id = obj->metaObject()->findSlot("reparseConfiguration()"); if (id == -1) return; TQUObject o[1]; @@ -430,7 +430,7 @@ void PageViewer::slotPopupMenu(KXMLGUIClient*, const TQPoint& p, const KURL& kur if (isLink) { idNewWindow = popup.insertItem(SmallIcon("tab_new"),i18n("Open Link in New &Tab"), this, TQT_SLOT(slotOpenLinkInForegroundTab())); - popup.tqsetWhatsThis(idNewWindow, i18n("<b>Open Link in New Tab</b><p>Opens current link in a new tab.")); + popup.setWhatsThis(idNewWindow, i18n("<b>Open Link in New Tab</b><p>Opens current link in a new tab.")); popup.insertItem(SmallIcon("window_new"), i18n("Open Link in External &Browser"), this, TQT_SLOT(slotOpenLinkInBrowser())); popup.insertSeparator(); diff --git a/akregator/src/progressmanager.cpp b/akregator/src/progressmanager.cpp index 7831a24fd..6b6ae4e6c 100644 --- a/akregator/src/progressmanager.cpp +++ b/akregator/src/progressmanager.cpp @@ -178,7 +178,7 @@ void ProgressItemHandler::slotFetchCompleted() { if (d->progressItem) { - d->progressItem->setqStatus(i18n("Fetch completed")); + d->progressItem->seStatus(i18n("Fetch completed")); d->progressItem->setComplete(); d->progressItem = 0; } @@ -188,7 +188,7 @@ void ProgressItemHandler::slotFetchError() { if (d->progressItem) { - d->progressItem->setqStatus(i18n("Fetch error")); + d->progressItem->seStatus(i18n("Fetch error")); d->progressItem->setComplete(); d->progressItem = 0; } @@ -198,7 +198,7 @@ void ProgressItemHandler::slotFetchAborted() { if (d->progressItem) { - d->progressItem->setqStatus(i18n("Fetch aborted")); + d->progressItem->seStatus(i18n("Fetch aborted")); d->progressItem->setComplete(); d->progressItem = 0; } diff --git a/akregator/src/propertieswidgetbase.ui b/akregator/src/propertieswidgetbase.ui index 14adeb001..de9f28ec6 100644 --- a/akregator/src/propertieswidgetbase.ui +++ b/akregator/src/propertieswidgetbase.ui @@ -116,7 +116,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>31</width> <height>20</height> @@ -282,7 +282,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>99</width> <height>20</height> @@ -299,7 +299,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>100</width> <height>20</height> @@ -396,7 +396,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>71</height> diff --git a/akregator/src/searchbar.cpp b/akregator/src/searchbar.cpp index 60e5f6fa7..6fc5a6bd7 100644 --- a/akregator/src/searchbar.cpp +++ b/akregator/src/searchbar.cpp @@ -65,7 +65,7 @@ SearchBar::SearchBar(TQWidget* parent, const char* name) : TQHBox(parent, name), d->delay = 400; setMargin(2); setSpacing(5); - tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) ); + setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) ); TQToolButton *clearButton = new TQToolButton(this); clearButton->setIconSet( SmallIconSet( TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase" ) ); @@ -144,7 +144,7 @@ void SearchBar::slotClearSearch() } } -void SearchBar::slotSetqStatus(int status) +void SearchBar::slotSeStatus(int status) { d->searchCombo->setCurrentItem(status); slotSearchComboChanged(status); @@ -194,15 +194,15 @@ void SearchBar::slotActivateSearch() { case 1: // Unread { - Criterion crit1( Criterion::tqStatus, Criterion::Equals, Article::New); - Criterion crit2( Criterion::tqStatus, Criterion::Equals, Article::Unread); + Criterion crit1( Criterion::Status, Criterion::Equals, Article::New); + Criterion crit2( Criterion::Status, Criterion::Equals, Article::Unread); statusCriteria << crit1; statusCriteria << crit2; break; } case 2: // New { - Criterion crit( Criterion::tqStatus, Criterion::Equals, Article::New); + Criterion crit( Criterion::Status, Criterion::Equals, Article::New); statusCriteria << crit; break; } diff --git a/akregator/src/searchbar.h b/akregator/src/searchbar.h index 6aff87b54..a13a78ca0 100644 --- a/akregator/src/searchbar.h +++ b/akregator/src/searchbar.h @@ -59,7 +59,7 @@ class SearchBar : public TQHBox public slots: void slotClearSearch(); - void slotSetqStatus(int status); + void slotSeStatus(int status); void slotSetText(const TQString& text); private slots: diff --git a/akregator/src/settings_advancedbase.ui b/akregator/src/settings_advancedbase.ui index 5943f79ad..352fbaf51 100644 --- a/akregator/src/settings_advancedbase.ui +++ b/akregator/src/settings_advancedbase.ui @@ -89,7 +89,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>174</width> <height>20</height> @@ -133,7 +133,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>260</height> diff --git a/akregator/src/settings_appearance.ui b/akregator/src/settings_appearance.ui index fc7f39b0d..c049638d0 100644 --- a/akregator/src/settings_appearance.ui +++ b/akregator/src/settings_appearance.ui @@ -197,7 +197,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>41</height> diff --git a/akregator/src/settings_archive.ui b/akregator/src/settings_archive.ui index 26faba49b..a068a9f51 100644 --- a/akregator/src/settings_archive.ui +++ b/akregator/src/settings_archive.ui @@ -143,7 +143,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>30</height> diff --git a/akregator/src/settings_browser.ui b/akregator/src/settings_browser.ui index 97dbcca18..e9982eddb 100644 --- a/akregator/src/settings_browser.ui +++ b/akregator/src/settings_browser.ui @@ -87,7 +87,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>31</width> <height>16</height> diff --git a/akregator/src/settings_general.ui b/akregator/src/settings_general.ui index 4634e5399..4632f7248 100644 --- a/akregator/src/settings_general.ui +++ b/akregator/src/settings_general.ui @@ -139,7 +139,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/akregator/src/tabwidget.cpp b/akregator/src/tabwidget.cpp index be7857b6a..6d733d475 100644 --- a/akregator/src/tabwidget.cpp +++ b/akregator/src/tabwidget.cpp @@ -166,8 +166,8 @@ void TabWidget::removeFrame(Frame *f) uint TabWidget::tabBarWidthForMaxChars( uint maxLength ) { int hframe, overlap; - hframe = tabBar()->tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabHSpace, this ); - overlap = tabBar()->tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabOverlap, this ); + hframe = tabBar()->tqstyle().pixelMetric( TQStyle::PM_TabBarTabHSpace, this ); + overlap = tabBar()->tqstyle().pixelMetric( TQStyle::PM_TabBarTabOverlap, this ); TQFontMetrics fm = tabBar()->fontMetrics(); int x = 0; @@ -198,7 +198,7 @@ void TabWidget::setTitle( const TQString &title , TQWidget* sender) removeTabToolTip( sender ); uint lcw=0, rcw=0; - int tabBarHeight = tabBar()->tqsizeHint().height(); + int tabBarHeight = tabBar()->sizeHint().height(); if ( cornerWidget( TopLeft ) && cornerWidget( TopLeft )->isVisible() ) lcw = TQMAX( cornerWidget( TopLeft )->width(), tabBarHeight ); if ( cornerWidget( TopRight ) && cornerWidget( TopRight )->isVisible() ) diff --git a/akregator/src/tagaction.cpp b/akregator/src/tagaction.cpp index d9c29a988..ec05f57b7 100644 --- a/akregator/src/tagaction.cpp +++ b/akregator/src/tagaction.cpp @@ -90,7 +90,7 @@ int TagAction::plug(TQWidget* widget, int index) return -1; TagMenuItem* item = new TagMenuItem(d->tag); - int id = popup->insertItem(TagMenuItem::checkBoxIconSet(isChecked(), popup->tqcolorGroup()), item, -1, index); + int id = popup->insertItem(TagMenuItem::checkBoxIconSet(isChecked(), popup->colorGroup()), item, -1, index); popup->connectItem (id, this, TQT_SLOT(slotActivated())); diff --git a/akregator/src/tagnode.cpp b/akregator/src/tagnode.cpp index 55273f727..4c4789dfe 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).setqStatus(Article::Read); + (*it).seStatus(Article::Read); setNotificationMode(true); } diff --git a/akregator/src/tagpropertieswidgetbase.ui b/akregator/src/tagpropertieswidgetbase.ui index 85f3ae941..45571a736 100644 --- a/akregator/src/tagpropertieswidgetbase.ui +++ b/akregator/src/tagpropertieswidgetbase.ui @@ -53,7 +53,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>31</height> @@ -91,7 +91,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>40</width> <height>40</height> @@ -117,7 +117,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>200</width> <height>21</height> diff --git a/akregator/src/tagset.cpp b/akregator/src/tagset.cpp index fd1cd42f0..66fb70aad 100644 --- a/akregator/src/tagset.cpp +++ b/akregator/src/tagset.cpp @@ -99,21 +99,21 @@ void TagSet::readFromXML(const TQDomDocument& doc) if (root.isNull()) return; - TQDomNodeList list = root.elementsByTagName(TQString::tqfromLatin1("tag")); + TQDomNodeList list = root.elementsByTagName(TQString::fromLatin1("tag")); for (uint i = 0; i < list.length(); ++i) { TQDomElement e = list.item(i).toElement(); if (!e.isNull()) { - if (e.hasAttribute(TQString::tqfromLatin1("id"))) + if (e.hasAttribute(TQString::fromLatin1("id"))) { - TQString id = e.attribute(TQString::tqfromLatin1("id")); + TQString id = e.attribute(TQString::fromLatin1("id")); TQString name = e.text(); - TQString scheme = e.attribute(TQString::tqfromLatin1("scheme")); + TQString scheme = e.attribute(TQString::fromLatin1("scheme")); Tag tag(id, name, scheme); - TQString icon = e.attribute(TQString::tqfromLatin1("icon")); + TQString icon = e.attribute(TQString::fromLatin1("icon")); if (!icon.isEmpty()) tag.setIcon(icon); @@ -145,11 +145,11 @@ TQDomDocument TagSet::toXML() const TQDomElement tn = doc.createElement("tag"); TQDomText text = doc.createTextNode((*it).name()); - tn.setAttribute(TQString::tqfromLatin1("id"),(*it).id()); + tn.setAttribute(TQString::fromLatin1("id"),(*it).id()); if (!(*it).scheme().isEmpty()) - tn.setAttribute(TQString::tqfromLatin1("scheme"),(*it).scheme()); + tn.setAttribute(TQString::fromLatin1("scheme"),(*it).scheme()); if (!(*it).icon().isEmpty()) - tn.setAttribute(TQString::tqfromLatin1("icon"),(*it).icon()); + tn.setAttribute(TQString::fromLatin1("icon"),(*it).icon()); tn.appendChild(text); root.appendChild(tn); } diff --git a/certmanager/certificateinfowidget.ui b/certmanager/certificateinfowidget.ui index 68f81f192..080453259 100644 --- a/certmanager/certificateinfowidget.ui +++ b/certmanager/certificateinfowidget.ui @@ -12,7 +12,7 @@ <height>403</height> </rect> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>250</width> <height>0</height> @@ -181,7 +181,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>291</width> <height>16</height> diff --git a/certmanager/certificatewizard.ui b/certmanager/certificatewizard.ui index b0c2626a1..ebc1170ef 100644 --- a/certmanager/certificatewizard.ui +++ b/certmanager/certificatewizard.ui @@ -55,7 +55,7 @@ The key pair will be generated in a decentralized manner. Please contact your lo <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -96,7 +96,7 @@ The key pair will be generated in a decentralized manner. Please contact your lo <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>31</height> @@ -140,7 +140,7 @@ The key pair will be generated in a decentralized manner. Please contact your lo <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>61</width> <height>20</height> @@ -199,7 +199,7 @@ The key pair will be generated in a decentralized manner. Please contact your lo <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>60</height> @@ -240,7 +240,7 @@ The key pair will be generated in a decentralized manner. Please contact your lo <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>440</width> <height>20</height> @@ -268,7 +268,7 @@ The key pair will be generated in a decentralized manner. Please contact your lo <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -336,7 +336,7 @@ there.</p><qt></string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>31</height> @@ -411,7 +411,7 @@ there.</p><qt></string> <property name="name"> <cstring>generatePB</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>30</height> @@ -431,7 +431,7 @@ there.</p><qt></string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>118</width> <height>16</height> @@ -448,7 +448,7 @@ there.</p><qt></string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>119</width> <height>16</height> diff --git a/certmanager/certificatewizardimpl.cpp b/certmanager/certificatewizardimpl.cpp index d24c7df99..af1907d1a 100644 --- a/certmanager/certificatewizardimpl.cpp +++ b/certmanager/certificatewizardimpl.cpp @@ -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::tqfromLatin1( res.error().asString() ) ), + .tqarg( TQString::fromLatin1( res.error().asString() ) ), i18n( "Certificate Manager Error" ) ); } else { // next will stay enabled until the user clicks Generate diff --git a/certmanager/certmanager.cpp b/certmanager/certmanager.cpp index 6d9557031..a357e8526 100644 --- a/certmanager/certmanager.cpp +++ b/certmanager/certmanager.cpp @@ -500,7 +500,7 @@ static TQStringList stringlistFromSet( const std::set<std::string> & set ) { TQStringList sl; for ( std::set<std::string>::const_iterator it = set.begin() ; it != set.end() ; ++it ) // let's make extra sure, maybe someone tries to make TQt not support std::string->TQString conversion - sl.push_back( TQString::tqfromLatin1( it->c_str() ) ); + sl.push_back( TQString::fromLatin1( it->c_str() ) ); return sl; } @@ -1338,7 +1338,7 @@ void CertManager::startSecretKeyExport( const TQString & fingerprint ) { }; TQStringList charsetList; for ( const char** c = charsets; *c; ++c ) { - charsetList.append( TQString::tqfromLatin1( *c ) ); + charsetList.append( TQString::fromLatin1( *c ) ); } // TODO this selection could be done in a derived KeySelectionDialog which would add a combobox, diff --git a/certmanager/conf/appearanceconfigwidgetbase.ui b/certmanager/conf/appearanceconfigwidgetbase.ui index 0d97a877b..b03cfb8f8 100644 --- a/certmanager/conf/appearanceconfigwidgetbase.ui +++ b/certmanager/conf/appearanceconfigwidgetbase.ui @@ -119,7 +119,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>100</height> diff --git a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp index e7690d4ff..a2d1e5518 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::tqcurrentDateTime().toString(Qt::ISODate) ) ); + mCentralWidget->append( tqtr("[%1] Log cleared").tqarg( TQDateTime::currentDateTime().toString(Qt::ISODate) ) ); } void KWatchGnuPGMainWindow::createActions() @@ -106,7 +106,7 @@ void KWatchGnuPGMainWindow::createActions() (void)KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureToolbars()), actionCollection()); #if 0 - (void)new KAction( i18n("Configure KWatchGnuPG..."), TQString::tqfromLatin1("configure"), + (void)new KAction( i18n("Configure KWatchGnuPG..."), TQString::fromLatin1("configure"), 0, this, TQT_SLOT( slotConfigure() ), actionCollection(), "configure" ); #endif @@ -135,7 +135,7 @@ void KWatchGnuPGMainWindow::startWatcher() kapp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput); } mCentralWidget->append(tqtr("[%1] Log stopped") - .tqarg( TQDateTime::tqcurrentDateTime().toString(Qt::ISODate))); + .tqarg( 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::tqcurrentDateTime().toString(Qt::ISODate) ) ); + .tqarg( TQDateTime::currentDateTime().toString(Qt::ISODate) ) ); } connect( mWatcher, TQT_SIGNAL( processExited(KProcess*) ), this, TQT_SLOT( slotWatcherExited() ) ); diff --git a/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp b/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp index f27dad3b6..472f7e642 100644 --- a/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp +++ b/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp @@ -224,9 +224,9 @@ namespace { return TQVariant( data.defaults.boolean.value, int() ); case ArgType_String: if ( isList() ) - return TQStringList( TQString::tqfromLatin1( data.defaults.string ) ); + return TQStringList( TQString::fromLatin1( data.defaults.string ) ); else - return TQString::tqfromLatin1( data.defaults.string ); + return TQString::fromLatin1( data.defaults.string ); case ArgType_Int: if ( isList() ) return TQValueList<TQVariant>() << data.defaults.integer; @@ -240,15 +240,15 @@ namespace { case ArgType_Path: case ArgType_DirPath: if ( isList() ) - return TQValueList<TQVariant>() << TQString::tqfromLatin1( data.defaults.path ); + return TQValueList<TQVariant>() << TQString::fromLatin1( data.defaults.path ); else - return TQString::tqfromLatin1( data.defaults.path ); + return TQString::fromLatin1( data.defaults.path ); case ArgType_URL: case ArgType_LDAPURL: if ( isList() ) - return TQValueList<TQVariant>() << TQString::tqfromLatin1( data.defaults.url ); + return TQValueList<TQVariant>() << TQString::fromLatin1( data.defaults.url ); else - return TQString::tqfromLatin1( data.defaults.url ); + return TQString::fromLatin1( data.defaults.url ); } } diff --git a/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp b/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp index ab413080c..57811c6e5 100644 --- a/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp +++ b/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp @@ -113,7 +113,7 @@ int Kleo::GnuPGProcessBase::commSetupDoneP() { if ( d->useStatusFD ) { ::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(slotChildtqStatus(int)) ); + connect( d->statnot, TQT_SIGNAL(activated(int)), TQT_SLOT(slotChildStatus(int)) ); } return KProcess::commSetupDoneP(); } @@ -124,12 +124,12 @@ int Kleo::GnuPGProcessBase::commSetupDoneC() { return KProcess::commSetupDoneC(); } -void Kleo::GnuPGProcessBase::slotChildtqStatus( int fd ) { - if ( !childtqStatus(fd) ) - closetqStatus(); +void Kleo::GnuPGProcessBase::slotChildStatus( int fd ) { + if ( !childStatus(fd) ) + closeStatus(); } -bool Kleo::GnuPGProcessBase::closetqStatus() { +bool Kleo::GnuPGProcessBase::closeStatus() { if ( !d->useStatusFD ) return false; d->useStatusFD = false; @@ -138,7 +138,7 @@ bool Kleo::GnuPGProcessBase::closetqStatus() { return true; } -int Kleo::GnuPGProcessBase::childtqStatus( int fd ) { +int Kleo::GnuPGProcessBase::childStatus( int fd ) { char buf[1024]; const int len = ::read( fd, buf, sizeof(buf)-1 ); if ( len > 0 ) { diff --git a/certmanager/lib/backends/qgpgme/gnupgprocessbase.h b/certmanager/lib/backends/qgpgme/gnupgprocessbase.h index b6643144a..c012b3075 100644 --- a/certmanager/lib/backends/qgpgme/gnupgprocessbase.h +++ b/certmanager/lib/backends/qgpgme/gnupgprocessbase.h @@ -57,7 +57,7 @@ namespace Kleo { /*! reimplementation */ bool start( RunMode runmode, Communication comm ); - bool closetqStatus(); + bool closeStatus(); signals: void status( Kleo::GnuPGProcessBase * proc, const TQString & type, const TQStringList & args ); @@ -70,11 +70,11 @@ namespace Kleo { /*! reimplementation */ int commSetupDoneC(); - int childtqStatus( int fd ); + int childStatus( int fd ); private slots: - void slotChildtqStatus( int fd ); + void slotChildStatus( int fd ); private: void parseStatusOutput(); diff --git a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp index 51f8f68c8..c2493ebe4 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp @@ -809,7 +809,7 @@ TQString QGpgMECryptoConfigEntry::toString( bool escape ) const if ( !isList() ) // non-list non-string { if ( mArgType == ArgType_None ) { - return mValue.toBool() ? TQString::tqfromLatin1( "1" ) : TQString(); + return mValue.toBool() ? TQString::fromLatin1( "1" ) : TQString(); } else { // some int Q_ASSERT( mArgType == ArgType_Int || mArgType == ArgType_UInt ); return mValue.toString(); // int to string conversion diff --git a/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp b/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp index de673faf1..95789725d 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp @@ -114,7 +114,7 @@ static const Map & makeMap() { // return a reference to a static to avoid copyin static Map map; for ( unsigned int i = 0 ; i < sizeof tokens / sizeof *tokens ; ++i ) { assert( tokens[i].token ); - const TQString token = TQString::tqfromLatin1( tokens[i].token ).lower(); + const TQString token = TQString::fromLatin1( tokens[i].token ).lower(); for ( unsigned int j = 0 ; j < tokens[i].numDesc ; ++j ) { const Desc & desc = tokens[i].desc[j]; assert( desc.display ); diff --git a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp index fdcdadbae..781e0513f 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp @@ -112,7 +112,7 @@ GpgME::Error Kleo::QGpgMERefreshKeysJob::startAProcess() { connect( mProcess, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)), TQT_SLOT(slotStderr(KProcess*,char*,int)) ); connect( mProcess, TQT_SIGNAL(status(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)), - TQT_SLOT(slotqStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) ); + TQT_SLOT(sloStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) ); if ( !mProcess->start( KProcess::NotifyOnExit, KProcess::Stderr ) ) { mError = gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_ENOENT ); // what else? @@ -129,7 +129,7 @@ void Kleo::QGpgMERefreshKeysJob::slotCancel() { mError = gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_CANCELED ); } -void Kleo::QGpgMERefreshKeysJob::slotqStatus( GnuPGProcessBase * proc, const TQString & type, const TQStringList & args ) { +void Kleo::QGpgMERefreshKeysJob::sloStatus( GnuPGProcessBase * proc, const TQString & type, const TQStringList & args ) { if ( proc != mProcess ) return; TQStringList::const_iterator it = args.begin(); diff --git a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h index f94957b3f..be4c9f796 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h @@ -63,7 +63,7 @@ namespace Kleo { /*! \reimp from Job */ void slotCancel(); - void slotqStatus( Kleo::GnuPGProcessBase *, const TQString &, const TQStringList & ); + void sloStatus( Kleo::GnuPGProcessBase *, const TQString &, const TQStringList & ); void slotStderr( KProcess *, char *, int ); void slotProcessExited( KProcess * ); diff --git a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp index e4875824c..8f2fd20d2 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp @@ -95,7 +95,7 @@ GpgME::Error Kleo::QGpgMESecretKeyExportJob::start( const TQStringList & pattern connect( mProcess, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)), TQT_SLOT(slotStderr(KProcess*,char*,int)) ); connect( mProcess, TQT_SIGNAL(status(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)), - TQT_SLOT(slotqStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) ); + TQT_SLOT(sloStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) ); if ( !mProcess->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) { mError = gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_ENOENT ); // what else? @@ -112,7 +112,7 @@ void Kleo::QGpgMESecretKeyExportJob::slotCancel() { mError = gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_CANCELED ); } -void Kleo::QGpgMESecretKeyExportJob::slotqStatus( GnuPGProcessBase * proc, const TQString & type, const TQStringList & args ) { +void Kleo::QGpgMESecretKeyExportJob::sloStatus( GnuPGProcessBase * proc, const TQString & type, const TQStringList & args ) { if ( proc != mProcess ) return; TQStringList::const_iterator it = args.begin(); diff --git a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h index aae3fd222..0c775a015 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h @@ -68,7 +68,7 @@ namespace Kleo { /*! \reimp from Job */ void slotCancel(); - void slotqStatus( Kleo::GnuPGProcessBase *, const TQString &, const TQStringList & ); + void sloStatus( Kleo::GnuPGProcessBase *, const TQString &, const TQStringList & ); void slotStdout( KProcess *, char *, int ); void slotStderr( KProcess *, char *, int ); void slotProcessExited( KProcess * ); diff --git a/certmanager/lib/cryptplug.cpp b/certmanager/lib/cryptplug.cpp index 53865edf4..77a914514 100644 --- a/certmanager/lib/cryptplug.cpp +++ b/certmanager/lib/cryptplug.cpp @@ -789,7 +789,7 @@ sig_status_to_string( gpgme_sig_stat_t status ) // gpgme 0.3 version below, too! static void obtain_signature_information( gpgme_ctx_t ctx, - gpgme_sig_stat_t & overalltqStatus, + gpgme_sig_stat_t & overallStatus, struct CryptPlug::SignatureMetaData* sigmeta, char** attrOrder, const char* unknownAttrsHandling, @@ -952,11 +952,11 @@ void obtain_signature_information( gpgme_ctx_t ctx, storeNewCharPtr( &this_info.status_text, sig_status ); } sigmeta->extended_info_count = sig_idx; - overalltqStatus = intersect_stati( result->signatures ); - sigmeta->status_code = overalltqStatus; - storeNewCharPtr( &sigmeta->status, sig_status_to_string( overalltqStatus ) ); + overallStatus = intersect_stati( result->signatures ); + sigmeta->status_code = overallStatus; + storeNewCharPtr( &sigmeta->status, sig_status_to_string( overallStatus ) ); if ( signatureFound ) - *signatureFound = ( overalltqStatus != GPGME_SIG_STAT_NONE ); + *signatureFound = ( overallStatus != GPGME_SIG_STAT_NONE ); } bool CryptPlug::checkMessageSignature( char** cleartext, diff --git a/certmanager/lib/cryptplugwrapper.cpp b/certmanager/lib/cryptplugwrapper.cpp index 4ffc59c91..3bce3d136 100644 --- a/certmanager/lib/cryptplugwrapper.cpp +++ b/certmanager/lib/cryptplugwrapper.cpp @@ -424,7 +424,7 @@ CryptPlugWrapper::CryptPlugWrapper( const TQString& name, _libName( libName ), _updateURL( update ), _active( active ), - _initqStatus( IniStatus_undef ), + _iniStatus( IniStatus_undef ), _cp( 0 ), _config( 0 ), _cryptoConfig( 0 ) @@ -492,15 +492,15 @@ TQString CryptPlugWrapper::displayName() const return i18n("(Unknown Protocol)"); } -bool CryptPlugWrapper::initialize( InitqStatus* initqStatus, TQString* errorMsg ) +bool CryptPlugWrapper::initialize( IniStatus* iniStatus, TQString* errorMsg ) { if ( _cp ) return true; - _initqStatus = IniStatus_undef; + _iniStatus = IniStatus_undef; /* make sure we have a lib name */ if ( _libName.isEmpty() ) { - _initqStatus = IniStatus_NoLibName; + _iniStatus = IniStatus_NoLibName; kdDebug(5150) << "No library name was given.\n" << endl; } else { if ( _libName.contains( "smime" ) ) { @@ -515,12 +515,12 @@ bool CryptPlugWrapper::initialize( InitqStatus* initqStatus, TQString* errorMsg } if ( !_cp ) { - _initqStatus = IniStatus_LoadError; + _iniStatus = IniStatus_LoadError; kdDebug(5150) << "Couldn't create '" << _libName.latin1() << "'" << endl; } else { /* now call the init function */ if( !_cp->initialize() ) { - _initqStatus = IniStatus_InitError; + _iniStatus = IniStatus_InitError; kdDebug(5150) << "Error while executing function 'initialize' on plugin " << _libName << endl; _lastError = i18n("Error while initializing plugin \"%1\"").tqarg( _libName ); if ( errorMsg ) @@ -528,13 +528,13 @@ bool CryptPlugWrapper::initialize( InitqStatus* initqStatus, TQString* errorMsg delete _cp; _cp = 0; delete _config; _config = 0; } else { - _initqStatus = IniStatus_Ok; + _iniStatus = IniStatus_Ok; } } } - if( initqStatus ) - *initqStatus = _initqStatus; - return _initqStatus == IniStatus_Ok; + if( iniStatus ) + *iniStatus = _iniStatus; + return _iniStatus == IniStatus_Ok; } @@ -547,11 +547,11 @@ void CryptPlugWrapper::deinitialize() } -CryptPlugWrapper::InitqStatus CryptPlugWrapper::initqStatus( TQString* errorMsg ) const +CryptPlugWrapper::IniStatus CryptPlugWrapper::iniStatus( TQString* errorMsg ) const { if( errorMsg ) *errorMsg = _lastError; - return _initqStatus; + return _iniStatus; } diff --git a/certmanager/lib/cryptplugwrapper.h b/certmanager/lib/cryptplugwrapper.h index 2275f3756..bf1976700 100644 --- a/certmanager/lib/cryptplugwrapper.h +++ b/certmanager/lib/cryptplugwrapper.h @@ -462,7 +462,7 @@ public: If initialize was not called before return value will be \c CryptPlugInit_undef. - \sa initqStatus, initialize + \sa iniStatus, initialize */ typedef enum { IniStatus_undef = 0, @@ -471,7 +471,7 @@ public: IniStatus_NoLibName = 2, IniStatus_LoadError = 0x1000, IniStatus_InitError = 0x2000 - } InitqStatus; + } IniStatus; /*! \ingroup groupSignAct \brief Flags used to compose the SigStatusFlags value. @@ -543,7 +543,7 @@ public: or not. \sa ~CryptPlugWrapper, setActive, active, initialize, deinitialize - \sa initqStatus + \sa iniStatus */ CryptPlugWrapper( const TQString& name=TQString(), const TQString& libName=TQString(), @@ -582,7 +582,7 @@ public: structures - if just prevents the normal functions from being called erroneously. When deactivated only the following functions are operational: constructor , destructor , - setActive , active, setLibName , libName , initqStatus; + setActive , active, setLibName , libName , iniStatus; calling other functions will be ignored and their return values will be undefined. @@ -590,7 +590,7 @@ public: or not. \sa active, CryptPlugWrapper(), ~CryptPlugWrapper - \sa deinitialize, initialize, initqStatus + \sa deinitialize, initialize, iniStatus */ void setActive( bool active ); @@ -613,7 +613,7 @@ public: This name may be set in the constructor or by calling setLibName(). \note Setting/changing the library name may only be done when - the initqStatus() is <b>not</b> \c IniStatus_Ok. + the iniStatus() is <b>not</b> \c IniStatus_Ok. If you want to change the name of the library after successfully having called initialize() please make sure to unload it by calling the deinitialize() function. @@ -626,7 +626,7 @@ public: above 'note'. \sa libName, CryptPlugWrapper(), ~CryptPlugWrapper - \sa deinitialize, initialize, initqStatus + \sa deinitialize, initialize, iniStatus */ bool setLibName( const TQString& libName ); @@ -666,13 +666,13 @@ private: undefined in this case, this rule does not apply to the functions \c setActive() and \c setLibName(). - \param initqStatus will receive the resulting InitqStatus if not NULL + \param iniStatus will receive the resulting IniStatus if not NULL \param errorMsg will receive the system error message if not NULL - \sa initqStatus, deinitialize, CryptPlugWrapper(), ~CryptPlugWrapper + \sa iniStatus, deinitialize, CryptPlugWrapper(), ~CryptPlugWrapper \sa setActive, active */ - bool initialize( InitqStatus* initqStatus, TQString* errorMsg ); + bool initialize( IniStatus* iniStatus, TQString* errorMsg ); public: /*! \ingroup groupGeneral @@ -681,10 +681,10 @@ public: After this function has been called, no other plugin functions should be called; the behavior is undefined in this case. - \note Deinitializing sets the internal initqStatus value back + \note Deinitializing sets the internal iniStatus value back to \c IniStatus_undef. - \sa initqStatus, initialize, CryptPlugWrapper, ~CryptPlugWrapper + \sa iniStatus, initialize, CryptPlugWrapper, ~CryptPlugWrapper \sa setActive, active */ void deinitialize(); @@ -693,7 +693,7 @@ public: \brief Returns this CRYPTPLUG wrapper's initialization state. \param errorMsg receives the last system error message, this value - should be ignored if InitqStatus value equals \c IniStatus_Ok. + should be ignored if IniStatus value equals \c IniStatus_Ok. \return whether the relative library was loaded and initialized correctly @@ -701,7 +701,7 @@ public: \sa initialize, deinitialize, CryptPlugWrapper(), ~CryptPlugWrapper \sa setActive, active */ - InitqStatus initqStatus( TQString* errorMsg ) const; + IniStatus iniStatus( TQString* errorMsg ) const; /*! \ingroup groupGeneral @@ -714,7 +714,7 @@ public: however. \note In case this function cannot be executed the system's error - message may be retrieved by calling initqStatus( TQString* ). + message may be retrieved by calling iniStatus( TQString* ). \return whether the relative feature is implemented or not */ @@ -824,7 +824,7 @@ private: TQString _libName; TQString _updateURL; bool _active; - InitqStatus _initqStatus; + IniStatus _iniStatus; TQString _lastError; CryptPlug* _cp; // local parameters without representation in cryptplug.h diff --git a/certmanager/lib/tests/gnupgviewer.h b/certmanager/lib/tests/gnupgviewer.h index bc589ec48..8f1a65229 100644 --- a/certmanager/lib/tests/gnupgviewer.h +++ b/certmanager/lib/tests/gnupgviewer.h @@ -54,12 +54,12 @@ public: private slots: void slotStdout( KProcess *, char *, int ); void slotStderr( KProcess *, char *, int ); - void slotqStatus( Kleo::GnuPGProcessBase *, const TQString &, const TQStringList & ); + void sloStatus( Kleo::GnuPGProcessBase *, const TQString &, const TQStringList & ); void slotProcessExited( KProcess * ); private: Kleo::GnuPGProcessBase * mProcess; - TQString mLastStdout, mLastStderr, mLastqStatus; + TQString mLastStdout, mLastStderr, mLasStatus; }; #endif // __KLEO_TESTS_GNUPGVIEWER_H__ diff --git a/certmanager/lib/tests/test_gnupgprocessbase.cpp b/certmanager/lib/tests/test_gnupgprocessbase.cpp index de3a4ff06..6e6bf7c80 100644 --- a/certmanager/lib/tests/test_gnupgprocessbase.cpp +++ b/certmanager/lib/tests/test_gnupgprocessbase.cpp @@ -69,7 +69,7 @@ void GnuPGViewer::setProcess( Kleo::GnuPGProcessBase * process ) { connect( mProcess, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)), TQT_SLOT(slotStderr(KProcess*,char*,int)) ); connect( mProcess, TQT_SIGNAL(status(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)), - TQT_SLOT(slotqStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) ); + TQT_SLOT(sloStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) ); } static TQStringList split( char * buffer, int buflen, TQString & old ) { @@ -102,14 +102,14 @@ void GnuPGViewer::slotStderr( KProcess *, char * buffer, int buflen ) { for ( TQStringList::const_iterator it = l.begin() ; it != l.end() ; ++it ) append( "<b>stderr: " + escape( *it ) + "</b>" ); } -void GnuPGViewer::slotqStatus( Kleo::GnuPGProcessBase *, const TQString & type, const TQStringList & args ) { +void GnuPGViewer::sloStatus( Kleo::GnuPGProcessBase *, const TQString & type, const TQStringList & args ) { append( "<b><font color=\"red\">status: " + escape( type + ' ' + args.join( " " ) ) + "</font></b>" ); } void GnuPGViewer::slotProcessExited( KProcess * proc ) { if ( !proc ) return; if ( proc->normalExit() ) - append( TQString( "<b>Process exit: return code %1</b>" ).arg ( proc->exitqStatus() ) ); + append( TQString( "<b>Process exit: return code %1</b>" ).arg ( proc->exiStatus() ) ); else append( "<b>Process exit: killed</b>" ); } diff --git a/certmanager/lib/ui/adddirectoryservicedialog.ui b/certmanager/lib/ui/adddirectoryservicedialog.ui index fc6f07a2e..30b89d2d8 100644 --- a/certmanager/lib/ui/adddirectoryservicedialog.ui +++ b/certmanager/lib/ui/adddirectoryservicedialog.ui @@ -75,7 +75,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>60</height> @@ -136,7 +136,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>260</width> <height>21</height> diff --git a/certmanager/lib/ui/backendconfigwidget.cpp b/certmanager/lib/ui/backendconfigwidget.cpp index 1052cff52..1207ed0f0 100644 --- a/certmanager/lib/ui/backendconfigwidget.cpp +++ b/certmanager/lib/ui/backendconfigwidget.cpp @@ -144,7 +144,7 @@ private: // First one is the generic name (find a nice one for OpenPGP, SMIME) const TQString protoName = qstricmp( protocolName, "openpgp" ) != 0 ? qstricmp( protocolName, "smime" ) != 0 - ? TQString::tqfromLatin1( protocolName ) + ? TQString::fromLatin1( protocolName ) : i18n( "S/MIME" ) : i18n( "OpenPGP" ); // second one is implementation name (gpg, gpgsm...) diff --git a/certmanager/lib/ui/cryptoconfigmodule.cpp b/certmanager/lib/ui/cryptoconfigmodule.cpp index a16dcd22e..c7604e84e 100644 --- a/certmanager/lib/ui/cryptoconfigmodule.cpp +++ b/certmanager/lib/ui/cryptoconfigmodule.cpp @@ -122,10 +122,10 @@ Kleo::CryptoConfigModule::CryptoConfigModule( Kleo::CryptoConfig* config, TQWidg dialogHeight = 500; else // small (800x600, 640x480) desktop dialogHeight = 400; - TQSize sz = scrollView->tqsizeHint(); + TQSize sz = scrollView->sizeHint(); scrollView->setMinimumSize( sz.width() - + scrollView->tqstyle().tqpixelMetric(TQStyle::PM_ScrollBarExtent), - TQMIN( compGUI->tqsizeHint().height(), dialogHeight ) ); + + scrollView->tqstyle().pixelMetric(TQStyle::PM_ScrollBarExtent), + TQMIN( compGUI->sizeHint().height(), dialogHeight ) ); } if ( mComponentGUIs.empty() ) { Q_ASSERT( face() == Plain ); @@ -136,7 +136,7 @@ Kleo::CryptoConfigModule::CryptoConfigModule( Kleo::CryptoConfig* config, TQWidg "information.") .tqarg( components.empty() ? "gpgconf --list-components" : "gpgconf --list-options gpg" ); TQLabel * label = new TQLabel( msg, vbox ); - label->tqsetAlignment( TQt::WordBreak ); + label->setAlignment( TQt::WordBreak ); label->setMinimumHeight( fontMetrics().lineSpacing() * 5 ); } } diff --git a/certmanager/lib/ui/directoryserviceswidget.cpp b/certmanager/lib/ui/directoryserviceswidget.cpp index 4975e3818..7c576aa86 100644 --- a/certmanager/lib/ui/directoryserviceswidget.cpp +++ b/certmanager/lib/ui/directoryserviceswidget.cpp @@ -63,7 +63,7 @@ public: void setPassword( const TQString& pass ) { mPassword = pass; - setText( 4, pass.isEmpty() ? TQString() : TQString::tqfromLatin1( "******" ) ); + setText( 4, pass.isEmpty() ? TQString() : TQString::fromLatin1( "******" ) ); } const TQString& password() const { return mPassword; } diff --git a/certmanager/lib/ui/directoryserviceswidgetbase.ui b/certmanager/lib/ui/directoryserviceswidgetbase.ui index 59a014618..016712ebd 100644 --- a/certmanager/lib/ui/directoryserviceswidgetbase.ui +++ b/certmanager/lib/ui/directoryserviceswidgetbase.ui @@ -158,7 +158,7 @@ If you do not use a directory service, you can still use local certificates. <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>51</height> @@ -187,7 +187,7 @@ If you do not use a directory service, you can still use local certificates. <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>47</width> <height>20</height> @@ -221,7 +221,7 @@ By clicking this button, you can select a new directory service to be used for r <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>47</width> <height>20</height> @@ -258,7 +258,7 @@ By clicking this button, you can remove the currently selected directory service <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>47</width> <height>20</height> @@ -277,7 +277,7 @@ By clicking this button, you can remove the currently selected directory service <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> diff --git a/certmanager/lib/ui/dnattributeorderconfigwidget.cpp b/certmanager/lib/ui/dnattributeorderconfigwidget.cpp index a4fc7d9a1..4cfcfb20a 100644 --- a/certmanager/lib/ui/dnattributeorderconfigwidget.cpp +++ b/certmanager/lib/ui/dnattributeorderconfigwidget.cpp @@ -115,7 +115,7 @@ Kleo::DNAttributeOrderConfigWidget::DNAttributeOrderConfigWidget( DNAttributeMap // the up/down/left/right arrow cross: TQGridLayout * xlay = new TQGridLayout( 5, 3, 0, "xlay" ); - xlay->tqsetAlignment( AlignCenter ); + xlay->setAlignment( AlignCenter ); static const struct { const char * icon; diff --git a/certmanager/lib/ui/kdhorizontalline.cpp b/certmanager/lib/ui/kdhorizontalline.cpp index d736399f8..07dc7ef89 100644 --- a/certmanager/lib/ui/kdhorizontalline.cpp +++ b/certmanager/lib/ui/kdhorizontalline.cpp @@ -97,7 +97,7 @@ void KDHorizontalLine::calculateFrame() { qDebug( "mLenVisible = %d (of %d)", mLenVisible, mTitle.length() ); if ( mLenVisible ) { // but do we also have a visible label? TQRect r = rect(); - const int va = tqstyle().tqstyleHint( TQStyle::SH_GroupBox_TextLabelVerticalAlignment, this ); + const int va = tqstyle().styleHint( TQStyle::SH_GroupBox_TextLabelVerticalAlignment, this ); if( va & AlignVCenter ) r.setTop( fm.height() / 2 ); // frame rect should be else if( va & AlignTop ) @@ -115,11 +115,11 @@ TQSizePolicy KDHorizontalLine::sizePolicy() const { return TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ); } -TQSize KDHorizontalLine::tqsizeHint() const { - return tqminimumSizeHint(); +TQSize KDHorizontalLine::sizeHint() const { + return minimumSizeHint(); } -TQSize KDHorizontalLine::tqminimumSizeHint() const { +TQSize KDHorizontalLine::minimumSizeHint() const { const int w = fontMetrics().width( mTitle, mLenVisible ) + fontMetrics().width( TQChar( ' ' ) ); const int h = fontMetrics().height(); @@ -147,13 +147,13 @@ void KDHorizontalLine::paintEvent( TQPaintEvent * e ) { x = 0; } TQRect r( x, 0, tw, h ); - int va = tqstyle().tqstyleHint( TQStyle::SH_GroupBox_TextLabelVerticalAlignment, this ); + int va = tqstyle().styleHint( TQStyle::SH_GroupBox_TextLabelVerticalAlignment, this ); if ( va & AlignTop ) r.moveBy( 0, fm.descent() ); - const TQColor pen( (TQRgb) tqstyle().tqstyleHint( TQStyle::SH_GroupBox_TextLabelColor, this ) ); - if ( !tqstyle().tqstyleHint( TQStyle::SH_UnderlineAccelerator, this ) ) + const TQColor pen( (TQRgb) tqstyle().styleHint( TQStyle::SH_GroupBox_TextLabelColor, this ) ); + if ( !tqstyle().styleHint( TQStyle::SH_UnderlineAccelerator, this ) ) va |= NoAccel; - tqstyle().drawItem( &paint, r, ShowPrefix | AlignHCenter | va, tqcolorGroup(), + tqstyle().drawItem( &paint, r, ShowPrefix | AlignHCenter | va, colorGroup(), isEnabled(), 0, mTitle, -1, ownPalette() ? 0 : &pen ); paint.setClipRegion( e->region().subtract( r ) ); // clip everything but title } diff --git a/certmanager/lib/ui/kdhorizontalline.h b/certmanager/lib/ui/kdhorizontalline.h index 466b54bca..c62a18ddf 100644 --- a/certmanager/lib/ui/kdhorizontalline.h +++ b/certmanager/lib/ui/kdhorizontalline.h @@ -58,8 +58,8 @@ public: /*! \reimp to hard-code the frame tqshape */ void setFrameStyle( int style ); - TQSize tqsizeHint() const; - TQSize tqminimumSizeHint() const; + TQSize sizeHint() const; + TQSize minimumSizeHint() const; TQSizePolicy sizePolicy() const; static int indentHint(); diff --git a/certmanager/lib/ui/keyapprovaldialog.cpp b/certmanager/lib/ui/keyapprovaldialog.cpp index afad1fb8e..3933b0a5e 100644 --- a/certmanager/lib/ui/keyapprovaldialog.cpp +++ b/certmanager/lib/ui/keyapprovaldialog.cpp @@ -170,8 +170,8 @@ Kleo::KeyApprovalDialog::KeyApprovalDialog( const std::vector<Item> & recipients // calculate the optimal width for the dialog const int dialogWidth = marginHint() + sv->frameWidth() - + view->tqsizeHint().width() - + sv->verticalScrollBar()->tqsizeHint().width() + + view->sizeHint().width() + + sv->verticalScrollBar()->sizeHint().width() + sv->frameWidth() + marginHint() + 2; @@ -180,11 +180,11 @@ Kleo::KeyApprovalDialog::KeyApprovalDialog( const std::vector<Item> & recipients + fontMetrics().height() + spacingHint() + sv->frameWidth() - + view->tqsizeHint().height() - + sv->horizontalScrollBar()->tqsizeHint().height() + + view->sizeHint().height() + + sv->horizontalScrollBar()->sizeHint().height() + sv->frameWidth() + spacingHint() - + actionButton( KDialogBase::Cancel )->tqsizeHint().height() + + actionButton( KDialogBase::Cancel )->sizeHint().height() + marginHint() + 2; diff --git a/certmanager/lib/ui/keylistview.cpp b/certmanager/lib/ui/keylistview.cpp index 32d5be217..075833b21 100644 --- a/certmanager/lib/ui/keylistview.cpp +++ b/certmanager/lib/ui/keylistview.cpp @@ -81,8 +81,8 @@ namespace { if ( !item ) return; - const TQRect tqitemRect = mKeyListView->tqitemRect( item ); - if ( !tqitemRect.isValid() ) + const TQRect itemRect = mKeyListView->itemRect( item ); + if ( !itemRect.isValid() ) return; const int col = mKeyListView->header()->sectionAt( p.x() ); @@ -93,8 +93,8 @@ namespace { if ( !headerRect.isValid() ) return; - const TQRect cellRect( headerRect.left(), tqitemRect.top(), - headerRect.width(), tqitemRect.height() ); + const TQRect cellRect( headerRect.left(), itemRect.top(), + headerRect.width(), itemRect.height() ); TQString tipStr; if ( const Kleo::KeyListViewItem * klvi = Kleo::lvi_cast<Kleo::KeyListViewItem>( item ) ) diff --git a/certmanager/lib/ui/keyrequester.cpp b/certmanager/lib/ui/keyrequester.cpp index ebde2c163..3c1e264cd 100644 --- a/certmanager/lib/ui/keyrequester.cpp +++ b/certmanager/lib/ui/keyrequester.cpp @@ -117,7 +117,7 @@ void Kleo::KeyRequester::init() // the button to unset any key: mEraseButton = new KPushButton( this ); mEraseButton->setAutoDefault( false ); - mEraseButton->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, + mEraseButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) ); mEraseButton->setIconSet( SmallIconSet( TQApplication::reverseLayout() ? "locationbar_erase" : "clear_left" ) ); TQToolTip::add( mEraseButton, i18n("Clear") ); @@ -133,7 +133,7 @@ void Kleo::KeyRequester::init() connect( mEraseButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotEraseButtonClicked()) ); connect( mDialogButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotDialogButtonClicked()) ); - tqsetSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, + setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed ) ); setAllowedKeys( mKeyUsage ); diff --git a/certmanager/lib/ui/keyselectiondialog.cpp b/certmanager/lib/ui/keyselectiondialog.cpp index f017f2024..b05d9ea28 100644 --- a/certmanager/lib/ui/keyselectiondialog.cpp +++ b/certmanager/lib/ui/keyselectiondialog.cpp @@ -250,7 +250,7 @@ namespace { "Fingerprint: %4" ) .tqarg( uid ? TQString::fromUtf8( uid ) : i18n("unknown"), creation, expiry, - fpr ? TQString::tqfromLatin1( fpr ) : i18n("unknown") ); + fpr ? TQString::fromLatin1( fpr ) : i18n("unknown") ); else return i18n( "S/MIME key for %1\n" "Created: %2\n" @@ -259,7 +259,7 @@ namespace { "Issuer: %5" ) .tqarg( uid ? Kleo::DN( uid ).prettyDN() : i18n("unknown"), creation, expiry, - fpr ? TQString::tqfromLatin1( fpr ) : i18n("unknown") ) + fpr ? TQString::fromLatin1( fpr ) : i18n("unknown") ) .tqarg( issuer ? Kleo::DN( issuer ).prettyDN() : i18n("unknown") ); } @@ -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->tqsetAlignment( textLabel->tqalignment() | TQt::WordBreak ); + textLabel->setAlignment( textLabel->tqalignment() | TQt::WordBreak ); mTopLayout->addWidget( textLabel ); } else { KActiveLabel *textLabel = new KActiveLabel( text, page ); - textLabel->tqsetAlignment( textLabel->tqalignment() | TQt::WordBreak ); + textLabel->setAlignment( textLabel->tqalignment() | TQt::WordBreak ); mTopLayout->addWidget( textLabel ); } } diff --git a/kabc/frontend/mainWindow.ui b/kabc/frontend/mainWindow.ui index 6744c23a9..6d7be869e 100644 --- a/kabc/frontend/mainWindow.ui +++ b/kabc/frontend/mainWindow.ui @@ -277,7 +277,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -540,7 +540,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -867,7 +867,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -1011,7 +1011,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kaddressbook/addresseditwidget.cpp b/kaddressbook/addresseditwidget.cpp index cc71bd4f9..32ecdc9a7 100644 --- a/kaddressbook/addresseditwidget.cpp +++ b/kaddressbook/addresseditwidget.cpp @@ -93,7 +93,7 @@ AddressEditWidget::AddressEditWidget( TQWidget *parent, const char *name ) mAddressField = new KActiveLabel( this ); mAddressField->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); mAddressField->setMinimumHeight( 20 ); - mAddressField->tqsetAlignment( TQt::AlignTop ); + mAddressField->setAlignment( TQt::AlignTop ); mAddressField->setTextFormat( TQt::PlainText ); tqlayout->addWidget( mAddressField ); @@ -274,7 +274,7 @@ AddressEditDialog::AddressEditDialog( const KABC::Address::List &list, topLayout->addMultiCellWidget( mTypeCombo, 0, 0, 0, 1 ); TQLabel *label = new TQLabel( i18n( "<streetLabel>:", "%1:" ).tqarg( KABC::Address::streetLabel() ), page ); - label->tqsetAlignment( TQt::AlignTop | TQt::AlignLeft ); + label->setAlignment( TQt::AlignTop | TQt::AlignLeft ); topLayout->addWidget( label, 1, 0 ); mStreetTextEdit = new TQTextEdit( page ); mStreetTextEdit->setTextFormat( TQt::PlainText ); diff --git a/kaddressbook/addresseeeditorwidget.cpp b/kaddressbook/addresseeeditorwidget.cpp index 6d2e2ea8b..658f90e0e 100644 --- a/kaddressbook/addresseeeditorwidget.cpp +++ b/kaddressbook/addresseeeditorwidget.cpp @@ -430,11 +430,11 @@ void AddresseeEditorWidget::setupTab2() ////////////////////////////////////// // Notes label = new TQLabel( i18n( "Note:" ), tab2 ); - label->tqsetAlignment( TQt::AlignTop | TQt::AlignLeft ); + label->setAlignment( TQt::AlignTop | TQt::AlignLeft ); tqlayout->addWidget( label, 7, 0 ); mNoteEdit = new TQTextEdit( tab2 ); mNoteEdit->setWordWrap( TQTextEdit::WidgetWidth ); - mNoteEdit->setMinimumSize( mNoteEdit->tqsizeHint() ); + mNoteEdit->setMinimumSize( mNoteEdit->sizeHint() ); connect( mNoteEdit, TQT_SIGNAL( textChanged() ), TQT_SLOT( emitModified() ) ); label->setBuddy( mNoteEdit ); tqlayout->addMultiCellWidget( mNoteEdit, 7, 7, 1, 5 ); diff --git a/kaddressbook/addviewdialog.cpp b/kaddressbook/addviewdialog.cpp index d63a33fab..b9f89249a 100644 --- a/kaddressbook/addviewdialog.cpp +++ b/kaddressbook/addviewdialog.cpp @@ -69,7 +69,7 @@ AddViewDialog::AddViewDialog( TQDict<ViewFactory> *viewFactoryDict, TQRadioButton *button = new TQRadioButton( i18n((*iter)->type().utf8()), mTypeGroup, (*iter)->type().latin1() ); label = new TQLabel( (*iter)->description(), mTypeGroup ); - label->tqsetAlignment( TQt::WordBreak ); + label->setAlignment( TQt::WordBreak ); groupLayout->addWidget( button, row, 0, TQt::AlignTop ); groupLayout->addWidget( label, row, 1, TQt::AlignTop ); diff --git a/kaddressbook/common/kabprefs.h b/kaddressbook/common/kabprefs.h index 35abdd04b..c0c92bdcc 100644 --- a/kaddressbook/common/kabprefs.h +++ b/kaddressbook/common/kabprefs.h @@ -42,7 +42,7 @@ class KDE_EXPORT KABPrefs : public KABPrefsBase void setLocationMapURL( const TQString &locationMapURL ) { - if ( !isImmutable( TQString::tqfromLatin1( "LocationMapURL" ) ) ) + if ( !isImmutable( TQString::fromLatin1( "LocationMapURL" ) ) ) mLocationMapURL = locationMapURL; } @@ -53,7 +53,7 @@ class KDE_EXPORT KABPrefs : public KABPrefsBase void setLocationMapURLs( const TQStringList &locationMapURLs ) { - if ( !isImmutable( TQString::tqfromLatin1( "LocationMapURLs" ) ) ) + if ( !isImmutable( TQString::fromLatin1( "LocationMapURLs" ) ) ) mLocationMapURLs = locationMapURLs; } diff --git a/kaddressbook/customfieldswidget.cpp b/kaddressbook/customfieldswidget.cpp index 1466e9900..752fd6cc8 100644 --- a/kaddressbook/customfieldswidget.cpp +++ b/kaddressbook/customfieldswidget.cpp @@ -128,7 +128,7 @@ FieldWidget::FieldWidget( TQWidget *parent, const char *name ) KDialog::spacingHint() ); mGlobalLayout = new TQVBoxLayout( tqlayout, KDialog::spacingHint() ); - mGlobalLayout->tqsetAlignment( TQt::AlignTop ); + mGlobalLayout->setAlignment( TQt::AlignTop ); mSeparator = new TQFrame( this ); mSeparator->setFrameStyle( TQFrame::HLine | TQFrame::Sunken ); @@ -136,7 +136,7 @@ FieldWidget::FieldWidget( TQWidget *parent, const char *name ) tqlayout->addWidget( mSeparator ); mLocalLayout = new TQVBoxLayout( tqlayout, KDialog::spacingHint() ); - mLocalLayout->tqsetAlignment( TQt::AlignTop ); + mLocalLayout->setAlignment( TQt::AlignTop ); } void FieldWidget::addField( const TQString &identifier, const TQString &title, @@ -238,13 +238,13 @@ void FieldWidget::clearFields() wdg->setChecked( true ); } else if ( (*fieldIt).mWidget->isA( TQDATEEDIT_OBJECT_NAME_STRING ) ) { TQDateEdit *wdg = static_cast<TQDateEdit*>( (*fieldIt).mWidget ); - wdg->setDate( TQDate::tqcurrentDate() ); + wdg->setDate( TQDate::currentDate() ); } else if ( (*fieldIt).mWidget->isA( TQTIMEEDIT_OBJECT_NAME_STRING ) ) { TQTimeEdit *wdg = static_cast<TQTimeEdit*>( (*fieldIt).mWidget ); wdg->setTime( TQTime::currentTime() ); } else if ( (*fieldIt).mWidget->isA( TQDATETIMEEDIT_OBJECT_NAME_STRING ) ) { TQDateTimeEdit *wdg = static_cast<TQDateTimeEdit*>( (*fieldIt).mWidget ); - wdg->setDateTime( TQDateTime::tqcurrentDateTime() ); + wdg->setDateTime( TQDateTime::currentDateTime() ); } } } @@ -370,7 +370,7 @@ void FieldWidget::recalculateLayout() FieldRecordList::ConstIterator it; for ( it = mFieldList.begin(); it != mFieldList.end(); ++it ) - maxWidth = TQMAX( maxWidth, (*it).mLabel->tqminimumSizeHint().width() ); + maxWidth = TQMAX( maxWidth, (*it).mLabel->minimumSizeHint().width() ); for ( it = mFieldList.begin(); it != mFieldList.end(); ++it ) (*it).mLabel->setMinimumWidth( maxWidth ); diff --git a/kaddressbook/distributionlisteditor.cpp b/kaddressbook/distributionlisteditor.cpp index 9a06fb399..6d1f65650 100644 --- a/kaddressbook/distributionlisteditor.cpp +++ b/kaddressbook/distributionlisteditor.cpp @@ -188,7 +188,7 @@ KPIM::DistributionListEditor::EditorWidget::EditorWidget( KABC::AddressBook* boo d->scrollView->setFrameShape( TQFrame::NoFrame ); mainLayout->addWidget( d->scrollView ); d->memberListWidget = new TQWidget( d->scrollView->viewport() ); - d->memberListWidget->tqsetSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding ); + d->memberListWidget->setSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding ); TQVBoxLayout* memberLayout = new TQVBoxLayout( d->memberListWidget ); d->addresseeLayout = new TQVBoxLayout; d->addresseeLayout->setSpacing( KDialog::spacingHint() ); @@ -200,7 +200,7 @@ KPIM::DistributionListEditor::EditorWidget::EditorWidget( KABC::AddressBook* boo setMainWidget( main ); KPIM::DistributionListEditor::Line* const last = d->addLineForEntry( KPIM::DistributionList::Entry() ); - const TQSize hint = tqsizeHint(); + const TQSize hint = sizeHint(); resize( hint.width() * 3L/2, hint.height() ); } diff --git a/kaddressbook/distributionlistentryview.cpp b/kaddressbook/distributionlistentryview.cpp index ef0fe9bbc..f87ff133a 100644 --- a/kaddressbook/distributionlistentryview.cpp +++ b/kaddressbook/distributionlistentryview.cpp @@ -44,7 +44,7 @@ KAB::DistributionListEntryView::DistributionListEntryView( KAB::Core* core, TQWi TQLabel* distLabel = new TQLabel( this ); distLabel->setText( i18n( "<b>Distribution list:</b>" ) ); - distLabel->tqsetAlignment( TQt::SingleLine ); + distLabel->setAlignment( TQt::SingleLine ); distLayout->addWidget( distLabel ); m_distListLabel = new KURLLabel( this ); @@ -57,7 +57,7 @@ KAB::DistributionListEntryView::DistributionListEntryView( KAB::Core* core, TQWi TQLabel* emailLabel = new TQLabel( this ); emailLabel->setText( i18n( "<b>Email address to use in this list:</b>" ) ); - emailLabel->tqsetAlignment( TQt::SingleLine ); + emailLabel->setAlignment( TQt::SingleLine ); m_mainLayout->addWidget( emailLabel ); TQBoxLayout* emailLayout = new TQHBoxLayout; @@ -110,7 +110,7 @@ void KAB::DistributionListEntryView::setEntry( const KPIM::DistributionList& lis 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->tqsetAlignment( TQt::SingleLine ); + m_resourceLabel->setAlignment( TQt::SingleLine ); m_emailGroup = new TQVButtonGroup( this ); m_emailGroup->setFlat( true ); diff --git a/kaddressbook/editors/imeditorbase.ui b/kaddressbook/editors/imeditorbase.ui index 77d11794d..40270b504 100644 --- a/kaddressbook/editors/imeditorbase.ui +++ b/kaddressbook/editors/imeditorbase.ui @@ -37,7 +37,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -116,7 +116,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>28</height> diff --git a/kaddressbook/editors/imeditorwidget.cpp b/kaddressbook/editors/imeditorwidget.cpp index 533b7d4b7..9f468bfd6 100644 --- a/kaddressbook/editors/imeditorwidget.cpp +++ b/kaddressbook/editors/imeditorwidget.cpp @@ -167,7 +167,7 @@ IMEditorWidget::IMEditorWidget( TQWidget *parent, const TQString &preferredIM, c //mWidget->btnDown->setEnabled( false ); mPreferred = preferredIM; mPreferred = mPreferred.replace( " on ", TQString( TQChar( 0xE120 ) ), true ); - mProtocols = KPluginInfo::fromServices( KTrader::self()->query( TQString::tqfromLatin1( "KABC/IMProtocol" ) ) ); + mProtocols = KPluginInfo::fromServices( KTrader::self()->query( TQString::fromLatin1( "KABC/IMProtocol" ) ) ); // order the protocols by putting them in a qmap, then sorting the set of keys and recreating the list TQMap<TQString, KPluginInfo *> protocolMap; @@ -204,8 +204,8 @@ void IMEditorWidget::loadContact( KABC::Addressee *addr ) TQString app, name, value; splitField( *it, app, name, value ); - if ( app.startsWith( TQString::tqfromLatin1( "messaging/" ) ) ) { - if ( name == TQString::tqfromLatin1( "All" ) ) { + if ( app.startsWith( TQString::fromLatin1( "messaging/" ) ) ) { + if ( name == TQString::fromLatin1( "All" ) ) { KPluginInfo *protocol = protocolFromString( app ); if ( protocol ) { TQStringList addresses = TQStringList::split( TQChar( 0xE000 ), value ); @@ -244,9 +244,9 @@ void IMEditorWidget::storeContact( KABC::Addressee *addr ) TQString addrBookField = (*protocolIt)->property( "X-KDE-InstantMessagingKABCField" ).toString(); if ( !lst.isEmpty() ) - addr->insertCustom( addrBookField, TQString::tqfromLatin1( "All" ), lst.join( TQChar( 0xE000 ) ) ); + addr->insertCustom( addrBookField, TQString::fromLatin1( "All" ), lst.join( TQChar( 0xE000 ) ) ); else - addr->removeCustom( addrBookField, TQString::tqfromLatin1( "All" ) ); + addr->removeCustom( addrBookField, TQString::fromLatin1( "All" ) ); } } diff --git a/kaddressbook/emaileditwidget.cpp b/kaddressbook/emaileditwidget.cpp index 4ecee68a1..3ed79f49d 100644 --- a/kaddressbook/emaileditwidget.cpp +++ b/kaddressbook/emaileditwidget.cpp @@ -184,7 +184,7 @@ EmailEditDialog::EmailEditDialog( const TQStringList &list, TQWidget *parent, mEmailListBox = new TQListBox( page ); // Make sure there is room for the scrollbar - mEmailListBox->setMinimumHeight( mEmailListBox->tqsizeHint().height() + 30 ); + mEmailListBox->setMinimumHeight( mEmailListBox->sizeHint().height() + 30 ); connect( mEmailListBox, TQT_SIGNAL( highlighted( int ) ), TQT_SLOT( selectionChanged( int ) ) ); connect( mEmailListBox, TQT_SIGNAL( selected( int ) ), diff --git a/kaddressbook/features/distributionlistngwidget.cpp b/kaddressbook/features/distributionlistngwidget.cpp index 7e6034881..6b39414ec 100644 --- a/kaddressbook/features/distributionlistngwidget.cpp +++ b/kaddressbook/features/distributionlistngwidget.cpp @@ -56,7 +56,7 @@ void KAB::DistributionListNg::ListBox::dragMoveEvent( TQDragMoveEvent *event ) event->ignore(); } else { - event->accept( tqitemRect( item ) ); + event->accept( itemRect( item ) ); } } diff --git a/kaddressbook/geowidget.cpp b/kaddressbook/geowidget.cpp index 725dde3dc..427e33bd9 100644 --- a/kaddressbook/geowidget.cpp +++ b/kaddressbook/geowidget.cpp @@ -56,7 +56,7 @@ GeoWidget::GeoWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name label = new TQLabel( this ); label->setPixmap( KGlobal::iconLoader()->loadIcon( "package_network", KIcon::Desktop, KIcon::SizeMedium ) ); - label->tqsetAlignment( TQt::AlignTop ); + label->setAlignment( TQt::AlignTop ); topLayout->addMultiCellWidget( label, 0, 3, 0, 0 ); mGeoIsValid = new TQCheckBox( i18n( "Use geo data" ), this ); diff --git a/kaddressbook/incsearchwidget.cpp b/kaddressbook/incsearchwidget.cpp index aaad464f1..8509018a5 100644 --- a/kaddressbook/incsearchwidget.cpp +++ b/kaddressbook/incsearchwidget.cpp @@ -43,7 +43,7 @@ IncSearchWidget::IncSearchWidget( TQWidget *parent, const char *name ) TQHBoxLayout *tqlayout = new TQHBoxLayout( this, 2, KDialog::spacingHint() ); TQToolButton *button = new TQToolButton( this ); - button->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ); + button->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ); button->setPixmap( SmallIcon( TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase" ) ); button->setAccel( TQKeySequence( CTRL+ALT+Key_S ) ); button->setAutoRaise( true ); @@ -51,17 +51,17 @@ IncSearchWidget::IncSearchWidget( TQWidget *parent, const char *name ) tqlayout->addWidget( button ); TQLabel *label = new TQLabel( i18n( "Search:" ), this, "kde toolbar widget" ); - label->tqsetAlignment( TQLabel::AlignVCenter | TQLabel::AlignRight ); + label->setAlignment( TQLabel::AlignVCenter | TQLabel::AlignRight ); tqlayout->addWidget( label ); mSearchText = new KLineEdit( this ); - mSearchText->tqsetSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred ); + mSearchText->setSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred ); TQWhatsThis::add( mSearchText, i18n( "The incremental search<p>Enter some text here will start the search for the contact, which matches the search pattern best. The part of the contact, which will be used for matching, depends on the field selection." ) ); label->setBuddy( mSearchText ); tqlayout->addWidget( mSearchText ); label = new TQLabel( i18n( "as in 'Search in:'", "&in:" ), this, "kde toolbar widget" ); - label->tqsetAlignment( TQLabel::AlignVCenter | TQLabel::AlignRight ); + label->setAlignment( TQLabel::AlignVCenter | TQLabel::AlignRight ); tqlayout->addWidget( label ); mFieldCombo = new TQComboBox( false, this ); diff --git a/kaddressbook/jumpbuttonbar.cpp b/kaddressbook/jumpbuttonbar.cpp index 2b603fe23..11c9a9d1a 100644 --- a/kaddressbook/jumpbuttonbar.cpp +++ b/kaddressbook/jumpbuttonbar.cpp @@ -68,7 +68,7 @@ JumpButtonBar::JumpButtonBar( KAB::Core *core, TQWidget *parent, const char *nam setMinimumSize( 1, 1 ); TQVBoxLayout *tqlayout = new TQVBoxLayout( this, 0, 0 ); - tqlayout->tqsetAlignment( TQt::AlignTop ); + tqlayout->setAlignment( TQt::AlignTop ); tqlayout->setAutoAdd( true ); tqlayout->setResizeMode( TQLayout::FreeResize ); @@ -179,7 +179,7 @@ void JumpButtonBar::updateButtons() int maxWidth = 0; TQPushButton *button; for ( button = mButtons.first(); button; button = mButtons.next() ) - maxWidth = TQMAX( maxWidth, button->tqsizeHint().width() ); + maxWidth = TQMAX( maxWidth, button->sizeHint().width() ); setFixedWidth( maxWidth ); } diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index bb2408f79..bc9ee1b6f 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp @@ -433,7 +433,7 @@ void KABCore::setContactSelected( const TQString &uid ) TQClipboard *cb = TQApplication::tqclipboard(); #if defined(KABC_VCARD_ENCODING_FIX) const TQMimeSource *data = cb->data( TQClipboard::Clipboard ); - list = AddresseeUtil::clipboardToAddressees( data->tqencodedData( "text/x-vcard" ) ); + list = AddresseeUtil::clipboardToAddressees( data->encodedData( "text/x-vcard" ) ); #else list = AddresseeUtil::clipboardToAddressees( cb->text() ); #endif @@ -578,7 +578,7 @@ void KABCore::pasteContacts() TQClipboard *cb = TQApplication::tqclipboard(); #if defined(KABC_VCARD_ENCODING_FIX) const TQMimeSource *data = cb->data( TQClipboard::Clipboard ); - KABC::Addressee::List list = AddresseeUtil::clipboardToAddressees( data->tqencodedData( "text/x-vcard" ) ); + KABC::Addressee::List list = AddresseeUtil::clipboardToAddressees( data->encodedData( "text/x-vcard" ) ); #else KABC::Addressee::List list = AddresseeUtil::clipboardToAddressees( cb->text() ); #endif @@ -661,7 +661,7 @@ void KABCore::incrementalJumpButtonSearch( const TQString& character ) KABC::AddresseeList::ConstIterator it; const KABC::AddresseeList::ConstIterator endIt( list.end() ); for ( it = list.begin(); it != endIt; ++it ) { - if ( field->value( *it ).tqstartsWith( character, false ) ) { + if ( field->value( *it ).startsWith( character, false ) ) { mViewManager->setSelected( (*it).uid(), true ); return; } @@ -1224,7 +1224,7 @@ void KABCore::initGUI() viewLayout->setSpacing( KDialog::spacingHint() ); mViewHeaderLabel = new TQLabel( viewWidget ); -// mViewHeaderLabel->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ); +// mViewHeaderLabel->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ); mViewHeaderLabel->setText( i18n( "Contacts" ) ); viewLayout->addWidget( mViewHeaderLabel ); mViewManager = new ViewManager( this, viewWidget ); diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.cpp b/kaddressbook/kcmconfigs/kabconfigwidget.cpp index 6f99bbcde..c418f15ed 100644 --- a/kaddressbook/kcmconfigs/kabconfigwidget.cpp +++ b/kaddressbook/kcmconfigs/kabconfigwidget.cpp @@ -61,7 +61,7 @@ KABConfigWidget::KABConfigWidget( TQWidget *parent, const char *name ) TQGroupBox *groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "General" ), generalPage ); TQBoxLayout *boxLayout = new TQVBoxLayout( groupBox->tqlayout() ); - boxLayout->tqsetAlignment( TQt::AlignTop ); + boxLayout->setAlignment( TQt::AlignTop ); mViewsSingleClickBox = new TQCheckBox( i18n( "Honor KDE single click" ), groupBox, "msingle" ); boxLayout->addWidget( mViewsSingleClickBox ); @@ -128,10 +128,10 @@ KABConfigWidget::KABConfigWidget( TQWidget *parent, const char *name ) groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Location Map" ), generalPage ); boxLayout = new TQVBoxLayout( groupBox->tqlayout(), KDialog::spacingHint() ); - boxLayout->tqsetAlignment( TQt::AlignTop ); + boxLayout->setAlignment( TQt::AlignTop ); mLocationMapURL = new TQComboBox( true, groupBox ); - mLocationMapURL->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) ); + mLocationMapURL->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) ); TQToolTip::add( mLocationMapURL, i18n( "<ul> <li>%s: Street</li>" "<li>%r: Region</li>" "<li>%l: Location</li>" diff --git a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp index a091c0f0c..e1f47e3db 100644 --- a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp +++ b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp @@ -297,7 +297,7 @@ void LDAPOptionsWidget::initGUI() tqlayout->addWidget( buttons ); - resize( TQSize( 460, 300 ).expandedTo( tqsizeHint() ) ); + resize( TQSize( 460, 300 ).expandedTo( sizeHint() ) ); } #include "ldapoptionswidget.moc" diff --git a/kaddressbook/ldapsearchdialog.cpp b/kaddressbook/ldapsearchdialog.cpp index 4722feac7..7893477f6 100644 --- a/kaddressbook/ldapsearchdialog.cpp +++ b/kaddressbook/ldapsearchdialog.cpp @@ -176,10 +176,10 @@ LDAPSearchDialog::LDAPSearchDialog( KABC::AddressBook *ab, KABCore *core, TQSize buttonSize; mSearchButton = new TQPushButton( i18n( "Stop" ), groupBox ); - buttonSize = mSearchButton->tqsizeHint(); + buttonSize = mSearchButton->sizeHint(); mSearchButton->setText( i18n( "&Search" ) ); - if ( buttonSize.width() < mSearchButton->tqsizeHint().width() ) - buttonSize = mSearchButton->tqsizeHint(); + if ( buttonSize.width() < mSearchButton->sizeHint().width() ) + buttonSize = mSearchButton->sizeHint(); mSearchButton->setFixedWidth( buttonSize.width() ); mSearchButton->setDefault( true ); @@ -208,7 +208,7 @@ LDAPSearchDialog::LDAPSearchDialog( KABC::AddressBook *ab, KABCore *core, topLayout->addWidget( buttons ); - resize( TQSize( 600, 400).expandedTo( tqminimumSizeHint() ) ); + resize( TQSize( 600, 400).expandedTo( minimumSizeHint() ) ); setButtonText( User1, i18n( "Add Selected" ) ); @@ -560,7 +560,7 @@ KPIM::DistributionList LDAPSearchDialog::selectDistributionList() KABC::Addressee::List LDAPSearchDialog::importContactsUnlessTheyExist( const TQValueList<ContactListItem*>& selectedItems, KABC::Resource * const resource ) { - const TQDateTime now = TQDateTime::tqcurrentDateTime(); + const TQDateTime now = TQDateTime::currentDateTime(); TQStringList importedAddrs; KABC::Addressee::List localAddrs; diff --git a/kaddressbook/phoneeditwidget.cpp b/kaddressbook/phoneeditwidget.cpp index 5c5733142..47d8d506a 100644 --- a/kaddressbook/phoneeditwidget.cpp +++ b/kaddressbook/phoneeditwidget.cpp @@ -176,11 +176,11 @@ PhoneEditWidget::PhoneEditWidget( TQWidget *parent, const char *name ) tqlayout->addMultiCellLayout( mWidgetLayout, 0, 0, 0, 1 ); mAddButton = new TQPushButton( i18n( "Add" ), this ); - mAddButton->setMaximumSize( mAddButton->tqsizeHint() ); + mAddButton->setMaximumSize( mAddButton->sizeHint() ); tqlayout->addWidget( mAddButton, 1, 0, TQt::AlignRight ); mRemoveButton = new TQPushButton( i18n( "Remove" ), this ); - mRemoveButton->setMaximumSize( mRemoveButton->tqsizeHint() ); + mRemoveButton->setMaximumSize( mRemoveButton->sizeHint() ); tqlayout->addWidget( mRemoveButton, 1, 1 ); mMapper = new TQSignalMapper( TQT_TQOBJECT(this) ); diff --git a/kaddressbook/printing/kabentrypainter.cpp b/kaddressbook/printing/kabentrypainter.cpp index 91bf9f342..427dd9de1 100644 --- a/kaddressbook/printing/kabentrypainter.cpp +++ b/kaddressbook/printing/kabentrypainter.cpp @@ -399,27 +399,27 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr, line1 = i18n( "Preferred Address" ); } - line1 += TQString::tqfromLatin1( ":" ); + line1 += TQString::fromLatin1( ":" ); text = TQString(); if ( !address.extended().isEmpty() ) text = address.extended().stripWhiteSpace(); if ( !text.isEmpty() ) { - line1 = line1 + TQString::tqfromLatin1( " (" ) + text + - TQString::tqfromLatin1( ")" ); + line1 = line1 + TQString::fromLatin1( " (" ) + text + + TQString::fromLatin1( ")" ); } line1 = line1.stripWhiteSpace(); line2 = address.street(); if ( !address.postOfficeBox().isEmpty() ) - line2 += TQString::tqfromLatin1( " - " ) + address.postOfficeBox(); + line2 += TQString::fromLatin1( " - " ) + address.postOfficeBox(); // print address in american style, this will need localisation: line3 = address.locality() + ( address.region().isEmpty() ? - TQString::tqfromLatin1( "" ) : TQString::tqfromLatin1( ", " ) + + TQString::fromLatin1( "" ) : TQString::fromLatin1( ", " ) + address.region() ) + ( address.postalCode().isEmpty() - ? TQString::tqfromLatin1( "" ) : TQString::tqfromLatin1( " " ) + ? TQString::fromLatin1( "" ) : TQString::fromLatin1( " " ) + address.postalCode() ); line4 = address.country(); diff --git a/kaddressbook/printing/mikesstyle.cpp b/kaddressbook/printing/mikesstyle.cpp index 746677ec8..a3fea0f67 100644 --- a/kaddressbook/printing/mikesstyle.cpp +++ b/kaddressbook/printing/mikesstyle.cpp @@ -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::tqcurrentDateTime() ) ); + .tqarg( KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime() ) ); p.setPen( TQt::black ); p.drawText( 0, fm.height(), text ); diff --git a/kaddressbook/printing/printprogress.cpp b/kaddressbook/printing/printprogress.cpp index 3a9c00d19..64442056e 100644 --- a/kaddressbook/printing/printprogress.cpp +++ b/kaddressbook/printing/printprogress.cpp @@ -49,7 +49,7 @@ PrintProgress::PrintProgress( TQWidget *parent, const char *name ) mProgressBar->setProgress( 0 ); topLayout->addWidget( mProgressBar, 1, 0 ); - resize( TQSize( 370, 220 ).expandedTo( tqminimumSizeHint() ) ); + resize( TQSize( 370, 220 ).expandedTo( minimumSizeHint() ) ); } PrintProgress::~PrintProgress() diff --git a/kaddressbook/printing/selectionpage.cpp b/kaddressbook/printing/selectionpage.cpp index e71c27891..4e52b57db 100644 --- a/kaddressbook/printing/selectionpage.cpp +++ b/kaddressbook/printing/selectionpage.cpp @@ -56,7 +56,7 @@ SelectionPage::SelectionPage( TQWidget* parent, const char* name ) mButtonGroup->tqlayout()->setMargin( KDialog::marginHint() ); TQGridLayout *groupLayout = new TQGridLayout( mButtonGroup->tqlayout() ); - groupLayout->tqsetAlignment( TQt::AlignTop ); + groupLayout->setAlignment( TQt::AlignTop ); mUseWholeBook = new TQRadioButton( i18n( "&All contacts" ), mButtonGroup ); mUseWholeBook->setChecked( true ); diff --git a/kaddressbook/printing/stylepage.cpp b/kaddressbook/printing/stylepage.cpp index b1c29b464..e157f1820 100644 --- a/kaddressbook/printing/stylepage.cpp +++ b/kaddressbook/printing/stylepage.cpp @@ -124,7 +124,7 @@ void StylePage::initGUI() group->setColumnLayout( 0, Qt::Vertical ); TQGridLayout *sortLayout = new TQGridLayout( group->tqlayout(), 2, 2, KDialog::spacingHint() ); - sortLayout->tqsetAlignment( TQt::AlignTop ); + sortLayout->setAlignment( TQt::AlignTop ); label = new TQLabel( i18n( "Criterion:" ), group ); sortLayout->addWidget( label, 0, 0 ); @@ -153,7 +153,7 @@ void StylePage::initGUI() font.setPointSize( 20 ); mPreview->setFont( font ); mPreview->setScaledContents( true ); - mPreview->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignCenter ) ); + mPreview->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignCenter ) ); styleLayout->addWidget( mPreview ); topLayout->addWidget( group, 1, 1 ); diff --git a/kaddressbook/searchmanager.cpp b/kaddressbook/searchmanager.cpp index 79d77ead7..4ec8f7bb3 100644 --- a/kaddressbook/searchmanager.cpp +++ b/kaddressbook/searchmanager.cpp @@ -109,11 +109,11 @@ void SearchManager::search( const TQString &pattern, const KABC::Field::List &fi const KABC::Field::List::ConstIterator fieldEndIt( fieldList.end() ); for ( ; fieldIt != fieldEndIt; ++fieldIt ) { - if ( type == StartsWith && (*fieldIt)->value( *it ).tqstartsWith( pattern, false ) ) { + if ( type == StartsWith && (*fieldIt)->value( *it ).startsWith( pattern, false ) ) { mContacts.append( *it ); found = true; break; - } else if ( type == EndsWith && (*fieldIt)->value( *it ).tqendsWith( pattern, false ) ) { + } else if ( type == EndsWith && (*fieldIt)->value( *it ).endsWith( pattern, false ) ) { mContacts.append( *it ); found = true; break; @@ -138,10 +138,10 @@ void SearchManager::search( const TQString &pattern, const KABC::Field::List &fi int pos = (*customIt).find( ':' ); if ( pos != -1 ) { const TQString value = (*customIt).mid( pos + 1 ); - if ( type == StartsWith && value.tqstartsWith( pattern, false ) ) { + if ( type == StartsWith && value.startsWith( pattern, false ) ) { mContacts.append( *it ); break; - } else if ( type == EndsWith && value.tqendsWith( pattern, false ) ) { + } else if ( type == EndsWith && value.endsWith( pattern, false ) ) { mContacts.append( *it ); break; } else if ( type == Contains && value.find( pattern, 0, false ) != -1 ) { diff --git a/kaddressbook/soundwidget.cpp b/kaddressbook/soundwidget.cpp index e50e129ba..d661a14ea 100644 --- a/kaddressbook/soundwidget.cpp +++ b/kaddressbook/soundwidget.cpp @@ -48,7 +48,7 @@ SoundWidget::SoundWidget( KABC::AddressBook *ab, TQWidget *parent, const char *n TQLabel *label = new TQLabel( this ); label->setPixmap( KGlobal::iconLoader()->loadIcon( "multimedia", KIcon::Desktop, KIcon::SizeMedium ) ); - label->tqsetAlignment( TQt::AlignTop ); + label->setAlignment( TQt::AlignTop ); topLayout->addMultiCellWidget( label, 0, 1, 0, 0 ); mPlayButton = new TQPushButton( i18n( "Play" ), this ); diff --git a/kaddressbook/viewconfigurefieldspage.cpp b/kaddressbook/viewconfigurefieldspage.cpp index 9ab4b26e2..bbe0f3f19 100644 --- a/kaddressbook/viewconfigurefieldspage.cpp +++ b/kaddressbook/viewconfigurefieldspage.cpp @@ -262,16 +262,16 @@ void ViewConfigureFieldsPage::initGUI() vb2->addStretch(); gl->addLayout( vb2, 1, 3 ); - TQSize tqsizeHint = mUnSelectedBox->tqsizeHint(); + TQSize sizeHint = mUnSelectedBox->sizeHint(); // make sure we fill the list with all items, so that we can // get the maxItemWidth we need to not truncate the view slotShowFields( 0 ); - tqsizeHint = tqsizeHint.expandedTo( mSelectedBox->tqsizeHint() ); - tqsizeHint.setWidth( mUnSelectedBox->maxItemWidth() ); - mUnSelectedBox->setMinimumSize( tqsizeHint ); - mSelectedBox->setMinimumSize( tqsizeHint ); + sizeHint = sizeHint.expandedTo( mSelectedBox->sizeHint() ); + sizeHint.setWidth( mUnSelectedBox->maxItemWidth() ); + mUnSelectedBox->setMinimumSize( sizeHint ); + mSelectedBox->setMinimumSize( sizeHint ); gl->activate(); diff --git a/kaddressbook/viewconfigurefilterpage.cpp b/kaddressbook/viewconfigurefilterpage.cpp index 83c358f3e..39bab7c81 100644 --- a/kaddressbook/viewconfigurefilterpage.cpp +++ b/kaddressbook/viewconfigurefilterpage.cpp @@ -47,7 +47,7 @@ ViewConfigureFilterPage::ViewConfigureFilterPage( TQWidget *parent, " this view is displayed. This feature allows you to configure views that only" " interact with certain types of information based on the filter. Once the view" " is activated, the filter can be changed at anytime." ), this ); - label->tqsetAlignment( TQt::AlignLeft | TQt::AlignTop | TQt::WordBreak ); + label->setAlignment( TQt::AlignLeft | TQt::AlignTop | TQt::WordBreak ); topLayout->addWidget( label ); TQWidget *spacer = new TQWidget( this ); diff --git a/kaddressbook/views/cardview.cpp b/kaddressbook/views/cardview.cpp index df956398e..66ec75d16 100644 --- a/kaddressbook/views/cardview.cpp +++ b/kaddressbook/views/cardview.cpp @@ -681,7 +681,7 @@ CardViewItem *CardView::itemAt( const TQPoint &viewPos ) const return 0; } -TQRect CardView::tqitemRect( const CardViewItem *item ) const +TQRect CardView::itemRect( const CardViewItem *item ) const { return TQRect( item->d->x, item->d->y, d->mItemWidth, item->height() ); } @@ -1324,7 +1324,7 @@ void CardView::keyPressEvent( TQKeyEvent *e ) break; case Key_Menu: emit contextMenuRequested( d->mCurrentItem, viewport()->mapToGlobal( - tqitemRect(d->mCurrentItem).center() ) ); + itemRect(d->mCurrentItem).center() ) ); break; default: if ( (e->state() & ControlButton) && e->key() == Key_A ) { @@ -1462,7 +1462,7 @@ void CardView::tryShowFullText() CardViewItem *item = itemAt( cpos ); if ( item ) { // query it for a value to display - TQPoint ipos = cpos - tqitemRect( item ).topLeft(); + TQPoint ipos = cpos - itemRect( item ).topLeft(); item->showFullString( ipos, d->mTip ); } } diff --git a/kaddressbook/views/cardview.h b/kaddressbook/views/cardview.h index e3c29e5a4..4b6bbe7e1 100644 --- a/kaddressbook/views/cardview.h +++ b/kaddressbook/views/cardview.h @@ -245,7 +245,7 @@ class CardView : public TQScrollView /** @return The bounding rect of the given item. */ - TQRect tqitemRect( const CardViewItem *item ) const; + TQRect itemRect( const CardViewItem *item ) const; /** Ensures that the given item is in the viewable area of the widget diff --git a/kaddressbook/views/configurecardviewdialog.cpp b/kaddressbook/views/configurecardviewdialog.cpp index 8cacbfec6..de28c5d17 100644 --- a/kaddressbook/views/configurecardviewdialog.cpp +++ b/kaddressbook/views/configurecardviewdialog.cpp @@ -94,19 +94,19 @@ void CardViewLookNFeelPage::restoreSettings( KConfig *config ) c = KGlobalSettings::baseColor(); lbColors->insertItem( new ColorListItem( i18n("Background Color"), config->readColorEntry( "BackgroundColor", &c ) ) ); - c = tqcolorGroup().foreground(); + c = colorGroup().foreground(); lbColors->insertItem( new ColorListItem( i18n("Text Color"), config->readColorEntry( "TextColor", &c ) ) ); - c = tqcolorGroup().button(); + c = colorGroup().button(); lbColors->insertItem( new ColorListItem( i18n("Header, Border & Separator Color"), config->readColorEntry( "HeaderColor", &c ) ) ); - c = tqcolorGroup().buttonText(); + c = colorGroup().buttonText(); lbColors->insertItem( new ColorListItem( i18n("Header Text Color"), config->readColorEntry( "HeaderTextColor", &c ) ) ); - c = tqcolorGroup().highlight(); + c = colorGroup().highlight(); lbColors->insertItem( new ColorListItem( i18n("Highlight Color"), config->readColorEntry( "HighlightColor", &c ) ) ); - c = tqcolorGroup().highlightedText(); + c = colorGroup().highlightedText(); lbColors->insertItem( new ColorListItem( i18n("Highlighted Text Color"), config->readColorEntry( "HighlightedTextColor", &c ) ) ); diff --git a/kaddressbook/views/contactlistview.cpp b/kaddressbook/views/contactlistview.cpp index 0807cce64..c2b527945 100644 --- a/kaddressbook/views/contactlistview.cpp +++ b/kaddressbook/views/contactlistview.cpp @@ -72,7 +72,7 @@ void DynamicTip::maybeTip( const TQPoint &pos ) return; TQString s; - TQRect r = plv->tqitemRect( lvi ); + TQRect r = plv->itemRect( lvi ); r.moveBy( posVp.x(), posVp.y() ); //kdDebug(5720) << "Tip rec: " << r.x() << "," << r.y() << "," << r.width() diff --git a/kaddressbook/xxport/csvimportdialog.cpp b/kaddressbook/xxport/csvimportdialog.cpp index 88a2c087a..14a40c611 100644 --- a/kaddressbook/xxport/csvimportdialog.cpp +++ b/kaddressbook/xxport/csvimportdialog.cpp @@ -387,7 +387,7 @@ void CSVImportDialog::initGUI() mDelimiterBox->tqlayout()->setSpacing( spacingHint() ); mDelimiterBox->tqlayout()->setMargin( marginHint() ); TQGridLayout *delimiterLayout = new TQGridLayout( mDelimiterBox->tqlayout() ); - delimiterLayout->tqsetAlignment( TQt::AlignTop ); + delimiterLayout->setAlignment( TQt::AlignTop ); tqlayout->addMultiCellWidget( mDelimiterBox, 1, 4, 0, 0 ); mRadioComma = new TQRadioButton( i18n( "Comma" ), mDelimiterBox ); diff --git a/kaddressbook/xxport/gnokii_xxport.cpp b/kaddressbook/xxport/gnokii_xxport.cpp index abd3234b7..f4d1e9dbd 100644 --- a/kaddressbook/xxport/gnokii_xxport.cpp +++ b/kaddressbook/xxport/gnokii_xxport.cpp @@ -173,9 +173,9 @@ static gn_error read_phone_memstat( const gn_memory_type memtype, gn_memory_stat static TQString buildPhoneInfoString( const gn_memory_status &memstat ) { - TQString format = TQString::tqfromLatin1("<tr><td><b>%1</b></td><td>%2</td></tr>"); + TQString format = TQString::fromLatin1("<tr><td><b>%1</b></td><td>%2</td></tr>"); - return TQString::tqfromLatin1("<b>%1</b><br><table>%2%3%4%5%6</table><br>") + 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))) @@ -272,7 +272,7 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty TQDateTime datetime; gn_timestamp ts = gn_lib_get_pb_date(state); if (ts.year<1998) - datetime = TQDateTime::tqcurrentDateTime(); + datetime = TQDateTime::currentDateTime(); else datetime = TQDateTime( TQDate(ts.year, ts.month, ts.day), TQTime(ts.hour, ts.minute, ts.second) ); @@ -481,7 +481,7 @@ static gn_error xxport_phone_write_entry( int phone_location, gn_memory_type mem if (Addr->isEmpty()) continue; TQStringList a; TQChar sem(';'); - TQString sem_repl(TQString::tqfromLatin1(",")); + TQString sem_repl(TQString::fromLatin1(",")); a.append( Addr->postOfficeBox().replace( sem, sem_repl ) ); a.append( Addr->extended() .replace( sem, sem_repl ) ); a.append( Addr->street() .replace( sem, sem_repl ) ); @@ -891,7 +891,7 @@ static gn_error read_phone_memstat( const gn_memory_type memtype, gn_memory_stat memset(memstat, 0, sizeof(*memstat)); memstat->memory_type = memtype; data.memory_status = memstat; - error = gn_sm_functions(GN_OP_GetMemorytqStatus, &data, &state); + error = gn_sm_functions(GN_OP_GetMemoryStatus, &data, &state); GNOKII_CHECK_ERROR(error); if (error != GN_ERR_NONE) { switch (memtype) { @@ -943,9 +943,9 @@ static bool phone_entry_empty( const int index, const gn_memory_type memtype ) static TQString buildPhoneInfoString( const gn_memory_status &memstat ) { - TQString format = TQString::tqfromLatin1("<tr><td><b>%1</b></td><td>%2</td></tr>"); + TQString format = TQString::fromLatin1("<tr><td><b>%1</b></td><td>%2</td></tr>"); - return TQString::tqfromLatin1("<b>%1</b><br><table>%2%3%4%5%6</table><br>") + 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))) @@ -1044,7 +1044,7 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty // evaluate timestamp (ignore timezone) TQDateTime datetime; if (entry.date.year<1998) - datetime = TQDateTime::tqcurrentDateTime(); + datetime = TQDateTime::currentDateTime(); else datetime = TQDateTime( TQDate(entry.date.year, entry.date.month, entry.date.day), TQTime(entry.date.hour, entry.date.minute, entry.date.second) ); @@ -1263,7 +1263,7 @@ static gn_error xxport_phone_write_entry( int phone_location, gn_memory_type mem subentry->entry_type = GN_PHONEBOOK_ENTRY_Postal; TQStringList a; TQChar sem(';'); - TQString sem_repl(TQString::tqfromLatin1(",")); + TQString sem_repl(TQString::fromLatin1(",")); a.append( Addr->postOfficeBox().replace( sem, sem_repl ) ); a.append( Addr->extended() .replace( sem, sem_repl ) ); a.append( Addr->street() .replace( sem, sem_repl ) ); diff --git a/kaddressbook/xxport/opera_xxport.cpp b/kaddressbook/xxport/opera_xxport.cpp index 4c2949cc9..a115d8dfd 100644 --- a/kaddressbook/xxport/opera_xxport.cpp +++ b/kaddressbook/xxport/opera_xxport.cpp @@ -48,7 +48,7 @@ KABC::AddresseeList OperaXXPort::importContacts( const TQString& ) const { KABC::AddresseeList addrList; - TQString fileName = KFileDialog::getOpenFileName( TQDir::homeDirPath() + TQString::tqfromLatin1( "/.opera/contacts.adr" ) ); + TQString fileName = KFileDialog::getOpenFileName( TQDir::homeDirPath() + TQString::fromLatin1( "/.opera/contacts.adr" ) ); if ( fileName.isEmpty() ) return addrList; @@ -70,7 +70,7 @@ KABC::AddresseeList OperaXXPort::importContacts( const TQString& ) const while ( !stream.atEnd() ) { line = stream.readLine(); line = line.stripWhiteSpace(); - if ( line == TQString::tqfromLatin1( "#CONTACT" ) ) { + if ( line == TQString::fromLatin1( "#CONTACT" ) ) { parseContact = true; addr = KABC::Addressee(); continue; @@ -87,9 +87,9 @@ KABC::AddresseeList OperaXXPort::importContacts( const TQString& ) const int sep = line.find( '=' ); key = line.left( sep ).lower(); value = line.mid( sep + 1 ); - if ( key == TQString::tqfromLatin1( "name" ) ) + if ( key == TQString::fromLatin1( "name" ) ) addr.setNameFromString( value ); - else if ( key == TQString::tqfromLatin1( "mail" ) ) { + else if ( key == TQString::fromLatin1( "mail" ) ) { TQStringList emails = TQStringList::split( separator, value ); TQStringList::Iterator it = emails.begin(); @@ -98,20 +98,20 @@ KABC::AddresseeList OperaXXPort::importContacts( const TQString& ) const addr.insertEmail( *it, preferred ); preferred = false; } - } else if ( key == TQString::tqfromLatin1( "phone" ) ) + } else if ( key == TQString::fromLatin1( "phone" ) ) addr.insertPhoneNumber( KABC::PhoneNumber( value ) ); - else if ( key == TQString::tqfromLatin1( "fax" ) ) + else if ( key == TQString::fromLatin1( "fax" ) ) addr.insertPhoneNumber( KABC::PhoneNumber( value, KABC::PhoneNumber::Fax | KABC::PhoneNumber::Home ) ); - else if ( key == TQString::tqfromLatin1( "postaladdress" ) ) { + else if ( key == TQString::fromLatin1( "postaladdress" ) ) { KABC::Address address( KABC::Address::Home ); address.setLabel( value.replace( separator, "\n" ) ); addr.insertAddress( address ); - } else if ( key == TQString::tqfromLatin1( "description" ) ) + } else if ( key == TQString::fromLatin1( "description" ) ) addr.setNote( value.replace( separator, "\n" ) ); - else if ( key == TQString::tqfromLatin1( "url" ) ) + else if ( key == TQString::fromLatin1( "url" ) ) addr.setUrl( KURL( value ) ); - else if ( key == TQString::tqfromLatin1( "pictureurl" ) ) { + else if ( key == TQString::fromLatin1( "pictureurl" ) ) { KABC::Picture pic( value ); addr.setPhoto( pic ); } diff --git a/kaddressbook/xxport/vcard_xxport.cpp b/kaddressbook/xxport/vcard_xxport.cpp index e752b9057..849b24407 100644 --- a/kaddressbook/xxport/vcard_xxport.cpp +++ b/kaddressbook/xxport/vcard_xxport.cpp @@ -237,12 +237,12 @@ KABC::AddresseeList VCardXXPort::importContacts( const TQString& ) const TQString vCardText; - // With version 3.0, vCards are encoded with UTF-8 by default. Otherwise, use tqfromLatin1() + // With version 3.0, vCards are encoded with UTF-8 by default. Otherwise, use fromLatin1() // and hope that are fields are encoded correctly. - if ( TQString::tqfromLatin1( rawData ).lower().contains( "version:3.0" ) ) { + if ( TQString::fromLatin1( rawData ).lower().contains( "version:3.0" ) ) { vCardText = TQString::fromUtf8( rawData ); } else { - vCardText = TQString::tqfromLatin1( rawData ); + vCardText = TQString::fromLatin1( rawData ); } addrList += parseVCard( vCardText ); } diff --git a/kaddressbook/xxportselectdialog.cpp b/kaddressbook/xxportselectdialog.cpp index b932f9d97..fce57e74f 100644 --- a/kaddressbook/xxportselectdialog.cpp +++ b/kaddressbook/xxportselectdialog.cpp @@ -191,7 +191,7 @@ void XXPortSelectDialog::initGUI() mButtonGroup->tqlayout()->setMargin( KDialog::marginHint() ); TQGridLayout *groupLayout = new TQGridLayout( mButtonGroup->tqlayout() ); - groupLayout->tqsetAlignment( TQt::AlignTop ); + groupLayout->setAlignment( TQt::AlignTop ); mUseWholeBook = new TQRadioButton( i18n( "&All contacts" ), mButtonGroup ); mUseWholeBook->setChecked( true ); @@ -228,7 +228,7 @@ void XXPortSelectDialog::initGUI() sortingGroup->setColumnLayout( 0, Qt::Vertical ); TQGridLayout *sortLayout = new TQGridLayout( sortingGroup->tqlayout(), 2, 2, KDialog::spacingHint() ); - sortLayout->tqsetAlignment( TQt::AlignTop ); + sortLayout->setAlignment( TQt::AlignTop ); label = new TQLabel( i18n( "Criterion:" ), sortingGroup ); sortLayout->addWidget( label, 0, 0 ); diff --git a/kalarm/alarmcalendar.cpp b/kalarm/alarmcalendar.cpp index 85bc17392..1de9e8323 100644 --- a/kalarm/alarmcalendar.cpp +++ b/kalarm/alarmcalendar.cpp @@ -61,17 +61,17 @@ using namespace KCal; TQString AlarmCalendar::icalProductId() { - return TQString::tqfromLatin1("-//K Desktop Environment//NONSGML " KALARM_NAME " %1//EN").tqarg(KAlarm::currentCalendarVersionString()); + return TQString::fromLatin1("-//K Desktop Environment//NONSGML " KALARM_NAME " %1//EN").tqarg(KAlarm::currentCalendarVersionString()); } -static const KAEvent::tqStatus eventTypes[AlarmCalendar::NCALS] = { +static const KAEvent::Status eventTypes[AlarmCalendar::NCALS] = { KAEvent::ACTIVE, KAEvent::EXPIRED, KAEvent::DISPLAYING, KAEvent::TEMPLATE }; static const TQString calendarNames[AlarmCalendar::NCALS] = { - TQString::tqfromLatin1("calendar.ics"), - TQString::tqfromLatin1("expired.ics"), - TQString::tqfromLatin1("displaying.ics"), - TQString::tqfromLatin1("template.ics") + TQString::fromLatin1("calendar.ics"), + TQString::fromLatin1("expired.ics"), + TQString::fromLatin1("displaying.ics"), + TQString::fromLatin1("template.ics") }; static KStaticDeleter<AlarmCalendar> calendarDeleter[AlarmCalendar::NCALS]; // ensure that the calendar destructors are called @@ -91,10 +91,10 @@ AlarmCalendar* AlarmCalendar::mCalendars[NCALS] = { 0, 0, 0, 0 }; bool AlarmCalendar::initialiseCalendars() { KConfig* config = kapp->config(); - config->setGroup(TQString::tqfromLatin1("General")); - TQString activeKey = TQString::tqfromLatin1("Calendar"); - TQString expiredKey = TQString::tqfromLatin1("ExpiredCalendar"); - TQString templateKey = TQString::tqfromLatin1("TemplateCalendar"); + config->setGroup(TQString::fromLatin1("General")); + TQString activeKey = TQString::fromLatin1("Calendar"); + TQString expiredKey = TQString::fromLatin1("ExpiredCalendar"); + TQString templateKey = TQString::fromLatin1("TemplateCalendar"); TQString displayCal, activeCal, expiredCal, templateCal; calendarDeleter[ACTIVE].setObject(mCalendars[ACTIVE], createCalendar(ACTIVE, config, activeCal, activeKey)); calendarDeleter[EXPIRED].setObject(mCalendars[EXPIRED], createCalendar(EXPIRED, config, expiredCal, expiredKey)); @@ -152,8 +152,8 @@ bool AlarmCalendar::initialiseCalendars() */ AlarmCalendar* AlarmCalendar::createCalendar(CalID type, KConfig* config, TQString& writePath, const TQString& configKey) { - static TQRegExp vcsRegExp(TQString::tqfromLatin1("\\.vcs$")); - static TQString ical = TQString::tqfromLatin1(".ics"); + static TQRegExp vcsRegExp(TQString::fromLatin1("\\.vcs$")); + static TQString ical = TQString::fromLatin1(".ics"); if (configKey.isNull()) { @@ -206,7 +206,7 @@ const KCal::Event* AlarmCalendar::getEvent(const TQString& uniqueID) if (uniqueID.isEmpty()) return 0; CalID calID; - switch (KAEvent::uidtqStatus(uniqueID)) + switch (KAEvent::uidStatus(uniqueID)) { case KAEvent::ACTIVE: calID = ACTIVE; break; case KAEvent::TEMPLATE: calID = TEMPLATE; break; @@ -261,7 +261,7 @@ bool AlarmCalendar::open() kdDebug(5950) << "AlarmCalendar::open(" << mUrl.prettyURL() << ")\n"; if (!mCalendar) - mCalendar = new CalendarLocal(TQString::tqfromLatin1("UTC")); + mCalendar = new CalendarLocal(TQString::fromLatin1("UTC")); mCalendar->setLocalTime(); // write out using local time (i.e. no time zone) // Check for file's existence, assuming that it does exist when uncertain, @@ -404,7 +404,7 @@ bool AlarmCalendar::saveCal(const TQString& newFile) if (!mConfigKey.isNull()) { KConfig* config = kapp->config(); - config->setGroup(TQString::tqfromLatin1("General")); + config->setGroup(TQString::fromLatin1("General")); config->writePathEntry(mConfigKey, mICalUrl.path()); config->sync(); } @@ -445,8 +445,8 @@ void AlarmCalendar::close() */ bool AlarmCalendar::importAlarms(TQWidget* parent) { - KURL url = KFileDialog::getOpenURL(TQString::tqfromLatin1(":importalarms"), - TQString::tqfromLatin1("*.vcs *.ics|%1").tqarg(i18n("Calendar Files")), parent); + KURL url = KFileDialog::getOpenURL(TQString::fromLatin1(":importalarms"), + TQString::fromLatin1("*.vcs *.ics|%1").tqarg(i18n("Calendar Files")), parent); if (url.isEmpty()) { kdError(5950) << "AlarmCalendar::importAlarms(): Empty URL" << endl; @@ -484,7 +484,7 @@ bool AlarmCalendar::importAlarms(TQWidget* parent) } // Read the calendar and add its alarms to the current calendars - CalendarLocal cal(TQString::tqfromLatin1("UTC")); + CalendarLocal cal(TQString::fromLatin1("UTC")); cal.setLocalTime(); // write out using local time (i.e. no time zone) success = cal.load(filename); if (!success) @@ -508,7 +508,7 @@ bool AlarmCalendar::importAlarms(TQWidget* parent) const Event* event = *it; if (event->alarms().isEmpty() || !KAEvent(*event).valid()) continue; // ignore events without alarms, or usable alarms - KAEvent::tqStatus type = KAEvent::uidtqStatus(event->uid()); + KAEvent::Status type = KAEvent::uidStatus(event->uid()); switch (type) { case KAEvent::ACTIVE: @@ -616,7 +616,7 @@ void AlarmCalendar::convertToICal() if (!mConfigKey.isNull()) { KConfig* config = kapp->config(); - config->setGroup(TQString::tqfromLatin1("General")); + config->setGroup(TQString::fromLatin1("General")); config->writePathEntry(mConfigKey, mICalUrl.path()); config->sync(); } @@ -688,7 +688,7 @@ void AlarmCalendar::purgeIfQueued() { kdDebug(5950) << "AlarmCalendar::purgeIfQueued(" << mPurgeDaysQueued << ")\n"; bool changed = false; - TQDate cutoff = TQDate::tqcurrentDate().addDays(-mPurgeDaysQueued); + TQDate cutoff = TQDate::currentDate().addDays(-mPurgeDaysQueued); Event::List events = mCalendar->rawEvents(); for (Event::List::ConstIterator it = events.begin(); it != events.end(); ++it) { @@ -807,9 +807,9 @@ bool AlarmCalendar::deleteEvent(const TQString& eventID, bool saveit) /****************************************************************************** * Emit a signal to indicate whether the calendar is empty. */ -void AlarmCalendar::emitEmptytqStatus() +void AlarmCalendar::emitEmptyStatus() { - emit emptytqStatus(events().isEmpty()); + emit emptyStatus(events().isEmpty()); } /****************************************************************************** diff --git a/kalarm/alarmcalendar.h b/kalarm/alarmcalendar.h index 47d59f3ed..1b7ffc029 100644 --- a/kalarm/alarmcalendar.h +++ b/kalarm/alarmcalendar.h @@ -40,7 +40,7 @@ class AlarmCalendar : public TQObject public: virtual ~AlarmCalendar(); bool valid() const { return mUrl.isValid(); } - KAEvent::tqStatus type() const { return mType; } + KAEvent::Status type() const { return mType; } bool open(); int load(); bool reload(); @@ -54,7 +54,7 @@ class AlarmCalendar : public TQObject KCal::Event* addEvent(KAEvent&, bool useEventID = false); void updateEvent(const KAEvent&); bool deleteEvent(const TQString& eventID, bool save = false); - void emitEmptytqStatus(); + void emitEmptyStatus(); void purgeAll() { purge(0); } void setPurgeDays(int days); void purgeIfQueued(); // must only be called from KAlarmApp::processQueue() @@ -81,7 +81,7 @@ class AlarmCalendar : public TQObject signals: void calendarSaved(AlarmCalendar*); void purged(); - void emptytqStatus(bool empty); + void emptyStatus(bool empty); private slots: void slotPurge(); @@ -103,7 +103,7 @@ class AlarmCalendar : public TQObject KURL mICalUrl; // URL of iCalendar file TQString mLocalFile; // calendar file, or local copy if it's a remote file TQString mConfigKey; // config file key for this calendar's URL - KAEvent::tqStatus mType; // what type of events the calendar file is for + KAEvent::Status mType; // what type of events the calendar file is for int mPurgeDays; // how long to keep alarms, 0 = don't keep, -1 = keep indefinitely bool mOpen; // true if the calendar file is open int mPurgeDaysQueued; // >= 0 to purge the calendar when called from KAlarmApp::processLoop() diff --git a/kalarm/alarmevent.cpp b/kalarm/alarmevent.cpp index c5e487caa..9acb722d1 100644 --- a/kalarm/alarmevent.cpp +++ b/kalarm/alarmevent.cpp @@ -44,7 +44,7 @@ const TQCString APPNAME("KALARM"); // KAlarm version which first used the current calendar/event format. // If this changes, KAEvent::convertKCalEvents() must be changed correspondingly. // The string version is the KAlarm version string used in the calendar file. -TQString KAEvent::calVersionString() { return TQString::tqfromLatin1("1.5.0"); } +TQString KAEvent::calVersionString() { return TQString::fromLatin1("1.5.0"); } int KAEvent::calVersion() { return KAlarm::Version(1,5,0); } // Custom calendar properties. @@ -54,16 +54,16 @@ static const TQCString NEXT_RECUR_PROPERTY("NEXTRECUR"); // X-KDE-KALARM-NEX static const TQCString REPEAT_PROPERTY("REPEAT"); // X-KDE-KALARM-REPEAT property // - General alarm properties static const TQCString TYPE_PROPERTY("TYPE"); // X-KDE-KALARM-TYPE property -static const TQString FILE_TYPE = TQString::tqfromLatin1("FILE"); -static const TQString AT_LOGIN_TYPE = TQString::tqfromLatin1("LOGIN"); -static const TQString REMINDER_TYPE = TQString::tqfromLatin1("REMINDER"); -static const TQString REMINDER_ONCE_TYPE = TQString::tqfromLatin1("REMINDER_ONCE"); -static const TQString ARCHIVE_REMINDER_ONCE_TYPE = TQString::tqfromLatin1("ONCE"); -static const TQString TIME_DEFERRAL_TYPE = TQString::tqfromLatin1("DEFERRAL"); -static const TQString DATE_DEFERRAL_TYPE = TQString::tqfromLatin1("DATE_DEFERRAL"); -static const TQString DISPLAYING_TYPE = TQString::tqfromLatin1("DISPLAYING"); // used only in displaying calendar -static const TQString PRE_ACTION_TYPE = TQString::tqfromLatin1("PRE"); -static const TQString POST_ACTION_TYPE = TQString::tqfromLatin1("POST"); +static const TQString FILE_TYPE = TQString::fromLatin1("FILE"); +static const TQString AT_LOGIN_TYPE = TQString::fromLatin1("LOGIN"); +static const TQString REMINDER_TYPE = TQString::fromLatin1("REMINDER"); +static const TQString REMINDER_ONCE_TYPE = TQString::fromLatin1("REMINDER_ONCE"); +static const TQString ARCHIVE_REMINDER_ONCE_TYPE = TQString::fromLatin1("ONCE"); +static const TQString TIME_DEFERRAL_TYPE = TQString::fromLatin1("DEFERRAL"); +static const TQString DATE_DEFERRAL_TYPE = TQString::fromLatin1("DATE_DEFERRAL"); +static const TQString DISPLAYING_TYPE = TQString::fromLatin1("DISPLAYING"); // used only in displaying calendar +static const TQString PRE_ACTION_TYPE = TQString::fromLatin1("PRE"); +static const TQString POST_ACTION_TYPE = TQString::fromLatin1("POST"); static const TQCString NEXT_REPEAT_PROPERTY("NEXTREPEAT"); // X-KDE-KALARM-NEXTREPEAT property // - Display alarm properties static const TQCString FONT_COLOUR_PROPERTY("FONTCOLOR"); // X-KDE-KALARM-FONTCOLOR property @@ -74,27 +74,27 @@ static const TQCString VOLUME_PROPERTY("VOLUME"); // X-KDE-KALARM-VOL static const TQCString SPEAK_PROPERTY("SPEAK"); // X-KDE-KALARM-SPEAK property // Event categories -static const TQString DATE_ONLY_CATEGORY = TQString::tqfromLatin1("DATE"); -static const TQString EMAIL_BCC_CATEGORY = TQString::tqfromLatin1("BCC"); -static const TQString CONFIRM_ACK_CATEGORY = TQString::tqfromLatin1("ACKCONF"); -static const TQString LATE_CANCEL_CATEGORY = TQString::tqfromLatin1("LATECANCEL;"); -static const TQString AUTO_CLOSE_CATEGORY = TQString::tqfromLatin1("LATECLOSE;"); -static const TQString TEMPL_AFTER_TIME_CATEGORY = TQString::tqfromLatin1("TMPLAFTTIME;"); -static const TQString KMAIL_SERNUM_CATEGORY = TQString::tqfromLatin1("KMAIL:"); -static const TQString KORGANIZER_CATEGORY = TQString::tqfromLatin1("KORG"); -static const TQString DEFER_CATEGORY = TQString::tqfromLatin1("DEFER;"); -static const TQString ARCHIVE_CATEGORY = TQString::tqfromLatin1("SAVE"); -static const TQString ARCHIVE_CATEGORIES = TQString::tqfromLatin1("SAVE:"); -static const TQString LOG_CATEGORY = TQString::tqfromLatin1("LOG:"); -static const TQString xtermURL = TQString::tqfromLatin1("xterm:"); +static const TQString DATE_ONLY_CATEGORY = TQString::fromLatin1("DATE"); +static const TQString EMAIL_BCC_CATEGORY = TQString::fromLatin1("BCC"); +static const TQString CONFIRM_ACK_CATEGORY = TQString::fromLatin1("ACKCONF"); +static const TQString LATE_CANCEL_CATEGORY = TQString::fromLatin1("LATECANCEL;"); +static const TQString AUTO_CLOSE_CATEGORY = TQString::fromLatin1("LATECLOSE;"); +static const TQString TEMPL_AFTER_TIME_CATEGORY = TQString::fromLatin1("TMPLAFTTIME;"); +static const TQString KMAIL_SERNUM_CATEGORY = TQString::fromLatin1("KMAIL:"); +static const TQString KORGANIZER_CATEGORY = TQString::fromLatin1("KORG"); +static const TQString DEFER_CATEGORY = TQString::fromLatin1("DEFER;"); +static const TQString ARCHIVE_CATEGORY = TQString::fromLatin1("SAVE"); +static const TQString ARCHIVE_CATEGORIES = TQString::fromLatin1("SAVE:"); +static const TQString LOG_CATEGORY = TQString::fromLatin1("LOG:"); +static const TQString xtermURL = TQString::fromLatin1("xterm:"); // Event status strings -static const TQString DISABLED_STATUS = TQString::tqfromLatin1("DISABLED"); +static const TQString DISABLED_STATUS = TQString::fromLatin1("DISABLED"); -static const TQString EXPIRED_UID = TQString::tqfromLatin1("-exp-"); -static const TQString DISPLAYING_UID = TQString::tqfromLatin1("-disp-"); -static const TQString TEMPLATE_UID = TQString::tqfromLatin1("-tmpl-"); -static const TQString KORGANIZER_UID = TQString::tqfromLatin1("-korg-"); +static const TQString EXPIRED_UID = TQString::fromLatin1("-exp-"); +static const TQString DISPLAYING_UID = TQString::fromLatin1("-disp-"); +static const TQString TEMPLATE_UID = TQString::fromLatin1("-tmpl-"); +static const TQString KORGANIZER_UID = TQString::fromLatin1("-korg-"); struct AlarmData { @@ -334,7 +334,7 @@ void KAEvent::set(const Event& event) } mNextMainDateTime = readDateTime(event, dateOnly, mStartDateTime); mSaveDateTime = event.created(); - if (uidtqStatus() == TEMPLATE) + if (uidStatus() == TEMPLATE) mTemplateName = event.summary(); if (event.statusStr() == DISABLED_STATUS) mEnabled = false; @@ -885,38 +885,38 @@ DateTime KAEvent::displayDateTime() const /****************************************************************************** * Convert a unique ID to indicate that the event is in a specified calendar file. */ -TQString KAEvent::uid(const TQString& id, tqStatus status) +TQString KAEvent::uid(const TQString& id, Status status) { TQString result = id; - tqStatus oldtqStatus; + Status oldStatus; int i, len; if ((i = result.find(EXPIRED_UID)) > 0) { - oldtqStatus = EXPIRED; + oldStatus = EXPIRED; len = EXPIRED_UID.length(); } else if ((i = result.find(DISPLAYING_UID)) > 0) { - oldtqStatus = DISPLAYING; + oldStatus = DISPLAYING; len = DISPLAYING_UID.length(); } else if ((i = result.find(TEMPLATE_UID)) > 0) { - oldtqStatus = TEMPLATE; + oldStatus = TEMPLATE; len = TEMPLATE_UID.length(); } else if ((i = result.find(KORGANIZER_UID)) > 0) { - oldtqStatus = KORGANIZER; + oldStatus = KORGANIZER; len = KORGANIZER_UID.length(); } else { - oldtqStatus = ACTIVE; + oldStatus = ACTIVE; i = result.findRev('-'); len = 1; } - if (status != oldtqStatus && i > 0) + if (status != oldStatus && i > 0) { TQString part; switch (status) @@ -935,7 +935,7 @@ TQString KAEvent::uid(const TQString& id, tqStatus status) /****************************************************************************** * Get the calendar type for a unique ID. */ -KAEvent::tqStatus KAEvent::uidtqStatus(const TQString& uid) +KAEvent::Status KAEvent::uidStatus(const TQString& uid) { if (uid.find(EXPIRED_UID) > 0) return EXPIRED; @@ -1039,14 +1039,14 @@ bool KAEvent::updateKCalEvent(Event& ev, bool checkUid, bool original, bool canc if (params.count() > 0) { TQString cat = ARCHIVE_CATEGORIES; - cat += params.join(TQString::tqfromLatin1(";")); + cat += params.join(TQString::fromLatin1(";")); cats.append(cat); } else cats.append(ARCHIVE_CATEGORY); } ev.setCategories(cats); - ev.setCustomtqStatus(mEnabled ? TQString() : DISABLED_STATUS); + ev.setCustomStatus(mEnabled ? TQString() : DISABLED_STATUS); ev.setRevision(mRevision); ev.clearAlarms(); @@ -1097,9 +1097,9 @@ bool KAEvent::updateKCalEvent(Event& ev, bool checkUid, bool original, bool canc else if (mAtLoginDateTime.isValid()) dtl = mAtLoginDateTime; else if (mStartDateTime.isDateOnly()) - dtl = TQDate::tqcurrentDate().addDays(-1); + dtl = TQDate::currentDate().addDays(-1); else - dtl = TQDateTime::tqcurrentDateTime(); + dtl = TQDateTime::currentDateTime(); initKCalAlarm(ev, dtl, AT_LOGIN_TYPE); if (!ancillaryType && dtl.isValid()) { @@ -1243,7 +1243,7 @@ Alarm* KAEvent::initKCalAlarm(Event& event, int startOffsetSecs, const TQStringL case KAAlarm::AUDIO_ALARM: alarm->setAudioAlarm(mAudioFile); // empty for a beep or for speaking if (mSpeak) - alarm->setCustomProperty(APPNAME, SPEAK_PROPERTY, TQString::tqfromLatin1("Y")); + alarm->setCustomProperty(APPNAME, SPEAK_PROPERTY, TQString::fromLatin1("Y")); if (mRepeatSound) { alarm->setRepeatCount(-1); @@ -1251,7 +1251,7 @@ Alarm* KAEvent::initKCalAlarm(Event& event, int startOffsetSecs, const TQStringL } if (!mAudioFile.isEmpty() && mSoundVolume >= 0) alarm->setCustomProperty(APPNAME, VOLUME_PROPERTY, - TQString::tqfromLatin1("%1;%2;%3").tqarg(TQString::number(mSoundVolume, 'f', 2)) + TQString::fromLatin1("%1;%2;%3").tqarg(TQString::number(mSoundVolume, 'f', 2)) .tqarg(TQString::number(mFadeVolume, 'f', 2)) .tqarg(mFadeSeconds)); break; @@ -1277,7 +1277,7 @@ Alarm* KAEvent::initKCalAlarm(Event& event, int startOffsetSecs, const TQStringL case T_MESSAGE: alarm->setDisplayAlarm(AlarmText::toCalendarText(mText)); alarm->setCustomProperty(APPNAME, FONT_COLOUR_PROPERTY, - TQString::tqfromLatin1("%1;%2;%3").tqarg(mBgColour.name()) + TQString::fromLatin1("%1;%2;%3").tqarg(mBgColour.name()) .tqarg(mFgColour.name()) .tqarg(mDefaultFont ? TQString() : mFont.toString())); break; @@ -1601,7 +1601,7 @@ bool KAEvent::defer(const DateTime& dateTime, bool reminder, bool adjustRecurren set_deferral(NORMAL_DEFERRAL); if (adjustRecurrence) { - TQDateTime now = TQDateTime::tqcurrentDateTime(); + TQDateTime now = TQDateTime::currentDateTime(); if (mainEndRepeatTime() < now) { // The last repetition (if any) of the current recurrence has already passed. @@ -1641,7 +1641,7 @@ void KAEvent::cancelDefer() // Set the deferral time to be the same as the next recurrence/repetition. // This prevents an immediate retriggering of the alarm. if (mMainExpired - || nextOccurrence(TQDateTime::tqcurrentDateTime(), mDeferralTime, RETURN_REPETITION) == NO_OCCURRENCE) + || nextOccurrence(TQDateTime::currentDateTime(), mDeferralTime, RETURN_REPETITION) == NO_OCCURRENCE) { // The main alarm has expired, so simply delete the deferral mDeferralTime = DateTime(); @@ -1678,7 +1678,7 @@ DateTime KAEvent::deferralLimit(KAEvent::DeferLimitType* limitType) const // It's a repeated alarm. Don't allow it to be deferred past its // next occurrence or repetition. DateTime reminderTime; - TQDateTime now = TQDateTime::tqcurrentDateTime(); + TQDateTime now = TQDateTime::currentDateTime(); OccurType type = nextOccurrence(now, endTime, RETURN_REPETITION); if (type & OCCURRENCE_REPEAT) ltype = LIMIT_REPETITION; @@ -1695,7 +1695,7 @@ DateTime KAEvent::deferralLimit(KAEvent::DeferLimitType* limitType) const ltype = LIMIT_RECURRENCE; } else if ((mReminderMinutes || mDeferral == REMINDER_DEFERRAL || mArchiveReminderMinutes) - && TQDateTime::tqcurrentDateTime() < mNextMainDateTime.dateTime()) + && TQDateTime::currentDateTime() < mNextMainDateTime.dateTime()) { // It's an reminder alarm. Don't allow it to be deferred past its main alarm time. endTime = mNextMainDateTime; @@ -2633,21 +2633,21 @@ void KAEvent::convertKCalEvents(KCal::Calendar& calendar, int version, bool adju static const TQChar LATE_CANCEL_CODE = 'C'; static const TQChar AT_LOGIN_CODE = 'L'; // subsidiary alarm at every login static const TQChar DEFERRAL_CODE = 'D'; // extra deferred alarm - static const TQString TEXT_PREFIX = TQString::tqfromLatin1("TEXT:"); - static const TQString FILE_PREFIX = TQString::tqfromLatin1("FILE:"); - static const TQString COMMAND_PREFIX = TQString::tqfromLatin1("CMD:"); + static const TQString TEXT_PREFIX = TQString::fromLatin1("TEXT:"); + static const TQString FILE_PREFIX = TQString::fromLatin1("FILE:"); + static const TQString COMMAND_PREFIX = TQString::fromLatin1("CMD:"); // KAlarm pre-0.9.2 codes held in the event's CATEGORY property - static const TQString BEEP_CATEGORY = TQString::tqfromLatin1("BEEP"); + static const TQString BEEP_CATEGORY = TQString::fromLatin1("BEEP"); // KAlarm pre-1.1.1 LATECANCEL category with no parameter - static const TQString LATE_CANCEL_CAT = TQString::tqfromLatin1("LATECANCEL"); + static const TQString LATE_CANCEL_CAT = TQString::fromLatin1("LATECANCEL"); // KAlarm pre-1.3.0 TMPLDEFTIME category with no parameter - static const TQString TEMPL_DEF_TIME_CAT = TQString::tqfromLatin1("TMPLDEFTIME"); + static const TQString TEMPL_DEF_TIME_CAT = TQString::fromLatin1("TMPLDEFTIME"); // KAlarm pre-1.3.1 XTERM category - static const TQString EXEC_IN_XTERM_CAT = TQString::tqfromLatin1("XTERM"); + static const TQString EXEC_IN_XTERM_CAT = TQString::fromLatin1("XTERM"); // KAlarm pre-1.4.22 properties static const TQCString KMAIL_ID_PROPERTY("KMAILID"); // X-KDE-KALARM-KMAILID property @@ -2818,7 +2818,7 @@ void KAEvent::convertKCalEvents(KCal::Calendar& calendar, int version, bool adju * X-KDE-KALARM-FONTCOLOUR property. * Convert BEEP category into an audio alarm with no audio file. */ - if (uidtqStatus(event->uid()) == EXPIRED) + if (uidStatus(event->uid()) == EXPIRED) event->setCreated(event->dtEnd()); TQDateTime start = event->dtStart(); if (event->doesFloat()) @@ -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::tqfromLatin1("%1;;").tqarg(cats[0])); + TQString::fromLatin1("%1;;").tqarg(cats[0])); } cats.remove(cats.begin()); } diff --git a/kalarm/alarmevent.h b/kalarm/alarmevent.h index b5bc41e2e..20f870b64 100644 --- a/kalarm/alarmevent.h +++ b/kalarm/alarmevent.h @@ -266,7 +266,7 @@ class KAEvent : public KAAlarmEventBase READ_ONLY_FLAGS = 0xF0000 // mask for all read-only internal values }; /** The category of an event, indicated by the middle part of its UID. */ - enum tqStatus + enum Status { ACTIVE, // the event is currently active EXPIRED, // the event has expired @@ -331,7 +331,7 @@ class KAEvent : public KAAlarmEventBase void setLateCancel(int lc) { mLateCancel = lc; mUpdated = true; } void setAutoClose(bool ac) { mAutoClose = ac; mUpdated = true; } void setRepeatAtLogin(bool rl) { mRepeatAtLogin = rl; mUpdated = true; } - void setUid(tqStatus s) { mEventID = uid(mEventID, s); mUpdated = true; } + void setUid(Status s) { mEventID = uid(mEventID, s); mUpdated = true; } void setKMailSerialNumber(unsigned long n) { mKMailSerialNumber = n; } void setLogFile(const TQString& logfile); void setReminder(int minutes, bool onceOnly); @@ -408,10 +408,10 @@ class KAEvent : public KAAlarmEventBase bool enabled() const { return mEnabled; } bool updated() const { return mUpdated; } bool mainExpired() const { return mMainExpired; } - bool expired() const { return mDisplaying && mMainExpired || uidtqStatus(mEventID) == EXPIRED; } - tqStatus uidtqStatus() const { return uidtqStatus(mEventID); } - static tqStatus uidtqStatus(const TQString& uid); - static TQString uid(const TQString& id, tqStatus); + bool expired() const { return mDisplaying && mMainExpired || uidStatus(mEventID) == EXPIRED; } + Status uidStatus() const { return uidStatus(mEventID); } + static Status uidStatus(const TQString& uid); + static TQString uid(const TQString& id, Status); static KAEvent findTemplateName(AlarmCalendar&, const TQString& name); struct MonthPos diff --git a/kalarm/alarmlistview.cpp b/kalarm/alarmlistview.cpp index 355cc4e3e..419f642a4 100644 --- a/kalarm/alarmlistview.cpp +++ b/kalarm/alarmlistview.cpp @@ -167,7 +167,7 @@ void AlarmListView::populate() KAEvent event; KCal::Event::List events; KCal::Event::List::ConstIterator it; - TQDateTime now = TQDateTime::tqcurrentDateTime(); + TQDateTime now = TQDateTime::currentDateTime(); if (mShowExpired) { AlarmCalendar* cal = AlarmCalendar::expiredCalendarOpen(); @@ -257,7 +257,7 @@ void AlarmListView::updateTimeToAlarms(bool forceDisplay) { if (forceDisplay || columnWidth(mColumn[TIME_TO_COLUMN])) { - TQDateTime now = TQDateTime::tqcurrentDateTime(); + TQDateTime now = TQDateTime::currentDateTime(); for (AlarmListViewItem* item = firstChild(); item; item = item->nextSibling()) item->updateTimeToAlarm(now, forceDisplay); } @@ -269,7 +269,7 @@ void AlarmListView::updateTimeToAlarms(bool forceDisplay) */ void AlarmListView::addEvent(const KAEvent& event, EventListViewBase* view) { - TQDateTime now = TQDateTime::tqcurrentDateTime(); + TQDateTime now = TQDateTime::currentDateTime(); for (InstanceListConstIterator it = mInstanceList.begin(); it != mInstanceList.end(); ++it) static_cast<AlarmListView*>(*it)->addEntry(event, now, true, (*it == view)); } @@ -290,7 +290,7 @@ AlarmListViewItem* AlarmListView::addEntry(const KAEvent& event, const TQDateTim */ EventListViewItemBase* AlarmListView::createItem(const KAEvent& event) { - return new AlarmListViewItem(this, event, TQDateTime::tqcurrentDateTime()); + return new AlarmListViewItem(this, event, TQDateTime::currentDateTime()); } /****************************************************************************** @@ -373,7 +373,7 @@ void AlarmListView::contentsMouseMoveEvent(TQMouseEvent* e) // Create a calendar object containing all the currently selected alarms kdDebug(5950) << "AlarmListView::contentsMouseMoveEvent(): drag started" << endl; mMousePressed = false; - KCal::CalendarLocal cal(TQString::tqfromLatin1("UTC")); + KCal::CalendarLocal cal(TQString::fromLatin1("UTC")); cal.setLocalTime(); // write out using local time (i.e. no time zone) TQValueList<EventListViewItemBase*> items = selectedItems(); if (!items.count()) @@ -652,7 +652,7 @@ void AlarmListViewItem::paintCell(TQPainter* painter, const TQColorGroup& cg, in */ int AlarmListViewItem::typeIconWidth(AlarmListView* v) { - return iconWidth() + 2 * v->tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth); + return iconWidth() + 2 * v->tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth); } /****************************************************************************** @@ -700,7 +700,7 @@ void AlarmListTooltip::maybeTip(const TQPoint& pt) if (columnX + widthNeeded <= listView->viewport()->width()) return; } - TQRect rect = listView->tqitemRect(item); + TQRect rect = listView->itemRect(item); rect.setLeft(columnX); rect.setWidth(columnWidth); kdDebug(5950) << "AlarmListTooltip::maybeTip(): display\n"; diff --git a/kalarm/alarmlistview.h b/kalarm/alarmlistview.h index f88ea4a85..7e78cbd5c 100644 --- a/kalarm/alarmlistview.h +++ b/kalarm/alarmlistview.h @@ -108,7 +108,7 @@ class AlarmListView : public EventListViewBase virtual TQString whatsThisText(int column) const; virtual bool shouldShowEvent(const KAEvent& e) const { return mShowExpired || !e.expired(); } AlarmListViewItem* addEntry(const KAEvent& e, bool setSize = false) - { return addEntry(e, TQDateTime::tqcurrentDateTime(), setSize); } + { return addEntry(e, TQDateTime::currentDateTime(), setSize); } AlarmListViewItem* updateEntry(AlarmListViewItem* item, const KAEvent& newEvent, bool setSize = false) { return (AlarmListViewItem*)EventListViewBase::updateEntry(item, newEvent, setSize); } virtual void contentsMousePressEvent(TQMouseEvent*); diff --git a/kalarm/alarmtext.cpp b/kalarm/alarmtext.cpp index 8bd1d6847..c030c384f 100644 --- a/kalarm/alarmtext.cpp +++ b/kalarm/alarmtext.cpp @@ -32,17 +32,17 @@ TQString AlarmText::mToPrefix; TQString AlarmText::mCcPrefix; TQString AlarmText::mDatePrefix; TQString AlarmText::mSubjectPrefix; -TQString AlarmText::mFromPrefixEn = TQString::tqfromLatin1("From:"); -TQString AlarmText::mToPrefixEn = TQString::tqfromLatin1("To:"); -TQString AlarmText::mCcPrefixEn = TQString::tqfromLatin1("Cc:"); -TQString AlarmText::mDatePrefixEn = TQString::tqfromLatin1("Date:"); -TQString AlarmText::mSubjectPrefixEn = TQString::tqfromLatin1("Subject:"); +TQString AlarmText::mFromPrefixEn = TQString::fromLatin1("From:"); +TQString AlarmText::mToPrefixEn = TQString::fromLatin1("To:"); +TQString AlarmText::mCcPrefixEn = TQString::fromLatin1("Cc:"); +TQString AlarmText::mDatePrefixEn = TQString::fromLatin1("Date:"); +TQString AlarmText::mSubjectPrefixEn = TQString::fromLatin1("Subject:"); void AlarmText::setText(const TQString& text) { mBody = text; - mIsScript = text.startsWith(TQString::tqfromLatin1("#!")); + mIsScript = text.startsWith(TQString::fromLatin1("#!")); mIsEmail = false; mTo = mFrom = mCc = mTime = mSubject = TQString(); mKMailSerialNum = 0; @@ -284,5 +284,5 @@ TQString AlarmText::summary(const KAEvent& event, int maxLines, bool* truncated) return text.left(newline); // text ends in newline if (truncated) *truncated = true; - return text.left(newline + (maxLines <= 1 ? 0 : 1)) + TQString::tqfromLatin1("..."); + return text.left(newline + (maxLines <= 1 ? 0 : 1)) + TQString::fromLatin1("..."); } diff --git a/kalarm/alarmtimewidget.cpp b/kalarm/alarmtimewidget.cpp index 2b907d9a1..2b65c7001 100644 --- a/kalarm/alarmtimewidget.cpp +++ b/kalarm/alarmtimewidget.cpp @@ -93,14 +93,14 @@ void AlarmTimeWidget::init(int mode) // At time radio button/label mAtTimeRadio = new RadioButton(((mode & DEFER_TIME) ? i18n("&Defer to date/time:") : i18n("At &date/time:")), this, "atTimeRadio"); - mAtTimeRadio->setFixedSize(mAtTimeRadio->tqsizeHint()); + mAtTimeRadio->setFixedSize(mAtTimeRadio->sizeHint()); TQWhatsThis::add(mAtTimeRadio, ((mode & DEFER_TIME) ? i18n("Reschedule the alarm to the specified date and time.") : i18n("Schedule the alarm at the specified date and time."))); // Date edit box mDateEdit = new DateEdit(this); - mDateEdit->setFixedSize(mDateEdit->tqsizeHint()); + mDateEdit->setFixedSize(mDateEdit->sizeHint()); 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 @@ -111,7 +111,7 @@ void AlarmTimeWidget::init(int mode) TQHBox* timeBox = new TQHBox(this); timeBox->setSpacing(2*KDialog::spacingHint()); mTimeEdit = new TimeEdit(timeBox); - mTimeEdit->setFixedSize(mTimeEdit->tqsizeHint()); + mTimeEdit->setFixedSize(mTimeEdit->sizeHint()); connect(mTimeEdit, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(dateTimeChanged())); static const TQString enterTimeText = i18n("Enter the time to schedule the alarm."); TQWhatsThis::add(mTimeEdit, @@ -128,7 +128,7 @@ void AlarmTimeWidget::init(int mode) { mAnyTimeAllowed = true; mAnyTimeCheckBox = new CheckBox(i18n("An&y time"), timeBox); - mAnyTimeCheckBox->setFixedSize(mAnyTimeCheckBox->tqsizeHint()); + mAnyTimeCheckBox->setFixedSize(mAnyTimeCheckBox->sizeHint()); connect(mAnyTimeCheckBox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotAnyTimeToggled(bool))); TQWhatsThis::add(mAnyTimeCheckBox, i18n("Schedule the alarm for any time during the day")); } @@ -136,7 +136,7 @@ void AlarmTimeWidget::init(int mode) // 'Time from now' radio button/label mAfterTimeRadio = new RadioButton(((mode & DEFER_TIME) ? i18n("Defer for time &interval:") : i18n_w_TimeFromNow()), this, "afterTimeRadio"); - mAfterTimeRadio->setFixedSize(mAfterTimeRadio->tqsizeHint()); + mAfterTimeRadio->setFixedSize(mAfterTimeRadio->sizeHint()); TQWhatsThis::add(mAfterTimeRadio, ((mode & DEFER_TIME) ? i18n("Reschedule the alarm for the specified time interval after now.") : i18n("Schedule the alarm after the specified time interval from now."))); @@ -144,7 +144,7 @@ void AlarmTimeWidget::init(int mode) // Delay time spin box mDelayTimeEdit = new TimeSpinBox(1, maxDelayTime, this); mDelayTimeEdit->setValue(maxDelayTime); - mDelayTimeEdit->setFixedSize(mDelayTimeEdit->tqsizeHint()); + 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()) @@ -226,7 +226,7 @@ DateTime AlarmTimeWidget::getDateTime(int* minsFromNow, bool checkExpired, bool if (errorWidget) *errorWidget = 0; TQTime nowt = TQTime::currentTime(); - TQDateTime now(TQDate::tqcurrentDate(), TQTime(nowt.hour(), nowt.minute())); + TQDateTime now(TQDate::currentDate(), TQTime(nowt.hour(), nowt.minute())); if (mAtTimeRadio->isOn()) { bool anyTime = mAnyTimeAllowed && mAnyTimeCheckBox && mAnyTimeCheckBox->isChecked(); @@ -328,7 +328,7 @@ void AlarmTimeWidget::setMinDateTimeIsCurrent() { mMinDateTimeIsNow = true; mMinDateTime = TQDateTime(); - TQDateTime now = TQDateTime::tqcurrentDateTime(); + TQDateTime now = TQDateTime::currentDateTime(); mDateEdit->setMinDate(now.date()); setMaxMinTimeIf(now); } @@ -342,7 +342,7 @@ void AlarmTimeWidget::setMinDateTime(const TQDateTime& dt) mMinDateTimeIsNow = false; mMinDateTime = dt; mDateEdit->setMinDate(dt.date()); - setMaxMinTimeIf(TQDateTime::tqcurrentDateTime()); + setMaxMinTimeIf(TQDateTime::currentDateTime()); } /****************************************************************************** @@ -357,7 +357,7 @@ void AlarmTimeWidget::setMaxDateTime(const DateTime& dt) else mMaxDateTime = dt.dateTime(); mDateEdit->setMaxDate(mMaxDateTime.date()); - TQDateTime now = TQDateTime::tqcurrentDateTime(); + TQDateTime now = TQDateTime::currentDateTime(); setMaxMinTimeIf(now); setMaxDelayTime(now); } @@ -452,13 +452,13 @@ void AlarmTimeWidget::slotTimer() if (mMinDateTimeIsNow) { // Make sure that the minimum date is updated when the day changes - now = TQDateTime::tqcurrentDateTime(); + now = TQDateTime::currentDateTime(); mDateEdit->setMinDate(now.date()); } if (mMaxDateTime.isValid()) { if (!now.isValid()) - now = TQDateTime::tqcurrentDateTime(); + now = TQDateTime::currentDateTime(); if (!mPastMax) { // Check whether the maximum date/time has now been reached @@ -502,7 +502,7 @@ void AlarmTimeWidget::slotButtonSet(int) mAnyTimeCheckBox->setEnabled(at && mAnyTimeAllowed); // Ensure that the value of the delay edit box is > 0. TQDateTime dt(mDateEdit->date(), mTimeEdit->time()); - int minutes = (TQDateTime::tqcurrentDateTime().secsTo(dt) + 59) / 60; + int minutes = (TQDateTime::currentDateTime().secsTo(dt) + 59) / 60; if (minutes <= 0) mDelayTimeEdit->setValid(true); mDelayTimeEdit->setEnabled(!at); @@ -525,7 +525,7 @@ void AlarmTimeWidget::slotAnyTimeToggled(bool on) void AlarmTimeWidget::dateTimeChanged() { TQDateTime dt(mDateEdit->date(), mTimeEdit->time()); - int minutes = (TQDateTime::tqcurrentDateTime().secsTo(dt) + 59) / 60; + int minutes = (TQDateTime::currentDateTime().secsTo(dt) + 59) / 60; bool blocked = mDelayTimeEdit->signalsBlocked(); mDelayTimeEdit->blockSignals(true); // prevent infinite recursion between here and delayTimeChanged() if (minutes <= 0 || minutes > mDelayTimeEdit->maxValue()) @@ -543,7 +543,7 @@ void AlarmTimeWidget::delayTimeChanged(int minutes) { if (mDelayTimeEdit->isValid()) { - TQDateTime dt = TQDateTime::tqcurrentDateTime().addSecs(minutes * 60); + TQDateTime dt = TQDateTime::currentDateTime().addSecs(minutes * 60); bool blockedT = mTimeEdit->signalsBlocked(); bool blockedD = mDateEdit->signalsBlocked(); mTimeEdit->blockSignals(true); // prevent infinite recursion between here and dateTimeChanged() diff --git a/kalarm/alarmtimewidget.h b/kalarm/alarmtimewidget.h index a4f438578..3525acf62 100644 --- a/kalarm/alarmtimewidget.h +++ b/kalarm/alarmtimewidget.h @@ -53,7 +53,7 @@ class AlarmTimeWidget : public ButtonGroup bool anyTime() const { return mAnyTime; } void enableAnyTime(bool enable); void selectTimeFromNow(int minutes = 0); - TQSize tqsizeHint() const { return tqminimumSizeHint(); } + TQSize sizeHint() const { return minimumSizeHint(); } static TQString i18n_w_TimeFromNow(); // text of 'Time from now:' radio button, with 'w' shortcut static TQString i18n_TimeAfterPeriod(); diff --git a/kalarm/birthdaydlg.cpp b/kalarm/birthdaydlg.cpp index 97e7bc6f7..dd4ab50f6 100644 --- a/kalarm/birthdaydlg.cpp +++ b/kalarm/birthdaydlg.cpp @@ -81,15 +81,15 @@ BirthdayDlg::BirthdayDlg(TQWidget* parent) // Prefix and suffix to the name in the alarm text // Get default prefix and suffix texts from config file KConfig* config = kapp->config(); - config->setGroup(TQString::tqfromLatin1("General")); - mPrefixText = config->readEntry(TQString::tqfromLatin1("BirthdayPrefix"), i18n("Birthday: ")); - mSuffixText = config->readEntry(TQString::tqfromLatin1("BirthdaySuffix")); + config->setGroup(TQString::fromLatin1("General")); + mPrefixText = config->readEntry(TQString::fromLatin1("BirthdayPrefix"), i18n("Birthday: ")); + mSuffixText = config->readEntry(TQString::fromLatin1("BirthdaySuffix")); TQGroupBox* textGroup = new TQGroupBox(2, Qt::Horizontal, i18n("Alarm Text"), topWidget); topLayout->addWidget(textGroup); TQLabel* label = new TQLabel(i18n("Pre&fix:"), textGroup); mPrefix = new BLineEdit(mPrefixText, textGroup); - mPrefix->setMinimumSize(mPrefix->tqsizeHint()); + mPrefix->setMinimumSize(mPrefix->sizeHint()); label->setBuddy(mPrefix); connect(mPrefix, TQT_SIGNAL(focusLost()), TQT_SLOT(slotTextLostFocus())); TQWhatsThis::add(mPrefix, @@ -98,7 +98,7 @@ BirthdayDlg::BirthdayDlg(TQWidget* parent) label = new TQLabel(i18n("S&uffix:"), textGroup); mSuffix = new BLineEdit(mSuffixText, textGroup); - mSuffix->setMinimumSize(mSuffix->tqsizeHint()); + mSuffix->setMinimumSize(mSuffix->sizeHint()); label->setBuddy(mSuffix); connect(mSuffix, TQT_SIGNAL(focusLost()), TQT_SLOT(slotTextLostFocus())); TQWhatsThis::add(mSuffix, @@ -128,12 +128,12 @@ BirthdayDlg::BirthdayDlg(TQWidget* parent) // Font and colour choice button and sample text mFontColourButton = new FontColourButton(group); - mFontColourButton->setMaximumHeight(mFontColourButton->tqsizeHint().height() * 3/2); + mFontColourButton->setMaximumHeight(mFontColourButton->sizeHint().height() * 3/2); groupLayout->addWidget(mFontColourButton); // Sound checkbox and file selector mSoundPicker = new SoundPicker(group); - mSoundPicker->setFixedSize(mSoundPicker->tqsizeHint()); + mSoundPicker->setFixedSize(mSoundPicker->sizeHint()); groupLayout->addWidget(mSoundPicker, 0, TQt::AlignAuto); // How much to advance warning to give @@ -142,7 +142,7 @@ BirthdayDlg::BirthdayDlg(TQWidget* parent) i18n("Enter the number of days before each birthday to display a reminder. " "This is in addition to the alarm which is displayed on the birthday."), false, false, group); - mReminder->setFixedSize(mReminder->tqsizeHint()); + mReminder->setFixedSize(mReminder->sizeHint()); mReminder->setMaximum(0, 364); mReminder->setMinutes(0, true); groupLayout->addWidget(mReminder, 0, TQt::AlignAuto); @@ -295,7 +295,7 @@ void BirthdayDlg::updateSelectionList() TQValueList<KAEvent> BirthdayDlg::events() const { TQValueList<KAEvent> list; - TQDate today = TQDate::tqcurrentDate(); + TQDate today = TQDate::currentDate(); TQDateTime todayNoon(today, TQTime(12, 0, 0)); int thisYear = today.year(); int reminder = mReminder->minutes(); @@ -344,9 +344,9 @@ void BirthdayDlg::slotOk() { // Save prefix and suffix texts to use as future defaults KConfig* config = kapp->config(); - config->setGroup(TQString::tqfromLatin1("General")); - config->writeEntry(TQString::tqfromLatin1("BirthdayPrefix"), mPrefix->text()); - config->writeEntry(TQString::tqfromLatin1("BirthdaySuffix"), mSuffix->text()); + config->setGroup(TQString::fromLatin1("General")); + config->writeEntry(TQString::fromLatin1("BirthdayPrefix"), mPrefix->text()); + config->writeEntry(TQString::fromLatin1("BirthdaySuffix"), mSuffix->text()); config->sync(); mFlags = (mSoundPicker->sound() == SoundPicker::BEEP ? KAEvent::BEEP : 0) diff --git a/kalarm/calendarcompat.cpp b/kalarm/calendarcompat.cpp index 0d049fed0..fef0f59df 100644 --- a/kalarm/calendarcompat.cpp +++ b/kalarm/calendarcompat.cpp @@ -80,7 +80,7 @@ int CalendarCompat::readKAlarmVersion(KCal::Calendar& calendar, TQString& subVer const TQString& prodid = calendar.productId(); // Find the KAlarm identifier - TQString progname = TQString::tqfromLatin1(" KAlarm "); + TQString progname = TQString::fromLatin1(" KAlarm "); int i = prodid.find(progname, 0, false); if (i < 0) { @@ -124,9 +124,9 @@ bool CalendarCompat::isUTC(const TQString& localFile) file.close(); // Extract the CREATED property for the first VEVENT from the calendar - TQString VCALENDAR = TQString::tqfromLatin1("BEGIN:VCALENDAR"); - TQString VEVENT = TQString::tqfromLatin1("BEGIN:VEVENT"); - TQString CREATED = TQString::tqfromLatin1("CREATED:"); + TQString VCALENDAR = TQString::fromLatin1("BEGIN:VCALENDAR"); + TQString VEVENT = TQString::fromLatin1("BEGIN:VEVENT"); + TQString CREATED = TQString::fromLatin1("CREATED:"); TQStringList lines = TQStringList::split(TQChar('\n'), text); for (TQStringList::ConstIterator it = lines.begin(); it != lines.end(); ++it) { diff --git a/kalarm/daemon.cpp b/kalarm/daemon.cpp index 1f8820bff..a970b94e1 100644 --- a/kalarm/daemon.cpp +++ b/kalarm/daemon.cpp @@ -58,7 +58,7 @@ class NotificationHandler : public TQObject, virtual public AlarmGuiIface NotificationHandler(); private: // DCOP interface - void alarmDaemonUpdate(int calendartqStatus, const TQString& calendarURL); + void alarmDaemonUpdate(int calendarStatus, const TQString& calendarURL); void handleEvent(const TQString& calendarURL, const TQString& eventID); void registered(bool reregister, int result, int version); }; @@ -74,7 +74,7 @@ TQTimer* Daemon::mStatusTimer = 0; int Daemon::mStatusTimerCount = 0; int Daemon::mStatusTimerInterval; int Daemon::mStartTimeout = 0; -Daemon::tqStatus Daemon::mtqStatus = Daemon::STOPPED; +Daemon::Status Daemon::mStatus = Daemon::STOPPED; bool Daemon::mRunning = false; bool Daemon::mCalendarDisabled = false; bool Daemon::mEnableCalPending = false; @@ -125,8 +125,8 @@ void Daemon::createDcopHandler() bool Daemon::start() { kdDebug(5950) << "Daemon::start()\n"; - updateRegisteredtqStatus(); - switch (mtqStatus) + updateRegisteredStatus(); + switch (mStatus) { case STOPPED: { @@ -134,7 +134,7 @@ bool Daemon::start() return true; // we're currently waiting for the daemon to start // Start the alarm daemon. It is a KUniqueApplication, which means that // there is automatically only one instance of the alarm daemon running. - TQString execStr = locate("exe", TQString::tqfromLatin1(DAEMON_APP_NAME)); + TQString execStr = locate("exe", TQString::fromLatin1(DAEMON_APP_NAME)); if (execStr.isEmpty()) { KMessageBox::error(0, i18n("Alarm daemon not found.")); @@ -173,7 +173,7 @@ bool Daemon::registerWith(bool reregister) { if (mRegisterTimer) return true; - switch (mtqStatus) + switch (mStatus) { case STOPPED: case RUNNING: @@ -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::tqfromLatin1(DAEMON_APP_NAME)); + .tqarg(TQString::fromLatin1(DAEMON_APP_NAME)); } else { @@ -236,7 +236,7 @@ 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::tqfromLatin1(DAEMON_APP_NAME)) + .tqarg(TQString::fromLatin1(DAEMON_APP_NAME)) .tqarg(kapp->aboutData()->appName())); break; case KAlarmd::FAILURE: @@ -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::tqfromLatin1(DAEMON_APP_NAME)); + .tqarg(TQString::fromLatin1(DAEMON_APP_NAME)); } break; } @@ -258,8 +258,8 @@ void Daemon::registrationResult(bool reregister, int result, int version) { if (!errmsg.isEmpty()) { - if (mtqStatus == REGISTERED) - mtqStatus = READY; + if (mStatus == REGISTERED) + mStatus = READY; if (!mRegisterFailMsg) { mRegisterFailMsg = true; @@ -272,7 +272,7 @@ void Daemon::registrationResult(bool reregister, int result, int version) if (!reregister) { // The alarm daemon has loaded the calendar - mtqStatus = REGISTERED; + mStatus = REGISTERED; mRegisterFailMsg = false; kdDebug(5950) << "Daemon::start(): daemon startup complete" << endl; } @@ -283,9 +283,9 @@ void Daemon::registrationResult(bool reregister, int result, int version) */ void Daemon::checkIfStarted() { - updateRegisteredtqStatus(); + updateRegisteredStatus(); bool err = false; - switch (mtqStatus) + switch (mStatus) { case STOPPED: if (--mStartTimeout > 0) @@ -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::tqfromLatin1(DAEMON_APP_NAME))); + KMessageBox::error(0, i18n("Cannot enable alarms:\nFailed to start Alarm Daemon (%1)").tqarg(TQString::fromLatin1(DAEMON_APP_NAME))); } } @@ -312,27 +312,27 @@ void Daemon::checkIfStarted() * Check whether the alarm daemon has started yet, and if so, whether it is * ready to accept DCOP calls. */ -void Daemon::updateRegisteredtqStatus(bool timeout) +void Daemon::updateRegisteredStatus(bool timeout) { if (!kapp->dcopClient()->isApplicationRegistered(DAEMON_APP_NAME)) { - mtqStatus = STOPPED; + mStatus = STOPPED; mRegisterFailMsg = false; } else { - switch (mtqStatus) + switch (mStatus) { case STOPPED: // The daemon has newly been detected as registered with DCOP. // Wait for a short time to ensure that it is ready for DCOP calls. - mtqStatus = RUNNING; + mStatus = RUNNING; TQTimer::singleShot(startCheckInterval, mInstance, TQT_SLOT(slotStarted())); break; case RUNNING: if (timeout) { - mtqStatus = READY; + mStatus = READY; start(); } break; @@ -341,7 +341,7 @@ void Daemon::updateRegisteredtqStatus(bool timeout) break; } } - kdDebug(5950) << "Daemon::updateRegisteredStatus() -> " << mtqStatus << endl; + kdDebug(5950) << "Daemon::updateRegisteredStatus() -> " << mStatus << endl; } /****************************************************************************** @@ -414,8 +414,8 @@ void Daemon::enableAutoStart(bool enable) // The return status doesn't report failure even if the daemon isn't running, // so in case of failure, rewrite the config file in any case. KConfig adconfig(locate("config", DAEMON_APP_NAME"rc")); - adconfig.setGroup(TQString::tqfromLatin1(DAEMON_AUTOSTART_SECTION)); - adconfig.writeEntry(TQString::tqfromLatin1(DAEMON_AUTOSTART_KEY), enable); + adconfig.setGroup(TQString::fromLatin1(DAEMON_AUTOSTART_SECTION)); + adconfig.writeEntry(TQString::fromLatin1(DAEMON_AUTOSTART_KEY), enable); adconfig.sync(); } @@ -437,8 +437,8 @@ void Daemon::notifyTimeChanged() bool Daemon::autoStart() { KConfig adconfig(locate("config", DAEMON_APP_NAME"rc")); - adconfig.setGroup(TQString::tqfromLatin1(DAEMON_AUTOSTART_SECTION)); - return adconfig.readBoolEntry(TQString::tqfromLatin1(DAEMON_AUTOSTART_KEY), true); + adconfig.setGroup(TQString::fromLatin1(DAEMON_AUTOSTART_SECTION)); + return adconfig.readBoolEntry(TQString::fromLatin1(DAEMON_AUTOSTART_KEY), true); } /****************************************************************************** @@ -491,8 +491,8 @@ bool Daemon::monitoringAlarms() bool Daemon::isRunning(bool startdaemon) { static bool runState = false; - updateRegisteredtqStatus(); - bool newRunState = (mtqStatus == READY || mtqStatus == REGISTERED); + updateRegisteredStatus(); + bool newRunState = (mStatus == READY || mStatus == REGISTERED); if (newRunState != runState) { // Daemon's status has changed @@ -500,7 +500,7 @@ bool Daemon::isRunning(bool startdaemon) if (runState && startdaemon) start(); // re-register with the daemon } - return runState && (mtqStatus == REGISTERED); + return runState && (mStatus == REGISTERED); } /****************************************************************************** @@ -666,10 +666,10 @@ NotificationHandler::NotificationHandler() * The daemon notifies calendar statuses when we first register as a GUI, and whenever * a calendar status changes. So we don't need to read its config files. */ -void NotificationHandler::alarmDaemonUpdate(int calendartqStatus, const TQString& calendarURL) +void NotificationHandler::alarmDaemonUpdate(int calendarStatus, const TQString& calendarURL) { - kdDebug(5950) << "NotificationHandler::alarmDaemonUpdate(" << calendartqStatus << ")\n"; - KAlarmd::CalendartqStatus status = KAlarmd::CalendartqStatus(calendartqStatus); + kdDebug(5950) << "NotificationHandler::alarmDaemonUpdate(" << calendarStatus << ")\n"; + KAlarmd::CalendarStatus status = KAlarmd::CalendarStatus(calendarStatus); if (expandURL(calendarURL) != AlarmCalendar::activeCalendar()->urlString()) return; // it's not a notification about KAlarm's calendar bool enabled = false; @@ -700,7 +700,7 @@ void NotificationHandler::alarmDaemonUpdate(int calendartqStatus, const TQString void NotificationHandler::handleEvent(const TQString& url, const TQString& eventId) { TQString id = eventId; - if (id.startsWith(TQString::tqfromLatin1("ad:"))) + if (id.startsWith(TQString::fromLatin1("ad:"))) { // It's a notification from the alarm deamon id = id.mid(3); diff --git a/kalarm/daemon.h b/kalarm/daemon.h index df3fdd4d2..a43d7a42e 100644 --- a/kalarm/daemon.h +++ b/kalarm/daemon.h @@ -51,11 +51,11 @@ class Daemon : public TQObject static void enableAutoStart(bool enable); static void notifyTimeChanged(); static void setAlarmsEnabled() { mInstance->setAlarmsEnabled(true); } - static void checktqStatus() { checkIfRunning(); } + static void checkStatus() { checkIfRunning(); } static bool monitoringAlarms(); static bool isRunning(bool startDaemon = true); static int maxTimeSinceCheck(); - static bool isRegistered() { return mtqStatus == REGISTERED; } + static bool isRegistered() { return mStatus == REGISTERED; } static void allowRegisterFailMsg() { mRegisterFailMsg = false; } static void queueEvent(const TQString& eventID); @@ -68,15 +68,15 @@ class Daemon : public TQObject private slots: void slotCalendarSaved(AlarmCalendar*); void checkIfStarted(); - void slotStarted() { updateRegisteredtqStatus(true); } - void registerTimerExpired() { registrationResult((mtqStatus == REGISTERED), KAlarmd::FAILURE); } + void slotStarted() { updateRegisteredStatus(true); } + void registerTimerExpired() { registrationResult((mStatus == REGISTERED), KAlarmd::FAILURE); } void setAlarmsEnabled(bool enable); void timerCheckIfRunning(); void slotPreferencesChanged(); private: - enum tqStatus // daemon status. KEEP IN THIS ORDER!! + enum Status // daemon status. KEEP IN THIS ORDER!! { STOPPED, // daemon is not registered with DCOP RUNNING, // daemon is newly registered with DCOP @@ -88,7 +88,7 @@ class Daemon : public TQObject static void registrationResult(bool reregister, int result, int version = 0); static void reload(); static void notifyEventHandled(const TQString& eventID, bool reloadCal); - static void updateRegisteredtqStatus(bool timeout = false); + static void updateRegisteredStatus(bool timeout = false); static void enableCalendar(bool enable); static void calendarIsEnabled(bool enabled); static bool checkIfRunning(); @@ -104,7 +104,7 @@ class Daemon : public TQObject static int mStatusTimerCount; // countdown for fast status checking static int mStatusTimerInterval; // timer interval (seconds) for checking daemon status static int mStartTimeout; // remaining number of times to check if alarm daemon has started - static tqStatus mtqStatus; // daemon status + static Status mStatus; // daemon status static bool mRunning; // whether the alarm daemon is currently running static bool mCalendarDisabled; // monitoring of calendar is currently disabled by daemon static bool mEnableCalPending; // waiting to tell daemon to enable calendar diff --git a/kalarm/dcophandler.cpp b/kalarm/dcophandler.cpp index f1a08df8a..5fa716e16 100644 --- a/kalarm/dcophandler.cpp +++ b/kalarm/dcophandler.cpp @@ -342,7 +342,7 @@ DateTime DcopHandler::convertStartDateTime(const TQString& startDateTime) else { // It's a time, so use today as the date - start.set(TQDate::tqcurrentDate(), TQTime::fromString(t, Qt::ISODate)); + start.set(TQDate::currentDate(), TQTime::fromString(t, Qt::ISODate)); } } if (!start.isValid()) diff --git a/kalarm/editdlg.cpp b/kalarm/editdlg.cpp index 15a2b38ae..acb7df637 100644 --- a/kalarm/editdlg.cpp +++ b/kalarm/editdlg.cpp @@ -129,7 +129,7 @@ inline TQString recurText(const KAEvent& event) { TQString r; if (event.repeatCount()) - r = TQString::tqfromLatin1("%1 / %2").tqarg(event.recurrenceText()).tqarg(event.repetitionText()); + r = TQString::fromLatin1("%1 / %2").tqarg(event.recurrenceText()).tqarg(event.repetitionText()); else r = event.recurrenceText(); return i18n("&Recurrence - [%1]").tqarg(r); @@ -196,12 +196,12 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par TQHBox* box = new TQHBox(mainWidget); box->setSpacing(spacingHint()); TQLabel* label = new TQLabel(i18n("Template name:"), box); - label->setFixedSize(label->tqsizeHint()); + label->setFixedSize(label->sizeHint()); mTemplateName = new TQLineEdit(box); mTemplateName->setReadOnly(mReadOnly); label->setBuddy(mTemplateName); TQWhatsThis::add(box, i18n("Enter the name of the alarm template")); - box->setFixedHeight(box->tqsizeHint().height()); + box->setFixedHeight(box->sizeHint().height()); } mTabs = new TQTabWidget(mainWidget); mTabs->setMargin(marginHint()); @@ -236,7 +236,7 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par // Message radio button mMessageRadio = new RadioButton(i18n("Te&xt"), mActionGroup, "messageButton"); - mMessageRadio->setFixedSize(mMessageRadio->tqsizeHint()); + mMessageRadio->setFixedSize(mMessageRadio->sizeHint()); TQWhatsThis::add(mMessageRadio, i18n("If checked, the alarm will display a text message.")); grid->addWidget(mMessageRadio, 1, 0); @@ -244,7 +244,7 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par // File radio button mFileRadio = new PickAlarmFileRadio(i18n("&File"), mActionGroup, "fileButton"); - mFileRadio->setFixedSize(mFileRadio->tqsizeHint()); + mFileRadio->setFixedSize(mFileRadio->sizeHint()); TQWhatsThis::add(mFileRadio, i18n("If checked, the alarm will display the contents of a text or image file.")); grid->addWidget(mFileRadio, 1, 2); @@ -252,7 +252,7 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par // Command radio button mCommandRadio = new RadioButton(i18n("Co&mmand"), mActionGroup, "cmdButton"); - mCommandRadio->setFixedSize(mCommandRadio->tqsizeHint()); + mCommandRadio->setFixedSize(mCommandRadio->sizeHint()); TQWhatsThis::add(mCommandRadio, i18n("If checked, the alarm will execute a shell command.")); grid->addWidget(mCommandRadio, 1, 4); @@ -260,7 +260,7 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par // Email radio button mEmailRadio = new RadioButton(i18n("&Email"), mActionGroup, "emailButton"); - mEmailRadio->setFixedSize(mEmailRadio->tqsizeHint()); + mEmailRadio->setFixedSize(mEmailRadio->sizeHint()); TQWhatsThis::add(mEmailRadio, i18n("If checked, the alarm will send an email.")); grid->addWidget(mEmailRadio, 1, 6); @@ -276,11 +276,11 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par mDeferGroup = new TQGroupBox(1, Qt::Vertical, i18n("Deferred Alarm"), mainPage, "deferGroup"); topLayout->addWidget(mDeferGroup); TQLabel* label = new TQLabel(i18n("Deferred to:"), mDeferGroup); - label->setFixedSize(label->tqsizeHint()); + label->setFixedSize(label->sizeHint()); mDeferTimeLabel = new TQLabel(mDeferGroup); mDeferChangeButton = new TQPushButton(i18n("C&hange..."), mDeferGroup); - mDeferChangeButton->setFixedSize(mDeferChangeButton->tqsizeHint()); + mDeferChangeButton->setFixedSize(mDeferChangeButton->sizeHint()); connect(mDeferChangeButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotEditDeferral())); TQWhatsThis::add(mDeferChangeButton, i18n("Change the alarm's deferred time, or cancel the deferral")); mDeferGroup->addSpace(0); @@ -299,7 +299,7 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par int tqalignment = TQApplication::reverseLayout() ? TQt::AlignRight : TQt::AlignLeft; mTemplateDefaultTime = new RadioButton(i18n("&Default time"), mTemplateTimeGroup, "templateDefTimeButton"); - mTemplateDefaultTime->setFixedSize(mTemplateDefaultTime->tqsizeHint()); + mTemplateDefaultTime->setFixedSize(mTemplateDefaultTime->sizeHint()); mTemplateDefaultTime->setReadOnly(mReadOnly); TQWhatsThis::add(mTemplateDefaultTime, i18n("Do not specify a start time for alarms based on this template. " @@ -309,23 +309,23 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par TQHBox* box = new TQHBox(mTemplateTimeGroup); box->setSpacing(spacingHint()); mTemplateUseTime = new RadioButton(i18n("Time:"), box, "templateTimeButton"); - mTemplateUseTime->setFixedSize(mTemplateUseTime->tqsizeHint()); + mTemplateUseTime->setFixedSize(mTemplateUseTime->sizeHint()); mTemplateUseTime->setReadOnly(mReadOnly); TQWhatsThis::add(mTemplateUseTime, i18n("Specify a start time for alarms based on this template.")); mTemplateTimeGroup->insert(mTemplateUseTime); mTemplateTime = new TimeEdit(box, "templateTimeEdit"); - mTemplateTime->setFixedSize(mTemplateTime->tqsizeHint()); + 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())); box->setStretchFactor(new TQWidget(box), 1); // left adjust the controls - box->setFixedHeight(box->tqsizeHint().height()); + box->setFixedHeight(box->sizeHint().height()); grid->addWidget(box, 0, 1, tqalignment); mTemplateAnyTime = new RadioButton(i18n("An&y time"), mTemplateTimeGroup, "templateAnyTimeButton"); - mTemplateAnyTime->setFixedSize(mTemplateAnyTime->tqsizeHint()); + 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"))); @@ -334,7 +334,7 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par box = new TQHBox(mTemplateTimeGroup); box->setSpacing(spacingHint()); mTemplateUseTimeAfter = new RadioButton(AlarmTimeWidget::i18n_w_TimeFromNow(), box, "templateFromNowButton"); - mTemplateUseTimeAfter->setFixedSize(mTemplateUseTimeAfter->tqsizeHint()); + mTemplateUseTimeAfter->setFixedSize(mTemplateUseTimeAfter->sizeHint()); mTemplateUseTimeAfter->setReadOnly(mReadOnly); TQWhatsThis::add(mTemplateUseTimeAfter, i18n("Set alarms based on this template to start after the specified time " @@ -342,12 +342,12 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par mTemplateTimeGroup->insert(mTemplateUseTimeAfter); mTemplateTimeAfter = new TimeSpinBox(1, maxDelayTime, box); mTemplateTimeAfter->setValue(1439); - mTemplateTimeAfter->setFixedSize(mTemplateTimeAfter->tqsizeHint()); + mTemplateTimeAfter->setFixedSize(mTemplateTimeAfter->sizeHint()); mTemplateTimeAfter->setReadOnly(mReadOnly); TQWhatsThis::add(mTemplateTimeAfter, TQString("%1\n\n%2").tqarg(AlarmTimeWidget::i18n_TimeAfterPeriod()) .tqarg(TimeSpinBox::shiftWhatsThis())); - box->setFixedHeight(box->tqsizeHint().height()); + box->setFixedHeight(box->sizeHint().height()); grid->addWidget(box, 1, 1, tqalignment); tqlayout->addStretch(); @@ -365,7 +365,7 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par 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()), true, true, mainPage); - mReminder->setFixedSize(mReminder->tqsizeHint()); + mReminder->setFixedSize(mReminder->sizeHint()); topLayout->addWidget(mReminder, 0, TQt::AlignAuto); // Late cancel selector - default = allow late display @@ -375,7 +375,7 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par // Acknowledgement confirmation required - default = no confirmation tqlayout = new TQHBoxLayout(topLayout, 0); mConfirmAck = createConfirmAckCheckbox(mainPage); - mConfirmAck->setFixedSize(mConfirmAck->tqsizeHint()); + mConfirmAck->setFixedSize(mConfirmAck->sizeHint()); tqlayout->addWidget(mConfirmAck); tqlayout->addSpacing(2*spacingHint()); tqlayout->addStretch(); @@ -384,7 +384,7 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par { // Show in KOrganizer checkbox mShowInKorganizer = new CheckBox(i18n_ShowInKOrganizer(), mainPage); - mShowInKorganizer->setFixedSize(mShowInKorganizer->tqsizeHint()); + mShowInKorganizer->setFixedSize(mShowInKorganizer->sizeHint()); TQWhatsThis::add(mShowInKorganizer, i18n("Check to copy the alarm into KOrganizer's calendar")); tqlayout->addWidget(mShowInKorganizer); } @@ -436,14 +436,14 @@ void EditAlarmDlg::initDisplayAlarms(TQWidget* parent) // File browse button mFileBrowseButton = new TQPushButton(mFileBox); mFileBrowseButton->setPixmap(SmallIcon("fileopen")); - mFileBrowseButton->setFixedSize(mFileBrowseButton->tqsizeHint()); + mFileBrowseButton->setFixedSize(mFileBrowseButton->sizeHint()); TQToolTip::add(mFileBrowseButton, i18n("Choose a file")); TQWhatsThis::add(mFileBrowseButton, i18n("Select a text or image file to display.")); mFileRadio->init(mFileBrowseButton, mFileMessageEdit); // Font and colour choice button and sample text mFontColourButton = new FontColourButton(mDisplayAlarmsFrame); - mFontColourButton->setMaximumHeight(mFontColourButton->tqsizeHint().height()); + mFontColourButton->setMaximumHeight(mFontColourButton->sizeHint().height()); frameLayout->addWidget(mFontColourButton); TQHBoxLayout* tqlayout = new TQHBoxLayout(frameLayout, 0, 0); @@ -459,7 +459,7 @@ void EditAlarmDlg::initDisplayAlarms(TQWidget* parent) // Sound checkbox and file selector tqlayout = new TQHBoxLayout(frameLayout); mSoundPicker = new SoundPicker(mDisplayAlarmsFrame); - mSoundPicker->setFixedSize(mSoundPicker->tqsizeHint()); + mSoundPicker->setFixedSize(mSoundPicker->sizeHint()); tqlayout->addWidget(mSoundPicker); tqlayout->addSpacing(2*spacingHint()); tqlayout->addStretch(); @@ -468,7 +468,7 @@ void EditAlarmDlg::initDisplayAlarms(TQWidget* parent) { // Special actions button mSpecialActionsButton = new SpecialActionsButton(i18n_SpecialActions(), mDisplayAlarmsFrame); - mSpecialActionsButton->setFixedSize(mSpecialActionsButton->tqsizeHint()); + mSpecialActionsButton->setFixedSize(mSpecialActionsButton->sizeHint()); tqlayout->addWidget(mSpecialActionsButton); } @@ -488,7 +488,7 @@ void EditAlarmDlg::initCommand(TQWidget* parent) TQBoxLayout* frameLayout = new TQVBoxLayout(mCommandFrame, 0, spacingHint()); mCmdTypeScript = new CheckBox(i18n_p_EnterScript(), mCommandFrame); - mCmdTypeScript->setFixedSize(mCmdTypeScript->tqsizeHint()); + mCmdTypeScript->setFixedSize(mCmdTypeScript->sizeHint()); connect(mCmdTypeScript, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotCmdScriptToggled(bool))); TQWhatsThis::add(mCmdTypeScript, i18n("Check to enter the contents of a script instead of a shell command line")); frameLayout->addWidget(mCmdTypeScript, 0, TQt::AlignAuto); @@ -510,7 +510,7 @@ void EditAlarmDlg::initCommand(TQWidget* parent) // Execute in terminal window RadioButton* button = new RadioButton(i18n_u_ExecInTermWindow(), mCmdOutputGroup, "execInTerm"); - button->setFixedSize(button->tqsizeHint()); + button->setFixedSize(button->sizeHint()); TQWhatsThis::add(button, i18n("Check to execute the command in a terminal window")); mCmdOutputGroup->insert(button, EXEC_IN_TERMINAL); tqlayout->addWidget(button, 0, TQt::AlignAuto); @@ -518,7 +518,7 @@ void EditAlarmDlg::initCommand(TQWidget* parent) // Log file name edit box TQHBox* box = new TQHBox(mCmdOutputGroup); (new TQWidget(box))->setFixedWidth(button->tqstyle().subRect(TQStyle::SR_RadioButtonIndicator, button).width()); // indent the edit box -// (new TQWidget(box))->setFixedWidth(button->style().tqpixelMetric(TQStyle::PM_ExclusiveIndicatorWidth)); // indent the edit box +// (new TQWidget(box))->setFixedWidth(button->style().pixelMetric(TQStyle::PM_ExclusiveIndicatorWidth)); // indent the edit box mCmdLogFileEdit = new LineEdit(LineEdit::Url, box); mCmdLogFileEdit->setAcceptDrops(true); TQWhatsThis::add(mCmdLogFileEdit, i18n("Enter the name or path of the log file.")); @@ -527,13 +527,13 @@ void EditAlarmDlg::initCommand(TQWidget* parent) // The file browser dialogue is activated by the PickLogFileRadio class. TQPushButton* browseButton = new TQPushButton(box); browseButton->setPixmap(SmallIcon("fileopen")); - browseButton->setFixedSize(browseButton->tqsizeHint()); + browseButton->setFixedSize(browseButton->sizeHint()); TQToolTip::add(browseButton, i18n("Choose a file")); TQWhatsThis::add(browseButton, i18n("Select a log file.")); // Log output to file button = new PickLogFileRadio(browseButton, mCmdLogFileEdit, i18n_g_LogToFile(), mCmdOutputGroup, "cmdLog"); - button->setFixedSize(button->tqsizeHint()); + button->setFixedSize(button->sizeHint()); TQWhatsThis::add(button, i18n("Check to log the command output to a local file. The output will be appended to any existing contents of the file.")); mCmdOutputGroup->insert(button, LOG_TO_FILE); @@ -542,7 +542,7 @@ void EditAlarmDlg::initCommand(TQWidget* parent) // Discard output button = new RadioButton(i18n("Discard"), mCmdOutputGroup, "cmdDiscard"); - button->setFixedSize(button->tqsizeHint()); + button->setFixedSize(button->sizeHint()); TQWhatsThis::add(button, i18n("Check to discard command output.")); mCmdOutputGroup->insert(button, DISCARD_OUTPUT); tqlayout->addWidget(button, 0, TQt::AlignAuto); @@ -569,11 +569,11 @@ void EditAlarmDlg::initEmail(TQWidget* parent) { // Email sender identity TQLabel* label = new TQLabel(i18n_EmailFrom(), mEmailFrame); - label->setFixedSize(label->tqsizeHint()); + label->setFixedSize(label->sizeHint()); grid->addWidget(label, 0, 0); mEmailFromList = new EmailIdCombo(KAMail::identityManager(), mEmailFrame); - mEmailFromList->setMinimumSize(mEmailFromList->tqsizeHint()); + mEmailFromList->setMinimumSize(mEmailFromList->sizeHint()); label->setBuddy(mEmailFromList); TQWhatsThis::add(mEmailFromList, i18n("Your email identity, used to identify you as the sender when sending email alarms.")); @@ -582,11 +582,11 @@ void EditAlarmDlg::initEmail(TQWidget* parent) // Email recipients TQLabel* label = new TQLabel(i18n_EmailTo(), mEmailFrame); - label->setFixedSize(label->tqsizeHint()); + label->setFixedSize(label->sizeHint()); grid->addWidget(label, 1, 0); mEmailToEdit = new LineEdit(LineEdit::Emails, mEmailFrame); - mEmailToEdit->setMinimumSize(mEmailToEdit->tqsizeHint()); + mEmailToEdit->setMinimumSize(mEmailToEdit->sizeHint()); TQWhatsThis::add(mEmailToEdit, i18n("Enter the addresses of the email recipients. Separate multiple addresses by " "commas or semicolons.")); @@ -594,7 +594,7 @@ void EditAlarmDlg::initEmail(TQWidget* parent) mEmailAddressButton = new TQPushButton(mEmailFrame); mEmailAddressButton->setPixmap(SmallIcon("contents")); - mEmailAddressButton->setFixedSize(mEmailAddressButton->tqsizeHint()); + mEmailAddressButton->setFixedSize(mEmailAddressButton->sizeHint()); connect(mEmailAddressButton, TQT_SIGNAL(clicked()), TQT_SLOT(openAddressBook())); TQToolTip::add(mEmailAddressButton, i18n("Open address book")); TQWhatsThis::add(mEmailAddressButton, i18n("Select email addresses from your address book.")); @@ -602,11 +602,11 @@ void EditAlarmDlg::initEmail(TQWidget* parent) // Email subject label = new TQLabel(i18n_j_EmailSubject(), mEmailFrame); - label->setFixedSize(label->tqsizeHint()); + label->setFixedSize(label->sizeHint()); grid->addWidget(label, 2, 0); mEmailSubjectEdit = new LineEdit(mEmailFrame); - mEmailSubjectEdit->setMinimumSize(mEmailSubjectEdit->tqsizeHint()); + mEmailSubjectEdit->setMinimumSize(mEmailSubjectEdit->sizeHint()); label->setBuddy(mEmailSubjectEdit); TQWhatsThis::add(mEmailSubjectEdit, i18n("Enter the email subject.")); grid->addMultiCellWidget(mEmailSubjectEdit, 2, 2, 1, 2); @@ -619,11 +619,11 @@ void EditAlarmDlg::initEmail(TQWidget* parent) // Email attachments grid = new TQGridLayout(tqlayout, 2, 3, spacingHint()); label = new TQLabel(i18n("Attachment&s:"), mEmailFrame); - label->setFixedSize(label->tqsizeHint()); + label->setFixedSize(label->sizeHint()); grid->addWidget(label, 0, 0); mEmailAttachList = new TQComboBox(true, mEmailFrame); - mEmailAttachList->setMinimumSize(mEmailAttachList->tqsizeHint()); + mEmailAttachList->setMinimumSize(mEmailAttachList->sizeHint()); mEmailAttachList->lineEdit()->setReadOnly(true); TQListBox* list = mEmailAttachList->listBox(); TQRect rect = list->tqgeometry(); @@ -646,7 +646,7 @@ list->setGeometry(rect.left() - 50, rect.top(), rect.width(), rect.height()); // BCC email to sender mEmailBcc = new CheckBox(i18n_s_CopyEmailToSelf(), mEmailFrame); - mEmailBcc->setFixedSize(mEmailBcc->tqsizeHint()); + mEmailBcc->setFixedSize(mEmailBcc->sizeHint()); TQWhatsThis::add(mEmailBcc, i18n("If checked, the email will be blind copied to you.")); grid->addMultiCellWidget(mEmailBcc, 1, 1, 0, 1, TQt::AlignAuto); @@ -708,7 +708,7 @@ void EditAlarmDlg::initialise(const KAEvent* event) if (event->isTemplate()) { // Initialising from an alarm template: use current date - TQDateTime now = TQDateTime::tqcurrentDateTime(); + TQDateTime now = TQDateTime::currentDateTime(); int afterTime = event->templateAfterTime(); if (afterTime >= 0) { @@ -728,7 +728,7 @@ void EditAlarmDlg::initialise(const KAEvent* event) else { mExpiredRecurrence = recurs && event->mainExpired(); - mTimeWidget->setDateTime(recurs || event->uidtqStatus() == KAEvent::EXPIRED ? event->startDateTime() + mTimeWidget->setDateTime(recurs || event->uidStatus() == KAEvent::EXPIRED ? event->startDateTime() : event->mainExpired() ? event->deferDateTime() : event->mainDateTime()); } } @@ -750,7 +750,7 @@ void EditAlarmDlg::initialise(const KAEvent* event) TimePeriod::HOURS_MINUTES); mLateCancel->showAutoClose(action == KAEvent::MESSAGE || action == KAEvent::FILE); mLateCancel->setAutoClose(event->autoClose()); - mLateCancel->setFixedSize(mLateCancel->tqsizeHint()); + mLateCancel->setFixedSize(mLateCancel->sizeHint()); if (mShowInKorganizer) mShowInKorganizer->setChecked(event->copyToKOrganizer()); mConfirmAck->setChecked(event->confirmAck()); @@ -804,7 +804,7 @@ void EditAlarmDlg::initialise(const KAEvent* event) mFontColourButton->setBgColour(Preferences::defaultBgColour()); mFontColourButton->setFgColour(Preferences::defaultFgColour()); mBgColourButton->setColour(Preferences::defaultBgColour()); - TQDateTime defaultTime = TQDateTime::tqcurrentDateTime().addSecs(60); + TQDateTime defaultTime = TQDateTime::currentDateTime().addSecs(60); if (mTemplate) { mTemplateTimeGroup->setButton(mTemplateTimeGroup->id(mTemplateDefaultTime)); @@ -817,7 +817,7 @@ void EditAlarmDlg::initialise(const KAEvent* event) mLateCancel->setMinutes((Preferences::defaultLateCancel() ? 1 : 0), false, TimePeriod::HOURS_MINUTES); mLateCancel->showAutoClose(true); mLateCancel->setAutoClose(Preferences::defaultAutoClose()); - mLateCancel->setFixedSize(mLateCancel->tqsizeHint()); + mLateCancel->setFixedSize(mLateCancel->sizeHint()); if (mShowInKorganizer) mShowInKorganizer->setChecked(Preferences::defaultCopyToKOrganizer()); mConfirmAck->setChecked(Preferences::defaultConfirmAck()); @@ -1212,7 +1212,7 @@ void EditAlarmDlg::setEvent(KAEvent& event, const TQString& text, bool trial) if (mRecurrenceEdit->repeatType() != RecurrenceEdit::NO_RECUR) { mRecurrenceEdit->updateEvent(event, !mTemplate); - TQDateTime now = TQDateTime::tqcurrentDateTime(); + TQDateTime now = TQDateTime::currentDateTime(); bool dateOnly = mAlarmDateTime.isDateOnly(); if (dateOnly && mAlarmDateTime.date() < now.date() || !dateOnly && mAlarmDateTime.rawDateTime() < now) @@ -1232,7 +1232,7 @@ void EditAlarmDlg::setEvent(KAEvent& event, const TQString& text, bool trial) DateTime remindTime = mAlarmDateTime.addMins(-reminder); if (mDeferDateTime >= remindTime) { - if (remindTime > TQDateTime::tqcurrentDateTime()) + if (remindTime > TQDateTime::currentDateTime()) deferral = false; // ignore deferral if it's after next reminder else if (mDeferDateTime > remindTime) deferReminder = true; // it's the reminder which is being deferred @@ -1298,7 +1298,7 @@ void EditAlarmDlg::showEvent(TQShowEvent* se) if (KAlarm::readConfigWindowSize(EDIT_DIALOG_NAME, s)) s.setHeight(s.height() + (mDeferGroup->isHidden() ? 0 : mDeferGroupHeight)); else - s = tqminimumSize(); + s = minimumSize(); resize(s); } KWin::setOnDesktop(winId(), mDesktop); // ensure it displays on the desktop expected by the user @@ -1381,7 +1381,7 @@ void EditAlarmDlg::slotOk() { if (timedRecurrence) { - TQDateTime now = TQDateTime::tqcurrentDateTime(); + TQDateTime now = TQDateTime::currentDateTime(); if (mAlarmDateTime.date() < now.date() || mAlarmDateTime.date() == now.date() && !mAlarmDateTime.isDateOnly() && mAlarmDateTime.time() < now.time()) @@ -1530,7 +1530,7 @@ void EditAlarmDlg::slotEditDeferral() return; limit = false; } - TQDateTime now = TQDateTime::tqcurrentDateTime(); + TQDateTime now = TQDateTime::currentDateTime(); if (limit) { if (repeatCount && start < now) @@ -1557,7 +1557,7 @@ void EditAlarmDlg::slotEditDeferral() if (reminder) { DateTime remindTime = start.addMins(-reminder); - if (TQDateTime::tqcurrentDateTime() < remindTime) + if (TQDateTime::currentDateTime() < remindTime) start = remindTime; } deferDlg.setLimit(start.addSecs(-60)); @@ -1604,7 +1604,7 @@ void EditAlarmDlg::slotShowRecurrenceEdit() mRecurPageIndex = mTabs->currentPageIndex(); if (!mReadOnly && !mTemplate) { - TQDateTime now = TQDateTime::tqcurrentDateTime(); + TQDateTime now = TQDateTime::currentDateTime(); mAlarmDateTime = mTimeWidget->getDateTime(0, false, false); bool expired = (mAlarmDateTime.dateTime() < now); if (mRecurSetDefaultEndDate) @@ -1826,7 +1826,7 @@ void EditAlarmDlg::slotAlarmTypeChanged(int) focus = mEmailToEdit; } mLateCancel->showAutoClose(displayAlarm); - mLateCancel->setFixedSize(mLateCancel->tqsizeHint()); + mLateCancel->setFixedSize(mLateCancel->sizeHint()); if (focus) focus->setFocus(); } @@ -1948,7 +1948,7 @@ bool EditAlarmDlg::checkText(TQString& result, bool showErrorMessage) const enum Err { NONE = 0, BLANK, NONEXISTENT, DIRECTORY, UNREADABLE, NOT_TEXT_IMAGE }; Err err = NONE; KURL url; - int i = alarmtext.find(TQString::tqfromLatin1("/")); + int i = alarmtext.find(TQString::fromLatin1("/")); if (i > 0 && alarmtext[i - 1] == ':') { url = alarmtext; @@ -1973,7 +1973,7 @@ bool EditAlarmDlg::checkText(TQString& result, bool showErrorMessage) const TQDir::setCurrent(TQDir::homeDirPath()); alarmtext = info.absFilePath(); url.setPath(alarmtext); - alarmtext = TQString::tqfromLatin1("file:") + alarmtext; + alarmtext = TQString::fromLatin1("file:") + alarmtext; if (!err) { if (info.isDir()) err = DIRECTORY; @@ -2030,7 +2030,7 @@ bool EditAlarmDlg::checkText(TQString& result, bool showErrorMessage) const TextEdit::TextEdit(TQWidget* parent, const char* name) : KTextEdit(parent, name) { - TQSize tsize = tqsizeHint(); + TQSize tsize = sizeHint(); tsize.setHeight(fontMetrics().lineSpacing()*13/4 + 2*frameWidth()); setMinimumSize(tsize); } diff --git a/kalarm/find.cpp b/kalarm/find.cpp index 560fcfd95..08bcce54c 100644 --- a/kalarm/find.cpp +++ b/kalarm/find.cpp @@ -102,12 +102,12 @@ void Find::display() // Live & expired alarm selection mLive = new TQCheckBox(i18n("Acti&ve"), group); - mLive->setFixedSize(mLive->tqsizeHint()); + mLive->setFixedSize(mLive->sizeHint()); TQWhatsThis::add(mLive, i18n("Check to include active alarms in the search.")); grid->addWidget(mLive, 1, 0, TQt::AlignAuto); mExpired = new TQCheckBox(i18n("Ex&pired"), group); - mExpired->setFixedSize(mExpired->tqsizeHint()); + mExpired->setFixedSize(mExpired->sizeHint()); TQWhatsThis::add(mExpired, i18n("Check to include expired alarms in the search. " "This option is only available if expired alarms are currently being displayed.")); @@ -118,22 +118,22 @@ void Find::display() // Alarm actions mMessageType = new TQCheckBox(i18n("Text"), group, "message"); - mMessageType->setFixedSize(mMessageType->tqsizeHint()); + mMessageType->setFixedSize(mMessageType->sizeHint()); TQWhatsThis::add(mMessageType, i18n("Check to include text message alarms in the search.")); grid->addWidget(mMessageType, 3, 0); mFileType = new TQCheckBox(i18n("Fi&le"), group, "file"); - mFileType->setFixedSize(mFileType->tqsizeHint()); + mFileType->setFixedSize(mFileType->sizeHint()); TQWhatsThis::add(mFileType, i18n("Check to include file alarms in the search.")); grid->addWidget(mFileType, 3, 2); mCommandType = new TQCheckBox(i18n("Co&mmand"), group, "command"); - mCommandType->setFixedSize(mCommandType->tqsizeHint()); + mCommandType->setFixedSize(mCommandType->sizeHint()); TQWhatsThis::add(mCommandType, i18n("Check to include command alarms in the search.")); grid->addWidget(mCommandType, 4, 0); mEmailType = new TQCheckBox(i18n("&Email"), group, "email"); - mEmailType->setFixedSize(mEmailType->tqsizeHint()); + mEmailType->setFixedSize(mEmailType->sizeHint()); TQWhatsThis::add(mEmailType, i18n("Check to include email alarms in the search.")); grid->addWidget(mEmailType, 4, 2); diff --git a/kalarm/fontcolour.cpp b/kalarm/fontcolour.cpp index 94497b969..a59785c1a 100644 --- a/kalarm/fontcolour.cpp +++ b/kalarm/fontcolour.cpp @@ -89,13 +89,13 @@ FontColourChooser::FontColourChooser(TQWidget *parent, const char *name, { TQHBoxLayout* tqlayout = new TQHBoxLayout(topLayout); TQPushButton* button = new TQPushButton(i18n("Add Co&lor..."), page); - button->setFixedSize(button->tqsizeHint()); + button->setFixedSize(button->sizeHint()); connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddColour())); TQWhatsThis::add(button, i18n("Choose a new color to add to the color selection list.")); tqlayout->addWidget(button); mRemoveColourButton = new TQPushButton(i18n("&Remove Color"), page); - mRemoveColourButton->setFixedSize(mRemoveColourButton->tqsizeHint()); + mRemoveColourButton->setFixedSize(mRemoveColourButton->sizeHint()); connect(mRemoveColourButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveColour())); TQWhatsThis::add(mRemoveColourButton, i18n("Remove the color currently shown in the background color chooser, from the color selection list.")); @@ -106,7 +106,7 @@ FontColourChooser::FontColourChooser(TQWidget *parent, const char *name, { TQHBoxLayout* tqlayout = new TQHBoxLayout(topLayout); mDefaultFont = new CheckBox(i18n("Use &default font"), page); - mDefaultFont->setMinimumSize(mDefaultFont->tqsizeHint()); + mDefaultFont->setMinimumSize(mDefaultFont->sizeHint()); connect(mDefaultFont, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotDefaultFontToggled(bool))); TQWhatsThis::add(mDefaultFont, i18n("Check to use the default font current at the time the alarm is displayed.")); diff --git a/kalarm/fontcolourbutton.cpp b/kalarm/fontcolourbutton.cpp index e5dd90b92..37fe5c99d 100644 --- a/kalarm/fontcolourbutton.cpp +++ b/kalarm/fontcolourbutton.cpp @@ -46,7 +46,7 @@ FontColourButton::FontColourButton(TQWidget* parent, const char* name) TQHBoxLayout* tqlayout = new TQHBoxLayout(this, 0, KDialog::spacingHint()); mButton = new PushButton(i18n("Font && Co&lor..."), this); - mButton->setFixedSize(mButton->tqsizeHint()); + mButton->setFixedSize(mButton->sizeHint()); connect(mButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotButtonPressed())); TQWhatsThis::add(mButton, i18n("Choose the font, and foreground and background color, for the alarm message.")); @@ -55,10 +55,10 @@ FontColourButton::FontColourButton(TQWidget* parent, const char* name) // Font and colour sample display mSample = new TQLineEdit(this); mSample->setMinimumHeight(TQMAX(mSample->fontMetrics().lineSpacing(), mButton->height()*3/2)); - mSample->tqsetSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::MinimumExpanding); + mSample->setSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::MinimumExpanding); mSample->setText(i18n("The Quick Brown Fox Jumps Over The Lazy Dog")); mSample->setCursorPosition(0); - mSample->tqsetAlignment(TQt::AlignCenter); + mSample->setAlignment(TQt::AlignCenter); TQWhatsThis::add(mSample, i18n("This sample text illustrates the current font and color settings. " "You may edit it to test special characters.")); diff --git a/kalarm/functions.cpp b/kalarm/functions.cpp index d7a6383f2..a4cf2b04a 100644 --- a/kalarm/functions.cpp +++ b/kalarm/functions.cpp @@ -129,10 +129,10 @@ TemplateMenuAction* createNewFromTemplateAction(const TQString& label, TQObject* * event in that listView instance. * 'event' is updated with the actual event ID. */ -UpdatetqStatus addEvent(KAEvent& event, AlarmListView* selectionView, TQWidget* errmsgParent, bool useEventID, bool allowKOrgUpdate) +UpdateStatus addEvent(KAEvent& event, AlarmListView* selectionView, TQWidget* errmsgParent, bool useEventID, bool allowKOrgUpdate) { kdDebug(5950) << "KAlarm::addEvent(): " << event.id() << endl; - UpdatetqStatus status = UPDATE_OK; + UpdateStatus status = UPDATE_OK; if (!theApp()->checkCalendarDaemon()) // ensure calendar is open and daemon started return UPDATE_FAILED; else @@ -172,9 +172,9 @@ bool addExpiredEvent(KAEvent& event) AlarmCalendar* cal = AlarmCalendar::expiredCalendarOpen(); if (!cal) return false; - bool archiving = (KAEvent::uidtqStatus(event.id()) == KAEvent::ACTIVE); + bool archiving = (KAEvent::uidStatus(event.id()) == KAEvent::ACTIVE); if (archiving) - event.setSaveDateTime(TQDateTime::tqcurrentDateTime()); // time stamp to control purging + event.setSaveDateTime(TQDateTime::currentDateTime()); // time stamp to control purging KCal::Event* kcalEvent = cal->addEvent(event); cal->save(); @@ -193,10 +193,10 @@ bool addExpiredEvent(KAEvent& event) * event in that listView instance. * 'event' is updated with the actual event ID. */ -UpdatetqStatus addTemplate(KAEvent& event, TemplateListView* selectionView, TQWidget* errmsgParent) +UpdateStatus addTemplate(KAEvent& event, TemplateListView* selectionView, TQWidget* errmsgParent) { kdDebug(5950) << "KAlarm::addTemplate(): " << event.id() << endl; - UpdatetqStatus status = UPDATE_OK; + UpdateStatus status = UPDATE_OK; // Add the template to the calendar file AlarmCalendar* cal = AlarmCalendar::templateCalendarOpen(); @@ -206,7 +206,7 @@ UpdatetqStatus addTemplate(KAEvent& event, TemplateListView* selectionView, TQWi status = SAVE_FAILED; else { - cal->emitEmptytqStatus(); + cal->emitEmptyStatus(); // Update the window lists TemplateListView::addEvent(event, selectionView); @@ -225,11 +225,11 @@ UpdatetqStatus addTemplate(KAEvent& event, TemplateListView* selectionView, TQWi * If 'selectionView' is non-null, the selection highlight is moved to the * modified event in that listView instance. */ -UpdatetqStatus modifyEvent(KAEvent& oldEvent, const KAEvent& newEvent, AlarmListView* selectionView, TQWidget* errmsgParent) +UpdateStatus modifyEvent(KAEvent& oldEvent, const KAEvent& newEvent, AlarmListView* selectionView, TQWidget* errmsgParent) { kdDebug(5950) << "KAlarm::modifyEvent(): '" << oldEvent.id() << endl; - UpdatetqStatus status = UPDATE_OK; + UpdateStatus status = UPDATE_OK; if (!newEvent.valid()) { deleteEvent(oldEvent, true); @@ -280,7 +280,7 @@ UpdatetqStatus modifyEvent(KAEvent& oldEvent, const KAEvent& newEvent, AlarmList * The event is not updated in KOrganizer, since this function is called when an * existing alarm is rescheduled (due to recurrence or deferral). */ -UpdatetqStatus updateEvent(KAEvent& event, AlarmListView* selectionView, TQWidget* errmsgParent, bool archiveOnDelete, bool incRevision) +UpdateStatus updateEvent(KAEvent& event, AlarmListView* selectionView, TQWidget* errmsgParent, bool archiveOnDelete, bool incRevision) { kdDebug(5950) << "KAlarm::updateEvent(): " << event.id() << endl; @@ -311,9 +311,9 @@ UpdatetqStatus updateEvent(KAEvent& event, AlarmListView* selectionView, TQWidge * If 'selectionView' is non-null, the selection highlight is moved to the * updated event in that listView instance. */ -UpdatetqStatus updateTemplate(const KAEvent& event, TemplateListView* selectionView, TQWidget* errmsgParent) +UpdateStatus updateTemplate(const KAEvent& event, TemplateListView* selectionView, TQWidget* errmsgParent) { - UpdatetqStatus status = UPDATE_OK; + UpdateStatus status = UPDATE_OK; AlarmCalendar* cal = AlarmCalendar::templateCalendarOpen(); if (!cal) status = UPDATE_FAILED; @@ -338,7 +338,7 @@ UpdatetqStatus updateTemplate(const KAEvent& event, TemplateListView* selectionV * Delete an alarm from the calendar file and from every main window instance. * If the event is archived, the event's ID is changed to an expired ID if necessary. */ -UpdatetqStatus deleteEvent(KAEvent& event, bool archive, TQWidget* errmsgParent) +UpdateStatus deleteEvent(KAEvent& event, bool archive, TQWidget* errmsgParent) { TQString id = event.id(); kdDebug(5950) << "KAlarm::deleteEvent(): " << id << endl; @@ -346,11 +346,11 @@ UpdatetqStatus deleteEvent(KAEvent& event, bool archive, TQWidget* errmsgParent) // Update the window lists AlarmListView::deleteEvent(id); - UpdatetqStatus status = UPDATE_OK; + UpdateStatus status = UPDATE_OK; AlarmCalendar* cal; // Delete the event from the calendar file - if (KAEvent::uidtqStatus(id) == KAEvent::EXPIRED) + if (KAEvent::uidStatus(id) == KAEvent::EXPIRED) { cal = AlarmCalendar::expiredCalendarOpen(); if (!cal) @@ -383,7 +383,7 @@ UpdatetqStatus deleteEvent(KAEvent& event, bool archive, TQWidget* errmsgParent) /****************************************************************************** * Delete a template from the calendar file and from every template list view. */ -UpdatetqStatus deleteTemplate(const KAEvent& event) +UpdateStatus deleteTemplate(const KAEvent& event) { TQString id = event.id(); @@ -393,7 +393,7 @@ UpdatetqStatus deleteTemplate(const KAEvent& event) return UPDATE_FAILED; if (!cal->deleteEvent(id, true)) // save calendar after deleting return SAVE_FAILED; - cal->emitEmptytqStatus(); + cal->emitEmptyStatus(); // Update the window lists TemplateListView::deleteEvent(id); @@ -407,7 +407,7 @@ void deleteDisplayEvent(const TQString& eventID) { kdDebug(5950) << "KAlarm::deleteDisplayEvent(" << eventID << ")\n"; - if (KAEvent::uidtqStatus(eventID) == KAEvent::DISPLAYING) + if (KAEvent::uidStatus(eventID) == KAEvent::DISPLAYING) { AlarmCalendar* cal = AlarmCalendar::displayCalendarOpen(); if (cal) @@ -421,15 +421,15 @@ void deleteDisplayEvent(const TQString& eventID) * If 'selectionView' is non-null, the selection highlight is moved to the * restored event in that listView instance. */ -UpdatetqStatus reactivateEvent(KAEvent& event, AlarmListView* selectionView, bool useEventID) +UpdateStatus reactivateEvent(KAEvent& event, AlarmListView* selectionView, bool useEventID) { TQString id = event.id(); kdDebug(5950) << "KAlarm::reactivateEvent(): " << id << endl; // Delete the event from the expired calendar file - if (KAEvent::uidtqStatus(id) == KAEvent::EXPIRED) + if (KAEvent::uidStatus(id) == KAEvent::EXPIRED) { - TQDateTime now = TQDateTime::tqcurrentDateTime(); + TQDateTime now = TQDateTime::currentDateTime(); if (event.occursAfter(now, true)) { if (event.recurs() || event.repeatCount()) @@ -443,7 +443,7 @@ UpdatetqStatus reactivateEvent(KAEvent& event, AlarmListView* selectionView, boo if (!cal->save()) return SAVE_FAILED; - UpdatetqStatus status = UPDATE_OK; + UpdateStatus status = UPDATE_OK; if (event.copyToKOrganizer()) { if (!sendToKOrganizer(event)) // tell KOrganizer to show the event @@ -468,7 +468,7 @@ UpdatetqStatus reactivateEvent(KAEvent& event, AlarmListView* selectionView, boo * If 'selectionView' is non-null, the selection highlight is moved to the * updated event in that listView instance. */ -UpdatetqStatus enableEvent(KAEvent& event, AlarmListView* selectionView, bool enable) +UpdateStatus enableEvent(KAEvent& event, AlarmListView* selectionView, bool enable) { kdDebug(5950) << "KAlarm::enableEvent(" << enable << "): " << event.id() << endl; @@ -498,7 +498,7 @@ UpdatetqStatus enableEvent(KAEvent& event, AlarmListView* selectionView, bool en /****************************************************************************** * Display an error message about an error saving an event. */ -void displayUpdateError(TQWidget* parent, UpdatetqStatus, UpdateError code, int nAlarms) +void displayUpdateError(TQWidget* parent, UpdateStatus, UpdateError code, int nAlarms) { TQString errmsg; switch (code) @@ -551,7 +551,7 @@ void displayKOrgUpdateError(TQWidget* parent, KOrgUpdateError code, int nAlarms) bool edit(const TQString& eventID) { AlarmCalendar* cal; - switch (KAEvent::uidtqStatus(eventID)) + switch (KAEvent::uidStatus(eventID)) { case KAEvent::ACTIVE: cal = AlarmCalendar::activeCalendar(); @@ -639,7 +639,7 @@ void outputAlarmWarnings(TQWidget* parent, const KAEvent* event) { if (KMessageBox::warningYesNo(parent, i18n("Alarms are currently disabled.\nDo you want to enable alarms now?"), TQString(), i18n("Enable"), i18n("Keep Disabled"), - TQString::tqfromLatin1("EditEnableAlarms")) + TQString::fromLatin1("EditEnableAlarms")) == KMessageBox::Yes) Daemon::setAlarmsEnabled(); } @@ -721,7 +721,7 @@ bool runProgram(const TQCString& program, const TQCString& windowName, TQCString if (!kapp->dcopClient()->isApplicationRegistered(program)) { // KOrganizer is not already running, so start it - if (KApplication::startServiceByDesktopName(TQString::tqfromLatin1(program), TQString(), &errorMessage, &dcopName)) + if (KApplication::startServiceByDesktopName(TQString::fromLatin1(program), TQString(), &errorMessage, &dcopName)) { kdError(5950) << "runProgram(): couldn't start " << program << " (" << errorMessage << ")\n"; return false; @@ -746,10 +746,10 @@ bool runProgram(const TQCString& program, const TQCString& windowName, TQCString bool readConfigWindowSize(const char* window, TQSize& result) { KConfig* config = KGlobal::config(); - config->setGroup(TQString::tqfromLatin1(window)); + config->setGroup(TQString::fromLatin1(window)); TQWidget* desktop = TQT_TQWIDGET(KApplication::desktop()); - TQSize s = TQSize(config->readNumEntry(TQString::tqfromLatin1("Width %1").tqarg(desktop->width()), 0), - config->readNumEntry(TQString::tqfromLatin1("Height %1").tqarg(desktop->height()), 0)); + TQSize s = TQSize(config->readNumEntry(TQString::fromLatin1("Width %1").tqarg(desktop->width()), 0), + config->readNumEntry(TQString::fromLatin1("Height %1").tqarg(desktop->height()), 0)); if (s.isEmpty()) return false; result = s; @@ -763,10 +763,10 @@ bool readConfigWindowSize(const char* window, TQSize& result) void writeConfigWindowSize(const char* window, const TQSize& size) { KConfig* config = KGlobal::config(); - config->setGroup(TQString::tqfromLatin1(window)); + config->setGroup(TQString::fromLatin1(window)); TQWidget* desktop = TQT_TQWIDGET(KApplication::desktop()); - config->writeEntry(TQString::tqfromLatin1("Width %1").tqarg(desktop->width()), size.width()); - config->writeEntry(TQString::tqfromLatin1("Height %1").tqarg(desktop->height()), size.height()); + config->writeEntry(TQString::fromLatin1("Width %1").tqarg(desktop->width()), size.width()); + config->writeEntry(TQString::fromLatin1("Height %1").tqarg(desktop->height()), size.height()); config->sync(); } @@ -834,20 +834,20 @@ FileType fileType(const TQString& mimetype) static const char* formattedTextTypes[] = { "html", "xml", 0 }; - if (mimetype.startsWith(TQString::tqfromLatin1("image/"))) + if (mimetype.startsWith(TQString::fromLatin1("image/"))) return Image; int slash = mimetype.find('/'); if (slash < 0) return Unknown; TQString type = mimetype.mid(slash + 1); const char* typel = type.latin1(); - if (mimetype.startsWith(TQString::tqfromLatin1("application"))) + if (mimetype.startsWith(TQString::fromLatin1("application"))) { for (int i = 0; applicationTypes[i]; ++i) if (!strcmp(typel, applicationTypes[i])) return TextApplication; } - else if (mimetype.startsWith(TQString::tqfromLatin1("text"))) + else if (mimetype.startsWith(TQString::fromLatin1("text"))) { for (int i = 0; formattedTextTypes[i]; ++i) if (!strcmp(typel, formattedTextTypes[i])) diff --git a/kalarm/functions.h b/kalarm/functions.h index b8a1a51d3..9d5b1900a 100644 --- a/kalarm/functions.h +++ b/kalarm/functions.h @@ -48,7 +48,7 @@ enum FileType { Unknown, TextPlain, TextFormatted, TextApplication, Image }; /** Return codes from calendar update functions. * The codes are ordered by severity. */ -enum UpdatetqStatus { +enum UpdateStatus { UPDATE_OK, // update succeeded UPDATE_KORG_ERR, // update succeeded, but KOrganizer update failed UPDATE_ERROR, // update failed partially @@ -94,18 +94,18 @@ void resetDaemonIfQueued(); // must only be called from KAlarm TQString runKMail(bool minimise); bool runProgram(const TQCString& program, const TQCString& windowName, TQCString& dcopName, TQString& errorMessage); -UpdatetqStatus addEvent(KAEvent&, AlarmListView* selectionView, TQWidget* errmsgParent = 0, bool useEventID = false, bool allowKOrgUpdate = true); +UpdateStatus addEvent(KAEvent&, AlarmListView* selectionView, TQWidget* errmsgParent = 0, bool useEventID = false, bool allowKOrgUpdate = true); bool addExpiredEvent(KAEvent&); -UpdatetqStatus addTemplate(KAEvent&, TemplateListView* selectionView, TQWidget* errmsgParent = 0); -UpdatetqStatus modifyEvent(KAEvent& oldEvent, const KAEvent& newEvent, AlarmListView* selectionView, TQWidget* errmsgParent = 0); -UpdatetqStatus updateEvent(KAEvent&, AlarmListView* selectionView, TQWidget* errmsgParent = 0, bool archiveOnDelete = true, bool incRevision = true); -UpdatetqStatus updateTemplate(const KAEvent&, TemplateListView* selectionView, TQWidget* errmsgParent = 0); -UpdatetqStatus deleteEvent(KAEvent&, bool archive = true, TQWidget* errmsgParent = 0); -UpdatetqStatus deleteTemplate(const KAEvent&); +UpdateStatus addTemplate(KAEvent&, TemplateListView* selectionView, TQWidget* errmsgParent = 0); +UpdateStatus modifyEvent(KAEvent& oldEvent, const KAEvent& newEvent, AlarmListView* selectionView, TQWidget* errmsgParent = 0); +UpdateStatus updateEvent(KAEvent&, AlarmListView* selectionView, TQWidget* errmsgParent = 0, bool archiveOnDelete = true, bool incRevision = true); +UpdateStatus updateTemplate(const KAEvent&, TemplateListView* selectionView, TQWidget* errmsgParent = 0); +UpdateStatus deleteEvent(KAEvent&, bool archive = true, TQWidget* errmsgParent = 0); +UpdateStatus deleteTemplate(const KAEvent&); void deleteDisplayEvent(const TQString& eventID); -UpdatetqStatus reactivateEvent(KAEvent&, AlarmListView* selectionView, bool useEventID = false); -UpdatetqStatus enableEvent(KAEvent&, AlarmListView* selectionView, bool enable); -void displayUpdateError(TQWidget* parent, UpdatetqStatus, UpdateError, int nAlarms); +UpdateStatus reactivateEvent(KAEvent&, AlarmListView* selectionView, bool useEventID = false); +UpdateStatus enableEvent(KAEvent&, AlarmListView* selectionView, bool enable); +void displayUpdateError(TQWidget* parent, UpdateStatus, UpdateError, int nAlarms); void displayKOrgUpdateError(TQWidget* parent, KOrgUpdateError, int nAlarms); TQString stripAccel(const TQString&); diff --git a/kalarm/kalarmapp.cpp b/kalarm/kalarmapp.cpp index 8a620afd5..8ef9f6a54 100644 --- a/kalarm/kalarmapp.cpp +++ b/kalarm/kalarmapp.cpp @@ -121,8 +121,8 @@ KAlarmApp::KAlarmApp() connect(AlarmCalendar::expiredCalendar(), TQT_SIGNAL(purged()), TQT_SLOT(slotExpiredPurged())); KConfig* config = kapp->config(); - config->setGroup(TQString::tqfromLatin1("General")); - mNoSystemTray = config->readBoolEntry(TQString::tqfromLatin1("NoSystemTray"), false); + config->setGroup(TQString::fromLatin1("General")); + mNoSystemTray = config->readBoolEntry(TQString::fromLatin1("NoSystemTray"), false); mSavedNoSystemTray = mNoSystemTray; mOldRunInSystemTray = wantRunInSystemTray(); mDisableAlarmsIfStopped = mOldRunInSystemTray && !mNoSystemTray && Preferences::disableAlarmsIfStopped(); @@ -139,7 +139,7 @@ KAlarmApp::KAlarmApp() if (!mSpeechEnabled) kdDebug(5950) << "KAlarmApp::KAlarmApp(): speech synthesis disabled (KTTSD not found)" << endl; // Check if KOrganizer is installed - TQString korg = TQString::tqfromLatin1("korganizer"); + TQString korg = TQString::fromLatin1("korganizer"); mKOrganizerEnabled = !locate("exe", korg).isNull() || !KStandardDirs::findExe(korg).isNull(); if (!mKOrganizerEnabled) kdDebug(5950) << "KAlarmApp::KAlarmApp(): KOrganizer options disabled (KOrganizer not found)" << endl; @@ -205,7 +205,7 @@ bool KAlarmApp::restoreSession() for (int i = 1; KMainWindow::canBeRestored(i); ++i) { TQString type = KMainWindow::classNameOfToplevel(i); - if (type == TQString::tqfromLatin1("MainWindow")) + if (type == TQString::fromLatin1("MainWindow")) { MainWindow* win = MainWindow::create(true); win->restore(i, false); @@ -214,7 +214,7 @@ bool KAlarmApp::restoreSession() else win->show(); } - else if (type == TQString::tqfromLatin1("MessageWin")) + else if (type == TQString::fromLatin1("MessageWin")) { MessageWin* win = new MessageWin; win->restore(i, false); @@ -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::tqfromLatin1("--calendarURL")).tqarg(TQString::tqfromLatin1("--handleEvent")).tqarg(TQString::tqfromLatin1("--triggerEvent")).tqarg(TQString::tqfromLatin1("--cancelEvent"))) + USAGE(i18n("%1 requires %2, %3 or %4").tqarg(TQString::fromLatin1("--calendarURL")).tqarg(TQString::fromLatin1("--handleEvent")).tqarg(TQString::fromLatin1("--triggerEvent")).tqarg(TQString::fromLatin1("--cancelEvent"))) if (count > 1) - USAGE(i18n("%1, %2, %3 mutually exclusive").tqarg(TQString::tqfromLatin1("--handleEvent")).tqarg(TQString::tqfromLatin1("--triggerEvent")).tqarg(TQString::tqfromLatin1("--cancelEvent"))); + USAGE(i18n("%1, %2, %3 mutually exclusive").tqarg(TQString::fromLatin1("--handleEvent")).tqarg(TQString::fromLatin1("--triggerEvent")).tqarg(TQString::fromLatin1("--cancelEvent"))); if (!initCheck(true)) // open the calendar, don't register with daemon yet { exitCode = 1; @@ -341,11 +341,11 @@ int KAlarmApp::newInstance() { TQString calendarUrl = args->getOption("calendarURL"); if (KURL(calendarUrl).url() != AlarmCalendar::activeCalendar()->urlString()) - USAGE(i18n("%1: wrong calendar file").tqarg(TQString::tqfromLatin1("--calendarURL"))) + USAGE(i18n("%1: wrong calendar file").tqarg(TQString::fromLatin1("--calendarURL"))) } TQString eventID = args->getOption(option); args->clear(); // free up memory - if (eventID.startsWith(TQString::tqfromLatin1("ad:"))) + if (eventID.startsWith(TQString::fromLatin1("ad:"))) { // It's a notification from the alarm deamon eventID = eventID.mid(3); @@ -369,7 +369,7 @@ int KAlarmApp::newInstance() } if (!KAlarm::edit(eventID)) { - USAGE(i18n("%1: Event %2 not found, or not editable").tqarg(TQString::tqfromLatin1("--edit")).tqarg(eventID)) + USAGE(i18n("%1: Event %2 not found, or not editable").tqarg(TQString::fromLatin1("--edit")).tqarg(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::tqfromLatin1("--exec")).tqarg(TQString::tqfromLatin1("--file"))) + USAGE(i18n("%1 incompatible with %2").tqarg(TQString::fromLatin1("--exec")).tqarg(TQString::fromLatin1("--file"))) if (args->isSet("mail")) - USAGE(i18n("%1 incompatible with %2").tqarg(TQString::tqfromLatin1("--mail")).tqarg(TQString::tqfromLatin1("--file"))) + USAGE(i18n("%1 incompatible with %2").tqarg(TQString::fromLatin1("--mail")).tqarg(TQString::fromLatin1("--file"))) if (args->count()) - USAGE(i18n("message incompatible with %1").tqarg(TQString::tqfromLatin1("--file"))) + USAGE(i18n("message incompatible with %1").tqarg(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::tqfromLatin1("--mail")).tqarg(TQString::tqfromLatin1("--exec"))) + USAGE(i18n("%1 incompatible with %2").tqarg(TQString::fromLatin1("--mail")).tqarg(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::tqfromLatin1("--mail"))) + USAGE(i18n("%1: invalid email address").tqarg(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::tqfromLatin1("--subject")).tqarg(TQString::tqfromLatin1("--mail"))) + USAGE(i18n("%1 requires %2").tqarg(TQString::fromLatin1("--subject")).tqarg(TQString::fromLatin1("--mail"))) if (args->isSet("from-id")) - USAGE(i18n("%1 requires %2").tqarg(TQString::tqfromLatin1("--from-id")).tqarg(TQString::tqfromLatin1("--mail"))) + USAGE(i18n("%1 requires %2").tqarg(TQString::fromLatin1("--from-id")).tqarg(TQString::fromLatin1("--mail"))) if (args->isSet("attach")) - USAGE(i18n("%1 requires %2").tqarg(TQString::tqfromLatin1("--attach")).tqarg(TQString::tqfromLatin1("--mail"))) + USAGE(i18n("%1 requires %2").tqarg(TQString::fromLatin1("--attach")).tqarg(TQString::fromLatin1("--mail"))) if (args->isSet("bcc")) - USAGE(i18n("%1 requires %2").tqarg(TQString::tqfromLatin1("--bcc")).tqarg(TQString::tqfromLatin1("--mail"))) + USAGE(i18n("%1 requires %2").tqarg(TQString::fromLatin1("--bcc")).tqarg(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::tqfromLatin1("--color"))) + USAGE(i18n("Invalid %1 parameter").tqarg(TQString::fromLatin1("--color"))) } if (args->isSet("colorfg")) { @@ -489,25 +489,25 @@ int KAlarmApp::newInstance() colourText.replace(0, 2, "#"); fgColour.setNamedColor(colourText); if (!fgColour.isValid()) - USAGE(i18n("Invalid %1 parameter").tqarg(TQString::tqfromLatin1("--colorfg"))) + USAGE(i18n("Invalid %1 parameter").tqarg(TQString::fromLatin1("--colorfg"))) } if (args->isSet("time")) { TQCString dateTime = args->getOption("time"); if (!convWakeTime(dateTime, alarmTime, alarmNoTime)) - USAGE(i18n("Invalid %1 parameter").tqarg(TQString::tqfromLatin1("--time"))) + USAGE(i18n("Invalid %1 parameter").tqarg(TQString::fromLatin1("--time"))) } else - alarmTime = TQDateTime::tqcurrentDateTime(); + alarmTime = TQDateTime::currentDateTime(); bool haveRecurrence = args->isSet("recurrence"); if (haveRecurrence) { if (args->isSet("login")) - USAGE(i18n("%1 incompatible with %2").tqarg(TQString::tqfromLatin1("--login")).tqarg(TQString::tqfromLatin1("--recurrence"))) + USAGE(i18n("%1 incompatible with %2").tqarg(TQString::fromLatin1("--login")).tqarg(TQString::fromLatin1("--recurrence"))) if (args->isSet("until")) - USAGE(i18n("%1 incompatible with %2").tqarg(TQString::tqfromLatin1("--until")).tqarg(TQString::tqfromLatin1("--recurrence"))) + USAGE(i18n("%1 incompatible with %2").tqarg(TQString::fromLatin1("--until")).tqarg(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::tqfromLatin1("--login")).tqarg(TQString::tqfromLatin1("--interval"))) + USAGE(i18n("%1 incompatible with %2").tqarg(TQString::fromLatin1("--login")).tqarg(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::tqfromLatin1("--repeat"))) + USAGE(i18n("Invalid %1 parameter").tqarg(TQString::fromLatin1("--repeat"))) } else if (haveRecurrence) - USAGE(i18n("%1 requires %2").tqarg(TQString::tqfromLatin1("--interval")).tqarg(TQString::tqfromLatin1("--repeat"))) + USAGE(i18n("%1 requires %2").tqarg(TQString::fromLatin1("--interval")).tqarg(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::tqfromLatin1("--until"))) + USAGE(i18n("Invalid %1 parameter").tqarg(TQString::fromLatin1("--until"))) if (endTime < alarmTime) - USAGE(i18n("%1 earlier than %2").tqarg(TQString::tqfromLatin1("--until")).tqarg(TQString::tqfromLatin1("--time"))) + USAGE(i18n("%1 earlier than %2").tqarg(TQString::fromLatin1("--until")).tqarg(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::tqfromLatin1("--interval"))) + USAGE(i18n("Invalid %1 parameter").tqarg(TQString::fromLatin1("--interval"))) if (alarmNoTime && recurType == KARecurrence::MINUTELY) - USAGE(i18n("Invalid %1 parameter for date-only alarm").tqarg(TQString::tqfromLatin1("--interval"))) + USAGE(i18n("Invalid %1 parameter for date-only alarm").tqarg(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::tqfromLatin1("--interval")).tqarg(TQString::tqfromLatin1("--repeat")).tqarg(TQString::tqfromLatin1("--recurrence"))); + 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"))); repeatCount = count; repeatInterval = interval; } @@ -566,9 +566,9 @@ int KAlarmApp::newInstance() else { if (args->isSet("repeat")) - USAGE(i18n("%1 requires %2").tqarg(TQString::tqfromLatin1("--repeat")).tqarg(TQString::tqfromLatin1("--interval"))) + USAGE(i18n("%1 requires %2").tqarg(TQString::fromLatin1("--repeat")).tqarg(TQString::fromLatin1("--interval"))) if (args->isSet("until")) - USAGE(i18n("%1 requires %2").tqarg(TQString::tqfromLatin1("--until")).tqarg(TQString::tqfromLatin1("--interval"))) + USAGE(i18n("%1 requires %2").tqarg(TQString::fromLatin1("--until")).tqarg(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::tqfromLatin1("--play")).tqarg(TQString::tqfromLatin1("--play-repeat"))) + USAGE(i18n("%1 incompatible with %2").tqarg(TQString::fromLatin1("--play")).tqarg(TQString::fromLatin1("--play-repeat"))) if (args->isSet("beep")) - USAGE(i18n("%1 incompatible with %2").tqarg(TQString::tqfromLatin1("--beep")).tqarg(TQString::tqfromLatin1(audioRepeat ? "--play-repeat" : "--play"))) + USAGE(i18n("%1 incompatible with %2").tqarg(TQString::fromLatin1("--beep")).tqarg(TQString::fromLatin1(audioRepeat ? "--play-repeat" : "--play"))) if (args->isSet("speak")) - USAGE(i18n("%1 incompatible with %2").tqarg(TQString::tqfromLatin1("--speak")).tqarg(TQString::tqfromLatin1(audioRepeat ? "--play-repeat" : "--play"))) + USAGE(i18n("%1 incompatible with %2").tqarg(TQString::fromLatin1("--speak")).tqarg(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::tqfromLatin1("--volume"))) + USAGE(i18n("Invalid %1 parameter").tqarg(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::tqfromLatin1("--volume")).tqarg(TQString::tqfromLatin1("--play")).tqarg(TQString::tqfromLatin1("--play-repeat"))) + USAGE(i18n("%1 requires %2 or %3").tqarg(TQString::fromLatin1("--volume")).tqarg(TQString::fromLatin1("--play")).tqarg(TQString::fromLatin1("--play-repeat"))) #endif if (args->isSet("speak")) { if (args->isSet("beep")) - USAGE(i18n("%1 incompatible with %2").tqarg(TQString::tqfromLatin1("--beep")).tqarg(TQString::tqfromLatin1("--speak"))) + USAGE(i18n("%1 incompatible with %2").tqarg(TQString::fromLatin1("--beep")).tqarg(TQString::fromLatin1("--speak"))) if (!mSpeechEnabled) - USAGE(i18n("%1 requires speech synthesis to be configured using KTTSD").tqarg(TQString::tqfromLatin1("--speak"))) + USAGE(i18n("%1 requires speech synthesis to be configured using KTTSD").tqarg(TQString::fromLatin1("--speak"))) } int reminderMinutes = 0; bool onceOnly = args->isSet("reminder-once"); @@ -616,12 +616,12 @@ 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::tqfromLatin1("--reminder")).tqarg(TQString::tqfromLatin1("--reminder-once"))) - TQString opt = onceOnly ? TQString::tqfromLatin1("--reminder-once") : TQString::tqfromLatin1("--reminder"); + USAGE(i18n("%1 incompatible with %2").tqarg(TQString::fromLatin1("--reminder")).tqarg(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::tqfromLatin1("--exec"))) + USAGE(i18n("%1 incompatible with %2").tqarg(opt).tqarg(TQString::fromLatin1("--exec"))) if (args->isSet("mail")) - USAGE(i18n("%1 incompatible with %2").tqarg(opt).tqarg(TQString::tqfromLatin1("--mail"))) + USAGE(i18n("%1 incompatible with %2").tqarg(opt).tqarg(TQString::fromLatin1("--mail"))) KARecurrence::Type recurType; TQString optval = args->getOption(onceOnly ? "reminder-once" : "reminder"); if (!convInterval(args->getOption(onceOnly ? "reminder-once" : "reminder"), recurType, reminderMinutes)) @@ -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::tqfromLatin1("late-cancel"))) + USAGE(i18n("Invalid %1 parameter").tqarg(TQString::fromLatin1("late-cancel"))) } else if (args->isSet("auto-close")) - USAGE(i18n("%1 requires %2").tqarg(TQString::tqfromLatin1("--auto-close")).tqarg(TQString::tqfromLatin1("--late-cancel"))) + USAGE(i18n("%1 requires %2").tqarg(TQString::fromLatin1("--auto-close")).tqarg(TQString::fromLatin1("--late-cancel"))) int flags = KAEvent::DEFAULT_FONT; if (args->isSet("ack-confirm")) @@ -683,52 +683,52 @@ int KAlarmApp::newInstance() // No arguments - run interactively & display the main window kdDebug(5950)<<"KAlarmApp::newInstance(): interactive\n"; if (args->isSet("ack-confirm")) - usage += TQString::tqfromLatin1("--ack-confirm "); + usage += TQString::fromLatin1("--ack-confirm "); if (args->isSet("attach")) - usage += TQString::tqfromLatin1("--attach "); + usage += TQString::fromLatin1("--attach "); if (args->isSet("auto-close")) - usage += TQString::tqfromLatin1("--auto-close "); + usage += TQString::fromLatin1("--auto-close "); if (args->isSet("bcc")) - usage += TQString::tqfromLatin1("--bcc "); + usage += TQString::fromLatin1("--bcc "); if (args->isSet("beep")) - usage += TQString::tqfromLatin1("--beep "); + usage += TQString::fromLatin1("--beep "); if (args->isSet("color")) - usage += TQString::tqfromLatin1("--color "); + usage += TQString::fromLatin1("--color "); if (args->isSet("colorfg")) - usage += TQString::tqfromLatin1("--colorfg "); + usage += TQString::fromLatin1("--colorfg "); if (args->isSet("disable")) - usage += TQString::tqfromLatin1("--disable "); + usage += TQString::fromLatin1("--disable "); if (args->isSet("from-id")) - usage += TQString::tqfromLatin1("--from-id "); + usage += TQString::fromLatin1("--from-id "); if (args->isSet("korganizer")) - usage += TQString::tqfromLatin1("--korganizer "); + usage += TQString::fromLatin1("--korganizer "); if (args->isSet("late-cancel")) - usage += TQString::tqfromLatin1("--late-cancel "); + usage += TQString::fromLatin1("--late-cancel "); if (args->isSet("login")) - usage += TQString::tqfromLatin1("--login "); + usage += TQString::fromLatin1("--login "); if (args->isSet("play")) - usage += TQString::tqfromLatin1("--play "); + usage += TQString::fromLatin1("--play "); #ifndef WITHOUT_ARTS if (args->isSet("play-repeat")) - usage += TQString::tqfromLatin1("--play-repeat "); + usage += TQString::fromLatin1("--play-repeat "); #endif if (args->isSet("reminder")) - usage += TQString::tqfromLatin1("--reminder "); + usage += TQString::fromLatin1("--reminder "); if (args->isSet("reminder-once")) - usage += TQString::tqfromLatin1("--reminder-once "); + usage += TQString::fromLatin1("--reminder-once "); if (args->isSet("speak")) - usage += TQString::tqfromLatin1("--speak "); + usage += TQString::fromLatin1("--speak "); if (args->isSet("subject")) - usage += TQString::tqfromLatin1("--subject "); + usage += TQString::fromLatin1("--subject "); if (args->isSet("time")) - usage += TQString::tqfromLatin1("--time "); + usage += TQString::fromLatin1("--time "); #ifndef WITHOUT_ARTS if (args->isSet("volume")) - usage += TQString::tqfromLatin1("--volume "); + usage += TQString::fromLatin1("--volume "); #endif if (!usage.isEmpty()) { - usage += i18n(": option(s) only valid with a message/%1/%2").tqarg(TQString::tqfromLatin1("--file")).tqarg(TQString::tqfromLatin1("--exec")); + usage += i18n(": option(s) only valid with a message/%1/%2").tqarg(TQString::fromLatin1("--file")).tqarg(TQString::fromLatin1("--exec")); break; } @@ -1043,8 +1043,8 @@ bool KAlarmApp::checkSystemTray() // tray and alarms are disabled when KAlarm is not running, registering with // NO_START_NOTIFY could result in alarms never being seen. KConfig* config = kapp->config(); - config->setGroup(TQString::tqfromLatin1("General")); - config->writeEntry(TQString::tqfromLatin1("NoSystemTray"), mNoSystemTray); + config->setGroup(TQString::fromLatin1("General")); + config->writeEntry(TQString::fromLatin1("NoSystemTray"), mNoSystemTray); config->sync(); // Update other settings and reregister with the alarm daemon @@ -1174,7 +1174,7 @@ bool KAlarmApp::scheduleEvent(KAEvent::Action action, const TQString& text, cons kdDebug(5950) << "KAlarmApp::scheduleEvent(): " << text << endl; if (!dateTime.isValid()) return false; - TQDateTime now = TQDateTime::tqcurrentDateTime(); + TQDateTime now = TQDateTime::currentDateTime(); if (lateCancel && dateTime < now.addSecs(-maxLateness(lateCancel))) return true; // alarm time was already expired too long ago TQDateTime alarmTime = dateTime; @@ -1266,7 +1266,7 @@ bool KAlarmApp::handleEvent(const TQString& eventID, EventFunc function) case EVENT_TRIGGER: // handle it if it's due, else execute it regardless case EVENT_HANDLE: // handle it if it's due { - TQDateTime now = TQDateTime::tqcurrentDateTime(); + TQDateTime now = TQDateTime::currentDateTime(); bool updateCalAndDisplay = false; bool alarmToExecuteValid = false; KAAlarm alarmToExecute; @@ -1502,7 +1502,7 @@ void KAlarmApp::rescheduleAlarm(KAEvent& event, const KAAlarm& alarm, bool updat else { // Reschedule the alarm for its next recurrence. - KAEvent::OccurType type = event.setNextOccurrence(TQDateTime::tqcurrentDateTime()); + KAEvent::OccurType type = event.setNextOccurrence(TQDateTime::currentDateTime()); switch (type) { case KAEvent::NO_OCCURRENCE: @@ -1722,7 +1722,7 @@ ShellProcess* KAlarmApp::doShellCommand(const TQString& command, const KAEvent& { // Execute the command from a temporary script file, // with a sleep after the command is executed - tmpXtermFile = createTempScriptFile(command + TQString::tqfromLatin1("\nsleep 86400\n"), true, event, *alarm); + tmpXtermFile = createTempScriptFile(command + TQString::fromLatin1("\nsleep 86400\n"), true, event, *alarm); if (tmpXtermFile.isEmpty()) return 0; cmd.replace("%W", tmpXtermFile); // %w indicates where to insert the command @@ -1731,7 +1731,7 @@ ShellProcess* KAlarmApp::doShellCommand(const TQString& command, const KAEvent& { // Append a sleep to the command. // Quote the command in case it contains characters such as [>|;]. - TQString exec = KShellProcess::quote(command + TQString::tqfromLatin1("; sleep 86400")); + TQString exec = KShellProcess::quote(command + TQString::fromLatin1("; sleep 86400")); cmd.replace("%w", exec); // %w indicates where to insert the command string } else @@ -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::tqfromLatin1("cat >>%1").tqarg(event.logFile())); + logproc = new ShellProcess(TQString::fromLatin1("cat >>%1").tqarg(event.logFile())); connect(logproc, TQT_SIGNAL(shellExited(ShellProcess*)), TQT_SLOT(slotLogProcExited(ShellProcess*))); logproc->start(KProcess::Stdin); TQCString heading; @@ -2068,7 +2068,7 @@ static bool convWakeTime(const TQCString& timeParam, TQDateTime& dateTime, bool& else { // Compile the values into a date/time structure - TQDateTime now = TQDateTime::tqcurrentDateTime(); + TQDateTime now = TQDateTime::currentDateTime(); if (dt[0] < 0) date.setYMD(now.date().year(), (dt[1] < 0 ? now.date().month() : dt[1]), diff --git a/kalarm/kalarmd/adcalendar.cpp b/kalarm/kalarmd/adcalendar.cpp index 409ab88f0..3b9c9f55a 100644 --- a/kalarm/kalarmd/adcalendar.cpp +++ b/kalarm/kalarmd/adcalendar.cpp @@ -37,7 +37,7 @@ TQStringList ADCalendar::mCalendarUrls; // never delete or reorde ADCalendar::ADCalendar(const TQString& url, const TQCString& appname) - : KCal::CalendarLocal(TQString::tqfromLatin1("UTC")), + : KCal::CalendarLocal(TQString::fromLatin1("UTC")), mUrlString(url), mAppName(appname), mLoaded(false), diff --git a/kalarm/kalarmd/adconfigdata.cpp b/kalarm/kalarmd/adconfigdata.cpp index 9f471e4da..06ee4597e 100644 --- a/kalarm/kalarmd/adconfigdata.cpp +++ b/kalarm/kalarmd/adconfigdata.cpp @@ -31,13 +31,13 @@ #include "adconfigdata.h" // Config file key strings -const TQString CLIENT_GROUP(TQString::tqfromLatin1("Client ")); +const TQString CLIENT_GROUP(TQString::fromLatin1("Client ")); const TQRegExp CLIENT_GROUP_SEARCH("^Client "); // Client data file key strings -const TQString CALENDAR_KEY(TQString::tqfromLatin1("Calendar")); -const TQString TITLE_KEY(TQString::tqfromLatin1("Title")); -const TQString DCOP_OBJECT_KEY(TQString::tqfromLatin1("DCOP object")); -const TQString START_CLIENT_KEY(TQString::tqfromLatin1("Start")); +const TQString CALENDAR_KEY(TQString::fromLatin1("Calendar")); +const TQString TITLE_KEY(TQString::fromLatin1("Title")); +const TQString DCOP_OBJECT_KEY(TQString::fromLatin1("DCOP object")); +const TQString START_CLIENT_KEY(TQString::fromLatin1("Start")); /****************************************************************************** @@ -139,8 +139,8 @@ void ADConfigData::enableAutoStart(bool on) kdDebug(5900) << "ADConfigData::enableAutoStart(" << on << ")\n"; KConfig* config = KGlobal::config(); config->reparseConfiguration(); - config->setGroup(TQString::tqfromLatin1(DAEMON_AUTOSTART_SECTION)); - config->writeEntry(TQString::tqfromLatin1(DAEMON_AUTOSTART_KEY), on); + config->setGroup(TQString::fromLatin1(DAEMON_AUTOSTART_SECTION)); + config->writeEntry(TQString::fromLatin1(DAEMON_AUTOSTART_KEY), on); config->sync(); } diff --git a/kalarm/kalarmd/alarmdaemon.cpp b/kalarm/kalarmd/alarmdaemon.cpp index 0fad7935f..85d214656 100644 --- a/kalarm/kalarmd/alarmdaemon.cpp +++ b/kalarm/kalarmd/alarmdaemon.cpp @@ -54,8 +54,8 @@ static const int KALARM_AUTOSTART_TIMEOUT = 30; static const int SECS_PER_DAY = 3600 * 24; // KAlarm config file keys -static const TQString START_OF_DAY(TQString::tqfromLatin1("StartOfDay")); -static const TQString AUTOSTART_TRAY(TQString::tqfromLatin1("AutostartTray")); +static const TQString START_OF_DAY(TQString::fromLatin1("StartOfDay")); +static const TQString AUTOSTART_TRAY(TQString::fromLatin1("AutostartTray")); AlarmDaemon::AlarmDaemon(bool autostart, TQObject *parent, const char *name) @@ -84,7 +84,7 @@ AlarmDaemon::AlarmDaemon(bool autostart, TQObject *parent, const char *name) * itself and instead will simply open a new window. */ KConfig kaconfig(locate("config", "kalarmrc")); - kaconfig.setGroup(TQString::tqfromLatin1("General")); + kaconfig.setGroup(TQString::fromLatin1("General")); autostart = kaconfig.readBoolEntry(AUTOSTART_TRAY, false); if (autostart) { @@ -119,8 +119,8 @@ void AlarmDaemon::autostartKAlarm() } kdDebug(5900) << "AlarmDaemon::autostartKAlarm(): starting KAlarm\n"; TQStringList args; - args << TQString::tqfromLatin1("--tray"); - int ret = KApplication::tdeinitExec(TQString::tqfromLatin1("kalarm"), args); + args << TQString::fromLatin1("--tray"); + int ret = KApplication::tdeinitExec(TQString::fromLatin1("kalarm"), args); if (ret) kdError(5900) << "AlarmDaemon::autostartKAlarm(): error=" << ret << endl; else @@ -138,7 +138,7 @@ void AlarmDaemon::startMonitoring() // Set up the alarm timer mAlarmTimer = new TQTimer(this); connect(mAlarmTimer, TQT_SIGNAL(timeout()), TQT_SLOT(checkAlarmsSlot())); - setTimertqStatus(); + setTimerStatus(); // Start monitoring calendar files. // They are monitored until their client application registers, upon which @@ -156,7 +156,7 @@ void AlarmDaemon::enableCal(const TQString& urlString, bool enable) if (cal) { cal->setEnabled(enable); - notifyCaltqStatus(cal); // notify KAlarm + notifyCalStatus(cal); // notify KAlarm } } @@ -196,8 +196,8 @@ void AlarmDaemon::calendarLoaded(ADCalendar* cal, bool success) { if (success) kdDebug(5900) << "Calendar reloaded" << endl; - notifyCaltqStatus(cal); // notify KAlarm - setTimertqStatus(); + notifyCalStatus(cal); // notify KAlarm + setTimerStatus(); checkAlarms(cal); } @@ -262,8 +262,8 @@ void AlarmDaemon::registerApp(const TQCString& appName, const TQString& appTitle ADConfigData::writeClient(appName, client); ADConfigData::enableAutoStart(true); - setTimertqStatus(); - notifyCaltqStatus(client->calendar()); + setTimerStatus(); + notifyCalStatus(client->calendar()); result = KAlarmd::SUCCESS; } @@ -365,7 +365,7 @@ void AlarmDaemon::checkAlarms(ADCalendar* cal) if (!cal->loaded() || !cal->enabled()) return; - TQDateTime now = TQDateTime::tqcurrentDateTime(); + TQDateTime now = TQDateTime::currentDateTime(); kdDebug(5901) << " To: " << now.toString() << endl; TQValueList<KCal::Alarm*> alarms = cal->alarmsTo(now); if (!alarms.count()) @@ -385,7 +385,7 @@ void AlarmDaemon::checkAlarms(ADCalendar* cal) // The times for non-due alarms are set invalid in 'alarmtimes'. bool recurs = event->doesRecur(); const TQStringList cats = event->categories(); - bool floats = (cats.find(TQString::tqfromLatin1("DATE")) != cats.end()); + bool floats = (cats.find(TQString::fromLatin1("DATE")) != cats.end()); TQDateTime nextDateTime = event->dtStart(); if (recurs) { @@ -478,7 +478,7 @@ bool AlarmDaemon::notifyEvent(ADCalendar* calendar, const TQString& eventID) return false; } kdDebug(5900) << "AlarmDaemon::notifyEvent(" << appname << ", " << eventID << "): notification type=" << client->startClient() << endl; - TQString id = TQString::tqfromLatin1("ad:") + eventID; // prefix to indicate that the notification if from the daemon + TQString id = TQString::fromLatin1("ad:") + eventID; // prefix to indicate that the notification if from the daemon // Check if the client application is running and ready to receive notification bool registered = kapp->dcopClient()->isApplicationRegistered(static_cast<const char*>(appname)); @@ -531,7 +531,7 @@ bool AlarmDaemon::notifyEvent(ADCalendar* calendar, const TQString& eventID) /****************************************************************************** * Starts or stops the alarm timer as necessary after a calendar is enabled/disabled. */ -void AlarmDaemon::setTimertqStatus() +void AlarmDaemon::setTimerStatus() { #ifdef AUTOSTART_KALARM if (!mAlarmTimer) @@ -569,7 +569,7 @@ void AlarmDaemon::setTimertqStatus() * Send a DCOP message to to the client which owns the specified calendar, * notifying it of a change in calendar status. */ -void AlarmDaemon::notifyCaltqStatus(const ADCalendar* cal) +void AlarmDaemon::notifyCalStatus(const ADCalendar* cal) { ClientInfo* client = ClientInfo::get(cal); if (!client) @@ -577,7 +577,7 @@ void AlarmDaemon::notifyCaltqStatus(const ADCalendar* cal) TQCString appname = client->appName(); if (kapp->dcopClient()->isApplicationRegistered(static_cast<const char*>(appname))) { - KAlarmd::CalendartqStatus change = cal->available() ? (cal->enabled() ? KAlarmd::CALENDAR_ENABLED : KAlarmd::CALENDAR_DISABLED) + KAlarmd::CalendarStatus change = cal->available() ? (cal->enabled() ? KAlarmd::CALENDAR_ENABLED : KAlarmd::CALENDAR_DISABLED) : KAlarmd::CALENDAR_UNAVAILABLE; kdDebug(5900) << "AlarmDaemon::notifyCalStatus() sending:" << appname << " -> " << change << endl; AlarmGuiIface_stub stub(appname, client->dcopObject()); @@ -595,7 +595,7 @@ void AlarmDaemon::notifyCaltqStatus(const ADCalendar* cal) void AlarmDaemon::readKAlarmConfig() { KConfig config(locate("config", "kalarmrc")); - config.setGroup(TQString::tqfromLatin1("General")); + config.setGroup(TQString::fromLatin1("General")); TQDateTime defTime(TQDate(1900,1,1), TQTime()); mStartOfDay = config.readDateTimeEntry(START_OF_DAY, &defTime).time(); kdDebug(5900) << "AlarmDaemon::readKAlarmConfig()" << endl; diff --git a/kalarm/kalarmd/alarmdaemon.h b/kalarm/kalarmd/alarmdaemon.h index c2c34e10f..fbbb8f308 100644 --- a/kalarm/kalarmd/alarmdaemon.h +++ b/kalarm/kalarmd/alarmdaemon.h @@ -67,8 +67,8 @@ class AlarmDaemon : public TQObject, virtual public AlarmDaemonIface void reloadCal(ADCalendar*, bool reset); void checkAlarms(ADCalendar*); bool notifyEvent(ADCalendar*, const TQString& eventID); - void notifyCaltqStatus(const ADCalendar*); - void setTimertqStatus(); + void notifyCalStatus(const ADCalendar*); + void setTimerStatus(); static TQString expandURL(const TQString& urlString); TQTimer* mAlarmTimer; diff --git a/kalarm/kalarmd/alarmguiiface.h b/kalarm/kalarmd/alarmguiiface.h index 49a467008..d221fd345 100644 --- a/kalarm/kalarmd/alarmguiiface.h +++ b/kalarm/kalarmd/alarmguiiface.h @@ -35,7 +35,7 @@ namespace KAlarmd NOT_FOUND = 2 // notification type requires client start, but client executable not found }; - enum CalendartqStatus // parameters to client notification + enum CalendarStatus // parameters to client notification { CALENDAR_ENABLED, // calendar is now being monitored CALENDAR_DISABLED, // calendar is available but not being monitored @@ -53,9 +53,9 @@ class AlarmGuiIface : virtual public DCOPObject K_DCOP k_dcop: /** Called to notify a change in status of the calendar. - @param calendartqStatus new calendar status. Value is of type CalendartqStatus. + @param calendarStatus new calendar status. Value is of type CalendarStatus. */ - virtual ASYNC alarmDaemonUpdate(int calendartqStatus, const TQString& calendarURL) = 0; + virtual ASYNC alarmDaemonUpdate(int calendarStatus, const TQString& calendarURL) = 0; /** Called to notify that an alarm is due. */ diff --git a/kalarm/kamail.cpp b/kalarm/kamail.cpp index 2b476d811..b50dcef0b 100644 --- a/kalarm/kamail.cpp +++ b/kalarm/kamail.cpp @@ -153,30 +153,30 @@ bool KAMail::send(const KAEvent& event, TQStringList& errmsgs, bool allowNotify) { // Use sendmail to send the message TQString textComplete; - TQString command = KStandardDirs::findExe(TQString::tqfromLatin1("sendmail"), - TQString::tqfromLatin1("/sbin:/usr/sbin:/usr/lib")); + TQString command = KStandardDirs::findExe(TQString::fromLatin1("sendmail"), + TQString::fromLatin1("/sbin:/usr/sbin:/usr/lib")); if (!command.isNull()) { - command += TQString::tqfromLatin1(" -f "); + command += TQString::fromLatin1(" -f "); command += KPIM::getEmailAddress(from); - command += TQString::tqfromLatin1(" -oi -t "); + command += TQString::fromLatin1(" -oi -t "); textComplete = initHeaders(data, false); } else { - command = KStandardDirs::findExe(TQString::tqfromLatin1("mail")); + command = KStandardDirs::findExe(TQString::fromLatin1("mail")); if (command.isNull()) { - errmsgs = errors(i18n("%1 not found").tqarg(TQString::tqfromLatin1("sendmail"))); // give up + errmsgs = errors(i18n("%1 not found").tqarg(TQString::fromLatin1("sendmail"))); // give up return false; } - command += TQString::tqfromLatin1(" -s "); + command += TQString::fromLatin1(" -s "); command += KShellProcess::quote(event.emailSubject()); if (!data.bcc.isEmpty()) { - command += TQString::tqfromLatin1(" -b "); + command += TQString::fromLatin1(" -b "); command += KShellProcess::quote(data.bcc); } @@ -321,7 +321,7 @@ TQString KAMail::addToKMailFolder(const KAMailData& data, const char* folder, bo // Notify KMail of the message in the temporary file TQByteArray callData; TQDataStream arg(callData, IO_WriteOnly); - arg << TQString::tqfromLatin1(folder) << tmpFile.name(); + arg << TQString::fromLatin1(folder) << tmpFile.name(); if (callKMail(callData, "KMailIface", "dcopAddMessage(TQString,TQString)", "int")) return TQString(); err = i18n("Error calling KMail"); @@ -386,15 +386,15 @@ TQString KAMail::initHeaders(const KAMailData& data, bool dateId) strftime(buff, sizeof(buff), "Date: %a, %d %b %Y %H:%M:%S %z", localtime(&timenow)); TQString from = data.from; from.replace(TQRegExp("^.*<"), TQString()).replace(TQRegExp(">.*$"), TQString()); - message = TQString::tqfromLatin1(buff); - message += TQString::tqfromLatin1("\nMessage-Id: <%1.%2.%3>\n").tqarg(timenow).tqarg(tod.tv_usec).tqarg(from); + message = TQString::fromLatin1(buff); + message += TQString::fromLatin1("\nMessage-Id: <%1.%2.%3>\n").tqarg(timenow).tqarg(tod.tv_usec).tqarg(from); } - message += TQString::tqfromLatin1("From: ") + data.from; - message += TQString::tqfromLatin1("\nTo: ") + data.event.emailAddresses(", "); + message += TQString::fromLatin1("From: ") + data.from; + message += TQString::fromLatin1("\nTo: ") + data.event.emailAddresses(", "); if (!data.bcc.isEmpty()) - message += TQString::tqfromLatin1("\nBcc: ") + data.bcc; - message += TQString::tqfromLatin1("\nSubject: ") + data.event.emailSubject(); - message += TQString::tqfromLatin1("\nX-Mailer: %1/" KALARM_VERSION).tqarg(kapp->aboutData()->programName()); + 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()); return message; } @@ -426,13 +426,13 @@ TQString KAMail::appendBodyAttachments(TQString& message, const KAEvent& event) time(&timenow); TQCString boundary; boundary.sprintf("------------_%lu_-%lx=", 2*timenow, timenow); - message += TQString::tqfromLatin1("\nMIME-Version: 1.0"); - message += TQString::tqfromLatin1("\nContent-Type: multipart/mixed;\n boundary=\"%1\"\n").tqarg(boundary.data()); + message += TQString::fromLatin1("\nMIME-Version: 1.0"); + message += TQString::fromLatin1("\nContent-Type: multipart/mixed;\n boundary=\"%1\"\n").tqarg(boundary.data()); if (!event.message().isEmpty()) { // There is a message body - message += TQString::tqfromLatin1("\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").tqarg(boundary.data()); message += event.message(); } @@ -463,10 +463,10 @@ TQString KAMail::appendBodyAttachments(TQString& message, const KAEvent& event) text = (mimeType == textMimeTypes[i]); } - message += TQString::tqfromLatin1("\n--%1").tqarg(boundary.data()); - message += TQString::tqfromLatin1("\nContent-Type: %2; name=\"%3\"").tqarg(mimeType).tqarg(fi.text()); - message += TQString::tqfromLatin1("\nContent-Transfer-Encoding: %1").tqarg(TQString::tqfromLatin1(text ? "8bit" : "BASE64")); - message += TQString::tqfromLatin1("\nContent-Disposition: attachment; filename=\"%4\"\n\n").tqarg(fi.text()); + 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()); // Read the file contents TQString tmpFile; @@ -504,14 +504,14 @@ TQString KAMail::appendBodyAttachments(TQString& message, const KAEvent& event) atterror = true; } else - message += TQString::tqfromLatin1(base64, base64Size); + message += TQString::fromLatin1(base64, base64Size); delete[] base64; } delete[] contents; if (atterror) return attachError.tqarg(attachment); } - message += TQString::tqfromLatin1("\n--%1--\n.\n").tqarg(boundary.data()); + message += TQString::fromLatin1("\n--%1--\n.\n").tqarg(boundary.data()); } return TQString(); } @@ -523,7 +523,7 @@ TQString KAMail::appendBodyAttachments(TQString& message, const KAEvent& event) void KAMail::notifyQueued(const KAEvent& event) { KMime::Types::Address addr; - TQString localhost = TQString::tqfromLatin1("localhost"); + TQString localhost = TQString::fromLatin1("localhost"); TQString hostname = getHostName(); const EmailAddressList& addresses = event.emailAddresses(); for (TQValueList<KCal::Person>::ConstIterator it = addresses.begin(); it != addresses.end(); ++it) @@ -925,7 +925,7 @@ TQStringList KAMail::errors(const TQString& err, bool sendfail) : i18n("Error copying sent email to KMail %1 folder").tqarg(i18n_sent_mail()); if (err.isEmpty()) return TQStringList(error1); - TQStringList errs(TQString::tqfromLatin1("%1:").tqarg(error1)); + TQStringList errs(TQString::fromLatin1("%1:").tqarg(error1)); errs += err; return errs; } diff --git a/kalarm/karecurrence.cpp b/kalarm/karecurrence.cpp index a14d5675e..8b7e9068f 100644 --- a/kalarm/karecurrence.cpp +++ b/kalarm/karecurrence.cpp @@ -165,7 +165,7 @@ bool KARecurrence::init(RecurrenceRule::PeriodType recurType, int freq, int coun */ bool KARecurrence::set(const TQString& icalRRULE) { - static TQString RRULE = TQString::tqfromLatin1("RRULE:"); + static TQString RRULE = TQString::fromLatin1("RRULE:"); mCachedType = -1; clear(); if (icalRRULE.isEmpty()) diff --git a/kalarm/latecancel.cpp b/kalarm/latecancel.cpp index 4f69be211..da5cfe784 100644 --- a/kalarm/latecancel.cpp +++ b/kalarm/latecancel.cpp @@ -60,7 +60,7 @@ LateCancelSelector::LateCancelSelector(bool allowHourMinute, TQWidget* parent, c mStack->addWidget(mCheckboxFrame, 1); TQBoxLayout* tqlayout = new TQVBoxLayout(mCheckboxFrame, 0, 0); mCheckbox = new CheckBox(i18n_n_CancelIfLate(), mCheckboxFrame); - mCheckbox->setFixedSize(mCheckbox->tqsizeHint()); + mCheckbox->setFixedSize(mCheckbox->sizeHint()); connect(mCheckbox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotToggled(bool))); TQWhatsThis::add(mCheckbox, whatsThis); tqlayout->addWidget(mCheckbox, 0, TQt::AlignAuto); @@ -79,7 +79,7 @@ LateCancelSelector::LateCancelSelector(bool allowHourMinute, TQWidget* parent, c tqlayout = new TQHBoxLayout(mLayout, KDialog::spacingHint()); tqlayout->addSpacing(3*KDialog::spacingHint()); mAutoClose = new CheckBox(i18n_AutoCloseWin(), this); - mAutoClose->setFixedSize(mAutoClose->tqsizeHint()); + mAutoClose->setFixedSize(mAutoClose->sizeHint()); TQWhatsThis::add(mAutoClose, i18n("Automatically close the alarm window after the expiry of the late-cancelation period")); tqlayout->addWidget(mAutoClose); tqlayout->addStretch(); diff --git a/kalarm/lib/checkbox.h b/kalarm/lib/checkbox.h index f81490ea9..7759f6229 100644 --- a/kalarm/lib/checkbox.h +++ b/kalarm/lib/checkbox.h @@ -63,7 +63,7 @@ class CheckBox : public TQCheckBox */ virtual void setReadOnly(bool readOnly); /** Returns the widget which receives focus when the user selects the check box by clicking on it. */ - TQWidget* tqfocusWidget() const { return mFocusWidget; } + TQWidget* focusWidget() const { return mFocusWidget; } /** Specifies a widget to receive focus when the user selects the check box by clicking on it. * @param widget Widget to receive focus. * @param enable If true, @p widget will be enabled before receiving focus. If diff --git a/kalarm/lib/dateedit.cpp b/kalarm/lib/dateedit.cpp index b9699988d..6bc51aec5 100644 --- a/kalarm/lib/dateedit.cpp +++ b/kalarm/lib/dateedit.cpp @@ -77,7 +77,7 @@ void DateEdit::pastLimitMessage(const TQDate& limit, const TQString& error, cons TQString errString = error; if (errString.isNull()) { - if (limit == TQDate::tqcurrentDate()) + if (limit == TQDate::currentDate()) errString = i18n("today"); else errString = KGlobal::locale()->formatDate(limit, true); diff --git a/kalarm/lib/lineedit.cpp b/kalarm/lib/lineedit.cpp index 16ca507e9..6b5787ebf 100644 --- a/kalarm/lib/lineedit.cpp +++ b/kalarm/lib/lineedit.cpp @@ -149,7 +149,7 @@ void LineEdit::dropEvent(TQDropEvent* e) case Emails: { // Email entry field - ignore all but mailto: URLs - TQString mailto = TQString::tqfromLatin1("mailto"); + TQString mailto = TQString::fromLatin1("mailto"); for (KURL::List::Iterator it = files.begin(); it != files.end(); ++it) { if ((*it).protocol() == mailto) @@ -168,7 +168,7 @@ void LineEdit::dropEvent(TQDropEvent* e) if (mType == Emails) { // Remove newlines from a list of email addresses, and allow an eventual mailto: protocol - TQString mailto = TQString::tqfromLatin1("mailto:"); + TQString mailto = TQString::fromLatin1("mailto:"); newEmails = TQStringList::split(TQRegExp("[\r\n]+"), txt); for (TQStringList::Iterator it = newEmails.begin(); it != newEmails.end(); ++it) { diff --git a/kalarm/lib/messagebox.cpp b/kalarm/lib/messagebox.cpp index 3345c9c4b..48c18f1cd 100644 --- a/kalarm/lib/messagebox.cpp +++ b/kalarm/lib/messagebox.cpp @@ -109,7 +109,7 @@ bool MessageBox::setDefaultShouldBeShownContinue(const TQString& dontShowAgainNa return false; // First check whether there is an existing setting KConfig* config = mConfig ? mConfig : KGlobal::config(); - config->setGroup(TQString::tqfromLatin1("Notification Messages")); + config->setGroup(TQString::fromLatin1("Notification Messages")); if (config->hasKey(dontShowAgainName)) return false; @@ -168,10 +168,10 @@ void MessageBox::saveDontShowAgain(const TQString& dontShowAgainName, bool yesno if (dontShowAgainName.isEmpty()) return; KConfig* config = mConfig ? mConfig : KGlobal::config(); - config->setGroup(TQString::tqfromLatin1("Notification Messages")); + config->setGroup(TQString::fromLatin1("Notification Messages")); bool global = (dontShowAgainName[0] == ':'); if (yesno) - config->writeEntry(dontShowAgainName, TQString::tqfromLatin1(dontShow ? yesnoResult : ""), true, global); + config->writeEntry(dontShowAgainName, TQString::fromLatin1(dontShow ? yesnoResult : ""), true, global); else config->writeEntry(dontShowAgainName, !dontShow, true, global); config->sync(); diff --git a/kalarm/lib/radiobutton.h b/kalarm/lib/radiobutton.h index 107957ca7..3af80343f 100644 --- a/kalarm/lib/radiobutton.h +++ b/kalarm/lib/radiobutton.h @@ -63,7 +63,7 @@ class RadioButton : public TQRadioButton */ virtual void setReadOnly(bool readOnly); /** Returns the widget which receives focus when the button is clicked. */ - TQWidget* tqfocusWidget() const { return mFocusWidget; } + TQWidget* focusWidget() const { return mFocusWidget; } /** Specifies a widget to receive focus when the button is clicked. * @param widget Widget to receive focus. * @param enable If true, @p widget will be enabled before receiving focus. If diff --git a/kalarm/lib/shellprocess.cpp b/kalarm/lib/shellprocess.cpp index 09daf91db..a8c8228c3 100644 --- a/kalarm/lib/shellprocess.cpp +++ b/kalarm/lib/shellprocess.cpp @@ -40,7 +40,7 @@ bool ShellProcess::mAuthorised = false; ShellProcess::ShellProcess(const TQString& command) : KShellProcess(shellName()), mCommand(command), - mtqStatus(INACTIVE), + mStatus(INACTIVE), mStdinExit(false) { } @@ -52,7 +52,7 @@ bool ShellProcess::start(Communication comm) { if (!authorised()) { - mtqStatus = UNAUTHORISED; + mStatus = UNAUTHORISED; return false; } KShellProcess::operator<<(mCommand); @@ -60,10 +60,10 @@ bool ShellProcess::start(Communication comm) connect(this, TQT_SIGNAL(processExited(KProcess*)), TQT_SLOT(slotExited(KProcess*))); if (!KShellProcess::start(KProcess::NotifyOnExit, comm)) { - mtqStatus = START_FAIL; + mStatus = START_FAIL; return false; } - mtqStatus = RUNNING; + mStatus = RUNNING; return true; } @@ -76,11 +76,11 @@ void ShellProcess::slotExited(KProcess* proc) { kdDebug(5950) << "ShellProcess::slotExited()\n"; mStdinQueue.clear(); - mtqStatus = SUCCESS; + mStatus = SUCCESS; if (!proc->normalExit()) { kdWarning(5950) << "ShellProcess::slotExited(" << mCommand << ") " << mShellName << ": died/killed\n"; - mtqStatus = DIED; + mStatus = DIED; } else { @@ -90,7 +90,7 @@ void ShellProcess::slotExited(KProcess* proc) || mShellName == "ksh" && status == 127) { kdWarning(5950) << "ShellProcess::slotExited(" << mCommand << ") " << mShellName << ": not found or not executable\n"; - mtqStatus = NOT_FOUND; + mStatus = NOT_FOUND; } } emit shellExited(this); @@ -140,7 +140,7 @@ void ShellProcess::stdinExit() */ TQString ShellProcess::errorMessage() const { - switch (mtqStatus) + switch (mStatus) { case UNAUTHORISED: return i18n("Failed to execute command (shell access not authorized):"); diff --git a/kalarm/lib/shellprocess.h b/kalarm/lib/shellprocess.h index fd303bea0..a4ff79889 100644 --- a/kalarm/lib/shellprocess.h +++ b/kalarm/lib/shellprocess.h @@ -61,7 +61,7 @@ class ShellProcess : public KShellProcess * @li NOT_FOUND - the command was either not found or not executable. * @li START_FAIL - the command couldn't be started for other reasons. */ - enum tqStatus { + enum Status { INACTIVE, // start() has not yet been called to run the command RUNNING, // command is currently running SUCCESS, // command appears to have exited successfully @@ -80,11 +80,11 @@ class ShellProcess : public KShellProcess */ bool start(Communication comm = NoCommunication); /** Returns the current status of the shell process. */ - tqStatus status() const { return mtqStatus; } + Status status() const { return mStatus; } /** Returns whether the command was run successfully. * @return True if the command has been run and appears to have exited successfully. */ - bool normalExit() const { return mtqStatus == SUCCESS; } + bool normalExit() const { return mStatus == SUCCESS; } /** Returns the command configured to be run. */ const TQString& command() const { return mCommand; } /** Returns the error message corresponding to the command exit status. @@ -132,7 +132,7 @@ class ShellProcess : public KShellProcess static bool mAuthorised; // true if shell commands are authorised TQString mCommand; // copy of command to be executed TQValueList<TQCString> mStdinQueue; // queued strings to send to STDIN - tqStatus mtqStatus; // current execution status + Status mStatus; // current execution status bool mStdinExit; // exit once STDIN queue has been written }; diff --git a/kalarm/lib/spinbox2.cpp b/kalarm/lib/spinbox2.cpp index 3ec3b68c0..2eceec29c 100644 --- a/kalarm/lib/spinbox2.cpp +++ b/kalarm/lib/spinbox2.cpp @@ -225,18 +225,18 @@ void SpinBox2::showEvent(TQShowEvent*) arrange(); } -TQSize SpinBox2::tqsizeHint() const +TQSize SpinBox2::sizeHint() const { getMetrics(); - TQSize size = mSpinbox->tqsizeHint(); + TQSize size = mSpinbox->sizeHint(); size.setWidth(size.width() - xSpinbox + wUpdown2 + wGap); return size; } -TQSize SpinBox2::tqminimumSizeHint() const +TQSize SpinBox2::minimumSizeHint() const { getMetrics(); - TQSize size = mSpinbox->tqminimumSizeHint(); + TQSize size = mSpinbox->minimumSizeHint(); size.setWidth(size.width() - xSpinbox + wUpdown2 + wGap); return size; } @@ -265,14 +265,14 @@ void SpinBox2::updateMirror() void SpinBox2::arrange() { getMetrics(); - TQRect arrowRect = TQStyle::tqvisualRect(TQRect(0, 0, wUpdown2, height()), this); + TQRect arrowRect = TQStyle::visualRect(TQRect(0, 0, wUpdown2, height()), this); mUpdown2Frame->setGeometry(arrowRect); mUpdown2->setGeometry(-xUpdown2, 0, mUpdown2->width(), height()); - mSpinboxFrame->setGeometry(TQStyle::tqvisualRect(TQRect(wUpdown2 + wGap, 0, width() - wUpdown2 - wGap, height()), this)); + mSpinboxFrame->setGeometry(TQStyle::visualRect(TQRect(wUpdown2 + wGap, 0, width() - wUpdown2 - wGap, height()), this)); mSpinbox->setGeometry(-xSpinbox, 0, mSpinboxFrame->width() + xSpinbox, height()); mSpinMirror->resize(wUpdown2, mUpdown2->height()); mSpinMirror->setGeometry(arrowRect); -//mSpinMirror->setGeometry(TQStyle::tqvisualRect(TQRect(0, 11, wUpdown2, height()), this)); +//mSpinMirror->setGeometry(TQStyle::visualRect(TQRect(0, 11, wUpdown2, height()), this)); mSpinMirror->setNormalButtons(TQPixmap::grabWidget(mUpdown2Frame, 0, 0)); } @@ -422,7 +422,7 @@ void SpinMirror::redraw() void SpinMirror::redraw(const TQPixmap& px) { TQCanvas* c = canvas(); - c->tqsetBackgroundPixmap(px); + c->setBackgroundPixmap(px); c->setAllChanged(); c->update(); } diff --git a/kalarm/lib/spinbox2.h b/kalarm/lib/spinbox2.h index 4391fbb9c..292cd2a85 100644 --- a/kalarm/lib/spinbox2.h +++ b/kalarm/lib/spinbox2.h @@ -116,7 +116,7 @@ class SpinBox2 : public TQFrame bool wrapping() const { return mSpinbox->wrapping(); } /** Set the text tqalignment of the widget */ - void tqsetAlignment(int a) { mSpinbox->tqsetAlignment(a); } + void setAlignment(int a) { mSpinbox->setAlignment(a); } /** Sets the button symbols to use (arrows or plus/minus). */ virtual void setButtonSymbols(TQSpinBox::ButtonSymbols); /** Returns the button symbols currently in use (arrows or plus/minus). */ @@ -131,8 +131,8 @@ class SpinBox2 : public TQFrame */ const TQValidator* validator() const { return mSpinbox->validator(); } - virtual TQSize tqsizeHint() const; - virtual TQSize tqminimumSizeHint() const; + virtual TQSize sizeHint() const; + virtual TQSize minimumSizeHint() const; /** Returns the minimum value of the spin box. */ int minValue() const { return mMinValue; } @@ -286,7 +286,7 @@ class SpinBox2 : public TQFrame : SpinBox(parent, name), owner(sb2) { } MainSpinBox(int minValue, int maxValue, int step, SpinBox2* sb2, TQWidget* parent, const char* name = 0) : SpinBox(minValue, maxValue, step, parent, name), owner(sb2) { } - void tqsetAlignment(int a) { editor()->tqsetAlignment(a); } + void setAlignment(int a) { editor()->setAlignment(a); } virtual TQString mapValueToText(int v) { return owner->mapValueToText(v); } virtual int mapTextToValue(bool* ok) { return owner->mapTextToValue(ok); } TQString mapValToText(int v) { return SpinBox::mapValueToText(v); } diff --git a/kalarm/lib/synchtimer.cpp b/kalarm/lib/synchtimer.cpp index caed93d7b..eecef7d4b 100644 --- a/kalarm/lib/synchtimer.cpp +++ b/kalarm/lib/synchtimer.cpp @@ -196,7 +196,7 @@ void DailyTimer::changeTime(const TQTime& newTimeOfDay, bool triggerMissed) void DailyTimer::start() { // TIMEZONE = local time - TQDateTime now = TQDateTime::tqcurrentDateTime(); + TQDateTime now = TQDateTime::currentDateTime(); // Find out whether to trigger today or tomorrow. // In preference, use the last trigger date to determine this, since // that will avoid possible errors due to daylight savings time changes. @@ -224,7 +224,7 @@ void DailyTimer::start() void DailyTimer::slotTimer() { // TIMEZONE = local time - TQDateTime now = TQDateTime::tqcurrentDateTime(); + TQDateTime now = TQDateTime::currentDateTime(); mLastDate = now.date(); TQDateTime next = TQDateTime(mLastDate.addDays(1), mTime); uint interval = next.toTime_t() - now.toTime_t(); diff --git a/kalarm/lib/timeedit.cpp b/kalarm/lib/timeedit.cpp index 170914922..01152fcee 100644 --- a/kalarm/lib/timeedit.cpp +++ b/kalarm/lib/timeedit.cpp @@ -37,13 +37,13 @@ TimeEdit::TimeEdit(TQWidget* parent, const char* name) { bool use12hour = KGlobal::locale()->use12Clock(); mSpinBox = new TimeSpinBox(!use12hour, this); - mSpinBox->setFixedSize(mSpinBox->tqsizeHint()); + mSpinBox->setFixedSize(mSpinBox->sizeHint()); connect(mSpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotValueChanged(int))); if (use12hour) { mAmPm = new ComboBox(this); setAmPmCombo(1, 1); // add "am" and "pm" options to the combo box - mAmPm->setFixedSize(mAmPm->tqsizeHint()); + mAmPm->setFixedSize(mAmPm->sizeHint()); connect(mAmPm, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotAmPmChanged(int))); } } diff --git a/kalarm/lib/timeperiod.cpp b/kalarm/lib/timeperiod.cpp index 291ba0872..e372615a7 100644 --- a/kalarm/lib/timeperiod.cpp +++ b/kalarm/lib/timeperiod.cpp @@ -71,7 +71,7 @@ TimePeriod::TimePeriod(bool allowHourMinute, TQWidget* parent, const char* name) connect(mTimeSpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotTimeChanged(int))); mSpinStack->addWidget(mTimeSpinBox, 1); - mSpinStack->setFixedSize(mSpinBox->tqsizeHint().expandedTo(mTimeSpinBox->tqsizeHint())); + mSpinStack->setFixedSize(mSpinBox->sizeHint().expandedTo(mTimeSpinBox->sizeHint())); mHourMinuteRaised = mNoHourMinute; showHourMin(!mNoHourMinute); @@ -87,7 +87,7 @@ TimePeriod::TimePeriod(bool allowHourMinute, TQWidget* parent, const char* name) mUnitsCombo->insertItem(i18n_days()); mUnitsCombo->insertItem(i18n_weeks()); mMaxUnitShown = WEEKS; - mUnitsCombo->setFixedSize(mUnitsCombo->tqsizeHint()); + mUnitsCombo->setFixedSize(mUnitsCombo->sizeHint()); connect(mUnitsCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotUnitsSelected(int))); setFocusProxy(mUnitsCombo); diff --git a/kalarm/lib/timespinbox.cpp b/kalarm/lib/timespinbox.cpp index f756112e8..b2121072f 100644 --- a/kalarm/lib/timespinbox.cpp +++ b/kalarm/lib/timespinbox.cpp @@ -69,7 +69,7 @@ TimeSpinBox::TimeSpinBox(bool use24hour, TQWidget* parent, const char* name) setReverseWithLayout(false); // keep buttons the same way round even if right-to-left language setShiftSteps(5, 360); // shift-left button increments 5 min / 6 hours setSelectOnStep(false); - tqsetAlignment(TQt::AlignHCenter); + setAlignment(TQt::AlignHCenter); connect(this, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotValueChanged(int))); } @@ -88,7 +88,7 @@ TimeSpinBox::TimeSpinBox(int minMinute, int maxMinute, TQWidget* parent, const c setReverseWithLayout(false); // keep buttons the same way round even if right-to-left language setShiftSteps(5, 300); // shift-left button increments 5 min / 5 hours setSelectOnStep(false); - tqsetAlignment(TQApplication::reverseLayout() ? TQt::AlignLeft : TQt::AlignRight); + setAlignment(TQApplication::reverseLayout() ? TQt::AlignLeft : TQt::AlignRight); } TQString TimeSpinBox::shiftWhatsThis() @@ -211,7 +211,7 @@ void TimeSpinBox::setValid(bool valid) { mInvalid = true; SpinBox2::setMinValue(mMinimumValue - 1); - setSpecialValueText(TQString::tqfromLatin1("**:**")); + setSpecialValueText(TQString::fromLatin1("**:**")); SpinBox2::setValue(mMinimumValue - 1); } } @@ -280,16 +280,16 @@ void TimeSpinBox::slotValueChanged(int value) mPm = mValidator->mPm = (value >= 720); } -TQSize TimeSpinBox::tqsizeHint() const +TQSize TimeSpinBox::sizeHint() const { - TQSize sz = SpinBox2::tqsizeHint(); + TQSize sz = SpinBox2::sizeHint(); TQFontMetrics fm(font()); return TQSize(sz.width() + fm.width(":"), sz.height()); } -TQSize TimeSpinBox::tqminimumSizeHint() const +TQSize TimeSpinBox::minimumSizeHint() const { - TQSize sz = SpinBox2::tqminimumSizeHint(); + TQSize sz = SpinBox2::minimumSizeHint(); TQFontMetrics fm(font()); return TQSize(sz.width() + fm.width(":"), sz.height()); } diff --git a/kalarm/lib/timespinbox.h b/kalarm/lib/timespinbox.h index 0be232453..fe45efab4 100644 --- a/kalarm/lib/timespinbox.h +++ b/kalarm/lib/timespinbox.h @@ -91,8 +91,8 @@ class TimeSpinBox : public SpinBox2 */ static TQString shiftWhatsThis(); - virtual TQSize tqsizeHint() const; - virtual TQSize tqminimumSizeHint() const; + virtual TQSize sizeHint() const; + virtual TQSize minimumSizeHint() const; public slots: /** Sets the value of the spin box. diff --git a/kalarm/mainwindow.cpp b/kalarm/mainwindow.cpp index 6985430b5..d6597fe20 100644 --- a/kalarm/mainwindow.cpp +++ b/kalarm/mainwindow.cpp @@ -71,11 +71,11 @@ using namespace KCal; static const char* UI_FILE = "kalarmui.rc"; static const char* WINDOW_NAME = "MainWindow"; -static const TQString VIEW_GROUP = TQString::tqfromLatin1("View"); -static const TQString SHOW_TIME_KEY = TQString::tqfromLatin1("ShowAlarmTime"); -static const TQString SHOW_TIME_TO_KEY = TQString::tqfromLatin1("ShowTimeToAlarm"); -static const TQString SHOW_ARCHIVED_KEY = TQString::tqfromLatin1("ShowArchivedAlarms"); -static const TQString SHOW_RESOURCES_KEY = TQString::tqfromLatin1("ShowResources"); +static const TQString VIEW_GROUP = TQString::fromLatin1("View"); +static const TQString SHOW_TIME_KEY = TQString::fromLatin1("ShowAlarmTime"); +static const TQString SHOW_TIME_TO_KEY = TQString::fromLatin1("ShowTimeToAlarm"); +static const TQString SHOW_ARCHIVED_KEY = TQString::fromLatin1("ShowArchivedAlarms"); +static const TQString SHOW_RESOURCES_KEY = TQString::fromLatin1("ShowResources"); static TQString undoText; static TQString undoTextStripped; @@ -123,7 +123,7 @@ MainWindow::MainWindow(bool restored) mHiddenTrayParent(false) { kdDebug(5950) << "MainWindow::MainWindow()\n"; - setAutoSaveSettings(TQString::tqfromLatin1(WINDOW_NAME)); // save window sizes etc. + setAutoSaveSettings(TQString::fromLatin1(WINDOW_NAME)); // save window sizes etc. setPlainCaption(kapp->aboutData()->programName()); KConfig* config = KGlobal::config(); config->setGroup(VIEW_GROUP); @@ -136,8 +136,8 @@ MainWindow::MainWindow(bool restored) if (KAlarm::readConfigWindowSize(WINDOW_NAME, s)) resize(s); } - config->setGroup(TQString::tqfromLatin1(WINDOW_NAME)); - TQValueList<int> order = config->readIntListEntry(TQString::tqfromLatin1("ColumnOrder")); + config->setGroup(TQString::fromLatin1(WINDOW_NAME)); + TQValueList<int> order = config->readIntListEntry(TQString::fromLatin1("ColumnOrder")); setAcceptDrops(true); // allow drag-and-drop onto this window if (!mShowTimeTo) @@ -201,10 +201,10 @@ MainWindow::~MainWindow() */ void MainWindow::saveProperties(KConfig* config) { - config->writeEntry(TQString::tqfromLatin1("HiddenTrayParent"), isTrayParent() && isHidden()); - config->writeEntry(TQString::tqfromLatin1("ShowExpired"), mShowExpired); - config->writeEntry(TQString::tqfromLatin1("ShowTime"), mShowTime); - config->writeEntry(TQString::tqfromLatin1("ShowTimeTo"), mShowTimeTo); + config->writeEntry(TQString::fromLatin1("HiddenTrayParent"), isTrayParent() && isHidden()); + config->writeEntry(TQString::fromLatin1("ShowExpired"), mShowExpired); + config->writeEntry(TQString::fromLatin1("ShowTime"), mShowTime); + config->writeEntry(TQString::fromLatin1("ShowTimeTo"), mShowTimeTo); } /****************************************************************************** @@ -214,10 +214,10 @@ void MainWindow::saveProperties(KConfig* config) */ void MainWindow::readProperties(KConfig* config) { - mHiddenTrayParent = config->readBoolEntry(TQString::tqfromLatin1("HiddenTrayParent")); - mShowExpired = config->readBoolEntry(TQString::tqfromLatin1("ShowExpired")); - mShowTime = config->readBoolEntry(TQString::tqfromLatin1("ShowTime")); - mShowTimeTo = config->readBoolEntry(TQString::tqfromLatin1("ShowTimeTo")); + mHiddenTrayParent = config->readBoolEntry(TQString::fromLatin1("HiddenTrayParent")); + mShowExpired = config->readBoolEntry(TQString::fromLatin1("ShowExpired")); + mShowTime = config->readBoolEntry(TQString::fromLatin1("ShowTime")); + mShowTimeTo = config->readBoolEntry(TQString::fromLatin1("ShowTimeTo")); } /****************************************************************************** @@ -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::tqfromLatin1(UI_FILE))); + KMessageBox::error(this, i18n("Failure to create menus\n(perhaps %1 missing or corrupted)").tqarg(TQString::fromLatin1(UI_FILE))); mMenuError = false; } } @@ -315,8 +315,8 @@ void MainWindow::hideEvent(TQHideEvent* he) void MainWindow::columnsReordered() { KConfig* config = KGlobal::config(); - config->setGroup(TQString::tqfromLatin1(WINDOW_NAME)); - config->writeEntry(TQString::tqfromLatin1("ColumnOrder"), mListView->columnOrder()); + config->setGroup(TQString::fromLatin1(WINDOW_NAME)); + config->writeEntry(TQString::fromLatin1("ColumnOrder"), mListView->columnOrder()); config->sync(); } @@ -386,7 +386,7 @@ void MainWindow::initActions() connect(mActionUndo->popupMenu(), TQT_SIGNAL(activated(int)), TQT_SLOT(slotUndoItem(int))); connect(mActionRedo->popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotInitRedoMenu())); connect(mActionRedo->popupMenu(), TQT_SIGNAL(activated(int)), TQT_SLOT(slotRedoItem(int))); - connect(Undo::instance(), TQT_SIGNAL(changed(const TQString&, const TQString&)), TQT_SLOT(slotUndotqStatus(const TQString&, const TQString&))); + connect(Undo::instance(), TQT_SIGNAL(changed(const TQString&, const TQString&)), TQT_SLOT(slotUndoStatus(const TQString&, const TQString&))); connect(mListView, TQT_SIGNAL(findActive(bool)), TQT_SLOT(slotFindActive(bool))); Preferences::connect(TQT_SIGNAL(preferencesChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotPrefsChanged())); connect(theApp(), TQT_SIGNAL(trayIconToggled()), TQT_SLOT(updateTrayIconAction())); @@ -415,7 +415,7 @@ void MainWindow::initActions() tb->applySettings(KGlobal::config(), "Toolbars"); Undo::emitChanged(); // set the Undo/Redo menu texts - Daemon::checktqStatus(); + Daemon::checkStatus(); Daemon::monitoringAlarms(); } @@ -947,7 +947,7 @@ void MainWindow::updateTrayIconAction() */ void MainWindow::updateActionsMenu() { - Daemon::checktqStatus(); // update the Alarms Enabled item status + Daemon::checkStatus(); // update the Alarms Enabled item status } /****************************************************************************** @@ -1033,7 +1033,7 @@ void MainWindow::initUndoMenu(KPopupMenu* menu, Undo::Type type) * Called when the status of the Undo or Redo list changes. * Change the Undo or Redo text to include the action which would be undone/redone. */ -void MainWindow::slotUndotqStatus(const TQString& undo, const TQString& redo) +void MainWindow::slotUndoStatus(const TQString& undo, const TQString& redo) { if (undo.isNull()) { @@ -1196,7 +1196,7 @@ void MainWindow::executeDropEvent(MainWindow* win, TQDropEvent* e) AlarmText alarmText; KPIM::MailList mailList; KURL::List files; - KCal::CalendarLocal calendar(TQString::tqfromLatin1("UTC")); + KCal::CalendarLocal calendar(TQString::fromLatin1("UTC")); calendar.setLocalTime(); // default to local time (i.e. no time zone) #ifndef NDEBUG TQCString fmts; @@ -1213,7 +1213,7 @@ void MainWindow::executeDropEvent(MainWindow* win, TQDropEvent* e) * Don't change them without careful thought !! */ if (e->provides("message/rfc822") - && !(bytes = e->tqencodedData("message/rfc822")).isEmpty()) + && !(bytes = e->encodedData("message/rfc822")).isEmpty()) { // Email message(s). Ignore all but the first. kdDebug(5950) << "MainWindow::executeDropEvent(email)" << endl; @@ -1299,7 +1299,7 @@ void MainWindow::slotSelection() bool enableEnableDisable = true; bool enableEnable = false; bool enableDisable = false; - TQDateTime now = TQDateTime::tqcurrentDateTime(); + TQDateTime now = TQDateTime::currentDateTime(); for (TQValueList<EventListViewItemBase*>::Iterator it = items.begin(); it != items.end(); ++it) { const KAEvent& event = ((AlarmListViewItem*)(*it))->event(); diff --git a/kalarm/mainwindow.h b/kalarm/mainwindow.h index cb070e9a2..08fcfacad 100644 --- a/kalarm/mainwindow.h +++ b/kalarm/mainwindow.h @@ -126,7 +126,7 @@ class MainWindow : public MainWindowBase void slotRedoItem(int id); void slotInitUndoMenu(); void slotInitRedoMenu(); - void slotUndotqStatus(const TQString&, const TQString&); + void slotUndoStatus(const TQString&, const TQString&); void slotFindActive(bool); void slotPrefsChanged(); void updateTrayIconAction(); diff --git a/kalarm/messagewin.cpp b/kalarm/messagewin.cpp index f7decdf65..4849e5334 100644 --- a/kalarm/messagewin.cpp +++ b/kalarm/messagewin.cpp @@ -101,7 +101,7 @@ class MessageText : public TQTextEdit } int scrollBarHeight() const { return horizontalScrollBar()->height(); } int scrollBarWidth() const { return verticalScrollBar()->width(); } - virtual TQSize tqsizeHint() const { return TQSize(contentsWidth() + scrollBarWidth(), contentsHeight() + scrollBarHeight()); } + virtual TQSize sizeHint() const { return TQSize(contentsWidth() + scrollBarWidth(), contentsHeight() + scrollBarHeight()); } }; @@ -191,7 +191,7 @@ MessageWin::MessageWin(const KAEvent& event, const KAAlarm& alarm, bool reschedu kdDebug(5950) << "MessageWin::MessageWin(event)" << endl; // Set to save settings automatically, but don't save window size. // File alarm window size is saved elsewhere. - setAutoSaveSettings(TQString::tqfromLatin1("MessageWin"), false); + setAutoSaveSettings(TQString::fromLatin1("MessageWin"), false); initView(); mWindowList.append(this); if (event.autoClose()) @@ -314,7 +314,7 @@ void MessageWin::initView() : KGlobal::locale()->formatDateTime(mDateTime.dateTime())); if (!frame) label->setFrameStyle(TQFrame::Box | TQFrame::Raised); - label->setFixedSize(label->tqsizeHint()); + label->setFixedSize(label->sizeHint()); tqlayout->addWidget(label, 0, TQt::AlignHCenter); TQWhatsThis::add(label, i18n("The scheduled date/time for the message (as opposed to the actual time of display).")); @@ -323,9 +323,9 @@ void MessageWin::initView() { label = new TQLabel(frame); label->setText(i18n("Reminder")); - label->setFixedSize(label->tqsizeHint()); + label->setFixedSize(label->sizeHint()); tqlayout->addWidget(label, 0, TQt::AlignHCenter); - frame->setFixedSize(frame->tqsizeHint()); + frame->setFixedSize(frame->sizeHint()); } } @@ -339,7 +339,7 @@ void MessageWin::initView() // Display the file name TQLabel* label = new TQLabel(mMessage, topWidget); label->setFrameStyle(TQFrame::Box | TQFrame::Raised); - label->setFixedSize(label->tqsizeHint()); + label->setFixedSize(label->sizeHint()); TQWhatsThis::add(label, i18n("The file whose contents are displayed below")); topLayout->addWidget(label, 0, TQt::AlignHCenter); @@ -357,7 +357,7 @@ void MessageWin::initView() opened = true; KTextBrowser* view = new KTextBrowser(topWidget, "fileContents"); MWMimeSourceFactory msf(tmpFile, view); - view->setMinimumSize(view->tqsizeHint()); + view->setMinimumSize(view->sizeHint()); topLayout->addWidget(view); // Set the default size to 20 lines square. @@ -365,7 +365,7 @@ void MessageWin::initView() // is overridden by the user-set default stored in the config file. // So there is no need to calculate an accurate size. int h = 20*view->fontMetrics().lineSpacing() + 2*view->frameWidth(); - view->resize(TQSize(h, h).expandedTo(view->tqsizeHint())); + view->resize(TQSize(h, h).expandedTo(view->sizeHint())); TQWhatsThis::add(view, i18n("The contents of the file to be displayed")); } KIO::NetAccess::removeTempFile(tmpFile); @@ -388,7 +388,7 @@ void MessageWin::initView() text->setPaletteForegroundColor(mFgColour); text->setFont(mFont); int lineSpacing = text->fontMetrics().lineSpacing(); - TQSize s = text->tqsizeHint(); + TQSize s = text->sizeHint(); int h = s.height(); text->setMaximumHeight(h + text->scrollBarHeight()); text->setMinimumHeight(TQMIN(h, lineSpacing*4)); @@ -401,7 +401,7 @@ void MessageWin::initView() // Don't include any horizontal margins if message is 2/3 screen width if (!mWinModule) mWinModule = new KWinModule(0, KWinModule::INFO_DESKTOP); - if (text->tqsizeHint().width() >= mWinModule->workArea().width()*2/3) + if (text->sizeHint().width() >= mWinModule->workArea().width()*2/3) topLayout->addWidget(text, 1, TQt::AlignHCenter); else { @@ -426,7 +426,7 @@ void MessageWin::initView() mRemainingText = new TQLabel(topWidget); mRemainingText->setFrameStyle(TQFrame::Box | TQFrame::Raised); mRemainingText->setMargin(leading); - if (mDateTime.isDateOnly() || TQDate::tqcurrentDate().daysTo(mDateTime.date()) > 0) + if (mDateTime.isDateOnly() || TQDate::currentDate().daysTo(mDateTime.date()) > 0) { setRemainingTextDay(); MidnightTimer::connect(TQT_TQOBJECT(this), TQT_SLOT(setRemainingTextDay())); // update every day @@ -456,17 +456,17 @@ void MessageWin::initView() TQGridLayout* grid = new TQGridLayout(frame, 2, 2, KDialog::marginHint(), KDialog::spacingHint()); TQLabel* label = new TQLabel(i18n("Email addressee", "To:"), frame); - label->setFixedSize(label->tqsizeHint()); + label->setFixedSize(label->sizeHint()); grid->addWidget(label, 0, 0, TQt::AlignLeft); label = new TQLabel(mEvent.emailAddresses("\n"), frame); - label->setFixedSize(label->tqsizeHint()); + label->setFixedSize(label->sizeHint()); grid->addWidget(label, 0, 1, TQt::AlignLeft); label = new TQLabel(i18n("Email subject", "Subject:"), frame); - label->setFixedSize(label->tqsizeHint()); + label->setFixedSize(label->sizeHint()); grid->addWidget(label, 1, 0, TQt::AlignLeft); label = new TQLabel(mEvent.emailSubject(), frame); - label->setFixedSize(label->tqsizeHint()); + label->setFixedSize(label->sizeHint()); grid->addWidget(label, 1, 1, TQt::AlignLeft); break; } @@ -489,13 +489,13 @@ void MessageWin::initView() tqlayout->addStretch(); TQLabel* label = new TQLabel(topWidget); label->setPixmap(DesktopIcon("error")); - label->setFixedSize(label->tqsizeHint()); + label->setFixedSize(label->sizeHint()); tqlayout->addWidget(label, 0, TQt::AlignRight); TQBoxLayout* vtqlayout = new TQVBoxLayout(tqlayout); for (TQStringList::Iterator it = mErrorMsgs.begin(); it != mErrorMsgs.end(); ++it) { label = new TQLabel(*it, topWidget); - label->setFixedSize(label->tqsizeHint()); + label->setFixedSize(label->sizeHint()); vtqlayout->addWidget(label, 0, TQt::AlignLeft); } tqlayout->addStretch(); @@ -511,7 +511,7 @@ void MessageWin::initView() // Prevent accidental acknowledgement of the message if the user is typing when the window appears mOkButton->clearFocus(); mOkButton->setFocusPolicy(TQ_ClickFocus); // don't allow keyboard selection - mOkButton->setFixedSize(mOkButton->tqsizeHint()); + mOkButton->setFixedSize(mOkButton->sizeHint()); connect(mOkButton, TQT_SIGNAL(clicked()), TQT_SLOT(close())); grid->addWidget(mOkButton, 0, gridIndex++, AlignHCenter); TQWhatsThis::add(mOkButton, i18n("Acknowledge the alarm")); @@ -521,7 +521,7 @@ void MessageWin::initView() // Edit button mEditButton = new TQPushButton(i18n("&Edit..."), topWidget); mEditButton->setFocusPolicy(TQ_ClickFocus); // don't allow keyboard selection - mEditButton->setFixedSize(mEditButton->tqsizeHint()); + mEditButton->setFixedSize(mEditButton->sizeHint()); connect(mEditButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotEdit())); grid->addWidget(mEditButton, 0, gridIndex++, AlignHCenter); TQWhatsThis::add(mEditButton, i18n("Edit the alarm.")); @@ -532,7 +532,7 @@ void MessageWin::initView() // Defer button mDeferButton = new TQPushButton(i18n("&Defer..."), topWidget); mDeferButton->setFocusPolicy(TQ_ClickFocus); // don't allow keyboard selection - mDeferButton->setFixedSize(mDeferButton->tqsizeHint()); + mDeferButton->setFixedSize(mDeferButton->sizeHint()); connect(mDeferButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotDefer())); grid->addWidget(mDeferButton, 0, gridIndex++, AlignHCenter); TQWhatsThis::add(mDeferButton, @@ -549,7 +549,7 @@ void MessageWin::initView() TQPixmap pixmap = MainBarIcon("player_stop"); mSilenceButton = new TQPushButton(topWidget); mSilenceButton->setPixmap(pixmap); - mSilenceButton->setFixedSize(mSilenceButton->tqsizeHint()); + mSilenceButton->setFixedSize(mSilenceButton->sizeHint()); connect(mSilenceButton, TQT_SIGNAL(clicked()), TQT_SLOT(stopPlay())); grid->addWidget(mSilenceButton, 0, gridIndex++, AlignHCenter); TQToolTip::add(mSilenceButton, i18n("Stop sound")); @@ -563,10 +563,10 @@ void MessageWin::initView() if (mKMailSerialNumber) { // KMail button - TQPixmap pixmap = iconLoader.loadIcon(TQString::tqfromLatin1("kmail"), KIcon::MainToolbar); + TQPixmap pixmap = iconLoader.loadIcon(TQString::fromLatin1("kmail"), KIcon::MainToolbar); mKMailButton = new TQPushButton(topWidget); mKMailButton->setPixmap(pixmap); - mKMailButton->setFixedSize(mKMailButton->tqsizeHint()); + mKMailButton->setFixedSize(mKMailButton->sizeHint()); connect(mKMailButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotShowKMailMessage())); grid->addWidget(mKMailButton, 0, gridIndex++, AlignHCenter); TQToolTip::add(mKMailButton, i18n("Locate this email in KMail", "Locate in KMail")); @@ -576,10 +576,10 @@ void MessageWin::initView() mKMailButton = 0; // KAlarm button - TQPixmap pixmap = iconLoader.loadIcon(TQString::tqfromLatin1(kapp->aboutData()->appName()), KIcon::MainToolbar); + TQPixmap pixmap = iconLoader.loadIcon(TQString::fromLatin1(kapp->aboutData()->appName()), KIcon::MainToolbar); mKAlarmButton = new TQPushButton(topWidget); mKAlarmButton->setPixmap(pixmap); - mKAlarmButton->setFixedSize(mKAlarmButton->tqsizeHint()); + mKAlarmButton->setFixedSize(mKAlarmButton->sizeHint()); connect(mKAlarmButton, TQT_SIGNAL(clicked()), TQT_SLOT(displayMainWindow())); grid->addWidget(mKAlarmButton, 0, gridIndex++, AlignHCenter); TQString actKAlarm = i18n("Activate KAlarm"); @@ -598,7 +598,7 @@ void MessageWin::initView() mKAlarmButton->setEnabled(false); topLayout->activate(); - setMinimumSize(TQSize(grid->tqsizeHint().width() + 2*KDialog::marginHint(), tqsizeHint().height())); + setMinimumSize(TQSize(grid->sizeHint().width() + 2*KDialog::marginHint(), sizeHint().height())); bool modal = !(getWFlags() & TQt::WX11BypassWM); @@ -615,7 +615,7 @@ void MessageWin::initView() void MessageWin::setRemainingTextDay() { TQString text; - int days = TQDate::tqcurrentDate().daysTo(mDateTime.date()); + int days = TQDate::currentDate().daysTo(mDateTime.date()); if (days <= 0 && !mDateTime.isDateOnly()) { // The alarm is due today, so start refreshing every minute @@ -642,7 +642,7 @@ void MessageWin::setRemainingTextDay() void MessageWin::setRemainingTextMinute() { TQString text; - int mins = (TQDateTime::tqcurrentDateTime().secsTo(mDateTime.dateTime()) + 59) / 60; + int mins = (TQDateTime::currentDateTime().secsTo(mDateTime.dateTime()) + 59) / 60; if (mins < 60) text = i18n("in 1 minute's time", "in %n minutes' time", (mins > 0 ? mins : 0)); else if (mins % 60 == 0) @@ -662,38 +662,38 @@ void MessageWin::saveProperties(KConfig* config) { if (mShown && !mErrorWindow) { - config->writeEntry(TQString::tqfromLatin1("EventID"), mEventID); - config->writeEntry(TQString::tqfromLatin1("AlarmType"), mAlarmType); - config->writeEntry(TQString::tqfromLatin1("Message"), mMessage); - config->writeEntry(TQString::tqfromLatin1("Type"), mAction); - config->writeEntry(TQString::tqfromLatin1("Font"), mFont); - config->writeEntry(TQString::tqfromLatin1("BgColour"), mBgColour); - config->writeEntry(TQString::tqfromLatin1("FgColour"), mFgColour); - config->writeEntry(TQString::tqfromLatin1("ConfirmAck"), mConfirmAck); + config->writeEntry(TQString::fromLatin1("EventID"), mEventID); + config->writeEntry(TQString::fromLatin1("AlarmType"), mAlarmType); + config->writeEntry(TQString::fromLatin1("Message"), mMessage); + config->writeEntry(TQString::fromLatin1("Type"), mAction); + config->writeEntry(TQString::fromLatin1("Font"), mFont); + config->writeEntry(TQString::fromLatin1("BgColour"), mBgColour); + config->writeEntry(TQString::fromLatin1("FgColour"), mFgColour); + config->writeEntry(TQString::fromLatin1("ConfirmAck"), mConfirmAck); if (mDateTime.isValid()) { - config->writeEntry(TQString::tqfromLatin1("Time"), mDateTime.dateTime()); - config->writeEntry(TQString::tqfromLatin1("DateOnly"), mDateTime.isDateOnly()); + config->writeEntry(TQString::fromLatin1("Time"), mDateTime.dateTime()); + config->writeEntry(TQString::fromLatin1("DateOnly"), mDateTime.isDateOnly()); } if (mCloseTime.isValid()) - config->writeEntry(TQString::tqfromLatin1("Expiry"), mCloseTime); + config->writeEntry(TQString::fromLatin1("Expiry"), mCloseTime); #ifndef WITHOUT_ARTS if (mAudioRepeat && mSilenceButton && mSilenceButton->isEnabled()) { // Only need to restart sound file playing if it's being repeated - config->writePathEntry(TQString::tqfromLatin1("AudioFile"), mAudioFile); - config->writeEntry(TQString::tqfromLatin1("Volume"), static_cast<int>(mVolume * 100)); + config->writePathEntry(TQString::fromLatin1("AudioFile"), mAudioFile); + config->writeEntry(TQString::fromLatin1("Volume"), static_cast<int>(mVolume * 100)); } #endif - config->writeEntry(TQString::tqfromLatin1("Speak"), mSpeak); - config->writeEntry(TQString::tqfromLatin1("Height"), height()); - config->writeEntry(TQString::tqfromLatin1("DeferMins"), mDefaultDeferMinutes); - config->writeEntry(TQString::tqfromLatin1("NoDefer"), mNoDefer); - config->writeEntry(TQString::tqfromLatin1("NoPostAction"), mNoPostAction); - config->writeEntry(TQString::tqfromLatin1("KMailSerial"), mKMailSerialNumber); + config->writeEntry(TQString::fromLatin1("Speak"), mSpeak); + config->writeEntry(TQString::fromLatin1("Height"), height()); + config->writeEntry(TQString::fromLatin1("DeferMins"), mDefaultDeferMinutes); + config->writeEntry(TQString::fromLatin1("NoDefer"), mNoDefer); + config->writeEntry(TQString::fromLatin1("NoPostAction"), mNoPostAction); + config->writeEntry(TQString::fromLatin1("KMailSerial"), mKMailSerialNumber); } else - config->writeEntry(TQString::tqfromLatin1("Invalid"), true); + config->writeEntry(TQString::fromLatin1("Invalid"), true); } /****************************************************************************** @@ -703,34 +703,34 @@ void MessageWin::saveProperties(KConfig* config) */ void MessageWin::readProperties(KConfig* config) { - mInvalid = config->readBoolEntry(TQString::tqfromLatin1("Invalid"), false); - mEventID = config->readEntry(TQString::tqfromLatin1("EventID")); - mAlarmType = KAAlarm::Type(config->readNumEntry(TQString::tqfromLatin1("AlarmType"))); - mMessage = config->readEntry(TQString::tqfromLatin1("Message")); - mAction = KAEvent::Action(config->readNumEntry(TQString::tqfromLatin1("Type"))); - mFont = config->readFontEntry(TQString::tqfromLatin1("Font")); - mBgColour = config->readColorEntry(TQString::tqfromLatin1("BgColour")); - mFgColour = config->readColorEntry(TQString::tqfromLatin1("FgColour")); - mConfirmAck = config->readBoolEntry(TQString::tqfromLatin1("ConfirmAck")); + mInvalid = config->readBoolEntry(TQString::fromLatin1("Invalid"), false); + mEventID = config->readEntry(TQString::fromLatin1("EventID")); + mAlarmType = KAAlarm::Type(config->readNumEntry(TQString::fromLatin1("AlarmType"))); + mMessage = config->readEntry(TQString::fromLatin1("Message")); + mAction = KAEvent::Action(config->readNumEntry(TQString::fromLatin1("Type"))); + mFont = config->readFontEntry(TQString::fromLatin1("Font")); + mBgColour = config->readColorEntry(TQString::fromLatin1("BgColour")); + mFgColour = config->readColorEntry(TQString::fromLatin1("FgColour")); + mConfirmAck = config->readBoolEntry(TQString::fromLatin1("ConfirmAck")); TQDateTime invalidDateTime; - TQDateTime dt = config->readDateTimeEntry(TQString::tqfromLatin1("Time"), &invalidDateTime); - bool dateOnly = config->readBoolEntry(TQString::tqfromLatin1("DateOnly")); + TQDateTime dt = config->readDateTimeEntry(TQString::fromLatin1("Time"), &invalidDateTime); + bool dateOnly = config->readBoolEntry(TQString::fromLatin1("DateOnly")); mDateTime.set(dt, dateOnly); - mCloseTime = config->readDateTimeEntry(TQString::tqfromLatin1("Expiry"), &invalidDateTime); + mCloseTime = config->readDateTimeEntry(TQString::fromLatin1("Expiry"), &invalidDateTime); #ifndef WITHOUT_ARTS - mAudioFile = config->readPathEntry(TQString::tqfromLatin1("AudioFile")); - mVolume = static_cast<float>(config->readNumEntry(TQString::tqfromLatin1("Volume"))) / 100; + mAudioFile = config->readPathEntry(TQString::fromLatin1("AudioFile")); + mVolume = static_cast<float>(config->readNumEntry(TQString::fromLatin1("Volume"))) / 100; mFadeVolume = -1; mFadeSeconds = 0; if (!mAudioFile.isEmpty()) mAudioRepeat = true; #endif - mSpeak = config->readBoolEntry(TQString::tqfromLatin1("Speak")); - mRestoreHeight = config->readNumEntry(TQString::tqfromLatin1("Height")); - mDefaultDeferMinutes = config->readNumEntry(TQString::tqfromLatin1("DeferMins")); - mNoDefer = config->readBoolEntry(TQString::tqfromLatin1("NoDefer")); - mNoPostAction = config->readBoolEntry(TQString::tqfromLatin1("NoPostAction")); - mKMailSerialNumber = config->readUnsignedLongNumEntry(TQString::tqfromLatin1("KMailSerial")); + mSpeak = config->readBoolEntry(TQString::fromLatin1("Speak")); + mRestoreHeight = config->readNumEntry(TQString::fromLatin1("Height")); + mDefaultDeferMinutes = config->readNumEntry(TQString::fromLatin1("DeferMins")); + mNoDefer = config->readBoolEntry(TQString::fromLatin1("NoDefer")); + mNoPostAction = config->readBoolEntry(TQString::fromLatin1("NoPostAction")); + mKMailSerialNumber = config->readUnsignedLongNumEntry(TQString::fromLatin1("KMailSerial")); mShowEdit = false; kdDebug(5950) << "MessageWin::readProperties(" << mEventID << ")" << endl; if (mAlarmType != KAAlarm::INVALID_ALARM) @@ -789,7 +789,7 @@ void MessageWin::playAudio() return; // ensure zero volume doesn't play anything #ifdef WITHOUT_ARTS TQString play = mAudioFile; - TQString file = TQString::tqfromLatin1("file:"); + TQString file = TQString::fromLatin1("file:"); if (mAudioFile.startsWith(file)) play = mAudioFile.mid(file.length()); KAudioPlayer::play(TQFile::encodeName(play)); @@ -883,7 +883,7 @@ void MessageWin::slotPlayAudio() if (!haveErrorMessage(ErrMsg_Volume)) { KMessageBox::information(this, i18n("Unable to set master volume\n(Error accessing KMix:\n%1)").tqarg(mKMixError), - TQString(), TQString::tqfromLatin1("KMixError")); + TQString(), TQString::fromLatin1("KMixError")); clearErrorMessage(ErrMsg_Volume); } } @@ -1183,7 +1183,7 @@ void MessageWin::show() if (mCloseTime.isValid()) { // Set a timer to auto-close the window - int delay = TQDateTime::tqcurrentDateTime().secsTo(mCloseTime); + int delay = TQDateTime::currentDateTime().secsTo(mCloseTime); if (delay < 0) delay = 0; TQTimer::singleShot(delay * 1000, this, TQT_SLOT(close())); @@ -1200,10 +1200,10 @@ void MessageWin::show() * For message windows, the size if limited to fit inside the working area of * the desktop. */ -TQSize MessageWin::tqsizeHint() const +TQSize MessageWin::sizeHint() const { if (mAction != KAEvent::MESSAGE) - return MainWindowBase::tqsizeHint(); + return MainWindowBase::sizeHint(); if (!mWinModule) mWinModule = new KWinModule(0, KWinModule::INFO_DESKTOP); TQSize frame = frameGeometry().size(); @@ -1211,7 +1211,7 @@ TQSize MessageWin::tqsizeHint() const TQSize desktop = mWinModule->workArea().size(); TQSize maxSize(desktop.width() - (frame.width() - contents.width()), desktop.height() - (frame.height() - contents.height())); - return MainWindowBase::tqsizeHint().boundedTo(maxSize); + return MainWindowBase::sizeHint().boundedTo(maxSize); } /****************************************************************************** @@ -1233,7 +1233,7 @@ void MessageWin::showEvent(TQShowEvent* se) * method is called, so for large windows the size needs to be * set again later. */ - TQSize s = tqsizeHint(); // fit the window round the message + TQSize s = sizeHint(); // fit the window round the message if (mAction == KAEvent::FILE && !mErrorMsgs.count()) KAlarm::readConfigWindowSize("FileMessage", s); resize(s); @@ -1328,7 +1328,7 @@ void MessageWin::moveEvent(TQMoveEvent* e) */ void MessageWin::setMaxSize() { - TQSize s = tqsizeHint(); + TQSize s = sizeHint(); if (width() > s.width() || height() > s.height()) resize(s); } @@ -1465,7 +1465,7 @@ void MessageWin::slotEdit() editDlg.getEvent(event); // Update the displayed lists and the calendar file - KAlarm::UpdatetqStatus status; + KAlarm::UpdateStatus status; if (AlarmCalendar::activeCalendar()->event(mEventID)) { // The old alarm hasn't expired yet, so replace it @@ -1516,7 +1516,7 @@ void MessageWin::checkDeferralLimit() { if (!mDeferButton || !mDeferLimit.isValid()) return; - int n = TQDate::tqcurrentDate().daysTo(mDeferLimit.date()); + int n = TQDate::currentDate().daysTo(mDeferLimit.date()); if (n > 0) return; MidnightTimer::disconnect(TQT_TQOBJECT(this), TQT_SLOT(checkDeferralLimit())); @@ -1540,7 +1540,7 @@ void MessageWin::checkDeferralLimit() */ void MessageWin::slotDefer() { - mDeferDlg = new DeferAlarmDlg(i18n("Defer Alarm"), TQDateTime(TQDateTime::tqcurrentDateTime().addSecs(60)), + mDeferDlg = new DeferAlarmDlg(i18n("Defer Alarm"), TQDateTime(TQDateTime::currentDateTime().addSecs(60)), false, this, "deferDlg"); if (mDefaultDeferMinutes > 0) mDeferDlg->setDeferMinutes(mDefaultDeferMinutes); diff --git a/kalarm/messagewin.h b/kalarm/messagewin.h index f39d2a715..b941307d1 100644 --- a/kalarm/messagewin.h +++ b/kalarm/messagewin.h @@ -57,7 +57,7 @@ class MessageWin : public MainWindowBase bool hasDefer() const { return !!mDeferButton; } bool isValid() const { return !mInvalid; } virtual void show(); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; static int instanceCount() { return mWindowList.count(); } static MessageWin* findEvent(const TQString& eventID); diff --git a/kalarm/prefdlg.cpp b/kalarm/prefdlg.cpp index 3aa6fc622..e259f3e56 100644 --- a/kalarm/prefdlg.cpp +++ b/kalarm/prefdlg.cpp @@ -81,12 +81,12 @@ // %C = temporary command file to execute in terminal // %W = temporary command file to execute in terminal, with 'sleep 86400' appended static TQString xtermCommands[] = { - TQString::tqfromLatin1("xterm -sb -hold -title %t -e %c"), - TQString::tqfromLatin1("konsole --noclose -T %t -e ${SHELL:-sh} -c %c"), - TQString::tqfromLatin1("gnome-terminal -t %t -e %W"), - TQString::tqfromLatin1("eterm --pause -T %t -e %C"), // some systems use eterm... - TQString::tqfromLatin1("Eterm --pause -T %t -e %C"), // while some use Eterm - TQString::tqfromLatin1("rxvt -title %t -e ${SHELL:-sh} -c %w"), + TQString::fromLatin1("xterm -sb -hold -title %t -e %c"), + TQString::fromLatin1("konsole --noclose -T %t -e ${SHELL:-sh} -c %c"), + TQString::fromLatin1("gnome-terminal -t %t -e %W"), + TQString::fromLatin1("eterm --pause -T %t -e %C"), // some systems use eterm... + TQString::fromLatin1("Eterm --pause -T %t -e %C"), // while some use Eterm + TQString::fromLatin1("rxvt -title %t -e ${SHELL:-sh} -c %w"), TQString() // end of list indicator - don't change! }; @@ -262,7 +262,7 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame) // Run-on-demand radio button mRunOnDemand = new TQRadioButton(i18n("&Run only on demand"), group, "runDemand"); - mRunOnDemand->setFixedSize(mRunOnDemand->tqsizeHint()); + mRunOnDemand->setFixedSize(mRunOnDemand->sizeHint()); connect(mRunOnDemand, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotRunModeToggled(bool))); TQWhatsThis::add(mRunOnDemand, i18n("Check to run KAlarm only when required.\n\n" @@ -273,7 +273,7 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame) // Run-in-system-tray radio button mRunInSystemTray = new TQRadioButton(i18n("Run continuously in system &tray"), group, "runTray"); - mRunInSystemTray->setFixedSize(mRunInSystemTray->tqsizeHint()); + mRunInSystemTray->setFixedSize(mRunInSystemTray->sizeHint()); connect(mRunInSystemTray, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotRunModeToggled(bool))); TQWhatsThis::add(mRunInSystemTray, i18n("Check to run KAlarm continuously in the KDE system tray.\n\n" @@ -285,14 +285,14 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame) // Run continuously options mDisableAlarmsIfStopped = new TQCheckBox(i18n("Disa&ble alarms while not running"), group, "disableAl"); - mDisableAlarmsIfStopped->setFixedSize(mDisableAlarmsIfStopped->tqsizeHint()); + mDisableAlarmsIfStopped->setFixedSize(mDisableAlarmsIfStopped->sizeHint()); 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); mQuitWarn = new TQCheckBox(i18n("Warn before &quitting"), group, "disableAl"); - mQuitWarn->setFixedSize(mQuitWarn->tqsizeHint()); + mQuitWarn->setFixedSize(mQuitWarn->sizeHint()); TQWhatsThis::add(mQuitWarn, i18n("Check to display a warning prompt before quitting KAlarm.")); grid->addWidget(mQuitWarn, 4, 2, tqalignment); @@ -305,15 +305,15 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame) // Autostart alarm daemon mAutostartDaemon = new TQCheckBox(i18n("Start alarm monitoring at lo&gin"), group, "startDaemon"); - mAutostartDaemon->setFixedSize(mAutostartDaemon->tqsizeHint()); + mAutostartDaemon->setFixedSize(mAutostartDaemon->sizeHint()); connect(mAutostartDaemon, TQT_SIGNAL(clicked()), TQT_SLOT(slotAutostartDaemonClicked())); 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::tqfromLatin1(DAEMON_APP_NAME))); + .tqarg(TQString::fromLatin1(DAEMON_APP_NAME))); grid->addMultiCellWidget(mAutostartDaemon, 6, 6, 0, 2, tqalignment); - group->setFixedHeight(group->tqsizeHint().height()); + group->setFixedHeight(group->sizeHint().height()); // Start-of-day time TQHBox* itemBox = new TQHBox(mPage); @@ -321,22 +321,22 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame) box->setSpacing(KDialog::spacingHint()); TQLabel* label = new TQLabel(i18n("&Start of day for date-only alarms:"), box); mStartOfDay = new TimeEdit(box); - mStartOfDay->setFixedSize(mStartOfDay->tqsizeHint()); + mStartOfDay->setFixedSize(mStartOfDay->sizeHint()); 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())); itemBox->setStretchFactor(new TQWidget(itemBox), 1); // left adjust the controls - itemBox->setFixedHeight(box->tqsizeHint().height()); + itemBox->setFixedHeight(box->sizeHint().height()); // Confirm alarm deletion? itemBox = new TQHBox(mPage); // this is to allow left adjustment mConfirmAlarmDeletion = new TQCheckBox(i18n("Con&firm alarm deletions"), itemBox, "confirmDeletion"); - mConfirmAlarmDeletion->setMinimumSize(mConfirmAlarmDeletion->tqsizeHint()); + mConfirmAlarmDeletion->setMinimumSize(mConfirmAlarmDeletion->sizeHint()); TQWhatsThis::add(mConfirmAlarmDeletion, i18n("Check to be prompted for confirmation each time you delete an alarm.")); itemBox->setStretchFactor(new TQWidget(itemBox), 1); // left adjust the controls - itemBox->setFixedHeight(itemBox->tqsizeHint().height()); + itemBox->setFixedHeight(itemBox->sizeHint().height()); // Expired alarms group = new TQGroupBox(i18n("Expired Alarms"), mPage); @@ -345,7 +345,7 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame) grid->addColSpacing(0, indentWidth()); grid->addRowSpacing(0, fontMetrics().lineSpacing()/2); mKeepExpired = new TQCheckBox(i18n("Keep alarms after e&xpiry"), group, "keepExpired"); - mKeepExpired->setFixedSize(mKeepExpired->tqsizeHint()); + mKeepExpired->setFixedSize(mKeepExpired->sizeHint()); 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).")); @@ -354,26 +354,26 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame) box = new TQHBox(group); box->setSpacing(KDialog::spacingHint()); mPurgeExpired = new TQCheckBox(i18n("Discard ex&pired alarms after:"), box, "purgeExpired"); - mPurgeExpired->setMinimumSize(mPurgeExpired->tqsizeHint()); + mPurgeExpired->setMinimumSize(mPurgeExpired->sizeHint()); connect(mPurgeExpired, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotExpiredToggled(bool))); mPurgeAfter = new SpinBox(box); mPurgeAfter->setMinValue(1); mPurgeAfter->setLineShiftStep(10); - mPurgeAfter->setMinimumSize(mPurgeAfter->tqsizeHint()); + mPurgeAfter->setMinimumSize(mPurgeAfter->sizeHint()); mPurgeAfterLabel = new TQLabel(i18n("da&ys"), box); - mPurgeAfterLabel->setMinimumSize(mPurgeAfterLabel->tqsizeHint()); + mPurgeAfterLabel->setMinimumSize(mPurgeAfterLabel->sizeHint()); 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); mClearExpired = new TQPushButton(i18n("Clear Expired Alar&ms"), group); - mClearExpired->setFixedSize(mClearExpired->tqsizeHint()); + 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); - group->setFixedHeight(group->tqsizeHint().height()); + group->setFixedHeight(group->sizeHint().height()); // Terminal window to use for command alarms group = new TQGroupBox(i18n("Terminal for Command Alarms"), mPage); @@ -395,7 +395,7 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame) if (args.isEmpty() || KStandardDirs::findExe(args[0]).isEmpty()) continue; TQRadioButton* radio = new TQRadioButton(args[0], group); - radio->setMinimumSize(radio->tqsizeHint()); + radio->setMinimumSize(radio->sizeHint()); mXtermType->insert(radio, mXtermCount); if (mXtermFirst < 0) mXtermFirst = mXtermCount; // note the id of the first button @@ -412,7 +412,7 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame) box = new TQHBox(group); grid->addMultiCellWidget(box, row + 1, row + 1, 0, 2, TQt::AlignAuto); TQRadioButton* radio = new TQRadioButton(i18n("Other:"), box); - radio->setFixedSize(radio->tqsizeHint()); + radio->setFixedSize(radio->sizeHint()); connect(radio, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotOtherTerminalToggled(bool))); mXtermType->insert(radio, mXtermCount); if (mXtermFirst < 0) @@ -604,13 +604,13 @@ EmailPrefTab::EmailPrefTab(TQVBox* frame) mEmailClient = new ButtonGroup(box); mEmailClient->hide(); RadioButton* radio = new RadioButton(i18n("&KMail"), box, "kmail"); - radio->setMinimumSize(radio->tqsizeHint()); + radio->setMinimumSize(radio->sizeHint()); mEmailClient->insert(radio, Preferences::KMAIL); radio = new RadioButton(i18n("&Sendmail"), box, "sendmail"); - radio->setMinimumSize(radio->tqsizeHint()); + radio->setMinimumSize(radio->sizeHint()); mEmailClient->insert(radio, Preferences::SENDMAIL); connect(mEmailClient, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(slotEmailClientChanged(int))); - box->setFixedHeight(box->tqsizeHint().height()); + box->setFixedHeight(box->sizeHint().height()); TQWhatsThis::add(box, i18n("Choose how to send email when an email alarm is triggered.\n" "KMail: The email is sent automatically via KMail. KMail is started first if necessary.\n" @@ -619,11 +619,11 @@ EmailPrefTab::EmailPrefTab(TQVBox* frame) 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->setFixedSize(mEmailCopyToKMail->tqsizeHint()); + 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())); box->setStretchFactor(new TQWidget(box), 1); // left adjust the controls - box->setFixedHeight(box->tqsizeHint().height()); + box->setFixedHeight(box->sizeHint().height()); // Your Email Address group box TQGroupBox* group = new TQGroupBox(i18n("Your Email Address"), mPage); @@ -633,7 +633,7 @@ EmailPrefTab::EmailPrefTab(TQVBox* frame) // 'From' email address controls ... label = new Label(EditAlarmDlg::i18n_f_EmailFrom(), group); - label->setFixedSize(label->tqsizeHint()); + label->setFixedSize(label->sizeHint()); grid->addWidget(label, 1, 0); mFromAddressGroup = new ButtonGroup(group); mFromAddressGroup->hide(); @@ -642,7 +642,7 @@ EmailPrefTab::EmailPrefTab(TQVBox* frame) // Line edit to enter a 'From' email address radio = new RadioButton(group); mFromAddressGroup->insert(radio, Preferences::MAIL_FROM_ADDR); - radio->setFixedSize(radio->tqsizeHint()); + radio->setFixedSize(radio->sizeHint()); label->setBuddy(radio); grid->addWidget(radio, 1, 1); mEmailAddress = new TQLineEdit(group); @@ -655,7 +655,7 @@ EmailPrefTab::EmailPrefTab(TQVBox* frame) // 'From' email address to be taken from Control Centre radio = new RadioButton(i18n("&Use address from Control Center"), group); - radio->setFixedSize(radio->tqsizeHint()); + radio->setFixedSize(radio->sizeHint()); mFromAddressGroup->insert(radio, Preferences::MAIL_FROM_CONTROL_CENTRE); TQWhatsThis::add(radio, i18n("Check to use the email address set in the KDE Control Center, to identify you as the sender when sending email alarms.")); @@ -663,7 +663,7 @@ EmailPrefTab::EmailPrefTab(TQVBox* frame) // 'From' email address to be picked from KMail's identities when the email alarm is configured radio = new RadioButton(i18n("Use KMail &identities"), group); - radio->setFixedSize(radio->tqsizeHint()); + radio->setFixedSize(radio->sizeHint()); mFromAddressGroup->insert(radio, Preferences::MAIL_FROM_KMAIL); TQWhatsThis::add(radio, i18n("Check to use KMail's email identities to identify you as the sender when sending email alarms. " @@ -674,7 +674,7 @@ EmailPrefTab::EmailPrefTab(TQVBox* frame) // 'Bcc' email address controls ... grid->addRowSpacing(4, KDialog::spacingHint()); label = new Label(i18n("'Bcc' email address", "&Bcc:"), group); - label->setFixedSize(label->tqsizeHint()); + label->setFixedSize(label->sizeHint()); grid->addWidget(label, 5, 0); mBccAddressGroup = new ButtonGroup(group); mBccAddressGroup->hide(); @@ -682,7 +682,7 @@ EmailPrefTab::EmailPrefTab(TQVBox* frame) // Line edit to enter a 'Bcc' email address radio = new RadioButton(group); - radio->setFixedSize(radio->tqsizeHint()); + radio->setFixedSize(radio->sizeHint()); mBccAddressGroup->insert(radio, Preferences::MAIL_FROM_ADDR); label->setBuddy(radio); grid->addWidget(radio, 5, 1); @@ -696,22 +696,22 @@ EmailPrefTab::EmailPrefTab(TQVBox* frame) // 'Bcc' email address to be taken from Control Centre radio = new RadioButton(i18n("Us&e address from Control Center"), group); - radio->setFixedSize(radio->tqsizeHint()); + radio->setFixedSize(radio->sizeHint()); mBccAddressGroup->insert(radio, Preferences::MAIL_FROM_CONTROL_CENTRE); TQWhatsThis::add(radio, i18n("Check to use the email address set in the KDE Control Center, for blind copying email alarms to yourself.")); grid->addMultiCellWidget(radio, 6, 6, 1, 2, TQt::AlignAuto); - group->setFixedHeight(group->tqsizeHint().height()); + group->setFixedHeight(group->sizeHint().height()); box = new TQHBox(mPage); // this is to allow left adjustment mEmailQueuedNotify = new TQCheckBox(i18n("&Notify when remote emails are queued"), box); - mEmailQueuedNotify->setFixedSize(mEmailQueuedNotify->tqsizeHint()); + mEmailQueuedNotify->setFixedSize(mEmailQueuedNotify->sizeHint()); TQWhatsThis::add(mEmailQueuedNotify, i18n("Display a notification message whenever an email alarm has queued an email for sending to a remote system. " "This could be useful if, for example, you have a dial-up connection, so that you can then ensure that the email is actually transmitted.")); box->setStretchFactor(new TQWidget(box), 1); // left adjust the controls - box->setFixedHeight(box->tqsizeHint().height()); + box->setFixedHeight(box->sizeHint().height()); mPage->setStretchFactor(new TQWidget(mPage), 1); // top adjust the widgets } @@ -887,7 +887,7 @@ void FontColourPrefTab::setDefaults() EditPrefTab::EditPrefTab(TQVBox* frame) : PrefsTabBase(frame) { - // Get tqalignment to use in TQLabel::tqsetAlignment(tqalignment | TQt::WordBreak) + // Get tqalignment to use in TQLabel::setAlignment(tqalignment | TQt::WordBreak) // (AlignAuto doesn't work correctly there) int tqalignment = TQApplication::reverseLayout() ? TQt::AlignRight : TQt::AlignLeft; @@ -901,12 +901,12 @@ EditPrefTab::EditPrefTab(TQVBox* frame) tqlayout->addSpacing(groupTopMargin); mConfirmAck = new TQCheckBox(EditAlarmDlg::i18n_k_ConfirmAck(), group, "defConfAck"); - mConfirmAck->setMinimumSize(mConfirmAck->tqsizeHint()); + mConfirmAck->setMinimumSize(mConfirmAck->sizeHint()); TQWhatsThis::add(mConfirmAck, defsetting.tqarg(EditAlarmDlg::i18n_ConfirmAck())); tqlayout->addWidget(mConfirmAck, 0, TQt::AlignAuto); mAutoClose = new TQCheckBox(LateCancelSelector::i18n_i_AutoCloseWinLC(), group, "defAutoClose"); - mAutoClose->setMinimumSize(mAutoClose->tqsizeHint()); + mAutoClose->setMinimumSize(mAutoClose->sizeHint()); TQWhatsThis::add(mAutoClose, defsetting.tqarg(LateCancelSelector::i18n_AutoCloseWin())); tqlayout->addWidget(mAutoClose, 0, TQt::AlignAuto); @@ -914,20 +914,20 @@ EditPrefTab::EditPrefTab(TQVBox* frame) box->setSpacing(KDialog::spacingHint()); tqlayout->addWidget(box); TQLabel* label = new TQLabel(i18n("Reminder &units:"), box); - label->setFixedSize(label->tqsizeHint()); + label->setFixedSize(label->sizeHint()); mReminderUnits = new TQComboBox(box, "defWarnUnits"); mReminderUnits->insertItem(TimePeriod::i18n_Minutes(), TimePeriod::MINUTES); mReminderUnits->insertItem(TimePeriod::i18n_Hours_Mins(), TimePeriod::HOURS_MINUTES); mReminderUnits->insertItem(TimePeriod::i18n_Days(), TimePeriod::DAYS); mReminderUnits->insertItem(TimePeriod::i18n_Weeks(), TimePeriod::WEEKS); - mReminderUnits->setFixedSize(mReminderUnits->tqsizeHint()); + mReminderUnits->setFixedSize(mReminderUnits->sizeHint()); label->setBuddy(mReminderUnits); TQWhatsThis::add(box, i18n("The default units for the reminder in the alarm edit dialog.")); box->setStretchFactor(new TQWidget(box), 1); // left adjust the control mSpecialActionsButton = new SpecialActionsButton(EditAlarmDlg::i18n_SpecialActions(), box); - mSpecialActionsButton->setFixedSize(mSpecialActionsButton->tqsizeHint()); + mSpecialActionsButton->setFixedSize(mSpecialActionsButton->sizeHint()); // SOUND TQButtonGroup* bgroup = new TQButtonGroup(SoundPicker::i18n_Sound(), mPage, "soundGroup"); @@ -941,14 +941,14 @@ EditPrefTab::EditPrefTab(TQVBox* frame) mSound->insertItem(SoundPicker::i18n_File()); // index 2 if (theApp()->speechEnabled()) mSound->insertItem(SoundPicker::i18n_Speak()); // index 3 - mSound->setMinimumSize(mSound->tqsizeHint()); + mSound->setMinimumSize(mSound->sizeHint()); TQWhatsThis::add(mSound, defsetting.tqarg(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->tqsizeHint()); + 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())); htqlayout->addWidget(mSoundRepeat); #endif @@ -956,19 +956,19 @@ EditPrefTab::EditPrefTab(TQVBox* frame) box = new TQHBox(bgroup); // this is to control the TQWhatsThis text display area box->setSpacing(KDialog::spacingHint()); mSoundFileLabel = new TQLabel(i18n("Sound &file:"), box); - mSoundFileLabel->setFixedSize(mSoundFileLabel->tqsizeHint()); + mSoundFileLabel->setFixedSize(mSoundFileLabel->sizeHint()); mSoundFile = new TQLineEdit(box); mSoundFileLabel->setBuddy(mSoundFile); mSoundFileBrowse = new TQPushButton(box); mSoundFileBrowse->setPixmap(SmallIcon("fileopen")); - mSoundFileBrowse->setFixedSize(mSoundFileBrowse->tqsizeHint()); + mSoundFileBrowse->setFixedSize(mSoundFileBrowse->sizeHint()); connect(mSoundFileBrowse, TQT_SIGNAL(clicked()), TQT_SLOT(slotBrowseSoundFile())); TQToolTip::add(mSoundFileBrowse, i18n("Choose a sound file")); TQWhatsThis::add(box, i18n("Enter the default sound file to use in the alarm edit dialog.")); - box->setFixedHeight(box->tqsizeHint().height()); + box->setFixedHeight(box->sizeHint().height()); tqlayout->addWidget(box); - bgroup->setFixedHeight(bgroup->tqsizeHint().height()); + bgroup->setFixedHeight(bgroup->sizeHint().height()); // COMMAND ALARMS group = new TQGroupBox(i18n("Command Alarms"), mPage); @@ -977,13 +977,13 @@ EditPrefTab::EditPrefTab(TQVBox* frame) tqlayout = new TQHBoxLayout(tqlayout, KDialog::spacingHint()); mCmdScript = new TQCheckBox(EditAlarmDlg::i18n_p_EnterScript(), group, "defCmdScript"); - mCmdScript->setMinimumSize(mCmdScript->tqsizeHint()); + mCmdScript->setMinimumSize(mCmdScript->sizeHint()); TQWhatsThis::add(mCmdScript, defsetting.tqarg(EditAlarmDlg::i18n_EnterScript())); tqlayout->addWidget(mCmdScript); tqlayout->addStretch(); mCmdXterm = new TQCheckBox(EditAlarmDlg::i18n_w_ExecInTermWindow(), group, "defCmdXterm"); - mCmdXterm->setMinimumSize(mCmdXterm->tqsizeHint()); + mCmdXterm->setMinimumSize(mCmdXterm->sizeHint()); TQWhatsThis::add(mCmdXterm, defsetting.tqarg(EditAlarmDlg::i18n_ExecInTermWindow())); tqlayout->addWidget(mCmdXterm); @@ -994,21 +994,21 @@ EditPrefTab::EditPrefTab(TQVBox* frame) // BCC email to sender mEmailBcc = new TQCheckBox(EditAlarmDlg::i18n_e_CopyEmailToSelf(), group, "defEmailBcc"); - mEmailBcc->setMinimumSize(mEmailBcc->tqsizeHint()); + mEmailBcc->setMinimumSize(mEmailBcc->sizeHint()); TQWhatsThis::add(mEmailBcc, defsetting.tqarg(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->tqsizeHint()); + mCopyToKOrganizer->setMinimumSize(mCopyToKOrganizer->sizeHint()); TQWhatsThis::add(mCopyToKOrganizer, defsetting.tqarg(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->tqsizeHint()); + mLateCancel->setMinimumSize(mLateCancel->sizeHint()); TQWhatsThis::add(mLateCancel, defsetting.tqarg(LateCancelSelector::i18n_CancelIfLate())); box->setStretchFactor(new TQWidget(box), 1); // left adjust the control @@ -1016,7 +1016,7 @@ EditPrefTab::EditPrefTab(TQVBox* frame) TQHBox* itemBox = new TQHBox(box); // this is to control the TQWhatsThis text display area itemBox->setSpacing(KDialog::spacingHint()); label = new TQLabel(i18n("&Recurrence:"), itemBox); - label->setFixedSize(label->tqsizeHint()); + label->setFixedSize(label->sizeHint()); mRecurPeriod = new TQComboBox(itemBox, "defRecur"); mRecurPeriod->insertItem(RecurrenceEdit::i18n_NoRecur()); mRecurPeriod->insertItem(RecurrenceEdit::i18n_AtLogin()); @@ -1025,17 +1025,17 @@ EditPrefTab::EditPrefTab(TQVBox* frame) mRecurPeriod->insertItem(RecurrenceEdit::i18n_Weekly()); mRecurPeriod->insertItem(RecurrenceEdit::i18n_Monthly()); mRecurPeriod->insertItem(RecurrenceEdit::i18n_Yearly()); - mRecurPeriod->setFixedSize(mRecurPeriod->tqsizeHint()); + mRecurPeriod->setFixedSize(mRecurPeriod->sizeHint()); label->setBuddy(mRecurPeriod); TQWhatsThis::add(itemBox, i18n("The default setting for the recurrence rule in the alarm edit dialog.")); - box->setFixedHeight(itemBox->tqsizeHint().height()); + box->setFixedHeight(itemBox->sizeHint().height()); // How to handle February 29th in yearly recurrences 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->tqsetAlignment(tqalignment | TQt::WordBreak); + label->setAlignment(tqalignment | TQt::WordBreak); itemBox = new TQHBox(vbox); itemBox->setSpacing(2*KDialog::spacingHint()); mFeb29 = new TQButtonGroup(itemBox); @@ -1043,15 +1043,15 @@ EditPrefTab::EditPrefTab(TQVBox* frame) TQWidget* widget = new TQWidget(itemBox); widget->setFixedWidth(3*KDialog::spacingHint()); TQRadioButton* radio = new TQRadioButton(i18n("February 2&8th"), itemBox); - radio->setMinimumSize(radio->tqsizeHint()); + radio->setMinimumSize(radio->sizeHint()); mFeb29->insert(radio, KARecurrence::FEB29_FEB28); radio = new TQRadioButton(i18n("March &1st"), itemBox); - radio->setMinimumSize(radio->tqsizeHint()); + radio->setMinimumSize(radio->sizeHint()); mFeb29->insert(radio, KARecurrence::FEB29_MAR1); radio = new TQRadioButton(i18n("Do ¬ repeat"), itemBox); - radio->setMinimumSize(radio->tqsizeHint()); + radio->setMinimumSize(radio->sizeHint()); mFeb29->insert(radio, KARecurrence::FEB29_FEB29); - itemBox->setFixedHeight(itemBox->tqsizeHint().height()); + itemBox->setFixedHeight(itemBox->sizeHint().height()); TQWhatsThis::add(vbox, i18n("For yearly recurrences, choose what date, if any, alarms due on February 29th should occur in non-leap years.\n" "Note that the next scheduled occurrence of existing alarms is not re-evaluated when you change this setting.")); @@ -1200,7 +1200,7 @@ ViewPrefTab::ViewPrefTab(TQVBox* frame) grid->addRowSpacing(0, fontMetrics().lineSpacing()/2); mTooltipShowAlarms = new TQCheckBox(i18n("Show next &24 hours' alarms"), group, "tooltipShow"); - mTooltipShowAlarms->setMinimumSize(mTooltipShowAlarms->tqsizeHint()); + mTooltipShowAlarms->setMinimumSize(mTooltipShowAlarms->sizeHint()); connect(mTooltipShowAlarms, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotTooltipAlarmsToggled(bool))); TQWhatsThis::add(mTooltipShowAlarms, i18n("Specify whether to include in the system tray tooltip, a summary of alarms due in the next 24 hours")); @@ -1209,25 +1209,25 @@ ViewPrefTab::ViewPrefTab(TQVBox* frame) TQHBox* box = new TQHBox(group); box->setSpacing(KDialog::spacingHint()); mTooltipMaxAlarms = new TQCheckBox(i18n("Ma&ximum number of alarms to show:"), box, "tooltipMax"); - mTooltipMaxAlarms->setMinimumSize(mTooltipMaxAlarms->tqsizeHint()); + mTooltipMaxAlarms->setMinimumSize(mTooltipMaxAlarms->sizeHint()); connect(mTooltipMaxAlarms, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotTooltipMaxToggled(bool))); mTooltipMaxAlarmCount = new SpinBox(1, 99, 1, box); mTooltipMaxAlarmCount->setLineShiftStep(5); - mTooltipMaxAlarmCount->setMinimumSize(mTooltipMaxAlarmCount->tqsizeHint()); + mTooltipMaxAlarmCount->setMinimumSize(mTooltipMaxAlarmCount->sizeHint()); TQWhatsThis::add(box, i18n("Uncheck to display all of the next 24 hours' alarms in the system tray tooltip. " "Check to enter an upper limit on the number to be displayed.")); grid->addMultiCellWidget(box, 2, 2, 1, 2, TQt::AlignAuto); mTooltipShowTime = new TQCheckBox(MainWindow::i18n_m_ShowAlarmTime(), group, "tooltipTime"); - mTooltipShowTime->setMinimumSize(mTooltipShowTime->tqsizeHint()); + mTooltipShowTime->setMinimumSize(mTooltipShowTime->sizeHint()); connect(mTooltipShowTime, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotTooltipTimeToggled(bool))); TQWhatsThis::add(mTooltipShowTime, i18n("Specify whether to show in the system tray tooltip, the time at which each alarm is due")); grid->addMultiCellWidget(mTooltipShowTime, 3, 3, 1, 2, TQt::AlignAuto); mTooltipShowTimeTo = new TQCheckBox(MainWindow::i18n_l_ShowTimeToAlarm(), group, "tooltipTimeTo"); - mTooltipShowTimeTo->setMinimumSize(mTooltipShowTimeTo->tqsizeHint()); + mTooltipShowTimeTo->setMinimumSize(mTooltipShowTimeTo->sizeHint()); connect(mTooltipShowTimeTo, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotTooltipTimeToToggled(bool))); TQWhatsThis::add(mTooltipShowTimeTo, i18n("Specify whether to show in the system tray tooltip, how long until each alarm is due")); @@ -1236,17 +1236,17 @@ ViewPrefTab::ViewPrefTab(TQVBox* frame) box = new TQHBox(group); // this is to control the TQWhatsThis text display area box->setSpacing(KDialog::spacingHint()); mTooltipTimeToPrefixLabel = new TQLabel(i18n("&Prefix:"), box); - mTooltipTimeToPrefixLabel->setFixedSize(mTooltipTimeToPrefixLabel->tqsizeHint()); + mTooltipTimeToPrefixLabel->setFixedSize(mTooltipTimeToPrefixLabel->sizeHint()); mTooltipTimeToPrefix = new TQLineEdit(box); mTooltipTimeToPrefixLabel->setBuddy(mTooltipTimeToPrefix); TQWhatsThis::add(box, i18n("Enter the text to be displayed in front of the time until the alarm, in the system tray tooltip")); - box->setFixedHeight(box->tqsizeHint().height()); + box->setFixedHeight(box->sizeHint().height()); grid->addWidget(box, 5, 2, TQt::AlignAuto); - group->setMaximumHeight(group->tqsizeHint().height()); + group->setMaximumHeight(group->sizeHint().height()); mModalMessages = new TQCheckBox(i18n("Message &windows have a title bar and take keyboard focus"), mPage, "modalMsg"); - mModalMessages->setMinimumSize(mModalMessages->tqsizeHint()); + mModalMessages->setMinimumSize(mModalMessages->sizeHint()); TQWhatsThis::add(mModalMessages, i18n("Specify the characteristics of alarm message windows:\n" "- If checked, the window is a normal window with a title bar, which grabs keyboard input when it is displayed.\n" @@ -1259,13 +1259,13 @@ ViewPrefTab::ViewPrefTab(TQVBox* frame) TQLabel* label = new TQLabel(i18n("System tray icon &update interval:"), box); mDaemonTrayCheckInterval = new SpinBox(1, 9999, 1, box, "daemonCheck"); mDaemonTrayCheckInterval->setLineShiftStep(10); - mDaemonTrayCheckInterval->setMinimumSize(mDaemonTrayCheckInterval->tqsizeHint()); + mDaemonTrayCheckInterval->setMinimumSize(mDaemonTrayCheckInterval->sizeHint()); label->setBuddy(mDaemonTrayCheckInterval); label = new TQLabel(i18n("seconds"), box); TQWhatsThis::add(box, i18n("How often to update the system tray icon to indicate whether or not the Alarm Daemon is monitoring alarms.")); itemBox->setStretchFactor(new TQWidget(itemBox), 1); // left adjust the controls - itemBox->setFixedHeight(box->tqsizeHint().height()); + itemBox->setFixedHeight(box->sizeHint().height()); mPage->setStretchFactor(new TQWidget(mPage), 1); // top adjust the widgets } diff --git a/kalarm/preferences.cpp b/kalarm/preferences.cpp index 95b1b5a69..6488c60c7 100644 --- a/kalarm/preferences.cpp +++ b/kalarm/preferences.cpp @@ -58,7 +58,7 @@ const int Preferences::default_messageButtonDelay = const int Preferences::default_tooltipAlarmCount = 5; const bool Preferences::default_showTooltipAlarmTime = true; const bool Preferences::default_showTooltipTimeToAlarm = true; -const TQString Preferences::default_tooltipTimeToPrefix = TQString::tqfromLatin1("+"); +const TQString Preferences::default_tooltipTimeToPrefix = TQString::fromLatin1("+"); const int Preferences::default_daemonTrayCheckInterval = 10; // (seconds) const bool Preferences::default_emailCopyToKMail = false; const bool Preferences::default_emailQueuedNotify = false; @@ -139,65 +139,65 @@ TQTime Preferences::mOldStartOfDay; bool Preferences::mStartOfDayChanged; -static const TQString defaultFeb29RecurType = TQString::tqfromLatin1("Mar1"); -static const TQString defaultEmailClient = TQString::tqfromLatin1("kmail"); +static const TQString defaultFeb29RecurType = TQString::fromLatin1("Mar1"); +static const TQString defaultEmailClient = TQString::fromLatin1("kmail"); // Config file entry names -static const TQString GENERAL_SECTION = TQString::tqfromLatin1("General"); -static const TQString VERSION_NUM = TQString::tqfromLatin1("Version"); -static const TQString MESSAGE_COLOURS = TQString::tqfromLatin1("MessageColours"); -static const TQString MESSAGE_BG_COLOUR = TQString::tqfromLatin1("MessageBackgroundColour"); -static const TQString MESSAGE_FONT = TQString::tqfromLatin1("MessageFont"); -static const TQString RUN_IN_SYSTEM_TRAY = TQString::tqfromLatin1("RunInSystemTray"); -static const TQString DISABLE_IF_STOPPED = TQString::tqfromLatin1("DisableAlarmsIfStopped"); -static const TQString AUTOSTART_TRAY = TQString::tqfromLatin1("AutostartTray"); -static const TQString FEB29_RECUR_TYPE = TQString::tqfromLatin1("Feb29Recur"); -static const TQString MODAL_MESSAGES = TQString::tqfromLatin1("ModalMessages"); -static const TQString MESSAGE_BUTTON_DELAY = TQString::tqfromLatin1("MessageButtonDelay"); -static const TQString TOOLTIP_ALARM_COUNT = TQString::tqfromLatin1("TooltipAlarmCount"); -static const TQString TOOLTIP_ALARM_TIME = TQString::tqfromLatin1("ShowTooltipAlarmTime"); -static const TQString TOOLTIP_TIME_TO_ALARM = TQString::tqfromLatin1("ShowTooltipTimeToAlarm"); -static const TQString TOOLTIP_TIME_TO_PREFIX = TQString::tqfromLatin1("TooltipTimeToPrefix"); -static const TQString DAEMON_TRAY_INTERVAL = TQString::tqfromLatin1("DaemonTrayCheckInterval"); -static const TQString EMAIL_CLIENT = TQString::tqfromLatin1("EmailClient"); -static const TQString EMAIL_COPY_TO_KMAIL = TQString::tqfromLatin1("EmailCopyToKMail"); -static const TQString EMAIL_FROM = TQString::tqfromLatin1("EmailFrom"); -static const TQString EMAIL_BCC_ADDRESS = TQString::tqfromLatin1("EmailBccAddress"); -static const TQString CMD_XTERM_COMMAND = TQString::tqfromLatin1("CmdXTerm"); -static const TQString START_OF_DAY = TQString::tqfromLatin1("StartOfDay"); -static const TQString START_OF_DAY_CHECK = TQString::tqfromLatin1("Sod"); -static const TQString DISABLED_COLOUR = TQString::tqfromLatin1("DisabledColour"); -static const TQString EXPIRED_COLOUR = TQString::tqfromLatin1("ExpiredColour"); -static const TQString EXPIRED_KEEP_DAYS = TQString::tqfromLatin1("ExpiredKeepDays"); -static const TQString DEFAULTS_SECTION = TQString::tqfromLatin1("Defaults"); -static const TQString DEF_LATE_CANCEL = TQString::tqfromLatin1("DefLateCancel"); -static const TQString DEF_AUTO_CLOSE = TQString::tqfromLatin1("DefAutoClose"); -static const TQString DEF_CONFIRM_ACK = TQString::tqfromLatin1("DefConfirmAck"); -static const TQString DEF_COPY_TO_KORG = TQString::tqfromLatin1("DefCopyKOrg"); -static const TQString DEF_SOUND_TYPE = TQString::tqfromLatin1("DefSoundType"); -static const TQString DEF_SOUND_FILE = TQString::tqfromLatin1("DefSoundFile"); -static const TQString DEF_SOUND_VOLUME = TQString::tqfromLatin1("DefSoundVolume"); -static const TQString DEF_SOUND_REPEAT = TQString::tqfromLatin1("DefSoundRepeat"); -static const TQString DEF_CMD_SCRIPT = TQString::tqfromLatin1("DefCmdScript"); -static const TQString DEF_CMD_LOG_TYPE = TQString::tqfromLatin1("DefCmdLogType"); -static const TQString DEF_LOG_FILE = TQString::tqfromLatin1("DefLogFile"); -static const TQString DEF_EMAIL_BCC = TQString::tqfromLatin1("DefEmailBcc"); -static const TQString DEF_RECUR_PERIOD = TQString::tqfromLatin1("DefRecurPeriod"); -static const TQString DEF_REMIND_UNITS = TQString::tqfromLatin1("RemindUnits"); -static const TQString DEF_PRE_ACTION = TQString::tqfromLatin1("DefPreAction"); -static const TQString DEF_POST_ACTION = TQString::tqfromLatin1("DefPostAction"); +static const TQString GENERAL_SECTION = TQString::fromLatin1("General"); +static const TQString VERSION_NUM = TQString::fromLatin1("Version"); +static const TQString MESSAGE_COLOURS = TQString::fromLatin1("MessageColours"); +static const TQString MESSAGE_BG_COLOUR = TQString::fromLatin1("MessageBackgroundColour"); +static const TQString MESSAGE_FONT = TQString::fromLatin1("MessageFont"); +static const TQString RUN_IN_SYSTEM_TRAY = TQString::fromLatin1("RunInSystemTray"); +static const TQString DISABLE_IF_STOPPED = TQString::fromLatin1("DisableAlarmsIfStopped"); +static const TQString AUTOSTART_TRAY = TQString::fromLatin1("AutostartTray"); +static const TQString FEB29_RECUR_TYPE = TQString::fromLatin1("Feb29Recur"); +static const TQString MODAL_MESSAGES = TQString::fromLatin1("ModalMessages"); +static const TQString MESSAGE_BUTTON_DELAY = TQString::fromLatin1("MessageButtonDelay"); +static const TQString TOOLTIP_ALARM_COUNT = TQString::fromLatin1("TooltipAlarmCount"); +static const TQString TOOLTIP_ALARM_TIME = TQString::fromLatin1("ShowTooltipAlarmTime"); +static const TQString TOOLTIP_TIME_TO_ALARM = TQString::fromLatin1("ShowTooltipTimeToAlarm"); +static const TQString TOOLTIP_TIME_TO_PREFIX = TQString::fromLatin1("TooltipTimeToPrefix"); +static const TQString DAEMON_TRAY_INTERVAL = TQString::fromLatin1("DaemonTrayCheckInterval"); +static const TQString EMAIL_CLIENT = TQString::fromLatin1("EmailClient"); +static const TQString EMAIL_COPY_TO_KMAIL = TQString::fromLatin1("EmailCopyToKMail"); +static const TQString EMAIL_FROM = TQString::fromLatin1("EmailFrom"); +static const TQString EMAIL_BCC_ADDRESS = TQString::fromLatin1("EmailBccAddress"); +static const TQString CMD_XTERM_COMMAND = TQString::fromLatin1("CmdXTerm"); +static const TQString START_OF_DAY = TQString::fromLatin1("StartOfDay"); +static const TQString START_OF_DAY_CHECK = TQString::fromLatin1("Sod"); +static const TQString DISABLED_COLOUR = TQString::fromLatin1("DisabledColour"); +static const TQString EXPIRED_COLOUR = TQString::fromLatin1("ExpiredColour"); +static const TQString EXPIRED_KEEP_DAYS = TQString::fromLatin1("ExpiredKeepDays"); +static const TQString DEFAULTS_SECTION = TQString::fromLatin1("Defaults"); +static const TQString DEF_LATE_CANCEL = TQString::fromLatin1("DefLateCancel"); +static const TQString DEF_AUTO_CLOSE = TQString::fromLatin1("DefAutoClose"); +static const TQString DEF_CONFIRM_ACK = TQString::fromLatin1("DefConfirmAck"); +static const TQString DEF_COPY_TO_KORG = TQString::fromLatin1("DefCopyKOrg"); +static const TQString DEF_SOUND_TYPE = TQString::fromLatin1("DefSoundType"); +static const TQString DEF_SOUND_FILE = TQString::fromLatin1("DefSoundFile"); +static const TQString DEF_SOUND_VOLUME = TQString::fromLatin1("DefSoundVolume"); +static const TQString DEF_SOUND_REPEAT = TQString::fromLatin1("DefSoundRepeat"); +static const TQString DEF_CMD_SCRIPT = TQString::fromLatin1("DefCmdScript"); +static const TQString DEF_CMD_LOG_TYPE = TQString::fromLatin1("DefCmdLogType"); +static const TQString DEF_LOG_FILE = TQString::fromLatin1("DefLogFile"); +static const TQString DEF_EMAIL_BCC = TQString::fromLatin1("DefEmailBcc"); +static const TQString DEF_RECUR_PERIOD = TQString::fromLatin1("DefRecurPeriod"); +static const TQString DEF_REMIND_UNITS = TQString::fromLatin1("RemindUnits"); +static const TQString DEF_PRE_ACTION = TQString::fromLatin1("DefPreAction"); +static const TQString DEF_POST_ACTION = TQString::fromLatin1("DefPostAction"); // Config file entry name for temporary use -static const TQString TEMP = TQString::tqfromLatin1("Temp"); +static const TQString TEMP = TQString::fromLatin1("Temp"); // Values for EmailFrom entry -static const TQString FROM_CONTROL_CENTRE = TQString::tqfromLatin1("@ControlCenter"); -static const TQString FROM_KMAIL = TQString::tqfromLatin1("@KMail"); +static const TQString FROM_CONTROL_CENTRE = TQString::fromLatin1("@ControlCenter"); +static const TQString FROM_KMAIL = TQString::fromLatin1("@KMail"); // Config file entry names for notification messages -const TQString Preferences::TQUIT_WARN = TQString::tqfromLatin1("QuitWarn"); -const TQString Preferences::CONFIRM_ALARM_DELETION = TQString::tqfromLatin1("ConfirmAlarmDeletion"); -const TQString Preferences::EMAIL_TQUEUED_NOTIFY = TQString::tqfromLatin1("EmailQueuedNotify"); +const TQString Preferences::TQUIT_WARN = TQString::fromLatin1("QuitWarn"); +const TQString Preferences::CONFIRM_ALARM_DELETION = TQString::fromLatin1("ConfirmAlarmDeletion"); +const TQString Preferences::EMAIL_TQUEUED_NOTIFY = TQString::fromLatin1("EmailQueuedNotify"); static const int SODxor = 0x82451630; inline int Preferences::startOfDayCheck() @@ -338,10 +338,10 @@ void Preferences::read() TQCString feb29 = config->readEntry(FEB29_RECUR_TYPE, defaultFeb29RecurType).local8Bit(); mDefaultFeb29Type = (feb29 == "Mar1") ? KARecurrence::FEB29_MAR1 : (feb29 == "Feb28") ? KARecurrence::FEB29_FEB28 : KARecurrence::FEB29_FEB29; TQString remindUnits = config->readEntry(DEF_REMIND_UNITS); - mDefaultReminderUnits = (remindUnits == TQString::tqfromLatin1("Minutes")) ? TimePeriod::MINUTES - : (remindUnits == TQString::tqfromLatin1("HoursMinutes")) ? TimePeriod::HOURS_MINUTES - : (remindUnits == TQString::tqfromLatin1("Days")) ? TimePeriod::DAYS - : (remindUnits == TQString::tqfromLatin1("Weeks")) ? TimePeriod::WEEKS : default_defaultReminderUnits; + mDefaultReminderUnits = (remindUnits == TQString::fromLatin1("Minutes")) ? TimePeriod::MINUTES + : (remindUnits == TQString::fromLatin1("HoursMinutes")) ? TimePeriod::HOURS_MINUTES + : (remindUnits == TQString::fromLatin1("Days")) ? TimePeriod::DAYS + : (remindUnits == TQString::fromLatin1("Weeks")) ? TimePeriod::WEEKS : default_defaultReminderUnits; mDefaultPreAction = config->readEntry(DEF_PRE_ACTION, default_defaultPreAction); mDefaultPostAction = config->readEntry(DEF_POST_ACTION, default_defaultPostAction); mInstance->emitPreferencesChanged(); @@ -406,10 +406,10 @@ void Preferences::save(bool syncToDisc) TQString value; switch (mDefaultReminderUnits) { - case TimePeriod::MINUTES: value = TQString::tqfromLatin1("Minutes"); break; - case TimePeriod::HOURS_MINUTES: value = TQString::tqfromLatin1("HoursMinutes"); break; - case TimePeriod::DAYS: value = TQString::tqfromLatin1("Days"); break; - case TimePeriod::WEEKS: value = TQString::tqfromLatin1("Weeks"); break; + case TimePeriod::MINUTES: value = TQString::fromLatin1("Minutes"); break; + case TimePeriod::HOURS_MINUTES: value = TQString::fromLatin1("HoursMinutes"); break; + case TimePeriod::DAYS: value = TQString::fromLatin1("Days"); break; + case TimePeriod::WEEKS: value = TQString::fromLatin1("Weeks"); break; default: value = TQString(); break; } config->writeEntry(DEF_REMIND_UNITS, value); @@ -558,12 +558,12 @@ void Preferences::convertOldPrefs() if (version <= KAlarm::Version(1,4,21)) { // Convert KAlarm 1.4.21 preferences - static const TQString OLD_REMIND_UNITS = TQString::tqfromLatin1("DefRemindUnits"); + static const TQString OLD_REMIND_UNITS = TQString::fromLatin1("DefRemindUnits"); config->setGroup(DEFAULTS_SECTION); int intUnit = config->readNumEntry(OLD_REMIND_UNITS, 0); - TQString strUnit = (intUnit == 1) ? TQString::tqfromLatin1("Days") - : (intUnit == 2) ? TQString::tqfromLatin1("Weeks") - : TQString::tqfromLatin1("HoursMinutes"); + TQString strUnit = (intUnit == 1) ? TQString::fromLatin1("Days") + : (intUnit == 2) ? TQString::fromLatin1("Weeks") + : TQString::fromLatin1("HoursMinutes"); config->deleteEntry(OLD_REMIND_UNITS); config->writeEntry(DEF_REMIND_UNITS, strUnit); } @@ -571,11 +571,11 @@ void Preferences::convertOldPrefs() if (version <= KAlarm::Version(1,4,20)) { // Convert KAlarm 1.4.20 preferences - static const TQString VIEW_SECTION = TQString::tqfromLatin1("View"); - static const TQString SHOW_ARCHIVED_ALARMS = TQString::tqfromLatin1("ShowArchivedAlarms"); - static const TQString SHOW_EXPIRED_ALARMS = TQString::tqfromLatin1("ShowExpiredAlarms"); - static const TQString SHOW_ALARM_TIME = TQString::tqfromLatin1("ShowAlarmTime"); - static const TQString SHOW_TIME_TO_ALARM = TQString::tqfromLatin1("ShowTimeToAlarm"); + static const TQString VIEW_SECTION = TQString::fromLatin1("View"); + static const TQString SHOW_ARCHIVED_ALARMS = TQString::fromLatin1("ShowArchivedAlarms"); + static const TQString SHOW_EXPIRED_ALARMS = TQString::fromLatin1("ShowExpiredAlarms"); + static const TQString SHOW_ALARM_TIME = TQString::fromLatin1("ShowAlarmTime"); + static const TQString SHOW_TIME_TO_ALARM = TQString::fromLatin1("ShowTimeToAlarm"); config->setGroup(GENERAL_SECTION); bool showExpired = config->readBoolEntry(SHOW_EXPIRED_ALARMS, false); bool showTime = config->readBoolEntry(SHOW_ALARM_TIME, true); @@ -592,7 +592,7 @@ void Preferences::convertOldPrefs() if (version <= KAlarm::Version(1,4,5)) { // Convert KAlarm 1.4.5 preferences - static const TQString DEF_SOUND = TQString::tqfromLatin1("DefSound"); + static const TQString DEF_SOUND = TQString::fromLatin1("DefSound"); config->setGroup(DEFAULTS_SECTION); bool sound = config->readBoolEntry(DEF_SOUND, false); if (!sound) @@ -603,9 +603,9 @@ void Preferences::convertOldPrefs() if (version < KAlarm::Version(1,3,0)) { // Convert KAlarm pre-1.3 preferences - static const TQString EMAIL_ADDRESS = TQString::tqfromLatin1("EmailAddress"); - static const TQString EMAIL_USE_CTRL_CENTRE = TQString::tqfromLatin1("EmailUseControlCenter"); - static const TQString EMAIL_BCC_USE_CTRL_CENTRE = TQString::tqfromLatin1("EmailBccUseControlCenter"); + static const TQString EMAIL_ADDRESS = TQString::fromLatin1("EmailAddress"); + static const TQString EMAIL_USE_CTRL_CENTRE = TQString::fromLatin1("EmailUseControlCenter"); + static const TQString EMAIL_BCC_USE_CTRL_CENTRE = TQString::fromLatin1("EmailBccUseControlCenter"); TQMap<TQString, TQString> entries = config->entryMap(GENERAL_SECTION); if (entries.find(EMAIL_FROM) == entries.end() && entries.find(EMAIL_USE_CTRL_CENTRE) != entries.end()) @@ -628,7 +628,7 @@ void Preferences::convertOldPrefs() config->deleteEntry(EMAIL_USE_CTRL_CENTRE); } // Convert KAlarm 1.2 preferences - static const TQString DEF_CMD_XTERM = TQString::tqfromLatin1("DefCmdXterm"); + static const TQString DEF_CMD_XTERM = TQString::fromLatin1("DefCmdXterm"); config->setGroup(DEFAULTS_SECTION); if (config->hasKey(DEF_CMD_XTERM)) { diff --git a/kalarm/recurrenceedit.cpp b/kalarm/recurrenceedit.cpp index 2a10c1a33..87fd43c8c 100644 --- a/kalarm/recurrenceedit.cpp +++ b/kalarm/recurrenceedit.cpp @@ -119,43 +119,43 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name connect(mRuleButtonGroup, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(periodClicked(int))); mNoneButton = new RadioButton(i18n_Norecur(), mRuleButtonGroup); - mNoneButton->setFixedSize(mNoneButton->tqsizeHint()); + mNoneButton->setFixedSize(mNoneButton->sizeHint()); mNoneButton->setReadOnly(mReadOnly); TQWhatsThis::add(mNoneButton, i18n("Do not repeat the alarm")); mAtLoginButton = new RadioButton(i18n_l_Atlogin(), mRuleButtonGroup); - mAtLoginButton->setFixedSize(mAtLoginButton->tqsizeHint()); + mAtLoginButton->setFixedSize(mAtLoginButton->sizeHint()); mAtLoginButton->setReadOnly(mReadOnly); TQWhatsThis::add(mAtLoginButton, i18n("Trigger the alarm at the specified date/time and at every login until then.\n" "Note that it will also be triggered any time the alarm daemon is restarted.")); mSubDailyButton = new RadioButton(i18n_u_HourlyMinutely(), mRuleButtonGroup); - mSubDailyButton->setFixedSize(mSubDailyButton->tqsizeHint()); + mSubDailyButton->setFixedSize(mSubDailyButton->sizeHint()); mSubDailyButton->setReadOnly(mReadOnly); TQWhatsThis::add(mSubDailyButton, i18n("Repeat the alarm at hourly/minutely intervals")); mDailyButton = new RadioButton(i18n_d_Daily(), mRuleButtonGroup); - mDailyButton->setFixedSize(mDailyButton->tqsizeHint()); + mDailyButton->setFixedSize(mDailyButton->sizeHint()); mDailyButton->setReadOnly(mReadOnly); TQWhatsThis::add(mDailyButton, i18n("Repeat the alarm at daily intervals")); mWeeklyButton = new RadioButton(i18n_w_Weekly(), mRuleButtonGroup); - mWeeklyButton->setFixedSize(mWeeklyButton->tqsizeHint()); + mWeeklyButton->setFixedSize(mWeeklyButton->sizeHint()); mWeeklyButton->setReadOnly(mReadOnly); TQWhatsThis::add(mWeeklyButton, i18n("Repeat the alarm at weekly intervals")); mMonthlyButton = new RadioButton(i18n_m_Monthly(), mRuleButtonGroup); - mMonthlyButton->setFixedSize(mMonthlyButton->tqsizeHint()); + mMonthlyButton->setFixedSize(mMonthlyButton->sizeHint()); mMonthlyButton->setReadOnly(mReadOnly); TQWhatsThis::add(mMonthlyButton, i18n("Repeat the alarm at monthly intervals")); mYearlyButton = new RadioButton(i18n_y_Yearly(), mRuleButtonGroup); - mYearlyButton->setFixedSize(mYearlyButton->tqsizeHint()); + mYearlyButton->setFixedSize(mYearlyButton->sizeHint()); mYearlyButton->setReadOnly(mReadOnly); TQWhatsThis::add(mYearlyButton, i18n("Repeat the alarm at annual intervals")); @@ -170,7 +170,7 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name // Sub-repetition button mSubRepetition = new RepetitionButton(i18n("Sub-Repetition"), true, ruleFrame); - mSubRepetition->setFixedSize(mSubRepetition->tqsizeHint()); + mSubRepetition->setFixedSize(mSubRepetition->sizeHint()); mSubRepetition->setReadOnly(mReadOnly); connect(mSubRepetition, TQT_SIGNAL(needsInitialisation()), TQT_SIGNAL(repeatNeedsInitialisation())); connect(mSubRepetition, TQT_SIGNAL(changed()), TQT_SIGNAL(frequencyChanged())); @@ -223,7 +223,7 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name TQVBoxLayout* vtqlayout = new TQVBoxLayout(mRangeButtonGroup, KDialog::marginHint(), KDialog::spacingHint()); vtqlayout->addSpacing(fontMetrics().lineSpacing()/2); mNoEndDateButton = new RadioButton(i18n("No &end"), mRangeButtonGroup); - mNoEndDateButton->setFixedSize(mNoEndDateButton->tqsizeHint()); + mNoEndDateButton->setFixedSize(mNoEndDateButton->sizeHint()); mNoEndDateButton->setReadOnly(mReadOnly); TQWhatsThis::add(mNoEndDateButton, i18n("Repeat the alarm indefinitely")); vtqlayout->addWidget(mNoEndDateButton, 1, TQt::AlignAuto); @@ -235,7 +235,7 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name TQWhatsThis::add(mRepeatCountButton, i18n("Repeat the alarm for the number of times specified")); mRepeatCountEntry = new SpinBox(1, 9999, 1, mRangeButtonGroup); - mRepeatCountEntry->setFixedSize(mRepeatCountEntry->tqsizeHint()); + mRepeatCountEntry->setFixedSize(mRepeatCountEntry->sizeHint()); mRepeatCountEntry->setLineShiftStep(10); mRepeatCountEntry->setSelectOnStep(false); mRepeatCountEntry->setReadOnly(mReadOnly); @@ -244,13 +244,13 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name i18n("Enter the total number of times to trigger the alarm")); mRepeatCountButton->setFocusWidget(mRepeatCountEntry); mRepeatCountLabel = new TQLabel(i18n("occurrence(s)"), mRangeButtonGroup); - mRepeatCountLabel->setFixedSize(mRepeatCountLabel->tqsizeHint()); + mRepeatCountLabel->setFixedSize(mRepeatCountLabel->sizeHint()); tqlayout->addWidget(mRepeatCountButton); tqlayout->addSpacing(KDialog::spacingHint()); tqlayout->addWidget(mRepeatCountEntry); tqlayout->addWidget(mRepeatCountLabel); tqlayout->addStretch(); - size = size.expandedTo(mRepeatCountButton->tqsizeHint()); + size = size.expandedTo(mRepeatCountButton->sizeHint()); tqlayout = new TQHBoxLayout(vtqlayout, KDialog::spacingHint()); mEndDateButton = new RadioButton(i18n("End &by:"), mRangeButtonGroup); @@ -259,18 +259,18 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name i18n("Repeat the alarm until the date/time specified.\n\n" "Note: This applies to the main recurrence only. It does not limit any sub-repetition which will occur regardless after the last main recurrence.")); mEndDateEdit = new DateEdit(mRangeButtonGroup); - mEndDateEdit->setFixedSize(mEndDateEdit->tqsizeHint()); + mEndDateEdit->setFixedSize(mEndDateEdit->sizeHint()); mEndDateEdit->setReadOnly(mReadOnly); TQWhatsThis::add(mEndDateEdit, i18n("Enter the last date to repeat the alarm")); mEndDateButton->setFocusWidget(mEndDateEdit); mEndTimeEdit = new TimeEdit(mRangeButtonGroup); - mEndTimeEdit->setFixedSize(mEndTimeEdit->tqsizeHint()); + 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())); mEndAnyTimeCheckBox = new CheckBox(i18n("Any time"), mRangeButtonGroup); - mEndAnyTimeCheckBox->setFixedSize(mEndAnyTimeCheckBox->tqsizeHint()); + mEndAnyTimeCheckBox->setFixedSize(mEndAnyTimeCheckBox->sizeHint()); mEndAnyTimeCheckBox->setReadOnly(mReadOnly); connect(mEndAnyTimeCheckBox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotAnyTimeToggled(bool))); TQWhatsThis::add(mEndAnyTimeCheckBox, @@ -281,7 +281,7 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name tqlayout->addWidget(mEndTimeEdit); tqlayout->addWidget(mEndAnyTimeCheckBox); tqlayout->addStretch(); - size = size.expandedTo(mEndDateButton->tqsizeHint()); + size = size.expandedTo(mEndDateButton->sizeHint()); // Line up the widgets to the right of the radio buttons mRepeatCountButton->setFixedSize(size); @@ -299,7 +299,7 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name vtqlayout = new TQVBoxLayout(tqlayout); mExceptionDateList = new TQListBox(mExceptionGroup); - mExceptionDateList->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding)); + mExceptionDateList->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding)); connect(mExceptionDateList, TQT_SIGNAL(selectionChanged()), TQT_SLOT(enableExceptionButtons())); TQWhatsThis::add(mExceptionDateList, i18n("The list of exceptions, i.e. dates/times excluded from the recurrence")); @@ -315,8 +315,8 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name { vtqlayout = new TQVBoxLayout(tqlayout); mExceptionDateEdit = new DateEdit(mExceptionGroup); - mExceptionDateEdit->setFixedSize(mExceptionDateEdit->tqsizeHint()); - mExceptionDateEdit->setDate(TQDate::tqcurrentDate()); + mExceptionDateEdit->setFixedSize(mExceptionDateEdit->sizeHint()); + mExceptionDateEdit->setDate(TQDate::currentDate()); TQWhatsThis::add(mExceptionDateEdit, i18n("Enter a date to insert in the exceptions list. " "Use in conjunction with the Add or Change button below.")); @@ -324,21 +324,21 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name tqlayout = new TQHBoxLayout(vtqlayout, KDialog::spacingHint()); TQPushButton* button = new TQPushButton(i18n("Add"), mExceptionGroup); - button->setFixedSize(button->tqsizeHint()); + button->setFixedSize(button->sizeHint()); connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(addException())); TQWhatsThis::add(button, i18n("Add the date entered above to the exceptions list")); tqlayout->addWidget(button); mChangeExceptionButton = new TQPushButton(i18n("Change"), mExceptionGroup); - mChangeExceptionButton->setFixedSize(mChangeExceptionButton->tqsizeHint()); + mChangeExceptionButton->setFixedSize(mChangeExceptionButton->sizeHint()); connect(mChangeExceptionButton, TQT_SIGNAL(clicked()), TQT_SLOT(changeException())); TQWhatsThis::add(mChangeExceptionButton, i18n("Replace the currently highlighted item in the exceptions list with the date entered above")); tqlayout->addWidget(mChangeExceptionButton); mDeleteExceptionButton = new TQPushButton(i18n("Delete"), mExceptionGroup); - mDeleteExceptionButton->setFixedSize(mDeleteExceptionButton->tqsizeHint()); + mDeleteExceptionButton->setFixedSize(mDeleteExceptionButton->sizeHint()); connect(mDeleteExceptionButton, TQT_SIGNAL(clicked()), TQT_SLOT(deleteException())); TQWhatsThis::add(mDeleteExceptionButton, i18n("Remove the currently highlighted item from the exceptions list")); @@ -1029,30 +1029,30 @@ Rule::Rule(const TQString& freqText, const TQString& freqWhatsThis, bool time, b box->setSpacing(KDialog::spacingHint()); TQLabel* label = new TQLabel(i18n("Recur e&very"), box); - label->setFixedSize(label->tqsizeHint()); + label->setFixedSize(label->sizeHint()); if (time) { mIntSpinBox = 0; mSpinBox = mTimeSpinBox = new TimeSpinBox(1, 5999, box); - mTimeSpinBox->setFixedSize(mTimeSpinBox->tqsizeHint()); + mTimeSpinBox->setFixedSize(mTimeSpinBox->sizeHint()); mTimeSpinBox->setReadOnly(readOnly); } else { mTimeSpinBox = 0; mSpinBox = mIntSpinBox = new SpinBox(1, 999, 1, box); - mIntSpinBox->setFixedSize(mIntSpinBox->tqsizeHint()); + mIntSpinBox->setFixedSize(mIntSpinBox->sizeHint()); mIntSpinBox->setReadOnly(readOnly); } connect(mSpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(frequencyChanged())); label->setBuddy(mSpinBox); label = new TQLabel(freqText, box); - label->setFixedSize(label->tqsizeHint()); - box->setFixedSize(tqsizeHint()); + label->setFixedSize(label->sizeHint()); + box->setFixedSize(sizeHint()); TQWhatsThis::add(box, freqWhatsThis); new TQWidget(freqBox); // left adjust the visible widgets - freqBox->setFixedHeight(freqBox->tqsizeHint().height()); + freqBox->setFixedHeight(freqBox->sizeHint().height()); freqBox->setFocusProxy(mSpinBox); } @@ -1116,7 +1116,7 @@ DayWeekRule::DayWeekRule(const TQString& freqText, const TQString& freqWhatsThis grid->setRowStretch(0, 1); TQLabel* label = new TQLabel(i18n("On: Tuesday", "O&n:"), this); - label->setFixedSize(label->tqsizeHint()); + label->setFixedSize(label->sizeHint()); grid->addWidget(label, 0, 0, TQt::AlignRight | TQt::AlignTop); grid->addColSpacing(1, KDialog::spacingHint()); @@ -1129,11 +1129,11 @@ DayWeekRule::DayWeekRule(const TQString& freqText, const TQString& freqWhatsThis { int day = KAlarm::localeDayInWeek_to_weekDay(i); mDayBox[i] = new CheckBox(calendar->weekDayName(day), box); - mDayBox[i]->setFixedSize(mDayBox[i]->tqsizeHint()); + mDayBox[i]->setFixedSize(mDayBox[i]->sizeHint()); mDayBox[i]->setReadOnly(readOnly); dgrid->addWidget(mDayBox[i], i%4, i/4, TQt::AlignAuto); } - box->setFixedSize(box->tqsizeHint()); + box->setFixedSize(box->sizeHint()); TQWhatsThis::add(box, daysWhatsThis); grid->addWidget(box, 0, 2, TQt::AlignAuto); label->setBuddy(mDayBox[0]); @@ -1261,7 +1261,7 @@ MonthYearRule::MonthYearRule(const TQString& freqText, const TQString& freqWhats tqlayout()->addWidget(box); mDayButton = new RadioButton(i18n("On day number in the month", "O&n day"), box); - mDayButton->setFixedSize(mDayButton->tqsizeHint()); + mDayButton->setFixedSize(mDayButton->sizeHint()); mDayButton->setReadOnly(readOnly); mDayButtonId = mButtonGroup->insert(mDayButton); TQWhatsThis::add(mDayButton, i18n("Repeat the alarm on the selected day of the month")); @@ -1271,14 +1271,14 @@ MonthYearRule::MonthYearRule(const TQString& freqText, const TQString& freqWhats for (int i = 0; i < 31; ++i) mDayCombo->insertItem(TQString::number(i + 1)); mDayCombo->insertItem(i18n("Last day of month", "Last")); - mDayCombo->setFixedSize(mDayCombo->tqsizeHint()); + mDayCombo->setFixedSize(mDayCombo->sizeHint()); mDayCombo->setReadOnly(readOnly); TQWhatsThis::add(mDayCombo, i18n("Select the day of the month on which to repeat the alarm")); mDayButton->setFocusWidget(mDayCombo); connect(mDayCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotDaySelected(int))); box->setStretchFactor(new TQWidget(box), 1); // left adjust the controls - box->setFixedHeight(box->tqsizeHint().height()); + box->setFixedHeight(box->sizeHint().height()); // Month position selector box = new TQHBox(this); @@ -1286,7 +1286,7 @@ MonthYearRule::MonthYearRule(const TQString& freqText, const TQString& freqWhats tqlayout()->addWidget(box); mPosButton = new RadioButton(i18n("On the 1st Tuesday", "On t&he"), box); - mPosButton->setFixedSize(mPosButton->tqsizeHint()); + mPosButton->setFixedSize(mPosButton->sizeHint()); mPosButton->setReadOnly(readOnly); mPosButtonId = mButtonGroup->insert(mPosButton); TQWhatsThis::add(mPosButton, @@ -1309,7 +1309,7 @@ MonthYearRule::MonthYearRule(const TQString& freqText, const TQString& freqWhats mWeekCombo->setSizeLimit(11); } TQWhatsThis::add(mWeekCombo, i18n("Select the week of the month in which to repeat the alarm")); - mWeekCombo->setFixedSize(mWeekCombo->tqsizeHint()); + mWeekCombo->setFixedSize(mWeekCombo->sizeHint()); mWeekCombo->setReadOnly(readOnly); mPosButton->setFocusWidget(mWeekCombo); @@ -1324,7 +1324,7 @@ MonthYearRule::MonthYearRule(const TQString& freqText, const TQString& freqWhats TQWhatsThis::add(mDayOfWeekCombo, i18n("Select the day of the week on which to repeat the alarm")); box->setStretchFactor(new TQWidget(box), 1); // left adjust the controls - box->setFixedHeight(box->tqsizeHint().height()); + box->setFixedHeight(box->sizeHint().height()); connect(mButtonGroup, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(clicked(int))); } @@ -1458,7 +1458,7 @@ YearlyRule::YearlyRule(bool readOnly, TQWidget* parent, const char* name) // Set up the month selection widgets TQBoxLayout* htqlayout = new TQHBoxLayout(tqlayout(), KDialog::spacingHint()); TQLabel* label = new TQLabel(i18n("List of months to select", "Months:"), this); - label->setFixedSize(label->tqsizeHint()); + label->setFixedSize(label->sizeHint()); htqlayout->addWidget(label, 0, TQt::AlignAuto | TQt::AlignTop); // List the months of the year. @@ -1466,16 +1466,16 @@ YearlyRule::YearlyRule(bool readOnly, TQWidget* parent, const char* name) htqlayout->addWidget(w, 1, TQt::AlignAuto); TQGridLayout* grid = new TQGridLayout(w, 4, 3, 0, KDialog::spacingHint()); const KCalendarSystem* calendar = KGlobal::locale()->calendar(); - int year = TQDate::tqcurrentDate().year(); + int year = TQDate::currentDate().year(); for (int i = 0; i < 12; ++i) { mMonthBox[i] = new CheckBox(calendar->monthName(i + 1, year, true), w); - mMonthBox[i]->setFixedSize(mMonthBox[i]->tqsizeHint()); + mMonthBox[i]->setFixedSize(mMonthBox[i]->sizeHint()); mMonthBox[i]->setReadOnly(readOnly); grid->addWidget(mMonthBox[i], i%3, i/3, TQt::AlignAuto); } connect(mMonthBox[1], TQT_SIGNAL(toggled(bool)), TQT_SLOT(enableFeb29())); - w->setFixedHeight(w->tqsizeHint().height()); + w->setFixedHeight(w->sizeHint().height()); TQWhatsThis::add(w, i18n("Select the months of the year in which to repeat the alarm")); // February 29th handling option @@ -1484,19 +1484,19 @@ YearlyRule::YearlyRule(bool readOnly, TQWidget* parent, const char* name) TQHBox* box = new TQHBox(f29box); // this is to control the TQWhatsThis text display area box->setSpacing(KDialog::spacingHint()); mFeb29Label = new TQLabel(i18n("February 2&9th alarm in non-leap years:"), box); - mFeb29Label->setFixedSize(mFeb29Label->tqsizeHint()); + mFeb29Label->setFixedSize(mFeb29Label->sizeHint()); mFeb29Combo = new ComboBox(false, box); mFeb29Combo->insertItem(i18n("No date", "None")); mFeb29Combo->insertItem(i18n("1st March (short form)", "1 Mar")); mFeb29Combo->insertItem(i18n("28th February (short form)", "28 Feb")); - mFeb29Combo->setFixedSize(mFeb29Combo->tqsizeHint()); + mFeb29Combo->setFixedSize(mFeb29Combo->sizeHint()); mFeb29Combo->setReadOnly(readOnly); mFeb29Label->setBuddy(mFeb29Combo); - box->setFixedSize(box->tqsizeHint()); + box->setFixedSize(box->sizeHint()); TQWhatsThis::add(box, i18n("Select which date, if any, the February 29th alarm should trigger in non-leap years")); new TQWidget(f29box); // left adjust the visible widgets - f29box->setFixedHeight(f29box->tqsizeHint().height()); + f29box->setFixedHeight(f29box->sizeHint().height()); } void YearlyRule::setDefaultValues(int dayOfMonth, int dayOfWeek, int month) diff --git a/kalarm/reminder.cpp b/kalarm/reminder.cpp index e10e04e22..2fd2ff79c 100644 --- a/kalarm/reminder.cpp +++ b/kalarm/reminder.cpp @@ -51,7 +51,7 @@ Reminder::Reminder(const TQString& caption, const TQString& reminderWhatsThis, c mTime = new TimeSelector(caption, i18n("in advance"), reminderWhatsThis, valueWhatsThis, allowHourMinute, this, "timeOption"); - mTime->setFixedSize(mTime->tqsizeHint()); + mTime->setFixedSize(mTime->sizeHint()); connect(mTime, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotReminderToggled(bool))); topLayout->addWidget(mTime); @@ -60,7 +60,7 @@ Reminder::Reminder(const TQString& caption, const TQString& reminderWhatsThis, c TQBoxLayout* tqlayout = new TQHBoxLayout(topLayout, KDialog::spacingHint()); tqlayout->addSpacing(3*KDialog::spacingHint()); mOnceOnly = new CheckBox(i18n_u_first_recurrence_only(), this); - mOnceOnly->setFixedSize(mOnceOnly->tqsizeHint()); + mOnceOnly->setFixedSize(mOnceOnly->sizeHint()); TQWhatsThis::add(mOnceOnly, i18n("Display the reminder only before the first time the alarm is scheduled")); tqlayout->addWidget(mOnceOnly); tqlayout->addStretch(); diff --git a/kalarm/repetition.cpp b/kalarm/repetition.cpp index 403250ba5..d5eae1a89 100644 --- a/kalarm/repetition.cpp +++ b/kalarm/repetition.cpp @@ -165,7 +165,7 @@ RepetitionDlg::RepetitionDlg(const TQString& caption, bool readOnly, TQWidget* p "checking this option makes the alarm trigger multiple times at each recurrence."), i18n("Enter the time between repetitions of the alarm"), true, page); - mTimeSelector->setFixedSize(mTimeSelector->tqsizeHint()); + mTimeSelector->setFixedSize(mTimeSelector->sizeHint()); connect(mTimeSelector, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(intervalChanged(int))); connect(mTimeSelector, TQT_SIGNAL(toggled(bool)), TQT_SLOT(repetitionToggled(bool))); topLayout->addWidget(mTimeSelector, 0, TQt::AlignAuto); @@ -177,12 +177,12 @@ RepetitionDlg::RepetitionDlg(const TQString& caption, bool readOnly, TQWidget* p TQBoxLayout* vtqlayout = new TQVBoxLayout(mButtonGroup, marginHint(), spacing); TQBoxLayout* tqlayout = new TQHBoxLayout(vtqlayout, spacing); mCountButton = new RadioButton(i18n("&Number of repetitions:"), mButtonGroup); - mCountButton->setFixedSize(mCountButton->tqsizeHint()); + mCountButton->setFixedSize(mCountButton->sizeHint()); TQWhatsThis::add(mCountButton, i18n("Check to specify the number of times the alarm should repeat after each recurrence")); tqlayout->addWidget(mCountButton); mCount = new SpinBox(1, MAX_COUNT, 1, mButtonGroup); - mCount->setFixedSize(mCount->tqsizeHint()); + mCount->setFixedSize(mCount->sizeHint()); mCount->setLineShiftStep(10); mCount->setSelectOnStep(false); connect(mCount, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(countChanged(int))); @@ -194,12 +194,12 @@ RepetitionDlg::RepetitionDlg(const TQString& caption, bool readOnly, TQWidget* p tqlayout = new TQHBoxLayout(vtqlayout, spacing); mDurationButton = new RadioButton(i18n("&Duration:"), mButtonGroup); - mDurationButton->setFixedSize(mDurationButton->tqsizeHint()); + mDurationButton->setFixedSize(mDurationButton->sizeHint()); TQWhatsThis::add(mDurationButton, i18n("Check to specify how long the alarm is to be repeated")); tqlayout->addWidget(mDurationButton); mDuration = new TimePeriod(true, mButtonGroup); - mDuration->setFixedSize(mDuration->tqsizeHint()); + mDuration->setFixedSize(mDuration->sizeHint()); connect(mDuration, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(durationChanged(int))); TQWhatsThis::add(mDuration, i18n("Enter the length of time to repeat the alarm")); diff --git a/kalarm/sounddlg.cpp b/kalarm/sounddlg.cpp index c7a6adcfb..d1cd97887 100644 --- a/kalarm/sounddlg.cpp +++ b/kalarm/sounddlg.cpp @@ -85,7 +85,7 @@ SoundDlg::SoundDlg(const TQString& file, float volume, float fadeVolume, int fad tqlayout->addWidget(box); mFilePlay = new TQPushButton(box); mFilePlay->setPixmap(SmallIcon("player_play")); - mFilePlay->setFixedSize(mFilePlay->tqsizeHint()); + mFilePlay->setFixedSize(mFilePlay->sizeHint()); connect(mFilePlay, TQT_SIGNAL(clicked()), TQT_SLOT(playSound())); TQToolTip::add(mFilePlay, i18n("Test the sound")); TQWhatsThis::add(mFilePlay, i18n("Play the selected sound file.")); @@ -98,14 +98,14 @@ SoundDlg::SoundDlg(const TQString& file, float volume, float fadeVolume, int fad // File browse button mFileBrowseButton = new PushButton(box); mFileBrowseButton->setPixmap(SmallIcon("fileopen")); - mFileBrowseButton->setFixedSize(mFileBrowseButton->tqsizeHint()); + mFileBrowseButton->setFixedSize(mFileBrowseButton->sizeHint()); connect(mFileBrowseButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotPickFile())); TQToolTip::add(mFileBrowseButton, i18n("Choose a file")); TQWhatsThis::add(mFileBrowseButton, i18n("Select a sound file to play.")); // Sound repetition checkbox mRepeatCheckbox = new CheckBox(i18n_p_Repeat(), page); - mRepeatCheckbox->setFixedSize(mRepeatCheckbox->tqsizeHint()); + mRepeatCheckbox->setFixedSize(mRepeatCheckbox->sizeHint()); TQWhatsThis::add(mRepeatCheckbox, i18n("If checked, the sound file will be played repeatedly for as long as the message is displayed.")); tqlayout->addWidget(mRepeatCheckbox); @@ -127,7 +127,7 @@ SoundDlg::SoundDlg(const TQString& file, float volume, float fadeVolume, int fad box->setSpacing(spacingHint()); grid->addMultiCellWidget(box, 1, 1, 0, 2); mVolumeCheckbox = new CheckBox(i18n_v_SetVolume(), box); - mVolumeCheckbox->setFixedSize(mVolumeCheckbox->tqsizeHint()); + mVolumeCheckbox->setFixedSize(mVolumeCheckbox->sizeHint()); connect(mVolumeCheckbox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotVolumeToggled(bool))); TQWhatsThis::add(mVolumeCheckbox, i18n("Select to choose the volume for playing the sound file.")); @@ -136,13 +136,13 @@ SoundDlg::SoundDlg(const TQString& file, float volume, float fadeVolume, int fad mVolumeSlider = new Slider(0, 100, 10, 0, Qt::Horizontal, box); mVolumeSlider->setTickmarks(TQSlider::Below); mVolumeSlider->setTickInterval(10); - mVolumeSlider->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed)); + mVolumeSlider->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed)); TQWhatsThis::add(mVolumeSlider, i18n("Choose the volume for playing the sound file.")); mVolumeCheckbox->setFocusWidget(mVolumeSlider); // Fade checkbox mFadeCheckbox = new CheckBox(i18n("Fade"), group); - mFadeCheckbox->setFixedSize(mFadeCheckbox->tqsizeHint()); + mFadeCheckbox->setFixedSize(mFadeCheckbox->sizeHint()); 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.")); @@ -153,13 +153,13 @@ SoundDlg::SoundDlg(const TQString& file, float volume, float fadeVolume, int fad mFadeBox->setSpacing(spacingHint()); grid->addWidget(mFadeBox, 3, 2, tqalignment); TQLabel* label = new TQLabel(i18n("Time period over which to fade the sound", "Fade time:"), mFadeBox); - label->setFixedSize(label->tqsizeHint()); + label->setFixedSize(label->sizeHint()); mFadeTime = new SpinBox(1, 999, 1, mFadeBox); mFadeTime->setLineShiftStep(10); - mFadeTime->setFixedSize(mFadeTime->tqsizeHint()); + mFadeTime->setFixedSize(mFadeTime->sizeHint()); label->setBuddy(mFadeTime); label = new TQLabel(i18n("seconds"), mFadeBox); - label->setFixedSize(label->tqsizeHint()); + label->setFixedSize(label->sizeHint()); TQWhatsThis::add(mFadeBox, i18n("Enter how many seconds to fade the sound before reaching the set volume.")); // Fade slider @@ -167,11 +167,11 @@ SoundDlg::SoundDlg(const TQString& file, float volume, float fadeVolume, int fad mFadeVolumeBox->setSpacing(spacingHint()); grid->addWidget(mFadeVolumeBox, 4, 2); label = new TQLabel(i18n("Initial volume:"), mFadeVolumeBox); - label->setFixedSize(label->tqsizeHint()); + label->setFixedSize(label->sizeHint()); mFadeSlider = new Slider(0, 100, 10, 0, Qt::Horizontal, mFadeVolumeBox); mFadeSlider->setTickmarks(TQSlider::Below); mFadeSlider->setTickInterval(10); - mFadeSlider->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed)); + mFadeSlider->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed)); label->setBuddy(mFadeSlider); TQWhatsThis::add(mFadeVolumeBox, i18n("Choose the initial volume for playing the sound file.")); diff --git a/kalarm/soundpicker.cpp b/kalarm/soundpicker.cpp index ed55b8112..485f0fdb1 100644 --- a/kalarm/soundpicker.cpp +++ b/kalarm/soundpicker.cpp @@ -64,7 +64,7 @@ SoundPicker::SoundPicker(TQWidget* parent, const char* name) mTypeBox->setSpacing(KDialog::spacingHint()); TQLabel* label = new TQLabel(i18n("An audio sound", "&Sound:"), mTypeBox); - label->setFixedSize(label->tqsizeHint()); + label->setFixedSize(label->sizeHint()); // Sound type combo box // The order of combo box entries must correspond with the 'Type' enum. @@ -81,7 +81,7 @@ SoundPicker::SoundPicker(TQWidget* parent, const char* name) // Sound file picker button mFilePicker = new PushButton(this); mFilePicker->setPixmap(SmallIcon("playsound")); - mFilePicker->setFixedSize(mFilePicker->tqsizeHint()); + mFilePicker->setFixedSize(mFilePicker->sizeHint()); connect(mFilePicker, TQT_SIGNAL(clicked()), TQT_SLOT(slotPickFile())); TQToolTip::add(mFilePicker, i18n("Configure sound file")); TQWhatsThis::add(mFilePicker, i18n("Configure a sound file to play when the alarm is displayed.")); @@ -283,7 +283,7 @@ TQString SoundPicker::browseFile(TQString& defaultDir, const TQString& initialFi defaultDir = kdeSoundDir; } #ifdef WITHOUT_ARTS - TQString filter = TQString::tqfromLatin1("*.wav *.mp3 *.ogg|%1\n*|%2").tqarg(i18n("Sound Files")).tqarg(i18n("All Files")); + TQString filter = TQString::fromLatin1("*.wav *.mp3 *.ogg|%1\n*|%2").tqarg(i18n("Sound Files")).tqarg(i18n("All Files")); #else TQStringList filters = KDE::PlayObjectFactory::mimeTypes(); TQString filter = filters.join(" "); diff --git a/kalarm/specialactions.cpp b/kalarm/specialactions.cpp index 02a0543f0..d4271d16d 100644 --- a/kalarm/specialactions.cpp +++ b/kalarm/specialactions.cpp @@ -142,7 +142,7 @@ SpecialActions::SpecialActions(TQWidget* parent, const char* name) // Pre-alarm action TQLabel* label = new TQLabel(i18n("Pre-a&larm action:"), this); - label->setFixedSize(label->tqsizeHint()); + label->setFixedSize(label->sizeHint()); topLayout->addWidget(label, 0, TQt::AlignAuto); mPreAction = new KLineEdit(this); @@ -156,7 +156,7 @@ SpecialActions::SpecialActions(TQWidget* parent, const char* name) // Post-alarm action label = new TQLabel(i18n("Post-alar&m action:"), this); - label->setFixedSize(label->tqsizeHint()); + label->setFixedSize(label->sizeHint()); topLayout->addWidget(label, 0, TQt::AlignAuto); mPostAction = new KLineEdit(this); diff --git a/kalarm/templatedlg.cpp b/kalarm/templatedlg.cpp index fa176f8b9..698077bf6 100644 --- a/kalarm/templatedlg.cpp +++ b/kalarm/templatedlg.cpp @@ -53,7 +53,7 @@ TemplateDlg::TemplateDlg(TQWidget* parent, const char* name) TQBoxLayout* tqlayout = new TQVBoxLayout(topLayout); mTemplateList = new TemplateListView(true, i18n("The list of alarm templates"), topWidget); mTemplateList->setSelectionMode(TQListView::Extended); - mTemplateList->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding)); + mTemplateList->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding)); connect(mTemplateList, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectionChanged())); tqlayout->addWidget(mTemplateList); @@ -192,14 +192,14 @@ void TemplateDlg::slotDelete() return; int warnErr = 0; - KAlarm::UpdatetqStatus status = KAlarm::UPDATE_OK; + KAlarm::UpdateStatus status = KAlarm::UPDATE_OK; TQValueList<KAEvent> events; AlarmCalendar::templateCalendar()->startUpdate(); // prevent multiple saves of the calendar until we're finished for (TQValueList<EventListViewItemBase*>::Iterator it = items.begin(); it != items.end(); ++it) { TemplateListViewItem* item = (TemplateListViewItem*)(*it); events.append(item->event()); - KAlarm::UpdatetqStatus st = KAlarm::deleteTemplate(item->event()); + KAlarm::UpdateStatus st = KAlarm::deleteTemplate(item->event()); if (st != KAlarm::UPDATE_OK) { status = st; diff --git a/kalarm/timeselector.cpp b/kalarm/timeselector.cpp index 31e69d749..1ca20bc10 100644 --- a/kalarm/timeselector.cpp +++ b/kalarm/timeselector.cpp @@ -43,7 +43,7 @@ TimeSelector::TimeSelector(const TQString& selectText, const TQString& postfix, TQVBoxLayout* topLayout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); TQHBoxLayout* tqlayout = new TQHBoxLayout(topLayout, KDialog::spacingHint()); mSelect = new CheckBox(selectText, this); - mSelect->setFixedSize(mSelect->tqsizeHint()); + mSelect->setFixedSize(mSelect->sizeHint()); connect(mSelect, TQT_SIGNAL(toggled(bool)), TQT_SLOT(selectToggled(bool))); TQWhatsThis::add(mSelect, selectWhatsThis); tqlayout->addWidget(mSelect); @@ -52,7 +52,7 @@ TimeSelector::TimeSelector(const TQString& selectText, const TQString& postfix, box->setSpacing(KDialog::spacingHint()); tqlayout->addWidget(box); mPeriod = new TimePeriod(allowHourMinute, box); - mPeriod->setFixedSize(mPeriod->tqsizeHint()); + mPeriod->setFixedSize(mPeriod->sizeHint()); mPeriod->setSelectOnStep(false); connect(mPeriod, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(periodChanged(int))); mSelect->setFocusWidget(mPeriod); diff --git a/kalarm/traywindow.cpp b/kalarm/traywindow.cpp index 9f3524b9d..aac2806cd 100644 --- a/kalarm/traywindow.cpp +++ b/kalarm/traywindow.cpp @@ -87,7 +87,7 @@ TrayWindow::TrayWindow(MainWindow* parent, const char* name) KActionCollection* actcol = actionCollection(); AlarmEnableAction* a = Daemon::createAlarmEnableAction(actcol, "tAlarmEnable"); a->plug(contextMenu()); - connect(a, TQT_SIGNAL(switched(bool)), TQT_SLOT(setEnabledtqStatus(bool))); + connect(a, TQT_SIGNAL(switched(bool)), TQT_SLOT(setEnabledStatus(bool))); KAlarm::createNewAlarmAction(i18n("&New Alarm..."), TQT_TQOBJECT(this), TQT_SLOT(slotNewAlarm()), actcol, "tNew")->plug(contextMenu()); KAlarm::createNewFromTemplateAction(i18n("New Alarm From &Template"), TQT_TQOBJECT(this), TQT_SLOT(slotNewFromTemplate(const KAEvent&)), actcol, "tNewFromTempl")->plug(contextMenu()); KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotPreferences()), actcol)->plug(contextMenu()); @@ -99,8 +99,8 @@ TrayWindow::TrayWindow(MainWindow* parent, const char* name) KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), actcol); // Set icon to correspond with the alarms enabled menu status - Daemon::checktqStatus(); - setEnabledtqStatus(Daemon::monitoringAlarms()); + Daemon::checkStatus(); + setEnabledStatus(Daemon::monitoringAlarms()); mTooltip = new TrayTooltip(this); } @@ -121,7 +121,7 @@ TrayWindow::~TrayWindow() void TrayWindow::contextMenuAboutToShow(KPopupMenu* menu) { KSystemTray::contextMenuAboutToShow(menu); // needed for KDE <= 3.1 compatibility - Daemon::checktqStatus(); + Daemon::checkStatus(); } /****************************************************************************** @@ -160,7 +160,7 @@ void TrayWindow::slotQuit() * Called when the Alarms Enabled action status has changed. * Updates the alarms enabled menu item check state, and the icon pixmap. */ -void TrayWindow::setEnabledtqStatus(bool status) +void TrayWindow::setEnabledStatus(bool status) { kdDebug(5950) << "TrayWindow::setEnabledStatus(" << (int)status << ")\n"; setPixmap(status ? mPixmapEnabled : mPixmapDisabled); @@ -226,7 +226,7 @@ void TrayWindow::tooltipAlarmText(TQString& text) const KAEvent event; const TQString& prefix = Preferences::tooltipTimeToPrefix(); int maxCount = Preferences::tooltipAlarmCount(); - TQDateTime now = TQDateTime::tqcurrentDateTime(); + TQDateTime now = TQDateTime::currentDateTime(); // Get today's and tomorrow's alarms, sorted in time order TQValueList<TipItem> items; diff --git a/kalarm/traywindow.h b/kalarm/traywindow.h index e1d9ff078..e69e1b565 100644 --- a/kalarm/traywindow.h +++ b/kalarm/traywindow.h @@ -59,7 +59,7 @@ class TrayWindow : public KSystemTray void slotNewAlarm(); void slotNewFromTemplate(const KAEvent&); void slotPreferences(); - void setEnabledtqStatus(bool status); + void setEnabledStatus(bool status); private: friend class TrayTooltip; diff --git a/kalarm/undo.cpp b/kalarm/undo.cpp index 63168f45e..ead90e004 100644 --- a/kalarm/undo.cpp +++ b/kalarm/undo.cpp @@ -52,8 +52,8 @@ class UndoItem int id() const { return mId; } Undo::Type type() const { return mType; } void setType(Undo::Type t) { mType = t; } - KAEvent::tqStatus calendar() const { return mCalendar; } - virtual void setCalendar(KAEvent::tqStatus s) { mCalendar = s; } + KAEvent::Status calendar() const { return mCalendar; } + virtual void setCalendar(KAEvent::Status s) { mCalendar = s; } virtual UndoItem* restore() = 0; virtual bool deleteID(const TQString& /*id*/) { return false; } @@ -66,13 +66,13 @@ class UndoItem protected: UndoItem(Undo::Type); - static TQString addDeleteActionText(KAEvent::tqStatus, bool add); + static TQString addDeleteActionText(KAEvent::Status, bool add); TQString description(const KAEvent&) const; void replaceWith(UndoItem* item) { Undo::replace(this, item); } int mId; // unique identifier (only for mType = UNDO, REDO) Undo::Type mType; // which list (if any) the object is in - KAEvent::tqStatus mCalendar; + KAEvent::Status mCalendar; }; class UndoMultiBase : public UndoItem @@ -101,7 +101,7 @@ class UndoAdd : public UndoItem { public: UndoAdd(Undo::Type, const KAEvent&); - UndoAdd(Undo::Type, const KAEvent&, KAEvent::tqStatus); + UndoAdd(Undo::Type, const KAEvent&, KAEvent::Status); virtual Operation operation() const { return ADD; } virtual TQString actionText() const; virtual TQString description() const { return mDescription; } @@ -586,7 +586,7 @@ TQString UndoItem::description(const KAEvent& event) const /****************************************************************************** * Return the action description of an add or delete Undo/Redo item for displaying. */ -TQString UndoItem::addDeleteActionText(KAEvent::tqStatus calendar, bool add) +TQString UndoItem::addDeleteActionText(KAEvent::Status calendar, bool add) { switch (calendar) { @@ -695,11 +695,11 @@ UndoAdd::UndoAdd(Undo::Type type, const KAEvent& event) : UndoItem(type), mEventID(event.id()) { - setCalendar(KAEvent::uidtqStatus(mEventID)); + setCalendar(KAEvent::uidStatus(mEventID)); mDescription = UndoItem::description(event); // calendar must be set before calling this } -UndoAdd::UndoAdd(Undo::Type type, const KAEvent& event, KAEvent::tqStatus cal) +UndoAdd::UndoAdd(Undo::Type type, const KAEvent& event, KAEvent::Status cal) : UndoItem(type), mEventID(KAEvent::uid(event.id(), cal)) { @@ -793,7 +793,7 @@ UndoEdit::UndoEdit(Undo::Type type, const KAEvent& oldEvent, const TQString& new mNewEventID(newEventID), mDescription(description) { - setCalendar(KAEvent::uidtqStatus(mNewEventID)); + setCalendar(KAEvent::uidStatus(mNewEventID)); } UndoEdit::~UndoEdit() @@ -880,7 +880,7 @@ UndoDelete::UndoDelete(Undo::Type type, const KAEvent& event) : UndoItem(type), mEvent(new KAEvent(event)) { - setCalendar(KAEvent::uidtqStatus(mEvent->id())); + setCalendar(KAEvent::uidStatus(mEvent->id())); } UndoDelete::~UndoDelete() diff --git a/kandy/src/cmdpropertiesdialog_base.ui b/kandy/src/cmdpropertiesdialog_base.ui index 2fd540ae5..fed3a7a57 100644 --- a/kandy/src/cmdpropertiesdialog_base.ui +++ b/kandy/src/cmdpropertiesdialog_base.ui @@ -110,7 +110,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>79</width> <height>20</height> diff --git a/kandy/src/mobilegui.cpp b/kandy/src/mobilegui.cpp index 70d0656f3..908837c49 100644 --- a/kandy/src/mobilegui.cpp +++ b/kandy/src/mobilegui.cpp @@ -954,7 +954,7 @@ void MobileGui::writeKabc() } -void MobileGui::refreshtqStatus() +void MobileGui::refreshStatus() { mScheduler->executeId( "+cbc" ); mScheduler->executeId( "+csq" ); @@ -1453,7 +1453,7 @@ void MobileGui::toggleConnection() emit connectModem(); readModelInformation(); - refreshtqStatus(); + refreshStatus(); mConnectButton->setText( tr2i18n( "Disconnect" ) ); PushButton1->setEnabled( true ); diff --git a/kandy/src/mobilegui.h b/kandy/src/mobilegui.h index b8bfeba26..ea5f2896d 100644 --- a/kandy/src/mobilegui.h +++ b/kandy/src/mobilegui.h @@ -61,7 +61,7 @@ class MobileGui : public MobileGui_base, virtual public KandyIface void readModelInformation(); void readPhonebook(); void savePhonebook(); - void refreshtqStatus(); + void refreshStatus(); void writePhonebook(); void readKabc(); void writeKabc(); diff --git a/kandy/src/mobilegui_base.ui b/kandy/src/mobilegui_base.ui index 62d399a1d..1d8857408 100644 --- a/kandy/src/mobilegui_base.ui +++ b/kandy/src/mobilegui_base.ui @@ -124,7 +124,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -207,7 +207,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -261,7 +261,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -342,7 +342,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>321</width> <height>20</height> @@ -385,7 +385,7 @@ </sizepolicy> </property> <property name="title"> - <string>tqStatus</string> + <string>Status</string> </property> <grid> <property name="name"> @@ -399,7 +399,7 @@ </property> <widget class="TQLabel" row="0" column="0"> <property name="name"> - <cstring>mtqStatus</cstring> + <cstring>mStatus</cstring> </property> <property name="text"> <string>Battery charge:</string> @@ -439,7 +439,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <height>20</height> </size> @@ -537,7 +537,7 @@ <sender>PushButton1</sender> <signal>clicked()</signal> <receiver>MobileGui_base</receiver> - <slot>refreshtqStatus()</slot> + <slot>refreshStatus()</slot> </connection> <connection> <sender>mConnectButton</sender> @@ -569,7 +569,7 @@ <slot>readKabc()</slot> <slot>readModelInformation()</slot> <slot>readPhonebook()</slot> - <slot>refreshtqStatus()</slot> + <slot>refreshStatus()</slot> <slot>savePhonebook()</slot> <slot>setClock()</slot> <slot>syncPhonebooks()</slot> diff --git a/karm/csvexportdialog_base.ui b/karm/csvexportdialog_base.ui index 906ba139b..1b06db1dd 100644 --- a/karm/csvexportdialog_base.ui +++ b/karm/csvexportdialog_base.ui @@ -29,7 +29,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>29</height> @@ -46,7 +46,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>160</width> <height>20</height> @@ -317,7 +317,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>32767</height> diff --git a/karm/edittaskdialog.cpp b/karm/edittaskdialog.cpp index 9b404d0af..bc2234867 100644 --- a/karm/edittaskdialog.cpp +++ b/karm/edittaskdialog.cpp @@ -87,7 +87,7 @@ EditTaskDialog::EditTaskDialog( TQString caption, bool editDlg, // Time _timeLA = new TQLabel( i18n("&Time:"), page, "time" ); lay3->addWidget( _timeLA, 0, 0 ); - _timeLA->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, + _timeLA->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, @@ -110,7 +110,7 @@ EditTaskDialog::EditTaskDialog( TQString caption, bool editDlg, _sessionTW = new KArmTimeWidget( page, "_sessionTW" ); lay3->addWidget( _sessionTW, 1, 1 ); _sessionLA->setBuddy( _sessionTW ); - _sessionLA->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, + _sessionLA->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, @@ -132,9 +132,9 @@ EditTaskDialog::EditTaskDialog( TQString caption, bool editDlg, lay4->addSpacing(20); _operator = new TQComboBox(page); - _operator->insertItem( TQString::tqfromLatin1( "+" ) ); - _operator->insertItem( TQString::tqfromLatin1( "-" ) ); - _operator->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, + _operator->insertItem( TQString::fromLatin1( "+" ) ); + _operator->insertItem( TQString::fromLatin1( "-" ) ); + _operator->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, diff --git a/karm/idletimedetector.cpp b/karm/idletimedetector.cpp index 38ae04d7a..c969bf149 100644 --- a/karm/idletimedetector.cpp +++ b/karm/idletimedetector.cpp @@ -67,7 +67,7 @@ void IdleTimeDetector::informOverrun(int idleSeconds) _timer->stop(); - TQDateTime idleStart = TQDateTime::tqcurrentDateTime().addSecs(-idleSeconds); + TQDateTime idleStart = TQDateTime::currentDateTime().addSecs(-idleSeconds); TQString idleStartTQString = KGlobal::locale()->formatTime(idleStart.time()); int id = TQMessageBox::warning( 0, i18n("Idle Detection"), @@ -76,13 +76,13 @@ void IdleTimeDetector::informOverrun(int idleSeconds) i18n("Revert && Stop"), i18n("Revert && Continue"), i18n("Continue Timing"),0,2); - TQDateTime end = TQDateTime::tqcurrentDateTime(); + TQDateTime end = TQDateTime::currentDateTime(); int diff = idleStart.secsTo(end)/secsPerMinute; if (id == 0) { // Revert And Stop - kdDebug(5970) << "Now it is " << TQDateTime::tqcurrentDateTime() << endl; + kdDebug(5970) << "Now it is " << TQDateTime::currentDateTime() << endl; kdDebug(5970) << "Reverting timer to " << KGlobal::locale()->formatTime(idleStart.time()).ascii() << endl; emit(extractTime(idleSeconds/60+diff)); // we need to subtract the time that has been added during idleness. emit(stopAllTimersAt(idleStart)); diff --git a/karm/karm_part.cpp b/karm/karm_part.cpp index db6204491..7a392ab41 100644 --- a/karm/karm_part.cpp +++ b/karm/karm_part.cpp @@ -134,12 +134,12 @@ void karmPart::makeMenus() actionCollection(), "reset_all_times"); actionStart = new KAction( i18n("&Start"), - TQString::tqfromLatin1("1rightarrow"), Key_S, + TQString::fromLatin1("1rightarrow"), Key_S, TQT_TQOBJECT(_taskView), TQT_SLOT( startCurrentTimer() ), actionCollection(), "start"); actionStop = new KAction( i18n("S&top"), - TQString::tqfromLatin1("stop"), 0, + TQString::fromLatin1("stop"), 0, TQT_TQOBJECT(_taskView), TQT_SLOT( stopCurrentTimer() ), actionCollection(), "stop"); @@ -151,55 +151,55 @@ void karmPart::makeMenus() actionStopAll->setEnabled(false); actionNew = new KAction( i18n("&New..."), - TQString::tqfromLatin1("filenew"), CTRL+Key_N, + TQString::fromLatin1("filenew"), CTRL+Key_N, TQT_TQOBJECT(_taskView), TQT_SLOT( newTask() ), actionCollection(), "new_task"); actionNewSub = new KAction( i18n("New &Subtask..."), - TQString::tqfromLatin1("kmultiple"), CTRL+ALT+Key_N, + TQString::fromLatin1("kmultiple"), CTRL+ALT+Key_N, TQT_TQOBJECT(_taskView), TQT_SLOT( newSubTask() ), actionCollection(), "new_sub_task"); actionDelete = new KAction( i18n("&Delete"), - TQString::tqfromLatin1("editdelete"), Key_Delete, + TQString::fromLatin1("editdelete"), Key_Delete, TQT_TQOBJECT(_taskView), TQT_SLOT( deleteTask() ), actionCollection(), "delete_task"); actionEdit = new KAction( i18n("&Edit..."), - TQString::tqfromLatin1("edit"), CTRL + Key_E, + TQString::fromLatin1("edit"), CTRL + Key_E, TQT_TQOBJECT(_taskView), TQT_SLOT( editTask() ), actionCollection(), "edit_task"); // actionAddComment = new KAction( i18n("&Add Comment..."), -// TQString::tqfromLatin1("document"), +// TQString::fromLatin1("document"), // CTRL+ALT+Key_E, // TQT_TQOBJECT(_taskView), // TQT_SLOT( addCommentToTask() ), // actionCollection(), // "add_comment_to_task"); actionMarkAsComplete = new KAction( i18n("&Mark as Complete"), - TQString::tqfromLatin1("document"), + TQString::fromLatin1("document"), CTRL+Key_M, TQT_TQOBJECT(_taskView), TQT_SLOT( markTaskAsComplete() ), actionCollection(), "mark_as_complete"); actionMarkAsIncomplete = new KAction( i18n("&Mark as Incomplete"), - TQString::tqfromLatin1("document"), + TQString::fromLatin1("document"), CTRL+Key_M, TQT_TQOBJECT(_taskView), TQT_SLOT( markTaskAsIncomplete() ), actionCollection(), "mark_as_incomplete"); actionClipTotals = new KAction( i18n("&Copy Totals to Clipboard"), - TQString::tqfromLatin1("klipper"), + TQString::fromLatin1("klipper"), CTRL+Key_C, TQT_TQOBJECT(_taskView), TQT_SLOT( clipTotals() ), actionCollection(), "clip_totals"); actionClipHistory = new KAction( i18n("Copy &History to Clipboard"), - TQString::tqfromLatin1("klipper"), + TQString::fromLatin1("klipper"), CTRL+ALT+Key_C, TQT_TQOBJECT(_taskView), TQT_SLOT( clipHistory() ), diff --git a/karm/karmstorage.cpp b/karm/karmstorage.cpp index 1e4f92a1f..aecee470d 100644 --- a/karm/karmstorage.cpp +++ b/karm/karmstorage.cpp @@ -135,7 +135,7 @@ TQString KarmStorage::load (TaskView* view, const Preferences* preferences, TQSt TQObject::connect (_calendar, TQT_SIGNAL(resourceChanged(ResourceCalendar *)), view, TQT_SLOT(iCalFileModified(ResourceCalendar *))); _calendar->setTimeZoneId( KPimPrefs::timezone() ); - _calendar->setResourceName( TQString::tqfromLatin1("KArm") ); + _calendar->setResourceName( TQString::fromLatin1("KArm") ); _calendar->open(); _calendar->load(); @@ -680,13 +680,13 @@ TQString KarmStorage::exportcsvFile( TaskView *taskview, else // use remote file { KTempFile tmpFile; - if ( tmpFile.status() != 0 ) err = TQString::tqfromLatin1( "Unable to get temporary file" ); + if ( tmpFile.status() != 0 ) err = TQString::fromLatin1( "Unable to get temporary file" ); else { TQTextStream *stream=tmpFile.textStream(); *stream << retval; tmpFile.close(); - if (!KIO::NetAccess::upload( tmpFile.name(), rc.url, 0 )) err=TQString::tqfromLatin1("Could not upload"); + if (!KIO::NetAccess::upload( tmpFile.name(), rc.url, 0 )) err=TQString::fromLatin1("Could not upload"); } } @@ -794,7 +794,7 @@ long KarmStorage::printTaskHistory ( TQString double_dquote = dquote + dquote; bool to_quote = true; - const TQString cr = TQString::tqfromLatin1("\n"); + const TQString cr = TQString::fromLatin1("\n"); TQString buf; TQString daytaskkey, daykey; TQDate day; @@ -807,14 +807,14 @@ long KarmStorage::printTaskHistory ( while (day <= to) { // write the time in seconds for the given task for the given day to s - daykey = day.toString(TQString::tqfromLatin1("yyyyMMdd")); - daytaskkey = TQString::tqfromLatin1("%1_%2") + daykey = day.toString(TQString::fromLatin1("yyyyMMdd")); + daytaskkey = TQString::fromLatin1("%1_%2") .tqarg(daykey) .tqarg(task->uid()); if (taskdaytotals.contains(daytaskkey)) { - cell.push_back(TQString::tqfromLatin1("%1") + cell.push_back(TQString::fromLatin1("%1") .tqarg(formatTime(taskdaytotals[daytaskkey]/60, rc.decimalMinutes))); sum += taskdaytotals[daytaskkey]; // in seconds @@ -829,7 +829,7 @@ long KarmStorage::printTaskHistory ( } // Total for task - cell.push_back(TQString::tqfromLatin1("%1").tqarg(formatTime(sum/60, rc.decimalMinutes))); + cell.push_back(TQString::fromLatin1("%1").tqarg(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::tqfromLatin1("%1").tqarg(formatTime((add+sum)/60, rc.decimalMinutes ))); + cell[colrectot]=(TQString::fromLatin1("%1").tqarg(formatTime((add+sum)/60, rc.decimalMinutes ))); for (unsigned int i=0; i < cell.size(); i++) matrix[ownline]+=cell[i]; return add+sum; } @@ -890,7 +890,7 @@ TQString KarmStorage::exportcsvHistory ( TaskView *taskview, const ReportCriteria &rc) { TQString delim = rc.delimiter; - const TQString cr = TQString::tqfromLatin1("\n"); + const TQString cr = TQString::fromLatin1("\n"); TQString err; // below taken from timekard.cpp @@ -910,7 +910,7 @@ TQString KarmStorage::exportcsvHistory ( TaskView *taskview, // parameter-plausi if ( from > to ) { - err = TQString::tqfromLatin1 ( + err = TQString::fromLatin1 ( "'to' has to be a date later than or equal to 'from'."); } @@ -921,7 +921,7 @@ TQString KarmStorage::exportcsvHistory ( TaskView *taskview, .tqarg(KGlobal::locale()->formatDate(to)); retval += cr; retval += i18n("Printed on: %1") - .tqarg(KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime())); + .tqarg(KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime())); retval += cr; day=from; @@ -936,8 +936,8 @@ TQString KarmStorage::exportcsvHistory ( TaskView *taskview, // so times are accumulated for each task. for (event = events.begin(); event != events.end(); ++event) { - daykey = (*event).start().date().toString(TQString::tqfromLatin1("yyyyMMdd")); - daytaskkey = TQString(TQString::tqfromLatin1("%1_%2")) + daykey = (*event).start().date().toString(TQString::fromLatin1("yyyyMMdd")); + daytaskkey = TQString(TQString::fromLatin1("%1_%2")) .tqarg(daykey) .tqarg((*event).todoUid()); @@ -953,7 +953,7 @@ TQString KarmStorage::exportcsvHistory ( TaskView *taskview, while ( dayheading <= to ) { // Use ISO 8601 format for date. - retval += dayheading.toString(TQString::tqfromLatin1("yyyy-MM-dd")); + retval += dayheading.toString(TQString::fromLatin1("yyyy-MM-dd")); retval += delim; dayheading=dayheading.addDays(1); } @@ -993,11 +993,11 @@ TQString KarmStorage::exportcsvHistory ( TaskView *taskview, day = from; while (day<=to) { - daykey = day.toString(TQString::tqfromLatin1("yyyyMMdd")); + daykey = day.toString(TQString::fromLatin1("yyyyMMdd")); if (daytotals.contains(daykey)) { - retval += TQString::tqfromLatin1("%1") + retval += TQString::fromLatin1("%1") .tqarg(formatTime(daytotals[daykey]/60, rc.decimalMinutes)); sum += daytotals[daykey]; // in seconds } @@ -1005,7 +1005,7 @@ TQString KarmStorage::exportcsvHistory ( TaskView *taskview, day = day.addDays(1); } - retval += TQString::tqfromLatin1("%1%2%3%4") + retval += TQString::fromLatin1("%1%2%3%4") .tqarg( formatTime( sum/60, rc.decimalMinutes ) ) .tqarg( delim ).tqarg( delim ) .tqarg( i18n( "Total" ) ); @@ -1036,14 +1036,14 @@ TQString KarmStorage::exportcsvHistory ( TaskView *taskview, KTempFile tmpFile; if ( tmpFile.status() != 0 ) { - err = TQString::tqfromLatin1( "Unable to get temporary file" ); + err = TQString::fromLatin1( "Unable to get temporary file" ); } else { TQTextStream *stream=tmpFile.textStream(); *stream << retval; tmpFile.close(); - if (!KIO::NetAccess::upload( tmpFile.name(), rc.url, 0 )) err=TQString::tqfromLatin1("Could not upload"); + if (!KIO::NetAccess::upload( tmpFile.name(), rc.url, 0 )) err=TQString::fromLatin1("Could not upload"); } } return err; diff --git a/karm/karmstorage.h b/karm/karmstorage.h index 573c55239..3f03ddffa 100644 --- a/karm/karmstorage.h +++ b/karm/karmstorage.h @@ -238,7 +238,7 @@ class KarmStorage * * @param task The task the timer was stopped for. */ - void stopTimer(const Task* task, TQDateTime when=TQDateTime::tqcurrentDateTime()); + void stopTimer(const Task* task, TQDateTime when=TQDateTime::currentDateTime()); /** * Log a new comment for this task. diff --git a/karm/ktimewidget.cpp b/karm/ktimewidget.cpp index 2eaf32b20..01d384168 100644 --- a/karm/ktimewidget.cpp +++ b/karm/ktimewidget.cpp @@ -74,7 +74,7 @@ KArmTimeWidget::KArmTimeWidget( TQWidget* parent, const char* name ) TimeValidator *validator = new TimeValidator( HOUR, _hourLE, "Validator for _hourLE"); _hourLE->setValidator( validator ); - _hourLE->tqsetAlignment( TQt::AlignRight ); + _hourLE->setAlignment( TQt::AlignRight ); TQLabel *hr = new TQLabel( i18n( "abbreviation for hours", " hr. " ), this ); @@ -89,7 +89,7 @@ KArmTimeWidget::KArmTimeWidget( TQWidget* parent, const char* name ) validator = new TimeValidator( MINUTE, _minuteLE, "Validator for _minuteLE"); _minuteLE->setValidator( validator ); _minuteLE->setMaxLength(2); - _minuteLE->tqsetAlignment( TQt::AlignRight ); + _minuteLE->setAlignment( TQt::AlignRight ); TQLabel *min = new TQLabel( i18n( "abbreviation for minutes", " min. " ), this ); tqlayout->addWidget( min ); @@ -111,7 +111,7 @@ void KArmTimeWidget::setTime( long minutes ) dummy.setNum( minutepart ); if (minutepart < 10 ) { - dummy = TQString::tqfromLatin1( "0" ) + dummy; + dummy = TQString::fromLatin1( "0" ) + dummy; } _minuteLE->setText( dummy ); } diff --git a/karm/mainwindow.cpp b/karm/mainwindow.cpp index 6d1ce29ea..8307dd1f7 100644 --- a/karm/mainwindow.cpp +++ b/karm/mainwindow.cpp @@ -272,12 +272,12 @@ void MainWindow::makeMenus() actionCollection(), "reset_all_times"); actionStart = new KAction( i18n("&Start"), - TQString::tqfromLatin1("1rightarrow"), Key_S, + TQString::fromLatin1("1rightarrow"), Key_S, TQT_TQOBJECT(_taskView), TQT_SLOT( startCurrentTimer() ), actionCollection(), "start"); actionStop = new KAction( i18n("S&top"), - TQString::tqfromLatin1("stop"), Key_S, + TQString::fromLatin1("stop"), Key_S, TQT_TQOBJECT(_taskView), TQT_SLOT( stopCurrentTimer() ), actionCollection(), "stop"); @@ -289,48 +289,48 @@ void MainWindow::makeMenus() actionStopAll->setEnabled(false); actionNew = new KAction( i18n("&New..."), - TQString::tqfromLatin1("filenew"), CTRL+Key_N, + TQString::fromLatin1("filenew"), CTRL+Key_N, TQT_TQOBJECT(_taskView), TQT_SLOT( newTask() ), actionCollection(), "new_task"); actionNewSub = new KAction( i18n("New &Subtask..."), - TQString::tqfromLatin1("kmultiple"), CTRL+ALT+Key_N, + TQString::fromLatin1("kmultiple"), CTRL+ALT+Key_N, TQT_TQOBJECT(_taskView), TQT_SLOT( newSubTask() ), actionCollection(), "new_sub_task"); actionDelete = new KAction( i18n("&Delete"), - TQString::tqfromLatin1("editdelete"), Key_Delete, + TQString::fromLatin1("editdelete"), Key_Delete, TQT_TQOBJECT(_taskView), TQT_SLOT( deleteTask() ), actionCollection(), "delete_task"); actionEdit = new KAction( i18n("&Edit..."), - TQString::tqfromLatin1("edit"), CTRL + Key_E, + TQString::fromLatin1("edit"), CTRL + Key_E, TQT_TQOBJECT(_taskView), TQT_SLOT( editTask() ), actionCollection(), "edit_task"); // actionAddComment = new KAction( i18n("&Add Comment..."), -// TQString::tqfromLatin1("document"), +// TQString::fromLatin1("document"), // CTRL+ALT+Key_E, // TQT_TQOBJECT(_taskView), // TQT_SLOT( addCommentToTask() ), // actionCollection(), // "add_comment_to_task"); actionMarkAsComplete = new KAction( i18n("&Mark as Complete"), - TQString::tqfromLatin1("document"), + TQString::fromLatin1("document"), CTRL+Key_M, TQT_TQOBJECT(_taskView), TQT_SLOT( markTaskAsComplete() ), actionCollection(), "mark_as_complete"); actionMarkAsIncomplete = new KAction( i18n("&Mark as Incomplete"), - TQString::tqfromLatin1("document"), + TQString::fromLatin1("document"), CTRL+Key_M, TQT_TQOBJECT(_taskView), TQT_SLOT( markTaskAsIncomplete() ), actionCollection(), "mark_as_incomplete"); actionClipTotals = new KAction( i18n("&Copy Totals to Clipboard"), - TQString::tqfromLatin1("klipper"), + TQString::fromLatin1("klipper"), CTRL+Key_C, TQT_TQOBJECT(_taskView), TQT_SLOT( clipTotals() ), @@ -338,14 +338,14 @@ void MainWindow::makeMenus() "clip_totals"); // actionClipTotals will never be used again, overwrite it actionClipTotals = new KAction( i18n("&Copy Session Time to Clipboard"), - TQString::tqfromLatin1("klipper"), + TQString::fromLatin1("klipper"), 0, TQT_TQOBJECT(_taskView), TQT_SLOT( clipSession() ), actionCollection(), "clip_session"); actionClipHistory = new KAction( i18n("Copy &History to Clipboard"), - TQString::tqfromLatin1("klipper"), + TQString::fromLatin1("klipper"), CTRL+ALT+Key_C, TQT_TQOBJECT(_taskView), TQT_SLOT( clipHistory() ), @@ -372,7 +372,7 @@ void MainWindow::makeMenus() "import_korg_events"); */ - setXMLFile( TQString::tqfromLatin1("karmui.rc") ); + setXMLFile( TQString::fromLatin1("karmui.rc") ); createGUI( 0 ); // Tool tips must be set after the createGUI. @@ -442,11 +442,11 @@ void MainWindow::loadGeometry() { KConfig &config = *kapp->config(); - config.setGroup( TQString::tqfromLatin1("Main Window Geometry") ); - int w = config.readNumEntry( TQString::tqfromLatin1("Width"), 100 ); - int h = config.readNumEntry( TQString::tqfromLatin1("Height"), 100 ); - w = TQMAX( w, tqsizeHint().width() ); - h = TQMAX( h, tqsizeHint().height() ); + config.setGroup( TQString::fromLatin1("Main Window Geometry") ); + int w = config.readNumEntry( TQString::fromLatin1("Width"), 100 ); + int h = config.readNumEntry( TQString::fromLatin1("Height"), 100 ); + w = TQMAX( w, sizeHint().width() ); + h = TQMAX( h, sizeHint().height() ); resize(w, h); } } @@ -455,9 +455,9 @@ void MainWindow::loadGeometry() void MainWindow::saveGeometry() { KConfig &config = *KGlobal::config(); - config.setGroup( TQString::tqfromLatin1("Main Window Geometry")); - config.writeEntry( TQString::tqfromLatin1("Width"), width()); - config.writeEntry( TQString::tqfromLatin1("Height"), height()); + config.setGroup( TQString::fromLatin1("Main Window Geometry")); + config.writeEntry( TQString::fromLatin1("Width"), width()); + config.writeEntry( TQString::fromLatin1("Height"), height()); config.sync(); } diff --git a/karm/plannerparser.cpp b/karm/plannerparser.cpp index 7ac13a5e3..67f7bd53f 100644 --- a/karm/plannerparser.cpp +++ b/karm/plannerparser.cpp @@ -55,15 +55,15 @@ test cases: int taskComplete=0; // only <task>s within <tasks> are processed - if (qName == TQString::tqfromLatin1("tasks")) withInTasks=true; - if ((qName == TQString::tqfromLatin1("task")) && (withInTasks)) + if (qName == TQString::fromLatin1("tasks")) withInTasks=true; + if ((qName == TQString::fromLatin1("task")) && (withInTasks)) { // find out name and percent-complete for (int i=0; i<att.length(); i++) { - if (att.qName(i) == TQString::tqfromLatin1("name")) taskName=att.value(i); - if (att.qName(i)==TQString::tqfromLatin1("percent-complete")) taskComplete=att.value(i).toInt(); + if (att.qName(i) == TQString::fromLatin1("name")) taskName=att.value(i); + if (att.qName(i)==TQString::fromLatin1("percent-complete")) taskComplete=att.value(i).toInt(); } // at the moment, task is still the old task or the old father task (if an endElement occurred) or not existing (if the diff --git a/karm/preferences.cpp b/karm/preferences.cpp index 24a5e8c41..e187599fa 100644 --- a/karm/preferences.cpp +++ b/karm/preferences.cpp @@ -121,7 +121,7 @@ void Preferences::makeStoragePage() // iCalendar TQLabel* _iCalFileLabel = new TQLabel( i18n("iCalendar file:"), storagePage); _iCalFileW = new KURLRequester(storagePage, "_iCalFileW"); - _iCalFileW->setFilter(TQString::tqfromLatin1("*.ics")); + _iCalFileW->setFilter(TQString::fromLatin1("*.ics")); _iCalFileW->setMode(KFile::File); // Log time? @@ -253,32 +253,32 @@ void Preferences::load() { KConfig &config = *kapp->config(); - config.setGroup( TQString::tqfromLatin1("Idle detection") ); - _doIdleDetectionV = config.readBoolEntry( TQString::tqfromLatin1("enabled"), + config.setGroup( TQString::fromLatin1("Idle detection") ); + _doIdleDetectionV = config.readBoolEntry( TQString::fromLatin1("enabled"), true ); - _idleDetectValueV = config.readNumEntry(TQString::tqfromLatin1("period"), 15); + _idleDetectValueV = config.readNumEntry(TQString::fromLatin1("period"), 15); - config.setGroup( TQString::tqfromLatin1("Saving") ); + config.setGroup( TQString::fromLatin1("Saving") ); _iCalFileV = config.readPathEntry - ( TQString::tqfromLatin1("ical file"), - locateLocal( "appdata", TQString::tqfromLatin1( "karm.ics"))); + ( TQString::fromLatin1("ical file"), + locateLocal( "appdata", TQString::fromLatin1( "karm.ics"))); _doAutoSaveV = config.readBoolEntry - ( TQString::tqfromLatin1("auto save"), true); + ( TQString::fromLatin1("auto save"), true); _autoSaveValueV = config.readNumEntry - ( TQString::tqfromLatin1("auto save period"), 5); + ( TQString::fromLatin1("auto save period"), 5); _promptDeleteV = config.readBoolEntry - ( TQString::tqfromLatin1("prompt delete"), true); + ( TQString::fromLatin1("prompt delete"), true); _loggingV = config.readBoolEntry - ( TQString::tqfromLatin1("logging"), true); + ( TQString::fromLatin1("logging"), true); _displayColumnV[0] = config.readBoolEntry - ( TQString::tqfromLatin1("display session time"), true); + ( TQString::fromLatin1("display session time"), true); _displayColumnV[1] = config.readBoolEntry - ( TQString::tqfromLatin1("display time"), true); + ( TQString::fromLatin1("display time"), true); _displayColumnV[2] = config.readBoolEntry - ( TQString::tqfromLatin1("display total session time"), true); + ( TQString::fromLatin1("display total session time"), true); _displayColumnV[3] = config.readBoolEntry - ( TQString::tqfromLatin1("display total time"), true); + ( TQString::fromLatin1("display total time"), true); KEMailSettings settings; _userRealName = settings.getSetting( KEMailSettings::RealName ); @@ -288,24 +288,24 @@ void Preferences::save() { KConfig &config = *KGlobal::config(); - config.setGroup( TQString::tqfromLatin1("Idle detection")); - config.writeEntry( TQString::tqfromLatin1("enabled"), _doIdleDetectionV); - config.writeEntry( TQString::tqfromLatin1("period"), _idleDetectValueV); + config.setGroup( TQString::fromLatin1("Idle detection")); + config.writeEntry( TQString::fromLatin1("enabled"), _doIdleDetectionV); + config.writeEntry( TQString::fromLatin1("period"), _idleDetectValueV); - config.setGroup( TQString::tqfromLatin1("Saving")); - config.writePathEntry( TQString::tqfromLatin1("ical file"), _iCalFileV); - config.writeEntry( TQString::tqfromLatin1("auto save"), _doAutoSaveV); - config.writeEntry( TQString::tqfromLatin1("logging"), _loggingV); - config.writeEntry( TQString::tqfromLatin1("auto save period"), _autoSaveValueV); - config.writeEntry( TQString::tqfromLatin1("prompt delete"), _promptDeleteV); + config.setGroup( TQString::fromLatin1("Saving")); + config.writePathEntry( TQString::fromLatin1("ical file"), _iCalFileV); + config.writeEntry( TQString::fromLatin1("auto save"), _doAutoSaveV); + config.writeEntry( TQString::fromLatin1("logging"), _loggingV); + config.writeEntry( TQString::fromLatin1("auto save period"), _autoSaveValueV); + config.writeEntry( TQString::fromLatin1("prompt delete"), _promptDeleteV); - config.writeEntry( TQString::tqfromLatin1("display session time"), + config.writeEntry( TQString::fromLatin1("display session time"), _displayColumnV[0]); - config.writeEntry( TQString::tqfromLatin1("display time"), + config.writeEntry( TQString::fromLatin1("display time"), _displayColumnV[1]); - config.writeEntry( TQString::tqfromLatin1("display total session time"), + config.writeEntry( TQString::fromLatin1("display total session time"), _displayColumnV[2]); - config.writeEntry( TQString::tqfromLatin1("display total time"), + config.writeEntry( TQString::fromLatin1("display total time"), _displayColumnV[3]); config.sync(); diff --git a/karm/print.cpp b/karm/print.cpp index d045a6658..df8aabf54 100644 --- a/karm/print.cpp +++ b/karm/print.cpp @@ -75,7 +75,7 @@ void MyPrinter::print() painter.setFont(newFont); int height = metrics.height(); - TQString now = KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime()); + TQString now = KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime()); painter.drawText(xMargin, yoff, pageWidth, height, TQPainter::AlignCenter, diff --git a/karm/printdialog.cpp b/karm/printdialog.cpp index 197875491..0813ca345 100644 --- a/karm/printdialog.cpp +++ b/karm/printdialog.cpp @@ -64,8 +64,8 @@ PrintDialog::PrintDialog() _from = new KDateEdit(rangeWidget); // Default from date to beginning of the month - year = TQDate::tqcurrentDate().year(); - month = TQDate::tqcurrentDate().month(); + year = TQDate::currentDate().year(); + month = TQDate::currentDate().month(); _from->setDate(TQDate(year, month, 1)); rangeLayout->addWidget(_from); rangeLayout->addWidget(new TQLabel(i18n("To:"), rangeWidget)); diff --git a/karm/task.cpp b/karm/task.cpp index 03eb1d3b2..0750c7200 100644 --- a/karm/task.cpp +++ b/karm/task.cpp @@ -75,13 +75,13 @@ void Task::init( const TQString& taskName, long minutes, long sessionTime, _removing = false; _name = taskName.stripWhiteSpace(); - _lastStart = TQDateTime::tqcurrentDateTime(); + _lastStart = TQDateTime::currentDateTime(); _totalTime = _time = minutes; _totalSessionTime = _sessionTime = sessionTime; _timer = new TQTimer(this); _desktops = desktops; connect(_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateActiveIcon())); - setPixmap(1, UserIcon(TQString::tqfromLatin1("empty-watch.xpm"))); + setPixmap(1, UserIcon(TQString::fromLatin1("empty-watch.xpm"))); _currentPic = 0; _percentcomplete = percent_complete; @@ -119,7 +119,7 @@ void Task::setRunning( bool on, KarmStorage* storage, TQDateTime whenStarted, TQ if ( ! _removing ) { storage->stopTimer(this, whenStopped); - setPixmap(1, UserIcon(TQString::tqfromLatin1("empty-watch.xpm"))); + setPixmap(1, UserIcon(TQString::fromLatin1("empty-watch.xpm"))); } } } @@ -290,7 +290,7 @@ TQString Task::fullName() const if (isRoot()) return name(); else - return parent()->fullName() + TQString::tqfromLatin1("/") + name(); + return parent()->fullName() + TQString::fromLatin1("/") + name(); } KCal::Todo* Task::asTodo(KCal::Todo* todo) const @@ -349,7 +349,7 @@ bool Task::parseIncidence( KCal::Incidence* incident, long& minutes, TQString desktopList = incident->customProperty( kapp->instanceName(), TQCString( "desktopList" ) ); - TQStringList desktopStrList = TQStringList::split( TQString::tqfromLatin1(","), + TQStringList desktopStrList = TQStringList::split( TQString::fromLatin1(","), desktopList ); desktops.clear(); @@ -380,7 +380,7 @@ TQString Task::getDesktopStr() const for ( DesktopList::const_iterator iter = _desktops.begin(); iter != _desktops.end(); ++iter ) { - desktopstr += TQString::number( *iter ) + TQString::tqfromLatin1( "," ); + desktopstr += TQString::number( *iter ) + TQString::fromLatin1( "," ); } desktopstr.remove( desktopstr.length() - 1, 1 ); return desktopstr; @@ -419,7 +419,7 @@ void Task::update() void Task::addComment( TQString comment, KarmStorage* storage ) { - _comment = _comment + TQString::tqfromLatin1("\n") + comment; + _comment = _comment + TQString::fromLatin1("\n") + comment; storage->addComment(this, comment); } diff --git a/karm/task.h b/karm/task.h index 53c7abcc9..165d60a8c 100644 --- a/karm/task.h +++ b/karm/task.h @@ -178,11 +178,11 @@ class Task : public TQObject, public TQListViewItem * @param on true or false for starting or stopping a task * @param storage a pointer to a KarmStorage object. * @param whenStarted time when the task was started. Normally - TQDateTime::tqcurrentDateTime, but if calendar has + TQDateTime::currentDateTime, but if calendar has been changed by another program and being reloaded the task is set to running with another start date */ - void setRunning( bool on, KarmStorage* storage, TQDateTime whenStarted=TQDateTime::tqcurrentDateTime(), TQDateTime whenStopped=TQDateTime::tqcurrentDateTime()); + void setRunning( bool on, KarmStorage* storage, TQDateTime whenStarted=TQDateTime::currentDateTime(), TQDateTime whenStopped=TQDateTime::currentDateTime()); /** return the state of a task - if it's running or not * @return true or false depending on whether the task is running diff --git a/karm/taskview.h b/karm/taskview.h index f1b22048f..988ad154d 100644 --- a/karm/taskview.h +++ b/karm/taskview.h @@ -173,7 +173,7 @@ class TaskView : public KListView * @param task task to start timer of * @param startTime if taskview has been modified by another program, we have to set the starting time to not-now. */ - void startTimerFor( Task* task, TQDateTime startTime = TQDateTime::tqcurrentDateTime() ); + void startTimerFor( Task* task, TQDateTime startTime = TQDateTime::currentDateTime() ); void stopTimerFor( Task* task ); /** clears all active tasks. Needed e.g. if iCal file was modified by diff --git a/karm/test/lockerthread.cpp b/karm/test/lockerthread.cpp index aeff6cc76..914682210 100644 --- a/karm/test/lockerthread.cpp +++ b/karm/test/lockerthread.cpp @@ -26,7 +26,7 @@ void LockerThread::run() KCal::ResourceCalendar *calendar = 0; KCal::CalendarResources::Ticket *lock = 0; - calendars = new KCal::CalendarResources( TQString::tqfromLatin1( "UTC" ) ); + calendars = new KCal::CalendarResources( TQString::fromLatin1( "UTC" ) ); calendar = new KCal::ResourceLocal( m_icsfile ); lock = calendars->requestSaveTicket( calendar ); if ( lock ) diff --git a/karm/test/locking.cpp b/karm/test/locking.cpp index cdf5e41a5..71113f79b 100644 --- a/karm/test/locking.cpp +++ b/karm/test/locking.cpp @@ -23,7 +23,7 @@ short test1() KCal::ResourceCalendar *calendar = 0; KCal::CalendarResources::Ticket *lock = 0; - calendars = new KCal::CalendarResources( TQString::tqfromLatin1( "UTC" ) ); + calendars = new KCal::CalendarResources( TQString::fromLatin1( "UTC" ) ); calendar = new KCal::ResourceLocal( icalfilename ); lock = calendars->requestSaveTicket( calendar ); @@ -62,7 +62,7 @@ short test2() KCal::ResourceCalendar *calendar = 0; KCal::CalendarResources::Ticket *lock = 0; - calendars = new KCal::CalendarResources( TQString::tqfromLatin1( "UTC" ) ); + calendars = new KCal::CalendarResources( TQString::fromLatin1( "UTC" ) ); calendar = new KCal::ResourceLocal( icalfilename ); LockerThread thread( icalfilename ); @@ -88,7 +88,7 @@ short test3() KCal::ResourceCalendar *calendar = 0; KCal::CalendarResources::Ticket *lock = 0; - calendars = new KCal::CalendarResources( TQString::tqfromLatin1( "UTC" ) ); + calendars = new KCal::CalendarResources( TQString::fromLatin1( "UTC" ) ); calendar = new KCal::ResourceLocal( icalfilename ); // lock then unlock diff --git a/karm/test/script.cpp b/karm/test/script.cpp index 58e5af3bc..816314368 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->exitqStatus(); + m_status = m_proc->exiStatus(); delete m_proc; m_proc = 0; } diff --git a/karm/timekard.cpp b/karm/timekard.cpp index d9b8d4a76..6ac410a26 100644 --- a/karm/timekard.cpp +++ b/karm/timekard.cpp @@ -43,7 +43,7 @@ const int timeWidth = 6; const int totalTimeWidth = 7; const int reportWidth = taskWidth + timeWidth; -const TQString cr = TQString::tqfromLatin1("\n"); +const TQString cr = TQString::fromLatin1("\n"); TQString TimeKard::totalsAsText(TaskView* taskview, bool justThisTask, WhichTime which) // Print the total Times as text. If justThisTask, use activeTask, else, all tasks @@ -59,9 +59,9 @@ TQString TimeKard::totalsAsText(TaskView* taskview, bool justThisTask, WhichTime // header retval += i18n("Task Totals") + cr; - retval += KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime()); + retval += KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime()); retval += cr + cr; - retval += TQString(TQString::tqfromLatin1("%1 %2")) + retval += TQString(TQString::fromLatin1("%1 %2")) .tqarg(i18n("Time"), timeWidth) .tqarg(i18n("Task")); retval += cr; @@ -92,8 +92,8 @@ TQString TimeKard::totalsAsText(TaskView* taskview, bool justThisTask, WhichTime // total buf.fill('-', reportWidth); - retval += TQString(TQString::tqfromLatin1("%1")).tqarg(buf, timeWidth) + cr; - retval += TQString(TQString::tqfromLatin1("%1 %2")) + retval += TQString(TQString::fromLatin1("%1")).tqarg(buf, timeWidth) + cr; + retval += TQString(TQString::fromLatin1("%1 %2")) .tqarg(formatTime(sum),timeWidth) .tqarg(i18n("Total")); } @@ -109,7 +109,7 @@ void TimeKard::printTask(Task *task, TQString &s, int level, WhichTime which) TQString buf; s += buf.fill(' ', level); - s += TQString(TQString::tqfromLatin1("%1 %2")) + s += TQString(TQString::fromLatin1("%1 %2")) .tqarg(formatTime(which == TotalTime?task->totalTime():task->totalSessionTime()), timeWidth) .tqarg(task->name()); s += cr; @@ -134,8 +134,8 @@ void TimeKard::printTaskHistory(const Task *task, long sectionsum = 0; for ( TQDate day = from; day <= to; day = day.addDays(1) ) { - TQString daykey = day.toString(TQString::tqfromLatin1("yyyyMMdd")); - TQString daytaskkey = TQString::tqfromLatin1("%1_%2") + TQString daykey = day.toString(TQString::fromLatin1("yyyyMMdd")); + TQString daytaskkey = TQString::fromLatin1("%1_%2") .tqarg(daykey) .tqarg(task->uid()); @@ -143,7 +143,7 @@ void TimeKard::printTaskHistory(const Task *task, { if ( !totalsOnly ) { - s += TQString::tqfromLatin1("%1") + s += TQString::fromLatin1("%1") .tqarg(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::tqfromLatin1("%1").tqarg(formatTime(sectionsum/60), totalTimeWidth); + s += TQString::fromLatin1("%1").tqarg(formatTime(sectionsum/60), totalTimeWidth); // Task name TQString buf; s += buf.fill(' ', level + 1); - s += TQString::tqfromLatin1("%1").tqarg(task->name()); + s += TQString::fromLatin1("%1").tqarg(task->name()); s += cr; for (Task* subTask = task->firstChild(); @@ -221,8 +221,8 @@ TQString TimeKard::sectionHistoryAsText( // so times are accumulated for each task. for (TQValueList<HistoryEvent>::iterator event = events.begin(); event != events.end(); ++event) { - TQString daykey = (*event).start().date().toString(TQString::tqfromLatin1("yyyyMMdd")); - TQString daytaskkey = TQString::tqfromLatin1("%1_%2") + TQString daykey = (*event).start().date().toString(TQString::fromLatin1("yyyyMMdd")); + TQString daytaskkey = TQString::fromLatin1("%1_%2") .tqarg(daykey) .tqarg((*event).todoUid()); @@ -246,7 +246,7 @@ TQString TimeKard::sectionHistoryAsText( // day headings for (TQDate day = sectionFrom; day <= sectionTo; day = day.addDays(1)) { - retval += TQString::tqfromLatin1("%1").tqarg(day.day(), timeWidth); + retval += TQString::fromLatin1("%1").tqarg(day.day(), timeWidth); } retval += cr; retval += line; @@ -280,13 +280,13 @@ TQString TimeKard::sectionHistoryAsText( long sum = 0; for (TQDate day = sectionFrom; day <= sectionTo; day = day.addDays(1)) { - TQString daykey = day.toString(TQString::tqfromLatin1("yyyyMMdd")); + TQString daykey = day.toString(TQString::fromLatin1("yyyyMMdd")); if (daytotals.contains(daykey)) { if ( !totalsOnly ) { - retval += TQString::tqfromLatin1("%1") + retval += TQString::fromLatin1("%1") .tqarg(formatTime(daytotals[daykey]/60), timeWidth); } sum += daytotals[daykey]; // in seconds @@ -298,7 +298,7 @@ TQString TimeKard::sectionHistoryAsText( } } - retval += TQString::tqfromLatin1("%1 %2") + retval += TQString::fromLatin1("%1 %2") .tqarg(formatTime(sum/60), totalTimeWidth) .tqarg(i18n("Total")); } @@ -317,7 +317,7 @@ TQString TimeKard::historyAsText(TaskView* taskview, const TQDate& from, .tqarg(KGlobal::locale()->formatDate(to)); retval += cr; retval += i18n("Printed on: %1") - .tqarg(KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime())); + .tqarg(KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime())); if ( perWeek ) { diff --git a/kdgantt/KDGanttMinimizeSplitter.cpp b/kdgantt/KDGanttMinimizeSplitter.cpp index f11832f37..09f0b8528 100644 --- a/kdgantt/KDGanttMinimizeSplitter.cpp +++ b/kdgantt/KDGanttMinimizeSplitter.cpp @@ -64,7 +64,7 @@ KDGanttSplitterHandle::KDGanttSplitterHandle( Qt::Orientation o, setMouseTracking( true ); } -TQSize KDGanttSplitterHandle::tqsizeHint() const +TQSize KDGanttSplitterHandle::sizeHint() const { return TQSize(8,8); } @@ -238,16 +238,16 @@ void KDGanttSplitterHandle::paintEvent( TQPaintEvent * ) TQPainter p( &buffer ); // Draw the splitter rectangle - p.setBrush( tqcolorGroup().background() ); - p.setPen( tqcolorGroup().foreground() ); + p.setBrush( colorGroup().background() ); + p.setPen( colorGroup().foreground() ); p.drawRect( rect() ); parentWidget()->tqstyle().tqdrawPrimitive( TQStyle::PE_Panel, &p, rect(), - parentWidget()->tqcolorGroup()); + parentWidget()->colorGroup()); int sw = 8; // Hardcoded, given I didn't use styles anymore, I didn't like to use their size // arrow color - TQColor col = tqcolorGroup().background().dark( 200 ); + TQColor col = colorGroup().background().dark( 200 ); p.setBrush( col ); p.setPen( col ); @@ -256,13 +256,13 @@ void KDGanttSplitterHandle::paintEvent( TQPaintEvent * ) for ( TQValueList<TQPointArray>::Iterator it = list.begin(); it != list.end(); ++it ) { if ( index == _activeButton ) { p.save(); - p.translate( parentWidget()->tqstyle().tqpixelMetric( TQStyle::PM_ButtonShiftHorizontal ), - parentWidget()->tqstyle().tqpixelMetric( TQStyle::PM_ButtonShiftVertical ) ); - p.tqdrawPolygon( *it, true ); + p.translate( parentWidget()->tqstyle().pixelMetric( TQStyle::PM_ButtonShiftHorizontal ), + parentWidget()->tqstyle().pixelMetric( TQStyle::PM_ButtonShiftVertical ) ); + p.drawPolygon( *it, true ); p.restore(); } else { - p.tqdrawPolygon( *it, true ); + p.drawPolygon( *it, true ); } index++; } @@ -364,10 +364,10 @@ static TQSize minSize( const TQWidget* /*w*/ ) // This is the original version of minSize static TQSize minSizeHint( const TQWidget* w ) { - TQSize min = w->tqminimumSize(); + TQSize min = w->minimumSize(); TQSize s; if ( min.height() <= 0 || min.width() <= 0 ) - s = w->tqminimumSizeHint(); + s = w->minimumSizeHint(); if ( min.height() > 0 ) s.setHeight( min.height() ); if ( min.width() > 0 ) @@ -413,9 +413,9 @@ void KDGanttMinimizeSplitter::init() { data = new TQSplitterData; if ( orient == Qt::Horizontal ) - tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Minimum) ); + setSizePolicy( TQSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Minimum) ); else - tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Expanding) ); + setSizePolicy( TQSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Expanding) ); } @@ -433,9 +433,9 @@ void KDGanttMinimizeSplitter::setOrientation( Qt::Orientation o ) orient = o; if ( orient == Qt::Horizontal ) - tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ) ); + setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ) ); else - tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ) ); + setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ) ); TQSplitterLayoutStruct *s = data->list.first(); while ( s ) { @@ -478,7 +478,7 @@ TQSplitterLayoutStruct *KDGanttMinimizeSplitter::addWidget( TQWidget *w, bool fi s->wid = newHandle; newHandle->setId(data->list.count()); s->isSplitter = TRUE; - s->sizer = pick( newHandle->tqsizeHint() ); + s->sizer = pick( newHandle->sizeHint() ); if ( first ) data->list.insert( 0, s ); else @@ -487,8 +487,8 @@ TQSplitterLayoutStruct *KDGanttMinimizeSplitter::addWidget( TQWidget *w, bool fi s = new TQSplitterLayoutStruct; s->mode = Stretch; s->wid = w; - if ( !testWState( WState_Resized ) && w->tqsizeHint().isValid() ) - s->sizer = pick( w->tqsizeHint() ); + if ( !testWState( WState_Resized ) && w->sizeHint().isValid() ) + s->sizer = pick( w->sizeHint() ); else s->sizer = pick( w->size() ); s->isSplitter = FALSE; @@ -561,7 +561,7 @@ void KDGanttMinimizeSplitter::setRubberband( int p ) paint.setRasterOp( XorROP ); TQRect r = contentsRect(); const int rBord = 3; //Themable???? - int sw = tqstyle().tqpixelMetric(TQStyle::PM_SplitterWidth, this); + int sw = tqstyle().pixelMetric(TQStyle::PM_SplitterWidth, this); if ( orient == Qt::Horizontal ) { if ( opaqueOldPos >= 0 ) paint.drawRect( opaqueOldPos + sw/2 - rBord , r.y(), @@ -601,7 +601,7 @@ bool KDGanttMinimizeSplitter::event( TQEvent *e ) void KDGanttMinimizeSplitter::drawSplitter( TQPainter *p, TQCOORD x, TQCOORD y, TQCOORD w, TQCOORD h ) { - tqstyle().tqdrawPrimitive(TQStyle::PE_Splitter, p, TQRect(x, y, w, h), tqcolorGroup(), + tqstyle().tqdrawPrimitive(TQStyle::PE_Splitter, p, TQRect(x, y, w, h), colorGroup(), (orientation() == Qt::Horizontal ? TQStyle::Style_Horizontal : 0)); } @@ -706,12 +706,12 @@ void KDGanttMinimizeSplitter::moveBefore( int pos, int id, bool upLeft ) int dd, newLeft, nextPos; if( TQApplication::reverseLayout() && orient == Qt::Horizontal ) { dd = w->tqgeometry().right() - pos; - dd = TQMAX( pick(minSize(w)), TQMIN(dd, pick(w->tqmaximumSize()))); + dd = TQMAX( pick(minSize(w)), TQMIN(dd, pick(w->maximumSize()))); newLeft = pos+1; nextPos = newLeft + dd; } else { dd = pos - pick( w->pos() ) + 1; - dd = TQMAX( pick(minSize(w)), TQMIN(dd, pick(w->tqmaximumSize()))); + dd = TQMAX( pick(minSize(w)), TQMIN(dd, pick(w->maximumSize()))); newLeft = pos-dd+1; nextPos = newLeft - 1; } @@ -760,13 +760,13 @@ void KDGanttMinimizeSplitter::moveAfter( int pos, int id, bool upLeft ) int right, dd,/* newRight,*/ newLeft, nextPos; if ( TQApplication::reverseLayout() && orient == Qt::Horizontal ) { dd = pos - left + 1; - dd = TQMAX( pick(minSize(w)), TQMIN(dd, pick(w->tqmaximumSize()))); + dd = TQMAX( pick(minSize(w)), TQMIN(dd, pick(w->maximumSize()))); newLeft = pos-dd+1; nextPos = newLeft - 1; } else { right = pick( w->tqgeometry().bottomRight() ); dd = right - pos + 1; - dd = TQMAX( pick(minSize(w)), TQMIN(dd, pick(w->tqmaximumSize()))); + dd = TQMAX( pick(minSize(w)), TQMIN(dd, pick(w->maximumSize()))); /*newRight = pos+dd-1;*/ newLeft = pos; nextPos = newLeft + dd; @@ -820,7 +820,7 @@ void KDGanttMinimizeSplitter::getRange( int id, int *min, int *max ) maxB += s->sizer; } else { minB += pick( minSize(s->wid) ); - maxB += pick( s->wid->tqmaximumSize() ); + maxB += pick( s->wid->maximumSize() ); } } for ( i = id; i < n; i++ ) { @@ -832,12 +832,12 @@ void KDGanttMinimizeSplitter::getRange( int id, int *min, int *max ) maxA += s->sizer; } else { minA += pick( minSize(s->wid) ); - maxA += pick( s->wid->tqmaximumSize() ); + maxA += pick( s->wid->maximumSize() ); } } TQRect r = contentsRect(); if ( orient == Qt::Horizontal && TQApplication::reverseLayout() ) { - int splitterWidth = tqstyle().tqpixelMetric(TQStyle::PM_SplitterWidth, this); + int splitterWidth = tqstyle().pixelMetric(TQStyle::PM_SplitterWidth, this); if ( min ) *min = pick(r.topRight()) - TQMIN( maxB, pick(r.size())-minA ) - splitterWidth; if ( max ) @@ -879,27 +879,27 @@ void KDGanttMinimizeSplitter::doResize() TQSplitterLayoutStruct *s = data->list.at(i); if ( s->wid->isHidden() ) { a[i].stretch = 0; - a[i].tqsizeHint = a[i].tqminimumSize = 0; - a[i].tqmaximumSize = 0; + a[i].sizeHint = a[i].minimumSize = 0; + a[i].maximumSize = 0; } else if ( s->isSplitter ) { a[i].stretch = 0; - a[i].tqsizeHint = a[i].tqminimumSize = a[i].tqmaximumSize = s->sizer; + a[i].sizeHint = a[i].minimumSize = a[i].maximumSize = s->sizer; a[i].empty = FALSE; } else if ( s->mode == KeepSize ) { a[i].stretch = 0; - a[i].tqminimumSize = pick( minSize(s->wid) ); - a[i].tqsizeHint = s->sizer; - a[i].tqmaximumSize = pick( s->wid->tqmaximumSize() ); + a[i].minimumSize = pick( minSize(s->wid) ); + a[i].sizeHint = s->sizer; + a[i].maximumSize = pick( s->wid->maximumSize() ); a[i].empty = FALSE; } else if ( s->mode == FollowSizeHint ) { a[i].stretch = 0; - a[i].tqminimumSize = a[i].tqsizeHint = pick( s->wid->tqsizeHint() ); - a[i].tqmaximumSize = pick( s->wid->tqmaximumSize() ); + a[i].minimumSize = a[i].sizeHint = pick( s->wid->sizeHint() ); + a[i].maximumSize = pick( s->wid->maximumSize() ); a[i].empty = FALSE; } else { //proportional a[i].stretch = s->sizer; - a[i].tqmaximumSize = pick( s->wid->tqmaximumSize() ); - a[i].tqsizeHint = a[i].tqminimumSize = pick( minSize(s->wid) ); + a[i].maximumSize = pick( s->wid->maximumSize() ); + a[i].sizeHint = a[i].minimumSize = pick( minSize(s->wid) ); a[i].empty = FALSE; } } @@ -953,9 +953,9 @@ void KDGanttMinimizeSplitter::recalc( bool update ) } else { TQSize minS = minSize(s->wid); minl += pick( minS ); - maxl += pick( s->wid->tqmaximumSize() ); + maxl += pick( s->wid->maximumSize() ); mint = TQMAX( mint, trans( minS )); - int tm = trans( s->wid->tqmaximumSize() ); + int tm = trans( s->wid->maximumSize() ); if ( tm > 0 ) maxt = TQMIN( maxt, tm ); } @@ -1105,7 +1105,7 @@ void KDGanttMinimizeSplitter::recalcId() /*! Reimplemented from superclass. */ -TQSize KDGanttMinimizeSplitter::tqsizeHint() const +TQSize KDGanttMinimizeSplitter::sizeHint() const { constPolish(); int l = 0; @@ -1119,7 +1119,7 @@ TQSize KDGanttMinimizeSplitter::tqsizeHint() const ++it; if ( o->isWidgetType() && !((TQWidget*)o)->isHidden() ) { - TQSize s = ((TQWidget*)o)->tqsizeHint(); + TQSize s = ((TQWidget*)o)->sizeHint(); if ( s.isValid() ) { l += pick( s ); t = TQMAX( t, trans( s ) ); @@ -1135,7 +1135,7 @@ TQSize KDGanttMinimizeSplitter::tqsizeHint() const \reimp */ -TQSize KDGanttMinimizeSplitter::tqminimumSizeHint() const +TQSize KDGanttMinimizeSplitter::minimumSizeHint() const { constPolish(); int l = 0; @@ -1309,7 +1309,7 @@ void KDGanttMinimizeSplitter::processChildEvents() void KDGanttMinimizeSplitter::styleChange( TQStyle& old ) { - int sw = tqstyle().tqpixelMetric(TQStyle::PM_SplitterWidth, this); + int sw = tqstyle().pixelMetric(TQStyle::PM_SplitterWidth, this); TQSplitterLayoutStruct *s = data->list.first(); while ( s ) { if ( s->isSplitter ) @@ -1364,9 +1364,9 @@ void kdganttGeomCalc( TQMemArray<TQLayoutStruct> &chain, int start, int count, i int i; for ( i = start; i < start + count; i++ ) { chain[i].done = FALSE; - cHint += chain[i].tqsizeHint; - cMin += chain[i].tqminimumSize; - cMax += chain[i].tqmaximumSize; + cHint += chain[i].sizeHint; + cMin += chain[i].minimumSize; + cMax += chain[i].maximumSize; sumStretch += chain[i].stretch; if ( !chain[i].empty ) spacerCount++; @@ -1379,11 +1379,11 @@ void kdganttGeomCalc( TQMemArray<TQLayoutStruct> &chain, int start, int count, i if ( space < cMin + spacerCount * spacer ) { // qDebug("not enough space"); for ( i = start; i < start+count; i++ ) { - chain[i].size = chain[i].tqminimumSize; + chain[i].size = chain[i].minimumSize; chain[i].done = TRUE; } } else if ( space < cHint + spacerCount*spacer ) { - // Less space than tqsizeHint, but more than minimum. + // Less space than sizeHint, but more than minimum. // Currently take space equally from each, like in TQt 2.x. // Commented-out lines will give more space to stretchier items. int n = count; @@ -1391,10 +1391,10 @@ void kdganttGeomCalc( TQMemArray<TQLayoutStruct> &chain, int start, int count, i int overdraft = cHint - space_left; //first give to the fixed ones: for ( i = start; i < start+count; i++ ) { - if ( !chain[i].done && chain[i].tqminimumSize >= chain[i].tqsizeHint) { - chain[i].size = chain[i].tqsizeHint; + if ( !chain[i].done && chain[i].minimumSize >= chain[i].sizeHint) { + chain[i].size = chain[i].sizeHint; chain[i].done = TRUE; - space_left -= chain[i].tqsizeHint; + space_left -= chain[i].sizeHint; // sumStretch -= chain[i].stretch; n--; } @@ -1413,13 +1413,13 @@ void kdganttGeomCalc( TQMemArray<TQLayoutStruct> &chain, int start, int count, i // else // fp_w += (fp_over * chain[i].stretch) / sumStretch; int w = fRound( fp_w ); - chain[i].size = chain[i].tqsizeHint - w; + chain[i].size = chain[i].sizeHint - w; fp_w -= toFixed( w ); //give the difference to the next - if ( chain[i].size < chain[i].tqminimumSize ) { + if ( chain[i].size < chain[i].minimumSize ) { chain[i].done = TRUE; - chain[i].size = chain[i].tqminimumSize; + chain[i].size = chain[i].minimumSize; finished = FALSE; - overdraft -= chain[i].tqsizeHint - chain[i].tqminimumSize; + overdraft -= chain[i].sizeHint - chain[i].minimumSize; // sumStretch -= chain[i].stretch; n--; break; @@ -1431,11 +1431,11 @@ void kdganttGeomCalc( TQMemArray<TQLayoutStruct> &chain, int start, int count, i int space_left = space - spacerCount*spacer; // first give to the fixed ones, and handle non-expansiveness for ( i = start; i < start + count; i++ ) { - if ( !chain[i].done && (chain[i].tqmaximumSize <= chain[i].tqsizeHint + if ( !chain[i].done && (chain[i].maximumSize <= chain[i].sizeHint || wannaGrow && !chain[i].expansive) ) { - chain[i].size = chain[i].tqsizeHint; + chain[i].size = chain[i].sizeHint; chain[i].done = TRUE; - space_left -= chain[i].tqsizeHint; + space_left -= chain[i].sizeHint; sumStretch -= chain[i].stretch; n--; } @@ -1467,20 +1467,20 @@ void kdganttGeomCalc( TQMemArray<TQLayoutStruct> &chain, int start, int count, i int w = fRound( fp_w ); chain[i].size = w; fp_w -= toFixed( w ); // give the difference to the next - if ( w < chain[i].tqsizeHint ) { - deficit += chain[i].tqsizeHint - w; - } else if ( w > chain[i].tqmaximumSize ) { - surplus += w - chain[i].tqmaximumSize; + if ( w < chain[i].sizeHint ) { + deficit += chain[i].sizeHint - w; + } else if ( w > chain[i].maximumSize ) { + surplus += w - chain[i].maximumSize; } } if ( deficit > 0 && surplus <= deficit ) { // give to the ones that have too little for ( i = start; i < start+count; i++ ) { if ( !chain[i].done && - chain[i].size < chain[i].tqsizeHint ) { - chain[i].size = chain[i].tqsizeHint; + chain[i].size < chain[i].sizeHint ) { + chain[i].size = chain[i].sizeHint; chain[i].done = TRUE; - space_left -= chain[i].tqsizeHint; + space_left -= chain[i].sizeHint; sumStretch -= chain[i].stretch; n--; } @@ -1490,10 +1490,10 @@ void kdganttGeomCalc( TQMemArray<TQLayoutStruct> &chain, int start, int count, i // take from the ones that have too much for ( i = start; i < start+count; i++ ) { if ( !chain[i].done && - chain[i].size > chain[i].tqmaximumSize ) { - chain[i].size = chain[i].tqmaximumSize; + chain[i].size > chain[i].maximumSize ) { + chain[i].size = chain[i].maximumSize; chain[i].done = TRUE; - space_left -= chain[i].tqmaximumSize; + space_left -= chain[i].maximumSize; sumStretch -= chain[i].stretch; n--; } diff --git a/kdgantt/KDGanttMinimizeSplitter.h b/kdgantt/KDGanttMinimizeSplitter.h index 0d3499ac1..1ebf7b543 100644 --- a/kdgantt/KDGanttMinimizeSplitter.h +++ b/kdgantt/KDGanttMinimizeSplitter.h @@ -70,8 +70,8 @@ public: void moveToLast( TQWidget * ); void refresh() { recalc( TRUE ); } - virtual TQSize tqsizeHint() const; - virtual TQSize tqminimumSizeHint() const; + virtual TQSize sizeHint() const; + virtual TQSize minimumSizeHint() const; TQValueList<int> sizes() const; void setSizes( TQValueList<int> ); @@ -147,7 +147,7 @@ public: bool opaque() const { return s->opaqueResize(); } - TQSize tqsizeHint() const; + TQSize sizeHint() const; int id() const { return myId; } // data->list.at(id())->wid == this void setId( int i ) { myId = i; } diff --git a/kdgantt/KDGanttSemiSizingControl.cpp b/kdgantt/KDGanttSemiSizingControl.cpp index bfaa161d0..199fb2c72 100644 --- a/kdgantt/KDGanttSemiSizingControl.cpp +++ b/kdgantt/KDGanttSemiSizingControl.cpp @@ -247,7 +247,7 @@ KDGanttSemiSizingControl::ArrowPosition KDGanttSemiSizingControl::arrowPosition( void KDGanttSemiSizingControl::init() { _but = new TQPushButton( this ); - _but->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); + _but->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); connect( _but, TQT_SIGNAL( clicked() ), this, TQT_SLOT(changeState()) ); _tqlayout = 0; TQWhatsThis::add( _but, "Click on this button to show the \nlegend at the bottom of the widget"); @@ -395,7 +395,7 @@ TQPixmap KDGanttSemiSizingControl::pixmap( Direction direction ) { TQPainter p( &pix ); p.setPen( black ); - p.setBrush( tqcolorGroup().button() ); + p.setBrush( colorGroup().button() ); p.drawPolygon( arr ); TQBitmap bit( s, s ); bit.fill( color0 ); diff --git a/kdgantt/KDGanttView.cpp b/kdgantt/KDGanttView.cpp index 5a1618a31..c7bfa0106 100644 --- a/kdgantt/KDGanttView.cpp +++ b/kdgantt/KDGanttView.cpp @@ -186,7 +186,7 @@ KDGanttView::KDGanttView( TQWidget* parent, const char* name ) fDropEnabled = false; closingBlocked = false; myTimeHeader->computeTicks(); - centerTimelineAfterShow( TQDateTime::tqcurrentDateTime () ); + centerTimelineAfterShow( TQDateTime::currentDateTime () ); setDisplayEmptyTasksAsLine( false ); TQValueList<int> list; list.append(240); @@ -313,12 +313,12 @@ bool KDGanttView::close ( bool alsoDelete ) /*! Returns a useful size for the view. Returned width: - tqsizeHint().width() of the list view + width of TimeTable + sizeHint().width() of the list view + width of TimeTable Returned height: height() of TimeHeader + height() of TimeTable + height() of Legend (if shown) */ -TQSize KDGanttView::tqsizeHint() const +TQSize KDGanttView::sizeHint() const { bool block = myTimeTable->blockUpdating(); myTimeTable->setBlockUpdating( false ); @@ -342,9 +342,9 @@ TQSize KDGanttView::tqsizeHint() const if ( myLegend->isShown() ) hintHeight += myLegend->legendSizeHint().height() +10; hintHeight += myTimeTable->minimumHeight+myListView->frameWidth()*2+2; - int hintWid = myListView->tqsizeHint().width(); + int hintWid = myListView->sizeHint().width(); //hintWid += myTimeHeader->mySizeHint+myCanvasView->verticalScrollBar()->width(); - hintWid += myCanvasView->tqsizeHint().width(); + hintWid += myCanvasView->sizeHint().width(); // add 10 for the splitter-bars // qDebug("sizehint %d %d ",hintWid+10, hintHeight ); myTimeTable->setBlockUpdating( block ); @@ -868,7 +868,7 @@ void KDGanttView::print( TQPrinter* printer , TQSize size = drawContents( 0, printListView, printTimeLine, printLegend ); // at the top, we want to print current time/date - TQString date = "Printing Time: " + TQDateTime::tqcurrentDateTime().toString(); + TQString date = "Printing Time: " + TQDateTime::currentDateTime().toString(); int hei = p.boundingRect(0,0, 5, 5, TQt::AlignLeft, date ).height(); p.drawText( 0, 0, date ); diff --git a/kdgantt/KDGanttView.h b/kdgantt/KDGanttView.h index 70b423218..7f4bf57a5 100644 --- a/kdgantt/KDGanttView.h +++ b/kdgantt/KDGanttView.h @@ -330,7 +330,7 @@ public: virtual void lvStartDrag (KDGanttViewItem*); virtual bool lvDragMoveEvent (TQDragMoveEvent * e,KDGanttViewItem*, KDGanttViewItem*); virtual void lvDragEnterEvent (TQDragEnterEvent * e ); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; KDGanttViewItem* getItemByName( const TQString& name ) const; TQDateTime getDateTimeForCoordX(int coordX, bool global = true ) const; KDGanttViewItem* getItemByListViewPos( const TQPoint& pos ) const; diff --git a/kdgantt/KDGanttViewItemDrag.cpp b/kdgantt/KDGanttViewItemDrag.cpp index c73eff67f..92c602011 100644 --- a/kdgantt/KDGanttViewItemDrag.cpp +++ b/kdgantt/KDGanttViewItemDrag.cpp @@ -86,7 +86,7 @@ KDGanttViewItemDrag::KDGanttViewItemDrag( KDGanttViewItem* item , TQWidget *sour \param c the format of the data \return the encoded data of the drag object */ -TQByteArray KDGanttViewItemDrag::tqencodedData( const char * c) const +TQByteArray KDGanttViewItemDrag::encodedData( const char * c) const { TQString s ( c ); if ( s == "x-application/x-KDGanttViewItemDrag" ) { @@ -132,7 +132,7 @@ bool KDGanttViewItemDrag::canDecode ( const TQMimeSource * e ) bool KDGanttViewItemDrag::decode ( const TQMimeSource * e , TQString & string) { TQByteArray arr; - arr = e->tqencodedData( "x-application/x-KDGanttViewItemDrag"); + arr = e->encodedData( "x-application/x-KDGanttViewItemDrag"); TQDataStream s( arr, IO_ReadOnly ); s >> string; return true; diff --git a/kdgantt/KDGanttViewItemDrag.h b/kdgantt/KDGanttViewItemDrag.h index a4d6cb6f0..9219c9181 100644 --- a/kdgantt/KDGanttViewItemDrag.h +++ b/kdgantt/KDGanttViewItemDrag.h @@ -44,7 +44,7 @@ class KDGanttViewItemDrag :public TQStoredDrag public: KDGanttViewItemDrag(KDGanttViewItem* item, TQWidget *source, const char * name ) ; - TQByteArray tqencodedData( const char * c) const; + TQByteArray encodedData( const char * c) const; KDGanttViewItem* getItem(); static bool canDecode ( const TQMimeSource * e ); static bool decode ( const TQMimeSource * e, TQString & ); diff --git a/kdgantt/KDGanttViewSubwidgets.cpp b/kdgantt/KDGanttViewSubwidgets.cpp index bd83feb14..57bd2566d 100644 --- a/kdgantt/KDGanttViewSubwidgets.cpp +++ b/kdgantt/KDGanttViewSubwidgets.cpp @@ -702,12 +702,12 @@ KDTimeHeaderWidget:: KDTimeHeaderWidget( TQWidget* parent,KDGanttView* gant ) mySizeHint = 0; myGanttView = gant; flagDoNotRecomputeAfterChange = true; - TQDateTime start = (TQDateTime::tqcurrentDateTime ()).addSecs(-3600); + TQDateTime start = (TQDateTime::currentDateTime ()).addSecs(-3600); setHorizonStart(start); setHorizonEnd( start.addSecs(3600*2)); flagStartTimeSet = false; flagEndTimeSet = false; - myCenterDateTime = TQDateTime::tqcurrentDateTime (); + myCenterDateTime = TQDateTime::currentDateTime (); setScale(KDGanttView::Auto); //setScale(KDGanttView::Hour); myMaxScale = KDGanttView::Month; @@ -2086,7 +2086,7 @@ void KDTimeHeaderWidget::computeTicks(bool doNotComputeRealScale) TQPainter p(this); int Width, Height; TQString testTextMinor,testTextMajor, tempStr; - TQRect tqitemRectMinor, tqitemRectMajor; + TQRect itemRectMinor, itemRectMajor; TQDate tempDate = myRealStart.date(); myRealEnd = myRealStart; // preparing the testtext for the differennt scales @@ -2109,25 +2109,25 @@ void KDTimeHeaderWidget::computeTicks(bool doNotComputeRealScale) testTextMinor = "12 AM"; testTextMajor = "Mon Aug 30, x"; if ( yearFormat() != KDGanttView::NoDate ) - testTextMajor += getYear(TQDate::tqcurrentDate()); + testTextMajor += getYear(TQDate::currentDate()); minorPerMajor = 2400; break; case KDGanttView::Day: minorItems = minorItems/(60*24); testTextMinor = "88"; - testTextMajor = "Aug 30, x"+getYear(TQDate::tqcurrentDate()); + testTextMajor = "Aug 30, x"+getYear(TQDate::currentDate()); minorPerMajor = 700; break; case KDGanttView::Week: minorItems = minorItems/(60*24*7); testTextMinor = "88"; - testTextMajor = "Aug x"+getYear(TQDate::tqcurrentDate()); + testTextMajor = "Aug x"+getYear(TQDate::currentDate()); minorPerMajor = 435; // 435 = 365days/12months/7days * 100 break; case KDGanttView::Month: minorItems = (minorItems*12)/(60*24*365); testTextMinor = "M"; - testTextMajor = "x"+getYear(TQDate::tqcurrentDate()); + testTextMajor = "x"+getYear(TQDate::currentDate()); minorPerMajor = 1200; break; case KDGanttView::Auto: @@ -2135,12 +2135,12 @@ void KDTimeHeaderWidget::computeTicks(bool doNotComputeRealScale) qDebug(" RealScale == Auto : This may not be! "); break; } - tqitemRectMinor = p.boundingRect ( 10, 10, 2, 2, TQt::AlignLeft,testTextMinor); - tqitemRectMajor = p.boundingRect ( 10, 10, 2, 2, TQt::AlignLeft,testTextMajor); + itemRectMinor = p.boundingRect ( 10, 10, 2, 2, TQt::AlignLeft,testTextMinor); + itemRectMajor = p.boundingRect ( 10, 10, 2, 2, TQt::AlignLeft,testTextMajor); p.end(); //qDebug(" tempMinorScaleCount %d ", tempMinorScaleCount); - Height = tqitemRectMinor.height()+tqitemRectMajor.height()+11; - Width = (tqitemRectMinor.width()+5); + Height = itemRectMinor.height()+itemRectMajor.height()+11; + Width = (itemRectMinor.width()+5); if (Width < minimumColumnWidth()) Width = minimumColumnWidth(); // if the desired width is greater than the maximum width of this widget // increase the minorscalecount @@ -2197,7 +2197,7 @@ void KDTimeHeaderWidget::computeTicks(bool doNotComputeRealScale) // checking, if enough space for majorscale // if not, increasing MajorScaleCount - while ((minorPerMajor*Width)/100 < tqitemRectMajor.width()) { + while ((minorPerMajor*Width)/100 < itemRectMajor.width()) { minorPerMajor = minorPerMajor/tempMajorScaleCount; ++tempMajorScaleCount; minorPerMajor = minorPerMajor*tempMajorScaleCount; @@ -2213,7 +2213,7 @@ void KDTimeHeaderWidget::computeTicks(bool doNotComputeRealScale) resize( Width, Height ); emit sizeChanged( Width ); } - myMajorGridHeight = tqitemRectMajor.height()+5; + myMajorGridHeight = itemRectMajor.height()+5; TQTime tempTime = myRealStart.time(); TQDateTime tempDateTime; int i; @@ -2631,7 +2631,7 @@ TQSize KDLegendWidget::legendSize() TQSize KDLegendWidget::legendSizeHint() { TQApplication::sendPostedEvents( 0, TQEvent::LayoutHint ); - return TQSize( myLegend->tqsizeHint().width(), myLegend->tqsizeHint().height()+scroll->horizontalScrollBar()->height()); + return TQSize( myLegend->sizeHint().width(), myLegend->sizeHint().height()+scroll->horizontalScrollBar()->height()); } @@ -2949,7 +2949,7 @@ void KDListView::drawAllContents(TQPainter * p, int cx, int cy, int cw, int ch) p->translate( rleft, crtop ); //kdDebug()<<k_funcinfo<<"paintBranches: "<<current->i->text(0)<<endl; - current->i->paintBranches( p, tqcolorGroup(), treeStepSize(), + current->i->paintBranches( p, colorGroup(), treeStepSize(), rtop - crtop, r.height() ); p->restore(); } @@ -3510,7 +3510,7 @@ KDGanttCanvasView::MovingOperation KDGanttCanvasView::gvItemHitTest( KDGanttView void KDGanttCanvasView::contentsMousePressEvent ( TQMouseEvent * e ) { //qDebug("mousepress! %d ", this); - //qDebug("focus %d ",tqApp->tqfocusWidget()); + //qDebug("focus %d ",tqApp->focusWidget()); setFocus(); currentLink = 0; currentItem = 0; diff --git a/kdgantt/itemAttributeDialog.ui b/kdgantt/itemAttributeDialog.ui index a3616dcad..a98d65a11 100644 --- a/kdgantt/itemAttributeDialog.ui +++ b/kdgantt/itemAttributeDialog.ui @@ -64,7 +64,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>16</height> @@ -383,7 +383,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>16</height> diff --git a/kdgantt/qlayoutengine_p.h b/kdgantt/qlayoutengine_p.h index 1f03331d2..cd659d693 100644 --- a/kdgantt/qlayoutengine_p.h +++ b/kdgantt/qlayoutengine_p.h @@ -62,15 +62,15 @@ #ifndef TQT_NO_LAYOUT struct QLayoutStruct { - void initParameters() { tqminimumSize = tqsizeHint = 0; - tqmaximumSize = TQWIDGETSIZE_MAX; expansive = FALSE; empty = TRUE; } + void initParameters() { minimumSize = sizeHint = 0; + maximumSize = TQWIDGETSIZE_MAX; expansive = FALSE; empty = TRUE; } void init() { stretch = 0; initParameters(); } //permanent storage: int stretch; //parameters: - TQCOORD tqsizeHint; - TQCOORD tqmaximumSize; - TQCOORD tqminimumSize; + TQCOORD sizeHint; + TQCOORD maximumSize; + TQCOORD minimumSize; bool expansive; bool empty; //temporary storage: diff --git a/kfile-plugins/ics/kfile_ics.cpp b/kfile-plugins/ics/kfile_ics.cpp index b8346f4f4..0d85344e7 100644 --- a/kfile-plugins/ics/kfile_ics.cpp +++ b/kfile-plugins/ics/kfile_ics.cpp @@ -59,7 +59,7 @@ bool ICSPlugin::readInfo( KFileMetaInfo& info, uint /*what*/ ) { KFileMetaInfoGroup group = appendGroup( info, "ICSInfo"); - CalendarLocal cal ( TQString::tqfromLatin1( "UTC" ) ); + CalendarLocal cal ( TQString::fromLatin1( "UTC" ) ); if( !cal.load( info.path() ) ) { kdDebug() << "Could not load calendar" << endl; return false; @@ -80,7 +80,7 @@ bool ICSPlugin::readInfo( KFileMetaInfo& info, uint /*what*/ ) Todo *todo = *it; if ( todo->isCompleted() ) ++completed; - else if ( todo->hasDueDate() && todo->dtDue().date() < TQDate::tqcurrentDate() ) + else if ( todo->hasDueDate() && todo->dtDue().date() < TQDate::currentDate() ) ++overdue; } diff --git a/kgantt/kgantt/KGantt.cpp b/kgantt/kgantt/KGantt.cpp index 249f11ad9..f16d47762 100644 --- a/kgantt/kgantt/KGantt.cpp +++ b/kgantt/kgantt/KGantt.cpp @@ -24,8 +24,8 @@ KGantt::KGantt(KGanttItem* toplevelitem, if(toplevelitem == 0) { _toplevelitem = new KGanttItem(0, "toplevelitem", - TQDateTime::tqcurrentDateTime(), - TQDateTime::tqcurrentDateTime() ); + TQDateTime::currentDateTime(), + TQDateTime::currentDateTime() ); _toplevelitem->setMode(KGanttItem::Rubberband); _deleteItem = true; } diff --git a/kgantt/kgantt/KGantt.h b/kgantt/kgantt/KGantt.h index ca02a066d..2475b1211 100644 --- a/kgantt/kgantt/KGantt.h +++ b/kgantt/kgantt/KGantt.h @@ -66,8 +66,8 @@ KGanttItem* t1 = new KGanttItem(toplevel, "task 1, no subtasks", - TQDateTime::tqcurrentDateTime().addDays(10), - TQDateTime::tqcurrentDateTime().addDays(20) ); + TQDateTime::currentDateTime().addDays(10), + TQDateTime::currentDateTime().addDays(20) ); ... diff --git a/kgantt/kgantt/itemedit.ui b/kgantt/kgantt/itemedit.ui index 3810b43a7..1922a3d1e 100644 --- a/kgantt/kgantt/itemedit.ui +++ b/kgantt/kgantt/itemedit.ui @@ -38,7 +38,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>30</height> @@ -74,7 +74,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>50</width> <height>20</height> @@ -85,7 +85,7 @@ <property name="name"> <cstring>_minStartMinuetEdit</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>20</width> <height>30</height> @@ -99,7 +99,7 @@ <property name="name"> <cstring>_minStartHourEdit</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>20</width> <height>30</height> @@ -177,7 +177,7 @@ <property name="name"> <cstring>_maxStartHourEdit</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>20</width> <height>30</height> @@ -210,7 +210,7 @@ <property name="name"> <cstring>_maxStartMinuetEdit</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>20</width> <height>30</height> @@ -230,7 +230,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>50</width> <height>20</height> @@ -308,7 +308,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>356</width> <height>20</height> @@ -354,7 +354,7 @@ <property name="name"> <cstring>_startHourEdit</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>20</width> <height>30</height> @@ -368,7 +368,7 @@ <property name="name"> <cstring>_startMinuetEdit</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>20</width> <height>30</height> @@ -395,7 +395,7 @@ <property name="name"> <cstring>_endMinuetEdit</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>20</width> <height>30</height> @@ -415,7 +415,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>356</width> <height>20</height> @@ -477,7 +477,7 @@ <property name="name"> <cstring>_endHourEdit</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>20</width> <height>30</height> diff --git a/kgantt/kgantt/itemedit2.ui b/kgantt/kgantt/itemedit2.ui index 999df7bde..73532fe48 100644 --- a/kgantt/kgantt/itemedit2.ui +++ b/kgantt/kgantt/itemedit2.ui @@ -217,7 +217,7 @@ <property name="name"> <cstring>_dateTimeHourEdit</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>20</width> <height>30</height> @@ -245,7 +245,7 @@ <property name="name"> <cstring>_dateTimeMinuetEdit</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>20</width> <height>30</height> @@ -265,7 +265,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>194</width> <height>20</height> @@ -302,7 +302,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>30</height> diff --git a/kioslaves/imap4/imap4.cc b/kioslaves/imap4/imap4.cc index 6671981eb..627f5eea6 100644 --- a/kioslaves/imap4/imap4.cc +++ b/kioslaves/imap4/imap4.cc @@ -1863,7 +1863,7 @@ IMAP4Protocol::stat (const KURL & _url) ok = true; else { - imapCommand *cmd = doCommand(imapCommand::clientqStatus(aBox, aSection)); + imapCommand *cmd = doCommand(imapCommand::clienStatus(aBox, aSection)); ok = cmd->result() == "OK"; cmdInfo = cmd->resultInfo(); completeQueue.removeRef(cmd); @@ -1887,13 +1887,13 @@ IMAP4Protocol::stat (const KURL & _url) error(KIO::ERR_DOES_NOT_EXIST, aBox); return; } - if ((aSection == "UIDNEXT" && getqStatus().uidNextAvailable()) - || (aSection == "UNSEEN" && getqStatus().unseenAvailable())) + if ((aSection == "UIDNEXT" && geStatus().uidNextAvailable()) + || (aSection == "UNSEEN" && geStatus().unseenAvailable())) { atom.m_uds = UDS_SIZE; atom.m_str = TQString(); - atom.m_long = (aSection == "UIDNEXT") ? getqStatus().uidNext() - : getqStatus().unseen(); + atom.m_long = (aSection == "UIDNEXT") ? geStatus().uidNext() + : geStatus().unseen(); entry.append(atom); } } else @@ -1910,9 +1910,9 @@ IMAP4Protocol::stat (const KURL & _url) // only do this if the box is not selected // the server might change the validity for new select/examine imapCommand *cmd = - doCommand (imapCommand::clientqStatus (aBox, "UIDVALIDITY")); + doCommand (imapCommand::clienStatus (aBox, "UIDVALIDITY")); completeQueue.removeRef (cmd); - validity = getqStatus ().uidValidity (); + validity = geStatus ().uidValidity (); } validity = 0; // temporary @@ -2715,10 +2715,10 @@ IMAP4Protocol::assureBox (const TQString & aBox, bool readonly) // Doing this means a server roundtrip and since assureBox is called // after every mail, we do it with a timeout. kdDebug(7116) << "IMAP4Protocol::assureBox - reusing box" << endl; - if ( mTimeOfLastNoop.secsTo( TQDateTime::tqcurrentDateTime() ) > 10 ) { + if ( mTimeOfLastNoop.secsTo( TQDateTime::currentDateTime() ) > 10 ) { cmd = doCommand (imapCommand::clientNoop ()); completeQueue.removeRef (cmd); - mTimeOfLastNoop = TQDateTime::tqcurrentDateTime(); + mTimeOfLastNoop = TQDateTime::currentDateTime(); kdDebug(7116) << "IMAP4Protocol::assureBox - noop timer fired" << endl; } } diff --git a/kioslaves/imap4/imapcommand.cc b/kioslaves/imap4/imapcommand.cc index 65a9227d0..4b9faadf4 100644 --- a/kioslaves/imap4/imapcommand.cc +++ b/kioslaves/imap4/imapcommand.cc @@ -236,7 +236,7 @@ imapCommand::clientAppend (const TQString & box, const TQString & flags, } imapCommand * -imapCommand::clientqStatus (const TQString & path, const TQString & parameters) +imapCommand::clienStatus (const TQString & path, const TQString & parameters) { return new imapCommand ("STATUS", TQString ("\"") + rfcDecoder::toIMAP (path) + diff --git a/kioslaves/imap4/imapcommand.h b/kioslaves/imap4/imapcommand.h index 9ddb3f252..9e2834424 100644 --- a/kioslaves/imap4/imapcommand.h +++ b/kioslaves/imap4/imapcommand.h @@ -212,7 +212,7 @@ public: * @param parameters * @return a STATUS imapCommand */ - static imapCommand *clientqStatus (const TQString & path, + static imapCommand *clienStatus (const TQString & path, const TQString & parameters); /** * @brief Create a COPY command diff --git a/kioslaves/imap4/imapparser.cc b/kioslaves/imap4/imapparser.cc index 4b8086ffc..328c0e566 100644 --- a/kioslaves/imap4/imapparser.cc +++ b/kioslaves/imap4/imapparser.cc @@ -273,7 +273,7 @@ imapParser::clientAuthenticate ( KIO::SlaveBase *slave, KIO::AuthInfo &ai, TQString firstCommand = aAuth; if ( !challenge.isEmpty() ) { firstCommand += " "; - firstCommand += TQString::tqfromLatin1( challenge.data(), challenge.size() ); + firstCommand += TQString::fromLatin1( challenge.data(), challenge.size() ); } cmd = sendCommand (new imapCommand ("AUTHENTICATE", firstCommand.latin1())); @@ -443,7 +443,7 @@ imapParser::parseUntagged (parseString & result) } else if (tqstrncmp(what, "STATUS", what.size()) == 0) { - parsetqStatus (result); + parseStatus (result); } break; @@ -845,9 +845,9 @@ void imapParser::parseSearch (parseString & result) } } -void imapParser::parsetqStatus (parseString & inWords) +void imapParser::parseStatus (parseString & inWords) { - lastqStatus = imapInfo (); + lasStatus = imapInfo (); parseLiteralC(inWords); // swallow the box if (inWords.isEmpty() || inWords[0] != '(') @@ -864,15 +864,15 @@ void imapParser::parsetqStatus (parseString & inWords) if (parseOneNumber (inWords, value)) { if (label == "MESSAGES") - lastqStatus.setCount (value); + lasStatus.setCount (value); else if (label == "RECENT") - lastqStatus.setRecent (value); + lasStatus.setRecent (value); else if (label == "UIDVALIDITY") - lastqStatus.setUidValidity (value); + lasStatus.setUidValidity (value); else if (label == "UNSEEN") - lastqStatus.setUnseen (value); + lasStatus.setUnseen (value); else if (label == "UIDNEXT") - lastqStatus.setUidNext (value); + lasStatus.setUidNext (value); } } diff --git a/kioslaves/imap4/imapparser.h b/kioslaves/imap4/imapparser.h index 9902534c3..01eabd5ec 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 parsetqStatus (parseString & result); + void parseStatus (parseString & result); /** @brief parse a EXISTS line */ void parseExists (ulong value, parseString & result); /** @brief parse a EXPUNGE line */ @@ -404,9 +404,9 @@ public: }; /** @brief return the last status code */ - const imapInfo & getqStatus () + const imapInfo & geStatus () { - return lastqStatus; + return lasStatus; }; /** return the select info */ const imapInfo & getSelected () @@ -450,7 +450,7 @@ protected: imapInfo selectInfo; /** @brief the results from the last status command */ - imapInfo lastqStatus; + imapInfo lasStatus; /** @brief the results from the capabilities, split at ' ' */ TQStringList imapCapabilities; diff --git a/kioslaves/imap4/mimeheader.cc b/kioslaves/imap4/mimeheader.cc index 048eba7a5..39af2c397 100644 --- a/kioslaves/imap4/mimeheader.cc +++ b/kioslaves/imap4/mimeheader.cc @@ -650,7 +650,7 @@ mimeHeader::bodyDecoded () TQByteArray temp; temp = bodyDecodedBinary (); - return TQString::tqfromLatin1 (temp.data (), temp.count ()); + return TQString::fromLatin1 (temp.data (), temp.count ()); } TQByteArray diff --git a/kioslaves/opengroupware/opengroupware.cpp b/kioslaves/opengroupware/opengroupware.cpp index 0032e4440..0b1a8a557 100644 --- a/kioslaves/opengroupware/opengroupware.cpp +++ b/kioslaves/opengroupware/opengroupware.cpp @@ -146,8 +146,8 @@ void OpenGroupware::getFreeBusy( const KURL &url ) // FIXME get from server // FIXME: Read range from configuration or URL parameters. - TQDate start = TQDate::tqcurrentDate().addDays( -3 ); - TQDate end = TQDate::tqcurrentDate().addDays( 60 ); + TQDate start = TQDate::currentDate().addDays( -3 ); + TQDate end = TQDate::currentDate().addDays( 60 ); fb->setDtStart( start ); fb->setDtEnd( end ); diff --git a/kioslaves/sieve/sieve.cpp b/kioslaves/sieve/sieve.cpp index 0b547fd0a..1cec79c52 100644 --- a/kioslaves/sieve/sieve.cpp +++ b/kioslaves/sieve/sieve.cpp @@ -453,7 +453,7 @@ void kio_sieveProtocol::disconnect(bool forcibly) /* ---------------------------------------------------------------------------------- */ /*void kio_sieveProtocol::slave_status() { - slavetqStatus(isConnectionValid() ? m_sServer : "", isConnectionValid()); + slaveStatus(isConnectionValid() ? m_sServer : "", isConnectionValid()); finished(); }*/ @@ -1082,13 +1082,13 @@ bool kio_sieveProtocol::authenticate() ksDebug() << "Preferred authentication method is " << mechusing << "." << endl; - TQString firstCommand = "AUTHENTICATE \"" + TQString::tqfromLatin1( mechusing ) + "\""; + TQString firstCommand = "AUTHENTICATE \"" + TQString::fromLatin1( mechusing ) + "\""; tmp.setRawData( out, outlen ); KCodecs::base64Encode( tmp, challenge ); tmp.resetRawData( out, outlen ); if ( !challenge.isEmpty() ) { firstCommand += " \""; - firstCommand += TQString::tqfromLatin1( challenge.data(), challenge.size() ); + firstCommand += TQString::fromLatin1( challenge.data(), challenge.size() ); firstCommand += "\""; } diff --git a/kitchensync/libqopensync/group.cpp b/kitchensync/libqopensync/group.cpp index d716e1c4c..427a57c9e 100644 --- a/kitchensync/libqopensync/group.cpp +++ b/kitchensync/libqopensync/group.cpp @@ -146,7 +146,7 @@ TQString Group::name() const { Q_ASSERT( mGroup ); - return TQString::tqfromLatin1( osync_group_get_name( mGroup ) ); + return TQString::fromLatin1( osync_group_get_name( mGroup ) ); } void Group::setLastSynchronization( const TQDateTime &dateTime ) diff --git a/kitchensync/libqopensync/member.cpp b/kitchensync/libqopensync/member.cpp index fc7dfe312..a2c2268e7 100644 --- a/kitchensync/libqopensync/member.cpp +++ b/kitchensync/libqopensync/member.cpp @@ -55,14 +55,14 @@ TQString Member::configurationDirectory() const { Q_ASSERT( mMember ); - return TQString::tqfromLatin1( osync_member_get_configdir( mMember ) ); + return TQString::fromLatin1( osync_member_get_configdir( mMember ) ); } TQString Member::pluginName() const { Q_ASSERT( mMember ); - return TQString::tqfromLatin1( osync_member_get_pluginname( mMember ) ); + return TQString::fromLatin1( osync_member_get_pluginname( mMember ) ); } Plugin Member::plugin() const diff --git a/kitchensync/libqopensync/plugin.cpp b/kitchensync/libqopensync/plugin.cpp index fd7600499..acd54447a 100644 --- a/kitchensync/libqopensync/plugin.cpp +++ b/kitchensync/libqopensync/plugin.cpp @@ -43,20 +43,20 @@ TQString Plugin::name() const { Q_ASSERT( mPlugin ); - return TQString::tqfromLatin1( osync_plugin_get_name( mPlugin ) ); + return TQString::fromLatin1( osync_plugin_get_name( mPlugin ) ); } TQString Plugin::longName() const { Q_ASSERT( mPlugin ); - return TQString::tqfromLatin1( osync_plugin_get_longname( mPlugin ) ); + return TQString::fromLatin1( osync_plugin_get_longname( mPlugin ) ); } TQString Plugin::description() const { Q_ASSERT( mPlugin ); - return TQString::tqfromLatin1( osync_plugin_get_description( mPlugin ) ); + return TQString::fromLatin1( osync_plugin_get_description( mPlugin ) ); } diff --git a/kitchensync/src/configguisunbird.cpp b/kitchensync/src/configguisunbird.cpp index d51101aeb..041a8d1c0 100644 --- a/kitchensync/src/configguisunbird.cpp +++ b/kitchensync/src/configguisunbird.cpp @@ -57,14 +57,14 @@ ConfigGuiSunbird::ConfigGuiSunbird( const QSync::Member &member, TQWidget *paren KPushButton *mLocalAddButton = new KPushButton( mLocalWidget ); mLocalAddButton->setText( i18n( "Add new calendar" ) ); - mLocalAddButton->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); + mLocalAddButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); mLocalLayout->addWidget( mLocalAddButton ); connect( mLocalAddButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( addLocalCalendar() ) ); KPushButton *mWebdavAddButton = new KPushButton( mWebdavWidget ); mWebdavAddButton->setText( i18n( "Add new calendar" ) ); - mWebdavAddButton->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); + mWebdavAddButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); mWebdavLayout->addWidget( mWebdavAddButton ); connect( mWebdavAddButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( addWebdavCalendar() ) ); @@ -100,7 +100,7 @@ void ConfigGuiSunbird::load( const TQString &xml ) LocalCalendar *cal = new LocalCalendar( path, defaultcal, days, mLocalWidget ); mLocalLayout->removeItem( mLocalSpacer ); - cal->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) ); + cal->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) ); mLocalLayout->addWidget( cal ); mLocalLayout->addItem( mLocalSpacer ); mLocalList.append( cal ); @@ -122,7 +122,7 @@ void ConfigGuiSunbird::load( const TQString &xml ) WebdavCalendar *cal = new WebdavCalendar( username, password, url, defaultcal, days, mWebdavWidget ); mWebdavLayout->removeItem( mWebdavSpacer ); - cal->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) ); + cal->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) ); mWebdavLayout->addWidget( cal ); mWebdavLayout->addItem( mWebdavSpacer ); mWebdavList.append( cal ); @@ -175,7 +175,7 @@ void ConfigGuiSunbird::addLocalCalendar() { LocalCalendar *cal = new LocalCalendar( mLocalWidget ); mLocalLayout->removeItem( mLocalSpacer ); - cal->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) ); + cal->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) ); mLocalLayout->addWidget( cal ); mLocalLayout->addItem( mLocalSpacer ); mLocalList.append( cal ); @@ -194,7 +194,7 @@ void ConfigGuiSunbird::addWebdavCalendar() { WebdavCalendar *cal = new WebdavCalendar( mWebdavWidget ); mWebdavLayout->removeItem( mWebdavSpacer ); - cal->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) ); + cal->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) ); mWebdavLayout->addWidget( cal ); mWebdavLayout->addItem( mWebdavSpacer ); mWebdavList.append( cal ); @@ -239,7 +239,7 @@ void LocalCalendar::initGui() mDaysSpinBox = new TQSpinBox( this ); mDaysSpinBox->setDisabled( true ); - mDaysSpinBox->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); + mDaysSpinBox->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); connect( mDaysCheckBox, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( toggleDays( bool ) ) ); @@ -253,7 +253,7 @@ void LocalCalendar::initGui() mPathRequester = new KURLRequester( this ); KPushButton *removeButton = new KPushButton( this ); - removeButton->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); + removeButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); removeButton->setText( i18n( "Remove" ) ); connect( removeButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( deleteWidget() ) ); @@ -308,7 +308,7 @@ void WebdavCalendar::initGui() mDaysSpinBox = new TQSpinBox( this ); mDaysSpinBox->setDisabled( true ); - mDaysSpinBox->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); + mDaysSpinBox->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); connect( mDaysCheckBox, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( toggleDays( bool ) ) ); diff --git a/kitchensync/src/groupconfig.cpp b/kitchensync/src/groupconfig.cpp index 99ff35fdb..1cb95ebd2 100644 --- a/kitchensync/src/groupconfig.cpp +++ b/kitchensync/src/groupconfig.cpp @@ -50,8 +50,8 @@ GroupConfig::GroupConfig( TQWidget *parent ) TQFrame *titleFrame = new TQFrame( this ); topLayout->addWidget( titleFrame ); - titleFrame->setPaletteForegroundColor( tqcolorGroup().light() ); - titleFrame->setPaletteBackgroundColor( tqcolorGroup().mid() ); + titleFrame->setPaletteForegroundColor( colorGroup().light() ); + titleFrame->setPaletteBackgroundColor( colorGroup().mid() ); TQBoxLayout *nameLayout = new TQHBoxLayout( titleFrame ); nameLayout->setMargin( 4 ); diff --git a/kitchensync/src/groupitem.cpp b/kitchensync/src/groupitem.cpp index 3a294f5ba..acfd73e5f 100644 --- a/kitchensync/src/groupitem.cpp +++ b/kitchensync/src/groupitem.cpp @@ -71,27 +71,27 @@ GroupItem::GroupItem( KWidgetList *parent, SyncProcess *process ) mIcon = new TQLabel( hbox ); mIcon->setPixmap( icon ); - mIcon->setFixedSize( mIcon->tqsizeHint() ); - mIcon->setPaletteBackgroundColor( tqcolorGroup().mid() ); + mIcon->setFixedSize( mIcon->sizeHint() ); + mIcon->setPaletteBackgroundColor( colorGroup().mid() ); mGroupName = new TQLabel( hbox ); - mGroupName->tqsetAlignment( AlignLeft | AlignVCenter ); + mGroupName->setAlignment( AlignLeft | AlignVCenter ); mGroupName->setIndent( KDialog::spacingHint() ); mGroupName->setFont( boldFont ); - mGroupName->setPaletteForegroundColor( tqcolorGroup().light() ); - mGroupName->setPaletteBackgroundColor( tqcolorGroup().mid() ); + mGroupName->setPaletteForegroundColor( colorGroup().light() ); + mGroupName->setPaletteBackgroundColor( colorGroup().mid() ); - mtqStatus = new TQLabel( hbox ); - mtqStatus->tqsetAlignment( TQt::AlignRight ); - mtqStatus->tqsetAlignment( AlignRight | AlignVCenter ); - mtqStatus->setIndent( KDialog::spacingHint() ); - mtqStatus->setFont( boldFont ); - mtqStatus->setPaletteForegroundColor( tqcolorGroup().light() ); - mtqStatus->setPaletteBackgroundColor( tqcolorGroup().mid() ); - mtqStatus->setText( i18n( "Ready" ) ); + mStatus = new TQLabel( hbox ); + mStatus->setAlignment( TQt::AlignRight ); + mStatus->setAlignment( AlignRight | AlignVCenter ); + mStatus->setIndent( KDialog::spacingHint() ); + mStatus->setFont( boldFont ); + mStatus->setPaletteForegroundColor( colorGroup().light() ); + mStatus->setPaletteBackgroundColor( colorGroup().mid() ); + mStatus->setText( i18n( "Ready" ) ); - hbox->setPaletteBackgroundColor( tqcolorGroup().mid() ); - hbox->setMaximumHeight( hbox->tqminimumSizeHint().height() ); + hbox->setPaletteBackgroundColor( colorGroup().mid() ); + hbox->setMaximumHeight( hbox->minimumSizeHint().height() ); tqlayout->addMultiCellWidget( hbox, 0, 0, 0, 3 ); tqlayout->addMultiCellWidget( mBox, 1, 1, 0, 3 ); @@ -189,14 +189,14 @@ void GroupItem::change( const QSync::SyncChangeUpdate &update ) switch ( update.type() ) { case QSync::SyncChangeUpdate::Received: mProcessedItems++; - mtqStatus->setText( i18n( "%1 entries read" ).tqarg( mProcessedItems ) ); + mStatus->setText( i18n( "%1 entries read" ).tqarg( mProcessedItems ) ); break; case QSync::SyncChangeUpdate::ReceivedInfo: - mtqStatus->setText( i18n( "Receive information" ) ); + mStatus->setText( i18n( "Receive information" ) ); break; case QSync::SyncChangeUpdate::Sent: mProcessedItems--; - mtqStatus->setText( i18n( "%1 entries written" ).tqarg( mMaxProcessedItems - mProcessedItems ) ); + mStatus->setText( i18n( "%1 entries written" ).tqarg( mMaxProcessedItems - mProcessedItems ) ); mProgressBar->show(); @@ -212,15 +212,15 @@ void GroupItem::change( const QSync::SyncChangeUpdate &update ) } break; case QSync::SyncChangeUpdate::WriteError: - mtqStatus->setText( i18n( "Error" ) ); + mStatus->setText( i18n( "Error" ) ); KPassivePopup::message( update.result().message(), this ); break; case QSync::SyncChangeUpdate::ReceiveError: - mtqStatus->setText( i18n( "Error" ) ); + mStatus->setText( i18n( "Error" ) ); KPassivePopup::message( update.result().message(), this ); break; default: - mtqStatus->setText( TQString() ); + mStatus->setText( TQString() ); break; } } @@ -233,24 +233,24 @@ void GroupItem::engine( const QSync::SyncEngineUpdate &update ) { switch ( update.type() ) { case QSync::SyncEngineUpdate::EndPhaseConnected: - mtqStatus->setText( i18n( "Connected" ) ); + mStatus->setText( i18n( "Connected" ) ); mProgressBar->setProgress( 0 ); mSynchronizing = true; mSyncAction->setText( "Abort Synchronization" ); break; case QSync::SyncEngineUpdate::EndPhaseRead: - mtqStatus->setText( i18n( "Data read" ) ); + mStatus->setText( i18n( "Data read" ) ); break; case QSync::SyncEngineUpdate::EndPhaseWrite: - mtqStatus->setText( i18n( "Data written" ) ); + mStatus->setText( i18n( "Data written" ) ); mProgressBar->setProgress( 100 ); mProcessedItems = mMaxProcessedItems = 0; break; case QSync::SyncEngineUpdate::EndPhaseDisconnected: - mtqStatus->setText( i18n( "Disconnected" ) ); + mStatus->setText( i18n( "Disconnected" ) ); break; case QSync::SyncEngineUpdate::Error: - mtqStatus->setText( i18n( "Synchronization failed" ) ); + mStatus->setText( i18n( "Synchronization failed" ) ); KPassivePopup::message( update.result().message(), this ); this->update(); @@ -258,8 +258,8 @@ void GroupItem::engine( const QSync::SyncEngineUpdate &update ) mSyncAction->setText( i18n( "Synchronize Now" ) ); break; case QSync::SyncEngineUpdate::SyncSuccessfull: - mtqStatus->setText( i18n( "Successfully synchronized" ) ); - mSyncProcess->group().setLastSynchronization( TQDateTime::tqcurrentDateTime() ); + mStatus->setText( i18n( "Successfully synchronized" ) ); + mSyncProcess->group().setLastSynchronization( TQDateTime::currentDateTime() ); mSyncProcess->group().save(); this->update(); @@ -267,14 +267,14 @@ void GroupItem::engine( const QSync::SyncEngineUpdate &update ) mSyncAction->setText( i18n( "Synchronize Now" ) ); break; case QSync::SyncEngineUpdate::PrevUnclean: - mtqStatus->setText( i18n( "Previous synchronization failed" ) ); + mStatus->setText( i18n( "Previous synchronization failed" ) ); break; case QSync::SyncEngineUpdate::EndConflicts: - mtqStatus->setText( i18n( "Conflicts solved" ) ); + mStatus->setText( i18n( "Conflicts solved" ) ); mMaxProcessedItems = mProcessedItems; break; default: - mtqStatus->setText( TQString() ); + mStatus->setText( TQString() ); break; } } @@ -367,15 +367,15 @@ MemberItem::MemberItem( TQWidget *parent, SyncProcess *process, mIcon = new TQLabel( box ); mIcon->setPixmap( icon ); - mIcon->tqsetAlignment( TQt::AlignTop ); - mIcon->setFixedWidth( mIcon->tqsizeHint().width() ); + mIcon->setAlignment( TQt::AlignTop ); + mIcon->setFixedWidth( mIcon->sizeHint().width() ); TQVBox *nameBox = new TQVBox( box ); mMemberName = new TQLabel( nameBox ); mMemberName->setFont( boldFont ); mDescription = new TQLabel( nameBox ); - mtqStatus = new TQLabel( box ); + mStatus = new TQLabel( box ); mMemberName->setText( member.name() ); mDescription->setText( plugin.longName() ); @@ -383,7 +383,7 @@ MemberItem::MemberItem( TQWidget *parent, SyncProcess *process, void MemberItem::seStatusMessage( const TQString &msg ) { - mtqStatus->setText( msg ); + mStatus->setText( msg ); } #include "groupitem.moc" diff --git a/kitchensync/src/groupitem.h b/kitchensync/src/groupitem.h index 524fa0369..338c733df 100644 --- a/kitchensync/src/groupitem.h +++ b/kitchensync/src/groupitem.h @@ -76,7 +76,7 @@ class GroupItem : public KWidgetListItem TQLabel *mIcon; TQLabel *mGroupName; - TQLabel *mtqStatus; + TQLabel *mStatus; TQLabel *mTime; KURLLabel *mSyncAction; KURLLabel *mConfigureAction; @@ -106,7 +106,7 @@ class MemberItem : public TQWidget TQLabel *mIcon; TQLabel *mMemberName; TQLabel *mDescription; - TQLabel *mtqStatus; + TQLabel *mStatus; }; #endif diff --git a/kitchensync/src/pluginpicker.cpp b/kitchensync/src/pluginpicker.cpp index d8d6c46d5..64355e568 100644 --- a/kitchensync/src/pluginpicker.cpp +++ b/kitchensync/src/pluginpicker.cpp @@ -42,7 +42,7 @@ PluginItem::PluginItem( KWidgetList *list, const QSync::Plugin &plugin ) TQLabel *icon = new TQLabel( this ); icon->setPixmap( KGlobal::iconLoader()->loadIcon( iconName, KIcon::Desktop ) ); - icon->setFixedSize( icon->tqsizeHint() ); + icon->setFixedSize( icon->sizeHint() ); TQLabel *name = new TQLabel( plugin.longName(), this ); TQLabel *description = new TQLabel( plugin.description(), this ); diff --git a/kitchensync/src/syncprocess.cpp b/kitchensync/src/syncprocess.cpp index 672c789c3..60310b803 100644 --- a/kitchensync/src/syncprocess.cpp +++ b/kitchensync/src/syncprocess.cpp @@ -48,12 +48,12 @@ SyncProcess::~SyncProcess() mEngine = 0; } -TQString SyncProcess::grouptqStatus() const +TQString SyncProcess::groupStatus() const { return i18n( "Ready" ); } -TQString SyncProcess::membertqStatus( const QSync::Member& ) const +TQString SyncProcess::memberStatus( const QSync::Member& ) const { return i18n( "Ready" ); } diff --git a/kitchensync/src/syncprocess.h b/kitchensync/src/syncprocess.h index 31cbd50c7..0bf9b803e 100644 --- a/kitchensync/src/syncprocess.h +++ b/kitchensync/src/syncprocess.h @@ -41,8 +41,8 @@ class SyncProcess : public TQObject QSync::Group group() const { return mGroup; } QSync::Engine* engine() const { return mEngine; } - TQString grouptqStatus() const; - TQString membertqStatus( const QSync::Member &member ) const; + TQString groupStatus() const; + TQString memberStatus( const QSync::Member &member ) const; QSync::Result addMember( const QSync::Plugin &plugin ); diff --git a/kmail/Mainpage.dox b/kmail/Mainpage.dox index 9c24f4598..05802ef7c 100644 --- a/kmail/Mainpage.dox +++ b/kmail/Mainpage.dox @@ -334,7 +334,7 @@ Currently defined tag values are: IdMD5 5 u msgIdMD5().stripWhiteSpace() XMark 6 u xmark().stripWhiteSpace() Offset 7 l folderOffset() (not only mbox!) - LegacytqStatus 8 l mLegacytqStatus + LegacyStatus 8 l mLegacyStatus Size 9 l msgSize() Date 10 l date() File 11 u fileName() (not only maildir!) @@ -342,7 +342,7 @@ Currently defined tag values are: MDNSent 13 l mdnSentState() ReplyToAuxIdMD5 14 u replyToAuxIdMD5() StrippedSubject 15 u strippedSubjectMD5().stripWhiteSpace() - tqStatus 16 l status() + Status 16 l status() u: tqunicode-string-value; l: ulong-value @@ -446,7 +446,7 @@ Currently defined tags are: MBoxOffset Offset(64) Offset in mbox file (pointing to From_) MBoxLength Size(64) Length of message in mbox file (incl. From_) Size Size(64) rfc2822-size of message (in mbox: excl. From_) - tqStatus BitField (see below) + Status BitField (see below) MessageIdMD5 MD5Hash MD5Hash of _normalized_ Message-Id: MDNLink SerialNumber SerNum of MDN received for this message DNSLink SerialNumber SerNUm of DSN received for this message @@ -459,7 +459,7 @@ Currently defined tags are: "String" is either Utf8String or (Utf16String or Latin1String), depending on content -Currently allocated bits for the tqStatus BitField are: +Currently allocated bits for the Status BitField are: Bit Value: on(/off) (\\imapflag) diff --git a/kmail/aboutdata.cpp b/kmail/aboutdata.cpp index 0fa29906d..0782f3d3b 100644 --- a/kmail/aboutdata.cpp +++ b/kmail/aboutdata.cpp @@ -175,7 +175,7 @@ namespace KMail { "[email protected]", 0 }, { "Torsten Kasch", 0, 0, 0 }, // crash fix for Solaris (cf. bug:68801) { "Jason 'vanRijn' Kasper", 0, 0, 0 }, // implemented wish 79938 (configurable font for new/unread/important messages) - { "Martijn Klingens", 0, 0, 0 }, // fix keyboard navigation in the tqStatus combo of the quick search + { "Martijn Klingens", 0, 0, 0 }, // fix keyboard navigation in the Status combo of the quick search { "Christoph Kl\303\274nter", 0, 0, 0 }, // fix for bug:88216 (drag&drop from KAddressBook to the To: field) { "Martin Koller", 0, 0, 0 }, // optional columns in the message list { "Tobias K\303\266nig", 0, 0, 0 }, // edit recent addresses, store email<->OpenPGP key association in address book diff --git a/kmail/accountdialog.cpp b/kmail/accountdialog.cpp index 93616ac8f..3712346ec 100644 --- a/kmail/accountdialog.cpp +++ b/kmail/accountdialog.cpp @@ -258,7 +258,7 @@ ProcmailRCParser::expandVars(const TQString &s) TQAsciiDictIterator<TQString> it( mVars ); // iterator for dict while ( it.current() ) { - expS.replace(TQString::tqfromLatin1("$") + it.currentKey(), *it.current()); + expS.replace(TQString::fromLatin1("$") + it.currentKey(), *it.current()); ++it; } @@ -306,7 +306,7 @@ AccountDialog::AccountDialog( const TQString & caption, KMAccount *account, else { TQString msg = i18n( "Account type is not supported." ); - KMessageBox::information( tqtopLevelWidget(),msg,i18n("Configure Account") ); + KMessageBox::information( topLevelWidget(),msg,i18n("Configure Account") ); return; } @@ -361,7 +361,7 @@ void AccountDialog::makeLocalAccountPage() group->tqlayout()->setSpacing( 0 ); group->tqlayout()->setMargin( 0 ); TQGridLayout *groupLayout = new TQGridLayout( group->tqlayout() ); - groupLayout->tqsetAlignment( TQt::AlignTop ); + groupLayout->setAlignment( TQt::AlignTop ); groupLayout->setSpacing( 6 ); groupLayout->setMargin( 11 ); @@ -905,7 +905,7 @@ void AccountDialog::makeImapAccountPage( bool connected ) // button to reload TQToolButton* button = new TQToolButton( box ); button->setAutoRaise(true); - button->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); + button->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); button->setFixedSize( 22, 22 ); button->setIconSet( KGlobal::iconLoader()->loadIconSet( "reload", KIcon::Small, 0 ) ); @@ -924,7 +924,7 @@ void AccountDialog::makeImapAccountPage( bool connected ) mImap.editPNS->setIconSet( KGlobal::iconLoader()->loadIconSet( "edit", KIcon::Small, 0 ) ); mImap.editPNS->setAutoRaise( true ); - mImap.editPNS->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); + mImap.editPNS->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); mImap.editPNS->setFixedSize( 22, 22 ); connect( mImap.editPNS, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditPersonalNamespace()) ); @@ -936,7 +936,7 @@ void AccountDialog::makeImapAccountPage( bool connected ) mImap.editONS->setIconSet( KGlobal::iconLoader()->loadIconSet( "edit", KIcon::Small, 0 ) ); mImap.editONS->setAutoRaise( true ); - mImap.editONS->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); + mImap.editONS->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); mImap.editONS->setFixedSize( 22, 22 ); connect( mImap.editONS, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditOtherUsersNamespace()) ); @@ -948,7 +948,7 @@ void AccountDialog::makeImapAccountPage( bool connected ) mImap.editSNS->setIconSet( KGlobal::iconLoader()->loadIconSet( "edit", KIcon::Small, 0 ) ); mImap.editSNS->setAutoRaise( true ); - mImap.editSNS->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); + mImap.editSNS->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); mImap.editSNS->setFixedSize( 22, 22 ); connect( mImap.editSNS, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditSharedNamespace()) ); @@ -1451,7 +1451,7 @@ void AccountDialog::slotLeaveOnServerClicked() slotEnableLeaveOnServerSize( state ); } if ( !( mCurCapa & UIDL ) && mPop.leaveOnServerCheck->isChecked() ) { - KMessageBox::information( tqtopLevelWidget(), + KMessageBox::information( topLevelWidget(), i18n("The server does not seem to support unique " "message numbers, but this is a " "requirement for leaving messages on the " @@ -1466,7 +1466,7 @@ void AccountDialog::slotLeaveOnServerClicked() void AccountDialog::slotFilterOnServerClicked() { if ( !( mCurCapa & TOP ) && mPop.filterOnServerCheck->isChecked() ) { - KMessageBox::information( tqtopLevelWidget(), + KMessageBox::information( topLevelWidget(), i18n("The server does not seem to support " "fetching message headers, but this is a " "requirement for filtering messages on the " @@ -1481,7 +1481,7 @@ void AccountDialog::slotFilterOnServerClicked() void AccountDialog::slotPipeliningClicked() { if (mPop.usePipeliningCheck->isChecked()) - KMessageBox::information( tqtopLevelWidget(), + KMessageBox::information( topLevelWidget(), i18n("Please note that this feature can cause some POP3 servers " "that do not support pipelining to send corrupted mail;\n" "this is configurable, though, because some servers support pipelining " @@ -1636,7 +1636,7 @@ void AccountDialog::enablePopFeatures( unsigned int capa ) mPop.authAPOP->setEnabled( capa & APOP ); if ( !( capa & Pipelining ) && mPop.usePipeliningCheck->isChecked() ) { mPop.usePipeliningCheck->setChecked( false ); - KMessageBox::information( tqtopLevelWidget(), + KMessageBox::information( topLevelWidget(), i18n("The server does not seem to support " "pipelining; therefore, this option has " "been disabled.\n" @@ -1655,7 +1655,7 @@ void AccountDialog::enablePopFeatures( unsigned int capa ) } if ( !( capa & UIDL ) && mPop.leaveOnServerCheck->isChecked() ) { mPop.leaveOnServerCheck->setChecked( false ); - KMessageBox::information( tqtopLevelWidget(), + KMessageBox::information( topLevelWidget(), i18n("The server does not seem to support unique " "message numbers, but this is a " "requirement for leaving messages on the " @@ -1668,7 +1668,7 @@ void AccountDialog::enablePopFeatures( unsigned int capa ) } if ( !( capa & TOP ) && mPop.filterOnServerCheck->isChecked() ) { mPop.filterOnServerCheck->setChecked( false ); - KMessageBox::information( tqtopLevelWidget(), + KMessageBox::information( topLevelWidget(), i18n("The server does not seem to support " "fetching message headers, but this is a " "requirement for filtering messages on the " @@ -2307,7 +2307,7 @@ NamespaceEditDialog::NamespaceEditDialog( TQWidget *parent, button->setIconSet( KGlobal::iconLoader()->loadIconSet( "editdelete", KIcon::Small, 0 ) ); button->setAutoRaise( true ); - button->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); + button->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); button->setFixedSize( 22, 22 ); mLineEditMap[ mBg->insert( button ) ] = edit; } diff --git a/kmail/accountmanager.cpp b/kmail/accountmanager.cpp index 21a9f8cdc..a086292a8 100644 --- a/kmail/accountmanager.cpp +++ b/kmail/accountmanager.cpp @@ -149,7 +149,7 @@ void AccountManager::processNextCheck( bool _newMail ) kdDebug(5006) << "account " << acct->name() << " finished check" << endl; mAcctChecking.remove( acct ); kmkernel->filterMgr()->deref(); - disconnect( acct, TQT_SIGNAL( finishedCheck( bool, ChecktqStatus ) ), + disconnect( acct, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ), this, TQT_SLOT( processNextCheck( bool ) ) ); } if ( mAcctChecking.isEmpty() ) { @@ -219,7 +219,7 @@ void AccountManager::processNextCheck( bool _newMail ) } } - connect( curAccount, TQT_SIGNAL( finishedCheck( bool, ChecktqStatus ) ), + connect( curAccount, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ), this, TQT_SLOT( processNextCheck( bool ) ) ); KPIM::BroadcastStatus::instance()->seStatusMsg( diff --git a/kmail/acljobs.cpp b/kmail/acljobs.cpp index 33a7e5837..1ad1a69be 100644 --- a/kmail/acljobs.cpp +++ b/kmail/acljobs.cpp @@ -122,7 +122,7 @@ TQString ACLJobs::permissionsToString( unsigned int permissions ) KIO::SimpleJob* ACLJobs::setACL( KIO::Slave* slave, const KURL& url, const TQString& user, unsigned int permissions ) { - TQString perm = TQString::tqfromLatin1( permissionsToIMAPRights( permissions ) ); + TQString perm = TQString::fromLatin1( permissionsToIMAPRights( permissions ) ); TQByteArray packedArgs; TQDataStream stream( packedArgs, IO_WriteOnly ); diff --git a/kmail/actionscheduler.cpp b/kmail/actionscheduler.cpp index 71475a93d..f699ff906 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->setqStatus(msg->status()); + newMsg->seStatus(msg->status()); newMsg->setComplete(msg->isComplete()); newMsg->setHeaderField( "X-KMail-Filtered", serNumS ); mSrcFolder->addMsg( newMsg ); diff --git a/kmail/antispamwizard.cpp b/kmail/antispamwizard.cpp index 4091c715c..e0b40fc67 100644 --- a/kmail/antispamwizard.cpp +++ b/kmail/antispamwizard.cpp @@ -517,7 +517,7 @@ void AntiSpamWizard::checkToolAvailability() } else { // check the availability of the application - KApplication::kApplication()->tqprocessEvents( 200 ); + KApplication::kApplication()->processEvents( 200 ); if ( !checkForProgram( (*it).getExecutable() ) ) { mInfoPage->addAvailableTool( (*it).getVisibleName() ); found = true; diff --git a/kmail/archivefolderdialog.cpp b/kmail/archivefolderdialog.cpp index 21c345fb3..c8068ec4d 100644 --- a/kmail/archivefolderdialog.cpp +++ b/kmail/archivefolderdialog.cpp @@ -46,7 +46,7 @@ static TQString standardArchivePath( const TQString &folderName ) } return currentPath + i18n( "Start of the filename for a mail archive file" , "Archive" ) + "_" + folderName + - "_" + TQDate::tqcurrentDate().toString( Qt::ISODate ) + ".tar.bz2"; + "_" + TQDate::currentDate().toString( Qt::ISODate ) + ".tar.bz2"; } ArchiveFolderDialog::ArchiveFolderDialog( TQWidget *parent ) @@ -120,7 +120,7 @@ ArchiveFolderDialog::ArchiveFolderDialog( TQWidget *parent ) mainLayout->addItem( new TQSpacerItem( 1, 1, TQSizePolicy::Expanding, TQSizePolicy::Expanding ), row, 0 ); // Make it a bit bigger, else the folder requester cuts off the text too early - resize( 500, tqminimumSize().height() ); + resize( 500, minimumSize().height() ); } void ArchiveFolderDialog::slotUrlChanged( const TQString &text ) diff --git a/kmail/backupjob.cpp b/kmail/backupjob.cpp index 43209ca7b..af9a75c38 100644 --- a/kmail/backupjob.cpp +++ b/kmail/backupjob.cpp @@ -165,7 +165,7 @@ void BackupJob::finish() } } - mProgressItem->setqStatus( i18n( "Archiving finished" ) ); + mProgressItem->seStatus( i18n( "Archiving finished" ) ); mProgressItem->setComplete(); mProgressItem = 0; @@ -388,7 +388,7 @@ void BackupJob::archiveNextFolder() mCurrentFolder = mPendingFolders.take( 0 ); kdDebug(5006) << "===> Archiving next folder: " << mCurrentFolder->name() << endl; - mProgressItem->setqStatus( i18n( "Archiving folder %1" ).tqarg( mCurrentFolder->name() ) ); + mProgressItem->seStatus( i18n( "Archiving folder %1" ).tqarg( mCurrentFolder->name() ) ); if ( mCurrentFolder->open( "BackupJob" ) != 0 ) { abort( i18n( "Unable to open folder '%1'.").tqarg( mCurrentFolder->name() ) ); return; diff --git a/kmail/cachedimapjob.cpp b/kmail/cachedimapjob.cpp index f47cc9ddf..ec7dece78 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::tqfromLatin1(";UID=%1").tqarg(uids) ); + TQString::fromLatin1(";UID=%1").tqarg(uids) ); KIO::SimpleJob *simpleJob = KIO::file_delete( url, false ); KIO::Scheduler::assignJobToSlave( mAccount->slave(), simpleJob ); @@ -248,7 +248,7 @@ void CachedImapJob::expungeFolder() { KURL url = mAccount->getUrl(); // Special URL that means EXPUNGE - url.setPath( mFolder->imapPath() + TQString::tqfromLatin1(";UID=*") ); + url.setPath( mFolder->imapPath() + TQString::fromLatin1(";UID=*") ); KIO::SimpleJob *job = KIO::file_delete( url, false ); KIO::Scheduler::assignJobToSlave( mAccount->slave(), job ); @@ -311,7 +311,7 @@ void CachedImapJob::slotGetNextMessage(KIO::Job * job) mFolder->addMsgInternal( mMsg, true, &index ); if ( kmkernel->iCalIface().isResourceFolder( mFolder->folder() ) ) { - mFolder->setqStatus( index, KMMsgStatusRead, false ); + mFolder->seStatus( index, KMMsgStatusRead, false ); } emit messageRetrieved( mMsg ); @@ -339,7 +339,7 @@ void CachedImapJob::slotGetNextMessage(KIO::Job * job) mMsg->setUID(mfd.uid); mMsg->setMsgSizeServer(mfd.size); if( mfd.flags > 0 ) - KMFolderImap::flagsTotqStatus(mMsg, mfd.flags, true, GlobalSettings::allowLocalFlags() ? mFolder->permanentFlags() : INT_MAX); + 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)); diff --git a/kmail/compactionjob.cpp b/kmail/compactionjob.cpp index 35aa6ef3f..aa563c46e 100644 --- a/kmail/compactionjob.cpp +++ b/kmail/compactionjob.cpp @@ -103,7 +103,7 @@ int MboxCompactionJob::executeNow( bool silent ) } kdDebug(5006) << "Compacting " << mSrcFolder->idString() << endl; - if (KMFolderIndex::IndexOk != mbox->indextqStatus()) { + if (KMFolderIndex::IndexOk != mbox->indexStatus()) { kdDebug(5006) << "Critical error: " << storage->location() << " has been modified by an external application while KMail was running." << endl; // exit(1); backed out due to broken nfs diff --git a/kmail/composercryptoconfiguration.ui b/kmail/composercryptoconfiguration.ui index 7ffe6c9d3..429933d45 100644 --- a/kmail/composercryptoconfiguration.ui +++ b/kmail/composercryptoconfiguration.ui @@ -137,7 +137,7 @@ However, there may be local rules that require you to turn this option on. When <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kmail/configuredialog.cpp b/kmail/configuredialog.cpp index 59223cf89..6dd25347d 100644 --- a/kmail/configuredialog.cpp +++ b/kmail/configuredialog.cpp @@ -281,7 +281,7 @@ void ConfigureDialog::slotUser2() { // * * // ************************************************************* TQString IdentityPage::helpAnchor() const { - return TQString::tqfromLatin1("configure-identity"); + return TQString::fromLatin1("configure-identity"); } IdentityPage::IdentityPage( TQWidget * parent, const char * name ) @@ -552,7 +552,7 @@ void IdentityPage::slotUpdateTransportCombo( const TQStringList & sl ) // * * // ************************************************************* TQString AccountsPage::helpAnchor() const { - return TQString::tqfromLatin1("configure-accounts"); + return TQString::fromLatin1("configure-accounts"); } AccountsPage::AccountsPage( TQWidget * parent, const char * name ) @@ -578,7 +578,7 @@ AccountsPage::AccountsPage( TQWidget * parent, const char * name ) } TQString AccountsPage::SendingTab::helpAnchor() const { - return TQString::tqfromLatin1("configure-accounts-sending"); + return TQString::fromLatin1("configure-accounts-sending"); } AccountsPageSendingTab::AccountsPageSendingTab( TQWidget * parent, const char * name ) @@ -599,7 +599,7 @@ AccountsPageSendingTab::AccountsPageSendingTab( TQWidget * parent, const char * // hbox tqlayout: stretch 10, spacing inherited from vlay hlay = new TQHBoxLayout(); - vlay->addLayout( hlay, 10 ); // high stretch b/c of the groupbox's tqsizeHint + vlay->addLayout( hlay, 10 ); // high stretch b/c of the groupbox's sizeHint // transport list: left widget in hlay; stretch 1 // ### FIXME: allow inline renaming of the account: @@ -787,10 +787,10 @@ void AccountsPage::SendingTab::slotAddTransport() KMTransportInfo *transportInfo = new KMTransportInfo(); switch ( transportType ) { case 0: // smtp - transportInfo->type = TQString::tqfromLatin1("smtp"); + transportInfo->type = TQString::fromLatin1("smtp"); break; case 1: // sendmail - transportInfo->type = TQString::tqfromLatin1("sendmail"); + transportInfo->type = TQString::fromLatin1("sendmail"); transportInfo->name = i18n("Sendmail"); transportInfo->host = _PATH_SENDMAIL; // ### FIXME: use const, not #define break; @@ -1026,7 +1026,7 @@ void AccountsPage::SendingTab::doLoadOther() { buffer[255] = 0; else buffer[0] = 0; - str = TQString::tqfromLatin1( *buffer ? buffer : "localhost" ); + str = TQString::fromLatin1( *buffer ? buffer : "localhost" ); } mDefaultDomainEdit->setText( str ); } @@ -1053,7 +1053,7 @@ void AccountsPage::SendingTab::save() { } TQString AccountsPage::ReceivingTab::helpAnchor() const { - return TQString::tqfromLatin1("configure-accounts-receiving"); + return TQString::fromLatin1("configure-accounts-receiving"); } AccountsPageReceivingTab::AccountsPageReceivingTab( TQWidget * parent, const char * name ) @@ -1127,7 +1127,7 @@ AccountsPageReceivingTab::AccountsPageReceivingTab( TQWidget * parent, const cha // "beep on new mail" check box: mBeepNewMailCheck = new TQCheckBox(i18n("&Beep"), group ); - mBeepNewMailCheck->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, + mBeepNewMailCheck->setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed ) ); connect( mBeepNewMailCheck, TQT_SIGNAL( stateChanged( int ) ), this, TQT_SLOT( slotEmitChanged( void ) ) ); @@ -1135,7 +1135,7 @@ AccountsPageReceivingTab::AccountsPageReceivingTab( TQWidget * parent, const cha // "Detailed new mail notification" check box mVerboseNotificationCheck = new TQCheckBox( i18n( "Deta&iled new mail notification" ), group ); - mVerboseNotificationCheck->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, + mVerboseNotificationCheck->setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed ) ); TQToolTip::add( mVerboseNotificationCheck, i18n( "Show for each folder the number of newly arrived " @@ -1147,7 +1147,7 @@ AccountsPageReceivingTab::AccountsPageReceivingTab( TQWidget * parent, const cha // "Other Actions" button: mOtherNewMailActionsButton = new TQPushButton( i18n("Other Actio&ns"), group ); - mOtherNewMailActionsButton->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, + mOtherNewMailActionsButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); connect( mOtherNewMailActionsButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditNotifications()) ); @@ -1229,7 +1229,7 @@ void AccountsPage::ReceivingTab::slotAddAccount() { } KMAccount *account - = kmkernel->acctMgr()->create( TQString::tqfromLatin1( accountType ) ); + = kmkernel->acctMgr()->create( TQString::fromLatin1( accountType ) ); if ( !account ) { // ### FIXME: Give the user more information. Is this error // recoverable? @@ -1478,7 +1478,7 @@ void AccountsPage::ReceivingTab::save() { // * * // ************************************************************* TQString AppearancePage::helpAnchor() const { - return TQString::tqfromLatin1("configure-appearance"); + return TQString::fromLatin1("configure-appearance"); } AppearancePage::AppearancePage( TQWidget * parent, const char * name ) @@ -1525,7 +1525,7 @@ AppearancePage::AppearancePage( TQWidget * parent, const char * name ) TQString AppearancePage::FontsTab::helpAnchor() const { - return TQString::tqfromLatin1("configure-appearance-fonts"); + return TQString::fromLatin1("configure-appearance-fonts"); } static const struct { @@ -1694,7 +1694,7 @@ void AppearancePage::FontsTab::save() { } TQString AppearancePage::ColorsTab::helpAnchor() const { - return TQString::tqfromLatin1("configure-appearance-colors"); + return TQString::fromLatin1("configure-appearance-colors"); } @@ -1857,7 +1857,7 @@ void AppearancePage::ColorsTab::save() { } TQString AppearancePage::LayoutTab::helpAnchor() const { - return TQString::tqfromLatin1("configure-appearance-tqlayout"); + return TQString::fromLatin1("configure-appearance-tqlayout"); } static const EnumConfigEntryItem folderListModes[] = { @@ -1976,7 +1976,7 @@ void AppearancePage::LayoutTab::save() { // TQString AppearancePage::HeadersTab::helpAnchor() const { - return TQString::tqfromLatin1("configure-appearance-headers"); + return TQString::fromLatin1("configure-appearance-headers"); } static const struct { @@ -2246,7 +2246,7 @@ static const BoolConfigEntry showCurrentTime = { }; TQString AppearancePage::ReaderTab::helpAnchor() const { - return TQString::tqfromLatin1("configure-appearance-reader"); + return TQString::fromLatin1("configure-appearance-reader"); } AppearancePageReaderTab::AppearancePageReaderTab( TQWidget * parent, @@ -2472,7 +2472,7 @@ void AppearancePage::ReaderTab::installProfile( KConfig * /* profile */ ) { TQString AppearancePage::SystemTrayTab::helpAnchor() const { - return TQString::tqfromLatin1("configure-appearance-systemtray"); + return TQString::fromLatin1("configure-appearance-systemtray"); } AppearancePageSystemTrayTab::AppearancePageSystemTrayTab( TQWidget * parent, @@ -2537,7 +2537,7 @@ void AppearancePage::SystemTrayTab::save() { // ************************************************************* TQString ComposerPage::helpAnchor() const { - return TQString::tqfromLatin1("configure-composer"); + return TQString::fromLatin1("configure-composer"); } ComposerPage::ComposerPage( TQWidget * parent, const char * name ) @@ -2596,7 +2596,7 @@ ComposerPage::ComposerPage( TQWidget * parent, const char * name ) } TQString ComposerPage::GeneralTab::helpAnchor() const { - return TQString::tqfromLatin1("configure-composer-general"); + return TQString::fromLatin1("configure-composer-general"); } ComposerPageGeneralTab::ComposerPageGeneralTab( TQWidget * parent, const char * name ) @@ -2910,7 +2910,7 @@ void ComposerPage::GeneralTab::slotConfigureCompletionOrder( ) } TQString ComposerPage::PhrasesTab::helpAnchor() const { - return TQString::tqfromLatin1("configure-composer-phrases"); + return TQString::fromLatin1("configure-composer-phrases"); } ComposerPagePhrasesTab::ComposerPagePhrasesTab( TQWidget * parent, const char * name ) @@ -3122,7 +3122,7 @@ void ComposerPage::PhrasesTab::save() { } TQString ComposerPage::TemplatesTab::helpAnchor() const { - return TQString::tqfromLatin1("configure-composer-templates"); + return TQString::fromLatin1("configure-composer-templates"); } ComposerPageTemplatesTab::ComposerPageTemplatesTab( TQWidget * parent, const char * name ) @@ -3146,7 +3146,7 @@ void ComposerPage::TemplatesTab::save() { } TQString ComposerPage::CustomTemplatesTab::helpAnchor() const { - return TQString::tqfromLatin1("configure-composer-custom-templates"); + return TQString::fromLatin1("configure-composer-custom-templates"); } ComposerPageCustomTemplatesTab::ComposerPageCustomTemplatesTab( TQWidget * parent, const char * name ) @@ -3170,7 +3170,7 @@ void ComposerPage::CustomTemplatesTab::save() { } TQString ComposerPage::SubjectTab::helpAnchor() const { - return TQString::tqfromLatin1("configure-composer-subject"); + return TQString::fromLatin1("configure-composer-subject"); } ComposerPageSubjectTab::ComposerPageSubjectTab( TQWidget * parent, const char * name ) @@ -3190,7 +3190,7 @@ ComposerPageSubjectTab::ComposerPageSubjectTab( TQWidget * parent, const char * // row 0: help text: label = new TQLabel( i18n("Recognize any sequence of the following prefixes\n" "(entries are case-insensitive regular expressions):"), group ); - label->tqsetAlignment( AlignLeft|WordBreak ); + label->setAlignment( AlignLeft|WordBreak ); // row 1, string list editor: SimpleStringListEditor::ButtonCode buttonCode = @@ -3219,7 +3219,7 @@ ComposerPageSubjectTab::ComposerPageSubjectTab( TQWidget * parent, const char * // row 0: help text: label= new TQLabel( i18n("Recognize any sequence of the following prefixes\n" "(entries are case-insensitive regular expressions):"), group ); - label->tqsetAlignment( AlignLeft|WordBreak ); + label->setAlignment( AlignLeft|WordBreak ); // row 1: string list editor mForwardListEditor = @@ -3254,7 +3254,7 @@ void ComposerPage::SubjectTab::save() { } TQString ComposerPage::CharsetTab::helpAnchor() const { - return TQString::tqfromLatin1("configure-composer-charset"); + return TQString::fromLatin1("configure-composer-charset"); } ComposerPageCharsetTab::ComposerPageCharsetTab( TQWidget * parent, const char * name ) @@ -3269,7 +3269,7 @@ ComposerPageCharsetTab::ComposerPageCharsetTab( TQWidget * parent, const char * label = new TQLabel( i18n("This list is checked for every outgoing message " "from the top to the bottom for a charset that " "contains all required characters."), this ); - label->tqsetAlignment( WordBreak); + label->setAlignment( WordBreak); vlay->addWidget( label ); mCharsetListEditor = @@ -3297,13 +3297,13 @@ void ComposerPage::CharsetTab::slotVerifyCharset( TQString & charset ) { // KCharsets::codecForName("us-ascii") returns "iso-8859-1" (cf. Bug #49812) // therefore we have to treat this case specially - if ( charset.lower() == TQString::tqfromLatin1("us-ascii") ) { - charset = TQString::tqfromLatin1("us-ascii"); + if ( charset.lower() == TQString::fromLatin1("us-ascii") ) { + charset = TQString::fromLatin1("us-ascii"); return; } - if ( charset.lower() == TQString::tqfromLatin1("locale") ) { - charset = TQString::tqfromLatin1("%1 (locale)") + if ( charset.lower() == TQString::fromLatin1("locale") ) { + charset = TQString::fromLatin1("%1 (locale)") .tqarg( TQString( kmkernel->networkCodec()->mimeName() ).lower() ); return; } @@ -3311,7 +3311,7 @@ void ComposerPage::CharsetTab::slotVerifyCharset( TQString & charset ) { bool ok = false; TQTextCodec *codec = KGlobal::charsets()->codecForName( charset, ok ); if ( ok && codec ) { - charset = TQString::tqfromLatin1( codec->mimeName() ).lower(); + charset = TQString::fromLatin1( codec->mimeName() ).lower(); return; } @@ -3325,7 +3325,7 @@ void ComposerPage::CharsetTab::doLoadOther() { TQStringList charsets = composer.readListEntry( "pref-charsets" ); for ( TQStringList::Iterator it = charsets.begin() ; it != charsets.end() ; ++it ) - if ( (*it) == TQString::tqfromLatin1("locale") ) { + if ( (*it) == TQString::fromLatin1("locale") ) { TQCString cset = kmkernel->networkCodec()->mimeName(); KPIM::kAsciiToLower( cset.data() ); (*it) = TQString("%1 (locale)").tqarg( TQString(cset) ); @@ -3349,7 +3349,7 @@ void ComposerPage::CharsetTab::save() { } TQString ComposerPage::HeadersTab::helpAnchor() const { - return TQString::tqfromLatin1("configure-composer-headers"); + return TQString::fromLatin1("configure-composer-headers"); } ComposerPageHeadersTab::ComposerPageHeadersTab( TQWidget * parent, const char * name ) @@ -3564,7 +3564,7 @@ void ComposerPage::HeadersTab::save() { } TQString ComposerPage::AttachmentsTab::helpAnchor() const { - return TQString::tqfromLatin1("configure-composer-attachments"); + return TQString::fromLatin1("configure-composer-attachments"); } ComposerPageAttachmentsTab::ComposerPageAttachmentsTab( TQWidget * parent, @@ -3601,7 +3601,7 @@ ComposerPageAttachmentsTab::ComposerPageAttachmentsTab( TQWidget * parent, // "Attachment key words" label and string list editor label = new TQLabel( i18n("Recognize any of the following key words as " "intention to attach a file:"), this ); - label->tqsetAlignment( AlignLeft|WordBreak ); + label->setAlignment( AlignLeft|WordBreak ); vlay->addWidget( label ); SimpleStringListEditor::ButtonCode buttonCode = @@ -3629,11 +3629,11 @@ void ComposerPage::AttachmentsTab::doLoadFromGlobalSettings() { TQStringList attachWordsList = GlobalSettings::self()->attachmentKeywords(); if ( attachWordsList.isEmpty() ) { // default value - attachWordsList << TQString::tqfromLatin1("attachment") - << TQString::tqfromLatin1("attached"); - if ( TQString::tqfromLatin1("attachment") != i18n("attachment") ) + attachWordsList << TQString::fromLatin1("attachment") + << TQString::fromLatin1("attached"); + if ( TQString::fromLatin1("attachment") != i18n("attachment") ) attachWordsList << i18n("attachment"); - if ( TQString::tqfromLatin1("attached") != i18n("attached") ) + if ( TQString::fromLatin1("attached") != i18n("attached") ) attachWordsList << i18n("attached"); } @@ -3669,7 +3669,7 @@ void ComposerPageAttachmentsTab::slotOutlookCompatibleClicked() // * * // ************************************************************* TQString SecurityPage::helpAnchor() const { - return TQString::tqfromLatin1("configure-security"); + return TQString::fromLatin1("configure-security"); } SecurityPage::SecurityPage( TQWidget * parent, const char * name ) @@ -3716,7 +3716,7 @@ void SecurityPage::installProfile( KConfig * profile ) { } TQString SecurityPage::GeneralTab::helpAnchor() const { - return TQString::tqfromLatin1("configure-security-reading"); + return TQString::fromLatin1("configure-security-reading"); } SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char * name ) @@ -3993,7 +3993,7 @@ void SecurityPage::GeneralTab::save() { TQString SecurityPage::ComposerCryptoTab::helpAnchor() const { - return TQString::tqfromLatin1("configure-security-composing"); + return TQString::fromLatin1("configure-security-composing"); } SecurityPageComposerCryptoTab::SecurityPageComposerCryptoTab( TQWidget * parent, const char * name ) @@ -4068,7 +4068,7 @@ void SecurityPage::ComposerCryptoTab::save() { } TQString SecurityPage::WarningTab::helpAnchor() const { - return TQString::tqfromLatin1("configure-security-warnings"); + return TQString::fromLatin1("configure-security-warnings"); } SecurityPageWarningTab::SecurityPageWarningTab( TQWidget * parent, const char * name ) @@ -4177,7 +4177,7 @@ void SecurityPage::WarningTab::slotReenableAllWarningsClicked() { //// TQString SecurityPage::SMimeTab::helpAnchor() const { - return TQString::tqfromLatin1("configure-security-smime-validation"); + return TQString::fromLatin1("configure-security-smime-validation"); } SecurityPageSMimeTab::SecurityPageSMimeTab( TQWidget * parent, const char * name ) @@ -4495,7 +4495,7 @@ Kleo::CryptoConfigEntry* SMIMECryptoConfigEntries::configEntry( const char* comp //// TQString SecurityPage::CryptPlugTab::helpAnchor() const { - return TQString::tqfromLatin1("configure-security-crypto-backends"); + return TQString::fromLatin1("configure-security-crypto-backends"); } SecurityPageCryptPlugTab::SecurityPageCryptPlugTab( TQWidget * parent, const char * name ) @@ -4528,7 +4528,7 @@ void SecurityPage::CryptPlugTab::save() { // * * // ************************************************************* TQString MiscPage::helpAnchor() const { - return TQString::tqfromLatin1("configure-misc"); + return TQString::fromLatin1("configure-misc"); } MiscPage::MiscPage( TQWidget * parent, const char * name ) @@ -4543,7 +4543,7 @@ MiscPage::MiscPage( TQWidget * parent, const char * name ) } TQString MiscPage::FolderTab::helpAnchor() const { - return TQString::tqfromLatin1("configure-misc-folders"); + return TQString::fromLatin1("configure-misc-folders"); } MiscPageFolderTab::MiscPageFolderTab( TQWidget * parent, const char * name ) @@ -4797,7 +4797,7 @@ void MiscPage::FolderTab::save() { } TQString MiscPage::GroupwareTab::helpAnchor() const { - return TQString::tqfromLatin1("configure-misc-groupware"); + return TQString::fromLatin1("configure-misc-groupware"); } MiscPageGroupwareTab::MiscPageGroupwareTab( TQWidget* parent, const char* name ) diff --git a/kmail/configuredialog_p.cpp b/kmail/configuredialog_p.cpp index 6357e1e86..ccc0230b1 100644 --- a/kmail/configuredialog_p.cpp +++ b/kmail/configuredialog_p.cpp @@ -43,7 +43,7 @@ NewIdentityDialog::NewIdentityDialog( const TQStringList & identities, : KDialogBase( parent, name, modal, i18n("New Identity"), Ok|Cancel|Help, Ok, true ) { - setHelp( TQString::tqfromLatin1("configure-identity-newidentitydialog") ); + setHelp( TQString::fromLatin1("configure-identity-newidentitydialog") ); TQWidget * page = makeMainWidget(); TQVBoxLayout * vlay = new TQVBoxLayout( page, 0, spacingHint() ); @@ -169,26 +169,26 @@ void ListView::setVisibleItem( int visibleItem, bool updateSize ) mVisibleItem = TQMAX( 1, visibleItem ); if( updateSize == true ) { - TQSize s = tqsizeHint(); - setMinimumSize( s.width() + verticalScrollBar()->tqsizeHint().width() + + TQSize s = sizeHint(); + setMinimumSize( s.width() + verticalScrollBar()->sizeHint().width() + lineWidth() * 2, s.height() ); } } -TQSize ListView::tqsizeHint() const +TQSize ListView::sizeHint() const { - TQSize s = TQListView::tqsizeHint(); + TQSize s = TQListView::sizeHint(); int h = fontMetrics().height() + 2*itemMargin(); if( h % 2 > 0 ) { h++; } - s.setHeight( h*mVisibleItem + lineWidth()*2 + header()->tqsizeHint().height()); + s.setHeight( h*mVisibleItem + lineWidth()*2 + header()->sizeHint().height()); return s; } -static TQString flagPng = TQString::tqfromLatin1("/flag.png"); +static TQString flagPng = TQString::fromLatin1("/flag.png"); NewLanguageDialog::NewLanguageDialog( LanguageItemList & suppressedLangs, TQWidget *parent, const char *name, @@ -203,7 +203,7 @@ NewLanguageDialog::NewLanguageDialog( LanguageItemList & suppressedLangs, hlay->addWidget( mComboBox, 1 ); TQStringList pathList = KGlobal::dirs()->findAllResources( "locale", - TQString::tqfromLatin1("*/entry.desktop") ); + TQString::fromLatin1("*/entry.desktop") ); // extract a list of language tags that should not be included: TQStringList suppressedAcronyms; for ( LanguageItemList::Iterator lit = suppressedLangs.begin(); @@ -224,7 +224,7 @@ NewLanguageDialog::NewLanguageDialog( LanguageItemList & suppressedLangs, if ( suppressedAcronyms.find( acronym ) == suppressedAcronyms.end() ) { // not found: - TQString displayname = TQString::tqfromLatin1("%1 (%2)") + TQString displayname = TQString::fromLatin1("%1 (%2)") .tqarg( name ).tqarg( acronym ); TQPixmap flag( locate("locale", acronym + flagPng ) ); mComboBox->insertItem( flag, displayname ); @@ -251,11 +251,11 @@ LanguageComboBox::LanguageComboBox( bool rw, TQWidget *parent, const char *name int LanguageComboBox::insertLanguage( const TQString & language ) { - static TQString entryDesktop = TQString::tqfromLatin1("/entry.desktop"); + static TQString entryDesktop = TQString::fromLatin1("/entry.desktop"); KSimpleConfig entry( locate("locale", language + entryDesktop) ); entry.setGroup( "KCM Locale" ); TQString name = entry.readEntry( "Name" ); - TQString output = TQString::tqfromLatin1("%1 (%2)").tqarg( name ).tqarg( language ); + TQString output = TQString::fromLatin1("%1 (%2)").tqarg( name ).tqarg( 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::tqfromLatin1("(%1)").tqarg( language ); + TQString parenthizedLanguage = TQString::fromLatin1("(%1)").tqarg( language ); for (int i = 0; i < count(); i++) // ### FIXME: use .endWith(): if ( text(i).find( parenthizedLanguage ) >= 0 ) { @@ -323,7 +323,7 @@ void ProfileDialog::slotSelectionChanged() void ProfileDialog::setup() { mListView->clear(); // find all profiles (config files named "profile-xyz-rc"): - const TQString profileFilenameFilter = TQString::tqfromLatin1("kmail/profile-*-rc"); + const TQString profileFilenameFilter = TQString::fromLatin1("kmail/profile-*-rc"); mProfileList = KGlobal::dirs()->findAllResources( "data", profileFilenameFilter ); kdDebug(5006) << "Profile manager: found " << mProfileList.count() diff --git a/kmail/configuredialog_p.h b/kmail/configuredialog_p.h index e095b1756..51dca5e16 100644 --- a/kmail/configuredialog_p.h +++ b/kmail/configuredialog_p.h @@ -1094,7 +1094,7 @@ public: void resizeColums(); void setVisibleItem( int visibleItem, bool updateSize=true ); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; protected: virtual void resizeEvent( TQResizeEvent *e ); diff --git a/kmail/customtemplates_base.ui b/kmail/customtemplates_base.ui index 7060794cc..c72ccec05 100644 --- a/kmail/customtemplates_base.ui +++ b/kmail/customtemplates_base.ui @@ -47,7 +47,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> diff --git a/kmail/expirypropertiesdialog.cpp b/kmail/expirypropertiesdialog.cpp index e992eace5..b6b0f6d7f 100644 --- a/kmail/expirypropertiesdialog.cpp +++ b/kmail/expirypropertiesdialog.cpp @@ -73,7 +73,7 @@ ExpiryPropertiesDialog::ExpiryPropertiesDialog( KMFolderTree* tree, KMFolder* fo labelDays2 = new TQLabel( privateLayoutWidget, "labelDays2" ); labelDays2->setText( i18n( "days" ) ); - labelDays2->tqsetAlignment( int( TQLabel::AlignTop ) ); + labelDays2->setAlignment( int( TQLabel::AlignTop ) ); unreadHBox->addWidget( labelDays2 ); globalVBox->addLayout( unreadHBox ); @@ -81,7 +81,7 @@ ExpiryPropertiesDialog::ExpiryPropertiesDialog( KMFolderTree* tree, KMFolder* fo expiryActionLabel = new TQLabel( privateLayoutWidget, "expiryActionLabel" ); expiryActionLabel->setText( i18n( "Expiry action:" ) ); - expiryActionLabel->tqsetAlignment( int( TQLabel::AlignVCenter ) ); + expiryActionLabel->setAlignment( int( TQLabel::AlignVCenter ) ); expiryActionHBox->addWidget( expiryActionLabel ); actionsHBox = new TQVBoxLayout( 0, 0, 6, "actionsHBox"); @@ -111,7 +111,7 @@ ExpiryPropertiesDialog::ExpiryPropertiesDialog( KMFolderTree* tree, KMFolder* fo note = new TQLabel( privateLayoutWidget, "note" ); note->setText( i18n( "Note: Expiry action will be applied immediately after confirming settings." ) ); - note->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) ); + note->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) ); globalVBox->addWidget( note ); // Load the values from the folder @@ -144,7 +144,7 @@ ExpiryPropertiesDialog::ExpiryPropertiesDialog( KMFolderTree* tree, KMFolder* fo folderSelector->setFolder( destFolder ); } slotUpdateControls(); - resize( TQSize(295, 204).expandedTo(tqminimumSizeHint()) ); + resize( TQSize(295, 204).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); } diff --git a/kmail/folderdiaacltab.cpp b/kmail/folderdiaacltab.cpp index 26daf6a23..63b67ffc4 100644 --- a/kmail/folderdiaacltab.cpp +++ b/kmail/folderdiaacltab.cpp @@ -328,7 +328,7 @@ KMail::FolderDiaACLTab::FolderDiaACLTab( KMFolderDialog* dlg, TQWidget* parent, topLayout->addWidget( mStack ); mLabel = new TQLabel( mStack ); - mLabel->tqsetAlignment( AlignHCenter | AlignVCenter | WordBreak ); + mLabel->setAlignment( AlignHCenter | AlignVCenter | WordBreak ); mStack->addWidget( mLabel ); mACLWidget = new TQHBox( mStack ); @@ -352,7 +352,7 @@ KMail::FolderDiaACLTab::FolderDiaACLTab( KMFolderDialog* dlg, TQWidget* parent, mEditACL = new KPushButton( i18n( "Modify Entry..." ), buttonBox ); mRemoveACL = new KPushButton( i18n( "Remove Entry" ), buttonBox ); TQWidget *spacer = new TQWidget( buttonBox ); - spacer->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ); + spacer->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ); connect( mAddACL, TQT_SIGNAL( clicked() ), TQT_SLOT( slotAddACL() ) ); connect( mEditACL, TQT_SIGNAL( clicked() ), TQT_SLOT( slotEditACL() ) ); @@ -632,7 +632,7 @@ void KMail::FolderDiaACLTab::slotRemoveACL() return; if ( !ACLitem->isNew() ) { if ( mImapAccount && mImapAccount->login() == ACLitem->userId() ) { - if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel( tqtopLevelWidget(), + if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel( topLevelWidget(), i18n( "Do you really want to remove your own permissions for this folder? You will not be able to access it afterwards." ), i18n( "Remove" ) ) ) return; } @@ -642,7 +642,7 @@ void KMail::FolderDiaACLTab::slotRemoveACL() emit changed(true); } -KMail::FolderDiaTab::AcceptqStatus KMail::FolderDiaACLTab::accept() +KMail::FolderDiaTab::AccepStatus KMail::FolderDiaACLTab::accept() { if ( !mChanged || !mImapAccount ) return Accepted; // (no change made), ok for accepting the dialog immediately diff --git a/kmail/folderdiaacltab.h b/kmail/folderdiaacltab.h index 901e12d1e..f518cbd35 100644 --- a/kmail/folderdiaacltab.h +++ b/kmail/folderdiaacltab.h @@ -94,7 +94,7 @@ public: virtual void load(); virtual bool save(); - virtual AcceptqStatus accept(); + virtual AccepStatus accept(); static bool supports( KMFolder* refFolder ); diff --git a/kmail/folderdiaquotatab.cpp b/kmail/folderdiaquotatab.cpp index 195a00b1f..7c133bb8f 100644 --- a/kmail/folderdiaquotatab.cpp +++ b/kmail/folderdiaquotatab.cpp @@ -62,7 +62,7 @@ KMail::FolderDiaQuotaTab::FolderDiaQuotaTab( KMFolderDialog* dlg, TQWidget* pare topLayout->addWidget( mStack ); mLabel = new TQLabel( mStack ); - mLabel->tqsetAlignment( AlignHCenter | AlignVCenter | WordBreak ); + mLabel->setAlignment( AlignHCenter | AlignVCenter | WordBreak ); mStack->addWidget( mLabel ); mQuotaWidget = new KMail::QuotaWidget( mStack ); @@ -187,7 +187,7 @@ void KMail::FolderDiaQuotaTab::showQuotaWidget() } -KMail::FolderDiaTab::AcceptqStatus KMail::FolderDiaQuotaTab::accept() +KMail::FolderDiaTab::AccepStatus KMail::FolderDiaQuotaTab::accept() { if ( mFolderType == KMFolderTypeCachedImap || mFolderType == KMFolderTypeImap ) return Accepted; diff --git a/kmail/folderdiaquotatab.h b/kmail/folderdiaquotatab.h index 9d2d968db..be91bba2b 100644 --- a/kmail/folderdiaquotatab.h +++ b/kmail/folderdiaquotatab.h @@ -60,7 +60,7 @@ public: virtual void load(); virtual bool save(); - virtual AcceptqStatus accept(); + virtual AccepStatus accept(); static bool supports( KMFolder* refFolder ); diff --git a/kmail/folderpropertiesdialog.ui b/kmail/folderpropertiesdialog.ui index b154aac12..c21b2d4b7 100644 --- a/kmail/folderpropertiesdialog.ui +++ b/kmail/folderpropertiesdialog.ui @@ -73,7 +73,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -104,7 +104,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -140,13 +140,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>28</width> <height>28</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>28</width> <height>28</height> @@ -166,7 +166,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -188,13 +188,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>28</width> <height>28</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>28</width> <height>28</height> @@ -228,7 +228,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>101</width> <height>20</height> @@ -296,7 +296,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -321,7 +321,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -434,7 +434,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -507,7 +507,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>120</width> <height>80</height> diff --git a/kmail/folderrequester.cpp b/kmail/folderrequester.cpp index 23636e365..242037b9a 100644 --- a/kmail/folderrequester.cpp +++ b/kmail/folderrequester.cpp @@ -55,7 +55,7 @@ FolderRequester::FolderRequester( TQWidget *parent, KMFolderTree *tree ) button->setIconSet( KGlobal::iconLoader()->loadIconSet( "folder", KIcon::Small, 0 ) ); connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotOpenDialog()) ); - tqsetSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, + setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed ) ); setFocusPolicy( TQ_StrongFocus ); } diff --git a/kmail/folderstorage.cpp b/kmail/folderstorage.cpp index 63dc91fb5..57241cd4b 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->setqStatus(KMMsgStatusUnread); + msgBase->seStatus(KMMsgStatusUnread); msgBase->setDirty(true); } } @@ -861,18 +861,18 @@ bool FolderStorage::isCloseToQuota() const } //----------------------------------------------------------------------------- -void FolderStorage::msgStatusChanged(const KMMsgtqStatus oldtqStatus, - const KMMsgtqStatus newtqStatus, int idx) +void FolderStorage::msgStatusChanged(const KMMsgStatus oldStatus, + const KMMsgStatus newStatus, int idx) { int oldUnread = 0; int newUnread = 0; - if (((oldtqStatus & KMMsgStatusUnread || oldtqStatus & KMMsgStatusNew) && - !(oldtqStatus & KMMsgStatusIgnored)) || + if (((oldStatus & KMMsgStatusUnread || oldStatus & KMMsgStatusNew) && + !(oldStatus & KMMsgStatusIgnored)) || (folder() == kmkernel->outboxFolder())) oldUnread = 1; - if (((newtqStatus & KMMsgStatusUnread || newtqStatus & KMMsgStatusNew) && - !(newtqStatus & KMMsgStatusIgnored)) || + if (((newStatus & KMMsgStatusUnread || newStatus & KMMsgStatusNew) && + !(newStatus & KMMsgStatusIgnored)) || (folder() == kmkernel->outboxFolder())) newUnread = 1; int deltaUnread = newUnread - oldUnread; @@ -1040,24 +1040,24 @@ void FolderStorage::setRDict( KMMsgDictREntry *rentry ) const } //----------------------------------------------------------------------------- -void FolderStorage::setqStatus(int idx, KMMsgtqStatus status, bool toggle) +void FolderStorage::seStatus(int idx, KMMsgStatus status, bool toggle) { KMMsgBase *msg = getMsgBase(idx); if ( msg ) { if (toggle) - msg->toggletqStatus(status, idx); + msg->toggleStatus(status, idx); else - msg->setqStatus(status, idx); + msg->seStatus(status, idx); } } //----------------------------------------------------------------------------- -void FolderStorage::setqStatus(TQValueList<int>& ids, KMMsgtqStatus status, bool toggle) +void FolderStorage::seStatus(TQValueList<int>& ids, KMMsgStatus status, bool toggle) { for ( TQValueList<int>::Iterator it = ids.begin(); it != ids.end(); ++it ) { - FolderStorage::setqStatus(*it, status, toggle); + FolderStorage::seStatus(*it, status, toggle); } } diff --git a/kmail/folderstorage.h b/kmail/folderstorage.h index 550b45e55..390675a25 100644 --- a/kmail/folderstorage.h +++ b/kmail/folderstorage.h @@ -245,10 +245,10 @@ public: * be reflected in the UI. */ virtual bool isCloseToQuota() const; - /** Called by KMMsgBase::setqStatus when status of a message has changed + /** Called by KMMsgBase::seStatus when status of a message has changed required to keep the number unread messages variable current. */ - virtual void msgStatusChanged( const KMMsgtqStatus oldtqStatus, - const KMMsgtqStatus newtqStatus, + virtual void msgStatusChanged( const KMMsgStatus oldStatus, + const KMMsgStatus newStatus, int idx); /** Open folder for access. @@ -364,10 +364,10 @@ public: void deregisterFromMessageDict(); /** Set the status of the message at index @p idx to @p status. */ - virtual void setqStatus(int idx, KMMsgtqStatus status, bool toggle=false); + virtual void seStatus(int idx, KMMsgStatus status, bool toggle=false); /** Set the status of the message(s) in the TQValueList @p ids to @p status. */ - virtual void setqStatus(TQValueList<int>& ids, KMMsgtqStatus status, bool toggle=false); + virtual void seStatus(TQValueList<int>& ids, KMMsgStatus status, bool toggle=false); void removeJobs(); diff --git a/kmail/folderviewtooltip.h b/kmail/folderviewtooltip.h index 8e4f56ddd..096d22764 100644 --- a/kmail/folderviewtooltip.h +++ b/kmail/folderviewtooltip.h @@ -20,8 +20,8 @@ class FolderViewToolTip : public TQToolTip KMFolderTreeItem *item = dynamic_cast<KMFolderTreeItem*>( mListView->itemAt( point ) ); if ( !item ) return; - const TQRect tqitemRect = mListView->tqitemRect( item ); - if ( !tqitemRect.isValid() ) + const TQRect itemRect = mListView->itemRect( item ); + if ( !itemRect.isValid() ) return; const TQRect headerRect = mListView->header()->sectionRect( 0 ); if ( !headerRect.isValid() ) @@ -43,7 +43,7 @@ class FolderViewToolTip : public TQToolTip tipText += i18n("<br>Quota: %1").tqarg( info.toString() ); } - tip( TQRect( headerRect.left(), tqitemRect.top(), headerRect.width(), tqitemRect.height() ), tipText ); + tip( TQRect( headerRect.left(), itemRect.top(), headerRect.width(), itemRect.height() ), tipText ); } private: diff --git a/kmail/headeritem.cpp b/kmail/headeritem.cpp index 81a4252cb..14d467327 100644 --- a/kmail/headeritem.cpp +++ b/kmail/headeritem.cpp @@ -309,7 +309,7 @@ const TQPixmap *HeaderItem::pixmap(int col) const if ( msgBase->isWatched() ) pixmaps << *KMHeaders::pixWatched; } - if ( !headers->mPaintInfo.showtqStatus ) { + if ( !headers->mPaintInfo.showStatus ) { const TQPixmap *pix = statusIcon(msgBase); if ( pix ) pixmaps << *pix; } diff --git a/kmail/headerlistquicksearch.cpp b/kmail/headerlistquicksearch.cpp index 4d5669a1a..5fe00e022 100644 --- a/kmail/headerlistquicksearch.cpp +++ b/kmail/headerlistquicksearch.cpp @@ -51,7 +51,7 @@ HeaderListQuickSearch::HeaderListQuickSearch( TQWidget *parent, KListView *listView, KActionCollection *actionCollection, const char *name ) - : KListViewSearchLine(parent, listView, name), mStatusCombo(0), mtqStatus(0), statusList() + : KListViewSearchLine(parent, listView, name), mStatusCombo(0), mStatus(0), statusList() { KAction *resetQuickSearch = new KAction( i18n( "Reset Quick Search" ), TQApplication::reverseLayout() @@ -72,16 +72,16 @@ HeaderListQuickSearch::HeaderListQuickSearch( TQWidget *parent, mStatusCombo->setSizeLimit( 12 ); mStatusCombo->insertItem( SmallIcon( "run" ), i18n("Any Status") ); - insertqStatus( StatusUnread ); - insertqStatus( StatusNew ); - insertqStatus( StatusImportant ); - insertqStatus( StatusReplied ); - insertqStatus( StatusForwarded ); - insertqStatus( StatusToDo ); - insertqStatus( StatusHasAttachment ); - insertqStatus( StatusInvitation ); - insertqStatus( StatusWatched ); - insertqStatus( StatusIgnored ); + inserStatus( StatusUnread ); + inserStatus( StatusNew ); + inserStatus( StatusImportant ); + inserStatus( StatusReplied ); + inserStatus( StatusForwarded ); + inserStatus( StatusToDo ); + inserStatus( StatusHasAttachment ); + inserStatus( StatusInvitation ); + inserStatus( StatusWatched ); + inserStatus( StatusIgnored ); mStatusCombo->setCurrentItem( 0 ); mStatusCombo->installEventFilter( this ); connect( mStatusCombo, TQT_SIGNAL ( activated( int ) ), @@ -145,10 +145,10 @@ bool HeaderListQuickSearch::eventFilter( TQObject *watched, TQEvent *event ) bool HeaderListQuickSearch::itemMatches(const TQListViewItem *item, const TQString &s) const { mCurrentSearchTerm = s; // bit of a hack, but works - if ( mtqStatus != 0 ) { + if ( mStatus != 0 ) { KMHeaders *headers = static_cast<KMHeaders*>( item->listView() ); const KMMsgBase *msg = headers->getMsgBaseForItem( item ); - if ( !msg || ! ( msg->status() & mtqStatus ) ) + if ( !msg || ! ( msg->status() & mStatus ) ) return false; } @@ -176,13 +176,13 @@ void HeaderListQuickSearch::reset() void HeaderListQuickSearch::sloStatusChanged( int index ) { if ( index == 0 ) - mtqStatus = 0; + mStatus = 0; else - mtqStatus = KMSearchRuletqStatus::statusFromEnglishName( statusList[index - 1] ); + mStatus = KMSearchRuleStatus::statusFromEnglishName( statusList[index - 1] ); updateSearch(); } -void HeaderListQuickSearch::insertqStatus(KMail::StatusValueTypes which) +void HeaderListQuickSearch::inserStatus(KMail::StatusValueTypes which) { mStatusCombo->insertItem( SmallIcon( KMail::StatusValues[which].icon ), i18n( KMail::StatusValues[ which ].text ) ); @@ -196,9 +196,9 @@ TQString HeaderListQuickSearch::currentSearchTerm() const } -int HeaderListQuickSearch::currentqStatus() const +int HeaderListQuickSearch::currenStatus() const { - return mtqStatus; + return mStatus; } } // namespace KMail diff --git a/kmail/headerlistquicksearch.h b/kmail/headerlistquicksearch.h index e0589c7d6..0e3c4c9de 100644 --- a/kmail/headerlistquicksearch.h +++ b/kmail/headerlistquicksearch.h @@ -31,7 +31,7 @@ #ifndef KMAILHEADERLISTQUICKSEARCH_H #define KMAILHEADERLISTQUICKSEARCH_H -#include "kmmsgbase.h" // for KMMsgtqStatus +#include "kmmsgbase.h" // for KMMsgStatus #include "kmsearchpattern.h" #include <klistviewsearchline.h> #include <tqvaluevector.h> @@ -67,7 +67,7 @@ public: /** * Returns the currently selected status filter. */ - int currentqStatus() const; + int currenStatus() const; public slots: void reset(); @@ -78,22 +78,22 @@ signals: protected: /** * checks whether @param item contains the search string and has the status - * currently in mtqStatus + * currently in mStatus */ virtual bool itemMatches(const TQListViewItem *item, const TQString &s) const; private slots: /** - * cache the status in mtqStatus so as to avoid having to do the comparatively + * cache the status in mStatus so as to avoid having to do the comparatively * expensive string comparison for each item in itemMatches */ void sloStatusChanged( int index ); private: /** Helper method for the filling of the status combo. */ - void insertqStatus(KMail::StatusValueTypes which); + void inserStatus(KMail::StatusValueTypes which); TQComboBox *mStatusCombo; - KMMsgtqStatus mtqStatus; + KMMsgStatus mStatus; TQValueVector<TQString> statusList; mutable TQString mCurrentSearchTerm; }; diff --git a/kmail/headerstyle.cpp b/kmail/headerstyle.cpp index ac45aeeb6..405f802b1 100644 --- a/kmail/headerstyle.cpp +++ b/kmail/headerstyle.cpp @@ -457,7 +457,7 @@ namespace KMail { } // Spam header display. - // If the spamSpamtqStatus config value is true then we look for headers + // If the spamSpamStatus config value is true then we look for headers // from a few spam filters and try to create visually meaningful graphics // out of the spam scores. @@ -493,7 +493,7 @@ namespace KMail { presence = imProxy->presenceString( kabcUid ); if ( !presence.isEmpty() ) { - TQString presenceIcon = TQString::tqfromLatin1( " <img src=\"%1\"/>" ) + TQString presenceIcon = TQString::fromLatin1( " <img src=\"%1\"/>" ) .tqarg( imgToDataUrl( imProxy->presenceIcon( kabcUid ).convertToImage() ) ); presence += presenceIcon; } @@ -830,8 +830,8 @@ namespace KMail { headerStr.append( TQString( "<tr><th>%1</th>\n" "<td dir=\"%2\">%3</td></tr>\n") .tqarg(i18n("Sender status: ")) - .tqarg( directionOf( onlinetqStatus ) ) - .tqarg(onlinetqStatus)); + .tqarg( directionOf( onlineStatus ) ) + .tqarg(onlineStatus)); */ headerStr.append( TQString("<tr><td colspan=\"2\"><div id=\"attachmentInjectionPoint\"></div></td></tr>" ) ); headerStr.append( @@ -853,7 +853,7 @@ namespace KMail { TQBuffer buffer( ba ); buffer.open( IO_WriteOnly ); image.save( &buffer, fmt ); - return TQString::tqfromLatin1("data:image/%1;base64,%2") + return TQString::fromLatin1("data:image/%1;base64,%2") .tqarg( fmt, KCodecs::base64Encode( ba ).data() ); } diff --git a/kmail/htmlstatusbar.cpp b/kmail/htmlstatusbar.cpp index 79af65979..d8c002515 100644 --- a/kmail/htmlstatusbar.cpp +++ b/kmail/htmlstatusbar.cpp @@ -52,9 +52,9 @@ KMail::HtmlStatusBar::HtmlStatusBar( TQWidget * parent, const char * name, WFlag : TQLabel( parent, name, f ), mMode( Normal ) { - tqsetAlignment( AlignHCenter|AlignTop ); + setAlignment( AlignHCenter|AlignTop ); // Don't force a minimum height to the reader widget - tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Ignored ) ); + setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Ignored ) ); upd(); } diff --git a/kmail/identitydrag.cpp b/kmail/identitydrag.cpp index 106cb5896..88df48f6a 100644 --- a/kmail/identitydrag.cpp +++ b/kmail/identitydrag.cpp @@ -54,7 +54,7 @@ namespace KMail { return 0; } - TQByteArray IdentityDrag::tqencodedData( const char * mimetype ) const { + TQByteArray IdentityDrag::encodedData( const char * mimetype ) const { TQByteArray a; if ( !qstrcmp( mimetype, kmailIdentityMimeType ) ) { @@ -73,7 +73,7 @@ namespace KMail { bool IdentityDrag::decode( const TQMimeSource * e, KPIM::Identity & i ) { if ( e->provides( kmailIdentityMimeType ) ) { - TQDataStream s( e->tqencodedData( kmailIdentityMimeType ), IO_ReadOnly ); + TQDataStream s( e->encodedData( kmailIdentityMimeType ), IO_ReadOnly ); s >> i; return true; } diff --git a/kmail/identitydrag.h b/kmail/identitydrag.h index a93095ff5..d0e468a17 100644 --- a/kmail/identitydrag.h +++ b/kmail/identitydrag.h @@ -52,7 +52,7 @@ namespace KMail { virtual ~IdentityDrag() {} const char * format( int i ) const; // reimp. TQMimeSource - TQByteArray tqencodedData( const char * mimetype ) const; // dto. + TQByteArray encodedData( const char * mimetype ) const; // dto. static bool canDecode( const TQMimeSource * e ); static bool decode( const TQMimeSource * e, KPIM::Identity & ident ); diff --git a/kmail/imapaccountbase.cpp b/kmail/imapaccountbase.cpp index f1dbaae11..df90dfdb2 100644 --- a/kmail/imapaccountbase.cpp +++ b/kmail/imapaccountbase.cpp @@ -1031,9 +1031,9 @@ namespace KMail { mCheckingSingleFolder = ( type == Single ); if ( checkingMail() ) { - disconnect( this, TQT_SIGNAL( finishedCheck( bool, ChecktqStatus ) ), + disconnect( this, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ), this, TQT_SLOT( slotCheckQueuedFolders() ) ); - connect( this, TQT_SIGNAL( finishedCheck( bool, ChecktqStatus ) ), + connect( this, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ), this, TQT_SLOT( slotCheckQueuedFolders() ) ); } else { slotCheckQueuedFolders(); @@ -1043,7 +1043,7 @@ namespace KMail { //----------------------------------------------------------------------------- void ImapAccountBase::slotCheckQueuedFolders() { - disconnect( this, TQT_SIGNAL( finishedCheck( bool, ChecktqStatus ) ), + disconnect( this, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ), this, TQT_SLOT( slotCheckQueuedFolders() ) ); TQValueList<TQGuardedPtr<KMFolder> > mSaveList = mMailCheckFolders; @@ -1194,7 +1194,7 @@ namespace KMail { } //----------------------------------------------------------------------------- - void ImapAccountBase::setImaptqStatus( KMFolder* folder, const TQString& path, const TQCString& flags ) + void ImapAccountBase::setImapStatus( KMFolder* folder, const TQString& path, const TQCString& flags ) { // set the status on the server, the uids are integrated in the path kdDebug(5006) << "setImapStatus path=" << path << " to: " << flags << endl; @@ -1218,7 +1218,7 @@ namespace KMail { TQT_SLOT(slotSeStatusResult(KIO::Job *))); } - void ImapAccountBase::setImapSeentqStatus(KMFolder * folder, const TQString & path, bool seen) + void ImapAccountBase::setImapSeenStatus(KMFolder * folder, const TQString & path, bool seen) { KURL url = getUrl(); url.setPath(path); diff --git a/kmail/imapaccountbase.h b/kmail/imapaccountbase.h index 533be4839..d9f3e7cb3 100644 --- a/kmail/imapaccountbase.h +++ b/kmail/imapaccountbase.h @@ -231,13 +231,13 @@ namespace KMail { * Set the status on the server * Emits imapStatusChanged signal on success/error. */ - void setImaptqStatus( KMFolder* folder, const TQString& path, const TQCString& flags ); + void setImapStatus( KMFolder* folder, const TQString& path, const TQCString& flags ); /** * Set seen status on the server. * Emits imapStatusChanged signal on success/error. */ - void setImapSeentqStatus( KMFolder* folder, const TQString& path, bool seen ); + void setImapSeenStatus( KMFolder* folder, const TQString& path, bool seen ); /** * The KIO-Slave died @@ -597,7 +597,7 @@ namespace KMail { /** * Emitted upon completion of the job for setting the status for a group of UIDs, - * as a result of a setImaptqStatus call. + * as a result of a setImapStatus call. * On error, if the user chooses abort (not continue), cont is set to false. */ void imapStatusChanged( KMFolder*, const TQString& imapPath, bool cont ); diff --git a/kmail/imapjob.cpp b/kmail/imapjob.cpp index 3ddb93f39..693414164 100644 --- a/kmail/imapjob.cpp +++ b/kmail/imapjob.cpp @@ -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->setqStatus( errorStr ); + (*it).progressItem->seStatus( 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->setqStatus( i18n("Uploading message data failed.") ); + (*it).progressItem->seStatus( i18n("Uploading message data failed.") ); account->handlePutError( job, *it, mDestFolder ); return; } else { if ( (*it).progressItem ) - (*it).progressItem->setqStatus( i18n("Uploading message data completed.") ); + (*it).progressItem->seStatus( 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->setqStatus( errStr ); + (*it).progressItem->seStatus( errStr ); if ( account->handleJobError( job, errStr ) ) deleteLater(); return; diff --git a/kmail/importarchivedialog.cpp b/kmail/importarchivedialog.cpp index eeea23d78..0da3448ca 100644 --- a/kmail/importarchivedialog.cpp +++ b/kmail/importarchivedialog.cpp @@ -73,7 +73,7 @@ ImportArchiveDialog::ImportArchiveDialog( TQWidget *parent, TQt::WidgetFlags fla mainLayout->addItem( new TQSpacerItem( 1, 1, TQSizePolicy::Expanding, TQSizePolicy::Expanding ), row, 0 ); // Make it a bit bigger, else the folder requester cuts off the text too early - resize( 500, tqminimumSize().height() ); + resize( 500, minimumSize().height() ); } void ImportArchiveDialog::setFolder( KMFolder *defaultFolder ) diff --git a/kmail/importjob.cpp b/kmail/importjob.cpp index 96ea86b5e..783c2dd5c 100644 --- a/kmail/importjob.cpp +++ b/kmail/importjob.cpp @@ -211,7 +211,7 @@ void KMail::ImportJob::importNextMessage() return; } kdDebug(5006) << "importNextMessage(): Current folder of queue is now: " << mCurrentFolder->name() << endl; - mProgressItem->setqStatus( i18n( "Importing folder %1" ).tqarg( mCurrentFolder->name() ) ); + mProgressItem->seStatus( i18n( "Importing folder %1" ).tqarg( 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 /* setqStatus */ ); + mCurrentMessage->fromByteArray( mCurrentMessageFile->data(), true /* seStatus */ ); int retIndex; // If this is not an IMAP folder, we can add the message directly. Otherwise, the whole thing is diff --git a/kmail/index.cpp b/kmail/index.cpp index 5604003d4..674588f24 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::tqfromLatin1( " %1 " ).tqarg( rule->contents() ); + terms += TQString::fromLatin1( " %1 " ).tqarg( rule->contents() ); } mValues = kmkernel->msgIndex()->simpleSearch( terms, 0 ); diff --git a/kmail/kcursorsaver.h b/kmail/kcursorsaver.h index 3f6526d72..ec02eb946 100644 --- a/kmail/kcursorsaver.h +++ b/kmail/kcursorsaver.h @@ -14,7 +14,7 @@ class KCursorSaver : public TQt { public: /// constructor taking TQCursor tqshapes - KCursorSaver(TQt::tqCursorShape tqshape) { + KCursorSaver(TQt::CursorShape tqshape) { TQApplication::setOverrideCursor( TQCursor(tqshape) ); inited = true; } diff --git a/kmail/kmaccount.cpp b/kmail/kmaccount.cpp index 7cadcba97..fa013b8d0 100644 --- a/kmail/kmaccount.cpp +++ b/kmail/kmaccount.cpp @@ -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->setqStatus(KMMsgStatusUnread); // -sanders - // aMsg->setqStatus(KMMsgStatusRead); + aMsg->seStatus(KMMsgStatusUnread); // -sanders + // aMsg->seStatus(KMMsgStatusRead); else - aMsg->setqStatus(KMMsgStatusNew); + aMsg->seStatus(KMMsgStatusNew); } /* TQFile fileD0( "testdat_xx-kmaccount-0" ); @@ -470,7 +470,7 @@ void KMAccount::pseudoAssign( const KMAccount * a ) { } //----------------------------------------------------------------------------- -void KMAccount::checkDone( bool newmail, ChecktqStatus status ) +void KMAccount::checkDone( bool newmail, CheckStatus status ) { setCheckingMail( false ); // Reset the timeout for automatic mailchecking. The user might have diff --git a/kmail/kmaccount.h b/kmail/kmaccount.h index 43f3aca3a..e5c1f4e78 100644 --- a/kmail/kmaccount.h +++ b/kmail/kmaccount.h @@ -83,7 +83,7 @@ class KMAccount: public TQObject, public KAccount public: virtual ~KMAccount(); - enum ChecktqStatus { CheckOK, CheckIgnored, CheckCanceled, CheckAborted, + enum CheckStatus { CheckOK, CheckIgnored, CheckCanceled, CheckAborted, CheckError }; /** The default check interval */ @@ -231,7 +231,7 @@ public: * @param newMail true if new mail arrived * @param status the status of the mail check */ - void checkDone( bool newMail, ChecktqStatus status ); + void checkDone( bool newMail, CheckStatus status ); /** * Abort all running mail checks. Used when closing the last KMMainWin. @@ -260,7 +260,7 @@ signals: * @param newMail true if there was new mail * @param status the status of the mail check **/ - virtual void finishedCheck( bool newMail, ChecktqStatus status ); + virtual void finishedCheck( bool newMail, CheckStatus status ); /** * Emitted after the mail check is finished. diff --git a/kmail/kmacctcachedimap.cpp b/kmail/kmacctcachedimap.cpp index 9066941c6..2a797acbb 100644 --- a/kmail/kmacctcachedimap.cpp +++ b/kmail/kmacctcachedimap.cpp @@ -186,7 +186,7 @@ void KMAcctCachedImap::slotCheckQueuedFolders() mMailCheckFolders.append( mFoldersQueuedForChecking.front() ); mFoldersQueuedForChecking.pop_front(); if ( mFoldersQueuedForChecking.isEmpty() ) - disconnect( this, TQT_SIGNAL( finishedCheck( bool, ChecktqStatus ) ), + disconnect( this, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ), this, TQT_SLOT( slotCheckQueuedFolders() ) ); kmkernel->acctMgr()->singleCheckMail(this, true); diff --git a/kmail/kmacctimap.cpp b/kmail/kmacctimap.cpp index fe74bc80a..6690bd008 100644 --- a/kmail/kmacctimap.cpp +++ b/kmail/kmacctimap.cpp @@ -395,7 +395,7 @@ void KMAcctImap::postProcessNewMail( KMFolder * folder ) if ( mMailCheckProgressItem ) { mMailCheckProgressItem->incCompletedItems(); mMailCheckProgressItem->updateProgress(); - mMailCheckProgressItem->setqStatus( folder->prettyURL() + i18n(" completed") ); + mMailCheckProgressItem->seStatus( folder->prettyURL() + i18n(" completed") ); } mCountRemainChecks--; @@ -488,8 +488,8 @@ void KMAcctImap::postProcessNewMail( KMFolder * folder ) mCountLastUnread = 0; // => mCountUnread - mCountLastUnread == new count // when we check only one folder (=selected) and we have new mails // then do not display a summary as the normal status message is better - bool showtqStatus = ( mCheckingSingleFolder && mCountUnread > 0 ) ? false : true; - ImapAccountBase::postProcessNewMail( showtqStatus ); + bool showStatus = ( mCheckingSingleFolder && mCountUnread > 0 ) ? false : true; + ImapAccountBase::postProcessNewMail( showStatus ); mUnreadBeforeCheck.clear(); mCheckingSingleFolder = false; } diff --git a/kmail/kmacctlocal.cpp b/kmail/kmacctlocal.cpp index 88424e13e..9af6e2cae 100644 --- a/kmail/kmacctlocal.cpp +++ b/kmail/kmacctlocal.cpp @@ -196,7 +196,7 @@ bool KMAcctLocal::fetchMsg() //BroadcastStatus::instance()->seStatusMsg( statusMsg ); mMailCheckProgressItem->incCompletedItems(); mMailCheckProgressItem->updateProgress(); - mMailCheckProgressItem->setqStatus( statusMsg ); + mMailCheckProgressItem->seStatus( 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->setqStatus(msg->headerField("Status").latin1(), + msg->seStatus(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)); @@ -250,7 +250,7 @@ void KMAcctLocal::postProcess() if( mMailCheckProgressItem ) { // do this only once... BroadcastStatus::instance()->seStatusMsgTransmissionCompleted( mName, mNumMsgs ); - mMailCheckProgressItem->setqStatus( + mMailCheckProgressItem->seStatus( i18n( "Fetched 1 message from mailbox %1.", "Fetched %n messages from mailbox %1.", mNumMsgs ).tqarg( mMailFolder->location() ) ); diff --git a/kmail/kmacctmaildir.cpp b/kmail/kmacctmaildir.cpp index 818e614d0..bcf29f118 100644 --- a/kmail/kmacctmaildir.cpp +++ b/kmail/kmacctmaildir.cpp @@ -165,12 +165,12 @@ void KMAcctMaildir::processNewMail(bool) TQString statusMsg = statusMsgStub.tqarg(i); mMailCheckProgressItem->incCompletedItems(); mMailCheckProgressItem->updateProgress(); - mMailCheckProgressItem->setqStatus( statusMsg ); + mMailCheckProgressItem->seStatus( statusMsg ); msg = mailFolder.take(0); if (msg) { - msg->setqStatus(msg->headerField("Status").latin1(), + msg->seStatus(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)); @@ -189,7 +189,7 @@ void KMAcctMaildir::processNewMail(bool) if( mMailCheckProgressItem ) { // do this only once... BroadcastStatus::instance()->seStatusMsgTransmissionCompleted( num ); - mMailCheckProgressItem->setqStatus( + mMailCheckProgressItem->seStatus( i18n( "Fetched 1 message from maildir folder %1.", "Fetched %n messages from maildir folder %1.", num ).tqarg(mailFolder.location() ) ); diff --git a/kmail/kmail.antispamrc b/kmail/kmail.antispamrc index 2bef9ad09..098f80c26 100644 --- a/kmail/kmail.antispamrc +++ b/kmail/kmail.antispamrc @@ -20,7 +20,7 @@ UseRegExp=0 SupportsBayes=1 SupportsUnsure=0 ScoreName=Spamassassin -ScoreHeader=X-Spam-tqStatus +ScoreHeader=X-Spam-Status ScoreType=Adjusted ScoreValueRegexp=(?:hits|score)=([\d\.-]+)[^\d\.] ScoreThresholdRegexp=required=([\d\.-]+)[^\d\.] @@ -139,7 +139,7 @@ UseRegExp=0 SupportsBayes=1 SupportsUnsure=0 ScoreName=Spamassassin -ScoreHeader=X-Spam-tqStatus +ScoreHeader=X-Spam-Status ScoreType=Adjusted ScoreValueRegexp=(?:hits|score)=([\d\.-]+)[^\d\.] ScoreThresholdRegexp=required=([\d\.-]+)[^\d\.] @@ -163,7 +163,7 @@ UseRegExp=0 SupportsBayes=1 SupportsUnsure=0 ScoreName=Spamassassin -ScoreHeader=X-Spam-tqStatus +ScoreHeader=X-Spam-Status ScoreType=Adjusted ScoreValueRegexp=(?:hits|score)=([\d\.-]+)[^\d\.] ScoreThresholdRegexp=required=([\d\.-]+)[^\d\.] @@ -222,7 +222,7 @@ PipeFilterName=CRM114 Check PipeCmdDetect=crm -u $HOME/.crm114 mailreaver.crm ExecCmdSpam=crm -u $HOME/.crm114 mailreaver.crm --spam ExecCmdHam=crm -u $HOME/.crm114 mailreaver.crm --good -DetectionHeader=X-CRM114-tqStatus +DetectionHeader=X-CRM114-Status DetectionPattern=SPAM DetectionPattern2=UNSURE DetectionOnly=0 @@ -230,7 +230,7 @@ UseRegExp=0 SupportsBayes=1 SupportsUnsure=1 ScoreName=CRM114 -ScoreHeader=X-CRM114-tqStatus +ScoreHeader=X-CRM114-Status ScoreType=Bool ScoreValueRegexp=SPAM ScoreThresholdRegexp= diff --git a/kmail/kmail_part.cpp b/kmail/kmail_part.cpp index 452f3fe43..ac418a952 100644 --- a/kmail/kmail_part.cpp +++ b/kmail/kmail_part.cpp @@ -223,7 +223,7 @@ void KMailPart::guiActivateEvent(KParts::GUIActivateEvent *e) mainWidget->initializeFilterActions(); mainWidget->initializeFolderShortcutActions(); mainWidget->setupForwardingActionsList(); - mainWidget->updateVactionScriptqStatus(); + mainWidget->updateVactionScripStatus(); } void KMailPart::exit() diff --git a/kmail/kmailicalifaceimpl.cpp b/kmail/kmailicalifaceimpl.cpp index 1376932e0..45654d276 100644 --- a/kmail/kmailicalifaceimpl.cpp +++ b/kmail/kmailicalifaceimpl.cpp @@ -671,19 +671,19 @@ static TQString subresourceLabelForPresentation( const KMFolder * folder ) } TQString label = folder->prettyURL(); - TQStringList parts = TQStringList::split( TQString::tqfromLatin1("/"), label ); + TQStringList parts = TQStringList::split( TQString::fromLatin1("/"), label ); // In the common special case of some other user's folder shared with us // the url looks like "Server Name/user/$USERNAME/Folder/Name". Make // those a bit nicer. - if ( parts[1] == TQString::tqfromLatin1("user") ) { + if ( parts[1] == TQString::fromLatin1("user") ) { TQStringList remainder(parts); remainder.pop_front(); remainder.pop_front(); remainder.pop_front(); label = i18n("%1's %2") .tqarg( parts[2] ) - .tqarg( remainder.join( TQString::tqfromLatin1("/") ) ); + .tqarg( 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::tqfromLatin1("/") ), + .tqarg( remainder.join( TQString::fromLatin1("/") ), static_cast<const KMFolderCachedImap*>( folder->storage() )->account()->name() ); } else { label = i18n("My %1") - .tqarg( remainder.join( TQString::tqfromLatin1("/") ) ); + .tqarg( remainder.join( TQString::fromLatin1("/") ) ); } } else { label = i18n("My %1") - .tqarg( remainder.join( TQString::tqfromLatin1("/") ) ); + .tqarg( remainder.join( TQString::fromLatin1("/") ) ); } break; } @@ -1311,33 +1311,33 @@ TQString KMailICalIfaceImpl::folderName( KFolderTreeItem::Type type, int languag GroupwarePage in configuredialog.cpp */ // English - folderNames[0][KFolderTreeItem::Calendar] = TQString::tqfromLatin1("Calendar"); - folderNames[0][KFolderTreeItem::Tasks] = TQString::tqfromLatin1("Tasks"); - folderNames[0][KFolderTreeItem::Journals] = TQString::tqfromLatin1("Journal"); - folderNames[0][KFolderTreeItem::Contacts] = TQString::tqfromLatin1("Contacts"); - folderNames[0][KFolderTreeItem::Notes] = TQString::tqfromLatin1("Notes"); + folderNames[0][KFolderTreeItem::Calendar] = TQString::fromLatin1("Calendar"); + folderNames[0][KFolderTreeItem::Tasks] = TQString::fromLatin1("Tasks"); + folderNames[0][KFolderTreeItem::Journals] = TQString::fromLatin1("Journal"); + folderNames[0][KFolderTreeItem::Contacts] = TQString::fromLatin1("Contacts"); + folderNames[0][KFolderTreeItem::Notes] = TQString::fromLatin1("Notes"); // German - folderNames[1][KFolderTreeItem::Calendar] = TQString::tqfromLatin1("Kalender"); - folderNames[1][KFolderTreeItem::Tasks] = TQString::tqfromLatin1("Aufgaben"); - folderNames[1][KFolderTreeItem::Journals] = TQString::tqfromLatin1("Journal"); - folderNames[1][KFolderTreeItem::Contacts] = TQString::tqfromLatin1("Kontakte"); - folderNames[1][KFolderTreeItem::Notes] = TQString::tqfromLatin1("Notizen"); + folderNames[1][KFolderTreeItem::Calendar] = TQString::fromLatin1("Kalender"); + folderNames[1][KFolderTreeItem::Tasks] = TQString::fromLatin1("Aufgaben"); + folderNames[1][KFolderTreeItem::Journals] = TQString::fromLatin1("Journal"); + folderNames[1][KFolderTreeItem::Contacts] = TQString::fromLatin1("Kontakte"); + folderNames[1][KFolderTreeItem::Notes] = TQString::fromLatin1("Notizen"); // French - folderNames[2][KFolderTreeItem::Calendar] = TQString::tqfromLatin1("Calendrier"); + folderNames[2][KFolderTreeItem::Calendar] = TQString::fromLatin1("Calendrier"); // Tasks = Tâches (â == 0xE2 in latin1) - folderNames[2][KFolderTreeItem::Tasks] = TQString::tqfromLatin1("T\342ches"); - folderNames[2][KFolderTreeItem::Journals] = TQString::tqfromLatin1("Journal"); - folderNames[2][KFolderTreeItem::Contacts] = TQString::tqfromLatin1("Contacts"); - folderNames[2][KFolderTreeItem::Notes] = TQString::tqfromLatin1("Notes"); + folderNames[2][KFolderTreeItem::Tasks] = TQString::fromLatin1("T\342ches"); + folderNames[2][KFolderTreeItem::Journals] = TQString::fromLatin1("Journal"); + folderNames[2][KFolderTreeItem::Contacts] = TQString::fromLatin1("Contacts"); + folderNames[2][KFolderTreeItem::Notes] = TQString::fromLatin1("Notes"); // Dutch - folderNames[3][KFolderTreeItem::Calendar] = TQString::tqfromLatin1("Agenda"); - folderNames[3][KFolderTreeItem::Tasks] = TQString::tqfromLatin1("Taken"); - folderNames[3][KFolderTreeItem::Journals] = TQString::tqfromLatin1("Logboek"); - folderNames[3][KFolderTreeItem::Contacts] = TQString::tqfromLatin1("Contactpersonen"); - folderNames[3][KFolderTreeItem::Notes] = TQString::tqfromLatin1("Notities"); + folderNames[3][KFolderTreeItem::Calendar] = TQString::fromLatin1("Agenda"); + folderNames[3][KFolderTreeItem::Tasks] = TQString::fromLatin1("Taken"); + folderNames[3][KFolderTreeItem::Journals] = TQString::fromLatin1("Logboek"); + folderNames[3][KFolderTreeItem::Contacts] = TQString::fromLatin1("Contactpersonen"); + folderNames[3][KFolderTreeItem::Notes] = TQString::fromLatin1("Notities"); } if( language < 0 || language > 3 ) { @@ -1574,7 +1574,7 @@ void KMailICalIfaceImpl::triggerKolabFreeBusy( const KURL& folderURL ) kdWarning() << "KCal::ResourceKolab::fromKMailFolderSynced path is too short: " << path << endl; return; } - if ( path.tqstartsWith( "/INBOX/", false ) ) { + if ( path.startsWith( "/INBOX/", false ) ) { // If INBOX, replace it with the username (which is user@domain) path = path.mid( secondSlash ); path.prepend( folderURL.user() ); @@ -1717,9 +1717,9 @@ void KMailICalIfaceImpl::readConfig() Q_ASSERT( account ); if ( account ) { // just in case we were connected already - disconnect( account, TQT_SIGNAL( finishedCheck( bool, ChecktqStatus ) ), + disconnect( account, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ), this, TQT_SLOT( slotCheckDone() ) ); - connect( account, TQT_SIGNAL( finishedCheck( bool, ChecktqStatus ) ), + connect( account, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ), this, TQT_SLOT( slotCheckDone() ) ); } mUseResourceIMAP = false; @@ -1966,7 +1966,7 @@ void KMailICalIfaceImpl::slotCheckDone() { KMAccount* account = kmkernel->acctMgr()->find( GlobalSettings::self()->theIMAPResourceAccount() ); if ( account ) - disconnect( account, TQT_SIGNAL( finishedCheck( bool, ChecktqStatus ) ), + disconnect( account, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ), this, TQT_SLOT( slotCheckDone() ) ); readConfig(); } @@ -2139,15 +2139,15 @@ TQString KMailICalIfaceImpl::folderPixmap( KFolderTreeItem::Type type ) const return TQString(); if( type == KFolderTreeItem::Contacts ) - return TQString::tqfromLatin1( "kmgroupware_folder_contacts" ); + return TQString::fromLatin1( "kmgroupware_folder_contacts" ); else if( type == KFolderTreeItem::Calendar ) - return TQString::tqfromLatin1( "kmgroupware_folder_calendar" ); + return TQString::fromLatin1( "kmgroupware_folder_calendar" ); else if( type == KFolderTreeItem::Notes ) - return TQString::tqfromLatin1( "kmgroupware_folder_notes" ); + return TQString::fromLatin1( "kmgroupware_folder_notes" ); else if( type == KFolderTreeItem::Tasks ) - return TQString::tqfromLatin1( "kmgroupware_folder_tasks" ); + return TQString::fromLatin1( "kmgroupware_folder_tasks" ); else if( type == KFolderTreeItem::Journals ) - return TQString::tqfromLatin1( "kmgroupware_folder_journals" ); + return TQString::fromLatin1( "kmgroupware_folder_journals" ); return TQString(); } diff --git a/kmail/kmatmlistview.cpp b/kmail/kmatmlistview.cpp index d1300f840..4d9fc42df 100644 --- a/kmail/kmatmlistview.cpp +++ b/kmail/kmatmlistview.cpp @@ -52,9 +52,9 @@ void KMAtmListViewItem::updateCheckBox( int headerSection, TQCheckBox *cb ) //Set the correct background color TQColor bg; if ( isSelected() ) { - bg = listView()->tqcolorGroup().highlight(); + bg = listView()->colorGroup().highlight(); } else { - bg = listView()->tqcolorGroup().base(); + bg = listView()->colorGroup().base(); } cb->setPaletteBackgroundColor( bg ); } diff --git a/kmail/kmcommands.cpp b/kmail/kmcommands.cpp index 19661be97..508964519 100644 --- a/kmail/kmcommands.cpp +++ b/kmail/kmcommands.cpp @@ -537,7 +537,7 @@ KMAddBookmarksCommand::KMAddBookmarksCommand( const KURL &url, TQWidget *parent KMCommand::Result KMAddBookmarksCommand::execute() { - TQString filename = locateLocal( "data", TQString::tqfromLatin1("konqueror/bookmarks.xml") ); + TQString filename = locateLocal( "data", TQString::fromLatin1("konqueror/bookmarks.xml") ); KBookmarkManager *bookManager = KBookmarkManager::managerForFile( filename, false ); KBookmarkGroup group = bookManager->root(); @@ -1395,7 +1395,7 @@ KMCommand::Result KMForwardDigestCommand::execute() id = msg->headerField( "X-KMail-Identity" ).stripWhiteSpace().toUInt(); // set the part header msgPartText += "--"; - msgPartText += TQString::tqfromLatin1( boundary ); + msgPartText += TQString::fromLatin1( boundary ); msgPartText += "\nContent-Type: MESSAGE/RFC822"; msgPartText += TQString( "; CHARSET=%1" ).tqarg( TQString(msg->charset()) ); msgPartText += '\n'; @@ -1422,7 +1422,7 @@ KMCommand::Result KMForwardDigestCommand::execute() id = mIdentity; // use folder identity if no message had an id set fwdMsg->initHeader( id ); msgPartText += "--"; - msgPartText += TQString::tqfromLatin1( boundary ); + msgPartText += TQString::fromLatin1( boundary ); msgPartText += "--\n"; TQCString tmp; msgPart->setTypeStr( "MULTIPART" ); @@ -1639,9 +1639,9 @@ KMCommand::Result KMPrintCommand::execute() } -KMSeStatusCommand::KMSeStatusCommand( KMMsgtqStatus status, +KMSeStatusCommand::KMSeStatusCommand( KMMsgStatus status, const TQValueList<TQ_UINT32> &serNums, bool toggle ) - : mtqStatus( status ), mSerNums( serNums ), mToggle( toggle ) + : mStatus( status ), mSerNums( serNums ), mToggle( toggle ) { } @@ -1650,7 +1650,7 @@ KMCommand::Result KMSeStatusCommand::execute() TQValueListIterator<TQ_UINT32> it; int idx = -1; KMFolder *folder = 0; - bool parentqStatus = false; + bool parenStatus = false; // Toggle actions on threads toggle the whole thread // depending on the state of the parent. @@ -1659,10 +1659,10 @@ KMCommand::Result KMSeStatusCommand::execute() KMMsgDict::instance()->getLocation( *mSerNums.begin(), &folder, &idx ); if (folder) { msg = folder->getMsgBase(idx); - if (msg && (msg->status()&mtqStatus)) - parentqStatus = true; + if (msg && (msg->status()&mStatus)) + parenStatus = true; else - parentqStatus = false; + parenStatus = false; } } TQMap< KMFolder*, TQValueList<int> > folderMap; @@ -1673,12 +1673,12 @@ KMCommand::Result KMSeStatusCommand::execute() KMMsgBase *msg = folder->getMsgBase(idx); // check if we are already at the target toggle state if (msg) { - bool mytqStatus; - if (msg->status()&mtqStatus) - mytqStatus = true; + bool myStatus; + if (msg->status()&mStatus) + myStatus = true; else - mytqStatus = false; - if (mytqStatus != parentqStatus) + myStatus = false; + if (myStatus != parenStatus) continue; } } @@ -1690,7 +1690,7 @@ KMCommand::Result KMSeStatusCommand::execute() TQMapIterator< KMFolder*, TQValueList<int> > it2 = folderMap.begin(); while ( it2 != folderMap.end() ) { KMFolder *f = it2.key(); - f->setqStatus( (*it2), mtqStatus, mToggle ); + f->seStatus( (*it2), mStatus, mToggle ); ++it2; } //kapp->dcopClient()->emitDCOPSignal( "unreadCountChanged()", TQByteArray() ); @@ -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->setqStatus(msg->status()); + newMsg->seStatus(msg->status()); if (srcFolder && !newMsg->isComplete()) { @@ -3011,7 +3011,7 @@ KMCommand::Result KMIMChatCommand::execute() { nameList.append( (*it).realName() ); } - TQString names = nameList.join( TQString::tqfromLatin1( ",\n" ) ); + TQString names = nameList.join( TQString::fromLatin1( ",\n" ) ); apology = apology.tqarg( names ); } @@ -3216,7 +3216,7 @@ void KMHandleAttachmentCommand::atmEncryptWithChiasmus() return; // FIXME: better detection of mimetype?? - if ( !mAtmName.tqendsWith( ".xia", false ) ) + if ( !mAtmName.endsWith( ".xia", false ) ) return; const Kleo::CryptoBackend::Protocol * chiasmus = @@ -3297,7 +3297,7 @@ void KMHandleAttachmentCommand::atmEncryptWithChiasmus() } static const TQString chomp( const TQString & base, const TQString & suffix, bool cs ) { - return base.tqendsWith( suffix, cs ) ? base.left( base.length() - suffix.length() ) : base ; + return base.endsWith( suffix, cs ) ? base.left( base.length() - suffix.length() ) : base ; } void KMHandleAttachmentCommand::slotAtmDecryptWithChiasmusResult( const GpgME::Error & err, const TQVariant & result ) @@ -3452,7 +3452,7 @@ KMCommand::Result KMDeleteAttachmentCommand::doAttachmentModify() KMMessage *newMsg = new KMMessage(); newMsg->fromDwString( msg->asDwString() ); - newMsg->setqStatus( msg->status() ); + newMsg->seStatus( 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->setqStatus( msg->status() ); + newMsg->seStatus( msg->status() ); storeChangedMessage( newMsg ); } diff --git a/kmail/kmcommands.h b/kmail/kmcommands.h index b3de87f75..8f03571ba 100644 --- a/kmail/kmcommands.h +++ b/kmail/kmcommands.h @@ -11,7 +11,7 @@ #include <tqtimer.h> #include <tqfont.h> #include <kio/job.h> -#include "kmmsgbase.h" // for KMMsgtqStatus +#include "kmmsgbase.h" // for KMMsgStatus #include <mimelib/string.h> #include <tdepimmacros.h> #include <kservice.h> @@ -663,13 +663,13 @@ class KDE_EXPORT KMSeStatusCommand : public KMCommand public: // Serial numbers - KMSeStatusCommand( KMMsgtqStatus status, const TQValueList<TQ_UINT32> &, + KMSeStatusCommand( KMMsgStatus status, const TQValueList<TQ_UINT32> &, bool toggle=false ); private: virtual Result execute(); - KMMsgtqStatus mtqStatus; + KMMsgStatus mStatus; TQValueList<TQ_UINT32> mSerNums; TQValueList<int> mIds; bool mToggle; diff --git a/kmail/kmcomposewin.cpp b/kmail/kmcomposewin.cpp index a161070df..12c2e6147 100644 --- a/kmail/kmcomposewin.cpp +++ b/kmail/kmcomposewin.cpp @@ -199,7 +199,7 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id ) mHeadersToEditorSplitter = new TQSplitter( Qt::Vertical, mMainWidget, "mHeadersToEditorSplitter" ); mHeadersToEditorSplitter->setChildrenCollapsible( false ); mHeadersArea = new TQWidget( mHeadersToEditorSplitter ); - mHeadersArea->tqsetSizePolicy( mHeadersToEditorSplitter->tqsizePolicy().horData(), TQSizePolicy::Maximum ); + mHeadersArea->setSizePolicy( mHeadersToEditorSplitter->sizePolicy().horData(), TQSizePolicy::Maximum ); TQVBoxLayout *v = new TQVBoxLayout( mMainWidget ); v->addWidget( mHeadersToEditorSplitter ); mIdentity = new KPIM::IdentityCombo(kmkernel->identityManager(), mHeadersArea); @@ -341,7 +341,7 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id ) TQHBoxLayout *hbox = new TQHBoxLayout( vbox ); { mSignatureStateIndicator = new TQLabel( editorAndCryptoStateIndicators ); - mSignatureStateIndicator->tqsetAlignment( TQt::AlignHCenter ); + mSignatureStateIndicator->setAlignment( TQt::AlignHCenter ); hbox->addWidget( mSignatureStateIndicator ); KConfigGroup reader( KMKernel::config(), "Reader" ); @@ -353,7 +353,7 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id ) mSignatureStateIndicator->setPalette( p ); mEncryptionStateIndicator = new TQLabel( editorAndCryptoStateIndicators ); - mEncryptionStateIndicator->tqsetAlignment( TQt::AlignHCenter ); + mEncryptionStateIndicator->setAlignment( TQt::AlignHCenter ); hbox->addWidget( mEncryptionStateIndicator ); p.setColor( TQColorGroup::Background, reader.readColorEntry( "PGPMessageEncr" , &defaultEncryptedColor ) ); mEncryptionStateIndicator->setPalette( p ); @@ -965,7 +965,7 @@ int KMComposeWin::calcColumnWidth(int which, long allShowing, int width) w->setBuddy( mEditor ); // set dummy so we don't calculate width of '&' for this label. w->adjustSize(); w->show(); - return TQMAX( width, w->tqsizeHint().width() ); + return TQMAX( width, w->sizeHint().width() ); } void KMComposeWin::rethinkFields(bool fromSlot) @@ -1111,7 +1111,7 @@ void KMComposeWin::rethinkFields(bool fromSlot) resize(this->size()); tqrepaint(); - mHeadersArea->setMaximumHeight( mHeadersArea->tqsizeHint().height() ); + mHeadersArea->setMaximumHeight( mHeadersArea->sizeHint().height() ); mGrid->activate(); mHeadersArea->show(); @@ -1182,7 +1182,7 @@ void KMComposeWin::rethinkHeaderLine(int aValue, int aMask, int& aRow, if (aValue & aMask) { aLbl->adjustSize(); - aLbl->resize((int)aLbl->tqsizeHint().width(),aLbl->tqsizeHint().height() + 6); + aLbl->resize((int)aLbl->sizeHint().width(),aLbl->sizeHint().height() + 6); aLbl->setMinimumSize(aLbl->size()); aLbl->show(); aLbl->setBuddy(aCbx); @@ -1193,7 +1193,7 @@ void KMComposeWin::rethinkHeaderLine(int aValue, int aMask, int& aRow, mGrid->addWidget(aCbx, aRow, 1); if ( aChk ) { mGrid->addWidget(aChk, aRow, 2); - aChk->setFixedSize(aChk->tqsizeHint().width(), aLbl->height()); + aChk->setFixedSize(aChk->sizeHint().width(), aLbl->height()); aChk->show(); } aRow++; @@ -2277,17 +2277,17 @@ bool KMComposeWin::userForgotAttachment() if ( attachWordsList.isEmpty() ) { // default value (FIXME: this is duplicated in configuredialog.cpp) - attachWordsList << TQString::tqfromLatin1("attachment") - << TQString::tqfromLatin1("attached"); - if ( TQString::tqfromLatin1("attachment") != i18n("attachment") ) + attachWordsList << TQString::fromLatin1("attachment") + << TQString::fromLatin1("attached"); + if ( TQString::fromLatin1("attachment") != i18n("attachment") ) attachWordsList << i18n("attachment"); - if ( TQString::tqfromLatin1("attached") != i18n("attached") ) + if ( TQString::fromLatin1("attached") != i18n("attached") ) attachWordsList << i18n("attached"); } - TQRegExp rx ( TQString::tqfromLatin1("\\b") + + TQRegExp rx ( TQString::fromLatin1("\\b") + attachWordsList.join("\\b|\\b") + - TQString::tqfromLatin1("\\b") ); + TQString::fromLatin1("\\b") ); rx.setCaseSensitive( false ); bool gotMatch = false; @@ -3681,7 +3681,7 @@ void KMComposeWin::slotPasteClipboardAsAttachment() TQMimeSource *mimeSource = TQApplication::tqclipboard()->data(); if ( TQImageDrag::canDecode(mimeSource) ) { - slotAttachPNGImageData(mimeSource->tqencodedData("image/png")); + slotAttachPNGImageData(mimeSource->encodedData("image/png")); } else { bool ok; @@ -3773,7 +3773,7 @@ void KMComposeWin::slotRemoveQuotes() //----------------------------------------------------------------------------- void KMComposeWin::slotUndo() { - TQWidget* fw = tqfocusWidget(); + TQWidget* fw = focusWidget(); if (!fw) return; if ( ::tqqt_cast<KEdit*>(fw) ) @@ -3784,7 +3784,7 @@ void KMComposeWin::slotUndo() void KMComposeWin::slotRedo() { - TQWidget* fw = tqfocusWidget(); + TQWidget* fw = focusWidget(); if (!fw) return; if (::tqqt_cast<KEdit*>(fw)) @@ -3796,7 +3796,7 @@ void KMComposeWin::slotRedo() //----------------------------------------------------------------------------- void KMComposeWin::slotCut() { - TQWidget* fw = tqfocusWidget(); + TQWidget* fw = focusWidget(); if (!fw) return; if (::tqqt_cast<KEdit*>(fw)) @@ -3809,7 +3809,7 @@ void KMComposeWin::slotCut() //----------------------------------------------------------------------------- void KMComposeWin::slotCopy() { - TQWidget* fw = tqfocusWidget(); + TQWidget* fw = focusWidget(); if (!fw) return; #ifdef KeyPress @@ -3829,12 +3829,12 @@ void KMComposeWin::slotPasteClipboard() void KMComposeWin::paste( TQClipboard::Mode mode ) { - TQWidget* fw = tqfocusWidget(); + TQWidget* fw = focusWidget(); if (!fw) return; TQMimeSource *mimeSource = TQApplication::tqclipboard()->data( mode ); if ( mimeSource->provides("image/png") ) { - slotAttachPNGImageData(mimeSource->tqencodedData("image/png")); + slotAttachPNGImageData(mimeSource->encodedData("image/png")); } else if ( KURLDrag::canDecode( mimeSource ) ) { KURL::List urlList; if( KURLDrag::decode( mimeSource, urlList ) ) { @@ -3872,7 +3872,7 @@ void KMComposeWin::paste( TQClipboard::Mode mode ) //----------------------------------------------------------------------------- void KMComposeWin::slotMarkAll() { - TQWidget* fw = tqfocusWidget(); + TQWidget* fw = focusWidget(); if (!fw) return; if (::tqqt_cast<TQLineEdit*>(fw)) @@ -4780,10 +4780,10 @@ void KMComposeWin::slotSpellcheckDone(int result) statusBar()->changeItem(i18n(" Spell check complete."),0); break; } - TQTimer::singleShot( 2000, this, TQT_SLOT(slotSpellcheckDoneCleartqStatus()) ); + TQTimer::singleShot( 2000, this, TQT_SLOT(slotSpellcheckDoneClearStatus()) ); } -void KMComposeWin::slotSpellcheckDoneCleartqStatus() +void KMComposeWin::slotSpellcheckDoneClearStatus() { statusBar()->changeItem("", 0); } @@ -4829,7 +4829,7 @@ void KMComposeWin::slotIdentityChanged( uint uoid ) // of the identity, we assume that since the user typed it // they want to keep it if ( mEdtBcc->text() != ident.bcc() && !mEdtBcc->text().isEmpty() ) { - TQString temp_string( mEdtBcc->text() + TQString::tqfromLatin1(",") + ident.bcc() ); + TQString temp_string( mEdtBcc->text() + TQString::fromLatin1(",") + ident.bcc() ); mEdtBcc->setText( temp_string ); } else { // if the user typed the same address as the preset BCC @@ -4843,7 +4843,7 @@ void KMComposeWin::slotIdentityChanged( uint uoid ) // allowing the user to keep all addresses if( mEdtBcc && mEdtBcc->edited() && !ident.bcc().isEmpty() ) { if( !mEdtBcc->text().isEmpty() ) { - TQString temp_string ( mEdtBcc->text() + TQString::tqfromLatin1(",") + ident.bcc() ); + TQString temp_string ( mEdtBcc->text() + TQString::fromLatin1(",") + ident.bcc() ); mEdtBcc->setText( temp_string ); } else { mEdtBcc->setText( ident.bcc() ); @@ -5177,19 +5177,19 @@ void KMComposeWin::slotSizeAction( int size ) void KMComposeWin::slotAlignLeft() { toggleMarkup(true); - mEditor->TQTextEdit::tqsetAlignment( AlignLeft ); + mEditor->TQTextEdit::setAlignment( AlignLeft ); } void KMComposeWin::slotAlignCenter() { toggleMarkup(true); - mEditor->TQTextEdit::tqsetAlignment( AlignHCenter ); + mEditor->TQTextEdit::setAlignment( AlignHCenter ); } void KMComposeWin::slotAlignRight() { toggleMarkup(true); - mEditor->TQTextEdit::tqsetAlignment( AlignRight ); + mEditor->TQTextEdit::setAlignment( AlignRight ); } void KMComposeWin::slotTextBold() @@ -5404,6 +5404,6 @@ void KMComposeWin::recipientEditorSizeHintChanged() void KMComposeWin::setMaximumHeaderSize() { - mHeadersArea->setMaximumHeight( mHeadersArea->tqsizeHint().height() ); + mHeadersArea->setMaximumHeight( mHeadersArea->sizeHint().height() ); } diff --git a/kmail/kmcomposewin.h b/kmail/kmcomposewin.h index 6193e8cb7..635ff7da9 100644 --- a/kmail/kmcomposewin.h +++ b/kmail/kmcomposewin.h @@ -470,7 +470,7 @@ private slots: // void slotSpellConfigure(); void slotSpellcheckDone(int result); - void slotSpellcheckDoneCleartqStatus(); + void slotSpellcheckDoneClearStatus(); public slots: // kmkernel void autoSaveMessage(); diff --git a/kmail/kmedit.cpp b/kmail/kmedit.cpp index df9582436..bcc95d0a8 100644 --- a/kmail/kmedit.cpp +++ b/kmail/kmedit.cpp @@ -169,7 +169,7 @@ void KMEdit::contentsDropEvent(TQDropEvent *e) command->start(); } else if( e->provides("image/png") ) { - emit attachPNGImageData(e->tqencodedData("image/png")); + emit attachPNGImageData(e->encodedData("image/png")); } else if( KURLDrag::canDecode( e ) ) { KURL::List urlList; @@ -454,7 +454,7 @@ bool KMEdit::eventFilter(TQObject*o, TQEvent* e) TQT_SLOT(slotExternalEditorDone(KProcess*))); if (!mExtEditorProcess->start()) { - KMessageBox::error( tqtopLevelWidget(), + KMessageBox::error( topLevelWidget(), i18n("Unable to start external editor.") ); killExternalEditor(); } else { @@ -627,7 +627,7 @@ void KMEdit::killExternalEditor() { bool KMEdit::checkExternalEditorFinished() { if ( !mExtEditorProcess ) return true; - switch ( KMessageBox::warningYesNoCancel( tqtopLevelWidget(), + switch ( KMessageBox::warningYesNoCancel( topLevelWidget(), i18n("The external editor is still running.\n" "Abort the external editor or leave it open?"), i18n("External Editor"), @@ -880,7 +880,7 @@ void KMEdit::slotSpellDone() mComposer->sujectLineWidget()->deselect(); if (status == KSpell::Error) { - KMessageBox::sorry( tqtopLevelWidget(), + KMessageBox::sorry( topLevelWidget(), i18n("ISpell/Aspell could not be started. Please " "make sure you have ISpell or Aspell properly " "configured and in your PATH.") ); @@ -889,7 +889,7 @@ void KMEdit::slotSpellDone() else if (status == KSpell::Crashed) { spellcheck_stop(); - KMessageBox::sorry( tqtopLevelWidget(), + KMessageBox::sorry( topLevelWidget(), i18n("ISpell/Aspell seems to have crashed.") ); emit spellcheck_done( KS_CANCEL ); } @@ -898,7 +898,7 @@ void KMEdit::slotSpellDone() if( mSpellLineEdit ) spellcheck(); else if( !mComposer->subjectTextWasSpellChecked() && status == KSpell::FinishedNoMisspellingsEncountered ) - KMessageBox::information( tqtopLevelWidget(), + KMessageBox::information( topLevelWidget(), i18n("No misspellings encountered.") ); } } diff --git a/kmail/kmfawidgets.cpp b/kmail/kmfawidgets.cpp index a4efae487..ae3634270 100644 --- a/kmail/kmfawidgets.cpp +++ b/kmail/kmfawidgets.cpp @@ -35,7 +35,7 @@ KMFilterActionWithAddressWidget::KMFilterActionWithAddressWidget( TQWidget* pare hbl->addWidget( mLineEdit, 1 /*stretch*/ ); mBtn = new TQPushButton( TQString() ,this ); mBtn->setPixmap( BarIcon( "contents", KIcon::SizeSmall ) ); - mBtn->setFixedHeight( mLineEdit->tqsizeHint().height() ); + mBtn->setFixedHeight( mLineEdit->sizeHint().height() ); TQToolTip::add( mBtn, i18n( "Open Address Book" ) ); hbl->addWidget( mBtn ); @@ -136,7 +136,7 @@ void KMSoundTestWidget::playSound() if ( parameter.isEmpty() ) return ; TQString play = parameter; - TQString file = TQString::tqfromLatin1("file:"); + TQString file = TQString::fromLatin1("file:"); if (parameter.startsWith(file)) play = parameter.mid(file.length()); KAudioPlayer::play(TQFile::encodeName(play)); diff --git a/kmail/kmfilteraction.cpp b/kmail/kmfilteraction.cpp index 6a5e12324..86a7a3e4f 100644 --- a/kmail/kmfilteraction.cpp +++ b/kmail/kmfilteraction.cpp @@ -742,13 +742,13 @@ void KMFilterActionIdentity::setParamWidgetValue( TQWidget * paramWidget ) const } //============================================================================= -// KMFilterActionSetqStatus - set status to +// KMFilterActionSeStatus - set status to // Set the status of messages //============================================================================= -class KMFilterActionSetqStatus: public KMFilterActionWithStringList +class KMFilterActionSeStatus: public KMFilterActionWithStringList { public: - KMFilterActionSetqStatus(); + KMFilterActionSeStatus(); virtual ReturnCode process(KMMessage* msg) const; virtual bool requiresBody(KMMsgBase*) const; @@ -762,7 +762,7 @@ public: }; -static const KMMsgtqStatus stati[] = +static const KMMsgStatus stati[] = { KMMsgStatusFlag, KMMsgStatusRead, @@ -776,18 +776,18 @@ static const KMMsgtqStatus stati[] = KMMsgStatusSpam, KMMsgStatusHam }; -static const int StatiCount = sizeof( stati ) / sizeof( KMMsgtqStatus ); +static const int StatiCount = sizeof( stati ) / sizeof( KMMsgStatus ); -KMFilterAction* KMFilterActionSetqStatus::newAction() +KMFilterAction* KMFilterActionSeStatus::newAction() { - return (new KMFilterActionSetqStatus); + return (new KMFilterActionSeStatus); } -KMFilterActionSetqStatus::KMFilterActionSetqStatus() +KMFilterActionSeStatus::KMFilterActionSeStatus() : KMFilterActionWithStringList( "set status", i18n("Mark As") ) { // if you change this list, also update - // KMFilterActionSetqStatus::stati above + // KMFilterActionSeStatus::stati above mParameterList.append( "" ); mParameterList.append( i18n("msg status","Important") ); mParameterList.append( i18n("msg status","Read") ); @@ -804,22 +804,22 @@ KMFilterActionSetqStatus::KMFilterActionSetqStatus() mParameter = *mParameterList.at(0); } -KMFilterAction::ReturnCode KMFilterActionSetqStatus::process(KMMessage* msg) const +KMFilterAction::ReturnCode KMFilterActionSeStatus::process(KMMessage* msg) const { int idx = mParameterList.findIndex( mParameter ); if ( idx < 1 ) return ErrorButGoOn; - KMMsgtqStatus status = stati[idx-1] ; - msg->setqStatus( status ); + KMMsgStatus status = stati[idx-1] ; + msg->seStatus( status ); return GoOn; } -bool KMFilterActionSetqStatus::requiresBody(KMMsgBase*) const +bool KMFilterActionSeStatus::requiresBody(KMMsgBase*) const { return false; } -void KMFilterActionSetqStatus::argsFromString( const TQString argsStr ) +void KMFilterActionSeStatus::argsFromString( const TQString argsStr ) { if ( argsStr.length() == 1 ) { for ( int i = 0 ; i < StatiCount ; i++ ) @@ -831,16 +831,16 @@ void KMFilterActionSetqStatus::argsFromString( const TQString argsStr ) mParameter = *mParameterList.at(0); } -const TQString KMFilterActionSetqStatus::argsAsString() const +const TQString KMFilterActionSeStatus::argsAsString() const { int idx = mParameterList.findIndex( mParameter ); if ( idx < 1 ) return TQString(); - KMMsgtqStatus status = stati[idx-1]; + KMMsgStatus status = stati[idx-1]; return KMMsgBase::statusToStr(status); } -const TQString KMFilterActionSetqStatus::displayString() const +const TQString KMFilterActionSeStatus::displayString() const { // FIXME after string freeze: // return i18n("").tqarg( ); @@ -1064,7 +1064,7 @@ TQWidget* KMFilterActionAddHeader::createParamWidget( TQWidget* parent ) const cb->setInsertionPolicy( TQComboBox::AtBottom ); hbl->addWidget( cb, 0 /* stretch */ ); TQLabel *l = new TQLabel( i18n("With value:"), w ); - l->setFixedWidth( l->tqsizeHint().width() ); + l->setFixedWidth( l->sizeHint().width() ); hbl->addWidget( l, 0 ); TQLineEdit *le = new KLineEdit( w, "ledit" ); hbl->addWidget( le, 1 ); @@ -1214,14 +1214,14 @@ TQWidget* KMFilterActionRewriteHeader::createParamWidget( TQWidget* parent ) con hbl->addWidget( cb, 0 /* stretch */ ); TQLabel *l = new TQLabel( i18n("Replace:"), w ); - l->setFixedWidth( l->tqsizeHint().width() ); + l->setFixedWidth( l->sizeHint().width() ); hbl->addWidget( l, 0 ); RegExpLineEdit *rele = new RegExpLineEdit( w, "search" ); hbl->addWidget( rele, 1 ); l = new TQLabel( i18n("With:"), w ); - l->setFixedWidth( l->tqsizeHint().width() ); + l->setFixedWidth( l->sizeHint().width() ); hbl->addWidget( l, 0 ); TQLineEdit *le = new KLineEdit( w, "replace" ); @@ -1744,10 +1744,10 @@ class PipeJob : public KPIM::ThreadWeaver::Job if ( !origSerNum.isEmpty() ) mMsg->setHeaderField( "X-KMail-Filtered", origSerNum ); if ( filterFolder && handler ) { - bool oldtqStatus = handler->ignoreChanges( true ); + bool oldStatus = handler->ignoreChanges( true ); filterFolder->take( filterFolder->find( mMsg ) ); filterFolder->addMsg( mMsg ); - handler->ignoreChanges( oldtqStatus ); + handler->ignoreChanges( oldStatus ); } else { kdDebug(5006) << "Warning: Cannot refresh the message from the external filter." << endl; } @@ -1898,7 +1898,7 @@ KMFilterAction::ReturnCode KMFilterActionExecSound::process(KMMessage*) const if ( mParameter.isEmpty() ) return ErrorButGoOn; TQString play = mParameter; - TQString file = TQString::tqfromLatin1("file:"); + TQString file = TQString::fromLatin1("file:"); if (mParameter.startsWith(file)) play = mParameter.mid(file.length()); KAudioPlayer::play(TQFile::encodeName(play)); @@ -1970,7 +1970,7 @@ void KMFilterActionDict::init(void) insert( KMFilterActionMove::newAction ); insert( KMFilterActionCopy::newAction ); insert( KMFilterActionIdentity::newAction ); - insert( KMFilterActionSetqStatus::newAction ); + insert( KMFilterActionSeStatus::newAction ); insert( KMFilterActionFakeDisposition::newAction ); insert( KMFilterActionTransport::newAction ); insert( KMFilterActionReplyTo::newAction ); diff --git a/kmail/kmfilterdlg.cpp b/kmail/kmfilterdlg.cpp index b9d0e5060..5a9ed3175 100644 --- a/kmail/kmfilterdlg.cpp +++ b/kmail/kmfilterdlg.cpp @@ -234,7 +234,7 @@ KMFilterDlg::KMFilterDlg(TQWidget* parent, const char* name, bool popFilter, boo mConfigureShortcut = new TQCheckBox( i18n("Add this filter to the Apply Filter menu"), adv_w ); gl->addMultiCellWidget( mConfigureShortcut, 7, 7, 0, 1 ); TQLabel *keyButtonLabel = new TQLabel( i18n( "Shortcut:" ), adv_w ); - keyButtonLabel->tqsetAlignment( AlignVCenter | AlignRight ); + keyButtonLabel->setAlignment( AlignVCenter | AlignRight ); gl->addMultiCellWidget( keyButtonLabel, 7, 7, 2, 2 ); mKeyButton = new KKeyButton( adv_w, "FilterShortcutSelector" ); gl->addMultiCellWidget( mKeyButton, 7, 7, 3, 3 ); @@ -595,19 +595,19 @@ KMFilterListBox::KMFilterListBox( const TQString & title, TQWidget *parent, cons mBtnTop = new KPushButton( TQString(), hb ); mBtnTop->setAutoRepeat( true ); mBtnTop->setIconSet( BarIconSet( "top", KIcon::SizeSmall ) ); - mBtnTop->setMinimumSize( mBtnTop->tqsizeHint() * 1.2 ); + mBtnTop->setMinimumSize( mBtnTop->sizeHint() * 1.2 ); mBtnUp = new KPushButton( TQString(), hb ); mBtnUp->setAutoRepeat( true ); mBtnUp->setIconSet( BarIconSet( "up", KIcon::SizeSmall ) ); - mBtnUp->setMinimumSize( mBtnUp->tqsizeHint() * 1.2 ); + mBtnUp->setMinimumSize( mBtnUp->sizeHint() * 1.2 ); mBtnDown = new KPushButton( TQString(), hb ); mBtnDown->setAutoRepeat( true ); mBtnDown->setIconSet( BarIconSet( "down", KIcon::SizeSmall ) ); - mBtnDown->setMinimumSize( mBtnDown->tqsizeHint() * 1.2 ); + mBtnDown->setMinimumSize( mBtnDown->sizeHint() * 1.2 ); mBtnBot = new KPushButton( TQString(), hb ); mBtnBot->setAutoRepeat( true ); mBtnBot->setIconSet( BarIconSet( "bottom", KIcon::SizeSmall ) ); - mBtnBot->setMinimumSize( mBtnBot->tqsizeHint() * 1.2 ); + mBtnBot->setMinimumSize( mBtnBot->sizeHint() * 1.2 ); TQToolTip::add( mBtnTop, i18n("Top") ); TQToolTip::add( mBtnUp, i18n("Up") ); TQToolTip::add( mBtnDown, i18n("Down") ); @@ -622,13 +622,13 @@ KMFilterListBox::KMFilterListBox( const TQString & title, TQWidget *parent, cons hb->setSpacing(4); mBtnNew = new TQPushButton( TQString(), hb ); mBtnNew->setPixmap( BarIcon( "filenew", KIcon::SizeSmall ) ); - mBtnNew->setMinimumSize( mBtnNew->tqsizeHint() * 1.2 ); + mBtnNew->setMinimumSize( mBtnNew->sizeHint() * 1.2 ); mBtnCopy = new TQPushButton( TQString(), hb ); mBtnCopy->setIconSet( BarIconSet( "editcopy", KIcon::SizeSmall ) ); - mBtnCopy->setMinimumSize( mBtnCopy->tqsizeHint() * 1.2 ); + mBtnCopy->setMinimumSize( mBtnCopy->sizeHint() * 1.2 ); mBtnDelete = new TQPushButton( TQString(), hb ); mBtnDelete->setIconSet( BarIconSet( "editdelete", KIcon::SizeSmall ) ); - mBtnDelete->setMinimumSize( mBtnDelete->tqsizeHint() * 1.2 ); + mBtnDelete->setMinimumSize( mBtnDelete->sizeHint() * 1.2 ); mBtnRename = new TQPushButton( i18n("Rename..."), hb ); TQToolTip::add( mBtnNew, i18n("New") ); TQToolTip::add( mBtnCopy, i18n("Copy") ); @@ -948,7 +948,7 @@ void KMFilterListBox::slotRename() i18n("Rename filter \"%1\" to:\n(leave the field empty for automatic naming)") .tqarg( filter->pattern()->name() ) /*label*/, filter->pattern()->name() /* initial value */, - &okPressed, tqtopLevelWidget(), 0, validator + &okPressed, topLevelWidget(), 0, validator ); delete validator; @@ -1141,12 +1141,12 @@ KMFilterActionWidget::KMFilterActionWidget( TQWidget *parent, const char* name ) // don't show scroll bars. mComboBox->setSizeLimit( mComboBox->count() ); // tqlayout management: - // o the combo box is not to be made larger than it's tqsizeHint(), + // o the combo box is not to be made larger than it's sizeHint(), // the parameter widget should grow instead. // o the whole widget takes all space horizontally, but is fixed vertically. mComboBox->adjustSize(); - mComboBox->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); - tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) ); + mComboBox->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); + setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) ); updateGeometry(); // redirect focus to the filter action combo box diff --git a/kmail/kmfolder.cpp b/kmail/kmfolder.cpp index df8b4daf1..3315c99ee 100644 --- a/kmail/kmfolder.cpp +++ b/kmail/kmfolder.cpp @@ -470,10 +470,10 @@ int KMFolder::countUnreadRecursive() return count; } -void KMFolder::msgStatusChanged( const KMMsgtqStatus oldtqStatus, - const KMMsgtqStatus newtqStatus, int idx ) +void KMFolder::msgStatusChanged( const KMMsgStatus oldStatus, + const KMMsgStatus newStatus, int idx ) { - mStorage->msgStatusChanged( oldtqStatus, newtqStatus, idx ); + mStorage->msgStatusChanged( oldStatus, newStatus, idx ); } int KMFolder::open(const char *owner) @@ -828,15 +828,15 @@ int KMFolder::writeIndex( bool createEmptyIndex ) return mStorage->writeIndex( createEmptyIndex ); } -void KMFolder::setqStatus( int idx, KMMsgtqStatus status, bool toggle ) +void KMFolder::seStatus( int idx, KMMsgStatus status, bool toggle ) { - mStorage->setqStatus( idx, status, toggle ); + mStorage->seStatus( idx, status, toggle ); } -void KMFolder::setqStatus( TQValueList<int>& ids, KMMsgtqStatus status, +void KMFolder::seStatus( TQValueList<int>& ids, KMMsgStatus status, bool toggle ) { - mStorage->setqStatus( ids, status, toggle); + mStorage->seStatus( ids, status, toggle); } void KMFolder::setIconPaths( const TQString &normalPath, diff --git a/kmail/kmfolder.h b/kmail/kmfolder.h index 60db26661..82d586a23 100644 --- a/kmail/kmfolder.h +++ b/kmail/kmfolder.h @@ -273,10 +273,10 @@ public: contained by this folder */ int countUnreadRecursive(); - /** Called by KMMsgBase::setqStatus when status of a message has changed + /** Called by KMMsgBase::seStatus when status of a message has changed required to keep the number unread messages variable current. */ - void msgStatusChanged( const KMMsgtqStatus oldtqStatus, - const KMMsgtqStatus newtqStatus, + void msgStatusChanged( const KMMsgStatus oldStatus, + const KMMsgStatus newStatus, int idx); /** Open folder for access. @@ -490,10 +490,10 @@ public: int writeIndex( bool createEmptyIndex = false ); /** Set the status of the message at index @p idx to @p status. */ - void setqStatus(int idx, KMMsgtqStatus status, bool toggle=false); + void seStatus(int idx, KMMsgStatus status, bool toggle=false); /** Set the status of the message(s) in the TQValueList @p ids to @p status. */ - void setqStatus(TQValueList<int>& ids, KMMsgtqStatus status, bool toggle=false); + void seStatus(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 10dfff5af..a55d22561 100644 --- a/kmail/kmfoldercachedimap.cpp +++ b/kmail/kmfoldercachedimap.cpp @@ -1531,7 +1531,7 @@ void KMFolderCachedImap::uploadFlags() // Send off a status setting job for each set. for( TQStringList::Iterator slit = sets.begin(); slit != sets.end(); ++slit ) { TQString imappath = imapPath() + ";UID=" + ( *slit ); - mAccount->setImaptqStatus(folder(), imappath, flags); + mAccount->setImapStatus(folder(), imappath, flags); } } // FIXME END DUPLICATED FROM KMFOLDERIMAP @@ -1575,7 +1575,7 @@ void KMFolderCachedImap::uploadSeenFlags() mStatusFlagsJobs += sets.count(); for( TQStringList::Iterator it = sets.begin(); it != sets.end(); ++it ) { TQString imappath = imapPath() + ";UID=" + ( *it ); - mAccount->setImapSeentqStatus( folder(), imappath, true ); + mAccount->setImapSeenStatus( folder(), imappath, true ); } } if ( !unseenUids.isEmpty() ) { @@ -1583,7 +1583,7 @@ void KMFolderCachedImap::uploadSeenFlags() mStatusFlagsJobs += sets.count(); for( TQStringList::Iterator it = sets.begin(); it != sets.end(); ++it ) { TQString imappath = imapPath() + ";UID=" + ( *it ); - mAccount->setImapSeentqStatus( folder(), imappath, false ); + mAccount->setImapSeenStatus( folder(), imappath, false ); } } @@ -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::setqStatus( int idx, KMMsgtqStatus status, bool toggle) +void KMFolderCachedImap::seStatus( int idx, KMMsgStatus status, bool toggle) { - KMFolderMaildir::setqStatus( idx, status, toggle ); + KMFolderMaildir::seStatus( idx, status, toggle ); const KMMsgBase *msg = getMsgBase( idx ); Q_ASSERT( msg ); if ( msg ) mUIDsOfLocallyChangedStatuses.insert( msg->UID() ); } -void KMFolderCachedImap::setqStatus(TQValueList<int>& ids, KMMsgtqStatus status, bool toggle) +void KMFolderCachedImap::seStatus(TQValueList<int>& ids, KMMsgStatus status, bool toggle) { - KMFolderMaildir::setqStatus(ids, status, toggle); + KMFolderMaildir::seStatus(ids, status, toggle); for (TQValueList<int>::iterator it = ids.begin(); it != ids.end(); it++ ) { const KMMsgBase *msg = getMsgBase( *it ); Q_ASSERT( msg ); @@ -1929,9 +1929,9 @@ void KMFolderCachedImap::slotGetMessagesData(KIO::Job * job, const TQByteArray & // be considered correct. if ( !mReadOnly || !GlobalSettings::allowLocalFlags() ) { /* The message is OK, update flags */ - KMFolderImap::flagsTotqStatus( existingMessage, flags, false, mReadOnly ? INT_MAX : mPermanentFlags ); + KMFolderImap::flagsToStatus( existingMessage, flags, false, mReadOnly ? INT_MAX : mPermanentFlags ); } else if ( mUserRights & KMail::ACLJobs::WriteSeenFlag ) { - KMFolderImap::seenFlagTotqStatus( existingMessage, flags ); + KMFolderImap::seenFlagToStatus( existingMessage, flags ); } } // kdDebug(5006) << "message with uid " << uid << " found in the local cache. " << endl; @@ -2596,7 +2596,7 @@ void KMFolderCachedImap::resetSyncState() KPIM::ProgressItem *progressItem = mAccount->mailCheckProgressItem(); TQString str = i18n("Aborted"); if (progressItem) - progressItem->setqStatus( str ); + progressItem->seStatus( str ); emit statusMsg( str ); emit syncStateChanged(); } @@ -2606,21 +2606,21 @@ void KMFolderCachedImap::slotIncreaseProgress() mProgress += 5; } -void KMFolderCachedImap::newState( int progress, const TQString& synctqStatus ) +void KMFolderCachedImap::newState( int progress, const TQString& syncStatus ) { - //kdDebug() << k_funcinfo << folder() << " " << mProgress << " " << synctqStatus << endl; + //kdDebug() << k_funcinfo << folder() << " " << mProgress << " " << syncStatus << endl; KPIM::ProgressItem *progressItem = mAccount->mailCheckProgressItem(); if( progressItem ) progressItem->setCompletedItems( progress ); - if ( !synctqStatus.isEmpty() ) { + if ( !syncStatus.isEmpty() ) { TQString str; // For a subfolder, show the label. But for the main folder, it's already shown. if ( mAccount->imapFolder() == this ) - str = synctqStatus; + str = syncStatus; else - str = TQString( "%1: %2" ).tqarg( label() ).tqarg( synctqStatus ); + str = TQString( "%1: %2" ).tqarg( label() ).tqarg( syncStatus ); if( progressItem ) - progressItem->setqStatus( str ); + progressItem->seStatus( str ); emit statusMsg( str ); } if( progressItem ) @@ -3095,7 +3095,7 @@ KMCommand* KMFolderCachedImap::rescueUnsyncedMessages() break; // create subfolder for this incident - TQDate today = TQDate::tqcurrentDate(); + TQDate today = TQDate::currentDate(); TQString baseName = folder()->label() + "-" + TQString::number( today.year() ) + (today.month() < 10 ? "0" : "" ) + TQString::number( today.month() ) + (today.day() < 10 ? "0" : "" ) + TQString::number( today.day() ); diff --git a/kmail/kmfoldercachedimap.h b/kmail/kmfoldercachedimap.h index dfef783ab..bd084f00a 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 setqStatus( int id, KMMsgtqStatus status, bool toggle ); - virtual void setqStatus( TQValueList<int>& ids, KMMsgtqStatus status, bool toggle ); + virtual void seStatus( int id, KMMsgStatus status, bool toggle ); + virtual void seStatus( TQValueList<int>& ids, KMMsgStatus status, bool toggle ); TQString annotationFolderType() const { return mAnnotationFolderType; } @@ -405,7 +405,7 @@ protected: virtual void timerEvent( TQTimerEvent* ); /* update progress status */ - void newState( int progress, const TQString& synctqStatus ); + void newState( int progress, const TQString& syncStatus ); /** See if there is a better parent then this folder */ KMFolderCachedImap* findParent( const TQString& path, const TQString& name ); @@ -590,7 +590,7 @@ private: bool mSharedSeenFlagsChanged; /** - * UIDs added by setqStatus. Indicates that the client has changed + * UIDs added by seStatus. 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 d10e8cfac..6e7b6b34e 100644 --- a/kmail/kmfolderdia.cpp +++ b/kmail/kmfolderdia.cpp @@ -185,7 +185,7 @@ void KMFolderDialog::slotOk() mDelayedSavingTabs = 0; // number of tabs which need delayed saving for ( unsigned int i = 0 ; i < mTabs.count() ; ++i ) { - FolderDiaTab::AcceptqStatus s = mTabs[i]->accept(); + FolderDiaTab::AccepStatus s = mTabs[i]->accept(); if ( s == FolderDiaTab::Canceled ) { slotCancelAccept(); return; @@ -331,7 +331,7 @@ KMail::FolderDiaGeneralTab::FolderDiaGeneralTab( KMFolderDialog* dlg, mNameEdit->setText( mDlg->folder() ? mDlg->folder()->label() : i18n("unnamed") ); if (!aName.isEmpty()) mNameEdit->setText(aName); - mNameEdit->setMinimumSize(mNameEdit->tqsizeHint()); + mNameEdit->setMinimumSize(mNameEdit->sizeHint()); // prevent renaming of IMAP inbox if ( mDlg->folder() && mDlg->folder()->isSystemFolder() ) { TQString imapPath; diff --git a/kmail/kmfolderdia.h b/kmail/kmfolderdia.h index 230b4526f..baec75f8a 100644 --- a/kmail/kmfolderdia.h +++ b/kmail/kmfolderdia.h @@ -83,12 +83,12 @@ public: /// @return whether save succeeded virtual bool save() = 0; - enum AcceptqStatus { Accepted, Canceled, Delayed }; + enum AccepStatus { Accepted, Canceled, Delayed }; /// Called when clicking OK. /// If a module returns Delayed, the closing is cancelled for now, /// and the module can close the dialog later on (i.e. after an async /// operation like a KIO job). - virtual AcceptqStatus accept() { + virtual AccepStatus accept() { return save() ? Accepted : Canceled; } diff --git a/kmail/kmfolderdir.cpp b/kmail/kmfolderdir.cpp index 77390e61b..0c88bd2d1 100644 --- a/kmail/kmfolderdir.cpp +++ b/kmail/kmfolderdir.cpp @@ -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::tqfromLatin1(".%1.uidcache").tqarg(fname); + TQString imapcachefile = TQString::fromLatin1(".%1.uidcache").tqarg(fname); if ( dir.exists( imapcachefile) || dir.exists( maildir ) ) { folder = new KMFolder( this, fname, KMFolderTypeCachedImap ); diff --git a/kmail/kmfolderimap.cpp b/kmail/kmfolderimap.cpp index 05a7864d1..51e5762e8 100644 --- a/kmail/kmfolderimap.cpp +++ b/kmail/kmfolderimap.cpp @@ -849,7 +849,7 @@ void KMFolderImap::slotListResult( const TQStringList& subfolderNames, // update progress account()->listDirProgressItem()->incCompletedItems(); account()->listDirProgressItem()->updateProgress(); - account()->listDirProgressItem()->setqStatus( folder()->prettyURL() + i18n(" completed") ); + account()->listDirProgressItem()->seStatus( folder()->prettyURL() + i18n(" completed") ); f->initializeFrom( this, subfolderPaths[i], subfolderMimeTypes[i] ); f->setChildrenState( subfolderAttributes[i] ); @@ -1073,7 +1073,7 @@ void KMFolderImap::checkValidity() mMailCheckProgressItem->setProgress(0); } if ( account()->mailCheckProgressItem() ) { - account()->mailCheckProgressItem()->setqStatus( folder()->prettyURL() ); + account()->mailCheckProgressItem()->seStatus( 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->setqStatus( i18n("Retrieving message status") ); + mMailCheckProgressItem->seStatus( 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->setqStatus( i18n("Retrieving messages") ); + mMailCheckProgressItem->seStatus( i18n("Retrieving messages") ); url.setPath(imapPath() + ";UID=" + startUid + ":*;SECTION=ENVELOPE"); KIO::SimpleJob *newJob = KIO::get(url, false, false); @@ -1309,9 +1309,9 @@ void KMFolderImap::slotListFolderResult(KIO::Job * job) int supportedFlags = mUploadAllFlags ? 31 : mPermanentFlags; if ( mReadOnly ) supportedFlags = INT_MAX; - flagsTotqStatus( msgBase, serverFlags, false, supportedFlags ); + flagsToStatus( msgBase, serverFlags, false, supportedFlags ); } else - seenFlagTotqStatus( msgBase, serverFlags, false ); + seenFlagToStatus( msgBase, serverFlags, false ); idx++; uid = (*it).items.remove(uid); if ( msgBase->getMsgSerNum() > 0 ) { @@ -1341,7 +1341,7 @@ void KMFolderImap::slotListFolderResult(KIO::Job * job) mMailCheckProgressItem->setCompletedItems( 0 ); mMailCheckProgressItem->setTotalItems( jd.total ); mMailCheckProgressItem->setProgress( 0 ); - mMailCheckProgressItem->setqStatus( i18n("Retrieving messages") ); + mMailCheckProgressItem->seStatus( i18n("Retrieving messages") ); } TQStringList sets; @@ -1421,7 +1421,7 @@ void KMFolderImap::slotListFolderEntries(KIO::Job * job, //X } //----------------------------------------------------------------------------- -void KMFolderImap::flagsTotqStatus(KMMsgBase *msg, int flags, bool newMsg, int supportedFlags ) +void KMFolderImap::flagsToStatus(KMMsgBase *msg, int flags, bool newMsg, int supportedFlags ) { if ( !msg ) return; @@ -1440,45 +1440,45 @@ void KMFolderImap::flagsTotqStatus(KMMsgBase *msg, int flags, bool newMsg, int s }; static const int numFlags = sizeof imapFlagMap / sizeof *imapFlagMap; - const KMMsgtqStatus oldtqStatus = msg->status(); + const KMMsgStatus oldStatus = msg->status(); for ( int i = 0; i < numFlags; ++i ) { if ( ( (supportedFlags & imapFlagMap[i].imapFlag) == 0 && (supportedFlags & 64) == 0 ) && !imapFlagMap[i].standardFlag ) { continue; } - if ( ((flags & imapFlagMap[i].imapFlag) > 0) != ((oldtqStatus & imapFlagMap[i].kmFlag) > 0) ) { - msg->toggletqStatus( imapFlagMap[i].kmFlag ); + if ( ((flags & imapFlagMap[i].imapFlag) > 0) != ((oldStatus & imapFlagMap[i].kmFlag) > 0) ) { + msg->toggleStatus( imapFlagMap[i].kmFlag ); } } - seenFlagTotqStatus( msg, flags, newMsg ); + seenFlagToStatus( msg, flags, newMsg ); } -void KMFolderImap::seenFlagTotqStatus(KMMsgBase * msg, int flags, bool newMsg) +void KMFolderImap::seenFlagToStatus(KMMsgBase * msg, int flags, bool newMsg) { if ( !msg ) return; - const KMMsgtqStatus oldtqStatus = msg->status(); - if ( (flags & 1) && (oldtqStatus & KMMsgStatusOld) == 0 ) - msg->setqStatus( KMMsgStatusOld ); + const KMMsgStatus oldStatus = msg->status(); + if ( (flags & 1) && (oldStatus & KMMsgStatusOld) == 0 ) + msg->seStatus( 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 // number of messages which actually show up as read can go out of sync. - if ( msg->isOfUnknowntqStatus() || (!(flags&1) && !(oldtqStatus&(KMMsgStatusNew|KMMsgStatusUnread)) ) ) { + if ( msg->isOfUnknownStatus() || (!(flags&1) && !(oldStatus&(KMMsgStatusNew|KMMsgStatusUnread)) ) ) { if (newMsg) { - if ( (oldtqStatus & KMMsgStatusNew) == 0 ) - msg->setqStatus( KMMsgStatusNew ); + if ( (oldStatus & KMMsgStatusNew) == 0 ) + msg->seStatus( KMMsgStatusNew ); } else { - if ( (oldtqStatus & KMMsgStatusUnread) == 0 ) - msg->setqStatus( KMMsgStatusUnread ); + if ( (oldStatus & KMMsgStatusUnread) == 0 ) + msg->seStatus( KMMsgStatusUnread ); } } } //----------------------------------------------------------------------------- -TQString KMFolderImap::statusToFlags(KMMsgtqStatus status, int supportedFlags) +TQString KMFolderImap::statusToFlags(KMMsgStatus status, int supportedFlags) { TQString flags; if (status & KMMsgStatusDeleted) @@ -1596,14 +1596,14 @@ void KMFolderImap::slotGetMessagesData(KIO::Job * job, const TQByteArray & data) } // Transfer the status, if it is cached. if ( md ) { - msg->setqStatus( md->status() ); + msg->seStatus( 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->setqStatus( md->status() ); + msg->seStatus( md->status() ); if ( md->serNum() != 0 && serNum == 0 ) { msg->setMsgSerNum( md->serNum() ); } @@ -1613,7 +1613,7 @@ void KMFolderImap::slotGetMessagesData(KIO::Job * job, const TQByteArray & data) } KMFolderMbox::addMsg(msg, 0); // Merge with the flags from the server. - flagsTotqStatus((KMMsgBase*)msg, flags, true, mUploadAllFlags ? 31 : mPermanentFlags); + flagsToStatus((KMMsgBase*)msg, flags, true, mUploadAllFlags ? 31 : mPermanentFlags); // set the correct size msg->setMsgSizeServer( msg->headerField("X-Length").toUInt() ); msg->setUID(uid); @@ -1880,15 +1880,15 @@ void KMFolderImap::deleteMessage(const TQPtrList<KMMessage>& msgList) } //----------------------------------------------------------------------------- -void KMFolderImap::setqStatus(int idx, KMMsgtqStatus status, bool toggle) +void KMFolderImap::seStatus(int idx, KMMsgStatus status, bool toggle) { TQValueList<int> ids; ids.append(idx); - setqStatus(ids, status, toggle); + seStatus(ids, status, toggle); } -void KMFolderImap::setqStatus(TQValueList<int>& _ids, KMMsgtqStatus status, bool toggle) +void KMFolderImap::seStatus(TQValueList<int>& _ids, KMMsgStatus status, bool toggle) { - FolderStorage::setqStatus(_ids, status, toggle); + FolderStorage::seStatus(_ids, status, toggle); TQValueList<int> ids; if ( mUploadAllFlags ) { kdDebug(5006) << k_funcinfo << "Migrating all flags to the server" << endl; @@ -1929,14 +1929,14 @@ void KMFolderImap::setqStatus(TQValueList<int>& _ids, KMMsgtqStatus status, bool TQStringList sets = KMFolderImap::makeSets( seenUids, true ); for( TQStringList::Iterator it = sets.begin(); it != sets.end(); ++it ) { TQString imappath = imapPath() + ";UID=" + ( *it ); - account()->setImapSeentqStatus( folder(), imappath, true ); + account()->setImapSeenStatus( folder(), imappath, true ); } } if ( !unseenUids.isEmpty() ) { TQStringList sets = KMFolderImap::makeSets( unseenUids, true ); for( TQStringList::Iterator it = sets.begin(); it != sets.end(); ++it ) { TQString imappath = imapPath() + ";UID=" + ( *it ); - account()->setImapSeentqStatus( folder(), imappath, false ); + account()->setImapSeenStatus( folder(), imappath, false ); } } return; @@ -1960,7 +1960,7 @@ void KMFolderImap::setqStatus(TQValueList<int>& _ids, KMMsgtqStatus status, bool // Send off a status setting job for each set. for ( TQStringList::Iterator slit = sets.begin(); slit != sets.end(); ++slit ) { TQString imappath = imapPath() + ";UID=" + ( *slit ); - account()->setImaptqStatus(folder(), imappath, flags); + account()->setImapStatus(folder(), imappath, flags); } } if ( mContentState == imapListingInProgress ) { diff --git a/kmail/kmfolderimap.h b/kmail/kmfolderimap.h index c7b31588f..47ddfbdfb 100644 --- a/kmail/kmfolderimap.h +++ b/kmail/kmfolderimap.h @@ -61,15 +61,15 @@ using KPIM::ProgressItem; class KMMsgMetaData { public: - KMMsgMetaData(KMMsgtqStatus atqStatus) - :mtqStatus(atqStatus), mSerNum(0) {} - KMMsgMetaData(KMMsgtqStatus atqStatus, TQ_UINT32 aSerNum) - :mtqStatus(atqStatus), mSerNum(aSerNum) {} + KMMsgMetaData(KMMsgStatus aStatus) + :mStatus(aStatus), mSerNum(0) {} + KMMsgMetaData(KMMsgStatus aStatus, TQ_UINT32 aSerNum) + :mStatus(aStatus), mSerNum(aSerNum) {} ~KMMsgMetaData() {}; - KMMsgtqStatus status() const { return mtqStatus; } + KMMsgStatus status() const { return mStatus; } TQ_UINT32 serNum() const { return mSerNum; } private: - KMMsgtqStatus mtqStatus; + KMMsgStatus mStatus; TQ_UINT32 mSerNum; }; @@ -184,12 +184,12 @@ public: * Change the status of the message indicated by @p index * Overloaded function for the following one */ - virtual void setqStatus(int idx, KMMsgtqStatus status, bool toggle); + virtual void seStatus(int idx, KMMsgStatus status, bool toggle); /** * Change the status of several messages indicated by @p ids */ - virtual void setqStatus(TQValueList<int>& _ids, KMMsgtqStatus status, bool toggle); + virtual void seStatus(TQValueList<int>& _ids, KMMsgStatus status, bool toggle); /** generates sets of uids */ static TQStringList makeSets( TQValueList<ulong>&, bool sort = true); @@ -241,7 +241,7 @@ public: /** * Convert message status to a list of IMAP flags */ - static TQString statusToFlags(KMMsgtqStatus status, int supportedFalgs); + static TQString statusToFlags(KMMsgStatus status, int supportedFalgs); /** * Return the filename of the folder (reimplemented from KFolder) @@ -380,13 +380,13 @@ public slots: * Convert IMAP flags to a message status * @param newMsg specifies whether unseen messages are new or unread */ - static void flagsTotqStatus(KMMsgBase *msg, int flags, bool newMsg = TRUE, int supportedFalgs = 31 ); + static void flagsToStatus(KMMsgBase *msg, int flags, bool newMsg = TRUE, int supportedFalgs = 31 ); /** * Convert IMAP seen flag to a message status. * @param newMsg specifies whether unseen messages are new or unread */ - static void seenFlagTotqStatus( KMMsgBase *msg, int flags, bool newMsg = true ); + static void seenFlagToStatus( KMMsgBase *msg, int flags, bool newMsg = true ); /** * Connected to the result signal of the copy/move job diff --git a/kmail/kmfolderindex.cpp b/kmail/kmfolderindex.cpp index d41f6bca1..21e51fcb5 100644 --- a/kmail/kmfolderindex.cpp +++ b/kmail/kmfolderindex.cpp @@ -288,7 +288,7 @@ bool KMFolderIndex::readIndex() #ifdef OBSOLETE else if (mi->isNew()) { - mi->setqStatus(KMMsgStatusUnread); + mi->seStatus(KMMsgStatusUnread); mi->setDirty(false); } #endif @@ -467,7 +467,7 @@ bool KMFolderIndex::updateIndexStreamPtr(bool) } -KMFolderIndex::IndextqStatus KMFolderIndex::indextqStatus() +KMFolderIndex::IndexStatus KMFolderIndex::indexStatus() { if ( !mCompactable ) return IndexCorrupt; @@ -562,10 +562,10 @@ void KMFolderIndex::updateInvitationAndAddressFieldsFromContents() msg.fromDwString( msgString, false ); msg.updateInvitationState(); if ( msg.status() & KMMsgStatusHasInvitation ) { - msgInfo->setqStatus( msgInfo->status() | KMMsgStatusHasInvitation ); + msgInfo->seStatus( msgInfo->status() | KMMsgStatusHasInvitation ); } if ( msg.status() & KMMsgStatusHasNoInvitation ) { - msgInfo->setqStatus( msgInfo->status() | KMMsgStatusHasNoInvitation ); + msgInfo->seStatus( msgInfo->status() | KMMsgStatusHasNoInvitation ); } msgInfo->setFrom( msg.from() ); msgInfo->setTo( msg.to() ); diff --git a/kmail/kmfolderindex.h b/kmail/kmfolderindex.h index b0682ff00..563fe5d6e 100644 --- a/kmail/kmfolderindex.h +++ b/kmail/kmfolderindex.h @@ -45,9 +45,9 @@ class KMFolderIndex: public FolderStorage public: /** This enum indicates the status of the index file. It's returned by - indextqStatus(). + indexStatus(). */ - enum IndextqStatus { IndexOk, + enum IndexStatus { IndexOk, IndexMissing, IndexCorrupt, IndexTooOld @@ -91,7 +91,7 @@ public: Should return IndexOk if the folder doesn't exist anymore "physically" or if the index is not older than the contents. */ - virtual IndextqStatus indextqStatus() = 0; + virtual IndexStatus indexStatus() = 0; public slots: /** Incrementally update the index if possible else call writeIndex */ diff --git a/kmail/kmfoldermaildir.cpp b/kmail/kmfoldermaildir.cpp index 6947bc78a..61f40e8bd 100644 --- a/kmail/kmfoldermaildir.cpp +++ b/kmail/kmfoldermaildir.cpp @@ -117,7 +117,7 @@ int KMFolderMaildir::open(const char *) if (!folder()->path().isEmpty()) { - if (KMFolderIndex::IndexOk != indextqStatus()) // test if contents file has changed + if (KMFolderIndex::IndexOk != indexStatus()) // test if contents file has changed { TQString str; mIndexStream = 0; @@ -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->setqStatus(KMMsgStatusUnread); + mi->seStatus(KMMsgStatusUnread); setDirty( true ); } #endif @@ -583,7 +583,7 @@ DwString KMFolderMaildir::getDwString(int idx) } -void KMFolderMaildir::readFileHeaderIntern(const TQString& dir, const TQString& file, KMMsgtqStatus status) +void KMFolderMaildir::readFileHeaderIntern(const TQString& dir, const TQString& file, KMMsgStatus status) { // we keep our current directory to restore it later char path_buffer[PATH_MAX]; @@ -903,7 +903,7 @@ int KMFolderMaildir::createIndexFromContents() return 0; } -KMFolderIndex::IndextqStatus KMFolderMaildir::indextqStatus() +KMFolderIndex::IndexStatus KMFolderMaildir::indexStatus() { if ( !mCompactable ) return KMFolderIndex::IndexCorrupt; @@ -1033,7 +1033,7 @@ static KStaticDeleter<TQRegExp> suffix_regex_sd; //----------------------------------------------------------------------------- // static TQString KMFolderMaildir::constructValidFileName( const TQString & filename, - KMMsgtqStatus status ) + KMMsgStatus status ) { TQString aFileName( filename ); @@ -1075,7 +1075,7 @@ TQString KMFolderMaildir::moveInternal(const TQString& oldLoc, const TQString& n } //----------------------------------------------------------------------------- -TQString KMFolderMaildir::moveInternal(const TQString& oldLoc, const TQString& newLoc, TQString& aFileName, KMMsgtqStatus status) +TQString KMFolderMaildir::moveInternal(const TQString& oldLoc, const TQString& newLoc, TQString& aFileName, KMMsgStatus status) { TQString dest(newLoc); // make sure that our destination filename doesn't already exist @@ -1096,13 +1096,13 @@ TQString KMFolderMaildir::moveInternal(const TQString& oldLoc, const TQString& n } //----------------------------------------------------------------------------- -void KMFolderMaildir::msgStatusChanged(const KMMsgtqStatus oldtqStatus, - const KMMsgtqStatus newtqStatus, int idx) +void KMFolderMaildir::msgStatusChanged(const KMMsgStatus oldStatus, + const KMMsgStatus newStatus, int idx) { // if the status of any message changes, then we need to compact needsCompact = true; - KMFolderIndex::msgStatusChanged(oldtqStatus, newtqStatus, idx); + KMFolderIndex::msgStatusChanged(oldStatus, newStatus, idx); } /*virtual*/ diff --git a/kmail/kmfoldermaildir.h b/kmail/kmfoldermaildir.h index ea02d9b11..c16d64f0b 100644 --- a/kmail/kmfoldermaildir.h +++ b/kmail/kmfoldermaildir.h @@ -56,10 +56,10 @@ public: virtual void removeMsg(TQPtrList<KMMessage> msgList, bool imapQuiet = FALSE) { return KMFolderIndex::removeMsg(msgList, imapQuiet); } - // Called by KMMsgBase::setqStatus when status of a message has changed + // Called by KMMsgBase::seStatus when status of a message has changed // required to keep the number unread messages variable current. - virtual void msgStatusChanged( const KMMsgtqStatus oldtqStatus, - const KMMsgtqStatus newtqStatus, + virtual void msgStatusChanged( const KMMsgStatus oldStatus, + const KMMsgStatus newStatus, int idx); /** Open folder for access. @@ -87,7 +87,7 @@ public: static int createMaildirFolders( const TQString & folderPath ); static TQString constructValidFileName( const TQString & filename = TQString(), - KMMsgtqStatus status = KMMsgStatusNew ); + KMMsgStatus status = KMMsgStatusNew ); static bool removeFile( const TQString & folderPath, const TQString & filename ); @@ -148,9 +148,9 @@ private slots: void slotDirSizeJobResult( KIO::Job* job ); private: - void readFileHeaderIntern(const TQString& dir, const TQString& file, KMMsgtqStatus status); + void readFileHeaderIntern(const TQString& dir, const TQString& file, KMMsgStatus status); TQString moveInternal(const TQString& oldLoc, const TQString& newLoc, KMMsgInfo* mi); - TQString moveInternal(const TQString& oldLoc, const TQString& newLoc, TQString& aFileName, KMMsgtqStatus status); + TQString moveInternal(const TQString& oldLoc, const TQString& newLoc, TQString& aFileName, KMMsgStatus status); bool removeFile(const TQString& filename); /** Tests whether the contents of this folder is newer than the index. @@ -158,7 +158,7 @@ private: Returns IndexMissing if there is no index. Returns IndexOk if the index is not older than the contents. */ - virtual IndextqStatus indextqStatus(); + virtual IndexStatus indexStatus(); typedef TQPair<TQGuardedPtr<const KMFolderMaildir>,KFileItemList> DirSizeJobQueueEntry; static TQValueList<DirSizeJobQueueEntry> s_DirSizeJobQueue; diff --git a/kmail/kmfoldermbox.cpp b/kmail/kmfoldermbox.cpp index a53a4be1b..c876e9a1e 100644 --- a/kmail/kmfoldermbox.cpp +++ b/kmail/kmfoldermbox.cpp @@ -119,7 +119,7 @@ int KMFolderMbox::open(const char *owner) if (!folder()->path().isEmpty()) { - KMFolderIndex::IndextqStatus index_status = indextqStatus(); + KMFolderIndex::IndexStatus index_status = indexStatus(); // test if index file exists and is up-to-date if (KMFolderIndex::IndexOk != index_status) { @@ -262,7 +262,7 @@ void KMFolderMbox::reallyDoClose(const char* owner) Q_UNUSED( owner ); if (mAutoCreateIndex) { - if (KMFolderIndex::IndexOk != indextqStatus()) { + if (KMFolderIndex::IndexOk != indexStatus()) { kdDebug(5006) << "Critical error: " << location() << " has been modified by an external application while KMail was running." << endl; // exit(1); backed out due to broken nfs @@ -521,7 +521,7 @@ int KMFolderMbox::unlock() //----------------------------------------------------------------------------- -KMFolderIndex::IndextqStatus KMFolderMbox::indextqStatus() +KMFolderIndex::IndexStatus KMFolderMbox::indexStatus() { if ( !mCompactable ) return KMFolderIndex::IndexCorrupt; @@ -555,8 +555,8 @@ int KMFolderMbox::createIndexFromContents() KMMsgInfo* mi; TQString msgStr; TQRegExp regexp(MSG_SEPERATOR_REGEX); - int i, num, numtqStatus; - short needtqStatus; + int i, num, numStatus; + short needStatus; assert(mStream != 0); rewind(mStream); @@ -564,7 +564,7 @@ int KMFolderMbox::createIndexFromContents() mMsgList.clear(); num = -1; - numtqStatus= 11; + numStatus= 11; off_t offs = 0; size_t size = 0; dateStr = ""; @@ -578,7 +578,7 @@ int KMFolderMbox::createIndexFromContents() replyToAuxIdStr = ""; referencesStr = ""; msgIdStr = ""; - needtqStatus = 3; + needStatus = 3; size_t sizeServer = 0; ulong uid = 0; @@ -597,11 +597,11 @@ int KMFolderMbox::createIndexFromContents() if (num >= 0) { - if (numtqStatus <= 0) + if (numStatus <= 0) { msgStr = i18n("Creating index file: one message done", "Creating index file: %n messages done", num); emit statusMsg(msgStr); - numtqStatus = 10; + numStatus = 10; } if (size > 0) @@ -682,14 +682,14 @@ int KMFolderMbox::createIndexFromContents() replyToIdStr, replyToAuxIdStr, msgIdStr, KMMsgEncryptionStateUnknown, KMMsgSignatureStateUnknown, KMMsgMDNStateUnknown, charset, offs, size, sizeServer, uid ); - mi->setqStatus(status, xstatus); + mi->seStatus(status, xstatus); mi->setDate( dateStr.stripWhiteSpace().data() ); mi->setDirty(false); mMsgList.append(mi, mExportsSernums ); *status = '\0'; *xstatus = '\0'; - needtqStatus = 3; + needStatus = 3; xmarkStr = ""; replyToIdStr = ""; replyToAuxIdStr = ""; @@ -701,12 +701,12 @@ int KMFolderMbox::createIndexFromContents() sizeServer = 0; uid = 0; } - else num--,numtqStatus++; + else num--,numStatus++; } offs = ftell(mStream); num++; - numtqStatus--; + numStatus--; inHeader = true; continue; } @@ -727,19 +727,19 @@ int KMFolderMbox::createIndexFromContents() /* -sanders Make all messages read when auto-recreating index */ /* Reverted, as it breaks reading the sent mail status, for example. -till */ - if ((needtqStatus & 1) && strncasecmp(line, "Status:", 7) == 0) + if ((needStatus & 1) && strncasecmp(line, "Status:", 7) == 0) { for(i=0; i<4 && line[i+8] > ' '; i++) status[i] = line[i+8]; status[i] = '\0'; - needtqStatus &= ~1; + needStatus &= ~1; } - else if ((needtqStatus & 2) && strncasecmp(line, "X-Status:", 9)==0) + else if ((needStatus & 2) && strncasecmp(line, "X-Status:", 9)==0) { for(i=0; i<4 && line[i+10] > ' '; i++) xstatus[i] = line[i+10]; xstatus[i] = '\0'; - needtqStatus &= ~2; + needStatus &= ~2; } else if (strncasecmp(line,"X-KMail-Mark:",13)==0) xmarkStr = TQCString(line+13); @@ -1237,7 +1237,7 @@ int KMFolderMbox::compact( bool silent ) // Note that job autodeletes itself. // If this is the current folder, the changed signal will ultimately call - // KMHeaders::setFolderInfotqStatus which will override the message, so save/restore it + // KMHeaders::setFolderInfoStatus which will override the message, so save/restore it TQString statusMsg = BroadcastStatus::instance()->statusMsg(); emit changed(); BroadcastStatus::instance()->seStatusMsg( statusMsg ); diff --git a/kmail/kmfoldermbox.h b/kmail/kmfoldermbox.h index d37411447..8cc8830bd 100644 --- a/kmail/kmfoldermbox.h +++ b/kmail/kmfoldermbox.h @@ -110,7 +110,7 @@ public: static TQByteArray escapeFrom( const DwString & str ); - virtual IndextqStatus indextqStatus(); + virtual IndexStatus indexStatus(); /** reimp */ virtual TQ_INT64 doFolderSize() const; diff --git a/kmail/kmfolderseldlg.cpp b/kmail/kmfolderseldlg.cpp index fd841ae6a..79df5bc1c 100644 --- a/kmail/kmfolderseldlg.cpp +++ b/kmail/kmfolderseldlg.cpp @@ -65,7 +65,7 @@ void KMFolderSelDlg::init() connect( mTreeView, TQT_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint&, int ) ), this, TQT_SLOT( slotSelect() ) ); connect( mTreeView, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( slotUpdateBtntqStatus() ) ); + this, TQT_SLOT( slotUpdateBtnStatus() ) ); readConfig(); } @@ -107,7 +107,7 @@ void KMFolderSelDlg::slotUser1() } //----------------------------------------------------------------------------- -void KMFolderSelDlg::slotUpdateBtntqStatus() +void KMFolderSelDlg::slotUpdateBtnStatus() { enableButton( User1, folder() && ( !folder()->noContent() && !folder()->noChildren() ) ); diff --git a/kmail/kmfolderseldlg.h b/kmail/kmfolderseldlg.h index edc5f6a74..2d699b80b 100644 --- a/kmail/kmfolderseldlg.h +++ b/kmail/kmfolderseldlg.h @@ -58,7 +58,7 @@ namespace KMail { protected slots: void slotSelect(); void slotUser1(); - void slotUpdateBtntqStatus(); + void slotUpdateBtnStatus(); protected: void readConfig(); diff --git a/kmail/kmfoldertree.cpp b/kmail/kmfoldertree.cpp index aef19abe4..2c59b3981 100644 --- a/kmail/kmfoldertree.cpp +++ b/kmail/kmfoldertree.cpp @@ -1467,7 +1467,7 @@ void KMFolderTree::contentsDragMoveEvent( TQDragMoveEvent *e ) } if ( dragAccepted ) { - e->accept( tqitemRect(i) ); + e->accept( itemRect(i) ); switch ( e->action() ) { case TQDropEvent::Copy: diff --git a/kmail/kmheaders.cpp b/kmail/kmheaders.cpp index 987f9aa06..1e9e5d132 100644 --- a/kmail/kmheaders.cpp +++ b/kmail/kmheaders.cpp @@ -329,7 +329,7 @@ void KMHeaders::slotToggleColumn(int id, int mode) } case KPaintInfo::COL_STATUS: { - show = &mPaintInfo.showtqStatus; + show = &mPaintInfo.showStatus; col = &mPaintInfo.statusCol; width = pixNew->width() + 8; if ( *col == header()->mapToIndex( *col ) ) @@ -409,7 +409,7 @@ void KMHeaders::paintEmptyArea( TQPainter * p, const TQRect & rect ) rect.left() + contentsX(), rect.top() + contentsY() ); else - p->fillRect( rect, tqcolorGroup().base() ); + p->fillRect( rect, colorGroup().base() ); } bool KMHeaders::event(TQEvent *e) @@ -669,7 +669,7 @@ void KMHeaders::writeConfig (void) config->writeEntry("showTodoColumn" , mPaintInfo.showTodo); config->writeEntry("showSpamHamColumn" , mPaintInfo.showSpamHam); config->writeEntry("showWatchedIgnoredColumn", mPaintInfo.showWatchedIgnored); - config->writeEntry("showStatusColumn" , mPaintInfo.showtqStatus); + config->writeEntry("showStatusColumn" , mPaintInfo.showStatus); config->writeEntry("showSignedColumn" , mPaintInfo.showSigned); config->writeEntry("showCryptoColumn" , mPaintInfo.showCrypto); config->writeEntry("showReceiverColumn" , mPaintInfo.showReceiver); @@ -700,7 +700,7 @@ void KMHeaders::setFolder( KMFolder *aFolder, bool forceJumpToUnread ) highlightMessage(0, false); disconnect(mFolder, TQT_SIGNAL(numUnreadMsgsChanged(KMFolder*)), - this, TQT_SLOT(setFolderInfotqStatus())); + this, TQT_SLOT(setFolderInfoStatus())); mFolder->markNewAsUnread(); writeFolderConfig(); @@ -754,7 +754,7 @@ void KMHeaders::setFolder( KMFolder *aFolder, bool forceJumpToUnread ) connect(mFolder, TQT_SIGNAL(statusMsg(const TQString&)), BroadcastStatus::instance(), TQT_SLOT( seStatusMsg( const TQString& ) ) ); connect(mFolder, TQT_SIGNAL(numUnreadMsgsChanged(KMFolder*)), - this, TQT_SLOT(setFolderInfotqStatus())); + this, TQT_SLOT(setFolderInfoStatus())); connect(mFolder, TQT_SIGNAL(viewConfigChanged()), this, TQT_SLOT(reset())); // Not very nice, but if we go from nested to non-nested @@ -789,7 +789,7 @@ void KMHeaders::setFolder( KMFolder *aFolder, bool forceJumpToUnread ) END_TIMER(updateMsg); SHOW_TIMER(updateMsg); makeHeaderVisible(); - setFolderInfotqStatus(); + setFolderInfoStatus(); TQString colText = i18n( "Sender" ); if (mFolder && (mFolder->whoField().lower() == "to") && !mPaintInfo.showReceiver) @@ -831,7 +831,7 @@ void KMHeaders::msgChanged() const bool scrollbarAtBottom = verticalScrollBar() && verticalScrollBar()->value() == verticalScrollBar()->maxValue(); const HeaderItem * const oldFirstVisibleItem = dynamic_cast<HeaderItem*>( itemAt( TQPoint( 0, 0 ) ) ); - const int oldOffsetOfFirstVisibleItem = tqitemRect( oldFirstVisibleItem ).y(); + const int oldOffsetOfFirstVisibleItem = itemRect( oldFirstVisibleItem ).y(); const uint oldSerNumOfFirstVisibleItem = oldFirstVisibleItem ? oldFirstVisibleItem->msgSerNum() : 0; TQString msgIdMD5; @@ -935,9 +935,9 @@ void KMHeaders::msgAdded(int id) } if (parent && mFolder->getMsgBase(parent->id())->isWatched()) - mFolder->getMsgBase(id)->setqStatus( KMMsgStatusWatched ); + mFolder->getMsgBase(id)->seStatus( KMMsgStatusWatched ); else if (parent && mFolder->getMsgBase(parent->id())->isIgnored()) - mFolder->getMsgBase(id)->setqStatus( KMMsgStatusIgnored ); + mFolder->getMsgBase(id)->seStatus( KMMsgStatusIgnored ); if (parent) hi = new HeaderItem( parent->item(), id ); else @@ -1220,7 +1220,7 @@ void KMHeaders::msgHeaderChanged(KMFolder*, int msgId) //----------------------------------------------------------------------------- -void KMHeaders::setMsgtqStatus (KMMsgtqStatus status, bool toggle) +void KMHeaders::setMsgStatus (KMMsgStatus status, bool toggle) { // kdDebug() << k_funcinfo << endl; SerNumList serNums = selectedVisibleSernums(); @@ -1254,7 +1254,7 @@ TQPtrList<TQListViewItem> KMHeaders::currentThread() const return list; } -void KMHeaders::setThreadtqStatus(KMMsgtqStatus status, bool toggle) +void KMHeaders::setThreadStatus(KMMsgStatus status, bool toggle) { TQPtrList<TQListViewItem> curThread; @@ -1372,9 +1372,9 @@ void KMHeaders::setStyleDependantFrameWidth() // set the width of the frame to a reasonable value for the current GUI style int frameWidth; if( tqstyle().isA("KeramikStyle") ) - frameWidth = tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth ) - 1; + frameWidth = tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth ) - 1; else - frameWidth = tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth ); + frameWidth = tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth ); if ( frameWidth < 0 ) frameWidth = 0; if ( frameWidth != lineWidth() ) @@ -1389,7 +1389,7 @@ void KMHeaders::styleChange( TQStyle& oldStyle ) } //----------------------------------------------------------------------------- -void KMHeaders::setFolderInfotqStatus () +void KMHeaders::setFolderInfoStatus () { if ( !mFolder ) return; TQString str; @@ -1701,7 +1701,7 @@ void KMHeaders::setCurrentMsg(int cur) setSelectionAnchor( currentItem() ); } makeHeaderVisible(); - setFolderInfotqStatus(); + setFolderInfoStatus(); } //----------------------------------------------------------------------------- @@ -1833,7 +1833,7 @@ void KMHeaders::selectNextMessage() (below->isSelected() ? setSelected(lvi, false) : setSelected(below, true)); setCurrentItem(below); makeHeaderVisible(); - setFolderInfotqStatus(); + setFolderInfoStatus(); } } } @@ -1871,7 +1871,7 @@ void KMHeaders::selectPrevMessage() (above->isSelected() ? setSelected(lvi, false) : setSelected(above, true)); setCurrentItem(above); makeHeaderVisible(); - setFolderInfotqStatus(); + setFolderInfoStatus(); } } } @@ -2140,7 +2140,7 @@ void KMHeaders::highlightMessage(TQListViewItem* lvi, bool markitread) mItems[idx]->irefresh(); mItems[idx]->tqrepaint(); emit selected( msg ); - setFolderInfotqStatus(); + setFolderInfoStatus(); } void KMHeaders::highlightCurrentThread() @@ -2344,21 +2344,21 @@ void KMHeaders::contentsMousePressEvent(TQMouseEvent* e) HeaderItem *item = static_cast<HeaderItem*>( lvi ); KMMsgBase *msg = mFolder->getMsgBase(item->msgId()); if ( section == mPaintInfo.flagCol && flagsToggleable ) { - setMsgtqStatus( KMMsgStatusFlag, true ); + setMsgStatus( KMMsgStatusFlag, true ); } else if ( section == mPaintInfo.importantCol && flagsToggleable ) { - setMsgtqStatus( KMMsgStatusFlag, true ); + setMsgStatus( KMMsgStatusFlag, true ); } else if ( section == mPaintInfo.todoCol && flagsToggleable ) { - setMsgtqStatus( KMMsgStatusTodo, true ); + setMsgStatus( KMMsgStatusTodo, true ); } else if ( section == mPaintInfo.watchedIgnoredCol && flagsToggleable ) { if ( msg->isWatched() || msg->isIgnored() ) - setMsgtqStatus( KMMsgStatusIgnored, true ); + setMsgStatus( KMMsgStatusIgnored, true ); else - setMsgtqStatus( KMMsgStatusWatched, true ); + setMsgStatus( KMMsgStatusWatched, true ); } else if ( section == mPaintInfo.statusCol ) { if ( msg->isUnread() || msg->isNew() ) - setMsgtqStatus( KMMsgStatusRead ); + setMsgStatus( KMMsgStatusRead ); else - setMsgtqStatus( KMMsgStatusUnread ); + setMsgStatus( KMMsgStatusUnread ); } } } @@ -2424,7 +2424,7 @@ void KMHeaders::highlightMessage(TQListViewItem* i) //----------------------------------------------------------------------------- void KMHeaders::slotRMB() { - if (!tqtopLevelWidget()) return; // safe bet + if (!topLevelWidget()) return; // safe bet mOwner->updateMessageActions(); // check if the user clicked into a status column and only show the respective menues @@ -3355,9 +3355,9 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread ) // If the parent is watched or ignored, propagate that to it's // tqchildren if (mFolder->getMsgBase(i->id())->isWatched()) - mFolder->getMsgBase(new_kci->id())->setqStatus(KMMsgStatusWatched); + mFolder->getMsgBase(new_kci->id())->seStatus(KMMsgStatusWatched); if (mFolder->getMsgBase(i->id())->isIgnored()) - mFolder->getMsgBase(new_kci->id())->setqStatus(KMMsgStatusIgnored); + mFolder->getMsgBase(new_kci->id())->seStatus(KMMsgStatusIgnored); khi = new HeaderItem(i->item(), new_kci->id(), new_kci->key()); } else { khi = new HeaderItem(this, new_kci->id(), new_kci->key()); diff --git a/kmail/kmheaders.h b/kmail/kmheaders.h index f504c3f30..6541d4a99 100644 --- a/kmail/kmheaders.h +++ b/kmail/kmheaders.h @@ -10,7 +10,7 @@ using KMail::HeaderItem; #include <klistview.h> #include <kfoldertree.h> // for KPaintInfo -#include <kmmsgbase.h> // for KMMsgtqStatus +#include <kmmsgbase.h> // for KMMsgStatus #include <tqwidget.h> #include <tqstrlist.h> @@ -77,13 +77,13 @@ public: /** Set all messages in the current thread to status @p status or toggle it, if specified. */ - virtual void setThreadtqStatus(KMMsgtqStatus status, bool toggle=false); + virtual void setThreadStatus(KMMsgStatus status, bool toggle=false); /* Set message status to read if it is new, or unread */ virtual void setMsgRead(int msgId); /** The following methods processes all selected messages. */ - virtual void setMsgtqStatus(KMMsgtqStatus status, bool toggle=false); + virtual void setMsgStatus(KMMsgStatus status, bool toggle=false); virtual void deleteMsg(); virtual void applyFiltersOnMsg(); virtual void undo(); @@ -299,7 +299,7 @@ public slots: void slotToggleColumn(int id, int mode = -1); /** Provide information about number of messages in a folder */ - void setFolderInfotqStatus(); + void setFolderInfoStatus(); protected: static TQPixmap *pixNew, *pixUns, *pixDel, *pixRead, *pixRep, *pixSent, diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp index e6c641300..a7624d844 100644 --- a/kmail/kmkernel.cpp +++ b/kmail/kmkernel.cpp @@ -732,9 +732,9 @@ int KMKernel::sendCertificate( const TQString& to, const TQByteArray& certData ) return 1; } -KMMsgtqStatus KMKernel::strTotqStatus(const TQString &flags) +KMMsgStatus KMKernel::strToStatus(const TQString &flags) { - KMMsgtqStatus status = 0; + KMMsgStatus status = 0; if (!flags.isEmpty()) { for (uint n = 0; n < flags.length() ; n++) { switch (flags[n]) { @@ -946,8 +946,8 @@ int KMKernel::dcopAddMessage( const TQString & foldername,const KURL & msgUrl, } if ( !MsgStatusFlags.isEmpty() ) { - KMMsgtqStatus status = strTotqStatus(MsgStatusFlags); - if (status) msg->setqStatus(status); + KMMsgStatus status = strToStatus(MsgStatusFlags); + if (status) msg->seStatus(status); } int index; @@ -1059,8 +1059,8 @@ int KMKernel::dcopAddMessage_fastImport( const TQString & foldername, int index; if( !MsgStatusFlags.isEmpty() ) { - KMMsgtqStatus status = strTotqStatus(MsgStatusFlags); - if (status) msg->setqStatus(status); + KMMsgStatus status = strToStatus(MsgStatusFlags); + if (status) msg->seStatus(status); } if ( mAddMsgCurrentFolder->addMsg( msg, &index ) == 0 ) { @@ -1702,7 +1702,7 @@ void KMKernel::recreateCorruptIndexFiles() if ( !folder || folder->isDir() || folder->isOpened() ) continue; KMFolderIndex * const index = dynamic_cast<KMFolderIndex*>( folder->storage() ); - if ( index && index->indextqStatus() != KMFolderIndex::IndexOk ) { + if ( index && index->indexStatus() != KMFolderIndex::IndexOk ) { foldersWithBrokenIndex.append( index ); } } @@ -2330,13 +2330,13 @@ void KMKernel::selectFolder( TQString folderPath ) KMMainWidget *KMKernel::getKMMainWidget() { //This could definitely use a speadup - TQWidgetList *l = kapp->tqtopLevelWidgets(); + TQWidgetList *l = kapp->topLevelWidgets(); TQWidgetListIt it( *l ); TQWidget *wid; while ( ( wid = it.current() ) != 0 ) { ++it; - TQObjectList *l2 = wid->tqtopLevelWidget()->queryList( "KMMainWidget" ); + TQObjectList *l2 = wid->topLevelWidget()->queryList( "KMMainWidget" ); if (l2 && l2->first()) { KMMainWidget* kmmw = dynamic_cast<KMMainWidget *>( l2->first() ); Q_ASSERT( kmmw ); @@ -2469,7 +2469,7 @@ Wallet *KMKernel::wallet() { if ( tqApp->activeWindow() ) window = tqApp->activeWindow()->winId(); else if ( getKMMainWidget() ) - window = getKMMainWidget()->tqtopLevelWidget()->winId(); + window = getKMMainWidget()->topLevelWidget()->winId(); delete mWallet; mWallet = Wallet::openWallet( Wallet::NetworkWallet(), window ); diff --git a/kmail/kmkernel.h b/kmail/kmkernel.h index ef1688a66..bfcd053a2 100644 --- a/kmail/kmkernel.h +++ b/kmail/kmkernel.h @@ -442,7 +442,7 @@ signals: private: void openReader( bool onlyCheck ); - KMMsgtqStatus strTotqStatus(const TQString &flags); + KMMsgStatus strToStatus(const TQString &flags); KMFolder *currentFolder(); KMFolder *the_inboxFolder; diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp index 1dc08d053..36556a1de 100644 --- a/kmail/kmmainwidget.cpp +++ b/kmail/kmmainwidget.cpp @@ -238,7 +238,7 @@ KMMainWidget::KMMainWidget(TQWidget *parent, const char *name, this, TQT_SLOT(slotFolderRemoved(KMFolder*))); connect( kmkernel, TQT_SIGNAL( onlineStatusChanged( GlobalSettings::EnumNetworkState::type ) ), - this, TQT_SLOT( slotUpdateOnlinetqStatus( GlobalSettings::EnumNetworkState::type ) ) ); + this, TQT_SLOT( slotUpdateOnlineStatus( GlobalSettings::EnumNetworkState::type ) ) ); toggleSystemTray(); @@ -246,7 +246,7 @@ KMMainWidget::KMMainWidget(TQWidget *parent, const char *name, mStartupDone = true; - KMainWindow *mainWin = dynamic_cast<KMainWindow*>(tqtopLevelWidget()); + KMainWindow *mainWin = dynamic_cast<KMainWindow*>(topLevelWidget()); KStatusBar *sb = mainWin ? mainWin->statusBar() : 0; mVacationScriptIndicator = new KStatusBarLabel( TQString(), 0, sb ); mVacationScriptIndicator->hide(); @@ -973,11 +973,11 @@ void KMMainWidget::slotMailChecked( bool newMail, bool sendOnCheck, if(kmkernel->xmlGuiInstance()) { KNotifyClient::Instance instance(kmkernel->xmlGuiInstance()); - KNotifyClient::event( tqtopLevelWidget()->winId(), "new-mail-arrived", + KNotifyClient::event( topLevelWidget()->winId(), "new-mail-arrived", summary ); } else - KNotifyClient::event( tqtopLevelWidget()->winId(), "new-mail-arrived", + KNotifyClient::event( topLevelWidget()->winId(), "new-mail-arrived", summary ); if (mBeepOnNew) { @@ -1713,12 +1713,12 @@ void KMMainWidget::slotApplyFilters() //----------------------------------------------------------------------------- void KMMainWidget::slotCheckVacation() { - updateVactionScriptqStatus( false ); + updateVactionScripStatus( false ); if ( !kmkernel->askToGoOnline() ) return; Vacation *vac = new Vacation( TQT_TQOBJECT(this), true /* check only */ ); - connect( vac, TQT_SIGNAL(scriptActive(bool)), TQT_SLOT(updateVactionScriptqStatus(bool)) ); + connect( vac, TQT_SIGNAL(scriptActive(bool)), TQT_SLOT(updateVactionScripStatus(bool)) ); } void KMMainWidget::slotEditVacation() @@ -1731,7 +1731,7 @@ void KMMainWidget::slotEditVacation() return; mVacation = new Vacation( TQT_TQOBJECT(this) ); - connect( mVacation, TQT_SIGNAL(scriptActive(bool)), TQT_SLOT(updateVactionScriptqStatus(bool)) ); + connect( mVacation, TQT_SIGNAL(scriptActive(bool)), TQT_SLOT(updateVactionScripStatus(bool)) ); if ( mVacation->isUsable() ) { connect( mVacation, TQT_SIGNAL(result(bool)), mVacation, TQT_SLOT(deleteLater()) ); } else { @@ -1903,10 +1903,10 @@ void KMMainWidget::slotSaveAttachments() saveCommand->start(); } -void KMMainWidget::slotOnlinetqStatus() +void KMMainWidget::slotOnlineStatus() { // KMKernel will emit a signal when we toggle the network state that is caught by - // KMMainWidget::slotUpdateOnlinetqStatus to update our GUI + // KMMainWidget::slotUpdateOnlineStatus to update our GUI if ( GlobalSettings::self()->networkState() == GlobalSettings::EnumNetworkState::Online ) { // if online; then toggle and set it offline. kmkernel->stopNetworkJobs(); @@ -1916,7 +1916,7 @@ void KMMainWidget::slotOnlinetqStatus() } } -void KMMainWidget::slotUpdateOnlinetqStatus( GlobalSettings::EnumNetworkState::type ) +void KMMainWidget::slotUpdateOnlineStatus( GlobalSettings::EnumNetworkState::type ) { if ( GlobalSettings::self()->networkState() == GlobalSettings::EnumNetworkState::Online ) actionCollection()->action( "online_status" )->setText( i18n("Work Offline") ); @@ -2239,37 +2239,37 @@ void KMMainWidget::slotReplaceMsgByUnencryptedVersion() //----------------------------------------------------------------------------- void KMMainWidget::slotSetThreadStatusNew() { - mHeaders->setThreadtqStatus(KMMsgStatusNew); + mHeaders->setThreadStatus(KMMsgStatusNew); } //----------------------------------------------------------------------------- void KMMainWidget::slotSetThreadStatusUnread() { - mHeaders->setThreadtqStatus(KMMsgStatusUnread); + mHeaders->setThreadStatus(KMMsgStatusUnread); } //----------------------------------------------------------------------------- void KMMainWidget::slotSetThreadStatusFlag() { - mHeaders->setThreadtqStatus(KMMsgStatusFlag, true); + mHeaders->setThreadStatus(KMMsgStatusFlag, true); } //----------------------------------------------------------------------------- void KMMainWidget::slotSetThreadStatusRead() { - mHeaders->setThreadtqStatus(KMMsgStatusRead); + mHeaders->setThreadStatus(KMMsgStatusRead); } //----------------------------------------------------------------------------- void KMMainWidget::slotSetThreadStatusTodo() { - mHeaders->setThreadtqStatus(KMMsgStatusTodo, true); + mHeaders->setThreadStatus(KMMsgStatusTodo, true); } //----------------------------------------------------------------------------- void KMMainWidget::slotSetThreadStatusWatched() { - mHeaders->setThreadtqStatus(KMMsgStatusWatched, true); + mHeaders->setThreadStatus(KMMsgStatusWatched, true); if (mWatchThreadAction->isChecked()) { mIgnoreThreadAction->setChecked(false); } @@ -2278,7 +2278,7 @@ void KMMainWidget::slotSetThreadStatusWatched() //----------------------------------------------------------------------------- void KMMainWidget::slotSetThreadStatusIgnored() { - mHeaders->setThreadtqStatus(KMMsgStatusIgnored, true); + mHeaders->setThreadStatus(KMMsgStatusIgnored, true); if (mIgnoreThreadAction->isChecked()) { mWatchThreadAction->setChecked(false); } @@ -2690,7 +2690,7 @@ void KMMainWidget::setupActions() TQT_SLOT(slotSendQueued()), actionCollection(), "send_queued"); (void) new KAction( i18n("Online Status (unknown)"), "online_status", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotOnlinetqStatus()), actionCollection(), "online_status"); + TQT_SLOT(slotOnlineStatus()), actionCollection(), "online_status"); KActionMenu *sendActionMenu = new KActionMenu( i18n("Send Queued Messages Via"), "mail_send_via", actionCollection(), @@ -3402,7 +3402,7 @@ void KMMainWidget::updateMessageActions() actionCollection()->action( "go_prev_unread_message" )->setEnabled( enable_goto_unread ); actionCollection()->action( "send_queued" )->setEnabled( kmkernel->outboxFolder()->count() > 0 ); actionCollection()->action( "send_queued_via" )->setEnabled( kmkernel->outboxFolder()->count() > 0 ); - slotUpdateOnlinetqStatus( static_cast<GlobalSettingsBase::EnumNetworkState::type>( GlobalSettings::self()->networkState() ) ); + slotUpdateOnlineStatus( static_cast<GlobalSettingsBase::EnumNetworkState::type>( GlobalSettings::self()->networkState() ) ); if (action( "edit_undo" )) action( "edit_undo" )->setEnabled( mHeaders->canUndo() ); @@ -3993,14 +3993,14 @@ void KMMainWidget::slotRequestFullSearchFromQuickSearch() assert( mSearchWin ); KMSearchPattern pattern; pattern.append( KMSearchRule::createInstance( "<message>", KMSearchRule::FuncContains, mQuickSearchLine->currentSearchTerm() ) ); - int status = mQuickSearchLine->currentqStatus(); + int status = mQuickSearchLine->currenStatus(); if ( status != 0 ) { - pattern.append( new KMSearchRuletqStatus( status ) ); + pattern.append( new KMSearchRuleStatus( status ) ); } mSearchWin->setSearchPattern( pattern ); } -void KMMainWidget::updateVactionScriptqStatus(bool active) +void KMMainWidget::updateVactionScripStatus(bool active) { mVacationIndicatorActive = active; if ( active ) { diff --git a/kmail/kmmainwidget.h b/kmail/kmmainwidget.h index 26e5eee3f..e67f4fbd7 100644 --- a/kmail/kmmainwidget.h +++ b/kmail/kmmainwidget.h @@ -179,7 +179,7 @@ public: void setupForwardingActionsList(); KStatusBarLabel* vacationScriptIndicator() const { return mVacationScriptIndicator; } - void updateVactionScriptqStatus() { updateVactionScriptqStatus( mVacationIndicatorActive ); } + void updateVactionScripStatus() { updateVactionScripStatus( mVacationIndicatorActive ); } public slots: void slotMoveMsgToFolder( KMFolder *dest); @@ -339,8 +339,8 @@ protected slots: void slotToggleSizeColumn(); void slotSendQueued(); void slotSendQueuedVia( int item ); - void slotOnlinetqStatus(); - void slotUpdateOnlinetqStatus( GlobalSettings::EnumNetworkState::type ); + void slotOnlineStatus(); + void slotUpdateOnlineStatus( GlobalSettings::EnumNetworkState::type ); void slotMsgPopup(KMMessage &msg, const KURL &aUrl, const TQPoint&); void slotMarkAll(); void slotMemInfo(); @@ -447,7 +447,7 @@ private: private slots: void slotRequestFullSearchFromQuickSearch(); - void updateVactionScriptqStatus( bool active ); + void updateVactionScripStatus( bool active ); private: // Message actions diff --git a/kmail/kmmessage.cpp b/kmail/kmmessage.cpp index 1e666701d..ecf1e763a 100644 --- a/kmail/kmmessage.cpp +++ b/kmail/kmmessage.cpp @@ -110,7 +110,7 @@ KMMessage::KMMessage(KMMsgInfo& msgInfo): KMMsgBase() // now overwrite a few from the msgInfo mMsgSize = msgInfo.msgSize(); mFolderOffset = msgInfo.folderOffset(); - mtqStatus = msgInfo.status(); + mStatus = msgInfo.status(); mEncryptionState = msgInfo.encryptionState(); mSignatureState = msgInfo.signatureState(); mMDNSentState = msgInfo.mdnSentState(); @@ -145,7 +145,7 @@ void KMMessage::init( DwMessage* aMsg ) mMsgSize = 0; mMsgLength = 0; mFolderOffset = 0; - mtqStatus = KMMsgStatusNew; + mStatus = KMMsgStatusNew; mEncryptionState = KMMsgEncryptionStateUnknown; mSignatureState = KMMsgSignatureStateUnknown; mMDNSentState = KMMsgMDNStateUnknown; @@ -173,7 +173,7 @@ void KMMessage::assign( const KMMessage& other ) mMsgSize = other.mMsgSize; mMsgLength = other.mMsgLength; mFolderOffset = other.mFolderOffset; - mtqStatus = other.mtqStatus; + mStatus = other.mStatus; mEncryptionState = other.mEncryptionState; mSignatureState = other.mSignatureState; mMDNSentState = other.mMDNSentState; @@ -384,7 +384,7 @@ TQString KMMessage::headerAsString() const header.Assemble(); if ( header.AsString().empty() ) return TQString(); - return TQString::tqfromLatin1( header.AsString().c_str() ); + return TQString::fromLatin1( header.AsString().c_str() ); } @@ -394,23 +394,23 @@ DwMediaType& KMMessage::dwContentType() return mMsg->Headers().ContentType(); } -void KMMessage::fromByteArray( const TQByteArray & ba, bool setqStatus ) { - return fromDwString( DwString( ba.data(), ba.size() ), setqStatus ); +void KMMessage::fromByteArray( const TQByteArray & ba, bool seStatus ) { + return fromDwString( DwString( ba.data(), ba.size() ), seStatus ); } -void KMMessage::fromString( const TQCString & str, bool aSetqStatus ) { - return fromDwString( KMail::Util::dwString( str ), aSetqStatus ); +void KMMessage::fromString( const TQCString & str, bool aSeStatus ) { + return fromDwString( KMail::Util::dwString( str ), aSeStatus ); } -void KMMessage::fromDwString(const DwString& str, bool aSetqStatus) +void KMMessage::fromDwString(const DwString& str, bool aSeStatus) { delete mMsg; mMsg = new DwMessage; mMsg->FromString( str ); mMsg->Parse(); - if (aSetqStatus) { - setqStatus(headerField("Status").latin1(), headerField("X-Status").latin1()); + if (aSeStatus) { + seStatus(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() ) ); @@ -1081,7 +1081,7 @@ KMMessage* KMMessage::createReply( KMail::ReplyStrategy replyStrategy, parser.process( this ); } } - // setqStatus(KMMsgStatusReplied); + // seStatus(KMMsgStatusReplied); msg->link(this, KMMsgStatusReplied); if ( parent() && parent()->putRepliesInSameFolder() ) @@ -1216,7 +1216,7 @@ void KMMessage::sanitizeHeaders( const TQStringList& whiteList ) { nextField = field->Next(); if ( field->FieldNameStr().find( "ontent" ) == DwString::npos - && !whiteList.contains( TQString::tqfromLatin1( field->FieldNameStr().c_str() ) ) ) + && !whiteList.contains( TQString::fromLatin1( field->FieldNameStr().c_str() ) ) ) header.RemoveField(field); field = nextField; } @@ -3358,7 +3358,7 @@ void KMMessage::addBodyPart(const KMMessagePart* aPart) //----------------------------------------------------------------------------- TQString KMMessage::generateMessageId( const TQString& addr ) { - TQDateTime datetime = TQDateTime::tqcurrentDateTime(); + TQDateTime datetime = TQDateTime::currentDateTime(); TQString msgIdStr; msgIdStr = '<' + datetime.toString( "yyyyMMddhhmm.sszzz" ); @@ -3457,7 +3457,7 @@ TQCString KMMessage::html2source( const TQCString & src ) TQString KMMessage::encodeMailtoUrl( const TQString& str ) { TQString result; - result = TQString::tqfromLatin1( KMMsgBase::encodeRFC2047String( str, + result = TQString::fromLatin1( KMMsgBase::encodeRFC2047String( str, "utf-8" ) ); result = KURL::encode_string( result ); return result; @@ -4145,11 +4145,11 @@ void KMMessage::setCharset( const TQCString &charset, DwEntity *entity ) //----------------------------------------------------------------------------- -void KMMessage::setqStatus(const KMMsgtqStatus atqStatus, int idx) +void KMMessage::seStatus(const KMMsgStatus aStatus, int idx) { - if (mtqStatus == atqStatus) + if (mStatus == aStatus) return; - KMMsgBase::setqStatus(atqStatus, idx); + KMMsgBase::seStatus(aStatus, idx); } void KMMessage::setEncryptionState(const KMMsgEncryptionState s, int idx) @@ -4182,11 +4182,11 @@ void KMMessage::setMDNSentState( KMMsgMDNSentState status, int idx ) } //----------------------------------------------------------------------------- -void KMMessage::link( const KMMessage *aMsg, KMMsgtqStatus atqStatus ) +void KMMessage::link( const KMMessage *aMsg, KMMsgStatus aStatus ) { - Q_ASSERT( atqStatus == KMMsgStatusReplied - || atqStatus == KMMsgStatusForwarded - || atqStatus == KMMsgStatusDeleted ); + Q_ASSERT( aStatus == KMMsgStatusReplied + || aStatus == KMMsgStatusForwarded + || aStatus == KMMsgStatusDeleted ); TQString message = headerField( "X-KMail-Link-Message" ); if ( !message.isEmpty() ) @@ -4196,11 +4196,11 @@ void KMMessage::link( const KMMessage *aMsg, KMMsgtqStatus atqStatus ) type += ','; message += TQString::number( aMsg->getMsgSerNum() ); - if ( atqStatus == KMMsgStatusReplied ) + if ( aStatus == KMMsgStatusReplied ) type += "reply"; - else if ( atqStatus == KMMsgStatusForwarded ) + else if ( aStatus == KMMsgStatusForwarded ) type += "forward"; - else if ( atqStatus == KMMsgStatusDeleted ) + else if ( aStatus == KMMsgStatusDeleted ) type += "deleted"; setHeaderField( "X-KMail-Link-Message", message ); @@ -4208,10 +4208,10 @@ void KMMessage::link( const KMMessage *aMsg, KMMsgtqStatus atqStatus ) } //----------------------------------------------------------------------------- -void KMMessage::getLink(int n, ulong *retMsgSerNum, KMMsgtqStatus *retqStatus) const +void KMMessage::getLink(int n, ulong *retMsgSerNum, KMMsgStatus *reStatus) const { *retMsgSerNum = 0; - *retqStatus = KMMsgStatusUnknown; + *reStatus = KMMsgStatusUnknown; TQString message = headerField("X-KMail-Link-Message"); TQString type = headerField("X-KMail-Link-Type"); @@ -4221,11 +4221,11 @@ void KMMessage::getLink(int n, ulong *retMsgSerNum, KMMsgtqStatus *retqStatus) c if ( !message.isEmpty() && !type.isEmpty() ) { *retMsgSerNum = message.toULong(); if ( type == "reply" ) - *retqStatus = KMMsgStatusReplied; + *reStatus = KMMsgStatusReplied; else if ( type == "forward" ) - *retqStatus = KMMsgStatusForwarded; + *reStatus = KMMsgStatusForwarded; else if ( type == "deleted" ) - *retqStatus = KMMsgStatusDeleted; + *reStatus = KMMsgStatusDeleted; } } @@ -4347,11 +4347,11 @@ void KMMessage::updateInvitationState() cntType += '/'; cntType += mMsg->Headers().ContentType().SubtypeStr().c_str(); if ( cntType.lower() == "text/calendar" ) { - setqStatus( KMMsgStatusHasInvitation ); + seStatus( KMMsgStatusHasInvitation ); return; } } - setqStatus( KMMsgStatusHasNoInvitation ); + seStatus( KMMsgStatusHasNoInvitation ); return; } @@ -4364,7 +4364,7 @@ void KMMessage::updateAttachmentState( DwBodyPart* part ) if ( !part ) { // kdDebug(5006) << "updateAttachmentState - no part!" << endl; - setqStatus( KMMsgStatusHasNoAttach ); + seStatus( KMMsgStatusHasNoAttach ); return; } @@ -4404,7 +4404,7 @@ void KMMessage::updateAttachmentState( DwBodyPart* part ) part->Headers().ContentType().Subtype() != DwMime::kSubtypePgpSignature && part->Headers().ContentType().Subtype() != DwMime::kSubtypePkcs7Signature ) ) { - setqStatus( KMMsgStatusHasAttach ); + seStatus( KMMsgStatusHasAttach ); } return; } @@ -4429,7 +4429,7 @@ void KMMessage::updateAttachmentState( DwBodyPart* part ) if ( part->Next() ) updateAttachmentState( part->Next() ); else if ( attachmentState() == KMMsgAttachmentUnknown ) - setqStatus( KMMsgStatusHasNoAttach ); + seStatus( KMMsgStatusHasNoAttach ); } void KMMessage::setBodyFromUnicode( const TQString &str, DwEntity *entity ) diff --git a/kmail/kmmessage.h b/kmail/kmmessage.h index ebc8c78ef..ffae3ff09 100644 --- a/kmail/kmmessage.h +++ b/kmail/kmmessage.h @@ -150,13 +150,13 @@ public: } /** Mark the message as deleted */ - void del() { setqStatus(KMMsgStatusDeleted); } + void del() { seStatus(KMMsgStatusDeleted); } /** Undelete the message. Same as touch */ - void undel() { setqStatus(KMMsgStatusOld); } + void undel() { seStatus(KMMsgStatusOld); } /** Touch the message - mark it as read */ - void touch() { setqStatus(KMMsgStatusOld); } + void touch() { seStatus(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 setqStatus=false); - void fromString(const TQCString& str, bool setqStatus=false); - void fromByteArray(const TQByteArray & ba, bool setqStatus=false); + void fromDwString(const DwString& str, bool seStatus=false); + void fromString(const TQCString& str, bool seStatus=false); + void fromByteArray(const TQByteArray & ba, bool seStatus=false); /** Return the entire message contents in the DwString. This function is *fast* even for large message since it does *not* involve a @@ -243,7 +243,7 @@ public: TQCString headerAsSendableString() const; /** - * Remove all private header fields: *tqStatus: and X-KMail-* + * Remove all private header fields: *Status: and X-KMail-* **/ void removePrivateHeaderFields(); @@ -822,11 +822,11 @@ public: ulong UID() const; void setUID(ulong uid); - /** tqStatus of the message. */ - KMMsgtqStatus status() const { return mtqStatus; } + /** Status of the message. */ + KMMsgStatus status() const { return mStatus; } /** Set status and mark dirty. */ - void setqStatus(const KMMsgtqStatus status, int idx = -1); - void setqStatus(const char* s1, const char* s2=0) { KMMsgBase::setqStatus(s1, s2); } + void seStatus(const KMMsgStatus status, int idx = -1); + void seStatus(const char* s1, const char* s2=0) { KMMsgBase::seStatus(s1, s2); } /** Set encryption status of the message. */ void setEncryptionState(const KMMsgEncryptionState, int idx = -1); @@ -844,11 +844,11 @@ public: KMMsgMDNSentState mdnSentState() const { return mMDNSentState; } - /** Links this message to @p aMsg, setting link type to @p atqStatus. */ - void link(const KMMessage *aMsg, KMMsgtqStatus atqStatus); + /** Links this message to @p aMsg, setting link type to @p aStatus. */ + void link(const KMMessage *aMsg, KMMsgStatus aStatus); /** Returns the information for the Nth link into @p retMsg - * and @p retqStatus. */ - void getLink(int n, ulong *retMsgSerNum, KMMsgtqStatus *retqStatus) const; + * and @p reStatus. */ + void getLink(int n, ulong *retMsgSerNum, KMMsgStatus *reStatus) const; /** Convert wildcards into normal string */ TQString formatString(const TQString&) const; diff --git a/kmail/kmmimeparttree.cpp b/kmail/kmmimeparttree.cpp index cd05ee38c..e5cead4db 100644 --- a/kmail/kmmimeparttree.cpp +++ b/kmail/kmmimeparttree.cpp @@ -214,9 +214,9 @@ void KMMimePartTree::setStyleDependantFrameWidth() // set the width of the frame to a reasonable value for the current GUI style int frameWidth; if( tqstyle().isA("KeramikStyle") ) - frameWidth = tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth ) - 1; + frameWidth = tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth ) - 1; else - frameWidth = tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth ); + frameWidth = tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth ); if ( frameWidth < 0 ) frameWidth = 0; if ( frameWidth != lineWidth() ) diff --git a/kmail/kmmsgbase.cpp b/kmail/kmmsgbase.cpp index f1341d6c8..db57a1bf1 100644 --- a/kmail/kmmsgbase.cpp +++ b/kmail/kmmsgbase.cpp @@ -72,7 +72,7 @@ using KMail::MessageProperty; //----------------------------------------------------------------------------- KMMsgBase::KMMsgBase(KMFolder* aParentFolder) : mParent( aParentFolder ), mIndexOffset( 0 ), - mIndexLength( 0 ), mDirty( false ), mEnableUndo( false ), mtqStatus( KMMsgStatusUnknown ) + mIndexLength( 0 ), mDirty( false ), mEnableUndo( false ), mStatus( KMMsgStatusUnknown ) { } @@ -121,145 +121,145 @@ bool KMMsgBase::isMessage(void) const return false; } //----------------------------------------------------------------------------- -void KMMsgBase::toggletqStatus(const KMMsgtqStatus atqStatus, int idx) +void KMMsgBase::toggleStatus(const KMMsgStatus aStatus, int idx) { mDirty = true; - KMMsgtqStatus oldtqStatus = status(); - if ( status() & atqStatus ) { - mtqStatus &= ~atqStatus; + KMMsgStatus oldStatus = status(); + if ( status() & aStatus ) { + mStatus &= ~aStatus; } else { - mtqStatus |= atqStatus; + mStatus |= aStatus; // Ignored and Watched are toggleable, yet mutually exclusive. // That is an arbitrary restriction on my part. HAR HAR HAR :) -till - if (atqStatus == KMMsgStatusWatched) - mtqStatus &= ~KMMsgStatusIgnored; - if (atqStatus == KMMsgStatusIgnored) - mtqStatus &= ~KMMsgStatusWatched; - if (atqStatus == KMMsgStatusSpam) - mtqStatus &= ~KMMsgStatusHam; - if (atqStatus == KMMsgStatusHam) - mtqStatus &= ~KMMsgStatusSpam; + if (aStatus == KMMsgStatusWatched) + mStatus &= ~KMMsgStatusIgnored; + if (aStatus == KMMsgStatusIgnored) + mStatus &= ~KMMsgStatusWatched; + if (aStatus == KMMsgStatusSpam) + mStatus &= ~KMMsgStatusHam; + if (aStatus == KMMsgStatusHam) + mStatus &= ~KMMsgStatusSpam; } if (storage()) { if (idx < 0) idx = storage()->find( this ); - storage()->msgStatusChanged( oldtqStatus, status(), idx ); + storage()->msgStatusChanged( oldStatus, status(), idx ); storage()->headerOfMsgChanged(this, idx); } } //----------------------------------------------------------------------------- -void KMMsgBase::setqStatus(const KMMsgtqStatus atqStatus, int idx) +void KMMsgBase::seStatus(const KMMsgStatus aStatus, int idx) { mDirty = true; - KMMsgtqStatus oldtqStatus = status(); - switch (atqStatus) { + KMMsgStatus oldStatus = status(); + switch (aStatus) { case KMMsgStatusRead: // Unset unread and new, set read - mtqStatus &= ~KMMsgStatusUnread; - mtqStatus &= ~KMMsgStatusNew; - mtqStatus |= KMMsgStatusRead; + mStatus &= ~KMMsgStatusUnread; + mStatus &= ~KMMsgStatusNew; + mStatus |= KMMsgStatusRead; break; case KMMsgStatusUnread: // unread overrides read - mtqStatus &= ~KMMsgStatusOld; - mtqStatus &= ~KMMsgStatusRead; - mtqStatus &= ~KMMsgStatusNew; - mtqStatus |= KMMsgStatusUnread; + mStatus &= ~KMMsgStatusOld; + mStatus &= ~KMMsgStatusRead; + mStatus &= ~KMMsgStatusNew; + mStatus |= KMMsgStatusUnread; break; case KMMsgStatusOld: // old can't be new or unread - mtqStatus &= ~KMMsgStatusNew; - mtqStatus &= ~KMMsgStatusUnread; - mtqStatus |= KMMsgStatusOld; + mStatus &= ~KMMsgStatusNew; + mStatus &= ~KMMsgStatusUnread; + mStatus |= KMMsgStatusOld; break; case KMMsgStatusNew: // new overrides old and read - mtqStatus &= ~KMMsgStatusOld; - mtqStatus &= ~KMMsgStatusRead; - mtqStatus &= ~KMMsgStatusUnread; - mtqStatus |= KMMsgStatusNew; + mStatus &= ~KMMsgStatusOld; + mStatus &= ~KMMsgStatusRead; + mStatus &= ~KMMsgStatusUnread; + mStatus |= KMMsgStatusNew; break; case KMMsgStatusDeleted: - mtqStatus |= KMMsgStatusDeleted; + mStatus |= KMMsgStatusDeleted; break; case KMMsgStatusReplied: - mtqStatus |= KMMsgStatusReplied; + mStatus |= KMMsgStatusReplied; break; case KMMsgStatusForwarded: - mtqStatus |= KMMsgStatusForwarded; + mStatus |= KMMsgStatusForwarded; break; case KMMsgStatusQueued: - mtqStatus |= KMMsgStatusQueued; + mStatus |= KMMsgStatusQueued; break; case KMMsgStatusTodo: - mtqStatus |= KMMsgStatusTodo; + mStatus |= KMMsgStatusTodo; break; case KMMsgStatusSent: - mtqStatus &= ~KMMsgStatusQueued; - mtqStatus &= ~KMMsgStatusUnread; - mtqStatus &= ~KMMsgStatusNew; - mtqStatus |= KMMsgStatusSent; + mStatus &= ~KMMsgStatusQueued; + mStatus &= ~KMMsgStatusUnread; + mStatus &= ~KMMsgStatusNew; + mStatus |= KMMsgStatusSent; break; case KMMsgStatusFlag: - mtqStatus |= KMMsgStatusFlag; + mStatus |= KMMsgStatusFlag; break; // Watched and ignored are mutually exclusive case KMMsgStatusWatched: - mtqStatus &= ~KMMsgStatusIgnored; - mtqStatus |= KMMsgStatusWatched; + mStatus &= ~KMMsgStatusIgnored; + mStatus |= KMMsgStatusWatched; break; case KMMsgStatusIgnored: - mtqStatus &= ~KMMsgStatusWatched; - mtqStatus |= KMMsgStatusIgnored; + mStatus &= ~KMMsgStatusWatched; + mStatus |= KMMsgStatusIgnored; break; // as are ham and spam case KMMsgStatusSpam: - mtqStatus &= ~KMMsgStatusHam; - mtqStatus |= KMMsgStatusSpam; + mStatus &= ~KMMsgStatusHam; + mStatus |= KMMsgStatusSpam; break; case KMMsgStatusHam: - mtqStatus &= ~KMMsgStatusSpam; - mtqStatus |= KMMsgStatusHam; + mStatus &= ~KMMsgStatusSpam; + mStatus |= KMMsgStatusHam; break; case KMMsgStatusHasAttach: - mtqStatus &= ~KMMsgStatusHasNoAttach; - mtqStatus |= KMMsgStatusHasAttach; + mStatus &= ~KMMsgStatusHasNoAttach; + mStatus |= KMMsgStatusHasAttach; break; case KMMsgStatusHasNoAttach: - mtqStatus &= ~KMMsgStatusHasAttach; - mtqStatus |= KMMsgStatusHasNoAttach; + mStatus &= ~KMMsgStatusHasAttach; + mStatus |= KMMsgStatusHasNoAttach; break; case KMMsgStatusHasInvitation: - mtqStatus &= ~KMMsgStatusHasNoInvitation; - mtqStatus |= KMMsgStatusHasInvitation; + mStatus &= ~KMMsgStatusHasNoInvitation; + mStatus |= KMMsgStatusHasInvitation; break; case KMMsgStatusHasNoInvitation: - mtqStatus &= ~KMMsgStatusHasInvitation; - mtqStatus |= KMMsgStatusHasNoInvitation; + mStatus &= ~KMMsgStatusHasInvitation; + mStatus |= KMMsgStatusHasNoInvitation; break; default: - mtqStatus = atqStatus; + mStatus = aStatus; break; } - if ( oldtqStatus != mtqStatus && storage() ) { + if ( oldStatus != mStatus && storage() ) { if (idx < 0) idx = storage()->find( this ); - storage()->msgStatusChanged( oldtqStatus, status(), idx ); + storage()->msgStatusChanged( oldStatus, status(), idx ); storage()->headerOfMsgChanged( this, idx ); } } @@ -267,40 +267,40 @@ void KMMsgBase::setqStatus(const KMMsgtqStatus atqStatus, int idx) //----------------------------------------------------------------------------- -void KMMsgBase::setqStatus(const char* aStatusStr, const char* aXStatusStr) +void KMMsgBase::seStatus(const char* aStatusStr, const char* aXStatusStr) { // first try to find status from "X-Status" field if given if (aXStatusStr) { - if (strchr(aXStatusStr, 'N')) setqStatus(KMMsgStatusNew); - if (strchr(aXStatusStr, 'U')) setqStatus(KMMsgStatusUnread); - if (strchr(aXStatusStr, 'O')) setqStatus(KMMsgStatusOld); - if (strchr(aXStatusStr, 'R')) setqStatus(KMMsgStatusRead); - if (strchr(aXStatusStr, 'D')) setqStatus(KMMsgStatusDeleted); - if (strchr(aXStatusStr, 'A')) setqStatus(KMMsgStatusReplied); - if (strchr(aXStatusStr, 'F')) setqStatus(KMMsgStatusForwarded); - if (strchr(aXStatusStr, 'Q')) setqStatus(KMMsgStatusQueued); - if (strchr(aXStatusStr, 'K')) setqStatus(KMMsgStatusTodo); - if (strchr(aXStatusStr, 'S')) setqStatus(KMMsgStatusSent); - if (strchr(aXStatusStr, 'G')) setqStatus(KMMsgStatusFlag); - if (strchr(aXStatusStr, 'P')) setqStatus(KMMsgStatusSpam); - if (strchr(aXStatusStr, 'H')) setqStatus(KMMsgStatusHam); - if (strchr(aXStatusStr, 'T')) setqStatus(KMMsgStatusHasAttach); - if (strchr(aXStatusStr, 'C')) setqStatus(KMMsgStatusHasNoAttach); + 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); } // Merge the contents of the "Status" field if (aStatusStr) { if ((aStatusStr[0]== 'R' && aStatusStr[1]== 'O') || (aStatusStr[0]== 'O' && aStatusStr[1]== 'R')) { - setqStatus( KMMsgStatusOld ); - setqStatus( KMMsgStatusRead ); + seStatus( KMMsgStatusOld ); + seStatus( KMMsgStatusRead ); } else if (aStatusStr[0] == 'R') - setqStatus(KMMsgStatusRead); + seStatus(KMMsgStatusRead); else if (aStatusStr[0] == 'D') - setqStatus(KMMsgStatusDeleted); + seStatus(KMMsgStatusDeleted); else - setqStatus(KMMsgStatusNew); + seStatus(KMMsgStatusNew); } } @@ -363,117 +363,117 @@ void KMMsgBase::setSignatureStateChar( TQChar status, int idx ) //----------------------------------------------------------------------------- bool KMMsgBase::isUnread(void) const { - KMMsgtqStatus st = status(); + KMMsgStatus st = status(); return (st & KMMsgStatusUnread && !(st & KMMsgStatusIgnored)); } //----------------------------------------------------------------------------- bool KMMsgBase::isNew(void) const { - KMMsgtqStatus st = status(); + KMMsgStatus st = status(); return (st & KMMsgStatusNew && !(st & KMMsgStatusIgnored)); } //----------------------------------------------------------------------------- -bool KMMsgBase::isOfUnknowntqStatus(void) const +bool KMMsgBase::isOfUnknownStatus(void) const { - KMMsgtqStatus st = status(); + KMMsgStatus st = status(); return (st == KMMsgStatusUnknown); } //----------------------------------------------------------------------------- bool KMMsgBase::isOld(void) const { - KMMsgtqStatus st = status(); + KMMsgStatus st = status(); return (st & KMMsgStatusOld); } //----------------------------------------------------------------------------- bool KMMsgBase::isRead(void) const { - KMMsgtqStatus st = status(); + KMMsgStatus st = status(); return (st & KMMsgStatusRead || st & KMMsgStatusIgnored); } //----------------------------------------------------------------------------- bool KMMsgBase::isDeleted(void) const { - KMMsgtqStatus st = status(); + KMMsgStatus st = status(); return (st & KMMsgStatusDeleted); } //----------------------------------------------------------------------------- bool KMMsgBase::isReplied(void) const { - KMMsgtqStatus st = status(); + KMMsgStatus st = status(); return (st & KMMsgStatusReplied); } //----------------------------------------------------------------------------- bool KMMsgBase::isForwarded(void) const { - KMMsgtqStatus st = status(); + KMMsgStatus st = status(); return (st & KMMsgStatusForwarded); } //----------------------------------------------------------------------------- bool KMMsgBase::isQueued(void) const { - KMMsgtqStatus st = status(); + KMMsgStatus st = status(); return (st & KMMsgStatusQueued); } //----------------------------------------------------------------------------- bool KMMsgBase::isTodo(void) const { - KMMsgtqStatus st = status(); + KMMsgStatus st = status(); return (st & KMMsgStatusTodo); } //----------------------------------------------------------------------------- bool KMMsgBase::isSent(void) const { - KMMsgtqStatus st = status(); + KMMsgStatus st = status(); return (st & KMMsgStatusSent); } //----------------------------------------------------------------------------- bool KMMsgBase::isImportant(void) const { - KMMsgtqStatus st = status(); + KMMsgStatus st = status(); return (st & KMMsgStatusFlag); } //----------------------------------------------------------------------------- bool KMMsgBase::isWatched(void) const { - KMMsgtqStatus st = status(); + KMMsgStatus st = status(); return (st & KMMsgStatusWatched); } //----------------------------------------------------------------------------- bool KMMsgBase::isIgnored(void) const { - KMMsgtqStatus st = status(); + KMMsgStatus st = status(); return (st & KMMsgStatusIgnored); } //----------------------------------------------------------------------------- bool KMMsgBase::isSpam(void) const { - KMMsgtqStatus st = status(); + KMMsgStatus st = status(); return (st & KMMsgStatusSpam); } //----------------------------------------------------------------------------- bool KMMsgBase::isHam(void) const { - KMMsgtqStatus st = status(); + KMMsgStatus st = status(); return (st & KMMsgStatusHam); } //----------------------------------------------------------------------------- -TQCString KMMsgBase::statusToStr(const KMMsgtqStatus status) +TQCString KMMsgBase::statusToStr(const KMMsgStatus status) { TQCString sstr; if (status & KMMsgStatusNew) sstr += 'N'; @@ -1037,7 +1037,7 @@ TQCString KMMsgBase::autoDetectCharset(const TQCString &_encoding, const TQStrin TQStringList charsets = encodingList; if (!_encoding.isEmpty()) { - TQString currentCharset = TQString::tqfromLatin1(_encoding); + TQString currentCharset = TQString::fromLatin1(_encoding); charsets.remove(currentCharset); charsets.prepend(currentCharset); } @@ -1093,7 +1093,7 @@ unsigned long KMMsgBase::getMsgSerNum() const //----------------------------------------------------------------------------- KMMsgAttachmentState KMMsgBase::attachmentState() const { - KMMsgtqStatus st = status(); + KMMsgStatus st = status(); if (st & KMMsgStatusHasAttach) return KMMsgHasAttachment; else if (st & KMMsgStatusHasNoAttach) @@ -1105,7 +1105,7 @@ KMMsgAttachmentState KMMsgBase::attachmentState() const KMMsgInvitationState KMMsgBase::invitationState() const { - KMMsgtqStatus st = status(); + KMMsgStatus st = status(); if (st & KMMsgStatusHasInvitation) return KMMsgHasInvitation; else if (st & KMMsgStatusHasNoInvitation) @@ -1372,7 +1372,7 @@ const uchar *KMMsgBase::asIndexString(int &length) const //these is at the beginning because it is queried quite often tmp_str = msgIdMD5().stripWhiteSpace(); STORE_DATA_LEN(MsgIdMD5Part, tmp_str.tqunicode(), tmp_str.length() * 2, true); - tmp = mLegacytqStatus; + tmp = mLegacyStatus; STORE_DATA(MsgLegacyStatusPart, tmp); //these are completely arbitrary order @@ -1476,7 +1476,7 @@ TQString KMMsgBase::replacePrefixes( const TQString& str, // construct a big regexp that // 1. is anchored to the beginning of str (sans whitespace) // 2. matches at least one of the part regexps in prefixRegExps - TQString bigRegExp = TQString::tqfromLatin1("^(?:\\s+|(?:%1))+\\s*") + TQString bigRegExp = TQString::fromLatin1("^(?:\\s+|(?:%1))+\\s*") .tqarg( prefixRegExps.join(")|(?:") ); TQRegExp rx( bigRegExp, false /*case insens.*/ ); if ( !rx.isValid() ) { diff --git a/kmail/kmmsgbase.h b/kmail/kmmsgbase.h index 43a101027..6ad1315dc 100644 --- a/kmail/kmmsgbase.h +++ b/kmail/kmmsgbase.h @@ -38,7 +38,7 @@ class KMFolderIndex; to Unread or New. This is done in KMMsgBase::isRead() and related getters. So we can preserve the state when switching a thread to Ignored and back. */ -enum MsgtqStatus +enum MsgStatus { KMMsgStatusUnknown = 0x00000000, KMMsgStatusNew = 0x00000001, @@ -62,7 +62,7 @@ enum MsgtqStatus KMMsgStatusHasNoInvitation = 0x00040000 }; -typedef uint KMMsgtqStatus; +typedef uint KMMsgStatus; /** The old status format, only one at a time possible. Needed for upgrade path purposes. */ @@ -80,7 +80,7 @@ typedef enum KMLegacyMsgStatusQueued='Q', KMLegacyMsgStatusSent='S', KMLegacyMsgStatusFlag='G' -} KMLegacyMsgtqStatus; +} KMLegacyMsgStatus; @@ -158,7 +158,7 @@ public: void setParent(KMFolder* p) { mParent = p; } /** Convert the given message status to a string. */ - static TQCString statusToStr(const KMMsgtqStatus status); + static TQCString statusToStr(const KMMsgStatus status); /** Convert the given message status to a string. */ TQString statusToSortRank(); @@ -173,7 +173,7 @@ public: virtual bool isNew(void) const; /** Returns TRUE if status is unknown. */ - virtual bool isOfUnknowntqStatus(void) const; + virtual bool isOfUnknownStatus(void) const; /** Returns TRUE if status is old. */ virtual bool isOld(void) const; @@ -215,14 +215,14 @@ public: virtual bool isHam(void) const; - /** tqStatus of the message. */ - virtual KMMsgtqStatus status(void) const = 0; + /** Status of the message. */ + virtual KMMsgStatus status(void) const = 0; /** Set status and mark dirty. Optional optimization: @p idx may * specify the index of this message within the parent folder. */ - virtual void setqStatus(const KMMsgtqStatus status, int idx = -1); - virtual void toggletqStatus(const KMMsgtqStatus status, int idx = -1); - virtual void setqStatus(const char* statusField, const char* xstatusField=0); + virtual void seStatus(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); /** Encryption status of the message. */ virtual KMMsgEncryptionState encryptionState() const = 0; @@ -450,10 +450,10 @@ protected: short mIndexLength; bool mDirty; bool mEnableUndo; - mutable KMMsgtqStatus mtqStatus; + mutable KMMsgStatus mStatus; // This is kept to provide an upgrade path from the the old single status // to the new multiple status scheme. - mutable KMLegacyMsgtqStatus mLegacytqStatus; + mutable KMLegacyMsgStatus mLegacyStatus; public: enum MsgPartType diff --git a/kmail/kmmsginfo.cpp b/kmail/kmmsginfo.cpp index 8ce5f7cf3..c2ce09582 100644 --- a/kmail/kmmsginfo.cpp +++ b/kmail/kmmsginfo.cpp @@ -154,7 +154,7 @@ KMMsgInfo& KMMsgInfo::operator=(const KMMsgInfo& other) delete kd; kd = 0; } - mtqStatus = other.status(); + mStatus = other.status(); return *this; } #endif @@ -174,7 +174,7 @@ KMMsgInfo& KMMsgInfo::operator=(const KMMessage& msg) kd->strippedSubjectMD5 = msg.strippedSubjectMD5(); kd->msgIdMD5 = msg.msgIdMD5(); kd->xmark = msg.xmark(); - mtqStatus = msg.status(); + mStatus = msg.status(); kd->folderOffset = msg.folderOffset(); kd->msgSize = msg.msgSize(); kd->date = msg.date(); @@ -192,7 +192,7 @@ KMMsgInfo& KMMsgInfo::operator=(const KMMessage& msg) //----------------------------------------------------------------------------- void KMMsgInfo::init(const TQCString& aSubject, const TQCString& aFrom, const TQCString& aTo, time_t aDate, - KMMsgtqStatus atqStatus, const TQCString& aXMark, + KMMsgStatus aStatus, const TQCString& aXMark, const TQCString& replyToId, const TQCString& replyToAuxId, const TQCString& msgId, KMMsgEncryptionState encryptionState, @@ -216,7 +216,7 @@ void KMMsgInfo::init(const TQCString& aSubject, const TQCString& aFrom, kd->msgIdMD5 = base64EncodedMD5( msgId ); kd->xmark = aXMark; kd->folderOffset = aFolderOffset; - mtqStatus = atqStatus; + mStatus = aStatus; kd->msgSize = aMsgSize; kd->date = aDate; kd->file = ""; @@ -232,7 +232,7 @@ void KMMsgInfo::init(const TQCString& aSubject, const TQCString& aFrom, void KMMsgInfo::init(const TQCString& aSubject, const TQCString& aFrom, const TQCString& aTo, time_t aDate, - KMMsgtqStatus atqStatus, const TQCString& aXMark, + KMMsgStatus aStatus, const TQCString& aXMark, const TQCString& replyToId, const TQCString& replyToAuxId, const TQCString& msgId, const TQCString& aFileName, @@ -244,7 +244,7 @@ void KMMsgInfo::init(const TQCString& aSubject, const TQCString& aFrom, size_t aMsgSizeServer, ulong aUID) { // use the "normal" init for most stuff - init( aSubject, aFrom, aTo, aDate, atqStatus, aXMark, replyToId, replyToAuxId, + init( aSubject, aFrom, aTo, aDate, aStatus, aXMark, replyToId, replyToAuxId, msgId, encryptionState, signatureState, mdnSentState, prefCharset, (unsigned long)0, aMsgSize, aMsgSizeServer, aUID ); kd->file = aFileName; @@ -477,16 +477,16 @@ void KMMsgInfo::setMDNSentState( const KMMsgMDNSentState s, int idx ) } //----------------------------------------------------------------------------- -KMMsgtqStatus KMMsgInfo::status(void) const +KMMsgStatus KMMsgInfo::status(void) const { - if (mtqStatus == KMMsgStatusUnknown) { - KMMsgtqStatus st = (KMMsgtqStatus)getLongPart(MsgStatusPart); + if (mStatus == KMMsgStatusUnknown) { + KMMsgStatus st = (KMMsgStatus)getLongPart(MsgStatusPart); if (!st) { // We are opening an old index for the first time, get the legacy // status and merge it in. - mLegacytqStatus = (KMLegacyMsgtqStatus)getLongPart(MsgLegacyStatusPart); + mLegacyStatus = (KMLegacyMsgStatus)getLongPart(MsgLegacyStatusPart); st = KMMsgStatusRead; - switch (mLegacytqStatus) { + switch (mLegacyStatus) { case KMLegacyMsgStatusUnknown: st = KMMsgStatusUnknown; break; @@ -525,9 +525,9 @@ KMMsgtqStatus KMMsgInfo::status(void) const } } - mtqStatus = st; + mStatus = st; } - return mtqStatus; + return mStatus; } @@ -666,11 +666,11 @@ void KMMsgInfo::setFileName(const TQString& file) } //----------------------------------------------------------------------------- -void KMMsgInfo::setqStatus(const KMMsgtqStatus atqStatus, int idx) +void KMMsgInfo::seStatus(const KMMsgStatus aStatus, int idx) { - if(atqStatus == status()) + if(aStatus == status()) return; - KMMsgBase::setqStatus(atqStatus, idx); //base does more "stuff" + KMMsgBase::seStatus(aStatus, idx); //base does more "stuff" } //----------------------------------------------------------------------------- @@ -716,7 +716,7 @@ void KMMsgInfo::compat_fromOldIndexString(const TQCString& str, bool toUtf8) kd->folderOffset = str.mid(2,9).toULong(); kd->msgSize = str.mid(12,9).toULong(); kd->date = (time_t)str.mid(22,10).toULong(); - mtqStatus = (KMMsgtqStatus)str.at(0); + mStatus = (KMMsgStatus)str.at(0); if (toUtf8) { kd->subject = str.mid(37, 100).stripWhiteSpace(); kd->fromStrip = str.mid(138, 50).stripWhiteSpace(); diff --git a/kmail/kmmsginfo.h b/kmail/kmmsginfo.h index a3d50c449..ce15e3127 100644 --- a/kmail/kmmsginfo.h +++ b/kmail/kmmsginfo.h @@ -39,7 +39,7 @@ public: /** Initialize with given values and set dirty flag to FALSE. */ virtual void init(const TQCString& subject, const TQCString& from, const TQCString& to, time_t date, - KMMsgtqStatus status, const TQCString& xmark, + KMMsgStatus status, const TQCString& xmark, const TQCString& replyToId, const TQCString& replyToAuxId, const TQCString& msgId, @@ -53,7 +53,7 @@ public: /** Initialize with given values and set dirty flag to FALSE. */ virtual void init(const TQCString& subject, const TQCString& from, const TQCString& to, time_t date, - KMMsgtqStatus status, const TQCString& xmark, + KMMsgStatus status, const TQCString& xmark, const TQCString& replyToId, const TQCString& replyToAuxId, const TQCString& msgId, @@ -78,7 +78,7 @@ public: virtual bool subjectIsPrefixed() const; virtual TQString msgIdMD5(void) const; virtual TQString fileName(void) const; - virtual KMMsgtqStatus status(void) const; + virtual KMMsgStatus status(void) const; virtual KMMsgEncryptionState encryptionState() const; virtual KMMsgSignatureState signatureState() const; virtual KMMsgMDNSentState mdnSentState() const; @@ -91,7 +91,7 @@ public: void setMsgSizeServer(size_t sz); void setFolderOffset(off_t offs); void setFileName(const TQString& file); - virtual void setqStatus(const KMMsgtqStatus status, int idx = -1); + virtual void seStatus(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 setqStatus(const char* s1, const char* s2=0) { KMMsgBase::setqStatus(s1, s2); } + virtual void seStatus(const char* s1, const char* s2=0) { KMMsgBase::seStatus(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 31a1e9321..16d188d7c 100644 --- a/kmail/kmmsgpartdlg.cpp +++ b/kmail/kmmsgpartdlg.cpp @@ -54,7 +54,7 @@ KMMsgPartDialog::KMMsgPartDialog( const TQString & caption, TQLabel * label; TQString msg; - setHelp( TQString::tqfromLatin1("attachments") ); + setHelp( TQString::fromLatin1("attachments") ); for ( int i = 0 ; i < numEncodingTypes ; ++i ) mI18nizedEncodings << i18n( encodingTypes[i].displayName ); @@ -73,14 +73,14 @@ KMMsgPartDialog::KMMsgPartDialog( const TQString & caption, mMimeType->setInsertionPolicy( TQComboBox::NoInsertion ); mMimeType->setValidator( new KMimeTypeValidator( TQT_TQOBJECT(mMimeType) ) ); mMimeType->insertStringList( TQStringList() - << TQString::tqfromLatin1("text/html") - << TQString::tqfromLatin1("text/plain") - << TQString::tqfromLatin1("image/gif") - << TQString::tqfromLatin1("image/jpeg") - << TQString::tqfromLatin1("image/png") - << TQString::tqfromLatin1("application/octet-stream") - << TQString::tqfromLatin1("application/x-gunzip") - << TQString::tqfromLatin1("application/zip") ); + << TQString::fromLatin1("text/html") + << TQString::fromLatin1("text/plain") + << TQString::fromLatin1("image/gif") + << TQString::fromLatin1("image/jpeg") + << TQString::fromLatin1("image/png") + << TQString::fromLatin1("application/octet-stream") + << TQString::fromLatin1("application/x-gunzip") + << TQString::fromLatin1("application/zip") ); connect( mMimeType, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotMimeTypeChanged(const TQString&)) ); glay->addWidget( mMimeType, 0, 1 ); @@ -210,7 +210,7 @@ void KMMsgPartDialog::setMimeType( const TQString & mimeType ) { void KMMsgPartDialog::setMimeType( const TQString & type, const TQString & subtype ) { - setMimeType( TQString::tqfromLatin1("%1/%2").tqarg(type).tqarg(subtype) ); + setMimeType( TQString::fromLatin1("%1/%2").tqarg(type).tqarg(subtype) ); } void KMMsgPartDialog::setMimeTypeList( const TQStringList & mimeTypes ) { diff --git a/kmail/kmpopfiltercnfrmdlg.cpp b/kmail/kmpopfiltercnfrmdlg.cpp index 987485969..2cd29768e 100644 --- a/kmail/kmpopfiltercnfrmdlg.cpp +++ b/kmail/kmpopfiltercnfrmdlg.cpp @@ -464,7 +464,7 @@ void KMPopFilterCnfrmDlg::slotToggled(bool aOn) void KMPopFilterCnfrmDlg::slotUpdateMinimumSize() { - mainWidget()->setMinimumSize(mainWidget()->tqsizeHint()); + mainWidget()->setMinimumSize(mainWidget()->sizeHint()); } #include "kmpopfiltercnfrmdlg.moc" diff --git a/kmail/kmreaderwin.cpp b/kmail/kmreaderwin.cpp index 505bd6128..e7eee3445 100644 --- a/kmail/kmreaderwin.cpp +++ b/kmail/kmreaderwin.cpp @@ -1027,14 +1027,14 @@ void KMReaderWin::contacStatusChanged( const TQString &uid) // kdDebug( 5006 ) << k_funcinfo << " got a presence change for " << uid << endl; // get the list of nodes for this contact from the htmlView DOM::NodeList presenceNodes = mViewer->htmlDocument() - .getElementsByName( DOM::DOMString( TQString::tqfromLatin1("presence-") + uid ) ); + .getElementsByName( DOM::DOMString( TQString::fromLatin1("presence-") + uid ) ); for ( unsigned int i = 0; i < presenceNodes.length(); ++i ) { DOM::Node n = presenceNodes.item( i ); kdDebug( 5006 ) << "name is " << n.nodeName().string() << endl; kdDebug( 5006 ) << "value of content was " << n.firstChild().nodeValue().string() << endl; TQString newPresence = kmkernel->imProxy()->presenceString( uid ); if ( newPresence.isNull() ) // KHTML crashes if you setNodeValue( TQString() ) - newPresence = TQString::tqfromLatin1( "ENOIMRUNNING" ); + newPresence = TQString::fromLatin1( "ENOIMRUNNING" ); n.firstChild().setNodeValue( newPresence ); // kdDebug( 5006 ) << "value of content is now " << n.firstChild().nodeValue().string() << endl; } @@ -1976,7 +1976,7 @@ void KMReaderWin::showAttachmentPopup( int id, const TQString & name, const TQPo menu->insertItem(SmallIcon("edit"), i18n("Edit Attachment"), 8 ); if ( GlobalSettings::self()->allowAttachmentDeletion() && canChange ) menu->insertItem(SmallIcon("editdelete"), i18n("Delete Attachment"), 7 ); - if ( name.tqendsWith( ".xia", false ) && + if ( name.endsWith( ".xia", false ) && Kleo::CryptoBackendFactory::instance()->protocol( "Chiasmus" ) ) menu->insertItem( i18n( "Decrypt With Chiasmus..." ), 6 ); menu->insertItem(i18n("Properties"), 5); @@ -2000,9 +2000,9 @@ void KMReaderWin::setStyleDependantFrameWidth() // set the width of the frame to a reasonable value for the current GUI style int frameWidth; if( tqstyle().isA("KeramikStyle") ) - frameWidth = tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth ) - 1; + frameWidth = tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth ) - 1; else - frameWidth = tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth ); + frameWidth = tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth ); if ( frameWidth < 0 ) frameWidth = 0; if ( frameWidth != mBox->lineWidth() ) @@ -2267,7 +2267,7 @@ void KMReaderWin::openAttachment( int id, const TQString & name ) // determine the MIME type of the attachment KMimeType::Ptr mimetype; // prefer the value of the Content-Type header - mimetype = KMimeType::mimeType( TQString::tqfromLatin1( contentTypeStr ) ); + mimetype = KMimeType::mimeType( TQString::fromLatin1( contentTypeStr ) ); if ( mimetype->name() == "application/octet-stream" ) { // consider the filename if Content-Type is application/octet-stream mimetype = KMimeType::findByPath( name, 0, true /* no disk access */ ); @@ -2297,7 +2297,7 @@ void KMReaderWin::openAttachment( int id, const TQString & name ) .tqarg( filenameText ); const int choice = KMessageBox::questionYesNoCancel( this, text, i18n("Open Attachment?"), KStdGuiItem::saveAs(), open_text, - TQString::tqfromLatin1("askSave") + mimetype->name() ); // dontAskAgainName + TQString::fromLatin1("askSave") + mimetype->name() ); // dontAskAgainName if( choice == KMessageBox::Yes ) { // Save mAtmUpdate = true; @@ -2828,7 +2828,7 @@ void KMReaderWin::scrollToAttachment( const partNode *node ) DOM::Document doc = mViewer->htmlDocument(); // The anchors for this are created in ObjectTreeParser::parseObjectTree() - mViewer->gotoAnchor( TQString::tqfromLatin1( "att%1" ).tqarg( node->nodeId() ) ); + mViewer->gotoAnchor( TQString::fromLatin1( "att%1" ).tqarg( node->nodeId() ) ); // Remove any old color markings which might be there const partNode *root = node->topLevelParent(); @@ -2889,7 +2889,7 @@ void KMReaderWin::injectAttachments() link += "<div style=\"text-align: left;\"><a href=\"" + urlHandle + "\"><img src=\"" + imgpath + imgSrc + "\"/></a></div>"; html.prepend( link ); - html.prepend( TQString::tqfromLatin1( "<div style=\"float:left;\">%1 </div>" ). + html.prepend( TQString::fromLatin1( "<div style=\"float:left;\">%1 </div>" ). arg( i18n( "Attachments:" ) ) ); } else { link += "<div style=\"text-align: right;\"><a href=\"" + urlHandle + "\"><img src=\"" + @@ -2930,7 +2930,7 @@ TQString KMReaderWin::renderAttachments(partNode * node, const TQColor &bgColor if ( headerStyle() == HeaderStyle::enterprise() ) align = "right"; if ( node->msgPart().typeStr().lower() == "message" || node == mRootNode ) - html += TQString::tqfromLatin1("<div style=\"background:%1; %2" + html += TQString::fromLatin1("<div style=\"background:%1; %2" "vertical-align:middle; float:%3; %4\">").tqarg( bgColor.name() ).tqarg( margin ) .tqarg( align ).tqarg( visibility ); html += subHtml; @@ -2941,11 +2941,11 @@ TQString KMReaderWin::renderAttachments(partNode * node, const TQColor &bgColor partNode::AttachmentDisplayInfo info = node->attachmentDisplayInfo(); if ( info.displayInHeader ) { html += "<div style=\"float:left;\">"; - html += TQString::tqfromLatin1( "<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;\">" ).tqarg( bgColor.name() ); TQString fileName = writeMessagePartToTempFile( &node->msgPart(), node->nodeId() ); TQString href = node->asHREF( "header" ); - html += TQString::tqfromLatin1( "<a href=\"" ) + href + - TQString::tqfromLatin1( "\">" ); + html += TQString::fromLatin1( "<a href=\"" ) + href + + TQString::fromLatin1( "\">" ); html += "<img style=\"vertical-align:middle;\" src=\"" + info.icon + "\"/> "; if ( headerStyle() == HeaderStyle::enterprise() ) { TQFont bodyFont = mCSSHelper->bodyFont( isFixedFont() ); diff --git a/kmail/kmsearchpattern.cpp b/kmail/kmsearchpattern.cpp index 4c4340a2b..1d6fd95d7 100644 --- a/kmail/kmsearchpattern.cpp +++ b/kmail/kmsearchpattern.cpp @@ -41,7 +41,7 @@ static const int numFuncConfigNames = sizeof funcConfigNames / sizeof *funcConfi struct _statusNames { const char* name; - KMMsgtqStatus status; + KMMsgStatus status; }; static struct _statusNames statusNames[] = { @@ -104,7 +104,7 @@ KMSearchRule * KMSearchRule::createInstance( const TQCString & field, { KMSearchRule *ret = 0; if (field == "<status>") - ret = new KMSearchRuletqStatus( field, func, contents ); + ret = new KMSearchRuleStatus( field, func, contents ); else if ( field == "<age in days>" || field == "<size>" ) ret = new KMSearchRuleNumerical( field, func, contents ); else @@ -550,7 +550,7 @@ bool KMSearchRuleNumerical::matches( const KMMessage * msg ) const } else if ( field() == "<age in days>" ) { TQDateTime msgDateTime; msgDateTime.setTime_t( msg->date() ); - numericalMsgContents = msgDateTime.daysTo( TQDateTime::tqcurrentDateTime() ); + numericalMsgContents = msgDateTime.daysTo( TQDateTime::currentDateTime() ); numericalValue = contents().toInt(); msgContents.setNum( numericalMsgContents ); } @@ -622,10 +622,10 @@ bool KMSearchRuleNumerical::matchesInternal( long numericalValue, //================================================== // -// class KMSearchRuletqStatus +// class KMSearchRuleStatus // //================================================== -TQString englishNameFortqStatus( const KMMsgtqStatus& status ) +TQString englishNameForStatus( const KMMsgStatus& status ) { for ( int i=0; i< numStatusNames; i++ ) { if ( statusNames[i].status == status ) { @@ -635,22 +635,22 @@ TQString englishNameFortqStatus( const KMMsgtqStatus& status ) return TQString(); } -KMSearchRuletqStatus::KMSearchRuletqStatus( const TQCString & field, +KMSearchRuleStatus::KMSearchRuleStatus( const TQCString & field, Function func, const TQString & aContents ) : KMSearchRule(field, func, aContents) { // the values are always in english, both from the conf file as well as // the patternedit gui - mtqStatus = statusFromEnglishName( aContents ); + mStatus = statusFromEnglishName( aContents ); } -KMSearchRuletqStatus::KMSearchRuletqStatus( int status, Function func ) -: KMSearchRule( "<status>", func, englishNameFortqStatus( status ) ) +KMSearchRuleStatus::KMSearchRuleStatus( int status, Function func ) +: KMSearchRule( "<status>", func, englishNameForStatus( status ) ) { - mtqStatus = status; + mStatus = status; } -KMMsgtqStatus KMSearchRuletqStatus::statusFromEnglishName( const TQString & aStatusString ) +KMMsgStatus KMSearchRuleStatus::statusFromEnglishName( const TQString & aStatusString ) { for ( int i=0; i< numStatusNames; i++ ) { if ( !aStatusString.compare( statusNames[i].name ) ) { @@ -660,33 +660,33 @@ KMMsgtqStatus KMSearchRuletqStatus::statusFromEnglishName( const TQString & aSta return KMMsgStatusUnknown; } -bool KMSearchRuletqStatus::isEmpty() const +bool KMSearchRuleStatus::isEmpty() const { return field().stripWhiteSpace().isEmpty() || contents().isEmpty(); } -bool KMSearchRuletqStatus::matches( const DwString &, KMMessage &, +bool KMSearchRuleStatus::matches( const DwString &, KMMessage &, const DwBoyerMoore *, int ) const { assert( 0 ); return false; // don't warn } -bool KMSearchRuletqStatus::matches( const KMMessage * msg ) const +bool KMSearchRuleStatus::matches( const KMMessage * msg ) const { - KMMsgtqStatus msgtqStatus = msg->status(); + KMMsgStatus msgStatus = msg->status(); bool rc = false; switch ( function() ) { case FuncEquals: // fallthrough. So that "<status> 'is' 'read'" works case FuncContains: - if (msgtqStatus & mtqStatus) + if (msgStatus & mStatus) rc = true; break; case FuncNotEqual: // fallthrough. So that "<status> 'is not' 'read'" works case FuncContainsNot: - if (! (msgtqStatus & mtqStatus) ) + if (! (msgStatus & mStatus) ) rc = true; break; // FIXME what about the remaining funcs, how can they make sense for diff --git a/kmail/kmsearchpattern.h b/kmail/kmsearchpattern.h index 87533a250..b60e9cdc8 100644 --- a/kmail/kmsearchpattern.h +++ b/kmail/kmsearchpattern.h @@ -10,7 +10,7 @@ #include <tqptrlist.h> #include <tqstring.h> #include <tqcstring.h> -#include "kmmsgbase.h" // for KMMsgtqStatus +#include "kmmsgbase.h" // for KMMsgStatus class KMMessage; class KConfig; @@ -208,13 +208,13 @@ public: namespace KMail { // The below are used in several places and here so they are accessible. - struct MessagetqStatus { + struct MessageStatus { const char * const text; const char * const icon; }; // If you change the ordering here; also do it in the enum below - static const MessagetqStatus StatusValues[] = { + static const MessageStatus StatusValues[] = { { I18N_NOOP( "Important" ), "kmmsgflag" }, { I18N_NOOP( "New" ), "kmmsgnew" }, { I18N_NOOP( "Unread" ), "kmmsgunseen" }, @@ -255,7 +255,7 @@ namespace KMail { }; static const int StatusValueCount = - sizeof( StatusValues ) / sizeof( MessagetqStatus ); + sizeof( StatusValues ) / sizeof( MessageStatus ); // we want to show all status entries in the quick search bar, but only the // ones up to attachment in the search/filter dialog, because there the // attachment case is handled separately. @@ -267,12 +267,12 @@ namespace KMail { @short This class represents a search pattern rule operating on message status. */ -class KMSearchRuletqStatus : public KMSearchRule +class KMSearchRuleStatus : public KMSearchRule { public: - KMSearchRuletqStatus( const TQCString & field=0, Function function=FuncContains, + KMSearchRuleStatus( const TQCString & field=0, Function function=FuncContains, const TQString & contents=TQString() ); - KMSearchRuletqStatus( int status, Function function=FuncContains ); + KMSearchRuleStatus( int status, Function function=FuncContains ); virtual bool isEmpty() const ; virtual bool matches( const KMMessage * msg ) const; @@ -280,9 +280,9 @@ public: virtual bool matches( const DwString &, KMMessage &, const DwBoyerMoore *, int ) const; - static KMMsgtqStatus statusFromEnglishName(const TQString&); + static KMMsgStatus statusFromEnglishName(const TQString&); private: - KMMsgtqStatus mtqStatus; + KMMsgStatus mStatus; }; // ------------------------------------------------------------------------ diff --git a/kmail/kmsearchpatternedit.cpp b/kmail/kmsearchpatternedit.cpp index f21bee17f..ceafc27e4 100644 --- a/kmail/kmsearchpatternedit.cpp +++ b/kmail/kmsearchpatternedit.cpp @@ -106,12 +106,12 @@ void KMSearchRuleWidget::initWidget() // initialize the function/value widget stack mFunctionStack = new TQWidgetStack( this, "mFunctionStack" ); //Don't expand the widget in vertical direction - mFunctionStack->tqsetSizePolicy( TQSizePolicy::Preferred,TQSizePolicy::Fixed ); + mFunctionStack->setSizePolicy( TQSizePolicy::Preferred,TQSizePolicy::Fixed ); hlay->addWidget( mFunctionStack ); mValueStack = new TQWidgetStack( this, "mValueStack" ); - mValueStack->tqsetSizePolicy( TQSizePolicy::Preferred,TQSizePolicy::Fixed ); + mValueStack->setSizePolicy( TQSizePolicy::Preferred,TQSizePolicy::Fixed ); hlay->addWidget( mValueStack ); hlay->setStretchFactor( mValueStack, 10 ); @@ -143,7 +143,7 @@ void KMSearchRuleWidget::setRule( KMSearchRule *aRule ) mRuleField->blockSignals( true ); if ( i < 0 ) { // not found -> user defined field - mRuleField->changeItem( TQString::tqfromLatin1( aRule->field() ), 0 ); + mRuleField->changeItem( TQString::fromLatin1( aRule->field() ), 0 ); i = 0; } else { // found in the list of predefined fields mRuleField->changeItem( TQString(), 0 ); diff --git a/kmail/kmsearchpatternedit.h b/kmail/kmsearchpatternedit.h index e42ae080d..625d8f864 100644 --- a/kmail/kmsearchpatternedit.h +++ b/kmail/kmsearchpatternedit.h @@ -46,7 +46,7 @@ public: be used to initialize the widget. */ KMSearchRuleWidget( TQWidget* parent=0, KMSearchRule* aRule=0, const char* name=0, bool headersOnly = false, bool absoluteDates = false ); - enum { Message, Body, AnyHeader, Recipients, Size, AgeInDays, tqStatus, + enum { Message, Body, AnyHeader, Recipients, Size, AgeInDays, Status, Subject, From, To, CC, ReplyTo, Organization }; /** Set whether only header fields can be searched. If @p is true only diff --git a/kmail/kmsender.cpp b/kmail/kmsender.cpp index 761f4d60a..8870976f9 100644 --- a/kmail/kmsender.cpp +++ b/kmail/kmsender.cpp @@ -80,7 +80,7 @@ KMSender::~KMSender() void KMSender::seStatusMsg(const TQString &msg) { if ( mProgressItem ) - mProgressItem->setqStatus(msg); + mProgressItem->seStatus(msg); } //----------------------------------------------------------------------------- @@ -164,7 +164,7 @@ bool KMSender::doSend(KMMessage* aMsg, short sendNow) KMFolder * const outbox = kmkernel->outboxFolder(); const KMFolderOpener openOutbox( outbox, "outbox" ); - aMsg->setqStatus(KMMsgStatusQueued); + aMsg->seStatus(KMMsgStatusQueued); if ( const int err = outbox->addMsg(aMsg) ) { Q_UNUSED( err ); @@ -314,8 +314,8 @@ void KMSender::doSendMsg() mCurrentMsg->addBodyPart( &msgPart ); } } - mCurrentMsg->setqStatus(KMMsgStatusSent); - mCurrentMsg->setqStatus(KMMsgStatusRead); // otherwise it defaults to new on imap + mCurrentMsg->seStatus(KMMsgStatusSent); + mCurrentMsg->seStatus(KMMsgStatusRead); // otherwise it defaults to new on imap mCurrentMsg->updateAttachmentState(); mCurrentMsg->updateInvitationState(); @@ -850,7 +850,7 @@ void KMSender::seStatusByLink(const KMMessage *aMsg) int n = 0; while (1) { ulong msn; - KMMsgtqStatus status; + KMMsgStatus status; aMsg->getLink(n, &msn, &status); if (!msn || !status) break; @@ -867,7 +867,7 @@ void KMSender::seStatusByLink(const KMMessage *aMsg) new KMDeleteMsgCommand( folder, folder->getMsg( index ) ); cmd->start(); } else { - folder->setqStatus(index, status); + folder->seStatus(index, status); } } else { kdWarning(5006) << k_funcinfo << "Cannot update linked message, it could not be found!" << endl; diff --git a/kmail/kmstartup.cpp b/kmail/kmstartup.cpp index b5b0680da..a6ac84769 100644 --- a/kmail/kmstartup.cpp +++ b/kmail/kmstartup.cpp @@ -43,7 +43,7 @@ #include <unistd.h> #include <tqfile.h> -#undef tqStatus // stupid X headers +#undef Status // stupid X headers extern "C" { diff --git a/kmail/kmsystemtray.cpp b/kmail/kmsystemtray.cpp index d7bba197b..3a1ab1ab5 100644 --- a/kmail/kmsystemtray.cpp +++ b/kmail/kmsystemtray.cpp @@ -67,7 +67,7 @@ KMSystemTray::KMSystemTray(TQWidget *parent, const char *name) mNewMessagePopupId(-1), mPopupMenu(0) { - tqsetAlignment( AlignCenter ); + setAlignment( AlignCenter ); kdDebug(5006) << "Initting systray" << endl; mLastUpdate = time( 0 ); @@ -81,7 +81,7 @@ KMSystemTray::KMSystemTray(TQWidget *parent, const char *name) KMMainWidget * mainWidget = kmkernel->getKMMainWidget(); if ( mainWidget ) { - TQWidget * mainWin = mainWidget->tqtopLevelWidget(); + TQWidget * mainWin = mainWidget->topLevelWidget(); if ( mainWin ) { mDesktopOfMainWin = KWin::windowInfo( mainWin->winId(), NET::WMDesktop ).desktop(); @@ -133,7 +133,7 @@ void KMSystemTray::buildPopupMenu() action->plug( mPopupMenu ); mPopupMenu->insertSeparator(); - KMainWindow *mainWin = ::tqqt_cast<KMainWindow*>(kmkernel->getKMMainWidget()->tqtopLevelWidget()); + KMainWindow *mainWin = ::tqqt_cast<KMainWindow*>(kmkernel->getKMMainWidget()->topLevelWidget()); mPopupMenu->insertItem( SmallIcon("exit"), i18n("&Quit"), this, TQT_SLOT(maybeQuit()) ); } @@ -385,7 +385,7 @@ bool KMSystemTray::mainWindowIsOnCurrentDesktop() if ( !mainWidget ) return false; - TQWidget *mainWin = kmkernel->getKMMainWidget()->tqtopLevelWidget(); + TQWidget *mainWin = kmkernel->getKMMainWidget()->topLevelWidget(); if ( !mainWin ) return false; @@ -401,7 +401,7 @@ void KMSystemTray::showKMail() { if (!kmkernel->getKMMainWidget()) return; - TQWidget *mainWin = kmkernel->getKMMainWidget()->tqtopLevelWidget(); + TQWidget *mainWin = kmkernel->getKMMainWidget()->topLevelWidget(); assert(mainWin); if(mainWin) { @@ -429,7 +429,7 @@ void KMSystemTray::hideKMail() { if (!kmkernel->getKMMainWidget()) return; - TQWidget *mainWin = kmkernel->getKMMainWidget()->tqtopLevelWidget(); + TQWidget *mainWin = kmkernel->getKMMainWidget()->topLevelWidget(); assert(mainWin); if(mainWin) { diff --git a/kmail/kmtransport.cpp b/kmail/kmtransport.cpp index c74c87f89..407a0bd99 100644 --- a/kmail/kmtransport.cpp +++ b/kmail/kmtransport.cpp @@ -291,7 +291,7 @@ KMTransportDialog::KMTransportDialog( const TQString & caption, { assert(transportInfo != 0); - if( transportInfo->type == TQString::tqfromLatin1("sendmail") ) + if( transportInfo->type == TQString::fromLatin1("sendmail") ) { makeSendmailPage(); } else { diff --git a/kmail/listjob.cpp b/kmail/listjob.cpp index 29dd8d8b0..e9e4a9361 100644 --- a/kmail/listjob.cpp +++ b/kmail/listjob.cpp @@ -109,16 +109,16 @@ void ListJob::execute() jd.curNamespace = mNamespace; if ( mParentProgressItem ) { - TQString escapedtqStatus = mDestFolder ? TQStyleSheet::escape( mDestFolder->prettyURL() ) + TQString escapedStatus = mDestFolder ? TQStyleSheet::escape( mDestFolder->prettyURL() ) : TQString(); jd.progressItem = ProgressManager::createProgressItem( mParentProgressItem, "ListDir" + ProgressManager::getUniqueID(), - escapedtqStatus, + escapedStatus, i18n("retrieving folders"), false, mAccount->useSSL() || mAccount->useTLS() ); - mParentProgressItem->setqStatus( escapedtqStatus ); + mParentProgressItem->seStatus( escapedStatus ); } // make the URL diff --git a/kmail/mailinglistpropertiesdialog.cpp b/kmail/mailinglistpropertiesdialog.cpp index 85c0c3408..2e85c38dd 100644 --- a/kmail/mailinglistpropertiesdialog.cpp +++ b/kmail/mailinglistpropertiesdialog.cpp @@ -144,7 +144,7 @@ MailingListFolderPropertiesDialog::MailingListFolderPropertiesDialog( TQWidget* TQT_SLOT(slotAddressChanged(int)) ); load(); - resize( TQSize(295, 204).expandedTo(tqminimumSizeHint()) ); + resize( TQSize(295, 204).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); } diff --git a/kmail/main.cpp b/kmail/main.cpp index 0cca3cb20..ae2d5a06f 100644 --- a/kmail/main.cpp +++ b/kmail/main.cpp @@ -28,7 +28,7 @@ #include <kdebug.h> -#undef tqStatus // stupid X headers +#undef Status // stupid X headers #include "aboutdata.h" diff --git a/kmail/managesievescriptsdialog.cpp b/kmail/managesievescriptsdialog.cpp index b65acadf8..ba32c0089 100644 --- a/kmail/managesievescriptsdialog.cpp +++ b/kmail/managesievescriptsdialog.cpp @@ -54,7 +54,7 @@ KMail::ManageSieveScriptsDialog::ManageSieveScriptsDialog( TQWidget * parent, co this, TQT_SLOT(slotSelectionChanged(TQListViewItem*)) ); vlay->addWidget( mListView ); - resize( 2 * tqsizeHint().width(), tqsizeHint().height() ); + resize( 2 * sizeHint().width(), sizeHint().height() ); slotRefresh(); } @@ -322,7 +322,7 @@ KMail::SieveEditor::SieveEditor( TQWidget * parent, const char * name ) mTextEdit->setWordWrap( TQTextEdit::NoWrap ); mTextEdit->setFont( KGlobalSettings::fixedFont() ); connect( mTextEdit, TQT_SIGNAL( textChanged () ), TQT_SLOT( slotTextChanged() ) ); - resize( 3 * tqsizeHint() ); + resize( 3 * sizeHint() ); } KMail::SieveEditor::~SieveEditor() {} diff --git a/kmail/messageactions.cpp b/kmail/messageactions.cpp index 6dc248e7b..c1f569925 100644 --- a/kmail/messageactions.cpp +++ b/kmail/messageactions.cpp @@ -223,30 +223,30 @@ void MessageActions::slotNoQuoteReplyToMsg() void MessageActions::slotSetMsgStatusNew() { - setMessagetqStatus( KMMsgStatusNew ); + setMessageStatus( KMMsgStatusNew ); } void MessageActions::slotSetMsgStatusUnread() { - setMessagetqStatus( KMMsgStatusUnread ); + setMessageStatus( KMMsgStatusUnread ); } void MessageActions::slotSetMsgStatusRead() { - setMessagetqStatus( KMMsgStatusRead ); + setMessageStatus( KMMsgStatusRead ); } void MessageActions::slotSetMsgStatusFlag() { - setMessagetqStatus( KMMsgStatusFlag, true ); + setMessageStatus( KMMsgStatusFlag, true ); } void MessageActions::slotSetMsgStatusTodo() { - setMessagetqStatus( KMMsgStatusTodo, true ); + setMessageStatus( KMMsgStatusTodo, true ); } -void MessageActions::setMessagetqStatus( KMMsgtqStatus status, bool toggle ) +void MessageActions::setMessageStatus( KMMsgStatus status, bool toggle ) { TQValueList<TQ_UINT32> serNums = mVisibleSernums; if ( serNums.isEmpty() && mCurrentMessage ) diff --git a/kmail/messageactions.h b/kmail/messageactions.h index a99e555b7..f0b47372d 100644 --- a/kmail/messageactions.h +++ b/kmail/messageactions.h @@ -70,7 +70,7 @@ class MessageActions : public TQObject private: void updateActions(); template<typename T> void replyCommand(); - void setMessagetqStatus( KMMsgtqStatus status, bool toggle = false ); + void setMessageStatus( KMMsgStatus status, bool toggle = false ); private slots: void slotReplyToMsg(); diff --git a/kmail/messagecomposer.cpp b/kmail/messagecomposer.cpp index c69aa525b..d3a0233d6 100644 --- a/kmail/messagecomposer.cpp +++ b/kmail/messagecomposer.cpp @@ -599,7 +599,7 @@ void MessageComposer::chiasmusEncryptAllAttachments() { for ( TQValueVector<Attachment>::iterator it = mAttachments.begin(), end = mAttachments.end() ; it != end ; ++it ) { KMMessagePart * part = it->part; const TQString filename = part->fileName(); - if ( filename.tqendsWith( ".xia", false ) ) + if ( filename.endsWith( ".xia", false ) ) continue; // already encrypted const TQByteArray body = part->bodyDecodedBinary(); TQByteArray resultData; @@ -2092,7 +2092,7 @@ TQByteArray MessageComposer::breakLinesAndApplyCodec() if( mCharset == "us-ascii" ) { cText = KMMsgBase::toUsAscii( text ); - newText = TQString::tqfromLatin1( cText ); + newText = TQString::fromLatin1( cText ); } else if( codec == 0 ) { kdDebug(5006) << "Something is wrong and I can not get a codec." << endl; cText = text.local8Bit(); diff --git a/kmail/newfolderdialog.cpp b/kmail/newfolderdialog.cpp index e6fed27be..b5848dcc8 100644 --- a/kmail/newfolderdialog.cpp +++ b/kmail/newfolderdialog.cpp @@ -176,7 +176,7 @@ NewFolderDialog::NewFolderDialog( TQWidget* parent, KMFolder *folder ) } } - resize( TQSize(282, 108).expandedTo(tqminimumSizeHint()) ); + resize( TQSize(282, 108).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); slotFolderNameChanged( mNameLineEdit->text()); } diff --git a/kmail/objecttreeparser.cpp b/kmail/objecttreeparser.cpp index 0e5103e29..518610d99 100644 --- a/kmail/objecttreeparser.cpp +++ b/kmail/objecttreeparser.cpp @@ -272,7 +272,7 @@ namespace KMail { ProcessResult processResult; if ( mReader ) { - htmlWriter()->queue( TQString::tqfromLatin1("<a name=\"att%1\"/>").tqarg( node->nodeId() ) ); + htmlWriter()->queue( TQString::fromLatin1("<a name=\"att%1\"/>").tqarg( node->nodeId() ) ); } if ( const Interface::BodyPartFormatter * formatter @@ -391,7 +391,7 @@ namespace KMail { ////////////////// ////////////////// - static int signatureTotqStatus( const GpgME::Signature &sig ) + static int signatureToStatus( const GpgME::Signature &sig ) { switch ( sig.status().code() ) { case GPG_ERR_NO_ERROR: @@ -586,10 +586,10 @@ namespace KMail { //kdDebug(5006) << "\nObjectTreeParser::writeOpaqueOrMultipartSignedData: found signature" << endl; GpgME::Signature signature = signatures[0]; - messagePart.status_code = signatureTotqStatus( signature ); + messagePart.status_code = signatureToStatus( signature ); messagePart.status = TQString::fromUtf8( signature.status().asString() ); for ( uint i = 1; i < signatures.size(); ++i ) { - if ( signatureTotqStatus( signatures[i] ) != messagePart.status_code ) { + if ( signatureToStatus( signatures[i] ) != messagePart.status_code ) { messagePart.status_code = GPGME_SIG_STAT_DIFF; messagePart.status = i18n("Different results for signatures"); } diff --git a/kmail/objecttreeparser_p.cpp b/kmail/objecttreeparser_p.cpp index 947c76ae3..a645b3989 100644 --- a/kmail/objecttreeparser_p.cpp +++ b/kmail/objecttreeparser_p.cpp @@ -190,7 +190,7 @@ bool VerifyDetachedBodyPartMemento::canStartKeyListJob() const TQStringList VerifyDetachedBodyPartMemento::keyListPattern() const { assert( canStartKeyListJob() ); - return TQStringList( TQString::tqfromLatin1( m_vr.signature( 0 ).fingerprint() ) ); + return TQStringList( TQString::fromLatin1( m_vr.signature( 0 ).fingerprint() ) ); } void VerifyDetachedBodyPartMemento::saveResult( const VerificationResult & vr ) @@ -297,7 +297,7 @@ bool VerifyOpaqueBodyPartMemento::canStartKeyListJob() const TQStringList VerifyOpaqueBodyPartMemento::keyListPattern() const { assert( canStartKeyListJob() ); - return TQStringList( TQString::tqfromLatin1( m_vr.signature( 0 ).fingerprint() ) ); + return TQStringList( TQString::fromLatin1( m_vr.signature( 0 ).fingerprint() ) ); } void VerifyOpaqueBodyPartMemento::saveResult( const VerificationResult & vr, diff --git a/kmail/partNode.cpp b/kmail/partNode.cpp index 333d14b0d..29cdac078 100644 --- a/kmail/partNode.cpp +++ b/kmail/partNode.cpp @@ -269,7 +269,7 @@ TQString partNode::contentTypeParameter( const char * name ) const { DwString this_attr = param->Attribute(); this_attr.ConvertToLowerCase(); // what a braindead design! if ( this_attr == attr ) - return TQString::tqfromLatin1( param->Value().data(), param->Value().size() ); + return TQString::fromLatin1( param->Value().data(), param->Value().size() ); // warning: misses rfc2231 handling! } return TQString(); diff --git a/kmail/popaccount.cpp b/kmail/popaccount.cpp index a37bc6d58..15efb0e87 100644 --- a/kmail/popaccount.cpp +++ b/kmail/popaccount.cpp @@ -747,7 +747,7 @@ void PopAccount::slotJobFinished() { if ( !idsOfMsgsToDelete.isEmpty() ) { stage = Dele; if ( mMailCheckProgressItem ) - mMailCheckProgressItem->setqStatus( + mMailCheckProgressItem->seStatus( i18n( "Fetched 1 message from %1. Deleting messages from server...", "Fetched %n messages from %1. Deleting messages from server...", numMsgs ) @@ -757,7 +757,7 @@ void PopAccount::slotJobFinished() { } else { stage = Quit; if ( mMailCheckProgressItem ) - mMailCheckProgressItem->setqStatus( + mMailCheckProgressItem->seStatus( i18n( "Fetched 1 message from %1. Terminating transmission...", "Fetched %n messages from %1. Terminating transmission...", numMsgs ) @@ -777,7 +777,7 @@ void PopAccount::slotJobFinished() { } idsOfMsgsToDelete.clear(); if ( mMailCheckProgressItem ) - mMailCheckProgressItem->setqStatus( + mMailCheckProgressItem->seStatus( i18n( "Fetched 1 message from %1. Terminating transmission...", "Fetched %n messages from %1. Terminating transmission...", numMsgs ) @@ -913,7 +913,7 @@ void PopAccount::slotData( KIO::Job* job, const TQByteArray &data) .tqarg(indexOfCurrentMsg+1).tqarg(numMsgs).tqarg(numBytesRead/1024) .tqarg(numBytesToRead/1024).tqarg(mLogin).tqarg(mHost); } - mMailCheckProgressItem->setqStatus( msg ); + mMailCheckProgressItem->seStatus( 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/recipientseditor.cpp b/kmail/recipientseditor.cpp index 5b18e044b..1b39cee80 100644 --- a/kmail/recipientseditor.cpp +++ b/kmail/recipientseditor.cpp @@ -288,7 +288,7 @@ void RecipientLine::keyPressEvent( TQKeyEvent *ev ) int RecipientLine::setComboWidth( int w ) { - w = TQMAX( w, mCombo->tqsizeHint().width() ); + w = TQMAX( w, mCombo->sizeHint().width() ); mCombo->setFixedWidth( w ); mCombo->updateGeometry(); parentWidget()->updateGeometry(); @@ -331,7 +331,7 @@ RecipientsView::RecipientsView( TQWidget *parent ) addLine(); setResizePolicy( TQScrollView::Manual ); - tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ); + setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ); viewport()->setPaletteBackgroundColor( paletteBackgroundColor() ); } @@ -400,7 +400,7 @@ RecipientLine *RecipientsView::addLine() mFirstColumnWidth = line->setComboWidth( mFirstColumnWidth ); - mLineHeight = line->tqminimumSizeHint().height(); + mLineHeight = line->minimumSizeHint().height(); line->resize( viewport()->width(), mLineHeight ); @@ -555,12 +555,12 @@ void RecipientsView::viewportResizeEvent ( TQResizeEvent *ev ) ensureVisible( 0, mLines.count() * mLineHeight ); } -TQSize RecipientsView::tqsizeHint() const +TQSize RecipientsView::sizeHint() const { return TQSize( 200, mLineHeight * mLines.count() ); } -TQSize RecipientsView::tqminimumSizeHint() const +TQSize RecipientsView::minimumSizeHint() const { int height; uint numLines = 5; @@ -757,7 +757,7 @@ SideWidget::SideWidget( RecipientsView *view, TQWidget *parent ) topLayout->addStretch( 1 ); mTotalLabel = new TQLabel( this ); - mTotalLabel->tqsetAlignment( AlignCenter ); + mTotalLabel->setAlignment( AlignCenter ); topLayout->addWidget( mTotalLabel ); mTotalLabel->hide(); diff --git a/kmail/recipientseditor.h b/kmail/recipientseditor.h index 0c4aafbcf..db63c8fe6 100644 --- a/kmail/recipientseditor.h +++ b/kmail/recipientseditor.h @@ -177,8 +177,8 @@ class RecipientsView : public TQScrollView public: RecipientsView( TQWidget *parent ); - TQSize tqminimumSizeHint() const; - TQSize tqsizeHint() const; + TQSize minimumSizeHint() const; + TQSize sizeHint() const; RecipientLine *activeLine(); diff --git a/kmail/recipientseditortest.cpp b/kmail/recipientseditortest.cpp index 05e552530..5d8b02ee3 100644 --- a/kmail/recipientseditortest.cpp +++ b/kmail/recipientseditortest.cpp @@ -54,7 +54,7 @@ Composer::Composer( TQWidget *parent ) mRecipients = new RecipientsEditor( this ); topLayout->addMultiCellWidget( mRecipients, 1, 1, 0, 1 ); - kdDebug() << "SIZEHINT: " << mRecipients->tqsizeHint() << endl; + kdDebug() << "SIZEHINT: " << mRecipients->sizeHint() << endl; // mRecipients->setFixedHeight( 10 ); diff --git a/kmail/recipientspicker.cpp b/kmail/recipientspicker.cpp index 6d00e41c4..dcf43f794 100644 --- a/kmail/recipientspicker.cpp +++ b/kmail/recipientspicker.cpp @@ -241,7 +241,7 @@ void RecipientsListToolTip::maybeTip( const TQPoint & pos ) RecipientViewItem *i = static_cast<RecipientViewItem *>( item ); if( item ) { - r = mListView->tqitemRect( item ); + r = mListView->itemRect( item ); TQString tipText( i->recipientItem()->tooltip() ); if ( !tipText.isEmpty() ) { tip( r, tipText ); diff --git a/kmail/redirectdialog.cpp b/kmail/redirectdialog.cpp index 4027375b9..88951fcf7 100644 --- a/kmail/redirectdialog.cpp +++ b/kmail/redirectdialog.cpp @@ -68,7 +68,7 @@ RedirectDialog::RedirectDialog( TQWidget *parent, const char *name, mBtnTo = new TQPushButton( TQString(), hbox, "toBtn" ); mBtnTo->setPixmap( BarIcon( "contents", KIcon::SizeSmall ) ); - mBtnTo->setMinimumSize( mBtnTo->tqsizeHint() * 1.2 ); + mBtnTo->setMinimumSize( mBtnTo->sizeHint() * 1.2 ); TQToolTip::add( mBtnTo, i18n("Use the Address-Selection Dialog") ); TQWhatsThis::add( mBtnTo, i18n("This button opens a separate dialog " "where you can select recipients out " diff --git a/kmail/regexplineedit.cpp b/kmail/regexplineedit.cpp index 0b2b2fb50..0da122891 100644 --- a/kmail/regexplineedit.cpp +++ b/kmail/regexplineedit.cpp @@ -82,7 +82,7 @@ namespace KMail { if( !KTrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty() ) { mRegExpEditButton = new TQPushButton( i18n("Edit..."), this, "mRegExpEditButton" ); - mRegExpEditButton->tqsetSizePolicy( TQSizePolicy::Minimum, + mRegExpEditButton->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ); hlay->addWidget( mRegExpEditButton ); diff --git a/kmail/rulewidgethandlermanager.cpp b/kmail/rulewidgethandlermanager.cpp index 9cc9e3ecb..4dc7eb6bf 100644 --- a/kmail/rulewidgethandlermanager.cpp +++ b/kmail/rulewidgethandlermanager.cpp @@ -1123,7 +1123,7 @@ namespace { const int status = currenStatusValue( valueStack ); if ( status != -1 ) - return TQString::tqfromLatin1( KMail::StatusValues[ status ].text ); + return TQString::fromLatin1( KMail::StatusValues[ status ].text ); else return TQString(); } @@ -1215,7 +1215,7 @@ namespace { const TQString value = rule->contents(); int valueIndex = 0; for ( ; valueIndex < KMail::StatusValueCountWithoutHidden; ++valueIndex ) - if ( value == TQString::tqfromLatin1( + if ( value == TQString::fromLatin1( KMail::StatusValues[ valueIndex ].text ) ) break; TQComboBox *statusCombo = diff --git a/kmail/searchwindow.cpp b/kmail/searchwindow.cpp index ff2248832..1a5da2688 100644 --- a/kmail/searchwindow.cpp +++ b/kmail/searchwindow.cpp @@ -360,7 +360,7 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name, mCopyAction = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(slotCopyMsgs()), ac, "search_copy_messages" ); mCutAction = KStdAction::cut( TQT_TQOBJECT(this), TQT_SLOT(slotCutMsgs()), ac, "search_cut_messages" ); - connect(mTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(updtqStatus())); + connect(mTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(updStatus())); connect(kmkernel->searchFolderMgr(), TQT_SIGNAL(folderInvalidated(KMFolder*)), TQT_TQOBJECT(this), TQT_SLOT(folderInvalidated(KMFolder*))); @@ -400,7 +400,7 @@ void SearchWindow::setEnabledSearchButton(bool) } //----------------------------------------------------------------------------- -void SearchWindow::updtqStatus(void) +void SearchWindow::updStatus(void) { TQString genMsg, detailMsg, procMsg; int numMatches = 0, numProcessed = 0; @@ -466,7 +466,7 @@ void SearchWindow::activateFolder(KMFolder *curFolder) //----------------------------------------------------------------------------- void SearchWindow::slotSearch() { - mLastFocus = tqfocusWidget(); + mLastFocus = focusWidget(); mBtnSearch->setFocus(); // set focus so we don't miss key event mStopped = false; @@ -541,7 +541,7 @@ void SearchWindow::slotSearch() void SearchWindow::searchDone() { mTimer->stop(); - updtqStatus(); + updStatus(); TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(enableGUI())); if(mLastFocus) diff --git a/kmail/searchwindow.h b/kmail/searchwindow.h index 6ea4adf86..19183e66d 100644 --- a/kmail/searchwindow.h +++ b/kmail/searchwindow.h @@ -105,7 +105,7 @@ public: protected slots: /** Update status line widget. */ - virtual void updtqStatus(void); + virtual void updStatus(void); virtual void slotClose(); virtual void slotSearch(); diff --git a/kmail/signatureconfigurator.cpp b/kmail/signatureconfigurator.cpp index fb3c7c40d..e29551676 100644 --- a/kmail/signatureconfigurator.cpp +++ b/kmail/signatureconfigurator.cpp @@ -260,7 +260,7 @@ namespace KMail { // slotEnableEditButton should prevent this assert from being hit: assert( !url.isEmpty() ); - (void)KRun::runURL( KURL( url ), TQString::tqfromLatin1("text/plain") ); + (void)KRun::runURL( KURL( url ), TQString::fromLatin1("text/plain") ); } } // namespace KMail diff --git a/kmail/smimeconfiguration.ui b/kmail/smimeconfiguration.ui index 287605aa3..a1a34d397 100644 --- a/kmail/smimeconfiguration.ui +++ b/kmail/smimeconfiguration.ui @@ -38,7 +38,7 @@ <string>Validate certificates online (OCSP)</string> </property> <property name="whatsThis" stdset="0"> - <string>If this option is selected, S/MIME certificates are validated online using the Online Certificates tqStatus Protocol (OCSP). Fill in the URL of the OCSP responder below.</string> + <string>If this option is selected, S/MIME certificates are validated online using the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP responder below.</string> </property> </widget> <widget class="TQGroupBox"> @@ -109,7 +109,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>150</width> <height>20</height> @@ -351,7 +351,7 @@ The syntax is "HOST" or "HOST:PORT". If PORT is omitted, port 389 (standard LDAP <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>73</height> diff --git a/kmail/snippetdlgbase.ui b/kmail/snippetdlgbase.ui index 5cdf04c73..429b598b9 100644 --- a/kmail/snippetdlgbase.ui +++ b/kmail/snippetdlgbase.ui @@ -37,7 +37,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -85,7 +85,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>80</height> diff --git a/kmail/snippetsettingsbase.ui b/kmail/snippetsettingsbase.ui index a9949cb55..83eba9643 100644 --- a/kmail/snippetsettingsbase.ui +++ b/kmail/snippetsettingsbase.ui @@ -56,7 +56,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>70</height> @@ -144,7 +144,7 @@ <property name="name"> <cstring>leDelimiter</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>40</width> <height>32767</height> @@ -164,7 +164,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> diff --git a/kmail/snippetwidget.cpp b/kmail/snippetwidget.cpp index aff2e8067..afa610df8 100644 --- a/kmail/snippetwidget.cpp +++ b/kmail/snippetwidget.cpp @@ -521,7 +521,7 @@ void SnippetWidget::maybeTip( const TQPoint & p ) if (!item) return; - TQRect r = tqitemRect( item ); + TQRect r = itemRect( item ); if (r.isValid() && _SnippetConfig.useToolTips() ) @@ -670,7 +670,7 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ TQCheckBox * cb = NULL; labTop = new TQLabel( &dlg, "label" ); - labTop->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, + labTop->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, labTop->sizePolicy().hasHeightForWidth() ) ); labTop->setText(i18n("Enter the replacement values for these variables:")); layoutTop->addWidget(labTop, 0, 0); @@ -708,13 +708,13 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ tqlayout->addMultiCellLayout( layoutVar, 1, 1, 0, 1 ); KPushButton * btn1 = new KPushButton( KStdGuiItem::cancel(), &dlg, "pushButton1" ); - btn1->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, + btn1->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, btn1->sizePolicy().hasHeightForWidth() ) ); layoutBtn->addWidget( btn1, 0, 0 ); KPushButton * btn2 = new KPushButton( KStdGuiItem::apply(), &dlg, "pushButton2" ); btn2->setDefault( TRUE ); - btn2->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, + btn2->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, btn2->sizePolicy().hasHeightForWidth() ) ); layoutBtn->addWidget( btn2, 0, 1 ); @@ -912,7 +912,7 @@ void SnippetWidget::slotDropped(TQDropEvent *e, TQListViewItem *) group = dynamic_cast<SnippetGroup *>(item2->parent()); TQCString dropped; - TQByteArray data = e->tqencodedData("text/plain"); + TQByteArray data = e->encodedData("text/plain"); if ( e->provides("text/plain") && data.size()>0 ) { //get the data from the event... TQString encData(data.data()); diff --git a/kmail/stringutil.cpp b/kmail/stringutil.cpp index e3a2243c8..907c5e1fb 100644 --- a/kmail/stringutil.cpp +++ b/kmail/stringutil.cpp @@ -29,7 +29,7 @@ namespace StringUtil TQString encodeMailtoUrl( const TQString& str ) { TQString result; - result = TQString::tqfromLatin1( KMMsgBase::encodeRFC2047String( str, + result = TQString::fromLatin1( KMMsgBase::encodeRFC2047String( str, "utf-8" ) ); result = KURL::encode_string( result ); return result; diff --git a/kmail/templateparser.cpp b/kmail/templateparser.cpp index 8dce59d4e..f3d48fecc 100644 --- a/kmail/templateparser.cpp +++ b/kmail/templateparser.cpp @@ -693,7 +693,7 @@ void TemplateParser::processWithTemplate( const TQString &tmpl ) } else if ( cmd.startsWith( "DATEEN" ) ) { kdDebug() << "Command: DATEEN" << endl; i += strlen( "DATEEN" ); - TQDateTime date = TQDateTime::tqcurrentDateTime(); + TQDateTime date = TQDateTime::currentDateTime(); KLocale locale( "C" ); TQString str = locale.formatDate( date.date(), false ); body.append( str ); @@ -701,28 +701,28 @@ void TemplateParser::processWithTemplate( const TQString &tmpl ) } else if ( cmd.startsWith( "DATESHORT" ) ) { kdDebug() << "Command: DATESHORT" << endl; i += strlen( "DATESHORT" ); - TQDateTime date = TQDateTime::tqcurrentDateTime(); + TQDateTime date = TQDateTime::currentDateTime(); TQString str = KGlobal::locale()->formatDate( date.date(), true ); body.append( str ); } else if ( cmd.startsWith( "DATE" ) ) { kdDebug() << "Command: DATE" << endl; i += strlen( "DATE" ); - TQDateTime date = TQDateTime::tqcurrentDateTime(); + TQDateTime date = TQDateTime::currentDateTime(); TQString str = KGlobal::locale()->formatDate( date.date(), false ); body.append( str ); } else if ( cmd.startsWith( "DOW" ) ) { kdDebug() << "Command: DOW" << endl; i += strlen( "DOW" ); - TQDateTime date = TQDateTime::tqcurrentDateTime(); + TQDateTime date = TQDateTime::currentDateTime(); TQString str = KGlobal::locale()->calendar()->weekDayName( date.date(), false ); body.append( str ); } else if ( cmd.startsWith( "TIMELONGEN" ) ) { kdDebug() << "Command: TIMELONGEN" << endl; i += strlen( "TIMELONGEN" ); - TQDateTime date = TQDateTime::tqcurrentDateTime(); + TQDateTime date = TQDateTime::currentDateTime(); KLocale locale( "C"); TQString str = locale.formatTime( date.time(), true ); body.append( str ); @@ -730,14 +730,14 @@ void TemplateParser::processWithTemplate( const TQString &tmpl ) } else if ( cmd.startsWith( "TIMELONG" ) ) { kdDebug() << "Command: TIMELONG" << endl; i += strlen( "TIMELONG" ); - TQDateTime date = TQDateTime::tqcurrentDateTime(); + TQDateTime date = TQDateTime::currentDateTime(); TQString str = KGlobal::locale()->formatTime( date.time(), true ); body.append( str ); } else if ( cmd.startsWith( "TIME" ) ) { kdDebug() << "Command: TIME" << endl; i += strlen( "TIME" ); - TQDateTime date = TQDateTime::tqcurrentDateTime(); + TQDateTime date = TQDateTime::currentDateTime(); TQString str = KGlobal::locale()->formatTime( date.time(), false ); body.append( str ); diff --git a/kmail/templatesconfiguration.cpp b/kmail/templatesconfiguration.cpp index b3c05c293..6f39a29c0 100644 --- a/kmail/templatesconfiguration.cpp +++ b/kmail/templatesconfiguration.cpp @@ -47,8 +47,8 @@ TemplatesConfiguration::TemplatesConfiguration( TQWidget *parent, const char *na textEdit_reply_all->setFont( f ); textEdit_forward->setFont( f ); - tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ); - tqsizeHint(); + setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ); + sizeHint(); connect( textEdit_new, TQT_SIGNAL( textChanged() ), this, TQT_SLOT( slotTextChanged( void ) ) ); diff --git a/kmail/templatesconfiguration_base.ui b/kmail/templatesconfiguration_base.ui index fba3da7ef..a6419987f 100644 --- a/kmail/templatesconfiguration_base.ui +++ b/kmail/templatesconfiguration_base.ui @@ -20,7 +20,7 @@ <verstretch>3</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>400</width> <height>300</height> @@ -45,7 +45,7 @@ <verstretch>3</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -86,7 +86,7 @@ <verstretch>3</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> diff --git a/kmail/templatesinsertcommand.cpp b/kmail/templatesinsertcommand.cpp index 825585633..f084be379 100644 --- a/kmail/templatesinsertcommand.cpp +++ b/kmail/templatesinsertcommand.cpp @@ -325,7 +325,7 @@ TemplatesInsertCommand::~TemplatesInsertCommand() void TemplatesInsertCommand::slotClicked() { - TQSize ps = mMenu->popupMenu()->tqsizeHint(); + TQSize ps = mMenu->popupMenu()->sizeHint(); mMenu->popup( mapToGlobal( TQPoint( 0, -(ps.height()) ) ) ); } diff --git a/kmail/tests/signedmail.mbox b/kmail/tests/signedmail.mbox index 5d1a286ab..1df5f3eed 100644 --- a/kmail/tests/signedmail.mbox +++ b/kmail/tests/signedmail.mbox @@ -31,7 +31,7 @@ Content-Type: multipart/signed; Message-Id: <[email protected]> To: undisclosed-recipients:; X-Virus-Scanned: by amavisd-new at kdab.net -X-Spam-tqStatus: Yes, score=7.598 tagged_above=3 required=6.3 +X-Spam-Status: Yes, score=7.598 tagged_above=3 required=6.3 tests=[BAYES_50=0.001, DATE_IN_PAST_96_XX=2.02, DNS_FROM_AHBL_RHSBL=0.231, DNS_FROM_RFC_ABUSE=0.2, DNS_FROM_RFC_DSN=2.597, DNS_FROM_RFC_POST=1.708, UNDISC_RECIPS=0.841] @@ -41,8 +41,8 @@ X-Spam-Flag: YES X-Kolab-Scheduling-Message: FALSE X-UID: 68768 X-Length: 3235 -tqStatus: RO -X-tqStatus: RPT +Status: RO +X-Status: RPT X-KMail-EncryptionState: X-KMail-SignatureState: X-KMail-MDN-Sent: diff --git a/kmail/twindowpositioner.cpp b/kmail/twindowpositioner.cpp index fbcb97607..dde045845 100644 --- a/kmail/twindowpositioner.cpp +++ b/kmail/twindowpositioner.cpp @@ -29,7 +29,7 @@ KWindowPositioner::KWindowPositioner( TQWidget *master, TQWidget *slave, Mode mode ) : TQObject( master ), mMaster( master ), mSlave( slave ), mMode( mode ) { - master->tqtopLevelWidget()->installEventFilter( this ); + master->topLevelWidget()->installEventFilter( this ); } bool KWindowPositioner::eventFilter( TQObject *, TQEvent *e ) diff --git a/kmail/vacation.cpp b/kmail/vacation.cpp index fbcf46c82..7011185d5 100644 --- a/kmail/vacation.cpp +++ b/kmail/vacation.cpp @@ -469,21 +469,21 @@ namespace KMail { } addressesArgument += sl.join( ", " ) + " ] "; } - TQString script = TQString::tqfromLatin1("require \"vacation\";\n\n" ); + TQString script = TQString::fromLatin1("require \"vacation\";\n\n" ); if ( !sendForSpam ) - script += TQString::tqfromLatin1( "if header :contains \"X-Spam-Flag\" \"YES\"" + script += TQString::fromLatin1( "if header :contains \"X-Spam-Flag\" \"YES\"" " { keep; stop; }\n" ); // FIXME? if ( !domain.isEmpty() ) // FIXME - script += TQString::tqfromLatin1( "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" ).tqarg( domain ); script += "vacation "; script += addressesArgument; if ( notificationInterval > 0 ) - script += TQString::tqfromLatin1(":days %1 ").tqarg( notificationInterval ); - script += TQString::tqfromLatin1("text:\n"); + script += TQString::fromLatin1(":days %1 ").tqarg( notificationInterval ); + script += TQString::fromLatin1("text:\n"); script += dotstuff( messageText.isEmpty() ? defaultMessageText() : messageText ); - script += TQString::tqfromLatin1( "\n.\n;\n" ); + script += TQString::fromLatin1( "\n.\n;\n" ); return script; } @@ -573,7 +573,7 @@ namespace KMail { "\n" "Yours sincerely,\n" "-- <enter your name and email address here>\n") - .tqarg( KGlobal::locale()->formatDate( TQDate::tqcurrentDate().addDays( 1 ) ) ); + .tqarg( KGlobal::locale()->formatDate( TQDate::currentDate().addDays( 1 ) ) ); } int Vacation::defaultNotificationInterval() { diff --git a/kmail/warningconfiguration.ui b/kmail/warningconfiguration.ui index c31bdb381..12d1c405f 100644 --- a/kmail/warningconfiguration.ui +++ b/kmail/warningconfiguration.ui @@ -329,7 +329,7 @@ The recommended SPHINX setting is 14 days. <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -348,7 +348,7 @@ The recommended SPHINX setting is 14 days. <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>90</height> @@ -373,7 +373,7 @@ The recommended SPHINX setting is 14 days. <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> diff --git a/kmail/xfaceconfigurator.cpp b/kmail/xfaceconfigurator.cpp index 5b56e2919..afd9f5fe6 100644 --- a/kmail/xfaceconfigurator.cpp +++ b/kmail/xfaceconfigurator.cpp @@ -165,7 +165,7 @@ namespace KMail { "monochrome picture with every message. " "For example, this could be a picture of you or a glyph. " "It is shown in the recipient's mail client (if supported)." ), page ); - label1->tqsetAlignment( TQLabel::WordBreak | TQLabel::AlignVCenter ); + label1->setAlignment( TQLabel::WordBreak | TQLabel::AlignVCenter ); page_vlay->addWidget( label1 ); widgetStack->raiseWidget( 0 ); // since mSourceCombo->currentItem() == 0 @@ -266,7 +266,7 @@ namespace KMail { TQString str = mTextEdit->text(); if ( !str.isEmpty() ) { - if ( str.tqstartsWith("x-face:", false) ) + if ( str.startsWith("x-face:", false) ) { str = str.remove("x-face:", false); mTextEdit->setText(str); diff --git a/kmailcvt/filter_kmail_maildir.cxx b/kmailcvt/filter_kmail_maildir.cxx index e1529b893..df67aaa1d 100644 --- a/kmailcvt/filter_kmail_maildir.cxx +++ b/kmailcvt/filter_kmail_maildir.cxx @@ -115,7 +115,7 @@ void FilterKMail_maildir::importDirContents( FilterInfo *info, const TQString& d /** - * Extract the X-tqStatus flag from a mailfile + * Extract the X-Status flag from a mailfile * @param info Information storage for the operation. * @param fileName The full path to the file to import */ diff --git a/kmailcvt/filter_oe.cxx b/kmailcvt/filter_oe.cxx index bc5d16fdf..3cd84137a 100644 --- a/kmailcvt/filter_oe.cxx +++ b/kmailcvt/filter_oe.cxx @@ -404,7 +404,7 @@ TQString FilterOE::getFolderName(TQString filename) TQString _tmpFileName = tmp[1]; _tmpFileName = _tmpFileName.lower(); if(_tmpFileName == search) { - folder.prepend( tmp[0] + TQString::tqfromLatin1("/") ); + folder.prepend( tmp[0] + TQString::fromLatin1("/") ); search = tmp[3]; foundFilename = true; } @@ -416,7 +416,7 @@ TQString FilterOE::getFolderName(TQString filename) found = true; break; } else { - folder.prepend( tmp[0] + TQString::tqfromLatin1("/") ); + folder.prepend( tmp[0] + TQString::fromLatin1("/") ); search = tmp[3]; } } diff --git a/kmailcvt/filter_opera.cxx b/kmailcvt/filter_opera.cxx index 37e19aa1e..cc5832179 100644 --- a/kmailcvt/filter_opera.cxx +++ b/kmailcvt/filter_opera.cxx @@ -114,7 +114,7 @@ void FilterOpera::import(FilterInfo *info) tmp.file()->writeBlock( input, l ); while ( ! operaArchiv.atEnd() && (l = operaArchiv.readLine(input.data(),MAX_LINE)) && ((seperate = input.data()).left(5) != "From ")) { - /** remove in KMail unneeded Flags from Opera (for example: X-Opera-tqStatus)*/ + /** remove in KMail unneeded Flags from Opera (for example: X-Opera-Status)*/ if(seperate.left(8) != "X-Opera-") tmp.file()->writeBlock( input, l ); } diff --git a/kmailcvt/filters.cxx b/kmailcvt/filters.cxx index 8feae7fd0..47bcc02a8 100644 --- a/kmailcvt/filters.cxx +++ b/kmailcvt/filters.cxx @@ -49,7 +49,7 @@ FilterInfo::~FilterInfo() void FilterInfo::seStatusMsg( const TQString& status ) { - m_dlg->_textqStatus->setText( status ); + m_dlg->_texStatus->setText( status ); } void FilterInfo::setFrom( const TQString& from ) diff --git a/kmailcvt/kimportpagedlg.ui b/kmailcvt/kimportpagedlg.ui index cdb9eaa7b..be68e6225 100644 --- a/kmailcvt/kimportpagedlg.ui +++ b/kmailcvt/kimportpagedlg.ui @@ -28,7 +28,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>170</width> <height>430</height> @@ -60,7 +60,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>10</width> <height>10</height> @@ -109,7 +109,7 @@ </widget> <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>_textqStatus</cstring> + <cstring>_texStatus</cstring> </property> <property name="text"> <string>Importing in progress...</string> diff --git a/kmailcvt/kselfilterpagedlg.ui b/kmailcvt/kselfilterpagedlg.ui index de52967ef..c4406e01f 100644 --- a/kmailcvt/kselfilterpagedlg.ui +++ b/kmailcvt/kselfilterpagedlg.ui @@ -28,7 +28,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>170</width> <height>430</height> @@ -60,7 +60,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>10</width> <height>10</height> diff --git a/kmobile/devices/gnokii/gnokii_mobile.cpp b/kmobile/devices/gnokii/gnokii_mobile.cpp index bd35ddf8b..c4f31579b 100644 --- a/kmobile/devices/gnokii/gnokii_mobile.cpp +++ b/kmobile/devices/gnokii/gnokii_mobile.cpp @@ -282,7 +282,7 @@ static gn_error read_phone_memstat( gn_memory_type memtype, gn_memory_status *me memset(memstat, 0, sizeof(*memstat)); memstat->memory_type = memtype; data.memory_status = memstat; - error = gn_sm_functions(GN_OP_GetMemorytqStatus, &data, &state); + error = gn_sm_functions(GN_OP_GetMemoryStatus, &data, &state); GNOKII_CHECK_ERROR(error); if (error != GN_ERR_NONE) { switch (memtype) { @@ -403,7 +403,7 @@ static gn_error read_phone_entry_highlevel( int index, const gn_memory_type memt // evaluate timestamp (ignore timezone) TQDateTime datetime; if (entry.date.year<1998) - datetime = TQDateTime::tqcurrentDateTime(); + datetime = TQDateTime::currentDateTime(); else datetime = TQDateTime( TQDate(entry.date.year, entry.date.month, entry.date.day), TQTime(entry.date.hour, entry.date.minute, entry.date.second) ); diff --git a/kmobile/devices/gnokii/gnokiiconfigui.ui b/kmobile/devices/gnokii/gnokiiconfigui.ui index d550eb9a2..255b6fb67 100644 --- a/kmobile/devices/gnokii/gnokiiconfigui.ui +++ b/kmobile/devices/gnokii/gnokiiconfigui.ui @@ -66,7 +66,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -140,7 +140,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>140</height> @@ -199,7 +199,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>41</width> <height>0</height> diff --git a/kmobile/kmobile_selectiondialog.ui b/kmobile/kmobile_selectiondialog.ui index 7088a6ff0..621ec83df 100644 --- a/kmobile/kmobile_selectiondialog.ui +++ b/kmobile/kmobile_selectiondialog.ui @@ -86,7 +86,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>181</width> <height>41</height> diff --git a/kmobile/kmobileclient.cpp b/kmobile/kmobileclient.cpp index 5a3ab8a6a..901aaf094 100644 --- a/kmobile/kmobileclient.cpp +++ b/kmobile/kmobileclient.cpp @@ -126,7 +126,7 @@ TQStringList KMobileClient::tqdeviceNames() { if (!isKMobileAvailable()) return TQStringList(); - RETURN_TYPE( "tqdeviceNames()", TQString::tqfromLatin1(""), TQStringList ); + RETURN_TYPE( "tqdeviceNames()", TQString::fromLatin1(""), TQStringList ); } void KMobileClient::removeDevice( TQString tqdeviceName ) diff --git a/kmobile/kmobiledevice.h b/kmobile/kmobiledevice.h index 88a4bc10f..94b73b77e 100644 --- a/kmobile/kmobiledevice.h +++ b/kmobile/kmobiledevice.h @@ -352,10 +352,10 @@ signals: * KIO::AuthInfo authInfo; * if ( openPassDlg( authInfo ) ) * { - * kdDebug() << TQString::tqfromLatin1("User: ") + * kdDebug() << TQString::fromLatin1("User: ") * << authInfo.username << endl; - * kdDebug() << TQString::tqfromLatin1("Password: ") - * << TQString::tqfromLatin1("Not displayed here!") << endl; + * kdDebug() << TQString::fromLatin1("Password: ") + * << TQString::fromLatin1("Not displayed here!") << endl; * } * </pre> * @@ -369,10 +369,10 @@ signals: * TQString errorMsg = "You entered an incorrect password."; * if ( openPassDlg( authInfo, errorMsg ) ) * { - * kdDebug() << TQString::tqfromLatin1("User: ") + * kdDebug() << TQString::fromLatin1("User: ") * << authInfo.username << endl; - * kdDebug() << TQString::tqfromLatin1("Password: ") - * << TQString::tqfromLatin1("Not displayed here!") << endl; + * kdDebug() << TQString::fromLatin1("Password: ") + * << TQString::fromLatin1("Not displayed here!") << endl; * } * </pre> * diff --git a/knode/articlewidget.cpp b/knode/articlewidget.cpp index 9e74cbb6d..272df8363 100644 --- a/knode/articlewidget.cpp +++ b/knode/articlewidget.cpp @@ -635,7 +635,7 @@ void ArticleWidget::displayHeader() TQString xface = ""; if ( !xfhead.isEmpty() ) { KPIM::KXFace xf; - xface = TQString::tqfromLatin1( "<div class=\"senderpic\"><img src=\"%1\" width=\"48\" height=\"48\"/></div>" ) + xface = TQString::fromLatin1( "<div class=\"senderpic\"><img src=\"%1\" width=\"48\" height=\"48\"/></div>" ) .tqarg( imgToDataUrl( xf.toImage( xfhead ), "PNG" ) ); } @@ -663,7 +663,7 @@ void ArticleWidget::displayHeader() html += TQString( "<b>%1</b>" ).tqarg( i18n("References:") ); while ( i <= refCnt ) { - html += " <a href=\"news:" + TQString::tqfromLatin1( id ) + "\">" + TQString::number( i ) + "</a>"; + html += " <a href=\"news:" + TQString::fromLatin1( id ) + "\">" + TQString::number( i ) + "</a>"; id = refs->next(); id = id.mid( 1, id.length() - 2 ); // remove <> i++; @@ -915,7 +915,7 @@ TQString ArticleWidget::imgToDataUrl( const TQImage &image, const char* fmt ) TQBuffer buffer( ba ); buffer.open( IO_WriteOnly ); image.save( &buffer, fmt ); - return TQString::tqfromLatin1("data:image/%1;base64,%2") + return TQString::fromLatin1("data:image/%1;base64,%2") .tqarg( fmt, TQString(KCodecs::base64Encode( ba )) ); } @@ -1416,7 +1416,7 @@ void ArticleWidget::slotAddBookmark() { if ( mCurrentURL.isEmpty() ) return; - TQString filename = locateLocal( "data", TQString::tqfromLatin1("konqueror/bookmarks.xml") ); + TQString filename = locateLocal( "data", TQString::fromLatin1("konqueror/bookmarks.xml") ); KBookmarkManager *bookManager = KBookmarkManager::managerForFile( filename, false ); KBookmarkGroup group = bookManager->root(); group.addBookmark( bookManager, mCurrentURL.url(), mCurrentURL ); diff --git a/knode/headerview.cpp b/knode/headerview.cpp index 78b46a4cf..c3fa53073 100644 --- a/knode/headerview.cpp +++ b/knode/headerview.cpp @@ -601,14 +601,14 @@ void KNHeaderViewToolTip::maybeTip( const TQPoint &p ) if ( !item->showToolTip( column ) ) return; - const TQRect tqitemRect = listView->tqitemRect( item ); - if ( !tqitemRect.isValid() ) + const TQRect itemRect = listView->itemRect( item ); + if ( !itemRect.isValid() ) return; const TQRect headerRect = listView->header()->sectionRect( column ); if ( !headerRect.isValid() ) return; - tip( TQRect( headerRect.left(), tqitemRect.top(), headerRect.width(), tqitemRect.height() ), + tip( TQRect( headerRect.left(), itemRect.top(), headerRect.width(), itemRect.height() ), TQStyleSheet::escape( item->text( column ) ) ); } diff --git a/knode/knaccountmanager.cpp b/knode/knaccountmanager.cpp index 627ff4cdd..e8d1ef380 100644 --- a/knode/knaccountmanager.cpp +++ b/knode/knaccountmanager.cpp @@ -223,7 +223,7 @@ void KNAccountManager::loadPasswordsAsync() if ( !mWallet && !mWalletOpenFailed ) { if ( knGlobals.top ) mWallet = Wallet::openWallet( Wallet::NetworkWallet(), - knGlobals.topWidget->tqtopLevelWidget()->winId(), + knGlobals.topWidget->topLevelWidget()->winId(), Wallet::Asynchronous ); else mWallet = Wallet::openWallet( Wallet::NetworkWallet(), 0, Wallet::Asynchronous ); @@ -263,7 +263,7 @@ KWallet::Wallet* KNAccountManager::wallet() delete mWallet; if ( knGlobals.top ) mWallet = Wallet::openWallet( Wallet::NetworkWallet(), - knGlobals.topWidget->tqtopLevelWidget()->winId() ); + knGlobals.topWidget->topLevelWidget()->winId() ); else mWallet = Wallet::openWallet( Wallet::NetworkWallet() ); diff --git a/knode/knarticlefactory.cpp b/knode/knarticlefactory.cpp index d82bb5c74..3a2a414e2 100644 --- a/knode/knarticlefactory.cpp +++ b/knode/knarticlefactory.cpp @@ -209,9 +209,9 @@ void KNArticleFactory::createReply(KNRemoteArticle *a, TQString selectedText, bo TQString attribution=knGlobals.configManager()->postNewsComposer()->intro(); TQString name(a->from()->name()); if (name.isEmpty()) - name = TQString::tqfromLatin1(a->from()->email()); + name = TQString::fromLatin1(a->from()->email()); attribution.replace(TQRegExp("%NAME"),name); - attribution.replace(TQRegExp("%EMAIL"),TQString::tqfromLatin1(a->from()->email())); + attribution.replace(TQRegExp("%EMAIL"),TQString::fromLatin1(a->from()->email())); attribution.replace(TQRegExp("%DATE"),KGlobal::locale()->formatDateTime(a->date()->qdt(),false)); attribution.replace(TQRegExp("%MSID"),a->messageID()->asUnicodeString()); attribution.replace(TQRegExp("%GROUP"),g->groupname()); @@ -419,7 +419,7 @@ void KNArticleFactory::createCancel(KNArticle *a) art->lines()->setNumberOfLines(1); //body - art->fromUnicodeString(TQString::tqfromLatin1("cancel by original author\n")); + art->fromUnicodeString(TQString::fromLatin1("cancel by original author\n")); //assemble art->assemble(); @@ -875,9 +875,9 @@ KNLocalArticle* KNArticleFactory::newArticle(KNCollection *col, TQString &sig, T if(origPost) { TQString name(origPost->from()->name()); if (name.isEmpty()) - name = TQString::tqfromLatin1(origPost->from()->email()); + name = TQString::fromLatin1(origPost->from()->email()); value.replace(TQRegExp("%NAME"), name); - value.replace(TQRegExp("%EMAIL"), TQString::tqfromLatin1(origPost->from()->email())); + value.replace(TQRegExp("%EMAIL"), TQString::fromLatin1(origPost->from()->email())); } else if(value.find("%NAME") != -1 || value.find("%EMAIL") != -1) diff --git a/knode/knarticlefilter.cpp b/knode/knarticlefilter.cpp index 359985198..8a7236c4e 100644 --- a/knode/knarticlefilter.cpp +++ b/knode/knarticlefilter.cpp @@ -324,7 +324,7 @@ void KNArticleFilter::setTranslatedName(const TQString &s) bool retranslated = false; for (const char **c=defFil;(*c)!=0;c++) // ok, try if it matches any of the standard filter names if (s==i18n("default filter name",*c)) { - n_ame = TQString::tqfromLatin1(*c); + n_ame = TQString::fromLatin1(*c); retranslated = true; break; } diff --git a/knode/kncomposer.cpp b/knode/kncomposer.cpp index de354ef76..d21f9b7fe 100644 --- a/knode/kncomposer.cpp +++ b/knode/kncomposer.cpp @@ -432,7 +432,7 @@ int KNComposer::listOfResultOfCheckWord( const TQStringList & lst , const TQStri void KNComposer::slotUndo() { - TQWidget* fw = tqfocusWidget(); + TQWidget* fw = focusWidget(); if (!fw) return; if (fw->inherits("KEdit")) @@ -443,7 +443,7 @@ void KNComposer::slotUndo() void KNComposer::slotRedo() { - TQWidget* fw = tqfocusWidget(); + TQWidget* fw = focusWidget(); if (!fw) return; if (fw->inherits("KEdit")) @@ -454,7 +454,7 @@ void KNComposer::slotRedo() void KNComposer::slotCut() { - TQWidget* fw = tqfocusWidget(); + TQWidget* fw = focusWidget(); if (!fw) return; if (fw->inherits("KEdit")) @@ -466,7 +466,7 @@ void KNComposer::slotCut() void KNComposer::slotCopy() { - TQWidget* fw = tqfocusWidget(); + TQWidget* fw = focusWidget(); if (!fw) return; if (fw->inherits("KEdit")) @@ -480,7 +480,7 @@ void KNComposer::slotCopy() void KNComposer::slotPaste() { - TQWidget* fw = tqfocusWidget(); + TQWidget* fw = focusWidget(); if (!fw) return; if (fw->inherits("KEdit")) @@ -492,7 +492,7 @@ void KNComposer::slotPaste() void KNComposer::slotSelectAll() { - TQWidget* fw = tqfocusWidget(); + TQWidget* fw = focusWidget(); if (!fw) return; if (fw->inherits(TQLINEEDIT_OBJECT_NAME_STRING)) @@ -969,7 +969,7 @@ void KNComposer::insertFile(TQFile *file, bool clear, bool box, TQString boxTitl ts.setCodec(codec); if (box) - temp = TQString::tqfromLatin1(",----[ %1 ]\n").tqarg(boxTitle); + temp = TQString::fromLatin1(",----[ %1 ]\n").tqarg(boxTitle); if (box && (v_iew->e_dit->wordWrap()!=TQMultiLineEdit::NoWrap)) { int wrapAt = v_iew->e_dit->wrapColumnOrWidth(); @@ -993,7 +993,7 @@ void KNComposer::insertFile(TQFile *file, bool clear, bool box, TQString boxTitl } if (box) - temp += TQString::tqfromLatin1("`----"); + temp += TQString::fromLatin1("`----"); if(clear) v_iew->e_dit->setText(temp); @@ -1447,7 +1447,7 @@ void KNComposer::slotGroupsChanged(const TQString &t) split.init(t.latin1(), ","); splitOk=split.first(); while(splitOk) { - v_iew->f_up2->insertItem(TQString::tqfromLatin1(split.string())); + v_iew->f_up2->insertItem(TQString::fromLatin1(split.string())); splitOk=split.next(); } v_iew->f_up2->insertItem(""); @@ -1998,7 +1998,7 @@ KNComposer::Editor::Editor(KNComposer::ComposerView *_composerView, KNComposer * spell = 0L; installEventFilter(this); KCursor::setAutoHideCursor( this, true, true ); - m_bound = TQRegExp( TQString::tqfromLatin1("[\\s\\W]") ); + m_bound = TQRegExp( TQString::fromLatin1("[\\s\\W]") ); } @@ -2233,7 +2233,7 @@ void KNComposer::Editor::slotAddBox() } else { int l = currentLine(); int c = currentColumn(); - TQString s = TQString::tqfromLatin1(",----[ ]\n| %1\n`----").tqarg(textLine(l)); + TQString s = TQString::fromLatin1(",----[ ]\n| %1\n`----").tqarg(textLine(l)); insertLine(s,l); removeLine(l+3); setCursorPosition(l+1,c+2); @@ -2244,7 +2244,7 @@ void KNComposer::Editor::slotAddBox() void KNComposer::Editor::slotRemoveBox() { if (hasMarkedText()) { - TQString s = TQString::tqfromLatin1("\n") + markedText() + TQString::tqfromLatin1("\n"); + TQString s = TQString::fromLatin1("\n") + markedText() + TQString::fromLatin1("\n"); s.replace(TQRegExp("\n,----[^\n]*\n"),"\n"); s.replace(TQRegExp("\n| "),"\n"); s.replace(TQRegExp("\n`----[^\n]*\n"),"\n"); @@ -2604,7 +2604,7 @@ KNComposer::AttachmentPropertiesDlg::AttachmentPropertiesDlg(KNAttachment *a, TQ this, TQT_SLOT(slotMimeTypeTextChanged(const TQString&))); //finish GUI - setFixedHeight(tqsizeHint().height()); + setFixedHeight(sizeHint().height()); KNHelper::restoreWindowSize("attProperties", this, TQSize(300,250)); setHelp("anc-knode-editor-advanced"); } diff --git a/knode/knconfig.cpp b/knode/knconfig.cpp index 98caed2bb..bde9fd42b 100644 --- a/knode/knconfig.cpp +++ b/knode/knconfig.cpp @@ -942,11 +942,11 @@ void KNConfig::PostNewsTechnical::save() conf->setGroup("POSTNEWS"); conf->writeEntry("ComposerCharsets", c_omposerCharsets); - conf->writeEntry("Charset", TQString::tqfromLatin1(c_harset)); + conf->writeEntry("Charset", TQString::fromLatin1(c_harset)); conf->writeEntry("8BitEncoding", a_llow8BitBody); conf->writeEntry("UseOwnCharset", u_seOwnCharset); conf->writeEntry("generateMId", g_enerateMID); - conf->writeEntry("MIdhost", TQString::tqfromLatin1(h_ostname)); + conf->writeEntry("MIdhost", TQString::fromLatin1(h_ostname)); conf->writeEntry("dontIncludeUA", d_ontIncludeUA); conf->writeEntry("useExternalMailer", u_seExternalMailer); @@ -1100,7 +1100,7 @@ KNConfig::Cleanup::Cleanup( bool global ) : // default values for new accounts / groups d_oExpire( true ), r_emoveUnavailable( true ), p_reserveThr( true ), e_xpireInterval( 5 ), r_eadMaxAge( 10 ), u_nreadMaxAge( 15 ), - mGlobal(global), mDefault(!global), mLastExpDate( TQDate::tqcurrentDate() ) + mGlobal(global), mDefault(!global), mLastExpDate( TQDate::currentDate() ) { if (mGlobal) { KConfig *conf = knGlobals.config(); @@ -1174,7 +1174,7 @@ bool KNConfig::Cleanup::expireToday() if (!d_oExpire) return false; - TQDate today = TQDate::tqcurrentDate(); + TQDate today = TQDate::currentDate(); if (mLastExpDate == TQDateTime(today)) return false; @@ -1184,7 +1184,7 @@ bool KNConfig::Cleanup::expireToday() void KNConfig::Cleanup::setLastExpireDate() { - mLastExpDate = TQDateTime::tqcurrentDateTime(); + mLastExpDate = TQDateTime::currentDateTime(); } @@ -1193,7 +1193,7 @@ bool KNConfig::Cleanup::compactToday() if (!d_oCompact) return false; - TQDate today = TQDate::tqcurrentDate(); + TQDate today = TQDate::currentDate(); if (mLastCompDate == TQDateTime(today)) return false; @@ -1203,7 +1203,7 @@ bool KNConfig::Cleanup::compactToday() void KNConfig::Cleanup::setLastCompactDate() { - mLastCompDate = TQDateTime::tqcurrentDateTime(); + mLastCompDate = TQDateTime::currentDateTime(); } diff --git a/knode/knconfig.h b/knode/knconfig.h index f2fd7d114..0f0f868cc 100644 --- a/knode/knconfig.h +++ b/knode/knconfig.h @@ -391,7 +391,7 @@ class KDE_EXPORT XHeader { TQCString name() { return n_ame; } TQString value() { return v_alue; } - TQString header() { return (TQString::tqfromLatin1(("X-"+n_ame+": "))+v_alue); } + TQString header() { return (TQString::fromLatin1(("X-"+n_ame+": "))+v_alue); } protected: TQCString n_ame; diff --git a/knode/knconfigwidgets.cpp b/knode/knconfigwidgets.cpp index 0860ee05e..99f25d783 100644 --- a/knode/knconfigwidgets.cpp +++ b/knode/knconfigwidgets.cpp @@ -561,7 +561,7 @@ KNConfig::NntpAccountConfDialog::NntpAccountConfDialog(KNNntpAccount *a, TQWidge connect( knGlobals.accountManager(), TQT_SIGNAL(passwordsChanged()), TQT_SLOT(slotPasswordChanged()) ); - KNHelper::restoreWindowSize("accNewsPropDLG", this, tqsizeHint()); + KNHelper::restoreWindowSize("accNewsPropDLG", this, sizeHint()); setHelp("anc-setting-the-news-account"); } @@ -1548,8 +1548,8 @@ KNConfig::DisplayedHeaderConfDialog::DisplayedHeaderConfDialog(KNDisplayedHeader v_alueCB[i]->setChecked(h->flag(i+4)); } - setFixedHeight(tqsizeHint().height()); - KNHelper::restoreWindowSize("accReadHdrPropDLG", this, tqsizeHint()); + setFixedHeight(sizeHint().height()); + KNHelper::restoreWindowSize("accReadHdrPropDLG", this, sizeHint()); connect(n_ameE, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotNameChanged(const TQString&))); @@ -2138,8 +2138,8 @@ KNConfig::XHeaderConfDialog::XHeaderConfDialog(const TQString &h, TQWidget *p, c v_alue->setText(h.mid(pos, h.length()-pos)); } - setFixedHeight(tqsizeHint().height()); - KNHelper::restoreWindowSize("XHeaderDlg", this, tqsizeHint()); + setFixedHeight(sizeHint().height()); + KNHelper::restoreWindowSize("XHeaderDlg", this, sizeHint()); n_ame->setFocus(); } diff --git a/knode/knconvert.cpp b/knode/knconvert.cpp index 70d447034..2db7b6f30 100644 --- a/knode/knconvert.cpp +++ b/knode/knconvert.cpp @@ -96,7 +96,7 @@ will be created before the conversion starts.").tqarg(KNODE_VERSION), w_1); w_2=new TQLabel(s_tack); w_2->setText(i18n("<b>Converting, please wait...</b>")); - w_2->tqsetAlignment(AlignCenter); + w_2->setAlignment(AlignCenter); s_tack->addWidget(w_2, 2); w_3=new TQWidget(s_tack); diff --git a/knode/kndisplayedheader.cpp b/knode/kndisplayedheader.cpp index 1f6952f46..65b165222 100644 --- a/knode/kndisplayedheader.cpp +++ b/knode/kndisplayedheader.cpp @@ -107,7 +107,7 @@ void KNDisplayedHeader::setTranslatedName(const TQString &s) bool retranslated = false; for (const char **c=predef;(*c)!=0;c++) { // ok, first the standard header names if (s==i18n("collection of article headers",*c)) { - n_ame = TQString::tqfromLatin1(*c); + n_ame = TQString::fromLatin1(*c); retranslated = true; break; } @@ -116,7 +116,7 @@ void KNDisplayedHeader::setTranslatedName(const TQString &s) if (!retranslated) { for (const char **c=disp;(*c)!=0;c++) // now our standard display names if (s==i18n("collection of article headers",*c)) { - n_ame = TQString::tqfromLatin1(*c); + n_ame = TQString::fromLatin1(*c); retranslated = true; break; } diff --git a/knode/knfilterdialog.cpp b/knode/knfilterdialog.cpp index ea05a21cc..729ec495c 100644 --- a/knode/knfilterdialog.cpp +++ b/knode/knfilterdialog.cpp @@ -74,8 +74,8 @@ KNFilterDialog::KNFilterDialog(KNArticleFilter *f, TQWidget *parent, const char fw->messageId->setFilter(f->messageId); fw->references->setFilter(f->references); - setFixedHeight(tqsizeHint().height()); - KNHelper::restoreWindowSize("filterDLG", this, tqsizeHint()); + setFixedHeight(sizeHint().height()); + KNHelper::restoreWindowSize("filterDLG", this, sizeHint()); setHelp("anc-using-filters"); connect( fname, TQT_SIGNAL( textChanged ( const TQString & )), this, TQT_SLOT( slotTextChanged( const TQString & ))); diff --git a/knode/kngroup.cpp b/knode/kngroup.cpp index df40915f2..c0ba082b5 100644 --- a/knode/kngroup.cpp +++ b/knode/kngroup.cpp @@ -133,7 +133,7 @@ void KNGroup::saveInfo() info.writeEntry("dynDataFormat", d_ynDataFormat); info.writeEntry("name", n_ame); info.writeEntry("useCharset", u_seCharset); - info.writeEntry("defaultChSet", TQString::tqfromLatin1(d_efaultChSet)); + info.writeEntry("defaultChSet", TQString::fromLatin1(d_efaultChSet)); switch (s_tatus) { case unknown: info.writeEntry("status","unknown"); break; diff --git a/knode/kngroup.h b/knode/kngroup.h index 387ff0f6e..76a9d0dd1 100644 --- a/knode/kngroup.h +++ b/knode/kngroup.h @@ -35,7 +35,7 @@ namespace KNConfig { class KNGroup : public KNArticleCollection , public KNJobItem { public: - enum tqStatus { unknown=0, readOnly=1, postingAllowed=2, moderated=3 }; + enum Status { unknown=0, readOnly=1, postingAllowed=2, moderated=3 }; KNGroup(KNCollection *p=0); ~KNGroup(); @@ -123,8 +123,8 @@ class KNGroup : public KNArticleCollection , public KNJobItem { KNNntpAccount* account(); KNConfig::Identity* identity()const { return i_dentity; } void setIdentity(KNConfig::Identity *i) { i_dentity=i; } - tqStatus status()const { return s_tatus; } - void setqStatus(tqStatus s) { s_tatus=s; } + Status status()const { return s_tatus; } + void seStatus(Status s) { s_tatus=s; } void showProperties(); // cleanup configuration @@ -153,7 +153,7 @@ class KNGroup : public KNArticleCollection , public KNJobItem { bool l_ocked, u_seCharset; - tqStatus s_tatus; + Status s_tatus; TQStringList c_rosspostIDBuffer; diff --git a/knode/kngroupdialog.cpp b/knode/kngroupdialog.cpp index 0050e96a5..6807979b9 100644 --- a/knode/kngroupdialog.cpp +++ b/knode/kngroupdialog.cpp @@ -300,7 +300,7 @@ void KNGroupDialog::slotUser2() topL->addMultiCellWidget(takeCustom, 2, 2, 0, 1); KDatePicker *dateSel = new KDatePicker(btnGrp, lastDate); - dateSel->setMinimumSize(dateSel->tqsizeHint()); + dateSel->setMinimumSize(dateSel->sizeHint()); topL->addWidget(dateSel, 3, 1, TQt::AlignLeft); connect(takeCustom, TQT_SIGNAL(toggled(bool)), dateSel, TQT_SLOT(setEnabled(bool))); @@ -314,7 +314,7 @@ void KNGroupDialog::slotUser2() if (dlg->exec()) { if (takeCustom->isChecked()) lastDate = dateSel->date(); - a_ccount->setLastNewFetch(TQDate::tqcurrentDate()); + a_ccount->setLastNewFetch(TQDate::currentDate()); leftLabel->setText(i18n("Checking for new groups...")); enableButton(User1,false); enableButton(User2,false); diff --git a/knode/kngroupmanager.cpp b/knode/kngroupmanager.cpp index dd8b05961..ea24f7930 100644 --- a/knode/kngroupmanager.cpp +++ b/knode/kngroupmanager.cpp @@ -51,7 +51,7 @@ KNGroupInfo::KNGroupInfo() } -KNGroupInfo::KNGroupInfo(const TQString &n_ame, const TQString &d_escription, bool n_ewGroup, bool s_ubscribed, KNGroup::tqStatus s_tatus) +KNGroupInfo::KNGroupInfo(const TQString &n_ame, const TQString &d_escription, bool n_ewGroup, bool s_ubscribed, KNGroup::Status s_tatus) : name(n_ame), description(d_escription), newGroup(n_ewGroup), subscribed(s_ubscribed), status(s_tatus) { @@ -101,7 +101,7 @@ bool KNGroupListData::readIn(KNProtocolClient *client) int sepPos1,sepPos2; TQString name,description; bool sub; - KNGroup::tqStatus status=KNGroup::unknown; + KNGroup::Status status=KNGroup::unknown; TQTime timer; uint size=f.size()+2; @@ -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->setqStatus(gi->status); + grp->seStatus(gi->status); grp->saveInfo(); mGroupList.append( grp ); emit groupAdded(grp); @@ -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)->setqStatus( inf->status ); + (*it)->seStatus( inf->status ); break; } } diff --git a/knode/kngroupmanager.h b/knode/kngroupmanager.h index 8b34979d6..c6ccc92fb 100644 --- a/knode/kngroupmanager.h +++ b/knode/kngroupmanager.h @@ -38,13 +38,13 @@ class KNGroupInfo { public: KNGroupInfo(); - KNGroupInfo(const TQString &n_ame, const TQString &d_escription, bool n_ewGroup=false, bool s_ubscribed=false, KNGroup::tqStatus s_tatus=KNGroup::unknown ); + KNGroupInfo(const TQString &n_ame, const TQString &d_escription, bool n_ewGroup=false, bool s_ubscribed=false, KNGroup::Status s_tatus=KNGroup::unknown ); ~KNGroupInfo(); /** group names will be utf-8 encoded in the future... */ TQString name,description; bool newGroup, subscribed; - KNGroup::tqStatus status; + KNGroup::Status status; bool operator== (const KNGroupInfo &gi2); bool operator< (const KNGroupInfo &gi2); diff --git a/knode/kngrouppropdlg.cpp b/knode/kngrouppropdlg.cpp index c0a107afd..a49e03a9e 100644 --- a/knode/kngrouppropdlg.cpp +++ b/knode/kngrouppropdlg.cpp @@ -152,7 +152,7 @@ KNGroupPropDlg::KNGroupPropDlg(KNGroup *group, TQWidget *parent, const char *nam cleanupLayout->addWidget( mCleanupWidget ); cleanupLayout->addStretch( 1 ); - KNHelper::restoreWindowSize("groupPropDLG", this, tqsizeHint()); + KNHelper::restoreWindowSize("groupPropDLG", this, sizeHint()); } diff --git a/knode/knjobdata.cpp b/knode/knjobdata.cpp index a5cdac894..81c2595ea 100644 --- a/knode/knjobdata.cpp +++ b/knode/knjobdata.cpp @@ -95,7 +95,7 @@ void KNJobData::cancel() mJob = 0; } if ( mProgressItem ) { - mProgressItem->setqStatus( "Canceled" ); + mProgressItem->seStatus( "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; - setqStatus( msg ); + seStatus( msg ); } diff --git a/knode/knjobdata.h b/knode/knjobdata.h index ade7b7f35..7f14dc7b9 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 setqStatus( const TQString &msg ) { if ( mProgressItem ) mProgressItem->setqStatus( msg ); } + void seStatus( const TQString &msg ) { if ( mProgressItem ) mProgressItem->seStatus( 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 4294f7a51..57e6f0bec 100644 --- a/knode/knmainwidget.cpp +++ b/knode/knmainwidget.cpp @@ -305,19 +305,19 @@ KNMainWidget::~KNMainWidget() void KNMainWidget::iniStatusBar() { //statusbar - KMainWindow *mainWin = dynamic_cast<KMainWindow*>(tqtopLevelWidget()); + KMainWindow *mainWin = dynamic_cast<KMainWindow*>(topLevelWidget()); KStatusBar *sb = mainWin ? mainWin->statusBar() : 0; s_tatusFilter = new KRSqueezedTextLabel( TQString(), sb ); - s_tatusFilter->tqsetAlignment( AlignLeft | AlignVCenter ); + s_tatusFilter->setAlignment( AlignLeft | AlignVCenter ); s_tatusGroup = new KRSqueezedTextLabel( TQString(), sb ); - s_tatusGroup->tqsetAlignment( AlignLeft | AlignVCenter ); + s_tatusGroup->setAlignment( AlignLeft | AlignVCenter ); } //================================== GUI ================================= void KNMainWidget::seStatusMsg(const TQString& text, int id) { - KMainWindow *mainWin = dynamic_cast<KMainWindow*>(tqtopLevelWidget()); + KMainWindow *mainWin = dynamic_cast<KMainWindow*>(topLevelWidget()); KStatusBar *bar = mainWin ? mainWin->statusBar() : 0; if ( !bar ) return; @@ -342,7 +342,7 @@ void KNMainWidget::seStatusMsg(const TQString& text, int id) void KNMainWidget::seStatusHelpMsg(const TQString& text) { - KMainWindow *mainWin = dynamic_cast<KMainWindow*>(tqtopLevelWidget()); + KMainWindow *mainWin = dynamic_cast<KMainWindow*>(topLevelWidget()); KStatusBar *bar = mainWin ? mainWin->statusBar() : 0; if ( bar ) bar->message(text, 2000); @@ -375,7 +375,7 @@ void KNMainWidget::setCursorBusy(bool b) void KNMainWidget::blockUI(bool b) { b_lockui = b; - KMainWindow *mainWin = dynamic_cast<KMainWindow*>(tqtopLevelWidget()); + KMainWindow *mainWin = dynamic_cast<KMainWindow*>(topLevelWidget()); KMenuBar *mbar = mainWin ? mainWin->menuBar() : 0; if ( mbar ) mbar->setEnabled(!b); @@ -394,7 +394,7 @@ void KNMainWidget::blockUI(bool b) void KNMainWidget::disableAccels(bool b) { a_ccel->setEnabled(!b); - KMainWindow *mainWin = dynamic_cast<KMainWindow*>(tqtopLevelWidget()); + KMainWindow *mainWin = dynamic_cast<KMainWindow*>(topLevelWidget()); KAccel *naccel = mainWin ? mainWin->accel() : 0; if ( naccel ) naccel->setEnabled(!b); @@ -409,7 +409,7 @@ void KNMainWidget::disableAccels(bool b) void KNMainWidget::secureProcessEvents() { b_lockui = true; - KMainWindow *mainWin = dynamic_cast<KMainWindow*>(tqtopLevelWidget()); + KMainWindow *mainWin = dynamic_cast<KMainWindow*>(topLevelWidget()); KMenuBar *mbar = mainWin ? mainWin->menuBar() : 0; if ( mbar ) mbar->setEnabled(false); @@ -431,7 +431,7 @@ void KNMainWidget::secureProcessEvents() } -TQSize KNMainWidget::tqsizeHint() const +TQSize KNMainWidget::sizeHint() const { return TQSize(759,478); // default optimized for 800x600 } @@ -903,7 +903,7 @@ bool KNMainWidget::queryClose() void KNMainWidget::showEvent(TQShowEvent *) { - slotCheckDockWidgetqStatus(); + slotCheckDockWidgeStatus(); } @@ -1301,7 +1301,7 @@ void KNMainWidget::slotNetworkActive(bool b) } -void KNMainWidget::slotCheckDockWidgetqStatus() +void KNMainWidget::slotCheckDockWidgeStatus() { a_ctToggleGroupView->setChecked(c_olDock->isVisible()); a_ctToggleArticleViewer->setChecked(a_rtDock->isVisible()); @@ -1966,7 +1966,7 @@ void KNMainWidget::slotFetchArticleWithID() void KNMainWidget::slotToggleGroupView() { c_olDock->changeHideShowState(); - slotCheckDockWidgetqStatus(); + slotCheckDockWidgeStatus(); } @@ -1977,19 +1977,19 @@ void KNMainWidget::slotToggleHeaderView() if ( !h_drDock->isDockBackPossible() ) { h_drDock->manualDock( a_rtDock, KDockWidget::DockTop ); h_drDock->makeDockVisible(); - slotCheckDockWidgetqStatus(); + slotCheckDockWidgeStatus(); return; } h_drDock->changeHideShowState(); - slotCheckDockWidgetqStatus(); + slotCheckDockWidgeStatus(); } void KNMainWidget::slotToggleArticleViewer() { a_rtDock->changeHideShowState(); - slotCheckDockWidgetqStatus(); + slotCheckDockWidgeStatus(); } void KNMainWidget::slotToggleQuickSearch() diff --git a/knode/knmainwidget.h b/knode/knmainwidget.h index c00c69982..6a6e8ed1a 100644 --- a/knode/knmainwidget.h +++ b/knode/knmainwidget.h @@ -83,7 +83,7 @@ public: void secureProcessEvents(); /** useful default value */ - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; /** handle URL given as command-line argument */ void openURL(const KURL &url); @@ -230,7 +230,7 @@ protected slots: void slotNetworkActive(bool b); //dock widget slots - void slotCheckDockWidgetqStatus(); + void slotCheckDockWidgeStatus(); void slotGroupDockHidden(); void slotHeaderDockHidden(); void slotArticleDockHidden(); diff --git a/knode/knnetaccess.cpp b/knode/knnetaccess.cpp index ec2c86632..1b67d62ea 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->setqStatus( i18n( "Waiting for KWallet..." ) ); + job->seStatus( i18n( "Waiting for KWallet..." ) ); return; } @@ -142,7 +142,7 @@ void KNNetAccess::addJob(KNJobData *job) startJobNntp(); } } - updatetqStatus(); + updateStatus(); } @@ -178,7 +178,7 @@ void KNNetAccess::stopJobsNntp( int type ) } else ++it; } - updatetqStatus(); + updateStatus(); } @@ -207,7 +207,7 @@ void KNNetAccess::stopJobsSmtp( int type ) } else ++it; } - updatetqStatus(); + updateStatus(); } @@ -340,7 +340,7 @@ void KNNetAccess::threadDoneNntp() if (!nntpJobQueue.isEmpty()) startJobNntp(); - updatetqStatus(); + updateStatus(); } @@ -368,7 +368,7 @@ void KNNetAccess::threadDoneSmtp() if (!smtpJobQueue.isEmpty()) startJobSmtp(); - updatetqStatus(); + updateStatus(); } @@ -399,52 +399,52 @@ void KNNetAccess::slotThreadSignal(int i) case KNProtocolClient::TSconnect: currMsg = i18n(" Connecting to server..."); knGlobals.seStatusMsg(currMsg); - currentNntpJob->setqStatus(currMsg); + currentNntpJob->seStatus(currMsg); break; case KNProtocolClient::TSloadGrouplist: currMsg = i18n(" Loading group list from disk..."); knGlobals.seStatusMsg(currMsg); - currentNntpJob->setqStatus(currMsg); + currentNntpJob->seStatus(currMsg); break; case KNProtocolClient::TSwriteGrouplist: currMsg = i18n(" Writing group list to disk..."); knGlobals.seStatusMsg(currMsg); - currentNntpJob->setqStatus(currMsg); + currentNntpJob->seStatus(currMsg); break; case KNProtocolClient::TSdownloadGrouplist: currMsg = i18n(" Downloading group list..."); knGlobals.seStatusMsg(currMsg); - currentNntpJob->setqStatus(currMsg); + currentNntpJob->seStatus(currMsg); break; case KNProtocolClient::TSdownloadNewGroups: currMsg = i18n(" Looking for new groups..."); knGlobals.seStatusMsg(currMsg); - currentNntpJob->setqStatus(currMsg); + currentNntpJob->seStatus(currMsg); break; case KNProtocolClient::TSdownloadDesc: currMsg = i18n(" Downloading group descriptions..."); knGlobals.seStatusMsg(currMsg); - currentNntpJob->setqStatus(currMsg); + currentNntpJob->seStatus(currMsg); break; case KNProtocolClient::TSdownloadNew: currMsg = i18n(" Downloading new headers..."); knGlobals.seStatusMsg(currMsg); - currentNntpJob->setqStatus(currMsg); + currentNntpJob->seStatus(currMsg); break; case KNProtocolClient::TSsortNew: currMsg = i18n(" Sorting..."); knGlobals.seStatusMsg(currMsg); - currentNntpJob->setqStatus(currMsg); + currentNntpJob->seStatus(currMsg); break; case KNProtocolClient::TSdownloadArticle: currMsg = i18n(" Downloading article..."); knGlobals.seStatusMsg(currMsg); - currentNntpJob->setqStatus(currMsg); + currentNntpJob->seStatus(currMsg); break; case KNProtocolClient::TSsendArticle: currMsg = i18n(" Sending article..."); knGlobals.seStatusMsg(currMsg); - currentNntpJob->setqStatus(currMsg); + currentNntpJob->seStatus(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)->setqStatus( i18n("Waiting...") ); + (*it)->seStatus( i18n("Waiting...") ); if ( (*it)->type() == KNJobData::JTmail ) smtpJobQueue.append( (*it) ); else @@ -528,10 +528,10 @@ void KNNetAccess::slotCancelJob( KPIM::ProgressItem *item ) if ( currentSmtpJob && currentSmtpJob->progressItem() == item ) cancelCurrentSmtpJob(); - updatetqStatus(); + updateStatus(); } -void KNNetAccess::updatetqStatus( ) +void KNNetAccess::updateStatus( ) { if ( nntpJobQueue.isEmpty() && smtpJobQueue.isEmpty() && !currentNntpJob && !currentSmtpJob && mWalletQueue.isEmpty() ) diff --git a/knode/knnetaccess.h b/knode/knnetaccess.h index 6b34937a1..23e34e0c0 100644 --- a/knode/knnetaccess.h +++ b/knode/knnetaccess.h @@ -85,7 +85,7 @@ class KNNetAccess : public TQObject { void cancelCurrentNntpJob( int type = 0 ); void cancelCurrentSmtpJob( int type = 0 ); /** Update activitiy status, i.e. emit netActive signal. */ - void updatetqStatus(); + void updateStatus(); private slots: void slotJobResult( KIO::Job *job ); diff --git a/knode/knnntpaccount.cpp b/knode/knnntpaccount.cpp index 81b3cc425..8aa5f1b76 100644 --- a/knode/knnntpaccount.cpp +++ b/knode/knnntpaccount.cpp @@ -75,7 +75,7 @@ void KNNntpAccountIntervalChecking::slotCheckNews() KNNntpAccount::KNNntpAccount() : KNCollection(0), KNServerInfo(), i_dentity(0), f_etchDescriptions(true), w_asOpen(false), i_ntervalChecking(false), c_heckInterval(10) { - l_astNewFetch = TQDate::tqcurrentDate(); + l_astNewFetch = TQDate::currentDate(); a_ccountIntervalChecking = new KNNntpAccountIntervalChecking(this); mCleanupConf = new KNConfig::Cleanup( false ); } diff --git a/knode/knnntpclient.cpp b/knode/knnntpclient.cpp index 26473b6a1..fbd8ce51d 100644 --- a/knode/knnntpclient.cpp +++ b/knode/knnntpclient.cpp @@ -93,7 +93,7 @@ void KNNntpClient::doFetchGroups() char *s, *line; TQString name; - KNGroup::tqStatus status; + KNGroup::Status status; bool subscribed; while (getNextLine()) { @@ -228,7 +228,7 @@ void KNNntpClient::doCheckNewGroups() char *s, *line; TQString name; - KNGroup::tqStatus status; + KNGroup::Status status; TQSortedList<KNGroupInfo> tmpList; tmpList.setAutoDelete(true); diff --git a/knode/knode.cpp b/knode/knode.cpp index e0963816b..1af62747b 100644 --- a/knode/knode.cpp +++ b/knode/knode.cpp @@ -109,7 +109,7 @@ void KNMainWindow::setupStatusBar() statusBar()->addWidget( mLittleProgress, 0 , true ); mStatusMsgLabel = new KRSqueezedTextLabel( TQString(), statusBar() ); - mStatusMsgLabel->tqsetAlignment( AlignLeft | AlignVCenter ); + mStatusMsgLabel->setAlignment( AlignLeft | AlignVCenter ); statusBar()->addWidget( mStatusMsgLabel, 2 ); statusBar()->addWidget(m_mainWidget->statusBarLabelFilter(), 2); statusBar()->addWidget(m_mainWidget->statusBarLabelGroup(), 3); diff --git a/knode/knrangefilter.cpp b/knode/knrangefilter.cpp index 28c67b030..f5aa55938 100644 --- a/knode/knrangefilter.cpp +++ b/knode/knrangefilter.cpp @@ -118,7 +118,7 @@ KNRangeFilterWidget::KNRangeFilterWidget(const TQString& value, int min, int max op2->insertItem("<="); des=new TQLabel(value, this); - des->tqsetAlignment(AlignCenter); + des->setAlignment(AlignCenter); TQGridLayout *topL=new TQGridLayout(this, 2,6, 8,5 ); diff --git a/knode/knsearchdialog.cpp b/knode/knsearchdialog.cpp index 4344cbbab..f72afe472 100644 --- a/knode/knsearchdialog.cpp +++ b/knode/knsearchdialog.cpp @@ -68,8 +68,8 @@ KNSearchDialog::KNSearchDialog(searchType /*t*/, TQWidget *parent) f_ilter->setLoaded(true); f_ilter->setSearchFilter(true); - setFixedHeight(tqsizeHint().height()); - KNHelper::restoreWindowSize("searchDlg", this, tqsizeHint()); + setFixedHeight(sizeHint().height()); + KNHelper::restoreWindowSize("searchDlg", this, sizeHint()); fcw->setStartFocus(); } diff --git a/knode/knwidgets.cpp b/knode/knwidgets.cpp index c3f21959a..e2afa4cf2 100644 --- a/knode/knwidgets.cpp +++ b/knode/knwidgets.cpp @@ -107,10 +107,10 @@ void KNDialogListBox::keyPressEvent(TQKeyEvent *e) //==================================================================================== -KNDockWidgetHeaderDrag::KNDockWidgetHeaderDrag(TQWidget *tqfocusWidget, KDockWidgetAbstractHeader* parent, KDockWidget* dock, const char* name ) +KNDockWidgetHeaderDrag::KNDockWidgetHeaderDrag(TQWidget *focusWidget, KDockWidgetAbstractHeader* parent, KDockWidget* dock, const char* name ) : KDockWidgetHeaderDrag(parent, dock, name), f_ocus(false) { - connect(tqfocusWidget, TQT_SIGNAL(focusChanged(TQFocusEvent*)), TQT_SLOT(slotFocusChanged(TQFocusEvent*))); + connect(focusWidget, TQT_SIGNAL(focusChanged(TQFocusEvent*)), TQT_SLOT(slotFocusChanged(TQFocusEvent*))); } @@ -141,7 +141,7 @@ void KNDockWidgetHeaderDrag::paintEvent(TQPaintEvent* ev) TQPainter paint; paint.begin(&drawBuffer); - paint.fillRect(drawBuffer.rect(), TQBrush(tqcolorGroup().brush(TQColorGroup::Background))); + paint.fillRect(drawBuffer.rect(), TQBrush(colorGroup().brush(TQColorGroup::Background))); paint.setPen(tqpalette().active().highlight()); paint.drawLine(1, 2, width(), 2); diff --git a/knode/knwidgets.h b/knode/knwidgets.h index 002e31373..e9e782e20 100644 --- a/knode/knwidgets.h +++ b/knode/knwidgets.h @@ -72,7 +72,7 @@ class KNDockWidgetHeaderDrag : public KDockWidgetHeaderDrag TQ_OBJECT public: - KNDockWidgetHeaderDrag(TQWidget *tqfocusWidget, KDockWidgetAbstractHeader* parent, KDockWidget* dock, + KNDockWidgetHeaderDrag(TQWidget *focusWidget, KDockWidgetAbstractHeader* parent, KDockWidget* dock, const char* name = 0); virtual ~KNDockWidgetHeaderDrag(); diff --git a/knode/smtpaccountwidget_base.ui b/knode/smtpaccountwidget_base.ui index b742d4dd7..54ffb5e4a 100644 --- a/knode/smtpaccountwidget_base.ui +++ b/knode/smtpaccountwidget_base.ui @@ -86,7 +86,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/knotes/knote.cpp b/knotes/knote.cpp index 430a5dca5..0571bb1bc 100644 --- a/knotes/knote.cpp +++ b/knotes/knote.cpp @@ -772,7 +772,7 @@ void KNote::slotClose() void KNote::slotInsDate() { - m_editor->insert( KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime()) ); + m_editor->insert( KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime()) ); } void KNote::slotSetAlarm() @@ -859,7 +859,7 @@ void KNote::slotPrint() printer.setFont( m_config->font() ); printer.setContext( m_editor->context() ); printer.setStyleSheet( m_editor->styleSheet() ); - printer.tqsetColorGroup( tqcolorGroup() ); + printer.setColorGroup( colorGroup() ); printer.printNote( TQString(), content ); } @@ -1033,9 +1033,9 @@ void KNote::updateLabelAlignment() // if the name is too long to fit, left-align it, otherwise center it (#59028) TQString labelText = m_label->text(); if ( m_label->fontMetrics().boundingRect( labelText ).width() > m_label->width() ) - m_label->tqsetAlignment( AlignLeft ); + m_label->setAlignment( AlignLeft ); else - m_label->tqsetAlignment( AlignHCenter ); + m_label->setAlignment( AlignHCenter ); } void KNote::updateFocus() @@ -1121,7 +1121,7 @@ void KNote::updateBackground( int y_offset ) { if ( !s_ppOffset ) { - m_editor->setPaper( TQBrush( tqcolorGroup().background() ) ); + m_editor->setPaper( TQBrush( colorGroup().background() ) ); return; } @@ -1161,7 +1161,7 @@ void KNote::updateBackground( int y_offset ) void KNote::updateLayout() { - const int headerHeight = m_label->tqsizeHint().height(); + const int headerHeight = m_label->sizeHint().height(); const int margin = m_editor->margin(); bool closeLeft = false; @@ -1241,9 +1241,9 @@ void KNote::drawFrame( TQPainter *p ) TQRect r = frameRect(); r.setTop( s_ppOffset ); if ( s_ppOffset ) - qDrawShadePanel( p, r, tqcolorGroup(), false, lineWidth() ); + qDrawShadePanel( p, r, colorGroup(), false, lineWidth() ); else - qDrawWinPanel( p, r, tqcolorGroup(), false ); + qDrawWinPanel( p, r, colorGroup(), false ); } void KNote::showEvent( TQShowEvent * ) diff --git a/knotes/knotebutton.cpp b/knotes/knotebutton.cpp index 5dc5009e0..002dd0f61 100644 --- a/knotes/knotebutton.cpp +++ b/knotes/knotebutton.cpp @@ -34,7 +34,7 @@ KNoteButton::KNoteButton( const TQString& icon, TQWidget *parent, const char *na : TQPushButton( parent, name ) { setFocusPolicy( TQ_NoFocus ); - tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); + setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); m_flat = true; @@ -58,9 +58,9 @@ void KNoteButton::leaveEvent( TQEvent * ) tqrepaint(); } -TQSize KNoteButton::tqsizeHint() const +TQSize KNoteButton::sizeHint() const { - return TQSize( TQPushButton::tqsizeHint().height(), TQPushButton::tqsizeHint().height() ); + return TQSize( TQPushButton::sizeHint().height(), TQPushButton::sizeHint().height() ); } void KNoteButton::drawButton( TQPainter* p ) @@ -78,7 +78,7 @@ void KNoteButton::drawButton( TQPainter* p ) if ( !m_flat ) flags |= TQStyle::Style_MouseOver; - tqstyle().tqdrawPrimitive( TQStyle::PE_ButtonTool, p, rect(), tqcolorGroup(), flags ); + tqstyle().tqdrawPrimitive( TQStyle::PE_ButtonTool, p, rect(), colorGroup(), flags ); drawButtonLabel( p ); } @@ -102,8 +102,8 @@ void KNoteButton::drawButtonLabel( TQPainter* p ) // Shift button contents if pushed. if ( isOn() || isDown() ) { - dx += tqstyle().tqpixelMetric( TQStyle::PM_ButtonShiftHorizontal, this ); - dy += tqstyle().tqpixelMetric( TQStyle::PM_ButtonShiftVertical, this ); + dx += tqstyle().pixelMetric( TQStyle::PM_ButtonShiftHorizontal, this ); + dy += tqstyle().pixelMetric( TQStyle::PM_ButtonShiftVertical, this ); } p->drawPixmap( dx, dy, pix ); diff --git a/knotes/knotebutton.h b/knotes/knotebutton.h index 6a9f7e5bf..2f3699269 100644 --- a/knotes/knotebutton.h +++ b/knotes/knotebutton.h @@ -36,7 +36,7 @@ public: KNoteButton( const TQString& icon, TQWidget *parent=0, const char *name=0 ); ~KNoteButton(); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; protected: virtual void enterEvent( TQEvent * ); diff --git a/knotes/knoteconfigdlg.cpp b/knotes/knoteconfigdlg.cpp index 034a3239e..2e26ab999 100644 --- a/knotes/knoteconfigdlg.cpp +++ b/knotes/knoteconfigdlg.cpp @@ -159,14 +159,14 @@ TQWidget *KNoteConfigDlg::makeEditorPage( bool defaults ) tqlayout->addWidget( label_Font, 3, 0 ); KFontRequester *kcfg_Font = new KFontRequester( editorPage, "kcfg_Font" ); - kcfg_Font->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) ); + kcfg_Font->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) ); tqlayout->addMultiCellWidget( kcfg_Font, 3, 3, 1, 2 ); TQLabel *label_TitleFont = new TQLabel( i18n("Title font:"), editorPage, "label_TitleFont" ); tqlayout->addWidget( label_TitleFont, 2, 0 ); KFontRequester *kcfg_TitleFont = new KFontRequester( editorPage, "kcfg_TitleFont" ); - kcfg_TitleFont->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) ); + kcfg_TitleFont->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) ); tqlayout->addMultiCellWidget( kcfg_TitleFont, 2, 2, 1, 2 ); return editorPage; diff --git a/knotes/knoteedit.cpp b/knotes/knoteedit.cpp index c0647e6de..2844c29f3 100644 --- a/knotes/knoteedit.cpp +++ b/knotes/knoteedit.cpp @@ -298,25 +298,25 @@ void KNoteEdit::textColor() void KNoteEdit::textAlignLeft() { - tqsetAlignment( AlignLeft ); + setAlignment( AlignLeft ); m_textAlignLeft->setChecked( true ); } void KNoteEdit::textAlignCenter() { - tqsetAlignment( AlignCenter ); + setAlignment( AlignCenter ); m_textAlignCenter->setChecked( true ); } void KNoteEdit::textAlignRight() { - tqsetAlignment( AlignRight ); + setAlignment( AlignRight ); m_textAlignRight->setChecked( true ); } void KNoteEdit::textAlignBlock() { - tqsetAlignment( AlignJustify ); + setAlignment( AlignJustify ); m_textAlignBlock->setChecked( true ); } diff --git a/knotes/knoteprinter.cpp b/knotes/knoteprinter.cpp index 6b2868174..a94e46310 100644 --- a/knotes/knoteprinter.cpp +++ b/knotes/knoteprinter.cpp @@ -46,14 +46,14 @@ TQFont KNotePrinter::font() const return m_font; } -void KNotePrinter::tqsetColorGroup( const TQColorGroup& tqcolorGroup ) +void KNotePrinter::setColorGroup( const TQColorGroup& colorGroup ) { - m_tqcolorGroup = tqcolorGroup; + m_colorGroup = colorGroup; } -TQColorGroup KNotePrinter::tqcolorGroup() const +TQColorGroup KNotePrinter::colorGroup() const { - return m_tqcolorGroup; + return m_colorGroup; } void KNotePrinter::setStyleSheet( TQStyleSheet* styleSheet ) @@ -93,7 +93,7 @@ void KNotePrinter::doPrint( KPrinter& printer, TQPainter& painter, for (;;) { - text.draw( &painter, body.left(), body.top(), view, m_tqcolorGroup ); + text.draw( &painter, body.left(), body.top(), view, m_colorGroup ); view.moveBy( 0, body.height() ); painter.translate( 0, -body.height() ); diff --git a/knotes/knoteprinter.h b/knotes/knoteprinter.h index 148a2ec45..632dd85a4 100644 --- a/knotes/knoteprinter.h +++ b/knotes/knoteprinter.h @@ -27,8 +27,8 @@ public: void setFont( const TQFont& font ); TQFont font() const; - void tqsetColorGroup( const TQColorGroup& tqcolorGroup ); - TQColorGroup tqcolorGroup() const; + void setColorGroup( const TQColorGroup& colorGroup ); + TQColorGroup colorGroup() const; void setStyleSheet( TQStyleSheet* styleSheet ); TQStyleSheet* styleSheet() const; @@ -43,7 +43,7 @@ private: void doPrint( KPrinter& printer, TQPainter& painter, const TQString& content ) const; - TQColorGroup m_tqcolorGroup; + TQColorGroup m_colorGroup; TQFont m_font; TQStyleSheet* m_styleSheet; TQMimeSourceFactory* m_mimeSourceFactory; diff --git a/knotes/knotesalarm.cpp b/knotes/knotesalarm.cpp index 5d8b0de28..285d7224e 100644 --- a/knotes/knotesalarm.cpp +++ b/knotes/knotesalarm.cpp @@ -59,7 +59,7 @@ void KNotesAlarm::checkAlarms() if ( !from.isValid() ) from.setTime_t( 0 ); - KNotesGlobalConfig::self()->setAlarmsLastChecked( TQDateTime::tqcurrentDateTime() ); + KNotesGlobalConfig::self()->setAlarmsLastChecked( TQDateTime::currentDateTime() ); TQValueList<KCal::Alarm *> alarms = m_manager->alarms( from, KNotesGlobalConfig::self()->alarmsLastChecked() ); if( alarms.isEmpty()) return; diff --git a/knotes/knotesapp.cpp b/knotes/knotesapp.cpp index 22ee49fd6..b76f19846 100644 --- a/knotes/knotesapp.cpp +++ b/knotes/knotesapp.cpp @@ -138,7 +138,7 @@ KNotesApp::KNotesApp() // get the most recent XML UI file TQString xmlFileName = instance()->instanceName() + "ui.rc"; - TQString filter = TQString::tqfromLatin1( instance()->instanceName() + '/' ) + xmlFileName; + TQString filter = TQString::fromLatin1( instance()->instanceName() + '/' ) + xmlFileName; TQStringList fileList = instance()->dirs()->findAllResources( "data", filter ) + instance()->dirs()->findAllResources( "data", xmlFileName ); @@ -183,7 +183,7 @@ KNotesApp::KNotesApp() m_manager->load(); // read the old config files, convert and add them - KCal::CalendarLocal calendar( TQString::tqfromLatin1( "UTC" ) ); + KCal::CalendarLocal calendar( TQString::fromLatin1( "UTC" ) ); if ( KNotesLegacy::convert( &calendar ) ) { KCal::Journal::List notes = calendar.journals(); @@ -253,7 +253,7 @@ TQString KNotesApp::newNote( const TQString& name, const TQString& text ) if ( !name.isEmpty() ) journal->setSummary( name ); else - journal->setSummary( KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime() ) ); + journal->setSummary( KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime() ) ); // the body of the note journal->setDescription( text ); diff --git a/knotes/knotesnetrecv.cpp b/knotes/knotesnetrecv.cpp index 2adf8e784..5c0be183a 100644 --- a/knotes/knotesnetrecv.cpp +++ b/knotes/knotesnetrecv.cpp @@ -61,7 +61,7 @@ KNotesNetworkReceiver::KNotesNetworkReceiver( KBufferedSocket *s ) : TQObject(), m_buffer( new TQByteArray() ), m_sock( s ) { - TQString date = KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime(), true, false ); + TQString date = KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), true, false ); // Add the remote IP or hostname and the date to the title, to help the // user guess who wrote it. diff --git a/knotes/resourcelocal.cpp b/knotes/resourcelocal.cpp index aed70e236..a4e2cf70c 100644 --- a/knotes/resourcelocal.cpp +++ b/knotes/resourcelocal.cpp @@ -45,7 +45,7 @@ ResourceLocal::ResourceLocal( const KConfig *config ) - : ResourceNotes( config ), mCalendar( TQString::tqfromLatin1( "UTC" ) ) + : ResourceNotes( config ), mCalendar( TQString::fromLatin1( "UTC" ) ) { kdDebug(5500) << "ResourceLocal::ResourceLocal()" << endl; setType( "file" ); diff --git a/kode/kodemain.cpp b/kode/kodemain.cpp index 6e9b62225..437b374f7 100644 --- a/kode/kodemain.cpp +++ b/kode/kodemain.cpp @@ -384,7 +384,7 @@ int create( KCmdLineArgs *args ) authorName = a.realName(); } if ( !authorEmail.isEmpty() ) { - file.addCopyright( TQDate::tqcurrentDate().year(), authorName, authorEmail ); + file.addCopyright( TQDate::currentDate().year(), authorName, authorEmail ); } KODE::License l; diff --git a/kode/kwsdl/kung/dateinputfield.cpp b/kode/kwsdl/kung/dateinputfield.cpp index d49c19472..56132a4eb 100644 --- a/kode/kwsdl/kung/dateinputfield.cpp +++ b/kode/kwsdl/kung/dateinputfield.cpp @@ -25,7 +25,7 @@ DateInputField::DateInputField( const TQString &name, const Schema::SimpleType *type ) : SimpleInputField( name, type ), - mValue( TQDate::tqcurrentDate() ) + mValue( TQDate::currentDate() ) { } diff --git a/kode/kwsdl/kung/pageinputfield.cpp b/kode/kwsdl/kung/pageinputfield.cpp index 6ca3409d7..c5ea0016e 100644 --- a/kode/kwsdl/kung/pageinputfield.cpp +++ b/kode/kwsdl/kung/pageinputfield.cpp @@ -94,7 +94,7 @@ TQWidget *PageInputField::createWidget( TQWidget *parent ) int row = 0; for ( it = mFields.begin(); it != mFields.end(); ++it, ++row ) { TQLabel *label = new TQLabel( (*it)->name(), mInputWidget ); - label->tqsetAlignment( TQt::AlignTop ); + label->setAlignment( TQt::AlignTop ); tqlayout->addWidget( label, row, 0 ); tqlayout->addWidget( (*it)->createWidget( mInputWidget ), row, 1 ); } diff --git a/konsolekalendar/konsolekalendarepoch.cpp b/konsolekalendar/konsolekalendarepoch.cpp index ec59d7a3f..6aebd9a94 100644 --- a/konsolekalendar/konsolekalendarepoch.cpp +++ b/konsolekalendar/konsolekalendarepoch.cpp @@ -64,8 +64,8 @@ uint KonsoleKalendarEpoch::TQDateTime2epoch( TQDateTime dt ) // SORRY QT DOESN'T HANDLE DAYLIGHT SAVINGS TIME. // Compute #seconds to subtract for local timezone difference from UTC. - int offset = TQDateTime::tqcurrentDateTime( Qt::UTC ).toTime_t() - - TQDateTime::tqcurrentDateTime( Qt::LocalTime ).toTime_t(); + int offset = TQDateTime::currentDateTime( Qt::UTC ).toTime_t() + - TQDateTime::currentDateTime( Qt::LocalTime ).toTime_t(); return( dt.toTime_t() - offset ); } diff --git a/konsolekalendar/main.cpp b/konsolekalendar/main.cpp index 0fc5bf72c..124862fed 100644 --- a/konsolekalendar/main.cpp +++ b/konsolekalendar/main.cpp @@ -204,11 +204,11 @@ int main( int argc, char *argv[] ) KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); // Default values for start date/time (today at 07:00) - TQDate startdate = TQDate::tqcurrentDate(); + TQDate startdate = TQDate::currentDate(); TQTime starttime( 7, 0 ); // Default values for end date/time (today at 17:00) - TQDate enddate = TQDate::tqcurrentDate(); + TQDate enddate = TQDate::currentDate(); TQTime endtime( 17, 0 ); // Default values for switches diff --git a/kontact/Thoughts b/kontact/Thoughts index 6fca8f43c..16aa9c4a7 100644 --- a/kontact/Thoughts +++ b/kontact/Thoughts @@ -203,7 +203,7 @@ Don: Don: And the same for all other loadX apps. -tqStatus Bar +Status Bar ---------- d We need a more sophisticated handling (progressbar, etc) diff --git a/kontact/interfaces/core.cpp b/kontact/interfaces/core.cpp index e4e44e704..ed8848c61 100644 --- a/kontact/interfaces/core.cpp +++ b/kontact/interfaces/core.cpp @@ -42,7 +42,7 @@ Core::Core( TQWidget *parent, const char *name ) { d = new Private; TQTimer* timer = new TQTimer( this ); - mLastDate = TQDate::tqcurrentDate(); + mLastDate = TQDate::currentDate(); connect(timer, TQT_SIGNAL( timeout() ), TQT_SLOT( checkNewDay() ) ); timer->start( 1000*60 ); } @@ -114,10 +114,10 @@ void Core::slotPartDestroyed( TQObject * obj ) void Core::checkNewDay() { - if ( mLastDate != TQDate::tqcurrentDate() ) - emit dayChanged( TQDate::tqcurrentDate() ); + if ( mLastDate != TQDate::currentDate() ) + emit dayChanged( TQDate::currentDate() ); - mLastDate = TQDate::tqcurrentDate(); + mLastDate = TQDate::currentDate(); } TQString Core::lastErrorMessage() const diff --git a/kontact/interfaces/summary.cpp b/kontact/interfaces/summary.cpp index 085125222..ece3a5775 100644 --- a/kontact/interfaces/summary.cpp +++ b/kontact/interfaces/summary.cpp @@ -55,20 +55,20 @@ TQWidget* Summary::createHeader(TQWidget *parent, const TQPixmap& icon, const TQ TQLabel *label = new TQLabel( hbox ); label->setPixmap( icon ); - label->setFixedSize( label->tqsizeHint() ); - label->setPaletteBackgroundColor( tqcolorGroup().mid() ); + label->setFixedSize( label->sizeHint() ); + label->setPaletteBackgroundColor( colorGroup().mid() ); label->setAcceptDrops( true ); label = new TQLabel( heading, hbox ); - label->tqsetAlignment( AlignLeft|AlignVCenter ); + label->setAlignment( AlignLeft|AlignVCenter ); label->setIndent( KDialog::spacingHint() ); label->setFont( boldFont ); - label->setPaletteForegroundColor( tqcolorGroup().light() ); - label->setPaletteBackgroundColor( tqcolorGroup().mid() ); + label->setPaletteForegroundColor( colorGroup().light() ); + label->setPaletteBackgroundColor( colorGroup().mid() ); - hbox->setPaletteBackgroundColor( tqcolorGroup().mid() ); + hbox->setPaletteBackgroundColor( colorGroup().mid() ); - hbox->setMaximumHeight( hbox->tqminimumSizeHint().height() ); + hbox->setMaximumHeight( hbox->minimumSizeHint().height() ); return hbox; } diff --git a/kontact/plugins/kmail/kmail_plugin.cpp b/kontact/plugins/kmail/kmail_plugin.cpp index 01cef3a6d..266823ff7 100644 --- a/kontact/plugins/kmail/kmail_plugin.cpp +++ b/kontact/plugins/kmail/kmail_plugin.cpp @@ -83,7 +83,7 @@ bool KMailPlugin::canDecodeDrag( TQMimeSource *qms ) void KMailPlugin::processDropEvent( TQDropEvent * de ) { kdDebug() << k_funcinfo << endl; - CalendarLocal cal( TQString::tqfromLatin1("UTC") ); + CalendarLocal cal( TQString::fromLatin1("UTC") ); KABC::Addressee::List list; if ( VCalDrag::decode( de, &cal ) || ICalDrag::decode( de, &cal ) ) { diff --git a/kontact/plugins/kmail/summarywidget.cpp b/kontact/plugins/kmail/summarywidget.cpp index 195d853a3..3a0b16591 100644 --- a/kontact/plugins/kmail/summarywidget.cpp +++ b/kontact/plugins/kmail/summarywidget.cpp @@ -132,7 +132,7 @@ void SummaryWidget::updateFolderList( const TQStringList& folders ) KURLLabel *urlLabel = new KURLLabel( *it, folderPath, this ); urlLabel->installEventFilter( this ); - urlLabel->tqsetAlignment( AlignLeft ); + urlLabel->setAlignment( AlignLeft ); urlLabel->show(); connect( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ), TQT_SLOT( selectFolder( const TQString& ) ) ); @@ -143,7 +143,7 @@ void SummaryWidget::updateFolderList( const TQStringList& folders ) new TQLabel( TQString( i18n("%1: number of unread messages " "%2: total number of messages", "%1 / %2") ) .tqarg( numUnreadMsg ).tqarg( numMsg ), this ); - label->tqsetAlignment( AlignLeft ); + label->setAlignment( AlignLeft ); label->show(); mLayout->addWidget( label, counter, 2 ); mLabels.append( label ); @@ -154,7 +154,7 @@ void SummaryWidget::updateFolderList( const TQStringList& folders ) if ( counter == 0 ) { TQLabel *label = new TQLabel( i18n( "No unread messages in your monitored folders" ), this ); - label->tqsetAlignment( AlignHCenter | AlignVCenter ); + label->setAlignment( AlignHCenter | AlignVCenter ); mLayout->addMultiCellWidget( label, 0, 0, 0, 2 ); label->show(); mLabels.append( label ); diff --git a/kontact/plugins/knotes/knotes_part.cpp b/kontact/plugins/knotes/knotes_part.cpp index 769c1acf5..db6e43b65 100644 --- a/kontact/plugins/knotes/knotes_part.cpp +++ b/kontact/plugins/knotes/knotes_part.cpp @@ -139,7 +139,7 @@ void KNotesPart::printSelectedNotes() //printer.setFont( m_config->font() ); //printer.setContext( m_editor->context() ); //printer.setStyleSheet( m_editor->styleSheet() ); - printer.tqsetColorGroup( tqcolorGroup() ); + printer.setColorGroup( colorGroup() ); printer.printNote( , content ); #endif } @@ -161,7 +161,7 @@ TQString KNotesPart::newNote( const TQString& name, const TQString& text ) if ( !name.isEmpty() ) journal->setSummary( name ); else - journal->setSummary( KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime() ) ); + journal->setSummary( KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime() ) ); // the body of the note journal->setDescription( text ); diff --git a/kontact/plugins/knotes/summarywidget.cpp b/kontact/plugins/knotes/summarywidget.cpp index 2bd0456ca..2f598990f 100644 --- a/kontact/plugins/knotes/summarywidget.cpp +++ b/kontact/plugins/knotes/summarywidget.cpp @@ -58,7 +58,7 @@ KNotesSummaryWidget::KNotesSummaryWidget( Kontact::Plugin *plugin, mLayout = new TQGridLayout( mainLayout, 7, 3, 3 ); mLayout->setRowStretch( 6, 1 ); - mCalendar = new KCal::CalendarLocal( TQString::tqfromLatin1("UTC") ); + mCalendar = new KCal::CalendarLocal( TQString::fromLatin1("UTC") ); KNotesResourceManager *manager = new KNotesResourceManager(); TQObject::connect( manager, TQT_SIGNAL( sigRegisteredNote( KCal::Journal* ) ), @@ -92,8 +92,8 @@ void KNotesSummaryWidget::updateView() // Fill Note Pixmap Field label = new TQLabel( this ); label->setPixmap( pm ); - label->setMaximumWidth( label->tqminimumSizeHint().width() ); - label->tqsetAlignment( AlignVCenter ); + label->setMaximumWidth( label->minimumSizeHint().width() ); + label->setAlignment( AlignVCenter ); mLayout->addWidget( label, counter, 0 ); mLabels.append( label ); @@ -103,7 +103,7 @@ void KNotesSummaryWidget::updateView() KURLLabel *urlLabel = new KURLLabel( (*it)->uid(), newtext, this ); urlLabel->installEventFilter( this ); urlLabel->setTextFormat(RichText); - urlLabel->tqsetAlignment( urlLabel->tqalignment() | TQt::WordBreak ); + urlLabel->setAlignment( urlLabel->tqalignment() | TQt::WordBreak ); mLayout->addWidget( urlLabel, counter, 1 ); mLabels.append( urlLabel ); @@ -118,7 +118,7 @@ void KNotesSummaryWidget::updateView() } else { TQLabel *noNotes = new TQLabel( i18n( "No Notes Available" ), this ); - noNotes->tqsetAlignment( AlignHCenter | AlignVCenter ); + noNotes->setAlignment( AlignHCenter | AlignVCenter ); mLayout->addWidget( noNotes, 0, 1 ); mLabels.append( noNotes ); } diff --git a/kontact/plugins/korganizer/korganizerplugin.cpp b/kontact/plugins/korganizer/korganizerplugin.cpp index 7c2140b36..6d39d413a 100644 --- a/kontact/plugins/korganizer/korganizerplugin.cpp +++ b/kontact/plugins/korganizer/korganizerplugin.cpp @@ -224,8 +224,8 @@ void KOrganizerPlugin::processDropEvent( TQDropEvent *event ) KTempFile tf; tf.setAutoDelete( true ); - TQString uri = TQString::tqfromLatin1("kmail:") + TQString::number( mail.serialNumber() ); - tf.file()->writeBlock( event->tqencodedData( "message/rfc822" ) ); + 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, uri, tf.name(), TQStringList(), "message/rfc822" ); diff --git a/kontact/plugins/korganizer/summarywidget.cpp b/kontact/plugins/korganizer/summarywidget.cpp index 7c3a1bed9..c4c4dad9c 100644 --- a/kontact/plugins/korganizer/summarywidget.cpp +++ b/kontact/plugins/korganizer/summarywidget.cpp @@ -97,9 +97,9 @@ void SummaryWidget::updateView() TQPixmap pma = loader.loadIcon( "calendaranniversary", KIcon::Small ); TQDate dt; - TQDate tqcurrentDate = TQDate::tqcurrentDate(); - for ( dt=tqcurrentDate; - dt<=tqcurrentDate.addDays( days - 1 ); + TQDate currentDate = TQDate::currentDate(); + for ( dt=currentDate; + dt<=currentDate.addDays( days - 1 ); dt=dt.addDays(1) ) { KCal::Event::List events = mCalendar->events( dt ); @@ -123,8 +123,8 @@ void SummaryWidget::updateView() int span=1; int dayof=1; if ( ev->isMultiDay() ) { TQDate d = ev->dtStart().date(); - if ( d < tqcurrentDate ) { - d = tqcurrentDate; + if ( d < currentDate ) { + d = currentDate; } while ( d < ev->dtEnd().date() ) { if ( d < dt ) { @@ -148,8 +148,8 @@ void SummaryWidget::updateView() } else { label->setPixmap( pm ); } - label->setMaximumWidth( label->tqminimumSizeHint().width() ); - label->tqsetAlignment( AlignVCenter ); + label->setMaximumWidth( label->minimumSizeHint().width() ); + label->setAlignment( AlignVCenter ); mLayout->addWidget( label, counter, 0 ); mLabels.append( label ); @@ -159,12 +159,12 @@ void SummaryWidget::updateView() // Modify event date for printing TQDate sD = TQDate( dt.year(), dt.month(), dt.day() ); - if ( ( sD.month() == tqcurrentDate.month() ) && - ( sD.day() == tqcurrentDate.day() ) ) { + if ( ( sD.month() == currentDate.month() ) && + ( sD.day() == currentDate.day() ) ) { datestr = i18n( "Today" ); makeBold = true; - } else if ( ( sD.month() == tqcurrentDate.addDays( 1 ).month() ) && - ( sD.day() == tqcurrentDate.addDays( 1 ).day() ) ) { + } else if ( ( sD.month() == currentDate.addDays( 1 ).month() ) && + ( sD.day() == currentDate.addDays( 1 ).day() ) ) { datestr = i18n( "Tomorrow" ); } else { datestr = KGlobal::locale()->formatDate( sD ); @@ -179,7 +179,7 @@ void SummaryWidget::updateView() } label = new TQLabel( datestr, this ); - label->tqsetAlignment( AlignLeft | AlignVCenter ); + label->setAlignment( AlignLeft | AlignVCenter ); if ( makeBold ) { TQFont font = label->font(); font.setBold( true ); @@ -198,7 +198,7 @@ void SummaryWidget::updateView() urlLabel->setText( newtext ); urlLabel->setURL( ev->uid() ); urlLabel->installEventFilter( this ); - urlLabel->tqsetAlignment( urlLabel->tqalignment() | TQt::WordBreak ); + urlLabel->setAlignment( urlLabel->tqalignment() | TQt::WordBreak ); mLayout->addWidget( urlLabel, counter, 2 ); mLabels.append( urlLabel ); @@ -228,7 +228,7 @@ void SummaryWidget::updateView() .tqarg( KGlobal::locale()->formatTime( sST ) ) .tqarg( KGlobal::locale()->formatTime( sET ) ); label = new TQLabel( datestr, this ); - label->tqsetAlignment( AlignLeft | AlignVCenter ); + label->setAlignment( AlignLeft | AlignVCenter ); mLayout->addWidget( label, counter, 3 ); mLabels.append( label ); } @@ -242,7 +242,7 @@ void SummaryWidget::updateView() i18n( "No appointments pending within the next day", "No appointments pending within the next %n days", days ), this, "nothing to see" ); - noEvents->tqsetAlignment( AlignHCenter | AlignVCenter ); + noEvents->setAlignment( AlignHCenter | AlignVCenter ); mLayout->addWidget( noEvents, 0, 2 ); mLabels.append( noEvents ); } diff --git a/kontact/plugins/korganizer/todoplugin.cpp b/kontact/plugins/korganizer/todoplugin.cpp index caaaaf91d..c17b153f5 100644 --- a/kontact/plugins/korganizer/todoplugin.cpp +++ b/kontact/plugins/korganizer/todoplugin.cpp @@ -217,7 +217,7 @@ void TodoPlugin::processDropEvent( TQDropEvent *event ) tf.setAutoDelete( true ); TQString uri = "kmail:" + TQString::number( mail.serialNumber() ) + "/" + mail.messageId(); - tf.file()->writeBlock( event->tqencodedData( "message/rfc822" ) ); + tf.file()->writeBlock( event->encodedData( "message/rfc822" ) ); tf.close(); interface()->openTodoEditor( i18n("Mail: %1").tqarg( mail.subject() ), txt, uri, tf.name(), TQStringList(), "message/rfc822", false ); diff --git a/kontact/plugins/korganizer/todosummarywidget.cpp b/kontact/plugins/korganizer/todosummarywidget.cpp index 0849dde74..ed21f40bf 100644 --- a/kontact/plugins/korganizer/todosummarywidget.cpp +++ b/kontact/plugins/korganizer/todosummarywidget.cpp @@ -94,7 +94,7 @@ void TodoSummaryWidget::updateView() TQLabel *label = 0; int counter = 0; - TQDate tqcurrentDate = TQDate::tqcurrentDate(); + TQDate currentDate = TQDate::currentDate(); KCal::Todo::List todos = mCalendar->todos(); if ( todos.count() > 0 ) { TQPixmap pm = loader.loadIcon( "todo", KIcon::Small ); @@ -111,27 +111,27 @@ void TodoSummaryWidget::updateView() // show uncomplete todos from the last days if ( todo->hasDueDate() && !todo->isCompleted() && - todo->dtDue().date() < tqcurrentDate ) { + todo->dtDue().date() < currentDate ) { accepted = true; stateText = i18n( "overdue" ); } // show todos which started somewhere in the past and has to be finished in future if ( todo->hasStartDate() && todo->hasDueDate() && - todo->dtStart().date() < tqcurrentDate && - tqcurrentDate < todo->dtDue().date() ) { + todo->dtStart().date() < currentDate && + currentDate < todo->dtDue().date() ) { accepted = true; stateText = i18n( "in progress" ); } // all todos which start today - if ( todo->hasStartDate() && todo->dtStart().date() == tqcurrentDate ) { + if ( todo->hasStartDate() && todo->dtStart().date() == currentDate ) { accepted = true; stateText = i18n( "starts today" ); } // all todos which end today - if ( todo->hasDueDate() && todo->dtDue().date() == tqcurrentDate ) { + if ( todo->hasDueDate() && todo->dtDue().date() == currentDate ) { accepted = true; stateText = i18n( "ends today" ); } @@ -141,13 +141,13 @@ void TodoSummaryWidget::updateView() label = new TQLabel( this ); label->setPixmap( pm ); - label->tqsetSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Maximum ); + label->setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Maximum ); mLayout->addWidget( label, counter, 0 ); mLabels.append( label ); label = new TQLabel( TQString::number( todo->percentComplete() ) + "%", this ); - label->tqsetAlignment( AlignHCenter | AlignVCenter ); - label->tqsetSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Maximum ); + label->setAlignment( AlignHCenter | AlignVCenter ); + label->setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Maximum ); mLayout->addWidget( label, counter, 1 ); mLabels.append( label ); @@ -168,14 +168,14 @@ void TodoSummaryWidget::updateView() connect( urlLabel, TQT_SIGNAL( rightClickedURL( const TQString& ) ), this, TQT_SLOT( popupMenu( const TQString& ) ) ); - TQString tipText( KCal::IncidenceFormatter::toolTipStr( mCalendar, todo, tqcurrentDate, true ) ); + TQString tipText( KCal::IncidenceFormatter::toolTipStr( mCalendar, todo, currentDate, true ) ); if ( !tipText.isEmpty() ) { TQToolTip::add( urlLabel, tipText ); } label = new TQLabel( stateText, this ); - label->tqsetAlignment( AlignLeft | AlignVCenter ); - label->tqsetSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Maximum ); + label->setAlignment( AlignLeft | AlignVCenter ); + label->setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Maximum ); mLayout->addWidget( label, counter, 3 ); mLabels.append( label ); @@ -185,7 +185,7 @@ void TodoSummaryWidget::updateView() if ( counter == 0 ) { TQLabel *noTodos = new TQLabel( i18n( "No to-dos pending" ), this ); - noTodos->tqsetAlignment( AlignHCenter | AlignVCenter ); + noTodos->setAlignment( AlignHCenter | AlignVCenter ); mLayout->addWidget( noTodos, 0, 1 ); mLabels.append( noTodos ); } @@ -214,7 +214,7 @@ void TodoSummaryWidget::completeTodo( const TQString &uid ) IncidenceChanger *changer = new IncidenceChanger( mCalendar, TQT_TQOBJECT(this) ); if ( !todo->isReadOnly() && changer->beginChange( todo, 0, TQString() ) ) { KCal::Todo *oldTodo = todo->clone(); - todo->setCompleted( TQDateTime::tqcurrentDateTime() ); + todo->setCompleted( TQDateTime::currentDateTime() ); changer->changeIncidence( oldTodo, todo, KOGlobals::COMPLETION_MODIFIED, this ); changer->endChange( todo, 0, TQString() ); delete oldTodo; diff --git a/kontact/plugins/kpilot/summarywidget.cpp b/kontact/plugins/kpilot/summarywidget.cpp index 46ec7fdfe..ff6d41852 100644 --- a/kontact/plugins/kpilot/summarywidget.cpp +++ b/kontact/plugins/kpilot/summarywidget.cpp @@ -88,7 +88,7 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name ) mPilotDeviceLabel = new TQLabel( i18n( "Unknown" ), this ); mLayout->addMultiCellWidget( mPilotDeviceLabel, row, row, 1, 3 ); - // tqStatus + // Status row++; mDaemonStatusTextLabel = new TQLabel( i18n( "<i>Status:</i>" ), this); mLayout->addWidget( mDaemonStatusTextLabel, row, 0 ); @@ -98,10 +98,10 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name ) // Conduits: row++; mConduitsTextLabel = new TQLabel( i18n( "<i>Conduits:</i>" ), this ); - mConduitsTextLabel->tqsetAlignment( AlignAuto | AlignTop | ExpandTabs ); + mConduitsTextLabel->setAlignment( AlignAuto | AlignTop | ExpandTabs ); mLayout->addWidget( mConduitsTextLabel, row, 0 ); mConduitsLabel = new TQLabel( i18n( "No information available" ), this ); - mConduitsLabel->tqsetAlignment( mConduitsLabel->tqalignment() | TQt::WordBreak ); + mConduitsLabel->setAlignment( mConduitsLabel->tqalignment() | TQt::WordBreak ); mLayout->addMultiCellWidget( mConduitsLabel, row, row, 1, 3 ); // widgets shown if kpilotDaemon is not running @@ -141,7 +141,7 @@ void SummaryWidget::receiveDaemonStatusDetails(TQDateTime lastSyncTime, TQString { mDCOPSuccess = true; mLastSyncTime = lastSyncTime; - mDaemontqStatus = status; + mDaemonStatus = status; mConduits = conduits; mSyncLog = logFileName; mUserName = userName; @@ -166,7 +166,7 @@ void SummaryWidget::updateView() } mPilotUserLabel->setText( mUserName.isEmpty() ? i18n( "unknown" ) : mUserName ); mPilotDeviceLabel->setText( mPilotDevice.isEmpty() ? i18n( "unknown" ) : mPilotDevice ); - mDaemonStatusLabel->setText( mDaemontqStatus ); + mDaemonStatusLabel->setText( mDaemonStatus ); mConduitsLabel->setText( mConduits.join( ", " ) ); } else { mSyncTimeLabel->setText( i18n( "No information available (Daemon not running?)" ) ); diff --git a/kontact/plugins/kpilot/summarywidget.h b/kontact/plugins/kpilot/summarywidget.h index b1b60a053..3e04ed88d 100644 --- a/kontact/plugins/kpilot/summarywidget.h +++ b/kontact/plugins/kpilot/summarywidget.h @@ -85,7 +85,7 @@ class SummaryWidget : public Kontact::Summary, public DCOPObject TQGridLayout *mLayout; TQDateTime mLastSyncTime; - TQString mDaemontqStatus; + TQString mDaemonStatus; TQStringList mConduits; TQString mSyncLog; TQString mUserName; diff --git a/kontact/plugins/newsticker/newsfeeds.h b/kontact/plugins/newsticker/newsfeeds.h index b092469aa..0fe52d3b7 100644 --- a/kontact/plugins/newsticker/newsfeeds.h +++ b/kontact/plugins/newsticker/newsfeeds.h @@ -58,257 +58,257 @@ class NewsSourceData static NewsSourceData NewsSourceDefault[DEFAULT_NEWSSOURCES] = { // Arts --------------- NewsSourceData( - TQString::tqfromLatin1("Bureau 42"), - TQString::tqfromLatin1("http://www.bureau42.com/rdf/"), - TQString::tqfromLatin1("http://www.bureau42.com/favicon.ico"), + TQString::fromLatin1("Bureau 42"), + TQString::fromLatin1("http://www.bureau42.com/rdf/"), + TQString::fromLatin1("http://www.bureau42.com/favicon.ico"), NewsSourceData::Arts ), NewsSourceData( - TQString::tqfromLatin1("eFilmCritic"), - TQString::tqfromLatin1("http://efilmcritic.com/fo.rdf"), - TQString::tqfromLatin1("http://efilmcritic.com/favicon.ico"), + TQString::fromLatin1("eFilmCritic"), + TQString::fromLatin1("http://efilmcritic.com/fo.rdf"), + TQString::fromLatin1("http://efilmcritic.com/favicon.ico"), NewsSourceData::Arts ), // Business ----------- NewsSourceData( - TQString::tqfromLatin1("Internet.com Business"), - TQString::tqfromLatin1("http://headlines.internet.com/internetnews/bus-news/news.rss"), + TQString::fromLatin1("Internet.com Business"), + TQString::fromLatin1("http://headlines.internet.com/internetnews/bus-news/news.rss"), TQString(), NewsSourceData::Business ), NewsSourceData( - TQString::tqfromLatin1("TradeSims"), - TQString::tqfromLatin1("http://www.tradesims.com/AEX.rdf"), + TQString::fromLatin1("TradeSims"), + TQString::fromLatin1("http://www.tradesims.com/AEX.rdf"), TQString(), NewsSourceData::Business ), // Computers ---------- NewsSourceData( - TQString::tqfromLatin1("KDE Deutschland"), - TQString::tqfromLatin1("http://www.kde.de/nachrichten/nachrichten.rdf"), - TQString::tqfromLatin1("http://www.kde.de/favicon.ico"), + TQString::fromLatin1("KDE Deutschland"), + TQString::fromLatin1("http://www.kde.de/nachrichten/nachrichten.rdf"), + TQString::fromLatin1("http://www.kde.de/favicon.ico"), NewsSourceData::Computers ), NewsSourceData( - TQString::tqfromLatin1("KDE France"), - TQString::tqfromLatin1("http://www.kde-france.org/backend-breves.php3"), + TQString::fromLatin1("KDE France"), + TQString::fromLatin1("http://www.kde-france.org/backend-breves.php3"), TQString(), NewsSourceData::Computers ), NewsSourceData( - TQString::tqfromLatin1("FreeBSD Project News"), - TQString::tqfromLatin1("http://www.freebsd.org/news/news.rdf"), - TQString::tqfromLatin1("http://www.freebsd.org/favicon.ico"), + TQString::fromLatin1("FreeBSD Project News"), + TQString::fromLatin1("http://www.freebsd.org/news/news.rdf"), + TQString::fromLatin1("http://www.freebsd.org/favicon.ico"), NewsSourceData::Computers ), NewsSourceData( - TQString::tqfromLatin1("dot.kde.org"), - TQString::tqfromLatin1("http://www.kde.org/dotkdeorg.rdf"), - TQString::tqfromLatin1("http://www.kde.org/favicon.ico"), + TQString::fromLatin1("dot.kde.org"), + TQString::fromLatin1("http://www.kde.org/dotkdeorg.rdf"), + TQString::fromLatin1("http://www.kde.org/favicon.ico"), NewsSourceData::Computers ), - NewsSourceData( TQString::tqfromLatin1("KDE-Look.org"), - TQString::tqfromLatin1("http://www.kde.org/kde-look-content.rdf"), - TQString::tqfromLatin1("http://kde-look.org/img/favicon-1-1.ico"), + NewsSourceData( TQString::fromLatin1("KDE-Look.org"), + TQString::fromLatin1("http://www.kde.org/kde-look-content.rdf"), + TQString::fromLatin1("http://kde-look.org/img/favicon-1-1.ico"), NewsSourceData::Computers ), - NewsSourceData( TQString::tqfromLatin1("KDE-Apps.org"), - TQString::tqfromLatin1("http://www.kde.org/dot/kde-apps-content.rdf"), - TQString::tqfromLatin1("http://kde-apps.org/img/favicon-1-1.ico"), + NewsSourceData( TQString::fromLatin1("KDE-Apps.org"), + TQString::fromLatin1("http://www.kde.org/dot/kde-apps-content.rdf"), + TQString::fromLatin1("http://kde-apps.org/img/favicon-1-1.ico"), NewsSourceData::Computers ), - NewsSourceData( TQString::tqfromLatin1("DesktopLinux"), - TQString::tqfromLatin1("http://www.desktoplinux.com/backend/index.html"), - TQString::tqfromLatin1("http://www.desktoplinux.com/images/favicon.ico"), + NewsSourceData( TQString::fromLatin1("DesktopLinux"), + TQString::fromLatin1("http://www.desktoplinux.com/backend/index.html"), + TQString::fromLatin1("http://www.desktoplinux.com/images/favicon.ico"), NewsSourceData::Computers ), - NewsSourceData( TQString::tqfromLatin1("DistroWatch"), - TQString::tqfromLatin1("http://distrowatch.com/news/dw.xml"), - TQString::tqfromLatin1("http://distrowatch.com/favicon.ico"), + NewsSourceData( TQString::fromLatin1("DistroWatch"), + TQString::fromLatin1("http://distrowatch.com/news/dw.xml"), + TQString::fromLatin1("http://distrowatch.com/favicon.ico"), NewsSourceData::Computers ), /*URL changed*/ NewsSourceData( - TQString::tqfromLatin1("GNOME News"), - TQString::tqfromLatin1("http://www.gnomedesktop.org/node/feed"), + TQString::fromLatin1("GNOME News"), + TQString::fromLatin1("http://www.gnomedesktop.org/node/feed"), TQString(), NewsSourceData::Computers ), NewsSourceData( - TQString::tqfromLatin1("Slashdot"), - TQString::tqfromLatin1("http://slashdot.org/slashdot.rdf"), - TQString::tqfromLatin1("http://slashdot.org/favicon.ico"), + TQString::fromLatin1("Slashdot"), + TQString::fromLatin1("http://slashdot.org/slashdot.rdf"), + TQString::fromLatin1("http://slashdot.org/favicon.ico"), NewsSourceData::Computers ), NewsSourceData( - TQString::tqfromLatin1("Ask Slashdot"), - TQString::tqfromLatin1("http://slashdot.org/askslashdot.rdf"), - TQString::tqfromLatin1("http://slashdot.org/favicon.ico"), + TQString::fromLatin1("Ask Slashdot"), + TQString::fromLatin1("http://slashdot.org/askslashdot.rdf"), + TQString::fromLatin1("http://slashdot.org/favicon.ico"), NewsSourceData::Computers ), NewsSourceData( - TQString::tqfromLatin1("Slashdot: Features"), - TQString::tqfromLatin1("http://slashdot.org/features.rdf"), - TQString::tqfromLatin1("http://slashdot.org/favicon.ico"), + TQString::fromLatin1("Slashdot: Features"), + TQString::fromLatin1("http://slashdot.org/features.rdf"), + TQString::fromLatin1("http://slashdot.org/favicon.ico"), NewsSourceData::Computers ), NewsSourceData( - TQString::tqfromLatin1("Slashdot: Apache"), - TQString::tqfromLatin1("http://slashdot.org/apache.rdf"), - TQString::tqfromLatin1("http://slashdot.org/favicon.ico"), + TQString::fromLatin1("Slashdot: Apache"), + TQString::fromLatin1("http://slashdot.org/apache.rdf"), + TQString::fromLatin1("http://slashdot.org/favicon.ico"), NewsSourceData::Computers ), NewsSourceData( - TQString::tqfromLatin1("Slashdot: Books"), - TQString::tqfromLatin1("http://slashdot.org/books.rdf"), - TQString::tqfromLatin1("http://slashdot.org/favicon.ico"), + TQString::fromLatin1("Slashdot: Books"), + TQString::fromLatin1("http://slashdot.org/books.rdf"), + TQString::fromLatin1("http://slashdot.org/favicon.ico"), NewsSourceData::Computers ), NewsSourceData( - TQString::tqfromLatin1("Jabber News"), - TQString::tqfromLatin1("http://www.jabber.org/news/rss.xml"), + TQString::fromLatin1("Jabber News"), + TQString::fromLatin1("http://www.jabber.org/news/rss.xml"), TQString(), NewsSourceData::Computers ), NewsSourceData( - TQString::tqfromLatin1("Freshmeat"), - TQString::tqfromLatin1("http://freshmeat.net/backend/fm.rdf"), - TQString::tqfromLatin1("http://freshmeat.net/favicon.ico"), + TQString::fromLatin1("Freshmeat"), + TQString::fromLatin1("http://freshmeat.net/backend/fm.rdf"), + TQString::fromLatin1("http://freshmeat.net/favicon.ico"), NewsSourceData::Computers ), NewsSourceData( - TQString::tqfromLatin1("Linux Weekly News"), - TQString::tqfromLatin1("http://www.lwn.net/headlines/rss"), - TQString::tqfromLatin1("http://www.lwn.net/favicon.ico"), + TQString::fromLatin1("Linux Weekly News"), + TQString::fromLatin1("http://www.lwn.net/headlines/rss"), + TQString::fromLatin1("http://www.lwn.net/favicon.ico"), NewsSourceData::Computers ), NewsSourceData( - TQString::tqfromLatin1("heise online news"), - TQString::tqfromLatin1("http://www.heise.de/newsticker/heise.rdf"), - TQString::tqfromLatin1("http://www.heise.de/favicon.ico"), + TQString::fromLatin1("heise online news"), + TQString::fromLatin1("http://www.heise.de/newsticker/heise.rdf"), + TQString::fromLatin1("http://www.heise.de/favicon.ico"), NewsSourceData::Computers ), NewsSourceData( - TQString::tqfromLatin1("RUS-CERT Ticker"), - TQString::tqfromLatin1("http://cert.uni-stuttgart.de/ticker/rus-cert.rdf"), - TQString::tqfromLatin1("http://cert.uni-stuttgart.de/favicon.ico"), + TQString::fromLatin1("RUS-CERT Ticker"), + TQString::fromLatin1("http://cert.uni-stuttgart.de/ticker/rus-cert.rdf"), + TQString::fromLatin1("http://cert.uni-stuttgart.de/favicon.ico"), NewsSourceData::Computers ), NewsSourceData( - TQString::tqfromLatin1("RUS-CERT Elsewhere"), - TQString::tqfromLatin1("http://cert.uni-stuttgart.de/ticker/rus-cert-elsewhere.rdf"), - TQString::tqfromLatin1("http://cert.uni-stuttgart.de/favicon.ico"), + TQString::fromLatin1("RUS-CERT Elsewhere"), + TQString::fromLatin1("http://cert.uni-stuttgart.de/ticker/rus-cert-elsewhere.rdf"), + TQString::fromLatin1("http://cert.uni-stuttgart.de/favicon.ico"), NewsSourceData::Computers ), NewsSourceData( - TQString::tqfromLatin1("Kuro5hin"), - TQString::tqfromLatin1("http://kuro5hin.org/backend.rdf"), - TQString::tqfromLatin1("http://kuro5hin.org/favicon.ico"), + TQString::fromLatin1("Kuro5hin"), + TQString::fromLatin1("http://kuro5hin.org/backend.rdf"), + TQString::fromLatin1("http://kuro5hin.org/favicon.ico"), NewsSourceData::Computers ), NewsSourceData( - TQString::tqfromLatin1("Prolinux"), - TQString::tqfromLatin1("http://www.pl-forum.de/backend/pro-linux.rdf"), - TQString::tqfromLatin1("http://www.prolinux.de/favicon.ico"), + TQString::fromLatin1("Prolinux"), + TQString::fromLatin1("http://www.pl-forum.de/backend/pro-linux.rdf"), + TQString::fromLatin1("http://www.prolinux.de/favicon.ico"), NewsSourceData::Computers ), NewsSourceData( - TQString::tqfromLatin1("LinuxSecurity.com"), - TQString::tqfromLatin1("http://www.linuxsecurity.com/linuxsecurity_hybrid.rdf"), - TQString::tqfromLatin1("http://www.linuxsecurity.com/favicon.ico"), + TQString::fromLatin1("LinuxSecurity.com"), + TQString::fromLatin1("http://www.linuxsecurity.com/linuxsecurity_hybrid.rdf"), + TQString::fromLatin1("http://www.linuxsecurity.com/favicon.ico"), NewsSourceData::Computers ), NewsSourceData( - TQString::tqfromLatin1("Linux Game Tome"), - TQString::tqfromLatin1("http://happypenguin.org/html/news.rdf"), + TQString::fromLatin1("Linux Game Tome"), + TQString::fromLatin1("http://happypenguin.org/html/news.rdf"), TQString(), NewsSourceData::Computers ), NewsSourceData( - TQString::tqfromLatin1("Mozilla"), - TQString::tqfromLatin1("http://www.mozilla.org/news.rdf"), - TQString::tqfromLatin1("http://www.mozillazine.org/favicon.ico"), + TQString::fromLatin1("Mozilla"), + TQString::fromLatin1("http://www.mozilla.org/news.rdf"), + TQString::fromLatin1("http://www.mozillazine.org/favicon.ico"), NewsSourceData::Computers ), NewsSourceData( - TQString::tqfromLatin1("MozillaZine"), - TQString::tqfromLatin1("http://www.mozillazine.org/contents.rdf"), - TQString::tqfromLatin1("http://www.mozillazine.org/favicon.ico"), + TQString::fromLatin1("MozillaZine"), + TQString::fromLatin1("http://www.mozillazine.org/contents.rdf"), + TQString::fromLatin1("http://www.mozillazine.org/favicon.ico"), NewsSourceData::Computers ), NewsSourceData( - TQString::tqfromLatin1("Daemon News"), - TQString::tqfromLatin1("http://daily.daemonnews.org/ddn.rdf.php3"), + TQString::fromLatin1("Daemon News"), + TQString::fromLatin1("http://daily.daemonnews.org/ddn.rdf.php3"), TQString(), NewsSourceData::Computers ), NewsSourceData( - TQString::tqfromLatin1("use Perl;"), - TQString::tqfromLatin1("http://use.perl.org/useperl.rdf"), + TQString::fromLatin1("use Perl;"), + TQString::fromLatin1("http://use.perl.org/useperl.rdf"), TQString(), NewsSourceData::Computers ), NewsSourceData( - TQString::tqfromLatin1("Root prompt"), - TQString::tqfromLatin1("http://www.rootprompt.org/rss/"), - TQString::tqfromLatin1("http://www.rootprompt.org/favicon.ico"), + TQString::fromLatin1("Root prompt"), + TQString::fromLatin1("http://www.rootprompt.org/rss/"), + TQString::fromLatin1("http://www.rootprompt.org/favicon.ico"), NewsSourceData::Computers ), NewsSourceData( - TQString::tqfromLatin1("SecurityFocus"), - TQString::tqfromLatin1("http://www.securityfocus.com/topnews-rdf.html"), - TQString::tqfromLatin1("http://www.securityfocus.com/favicon.ico"), + TQString::fromLatin1("SecurityFocus"), + TQString::fromLatin1("http://www.securityfocus.com/topnews-rdf.html"), + TQString::fromLatin1("http://www.securityfocus.com/favicon.ico"), NewsSourceData::Computers ), NewsSourceData( - TQString::tqfromLatin1("Arstechnica"), - TQString::tqfromLatin1("http://arstechnica.com/etc/rdf/ars.rdf"), - TQString::tqfromLatin1("http://arstechnica.com/favicon.ico"), + TQString::fromLatin1("Arstechnica"), + TQString::fromLatin1("http://arstechnica.com/etc/rdf/ars.rdf"), + TQString::fromLatin1("http://arstechnica.com/favicon.ico"), NewsSourceData::Computers ), NewsSourceData( - TQString::tqfromLatin1("amiga-news.de - deutschsprachige Amiga Nachrichten"), - TQString::tqfromLatin1("http://www.amiga-news.de/de/backends/news/index.rss"), - TQString::tqfromLatin1("http://www.amiga-news.de/favicon.ico"), + TQString::fromLatin1("amiga-news.de - deutschsprachige Amiga Nachrichten"), + TQString::fromLatin1("http://www.amiga-news.de/de/backends/news/index.rss"), + TQString::fromLatin1("http://www.amiga-news.de/favicon.ico"), NewsSourceData::Computers ), NewsSourceData( - TQString::tqfromLatin1("amiga-news.de - english Amiga news"), - TQString::tqfromLatin1("http://www.amiga-news.de/en/backends/news/index.rss"), - TQString::tqfromLatin1("http://www.amiga-news.de/favicon.ico"), + TQString::fromLatin1("amiga-news.de - english Amiga news"), + TQString::fromLatin1("http://www.amiga-news.de/en/backends/news/index.rss"), + TQString::fromLatin1("http://www.amiga-news.de/favicon.ico"), NewsSourceData::Computers ), NewsSourceData( - TQString::tqfromLatin1("FreshPorts - the place for ports"), - TQString::tqfromLatin1("http://www.freshports.org/news.php3"), - TQString::tqfromLatin1("http://www.freshports.org/favicon.ico"), + TQString::fromLatin1("FreshPorts - the place for ports"), + TQString::fromLatin1("http://www.freshports.org/news.php3"), + TQString::fromLatin1("http://www.freshports.org/favicon.ico"), NewsSourceData::Computers ), NewsSourceData( - TQString::tqfromLatin1("zez.org - about code "), - TQString::tqfromLatin1("http://zez.org/article/rssheadlines"), + TQString::fromLatin1("zez.org - about code "), + TQString::fromLatin1("http://zez.org/article/rssheadlines"), TQString(), NewsSourceData::Computers ), NewsSourceData( - TQString::tqfromLatin1("BSDatwork.com"), - TQString::tqfromLatin1("http://BSDatwork.com/backend.php"), - TQString::tqfromLatin1("http://BSDatwork.com/favicon.ico"), + TQString::fromLatin1("BSDatwork.com"), + TQString::fromLatin1("http://BSDatwork.com/backend.php"), + TQString::fromLatin1("http://BSDatwork.com/favicon.ico"), NewsSourceData::Computers ), NewsSourceData( - TQString::tqfromLatin1("FreshSource - the place for source"), - TQString::tqfromLatin1("http://www.freshsource.org/news.php"), - TQString::tqfromLatin1("http://www.freshsource.org/favicon.ico"), + TQString::fromLatin1("FreshSource - the place for source"), + TQString::fromLatin1("http://www.freshsource.org/news.php"), + TQString::fromLatin1("http://www.freshsource.org/favicon.ico"), NewsSourceData::Computers ), NewsSourceData( - TQString::tqfromLatin1("The FreeBSD Diary"), - TQString::tqfromLatin1("http://www.freebsddiary.org/news.php"), - TQString::tqfromLatin1("http://www.freebsddiary.org/favicon.ico"), + TQString::fromLatin1("The FreeBSD Diary"), + TQString::fromLatin1("http://www.freebsddiary.org/news.php"), + TQString::fromLatin1("http://www.freebsddiary.org/favicon.ico"), NewsSourceData::Computers ), // Miscellaneous ------ NewsSourceData( - TQString::tqfromLatin1("tagesschau.de"), - TQString::tqfromLatin1("http://www.tagesschau.de/newsticker.rdf"), - TQString::tqfromLatin1("http://www.tagesschau.de/favicon.ico"), + TQString::fromLatin1("tagesschau.de"), + TQString::fromLatin1("http://www.tagesschau.de/newsticker.rdf"), + TQString::fromLatin1("http://www.tagesschau.de/favicon.ico"), NewsSourceData::Misc ), NewsSourceData( - TQString::tqfromLatin1("CNN Top Stories"), - TQString::tqfromLatin1("http://rss.cnn.com/rss/cnn_topstories.rss"), - TQString::tqfromLatin1("http://www.cnn.com/favicon.ico"), + TQString::fromLatin1("CNN Top Stories"), + TQString::fromLatin1("http://rss.cnn.com/rss/cnn_topstories.rss"), + TQString::fromLatin1("http://www.cnn.com/favicon.ico"), NewsSourceData::Misc ), /*feed URL changed*/ NewsSourceData( - TQString::tqfromLatin1("HotWired"), - TQString::tqfromLatin1("http://www.wired.com/news/feeds/rss2/0,2610,,00.xml"), - TQString::tqfromLatin1("http://www.hotwired.com/favicon.ico"), + TQString::fromLatin1("HotWired"), + TQString::fromLatin1("http://www.wired.com/news/feeds/rss2/0,2610,,00.xml"), + TQString::fromLatin1("http://www.hotwired.com/favicon.ico"), NewsSourceData::Misc ), NewsSourceData( - TQString::tqfromLatin1("The Register"), - TQString::tqfromLatin1("http://www.theregister.co.uk/headlines.rss"), - TQString::tqfromLatin1("http://www.theregister.co.uk/favicon.ico"), + TQString::fromLatin1("The Register"), + TQString::fromLatin1("http://www.theregister.co.uk/headlines.rss"), + TQString::fromLatin1("http://www.theregister.co.uk/favicon.ico"), NewsSourceData::Misc ), NewsSourceData( - TQString::tqfromLatin1( "Christian Science Monitor" ), - TQString::tqfromLatin1( "http://www.csmonitor.com/rss/csm.rss"), - TQString::tqfromLatin1( "http://www.csmonitor.com/favicon.ico"), + TQString::fromLatin1( "Christian Science Monitor" ), + TQString::fromLatin1( "http://www.csmonitor.com/rss/csm.rss"), + TQString::fromLatin1( "http://www.csmonitor.com/favicon.ico"), NewsSourceData::Misc ), // Recreation // Society NewsSourceData( - TQString::tqfromLatin1("nippon.it"), - TQString::tqfromLatin1("http://www.nippon.it/backend.it.php"), - TQString::tqfromLatin1("http://www.nippon.it/favicon.ico"), + TQString::fromLatin1("nippon.it"), + TQString::fromLatin1("http://www.nippon.it/backend.it.php"), + TQString::fromLatin1("http://www.nippon.it/favicon.ico"), NewsSourceData::Society ), NewsSourceData( - TQString::tqfromLatin1( "gflash" ), - TQString::tqfromLatin1( "http://www.gflash.de/backend.php"), - TQString::tqfromLatin1( "http://www.gflash.de/favicon.ico"), + TQString::fromLatin1( "gflash" ), + TQString::fromLatin1( "http://www.gflash.de/backend.php"), + TQString::fromLatin1( "http://www.gflash.de/favicon.ico"), NewsSourceData::Society ), NewsSourceData( - TQString::tqfromLatin1( "Quintessenz" ), - TQString::tqfromLatin1( "http://quintessenz.at/cgi-bin/rdf"), - TQString::tqfromLatin1( "http://quintessenz.at/favicon.ico"), + TQString::fromLatin1( "Quintessenz" ), + TQString::fromLatin1( "http://quintessenz.at/cgi-bin/rdf"), + TQString::fromLatin1( "http://quintessenz.at/favicon.ico"), NewsSourceData::Society ) }; diff --git a/kontact/plugins/newsticker/summarywidget.cpp b/kontact/plugins/newsticker/summarywidget.cpp index 2ba0dfcfa..3c58e0dd9 100644 --- a/kontact/plugins/newsticker/summarywidget.cpp +++ b/kontact/plugins/newsticker/summarywidget.cpp @@ -220,7 +220,7 @@ void SummaryWidget::updateView() KURLLabel *urlLabel = new KURLLabel( hbox ); urlLabel->setURL( (*it).url ); urlLabel->setPixmap( (*it).logo ); - urlLabel->setMaximumSize( urlLabel->tqminimumSizeHint() ); + urlLabel->setMaximumSize( urlLabel->minimumSizeHint() ); mLabels.append( urlLabel ); connect( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ), @@ -231,13 +231,13 @@ void SummaryWidget::updateView() // header TQLabel *label = new TQLabel( hbox ); label->setText( KCharsets::resolveEntities( (*it).title ) ); - label->tqsetAlignment( AlignLeft|AlignVCenter ); + label->setAlignment( AlignLeft|AlignVCenter ); label->setFont( boldFont ); label->setIndent( 6 ); - label->setMaximumSize( label->tqminimumSizeHint() ); + label->setMaximumSize( label->minimumSizeHint() ); mLabels.append( label ); - hbox->setMaximumWidth( hbox->tqminimumSizeHint().width() ); + hbox->setMaximumWidth( hbox->minimumSizeHint().width() ); hbox->show(); // articles diff --git a/kontact/plugins/specialdates/sdsummarywidget.cpp b/kontact/plugins/specialdates/sdsummarywidget.cpp index 3fbac9d2e..9b5c27efe 100644 --- a/kontact/plugins/specialdates/sdsummarywidget.cpp +++ b/kontact/plugins/specialdates/sdsummarywidget.cpp @@ -183,8 +183,8 @@ int SDSummaryWidget::span( KCal::Event *event ) int span=1; if ( event->isMultiDay() && event->doesFloat() ) { TQDate d = event->dtStart().date(); - if ( d < TQDate::tqcurrentDate() ) { - d = TQDate::tqcurrentDate(); + if ( d < TQDate::currentDate() ) { + d = TQDate::currentDate(); } while ( d < event->dtEnd().date() ) { span++; @@ -199,8 +199,8 @@ int SDSummaryWidget::dayof( KCal::Event *event, const TQDate& date ) { int dayof=1; TQDate d = event->dtStart().date(); - if ( d < TQDate::tqcurrentDate() ) { - d = TQDate::tqcurrentDate(); + if ( d < TQDate::currentDate() ) { + d = TQDate::currentDate(); } while ( d < event->dtEnd().date() ) { if ( d < date ) { @@ -269,9 +269,9 @@ void SDSummaryWidget::updateView() // Search for Birthdays, Anniversaries, Holidays, and Special Occasions // in the Calendar TQDate dt; - TQDate tqcurrentDate = TQDate::tqcurrentDate(); - for ( dt=tqcurrentDate; - dt<=tqcurrentDate.addDays( mDaysAhead - 1 ); + TQDate currentDate = TQDate::currentDate(); + for ( dt=currentDate; + dt<=currentDate.addDays( mDaysAhead - 1 ); dt=dt.addDays(1) ) { KCal::Event::List events = mCalendar->events( dt, KCal::EventSortStartDate, @@ -358,8 +358,8 @@ void SDSummaryWidget::updateView() // Seach for Holidays if ( mShowHolidays ) { if ( initHolidays() ) { - for ( dt=tqcurrentDate; - dt<=tqcurrentDate.addDays( mDaysAhead - 1 ); + for ( dt=currentDate; + dt<=currentDate.addDays( mDaysAhead - 1 ); dt=dt.addDays(1) ) { TQValueList<KHoliday> holidays = mHolidays->getHolidays( dt ); TQValueList<KHoliday>::ConstIterator it = holidays.begin(); @@ -429,8 +429,8 @@ void SDSummaryWidget::updateView() } else { label->setPixmap( icon_img ); } - label->setMaximumWidth( label->tqminimumSizeHint().width() ); - label->tqsetAlignment( AlignVCenter ); + label->setMaximumWidth( label->minimumSizeHint().width() ); + label->setAlignment( AlignVCenter ); mLayout->addWidget( label, counter, 0 ); mLabels.append( label ); @@ -438,7 +438,7 @@ void SDSummaryWidget::updateView() TQString datestr; //Muck with the year -- change to the year 'daysTo' days away - int year = tqcurrentDate.addDays( (*addrIt).daysTo ).year(); + int year = currentDate.addDays( (*addrIt).daysTo ).year(); TQDate sD = TQDate( year, (*addrIt).date.month(), (*addrIt).date.day() ); if ( (*addrIt).daysTo == 0 ) { @@ -457,7 +457,7 @@ void SDSummaryWidget::updateView() } label = new TQLabel( datestr, this ); - label->tqsetAlignment( AlignLeft | AlignVCenter ); + label->setAlignment( AlignLeft | AlignVCenter ); mLayout->addWidget( label, counter, 1 ); mLabels.append( label ); if ( makeBold ) { @@ -474,7 +474,7 @@ void SDSummaryWidget::updateView() label->setText( i18n( "in 1 day", "in %n days", (*addrIt).daysTo ) ); } - label->tqsetAlignment( AlignLeft | AlignVCenter ); + label->setAlignment( AlignLeft | AlignVCenter ); mLayout->addWidget( label, counter, 2 ); mLabels.append( label ); @@ -492,7 +492,7 @@ void SDSummaryWidget::updateView() } label = new TQLabel( this ); label->setText( what ); - label->tqsetAlignment( AlignLeft | AlignVCenter ); + label->setAlignment( AlignLeft | AlignVCenter ); mLayout->addWidget( label, counter, 3 ); mLabels.append( label ); @@ -530,7 +530,7 @@ void SDSummaryWidget::updateView() } else { label->setText( i18n( "one year", "%n years", (*addrIt).yearsOld ) ); } - label->tqsetAlignment( AlignLeft | AlignVCenter ); + label->setAlignment( AlignLeft | AlignVCenter ); mLayout->addWidget( label, counter, 5 ); mLabels.append( label ); } @@ -542,7 +542,7 @@ void SDSummaryWidget::updateView() i18n( "No special dates within the next 1 day", "No special dates pending within the next %n days", mDaysAhead ), this, "nothing to see" ); - label->tqsetAlignment( AlignHCenter | AlignVCenter ); + label->setAlignment( AlignHCenter | AlignVCenter ); mLayout->addMultiCellWidget( label, 0, 0, 0, 4 ); mLabels.append( label ); } @@ -605,27 +605,27 @@ bool SDSummaryWidget::eventFilter( TQObject *obj, TQEvent* e ) void SDSummaryWidget::dateDiff( const TQDate &date, int &days, int &years ) { - TQDate tqcurrentDate; + TQDate currentDate; TQDate eventDate; if ( TQDate::leapYear( date.year() ) && date.month() == 2 && date.day() == 29 ) { - tqcurrentDate = TQDate( date.year(), TQDate::tqcurrentDate().month(), TQDate::tqcurrentDate().day() ); - if ( !TQDate::leapYear( TQDate::tqcurrentDate().year() ) ) + currentDate = TQDate( date.year(), TQDate::currentDate().month(), TQDate::currentDate().day() ); + if ( !TQDate::leapYear( TQDate::currentDate().year() ) ) eventDate = TQDate( date.year(), date.month(), 28 ); // celebrate one day earlier ;) else eventDate = TQDate( date.year(), date.month(), date.day() ); } else { - tqcurrentDate = TQDate( 0, TQDate::tqcurrentDate().month(), TQDate::tqcurrentDate().day() ); + currentDate = TQDate( 0, TQDate::currentDate().month(), TQDate::currentDate().day() ); eventDate = TQDate( 0, date.month(), date.day() ); } - int offset = tqcurrentDate.daysTo( eventDate ); + int offset = currentDate.daysTo( eventDate ); if ( offset < 0 ) { days = 365 + offset; - years = TQDate::tqcurrentDate().year() + 1 - date.year(); + years = TQDate::currentDate().year() + 1 - date.year(); } else { days = offset; - years = TQDate::tqcurrentDate().year() - date.year(); + years = TQDate::currentDate().year() - date.year(); } } diff --git a/kontact/plugins/summary/kcmkontactsummary.cpp b/kontact/plugins/summary/kcmkontactsummary.cpp index 47c9bca64..076692948 100644 --- a/kontact/plugins/summary/kcmkontactsummary.cpp +++ b/kontact/plugins/summary/kcmkontactsummary.cpp @@ -119,7 +119,7 @@ KCMKontactSummary::KCMKontactSummary( TQWidget *parent, const char *name ) void KCMKontactSummary::load() { KTrader::OfferList offers = KTrader::self()->query( - TQString::tqfromLatin1( "Kontact/Plugin" ), + TQString::fromLatin1( "Kontact/Plugin" ), TQString( "[X-KDE-KontactPluginVersion] == %1" ).tqarg( KONTACT_PLUGIN_VERSION ) ); TQStringList activeSummaries; diff --git a/kontact/plugins/summary/summaryview_part.cpp b/kontact/plugins/summary/summaryview_part.cpp index d65228cd1..9caeeb6d6 100644 --- a/kontact/plugins/summary/summaryview_part.cpp +++ b/kontact/plugins/summary/summaryview_part.cpp @@ -80,7 +80,7 @@ SummaryViewPart::SummaryViewPart( Kontact::Core *core, const char*, connect( kapp, TQT_SIGNAL( kdisplayPaletteChanged() ), TQT_SLOT( slotAdjustPalette() ) ); slotAdjustPalette(); - setDate( TQDate::tqcurrentDate() ); + setDate( TQDate::currentDate() ); connect( mCore, TQT_SIGNAL( dayChanged( const TQDate& ) ), TQT_SLOT( setDate( const TQDate& ) ) ); @@ -137,7 +137,7 @@ void SummaryViewPart::updateWidgets() const KPIM::Identity &id = idm.defaultIdentity(); TQString currentUser = i18n( "Summary for %1" ).tqarg( id.fullName() ); - mUsernameLabel->setText( TQString::tqfromLatin1( "<b>%1</b>" ).tqarg( currentUser ) ); + mUsernameLabel->setText( TQString::fromLatin1( "<b>%1</b>" ).tqarg( currentUser ) ); mSummaries.clear(); @@ -374,7 +374,7 @@ void SummaryViewPart::initGUI( Kontact::Core *core ) mUsernameLabel = new TQLabel( mMainWidget ); hbl->addWidget( mUsernameLabel ); mDateLabel = new TQLabel( mMainWidget ); - mDateLabel->tqsetAlignment( AlignRight ); + mDateLabel->setAlignment( AlignRight ); hbl->addWidget( mDateLabel ); TQFrame *hline = new TQFrame( mMainWidget ); diff --git a/kontact/plugins/weather/summarywidget.cpp b/kontact/plugins/weather/summarywidget.cpp index bf4d452ad..a0ff4341c 100644 --- a/kontact/plugins/weather/summarywidget.cpp +++ b/kontact/plugins/weather/summarywidget.cpp @@ -43,7 +43,7 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name ) DCOPObject( "WeatherSummaryWidget" ), mProc( 0 ) { mLayout = new TQVBoxLayout( this, 3, 3 ); - mLayout->tqsetAlignment( TQt::AlignTop ); + mLayout->setAlignment( TQt::AlignTop ); TQPixmap icon = KGlobal::iconLoader()->loadIcon( "kweather", KIcon::Desktop, KIcon::SizeMedium ); TQWidget *header = createHeader( this, icon, i18n( "Weather Service" ) ); @@ -113,8 +113,8 @@ void SummaryWidget::updateView() urlLabel->installEventFilter( this ); urlLabel->setURL( (*it).stationID() ); urlLabel->setPixmap( img.smoothScale( 32, 32 ) ); - urlLabel->setMaximumSize( urlLabel->tqsizeHint() ); - urlLabel->tqsetAlignment( AlignTop ); + urlLabel->setMaximumSize( urlLabel->sizeHint() ); + urlLabel->setAlignment( AlignTop ); tqlayout->addMultiCellWidget( urlLabel, 0, 1, 0, 0 ); mLabels.append( urlLabel ); connect ( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ), @@ -125,7 +125,7 @@ void SummaryWidget::updateView() TQFont font = label->font(); font.setBold( true ); label->setFont( font ); - label->tqsetAlignment( AlignLeft ); + label->setAlignment( AlignLeft ); tqlayout->addMultiCellWidget( label, 0, 0, 1, 2 ); mLabels.append( label ); @@ -143,7 +143,7 @@ void SummaryWidget::updateView() TQToolTip::add( label, labelText.replace( " ", " " ) ); label = new TQLabel( cover, this ); - label->tqsetAlignment( AlignLeft ); + label->setAlignment( AlignLeft ); tqlayout->addMultiCellWidget( label, 1, 1, 1, 2 ); mLabels.append( label ); } diff --git a/kontact/src/aboutdialog.cpp b/kontact/src/aboutdialog.cpp index 1bbd0ef6c..1d52da2f1 100644 --- a/kontact/src/aboutdialog.cpp +++ b/kontact/src/aboutdialog.cpp @@ -96,7 +96,7 @@ void AboutDialog::addAboutData( const TQString &title, const TQString &icon, text.replace( "\n", "<br>" ); KActiveLabel *label = new KActiveLabel( text, topFrame ); - label->tqsetAlignment( AlignTop ); + label->setAlignment( AlignTop ); topLayout->addWidget( label ); diff --git a/kontact/src/iconsidepane.cpp b/kontact/src/iconsidepane.cpp index 4eacd6088..91abb28a0 100644 --- a/kontact/src/iconsidepane.cpp +++ b/kontact/src/iconsidepane.cpp @@ -173,13 +173,13 @@ void EntryItem::paint( TQPainter *p ) TQBrush brush; if ( isCurrent() || isSelected() || mPaintActive ) - brush = box->tqcolorGroup().brush( TQColorGroup::Highlight ); + brush = box->colorGroup().brush( TQColorGroup::Highlight ); else - brush = TQBrush(box->tqcolorGroup().highlight().light( 115 )); + brush = TQBrush(box->colorGroup().highlight().light( 115 )); p->fillRect( 1, 0, w - 2, h - 1, brush ); TQPen pen = p->pen(); TQPen oldPen = pen; - pen.setColor( box->tqcolorGroup().mid() ); + pen.setColor( box->colorGroup().mid() ); p->setPen( pen ); p->drawPoint( 1, 0 ); @@ -196,9 +196,9 @@ void EntryItem::paint( TQPainter *p ) p->drawPixmap( x, y, mPixmap ); } - TQColor shadowColor = listBox()->tqcolorGroup().background().dark(115); + TQColor shadowColor = listBox()->colorGroup().background().dark(115); if ( isCurrent() || isSelected() ) { - p->setPen( box->tqcolorGroup().highlightedText() ); + p->setPen( box->colorGroup().highlightedText() ); } if ( !text().isEmpty() && navigator()->showText() ) { @@ -225,13 +225,13 @@ void EntryItem::paint( TQPainter *p ) if ( plugin()->disabled() ) { p->setPen( box->tqpalette().disabled().text( ) ); } else if ( isCurrent() || isSelected() || mHasHover ) { - p->setPen( box->tqcolorGroup().highlight().dark(115) ); + p->setPen( box->colorGroup().highlight().dark(115) ); p->drawText( x + ( TQApplication::reverseLayout() ? -1 : 1), y + 1, text() ); - p->setPen( box->tqcolorGroup().highlightedText() ); + p->setPen( box->colorGroup().highlightedText() ); } else - p->setPen( box->tqcolorGroup().text() ); + p->setPen( box->colorGroup().text() ); p->drawText( x, y, text() ); } @@ -284,7 +284,7 @@ Navigator::Navigator( IconSidePane *parent, const char *name ) } -TQSize Navigator::tqsizeHint() const +TQSize Navigator::sizeHint() const { return TQSize( 100, 100 ); } diff --git a/kontact/src/iconsidepane.h b/kontact/src/iconsidepane.h index d215558df..135332284 100644 --- a/kontact/src/iconsidepane.h +++ b/kontact/src/iconsidepane.h @@ -101,12 +101,12 @@ class EntryItemToolTip : public TQToolTip if ( !mListBox ) return; TQListBoxItem* item = mListBox->itemAt( p ); if ( !item ) return; - const TQRect tqitemRect = mListBox->tqitemRect( item ); - if ( !tqitemRect.isValid() ) return; + const TQRect itemRect = mListBox->itemRect( item ); + if ( !itemRect.isValid() ) return; const EntryItem *entryItem = static_cast<EntryItem*>( item ); TQString tipStr = entryItem->text(); - tip( tqitemRect, tipStr ); + tip( itemRect, tipStr ); } private: TQListBox* mListBox; @@ -126,7 +126,7 @@ class Navigator : public KListBox void updatePlugins( TQValueList<Kontact::Plugin*> plugins ); - TQSize tqsizeHint() const; + TQSize sizeHint() const; void highlightItem( EntryItem* item ); diff --git a/kontact/src/kcmkontact.cpp b/kontact/src/kcmkontact.cpp index 7bfed9cd4..5de81055e 100644 --- a/kontact/src/kcmkontact.cpp +++ b/kontact/src/kcmkontact.cpp @@ -114,7 +114,7 @@ PluginSelection::~PluginSelection() void PluginSelection::readConfig() { const KTrader::OfferList offers = KTrader::self()->query( - TQString::tqfromLatin1( "Kontact/Plugin" ), + TQString::fromLatin1( "Kontact/Plugin" ), TQString( "[X-KDE-KontactPluginVersion] == %1" ).tqarg( KONTACT_PLUGIN_VERSION ) ); int activeComponent = 0; diff --git a/kontact/src/main.cpp b/kontact/src/main.cpp index d2a57bcb7..5cf0bfd50 100644 --- a/kontact/src/main.cpp +++ b/kontact/src/main.cpp @@ -76,7 +76,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::tqfromLatin1( "Kontact/Plugin" ), + TQString::fromLatin1( "Kontact/Plugin" ), TQString( "[X-KDE-KontactPluginVersion] == %1" ).tqarg( KONTACT_PLUGIN_VERSION ) ); for ( KService::List::Iterator it = offers.begin(); it != offers.end(); ++it ) { KService::Ptr service = (*it); diff --git a/kontact/src/mainwindow.cpp b/kontact/src/mainwindow.cpp index fe24bd8dd..06664d41e 100644 --- a/kontact/src/mainwindow.cpp +++ b/kontact/src/mainwindow.cpp @@ -124,7 +124,7 @@ void MainWindow::initGUI() TQT_SLOT( showAboutDialog() ) ); KTrader::OfferList offers = KTrader::self()->query( - TQString::tqfromLatin1( "Kontact/Plugin" ), + TQString::fromLatin1( "Kontact/Plugin" ), TQString( "[X-KDE-KontactPluginVersion] == %1" ).tqarg( KONTACT_PLUGIN_VERSION ) ); mPluginInfos = KPluginInfo::fromServices( offers, Prefs::self()->config(), "Plugins" ); @@ -244,7 +244,7 @@ void MainWindow::initWidgets() mSplitter = new TQSplitter( mTopWidget ); mBox = new TQHBox( mTopWidget ); mSidePane = new IconSidePane( this, mSplitter ); - mSidePane->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Maximum, + mSidePane->setSizePolicy( TQSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Preferred ) ); // donÄt occupy screen estate on load TQValueList<int> sizes; @@ -278,7 +278,7 @@ void MainWindow::initWidgets() mLittleProgress = new KPIM::StatusbarProgressWidget( progressDialog, statusBar() ); mStatusMsgLabel = new KRSqueezedTextLabel( i18n( " Initializing..." ), statusBar() ); - mStatusMsgLabel->tqsetAlignment( AlignLeft | AlignVCenter ); + mStatusMsgLabel->setAlignment( AlignLeft | AlignVCenter ); statusBar()->addWidget( mStatusMsgLabel, 10 , false ); statusBar()->addWidget( mLittleProgress, 0 , true ); @@ -802,13 +802,13 @@ void MainWindow::selectPlugin( Kontact::Plugin *plugin ) } // store old focus widget - TQWidget *tqfocusWidget = kapp->tqfocusWidget(); - if ( mCurrentPlugin && tqfocusWidget ) { + TQWidget *focusWidget = kapp->focusWidget(); + if ( mCurrentPlugin && focusWidget ) { // save the focus widget only when it belongs to the activated part - TQWidget *parent = tqfocusWidget->parentWidget(); + TQWidget *parent = focusWidget->parentWidget(); while ( parent ) { if ( parent == mCurrentPlugin->part()->widget() ) - mFocusWidgets.insert( mCurrentPlugin->identifier(), TQGuardedPtr<TQWidget>( tqfocusWidget ) ); + mFocusWidgets.insert( mCurrentPlugin->identifier(), TQGuardedPtr<TQWidget>( focusWidget ) ); parent = parent->parentWidget(); } @@ -829,9 +829,9 @@ void MainWindow::selectPlugin( Kontact::Plugin *plugin ) view->show(); if ( mFocusWidgets.contains( plugin->identifier() ) ) { - tqfocusWidget = mFocusWidgets[ plugin->identifier() ]; - if ( tqfocusWidget ) - tqfocusWidget->setFocus(); + focusWidget = mFocusWidgets[ plugin->identifier() ]; + if ( focusWidget ) + focusWidget->setFocus(); } else view->setFocus(); diff --git a/kontact/src/profilemanager.cpp b/kontact/src/profilemanager.cpp index 91fc370db..67f1bd198 100644 --- a/kontact/src/profilemanager.cpp +++ b/kontact/src/profilemanager.cpp @@ -178,7 +178,7 @@ void Kontact::ProfileManager::writeProfileConfig( const Kontact::Profile& profil void Kontact::ProfileManager::readConfig() { - const TQStringList profilePaths = KGlobal::dirs()->findAllResources( "data", TQString::tqfromLatin1( "kontact/profiles/*/profile.cfg" ) ); + const TQStringList profilePaths = KGlobal::dirs()->findAllResources( "data", TQString::fromLatin1( "kontact/profiles/*/profile.cfg" ) ); typedef TQMap<TQString, Kontact::Profile> ProfileMap; ProfileMap profiles; diff --git a/korganizer/actionmanager.cpp b/korganizer/actionmanager.cpp index 7a27df738..1d61545f0 100644 --- a/korganizer/actionmanager.cpp +++ b/korganizer/actionmanager.cpp @@ -723,7 +723,7 @@ void ActionManager::file_open( const KURL &url ) // is that URL already opened somewhere else? Activate that window KOrg::MainWindow *korg=ActionManager::findInstance( url ); if ( ( 0 != korg )&&( korg != mMainWindow ) ) { - KWin::activateWindow( korg->tqtopLevelWidget()->winId() ); + KWin::activateWindow( korg->topLevelWidget()->winId() ); return; } @@ -745,7 +745,7 @@ void ActionManager::file_icalimport() TQString progPath; KTempFile tmpfn; - TQString homeDir = TQDir::homeDirPath() + TQString::tqfromLatin1( "/.calendar" ); + TQString homeDir = TQDir::homeDirPath() + TQString::fromLatin1( "/.calendar" ); if ( !TQFile::exists( homeDir ) ) { KMessageBox::error( dialogParent(), @@ -1043,9 +1043,9 @@ void ActionManager::exportHTML() settings.readConfig(); TQDate qd1; - qd1 = TQDate::tqcurrentDate(); + qd1 = TQDate::currentDate(); TQDate qd2; - qd2 = TQDate::tqcurrentDate(); + qd2 = TQDate::currentDate(); if ( settings.monthView() ) qd2.addMonths( 1 ); else @@ -2011,7 +2011,7 @@ void ActionManager::importCalendar( const KURL &url ) } PreviewDialog *dialog; - dialog = new PreviewDialog( url, mMainWindow->tqtopLevelWidget() ); + dialog = new PreviewDialog( url, mMainWindow->topLevelWidget() ); connect( dialog, TQT_SIGNAL( dialogFinished( PreviewDialog * ) ), TQT_SLOT( slotPreviewDialogFinished( PreviewDialog * ) ) ); connect( dialog, TQT_SIGNAL( openURL( const KURL &, bool ) ), @@ -2104,10 +2104,10 @@ bool ActionManager::handleCommandLine() ret = false; } else if ( args->count() <= 0 ) { // No filenames given => all other args are meaningless, show main Window - mainWindow->tqtopLevelWidget()->show(); + mainWindow->topLevelWidget()->show(); } else if ( !args->isSet( "open" ) ) { // Import, merge, or ask => we need the resource calendar window anyway. - mainWindow->tqtopLevelWidget()->show(); + mainWindow->topLevelWidget()->show(); // Check for import, merge or ask if ( args->isSet( "import" ) ) { @@ -2130,7 +2130,7 @@ bool ActionManager::handleCommandLine() TQWidget *ActionManager::dialogParent() { - return mCalendarView->tqtopLevelWidget(); + return mCalendarView->topLevelWidget(); } #include "actionmanager.moc" diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 5b6d94928..56f3007e2 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp @@ -177,7 +177,7 @@ CalendarView::CalendarView( TQWidget *parent, const char *name ) mDateNavigatorContainer = new KDateNavigator( leftFrame, true, "CalendarView::DateNavigator", - TQDate::tqcurrentDate() ); + TQDate::currentDate() ); mTodoList = new KOTodoView( CalendarNull::self(), leftFrame, "todolist" ); mEventViewer = new KOEventViewer ( CalendarNull::self(), leftFrame, "EventViewer" ); @@ -185,7 +185,7 @@ CalendarView::CalendarView( TQWidget *parent, const char *name ) TQWidget *rightBox = new TQWidget( mainBox ); TQBoxLayout *rightLayout = new TQVBoxLayout( rightBox ); - mNavigatorBar = new NavigatorBar( TQDate::tqcurrentDate(), rightBox ); + mNavigatorBar = new NavigatorBar( TQDate::currentDate(), rightBox ); rightLayout->addWidget( mNavigatorBar ); mRightFrame = new TQWidgetStack( rightBox ); @@ -195,7 +195,7 @@ CalendarView::CalendarView( TQWidget *parent, const char *name ) if ( KOPrefs::instance()->mVerticalScreen ) { // mTodoList->setFixedHeight( 60 ); - mTodoList->setFixedHeight( mDateNavigatorContainer->tqsizeHint().height() ); + mTodoList->setFixedHeight( mDateNavigatorContainer->sizeHint().height() ); } #endif @@ -387,7 +387,7 @@ TQDate CalendarView::activeDate( bool fallbackToToday ) // When all else fails, use the navigator start date, or today. if ( fallbackToToday ) { - return TQDate::tqcurrentDate(); + return TQDate::currentDate(); } else { return mDateNavigator->selectedDates().first(); } @@ -547,7 +547,7 @@ void CalendarView::readSettings() TQValueList<int> sizes = config->readIntListEntry( "Separator1" ); if ( sizes.count() != 2 ) { - sizes << mDateNavigatorContainer->tqminimumSizeHint().width(); + sizes << mDateNavigatorContainer->minimumSizeHint().width(); sizes << 300; } mPanner->setSizes( sizes ); @@ -779,14 +779,14 @@ void CalendarView::incidenceChanged( Incidence *oldIncidence, TQString description = i18n( "To-do completed: %1 (%2)" ).tqarg( newIncidence->summary() ).tqarg( timeStr ); - Journal::List journals = calendar()->journals( TQDate::tqcurrentDate() ); + Journal::List journals = calendar()->journals( TQDate::currentDate() ); Journal *journal; if ( journals.isEmpty() ) { journal = new Journal(); - journal->setDtStart( TQDateTime::tqcurrentDateTime() ); + journal->setDtStart( TQDateTime::currentDateTime() ); - TQString dateStr = KGlobal::locale()->formatDate( TQDate::tqcurrentDate() ); + TQString dateStr = KGlobal::locale()->formatDate( TQDate::currentDate() ); journal->setSummary( i18n("Journal of %1").tqarg( dateStr ) ); journal->setDescription( description ); @@ -1248,7 +1248,7 @@ void CalendarView::newTodo( ResourceCalendar *res, const TQString &subRes ) todoEditor->setResource( res, subRes ); if ( mViewManager->currentView()->isEventView() ) { dtDue.setDate( mDateNavigator->selectedDates().first() ); - TQDateTime dtDummy = TQDateTime::tqcurrentDateTime(); + TQDateTime dtDummy = TQDateTime::currentDateTime(); mViewManager->currentView()->eventDurationHint( dtDue, dtDummy, allday ); todoEditor->setDates( dtDue, allday ); } @@ -1669,7 +1669,7 @@ void CalendarView::schedule_forward( Incidence *incidence ) void CalendarView::mailFreeBusy( int daysToPublish ) { - TQDateTime start = TQDateTime::tqcurrentDateTime(); + TQDateTime start = TQDateTime::currentDateTime(); TQDateTime end = start.addDays(daysToPublish); FreeBusy *freebusy = new FreeBusy(mCalendar, start, end); @@ -1865,7 +1865,7 @@ void CalendarView::eventUpdated(Incidence *) void CalendarView::adaptNavigationUnits() { if (mViewManager->currentView()->isEventView()) { - int days = mViewManager->currentView()->tqcurrentDateCount(); + int days = mViewManager->currentView()->currentDateCount(); if (days == 1) { emit changeNavStringPrev(i18n("&Previous Day")); emit changeNavStringNext(i18n("&Next Day")); diff --git a/korganizer/datechecker.cpp b/korganizer/datechecker.cpp index c311743eb..7d7cdedbe 100644 --- a/korganizer/datechecker.cpp +++ b/korganizer/datechecker.cpp @@ -59,14 +59,14 @@ void DateChecker::enableRollover( RolloverType r ) TQT_SLOT( possiblyPastMidnight() ) ); } mUpdateTimer->start( 0, true ); - mLastDayChecked = TQDate::tqcurrentDate(); + mLastDayChecked = TQDate::currentDate(); } mUpdateRollover = r; } void DateChecker::passedMidnight() { - TQDate today = TQDate::tqcurrentDate(); + TQDate today = TQDate::currentDate(); if ( today.month() != mLastDayChecked.month() ) { if ( mUpdateRollover == FollowMonth ) { @@ -78,9 +78,9 @@ void DateChecker::passedMidnight() void DateChecker::possiblyPastMidnight() { - if ( mLastDayChecked != TQDate::tqcurrentDate() ) { + if ( mLastDayChecked != TQDate::currentDate() ) { passedMidnight(); - mLastDayChecked = TQDate::tqcurrentDate(); + mLastDayChecked = TQDate::currentDate(); } // Set the timer to go off 1 second after midnight // or after 8 minutes, whichever comes first. diff --git a/korganizer/datenavigator.cpp b/korganizer/datenavigator.cpp index a792b8416..bb4206b0c 100644 --- a/korganizer/datenavigator.cpp +++ b/korganizer/datenavigator.cpp @@ -37,7 +37,7 @@ using namespace KCal; DateNavigator::DateNavigator( TQObject *parent, const char *name ) : TQObject( parent, name ) { - mSelectedDates.append( TQDate::tqcurrentDate() ); + mSelectedDates.append( TQDate::currentDate() ); } DateNavigator::~DateNavigator() @@ -69,7 +69,7 @@ void DateNavigator::selectDate( const TQDate &date ) if ( !d.isValid() ) { kdDebug(5850) << "DateNavigator::selectDates(TQDate): an invalid date was passed as a parameter!" << endl; - d = TQDate::tqcurrentDate(); + d = TQDate::currentDate(); } mSelectedDates.clear(); @@ -143,10 +143,10 @@ void DateNavigator::selectWorkWeek( const TQDate &d ) int dayOfWeek = KOGlobals::self()->calendarSystem()->dayOfWeek( d ); - TQDate tqcurrentDate = d.addDays( weekStart - dayOfWeek ); + TQDate currentDate = d.addDays( weekStart - dayOfWeek ); if ( weekStart != 1 && dayOfWeek < weekStart ) { - tqcurrentDate = tqcurrentDate.addDays( -7 ); + currentDate = currentDate.addDays( -7 ); } mSelectedDates.clear(); @@ -154,7 +154,7 @@ void DateNavigator::selectWorkWeek( const TQDate &d ) for ( int i = 0; i < 7; ++i ) { if( (1<< ((i + weekStart + 6) % 7)) & (mask) ) { - mSelectedDates.append( tqcurrentDate.addDays(i) ); + mSelectedDates.append( currentDate.addDays(i) ); } } @@ -163,7 +163,7 @@ void DateNavigator::selectWorkWeek( const TQDate &d ) void DateNavigator::selectToday() { - TQDate d = TQDate::tqcurrentDate(); + TQDate d = TQDate::currentDate(); int dateCount = mSelectedDates.count(); diff --git a/korganizer/datenavigatorcontainer.cpp b/korganizer/datenavigatorcontainer.cpp index 5504e8f65..dd3f8a1ac 100644 --- a/korganizer/datenavigatorcontainer.cpp +++ b/korganizer/datenavigatorcontainer.cpp @@ -207,18 +207,18 @@ void DateNavigatorContainer::resizeEvent( TQResizeEvent * ) #if 0 kdDebug(5850) << "DateNavigatorContainer::resizeEvent()" << endl; kdDebug(5850) << " CURRENT SIZE: " << size() << endl; - kdDebug(5850) << " MINIMUM SIZEHINT: " << tqminimumSizeHint() << endl; - kdDebug(5850) << " SIZEHINT: " << tqsizeHint() << endl; - kdDebug(5850) << " MINIMUM SIZE: " << tqminimumSize() << endl; + kdDebug(5850) << " MINIMUM SIZEHINT: " << minimumSizeHint() << endl; + kdDebug(5850) << " SIZEHINT: " << sizeHint() << endl; + kdDebug(5850) << " MINIMUM SIZE: " << minimumSize() << endl; #endif TQTimer::singleShot( 0, this, TQT_SLOT( resizeAllContents() ) ); } void DateNavigatorContainer::resizeAllContents() { - TQSize minSize = mNavigatorView->tqminimumSizeHint(); + TQSize minSize = mNavigatorView->minimumSizeHint(); -// kdDebug(5850) << " NAVIGATORVIEW tqminimumSizeHint: " << minSize << endl; +// kdDebug(5850) << " NAVIGATORVIEW minimumSizeHint: " << minSize << endl; int margin = KDialog::spacingHint(); int verticalCount = ( size().height() - margin*2 ) / minSize.height(); @@ -286,16 +286,16 @@ void DateNavigatorContainer::resizeAllContents() } } -TQSize DateNavigatorContainer::tqminimumSizeHint() const +TQSize DateNavigatorContainer::minimumSizeHint() const { int margin = KDialog::spacingHint() * 2; - return mNavigatorView->tqminimumSizeHint() + TQSize( margin, margin ); + return mNavigatorView->minimumSizeHint() + TQSize( margin, margin ); } -TQSize DateNavigatorContainer::tqsizeHint() const +TQSize DateNavigatorContainer::sizeHint() const { int margin = KDialog::spacingHint() * 2; - return mNavigatorView->tqsizeHint() + TQSize( margin, margin ); + return mNavigatorView->sizeHint() + TQSize( margin, margin ); } void DateNavigatorContainer::goNextMonth() diff --git a/korganizer/datenavigatorcontainer.h b/korganizer/datenavigatorcontainer.h index ae8f22a25..cd0b98e99 100644 --- a/korganizer/datenavigatorcontainer.h +++ b/korganizer/datenavigatorcontainer.h @@ -42,8 +42,8 @@ class DateNavigatorContainer: public TQFrame */ void setCalendar( Calendar * ); - TQSize tqminimumSizeHint() const; - TQSize tqsizeHint() const; + TQSize minimumSizeHint() const; + TQSize sizeHint() const; void setUpdateNeeded(); public slots: /** diff --git a/korganizer/eventarchiver.cpp b/korganizer/eventarchiver.cpp index ac0cef045..51e25517d 100644 --- a/korganizer/eventarchiver.cpp +++ b/korganizer/eventarchiver.cpp @@ -52,7 +52,7 @@ void EventArchiver::runOnce( Calendar* calendar, const TQDate& limitDate, TQWidg void EventArchiver::runAuto( Calendar* calendar, TQWidget* widget, bool withGUI ) { - TQDate limitDate( TQDate::tqcurrentDate() ); + TQDate limitDate( TQDate::currentDate() ); int expiryTime = KOPrefs::instance()->mExpiryTime; switch (KOPrefs::instance()->mExpiryUnit) { case KOPrefs::UnitDays: // Days diff --git a/korganizer/filteredit_base.ui b/korganizer/filteredit_base.ui index f1bdc7902..bfab52075 100644 --- a/korganizer/filteredit_base.ui +++ b/korganizer/filteredit_base.ui @@ -111,7 +111,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>15</width> <height>20</height> @@ -165,7 +165,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>21</height> @@ -220,7 +220,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>110</height> diff --git a/korganizer/freebusymanager.cpp b/korganizer/freebusymanager.cpp index ec32367b1..62c4e6ef3 100644 --- a/korganizer/freebusymanager.cpp +++ b/korganizer/freebusymanager.cpp @@ -80,7 +80,7 @@ FreeBusyDownloadJob::FreeBusyDownloadJob( const TQString &email, const KURL &url KIO::TransferJob *job = KIO::get( url, false, false ); //pass the mainwindow to the job so any prompts are active KOrg::MainWindow *korg = ActionManager::findInstance( KURL() ); - job->setWindow( korg->tqtopLevelWidget() ); + job->setWindow( korg->topLevelWidget() ); connect( job, TQT_SIGNAL( result( KIO::Job * ) ), TQT_SLOT( slotResult( KIO::Job * ) ) ); @@ -140,7 +140,7 @@ void FreeBusyManager::setCalendar( KCal::Calendar *c ) KCal::FreeBusy *FreeBusyManager::ownerFreeBusy() { - TQDateTime start = TQDateTime::tqcurrentDateTime(); + TQDateTime start = TQDateTime::currentDateTime(); TQDateTime end = start.addDays( KOPrefs::instance()->mFreeBusyPublishDays ); FreeBusy *freebusy = new FreeBusy( mCalendar, start, end ); @@ -176,13 +176,13 @@ void FreeBusyManager::slotPerhapsUploadFB() // A timer is already running, so we don't need to do anything return; - int now = static_cast<int>( TQDateTime::tqcurrentDateTime().toTime_t() ); + int now = static_cast<int>( TQDateTime::currentDateTime().toTime_t() ); int eta = static_cast<int>( mNextUploadTime.toTime_t() ) - now; if( !mUploadingFreeBusy ) { // Not currently uploading if( mNextUploadTime.isNull() || - TQDateTime::tqcurrentDateTime() > mNextUploadTime ) { + TQDateTime::currentDateTime() > mNextUploadTime ) { // No uploading have been done in this session, or delay time is over publishFreeBusy(); return; @@ -271,7 +271,7 @@ void FreeBusyManager::publishFreeBusy() } // Save the time of the next free/busy uploading - mNextUploadTime = TQDateTime::tqcurrentDateTime(); + mNextUploadTime = TQDateTime::currentDateTime(); if( KOPrefs::instance()->mFreeBusyPublishDelay > 0 ) mNextUploadTime = mNextUploadTime.addSecs( KOPrefs::instance()->mFreeBusyPublishDelay * 60 ); @@ -337,7 +337,7 @@ void FreeBusyManager::publishFreeBusy() false /*don't show progress info*/ ); //pass the mainwindow to the job so any prompts are active KOrg::MainWindow *korg = ActionManager::findInstance( KURL() ); - job->setWindow( korg->tqtopLevelWidget() ); + job->setWindow( korg->topLevelWidget() ); connect( job, TQT_SIGNAL( result( KIO::Job * ) ), TQT_SLOT( slotUploadFreeBusyResult( KIO::Job * ) ) ); @@ -557,7 +557,7 @@ KURL FreeBusyManager::freeBusyUrl( const TQString &email ) // This means that if the trailing slash is not entered, we can treat this as a custom, non-Kolab URL! // In that case, just pass it on through with substitution for %u and %d // TODO: May want an explicit configuration option in kogroupwareprefspage.ui for this - if ((fullpathURL.url().tqendsWith("/", true) == false) || (fullpathURL.url().contains("%25u", true)) || (fullpathURL.url().contains("%25d", true))) { + if ((fullpathURL.url().endsWith("/", true) == false) || (fullpathURL.url().contains("%25u", true)) || (fullpathURL.url().contains("%25d", true))) { // A generic URL, substitute %u and %d fullpathURL = fullpathURL.url().replace("%25u", emailName, true); fullpathURL = fullpathURL.url().replace("%25d", emailHost, true); diff --git a/korganizer/incidencechanger.cpp b/korganizer/incidencechanger.cpp index 0cf69fc20..c3517e75f 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->setqStatus( KCal::Attendee::Declined ); + newMe->seStatus( KCal::Attendee::Declined ); tmp->clearAttendees(); tmp->addAttendee( newMe ); break; diff --git a/korganizer/interfaces/korganizer/baseview.h b/korganizer/interfaces/korganizer/baseview.h index b1f6afa1d..2a7fc375b 100644 --- a/korganizer/interfaces/korganizer/baseview.h +++ b/korganizer/interfaces/korganizer/baseview.h @@ -138,7 +138,7 @@ class KDE_EXPORT BaseView : public TQWidget /** Return number of currently shown dates. A return value of 0 means no idea. */ - virtual int tqcurrentDateCount() = 0; + virtual int currentDateCount() = 0; /** Return if this view is a view for displaying events. */ virtual bool isEventView() { return false; } diff --git a/korganizer/interfaces/korganizer/mainwindow.h b/korganizer/interfaces/korganizer/mainwindow.h index 8c98dcd01..dcda1bee5 100644 --- a/korganizer/interfaces/korganizer/mainwindow.h +++ b/korganizer/interfaces/korganizer/mainwindow.h @@ -68,7 +68,7 @@ class MainWindow /** Return widget whcih represents this main window. */ - virtual TQWidget *tqtopLevelWidget() = 0; + virtual TQWidget *topLevelWidget() = 0; /** Return ActionManager of this main window. */ diff --git a/korganizer/interfaces/korganizer/part.h b/korganizer/interfaces/korganizer/part.h index 50c765d65..35e426d88 100644 --- a/korganizer/interfaces/korganizer/part.h +++ b/korganizer/interfaces/korganizer/part.h @@ -39,7 +39,7 @@ class Part : public KParts::Part typedef TQPtrList<Part> List; Part( MainWindow *parent, const char *name ) - : KParts::Part( parent?(TQT_TQOBJECT(parent->tqtopLevelWidget())):0, name ), mMainWindow( parent ) {} + : KParts::Part( parent?(TQT_TQOBJECT(parent->topLevelWidget())):0, name ), mMainWindow( parent ) {} virtual ~Part() {} diff --git a/korganizer/journalentry.cpp b/korganizer/journalentry.cpp index cf93a58f1..a9660cea9 100644 --- a/korganizer/journalentry.cpp +++ b/korganizer/journalentry.cpp @@ -74,7 +74,7 @@ JournalDateEntry::JournalDateEntry( Calendar *calendar, TQWidget *parent ) : mTitle = new JournalTitleLable( this ); mTitle->setMargin(2); - mTitle->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); + mTitle->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); connect( mTitle, TQT_SIGNAL( linkClicked( const TQString & ) ), this, TQT_SLOT( emitNewJournal() ) ); } @@ -213,7 +213,7 @@ JournalEntry::JournalEntry( Journal* j, TQWidget *parent ) : mDeleteButton = new TQToolButton( this, "deleteButton" ); TQPixmap pix = KOGlobals::self()->smallIcon( "editdelete" ); mDeleteButton->setPixmap( pix ); - mDeleteButton->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); + mDeleteButton->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); TQToolTip::add( mDeleteButton, i18n("Delete this journal entry") ); TQWhatsThis::add( mDeleteButton, i18n("Delete this journal entry") ); mLayout->addWidget( mDeleteButton, 0, 4 ); @@ -221,7 +221,7 @@ JournalEntry::JournalEntry( Journal* j, TQWidget *parent ) : mEditButton = new TQToolButton( this, "editButton" ); mEditButton->setPixmap( KOGlobals::self()->smallIcon( "edit" ) ); - mEditButton->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); + mEditButton->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); TQToolTip::add( mEditButton, i18n("Edit this journal entry") ); TQWhatsThis::add( mEditButton, i18n("Opens an editor dialog for this journal entry") ); mLayout->addWidget( mEditButton, 0, 5 ); @@ -230,7 +230,7 @@ JournalEntry::JournalEntry( Journal* j, TQWidget *parent ) : #ifndef KORG_NOPRINTER mPrintButton = new TQToolButton( this, "printButton" ); mPrintButton->setPixmap( KOGlobals::self()->smallIcon( "printer1" ) ); - mPrintButton->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); + mPrintButton->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); TQToolTip::add( mPrintButton, i18n("Print this journal entry") ); TQWhatsThis::add( mPrintButton, i18n("Opens the print dialog for this journal entry") ); mLayout->addWidget( mPrintButton, 0, 6 ); diff --git a/korganizer/kdatenavigator.cpp b/korganizer/kdatenavigator.cpp index d47b79748..c97ec9f76 100644 --- a/korganizer/kdatenavigator.cpp +++ b/korganizer/kdatenavigator.cpp @@ -67,7 +67,7 @@ KDateNavigator::KDateNavigator( TQWidget *parent, const char *name ) for( i = 0; i < 7; i++ ) { mHeadings[i] = new TQLabel( this ); mHeadings[i]->setFont( TQFont( generalFont, 10, TQFont::Bold ) ); - mHeadings[i]->tqsetAlignment( AlignCenter ); + mHeadings[i]->setAlignment( AlignCenter ); topLayout->addWidget( mHeadings[i], 1, i + 1 ); } @@ -75,7 +75,7 @@ KDateNavigator::KDateNavigator( TQWidget *parent, const char *name ) // Create the weeknumber labels for( i = 0; i < 6; i++ ) { mWeeknos[i] = new TQLabel( this ); - mWeeknos[i]->tqsetAlignment( AlignCenter ); + mWeeknos[i]->setAlignment( AlignCenter ); mWeeknos[i]->setFont( TQFont( generalFont, 10 ) ); mWeeknos[i]->installEventFilter( this ); diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp index 5600682f1..a05a82d2c 100644 --- a/korganizer/koagenda.cpp +++ b/korganizer/koagenda.cpp @@ -73,7 +73,7 @@ MarcusBains::MarcusBains(KOAgenda *_agenda,const char *name ) minutes->start(0, true); mTimeBox = new TQLabel(this); - mTimeBox->tqsetAlignment(TQt::AlignRight | TQt::AlignBottom); + mTimeBox->setAlignment(TQt::AlignRight | TQt::AlignBottom); TQPalette pal = mTimeBox->palette(); pal.setColor(TQColorGroup::Foreground, TQt::red); mTimeBox->setPalette(pal); @@ -92,13 +92,13 @@ MarcusBains::~MarcusBains() int MarcusBains::todayColumn() { - TQDate tqcurrentDate = TQDate::tqcurrentDate(); + TQDate currentDate = TQDate::currentDate(); DateList dateList = agenda->dateList(); DateList::ConstIterator it; int col = 0; for(it = dateList.begin(); it != dateList.end(); ++it) { - if((*it) == tqcurrentDate) + if((*it) == currentDate) return KOGlobals::self()->reverseLayout() ? agenda->columns() - 1 - col : col; ++col; diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp index 124102b00..b8cd33fdf 100644 --- a/korganizer/koagendaitem.cpp +++ b/korganizer/koagendaitem.cpp @@ -769,7 +769,7 @@ void KOAgendaItem::paintEvent( TQPaintEvent *ev ) if ( static_cast<Todo*>(mIncidence)->isOverdue() ) bgColor = KOPrefs::instance()->todoOverdueColor(); else if ( static_cast<Todo*>(mIncidence)->dtDue().date() == - TQDateTime::tqcurrentDateTime().date() ) + TQDateTime::currentDateTime().date() ) bgColor = KOPrefs::instance()->todoDueTodayColor(); } diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp index ba565a8d2..7b48d9cca 100644 --- a/korganizer/koagendaview.cpp +++ b/korganizer/koagendaview.cpp @@ -137,7 +137,7 @@ KOAlternateLabel::KOAlternateLabel(const TQString &shortlabel, const TQString &l : TQLabel(parent, name), mTextTypeFixed(false), mShortText(shortlabel), mLongText(longlabel), mExtensiveText(extensivelabel) { - tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); + setSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); if (mExtensiveText.isEmpty()) mExtensiveText = mLongText; squeezeTextToLabel(); } @@ -235,9 +235,9 @@ void KOAlternateLabel::resizeEvent( TQResizeEvent * ) squeezeTextToLabel(); } -TQSize KOAlternateLabel::tqminimumSizeHint() const +TQSize KOAlternateLabel::minimumSizeHint() const { - TQSize sh = TQLabel::tqminimumSizeHint(); + TQSize sh = TQLabel::minimumSizeHint(); sh.setWidth(-1); return sh; } @@ -258,7 +258,7 @@ KOAgendaView::KOAgendaView( Calendar *cal, mPendingChanges( true ), mAreDatesInitialized( false ) { - mSelectedDates.append(TQDate::tqcurrentDate()); + mSelectedDates.append(TQDate::currentDate()); mLayoutDayLabels = 0; mDayLabelsFrame = 0; @@ -313,12 +313,12 @@ KOAgendaView::KOAgendaView( Calendar *cal, if ( KOPrefs::instance()->compactDialogs() ) { mExpandButton = new TQPushButton(mDummyAllDayLeft); mExpandButton->setPixmap( mNotExpandedPixmap ); - mExpandButton->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, + mExpandButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); connect( mExpandButton, TQT_SIGNAL( clicked() ), TQT_SIGNAL( toggleExpand() ) ); } else { TQLabel *label = new TQLabel( i18n("All Day"), mDummyAllDayLeft ); - label->tqsetAlignment( TQt::AlignRight | TQt::AlignVCenter | TQt::WordBreak ); + label->setAlignment( TQt::AlignRight | TQt::AlignVCenter | TQt::WordBreak ); } mAllDayAgenda = new KOAgenda( 1, calendarView, mAllDayFrame ); @@ -635,8 +635,8 @@ void KOAgendaView::createDayLabels( bool force ) longstr, veryLongStr, mDayLabels); dayLabel->useShortText(); // will be recalculated in updateDayLabelSizes() anyway dayLabel->setMinimumWidth(1); - dayLabel->tqsetAlignment(TQLabel::AlignHCenter); - if (date == TQDate::tqcurrentDate()) { + dayLabel->setAlignment(TQLabel::AlignHCenter); + if (date == TQDate::currentDate()) { TQFont font = dayLabel->font(); font.setBold(true); dayLabel->setFont(font); @@ -651,7 +651,7 @@ void KOAgendaView::createDayLabels( bool force ) // use a KOAlternateLabel so when the text doesn't fit any more a tooltip is used KOAlternateLabel*label = new KOAlternateLabel( (*textit), (*textit), TQString(), mDayLabels ); label->setMinimumWidth(1); - label->tqsetAlignment(AlignCenter); + label->setAlignment(AlignCenter); dayLayout->addWidget(label); } @@ -664,7 +664,7 @@ void KOAgendaView::createDayLabels( bool force ) // use a KOAlternateLabel so when the text doesn't fit any more a tooltip is used KOAlternateLabel*label = new KOAlternateLabel( text, text, TQString(), mDayLabels ); label->setMinimumWidth(1); - label->tqsetAlignment(AlignCenter); + label->setAlignment(AlignCenter); dayLayout->addWidget(label); } } @@ -696,7 +696,7 @@ int KOAgendaView::maxDatesHint() return 0; } -int KOAgendaView::tqcurrentDateCount() +int KOAgendaView::currentDateCount() { return mSelectedDates.count(); } @@ -1420,7 +1420,7 @@ void KOAgendaView::fillAgenda() void KOAgendaView::displayIncidence( Incidence *incidence ) { - TQDate today = TQDate::tqcurrentDate(); + TQDate today = TQDate::currentDate(); DateTimeList::iterator t; // FIXME: use a visitor here @@ -1523,7 +1523,7 @@ void KOAgendaView::clearView() CalPrinterBase::PrintType KOAgendaView::printType() { - if ( tqcurrentDateCount() == 1 ) return CalPrinterBase::Day; + if ( currentDateCount() == 1 ) return CalPrinterBase::Day; else return CalPrinterBase::Week; } diff --git a/korganizer/koagendaview.h b/korganizer/koagendaview.h index 647dcafcb..1a90bad09 100644 --- a/korganizer/koagendaview.h +++ b/korganizer/koagendaview.h @@ -82,7 +82,7 @@ class KOAlternateLabel : public TQLabel TQWidget *parent = 0, const char *name = 0 ); ~KOAlternateLabel(); - virtual TQSize tqminimumSizeHint() const; + virtual TQSize minimumSizeHint() const; enum TextType { Short = 0, Long = 1, Extensive = 2 }; TextType largestFittingTextType() const; @@ -121,7 +121,7 @@ class KOAgendaView : public KOrg::AgendaView, public KCal::Calendar::Observer virtual int maxDatesHint(); /** Returns number of currently shown dates. */ - virtual int tqcurrentDateCount(); + virtual int currentDateCount(); /** returns the currently selected events */ virtual Incidence::List selectedIncidences(); diff --git a/korganizer/koapp.cpp b/korganizer/koapp.cpp index aecf8ba9c..dcebd48be 100644 --- a/korganizer/koapp.cpp +++ b/korganizer/koapp.cpp @@ -132,7 +132,7 @@ void KOrganizerApp::processCalendar( const KURL &url ) bool hasDocument = !url.isEmpty(); korg = new KOrganizer( "KOrganizer MainWindow" ); korg->init( hasDocument ); - korg->tqtopLevelWidget()->show(); + korg->topLevelWidget()->show(); kdDebug(5850) << "KOrganizerApp::processCalendar(): '" << url.url() << "'" << endl; @@ -145,12 +145,12 @@ void KOrganizerApp::processCalendar( const KURL &url ) korg->view()->updateView(); } } else { - korg->tqtopLevelWidget()->show(); + korg->topLevelWidget()->show(); } // Handle window activation #if defined TQ_WS_X11 && ! defined K_WS_TQTONLY - KStartupInfo::setNewStartupId( korg->tqtopLevelWidget(), startupId() ); + KStartupInfo::setNewStartupId( korg->topLevelWidget(), startupId() ); #endif } diff --git a/korganizer/koattendeeeditor.cpp b/korganizer/koattendeeeditor.cpp index 497f10982..6e3b78153 100644 --- a/korganizer/koattendeeeditor.cpp +++ b/korganizer/koattendeeeditor.cpp @@ -430,7 +430,7 @@ void KOAttendeeEditor::updateAttendee() a->setUid( mUid ); a->setEmail( email ); a->setRole( Attendee::Role( mRoleCombo->currentItem() ) ); - a->setqStatus( Attendee::PartStat( mStatusCombo->currentItem() ) ); + a->seStatus( Attendee::PartStat( mStatusCombo->currentItem() ) ); a->setRSVP( mRsvpButton->isChecked() ); updateCurrentItem(); diff --git a/korganizer/kocore.cpp b/korganizer/kocore.cpp index b3781e2d9..957e6c08d 100644 --- a/korganizer/kocore.cpp +++ b/korganizer/kocore.cpp @@ -236,7 +236,7 @@ void KOCore::removeXMLGUIClient( TQWidget *wdg ) KXMLGUIClient* KOCore::xmlguiClient( TQWidget *wdg ) const { - TQWidget *topLevel = wdg->tqtopLevelWidget(); + TQWidget *topLevel = wdg->topLevelWidget(); TQMap<TQWidget*, KXMLGUIClient*>::ConstIterator it = mXMLGUIClients.find( topLevel ); if ( it != mXMLGUIClients.end() ) return it.data(); diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp index 0e921e440..718cc5c04 100644 --- a/korganizer/kodaymatrix.cpp +++ b/korganizer/kodaymatrix.cpp @@ -57,7 +57,7 @@ #undef FocusIn #undef KeyPress #undef None -#undef tqStatus +#undef Status #endif // ============================================================================ @@ -214,9 +214,9 @@ void KODayMatrix::recalculateToday() mDayLabels[ i ] = TQString::number( KOGlobals::self()->calendarSystem()->day( mDays[i] )); // if today is in the currently displayed month, hilight today - if ( mDays[ i ].year() == TQDate::tqcurrentDate().year() && - mDays[ i ].month() == TQDate::tqcurrentDate().month() && - mDays[ i ].day() == TQDate::tqcurrentDate().day() ) { + if ( mDays[ i ].year() == TQDate::currentDate().year() && + mDays[ i ].month() == TQDate::currentDate().month() && + mDays[ i ].day() == TQDate::currentDate().day() ) { mToday = i; } } diff --git a/korganizer/koeditoralarms_base.ui b/korganizer/koeditoralarms_base.ui index 9f599b6fd..cc0625282 100644 --- a/korganizer/koeditoralarms_base.ui +++ b/korganizer/koeditoralarms_base.ui @@ -298,7 +298,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>41</height> @@ -400,7 +400,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>61</height> @@ -468,7 +468,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -570,7 +570,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>60</height> diff --git a/korganizer/koeditorattachments.cpp b/korganizer/koeditorattachments.cpp index b39d5fe53..fe67a54ec 100644 --- a/korganizer/koeditorattachments.cpp +++ b/korganizer/koeditorattachments.cpp @@ -232,7 +232,7 @@ AttachmentEditDialog::AttachmentEditDialog( AttachmentListItem *item, } else { uint size = item->attachment()->size(); grid->addWidget( new TQLabel( i18n( "Size:" ), topFrame ), 4, 0 ); - grid->addWidget( new TQLabel( TQString::tqfromLatin1( "%1 (%2)" ). + grid->addWidget( new TQLabel( TQString::fromLatin1( "%1 (%2)" ). arg( KIO::convertSize( size ) ). arg( KGlobal::locale()->formatNumber( size, 0 ) ), topFrame ), 4, 2 ); @@ -625,7 +625,7 @@ void KOEditorAttachments::handlePasteOrDrop( TQMimeSource* source ) addUriAttachment( (*it).url(), TQString(), label, true ); } } else { // we take anything - addDataAttachment( source->tqencodedData( source->format() ), + addDataAttachment( source->encodedData( source->format() ), source->format(), KMimeType::mimeType( source->format() )->name() ); } diff --git a/korganizer/koeditordetails.cpp b/korganizer/koeditordetails.cpp index a47dc7374..be9a7fbaf 100644 --- a/korganizer/koeditordetails.cpp +++ b/korganizer/koeditordetails.cpp @@ -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()->setqStatus( status ); + item->data()->seStatus( status ); item->updateItem(); } } diff --git a/korganizer/koeditorfreebusy.cpp b/korganizer/koeditorfreebusy.cpp index 2fc7b30fd..e3f88f14e 100644 --- a/korganizer/koeditorfreebusy.cpp +++ b/korganizer/koeditorfreebusy.cpp @@ -202,7 +202,7 @@ void FreeBusyItem::setFreeBusyPeriods( FreeBusy* fb ) // No free/busy information //debug only start // int ii ; - // TQDateTime cur = TQDateTime::tqcurrentDateTime(); + // TQDateTime cur = TQDateTime::currentDateTime(); // for( ii = 0; ii < 10 ;++ii ) { // KDGanttViewTaskItem* newSubItem = new KDGanttViewTaskItem( this ); // cur = cur.addSecs( 7200 ); @@ -310,16 +310,16 @@ KOEditorFreeBusy::KOEditorFreeBusy( int spacing, TQWidget *parent, mGanttView->setShowHeaderPopupMenu( false, false, false, false, false, false ); // Initially, show 15 days back and forth // set start to even hours, i.e. to 12:AM 0 Min 0 Sec - TQDateTime horizonStart = TQDateTime( TQDateTime::tqcurrentDateTime() + TQDateTime horizonStart = TQDateTime( TQDateTime::currentDateTime() .addDays( -15 ).date() ); - TQDateTime horizonEnd = TQDateTime::tqcurrentDateTime().addDays( 15 ); + TQDateTime horizonEnd = TQDateTime::currentDateTime().addDays( 15 ); mGanttView->setHorizonStart( horizonStart ); mGanttView->setHorizonEnd( horizonEnd ); mGanttView->setCalendarMode( true ); //mGanttView->setDisplaySubitemsAsGroup( true ); mGanttView->setShowLegendButton( false ); // Initially, center to current date - mGanttView->centerTimelineAfterShow( TQDateTime::tqcurrentDateTime() ); + mGanttView->centerTimelineAfterShow( TQDateTime::currentDateTime() ); if ( KGlobal::locale()->use12Clock() ) mGanttView->setHourFormat( KDGanttView::Hour_12 ); else @@ -580,10 +580,10 @@ bool KOEditorFreeBusy::findFreeSlot( TQDateTime &dtFrom, TQDateTime &dtTo ) // Make sure that we never suggest a date in the past, even if the // user originally scheduled the meeting to be in the past. - if( tryFrom < TQDateTime::tqcurrentDateTime() ) { + if( tryFrom < TQDateTime::currentDateTime() ) { // The slot to look for is at least partially in the past. int secs = tryFrom.secsTo( tryTo ); - tryFrom = TQDateTime::tqcurrentDateTime(); + tryFrom = TQDateTime::currentDateTime(); tryTo = tryFrom.addSecs( secs ); } @@ -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()->setqStatus( status ); + item->attendee()->seStatus( 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()->setqStatus( (Attendee::PartStat)status ); + currentAttendee()->seStatus( (Attendee::PartStat)status ); updateCurrentItem(); updateAttendeeInput(); } diff --git a/korganizer/koeditorgeneralevent.cpp b/korganizer/koeditorgeneralevent.cpp index e069d65de..793b90d70 100644 --- a/korganizer/koeditorgeneralevent.cpp +++ b/korganizer/koeditorgeneralevent.cpp @@ -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::tqcurrentDate() ) ) ); + .tqarg( 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::tqcurrentDate() ) ) ); + .tqarg( KGlobal::locale()->formatDate( TQDate::currentDate() ) ) ); return false; } diff --git a/korganizer/koeditorgeneraljournal.cpp b/korganizer/koeditorgeneraljournal.cpp index 25372ba49..b14aa7e58 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::tqcurrentDate() ) ) ); + .tqarg( KGlobal::locale()->formatDate( TQDate::currentDate() ) ) ); return false; } diff --git a/korganizer/koeditorgeneraltodo.cpp b/korganizer/koeditorgeneraltodo.cpp index fe2fbe2b2..7f4684e10 100644 --- a/korganizer/koeditorgeneraltodo.cpp +++ b/korganizer/koeditorgeneraltodo.cpp @@ -252,7 +252,7 @@ void KOEditorGeneralTodo::initPriority(TQWidget *parent, TQBoxLayout *topLayout) priorityLabel->setBuddy( mPriorityCombo ); } -void KOEditorGeneralTodo::initqStatus(TQWidget *parent,TQBoxLayout *topLayout) +void KOEditorGeneralTodo::iniStatus(TQWidget *parent,TQBoxLayout *topLayout) { TQBoxLayout *statusLayout = new TQHBoxLayout(topLayout); @@ -284,12 +284,12 @@ void KOEditorGeneralTodo::setDefaults( const TQDateTime &due, bool allDay ) mDueTimeEdit->setTime( due.time() ); } else { // Make it due tomorrow. - mDueDateEdit->setDate( TQDate::tqcurrentDate().addDays(1) ); + mDueDateEdit->setDate( TQDate::currentDate().addDays(1) ); mDueTimeEdit->setTime( TQTime::currentTime() ); } - if ( !due.isValid() || (TQDateTime::tqcurrentDateTime() < due) ) { - mStartDateEdit->setDate( TQDate::tqcurrentDate() ); + if ( !due.isValid() || (TQDateTime::currentDateTime() < due) ) { + mStartDateEdit->setDate( TQDate::currentDate() ); mStartTimeEdit->setTime( TQTime::currentTime() ); } else { mStartDateEdit->setDate( due.date().addDays( -1 ) ); @@ -322,7 +322,7 @@ void KOEditorGeneralTodo::readTodo(Todo *todo, Calendar *calendar, const TQDate } else { mDueDateEdit->setEnabled(false); mDueTimeEdit->setEnabled(false); - mDueDateEdit->setDate(TQDate::tqcurrentDate()); + mDueDateEdit->setDate(TQDate::currentDate()); mDueTimeEdit->setTime(TQTime::currentTime()); mDueCheck->setChecked(false); } @@ -339,7 +339,7 @@ void KOEditorGeneralTodo::readTodo(Todo *todo, Calendar *calendar, const TQDate } else { mStartDateEdit->setEnabled(false); mStartTimeEdit->setEnabled(false); - mStartDateEdit->setDate(TQDate::tqcurrentDate()); + mStartDateEdit->setDate(TQDate::currentDate()); mStartTimeEdit->setTime(TQTime::currentTime()); mStartCheck->setChecked(false); } @@ -545,7 +545,7 @@ void KOEditorGeneralTodo::completedChanged( int index ) { if ( index == 10 ) { mCompletedToggle->setChecked( true ); - mCompletedDateTime = TQDateTime::tqcurrentDateTime(); + mCompletedDateTime = TQDateTime::currentDateTime(); } else { mCompletedToggle->setChecked( false ); } @@ -556,7 +556,7 @@ void KOEditorGeneralTodo::completedChanged() { if ( mCompletedToggle->isChecked() ) { mCompletedCombo->setCurrentItem( 10 ); - mCompletedDateTime = TQDateTime::tqcurrentDateTime(); + mCompletedDateTime = TQDateTime::currentDateTime(); } else { mCompletedCombo->setCurrentItem( 0 ); } diff --git a/korganizer/koeditorgeneraltodo.h b/korganizer/koeditorgeneraltodo.h index 27ffdc270..bf7fb9794 100644 --- a/korganizer/koeditorgeneraltodo.h +++ b/korganizer/koeditorgeneraltodo.h @@ -48,7 +48,7 @@ class KOEditorGeneralTodo : public KOEditorGeneral virtual ~KOEditorGeneralTodo(); void initTime(TQWidget *, TQBoxLayout *); - void initqStatus(TQWidget *, TQBoxLayout *); + void iniStatus(TQWidget *, TQBoxLayout *); void initCompletion(TQWidget *, TQBoxLayout *); void initPriority(TQWidget *, TQBoxLayout *); diff --git a/korganizer/koeditorrecurrence.cpp b/korganizer/koeditorrecurrence.cpp index b1174bbb9..b93f6d196 100644 --- a/korganizer/koeditorrecurrence.cpp +++ b/korganizer/koeditorrecurrence.cpp @@ -590,7 +590,7 @@ ExceptionsWidget::ExceptionsWidget( TQWidget *parent, const char *name ) : TQWhatsThis::add( mExceptionDateEdit, i18n("A date that should be considered an exception " "to the recurrence rules for this event or to-do.") ); - mExceptionDateEdit->setDate( TQDate::tqcurrentDate() ); + mExceptionDateEdit->setDate( TQDate::currentDate() ); boxLayout->addWidget( mExceptionDateEdit, 0, 0 ); TQPushButton *addExceptionButton = new TQPushButton( diff --git a/korganizer/koeventeditor.cpp b/korganizer/koeventeditor.cpp index c73a67ac2..27bcb827e 100644 --- a/korganizer/koeventeditor.cpp +++ b/korganizer/koeventeditor.cpp @@ -242,7 +242,7 @@ void KOEventEditor::setTexts( const TQString &summary, const TQString &descripti void KOEventEditor::loadDefaults() { - TQDateTime from( TQDate::tqcurrentDate(), KOPrefs::instance()->mStartTime.time() ); + TQDateTime from( TQDate::currentDate(), KOPrefs::instance()->mStartTime.time() ); int addSecs = ( KOPrefs::instance()->mDefaultDuration.time().hour()*3600 ) + ( KOPrefs::instance()->mDefaultDuration.time().minute()*60 ); TQDateTime to( from.addSecs( addSecs ) ); diff --git a/korganizer/kogroupware.cpp b/korganizer/kogroupware.cpp index 5104383c1..28f62dd45 100644 --- a/korganizer/kogroupware.cpp +++ b/korganizer/kogroupware.cpp @@ -174,7 +174,7 @@ void KOGroupware::incomingDirChanged( const TQString& path ) KCal::Scheduler::Method method = static_cast<KCal::Scheduler::Method>( message->method() ); - KCal::ScheduleMessage::tqStatus status = message->status(); + KCal::ScheduleMessage::Status status = message->status(); KCal::Incidence* incidence = dynamic_cast<KCal::Incidence*>( message->event() ); if(!incidence) { @@ -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)->setqStatus( KCal::Attendee::Accepted ); + (*it)->seStatus( KCal::Attendee::Accepted ); else if ( action.startsWith( "tentative" ) ) - (*it)->setqStatus( KCal::Attendee::Tentative ); + (*it)->seStatus( KCal::Attendee::Tentative ); else if ( KOPrefs::instance()->outlookCompatCounterProposals() && action.startsWith( "counter" ) ) - (*it)->setqStatus( KCal::Attendee::Tentative ); + (*it)->seStatus( KCal::Attendee::Tentative ); else if ( action.startsWith( "delegated" ) ) - (*it)->setqStatus( KCal::Attendee::Delegated ); + (*it)->seStatus( KCal::Attendee::Delegated ); break; } } diff --git a/korganizer/kogroupwareprefspage.ui b/korganizer/kogroupwareprefspage.ui index feec8d710..1eb5fc662 100644 --- a/korganizer/kogroupwareprefspage.ui +++ b/korganizer/kogroupwareprefspage.ui @@ -153,7 +153,7 @@ Note: If KOrganizer is acting as a KDE Kolab client, this is not required, as th <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -226,7 +226,7 @@ For security reasons, it is not recommended to store your password in the config <property name="name"> <cstring>publishUser</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>120</width> <height>0</height> @@ -292,7 +292,7 @@ Ask the server administrator for this information.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>50</height> @@ -508,7 +508,7 @@ For security reasons, it is not recommended to store your password in the config <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>160</height> diff --git a/korganizer/kojournaleditor.cpp b/korganizer/kojournaleditor.cpp index 30e6c7d71..867d447f4 100644 --- a/korganizer/kojournaleditor.cpp +++ b/korganizer/kojournaleditor.cpp @@ -132,7 +132,7 @@ void KOJournalEditor::setTexts( const TQString &summary, const TQString &descrip void KOJournalEditor::loadDefaults() { - setDate( TQDate::tqcurrentDate() ); + setDate( TQDate::currentDate() ); } bool KOJournalEditor::processInput() diff --git a/korganizer/kojournalview.cpp b/korganizer/kojournalview.cpp index 1219fd57e..f5d64ca6a 100644 --- a/korganizer/kojournalview.cpp +++ b/korganizer/kojournalview.cpp @@ -97,7 +97,7 @@ void KOJournalView::appendJournal( Journal*journal, const TQDate &dt) } } -int KOJournalView::tqcurrentDateCount() +int KOJournalView::currentDateCount() { return mEntries.size(); } @@ -211,7 +211,7 @@ void KOJournalView::setIncidenceChanger( IncidenceChangerBase *changer ) void KOJournalView::newJournal() { emit newJournalSignal( 0/*ResourceCalendar*/, TQString()/*subResource*/, - TQDate::tqcurrentDate() ); + TQDate::currentDate() ); } #include "kojournalview.moc" diff --git a/korganizer/kojournalview.h b/korganizer/kojournalview.h index 056b456ee..347453cc2 100644 --- a/korganizer/kojournalview.h +++ b/korganizer/kojournalview.h @@ -47,7 +47,7 @@ class KOJournalView : public KOrg::BaseView const char *name = 0); ~KOJournalView(); - virtual int tqcurrentDateCount(); + virtual int currentDateCount(); virtual Incidence::List selectedIncidences(); DateList selectedIncidenceDates() { return DateList(); } void appendJournal( Journal*journal, const TQDate &dt); diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp index 32ddc327a..24ffb2025 100644 --- a/korganizer/kolistview.cpp +++ b/korganizer/kolistview.cpp @@ -72,7 +72,7 @@ void KOListViewToolTip::maybeTip( const TQPoint &pos ) if ( i && KOPrefs::instance()->mEnableToolTips ) { /* Calculate the rectangle. */ - r = eventlist->tqitemRect( it ); + r = eventlist->itemRect( it ); /* Show the tip */ TQString tipText( IncidenceFormatter::toolTipStr( mCalendar, i->data() ) ); if ( !tipText.isEmpty() ) { @@ -248,7 +248,7 @@ KOListView::KOListView( Calendar *calendar, new KOListViewToolTip( mListView->viewport(), calendar, mListView ); - mSelectedDates.append( TQDate::tqcurrentDate() ); + mSelectedDates.append( TQDate::currentDate() ); } KOListView::~KOListView() @@ -261,7 +261,7 @@ int KOListView::maxDatesHint() return 0; } -int KOListView::tqcurrentDateCount() +int KOListView::currentDateCount() { return mSelectedDates.count(); } @@ -499,9 +499,9 @@ void KOListView::clear() mDateList.clear(); } -TQSize KOListView::tqsizeHint() const +TQSize KOListView::sizeHint() const { - const TQSize s = KOEventView::tqsizeHint(); - return TQSize( s.width() + tqstyle().tqpixelMetric( TQStyle::PM_ScrollBarExtent ) + 1, + const TQSize s = KOEventView::sizeHint(); + return TQSize( s.width() + tqstyle().pixelMetric( TQStyle::PM_ScrollBarExtent ) + 1, s.height() ); } diff --git a/korganizer/kolistview.h b/korganizer/kolistview.h index 2480d6bef..a4533ea86 100644 --- a/korganizer/kolistview.h +++ b/korganizer/kolistview.h @@ -77,7 +77,7 @@ class KOListView : public KOEventView ~KOListView(); virtual int maxDatesHint(); - virtual int tqcurrentDateCount(); + virtual int currentDateCount(); virtual Incidence::List selectedIncidences(); virtual DateList selectedIncidenceDates(); @@ -90,7 +90,7 @@ class KOListView : public KOEventView void writeSettings(KConfig *config); void clear(); - TQSize tqsizeHint() const; + TQSize sizeHint() const; public slots: virtual void updateView(); diff --git a/korganizer/komailclient.cpp b/korganizer/komailclient.cpp index b664e68f3..1081f62a5 100644 --- a/korganizer/komailclient.cpp +++ b/korganizer/komailclient.cpp @@ -188,18 +188,18 @@ bool KOMailClient::send(const TQString &from,const TQString &_to,const TQString if (KOPrefs::instance()->mMailClient == KOPrefs::MailClientSendmail) { bool needHeaders = true; - TQString command = KStandardDirs::findExe(TQString::tqfromLatin1("sendmail"), - TQString::tqfromLatin1("/sbin:/usr/sbin:/usr/lib")); - if (!command.isNull()) command += TQString::tqfromLatin1(" -oi -t"); + TQString command = KStandardDirs::findExe(TQString::fromLatin1("sendmail"), + TQString::fromLatin1("/sbin:/usr/sbin:/usr/lib")); + if (!command.isNull()) command += TQString::fromLatin1(" -oi -t"); else { - command = KStandardDirs::findExe(TQString::tqfromLatin1("mail")); + command = KStandardDirs::findExe(TQString::fromLatin1("mail")); if (command.isNull()) return false; // give up - command.append(TQString::tqfromLatin1(" -s ")); + command.append(TQString::fromLatin1(" -s ")); command.append(KProcess::quote(subject)); if (bcc) { - command.append(TQString::tqfromLatin1(" -b ")); + command.append(TQString::fromLatin1(" -b ")); command.append(KProcess::quote(from)); } @@ -224,14 +224,14 @@ bool KOMailClient::send(const TQString &from,const TQString &_to,const TQString TQString textComplete; if (needHeaders) { - textComplete += TQString::tqfromLatin1("From: ") + from + '\n'; - textComplete += TQString::tqfromLatin1("To: ") + to + '\n'; + textComplete += TQString::fromLatin1("From: ") + from + '\n'; + textComplete += TQString::fromLatin1("To: ") + to + '\n'; if ( !cc.isEmpty() ) { - textComplete += TQString::tqfromLatin1("Cc: " ) + cc + '\n'; + textComplete += TQString::fromLatin1("Cc: " ) + cc + '\n'; } - if (bcc) textComplete += TQString::tqfromLatin1("Bcc: ") + from + '\n'; - textComplete += TQString::tqfromLatin1("Subject: ") + subject + '\n'; - textComplete += TQString::tqfromLatin1("X-Mailer: KOrganizer") + korgVersion + '\n'; + if (bcc) textComplete += TQString::fromLatin1("Bcc: ") + from + '\n'; + textComplete += TQString::fromLatin1("Subject: ") + subject + '\n'; + textComplete += TQString::fromLatin1("X-Mailer: KOrganizer") + korgVersion + '\n'; } textComplete += '\n'; // end of headers textComplete += body; diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp index eead72522..669049d74 100644 --- a/korganizer/komonthview.cpp +++ b/korganizer/komonthview.cpp @@ -78,7 +78,7 @@ void KOMonthCellToolTip::maybeTip( const TQPoint &pos ) if( i && KOPrefs::instance()->mEnableToolTips ) { /* Calculate the rectangle. */ - r=eventlist->tqitemRect( it ); + r=eventlist->itemRect( it ); /* Show the tip */ TQString tipText( IncidenceFormatter::toolTipStr( mCalendar, i->incidence(), mDate ) ); if ( !tipText.isEmpty() ) { @@ -245,7 +245,7 @@ void MonthViewItem::paint( TQPainter *p ) if ( mIncidence && mTodo ) { if ( static_cast<Todo*>( mIncidence )->isOverdue() ) { bgColor = KOPrefs::instance()->todoOverdueColor(); - } else if ( static_cast<Todo*>( mIncidence )->dtDue().date() == TQDate::tqcurrentDate() ) { + } else if ( static_cast<Todo*>( mIncidence )->dtDue().date() == TQDate::currentDate() ) { bgColor = KOPrefs::instance()->todoDueTodayColor(); } } @@ -388,7 +388,7 @@ MonthViewCell::MonthViewCell( KOMonthView *parent) mLabel = new TQLabel( this ); mLabel->setFrameStyle( TQFrame::Panel | TQFrame::Plain ); mLabel->setLineWidth( 1 ); - mLabel->tqsetAlignment( AlignCenter ); + mLabel->setAlignment( AlignCenter ); mItemList = new KNoScrollListBox( this ); mItemList->setMinimumSize( 10, 10 ); @@ -451,7 +451,7 @@ TQDate MonthViewCell::date() const void MonthViewCell::setFrameWidth() { // show current day with a thicker frame - if ( mDate == TQDate::tqcurrentDate() ) { + if ( mDate == TQDate::currentDate() ) { mItemList->setLineWidth( 3 ); } else if ( !isSelected ) { mItemList->setLineWidth( 1 ); @@ -496,7 +496,7 @@ void MonthViewCell::updateCell() { setFrameWidth(); - if ( mDate == TQDate::tqcurrentDate() ) { + if ( mDate == TQDate::currentDate() ) { setPalette( mTodayPalette ); TQPalette pal = mItemList->palette(); @@ -759,7 +759,7 @@ void MonthViewCell::select() enableScrollBars( true ); // don't mess up the cell when it represents today - if( mDate != TQDate::tqcurrentDate() ) { + if( mDate != TQDate::currentDate() ) { mItemList->setFrameStyle( TQFrame::Sunken | TQFrame::Panel ); mItemList->setLineWidth( 3 ); } @@ -828,7 +828,7 @@ KOMonthView::KOMonthView( Calendar *calendar, TQWidget *parent, const char *name // month name on top mLabel = new TQLabel( this ); mLabel->setFont( mfont ); - mLabel->tqsetAlignment( AlignCenter ); + mLabel->setAlignment( AlignCenter ); mLabel->setLineWidth( 0 ); mLabel->setFrameStyle( TQFrame::Plain ); @@ -843,7 +843,7 @@ KOMonthView::KOMonthView( Calendar *calendar, TQWidget *parent, const char *name label->setFont( bfont ); label->setFrameStyle( TQFrame::Panel | TQFrame::Raised ); label->setLineWidth( 1 ); - label->tqsetAlignment( AlignCenter ); + label->setAlignment( AlignCenter ); mDayLabels.insert( i, label ); @@ -886,7 +886,7 @@ int KOMonthView::maxDatesHint() return mNumCells; } -int KOMonthView::tqcurrentDateCount() +int KOMonthView::currentDateCount() { return mNumCells; } diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h index 732a63a1a..24f05f308 100644 --- a/korganizer/komonthview.h +++ b/korganizer/komonthview.h @@ -254,7 +254,7 @@ class KOMonthView: public KOEventView virtual int maxDatesHint(); /** Returns number of currently shown dates. */ - virtual int tqcurrentDateCount(); + virtual int currentDateCount(); /** Returns the currently selected events */ virtual Incidence::List selectedIncidences(); diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp index 1f3ede91a..50f832475 100644 --- a/korganizer/koprefsdialog.cpp +++ b/korganizer/koprefsdialog.cpp @@ -1108,11 +1108,11 @@ KOPrefsDialogPlugins::KOPrefsDialogPlugins( TQWidget *parent, const char* name ) topLayout->addWidget( mListView ); mDescription = new TQLabel( topFrame ); - mDescription->tqsetAlignment( TQLabel::NoAccel | TQLabel::WordBreak | TQLabel::AlignVCenter ); + mDescription->setAlignment( TQLabel::NoAccel | TQLabel::WordBreak | TQLabel::AlignVCenter ); mDescription->setFrameShape( TQLabel::Panel ); mDescription->setFrameShadow( TQLabel::Sunken ); mDescription->setMinimumSize( TQSize( 0, 55 ) ); - mDescription->tqsetSizePolicy( + mDescription->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, mDescription->sizePolicy().hasHeightForWidth() ) ); topLayout->addWidget( mDescription ); diff --git a/korganizer/korgac/alarmdialog.cpp b/korganizer/korgac/alarmdialog.cpp index a1b436850..cd46bbe43 100644 --- a/korganizer/korgac/alarmdialog.cpp +++ b/korganizer/korgac/alarmdialog.cpp @@ -402,7 +402,7 @@ void AlarmDialog::suspend() if ( item->isSelected() && item->isVisible() ) { item->setVisible( false ); item->setSelected( false ); - item->mRemindAt = TQDateTime::tqcurrentDateTime().addSecs( unit * mSuspendSpin->value() ); + item->mRemindAt = TQDateTime::currentDateTime().addSecs( unit * mSuspendSpin->value() ); item->mNotified = false; selitem = item; } @@ -435,8 +435,8 @@ void AlarmDialog::setTimer() int nextReminderAt = -1; for ( TQListViewItemIterator it( mIncidenceListView ) ; it.current() ; ++it ) { AlarmListItem * item = static_cast<AlarmListItem*>( it.current() ); - if ( item->mRemindAt > TQDateTime::tqcurrentDateTime() ) { - int secs = TQDateTime::tqcurrentDateTime().secsTo( item->mRemindAt ); + if ( item->mRemindAt > TQDateTime::currentDateTime() ) { + int secs = TQDateTime::currentDateTime().secsTo( item->mRemindAt ); nextReminderAt = nextReminderAt <= 0 ? secs : TQMIN( nextReminderAt, secs ); } } @@ -532,7 +532,7 @@ void AlarmDialog::wakeUp() continue; } - if ( item->mRemindAt <= TQDateTime::tqcurrentDateTime() ) { + if ( item->mRemindAt <= TQDateTime::currentDateTime() ) { if ( !item->isVisible() ) { item->setVisible( true ); item->setSelected( false ); diff --git a/korganizer/korgac/alarmdockwindow.cpp b/korganizer/korgac/alarmdockwindow.cpp index 9e4e9c238..aaeedd7fe 100644 --- a/korganizer/korgac/alarmdockwindow.cpp +++ b/korganizer/korgac/alarmdockwindow.cpp @@ -192,7 +192,7 @@ void AlarmDockWindow::slotQuit() "(note that you will not get reminders whilst the daemon is not running)?"), i18n("Close KOrganizer Reminder Daemon"), i18n("Start"), i18n("Do Not Start"), - TQString::tqfromLatin1("AskForStartAtLogin") + TQString::fromLatin1("AskForStartAtLogin") ); bool autostart = true; diff --git a/korganizer/korgac/koalarmclient.cpp b/korganizer/korgac/koalarmclient.cpp index 045dd9923..93c0602aa 100644 --- a/korganizer/korgac/koalarmclient.cpp +++ b/korganizer/korgac/koalarmclient.cpp @@ -108,7 +108,7 @@ void KOAlarmClient::checkAlarms() if ( !cfg->readBoolEntry( "Enabled", true ) ) return; TQDateTime from = mLastChecked.addSecs( 1 ); - mLastChecked = TQDateTime::tqcurrentDateTime(); + mLastChecked = TQDateTime::currentDateTime(); kdDebug(5891) << "Check: " << from.toString() << " - " << mLastChecked.toString() << endl; @@ -188,7 +188,7 @@ void KOAlarmClient::dumpDebug() TQStringList KOAlarmClient::dumpAlarms() { - TQDateTime start = TQDateTime( TQDateTime::tqcurrentDateTime().date(), + TQDateTime start = TQDateTime( TQDateTime::currentDateTime().date(), TQTime( 0, 0 ) ); TQDateTime end = start.addDays( 1 ).addSecs( -1 ); diff --git a/korganizer/korgac/testalarmdlg.cpp b/korganizer/korgac/testalarmdlg.cpp index 1d9159ae7..cd3f434f4 100644 --- a/korganizer/korgac/testalarmdlg.cpp +++ b/korganizer/korgac/testalarmdlg.cpp @@ -48,7 +48,7 @@ int main(int argc,char **argv) Event *e1 = new Event; e1->setSummary( "This is a summary." ); - TQDateTime now = TQDateTime::tqcurrentDateTime(); + TQDateTime now = TQDateTime::currentDateTime(); e1->setDtStart( now ); e1->setDtEnd( now.addDays( 1 ) ); Alarm *a = e1->newAlarm(); @@ -97,19 +97,19 @@ int main(int argc,char **argv) AlarmDialog dlg( mCalendar, 0 ); app.setMainWidget( &dlg ); - dlg.addIncidence( e2, TQDateTime::tqcurrentDateTime().addSecs( 60 ), + dlg.addIncidence( e2, TQDateTime::currentDateTime().addSecs( 60 ), TQString() ); - dlg.addIncidence( t1, TQDateTime::tqcurrentDateTime().addSecs( 300 ), + dlg.addIncidence( t1, TQDateTime::currentDateTime().addSecs( 300 ), TQString( "THIS IS DISPLAY TEXT" ) ); - dlg.addIncidence( e4, TQDateTime::tqcurrentDateTime().addSecs( 120 ), + dlg.addIncidence( e4, TQDateTime::currentDateTime().addSecs( 120 ), TQString( "Fred and Barney get cloned" ) ); - dlg.addIncidence( e3, TQDateTime::tqcurrentDateTime().addSecs( 240 ), + dlg.addIncidence( e3, TQDateTime::currentDateTime().addSecs( 240 ), TQString() ); - dlg.addIncidence( e1, TQDateTime::tqcurrentDateTime().addSecs( 180 ), + dlg.addIncidence( e1, TQDateTime::currentDateTime().addSecs( 180 ), TQString() ); - dlg.addIncidence( t2, TQDateTime::tqcurrentDateTime().addSecs( 600 ), + dlg.addIncidence( t2, TQDateTime::currentDateTime().addSecs( 600 ), TQString( "THIS IS DISPLAY TEXT" ) ); - dlg.addIncidence( t3, TQDateTime::tqcurrentDateTime().addSecs( 360 ), + dlg.addIncidence( t3, TQDateTime::currentDateTime().addSecs( 360 ), TQString() ); dlg.show(); dlg.eventNotification(); diff --git a/korganizer/korganizer.h b/korganizer/korganizer.h index facf9f59d..9148a07f3 100644 --- a/korganizer/korganizer.h +++ b/korganizer/korganizer.h @@ -94,7 +94,7 @@ class KOrganizer : public KPartsMainWindow, public KOrgMainWindow virtual KXMLGUIFactory *mainGuiFactory() { return factory(); } virtual KXMLGUIClient *mainGuiClient() { return this; } - virtual TQWidget *tqtopLevelWidget() { return this; } + virtual TQWidget *topLevelWidget() { return this; } virtual bool isCurrentlyActivePart(); diff --git a/korganizer/korganizer_part.cpp b/korganizer/korganizer_part.cpp index c79a784db..9bcdc8edb 100644 --- a/korganizer/korganizer_part.cpp +++ b/korganizer/korganizer_part.cpp @@ -69,7 +69,7 @@ K_EXPORT_COMPONENT_FACTORY( libkorganizerpart, KOrganizerFactory ) KOrganizerPart::KOrganizerPart( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const TQStringList & ) : - KParts::ReadOnlyPart(parent, name), mTopLevelWidget( parentWidget->tqtopLevelWidget() ) + KParts::ReadOnlyPart(parent, name), mTopLevelWidget( parentWidget->topLevelWidget() ) { KGlobal::locale()->insertCatalogue( "libkcal" ); KGlobal::locale()->insertCatalogue( "libtdepim" ); @@ -155,9 +155,9 @@ void KOrganizerPart::slotChangeInfo( Incidence *incidence, const TQDate & ) } } -TQWidget *KOrganizerPart::tqtopLevelWidget() +TQWidget *KOrganizerPart::topLevelWidget() { - return mView->tqtopLevelWidget(); + return mView->topLevelWidget(); } ActionManager *KOrganizerPart::actionManager() diff --git a/korganizer/korganizer_part.h b/korganizer/korganizer_part.h index 923a153d5..c7f1964a3 100644 --- a/korganizer/korganizer_part.h +++ b/korganizer/korganizer_part.h @@ -79,7 +79,7 @@ class KOrganizerPart: public KParts::ReadOnlyPart, virtual KXMLGUIFactory *mainGuiFactory() { return factory(); } virtual KXMLGUIClient *mainGuiClient() { return this; } - virtual TQWidget *tqtopLevelWidget(); + virtual TQWidget *topLevelWidget(); virtual ActionManager *actionManager(); virtual KActionCollection *getActionCollection() const { return actionCollection(); } virtual void showStatusMessage( const TQString &message ); diff --git a/korganizer/kotimelineview.cpp b/korganizer/kotimelineview.cpp index 84c9d746c..d47e360ee 100644 --- a/korganizer/kotimelineview.cpp +++ b/korganizer/kotimelineview.cpp @@ -94,7 +94,7 @@ KCal::DateList KOTimelineView::selectedIncidenceDates() } /*virtual*/ -int KOTimelineView::tqcurrentDateCount() +int KOTimelineView::currentDateCount() { return 0; } diff --git a/korganizer/kotimelineview.h b/korganizer/kotimelineview.h index 9442a32d5..683d0c4dc 100644 --- a/korganizer/kotimelineview.h +++ b/korganizer/kotimelineview.h @@ -52,7 +52,7 @@ class KOTimelineView : public KOEventView virtual KCal::ListBase<KCal::Incidence> selectedIncidences(); virtual KCal::DateList selectedIncidenceDates(); - virtual int tqcurrentDateCount(); + virtual int currentDateCount(); virtual void showDates(const TQDate&, const TQDate&); virtual void showIncidences(const KCal::ListBase<KCal::Incidence>&, const TQDate &date); virtual void updateView(); diff --git a/korganizer/kotodoeditor.cpp b/korganizer/kotodoeditor.cpp index c3eee2ee4..6b59571da 100644 --- a/korganizer/kotodoeditor.cpp +++ b/korganizer/kotodoeditor.cpp @@ -128,7 +128,7 @@ void KOTodoEditor::setupGeneral() mGeneral->initHeader( topFrame, topLayout ); mGeneral->initTime(topFrame,topLayout); - mGeneral->initqStatus(topFrame,topLayout); + mGeneral->iniStatus(topFrame,topLayout); mGeneral->initDescription(topFrame,topLayout); mGeneral->initAttachments(topFrame,topLayout); connect( mGeneral, TQT_SIGNAL( openURL( const KURL& ) ), @@ -185,7 +185,7 @@ void KOTodoEditor::setTexts( const TQString &summary, const TQString &descriptio void KOTodoEditor::loadDefaults() { kdDebug(5850) << k_funcinfo << endl; - setDates( TQDateTime::tqcurrentDateTime().addDays( 7 ), true, 0 ); + setDates( TQDateTime::currentDateTime().addDays( 7 ), true, 0 ); mGeneral->toggleAlarm( KOPrefs::instance()->defaultTodoReminders() ); } @@ -271,7 +271,7 @@ void KOTodoEditor::setDates( const TQDateTime &due, bool allDay, Todo *relatedEv if ( mTodo ) { mRecurrence->setDefaults( mTodo->dtStart(), due, false ); } else { - mRecurrence->setDefaults( TQDateTime::tqcurrentDateTime(), due, false ); + mRecurrence->setDefaults( TQDateTime::currentDateTime(), due, false ); } } diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp index 895238213..b6fb3a442 100644 --- a/korganizer/kotodoview.cpp +++ b/korganizer/kotodoview.cpp @@ -84,7 +84,7 @@ void KOTodoListViewToolTip::maybeTip( const TQPoint & pos) { /* Calculate the rectangle. */ - r=todolist->tqitemRect(i); + r=todolist->itemRect(i); headerPos = todolist->header()->sectionPos(col)-todolist->contentsX(); r.setLeft( (headerPos < 0 ? 0 : headerPos) ); r.setRight(headerPos + todolist->header()->sectionSize(col)); @@ -797,7 +797,7 @@ void KOTodoView::popupMenu( TQListViewItem *item, const TQPoint &, int column ) if ( mActiveItem->todo()->hasDueDate () ) { mMovePopupMenu->datePicker()->setDate( date ); } else { - mMovePopupMenu->datePicker()->setDate( TQDate::tqcurrentDate() ); + mMovePopupMenu->datePicker()->setDate( TQDate::currentDate() ); } switch ( column ) { case ePriorityColumn: @@ -815,7 +815,7 @@ void KOTodoView::popupMenu( TQListViewItem *item, const TQPoint &, int column ) break; default: mCopyPopupMenu->datePicker()->setDate( date ); - mCopyPopupMenu->datePicker()->setDate( TQDate::tqcurrentDate() ); + mCopyPopupMenu->datePicker()->setDate( TQDate::currentDate() ); mItemPopupMenu->setItemEnabled( ePopupUnSubTodo, mActiveItem->todo()->relatedTo() ); mItemPopupMenu->setItemEnabled( ePopupUnAllSubTodo, @@ -832,7 +832,7 @@ void KOTodoView::newTodo() { kdDebug() << k_funcinfo << endl; emit newTodoSignal( 0/*ResourceCalendar*/, TQString()/*subResource*/, - TQDate::tqcurrentDate().addDays(7) ); + TQDate::currentDate().addDays(7) ); } void KOTodoView::newSubTodo() @@ -917,7 +917,7 @@ void KOTodoView::setNewPercentage( KOTodoViewItem *item, int percentage ) myChild = myChild->nextSibling(); }*/ if ( percentage == 100 ) { - todo->setCompleted( TQDateTime::tqcurrentDateTime() ); + todo->setCompleted( TQDateTime::currentDateTime() ); // If the todo does recur, it doesn't get set as completed. However, the // item is still checked. Uncheck it again. if ( !todo->isCompleted() ) { diff --git a/korganizer/kotodoview.h b/korganizer/kotodoview.h index 6175a053a..f9ce40703 100644 --- a/korganizer/kotodoview.h +++ b/korganizer/kotodoview.h @@ -126,7 +126,7 @@ class KOTodoView : public KOrg::BaseView DateList selectedIncidenceDates() { return DateList(); } /** Return number of shown dates. TodoView does not show dates, */ - int tqcurrentDateCount() { return 0; } + int currentDateCount() { return 0; } CalPrinterBase::PrintType printType(); diff --git a/korganizer/kotodoviewitem.cpp b/korganizer/kotodoviewitem.cpp index 3fe929b64..06b98b0bd 100644 --- a/korganizer/kotodoviewitem.cpp +++ b/korganizer/kotodoviewitem.cpp @@ -249,12 +249,12 @@ void KOTodoViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, if (isAlternate()) _cg.setColor(TQColorGroup::Base, static_cast< KOTodoListView* >(listView())->alternateBackground()); if (mTodo->hasDueDate()) { - if (mTodo->dtDue().date()==TQDate::tqcurrentDate() && + if (mTodo->dtDue().date()==TQDate::currentDate() && !mTodo->isCompleted()) { _cg.setColor(TQColorGroup::Base, KOPrefs::instance()->mTodoDueTodayColor); _cg.setColor(TQColorGroup::Text, getTextColor(KOPrefs::instance()->mTodoDueTodayColor)); } - if (mTodo->dtDue().date() < TQDate::tqcurrentDate() && + if (mTodo->dtDue().date() < TQDate::currentDate() && !mTodo->isCompleted()) { _cg.setColor(TQColorGroup::Base, KOPrefs::instance()->mTodoOverdueColor); _cg.setColor(TQColorGroup::Text, getTextColor(KOPrefs::instance()->mTodoOverdueColor)); diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp index 38ab086af..69bf88b66 100644 --- a/korganizer/koviewmanager.cpp +++ b/korganizer/koviewmanager.cpp @@ -447,7 +447,7 @@ void KOViewManager::showNextXView() { mAgendaMode = AGENDA_NEXTX; showAgendaView(); - mMainView->dateNavigator()->selectDates( TQDate::tqcurrentDate(), + mMainView->dateNavigator()->selectDates( TQDate::currentDate(), KOPrefs::instance()->mNextXDays ); } diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp index c98c6c31d..fd8e5742b 100644 --- a/korganizer/kowhatsnextview.cpp +++ b/korganizer/kowhatsnextview.cpp @@ -65,9 +65,9 @@ KOWhatsNextView::KOWhatsNextView(Calendar *calendar, TQWidget *parent, : KOrg::BaseView(calendar, parent, name) { // TQLabel *dateLabel = -// new TQLabel(KGlobal::locale()->formatDate(TQDate::tqcurrentDate()),this); +// new TQLabel(KGlobal::locale()->formatDate(TQDate::currentDate()),this); // dateLabel->setMargin(2); -// dateLabel->tqsetAlignment(AlignCenter); +// dateLabel->setAlignment(AlignCenter); mView = new WhatsNextTextBrowser(this); connect(mView,TQT_SIGNAL(showIncidence(const TQString &)),TQT_SLOT(showIncidence(const TQString &))); @@ -81,7 +81,7 @@ KOWhatsNextView::~KOWhatsNextView() { } -int KOWhatsNextView::tqcurrentDateCount() +int KOWhatsNextView::currentDateCount() { return mStartDate.daysTo( mEndDate ); } @@ -183,7 +183,7 @@ void KOWhatsNextView::updateView() TQStringList myEmails( KOPrefs::instance()->allEmails() ); int replies = 0; - events = calendar()->events( TQDate::tqcurrentDate(), TQDate(2975,12,6) ); + events = calendar()->events( TQDate::currentDate(), TQDate(2975,12,6) ); Event::List::ConstIterator it2; for( it2 = events.begin(); it2 != events.end(); ++it2 ) { Event *ev = *it2; diff --git a/korganizer/kowhatsnextview.h b/korganizer/kowhatsnextview.h index e899ae157..c65a85dff 100644 --- a/korganizer/kowhatsnextview.h +++ b/korganizer/kowhatsnextview.h @@ -57,7 +57,7 @@ class KOWhatsNextView : public KOrg::BaseView const char *name = 0); ~KOWhatsNextView(); - virtual int tqcurrentDateCount(); + virtual int currentDateCount(); virtual Incidence::List selectedIncidences() { return Incidence::List(); } DateList selectedIncidenceDates() { return DateList(); } diff --git a/korganizer/multiagendaview.cpp b/korganizer/multiagendaview.cpp index 8558d846f..998936226 100644 --- a/korganizer/multiagendaview.cpp +++ b/korganizer/multiagendaview.cpp @@ -60,7 +60,7 @@ MultiAgendaView::MultiAgendaView( Calendar * cal, CalendarView *calendarView, mLeftSplitter = new TQSplitter( Qt::Vertical, topSideBox ); mLeftSplitter->setOpaqueResize( KGlobalSettings::opaqueResize() ); TQLabel *label = new TQLabel( i18n("All Day"), mLeftSplitter ); - label->tqsetAlignment( TQt::AlignRight | TQt::AlignVCenter | TQt::WordBreak ); + label->setAlignment( TQt::AlignRight | TQt::AlignVCenter | TQt::WordBreak ); TQVBox *sideBox = new TQVBox( mLeftSplitter ); EventIndicator *eiSpacer = new EventIndicator( EventIndicator::Top, sideBox ); eiSpacer->changeColumns( 0 ); @@ -265,7 +265,7 @@ void MultiAgendaView::setupViews() int minWidth = 0; for ( TQValueList<TQWidget*>::ConstIterator it = mAgendaWidgets.constBegin(); it != mAgendaWidgets.constEnd(); ++it ) - minWidth = TQMAX( minWidth, (*it)->tqminimumSizeHint().width() ); + minWidth = TQMAX( minWidth, (*it)->minimumSizeHint().width() ); for ( TQValueList<TQWidget*>::ConstIterator it = mAgendaWidgets.constBegin(); it != mAgendaWidgets.constEnd(); ++it ) (*it)->setMinimumWidth( minWidth ); } @@ -292,10 +292,10 @@ DateList MultiAgendaView::selectedIncidenceDates() return list; } -int MultiAgendaView::tqcurrentDateCount() +int MultiAgendaView::currentDateCount() { FOREACH_VIEW( agendaView ) - return agendaView->tqcurrentDateCount(); + return agendaView->currentDateCount(); return 0; } @@ -427,7 +427,7 @@ void MultiAgendaView::resizeEvent(TQResizeEvent * ev) void MultiAgendaView::resizeScrollView(const TQSize & size) { const int widgetWidth = size.width() - mTimeLabels->width() - mScrollBar->width(); - int width = TQMAX( mTopBox->tqsizeHint().width(), widgetWidth ); + int width = TQMAX( mTopBox->sizeHint().width(), widgetWidth ); int height = size.height(); if ( width > widgetWidth ) { const int sbHeight = mScrollView->horizontalScrollBar()->height(); diff --git a/korganizer/multiagendaview.h b/korganizer/multiagendaview.h index 06c219dc5..a702b9c01 100644 --- a/korganizer/multiagendaview.h +++ b/korganizer/multiagendaview.h @@ -51,7 +51,7 @@ class MultiAgendaView : public AgendaView void deSelectAgendaView() { mSelectedAgendaView = 0; } Incidence::List selectedIncidences(); DateList selectedIncidenceDates(); - int tqcurrentDateCount(); + int currentDateCount(); int maxDatesHint(); bool eventDurationHint(TQDateTime &startDt, TQDateTime &endDt, bool &allDay); diff --git a/korganizer/navigatorbar.cpp b/korganizer/navigatorbar.cpp index 23a017167..ba8842042 100644 --- a/korganizer/navigatorbar.cpp +++ b/korganizer/navigatorbar.cpp @@ -71,40 +71,40 @@ NavigatorBar::NavigatorBar( TQWidget *parent, const char *name ) pix = KOGlobals::self()->smallIcon( isRTL ? "2rightarrow" : "2leftarrow" ); mPrevYear = new TQPushButton( this ); mPrevYear->setPixmap( pix ); - mPrevYear->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); + mPrevYear->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); TQToolTip::add( mPrevYear, i18n( "Previous year" ) ); pix = KOGlobals::self()->smallIcon( isRTL ? "1rightarrow" : "1leftarrow"); mPrevMonth = new TQPushButton( this ); mPrevMonth->setPixmap( pix ); - mPrevMonth->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); + mPrevMonth->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); TQToolTip::add( mPrevMonth, i18n( "Previous month" ) ); // Create forward navigation buttons pix = KOGlobals::self()->smallIcon( isRTL ? "1leftarrow" : "1rightarrow"); mNextMonth = new TQPushButton( this ); mNextMonth->setPixmap( pix ); - mNextMonth->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); + mNextMonth->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); TQToolTip::add( mNextMonth, i18n( "Next month" ) ); pix = KOGlobals::self()->smallIcon( isRTL ? "2leftarrow" : "2rightarrow"); mNextYear = new TQPushButton( this ); mNextYear->setPixmap( pix ); - mNextYear->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); + mNextYear->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); TQToolTip::add( mNextYear, i18n( "Next year" ) ); // Create month name button mMonth = new ActiveLabel( this ); mMonth->setFont( tfont ); - mMonth->tqsetAlignment( AlignCenter ); - mMonth->setMinimumHeight( mPrevYear->tqsizeHint().height() ); + mMonth->setAlignment( AlignCenter ); + mMonth->setMinimumHeight( mPrevYear->sizeHint().height() ); TQToolTip::add( mMonth, i18n( "Select a month" ) ); // Create year button mYear = new ActiveLabel( this ); mYear->setFont( tfont ); - mYear->tqsetAlignment( AlignCenter ); - mYear->setMinimumHeight( mPrevYear->tqsizeHint().height() ); + mYear->setAlignment( AlignCenter ); + mYear->setMinimumHeight( mPrevYear->sizeHint().height() ); TQToolTip::add( mYear, i18n( "Select a year" ) ); // set up control frame tqlayout diff --git a/korganizer/plugins/exchange/exchange.cpp b/korganizer/plugins/exchange/exchange.cpp index 87784c282..a0062387c 100644 --- a/korganizer/plugins/exchange/exchange.cpp +++ b/korganizer/plugins/exchange/exchange.cpp @@ -65,7 +65,7 @@ Exchange::Exchange(KOrg::MainWindow *parent, const char *name) : mAccount = new KPIM::ExchangeAccount( "Calendar/Exchange Plugin" ); mClient = new KPIM::ExchangeClient( mAccount ); - mClient->setWindow( parent->tqtopLevelWidget() ); + mClient->setWindow( parent->topLevelWidget() ); setXMLFile("plugins/exchangeui.rc"); @@ -219,9 +219,9 @@ void Exchange::showError( int error, const TQString& moreInfo /* = TQString() */ if ( error != KPIM::ExchangeClient::ResultOK ) { if ( moreInfo.isNull() ) - KMessageBox::error( mainWindow()->tqtopLevelWidget(), errorText, i18n( "Exchange Plugin" ) ); + KMessageBox::error( mainWindow()->topLevelWidget(), errorText, i18n( "Exchange Plugin" ) ); else - KMessageBox::detailedError( mainWindow()->tqtopLevelWidget(), errorText, moreInfo, i18n( "Exchange Plugin" ) ); + KMessageBox::detailedError( mainWindow()->topLevelWidget(), errorText, moreInfo, i18n( "Exchange Plugin" ) ); } } diff --git a/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui b/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui index 1ef0c311b..e5fc832c0 100644 --- a/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui +++ b/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui @@ -81,7 +81,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>15</width> <height>20</height> @@ -136,7 +136,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>324</width> <height>21</height> @@ -157,7 +157,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>201</height> diff --git a/korganizer/plugins/printing/list/calprintlistconfig_base.ui b/korganizer/plugins/printing/list/calprintlistconfig_base.ui index b27389b6c..ecd2a848c 100644 --- a/korganizer/plugins/printing/list/calprintlistconfig_base.ui +++ b/korganizer/plugins/printing/list/calprintlistconfig_base.ui @@ -56,7 +56,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>15</width> <height>20</height> @@ -111,7 +111,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>324</width> <height>21</height> @@ -169,7 +169,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>40</height> diff --git a/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui b/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui index 41d9fef01..b8ad273fa 100644 --- a/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui +++ b/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui @@ -56,7 +56,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>15</width> <height>20</height> @@ -111,7 +111,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>324</width> <height>21</height> @@ -132,7 +132,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>201</height> diff --git a/korganizer/plugins/printing/year/calprintyearconfig_base.ui b/korganizer/plugins/printing/year/calprintyearconfig_base.ui index e0f52d6cb..d02ca9f0e 100644 --- a/korganizer/plugins/printing/year/calprintyearconfig_base.ui +++ b/korganizer/plugins/printing/year/calprintyearconfig_base.ui @@ -84,7 +84,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>120</width> <height>21</height> @@ -106,7 +106,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>131</width> <height>21</height> @@ -187,7 +187,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>40</height> diff --git a/korganizer/plugins/projectview/koprojectview.cpp b/korganizer/plugins/projectview/koprojectview.cpp index 79b146b35..6c45ff424 100644 --- a/korganizer/plugins/projectview/koprojectview.cpp +++ b/korganizer/plugins/projectview/koprojectview.cpp @@ -107,8 +107,8 @@ KOProjectView::KOProjectView(Calendar *calendar,TQWidget* parent, void KOProjectView::createMainTask() { mMainTask = new KGanttItem(0,i18n("main task"), - TQDateTime::tqcurrentDateTime(), - TQDateTime::tqcurrentDateTime()); + TQDateTime::currentDateTime(), + TQDateTime::currentDateTime()); mMainTask->setMode(KGanttItem::Rubberband); mMainTask->setStyle(KGanttItem::DrawBorder | KGanttItem::DrawText | KGanttItem::DrawHandle); @@ -154,8 +154,8 @@ void KOProjectView::updateView() #if 0 KGanttItem* t1 = new KGanttItem(mGantt->getMainTask(), "task 1, no subtasks", - TQDateTime::tqcurrentDateTime().addDays(10), - TQDateTime::tqcurrentDateTime().addDays(20) ); + TQDateTime::currentDateTime().addDays(10), + TQDateTime::currentDateTime().addDays(20) ); KGanttItem* t2 = new KGanttItem(mGantt->getMainTask(), "task 2, subtasks, no rubberband", TQDateTime(TQDate(2000,10,1)), @@ -224,14 +224,14 @@ KGanttItem *KOProjectView::createTask(KGanttItem *parent,Todo *todo) if (todo->hasStartDate() && !todo->hasDueDate()) { // start date but no due date startDt = todo->dtStart(); - endDt = TQDateTime::tqcurrentDateTime(); + endDt = TQDateTime::currentDateTime(); } else if (!todo->hasStartDate() && todo->hasDueDate()) { // due date but no start date startDt = todo->dtDue(); endDt = todo->dtDue(); } else if (!todo->hasStartDate() || !todo->hasDueDate()) { - startDt = TQDateTime::tqcurrentDateTime(); - endDt = TQDateTime::tqcurrentDateTime(); + startDt = TQDateTime::currentDateTime(); + endDt = TQDateTime::currentDateTime(); } else { startDt = todo->dtStart(); endDt = todo->dtDue(); diff --git a/korganizer/plugins/projectview/koprojectview.h b/korganizer/plugins/projectview/koprojectview.h index d05610527..6065f9c3e 100644 --- a/korganizer/plugins/projectview/koprojectview.h +++ b/korganizer/plugins/projectview/koprojectview.h @@ -75,7 +75,7 @@ class KOProjectView : public KOrg::BaseView DateList selectedDates(); /** Return number of shown dates. */ - int tqcurrentDateCount() { return 0; } + int currentDateCount() { return 0; } void readSettings(); void writeSettings(KConfig *); diff --git a/korganizer/plugins/timespanview/kotimespanview.cpp b/korganizer/plugins/timespanview/kotimespanview.cpp index 08fd51b16..eb924c74d 100644 --- a/korganizer/plugins/timespanview/kotimespanview.cpp +++ b/korganizer/plugins/timespanview/kotimespanview.cpp @@ -79,7 +79,7 @@ int KOTimeSpanView::maxDatesHint() return 0; } -int KOTimeSpanView::tqcurrentDateCount() +int KOTimeSpanView::currentDateCount() { return 0; } diff --git a/korganizer/plugins/timespanview/kotimespanview.h b/korganizer/plugins/timespanview/kotimespanview.h index c121d8970..7018ce469 100644 --- a/korganizer/plugins/timespanview/kotimespanview.h +++ b/korganizer/plugins/timespanview/kotimespanview.h @@ -39,7 +39,7 @@ class KOTimeSpanView : public KOEventView ~KOTimeSpanView(); virtual int maxDatesHint(); - virtual int tqcurrentDateCount(); + virtual int currentDateCount(); virtual Incidence::List selectedIncidences(); DateList selectedDates() { return DateList(); } diff --git a/korganizer/printing/calprintdayconfig_base.ui b/korganizer/printing/calprintdayconfig_base.ui index bd9227ce8..b9c070eb1 100644 --- a/korganizer/printing/calprintdayconfig_base.ui +++ b/korganizer/printing/calprintdayconfig_base.ui @@ -56,7 +56,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>121</width> <height>21</height> @@ -73,7 +73,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>121</width> <height>21</height> @@ -228,7 +228,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>201</height> diff --git a/korganizer/printing/calprinter.cpp b/korganizer/printing/calprinter.cpp index e87f3c5a3..65d1bc081 100644 --- a/korganizer/printing/calprinter.cpp +++ b/korganizer/printing/calprinter.cpp @@ -178,7 +178,7 @@ CalPrintDialog::CalPrintDialog( KOrg::PrintPlugin::List plugins, mTypeGroup = new TQVButtonGroup( i18n("Print Style"), splitter, "buttonGroup" ); // use the minimal width possible = max width of the radio buttons, not extensible -/* mTypeGroup->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)4, +/* mTypeGroup->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)4, (TQSizePolicy::SizeType)5, 0, 0, mTypeGroup->sizePolicy().hasHeightForWidth() ) );*/ @@ -220,11 +220,11 @@ CalPrintDialog::CalPrintDialog( KOrg::PrintPlugin::List plugins, TQRadioButton *radioButton = new TQRadioButton( p->description(), mTypeGroup ); radioButton->setEnabled( p->enabled() ); mTypeGroup->insert( radioButton, mapit.key() ); -// radioButton->setMinimumHeight( radioButton->tqsizeHint().height() - 5 ); +// radioButton->setMinimumHeight( radioButton->sizeHint().height() - 5 ); } - setMinimumSize( tqminimumSizeHint() ); - resize( tqminimumSizeHint() ); + setMinimumSize( minimumSizeHint() ); + resize( minimumSizeHint() ); } CalPrintDialog::~CalPrintDialog() diff --git a/korganizer/printing/calprintincidenceconfig_base.ui b/korganizer/printing/calprintincidenceconfig_base.ui index 68afdecb1..509d4c54b 100644 --- a/korganizer/printing/calprintincidenceconfig_base.ui +++ b/korganizer/printing/calprintincidenceconfig_base.ui @@ -90,7 +90,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>201</height> diff --git a/korganizer/printing/calprintmonthconfig_base.ui b/korganizer/printing/calprintmonthconfig_base.ui index a6c5ba0e9..ceace2461 100644 --- a/korganizer/printing/calprintmonthconfig_base.ui +++ b/korganizer/printing/calprintmonthconfig_base.ui @@ -31,7 +31,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>20</height> @@ -131,7 +131,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>17</width> <height>21</height> diff --git a/korganizer/printing/calprintpluginbase.cpp b/korganizer/printing/calprintpluginbase.cpp index 27c3cb336..52be67ec1 100644 --- a/korganizer/printing/calprintpluginbase.cpp +++ b/korganizer/printing/calprintpluginbase.cpp @@ -182,7 +182,7 @@ void CalPrintPluginBase::doLoadConfig() if ( mConfig ) { KConfigGroupSaver saver( mConfig, description() ); mConfig->sync(); - TQDateTime currDate( TQDate::tqcurrentDate() ); + TQDateTime currDate( TQDate::currentDate() ); mFromDate = mConfig->readDateTimeEntry( "FromDate", &currDate ).date(); mToDate = mConfig->readDateTimeEntry( "ToDate" ).date(); mUseColors = mConfig->readBoolEntry( "UseColors", true ); @@ -558,7 +558,7 @@ int CalPrintPluginBase::drawFooter( TQPainter &p, TQRect &footbox ) TQFont oldfont( p.font() ); p.setFont( TQFont( "sans-serif", 6 ) ); TQFontMetrics fm( p.font() ); - TQString dateStr = KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime(), false ); + 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 ) ); p.setFont( oldfont ); diff --git a/korganizer/printing/calprinttodoconfig_base.ui b/korganizer/printing/calprinttodoconfig_base.ui index f416c0ea8..ed2cf4b95 100644 --- a/korganizer/printing/calprinttodoconfig_base.ui +++ b/korganizer/printing/calprinttodoconfig_base.ui @@ -102,7 +102,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -191,7 +191,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>21</height> @@ -275,7 +275,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -341,7 +341,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>121</width> <height>20</height> @@ -358,7 +358,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>121</width> <height>20</height> diff --git a/korganizer/printing/calprintweekconfig_base.ui b/korganizer/printing/calprintweekconfig_base.ui index f367f3c41..505f4f147 100644 --- a/korganizer/printing/calprintweekconfig_base.ui +++ b/korganizer/printing/calprintweekconfig_base.ui @@ -34,7 +34,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>27</height> @@ -62,7 +62,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>21</height> @@ -118,7 +118,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>110</width> <height>20</height> diff --git a/korganizer/publishdialog_base.ui b/korganizer/publishdialog_base.ui index 76efbe645..640b19fb6 100644 --- a/korganizer/publishdialog_base.ui +++ b/korganizer/publishdialog_base.ui @@ -112,7 +112,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>241</height> diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp index 497ad1f6e..e278d5fbb 100644 --- a/korganizer/searchdialog.cpp +++ b/korganizer/searchdialog.cpp @@ -89,7 +89,7 @@ SearchDialog::SearchDialog(Calendar *calendar,TQWidget *parent) mEndDate = new KDateEdit( rangeWidget ); rangeLayout->addWidget( new TQLabel( mEndDate, i18n("&To:"), rangeWidget ) ); - mEndDate->setDate( TQDate::tqcurrentDate().addDays( 365 ) ); + mEndDate->setDate( TQDate::currentDate().addDays( 365 ) ); rangeLayout->addWidget( mEndDate ); mInclusiveCheck = new TQCheckBox( i18n("E&vents have to be completely included"), diff --git a/korganizer/statusdialog.cpp b/korganizer/statusdialog.cpp index 15e15e5ab..ba86ce7f6 100644 --- a/korganizer/statusdialog.cpp +++ b/korganizer/statusdialog.cpp @@ -49,9 +49,9 @@ StatusDialog::StatusDialog(TQWidget* parent, const char* name) : TQLabel *text = new TQLabel(i18n("Set your status"),this); statusLayout->addWidget( text ); - mtqStatus = new TQComboBox(false,this); - mtqStatus->insertStringList(Attendee::statusList()); - statusLayout->addWidget( mtqStatus ); + mStatus = new TQComboBox(false,this); + mStatus->insertStringList(Attendee::statusList()); + statusLayout->addWidget( mStatus ); TQBoxLayout *buttonLayout = new TQHBoxLayout( topLayout ); @@ -70,5 +70,5 @@ StatusDialog::~StatusDialog() Attendee::PartStat StatusDialog::status() { - return Attendee::PartStat( mtqStatus->currentItem() ) ; + return Attendee::PartStat( mStatus->currentItem() ) ; } diff --git a/korganizer/statusdialog.h b/korganizer/statusdialog.h index 9f01bca6e..5906b44df 100644 --- a/korganizer/statusdialog.h +++ b/korganizer/statusdialog.h @@ -37,7 +37,7 @@ class StatusDialog : public KDialog Attendee::PartStat status(); private: - TQComboBox *mtqStatus; + TQComboBox *mStatus; }; #endif diff --git a/korganizer/template_management_dialog_base.ui b/korganizer/template_management_dialog_base.ui index db3402424..7fd65a105 100644 --- a/korganizer/template_management_dialog_base.ui +++ b/korganizer/template_management_dialog_base.ui @@ -75,7 +75,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>51</height> diff --git a/korn/boxcontaineritem.cpp b/korn/boxcontaineritem.cpp index c412a07b2..8c9989532 100644 --- a/korn/boxcontaineritem.cpp +++ b/korn/boxcontaineritem.cpp @@ -316,7 +316,7 @@ void BoxContainerItem::drawLabel( TQLabel *label, const int count, const bool ne if( _fonts[ index ] ) label->setFont( *_fonts[ index ] ); label->setPaletteForegroundColor( *_fgColour[ index ] ); - label->tqsetAlignment( TQt::AlignHCenter | TQt::AlignVCenter ); + label->setAlignment( TQt::AlignHCenter | TQt::AlignVCenter ); label->setText( TQString::number( count ) ); } @@ -371,7 +371,7 @@ TQPixmap BoxContainerItem::calcComplexPixmap( const TQPixmap &icon, const TQColo void BoxContainerItem::setAnimIcon( TQLabel* label, const TQString& anim ) { - label->tqsetAlignment( TQt::AlignHCenter | TQt::AlignVCenter ); + label->setAlignment( TQt::AlignHCenter | TQt::AlignVCenter ); label->setMovie( TQMovie( anim ) ); label->show(); } diff --git a/korn/dcopdrop.cpp b/korn/dcopdrop.cpp index aea90103e..9fa7caa85 100644 --- a/korn/dcopdrop.cpp +++ b/korn/dcopdrop.cpp @@ -162,7 +162,7 @@ int DCOPDrop::addMessage( const TQString& subject, const TQString& message ) mailsubject->setSender( TQString( "DCOP: %1" ).tqarg( *_name ) ); mailsubject->setHeader( message, true ); mailsubject->setSize( message.length() ); - mailsubject->setDate( TQDateTime::tqcurrentDateTime().toTime_t() ); + mailsubject->setDate( TQDateTime::currentDateTime().toTime_t() ); _msgList->insert( id->getId(), mailsubject ); diff --git a/korn/kornboxcfg.ui b/korn/kornboxcfg.ui index 3d9ca6092..deea15915 100644 --- a/korn/kornboxcfg.ui +++ b/korn/kornboxcfg.ui @@ -288,7 +288,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>41</width> <height>160</height> @@ -477,7 +477,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>20</height> @@ -502,7 +502,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>21</height> @@ -540,7 +540,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>20</height> @@ -565,7 +565,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>21</height> @@ -592,7 +592,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>20</height> @@ -617,7 +617,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>21</height> @@ -644,7 +644,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>20</height> @@ -669,7 +669,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>21</height> @@ -696,7 +696,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>20</height> @@ -721,7 +721,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>21</height> @@ -767,7 +767,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>20</height> @@ -792,7 +792,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>21</height> @@ -819,7 +819,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>20</height> @@ -844,7 +844,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>21</height> @@ -882,7 +882,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>20</height> @@ -907,7 +907,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>21</height> @@ -942,7 +942,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>20</height> @@ -967,7 +967,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>21</height> @@ -1002,7 +1002,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>20</height> @@ -1027,7 +1027,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>21</height> @@ -1062,7 +1062,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>20</height> @@ -1087,7 +1087,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>21</height> @@ -1114,7 +1114,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>20</height> @@ -1139,7 +1139,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>21</height> @@ -1166,7 +1166,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>20</height> @@ -1191,7 +1191,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>21</height> @@ -1218,7 +1218,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>20</height> @@ -1243,7 +1243,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>21</height> @@ -1278,7 +1278,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>20</height> @@ -1303,7 +1303,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>21</height> diff --git a/korn/progress_dialog.ui b/korn/progress_dialog.ui index e56703418..2be856f3e 100644 --- a/korn/progress_dialog.ui +++ b/korn/progress_dialog.ui @@ -55,7 +55,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>41</width> <height>20</height> @@ -80,7 +80,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>41</width> <height>31</height> diff --git a/kresources/birthdays/resourcekabc.cpp b/kresources/birthdays/resourcekabc.cpp index db0a7b77d..fde979ed5 100644 --- a/kresources/birthdays/resourcekabc.cpp +++ b/kresources/birthdays/resourcekabc.cpp @@ -67,7 +67,7 @@ extern "C" } ResourceKABC::ResourceKABC( const KConfig* config ) - : ResourceCalendar( config ), mCalendar( TQString::tqfromLatin1( "UTC" ) ), + : ResourceCalendar( config ), mCalendar( TQString::fromLatin1( "UTC" ) ), mAlarmDays( 0 ), mAlarm( true ), mUseCategories( false ) { if ( config ) { @@ -80,7 +80,7 @@ ResourceKABC::ResourceKABC( const KConfig* config ) } ResourceKABC::ResourceKABC() - : ResourceCalendar( 0 ), mCalendar( TQString::tqfromLatin1( "UTC" ) ), + : ResourceCalendar( 0 ), mCalendar( TQString::fromLatin1( "UTC" ) ), mAlarmDays( 0 ), mAlarm( true ), mUseCategories( false ) { init(); diff --git a/kresources/blogging/resourcebloggingsettings.ui b/kresources/blogging/resourcebloggingsettings.ui index 917933cee..df9baeffb 100644 --- a/kresources/blogging/resourcebloggingsettings.ui +++ b/kresources/blogging/resourcebloggingsettings.ui @@ -291,7 +291,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>84</height> diff --git a/kresources/caldav/resource.cpp b/kresources/caldav/resource.cpp index db4546d82..fc5bc75e6 100644 --- a/kresources/caldav/resource.cpp +++ b/kresources/caldav/resource.cpp @@ -105,7 +105,7 @@ ResourceCalDav::~ResourceCalDav() { while ((mWriter->running() == true) || (mWritingQueue.isEmpty() == false) || !mWritingQueueReady) { readLockout = true; sleep(1); - tqApp->tqprocessEvents(TQEventLoop::ExcludeUserInput); + tqApp->processEvents(TQEventLoop::ExcludeUserInput); } if (mWriter) { @@ -338,7 +338,7 @@ void ResourceCalDav::loadingQueuePop() { mLoader->setParent(this); mLoader->setType(0); - TQDateTime dt(TQDate::tqcurrentDate()); + TQDateTime dt(TQDate::currentDate()); mLoader->setRange(dt.addDays(-CACHE_DAYS), dt.addDays(CACHE_DAYS)); //mLoader->setGetAll(); diff --git a/kresources/carddav/resource.cpp b/kresources/carddav/resource.cpp index 4fb33af55..2648ca7a6 100644 --- a/kresources/carddav/resource.cpp +++ b/kresources/carddav/resource.cpp @@ -105,7 +105,7 @@ ResourceCardDav::~ResourceCardDav() { while ((mWriter->running() == true) || (mWritingQueue.isEmpty() == false) || !mWritingQueueReady) { readLockout = true; sleep(1); - tqApp->tqprocessEvents(TQEventLoop::ExcludeUserInput); + tqApp->processEvents(TQEventLoop::ExcludeUserInput); } if (mWriter) { diff --git a/kresources/egroupware/kcal_resourcexmlrpc.cpp b/kresources/egroupware/kcal_resourcexmlrpc.cpp index f47df2718..8841da75e 100644 --- a/kresources/egroupware/kcal_resourcexmlrpc.cpp +++ b/kresources/egroupware/kcal_resourcexmlrpc.cpp @@ -239,8 +239,8 @@ bool ResourceXMLRPC::doLoad() mTodoStateMapper.load(); TQMap<TQString, TQVariant> args, columns; - args.insert( "start", TQDateTime( TQDate::tqcurrentDate().addDays( -12 ) ) ); - args.insert( "end", TQDateTime( TQDate::tqcurrentDate().addDays( 2000 ) ) ); + args.insert( "start", TQDateTime( TQDate::currentDate().addDays( -12 ) ) ); + args.insert( "end", TQDateTime( TQDate::currentDate().addDays( 2000 ) ) ); mServer->call( SearchEventsCommand, args, this, TQT_SLOT( listEventsFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), diff --git a/kresources/egroupware/knotes_resourcexmlrpc.cpp b/kresources/egroupware/knotes_resourcexmlrpc.cpp index 8b50c3b8e..c9a9a1bfd 100644 --- a/kresources/egroupware/knotes_resourcexmlrpc.cpp +++ b/kresources/egroupware/knotes_resourcexmlrpc.cpp @@ -50,7 +50,7 @@ static const TQString DeleteNoteCommand = "infolog.boinfolog.delete"; static const TQString LoadNoteCategoriesCommand = "infolog.boinfolog.categories"; ResourceXMLRPC::ResourceXMLRPC( const KConfig* config ) - : ResourceNotes( config ), mCalendar( TQString::tqfromLatin1("UTC") ), + : ResourceNotes( config ), mCalendar( TQString::fromLatin1("UTC") ), mServer( 0 ) { init(); @@ -65,7 +65,7 @@ ResourceXMLRPC::ResourceXMLRPC( const KConfig* config ) } ResourceXMLRPC::ResourceXMLRPC( ) - : ResourceNotes( 0 ), mCalendar( TQString::tqfromLatin1("UTC") ), + : ResourceNotes( 0 ), mCalendar( TQString::fromLatin1("UTC") ), mServer( 0 ) { init(); diff --git a/kresources/exchange/resourceexchange.cpp b/kresources/exchange/resourceexchange.cpp index b58a750f2..9aace4162 100644 --- a/kresources/exchange/resourceexchange.cpp +++ b/kresources/exchange/resourceexchange.cpp @@ -78,7 +78,7 @@ ResourceExchange::ResourceExchange( const KConfig *config ) { mLock = new KABC::LockNull( true ); - mTimeZoneId = TQString::tqfromLatin1( "UTC" ); + mTimeZoneId = TQString::fromLatin1( "UTC" ); kdDebug() << "Creating ResourceExchange" << endl; if (config ) { @@ -139,7 +139,7 @@ bool ResourceExchange::doOpen() mMonitor->addWatch( mAccount->calendarURL(), ExchangeMonitor::UpdateNewMember, 1 ); #endif - TQWidgetList* widgets = TQApplication::tqtopLevelWidgets(); + TQWidgetList* widgets = TQApplication::topLevelWidgets(); if ( !widgets->isEmpty() ) mClient->setWindow( widgets->first() ); delete widgets; @@ -477,7 +477,7 @@ Event::List ResourceExchange::rawEventsForDate( const TQDate &qd, if (!mCache) return Event::List(); // If the events for this date are not in the cache, or if they are old, // get them again - TQDateTime now = TQDateTime::tqcurrentDateTime(); + TQDateTime now = TQDateTime::currentDateTime(); // kdDebug() << "Now is " << now.toString() << endl; // kdDebug() << "mDates: " << mDates << endl; TQDate start = TQDate( qd.year(), qd.month(), 1 ); // First day of month diff --git a/kresources/groupdav/groupdavglobals.cpp b/kresources/groupdav/groupdavglobals.cpp index 5fb9d6d3a..896680e9e 100644 --- a/kresources/groupdav/groupdavglobals.cpp +++ b/kresources/groupdav/groupdavglobals.cpp @@ -230,7 +230,7 @@ bool GroupDavGlobals::interpretCalendarDownloadItemsJob( KCal::CalendarAdaptor * kdDebug(5800) << "GroupDavGlobals::interpretCalendarDownloadItemsJob, iCalendar=" << endl; kdDebug(5800) << jobData << endl; if ( !adaptor || !job ) return false; - KCal::CalendarLocal calendar( TQString::tqfromLatin1("UTC") ); + KCal::CalendarLocal calendar( TQString::fromLatin1("UTC") ); KCal::ICalFormat ical; calendar.setTimeZoneId( adaptor->resource()->timeZoneId() ); KCal::Incidence::List incidences; diff --git a/kresources/groupwise/kabc_resourcegroupwise.cpp b/kresources/groupwise/kabc_resourcegroupwise.cpp index 8291b2bfc..8526f1feb 100644 --- a/kresources/groupwise/kabc_resourcegroupwise.cpp +++ b/kresources/groupwise/kabc_resourcegroupwise.cpp @@ -708,7 +708,7 @@ KURL ResourceGroupwise::createAccessUrl( BookType bookType, AccessMode mode, uns if ( mode == Update && lastSequenceNumber > 0 && lastPORebuildTime > 0 ) { - query += TQString::tqfromLatin1( "&update=true&lastSeqNo=%1&PORebuildTime=%2" ).tqarg( lastSequenceNumber ).tqarg( lastPORebuildTime );; + query += TQString::fromLatin1( "&update=true&lastSeqNo=%1&PORebuildTime=%2" ).tqarg( lastSequenceNumber ).tqarg( lastPORebuildTime );; } url.setQuery( query ); return url; diff --git a/kresources/groupwise/kcal_resourcegroupwise.cpp b/kresources/groupwise/kcal_resourcegroupwise.cpp index 026cf9b6c..060fe5f20 100644 --- a/kresources/groupwise/kcal_resourcegroupwise.cpp +++ b/kresources/groupwise/kcal_resourcegroupwise.cpp @@ -186,7 +186,7 @@ void ResourceGroupwise::slotJobResult( KIO::Job *job ) clearCache(); // FIXME: This does not take into account the time zone! - CalendarLocal calendar( TQString::tqfromLatin1("UTC") ); + CalendarLocal calendar( TQString::fromLatin1("UTC") ); ICalFormat ical; if ( !ical.fromString( &calendar, mJobData ) ) { loadError( i18n("Error parsing calendar data.") ); diff --git a/kresources/groupwise/kioslave/groupwise.cpp b/kresources/groupwise/kioslave/groupwise.cpp index 4ebb2e387..7e9324b23 100644 --- a/kresources/groupwise/kioslave/groupwise.cpp +++ b/kresources/groupwise/kioslave/groupwise.cpp @@ -190,8 +190,8 @@ void Groupwise::getFreeBusy( const KURL &url ) GroupwiseServer server( u, user, pass, 0 ); // FIXME: Read range from configuration or URL parameters. - TQDate start = TQDate::tqcurrentDate().addDays( -3 ); - TQDate end = TQDate::tqcurrentDate().addDays( 60 ); + TQDate start = TQDate::currentDate().addDays( -3 ); + TQDate end = TQDate::currentDate().addDays( 60 ); fb->setDtStart( start ); fb->setDtEnd( end ); @@ -241,7 +241,7 @@ void Groupwise::getCalendar( const KURL &url ) GroupwiseServer server( u, user, pass, 0 ); - KCal::CalendarLocal calendar( TQString::tqfromLatin1("UTC")); + KCal::CalendarLocal calendar( TQString::fromLatin1("UTC")); kdDebug() << "Login" << endl; if ( !server.login() ) { diff --git a/kresources/groupwise/soap/contactconverter.cpp b/kresources/groupwise/soap/contactconverter.cpp index 4f4454399..34c934fe5 100644 --- a/kresources/groupwise/soap/contactconverter.cpp +++ b/kresources/groupwise/soap/contactconverter.cpp @@ -402,8 +402,8 @@ 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::tqfromLatin1("messaging/%1").tqarg( protocol ), - TQString::tqfromLatin1( "All" ), + addr.insertCustom( TQString::fromLatin1("messaging/%1").tqarg( protocol ), + TQString::fromLatin1( "All" ), addresses.join( TQChar( 0xE000 ) ) ); } } @@ -583,7 +583,7 @@ ngwt__ImAddressList* ContactConverter::convertImAddresses( const KABC::Addressee TQString app, name, value; splitField( *it, app, name, value ); - if ( app.startsWith( TQString::tqfromLatin1( "messaging/" ) ) && name == TQString::tqfromLatin1( "All" ) ) { + if ( app.startsWith( TQString::fromLatin1( "messaging/" ) ) && name == TQString::fromLatin1( "All" ) ) { // get the protocol for this field TQString protocol = app.section( '/', 1, 1 ); if ( !protocol.isEmpty() ) { diff --git a/kresources/groupwise/soap/groupwiseserver.cpp b/kresources/groupwise/soap/groupwiseserver.cpp index 67c0da6e7..2b4f9827e 100644 --- a/kresources/groupwise/soap/groupwiseserver.cpp +++ b/kresources/groupwise/soap/groupwiseserver.cpp @@ -129,7 +129,7 @@ int GroupwiseServer::gSoapOpen( struct soap *soap, const char *, if (rc != 0 ) { kdError() << "gSoapOpen: lookup of " << host << " failed " << rc << endl; TQString errorMessage; - errorMessage = TQString::tqfromLatin1( strerror( errno ) ); + errorMessage = TQString::fromLatin1( strerror( errno ) ); perror( 0 ); soap->error = SOAP_TCP_ERROR; mErrorText = i18n("Connect failed: %1.").tqarg( errorMessage ); @@ -141,13 +141,13 @@ int GroupwiseServer::gSoapOpen( struct soap *soap, const char *, kdError() << "gSoapOpen: connect failed " << rc << endl; TQString errorMessage; if ( rc == -1 ) { - errorMessage = TQString::tqfromLatin1( strerror( errno ) ); + errorMessage = TQString::fromLatin1( strerror( errno ) ); perror( 0 ); } //set the soap struct's error here! else { if ( rc == -3 ) - errorMessage = TQString::tqfromLatin1( "Connection timed out. Check host and port number" ); + errorMessage = TQString::fromLatin1( "Connection timed out. Check host and port number" ); } mErrorText = i18n("Connect failed: %1.").tqarg( errorMessage ); soap->error =SOAP_TCP_ERROR; @@ -1097,7 +1097,7 @@ bool GroupwiseServer::changeIncidence( KCal::Incidence *incidence ) return success; } -bool GroupwiseServer::checkResponse( int result, ngwt__tqStatus *status ) +bool GroupwiseServer::checkResponse( int result, ngwt__Status *status ) { if ( result != 0 ) { soap_print_fault( mSoap, stderr ); diff --git a/kresources/groupwise/soap/groupwiseserver.h b/kresources/groupwise/soap/groupwiseserver.h index 2c537661a..c37cc1486 100644 --- a/kresources/groupwise/soap/groupwiseserver.h +++ b/kresources/groupwise/soap/groupwiseserver.h @@ -59,7 +59,7 @@ class ngwt__Item; class ngwt__Appointment; class ngwt__Mail; class ngwt__Task; -class ngwt__tqStatus; +class ngwt__Status; class GroupWiseBinding; namespace GroupWise { @@ -97,7 +97,7 @@ class GroupwiseServer : public TQObject TQ_OBJECT public: - bool checkResponse( int result, ngwt__tqStatus *status ); + bool checkResponse( int result, ngwt__Status *status ); enum RetractCause { DueToResend, Other }; GroupwiseServer( const TQString &url, const TQString &user, const TQString &password, TQObject *parent ); diff --git a/kresources/groupwise/soap/gwconverter.cpp b/kresources/groupwise/soap/gwconverter.cpp index 2f7d5e03b..bda455f78 100644 --- a/kresources/groupwise/soap/gwconverter.cpp +++ b/kresources/groupwise/soap/gwconverter.cpp @@ -111,7 +111,7 @@ std::string* GWConverter::qDateToString( const TQDate &date ) TQDate GWConverter::stringToTQDate( std::string* str ) { //NB this ISODate may become unnecessary, if GW stops sending in yyyy-mm-dd format again - return TQDate::fromString( TQString::tqfromLatin1( str->c_str() ), Qt::ISODate ); + return TQDate::fromString( TQString::fromLatin1( str->c_str() ), Qt::ISODate ); } TQDateTime GWConverter::charToTQDateTime( const char *str ) diff --git a/kresources/groupwise/soap/gwjobs.cpp b/kresources/groupwise/soap/gwjobs.cpp index 2a51adf06..24c0c0dc8 100644 --- a/kresources/groupwise/soap/gwjobs.cpp +++ b/kresources/groupwise/soap/gwjobs.cpp @@ -475,8 +475,8 @@ void ReadCalendarJob::readCalendarFolder( const std::string &id, ReadItemCounts ngwt__Filter *filter = soap_new_ngwm__Filter( mSoap, -1 ); ngwt__FilterEntry *filterEntry = soap_new_ngwm__FilterEntry( mSoap, -1 ); filterEntry->op = gte; - filterEntry->field = TQString::tqfromLatin1( "startDate" ).utf8(); - filterEntry->value = TQDateTime::tqcurrentDateTime().toString( "yyyyMMddThhmmZ" ).utf8(); + filterEntry->field = TQString::fromLatin1( "startDate" ).utf8(); + filterEntry->value = TQDateTime::currentDateTime().toString( "yyyyMMddThhmmZ" ).utf8(); filter->element = filterEntry; diff --git a/kresources/groupwise/soap/incidenceconverter.cpp b/kresources/groupwise/soap/incidenceconverter.cpp index 7360d8a42..7610e8116 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::tqfromLatin1( "; %1" ).tqarg( (*it)->name() ); + to += TQString::fromLatin1( "; %1" ).tqarg( (*it)->name() ); kdDebug() << "IncidenceConverter::setAttendees(), adding " << (*it)->fullName() << endl; TQString uuid; @@ -489,7 +489,7 @@ ngwt__Recipient *IncidenceConverter::createRecipient( const TQString &name, { ngwt__Recipient *recipient = soap_new_ngwt__Recipient( soap(), -1 ); - recipient->recipientqStatus = 0; + recipient->recipienStatus = 0; if ( !uuid.isEmpty() ) recipient->uuid = qStringToString( uuid ); else recipient->uuid = 0; if ( !name.isEmpty() ) { @@ -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->setqStatus( ( *item->status->accepted ) ? KCal::Attendee::Accepted : KCal::Attendee::NeedsAction ); + attendee->seStatus( ( *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 c6fe2a4f6..8119e3e7c 100644 --- a/kresources/groupwise/soap/ksslsocket.cpp +++ b/kresources/groupwise/soap/ksslsocket.cpp @@ -109,7 +109,7 @@ void KSSLSocket::slotConnected() d->kssl->reInitialize(); } d->kssl->setPeerHost(host()); -// kdDebug() << "SOCKET STATUS: " << socketqStatus() << endl; +// kdDebug() << "SOCKET STATUS: " << sockeStatus() << endl; int rc = d->kssl->connect( sockfd ); if ( rc <= 0 ) { kdError() << "Error connecting KSSL: " << rc << endl; diff --git a/kresources/groupwise/soap/soapC.cpp b/kresources/groupwise/soap/soapC.cpp index a64b82b66..658040e41 100644 --- a/kresources/groupwise/soap/soapC.cpp +++ b/kresources/groupwise/soap/soapC.cpp @@ -164,8 +164,8 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type) return soap_in_ngwe__EventType(soap, NULL, NULL, "ngwe:EventType"); case SOAP_TYPE_ngwt__WeekDay: return soap_in_ngwt__WeekDay(soap, NULL, NULL, "ngwt:WeekDay"); - case SOAP_TYPE_ngwt__VersiontqStatus: - return soap_in_ngwt__VersiontqStatus(soap, NULL, NULL, "ngwt:VersionStatus"); + case SOAP_TYPE_ngwt__VersionStatus: + return soap_in_ngwt__VersionStatus(soap, NULL, NULL, "ngwt:VersionStatus"); case SOAP_TYPE_ngwt__VersionEventType: return soap_in_ngwt__VersionEventType(soap, NULL, NULL, "ngwt:VersionEventType"); case SOAP_TYPE_ngwt__StatusTrackingOptions: @@ -206,8 +206,8 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type) return soap_in_ngwt__Frequency(soap, NULL, NULL, "ngwt:Frequency"); case SOAP_TYPE_ngwt__FolderType: return soap_in_ngwt__FolderType(soap, NULL, NULL, "ngwt:FolderType"); - case SOAP_TYPE_ngwt__FolderACLtqStatus: - return soap_in_ngwt__FolderACLtqStatus(soap, NULL, NULL, "ngwt:FolderACLStatus"); + case SOAP_TYPE_ngwt__FolderACLStatus: + return soap_in_ngwt__FolderACLStatus(soap, NULL, NULL, "ngwt:FolderACLStatus"); case SOAP_TYPE_ngwt__FilterOp: return soap_in_ngwt__FilterOp(soap, NULL, NULL, "ngwt:FilterOp"); case SOAP_TYPE_ngwt__FilterDate: @@ -610,8 +610,8 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type) return soap_in_ngwt__UserInfo(soap, NULL, NULL, "ngwt:UserInfo"); case SOAP_TYPE_ngwt__TrustedApplication: return soap_in_ngwt__TrustedApplication(soap, NULL, NULL, "ngwt:TrustedApplication"); - case SOAP_TYPE_ngwt__TransferFailedtqStatus: - return soap_in_ngwt__TransferFailedtqStatus(soap, NULL, NULL, "ngwt:TransferFailedStatus"); + case SOAP_TYPE_ngwt__TransferFailedStatus: + return soap_in_ngwt__TransferFailedStatus(soap, NULL, NULL, "ngwt:TransferFailedStatus"); case SOAP_TYPE_ngwt__TimezoneList: return soap_in_ngwt__TimezoneList(soap, NULL, NULL, "ngwt:TimezoneList"); case SOAP_TYPE_ngwt__TimezoneComponent: @@ -624,8 +624,8 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type) return soap_in_ngwt__SystemFolder(soap, NULL, NULL, "ngwt:SystemFolder"); case SOAP_TYPE_ngwt__StatusTracking: return soap_in_ngwt__StatusTracking(soap, NULL, NULL, "ngwt:StatusTracking"); - case SOAP_TYPE_ngwt__tqStatus: - return soap_in_ngwt__tqStatus(soap, NULL, NULL, "ngwt:Status"); + case SOAP_TYPE_ngwt__Status: + return soap_in_ngwt__Status(soap, NULL, NULL, "ngwt:Status"); case SOAP_TYPE_ngwt__SMimeOperation: return soap_in_ngwt__SMimeOperation(soap, NULL, NULL, "ngwt:SMimeOperation"); case SOAP_TYPE_ngwt__SignatureData: @@ -672,8 +672,8 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type) return soap_in_ngwt__RecurrenceRule(soap, NULL, NULL, "ngwt:RecurrenceRule"); case SOAP_TYPE_ngwt__RecurrenceDateType: return soap_in_ngwt__RecurrenceDateType(soap, NULL, NULL, "ngwt:RecurrenceDateType"); - case SOAP_TYPE_ngwt__RecipientqStatus: - return soap_in_ngwt__RecipientqStatus(soap, NULL, NULL, "ngwt:RecipienStatus"); + case SOAP_TYPE_ngwt__RecipienStatus: + return soap_in_ngwt__RecipienStatus(soap, NULL, NULL, "ngwt:RecipienStatus"); case SOAP_TYPE_ngwt__RecipientList: return soap_in_ngwt__RecipientList(soap, NULL, NULL, "ngwt:RecipientList"); case SOAP_TYPE_ngwt__Recipient: @@ -738,8 +738,8 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type) return soap_in_ngwt__JunkHandlingList(soap, NULL, NULL, "ngwt:JunkHandlingList"); case SOAP_TYPE_ngwt__JunkEntry: return soap_in_ngwt__JunkEntry(soap, NULL, NULL, "ngwt:JunkEntry"); - case SOAP_TYPE_ngwt__ItemtqStatus: - return soap_in_ngwt__ItemtqStatus(soap, NULL, NULL, "ngwt:ItemStatus"); + case SOAP_TYPE_ngwt__ItemStatus: + return soap_in_ngwt__ItemStatus(soap, NULL, NULL, "ngwt:ItemStatus"); case SOAP_TYPE_ngwt__Items: return soap_in_ngwt__Items(soap, NULL, NULL, "ngwt:Items"); case SOAP_TYPE_ngwt__ItemRefList: @@ -812,10 +812,10 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type) return soap_in_ngwt__Distribution(soap, NULL, NULL, "ngwt:Distribution"); case SOAP_TYPE_ngwt__DeltaInfo: return soap_in_ngwt__DeltaInfo(soap, NULL, NULL, "ngwt:DeltaInfo"); - case SOAP_TYPE_ngwt__DelegateetqStatus: - return soap_in_ngwt__DelegateetqStatus(soap, NULL, NULL, "ngwt:DelegateeStatus"); - case SOAP_TYPE_ngwt__DelegatedtqStatus: - return soap_in_ngwt__DelegatedtqStatus(soap, NULL, NULL, "ngwt:DelegatedStatus"); + case SOAP_TYPE_ngwt__DelegateeStatus: + return soap_in_ngwt__DelegateeStatus(soap, NULL, NULL, "ngwt:DelegateeStatus"); + case SOAP_TYPE_ngwt__DelegatedStatus: + return soap_in_ngwt__DelegatedStatus(soap, NULL, NULL, "ngwt:DelegatedStatus"); case SOAP_TYPE_ngwt__DayOfYearWeekList: return soap_in_ngwt__DayOfYearWeekList(soap, NULL, NULL, "ngwt:DayOfYearWeekList"); case SOAP_TYPE_ngwt__DayOfYearWeek: @@ -838,8 +838,8 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type) return soap_in_ngwt__ContactFolder(soap, NULL, NULL, "ngwt:ContactFolder"); case SOAP_TYPE_ngwt__Contact: return soap_in_ngwt__Contact(soap, NULL, NULL, "ngwt:Contact"); - case SOAP_TYPE_ngwt__CommentqStatus: - return soap_in_ngwt__CommentqStatus(soap, NULL, NULL, "ngwt:CommenStatus"); + case SOAP_TYPE_ngwt__CommenStatus: + return soap_in_ngwt__CommenStatus(soap, NULL, NULL, "ngwt:CommenStatus"); case SOAP_TYPE_ngwt__CategoryRefList: return soap_in_ngwt__CategoryRefList(soap, NULL, NULL, "ngwt:CategoryRefList"); case SOAP_TYPE_ngwt__CategoryList: @@ -1262,8 +1262,8 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type) return soap_in_PointerTongwt__EmailAddressList(soap, NULL, NULL, "ngwt:EmailAddressList"); case SOAP_TYPE_PointerTongwt__FullName: return soap_in_PointerTongwt__FullName(soap, NULL, NULL, "ngwt:FullName"); - case SOAP_TYPE_PointerTongwt__VersiontqStatus: - return soap_in_PointerTongwt__VersiontqStatus(soap, NULL, NULL, "ngwt:VersionStatus"); + case SOAP_TYPE_PointerTongwt__VersionStatus: + return soap_in_PointerTongwt__VersionStatus(soap, NULL, NULL, "ngwt:VersionStatus"); case SOAP_TYPE_PointerTongwt__FolderACL: return soap_in_PointerTongwt__FolderACL(soap, NULL, NULL, "ngwt:FolderACL"); case SOAP_TYPE_PointerTongwt__RuleActionList: @@ -1272,8 +1272,8 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type) return soap_in_PointerTongwt__Execution(soap, NULL, NULL, "ngwt:Execution"); case SOAP_TYPE_PointerTongwt__Query: return soap_in_PointerTongwt__Query(soap, NULL, NULL, "ngwt:Query"); - case SOAP_TYPE_PointerTongwt__FolderACLtqStatus: - return soap_in_PointerTongwt__FolderACLtqStatus(soap, NULL, NULL, "ngwt:FolderACLStatus"); + case SOAP_TYPE_PointerTongwt__FolderACLStatus: + return soap_in_PointerTongwt__FolderACLStatus(soap, NULL, NULL, "ngwt:FolderACLStatus"); case SOAP_TYPE_PointerTongwt__AccessControlList: return soap_in_PointerTongwt__AccessControlList(soap, NULL, NULL, "ngwt:AccessControlList"); case SOAP_TYPE_PointerTongwt__WeekOfYear: @@ -1286,12 +1286,12 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type) return soap_in_PointerTongwt__ItemClass(soap, NULL, NULL, "ngwt:ItemClass"); case SOAP_TYPE_PointerTongwt__ItemSource: return soap_in_PointerTongwt__ItemSource(soap, NULL, NULL, "ngwt:ItemSource"); - case SOAP_TYPE_PointerTongwt__ItemtqStatus: - return soap_in_PointerTongwt__ItemtqStatus(soap, NULL, NULL, "ngwt:ItemStatus"); + case SOAP_TYPE_PointerTongwt__ItemStatus: + return soap_in_PointerTongwt__ItemStatus(soap, NULL, NULL, "ngwt:ItemStatus"); case SOAP_TYPE_PointerTongwt__DeltaSyncType: return soap_in_PointerTongwt__DeltaSyncType(soap, NULL, NULL, "ngwt:DeltaSyncType"); - case SOAP_TYPE_PointerTongwt__RecipientqStatus: - return soap_in_PointerTongwt__RecipientqStatus(soap, NULL, NULL, "ngwt:RecipienStatus"); + case SOAP_TYPE_PointerTongwt__RecipienStatus: + return soap_in_PointerTongwt__RecipienStatus(soap, NULL, NULL, "ngwt:RecipienStatus"); case SOAP_TYPE_PointerTongwt__FreeBusyBlockList: return soap_in_PointerTongwt__FreeBusyBlockList(soap, NULL, NULL, "ngwt:FreeBusyBlockList"); case SOAP_TYPE_PointerTongwt__CalendarFolderAttribute: @@ -1394,8 +1394,8 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type) return soap_in_PointerTongwt__Distribution(soap, NULL, NULL, "ngwt:Distribution"); case SOAP_TYPE_PointerTongwt__View: return soap_in_PointerTongwt__View(soap, NULL, NULL, "ngwt:View"); - case SOAP_TYPE_PointerTongwt__tqStatus: - return soap_in_PointerTongwt__tqStatus(soap, NULL, NULL, "ngwt:Status"); + case SOAP_TYPE_PointerTongwt__Status: + return soap_in_PointerTongwt__Status(soap, NULL, NULL, "ngwt:Status"); case SOAP_TYPE_PointerTongwt__ItemRefList: return soap_in_PointerTongwt__ItemRefList(soap, NULL, NULL, "ngwt:ItemRefList"); case SOAP_TYPE_PointerTongwt__UserInfo: @@ -1450,14 +1450,14 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type) return soap_in_PointerTongwt__DayOfYearWeekList(soap, NULL, NULL, "ngwt:DayOfYearWeekList"); case SOAP_TYPE_PointerTongwt__Frequency: return soap_in_PointerTongwt__Frequency(soap, NULL, NULL, "ngwt:Frequency"); - case SOAP_TYPE_PointerTongwt__DelegateetqStatus: - return soap_in_PointerTongwt__DelegateetqStatus(soap, NULL, NULL, "ngwt:DelegateeStatus"); - case SOAP_TYPE_PointerTongwt__DelegatedtqStatus: - return soap_in_PointerTongwt__DelegatedtqStatus(soap, NULL, NULL, "ngwt:DelegatedStatus"); - case SOAP_TYPE_PointerTongwt__CommentqStatus: - return soap_in_PointerTongwt__CommentqStatus(soap, NULL, NULL, "ngwt:CommenStatus"); - case SOAP_TYPE_PointerTongwt__TransferFailedtqStatus: - return soap_in_PointerTongwt__TransferFailedtqStatus(soap, NULL, NULL, "ngwt:TransferFailedStatus"); + case SOAP_TYPE_PointerTongwt__DelegateeStatus: + return soap_in_PointerTongwt__DelegateeStatus(soap, NULL, NULL, "ngwt:DelegateeStatus"); + case SOAP_TYPE_PointerTongwt__DelegatedStatus: + return soap_in_PointerTongwt__DelegatedStatus(soap, NULL, NULL, "ngwt:DelegatedStatus"); + case SOAP_TYPE_PointerTongwt__CommenStatus: + return soap_in_PointerTongwt__CommenStatus(soap, NULL, NULL, "ngwt:CommenStatus"); + case SOAP_TYPE_PointerTongwt__TransferFailedStatus: + return soap_in_PointerTongwt__TransferFailedStatus(soap, NULL, NULL, "ngwt:TransferFailedStatus"); case SOAP_TYPE_PointerTongwt__Recipient: return soap_in_PointerTongwt__Recipient(soap, NULL, NULL, "ngwt:Recipient"); case SOAP_TYPE_PointerTongwt__Filter: @@ -1649,8 +1649,8 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type) return soap_in_ngwt__WeekDay(soap, NULL, NULL, NULL); } if (!soap_match_tag(soap, t, "ngwt:VersionStatus")) - { *type = SOAP_TYPE_ngwt__VersiontqStatus; - return soap_in_ngwt__VersiontqStatus(soap, NULL, NULL, NULL); + { *type = SOAP_TYPE_ngwt__VersionStatus; + return soap_in_ngwt__VersionStatus(soap, NULL, NULL, NULL); } if (!soap_match_tag(soap, t, "ngwt:VersionEventType")) { *type = SOAP_TYPE_ngwt__VersionEventType; @@ -1733,8 +1733,8 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type) return soap_in_ngwt__FolderType(soap, NULL, NULL, NULL); } if (!soap_match_tag(soap, t, "ngwt:FolderACLStatus")) - { *type = SOAP_TYPE_ngwt__FolderACLtqStatus; - return soap_in_ngwt__FolderACLtqStatus(soap, NULL, NULL, NULL); + { *type = SOAP_TYPE_ngwt__FolderACLStatus; + return soap_in_ngwt__FolderACLStatus(soap, NULL, NULL, NULL); } if (!soap_match_tag(soap, t, "ngwt:FilterOp")) { *type = SOAP_TYPE_ngwt__FilterOp; @@ -2541,8 +2541,8 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type) return soap_in_ngwt__TrustedApplication(soap, NULL, NULL, NULL); } if (!soap_match_tag(soap, t, "ngwt:TransferFailedStatus")) - { *type = SOAP_TYPE_ngwt__TransferFailedtqStatus; - return soap_in_ngwt__TransferFailedtqStatus(soap, NULL, NULL, NULL); + { *type = SOAP_TYPE_ngwt__TransferFailedStatus; + return soap_in_ngwt__TransferFailedStatus(soap, NULL, NULL, NULL); } if (!soap_match_tag(soap, t, "ngwt:TimezoneList")) { *type = SOAP_TYPE_ngwt__TimezoneList; @@ -2569,8 +2569,8 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type) return soap_in_ngwt__StatusTracking(soap, NULL, NULL, NULL); } if (!soap_match_tag(soap, t, "ngwt:Status")) - { *type = SOAP_TYPE_ngwt__tqStatus; - return soap_in_ngwt__tqStatus(soap, NULL, NULL, NULL); + { *type = SOAP_TYPE_ngwt__Status; + return soap_in_ngwt__Status(soap, NULL, NULL, NULL); } if (!soap_match_tag(soap, t, "ngwt:SMimeOperation")) { *type = SOAP_TYPE_ngwt__SMimeOperation; @@ -2665,8 +2665,8 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type) return soap_in_ngwt__RecurrenceDateType(soap, NULL, NULL, NULL); } if (!soap_match_tag(soap, t, "ngwt:RecipienStatus")) - { *type = SOAP_TYPE_ngwt__RecipientqStatus; - return soap_in_ngwt__RecipientqStatus(soap, NULL, NULL, NULL); + { *type = SOAP_TYPE_ngwt__RecipienStatus; + return soap_in_ngwt__RecipienStatus(soap, NULL, NULL, NULL); } if (!soap_match_tag(soap, t, "ngwt:RecipientList")) { *type = SOAP_TYPE_ngwt__RecipientList; @@ -2797,8 +2797,8 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type) return soap_in_ngwt__JunkEntry(soap, NULL, NULL, NULL); } if (!soap_match_tag(soap, t, "ngwt:ItemStatus")) - { *type = SOAP_TYPE_ngwt__ItemtqStatus; - return soap_in_ngwt__ItemtqStatus(soap, NULL, NULL, NULL); + { *type = SOAP_TYPE_ngwt__ItemStatus; + return soap_in_ngwt__ItemStatus(soap, NULL, NULL, NULL); } if (!soap_match_tag(soap, t, "ngwt:Items")) { *type = SOAP_TYPE_ngwt__Items; @@ -2945,12 +2945,12 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type) return soap_in_ngwt__DeltaInfo(soap, NULL, NULL, NULL); } if (!soap_match_tag(soap, t, "ngwt:DelegateeStatus")) - { *type = SOAP_TYPE_ngwt__DelegateetqStatus; - return soap_in_ngwt__DelegateetqStatus(soap, NULL, NULL, NULL); + { *type = SOAP_TYPE_ngwt__DelegateeStatus; + return soap_in_ngwt__DelegateeStatus(soap, NULL, NULL, NULL); } if (!soap_match_tag(soap, t, "ngwt:DelegatedStatus")) - { *type = SOAP_TYPE_ngwt__DelegatedtqStatus; - return soap_in_ngwt__DelegatedtqStatus(soap, NULL, NULL, NULL); + { *type = SOAP_TYPE_ngwt__DelegatedStatus; + return soap_in_ngwt__DelegatedStatus(soap, NULL, NULL, NULL); } if (!soap_match_tag(soap, t, "ngwt:DayOfYearWeekList")) { *type = SOAP_TYPE_ngwt__DayOfYearWeekList; @@ -2997,8 +2997,8 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type) return soap_in_ngwt__Contact(soap, NULL, NULL, NULL); } if (!soap_match_tag(soap, t, "ngwt:CommenStatus")) - { *type = SOAP_TYPE_ngwt__CommentqStatus; - return soap_in_ngwt__CommentqStatus(soap, NULL, NULL, NULL); + { *type = SOAP_TYPE_ngwt__CommenStatus; + return soap_in_ngwt__CommenStatus(soap, NULL, NULL, NULL); } if (!soap_match_tag(soap, t, "ngwt:CategoryRefList")) { *type = SOAP_TYPE_ngwt__CategoryRefList; @@ -3218,8 +3218,8 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_putelement(struct soap *soap, const void *ptr, co return soap_out_ngwe__EventType(soap, tag, id, (const enum ngwe__EventType *)ptr, "ngwe:EventType"); case SOAP_TYPE_ngwt__WeekDay: return soap_out_ngwt__WeekDay(soap, tag, id, (const enum ngwt__WeekDay *)ptr, "ngwt:WeekDay"); - case SOAP_TYPE_ngwt__VersiontqStatus: - return soap_out_ngwt__VersiontqStatus(soap, tag, id, (const enum ngwt__VersiontqStatus *)ptr, "ngwt:VersionStatus"); + case SOAP_TYPE_ngwt__VersionStatus: + return soap_out_ngwt__VersionStatus(soap, tag, id, (const enum ngwt__VersionStatus *)ptr, "ngwt:VersionStatus"); case SOAP_TYPE_ngwt__VersionEventType: return soap_out_ngwt__VersionEventType(soap, tag, id, (const enum ngwt__VersionEventType *)ptr, "ngwt:VersionEventType"); case SOAP_TYPE_ngwt__StatusTrackingOptions: @@ -3260,8 +3260,8 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_putelement(struct soap *soap, const void *ptr, co return soap_out_ngwt__Frequency(soap, tag, id, (const enum ngwt__Frequency *)ptr, "ngwt:Frequency"); case SOAP_TYPE_ngwt__FolderType: return soap_out_ngwt__FolderType(soap, tag, id, (const enum ngwt__FolderType *)ptr, "ngwt:FolderType"); - case SOAP_TYPE_ngwt__FolderACLtqStatus: - return soap_out_ngwt__FolderACLtqStatus(soap, tag, id, (const enum ngwt__FolderACLtqStatus *)ptr, "ngwt:FolderACLStatus"); + case SOAP_TYPE_ngwt__FolderACLStatus: + return soap_out_ngwt__FolderACLStatus(soap, tag, id, (const enum ngwt__FolderACLStatus *)ptr, "ngwt:FolderACLStatus"); case SOAP_TYPE_ngwt__FilterOp: return soap_out_ngwt__FilterOp(soap, tag, id, (const enum ngwt__FilterOp *)ptr, "ngwt:FilterOp"); case SOAP_TYPE_ngwt__FilterDate: @@ -3664,8 +3664,8 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_putelement(struct soap *soap, const void *ptr, co return ((ngwt__UserInfo *)ptr)->soap_out(soap, tag, id, "ngwt:UserInfo"); case SOAP_TYPE_ngwt__TrustedApplication: return ((ngwt__TrustedApplication *)ptr)->soap_out(soap, tag, id, "ngwt:TrustedApplication"); - case SOAP_TYPE_ngwt__TransferFailedtqStatus: - return ((ngwt__TransferFailedtqStatus *)ptr)->soap_out(soap, tag, id, "ngwt:TransferFailedStatus"); + case SOAP_TYPE_ngwt__TransferFailedStatus: + return ((ngwt__TransferFailedStatus *)ptr)->soap_out(soap, tag, id, "ngwt:TransferFailedStatus"); case SOAP_TYPE_ngwt__TimezoneList: return ((ngwt__TimezoneList *)ptr)->soap_out(soap, tag, id, "ngwt:TimezoneList"); case SOAP_TYPE_ngwt__TimezoneComponent: @@ -3678,8 +3678,8 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_putelement(struct soap *soap, const void *ptr, co return ((ngwt__SystemFolder *)ptr)->soap_out(soap, tag, id, "ngwt:SystemFolder"); case SOAP_TYPE_ngwt__StatusTracking: return ((ngwt__StatusTracking *)ptr)->soap_out(soap, tag, id, "ngwt:StatusTracking"); - case SOAP_TYPE_ngwt__tqStatus: - return ((ngwt__tqStatus *)ptr)->soap_out(soap, tag, id, "ngwt:Status"); + case SOAP_TYPE_ngwt__Status: + return ((ngwt__Status *)ptr)->soap_out(soap, tag, id, "ngwt:Status"); case SOAP_TYPE_ngwt__SMimeOperation: return ((ngwt__SMimeOperation *)ptr)->soap_out(soap, tag, id, "ngwt:SMimeOperation"); case SOAP_TYPE_ngwt__SignatureData: @@ -3726,8 +3726,8 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_putelement(struct soap *soap, const void *ptr, co return ((ngwt__RecurrenceRule *)ptr)->soap_out(soap, tag, id, "ngwt:RecurrenceRule"); case SOAP_TYPE_ngwt__RecurrenceDateType: return ((ngwt__RecurrenceDateType *)ptr)->soap_out(soap, tag, id, "ngwt:RecurrenceDateType"); - case SOAP_TYPE_ngwt__RecipientqStatus: - return ((ngwt__RecipientqStatus *)ptr)->soap_out(soap, tag, id, "ngwt:RecipienStatus"); + case SOAP_TYPE_ngwt__RecipienStatus: + return ((ngwt__RecipienStatus *)ptr)->soap_out(soap, tag, id, "ngwt:RecipienStatus"); case SOAP_TYPE_ngwt__RecipientList: return ((ngwt__RecipientList *)ptr)->soap_out(soap, tag, id, "ngwt:RecipientList"); case SOAP_TYPE_ngwt__Recipient: @@ -3792,8 +3792,8 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_putelement(struct soap *soap, const void *ptr, co return ((ngwt__JunkHandlingList *)ptr)->soap_out(soap, tag, id, "ngwt:JunkHandlingList"); case SOAP_TYPE_ngwt__JunkEntry: return ((ngwt__JunkEntry *)ptr)->soap_out(soap, tag, id, "ngwt:JunkEntry"); - case SOAP_TYPE_ngwt__ItemtqStatus: - return ((ngwt__ItemtqStatus *)ptr)->soap_out(soap, tag, id, "ngwt:ItemStatus"); + case SOAP_TYPE_ngwt__ItemStatus: + return ((ngwt__ItemStatus *)ptr)->soap_out(soap, tag, id, "ngwt:ItemStatus"); case SOAP_TYPE_ngwt__Items: return ((ngwt__Items *)ptr)->soap_out(soap, tag, id, "ngwt:Items"); case SOAP_TYPE_ngwt__ItemRefList: @@ -3866,10 +3866,10 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_putelement(struct soap *soap, const void *ptr, co return ((ngwt__Distribution *)ptr)->soap_out(soap, tag, id, "ngwt:Distribution"); case SOAP_TYPE_ngwt__DeltaInfo: return ((ngwt__DeltaInfo *)ptr)->soap_out(soap, tag, id, "ngwt:DeltaInfo"); - case SOAP_TYPE_ngwt__DelegateetqStatus: - return ((ngwt__DelegateetqStatus *)ptr)->soap_out(soap, tag, id, "ngwt:DelegateeStatus"); - case SOAP_TYPE_ngwt__DelegatedtqStatus: - return ((ngwt__DelegatedtqStatus *)ptr)->soap_out(soap, tag, id, "ngwt:DelegatedStatus"); + case SOAP_TYPE_ngwt__DelegateeStatus: + return ((ngwt__DelegateeStatus *)ptr)->soap_out(soap, tag, id, "ngwt:DelegateeStatus"); + case SOAP_TYPE_ngwt__DelegatedStatus: + return ((ngwt__DelegatedStatus *)ptr)->soap_out(soap, tag, id, "ngwt:DelegatedStatus"); case SOAP_TYPE_ngwt__DayOfYearWeekList: return ((ngwt__DayOfYearWeekList *)ptr)->soap_out(soap, tag, id, "ngwt:DayOfYearWeekList"); case SOAP_TYPE_ngwt__DayOfYearWeek: @@ -3892,8 +3892,8 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_putelement(struct soap *soap, const void *ptr, co return ((ngwt__ContactFolder *)ptr)->soap_out(soap, tag, id, "ngwt:ContactFolder"); case SOAP_TYPE_ngwt__Contact: return ((ngwt__Contact *)ptr)->soap_out(soap, tag, id, "ngwt:Contact"); - case SOAP_TYPE_ngwt__CommentqStatus: - return ((ngwt__CommentqStatus *)ptr)->soap_out(soap, tag, id, "ngwt:CommenStatus"); + case SOAP_TYPE_ngwt__CommenStatus: + return ((ngwt__CommenStatus *)ptr)->soap_out(soap, tag, id, "ngwt:CommenStatus"); case SOAP_TYPE_ngwt__CategoryRefList: return ((ngwt__CategoryRefList *)ptr)->soap_out(soap, tag, id, "ngwt:CategoryRefList"); case SOAP_TYPE_ngwt__CategoryList: @@ -4316,8 +4316,8 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_putelement(struct soap *soap, const void *ptr, co return soap_out_PointerTongwt__EmailAddressList(soap, tag, id, (ngwt__EmailAddressList *const*)ptr, "ngwt:EmailAddressList"); case SOAP_TYPE_PointerTongwt__FullName: return soap_out_PointerTongwt__FullName(soap, tag, id, (ngwt__FullName *const*)ptr, "ngwt:FullName"); - case SOAP_TYPE_PointerTongwt__VersiontqStatus: - return soap_out_PointerTongwt__VersiontqStatus(soap, tag, id, (enum ngwt__VersiontqStatus *const*)ptr, "ngwt:VersionStatus"); + case SOAP_TYPE_PointerTongwt__VersionStatus: + return soap_out_PointerTongwt__VersionStatus(soap, tag, id, (enum ngwt__VersionStatus *const*)ptr, "ngwt:VersionStatus"); case SOAP_TYPE_PointerTongwt__FolderACL: return soap_out_PointerTongwt__FolderACL(soap, tag, id, (ngwt__FolderACL *const*)ptr, "ngwt:FolderACL"); case SOAP_TYPE_PointerTongwt__RuleActionList: @@ -4326,8 +4326,8 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_putelement(struct soap *soap, const void *ptr, co return soap_out_PointerTongwt__Execution(soap, tag, id, (enum ngwt__Execution *const*)ptr, "ngwt:Execution"); case SOAP_TYPE_PointerTongwt__Query: return soap_out_PointerTongwt__Query(soap, tag, id, (ngwt__Query *const*)ptr, "ngwt:Query"); - case SOAP_TYPE_PointerTongwt__FolderACLtqStatus: - return soap_out_PointerTongwt__FolderACLtqStatus(soap, tag, id, (enum ngwt__FolderACLtqStatus *const*)ptr, "ngwt:FolderACLStatus"); + case SOAP_TYPE_PointerTongwt__FolderACLStatus: + return soap_out_PointerTongwt__FolderACLStatus(soap, tag, id, (enum ngwt__FolderACLStatus *const*)ptr, "ngwt:FolderACLStatus"); case SOAP_TYPE_PointerTongwt__AccessControlList: return soap_out_PointerTongwt__AccessControlList(soap, tag, id, (ngwt__AccessControlList *const*)ptr, "ngwt:AccessControlList"); case SOAP_TYPE_PointerTongwt__WeekOfYear: @@ -4340,12 +4340,12 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_putelement(struct soap *soap, const void *ptr, co return soap_out_PointerTongwt__ItemClass(soap, tag, id, (enum ngwt__ItemClass *const*)ptr, "ngwt:ItemClass"); case SOAP_TYPE_PointerTongwt__ItemSource: return soap_out_PointerTongwt__ItemSource(soap, tag, id, (enum ngwt__ItemSource *const*)ptr, "ngwt:ItemSource"); - case SOAP_TYPE_PointerTongwt__ItemtqStatus: - return soap_out_PointerTongwt__ItemtqStatus(soap, tag, id, (ngwt__ItemtqStatus *const*)ptr, "ngwt:ItemStatus"); + case SOAP_TYPE_PointerTongwt__ItemStatus: + return soap_out_PointerTongwt__ItemStatus(soap, tag, id, (ngwt__ItemStatus *const*)ptr, "ngwt:ItemStatus"); case SOAP_TYPE_PointerTongwt__DeltaSyncType: return soap_out_PointerTongwt__DeltaSyncType(soap, tag, id, (enum ngwt__DeltaSyncType *const*)ptr, "ngwt:DeltaSyncType"); - case SOAP_TYPE_PointerTongwt__RecipientqStatus: - return soap_out_PointerTongwt__RecipientqStatus(soap, tag, id, (ngwt__RecipientqStatus *const*)ptr, "ngwt:RecipienStatus"); + case SOAP_TYPE_PointerTongwt__RecipienStatus: + return soap_out_PointerTongwt__RecipienStatus(soap, tag, id, (ngwt__RecipienStatus *const*)ptr, "ngwt:RecipienStatus"); case SOAP_TYPE_PointerTongwt__FreeBusyBlockList: return soap_out_PointerTongwt__FreeBusyBlockList(soap, tag, id, (ngwt__FreeBusyBlockList *const*)ptr, "ngwt:FreeBusyBlockList"); case SOAP_TYPE_PointerTongwt__CalendarFolderAttribute: @@ -4448,8 +4448,8 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_putelement(struct soap *soap, const void *ptr, co return soap_out_PointerTongwt__Distribution(soap, tag, id, (ngwt__Distribution *const*)ptr, "ngwt:Distribution"); case SOAP_TYPE_PointerTongwt__View: return soap_out_PointerTongwt__View(soap, tag, id, (std::string *const*)ptr, "ngwt:View"); - case SOAP_TYPE_PointerTongwt__tqStatus: - return soap_out_PointerTongwt__tqStatus(soap, tag, id, (ngwt__tqStatus *const*)ptr, "ngwt:Status"); + case SOAP_TYPE_PointerTongwt__Status: + return soap_out_PointerTongwt__Status(soap, tag, id, (ngwt__Status *const*)ptr, "ngwt:Status"); case SOAP_TYPE_PointerTongwt__ItemRefList: return soap_out_PointerTongwt__ItemRefList(soap, tag, id, (ngwt__ItemRefList *const*)ptr, "ngwt:ItemRefList"); case SOAP_TYPE_PointerTongwt__UserInfo: @@ -4504,14 +4504,14 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_putelement(struct soap *soap, const void *ptr, co return soap_out_PointerTongwt__DayOfYearWeekList(soap, tag, id, (ngwt__DayOfYearWeekList *const*)ptr, "ngwt:DayOfYearWeekList"); case SOAP_TYPE_PointerTongwt__Frequency: return soap_out_PointerTongwt__Frequency(soap, tag, id, (enum ngwt__Frequency *const*)ptr, "ngwt:Frequency"); - case SOAP_TYPE_PointerTongwt__DelegateetqStatus: - return soap_out_PointerTongwt__DelegateetqStatus(soap, tag, id, (ngwt__DelegateetqStatus *const*)ptr, "ngwt:DelegateeStatus"); - case SOAP_TYPE_PointerTongwt__DelegatedtqStatus: - return soap_out_PointerTongwt__DelegatedtqStatus(soap, tag, id, (ngwt__DelegatedtqStatus *const*)ptr, "ngwt:DelegatedStatus"); - case SOAP_TYPE_PointerTongwt__CommentqStatus: - return soap_out_PointerTongwt__CommentqStatus(soap, tag, id, (ngwt__CommentqStatus *const*)ptr, "ngwt:CommenStatus"); - case SOAP_TYPE_PointerTongwt__TransferFailedtqStatus: - return soap_out_PointerTongwt__TransferFailedtqStatus(soap, tag, id, (ngwt__TransferFailedtqStatus *const*)ptr, "ngwt:TransferFailedStatus"); + case SOAP_TYPE_PointerTongwt__DelegateeStatus: + return soap_out_PointerTongwt__DelegateeStatus(soap, tag, id, (ngwt__DelegateeStatus *const*)ptr, "ngwt:DelegateeStatus"); + case SOAP_TYPE_PointerTongwt__DelegatedStatus: + return soap_out_PointerTongwt__DelegatedStatus(soap, tag, id, (ngwt__DelegatedStatus *const*)ptr, "ngwt:DelegatedStatus"); + case SOAP_TYPE_PointerTongwt__CommenStatus: + return soap_out_PointerTongwt__CommenStatus(soap, tag, id, (ngwt__CommenStatus *const*)ptr, "ngwt:CommenStatus"); + case SOAP_TYPE_PointerTongwt__TransferFailedStatus: + return soap_out_PointerTongwt__TransferFailedStatus(soap, tag, id, (ngwt__TransferFailedStatus *const*)ptr, "ngwt:TransferFailedStatus"); case SOAP_TYPE_PointerTongwt__Recipient: return soap_out_PointerTongwt__Recipient(soap, tag, id, (ngwt__Recipient *const*)ptr, "ngwt:Recipient"); case SOAP_TYPE_PointerTongwt__Filter: @@ -5175,8 +5175,8 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_markelement(struct soap *soap, const void *ptr, case SOAP_TYPE_ngwt__TrustedApplication: ((ngwt__TrustedApplication *)ptr)->soap_serialize(soap); break; - case SOAP_TYPE_ngwt__TransferFailedtqStatus: - ((ngwt__TransferFailedtqStatus *)ptr)->soap_serialize(soap); + case SOAP_TYPE_ngwt__TransferFailedStatus: + ((ngwt__TransferFailedStatus *)ptr)->soap_serialize(soap); break; case SOAP_TYPE_ngwt__TimezoneList: ((ngwt__TimezoneList *)ptr)->soap_serialize(soap); @@ -5196,8 +5196,8 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_markelement(struct soap *soap, const void *ptr, case SOAP_TYPE_ngwt__StatusTracking: ((ngwt__StatusTracking *)ptr)->soap_serialize(soap); break; - case SOAP_TYPE_ngwt__tqStatus: - ((ngwt__tqStatus *)ptr)->soap_serialize(soap); + case SOAP_TYPE_ngwt__Status: + ((ngwt__Status *)ptr)->soap_serialize(soap); break; case SOAP_TYPE_ngwt__SMimeOperation: ((ngwt__SMimeOperation *)ptr)->soap_serialize(soap); @@ -5268,8 +5268,8 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_markelement(struct soap *soap, const void *ptr, case SOAP_TYPE_ngwt__RecurrenceDateType: ((ngwt__RecurrenceDateType *)ptr)->soap_serialize(soap); break; - case SOAP_TYPE_ngwt__RecipientqStatus: - ((ngwt__RecipientqStatus *)ptr)->soap_serialize(soap); + case SOAP_TYPE_ngwt__RecipienStatus: + ((ngwt__RecipienStatus *)ptr)->soap_serialize(soap); break; case SOAP_TYPE_ngwt__RecipientList: ((ngwt__RecipientList *)ptr)->soap_serialize(soap); @@ -5367,8 +5367,8 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_markelement(struct soap *soap, const void *ptr, case SOAP_TYPE_ngwt__JunkEntry: ((ngwt__JunkEntry *)ptr)->soap_serialize(soap); break; - case SOAP_TYPE_ngwt__ItemtqStatus: - ((ngwt__ItemtqStatus *)ptr)->soap_serialize(soap); + case SOAP_TYPE_ngwt__ItemStatus: + ((ngwt__ItemStatus *)ptr)->soap_serialize(soap); break; case SOAP_TYPE_ngwt__Items: ((ngwt__Items *)ptr)->soap_serialize(soap); @@ -5478,11 +5478,11 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_markelement(struct soap *soap, const void *ptr, case SOAP_TYPE_ngwt__DeltaInfo: ((ngwt__DeltaInfo *)ptr)->soap_serialize(soap); break; - case SOAP_TYPE_ngwt__DelegateetqStatus: - ((ngwt__DelegateetqStatus *)ptr)->soap_serialize(soap); + case SOAP_TYPE_ngwt__DelegateeStatus: + ((ngwt__DelegateeStatus *)ptr)->soap_serialize(soap); break; - case SOAP_TYPE_ngwt__DelegatedtqStatus: - ((ngwt__DelegatedtqStatus *)ptr)->soap_serialize(soap); + case SOAP_TYPE_ngwt__DelegatedStatus: + ((ngwt__DelegatedStatus *)ptr)->soap_serialize(soap); break; case SOAP_TYPE_ngwt__DayOfYearWeekList: ((ngwt__DayOfYearWeekList *)ptr)->soap_serialize(soap); @@ -5517,8 +5517,8 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_markelement(struct soap *soap, const void *ptr, case SOAP_TYPE_ngwt__Contact: ((ngwt__Contact *)ptr)->soap_serialize(soap); break; - case SOAP_TYPE_ngwt__CommentqStatus: - ((ngwt__CommentqStatus *)ptr)->soap_serialize(soap); + case SOAP_TYPE_ngwt__CommenStatus: + ((ngwt__CommenStatus *)ptr)->soap_serialize(soap); break; case SOAP_TYPE_ngwt__CategoryRefList: ((ngwt__CategoryRefList *)ptr)->soap_serialize(soap); @@ -6402,8 +6402,8 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_markelement(struct soap *soap, const void *ptr, case SOAP_TYPE_PointerTongwt__FullName: soap_serialize_PointerTongwt__FullName(soap, (ngwt__FullName *const*)ptr); break; - case SOAP_TYPE_PointerTongwt__VersiontqStatus: - soap_serialize_PointerTongwt__VersiontqStatus(soap, (enum ngwt__VersiontqStatus *const*)ptr); + case SOAP_TYPE_PointerTongwt__VersionStatus: + soap_serialize_PointerTongwt__VersionStatus(soap, (enum ngwt__VersionStatus *const*)ptr); break; case SOAP_TYPE_PointerTongwt__FolderACL: soap_serialize_PointerTongwt__FolderACL(soap, (ngwt__FolderACL *const*)ptr); @@ -6417,8 +6417,8 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_markelement(struct soap *soap, const void *ptr, case SOAP_TYPE_PointerTongwt__Query: soap_serialize_PointerTongwt__Query(soap, (ngwt__Query *const*)ptr); break; - case SOAP_TYPE_PointerTongwt__FolderACLtqStatus: - soap_serialize_PointerTongwt__FolderACLtqStatus(soap, (enum ngwt__FolderACLtqStatus *const*)ptr); + case SOAP_TYPE_PointerTongwt__FolderACLStatus: + soap_serialize_PointerTongwt__FolderACLStatus(soap, (enum ngwt__FolderACLStatus *const*)ptr); break; case SOAP_TYPE_PointerTongwt__AccessControlList: soap_serialize_PointerTongwt__AccessControlList(soap, (ngwt__AccessControlList *const*)ptr); @@ -6438,14 +6438,14 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_markelement(struct soap *soap, const void *ptr, case SOAP_TYPE_PointerTongwt__ItemSource: soap_serialize_PointerTongwt__ItemSource(soap, (enum ngwt__ItemSource *const*)ptr); break; - case SOAP_TYPE_PointerTongwt__ItemtqStatus: - soap_serialize_PointerTongwt__ItemtqStatus(soap, (ngwt__ItemtqStatus *const*)ptr); + case SOAP_TYPE_PointerTongwt__ItemStatus: + soap_serialize_PointerTongwt__ItemStatus(soap, (ngwt__ItemStatus *const*)ptr); break; case SOAP_TYPE_PointerTongwt__DeltaSyncType: soap_serialize_PointerTongwt__DeltaSyncType(soap, (enum ngwt__DeltaSyncType *const*)ptr); break; - case SOAP_TYPE_PointerTongwt__RecipientqStatus: - soap_serialize_PointerTongwt__RecipientqStatus(soap, (ngwt__RecipientqStatus *const*)ptr); + case SOAP_TYPE_PointerTongwt__RecipienStatus: + soap_serialize_PointerTongwt__RecipienStatus(soap, (ngwt__RecipienStatus *const*)ptr); break; case SOAP_TYPE_PointerTongwt__FreeBusyBlockList: soap_serialize_PointerTongwt__FreeBusyBlockList(soap, (ngwt__FreeBusyBlockList *const*)ptr); @@ -6600,8 +6600,8 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_markelement(struct soap *soap, const void *ptr, case SOAP_TYPE_PointerTongwt__View: soap_serialize_PointerTongwt__View(soap, (std::string *const*)ptr); break; - case SOAP_TYPE_PointerTongwt__tqStatus: - soap_serialize_PointerTongwt__tqStatus(soap, (ngwt__tqStatus *const*)ptr); + case SOAP_TYPE_PointerTongwt__Status: + soap_serialize_PointerTongwt__Status(soap, (ngwt__Status *const*)ptr); break; case SOAP_TYPE_PointerTongwt__ItemRefList: soap_serialize_PointerTongwt__ItemRefList(soap, (ngwt__ItemRefList *const*)ptr); @@ -6684,17 +6684,17 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_markelement(struct soap *soap, const void *ptr, case SOAP_TYPE_PointerTongwt__Frequency: soap_serialize_PointerTongwt__Frequency(soap, (enum ngwt__Frequency *const*)ptr); break; - case SOAP_TYPE_PointerTongwt__DelegateetqStatus: - soap_serialize_PointerTongwt__DelegateetqStatus(soap, (ngwt__DelegateetqStatus *const*)ptr); + case SOAP_TYPE_PointerTongwt__DelegateeStatus: + soap_serialize_PointerTongwt__DelegateeStatus(soap, (ngwt__DelegateeStatus *const*)ptr); break; - case SOAP_TYPE_PointerTongwt__DelegatedtqStatus: - soap_serialize_PointerTongwt__DelegatedtqStatus(soap, (ngwt__DelegatedtqStatus *const*)ptr); + case SOAP_TYPE_PointerTongwt__DelegatedStatus: + soap_serialize_PointerTongwt__DelegatedStatus(soap, (ngwt__DelegatedStatus *const*)ptr); break; - case SOAP_TYPE_PointerTongwt__CommentqStatus: - soap_serialize_PointerTongwt__CommentqStatus(soap, (ngwt__CommentqStatus *const*)ptr); + case SOAP_TYPE_PointerTongwt__CommenStatus: + soap_serialize_PointerTongwt__CommenStatus(soap, (ngwt__CommenStatus *const*)ptr); break; - case SOAP_TYPE_PointerTongwt__TransferFailedtqStatus: - soap_serialize_PointerTongwt__TransferFailedtqStatus(soap, (ngwt__TransferFailedtqStatus *const*)ptr); + case SOAP_TYPE_PointerTongwt__TransferFailedStatus: + soap_serialize_PointerTongwt__TransferFailedStatus(soap, (ngwt__TransferFailedStatus *const*)ptr); break; case SOAP_TYPE_PointerTongwt__Recipient: soap_serialize_PointerTongwt__Recipient(soap, (ngwt__Recipient *const*)ptr); @@ -6944,8 +6944,8 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_instantiate(struct soap *soap, int t, const ch return (void*)soap_instantiate_ngwt__ItemRefList(soap, -1, type, arrayType, n); case SOAP_TYPE_ngwt__Items: return (void*)soap_instantiate_ngwt__Items(soap, -1, type, arrayType, n); - case SOAP_TYPE_ngwt__ItemtqStatus: - return (void*)soap_instantiate_ngwt__ItemtqStatus(soap, -1, type, arrayType, n); + case SOAP_TYPE_ngwt__ItemStatus: + return (void*)soap_instantiate_ngwt__ItemStatus(soap, -1, type, arrayType, n); case SOAP_TYPE_ngwt__JunkEntry: return (void*)soap_instantiate_ngwt__JunkEntry(soap, -1, type, arrayType, n); case SOAP_TYPE_ngwt__JunkHandlingList: @@ -6986,8 +6986,8 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_instantiate(struct soap *soap, int t, const ch return (void*)soap_instantiate_ngwt__QueryTarget(soap, -1, type, arrayType, n); case SOAP_TYPE_ngwt__RecipientList: return (void*)soap_instantiate_ngwt__RecipientList(soap, -1, type, arrayType, n); - case SOAP_TYPE_ngwt__RecipientqStatus: - return (void*)soap_instantiate_ngwt__RecipientqStatus(soap, -1, type, arrayType, n); + case SOAP_TYPE_ngwt__RecipienStatus: + return (void*)soap_instantiate_ngwt__RecipienStatus(soap, -1, type, arrayType, n); case SOAP_TYPE_ngwt__RecurrenceDateType: return (void*)soap_instantiate_ngwt__RecurrenceDateType(soap, -1, type, arrayType, n); case SOAP_TYPE_ngwt__RecurrenceRule: @@ -7026,8 +7026,8 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_instantiate(struct soap *soap, int t, const ch return (void*)soap_instantiate_ngwt__SignatureData(soap, -1, type, arrayType, n); case SOAP_TYPE_ngwt__SMimeOperation: return (void*)soap_instantiate_ngwt__SMimeOperation(soap, -1, type, arrayType, n); - case SOAP_TYPE_ngwt__tqStatus: - return (void*)soap_instantiate_ngwt__tqStatus(soap, -1, type, arrayType, n); + case SOAP_TYPE_ngwt__Status: + return (void*)soap_instantiate_ngwt__Status(soap, -1, type, arrayType, n); case SOAP_TYPE_ngwt__Timezone: return (void*)soap_instantiate_ngwt__Timezone(soap, -1, type, arrayType, n); case SOAP_TYPE_ngwt__TimezoneComponent: @@ -7400,16 +7400,16 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_instantiate(struct soap *soap, int t, const ch return (void*)soap_instantiate_ngwt__Alarm(soap, -1, type, arrayType, n); case SOAP_TYPE_ngwt__Category: return (void*)soap_instantiate_ngwt__Category(soap, -1, type, arrayType, n); - case SOAP_TYPE_ngwt__CommentqStatus: - return (void*)soap_instantiate_ngwt__CommentqStatus(soap, -1, type, arrayType, n); + case SOAP_TYPE_ngwt__CommenStatus: + return (void*)soap_instantiate_ngwt__CommenStatus(soap, -1, type, arrayType, n); case SOAP_TYPE_ngwt__ContainerItem: return (void*)soap_instantiate_ngwt__ContainerItem(soap, -1, type, arrayType, n); case SOAP_TYPE_ngwt__ContainerRef: return (void*)soap_instantiate_ngwt__ContainerRef(soap, -1, type, arrayType, n); - case SOAP_TYPE_ngwt__DelegatedtqStatus: - return (void*)soap_instantiate_ngwt__DelegatedtqStatus(soap, -1, type, arrayType, n); - case SOAP_TYPE_ngwt__DelegateetqStatus: - return (void*)soap_instantiate_ngwt__DelegateetqStatus(soap, -1, type, arrayType, n); + case SOAP_TYPE_ngwt__DelegatedStatus: + return (void*)soap_instantiate_ngwt__DelegatedStatus(soap, -1, type, arrayType, n); + case SOAP_TYPE_ngwt__DelegateeStatus: + return (void*)soap_instantiate_ngwt__DelegateeStatus(soap, -1, type, arrayType, n); case SOAP_TYPE_ngwt__FilterEntry: return (void*)soap_instantiate_ngwt__FilterEntry(soap, -1, type, arrayType, n); case SOAP_TYPE_ngwt__FilterGroup: @@ -7436,8 +7436,8 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_instantiate(struct soap *soap, int t, const ch return (void*)soap_instantiate_ngwt__ProxyUser(soap, -1, type, arrayType, n); case SOAP_TYPE_ngwt__Recipient: return (void*)soap_instantiate_ngwt__Recipient(soap, -1, type, arrayType, n); - case SOAP_TYPE_ngwt__TransferFailedtqStatus: - return (void*)soap_instantiate_ngwt__TransferFailedtqStatus(soap, -1, type, arrayType, n); + case SOAP_TYPE_ngwt__TransferFailedStatus: + return (void*)soap_instantiate_ngwt__TransferFailedStatus(soap, -1, type, arrayType, n); case SOAP_TYPE_ngwt__TrustedApplication: return (void*)soap_instantiate_ngwt__TrustedApplication(soap, -1, type, arrayType, n); case SOAP_TYPE_ngwt__AddressBookItem: @@ -7540,8 +7540,8 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_instantiate(struct soap *soap, int t, const ch return (void*)soap_instantiate_std__vectorTemplateOfPointerTongwt__RuleAction(soap, -1, type, arrayType, n); case SOAP_TYPE_std__vectorTemplateOfxsd__date: return (void*)soap_instantiate_std__vectorTemplateOfxsd__date(soap, -1, type, arrayType, n); - case SOAP_TYPE_std__vectorTemplateOfPointerTongwt__DelegateetqStatus: - return (void*)soap_instantiate_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(soap, -1, type, arrayType, n); + case SOAP_TYPE_std__vectorTemplateOfPointerTongwt__DelegateeStatus: + return (void*)soap_instantiate_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, -1, type, arrayType, n); case SOAP_TYPE_std__vectorTemplateOfPointerTongwt__Recipient: return (void*)soap_instantiate_std__vectorTemplateOfPointerTongwt__Recipient(soap, -1, type, arrayType, n); case SOAP_TYPE_std__vectorTemplateOfPointerTongwt__ProxyUser: @@ -7879,11 +7879,11 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_fdelete(struct soap_clist *p) else delete[] (ngwt__Items*)p->ptr; break; - case SOAP_TYPE_ngwt__ItemtqStatus: + case SOAP_TYPE_ngwt__ItemStatus: if (p->size < 0) - delete (ngwt__ItemtqStatus*)p->ptr; + delete (ngwt__ItemStatus*)p->ptr; else - delete[] (ngwt__ItemtqStatus*)p->ptr; + delete[] (ngwt__ItemStatus*)p->ptr; break; case SOAP_TYPE_ngwt__JunkEntry: if (p->size < 0) @@ -8005,11 +8005,11 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_fdelete(struct soap_clist *p) else delete[] (ngwt__RecipientList*)p->ptr; break; - case SOAP_TYPE_ngwt__RecipientqStatus: + case SOAP_TYPE_ngwt__RecipienStatus: if (p->size < 0) - delete (ngwt__RecipientqStatus*)p->ptr; + delete (ngwt__RecipienStatus*)p->ptr; else - delete[] (ngwt__RecipientqStatus*)p->ptr; + delete[] (ngwt__RecipienStatus*)p->ptr; break; case SOAP_TYPE_ngwt__RecurrenceDateType: if (p->size < 0) @@ -8125,11 +8125,11 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_fdelete(struct soap_clist *p) else delete[] (ngwt__SMimeOperation*)p->ptr; break; - case SOAP_TYPE_ngwt__tqStatus: + case SOAP_TYPE_ngwt__Status: if (p->size < 0) - delete (ngwt__tqStatus*)p->ptr; + delete (ngwt__Status*)p->ptr; else - delete[] (ngwt__tqStatus*)p->ptr; + delete[] (ngwt__Status*)p->ptr; break; case SOAP_TYPE_ngwt__Timezone: if (p->size < 0) @@ -9247,11 +9247,11 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_fdelete(struct soap_clist *p) else delete[] (ngwt__Category*)p->ptr; break; - case SOAP_TYPE_ngwt__CommentqStatus: + case SOAP_TYPE_ngwt__CommenStatus: if (p->size < 0) - delete (ngwt__CommentqStatus*)p->ptr; + delete (ngwt__CommenStatus*)p->ptr; else - delete[] (ngwt__CommentqStatus*)p->ptr; + delete[] (ngwt__CommenStatus*)p->ptr; break; case SOAP_TYPE_ngwt__ContainerItem: if (p->size < 0) @@ -9265,17 +9265,17 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_fdelete(struct soap_clist *p) else delete[] (ngwt__ContainerRef*)p->ptr; break; - case SOAP_TYPE_ngwt__DelegatedtqStatus: + case SOAP_TYPE_ngwt__DelegatedStatus: if (p->size < 0) - delete (ngwt__DelegatedtqStatus*)p->ptr; + delete (ngwt__DelegatedStatus*)p->ptr; else - delete[] (ngwt__DelegatedtqStatus*)p->ptr; + delete[] (ngwt__DelegatedStatus*)p->ptr; break; - case SOAP_TYPE_ngwt__DelegateetqStatus: + case SOAP_TYPE_ngwt__DelegateeStatus: if (p->size < 0) - delete (ngwt__DelegateetqStatus*)p->ptr; + delete (ngwt__DelegateeStatus*)p->ptr; else - delete[] (ngwt__DelegateetqStatus*)p->ptr; + delete[] (ngwt__DelegateeStatus*)p->ptr; break; case SOAP_TYPE_ngwt__FilterEntry: if (p->size < 0) @@ -9355,11 +9355,11 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_fdelete(struct soap_clist *p) else delete[] (ngwt__Recipient*)p->ptr; break; - case SOAP_TYPE_ngwt__TransferFailedtqStatus: + case SOAP_TYPE_ngwt__TransferFailedStatus: if (p->size < 0) - delete (ngwt__TransferFailedtqStatus*)p->ptr; + delete (ngwt__TransferFailedStatus*)p->ptr; else - delete[] (ngwt__TransferFailedtqStatus*)p->ptr; + delete[] (ngwt__TransferFailedStatus*)p->ptr; break; case SOAP_TYPE_ngwt__TrustedApplication: if (p->size < 0) @@ -9667,11 +9667,11 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_fdelete(struct soap_clist *p) else delete[] (std::vector<std::string >*)p->ptr; break; - case SOAP_TYPE_std__vectorTemplateOfPointerTongwt__DelegateetqStatus: + case SOAP_TYPE_std__vectorTemplateOfPointerTongwt__DelegateeStatus: if (p->size < 0) - delete (std::vector<ngwt__DelegateetqStatus * >*)p->ptr; + delete (std::vector<ngwt__DelegateeStatus * >*)p->ptr; else - delete[] (std::vector<ngwt__DelegateetqStatus * >*)p->ptr; + delete[] (std::vector<ngwt__DelegateeStatus * >*)p->ptr; break; case SOAP_TYPE_std__vectorTemplateOfPointerTongwt__Recipient: if (p->size < 0) @@ -9927,9 +9927,9 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_container_insert(struct soap *soap, int st, int DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Container insert type=%d in %d location=%p object=%p\n", st, tt, p, q)); ((std::vector<std::string >*)p)->insert(((std::vector<std::string >*)p)->end(), *(std::string *)q); break; - case SOAP_TYPE_std__vectorTemplateOfPointerTongwt__DelegateetqStatus: + case SOAP_TYPE_std__vectorTemplateOfPointerTongwt__DelegateeStatus: DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Container insert type=%d in %d location=%p object=%p\n", st, tt, p, q)); - ((std::vector<ngwt__DelegateetqStatus * >*)p)->insert(((std::vector<ngwt__DelegateetqStatus * >*)p)->end(), *(ngwt__DelegateetqStatus **)q); + ((std::vector<ngwt__DelegateeStatus * >*)p)->insert(((std::vector<ngwt__DelegateeStatus * >*)p)->end(), *(ngwt__DelegateeStatus **)q); break; case SOAP_TYPE_std__vectorTemplateOfPointerTongwt__Recipient: DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Container insert type=%d in %d location=%p object=%p\n", st, tt, p, q)); @@ -11031,25 +11031,25 @@ SOAP_FMAC3 enum ngwt__WeekDay * SOAP_FMAC4 soap_in_ngwt__WeekDay(struct soap *so return a; } -SOAP_FMAC3 void SOAP_FMAC4 soap_default_ngwt__VersiontqStatus(struct soap *soap, enum ngwt__VersiontqStatus *a) +SOAP_FMAC3 void SOAP_FMAC4 soap_default_ngwt__VersionStatus(struct soap *soap, enum ngwt__VersionStatus *a) { (void)soap; /* appease -Wall -Werror */ -#ifdef SOAP_DEFAULT_ngwt__VersiontqStatus - *a = SOAP_DEFAULT_ngwt__VersiontqStatus; +#ifdef SOAP_DEFAULT_ngwt__VersionStatus + *a = SOAP_DEFAULT_ngwt__VersionStatus; #else - *a = (enum ngwt__VersiontqStatus)0; + *a = (enum ngwt__VersionStatus)0; #endif } -SOAP_FMAC3 int SOAP_FMAC4 soap_put_ngwt__VersiontqStatus(struct soap *soap, const enum ngwt__VersiontqStatus *a, const char *tag, const char *type) +SOAP_FMAC3 int SOAP_FMAC4 soap_put_ngwt__VersionStatus(struct soap *soap, const enum ngwt__VersionStatus *a, const char *tag, const char *type) { - register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_ngwt__VersiontqStatus); - if (soap_out_ngwt__VersiontqStatus(soap, tag, id, a, type)) + register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_ngwt__VersionStatus); + if (soap_out_ngwt__VersionStatus(soap, tag, id, a, type)) return soap->error; return soap_putindependent(soap); } -static const struct soap_code_map soap_codes_ngwt__VersiontqStatus[] = +static const struct soap_code_map soap_codes_ngwt__VersionStatus[] = { { (long)available, "available" }, { (long)checkedOut, "checkedOut" }, { (long)inUse, "inUse" }, @@ -11060,44 +11060,44 @@ static const struct soap_code_map soap_codes_ngwt__VersiontqStatus[] = { 0, NULL } }; -SOAP_FMAC3S const char* SOAP_FMAC4S soap_ngwt__VersiontqStatus2s(struct soap *soap, enum ngwt__VersiontqStatus n) -{ const char *s = soap_str_code(soap_codes_ngwt__VersiontqStatus, (long)n); +SOAP_FMAC3S const char* SOAP_FMAC4S soap_ngwt__VersionStatus2s(struct soap *soap, enum ngwt__VersionStatus n) +{ const char *s = soap_str_code(soap_codes_ngwt__VersionStatus, (long)n); if (s) return s; return soap_long2s(soap, (long)n); } -SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__VersiontqStatus(struct soap *soap, const char *tag, int id, const enum ngwt__VersiontqStatus *a, const char *type) -{ soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ngwt__VersiontqStatus), type); - soap_send(soap, soap_ngwt__VersiontqStatus2s(soap, *a)); +SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__VersionStatus(struct soap *soap, const char *tag, int id, const enum ngwt__VersionStatus *a, const char *type) +{ soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ngwt__VersionStatus), type); + soap_send(soap, soap_ngwt__VersionStatus2s(soap, *a)); return soap_element_end_out(soap, tag); } -SOAP_FMAC3 enum ngwt__VersiontqStatus * SOAP_FMAC4 soap_get_ngwt__VersiontqStatus(struct soap *soap, enum ngwt__VersiontqStatus *p, const char *tag, const char *type) +SOAP_FMAC3 enum ngwt__VersionStatus * SOAP_FMAC4 soap_get_ngwt__VersionStatus(struct soap *soap, enum ngwt__VersionStatus *p, const char *tag, const char *type) { - if ((p = soap_in_ngwt__VersiontqStatus(soap, tag, p, type))) + if ((p = soap_in_ngwt__VersionStatus(soap, tag, p, type))) soap_getindependent(soap); return p; } -SOAP_FMAC3S int SOAP_FMAC4S soap_s2ngwt__VersiontqStatus(struct soap *soap, const char *s, enum ngwt__VersiontqStatus *a) +SOAP_FMAC3S int SOAP_FMAC4S soap_s2ngwt__VersionStatus(struct soap *soap, const char *s, enum ngwt__VersionStatus *a) { const struct soap_code_map *map; if (!s) return SOAP_OK; - map = soap_code(soap_codes_ngwt__VersiontqStatus, s); + map = soap_code(soap_codes_ngwt__VersionStatus, s); if (map) - *a = (enum ngwt__VersiontqStatus)map->code; + *a = (enum ngwt__VersionStatus)map->code; else { long n; if (soap_s2long(soap, s, &n)) return soap->error; - *a = (enum ngwt__VersiontqStatus)n; + *a = (enum ngwt__VersionStatus)n; } return SOAP_OK; } -SOAP_FMAC3 enum ngwt__VersiontqStatus * SOAP_FMAC4 soap_in_ngwt__VersiontqStatus(struct soap *soap, const char *tag, enum ngwt__VersiontqStatus *a, const char *type) +SOAP_FMAC3 enum ngwt__VersionStatus * SOAP_FMAC4 soap_in_ngwt__VersionStatus(struct soap *soap, const char *tag, enum ngwt__VersionStatus *a, const char *type) { if (soap_element_begin_in(soap, tag, 0)) return NULL; @@ -11105,15 +11105,15 @@ SOAP_FMAC3 enum ngwt__VersiontqStatus * SOAP_FMAC4 soap_in_ngwt__VersiontqStatus { soap->error = SOAP_TYPE; return NULL; } - a = (enum ngwt__VersiontqStatus *)soap_id_enter(soap, soap->id, a, SOAP_TYPE_ngwt__VersiontqStatus, sizeof(enum ngwt__VersiontqStatus), 0, NULL, NULL, NULL); + a = (enum ngwt__VersionStatus *)soap_id_enter(soap, soap->id, a, SOAP_TYPE_ngwt__VersionStatus, sizeof(enum ngwt__VersionStatus), 0, NULL, NULL, NULL); if (!a) return NULL; if (soap->body && !*soap->href) - { if (!a || soap_s2ngwt__VersiontqStatus(soap, soap_value(soap), a) || soap_element_end_in(soap, tag)) + { if (!a || soap_s2ngwt__VersionStatus(soap, soap_value(soap), a) || soap_element_end_in(soap, tag)) return NULL; } else - { a = (enum ngwt__VersiontqStatus *)soap_id_forward(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__VersiontqStatus, 0, sizeof(enum ngwt__VersiontqStatus), 0, NULL); + { a = (enum ngwt__VersionStatus *)soap_id_forward(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__VersionStatus, 0, sizeof(enum ngwt__VersionStatus), 0, NULL); if (soap->body && soap_element_end_in(soap, tag)) return NULL; } @@ -11148,7 +11148,7 @@ static const struct soap_code_map soap_codes_ngwt__VersionEventType[] = { (long)created, "created" }, { (long)deleteVersion, "deleteVersion" }, { (long)endAccess, "endAccess" }, - { (long)resetqStatus, "reseStatus" }, + { (long)reseStatus, "reseStatus" }, { (long)restore, "restore" }, { (long)retrieve, "retrieve" }, { (long)securityModified, "securityModified" }, @@ -12877,25 +12877,25 @@ SOAP_FMAC3 enum ngwt__FolderType * SOAP_FMAC4 soap_in_ngwt__FolderType(struct so return a; } -SOAP_FMAC3 void SOAP_FMAC4 soap_default_ngwt__FolderACLtqStatus(struct soap *soap, enum ngwt__FolderACLtqStatus *a) +SOAP_FMAC3 void SOAP_FMAC4 soap_default_ngwt__FolderACLStatus(struct soap *soap, enum ngwt__FolderACLStatus *a) { (void)soap; /* appease -Wall -Werror */ -#ifdef SOAP_DEFAULT_ngwt__FolderACLtqStatus - *a = SOAP_DEFAULT_ngwt__FolderACLtqStatus; +#ifdef SOAP_DEFAULT_ngwt__FolderACLStatus + *a = SOAP_DEFAULT_ngwt__FolderACLStatus; #else - *a = (enum ngwt__FolderACLtqStatus)0; + *a = (enum ngwt__FolderACLStatus)0; #endif } -SOAP_FMAC3 int SOAP_FMAC4 soap_put_ngwt__FolderACLtqStatus(struct soap *soap, const enum ngwt__FolderACLtqStatus *a, const char *tag, const char *type) +SOAP_FMAC3 int SOAP_FMAC4 soap_put_ngwt__FolderACLStatus(struct soap *soap, const enum ngwt__FolderACLStatus *a, const char *tag, const char *type) { - register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_ngwt__FolderACLtqStatus); - if (soap_out_ngwt__FolderACLtqStatus(soap, tag, id, a, type)) + register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_ngwt__FolderACLStatus); + if (soap_out_ngwt__FolderACLStatus(soap, tag, id, a, type)) return soap->error; return soap_putindependent(soap); } -static const struct soap_code_map soap_codes_ngwt__FolderACLtqStatus[] = +static const struct soap_code_map soap_codes_ngwt__FolderACLStatus[] = { { (long)pending, "pending" }, { (long)accepted, "accepted" }, { (long)deleted, "deleted" }, @@ -12904,44 +12904,44 @@ static const struct soap_code_map soap_codes_ngwt__FolderACLtqStatus[] = { 0, NULL } }; -SOAP_FMAC3S const char* SOAP_FMAC4S soap_ngwt__FolderACLtqStatus2s(struct soap *soap, enum ngwt__FolderACLtqStatus n) -{ const char *s = soap_str_code(soap_codes_ngwt__FolderACLtqStatus, (long)n); +SOAP_FMAC3S const char* SOAP_FMAC4S soap_ngwt__FolderACLStatus2s(struct soap *soap, enum ngwt__FolderACLStatus n) +{ const char *s = soap_str_code(soap_codes_ngwt__FolderACLStatus, (long)n); if (s) return s; return soap_long2s(soap, (long)n); } -SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__FolderACLtqStatus(struct soap *soap, const char *tag, int id, const enum ngwt__FolderACLtqStatus *a, const char *type) -{ soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ngwt__FolderACLtqStatus), type); - soap_send(soap, soap_ngwt__FolderACLtqStatus2s(soap, *a)); +SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__FolderACLStatus(struct soap *soap, const char *tag, int id, const enum ngwt__FolderACLStatus *a, const char *type) +{ soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ngwt__FolderACLStatus), type); + soap_send(soap, soap_ngwt__FolderACLStatus2s(soap, *a)); return soap_element_end_out(soap, tag); } -SOAP_FMAC3 enum ngwt__FolderACLtqStatus * SOAP_FMAC4 soap_get_ngwt__FolderACLtqStatus(struct soap *soap, enum ngwt__FolderACLtqStatus *p, const char *tag, const char *type) +SOAP_FMAC3 enum ngwt__FolderACLStatus * SOAP_FMAC4 soap_get_ngwt__FolderACLStatus(struct soap *soap, enum ngwt__FolderACLStatus *p, const char *tag, const char *type) { - if ((p = soap_in_ngwt__FolderACLtqStatus(soap, tag, p, type))) + if ((p = soap_in_ngwt__FolderACLStatus(soap, tag, p, type))) soap_getindependent(soap); return p; } -SOAP_FMAC3S int SOAP_FMAC4S soap_s2ngwt__FolderACLtqStatus(struct soap *soap, const char *s, enum ngwt__FolderACLtqStatus *a) +SOAP_FMAC3S int SOAP_FMAC4S soap_s2ngwt__FolderACLStatus(struct soap *soap, const char *s, enum ngwt__FolderACLStatus *a) { const struct soap_code_map *map; if (!s) return SOAP_OK; - map = soap_code(soap_codes_ngwt__FolderACLtqStatus, s); + map = soap_code(soap_codes_ngwt__FolderACLStatus, s); if (map) - *a = (enum ngwt__FolderACLtqStatus)map->code; + *a = (enum ngwt__FolderACLStatus)map->code; else { long n; if (soap_s2long(soap, s, &n)) return soap->error; - *a = (enum ngwt__FolderACLtqStatus)n; + *a = (enum ngwt__FolderACLStatus)n; } return SOAP_OK; } -SOAP_FMAC3 enum ngwt__FolderACLtqStatus * SOAP_FMAC4 soap_in_ngwt__FolderACLtqStatus(struct soap *soap, const char *tag, enum ngwt__FolderACLtqStatus *a, const char *type) +SOAP_FMAC3 enum ngwt__FolderACLStatus * SOAP_FMAC4 soap_in_ngwt__FolderACLStatus(struct soap *soap, const char *tag, enum ngwt__FolderACLStatus *a, const char *type) { if (soap_element_begin_in(soap, tag, 0)) return NULL; @@ -12949,15 +12949,15 @@ SOAP_FMAC3 enum ngwt__FolderACLtqStatus * SOAP_FMAC4 soap_in_ngwt__FolderACLtqSt { soap->error = SOAP_TYPE; return NULL; } - a = (enum ngwt__FolderACLtqStatus *)soap_id_enter(soap, soap->id, a, SOAP_TYPE_ngwt__FolderACLtqStatus, sizeof(enum ngwt__FolderACLtqStatus), 0, NULL, NULL, NULL); + a = (enum ngwt__FolderACLStatus *)soap_id_enter(soap, soap->id, a, SOAP_TYPE_ngwt__FolderACLStatus, sizeof(enum ngwt__FolderACLStatus), 0, NULL, NULL, NULL); if (!a) return NULL; if (soap->body && !*soap->href) - { if (!a || soap_s2ngwt__FolderACLtqStatus(soap, soap_value(soap), a) || soap_element_end_in(soap, tag)) + { if (!a || soap_s2ngwt__FolderACLStatus(soap, soap_value(soap), a) || soap_element_end_in(soap, tag)) return NULL; } else - { a = (enum ngwt__FolderACLtqStatus *)soap_id_forward(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__FolderACLtqStatus, 0, sizeof(enum ngwt__FolderACLtqStatus), 0, NULL); + { a = (enum ngwt__FolderACLStatus *)soap_id_forward(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__FolderACLStatus, 0, sizeof(enum ngwt__FolderACLStatus), 0, NULL); if (soap->body && soap_element_end_in(soap, tag)) return NULL; } @@ -14261,7 +14261,7 @@ static const struct soap_code_map soap_codes_ngwe__FieldList[] = { (long)PhoneNumber, "PhoneNumber" }, { (long)Place, "Place" }, { (long)PostalAddress, "PostalAddress" }, - { (long)RecipientqStatus, "RecipienStatus" }, + { (long)RecipienStatus, "RecipienStatus" }, { (long)Rights, "Rights" }, { (long)Security, "Security" }, { (long)SendPriority, "SendPriority" }, @@ -14299,7 +14299,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwe__FieldList(struct soap *soap, const char case 262144: soap_send(soap, "PhoneNumber "); break; case 524288: soap_send(soap, "Place "); break; case 1048576: soap_send(soap, "PostalAddress "); break; - case 2097152: soap_send(soap, "RecipientqStatus "); break; + case 2097152: soap_send(soap, "RecipienStatus "); break; case 4194304: soap_send(soap, "Rights "); break; case 8388608: soap_send(soap, "Security "); break; case 16777216: soap_send(soap, "SendPriority "); break; @@ -14377,7 +14377,7 @@ SOAP_FMAC3 enum ngwe__FieldList * SOAP_FMAC4 soap_in_ngwe__FieldList(struct soap else if (!strcmp(s, "PostalAddress")) i |= (LONG64)PostalAddress; else if (!strcmp(s, "RecipienStatus")) - i |= (LONG64)RecipientqStatus; + i |= (LONG64)RecipienStatus; else if (!strcmp(s, "Rights")) i |= (LONG64)Rights; else if (!strcmp(s, "Security")) @@ -14873,8 +14873,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__View(struct soap *soap, int st, int t void _ngwe__removeEventsResponse::soap_serialize(struct soap *soap) const { (void)soap; /* appease -Wall -Werror */ - soap_embedded(soap, &((_ngwe__removeEventsResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwe__removeEventsResponse*)this)->status); + soap_embedded(soap, &((_ngwe__removeEventsResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwe__removeEventsResponse*)this)->status); /* transient soap skipped */ } @@ -14901,7 +14901,7 @@ int _ngwe__removeEventsResponse::soap_out(struct soap *soap, const char *tag, in SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwe__removeEventsResponse(struct soap *soap, const char *tag, int id, const _ngwe__removeEventsResponse *a, const char *type) { soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwe__removeEventsResponse), type); - soap_out_PointerTongwt__tqStatus(soap, "ngwe:status", -1, &(((_ngwe__removeEventsResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwe:status", -1, &(((_ngwe__removeEventsResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -14944,7 +14944,7 @@ SOAP_FMAC3 _ngwe__removeEventsResponse * SOAP_FMAC4 soap_in__ngwe__removeEventsR for (;;) { soap->error = SOAP_TAG_MISMATCH; if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwe:status", &(((_ngwe__removeEventsResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwe:status", &(((_ngwe__removeEventsResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -15167,8 +15167,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwe__removeEventsRequest(struct soap *soa void _ngwe__removeEventConfigurationResponse::soap_serialize(struct soap *soap) const { (void)soap; /* appease -Wall -Werror */ - soap_embedded(soap, &((_ngwe__removeEventConfigurationResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwe__removeEventConfigurationResponse*)this)->status); + soap_embedded(soap, &((_ngwe__removeEventConfigurationResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwe__removeEventConfigurationResponse*)this)->status); /* transient soap skipped */ } @@ -15195,7 +15195,7 @@ int _ngwe__removeEventConfigurationResponse::soap_out(struct soap *soap, const c SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwe__removeEventConfigurationResponse(struct soap *soap, const char *tag, int id, const _ngwe__removeEventConfigurationResponse *a, const char *type) { soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwe__removeEventConfigurationResponse), type); - soap_out_PointerTongwt__tqStatus(soap, "ngwe:status", -1, &(((_ngwe__removeEventConfigurationResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwe:status", -1, &(((_ngwe__removeEventConfigurationResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -15238,7 +15238,7 @@ SOAP_FMAC3 _ngwe__removeEventConfigurationResponse * SOAP_FMAC4 soap_in__ngwe__r for (;;) { soap->error = SOAP_TAG_MISMATCH; if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwe:status", &(((_ngwe__removeEventConfigurationResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwe:status", &(((_ngwe__removeEventConfigurationResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -15445,8 +15445,8 @@ void _ngwe__getEventsResponse::soap_serialize(struct soap *soap) const (void)soap; /* appease -Wall -Werror */ soap_embedded(soap, &((_ngwe__getEventsResponse*)this)->events, SOAP_TYPE_PointerTongwe__EventList); soap_serialize_PointerTongwe__EventList(soap, &((_ngwe__getEventsResponse*)this)->events); - soap_embedded(soap, &((_ngwe__getEventsResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwe__getEventsResponse*)this)->status); + soap_embedded(soap, &((_ngwe__getEventsResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwe__getEventsResponse*)this)->status); /* transient soap skipped */ } @@ -15475,7 +15475,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwe__getEventsResponse(struct soap *soap, c { soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwe__getEventsResponse), type); soap_out_PointerTongwe__EventList(soap, "ngwe:events", -1, &(((_ngwe__getEventsResponse*)a)->events), ""); - soap_out_PointerTongwt__tqStatus(soap, "ngwe:status", -1, &(((_ngwe__getEventsResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwe:status", -1, &(((_ngwe__getEventsResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -15523,7 +15523,7 @@ SOAP_FMAC3 _ngwe__getEventsResponse * SOAP_FMAC4 soap_in__ngwe__getEventsRespons continue; } if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwe:status", &(((_ngwe__getEventsResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwe:status", &(((_ngwe__getEventsResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -15781,8 +15781,8 @@ void _ngwe__getEventConfigurationResponse::soap_serialize(struct soap *soap) con (void)soap; /* appease -Wall -Werror */ soap_embedded(soap, &((_ngwe__getEventConfigurationResponse*)this)->events, SOAP_TYPE_PointerTongwe__EventsList); soap_serialize_PointerTongwe__EventsList(soap, &((_ngwe__getEventConfigurationResponse*)this)->events); - soap_embedded(soap, &((_ngwe__getEventConfigurationResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwe__getEventConfigurationResponse*)this)->status); + soap_embedded(soap, &((_ngwe__getEventConfigurationResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwe__getEventConfigurationResponse*)this)->status); /* transient soap skipped */ } @@ -15811,7 +15811,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwe__getEventConfigurationResponse(struct s { soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwe__getEventConfigurationResponse), type); soap_out_PointerTongwe__EventsList(soap, "ngwe:events", -1, &(((_ngwe__getEventConfigurationResponse*)a)->events), ""); - soap_out_PointerTongwt__tqStatus(soap, "ngwe:status", -1, &(((_ngwe__getEventConfigurationResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwe:status", -1, &(((_ngwe__getEventConfigurationResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -15859,7 +15859,7 @@ SOAP_FMAC3 _ngwe__getEventConfigurationResponse * SOAP_FMAC4 soap_in__ngwe__getE continue; } if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwe:status", &(((_ngwe__getEventConfigurationResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwe:status", &(((_ngwe__getEventConfigurationResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -16060,8 +16060,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwe__getEventConfigurationRequest(struct void _ngwe__configureEventsResponse::soap_serialize(struct soap *soap) const { (void)soap; /* appease -Wall -Werror */ - soap_embedded(soap, &((_ngwe__configureEventsResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwe__configureEventsResponse*)this)->status); + soap_embedded(soap, &((_ngwe__configureEventsResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwe__configureEventsResponse*)this)->status); /* transient soap skipped */ } @@ -16088,7 +16088,7 @@ int _ngwe__configureEventsResponse::soap_out(struct soap *soap, const char *tag, SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwe__configureEventsResponse(struct soap *soap, const char *tag, int id, const _ngwe__configureEventsResponse *a, const char *type) { soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwe__configureEventsResponse), type); - soap_out_PointerTongwt__tqStatus(soap, "ngwe:status", -1, &(((_ngwe__configureEventsResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwe:status", -1, &(((_ngwe__configureEventsResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -16131,7 +16131,7 @@ SOAP_FMAC3 _ngwe__configureEventsResponse * SOAP_FMAC4 soap_in__ngwe__configureE for (;;) { soap->error = SOAP_TAG_MISMATCH; if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwe:status", &(((_ngwe__configureEventsResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwe:status", &(((_ngwe__configureEventsResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -16332,8 +16332,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwe__configureEventsRequest(struct soap * void _ngwe__cleanEventConfigurationResponse::soap_serialize(struct soap *soap) const { (void)soap; /* appease -Wall -Werror */ - soap_embedded(soap, &((_ngwe__cleanEventConfigurationResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwe__cleanEventConfigurationResponse*)this)->status); + soap_embedded(soap, &((_ngwe__cleanEventConfigurationResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwe__cleanEventConfigurationResponse*)this)->status); /* transient soap skipped */ } @@ -16360,7 +16360,7 @@ int _ngwe__cleanEventConfigurationResponse::soap_out(struct soap *soap, const ch SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwe__cleanEventConfigurationResponse(struct soap *soap, const char *tag, int id, const _ngwe__cleanEventConfigurationResponse *a, const char *type) { soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwe__cleanEventConfigurationResponse), type); - soap_out_PointerTongwt__tqStatus(soap, "ngwe:status", -1, &(((_ngwe__cleanEventConfigurationResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwe:status", -1, &(((_ngwe__cleanEventConfigurationResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -16403,7 +16403,7 @@ SOAP_FMAC3 _ngwe__cleanEventConfigurationResponse * SOAP_FMAC4 soap_in__ngwe__cl for (;;) { soap->error = SOAP_TAG_MISMATCH; if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwe:status", &(((_ngwe__cleanEventConfigurationResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwe:status", &(((_ngwe__cleanEventConfigurationResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -17867,8 +17867,8 @@ void _ngwm__updateVersionStatusResponse::soap_serialize(struct soap *soap) const (void)soap; /* appease -Wall -Werror */ soap_embedded(soap, &((_ngwm__updateVersionStatusResponse*)this)->part, SOAP_TYPE_PointerTongwt__SignatureData); soap_serialize_PointerTongwt__SignatureData(soap, &((_ngwm__updateVersionStatusResponse*)this)->part); - soap_embedded(soap, &((_ngwm__updateVersionStatusResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__updateVersionStatusResponse*)this)->status); + soap_embedded(soap, &((_ngwm__updateVersionStatusResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__updateVersionStatusResponse*)this)->status); /* transient soap skipped */ } @@ -17897,7 +17897,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__updateVersionStatusResponse(struct soa { soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__updateVersionStatusResponse), type); soap_out_PointerTongwt__SignatureData(soap, "ngwm:part", -1, &(((_ngwm__updateVersionStatusResponse*)a)->part), ""); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__updateVersionStatusResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__updateVersionStatusResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -17945,7 +17945,7 @@ SOAP_FMAC3 _ngwm__updateVersionStatusResponse * SOAP_FMAC4 soap_in__ngwm__update continue; } if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__updateVersionStatusResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__updateVersionStatusResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -18167,8 +18167,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__updateVersionStatusRequest(struct so void _ngwm__uncompleteResponse::soap_serialize(struct soap *soap) const { (void)soap; /* appease -Wall -Werror */ - soap_embedded(soap, &((_ngwm__uncompleteResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__uncompleteResponse*)this)->status); + soap_embedded(soap, &((_ngwm__uncompleteResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__uncompleteResponse*)this)->status); /* transient soap skipped */ } @@ -18195,7 +18195,7 @@ int _ngwm__uncompleteResponse::soap_out(struct soap *soap, const char *tag, int SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__uncompleteResponse(struct soap *soap, const char *tag, int id, const _ngwm__uncompleteResponse *a, const char *type) { soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__uncompleteResponse), type); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__uncompleteResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__uncompleteResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -18238,7 +18238,7 @@ SOAP_FMAC3 _ngwm__uncompleteResponse * SOAP_FMAC4 soap_in__ngwm__uncompleteRespo for (;;) { soap->error = SOAP_TAG_MISMATCH; if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__uncompleteResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__uncompleteResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -18443,8 +18443,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__uncompleteRequest(struct soap *soap, void _ngwm__unacceptResponse::soap_serialize(struct soap *soap) const { (void)soap; /* appease -Wall -Werror */ - soap_embedded(soap, &((_ngwm__unacceptResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__unacceptResponse*)this)->status); + soap_embedded(soap, &((_ngwm__unacceptResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__unacceptResponse*)this)->status); /* transient soap skipped */ } @@ -18471,7 +18471,7 @@ int _ngwm__unacceptResponse::soap_out(struct soap *soap, const char *tag, int id SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__unacceptResponse(struct soap *soap, const char *tag, int id, const _ngwm__unacceptResponse *a, const char *type) { soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__unacceptResponse), type); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__unacceptResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__unacceptResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -18514,7 +18514,7 @@ SOAP_FMAC3 _ngwm__unacceptResponse * SOAP_FMAC4 soap_in__ngwm__unacceptResponse( for (;;) { soap->error = SOAP_TAG_MISMATCH; if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__unacceptResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__unacceptResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -18721,8 +18721,8 @@ void _ngwm__startFreeBusySessionResponse::soap_serialize(struct soap *soap) cons (void)soap; /* appease -Wall -Werror */ soap_embedded(soap, &((_ngwm__startFreeBusySessionResponse*)this)->freeBusySessionId, SOAP_TYPE_PointerToint); soap_serialize_PointerToint(soap, &((_ngwm__startFreeBusySessionResponse*)this)->freeBusySessionId); - soap_embedded(soap, &((_ngwm__startFreeBusySessionResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__startFreeBusySessionResponse*)this)->status); + soap_embedded(soap, &((_ngwm__startFreeBusySessionResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__startFreeBusySessionResponse*)this)->status); /* transient soap skipped */ } @@ -18751,7 +18751,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__startFreeBusySessionResponse(struct so { soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__startFreeBusySessionResponse), type); soap_out_PointerToint(soap, "ngwm:freeBusySessionId", -1, &(((_ngwm__startFreeBusySessionResponse*)a)->freeBusySessionId), ""); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__startFreeBusySessionResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__startFreeBusySessionResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -18799,7 +18799,7 @@ SOAP_FMAC3 _ngwm__startFreeBusySessionResponse * SOAP_FMAC4 soap_in__ngwm__start continue; } if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__startFreeBusySessionResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__startFreeBusySessionResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -19022,8 +19022,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__startFreeBusySessionRequest(struct s void _ngwm__setTimestampResponse::soap_serialize(struct soap *soap) const { (void)soap; /* appease -Wall -Werror */ - soap_embedded(soap, &((_ngwm__setTimestampResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__setTimestampResponse*)this)->status); + soap_embedded(soap, &((_ngwm__setTimestampResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__setTimestampResponse*)this)->status); /* transient soap skipped */ } @@ -19050,7 +19050,7 @@ int _ngwm__setTimestampResponse::soap_out(struct soap *soap, const char *tag, in SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__setTimestampResponse(struct soap *soap, const char *tag, int id, const _ngwm__setTimestampResponse *a, const char *type) { soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__setTimestampResponse), type); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__setTimestampResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__setTimestampResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -19093,7 +19093,7 @@ SOAP_FMAC3 _ngwm__setTimestampResponse * SOAP_FMAC4 soap_in__ngwm__setTimestampR for (;;) { soap->error = SOAP_TAG_MISMATCH; if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__setTimestampResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__setTimestampResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -19304,8 +19304,8 @@ void _ngwm__sendItemResponse::soap_serialize(struct soap *soap) const { (void)soap; /* appease -Wall -Werror */ soap_serialize_std__vectorTemplateOfngwt__uid(soap, &((_ngwm__sendItemResponse*)this)->id); - soap_embedded(soap, &((_ngwm__sendItemResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__sendItemResponse*)this)->status); + soap_embedded(soap, &((_ngwm__sendItemResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__sendItemResponse*)this)->status); /* transient soap skipped */ } @@ -19334,7 +19334,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__sendItemResponse(struct soap *soap, co { soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__sendItemResponse), type); soap_out_std__vectorTemplateOfngwt__uid(soap, "ngwm:id", -1, &(((_ngwm__sendItemResponse*)a)->id), ""); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__sendItemResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__sendItemResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -19380,7 +19380,7 @@ SOAP_FMAC3 _ngwm__sendItemResponse * SOAP_FMAC4 soap_in__ngwm__sendItemResponse( if (soap_in_std__vectorTemplateOfngwt__uid(soap, "ngwm:id", &(((_ngwm__sendItemResponse*)a)->id), "ngwt:uid")) continue; if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__sendItemResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__sendItemResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -19585,8 +19585,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__sendItemRequest(struct soap *soap, i void _ngwm__retractResponse::soap_serialize(struct soap *soap) const { (void)soap; /* appease -Wall -Werror */ - soap_embedded(soap, &((_ngwm__retractResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__retractResponse*)this)->status); + soap_embedded(soap, &((_ngwm__retractResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__retractResponse*)this)->status); /* transient soap skipped */ } @@ -19613,7 +19613,7 @@ int _ngwm__retractResponse::soap_out(struct soap *soap, const char *tag, int id, SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__retractResponse(struct soap *soap, const char *tag, int id, const _ngwm__retractResponse *a, const char *type) { soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__retractResponse), type); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__retractResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__retractResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -19656,7 +19656,7 @@ SOAP_FMAC3 _ngwm__retractResponse * SOAP_FMAC4 soap_in__ngwm__retractResponse(st for (;;) { soap->error = SOAP_TAG_MISMATCH; if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__retractResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__retractResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -19897,8 +19897,8 @@ void _ngwm__replyResponse::soap_serialize(struct soap *soap) const (void)soap; /* appease -Wall -Werror */ soap_embedded(soap, &((_ngwm__replyResponse*)this)->item, SOAP_TYPE_PointerTongwt__Item); soap_serialize_PointerTongwt__Item(soap, &((_ngwm__replyResponse*)this)->item); - soap_embedded(soap, &((_ngwm__replyResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__replyResponse*)this)->status); + soap_embedded(soap, &((_ngwm__replyResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__replyResponse*)this)->status); /* transient soap skipped */ } @@ -19927,7 +19927,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__replyResponse(struct soap *soap, const { soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__replyResponse), type); soap_out_PointerTongwt__Item(soap, "ngwm:item", -1, &(((_ngwm__replyResponse*)a)->item), ""); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__replyResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__replyResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -19975,7 +19975,7 @@ SOAP_FMAC3 _ngwm__replyResponse * SOAP_FMAC4 soap_in__ngwm__replyResponse(struct continue; } if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__replyResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__replyResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -20189,8 +20189,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__replyRequest(struct soap *soap, int void _ngwm__removeSignatureResponse::soap_serialize(struct soap *soap) const { (void)soap; /* appease -Wall -Werror */ - soap_embedded(soap, &((_ngwm__removeSignatureResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__removeSignatureResponse*)this)->status); + soap_embedded(soap, &((_ngwm__removeSignatureResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__removeSignatureResponse*)this)->status); /* transient soap skipped */ } @@ -20217,7 +20217,7 @@ int _ngwm__removeSignatureResponse::soap_out(struct soap *soap, const char *tag, SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__removeSignatureResponse(struct soap *soap, const char *tag, int id, const _ngwm__removeSignatureResponse *a, const char *type) { soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__removeSignatureResponse), type); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__removeSignatureResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__removeSignatureResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -20260,7 +20260,7 @@ SOAP_FMAC3 _ngwm__removeSignatureResponse * SOAP_FMAC4 soap_in__ngwm__removeSign for (;;) { soap->error = SOAP_TAG_MISMATCH; if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__removeSignatureResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__removeSignatureResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -20478,8 +20478,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__removeSignatureRequest(struct soap * void _ngwm__removeProxyUserResponse::soap_serialize(struct soap *soap) const { (void)soap; /* appease -Wall -Werror */ - soap_embedded(soap, &((_ngwm__removeProxyUserResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__removeProxyUserResponse*)this)->status); + soap_embedded(soap, &((_ngwm__removeProxyUserResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__removeProxyUserResponse*)this)->status); /* transient soap skipped */ } @@ -20506,7 +20506,7 @@ int _ngwm__removeProxyUserResponse::soap_out(struct soap *soap, const char *tag, SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__removeProxyUserResponse(struct soap *soap, const char *tag, int id, const _ngwm__removeProxyUserResponse *a, const char *type) { soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__removeProxyUserResponse), type); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__removeProxyUserResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__removeProxyUserResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -20549,7 +20549,7 @@ SOAP_FMAC3 _ngwm__removeProxyUserResponse * SOAP_FMAC4 soap_in__ngwm__removeProx for (;;) { soap->error = SOAP_TAG_MISMATCH; if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__removeProxyUserResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__removeProxyUserResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -20754,8 +20754,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__removeProxyUserRequest(struct soap * void _ngwm__removeProxyAccessResponse::soap_serialize(struct soap *soap) const { (void)soap; /* appease -Wall -Werror */ - soap_embedded(soap, &((_ngwm__removeProxyAccessResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__removeProxyAccessResponse*)this)->status); + soap_embedded(soap, &((_ngwm__removeProxyAccessResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__removeProxyAccessResponse*)this)->status); /* transient soap skipped */ } @@ -20782,7 +20782,7 @@ int _ngwm__removeProxyAccessResponse::soap_out(struct soap *soap, const char *ta SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__removeProxyAccessResponse(struct soap *soap, const char *tag, int id, const _ngwm__removeProxyAccessResponse *a, const char *type) { soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__removeProxyAccessResponse), type); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__removeProxyAccessResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__removeProxyAccessResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -20825,7 +20825,7 @@ SOAP_FMAC3 _ngwm__removeProxyAccessResponse * SOAP_FMAC4 soap_in__ngwm__removePr for (;;) { soap->error = SOAP_TAG_MISMATCH; if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__removeProxyAccessResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__removeProxyAccessResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -21030,8 +21030,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__removeProxyAccessRequest(struct soap void _ngwm__removeMembersResponse::soap_serialize(struct soap *soap) const { (void)soap; /* appease -Wall -Werror */ - soap_embedded(soap, &((_ngwm__removeMembersResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__removeMembersResponse*)this)->status); + soap_embedded(soap, &((_ngwm__removeMembersResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__removeMembersResponse*)this)->status); /* transient soap skipped */ } @@ -21058,7 +21058,7 @@ int _ngwm__removeMembersResponse::soap_out(struct soap *soap, const char *tag, i SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__removeMembersResponse(struct soap *soap, const char *tag, int id, const _ngwm__removeMembersResponse *a, const char *type) { soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__removeMembersResponse), type); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__removeMembersResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__removeMembersResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -21101,7 +21101,7 @@ SOAP_FMAC3 _ngwm__removeMembersResponse * SOAP_FMAC4 soap_in__ngwm__removeMember for (;;) { soap->error = SOAP_TAG_MISMATCH; if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__removeMembersResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__removeMembersResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -21315,8 +21315,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__removeMembersRequest(struct soap *so void _ngwm__removeJunkEntryResponse::soap_serialize(struct soap *soap) const { (void)soap; /* appease -Wall -Werror */ - soap_embedded(soap, &((_ngwm__removeJunkEntryResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__removeJunkEntryResponse*)this)->status); + soap_embedded(soap, &((_ngwm__removeJunkEntryResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__removeJunkEntryResponse*)this)->status); /* transient soap skipped */ } @@ -21343,7 +21343,7 @@ int _ngwm__removeJunkEntryResponse::soap_out(struct soap *soap, const char *tag, SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__removeJunkEntryResponse(struct soap *soap, const char *tag, int id, const _ngwm__removeJunkEntryResponse *a, const char *type) { soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__removeJunkEntryResponse), type); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__removeJunkEntryResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__removeJunkEntryResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -21386,7 +21386,7 @@ SOAP_FMAC3 _ngwm__removeJunkEntryResponse * SOAP_FMAC4 soap_in__ngwm__removeJunk for (;;) { soap->error = SOAP_TAG_MISMATCH; if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__removeJunkEntryResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__removeJunkEntryResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -21591,8 +21591,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__removeJunkEntryRequest(struct soap * void _ngwm__removeItemsResponse::soap_serialize(struct soap *soap) const { (void)soap; /* appease -Wall -Werror */ - soap_embedded(soap, &((_ngwm__removeItemsResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__removeItemsResponse*)this)->status); + soap_embedded(soap, &((_ngwm__removeItemsResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__removeItemsResponse*)this)->status); /* transient soap skipped */ } @@ -21619,7 +21619,7 @@ int _ngwm__removeItemsResponse::soap_out(struct soap *soap, const char *tag, int SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__removeItemsResponse(struct soap *soap, const char *tag, int id, const _ngwm__removeItemsResponse *a, const char *type) { soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__removeItemsResponse), type); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__removeItemsResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__removeItemsResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -21662,7 +21662,7 @@ SOAP_FMAC3 _ngwm__removeItemsResponse * SOAP_FMAC4 soap_in__ngwm__removeItemsRes for (;;) { soap->error = SOAP_TAG_MISMATCH; if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__removeItemsResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__removeItemsResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -21876,8 +21876,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__removeItemsRequest(struct soap *soap void _ngwm__removeItemResponse::soap_serialize(struct soap *soap) const { (void)soap; /* appease -Wall -Werror */ - soap_embedded(soap, &((_ngwm__removeItemResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__removeItemResponse*)this)->status); + soap_embedded(soap, &((_ngwm__removeItemResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__removeItemResponse*)this)->status); /* transient soap skipped */ } @@ -21904,7 +21904,7 @@ int _ngwm__removeItemResponse::soap_out(struct soap *soap, const char *tag, int SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__removeItemResponse(struct soap *soap, const char *tag, int id, const _ngwm__removeItemResponse *a, const char *type) { soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__removeItemResponse), type); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__removeItemResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__removeItemResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -21947,7 +21947,7 @@ SOAP_FMAC3 _ngwm__removeItemResponse * SOAP_FMAC4 soap_in__ngwm__removeItemRespo for (;;) { soap->error = SOAP_TAG_MISMATCH; if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__removeItemResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__removeItemResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -22161,8 +22161,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__removeItemRequest(struct soap *soap, void _ngwm__removeCustomDefinitionResponse::soap_serialize(struct soap *soap) const { (void)soap; /* appease -Wall -Werror */ - soap_embedded(soap, &((_ngwm__removeCustomDefinitionResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__removeCustomDefinitionResponse*)this)->status); + soap_embedded(soap, &((_ngwm__removeCustomDefinitionResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__removeCustomDefinitionResponse*)this)->status); /* transient soap skipped */ } @@ -22189,7 +22189,7 @@ int _ngwm__removeCustomDefinitionResponse::soap_out(struct soap *soap, const cha SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__removeCustomDefinitionResponse(struct soap *soap, const char *tag, int id, const _ngwm__removeCustomDefinitionResponse *a, const char *type) { soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__removeCustomDefinitionResponse), type); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__removeCustomDefinitionResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__removeCustomDefinitionResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -22232,7 +22232,7 @@ SOAP_FMAC3 _ngwm__removeCustomDefinitionResponse * SOAP_FMAC4 soap_in__ngwm__rem for (;;) { soap->error = SOAP_TAG_MISMATCH; if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__removeCustomDefinitionResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__removeCustomDefinitionResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -22451,8 +22451,8 @@ void _ngwm__readCursorResponse::soap_serialize(struct soap *soap) const (void)soap; /* appease -Wall -Werror */ soap_embedded(soap, &((_ngwm__readCursorResponse*)this)->items, SOAP_TYPE_PointerTongwt__ItemList); soap_serialize_PointerTongwt__ItemList(soap, &((_ngwm__readCursorResponse*)this)->items); - soap_embedded(soap, &((_ngwm__readCursorResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__readCursorResponse*)this)->status); + soap_embedded(soap, &((_ngwm__readCursorResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__readCursorResponse*)this)->status); /* transient soap skipped */ } @@ -22481,7 +22481,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__readCursorResponse(struct soap *soap, { soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__readCursorResponse), type); soap_out_PointerTongwt__ItemList(soap, "ngwm:items", -1, &(((_ngwm__readCursorResponse*)a)->items), ""); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__readCursorResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__readCursorResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -22529,7 +22529,7 @@ SOAP_FMAC3 _ngwm__readCursorResponse * SOAP_FMAC4 soap_in__ngwm__readCursorRespo continue; } if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__readCursorResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__readCursorResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -22768,8 +22768,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__readCursorRequest(struct soap *soap, void _ngwm__purgeResponse::soap_serialize(struct soap *soap) const { (void)soap; /* appease -Wall -Werror */ - soap_embedded(soap, &((_ngwm__purgeResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__purgeResponse*)this)->status); + soap_embedded(soap, &((_ngwm__purgeResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__purgeResponse*)this)->status); /* transient soap skipped */ } @@ -22796,7 +22796,7 @@ int _ngwm__purgeResponse::soap_out(struct soap *soap, const char *tag, int id, c SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__purgeResponse(struct soap *soap, const char *tag, int id, const _ngwm__purgeResponse *a, const char *type) { soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__purgeResponse), type); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__purgeResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__purgeResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -22839,7 +22839,7 @@ SOAP_FMAC3 _ngwm__purgeResponse * SOAP_FMAC4 soap_in__ngwm__purgeResponse(struct for (;;) { soap->error = SOAP_TAG_MISMATCH; if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__purgeResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__purgeResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -23044,8 +23044,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__purgeRequest(struct soap *soap, int void _ngwm__purgeDeletedItemsResponse::soap_serialize(struct soap *soap) const { (void)soap; /* appease -Wall -Werror */ - soap_embedded(soap, &((_ngwm__purgeDeletedItemsResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__purgeDeletedItemsResponse*)this)->status); + soap_embedded(soap, &((_ngwm__purgeDeletedItemsResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__purgeDeletedItemsResponse*)this)->status); /* transient soap skipped */ } @@ -23072,7 +23072,7 @@ int _ngwm__purgeDeletedItemsResponse::soap_out(struct soap *soap, const char *ta SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__purgeDeletedItemsResponse(struct soap *soap, const char *tag, int id, const _ngwm__purgeDeletedItemsResponse *a, const char *type) { soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__purgeDeletedItemsResponse), type); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__purgeDeletedItemsResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__purgeDeletedItemsResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -23115,7 +23115,7 @@ SOAP_FMAC3 _ngwm__purgeDeletedItemsResponse * SOAP_FMAC4 soap_in__ngwm__purgeDel for (;;) { soap->error = SOAP_TAG_MISMATCH; if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__purgeDeletedItemsResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__purgeDeletedItemsResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -23306,8 +23306,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__purgeDeletedItemsRequest(struct soap void _ngwm__positionCursorResponse::soap_serialize(struct soap *soap) const { (void)soap; /* appease -Wall -Werror */ - soap_embedded(soap, &((_ngwm__positionCursorResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__positionCursorResponse*)this)->status); + soap_embedded(soap, &((_ngwm__positionCursorResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__positionCursorResponse*)this)->status); /* transient soap skipped */ } @@ -23334,7 +23334,7 @@ int _ngwm__positionCursorResponse::soap_out(struct soap *soap, const char *tag, SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__positionCursorResponse(struct soap *soap, const char *tag, int id, const _ngwm__positionCursorResponse *a, const char *type) { soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__positionCursorResponse), type); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__positionCursorResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__positionCursorResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -23377,7 +23377,7 @@ SOAP_FMAC3 _ngwm__positionCursorResponse * SOAP_FMAC4 soap_in__ngwm__positionCur for (;;) { soap->error = SOAP_TAG_MISMATCH; if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__positionCursorResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__positionCursorResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -23606,8 +23606,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__positionCursorRequest(struct soap *s void _ngwm__moveItemResponse::soap_serialize(struct soap *soap) const { (void)soap; /* appease -Wall -Werror */ - soap_embedded(soap, &((_ngwm__moveItemResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__moveItemResponse*)this)->status); + soap_embedded(soap, &((_ngwm__moveItemResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__moveItemResponse*)this)->status); /* transient soap skipped */ } @@ -23634,7 +23634,7 @@ int _ngwm__moveItemResponse::soap_out(struct soap *soap, const char *tag, int id SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__moveItemResponse(struct soap *soap, const char *tag, int id, const _ngwm__moveItemResponse *a, const char *type) { soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__moveItemResponse), type); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__moveItemResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__moveItemResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -23677,7 +23677,7 @@ SOAP_FMAC3 _ngwm__moveItemResponse * SOAP_FMAC4 soap_in__ngwm__moveItemResponse( for (;;) { soap->error = SOAP_TAG_MISMATCH; if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__moveItemResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__moveItemResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -23900,8 +23900,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__moveItemRequest(struct soap *soap, i void _ngwm__modifySignaturesResponse::soap_serialize(struct soap *soap) const { (void)soap; /* appease -Wall -Werror */ - soap_embedded(soap, &((_ngwm__modifySignaturesResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__modifySignaturesResponse*)this)->status); + soap_embedded(soap, &((_ngwm__modifySignaturesResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__modifySignaturesResponse*)this)->status); /* transient soap skipped */ } @@ -23928,7 +23928,7 @@ int _ngwm__modifySignaturesResponse::soap_out(struct soap *soap, const char *tag SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__modifySignaturesResponse(struct soap *soap, const char *tag, int id, const _ngwm__modifySignaturesResponse *a, const char *type) { soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__modifySignaturesResponse), type); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__modifySignaturesResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__modifySignaturesResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -23971,7 +23971,7 @@ SOAP_FMAC3 _ngwm__modifySignaturesResponse * SOAP_FMAC4 soap_in__ngwm__modifySig for (;;) { soap->error = SOAP_TAG_MISMATCH; if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__modifySignaturesResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__modifySignaturesResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -24176,8 +24176,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__modifySignaturesRequest(struct soap void _ngwm__modifySettingsResponse::soap_serialize(struct soap *soap) const { (void)soap; /* appease -Wall -Werror */ - soap_embedded(soap, &((_ngwm__modifySettingsResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__modifySettingsResponse*)this)->status); + soap_embedded(soap, &((_ngwm__modifySettingsResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__modifySettingsResponse*)this)->status); /* transient soap skipped */ } @@ -24204,7 +24204,7 @@ int _ngwm__modifySettingsResponse::soap_out(struct soap *soap, const char *tag, SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__modifySettingsResponse(struct soap *soap, const char *tag, int id, const _ngwm__modifySettingsResponse *a, const char *type) { soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__modifySettingsResponse), type); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__modifySettingsResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__modifySettingsResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -24247,7 +24247,7 @@ SOAP_FMAC3 _ngwm__modifySettingsResponse * SOAP_FMAC4 soap_in__ngwm__modifySetti for (;;) { soap->error = SOAP_TAG_MISMATCH; if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__modifySettingsResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__modifySettingsResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -24452,8 +24452,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__modifySettingsRequest(struct soap *s void _ngwm__modifyProxyAccessResponse::soap_serialize(struct soap *soap) const { (void)soap; /* appease -Wall -Werror */ - soap_embedded(soap, &((_ngwm__modifyProxyAccessResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__modifyProxyAccessResponse*)this)->status); + soap_embedded(soap, &((_ngwm__modifyProxyAccessResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__modifyProxyAccessResponse*)this)->status); /* transient soap skipped */ } @@ -24480,7 +24480,7 @@ int _ngwm__modifyProxyAccessResponse::soap_out(struct soap *soap, const char *ta SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__modifyProxyAccessResponse(struct soap *soap, const char *tag, int id, const _ngwm__modifyProxyAccessResponse *a, const char *type) { soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__modifyProxyAccessResponse), type); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__modifyProxyAccessResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__modifyProxyAccessResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -24523,7 +24523,7 @@ SOAP_FMAC3 _ngwm__modifyProxyAccessResponse * SOAP_FMAC4 soap_in__ngwm__modifyPr for (;;) { soap->error = SOAP_TAG_MISMATCH; if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__modifyProxyAccessResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__modifyProxyAccessResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -24737,8 +24737,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__modifyProxyAccessRequest(struct soap void _ngwm__modifyPasswordResponse::soap_serialize(struct soap *soap) const { (void)soap; /* appease -Wall -Werror */ - soap_embedded(soap, &((_ngwm__modifyPasswordResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__modifyPasswordResponse*)this)->status); + soap_embedded(soap, &((_ngwm__modifyPasswordResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__modifyPasswordResponse*)this)->status); /* transient soap skipped */ } @@ -24765,7 +24765,7 @@ int _ngwm__modifyPasswordResponse::soap_out(struct soap *soap, const char *tag, SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__modifyPasswordResponse(struct soap *soap, const char *tag, int id, const _ngwm__modifyPasswordResponse *a, const char *type) { soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__modifyPasswordResponse), type); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__modifyPasswordResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__modifyPasswordResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -24808,7 +24808,7 @@ SOAP_FMAC3 _ngwm__modifyPasswordResponse * SOAP_FMAC4 soap_in__ngwm__modifyPassw for (;;) { soap->error = SOAP_TAG_MISMATCH; if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__modifyPasswordResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__modifyPasswordResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -25018,8 +25018,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__modifyPasswordRequest(struct soap *s void _ngwm__modifyJunkMailSettingsResponse::soap_serialize(struct soap *soap) const { (void)soap; /* appease -Wall -Werror */ - soap_embedded(soap, &((_ngwm__modifyJunkMailSettingsResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__modifyJunkMailSettingsResponse*)this)->status); + soap_embedded(soap, &((_ngwm__modifyJunkMailSettingsResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__modifyJunkMailSettingsResponse*)this)->status); /* transient soap skipped */ } @@ -25046,7 +25046,7 @@ int _ngwm__modifyJunkMailSettingsResponse::soap_out(struct soap *soap, const cha SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__modifyJunkMailSettingsResponse(struct soap *soap, const char *tag, int id, const _ngwm__modifyJunkMailSettingsResponse *a, const char *type) { soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__modifyJunkMailSettingsResponse), type); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__modifyJunkMailSettingsResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__modifyJunkMailSettingsResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -25089,7 +25089,7 @@ SOAP_FMAC3 _ngwm__modifyJunkMailSettingsResponse * SOAP_FMAC4 soap_in__ngwm__mod for (;;) { soap->error = SOAP_TAG_MISMATCH; if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__modifyJunkMailSettingsResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__modifyJunkMailSettingsResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -25294,8 +25294,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__modifyJunkMailSettingsRequest(struct void _ngwm__modifyJunkEntryResponse::soap_serialize(struct soap *soap) const { (void)soap; /* appease -Wall -Werror */ - soap_embedded(soap, &((_ngwm__modifyJunkEntryResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__modifyJunkEntryResponse*)this)->status); + soap_embedded(soap, &((_ngwm__modifyJunkEntryResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__modifyJunkEntryResponse*)this)->status); /* transient soap skipped */ } @@ -25322,7 +25322,7 @@ int _ngwm__modifyJunkEntryResponse::soap_out(struct soap *soap, const char *tag, SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__modifyJunkEntryResponse(struct soap *soap, const char *tag, int id, const _ngwm__modifyJunkEntryResponse *a, const char *type) { soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__modifyJunkEntryResponse), type); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__modifyJunkEntryResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__modifyJunkEntryResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -25365,7 +25365,7 @@ SOAP_FMAC3 _ngwm__modifyJunkEntryResponse * SOAP_FMAC4 soap_in__ngwm__modifyJunk for (;;) { soap->error = SOAP_TAG_MISMATCH; if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__modifyJunkEntryResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__modifyJunkEntryResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -25572,8 +25572,8 @@ void _ngwm__modifyItemsResponse::soap_serialize(struct soap *soap) const (void)soap; /* appease -Wall -Werror */ soap_serialize_std__vectorTemplateOfstring(soap, &((_ngwm__modifyItemsResponse*)this)->ngwt__modified); soap_serialize_std__vectorTemplateOfngwt__uid(soap, &((_ngwm__modifyItemsResponse*)this)->id); - soap_embedded(soap, &((_ngwm__modifyItemsResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__modifyItemsResponse*)this)->status); + soap_embedded(soap, &((_ngwm__modifyItemsResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__modifyItemsResponse*)this)->status); /* transient soap skipped */ } @@ -25604,7 +25604,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__modifyItemsResponse(struct soap *soap, soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__modifyItemsResponse), type); soap_out_std__vectorTemplateOfstring(soap, "ngwt:modified", -1, &(((_ngwm__modifyItemsResponse*)a)->ngwt__modified), ""); soap_out_std__vectorTemplateOfngwt__uid(soap, "ngwm:id", -1, &(((_ngwm__modifyItemsResponse*)a)->id), ""); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__modifyItemsResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__modifyItemsResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -25653,7 +25653,7 @@ SOAP_FMAC3 _ngwm__modifyItemsResponse * SOAP_FMAC4 soap_in__ngwm__modifyItemsRes if (soap_in_std__vectorTemplateOfngwt__uid(soap, "ngwm:id", &(((_ngwm__modifyItemsResponse*)a)->id), "ngwt:uid")) continue; if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__modifyItemsResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__modifyItemsResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -25853,8 +25853,8 @@ void _ngwm__modifyItemResponse::soap_serialize(struct soap *soap) const soap_embedded(soap, &((_ngwm__modifyItemResponse*)this)->ngwt__modified, SOAP_TYPE_string); soap_serialize_string(soap, &((_ngwm__modifyItemResponse*)this)->ngwt__modified); soap_serialize_std__vectorTemplateOfngwt__uid(soap, &((_ngwm__modifyItemResponse*)this)->id); - soap_embedded(soap, &((_ngwm__modifyItemResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__modifyItemResponse*)this)->status); + soap_embedded(soap, &((_ngwm__modifyItemResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__modifyItemResponse*)this)->status); /* transient soap skipped */ } @@ -25885,7 +25885,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__modifyItemResponse(struct soap *soap, soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__modifyItemResponse), type); soap_out_string(soap, "ngwt:modified", -1, &(((_ngwm__modifyItemResponse*)a)->ngwt__modified), ""); soap_out_std__vectorTemplateOfngwt__uid(soap, "ngwm:id", -1, &(((_ngwm__modifyItemResponse*)a)->id), ""); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__modifyItemResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__modifyItemResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -25936,7 +25936,7 @@ SOAP_FMAC3 _ngwm__modifyItemResponse * SOAP_FMAC4 soap_in__ngwm__modifyItemRespo if (soap_in_std__vectorTemplateOfngwt__uid(soap, "ngwm:id", &(((_ngwm__modifyItemResponse*)a)->id), "ngwt:uid")) continue; if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__modifyItemResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__modifyItemResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -26167,8 +26167,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__modifyItemRequest(struct soap *soap, void _ngwm__markUnReadResponse::soap_serialize(struct soap *soap) const { (void)soap; /* appease -Wall -Werror */ - soap_embedded(soap, &((_ngwm__markUnReadResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__markUnReadResponse*)this)->status); + soap_embedded(soap, &((_ngwm__markUnReadResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__markUnReadResponse*)this)->status); /* transient soap skipped */ } @@ -26195,7 +26195,7 @@ int _ngwm__markUnReadResponse::soap_out(struct soap *soap, const char *tag, int SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__markUnReadResponse(struct soap *soap, const char *tag, int id, const _ngwm__markUnReadResponse *a, const char *type) { soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__markUnReadResponse), type); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__markUnReadResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__markUnReadResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -26238,7 +26238,7 @@ SOAP_FMAC3 _ngwm__markUnReadResponse * SOAP_FMAC4 soap_in__ngwm__markUnReadRespo for (;;) { soap->error = SOAP_TAG_MISMATCH; if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__markUnReadResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__markUnReadResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -26443,8 +26443,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__markUnReadRequest(struct soap *soap, void _ngwm__markUnPrivateResponse::soap_serialize(struct soap *soap) const { (void)soap; /* appease -Wall -Werror */ - soap_embedded(soap, &((_ngwm__markUnPrivateResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__markUnPrivateResponse*)this)->status); + soap_embedded(soap, &((_ngwm__markUnPrivateResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__markUnPrivateResponse*)this)->status); /* transient soap skipped */ } @@ -26471,7 +26471,7 @@ int _ngwm__markUnPrivateResponse::soap_out(struct soap *soap, const char *tag, i SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__markUnPrivateResponse(struct soap *soap, const char *tag, int id, const _ngwm__markUnPrivateResponse *a, const char *type) { soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__markUnPrivateResponse), type); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__markUnPrivateResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__markUnPrivateResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -26514,7 +26514,7 @@ SOAP_FMAC3 _ngwm__markUnPrivateResponse * SOAP_FMAC4 soap_in__ngwm__markUnPrivat for (;;) { soap->error = SOAP_TAG_MISMATCH; if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__markUnPrivateResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__markUnPrivateResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -26719,8 +26719,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__markUnPrivateRequest(struct soap *so void _ngwm__markReadResponse::soap_serialize(struct soap *soap) const { (void)soap; /* appease -Wall -Werror */ - soap_embedded(soap, &((_ngwm__markReadResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__markReadResponse*)this)->status); + soap_embedded(soap, &((_ngwm__markReadResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__markReadResponse*)this)->status); /* transient soap skipped */ } @@ -26747,7 +26747,7 @@ int _ngwm__markReadResponse::soap_out(struct soap *soap, const char *tag, int id SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__markReadResponse(struct soap *soap, const char *tag, int id, const _ngwm__markReadResponse *a, const char *type) { soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__markReadResponse), type); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__markReadResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__markReadResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -26790,7 +26790,7 @@ SOAP_FMAC3 _ngwm__markReadResponse * SOAP_FMAC4 soap_in__ngwm__markReadResponse( for (;;) { soap->error = SOAP_TAG_MISMATCH; if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__markReadResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__markReadResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -26995,8 +26995,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__markReadRequest(struct soap *soap, i void _ngwm__markPrivateResponse::soap_serialize(struct soap *soap) const { (void)soap; /* appease -Wall -Werror */ - soap_embedded(soap, &((_ngwm__markPrivateResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__markPrivateResponse*)this)->status); + soap_embedded(soap, &((_ngwm__markPrivateResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__markPrivateResponse*)this)->status); /* transient soap skipped */ } @@ -27023,7 +27023,7 @@ int _ngwm__markPrivateResponse::soap_out(struct soap *soap, const char *tag, int SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__markPrivateResponse(struct soap *soap, const char *tag, int id, const _ngwm__markPrivateResponse *a, const char *type) { soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__markPrivateResponse), type); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__markPrivateResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__markPrivateResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -27066,7 +27066,7 @@ SOAP_FMAC3 _ngwm__markPrivateResponse * SOAP_FMAC4 soap_in__ngwm__markPrivateRes for (;;) { soap->error = SOAP_TAG_MISMATCH; if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__markPrivateResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__markPrivateResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -27271,8 +27271,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__markPrivateRequest(struct soap *soap void _ngwm__logoutResponse::soap_serialize(struct soap *soap) const { (void)soap; /* appease -Wall -Werror */ - soap_embedded(soap, &((_ngwm__logoutResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__logoutResponse*)this)->status); + soap_embedded(soap, &((_ngwm__logoutResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__logoutResponse*)this)->status); /* transient soap skipped */ } @@ -27299,7 +27299,7 @@ int _ngwm__logoutResponse::soap_out(struct soap *soap, const char *tag, int id, SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__logoutResponse(struct soap *soap, const char *tag, int id, const _ngwm__logoutResponse *a, const char *type) { soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__logoutResponse), type); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__logoutResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__logoutResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -27342,7 +27342,7 @@ SOAP_FMAC3 _ngwm__logoutResponse * SOAP_FMAC4 soap_in__ngwm__logoutResponse(stru for (;;) { soap->error = SOAP_TAG_MISMATCH; if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__logoutResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__logoutResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -27546,8 +27546,8 @@ void _ngwm__loginResponse::soap_serialize(struct soap *soap) const soap_serialize_std__vectorTemplateOfPointerTongwt__Host(soap, &((_ngwm__loginResponse*)this)->redirectToHost); soap_embedded(soap, &((_ngwm__loginResponse*)this)->serverUTCTime, SOAP_TYPE_string); soap_serialize_string(soap, &((_ngwm__loginResponse*)this)->serverUTCTime); - soap_embedded(soap, &((_ngwm__loginResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__loginResponse*)this)->status); + soap_embedded(soap, &((_ngwm__loginResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__loginResponse*)this)->status); /* transient soap skipped */ } @@ -27588,7 +27588,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__loginResponse(struct soap *soap, const soap_out_PointerTostd__string(soap, "ngwm:build", -1, &(((_ngwm__loginResponse*)a)->build), ""); soap_out_std__vectorTemplateOfPointerTongwt__Host(soap, "ngwm:redirectToHost", -1, &(((_ngwm__loginResponse*)a)->redirectToHost), ""); soap_out_string(soap, "ngwm:serverUTCTime", -1, &(((_ngwm__loginResponse*)a)->serverUTCTime), ""); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__loginResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__loginResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -27664,7 +27664,7 @@ SOAP_FMAC3 _ngwm__loginResponse * SOAP_FMAC4 soap_in__ngwm__loginResponse(struct continue; } if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__loginResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__loginResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -27898,8 +27898,8 @@ void _ngwm__getUserListResponse::soap_serialize(struct soap *soap) const (void)soap; /* appease -Wall -Werror */ soap_embedded(soap, &((_ngwm__getUserListResponse*)this)->users, SOAP_TYPE_PointerTongwt__UserList); soap_serialize_PointerTongwt__UserList(soap, &((_ngwm__getUserListResponse*)this)->users); - soap_embedded(soap, &((_ngwm__getUserListResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__getUserListResponse*)this)->status); + soap_embedded(soap, &((_ngwm__getUserListResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__getUserListResponse*)this)->status); /* transient soap skipped */ } @@ -27928,7 +27928,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getUserListResponse(struct soap *soap, { soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__getUserListResponse), type); soap_out_PointerTongwt__UserList(soap, "ngwm:users", -1, &(((_ngwm__getUserListResponse*)a)->users), ""); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__getUserListResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__getUserListResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -27976,7 +27976,7 @@ SOAP_FMAC3 _ngwm__getUserListResponse * SOAP_FMAC4 soap_in__ngwm__getUserListRes continue; } if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__getUserListResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__getUserListResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -28188,8 +28188,8 @@ void _ngwm__getTimezoneListResponse::soap_serialize(struct soap *soap) const (void)soap; /* appease -Wall -Werror */ soap_embedded(soap, &((_ngwm__getTimezoneListResponse*)this)->timezones, SOAP_TYPE_PointerTongwt__TimezoneList); soap_serialize_PointerTongwt__TimezoneList(soap, &((_ngwm__getTimezoneListResponse*)this)->timezones); - soap_embedded(soap, &((_ngwm__getTimezoneListResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__getTimezoneListResponse*)this)->status); + soap_embedded(soap, &((_ngwm__getTimezoneListResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__getTimezoneListResponse*)this)->status); /* transient soap skipped */ } @@ -28218,7 +28218,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getTimezoneListResponse(struct soap *s { soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__getTimezoneListResponse), type); soap_out_PointerTongwt__TimezoneList(soap, "ngwm:timezones", -1, &(((_ngwm__getTimezoneListResponse*)a)->timezones), ""); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__getTimezoneListResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__getTimezoneListResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -28266,7 +28266,7 @@ SOAP_FMAC3 _ngwm__getTimezoneListResponse * SOAP_FMAC4 soap_in__ngwm__getTimezon continue; } if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__getTimezoneListResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__getTimezoneListResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -28461,8 +28461,8 @@ void _ngwm__getTimestampResponse::soap_serialize(struct soap *soap) const soap_serialize_string(soap, &((_ngwm__getTimestampResponse*)this)->backup); soap_embedded(soap, &((_ngwm__getTimestampResponse*)this)->retention, SOAP_TYPE_string); soap_serialize_string(soap, &((_ngwm__getTimestampResponse*)this)->retention); - soap_embedded(soap, &((_ngwm__getTimestampResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__getTimestampResponse*)this)->status); + soap_embedded(soap, &((_ngwm__getTimestampResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__getTimestampResponse*)this)->status); /* transient soap skipped */ } @@ -28493,7 +28493,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getTimestampResponse(struct soap *soap soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__getTimestampResponse), type); soap_out_string(soap, "ngwm:backup", -1, &(((_ngwm__getTimestampResponse*)a)->backup), ""); soap_out_string(soap, "ngwm:retention", -1, &(((_ngwm__getTimestampResponse*)a)->retention), ""); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__getTimestampResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__getTimestampResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -28546,7 +28546,7 @@ SOAP_FMAC3 _ngwm__getTimestampResponse * SOAP_FMAC4 soap_in__ngwm__getTimestampR continue; } if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__getTimestampResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__getTimestampResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -28767,8 +28767,8 @@ void _ngwm__getSignaturesResponse::soap_serialize(struct soap *soap) const (void)soap; /* appease -Wall -Werror */ soap_embedded(soap, &((_ngwm__getSignaturesResponse*)this)->signatures, SOAP_TYPE_PointerTongwt__Signatures); soap_serialize_PointerTongwt__Signatures(soap, &((_ngwm__getSignaturesResponse*)this)->signatures); - soap_embedded(soap, &((_ngwm__getSignaturesResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__getSignaturesResponse*)this)->status); + soap_embedded(soap, &((_ngwm__getSignaturesResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__getSignaturesResponse*)this)->status); /* transient soap skipped */ } @@ -28797,7 +28797,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getSignaturesResponse(struct soap *soa { soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__getSignaturesResponse), type); soap_out_PointerTongwt__Signatures(soap, "ngwm:signatures", -1, &(((_ngwm__getSignaturesResponse*)a)->signatures), ""); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__getSignaturesResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__getSignaturesResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -28845,7 +28845,7 @@ SOAP_FMAC3 _ngwm__getSignaturesResponse * SOAP_FMAC4 soap_in__ngwm__getSignature continue; } if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__getSignaturesResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__getSignaturesResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -29047,8 +29047,8 @@ void _ngwm__getSettingsResponse::soap_serialize(struct soap *soap) const (void)soap; /* appease -Wall -Werror */ soap_embedded(soap, &((_ngwm__getSettingsResponse*)this)->settings, SOAP_TYPE_PointerTongwt__Settings); soap_serialize_PointerTongwt__Settings(soap, &((_ngwm__getSettingsResponse*)this)->settings); - soap_embedded(soap, &((_ngwm__getSettingsResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__getSettingsResponse*)this)->status); + soap_embedded(soap, &((_ngwm__getSettingsResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__getSettingsResponse*)this)->status); /* transient soap skipped */ } @@ -29077,7 +29077,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getSettingsResponse(struct soap *soap, { soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__getSettingsResponse), type); soap_out_PointerTongwt__Settings(soap, "ngwm:settings", -1, &(((_ngwm__getSettingsResponse*)a)->settings), ""); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__getSettingsResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__getSettingsResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -29125,7 +29125,7 @@ SOAP_FMAC3 _ngwm__getSettingsResponse * SOAP_FMAC4 soap_in__ngwm__getSettingsRes continue; } if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__getSettingsResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__getSettingsResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -29328,8 +29328,8 @@ void _ngwm__getRuleListResponse::soap_serialize(struct soap *soap) const (void)soap; /* appease -Wall -Werror */ soap_embedded(soap, &((_ngwm__getRuleListResponse*)this)->rules, SOAP_TYPE_PointerTongwt__RuleList); soap_serialize_PointerTongwt__RuleList(soap, &((_ngwm__getRuleListResponse*)this)->rules); - soap_embedded(soap, &((_ngwm__getRuleListResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__getRuleListResponse*)this)->status); + soap_embedded(soap, &((_ngwm__getRuleListResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__getRuleListResponse*)this)->status); /* transient soap skipped */ } @@ -29358,7 +29358,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getRuleListResponse(struct soap *soap, { soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__getRuleListResponse), type); soap_out_PointerTongwt__RuleList(soap, "ngwm:rules", -1, &(((_ngwm__getRuleListResponse*)a)->rules), ""); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__getRuleListResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__getRuleListResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -29406,7 +29406,7 @@ SOAP_FMAC3 _ngwm__getRuleListResponse * SOAP_FMAC4 soap_in__ngwm__getRuleListRes continue; } if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__getRuleListResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__getRuleListResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -29599,8 +29599,8 @@ void _ngwm__getProxyListResponse::soap_serialize(struct soap *soap) const (void)soap; /* appease -Wall -Werror */ soap_embedded(soap, &((_ngwm__getProxyListResponse*)this)->proxies, SOAP_TYPE_PointerTongwt__ProxyList); soap_serialize_PointerTongwt__ProxyList(soap, &((_ngwm__getProxyListResponse*)this)->proxies); - soap_embedded(soap, &((_ngwm__getProxyListResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__getProxyListResponse*)this)->status); + soap_embedded(soap, &((_ngwm__getProxyListResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__getProxyListResponse*)this)->status); /* transient soap skipped */ } @@ -29629,7 +29629,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getProxyListResponse(struct soap *soap { soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__getProxyListResponse), type); soap_out_PointerTongwt__ProxyList(soap, "ngwm:proxies", -1, &(((_ngwm__getProxyListResponse*)a)->proxies), ""); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__getProxyListResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__getProxyListResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -29677,7 +29677,7 @@ SOAP_FMAC3 _ngwm__getProxyListResponse * SOAP_FMAC4 soap_in__ngwm__getProxyListR continue; } if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__getProxyListResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__getProxyListResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -29870,8 +29870,8 @@ void _ngwm__getProxyAccessListResponse::soap_serialize(struct soap *soap) const (void)soap; /* appease -Wall -Werror */ soap_embedded(soap, &((_ngwm__getProxyAccessListResponse*)this)->accessRights, SOAP_TYPE_PointerTongwt__AccessRightList); soap_serialize_PointerTongwt__AccessRightList(soap, &((_ngwm__getProxyAccessListResponse*)this)->accessRights); - soap_embedded(soap, &((_ngwm__getProxyAccessListResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__getProxyAccessListResponse*)this)->status); + soap_embedded(soap, &((_ngwm__getProxyAccessListResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__getProxyAccessListResponse*)this)->status); /* transient soap skipped */ } @@ -29900,7 +29900,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getProxyAccessListResponse(struct soap { soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__getProxyAccessListResponse), type); soap_out_PointerTongwt__AccessRightList(soap, "ngwm:accessRights", -1, &(((_ngwm__getProxyAccessListResponse*)a)->accessRights), ""); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__getProxyAccessListResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__getProxyAccessListResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -29948,7 +29948,7 @@ SOAP_FMAC3 _ngwm__getProxyAccessListResponse * SOAP_FMAC4 soap_in__ngwm__getProx continue; } if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__getProxyAccessListResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__getProxyAccessListResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -30143,8 +30143,8 @@ void _ngwm__getQuickMessagesResponse::soap_serialize(struct soap *soap) const soap_serialize_string(soap, &((_ngwm__getQuickMessagesResponse*)this)->ngwt__startDate); soap_embedded(soap, &((_ngwm__getQuickMessagesResponse*)this)->items, SOAP_TYPE_PointerTongwt__Items); soap_serialize_PointerTongwt__Items(soap, &((_ngwm__getQuickMessagesResponse*)this)->items); - soap_embedded(soap, &((_ngwm__getQuickMessagesResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__getQuickMessagesResponse*)this)->status); + soap_embedded(soap, &((_ngwm__getQuickMessagesResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__getQuickMessagesResponse*)this)->status); /* transient soap skipped */ } @@ -30175,7 +30175,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getQuickMessagesResponse(struct soap * soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__getQuickMessagesResponse), type); soap_out_string(soap, "ngwt:startDate", -1, &(((_ngwm__getQuickMessagesResponse*)a)->ngwt__startDate), ""); soap_out_PointerTongwt__Items(soap, "ngwm:items", -1, &(((_ngwm__getQuickMessagesResponse*)a)->items), ""); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__getQuickMessagesResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__getQuickMessagesResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -30228,7 +30228,7 @@ SOAP_FMAC3 _ngwm__getQuickMessagesResponse * SOAP_FMAC4 soap_in__ngwm__getQuickM continue; } if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__getQuickMessagesResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__getQuickMessagesResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -30487,8 +30487,8 @@ void _ngwm__getLibraryListResponse::soap_serialize(struct soap *soap) const (void)soap; /* appease -Wall -Werror */ soap_embedded(soap, &((_ngwm__getLibraryListResponse*)this)->libraries, SOAP_TYPE_PointerTongwt__LibraryList); soap_serialize_PointerTongwt__LibraryList(soap, &((_ngwm__getLibraryListResponse*)this)->libraries); - soap_embedded(soap, &((_ngwm__getLibraryListResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__getLibraryListResponse*)this)->status); + soap_embedded(soap, &((_ngwm__getLibraryListResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__getLibraryListResponse*)this)->status); /* transient soap skipped */ } @@ -30517,7 +30517,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getLibraryListResponse(struct soap *so { soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__getLibraryListResponse), type); soap_out_PointerTongwt__LibraryList(soap, "ngwm:libraries", -1, &(((_ngwm__getLibraryListResponse*)a)->libraries), ""); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__getLibraryListResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__getLibraryListResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -30565,7 +30565,7 @@ SOAP_FMAC3 _ngwm__getLibraryListResponse * SOAP_FMAC4 soap_in__ngwm__getLibraryL continue; } if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__getLibraryListResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__getLibraryListResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -30758,8 +30758,8 @@ void _ngwm__getLibraryItemResponse::soap_serialize(struct soap *soap) const (void)soap; /* appease -Wall -Werror */ soap_embedded(soap, &((_ngwm__getLibraryItemResponse*)this)->item, SOAP_TYPE_PointerTongwt__Item); soap_serialize_PointerTongwt__Item(soap, &((_ngwm__getLibraryItemResponse*)this)->item); - soap_embedded(soap, &((_ngwm__getLibraryItemResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__getLibraryItemResponse*)this)->status); + soap_embedded(soap, &((_ngwm__getLibraryItemResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__getLibraryItemResponse*)this)->status); /* transient soap skipped */ } @@ -30788,7 +30788,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getLibraryItemResponse(struct soap *so { soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__getLibraryItemResponse), type); soap_out_PointerTongwt__Item(soap, "ngwm:item", -1, &(((_ngwm__getLibraryItemResponse*)a)->item), ""); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__getLibraryItemResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__getLibraryItemResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -30836,7 +30836,7 @@ SOAP_FMAC3 _ngwm__getLibraryItemResponse * SOAP_FMAC4 soap_in__ngwm__getLibraryI continue; } if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__getLibraryItemResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__getLibraryItemResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -31061,8 +31061,8 @@ void _ngwm__getJunkMailSettingsResponse::soap_serialize(struct soap *soap) const (void)soap; /* appease -Wall -Werror */ soap_embedded(soap, &((_ngwm__getJunkMailSettingsResponse*)this)->settings, SOAP_TYPE_PointerTongwt__SettingsList); soap_serialize_PointerTongwt__SettingsList(soap, &((_ngwm__getJunkMailSettingsResponse*)this)->settings); - soap_embedded(soap, &((_ngwm__getJunkMailSettingsResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__getJunkMailSettingsResponse*)this)->status); + soap_embedded(soap, &((_ngwm__getJunkMailSettingsResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__getJunkMailSettingsResponse*)this)->status); /* transient soap skipped */ } @@ -31091,7 +31091,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getJunkMailSettingsResponse(struct soa { soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__getJunkMailSettingsResponse), type); soap_out_PointerTongwt__SettingsList(soap, "ngwm:settings", -1, &(((_ngwm__getJunkMailSettingsResponse*)a)->settings), ""); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__getJunkMailSettingsResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__getJunkMailSettingsResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -31139,7 +31139,7 @@ SOAP_FMAC3 _ngwm__getJunkMailSettingsResponse * SOAP_FMAC4 soap_in__ngwm__getJun continue; } if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__getJunkMailSettingsResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__getJunkMailSettingsResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -31336,8 +31336,8 @@ void _ngwm__getJunkEntriesResponse::soap_serialize(struct soap *soap) const soap_serialize_PointerTongwt__JunkHandlingList(soap, &((_ngwm__getJunkEntriesResponse*)this)->block); soap_embedded(soap, &((_ngwm__getJunkEntriesResponse*)this)->trust, SOAP_TYPE_PointerTongwt__JunkHandlingList); soap_serialize_PointerTongwt__JunkHandlingList(soap, &((_ngwm__getJunkEntriesResponse*)this)->trust); - soap_embedded(soap, &((_ngwm__getJunkEntriesResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__getJunkEntriesResponse*)this)->status); + soap_embedded(soap, &((_ngwm__getJunkEntriesResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__getJunkEntriesResponse*)this)->status); /* transient soap skipped */ } @@ -31370,7 +31370,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getJunkEntriesResponse(struct soap *so soap_out_PointerTongwt__JunkHandlingList(soap, "ngwm:junk", -1, &(((_ngwm__getJunkEntriesResponse*)a)->junk), ""); soap_out_PointerTongwt__JunkHandlingList(soap, "ngwm:block", -1, &(((_ngwm__getJunkEntriesResponse*)a)->block), ""); soap_out_PointerTongwt__JunkHandlingList(soap, "ngwm:trust", -1, &(((_ngwm__getJunkEntriesResponse*)a)->trust), ""); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__getJunkEntriesResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__getJunkEntriesResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -31428,7 +31428,7 @@ SOAP_FMAC3 _ngwm__getJunkEntriesResponse * SOAP_FMAC4 soap_in__ngwm__getJunkEntr continue; } if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__getJunkEntriesResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__getJunkEntriesResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -31631,8 +31631,8 @@ void _ngwm__getItemsResponse::soap_serialize(struct soap *soap) const (void)soap; /* appease -Wall -Werror */ soap_embedded(soap, &((_ngwm__getItemsResponse*)this)->items, SOAP_TYPE_PointerTongwt__Items); soap_serialize_PointerTongwt__Items(soap, &((_ngwm__getItemsResponse*)this)->items); - soap_embedded(soap, &((_ngwm__getItemsResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__getItemsResponse*)this)->status); + soap_embedded(soap, &((_ngwm__getItemsResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__getItemsResponse*)this)->status); /* transient soap skipped */ } @@ -31661,7 +31661,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getItemsResponse(struct soap *soap, co { soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__getItemsResponse), type); soap_out_PointerTongwt__Items(soap, "ngwm:items", -1, &(((_ngwm__getItemsResponse*)a)->items), ""); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__getItemsResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__getItemsResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -31709,7 +31709,7 @@ SOAP_FMAC3 _ngwm__getItemsResponse * SOAP_FMAC4 soap_in__ngwm__getItemsResponse( continue; } if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__getItemsResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__getItemsResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -31947,8 +31947,8 @@ void _ngwm__getItemResponse::soap_serialize(struct soap *soap) const (void)soap; /* appease -Wall -Werror */ soap_embedded(soap, &((_ngwm__getItemResponse*)this)->item, SOAP_TYPE_PointerTongwt__Item); soap_serialize_PointerTongwt__Item(soap, &((_ngwm__getItemResponse*)this)->item); - soap_embedded(soap, &((_ngwm__getItemResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__getItemResponse*)this)->status); + soap_embedded(soap, &((_ngwm__getItemResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__getItemResponse*)this)->status); /* transient soap skipped */ } @@ -31977,7 +31977,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getItemResponse(struct soap *soap, con { soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__getItemResponse), type); soap_out_PointerTongwt__Item(soap, "ngwm:item", -1, &(((_ngwm__getItemResponse*)a)->item), ""); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__getItemResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__getItemResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -32025,7 +32025,7 @@ SOAP_FMAC3 _ngwm__getItemResponse * SOAP_FMAC4 soap_in__ngwm__getItemResponse(st continue; } if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__getItemResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__getItemResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -32243,8 +32243,8 @@ void _ngwm__getFreeBusyResponse::soap_serialize(struct soap *soap) const soap_serialize_PointerTongwt__FreeBusyStats(soap, &((_ngwm__getFreeBusyResponse*)this)->freeBusyStats); soap_embedded(soap, &((_ngwm__getFreeBusyResponse*)this)->freeBusyInfo, SOAP_TYPE_PointerTongwt__FreeBusyInfoList); soap_serialize_PointerTongwt__FreeBusyInfoList(soap, &((_ngwm__getFreeBusyResponse*)this)->freeBusyInfo); - soap_embedded(soap, &((_ngwm__getFreeBusyResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__getFreeBusyResponse*)this)->status); + soap_embedded(soap, &((_ngwm__getFreeBusyResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__getFreeBusyResponse*)this)->status); /* transient soap skipped */ } @@ -32275,7 +32275,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getFreeBusyResponse(struct soap *soap, soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__getFreeBusyResponse), type); soap_out_PointerTongwt__FreeBusyStats(soap, "ngwm:freeBusyStats", -1, &(((_ngwm__getFreeBusyResponse*)a)->freeBusyStats), ""); soap_out_PointerTongwt__FreeBusyInfoList(soap, "ngwm:freeBusyInfo", -1, &(((_ngwm__getFreeBusyResponse*)a)->freeBusyInfo), ""); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__getFreeBusyResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__getFreeBusyResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -32328,7 +32328,7 @@ SOAP_FMAC3 _ngwm__getFreeBusyResponse * SOAP_FMAC4 soap_in__ngwm__getFreeBusyRes continue; } if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__getFreeBusyResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__getFreeBusyResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -32535,8 +32535,8 @@ void _ngwm__getFolderListResponse::soap_serialize(struct soap *soap) const (void)soap; /* appease -Wall -Werror */ soap_embedded(soap, &((_ngwm__getFolderListResponse*)this)->folders, SOAP_TYPE_PointerTongwt__FolderList); soap_serialize_PointerTongwt__FolderList(soap, &((_ngwm__getFolderListResponse*)this)->folders); - soap_embedded(soap, &((_ngwm__getFolderListResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__getFolderListResponse*)this)->status); + soap_embedded(soap, &((_ngwm__getFolderListResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__getFolderListResponse*)this)->status); /* transient soap skipped */ } @@ -32565,7 +32565,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getFolderListResponse(struct soap *soa { soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__getFolderListResponse), type); soap_out_PointerTongwt__FolderList(soap, "ngwm:folders", -1, &(((_ngwm__getFolderListResponse*)a)->folders), ""); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__getFolderListResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__getFolderListResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -32613,7 +32613,7 @@ SOAP_FMAC3 _ngwm__getFolderListResponse * SOAP_FMAC4 soap_in__ngwm__getFolderLis continue; } if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__getFolderListResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__getFolderListResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -32853,8 +32853,8 @@ void _ngwm__getFolderResponse::soap_serialize(struct soap *soap) const (void)soap; /* appease -Wall -Werror */ soap_embedded(soap, &((_ngwm__getFolderResponse*)this)->folder, SOAP_TYPE_PointerTongwt__Folder); soap_serialize_PointerTongwt__Folder(soap, &((_ngwm__getFolderResponse*)this)->folder); - soap_embedded(soap, &((_ngwm__getFolderResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__getFolderResponse*)this)->status); + soap_embedded(soap, &((_ngwm__getFolderResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__getFolderResponse*)this)->status); /* transient soap skipped */ } @@ -32883,7 +32883,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getFolderResponse(struct soap *soap, c { soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__getFolderResponse), type); soap_out_PointerTongwt__Folder(soap, "ngwm:folder", -1, &(((_ngwm__getFolderResponse*)a)->folder), ""); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__getFolderResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__getFolderResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -32931,7 +32931,7 @@ SOAP_FMAC3 _ngwm__getFolderResponse * SOAP_FMAC4 soap_in__ngwm__getFolderRespons continue; } if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__getFolderResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__getFolderResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -33170,8 +33170,8 @@ void _ngwm__getDocumentTypeListResponse::soap_serialize(struct soap *soap) const (void)soap; /* appease -Wall -Werror */ soap_embedded(soap, &((_ngwm__getDocumentTypeListResponse*)this)->items, SOAP_TYPE_PointerTongwt__DocumentTypeList); soap_serialize_PointerTongwt__DocumentTypeList(soap, &((_ngwm__getDocumentTypeListResponse*)this)->items); - soap_embedded(soap, &((_ngwm__getDocumentTypeListResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__getDocumentTypeListResponse*)this)->status); + soap_embedded(soap, &((_ngwm__getDocumentTypeListResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__getDocumentTypeListResponse*)this)->status); /* transient soap skipped */ } @@ -33200,7 +33200,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getDocumentTypeListResponse(struct soa { soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__getDocumentTypeListResponse), type); soap_out_PointerTongwt__DocumentTypeList(soap, "ngwm:items", -1, &(((_ngwm__getDocumentTypeListResponse*)a)->items), ""); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__getDocumentTypeListResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__getDocumentTypeListResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -33248,7 +33248,7 @@ SOAP_FMAC3 _ngwm__getDocumentTypeListResponse * SOAP_FMAC4 soap_in__ngwm__getDoc continue; } if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__getDocumentTypeListResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__getDocumentTypeListResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -33455,8 +33455,8 @@ void _ngwm__getDeltaInfoResponse::soap_serialize(struct soap *soap) const (void)soap; /* appease -Wall -Werror */ soap_embedded(soap, &((_ngwm__getDeltaInfoResponse*)this)->deltaInfo, SOAP_TYPE_PointerTongwt__DeltaInfo); soap_serialize_PointerTongwt__DeltaInfo(soap, &((_ngwm__getDeltaInfoResponse*)this)->deltaInfo); - soap_embedded(soap, &((_ngwm__getDeltaInfoResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__getDeltaInfoResponse*)this)->status); + soap_embedded(soap, &((_ngwm__getDeltaInfoResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__getDeltaInfoResponse*)this)->status); /* transient soap skipped */ } @@ -33485,7 +33485,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getDeltaInfoResponse(struct soap *soap { soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__getDeltaInfoResponse), type); soap_out_PointerTongwt__DeltaInfo(soap, "ngwm:deltaInfo", -1, &(((_ngwm__getDeltaInfoResponse*)a)->deltaInfo), ""); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__getDeltaInfoResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__getDeltaInfoResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -33533,7 +33533,7 @@ SOAP_FMAC3 _ngwm__getDeltaInfoResponse * SOAP_FMAC4 soap_in__ngwm__getDeltaInfoR continue; } if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__getDeltaInfoResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__getDeltaInfoResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -33742,8 +33742,8 @@ void _ngwm__getDeltasResponse::soap_serialize(struct soap *soap) const soap_serialize_PointerTongwt__Items(soap, &((_ngwm__getDeltasResponse*)this)->items); soap_embedded(soap, &((_ngwm__getDeltasResponse*)this)->deltaInfo, SOAP_TYPE_PointerTongwt__DeltaInfo); soap_serialize_PointerTongwt__DeltaInfo(soap, &((_ngwm__getDeltasResponse*)this)->deltaInfo); - soap_embedded(soap, &((_ngwm__getDeltasResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__getDeltasResponse*)this)->status); + soap_embedded(soap, &((_ngwm__getDeltasResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__getDeltasResponse*)this)->status); /* transient soap skipped */ } @@ -33774,7 +33774,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getDeltasResponse(struct soap *soap, c soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__getDeltasResponse), type); soap_out_PointerTongwt__Items(soap, "ngwm:items", -1, &(((_ngwm__getDeltasResponse*)a)->items), ""); soap_out_PointerTongwt__DeltaInfo(soap, "ngwm:deltaInfo", -1, &(((_ngwm__getDeltasResponse*)a)->deltaInfo), ""); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__getDeltasResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__getDeltasResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -33827,7 +33827,7 @@ SOAP_FMAC3 _ngwm__getDeltasResponse * SOAP_FMAC4 soap_in__ngwm__getDeltasRespons continue; } if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__getDeltasResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__getDeltasResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -34052,8 +34052,8 @@ void _ngwm__getCustomListResponse::soap_serialize(struct soap *soap) const (void)soap; /* appease -Wall -Werror */ soap_embedded(soap, &((_ngwm__getCustomListResponse*)this)->customs, SOAP_TYPE_PointerTongwt__CustomList); soap_serialize_PointerTongwt__CustomList(soap, &((_ngwm__getCustomListResponse*)this)->customs); - soap_embedded(soap, &((_ngwm__getCustomListResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__getCustomListResponse*)this)->status); + soap_embedded(soap, &((_ngwm__getCustomListResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__getCustomListResponse*)this)->status); /* transient soap skipped */ } @@ -34082,7 +34082,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getCustomListResponse(struct soap *soa { soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__getCustomListResponse), type); soap_out_PointerTongwt__CustomList(soap, "ngwm:customs", -1, &(((_ngwm__getCustomListResponse*)a)->customs), ""); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__getCustomListResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__getCustomListResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -34130,7 +34130,7 @@ SOAP_FMAC3 _ngwm__getCustomListResponse * SOAP_FMAC4 soap_in__ngwm__getCustomLis continue; } if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__getCustomListResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__getCustomListResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -34323,8 +34323,8 @@ void _ngwm__getCategoryListResponse::soap_serialize(struct soap *soap) const (void)soap; /* appease -Wall -Werror */ soap_embedded(soap, &((_ngwm__getCategoryListResponse*)this)->categories, SOAP_TYPE_PointerTongwt__CategoryList); soap_serialize_PointerTongwt__CategoryList(soap, &((_ngwm__getCategoryListResponse*)this)->categories); - soap_embedded(soap, &((_ngwm__getCategoryListResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__getCategoryListResponse*)this)->status); + soap_embedded(soap, &((_ngwm__getCategoryListResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__getCategoryListResponse*)this)->status); /* transient soap skipped */ } @@ -34353,7 +34353,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getCategoryListResponse(struct soap *s { soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__getCategoryListResponse), type); soap_out_PointerTongwt__CategoryList(soap, "ngwm:categories", -1, &(((_ngwm__getCategoryListResponse*)a)->categories), ""); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__getCategoryListResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__getCategoryListResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -34401,7 +34401,7 @@ SOAP_FMAC3 _ngwm__getCategoryListResponse * SOAP_FMAC4 soap_in__ngwm__getCategor continue; } if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__getCategoryListResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__getCategoryListResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -34594,8 +34594,8 @@ void _ngwm__getAttachmentResponse::soap_serialize(struct soap *soap) const (void)soap; /* appease -Wall -Werror */ soap_embedded(soap, &((_ngwm__getAttachmentResponse*)this)->part, SOAP_TYPE_PointerTongwt__MessagePart); soap_serialize_PointerTongwt__MessagePart(soap, &((_ngwm__getAttachmentResponse*)this)->part); - soap_embedded(soap, &((_ngwm__getAttachmentResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__getAttachmentResponse*)this)->status); + soap_embedded(soap, &((_ngwm__getAttachmentResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__getAttachmentResponse*)this)->status); /* transient soap skipped */ } @@ -34624,7 +34624,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getAttachmentResponse(struct soap *soa { soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__getAttachmentResponse), type); soap_out_PointerTongwt__MessagePart(soap, "ngwm:part", -1, &(((_ngwm__getAttachmentResponse*)a)->part), ""); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__getAttachmentResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__getAttachmentResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -34672,7 +34672,7 @@ SOAP_FMAC3 _ngwm__getAttachmentResponse * SOAP_FMAC4 soap_in__ngwm__getAttachmen continue; } if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__getAttachmentResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__getAttachmentResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -34895,8 +34895,8 @@ void _ngwm__getAddressBookListResponse::soap_serialize(struct soap *soap) const (void)soap; /* appease -Wall -Werror */ soap_embedded(soap, &((_ngwm__getAddressBookListResponse*)this)->books, SOAP_TYPE_PointerTongwt__AddressBookList); soap_serialize_PointerTongwt__AddressBookList(soap, &((_ngwm__getAddressBookListResponse*)this)->books); - soap_embedded(soap, &((_ngwm__getAddressBookListResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__getAddressBookListResponse*)this)->status); + soap_embedded(soap, &((_ngwm__getAddressBookListResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__getAddressBookListResponse*)this)->status); /* transient soap skipped */ } @@ -34925,7 +34925,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getAddressBookListResponse(struct soap { soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__getAddressBookListResponse), type); soap_out_PointerTongwt__AddressBookList(soap, "ngwm:books", -1, &(((_ngwm__getAddressBookListResponse*)a)->books), ""); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__getAddressBookListResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__getAddressBookListResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -34973,7 +34973,7 @@ SOAP_FMAC3 _ngwm__getAddressBookListResponse * SOAP_FMAC4 soap_in__ngwm__getAddr continue; } if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__getAddressBookListResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__getAddressBookListResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -35166,8 +35166,8 @@ void _ngwm__forwardResponse::soap_serialize(struct soap *soap) const (void)soap; /* appease -Wall -Werror */ soap_embedded(soap, &((_ngwm__forwardResponse*)this)->item, SOAP_TYPE_PointerTongwt__Item); soap_serialize_PointerTongwt__Item(soap, &((_ngwm__forwardResponse*)this)->item); - soap_embedded(soap, &((_ngwm__forwardResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__forwardResponse*)this)->status); + soap_embedded(soap, &((_ngwm__forwardResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__forwardResponse*)this)->status); /* transient soap skipped */ } @@ -35196,7 +35196,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__forwardResponse(struct soap *soap, con { soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__forwardResponse), type); soap_out_PointerTongwt__Item(soap, "ngwm:item", -1, &(((_ngwm__forwardResponse*)a)->item), ""); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__forwardResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__forwardResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -35244,7 +35244,7 @@ SOAP_FMAC3 _ngwm__forwardResponse * SOAP_FMAC4 soap_in__ngwm__forwardResponse(st continue; } if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__forwardResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__forwardResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -35466,8 +35466,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__forwardRequest(struct soap *soap, in void _ngwm__executeRuleResponse::soap_serialize(struct soap *soap) const { (void)soap; /* appease -Wall -Werror */ - soap_embedded(soap, &((_ngwm__executeRuleResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__executeRuleResponse*)this)->status); + soap_embedded(soap, &((_ngwm__executeRuleResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__executeRuleResponse*)this)->status); /* transient soap skipped */ } @@ -35494,7 +35494,7 @@ int _ngwm__executeRuleResponse::soap_out(struct soap *soap, const char *tag, int SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__executeRuleResponse(struct soap *soap, const char *tag, int id, const _ngwm__executeRuleResponse *a, const char *type) { soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__executeRuleResponse), type); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__executeRuleResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__executeRuleResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -35537,7 +35537,7 @@ SOAP_FMAC3 _ngwm__executeRuleResponse * SOAP_FMAC4 soap_in__ngwm__executeRuleRes for (;;) { soap->error = SOAP_TAG_MISMATCH; if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__executeRuleResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__executeRuleResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -35742,8 +35742,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__executeRuleRequest(struct soap *soap void _ngwm__destroyCursorResponse::soap_serialize(struct soap *soap) const { (void)soap; /* appease -Wall -Werror */ - soap_embedded(soap, &((_ngwm__destroyCursorResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__destroyCursorResponse*)this)->status); + soap_embedded(soap, &((_ngwm__destroyCursorResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__destroyCursorResponse*)this)->status); /* transient soap skipped */ } @@ -35770,7 +35770,7 @@ int _ngwm__destroyCursorResponse::soap_out(struct soap *soap, const char *tag, i SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__destroyCursorResponse(struct soap *soap, const char *tag, int id, const _ngwm__destroyCursorResponse *a, const char *type) { soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__destroyCursorResponse), type); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__destroyCursorResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__destroyCursorResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -35813,7 +35813,7 @@ SOAP_FMAC3 _ngwm__destroyCursorResponse * SOAP_FMAC4 soap_in__ngwm__destroyCurso for (;;) { soap->error = SOAP_TAG_MISMATCH; if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__destroyCursorResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__destroyCursorResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -36026,8 +36026,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__destroyCursorRequest(struct soap *so void _ngwm__delegateResponse::soap_serialize(struct soap *soap) const { (void)soap; /* appease -Wall -Werror */ - soap_embedded(soap, &((_ngwm__delegateResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__delegateResponse*)this)->status); + soap_embedded(soap, &((_ngwm__delegateResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__delegateResponse*)this)->status); /* transient soap skipped */ } @@ -36054,7 +36054,7 @@ int _ngwm__delegateResponse::soap_out(struct soap *soap, const char *tag, int id SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__delegateResponse(struct soap *soap, const char *tag, int id, const _ngwm__delegateResponse *a, const char *type) { soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__delegateResponse), type); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__delegateResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__delegateResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -36097,7 +36097,7 @@ SOAP_FMAC3 _ngwm__delegateResponse * SOAP_FMAC4 soap_in__ngwm__delegateResponse( for (;;) { soap->error = SOAP_TAG_MISMATCH; if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__delegateResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__delegateResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -36337,8 +36337,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__delegateRequest(struct soap *soap, i void _ngwm__declineResponse::soap_serialize(struct soap *soap) const { (void)soap; /* appease -Wall -Werror */ - soap_embedded(soap, &((_ngwm__declineResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__declineResponse*)this)->status); + soap_embedded(soap, &((_ngwm__declineResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__declineResponse*)this)->status); /* transient soap skipped */ } @@ -36365,7 +36365,7 @@ int _ngwm__declineResponse::soap_out(struct soap *soap, const char *tag, int id, SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__declineResponse(struct soap *soap, const char *tag, int id, const _ngwm__declineResponse *a, const char *type) { soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__declineResponse), type); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__declineResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__declineResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -36408,7 +36408,7 @@ SOAP_FMAC3 _ngwm__declineResponse * SOAP_FMAC4 soap_in__ngwm__declineResponse(st for (;;) { soap->error = SOAP_TAG_MISMATCH; if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__declineResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__declineResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -36630,8 +36630,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__declineRequest(struct soap *soap, in void _ngwm__createSignatureResponse::soap_serialize(struct soap *soap) const { (void)soap; /* appease -Wall -Werror */ - soap_embedded(soap, &((_ngwm__createSignatureResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__createSignatureResponse*)this)->status); + soap_embedded(soap, &((_ngwm__createSignatureResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__createSignatureResponse*)this)->status); /* transient soap skipped */ } @@ -36658,7 +36658,7 @@ int _ngwm__createSignatureResponse::soap_out(struct soap *soap, const char *tag, SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__createSignatureResponse(struct soap *soap, const char *tag, int id, const _ngwm__createSignatureResponse *a, const char *type) { soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__createSignatureResponse), type); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__createSignatureResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__createSignatureResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -36701,7 +36701,7 @@ SOAP_FMAC3 _ngwm__createSignatureResponse * SOAP_FMAC4 soap_in__ngwm__createSign for (;;) { soap->error = SOAP_TAG_MISMATCH; if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__createSignatureResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__createSignatureResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -36908,8 +36908,8 @@ void _ngwm__createProxyAccessResponse::soap_serialize(struct soap *soap) const (void)soap; /* appease -Wall -Werror */ soap_embedded(soap, &((_ngwm__createProxyAccessResponse*)this)->id, SOAP_TYPE_PointerTongwt__uid); soap_serialize_PointerTongwt__uid(soap, &((_ngwm__createProxyAccessResponse*)this)->id); - soap_embedded(soap, &((_ngwm__createProxyAccessResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__createProxyAccessResponse*)this)->status); + soap_embedded(soap, &((_ngwm__createProxyAccessResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__createProxyAccessResponse*)this)->status); /* transient soap skipped */ } @@ -36938,7 +36938,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__createProxyAccessResponse(struct soap { soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__createProxyAccessResponse), type); soap_out_PointerTongwt__uid(soap, "ngwm:id", -1, &(((_ngwm__createProxyAccessResponse*)a)->id), ""); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__createProxyAccessResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__createProxyAccessResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -36986,7 +36986,7 @@ SOAP_FMAC3 _ngwm__createProxyAccessResponse * SOAP_FMAC4 soap_in__ngwm__createPr continue; } if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__createProxyAccessResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__createProxyAccessResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -37193,8 +37193,8 @@ void _ngwm__createJunkEntryResponse::soap_serialize(struct soap *soap) const (void)soap; /* appease -Wall -Werror */ soap_embedded(soap, &((_ngwm__createJunkEntryResponse*)this)->id, SOAP_TYPE_PointerTongwt__uid); soap_serialize_PointerTongwt__uid(soap, &((_ngwm__createJunkEntryResponse*)this)->id); - soap_embedded(soap, &((_ngwm__createJunkEntryResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__createJunkEntryResponse*)this)->status); + soap_embedded(soap, &((_ngwm__createJunkEntryResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__createJunkEntryResponse*)this)->status); /* transient soap skipped */ } @@ -37223,7 +37223,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__createJunkEntryResponse(struct soap *s { soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__createJunkEntryResponse), type); soap_out_PointerTongwt__uid(soap, "ngwm:id", -1, &(((_ngwm__createJunkEntryResponse*)a)->id), ""); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__createJunkEntryResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__createJunkEntryResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -37271,7 +37271,7 @@ SOAP_FMAC3 _ngwm__createJunkEntryResponse * SOAP_FMAC4 soap_in__ngwm__createJunk continue; } if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__createJunkEntryResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__createJunkEntryResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -37477,8 +37477,8 @@ void _ngwm__createItemsResponse::soap_serialize(struct soap *soap) const { (void)soap; /* appease -Wall -Werror */ soap_serialize_std__vectorTemplateOfngwt__uid(soap, &((_ngwm__createItemsResponse*)this)->id); - soap_embedded(soap, &((_ngwm__createItemsResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__createItemsResponse*)this)->status); + soap_embedded(soap, &((_ngwm__createItemsResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__createItemsResponse*)this)->status); /* transient soap skipped */ } @@ -37507,7 +37507,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__createItemsResponse(struct soap *soap, { soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__createItemsResponse), type); soap_out_std__vectorTemplateOfngwt__uid(soap, "ngwm:id", -1, &(((_ngwm__createItemsResponse*)a)->id), ""); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__createItemsResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__createItemsResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -37553,7 +37553,7 @@ SOAP_FMAC3 _ngwm__createItemsResponse * SOAP_FMAC4 soap_in__ngwm__createItemsRes if (soap_in_std__vectorTemplateOfngwt__uid(soap, "ngwm:id", &(((_ngwm__createItemsResponse*)a)->id), "ngwt:uid")) continue; if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__createItemsResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__createItemsResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -37751,8 +37751,8 @@ void _ngwm__createItemResponse::soap_serialize(struct soap *soap) const { (void)soap; /* appease -Wall -Werror */ soap_serialize_std__vectorTemplateOfngwt__uid(soap, &((_ngwm__createItemResponse*)this)->id); - soap_embedded(soap, &((_ngwm__createItemResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__createItemResponse*)this)->status); + soap_embedded(soap, &((_ngwm__createItemResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__createItemResponse*)this)->status); /* transient soap skipped */ } @@ -37781,7 +37781,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__createItemResponse(struct soap *soap, { soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__createItemResponse), type); soap_out_std__vectorTemplateOfngwt__uid(soap, "ngwm:id", -1, &(((_ngwm__createItemResponse*)a)->id), ""); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__createItemResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__createItemResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -37827,7 +37827,7 @@ SOAP_FMAC3 _ngwm__createItemResponse * SOAP_FMAC4 soap_in__ngwm__createItemRespo if (soap_in_std__vectorTemplateOfngwt__uid(soap, "ngwm:id", &(((_ngwm__createItemResponse*)a)->id), "ngwt:uid")) continue; if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__createItemResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__createItemResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -38043,8 +38043,8 @@ void _ngwm__createCursorResponse::soap_serialize(struct soap *soap) const (void)soap; /* appease -Wall -Werror */ soap_embedded(soap, &((_ngwm__createCursorResponse*)this)->cursor, SOAP_TYPE_PointerToint); soap_serialize_PointerToint(soap, &((_ngwm__createCursorResponse*)this)->cursor); - soap_embedded(soap, &((_ngwm__createCursorResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__createCursorResponse*)this)->status); + soap_embedded(soap, &((_ngwm__createCursorResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__createCursorResponse*)this)->status); /* transient soap skipped */ } @@ -38073,7 +38073,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__createCursorResponse(struct soap *soap { soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__createCursorResponse), type); soap_out_PointerToint(soap, "ngwm:cursor", -1, &(((_ngwm__createCursorResponse*)a)->cursor), ""); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__createCursorResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__createCursorResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -38121,7 +38121,7 @@ SOAP_FMAC3 _ngwm__createCursorResponse * SOAP_FMAC4 soap_in__ngwm__createCursorR continue; } if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__createCursorResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__createCursorResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -38344,8 +38344,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__createCursorRequest(struct soap *soa void _ngwm__completeResponse::soap_serialize(struct soap *soap) const { (void)soap; /* appease -Wall -Werror */ - soap_embedded(soap, &((_ngwm__completeResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__completeResponse*)this)->status); + soap_embedded(soap, &((_ngwm__completeResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__completeResponse*)this)->status); /* transient soap skipped */ } @@ -38372,7 +38372,7 @@ int _ngwm__completeResponse::soap_out(struct soap *soap, const char *tag, int id SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__completeResponse(struct soap *soap, const char *tag, int id, const _ngwm__completeResponse *a, const char *type) { soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__completeResponse), type); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__completeResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__completeResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -38415,7 +38415,7 @@ SOAP_FMAC3 _ngwm__completeResponse * SOAP_FMAC4 soap_in__ngwm__completeResponse( for (;;) { soap->error = SOAP_TAG_MISMATCH; if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__completeResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__completeResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -38620,8 +38620,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__completeRequest(struct soap *soap, i void _ngwm__closeFreeBusySessionResponse::soap_serialize(struct soap *soap) const { (void)soap; /* appease -Wall -Werror */ - soap_embedded(soap, &((_ngwm__closeFreeBusySessionResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__closeFreeBusySessionResponse*)this)->status); + soap_embedded(soap, &((_ngwm__closeFreeBusySessionResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__closeFreeBusySessionResponse*)this)->status); /* transient soap skipped */ } @@ -38648,7 +38648,7 @@ int _ngwm__closeFreeBusySessionResponse::soap_out(struct soap *soap, const char SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__closeFreeBusySessionResponse(struct soap *soap, const char *tag, int id, const _ngwm__closeFreeBusySessionResponse *a, const char *type) { soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__closeFreeBusySessionResponse), type); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__closeFreeBusySessionResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__closeFreeBusySessionResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -38691,7 +38691,7 @@ SOAP_FMAC3 _ngwm__closeFreeBusySessionResponse * SOAP_FMAC4 soap_in__ngwm__close for (;;) { soap->error = SOAP_TAG_MISMATCH; if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__closeFreeBusySessionResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__closeFreeBusySessionResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -38895,8 +38895,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__closeFreeBusySessionRequest(struct s void _ngwm__addMembersResponse::soap_serialize(struct soap *soap) const { (void)soap; /* appease -Wall -Werror */ - soap_embedded(soap, &((_ngwm__addMembersResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__addMembersResponse*)this)->status); + soap_embedded(soap, &((_ngwm__addMembersResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__addMembersResponse*)this)->status); /* transient soap skipped */ } @@ -38923,7 +38923,7 @@ int _ngwm__addMembersResponse::soap_out(struct soap *soap, const char *tag, int SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__addMembersResponse(struct soap *soap, const char *tag, int id, const _ngwm__addMembersResponse *a, const char *type) { soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__addMembersResponse), type); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__addMembersResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__addMembersResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -38966,7 +38966,7 @@ SOAP_FMAC3 _ngwm__addMembersResponse * SOAP_FMAC4 soap_in__ngwm__addMembersRespo for (;;) { soap->error = SOAP_TAG_MISMATCH; if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__addMembersResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__addMembersResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -39180,8 +39180,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__addMembersRequest(struct soap *soap, void _ngwm__addItemsResponse::soap_serialize(struct soap *soap) const { (void)soap; /* appease -Wall -Werror */ - soap_embedded(soap, &((_ngwm__addItemsResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__addItemsResponse*)this)->status); + soap_embedded(soap, &((_ngwm__addItemsResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__addItemsResponse*)this)->status); /* transient soap skipped */ } @@ -39208,7 +39208,7 @@ int _ngwm__addItemsResponse::soap_out(struct soap *soap, const char *tag, int id SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__addItemsResponse(struct soap *soap, const char *tag, int id, const _ngwm__addItemsResponse *a, const char *type) { soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__addItemsResponse), type); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__addItemsResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__addItemsResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -39251,7 +39251,7 @@ SOAP_FMAC3 _ngwm__addItemsResponse * SOAP_FMAC4 soap_in__ngwm__addItemsResponse( for (;;) { soap->error = SOAP_TAG_MISMATCH; if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__addItemsResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__addItemsResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -39465,8 +39465,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__addItemsRequest(struct soap *soap, i void _ngwm__addItemResponse::soap_serialize(struct soap *soap) const { (void)soap; /* appease -Wall -Werror */ - soap_embedded(soap, &((_ngwm__addItemResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__addItemResponse*)this)->status); + soap_embedded(soap, &((_ngwm__addItemResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__addItemResponse*)this)->status); /* transient soap skipped */ } @@ -39493,7 +39493,7 @@ int _ngwm__addItemResponse::soap_out(struct soap *soap, const char *tag, int id, SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__addItemResponse(struct soap *soap, const char *tag, int id, const _ngwm__addItemResponse *a, const char *type) { soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__addItemResponse), type); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__addItemResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__addItemResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -39536,7 +39536,7 @@ SOAP_FMAC3 _ngwm__addItemResponse * SOAP_FMAC4 soap_in__ngwm__addItemResponse(st for (;;) { soap->error = SOAP_TAG_MISMATCH; if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__addItemResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__addItemResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -39752,8 +39752,8 @@ void _ngwm__acceptShareResponse::soap_serialize(struct soap *soap) const (void)soap; /* appease -Wall -Werror */ soap_embedded(soap, &((_ngwm__acceptShareResponse*)this)->id, SOAP_TYPE_PointerTongwt__uid); soap_serialize_PointerTongwt__uid(soap, &((_ngwm__acceptShareResponse*)this)->id); - soap_embedded(soap, &((_ngwm__acceptShareResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__acceptShareResponse*)this)->status); + soap_embedded(soap, &((_ngwm__acceptShareResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__acceptShareResponse*)this)->status); /* transient soap skipped */ } @@ -39782,7 +39782,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__acceptShareResponse(struct soap *soap, { soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__acceptShareResponse), type); soap_out_PointerTongwt__uid(soap, "ngwm:id", -1, &(((_ngwm__acceptShareResponse*)a)->id), ""); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__acceptShareResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__acceptShareResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -39830,7 +39830,7 @@ SOAP_FMAC3 _ngwm__acceptShareResponse * SOAP_FMAC4 soap_in__ngwm__acceptShareRes continue; } if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__acceptShareResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__acceptShareResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -40062,8 +40062,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__acceptShareRequest(struct soap *soap void _ngwm__acceptResponse::soap_serialize(struct soap *soap) const { (void)soap; /* appease -Wall -Werror */ - soap_embedded(soap, &((_ngwm__acceptResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus); - soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__acceptResponse*)this)->status); + soap_embedded(soap, &((_ngwm__acceptResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status); + soap_serialize_PointerTongwt__Status(soap, &((_ngwm__acceptResponse*)this)->status); /* transient soap skipped */ } @@ -40090,7 +40090,7 @@ int _ngwm__acceptResponse::soap_out(struct soap *soap, const char *tag, int id, SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__acceptResponse(struct soap *soap, const char *tag, int id, const _ngwm__acceptResponse *a, const char *type) { soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__acceptResponse), type); - soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__acceptResponse*)a)->status), ""); + soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__acceptResponse*)a)->status), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; @@ -40133,7 +40133,7 @@ SOAP_FMAC3 _ngwm__acceptResponse * SOAP_FMAC4 soap_in__ngwm__acceptResponse(stru for (;;) { soap->error = SOAP_TAG_MISMATCH; if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__acceptResponse*)a)->status), "ngwt:Status")) + if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__acceptResponse*)a)->status), "ngwt:Status")) { soap_flag_status1 = 0; continue; } @@ -40644,8 +40644,8 @@ void ngwt__Version::soap_serialize(struct soap *soap) const soap_embedded(soap, &((ngwt__Version*)this)->versionNumber, SOAP_TYPE_unsignedLong); soap_embedded(soap, &((ngwt__Version*)this)->versionDescription, SOAP_TYPE_PointerTostd__string); soap_serialize_PointerTostd__string(soap, &((ngwt__Version*)this)->versionDescription); - soap_embedded(soap, &((ngwt__Version*)this)->versiontqStatus, SOAP_TYPE_PointerTongwt__VersiontqStatus); - soap_serialize_PointerTongwt__VersiontqStatus(soap, &((ngwt__Version*)this)->versiontqStatus); + soap_embedded(soap, &((ngwt__Version*)this)->versionStatus, SOAP_TYPE_PointerTongwt__VersionStatus); + soap_serialize_PointerTongwt__VersionStatus(soap, &((ngwt__Version*)this)->versionStatus); soap_embedded(soap, &((ngwt__Version*)this)->life, SOAP_TYPE_PointerTounsignedLong); soap_serialize_PointerTounsignedLong(soap, &((ngwt__Version*)this)->life); soap_embedded(soap, &((ngwt__Version*)this)->ageAction, SOAP_TYPE_PointerTongwt__AgeAction); @@ -40684,7 +40684,7 @@ void ngwt__Version::soap_default(struct soap *soap) soap_default_string(soap, &((ngwt__Version*)this)->retrievedDate); soap_default_unsignedLong(soap, &((ngwt__Version*)this)->versionNumber); ((ngwt__Version*)this)->versionDescription = NULL; - ((ngwt__Version*)this)->versiontqStatus = NULL; + ((ngwt__Version*)this)->versionStatus = NULL; ((ngwt__Version*)this)->life = NULL; ((ngwt__Version*)this)->ageAction = NULL; ((ngwt__Version*)this)->fileSize = NULL; @@ -40734,7 +40734,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__Version(struct soap *soap, const char * soap_out_string(soap, "ngwt:retrievedDate", -1, &(((ngwt__Version*)a)->retrievedDate), ""); soap_out_unsignedLong(soap, "ngwt:versionNumber", -1, &(((ngwt__Version*)a)->versionNumber), ""); soap_out_PointerTostd__string(soap, "ngwt:versionDescription", -1, &(((ngwt__Version*)a)->versionDescription), ""); - soap_out_PointerTongwt__VersiontqStatus(soap, "ngwt:versionStatus", -1, &(((ngwt__Version*)a)->versiontqStatus), ""); + soap_out_PointerTongwt__VersionStatus(soap, "ngwt:versionStatus", -1, &(((ngwt__Version*)a)->versionStatus), ""); soap_out_PointerTounsignedLong(soap, "ngwt:life", -1, &(((ngwt__Version*)a)->life), ""); soap_out_PointerTongwt__AgeAction(soap, "ngwt:ageAction", -1, &(((ngwt__Version*)a)->ageAction), ""); soap_out_PointerTounsignedLong(soap, "ngwt:fileSize", -1, &(((ngwt__Version*)a)->fileSize), ""); @@ -40774,7 +40774,7 @@ SOAP_FMAC3 ngwt__Version * SOAP_FMAC4 soap_in_ngwt__Version(struct soap *soap, c return (ngwt__Version *)a->soap_in(soap, tag, type); } } - short soap_flag_id3 = 1, soap_flag_name3 = 1, soap_flag_version3 = 1, soap_flag_modified3 = 1, soap_flag_changes3 = 1, soap_flag_categories2 = 1, soap_flag_created2 = 1, soap_flag_customs2 = 1, soap_flag_library1 = 1, soap_flag_documentNumber1 = 1, soap_flag_versionCreator1 = 1, soap_flag_retrievedBy1 = 1, soap_flag_retrievedDate1 = 1, soap_flag_versionNumber1 = 1, soap_flag_versionDescription1 = 1, soap_flag_versiontqStatus1 = 1, soap_flag_life1 = 1, soap_flag_ageAction1 = 1, soap_flag_fileSize1 = 1, soap_flag_filename1 = 1; + short soap_flag_id3 = 1, soap_flag_name3 = 1, soap_flag_version3 = 1, soap_flag_modified3 = 1, soap_flag_changes3 = 1, soap_flag_categories2 = 1, soap_flag_created2 = 1, soap_flag_customs2 = 1, soap_flag_library1 = 1, soap_flag_documentNumber1 = 1, soap_flag_versionCreator1 = 1, soap_flag_retrievedBy1 = 1, soap_flag_retrievedDate1 = 1, soap_flag_versionNumber1 = 1, soap_flag_versionDescription1 = 1, soap_flag_versionStatus1 = 1, soap_flag_life1 = 1, soap_flag_ageAction1 = 1, soap_flag_fileSize1 = 1, soap_flag_filename1 = 1; if (soap->body && !*soap->href) { for (;;) @@ -40858,9 +40858,9 @@ SOAP_FMAC3 ngwt__Version * SOAP_FMAC4 soap_in_ngwt__Version(struct soap *soap, c { soap_flag_versionDescription1 = 0; continue; } - if (soap_flag_versiontqStatus1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__VersiontqStatus(soap, "ngwt:versionStatus", &(((ngwt__Version*)a)->versiontqStatus), "")) - { soap_flag_versiontqStatus1 = 0; + if (soap_flag_versionStatus1 && soap->error == SOAP_TAG_MISMATCH) + if (soap_in_PointerTongwt__VersionStatus(soap, "ngwt:versionStatus", &(((ngwt__Version*)a)->versionStatus), "")) + { soap_flag_versionStatus1 = 0; continue; } if (soap_flag_life1 && soap->error == SOAP_TAG_MISMATCH) @@ -41402,167 +41402,167 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__TrustedApplication(struct soap *soap, *(ngwt__TrustedApplication*)p = *(ngwt__TrustedApplication*)q; } -void ngwt__TransferFailedtqStatus::soap_serialize(struct soap *soap) const +void ngwt__TransferFailedStatus::soap_serialize(struct soap *soap) const { (void)soap; /* appease -Wall -Werror */ - soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->delivered, SOAP_TYPE_string); - soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->delivered); - soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->undeliverable, SOAP_TYPE_string); - soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->undeliverable); - soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->transferred, SOAP_TYPE_string); - soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->transferred); - soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->transferDelayed, SOAP_TYPE_string); - soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->transferDelayed); - soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->transferFailed, SOAP_TYPE_PointerTongwt__TransferFailedtqStatus); - soap_serialize_PointerTongwt__TransferFailedtqStatus(soap, &((ngwt__RecipientqStatus*)this)->transferFailed); - soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->downloaded, SOAP_TYPE_string); - soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->downloaded); - soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->downloadedByThirdParty, SOAP_TYPE_string); - soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->downloadedByThirdParty); - soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->retractRequested, SOAP_TYPE_string); - soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->retractRequested); - soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->retracted, SOAP_TYPE_string); - soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->retracted); - soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->opened, SOAP_TYPE_string); - soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->opened); - soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->deleted, SOAP_TYPE_string); - soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->deleted); - soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->undeleted, SOAP_TYPE_string); - soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->undeleted); - soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->purged, SOAP_TYPE_string); - soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->purged); - soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->accepted, SOAP_TYPE_PointerTongwt__CommentqStatus); - soap_serialize_PointerTongwt__CommentqStatus(soap, &((ngwt__RecipientqStatus*)this)->accepted); - soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->declined, SOAP_TYPE_PointerTongwt__CommentqStatus); - soap_serialize_PointerTongwt__CommentqStatus(soap, &((ngwt__RecipientqStatus*)this)->declined); - soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->replied, SOAP_TYPE_string); - soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->replied); - soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->forwarded, SOAP_TYPE_string); - soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->forwarded); - soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->shared, SOAP_TYPE_string); - soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->shared); - soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->started, SOAP_TYPE_string); - soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->started); - soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->completed, SOAP_TYPE_string); - soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->completed); - soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->incomplete, SOAP_TYPE_string); - soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->incomplete); - soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->delegated, SOAP_TYPE_PointerTongwt__DelegatedtqStatus); - soap_serialize_PointerTongwt__DelegatedtqStatus(soap, &((ngwt__RecipientqStatus*)this)->delegated); - soap_serialize_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(soap, &((ngwt__RecipientqStatus*)this)->delegateetqStatus); - /* transient soap skipped */ -} - -void ngwt__TransferFailedtqStatus::soap_default(struct soap *soap) + soap_embedded(soap, &((ngwt__RecipienStatus*)this)->delivered, SOAP_TYPE_string); + soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->delivered); + soap_embedded(soap, &((ngwt__RecipienStatus*)this)->undeliverable, SOAP_TYPE_string); + soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->undeliverable); + soap_embedded(soap, &((ngwt__RecipienStatus*)this)->transferred, SOAP_TYPE_string); + soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->transferred); + soap_embedded(soap, &((ngwt__RecipienStatus*)this)->transferDelayed, SOAP_TYPE_string); + soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->transferDelayed); + soap_embedded(soap, &((ngwt__RecipienStatus*)this)->transferFailed, SOAP_TYPE_PointerTongwt__TransferFailedStatus); + soap_serialize_PointerTongwt__TransferFailedStatus(soap, &((ngwt__RecipienStatus*)this)->transferFailed); + soap_embedded(soap, &((ngwt__RecipienStatus*)this)->downloaded, SOAP_TYPE_string); + soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->downloaded); + soap_embedded(soap, &((ngwt__RecipienStatus*)this)->downloadedByThirdParty, SOAP_TYPE_string); + soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->downloadedByThirdParty); + soap_embedded(soap, &((ngwt__RecipienStatus*)this)->retractRequested, SOAP_TYPE_string); + soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->retractRequested); + soap_embedded(soap, &((ngwt__RecipienStatus*)this)->retracted, SOAP_TYPE_string); + soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->retracted); + soap_embedded(soap, &((ngwt__RecipienStatus*)this)->opened, SOAP_TYPE_string); + soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->opened); + soap_embedded(soap, &((ngwt__RecipienStatus*)this)->deleted, SOAP_TYPE_string); + soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->deleted); + soap_embedded(soap, &((ngwt__RecipienStatus*)this)->undeleted, SOAP_TYPE_string); + soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->undeleted); + soap_embedded(soap, &((ngwt__RecipienStatus*)this)->purged, SOAP_TYPE_string); + soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->purged); + soap_embedded(soap, &((ngwt__RecipienStatus*)this)->accepted, SOAP_TYPE_PointerTongwt__CommenStatus); + soap_serialize_PointerTongwt__CommenStatus(soap, &((ngwt__RecipienStatus*)this)->accepted); + soap_embedded(soap, &((ngwt__RecipienStatus*)this)->declined, SOAP_TYPE_PointerTongwt__CommenStatus); + soap_serialize_PointerTongwt__CommenStatus(soap, &((ngwt__RecipienStatus*)this)->declined); + soap_embedded(soap, &((ngwt__RecipienStatus*)this)->replied, SOAP_TYPE_string); + soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->replied); + soap_embedded(soap, &((ngwt__RecipienStatus*)this)->forwarded, SOAP_TYPE_string); + soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->forwarded); + soap_embedded(soap, &((ngwt__RecipienStatus*)this)->shared, SOAP_TYPE_string); + soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->shared); + soap_embedded(soap, &((ngwt__RecipienStatus*)this)->started, SOAP_TYPE_string); + soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->started); + soap_embedded(soap, &((ngwt__RecipienStatus*)this)->completed, SOAP_TYPE_string); + soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->completed); + soap_embedded(soap, &((ngwt__RecipienStatus*)this)->incomplete, SOAP_TYPE_string); + soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->incomplete); + soap_embedded(soap, &((ngwt__RecipienStatus*)this)->delegated, SOAP_TYPE_PointerTongwt__DelegatedStatus); + soap_serialize_PointerTongwt__DelegatedStatus(soap, &((ngwt__RecipienStatus*)this)->delegated); + soap_serialize_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, &((ngwt__RecipienStatus*)this)->delegateeStatus); + /* transient soap skipped */ +} + +void ngwt__TransferFailedStatus::soap_default(struct soap *soap) { this->soap = soap; - ((ngwt__TransferFailedtqStatus*)this)->FailureReason = NULL; - soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->delivered); - soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->undeliverable); - soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->transferred); - soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->transferDelayed); - ((ngwt__RecipientqStatus*)this)->transferFailed = NULL; - soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->downloaded); - soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->downloadedByThirdParty); - soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->retractRequested); - soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->retracted); - soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->opened); - soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->deleted); - soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->undeleted); - soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->purged); - ((ngwt__RecipientqStatus*)this)->accepted = NULL; - ((ngwt__RecipientqStatus*)this)->declined = NULL; - soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->replied); - soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->forwarded); - soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->shared); - soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->started); - soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->completed); - soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->incomplete); - ((ngwt__RecipientqStatus*)this)->delegated = NULL; - soap_default_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(soap, &((ngwt__RecipientqStatus*)this)->delegateetqStatus); - /* transient soap skipped */ -} - -int ngwt__TransferFailedtqStatus::soap_put(struct soap *soap, const char *tag, const char *type) const -{ - register int id = soap_embed(soap, (void*)this, NULL, 0, tag, SOAP_TYPE_ngwt__TransferFailedtqStatus); + ((ngwt__TransferFailedStatus*)this)->FailureReason = NULL; + soap_default_string(soap, &((ngwt__RecipienStatus*)this)->delivered); + soap_default_string(soap, &((ngwt__RecipienStatus*)this)->undeliverable); + soap_default_string(soap, &((ngwt__RecipienStatus*)this)->transferred); + soap_default_string(soap, &((ngwt__RecipienStatus*)this)->transferDelayed); + ((ngwt__RecipienStatus*)this)->transferFailed = NULL; + soap_default_string(soap, &((ngwt__RecipienStatus*)this)->downloaded); + soap_default_string(soap, &((ngwt__RecipienStatus*)this)->downloadedByThirdParty); + soap_default_string(soap, &((ngwt__RecipienStatus*)this)->retractRequested); + soap_default_string(soap, &((ngwt__RecipienStatus*)this)->retracted); + soap_default_string(soap, &((ngwt__RecipienStatus*)this)->opened); + soap_default_string(soap, &((ngwt__RecipienStatus*)this)->deleted); + soap_default_string(soap, &((ngwt__RecipienStatus*)this)->undeleted); + soap_default_string(soap, &((ngwt__RecipienStatus*)this)->purged); + ((ngwt__RecipienStatus*)this)->accepted = NULL; + ((ngwt__RecipienStatus*)this)->declined = NULL; + soap_default_string(soap, &((ngwt__RecipienStatus*)this)->replied); + soap_default_string(soap, &((ngwt__RecipienStatus*)this)->forwarded); + soap_default_string(soap, &((ngwt__RecipienStatus*)this)->shared); + soap_default_string(soap, &((ngwt__RecipienStatus*)this)->started); + soap_default_string(soap, &((ngwt__RecipienStatus*)this)->completed); + soap_default_string(soap, &((ngwt__RecipienStatus*)this)->incomplete); + ((ngwt__RecipienStatus*)this)->delegated = NULL; + soap_default_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, &((ngwt__RecipienStatus*)this)->delegateeStatus); + /* transient soap skipped */ +} + +int ngwt__TransferFailedStatus::soap_put(struct soap *soap, const char *tag, const char *type) const +{ + register int id = soap_embed(soap, (void*)this, NULL, 0, tag, SOAP_TYPE_ngwt__TransferFailedStatus); if (this->soap_out(soap, tag, id, type)) return soap->error; return soap_putindependent(soap); } -int ngwt__TransferFailedtqStatus::soap_out(struct soap *soap, const char *tag, int id, const char *type) const +int ngwt__TransferFailedStatus::soap_out(struct soap *soap, const char *tag, int id, const char *type) const { - return soap_out_ngwt__TransferFailedtqStatus(soap, tag, id, this, type); + return soap_out_ngwt__TransferFailedStatus(soap, tag, id, this, type); } -SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__TransferFailedtqStatus(struct soap *soap, const char *tag, int id, const ngwt__TransferFailedtqStatus *a, const char *type) +SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__TransferFailedStatus(struct soap *soap, const char *tag, int id, const ngwt__TransferFailedStatus *a, const char *type) { - if (((ngwt__TransferFailedtqStatus *)a)->FailureReason) - soap_set_attr(soap, "FailureReason", ((ngwt__TransferFailedtqStatus *)a)->FailureReason->c_str()); - soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ngwt__TransferFailedtqStatus), "ngwt:TransferFailedStatus"); - soap_out_string(soap, "ngwt:delivered", -1, &(((ngwt__RecipientqStatus*)a)->delivered), ""); - soap_out_string(soap, "ngwt:undeliverable", -1, &(((ngwt__RecipientqStatus*)a)->undeliverable), ""); - soap_out_string(soap, "ngwt:transferred", -1, &(((ngwt__RecipientqStatus*)a)->transferred), ""); - soap_out_string(soap, "ngwt:transferDelayed", -1, &(((ngwt__RecipientqStatus*)a)->transferDelayed), ""); - soap_out_PointerTongwt__TransferFailedtqStatus(soap, "ngwt:transferFailed", -1, &(((ngwt__RecipientqStatus*)a)->transferFailed), ""); - soap_out_string(soap, "ngwt:downloaded", -1, &(((ngwt__RecipientqStatus*)a)->downloaded), ""); - soap_out_string(soap, "ngwt:downloadedByThirdParty", -1, &(((ngwt__RecipientqStatus*)a)->downloadedByThirdParty), ""); - soap_out_string(soap, "ngwt:retractRequested", -1, &(((ngwt__RecipientqStatus*)a)->retractRequested), ""); - soap_out_string(soap, "ngwt:retracted", -1, &(((ngwt__RecipientqStatus*)a)->retracted), ""); - soap_out_string(soap, "ngwt:opened", -1, &(((ngwt__RecipientqStatus*)a)->opened), ""); - soap_out_string(soap, "ngwt:deleted", -1, &(((ngwt__RecipientqStatus*)a)->deleted), ""); - soap_out_string(soap, "ngwt:undeleted", -1, &(((ngwt__RecipientqStatus*)a)->undeleted), ""); - soap_out_string(soap, "ngwt:purged", -1, &(((ngwt__RecipientqStatus*)a)->purged), ""); - soap_out_PointerTongwt__CommentqStatus(soap, "ngwt:accepted", -1, &(((ngwt__RecipientqStatus*)a)->accepted), ""); - soap_out_PointerTongwt__CommentqStatus(soap, "ngwt:declined", -1, &(((ngwt__RecipientqStatus*)a)->declined), ""); - soap_out_string(soap, "ngwt:replied", -1, &(((ngwt__RecipientqStatus*)a)->replied), ""); - soap_out_string(soap, "ngwt:forwarded", -1, &(((ngwt__RecipientqStatus*)a)->forwarded), ""); - soap_out_string(soap, "ngwt:shared", -1, &(((ngwt__RecipientqStatus*)a)->shared), ""); - soap_out_string(soap, "ngwt:started", -1, &(((ngwt__RecipientqStatus*)a)->started), ""); - soap_out_string(soap, "ngwt:completed", -1, &(((ngwt__RecipientqStatus*)a)->completed), ""); - soap_out_string(soap, "ngwt:incomplete", -1, &(((ngwt__RecipientqStatus*)a)->incomplete), ""); - soap_out_PointerTongwt__DelegatedtqStatus(soap, "ngwt:delegated", -1, &(((ngwt__RecipientqStatus*)a)->delegated), ""); - soap_out_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(soap, "ngwt:delegateeStatus", -1, &(((ngwt__RecipientqStatus*)a)->delegateetqStatus), ""); + if (((ngwt__TransferFailedStatus *)a)->FailureReason) + soap_set_attr(soap, "FailureReason", ((ngwt__TransferFailedStatus *)a)->FailureReason->c_str()); + soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ngwt__TransferFailedStatus), "ngwt:TransferFailedStatus"); + soap_out_string(soap, "ngwt:delivered", -1, &(((ngwt__RecipienStatus*)a)->delivered), ""); + soap_out_string(soap, "ngwt:undeliverable", -1, &(((ngwt__RecipienStatus*)a)->undeliverable), ""); + soap_out_string(soap, "ngwt:transferred", -1, &(((ngwt__RecipienStatus*)a)->transferred), ""); + soap_out_string(soap, "ngwt:transferDelayed", -1, &(((ngwt__RecipienStatus*)a)->transferDelayed), ""); + soap_out_PointerTongwt__TransferFailedStatus(soap, "ngwt:transferFailed", -1, &(((ngwt__RecipienStatus*)a)->transferFailed), ""); + soap_out_string(soap, "ngwt:downloaded", -1, &(((ngwt__RecipienStatus*)a)->downloaded), ""); + soap_out_string(soap, "ngwt:downloadedByThirdParty", -1, &(((ngwt__RecipienStatus*)a)->downloadedByThirdParty), ""); + soap_out_string(soap, "ngwt:retractRequested", -1, &(((ngwt__RecipienStatus*)a)->retractRequested), ""); + soap_out_string(soap, "ngwt:retracted", -1, &(((ngwt__RecipienStatus*)a)->retracted), ""); + soap_out_string(soap, "ngwt:opened", -1, &(((ngwt__RecipienStatus*)a)->opened), ""); + soap_out_string(soap, "ngwt:deleted", -1, &(((ngwt__RecipienStatus*)a)->deleted), ""); + soap_out_string(soap, "ngwt:undeleted", -1, &(((ngwt__RecipienStatus*)a)->undeleted), ""); + soap_out_string(soap, "ngwt:purged", -1, &(((ngwt__RecipienStatus*)a)->purged), ""); + soap_out_PointerTongwt__CommenStatus(soap, "ngwt:accepted", -1, &(((ngwt__RecipienStatus*)a)->accepted), ""); + soap_out_PointerTongwt__CommenStatus(soap, "ngwt:declined", -1, &(((ngwt__RecipienStatus*)a)->declined), ""); + soap_out_string(soap, "ngwt:replied", -1, &(((ngwt__RecipienStatus*)a)->replied), ""); + soap_out_string(soap, "ngwt:forwarded", -1, &(((ngwt__RecipienStatus*)a)->forwarded), ""); + soap_out_string(soap, "ngwt:shared", -1, &(((ngwt__RecipienStatus*)a)->shared), ""); + soap_out_string(soap, "ngwt:started", -1, &(((ngwt__RecipienStatus*)a)->started), ""); + soap_out_string(soap, "ngwt:completed", -1, &(((ngwt__RecipienStatus*)a)->completed), ""); + soap_out_string(soap, "ngwt:incomplete", -1, &(((ngwt__RecipienStatus*)a)->incomplete), ""); + soap_out_PointerTongwt__DelegatedStatus(soap, "ngwt:delegated", -1, &(((ngwt__RecipienStatus*)a)->delegated), ""); + soap_out_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, "ngwt:delegateeStatus", -1, &(((ngwt__RecipienStatus*)a)->delegateeStatus), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; } -void *ngwt__TransferFailedtqStatus::soap_get(struct soap *soap, const char *tag, const char *type) +void *ngwt__TransferFailedStatus::soap_get(struct soap *soap, const char *tag, const char *type) { - return soap_get_ngwt__TransferFailedtqStatus(soap, this, tag, type); + return soap_get_ngwt__TransferFailedStatus(soap, this, tag, type); } -SOAP_FMAC3 ngwt__TransferFailedtqStatus * SOAP_FMAC4 soap_get_ngwt__TransferFailedtqStatus(struct soap *soap, ngwt__TransferFailedtqStatus *p, const char *tag, const char *type) +SOAP_FMAC3 ngwt__TransferFailedStatus * SOAP_FMAC4 soap_get_ngwt__TransferFailedStatus(struct soap *soap, ngwt__TransferFailedStatus *p, const char *tag, const char *type) { - if ((p = soap_in_ngwt__TransferFailedtqStatus(soap, tag, p, type))) + if ((p = soap_in_ngwt__TransferFailedStatus(soap, tag, p, type))) soap_getindependent(soap); return p; } -void *ngwt__TransferFailedtqStatus::soap_in(struct soap *soap, const char *tag, const char *type) -{ return soap_in_ngwt__TransferFailedtqStatus(soap, tag, this, type); +void *ngwt__TransferFailedStatus::soap_in(struct soap *soap, const char *tag, const char *type) +{ return soap_in_ngwt__TransferFailedStatus(soap, tag, this, type); } -SOAP_FMAC3 ngwt__TransferFailedtqStatus * SOAP_FMAC4 soap_in_ngwt__TransferFailedtqStatus(struct soap *soap, const char *tag, ngwt__TransferFailedtqStatus *a, const char *type) +SOAP_FMAC3 ngwt__TransferFailedStatus * SOAP_FMAC4 soap_in_ngwt__TransferFailedStatus(struct soap *soap, const char *tag, ngwt__TransferFailedStatus *a, const char *type) { if (soap_element_begin_in(soap, tag, 0)) return NULL; - a = (ngwt__TransferFailedtqStatus *)soap_class_id_enter(soap, soap->id, a, SOAP_TYPE_ngwt__TransferFailedtqStatus, sizeof(ngwt__TransferFailedtqStatus), soap->type, soap->arrayType); + a = (ngwt__TransferFailedStatus *)soap_class_id_enter(soap, soap->id, a, SOAP_TYPE_ngwt__TransferFailedStatus, sizeof(ngwt__TransferFailedStatus), soap->type, soap->arrayType); if (!a) return NULL; if (soap->alloced) { a->soap_default(soap); - if (soap->clist->type != SOAP_TYPE_ngwt__TransferFailedtqStatus) + if (soap->clist->type != SOAP_TYPE_ngwt__TransferFailedStatus) { soap_revert(soap); *soap->id = '\0'; - return (ngwt__TransferFailedtqStatus *)a->soap_in(soap, tag, type); + return (ngwt__TransferFailedStatus *)a->soap_in(soap, tag, type); } } { const char *t = soap_attr_value(soap, "FailureReason", 0); if (t) - { if (!(((ngwt__TransferFailedtqStatus *)a)->FailureReason = (std::string *)soap_malloc(soap, sizeof(std::string)))) + { if (!(((ngwt__TransferFailedStatus *)a)->FailureReason = (std::string *)soap_malloc(soap, sizeof(std::string)))) { soap->error = SOAP_EOM; return NULL; } @@ -41570,8 +41570,8 @@ SOAP_FMAC3 ngwt__TransferFailedtqStatus * SOAP_FMAC4 soap_in_ngwt__TransferFaile if (soap_s2string(soap, t, &s)) return NULL; if (s) - { ((ngwt__TransferFailedtqStatus *)a)->FailureReason = soap_new_std__string(soap, -1); - ((ngwt__TransferFailedtqStatus *)a)->FailureReason->assign(s); + { ((ngwt__TransferFailedStatus *)a)->FailureReason = soap_new_std__string(soap, -1); + ((ngwt__TransferFailedStatus *)a)->FailureReason->assign(s); } } } @@ -41581,117 +41581,117 @@ SOAP_FMAC3 ngwt__TransferFailedtqStatus * SOAP_FMAC4 soap_in_ngwt__TransferFaile for (;;) { soap->error = SOAP_TAG_MISMATCH; if (soap_flag_delivered2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) - if (soap_in_string(soap, "ngwt:delivered", &(((ngwt__RecipientqStatus*)a)->delivered), "")) + if (soap_in_string(soap, "ngwt:delivered", &(((ngwt__RecipienStatus*)a)->delivered), "")) { soap_flag_delivered2 = 0; continue; } if (soap_flag_undeliverable2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) - if (soap_in_string(soap, "ngwt:undeliverable", &(((ngwt__RecipientqStatus*)a)->undeliverable), "")) + if (soap_in_string(soap, "ngwt:undeliverable", &(((ngwt__RecipienStatus*)a)->undeliverable), "")) { soap_flag_undeliverable2 = 0; continue; } if (soap_flag_transferred2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) - if (soap_in_string(soap, "ngwt:transferred", &(((ngwt__RecipientqStatus*)a)->transferred), "")) + if (soap_in_string(soap, "ngwt:transferred", &(((ngwt__RecipienStatus*)a)->transferred), "")) { soap_flag_transferred2 = 0; continue; } if (soap_flag_transferDelayed2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) - if (soap_in_string(soap, "ngwt:transferDelayed", &(((ngwt__RecipientqStatus*)a)->transferDelayed), "")) + if (soap_in_string(soap, "ngwt:transferDelayed", &(((ngwt__RecipienStatus*)a)->transferDelayed), "")) { soap_flag_transferDelayed2 = 0; continue; } if (soap_flag_transferFailed2 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__TransferFailedtqStatus(soap, "ngwt:transferFailed", &(((ngwt__RecipientqStatus*)a)->transferFailed), "ngwt:TransferFailedStatus")) + if (soap_in_PointerTongwt__TransferFailedStatus(soap, "ngwt:transferFailed", &(((ngwt__RecipienStatus*)a)->transferFailed), "ngwt:TransferFailedStatus")) { soap_flag_transferFailed2 = 0; continue; } if (soap_flag_downloaded2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) - if (soap_in_string(soap, "ngwt:downloaded", &(((ngwt__RecipientqStatus*)a)->downloaded), "")) + if (soap_in_string(soap, "ngwt:downloaded", &(((ngwt__RecipienStatus*)a)->downloaded), "")) { soap_flag_downloaded2 = 0; continue; } if (soap_flag_downloadedByThirdParty2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) - if (soap_in_string(soap, "ngwt:downloadedByThirdParty", &(((ngwt__RecipientqStatus*)a)->downloadedByThirdParty), "")) + if (soap_in_string(soap, "ngwt:downloadedByThirdParty", &(((ngwt__RecipienStatus*)a)->downloadedByThirdParty), "")) { soap_flag_downloadedByThirdParty2 = 0; continue; } if (soap_flag_retractRequested2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) - if (soap_in_string(soap, "ngwt:retractRequested", &(((ngwt__RecipientqStatus*)a)->retractRequested), "")) + if (soap_in_string(soap, "ngwt:retractRequested", &(((ngwt__RecipienStatus*)a)->retractRequested), "")) { soap_flag_retractRequested2 = 0; continue; } if (soap_flag_retracted2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) - if (soap_in_string(soap, "ngwt:retracted", &(((ngwt__RecipientqStatus*)a)->retracted), "")) + if (soap_in_string(soap, "ngwt:retracted", &(((ngwt__RecipienStatus*)a)->retracted), "")) { soap_flag_retracted2 = 0; continue; } if (soap_flag_opened2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) - if (soap_in_string(soap, "ngwt:opened", &(((ngwt__RecipientqStatus*)a)->opened), "")) + if (soap_in_string(soap, "ngwt:opened", &(((ngwt__RecipienStatus*)a)->opened), "")) { soap_flag_opened2 = 0; continue; } if (soap_flag_deleted2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) - if (soap_in_string(soap, "ngwt:deleted", &(((ngwt__RecipientqStatus*)a)->deleted), "")) + if (soap_in_string(soap, "ngwt:deleted", &(((ngwt__RecipienStatus*)a)->deleted), "")) { soap_flag_deleted2 = 0; continue; } if (soap_flag_undeleted2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) - if (soap_in_string(soap, "ngwt:undeleted", &(((ngwt__RecipientqStatus*)a)->undeleted), "")) + if (soap_in_string(soap, "ngwt:undeleted", &(((ngwt__RecipienStatus*)a)->undeleted), "")) { soap_flag_undeleted2 = 0; continue; } if (soap_flag_purged2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) - if (soap_in_string(soap, "ngwt:purged", &(((ngwt__RecipientqStatus*)a)->purged), "")) + if (soap_in_string(soap, "ngwt:purged", &(((ngwt__RecipienStatus*)a)->purged), "")) { soap_flag_purged2 = 0; continue; } if (soap_flag_accepted2 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__CommentqStatus(soap, "ngwt:accepted", &(((ngwt__RecipientqStatus*)a)->accepted), "ngwt:CommenStatus")) + if (soap_in_PointerTongwt__CommenStatus(soap, "ngwt:accepted", &(((ngwt__RecipienStatus*)a)->accepted), "ngwt:CommenStatus")) { soap_flag_accepted2 = 0; continue; } if (soap_flag_declined2 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__CommentqStatus(soap, "ngwt:declined", &(((ngwt__RecipientqStatus*)a)->declined), "ngwt:CommenStatus")) + if (soap_in_PointerTongwt__CommenStatus(soap, "ngwt:declined", &(((ngwt__RecipienStatus*)a)->declined), "ngwt:CommenStatus")) { soap_flag_declined2 = 0; continue; } if (soap_flag_replied2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) - if (soap_in_string(soap, "ngwt:replied", &(((ngwt__RecipientqStatus*)a)->replied), "")) + if (soap_in_string(soap, "ngwt:replied", &(((ngwt__RecipienStatus*)a)->replied), "")) { soap_flag_replied2 = 0; continue; } if (soap_flag_forwarded2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) - if (soap_in_string(soap, "ngwt:forwarded", &(((ngwt__RecipientqStatus*)a)->forwarded), "")) + if (soap_in_string(soap, "ngwt:forwarded", &(((ngwt__RecipienStatus*)a)->forwarded), "")) { soap_flag_forwarded2 = 0; continue; } if (soap_flag_shared2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) - if (soap_in_string(soap, "ngwt:shared", &(((ngwt__RecipientqStatus*)a)->shared), "")) + if (soap_in_string(soap, "ngwt:shared", &(((ngwt__RecipienStatus*)a)->shared), "")) { soap_flag_shared2 = 0; continue; } if (soap_flag_started2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) - if (soap_in_string(soap, "ngwt:started", &(((ngwt__RecipientqStatus*)a)->started), "")) + if (soap_in_string(soap, "ngwt:started", &(((ngwt__RecipienStatus*)a)->started), "")) { soap_flag_started2 = 0; continue; } if (soap_flag_completed2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) - if (soap_in_string(soap, "ngwt:completed", &(((ngwt__RecipientqStatus*)a)->completed), "")) + if (soap_in_string(soap, "ngwt:completed", &(((ngwt__RecipienStatus*)a)->completed), "")) { soap_flag_completed2 = 0; continue; } if (soap_flag_incomplete2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) - if (soap_in_string(soap, "ngwt:incomplete", &(((ngwt__RecipientqStatus*)a)->incomplete), "")) + if (soap_in_string(soap, "ngwt:incomplete", &(((ngwt__RecipienStatus*)a)->incomplete), "")) { soap_flag_incomplete2 = 0; continue; } if (soap_flag_delegated2 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__DelegatedtqStatus(soap, "ngwt:delegated", &(((ngwt__RecipientqStatus*)a)->delegated), "ngwt:DelegatedStatus")) + if (soap_in_PointerTongwt__DelegatedStatus(soap, "ngwt:delegated", &(((ngwt__RecipienStatus*)a)->delegated), "ngwt:DelegatedStatus")) { soap_flag_delegated2 = 0; continue; } if (soap->error == SOAP_TAG_MISMATCH) - if (soap_in_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(soap, "ngwt:delegateeStatus", &(((ngwt__RecipientqStatus*)a)->delegateetqStatus), "ngwt:DelegateeStatus")) + if (soap_in_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, "ngwt:delegateeStatus", &(((ngwt__RecipienStatus*)a)->delegateeStatus), "ngwt:DelegateeStatus")) continue; /* transient soap skipped */ if (soap->error == SOAP_TAG_MISMATCH) @@ -41705,48 +41705,48 @@ SOAP_FMAC3 ngwt__TransferFailedtqStatus * SOAP_FMAC4 soap_in_ngwt__TransferFaile return NULL; } else - { a = (ngwt__TransferFailedtqStatus *)soap_id_forward(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__TransferFailedtqStatus, 0, sizeof(ngwt__TransferFailedtqStatus), 0, soap_copy_ngwt__TransferFailedtqStatus); + { a = (ngwt__TransferFailedStatus *)soap_id_forward(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__TransferFailedStatus, 0, sizeof(ngwt__TransferFailedStatus), 0, soap_copy_ngwt__TransferFailedStatus); if (soap->body && soap_element_end_in(soap, tag)) return NULL; } return a; } -SOAP_FMAC5 ngwt__TransferFailedtqStatus * SOAP_FMAC6 soap_new_ngwt__TransferFailedtqStatus(struct soap *soap, int n) -{ return soap_instantiate_ngwt__TransferFailedtqStatus(soap, n, NULL, NULL, NULL); +SOAP_FMAC5 ngwt__TransferFailedStatus * SOAP_FMAC6 soap_new_ngwt__TransferFailedStatus(struct soap *soap, int n) +{ return soap_instantiate_ngwt__TransferFailedStatus(soap, n, NULL, NULL, NULL); } -SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__TransferFailedtqStatus(struct soap *soap, ngwt__TransferFailedtqStatus *p) +SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__TransferFailedStatus(struct soap *soap, ngwt__TransferFailedStatus *p) { soap_delete(soap, p); } -SOAP_FMAC5 ngwt__TransferFailedtqStatus * SOAP_FMAC6 soap_instantiate_ngwt__TransferFailedtqStatus(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size) +SOAP_FMAC5 ngwt__TransferFailedStatus * SOAP_FMAC6 soap_instantiate_ngwt__TransferFailedStatus(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size) { - DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_ngwt__TransferFailedtqStatus(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:"")); - struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_ngwt__TransferFailedtqStatus, n, soap_fdelete); + DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_ngwt__TransferFailedStatus(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:"")); + struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_ngwt__TransferFailedStatus, n, soap_fdelete); if (!cp) return NULL; if (n < 0) - { cp->ptr = (void*)new ngwt__TransferFailedtqStatus; + { cp->ptr = (void*)new ngwt__TransferFailedStatus; if (size) - *size = sizeof(ngwt__TransferFailedtqStatus); - ((ngwt__TransferFailedtqStatus*)cp->ptr)->soap = soap; + *size = sizeof(ngwt__TransferFailedStatus); + ((ngwt__TransferFailedStatus*)cp->ptr)->soap = soap; } else - { cp->ptr = (void*)new ngwt__TransferFailedtqStatus[n]; + { cp->ptr = (void*)new ngwt__TransferFailedStatus[n]; if (size) - *size = n * sizeof(ngwt__TransferFailedtqStatus); + *size = n * sizeof(ngwt__TransferFailedStatus); for (int i = 0; i < n; i++) - ((ngwt__TransferFailedtqStatus*)cp->ptr)[i].soap = soap; + ((ngwt__TransferFailedStatus*)cp->ptr)[i].soap = soap; } DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr)); - return (ngwt__TransferFailedtqStatus*)cp->ptr; + return (ngwt__TransferFailedStatus*)cp->ptr; } -SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__TransferFailedtqStatus(struct soap *soap, int st, int tt, void *p, const void *q, size_t n) +SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__TransferFailedStatus(struct soap *soap, int st, int tt, void *p, const void *q, size_t n) { - DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying ngwt__TransferFailedtqStatus %p -> %p\n", q, p)); - *(ngwt__TransferFailedtqStatus*)p = *(ngwt__TransferFailedtqStatus*)q; + DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying ngwt__TransferFailedStatus %p -> %p\n", q, p)); + *(ngwt__TransferFailedStatus*)p = *(ngwt__TransferFailedStatus*)q; } void ngwt__TimezoneList::soap_serialize(struct soap *soap) const @@ -42278,8 +42278,8 @@ void ngwt__Task::soap_serialize(struct soap *soap) const soap_serialize_PointerTobool(soap, &((ngwt__Mail*)this)->nntpOrImap); soap_embedded(soap, &((ngwt__Mail*)this)->smimeType, SOAP_TYPE_PointerTongwt__SMimeOperation); soap_serialize_PointerTongwt__SMimeOperation(soap, &((ngwt__Mail*)this)->smimeType); - soap_embedded(soap, &((ngwt__BoxEntry*)this)->status, SOAP_TYPE_PointerTongwt__ItemtqStatus); - soap_serialize_PointerTongwt__ItemtqStatus(soap, &((ngwt__BoxEntry*)this)->status); + soap_embedded(soap, &((ngwt__BoxEntry*)this)->status, SOAP_TYPE_PointerTongwt__ItemStatus); + soap_serialize_PointerTongwt__ItemStatus(soap, &((ngwt__BoxEntry*)this)->status); soap_embedded(soap, &((ngwt__BoxEntry*)this)->thread, SOAP_TYPE_PointerTostd__string); soap_serialize_PointerTostd__string(soap, &((ngwt__BoxEntry*)this)->thread); soap_embedded(soap, &((ngwt__BoxEntry*)this)->msgId, SOAP_TYPE_PointerTostd__string); @@ -42392,7 +42392,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__Task(struct soap *soap, const char *tag soap_out_PointerTongwt__CategoryRefList(soap, "ngwt:categories", -1, &(((ngwt__ContainerItem*)a)->categories), ""); soap_out_string(soap, "ngwt:created", -1, &(((ngwt__ContainerItem*)a)->created), ""); soap_out_PointerTongwt__CustomList(soap, "ngwt:customs", -1, &(((ngwt__ContainerItem*)a)->customs), ""); - soap_out_PointerTongwt__ItemtqStatus(soap, "ngwt:status", -1, &(((ngwt__BoxEntry*)a)->status), ""); + soap_out_PointerTongwt__ItemStatus(soap, "ngwt:status", -1, &(((ngwt__BoxEntry*)a)->status), ""); soap_out_PointerTostd__string(soap, "ngwt:thread", -1, &(((ngwt__BoxEntry*)a)->thread), ""); soap_out_PointerTostd__string(soap, "ngwt:msgId", -1, &(((ngwt__BoxEntry*)a)->msgId), ""); soap_out_PointerTostd__string(soap, "ngwt:messageId", -1, &(((ngwt__BoxEntry*)a)->messageId), ""); @@ -42510,7 +42510,7 @@ SOAP_FMAC3 ngwt__Task * SOAP_FMAC4 soap_in_ngwt__Task(struct soap *soap, const c continue; } if (soap_flag_status4 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__ItemtqStatus(soap, "ngwt:status", &(((ngwt__BoxEntry*)a)->status), "ngwt:ItemStatus")) + if (soap_in_PointerTongwt__ItemStatus(soap, "ngwt:status", &(((ngwt__BoxEntry*)a)->status), "ngwt:ItemStatus")) { soap_flag_status4 = 0; continue; } @@ -43151,83 +43151,83 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__StatusTracking(struct soap *soap, int *(ngwt__StatusTracking*)p = *(ngwt__StatusTracking*)q; } -void ngwt__tqStatus::soap_serialize(struct soap *soap) const +void ngwt__Status::soap_serialize(struct soap *soap) const { (void)soap; /* appease -Wall -Werror */ - soap_embedded(soap, &((ngwt__tqStatus*)this)->code, SOAP_TYPE_int); - soap_embedded(soap, &((ngwt__tqStatus*)this)->description, SOAP_TYPE_PointerTostd__string); - soap_serialize_PointerTostd__string(soap, &((ngwt__tqStatus*)this)->description); - soap_embedded(soap, &((ngwt__tqStatus*)this)->info, SOAP_TYPE_PointerTostd__string); - soap_serialize_PointerTostd__string(soap, &((ngwt__tqStatus*)this)->info); - soap_embedded(soap, &((ngwt__tqStatus*)this)->problems, SOAP_TYPE_PointerTongwt__ProblemList); - soap_serialize_PointerTongwt__ProblemList(soap, &((ngwt__tqStatus*)this)->problems); + soap_embedded(soap, &((ngwt__Status*)this)->code, SOAP_TYPE_int); + soap_embedded(soap, &((ngwt__Status*)this)->description, SOAP_TYPE_PointerTostd__string); + soap_serialize_PointerTostd__string(soap, &((ngwt__Status*)this)->description); + soap_embedded(soap, &((ngwt__Status*)this)->info, SOAP_TYPE_PointerTostd__string); + soap_serialize_PointerTostd__string(soap, &((ngwt__Status*)this)->info); + soap_embedded(soap, &((ngwt__Status*)this)->problems, SOAP_TYPE_PointerTongwt__ProblemList); + soap_serialize_PointerTongwt__ProblemList(soap, &((ngwt__Status*)this)->problems); /* transient soap skipped */ } -void ngwt__tqStatus::soap_default(struct soap *soap) +void ngwt__Status::soap_default(struct soap *soap) { this->soap = soap; - soap_default_int(soap, &((ngwt__tqStatus*)this)->code); - ((ngwt__tqStatus*)this)->description = NULL; - ((ngwt__tqStatus*)this)->info = NULL; - ((ngwt__tqStatus*)this)->problems = NULL; + soap_default_int(soap, &((ngwt__Status*)this)->code); + ((ngwt__Status*)this)->description = NULL; + ((ngwt__Status*)this)->info = NULL; + ((ngwt__Status*)this)->problems = NULL; /* transient soap skipped */ } -int ngwt__tqStatus::soap_put(struct soap *soap, const char *tag, const char *type) const +int ngwt__Status::soap_put(struct soap *soap, const char *tag, const char *type) const { - register int id = soap_embed(soap, (void*)this, NULL, 0, tag, SOAP_TYPE_ngwt__tqStatus); + register int id = soap_embed(soap, (void*)this, NULL, 0, tag, SOAP_TYPE_ngwt__Status); if (this->soap_out(soap, tag, id, type)) return soap->error; return soap_putindependent(soap); } -int ngwt__tqStatus::soap_out(struct soap *soap, const char *tag, int id, const char *type) const +int ngwt__Status::soap_out(struct soap *soap, const char *tag, int id, const char *type) const { - return soap_out_ngwt__tqStatus(soap, tag, id, this, type); + return soap_out_ngwt__Status(soap, tag, id, this, type); } -SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__tqStatus(struct soap *soap, const char *tag, int id, const ngwt__tqStatus *a, const char *type) +SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__Status(struct soap *soap, const char *tag, int id, const ngwt__Status *a, const char *type) { - soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ngwt__tqStatus), type); - soap_out_int(soap, "ngwt:code", -1, &(((ngwt__tqStatus*)a)->code), ""); - soap_out_PointerTostd__string(soap, "ngwt:description", -1, &(((ngwt__tqStatus*)a)->description), ""); - soap_out_PointerTostd__string(soap, "ngwt:info", -1, &(((ngwt__tqStatus*)a)->info), ""); - soap_out_PointerTongwt__ProblemList(soap, "ngwt:problems", -1, &(((ngwt__tqStatus*)a)->problems), ""); + soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ngwt__Status), type); + soap_out_int(soap, "ngwt:code", -1, &(((ngwt__Status*)a)->code), ""); + soap_out_PointerTostd__string(soap, "ngwt:description", -1, &(((ngwt__Status*)a)->description), ""); + soap_out_PointerTostd__string(soap, "ngwt:info", -1, &(((ngwt__Status*)a)->info), ""); + soap_out_PointerTongwt__ProblemList(soap, "ngwt:problems", -1, &(((ngwt__Status*)a)->problems), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; } -void *ngwt__tqStatus::soap_get(struct soap *soap, const char *tag, const char *type) +void *ngwt__Status::soap_get(struct soap *soap, const char *tag, const char *type) { - return soap_get_ngwt__tqStatus(soap, this, tag, type); + return soap_get_ngwt__Status(soap, this, tag, type); } -SOAP_FMAC3 ngwt__tqStatus * SOAP_FMAC4 soap_get_ngwt__tqStatus(struct soap *soap, ngwt__tqStatus *p, const char *tag, const char *type) +SOAP_FMAC3 ngwt__Status * SOAP_FMAC4 soap_get_ngwt__Status(struct soap *soap, ngwt__Status *p, const char *tag, const char *type) { - if ((p = soap_in_ngwt__tqStatus(soap, tag, p, type))) + if ((p = soap_in_ngwt__Status(soap, tag, p, type))) soap_getindependent(soap); return p; } -void *ngwt__tqStatus::soap_in(struct soap *soap, const char *tag, const char *type) -{ return soap_in_ngwt__tqStatus(soap, tag, this, type); +void *ngwt__Status::soap_in(struct soap *soap, const char *tag, const char *type) +{ return soap_in_ngwt__Status(soap, tag, this, type); } -SOAP_FMAC3 ngwt__tqStatus * SOAP_FMAC4 soap_in_ngwt__tqStatus(struct soap *soap, const char *tag, ngwt__tqStatus *a, const char *type) +SOAP_FMAC3 ngwt__Status * SOAP_FMAC4 soap_in_ngwt__Status(struct soap *soap, const char *tag, ngwt__Status *a, const char *type) { if (soap_element_begin_in(soap, tag, 0)) return NULL; - a = (ngwt__tqStatus *)soap_class_id_enter(soap, soap->id, a, SOAP_TYPE_ngwt__tqStatus, sizeof(ngwt__tqStatus), soap->type, soap->arrayType); + a = (ngwt__Status *)soap_class_id_enter(soap, soap->id, a, SOAP_TYPE_ngwt__Status, sizeof(ngwt__Status), soap->type, soap->arrayType); if (!a) return NULL; if (soap->alloced) { a->soap_default(soap); - if (soap->clist->type != SOAP_TYPE_ngwt__tqStatus) + if (soap->clist->type != SOAP_TYPE_ngwt__Status) { soap_revert(soap); *soap->id = '\0'; - return (ngwt__tqStatus *)a->soap_in(soap, tag, type); + return (ngwt__Status *)a->soap_in(soap, tag, type); } } short soap_flag_code1 = 1, soap_flag_description1 = 1, soap_flag_info1 = 1, soap_flag_problems1 = 1; @@ -43236,22 +43236,22 @@ SOAP_FMAC3 ngwt__tqStatus * SOAP_FMAC4 soap_in_ngwt__tqStatus(struct soap *soap, for (;;) { soap->error = SOAP_TAG_MISMATCH; if (soap_flag_code1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_int(soap, "ngwt:code", &(((ngwt__tqStatus*)a)->code), "")) + if (soap_in_int(soap, "ngwt:code", &(((ngwt__Status*)a)->code), "")) { soap_flag_code1 = 0; continue; } if (soap_flag_description1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) - if (soap_in_PointerTostd__string(soap, "ngwt:description", &(((ngwt__tqStatus*)a)->description), "")) + if (soap_in_PointerTostd__string(soap, "ngwt:description", &(((ngwt__Status*)a)->description), "")) { soap_flag_description1 = 0; continue; } if (soap_flag_info1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) - if (soap_in_PointerTostd__string(soap, "ngwt:info", &(((ngwt__tqStatus*)a)->info), "")) + if (soap_in_PointerTostd__string(soap, "ngwt:info", &(((ngwt__Status*)a)->info), "")) { soap_flag_info1 = 0; continue; } if (soap_flag_problems1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__ProblemList(soap, "ngwt:problems", &(((ngwt__tqStatus*)a)->problems), "ngwt:ProblemList")) + if (soap_in_PointerTongwt__ProblemList(soap, "ngwt:problems", &(((ngwt__Status*)a)->problems), "ngwt:ProblemList")) { soap_flag_problems1 = 0; continue; } @@ -43271,48 +43271,48 @@ SOAP_FMAC3 ngwt__tqStatus * SOAP_FMAC4 soap_in_ngwt__tqStatus(struct soap *soap, return NULL; } else - { a = (ngwt__tqStatus *)soap_id_forward(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__tqStatus, 0, sizeof(ngwt__tqStatus), 0, soap_copy_ngwt__tqStatus); + { a = (ngwt__Status *)soap_id_forward(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__Status, 0, sizeof(ngwt__Status), 0, soap_copy_ngwt__Status); if (soap->body && soap_element_end_in(soap, tag)) return NULL; } return a; } -SOAP_FMAC5 ngwt__tqStatus * SOAP_FMAC6 soap_new_ngwt__tqStatus(struct soap *soap, int n) -{ return soap_instantiate_ngwt__tqStatus(soap, n, NULL, NULL, NULL); +SOAP_FMAC5 ngwt__Status * SOAP_FMAC6 soap_new_ngwt__Status(struct soap *soap, int n) +{ return soap_instantiate_ngwt__Status(soap, n, NULL, NULL, NULL); } -SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__tqStatus(struct soap *soap, ngwt__tqStatus *p) +SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__Status(struct soap *soap, ngwt__Status *p) { soap_delete(soap, p); } -SOAP_FMAC5 ngwt__tqStatus * SOAP_FMAC6 soap_instantiate_ngwt__tqStatus(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size) +SOAP_FMAC5 ngwt__Status * SOAP_FMAC6 soap_instantiate_ngwt__Status(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size) { - DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_ngwt__tqStatus(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:"")); - struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_ngwt__tqStatus, n, soap_fdelete); + DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_ngwt__Status(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:"")); + struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_ngwt__Status, n, soap_fdelete); if (!cp) return NULL; if (n < 0) - { cp->ptr = (void*)new ngwt__tqStatus; + { cp->ptr = (void*)new ngwt__Status; if (size) - *size = sizeof(ngwt__tqStatus); - ((ngwt__tqStatus*)cp->ptr)->soap = soap; + *size = sizeof(ngwt__Status); + ((ngwt__Status*)cp->ptr)->soap = soap; } else - { cp->ptr = (void*)new ngwt__tqStatus[n]; + { cp->ptr = (void*)new ngwt__Status[n]; if (size) - *size = n * sizeof(ngwt__tqStatus); + *size = n * sizeof(ngwt__Status); for (int i = 0; i < n; i++) - ((ngwt__tqStatus*)cp->ptr)[i].soap = soap; + ((ngwt__Status*)cp->ptr)[i].soap = soap; } DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr)); - return (ngwt__tqStatus*)cp->ptr; + return (ngwt__Status*)cp->ptr; } -SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__tqStatus(struct soap *soap, int st, int tt, void *p, const void *q, size_t n) +SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__Status(struct soap *soap, int st, int tt, void *p, const void *q, size_t n) { - DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying ngwt__tqStatus %p -> %p\n", q, p)); - *(ngwt__tqStatus*)p = *(ngwt__tqStatus*)q; + DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying ngwt__Status %p -> %p\n", q, p)); + *(ngwt__Status*)p = *(ngwt__Status*)q; } void ngwt__SMimeOperation::soap_serialize(struct soap *soap) const @@ -43931,8 +43931,8 @@ void ngwt__SharedNotification::soap_serialize(struct soap *soap) const soap_serialize_PointerTobool(soap, &((ngwt__Mail*)this)->nntpOrImap); soap_embedded(soap, &((ngwt__Mail*)this)->smimeType, SOAP_TYPE_PointerTongwt__SMimeOperation); soap_serialize_PointerTongwt__SMimeOperation(soap, &((ngwt__Mail*)this)->smimeType); - soap_embedded(soap, &((ngwt__BoxEntry*)this)->status, SOAP_TYPE_PointerTongwt__ItemtqStatus); - soap_serialize_PointerTongwt__ItemtqStatus(soap, &((ngwt__BoxEntry*)this)->status); + soap_embedded(soap, &((ngwt__BoxEntry*)this)->status, SOAP_TYPE_PointerTongwt__ItemStatus); + soap_serialize_PointerTongwt__ItemStatus(soap, &((ngwt__BoxEntry*)this)->status); soap_embedded(soap, &((ngwt__BoxEntry*)this)->thread, SOAP_TYPE_PointerTostd__string); soap_serialize_PointerTostd__string(soap, &((ngwt__BoxEntry*)this)->thread); soap_embedded(soap, &((ngwt__BoxEntry*)this)->msgId, SOAP_TYPE_PointerTostd__string); @@ -44038,7 +44038,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__SharedNotification(struct soap *soap, c soap_out_PointerTongwt__CategoryRefList(soap, "ngwt:categories", -1, &(((ngwt__ContainerItem*)a)->categories), ""); soap_out_string(soap, "ngwt:created", -1, &(((ngwt__ContainerItem*)a)->created), ""); soap_out_PointerTongwt__CustomList(soap, "ngwt:customs", -1, &(((ngwt__ContainerItem*)a)->customs), ""); - soap_out_PointerTongwt__ItemtqStatus(soap, "ngwt:status", -1, &(((ngwt__BoxEntry*)a)->status), ""); + soap_out_PointerTongwt__ItemStatus(soap, "ngwt:status", -1, &(((ngwt__BoxEntry*)a)->status), ""); soap_out_PointerTostd__string(soap, "ngwt:thread", -1, &(((ngwt__BoxEntry*)a)->thread), ""); soap_out_PointerTostd__string(soap, "ngwt:msgId", -1, &(((ngwt__BoxEntry*)a)->msgId), ""); soap_out_PointerTostd__string(soap, "ngwt:messageId", -1, &(((ngwt__BoxEntry*)a)->messageId), ""); @@ -44149,7 +44149,7 @@ SOAP_FMAC3 ngwt__SharedNotification * SOAP_FMAC4 soap_in_ngwt__SharedNotificatio continue; } if (soap_flag_status3 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__ItemtqStatus(soap, "ngwt:status", &(((ngwt__BoxEntry*)a)->status), "ngwt:ItemStatus")) + if (soap_in_PointerTongwt__ItemStatus(soap, "ngwt:status", &(((ngwt__BoxEntry*)a)->status), "ngwt:ItemStatus")) { soap_flag_status3 = 0; continue; } @@ -47486,159 +47486,159 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__RecurrenceDateType(struct soap *soap, *(ngwt__RecurrenceDateType*)p = *(ngwt__RecurrenceDateType*)q; } -void ngwt__RecipientqStatus::soap_serialize(struct soap *soap) const +void ngwt__RecipienStatus::soap_serialize(struct soap *soap) const { (void)soap; /* appease -Wall -Werror */ - soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->delivered, SOAP_TYPE_string); - soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->delivered); - soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->undeliverable, SOAP_TYPE_string); - soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->undeliverable); - soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->transferred, SOAP_TYPE_string); - soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->transferred); - soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->transferDelayed, SOAP_TYPE_string); - soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->transferDelayed); - soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->transferFailed, SOAP_TYPE_PointerTongwt__TransferFailedtqStatus); - soap_serialize_PointerTongwt__TransferFailedtqStatus(soap, &((ngwt__RecipientqStatus*)this)->transferFailed); - soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->downloaded, SOAP_TYPE_string); - soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->downloaded); - soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->downloadedByThirdParty, SOAP_TYPE_string); - soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->downloadedByThirdParty); - soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->retractRequested, SOAP_TYPE_string); - soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->retractRequested); - soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->retracted, SOAP_TYPE_string); - soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->retracted); - soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->opened, SOAP_TYPE_string); - soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->opened); - soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->deleted, SOAP_TYPE_string); - soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->deleted); - soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->undeleted, SOAP_TYPE_string); - soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->undeleted); - soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->purged, SOAP_TYPE_string); - soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->purged); - soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->accepted, SOAP_TYPE_PointerTongwt__CommentqStatus); - soap_serialize_PointerTongwt__CommentqStatus(soap, &((ngwt__RecipientqStatus*)this)->accepted); - soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->declined, SOAP_TYPE_PointerTongwt__CommentqStatus); - soap_serialize_PointerTongwt__CommentqStatus(soap, &((ngwt__RecipientqStatus*)this)->declined); - soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->replied, SOAP_TYPE_string); - soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->replied); - soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->forwarded, SOAP_TYPE_string); - soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->forwarded); - soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->shared, SOAP_TYPE_string); - soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->shared); - soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->started, SOAP_TYPE_string); - soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->started); - soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->completed, SOAP_TYPE_string); - soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->completed); - soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->incomplete, SOAP_TYPE_string); - soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->incomplete); - soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->delegated, SOAP_TYPE_PointerTongwt__DelegatedtqStatus); - soap_serialize_PointerTongwt__DelegatedtqStatus(soap, &((ngwt__RecipientqStatus*)this)->delegated); - soap_serialize_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(soap, &((ngwt__RecipientqStatus*)this)->delegateetqStatus); - /* transient soap skipped */ -} - -void ngwt__RecipientqStatus::soap_default(struct soap *soap) + soap_embedded(soap, &((ngwt__RecipienStatus*)this)->delivered, SOAP_TYPE_string); + soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->delivered); + soap_embedded(soap, &((ngwt__RecipienStatus*)this)->undeliverable, SOAP_TYPE_string); + soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->undeliverable); + soap_embedded(soap, &((ngwt__RecipienStatus*)this)->transferred, SOAP_TYPE_string); + soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->transferred); + soap_embedded(soap, &((ngwt__RecipienStatus*)this)->transferDelayed, SOAP_TYPE_string); + soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->transferDelayed); + soap_embedded(soap, &((ngwt__RecipienStatus*)this)->transferFailed, SOAP_TYPE_PointerTongwt__TransferFailedStatus); + soap_serialize_PointerTongwt__TransferFailedStatus(soap, &((ngwt__RecipienStatus*)this)->transferFailed); + soap_embedded(soap, &((ngwt__RecipienStatus*)this)->downloaded, SOAP_TYPE_string); + soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->downloaded); + soap_embedded(soap, &((ngwt__RecipienStatus*)this)->downloadedByThirdParty, SOAP_TYPE_string); + soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->downloadedByThirdParty); + soap_embedded(soap, &((ngwt__RecipienStatus*)this)->retractRequested, SOAP_TYPE_string); + soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->retractRequested); + soap_embedded(soap, &((ngwt__RecipienStatus*)this)->retracted, SOAP_TYPE_string); + soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->retracted); + soap_embedded(soap, &((ngwt__RecipienStatus*)this)->opened, SOAP_TYPE_string); + soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->opened); + soap_embedded(soap, &((ngwt__RecipienStatus*)this)->deleted, SOAP_TYPE_string); + soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->deleted); + soap_embedded(soap, &((ngwt__RecipienStatus*)this)->undeleted, SOAP_TYPE_string); + soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->undeleted); + soap_embedded(soap, &((ngwt__RecipienStatus*)this)->purged, SOAP_TYPE_string); + soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->purged); + soap_embedded(soap, &((ngwt__RecipienStatus*)this)->accepted, SOAP_TYPE_PointerTongwt__CommenStatus); + soap_serialize_PointerTongwt__CommenStatus(soap, &((ngwt__RecipienStatus*)this)->accepted); + soap_embedded(soap, &((ngwt__RecipienStatus*)this)->declined, SOAP_TYPE_PointerTongwt__CommenStatus); + soap_serialize_PointerTongwt__CommenStatus(soap, &((ngwt__RecipienStatus*)this)->declined); + soap_embedded(soap, &((ngwt__RecipienStatus*)this)->replied, SOAP_TYPE_string); + soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->replied); + soap_embedded(soap, &((ngwt__RecipienStatus*)this)->forwarded, SOAP_TYPE_string); + soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->forwarded); + soap_embedded(soap, &((ngwt__RecipienStatus*)this)->shared, SOAP_TYPE_string); + soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->shared); + soap_embedded(soap, &((ngwt__RecipienStatus*)this)->started, SOAP_TYPE_string); + soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->started); + soap_embedded(soap, &((ngwt__RecipienStatus*)this)->completed, SOAP_TYPE_string); + soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->completed); + soap_embedded(soap, &((ngwt__RecipienStatus*)this)->incomplete, SOAP_TYPE_string); + soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->incomplete); + soap_embedded(soap, &((ngwt__RecipienStatus*)this)->delegated, SOAP_TYPE_PointerTongwt__DelegatedStatus); + soap_serialize_PointerTongwt__DelegatedStatus(soap, &((ngwt__RecipienStatus*)this)->delegated); + soap_serialize_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, &((ngwt__RecipienStatus*)this)->delegateeStatus); + /* transient soap skipped */ +} + +void ngwt__RecipienStatus::soap_default(struct soap *soap) { this->soap = soap; - soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->delivered); - soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->undeliverable); - soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->transferred); - soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->transferDelayed); - ((ngwt__RecipientqStatus*)this)->transferFailed = NULL; - soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->downloaded); - soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->downloadedByThirdParty); - soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->retractRequested); - soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->retracted); - soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->opened); - soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->deleted); - soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->undeleted); - soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->purged); - ((ngwt__RecipientqStatus*)this)->accepted = NULL; - ((ngwt__RecipientqStatus*)this)->declined = NULL; - soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->replied); - soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->forwarded); - soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->shared); - soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->started); - soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->completed); - soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->incomplete); - ((ngwt__RecipientqStatus*)this)->delegated = NULL; - soap_default_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(soap, &((ngwt__RecipientqStatus*)this)->delegateetqStatus); - /* transient soap skipped */ -} - -int ngwt__RecipientqStatus::soap_put(struct soap *soap, const char *tag, const char *type) const -{ - register int id = soap_embed(soap, (void*)this, NULL, 0, tag, SOAP_TYPE_ngwt__RecipientqStatus); + soap_default_string(soap, &((ngwt__RecipienStatus*)this)->delivered); + soap_default_string(soap, &((ngwt__RecipienStatus*)this)->undeliverable); + soap_default_string(soap, &((ngwt__RecipienStatus*)this)->transferred); + soap_default_string(soap, &((ngwt__RecipienStatus*)this)->transferDelayed); + ((ngwt__RecipienStatus*)this)->transferFailed = NULL; + soap_default_string(soap, &((ngwt__RecipienStatus*)this)->downloaded); + soap_default_string(soap, &((ngwt__RecipienStatus*)this)->downloadedByThirdParty); + soap_default_string(soap, &((ngwt__RecipienStatus*)this)->retractRequested); + soap_default_string(soap, &((ngwt__RecipienStatus*)this)->retracted); + soap_default_string(soap, &((ngwt__RecipienStatus*)this)->opened); + soap_default_string(soap, &((ngwt__RecipienStatus*)this)->deleted); + soap_default_string(soap, &((ngwt__RecipienStatus*)this)->undeleted); + soap_default_string(soap, &((ngwt__RecipienStatus*)this)->purged); + ((ngwt__RecipienStatus*)this)->accepted = NULL; + ((ngwt__RecipienStatus*)this)->declined = NULL; + soap_default_string(soap, &((ngwt__RecipienStatus*)this)->replied); + soap_default_string(soap, &((ngwt__RecipienStatus*)this)->forwarded); + soap_default_string(soap, &((ngwt__RecipienStatus*)this)->shared); + soap_default_string(soap, &((ngwt__RecipienStatus*)this)->started); + soap_default_string(soap, &((ngwt__RecipienStatus*)this)->completed); + soap_default_string(soap, &((ngwt__RecipienStatus*)this)->incomplete); + ((ngwt__RecipienStatus*)this)->delegated = NULL; + soap_default_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, &((ngwt__RecipienStatus*)this)->delegateeStatus); + /* transient soap skipped */ +} + +int ngwt__RecipienStatus::soap_put(struct soap *soap, const char *tag, const char *type) const +{ + register int id = soap_embed(soap, (void*)this, NULL, 0, tag, SOAP_TYPE_ngwt__RecipienStatus); if (this->soap_out(soap, tag, id, type)) return soap->error; return soap_putindependent(soap); } -int ngwt__RecipientqStatus::soap_out(struct soap *soap, const char *tag, int id, const char *type) const +int ngwt__RecipienStatus::soap_out(struct soap *soap, const char *tag, int id, const char *type) const { - return soap_out_ngwt__RecipientqStatus(soap, tag, id, this, type); + return soap_out_ngwt__RecipienStatus(soap, tag, id, this, type); } -SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__RecipientqStatus(struct soap *soap, const char *tag, int id, const ngwt__RecipientqStatus *a, const char *type) +SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__RecipienStatus(struct soap *soap, const char *tag, int id, const ngwt__RecipienStatus *a, const char *type) { - soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ngwt__RecipientqStatus), type); - soap_out_string(soap, "ngwt:delivered", -1, &(((ngwt__RecipientqStatus*)a)->delivered), ""); - soap_out_string(soap, "ngwt:undeliverable", -1, &(((ngwt__RecipientqStatus*)a)->undeliverable), ""); - soap_out_string(soap, "ngwt:transferred", -1, &(((ngwt__RecipientqStatus*)a)->transferred), ""); - soap_out_string(soap, "ngwt:transferDelayed", -1, &(((ngwt__RecipientqStatus*)a)->transferDelayed), ""); - soap_out_PointerTongwt__TransferFailedtqStatus(soap, "ngwt:transferFailed", -1, &(((ngwt__RecipientqStatus*)a)->transferFailed), ""); - soap_out_string(soap, "ngwt:downloaded", -1, &(((ngwt__RecipientqStatus*)a)->downloaded), ""); - soap_out_string(soap, "ngwt:downloadedByThirdParty", -1, &(((ngwt__RecipientqStatus*)a)->downloadedByThirdParty), ""); - soap_out_string(soap, "ngwt:retractRequested", -1, &(((ngwt__RecipientqStatus*)a)->retractRequested), ""); - soap_out_string(soap, "ngwt:retracted", -1, &(((ngwt__RecipientqStatus*)a)->retracted), ""); - soap_out_string(soap, "ngwt:opened", -1, &(((ngwt__RecipientqStatus*)a)->opened), ""); - soap_out_string(soap, "ngwt:deleted", -1, &(((ngwt__RecipientqStatus*)a)->deleted), ""); - soap_out_string(soap, "ngwt:undeleted", -1, &(((ngwt__RecipientqStatus*)a)->undeleted), ""); - soap_out_string(soap, "ngwt:purged", -1, &(((ngwt__RecipientqStatus*)a)->purged), ""); - soap_out_PointerTongwt__CommentqStatus(soap, "ngwt:accepted", -1, &(((ngwt__RecipientqStatus*)a)->accepted), ""); - soap_out_PointerTongwt__CommentqStatus(soap, "ngwt:declined", -1, &(((ngwt__RecipientqStatus*)a)->declined), ""); - soap_out_string(soap, "ngwt:replied", -1, &(((ngwt__RecipientqStatus*)a)->replied), ""); - soap_out_string(soap, "ngwt:forwarded", -1, &(((ngwt__RecipientqStatus*)a)->forwarded), ""); - soap_out_string(soap, "ngwt:shared", -1, &(((ngwt__RecipientqStatus*)a)->shared), ""); - soap_out_string(soap, "ngwt:started", -1, &(((ngwt__RecipientqStatus*)a)->started), ""); - soap_out_string(soap, "ngwt:completed", -1, &(((ngwt__RecipientqStatus*)a)->completed), ""); - soap_out_string(soap, "ngwt:incomplete", -1, &(((ngwt__RecipientqStatus*)a)->incomplete), ""); - soap_out_PointerTongwt__DelegatedtqStatus(soap, "ngwt:delegated", -1, &(((ngwt__RecipientqStatus*)a)->delegated), ""); - soap_out_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(soap, "ngwt:delegateeStatus", -1, &(((ngwt__RecipientqStatus*)a)->delegateetqStatus), ""); + soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ngwt__RecipienStatus), type); + soap_out_string(soap, "ngwt:delivered", -1, &(((ngwt__RecipienStatus*)a)->delivered), ""); + soap_out_string(soap, "ngwt:undeliverable", -1, &(((ngwt__RecipienStatus*)a)->undeliverable), ""); + soap_out_string(soap, "ngwt:transferred", -1, &(((ngwt__RecipienStatus*)a)->transferred), ""); + soap_out_string(soap, "ngwt:transferDelayed", -1, &(((ngwt__RecipienStatus*)a)->transferDelayed), ""); + soap_out_PointerTongwt__TransferFailedStatus(soap, "ngwt:transferFailed", -1, &(((ngwt__RecipienStatus*)a)->transferFailed), ""); + soap_out_string(soap, "ngwt:downloaded", -1, &(((ngwt__RecipienStatus*)a)->downloaded), ""); + soap_out_string(soap, "ngwt:downloadedByThirdParty", -1, &(((ngwt__RecipienStatus*)a)->downloadedByThirdParty), ""); + soap_out_string(soap, "ngwt:retractRequested", -1, &(((ngwt__RecipienStatus*)a)->retractRequested), ""); + soap_out_string(soap, "ngwt:retracted", -1, &(((ngwt__RecipienStatus*)a)->retracted), ""); + soap_out_string(soap, "ngwt:opened", -1, &(((ngwt__RecipienStatus*)a)->opened), ""); + soap_out_string(soap, "ngwt:deleted", -1, &(((ngwt__RecipienStatus*)a)->deleted), ""); + soap_out_string(soap, "ngwt:undeleted", -1, &(((ngwt__RecipienStatus*)a)->undeleted), ""); + soap_out_string(soap, "ngwt:purged", -1, &(((ngwt__RecipienStatus*)a)->purged), ""); + soap_out_PointerTongwt__CommenStatus(soap, "ngwt:accepted", -1, &(((ngwt__RecipienStatus*)a)->accepted), ""); + soap_out_PointerTongwt__CommenStatus(soap, "ngwt:declined", -1, &(((ngwt__RecipienStatus*)a)->declined), ""); + soap_out_string(soap, "ngwt:replied", -1, &(((ngwt__RecipienStatus*)a)->replied), ""); + soap_out_string(soap, "ngwt:forwarded", -1, &(((ngwt__RecipienStatus*)a)->forwarded), ""); + soap_out_string(soap, "ngwt:shared", -1, &(((ngwt__RecipienStatus*)a)->shared), ""); + soap_out_string(soap, "ngwt:started", -1, &(((ngwt__RecipienStatus*)a)->started), ""); + soap_out_string(soap, "ngwt:completed", -1, &(((ngwt__RecipienStatus*)a)->completed), ""); + soap_out_string(soap, "ngwt:incomplete", -1, &(((ngwt__RecipienStatus*)a)->incomplete), ""); + soap_out_PointerTongwt__DelegatedStatus(soap, "ngwt:delegated", -1, &(((ngwt__RecipienStatus*)a)->delegated), ""); + soap_out_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, "ngwt:delegateeStatus", -1, &(((ngwt__RecipienStatus*)a)->delegateeStatus), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; } -void *ngwt__RecipientqStatus::soap_get(struct soap *soap, const char *tag, const char *type) +void *ngwt__RecipienStatus::soap_get(struct soap *soap, const char *tag, const char *type) { - return soap_get_ngwt__RecipientqStatus(soap, this, tag, type); + return soap_get_ngwt__RecipienStatus(soap, this, tag, type); } -SOAP_FMAC3 ngwt__RecipientqStatus * SOAP_FMAC4 soap_get_ngwt__RecipientqStatus(struct soap *soap, ngwt__RecipientqStatus *p, const char *tag, const char *type) +SOAP_FMAC3 ngwt__RecipienStatus * SOAP_FMAC4 soap_get_ngwt__RecipienStatus(struct soap *soap, ngwt__RecipienStatus *p, const char *tag, const char *type) { - if ((p = soap_in_ngwt__RecipientqStatus(soap, tag, p, type))) + if ((p = soap_in_ngwt__RecipienStatus(soap, tag, p, type))) soap_getindependent(soap); return p; } -void *ngwt__RecipientqStatus::soap_in(struct soap *soap, const char *tag, const char *type) -{ return soap_in_ngwt__RecipientqStatus(soap, tag, this, type); +void *ngwt__RecipienStatus::soap_in(struct soap *soap, const char *tag, const char *type) +{ return soap_in_ngwt__RecipienStatus(soap, tag, this, type); } -SOAP_FMAC3 ngwt__RecipientqStatus * SOAP_FMAC4 soap_in_ngwt__RecipientqStatus(struct soap *soap, const char *tag, ngwt__RecipientqStatus *a, const char *type) +SOAP_FMAC3 ngwt__RecipienStatus * SOAP_FMAC4 soap_in_ngwt__RecipienStatus(struct soap *soap, const char *tag, ngwt__RecipienStatus *a, const char *type) { if (soap_element_begin_in(soap, tag, 0)) return NULL; - a = (ngwt__RecipientqStatus *)soap_class_id_enter(soap, soap->id, a, SOAP_TYPE_ngwt__RecipientqStatus, sizeof(ngwt__RecipientqStatus), soap->type, soap->arrayType); + a = (ngwt__RecipienStatus *)soap_class_id_enter(soap, soap->id, a, SOAP_TYPE_ngwt__RecipienStatus, sizeof(ngwt__RecipienStatus), soap->type, soap->arrayType); if (!a) return NULL; if (soap->alloced) { a->soap_default(soap); - if (soap->clist->type != SOAP_TYPE_ngwt__RecipientqStatus) + if (soap->clist->type != SOAP_TYPE_ngwt__RecipienStatus) { soap_revert(soap); *soap->id = '\0'; - return (ngwt__RecipientqStatus *)a->soap_in(soap, tag, type); + return (ngwt__RecipienStatus *)a->soap_in(soap, tag, type); } } short soap_flag_delivered1 = 1, soap_flag_undeliverable1 = 1, soap_flag_transferred1 = 1, soap_flag_transferDelayed1 = 1, soap_flag_transferFailed1 = 1, soap_flag_downloaded1 = 1, soap_flag_downloadedByThirdParty1 = 1, soap_flag_retractRequested1 = 1, soap_flag_retracted1 = 1, soap_flag_opened1 = 1, soap_flag_deleted1 = 1, soap_flag_undeleted1 = 1, soap_flag_purged1 = 1, soap_flag_accepted1 = 1, soap_flag_declined1 = 1, soap_flag_replied1 = 1, soap_flag_forwarded1 = 1, soap_flag_shared1 = 1, soap_flag_started1 = 1, soap_flag_completed1 = 1, soap_flag_incomplete1 = 1, soap_flag_delegated1 = 1; @@ -47647,117 +47647,117 @@ SOAP_FMAC3 ngwt__RecipientqStatus * SOAP_FMAC4 soap_in_ngwt__RecipientqStatus(st for (;;) { soap->error = SOAP_TAG_MISMATCH; if (soap_flag_delivered1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) - if (soap_in_string(soap, "ngwt:delivered", &(((ngwt__RecipientqStatus*)a)->delivered), "")) + if (soap_in_string(soap, "ngwt:delivered", &(((ngwt__RecipienStatus*)a)->delivered), "")) { soap_flag_delivered1 = 0; continue; } if (soap_flag_undeliverable1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) - if (soap_in_string(soap, "ngwt:undeliverable", &(((ngwt__RecipientqStatus*)a)->undeliverable), "")) + if (soap_in_string(soap, "ngwt:undeliverable", &(((ngwt__RecipienStatus*)a)->undeliverable), "")) { soap_flag_undeliverable1 = 0; continue; } if (soap_flag_transferred1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) - if (soap_in_string(soap, "ngwt:transferred", &(((ngwt__RecipientqStatus*)a)->transferred), "")) + if (soap_in_string(soap, "ngwt:transferred", &(((ngwt__RecipienStatus*)a)->transferred), "")) { soap_flag_transferred1 = 0; continue; } if (soap_flag_transferDelayed1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) - if (soap_in_string(soap, "ngwt:transferDelayed", &(((ngwt__RecipientqStatus*)a)->transferDelayed), "")) + if (soap_in_string(soap, "ngwt:transferDelayed", &(((ngwt__RecipienStatus*)a)->transferDelayed), "")) { soap_flag_transferDelayed1 = 0; continue; } if (soap_flag_transferFailed1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__TransferFailedtqStatus(soap, "ngwt:transferFailed", &(((ngwt__RecipientqStatus*)a)->transferFailed), "ngwt:TransferFailedStatus")) + if (soap_in_PointerTongwt__TransferFailedStatus(soap, "ngwt:transferFailed", &(((ngwt__RecipienStatus*)a)->transferFailed), "ngwt:TransferFailedStatus")) { soap_flag_transferFailed1 = 0; continue; } if (soap_flag_downloaded1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) - if (soap_in_string(soap, "ngwt:downloaded", &(((ngwt__RecipientqStatus*)a)->downloaded), "")) + if (soap_in_string(soap, "ngwt:downloaded", &(((ngwt__RecipienStatus*)a)->downloaded), "")) { soap_flag_downloaded1 = 0; continue; } if (soap_flag_downloadedByThirdParty1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) - if (soap_in_string(soap, "ngwt:downloadedByThirdParty", &(((ngwt__RecipientqStatus*)a)->downloadedByThirdParty), "")) + if (soap_in_string(soap, "ngwt:downloadedByThirdParty", &(((ngwt__RecipienStatus*)a)->downloadedByThirdParty), "")) { soap_flag_downloadedByThirdParty1 = 0; continue; } if (soap_flag_retractRequested1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) - if (soap_in_string(soap, "ngwt:retractRequested", &(((ngwt__RecipientqStatus*)a)->retractRequested), "")) + if (soap_in_string(soap, "ngwt:retractRequested", &(((ngwt__RecipienStatus*)a)->retractRequested), "")) { soap_flag_retractRequested1 = 0; continue; } if (soap_flag_retracted1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) - if (soap_in_string(soap, "ngwt:retracted", &(((ngwt__RecipientqStatus*)a)->retracted), "")) + if (soap_in_string(soap, "ngwt:retracted", &(((ngwt__RecipienStatus*)a)->retracted), "")) { soap_flag_retracted1 = 0; continue; } if (soap_flag_opened1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) - if (soap_in_string(soap, "ngwt:opened", &(((ngwt__RecipientqStatus*)a)->opened), "")) + if (soap_in_string(soap, "ngwt:opened", &(((ngwt__RecipienStatus*)a)->opened), "")) { soap_flag_opened1 = 0; continue; } if (soap_flag_deleted1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) - if (soap_in_string(soap, "ngwt:deleted", &(((ngwt__RecipientqStatus*)a)->deleted), "")) + if (soap_in_string(soap, "ngwt:deleted", &(((ngwt__RecipienStatus*)a)->deleted), "")) { soap_flag_deleted1 = 0; continue; } if (soap_flag_undeleted1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) - if (soap_in_string(soap, "ngwt:undeleted", &(((ngwt__RecipientqStatus*)a)->undeleted), "")) + if (soap_in_string(soap, "ngwt:undeleted", &(((ngwt__RecipienStatus*)a)->undeleted), "")) { soap_flag_undeleted1 = 0; continue; } if (soap_flag_purged1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) - if (soap_in_string(soap, "ngwt:purged", &(((ngwt__RecipientqStatus*)a)->purged), "")) + if (soap_in_string(soap, "ngwt:purged", &(((ngwt__RecipienStatus*)a)->purged), "")) { soap_flag_purged1 = 0; continue; } if (soap_flag_accepted1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__CommentqStatus(soap, "ngwt:accepted", &(((ngwt__RecipientqStatus*)a)->accepted), "ngwt:CommenStatus")) + if (soap_in_PointerTongwt__CommenStatus(soap, "ngwt:accepted", &(((ngwt__RecipienStatus*)a)->accepted), "ngwt:CommenStatus")) { soap_flag_accepted1 = 0; continue; } if (soap_flag_declined1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__CommentqStatus(soap, "ngwt:declined", &(((ngwt__RecipientqStatus*)a)->declined), "ngwt:CommenStatus")) + if (soap_in_PointerTongwt__CommenStatus(soap, "ngwt:declined", &(((ngwt__RecipienStatus*)a)->declined), "ngwt:CommenStatus")) { soap_flag_declined1 = 0; continue; } if (soap_flag_replied1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) - if (soap_in_string(soap, "ngwt:replied", &(((ngwt__RecipientqStatus*)a)->replied), "")) + if (soap_in_string(soap, "ngwt:replied", &(((ngwt__RecipienStatus*)a)->replied), "")) { soap_flag_replied1 = 0; continue; } if (soap_flag_forwarded1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) - if (soap_in_string(soap, "ngwt:forwarded", &(((ngwt__RecipientqStatus*)a)->forwarded), "")) + if (soap_in_string(soap, "ngwt:forwarded", &(((ngwt__RecipienStatus*)a)->forwarded), "")) { soap_flag_forwarded1 = 0; continue; } if (soap_flag_shared1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) - if (soap_in_string(soap, "ngwt:shared", &(((ngwt__RecipientqStatus*)a)->shared), "")) + if (soap_in_string(soap, "ngwt:shared", &(((ngwt__RecipienStatus*)a)->shared), "")) { soap_flag_shared1 = 0; continue; } if (soap_flag_started1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) - if (soap_in_string(soap, "ngwt:started", &(((ngwt__RecipientqStatus*)a)->started), "")) + if (soap_in_string(soap, "ngwt:started", &(((ngwt__RecipienStatus*)a)->started), "")) { soap_flag_started1 = 0; continue; } if (soap_flag_completed1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) - if (soap_in_string(soap, "ngwt:completed", &(((ngwt__RecipientqStatus*)a)->completed), "")) + if (soap_in_string(soap, "ngwt:completed", &(((ngwt__RecipienStatus*)a)->completed), "")) { soap_flag_completed1 = 0; continue; } if (soap_flag_incomplete1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) - if (soap_in_string(soap, "ngwt:incomplete", &(((ngwt__RecipientqStatus*)a)->incomplete), "")) + if (soap_in_string(soap, "ngwt:incomplete", &(((ngwt__RecipienStatus*)a)->incomplete), "")) { soap_flag_incomplete1 = 0; continue; } if (soap_flag_delegated1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__DelegatedtqStatus(soap, "ngwt:delegated", &(((ngwt__RecipientqStatus*)a)->delegated), "ngwt:DelegatedStatus")) + if (soap_in_PointerTongwt__DelegatedStatus(soap, "ngwt:delegated", &(((ngwt__RecipienStatus*)a)->delegated), "ngwt:DelegatedStatus")) { soap_flag_delegated1 = 0; continue; } if (soap->error == SOAP_TAG_MISMATCH) - if (soap_in_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(soap, "ngwt:delegateeStatus", &(((ngwt__RecipientqStatus*)a)->delegateetqStatus), "ngwt:DelegateeStatus")) + if (soap_in_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, "ngwt:delegateeStatus", &(((ngwt__RecipienStatus*)a)->delegateeStatus), "ngwt:DelegateeStatus")) continue; /* transient soap skipped */ if (soap->error == SOAP_TAG_MISMATCH) @@ -47771,84 +47771,84 @@ SOAP_FMAC3 ngwt__RecipientqStatus * SOAP_FMAC4 soap_in_ngwt__RecipientqStatus(st return NULL; } else - { a = (ngwt__RecipientqStatus *)soap_id_forward(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__RecipientqStatus, 0, sizeof(ngwt__RecipientqStatus), 0, soap_copy_ngwt__RecipientqStatus); + { a = (ngwt__RecipienStatus *)soap_id_forward(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__RecipienStatus, 0, sizeof(ngwt__RecipienStatus), 0, soap_copy_ngwt__RecipienStatus); if (soap->body && soap_element_end_in(soap, tag)) return NULL; } return a; } -SOAP_FMAC5 ngwt__RecipientqStatus * SOAP_FMAC6 soap_new_ngwt__RecipientqStatus(struct soap *soap, int n) -{ return soap_instantiate_ngwt__RecipientqStatus(soap, n, NULL, NULL, NULL); +SOAP_FMAC5 ngwt__RecipienStatus * SOAP_FMAC6 soap_new_ngwt__RecipienStatus(struct soap *soap, int n) +{ return soap_instantiate_ngwt__RecipienStatus(soap, n, NULL, NULL, NULL); } -SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__RecipientqStatus(struct soap *soap, ngwt__RecipientqStatus *p) +SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__RecipienStatus(struct soap *soap, ngwt__RecipienStatus *p) { soap_delete(soap, p); } -SOAP_FMAC5 ngwt__RecipientqStatus * SOAP_FMAC6 soap_instantiate_ngwt__RecipientqStatus(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size) +SOAP_FMAC5 ngwt__RecipienStatus * SOAP_FMAC6 soap_instantiate_ngwt__RecipienStatus(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size) { - DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_ngwt__RecipientqStatus(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:"")); - struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_ngwt__RecipientqStatus, n, soap_fdelete); + DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_ngwt__RecipienStatus(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:"")); + struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_ngwt__RecipienStatus, n, soap_fdelete); if (!cp) return NULL; if (type && !soap_match_tag(soap, type, "ngwt:DelegateeStatus")) - { cp->type = SOAP_TYPE_ngwt__DelegateetqStatus; + { cp->type = SOAP_TYPE_ngwt__DelegateeStatus; if (n < 0) - { cp->ptr = (void*)new ngwt__DelegateetqStatus; + { cp->ptr = (void*)new ngwt__DelegateeStatus; if (size) - *size = sizeof(ngwt__DelegateetqStatus); - ((ngwt__DelegateetqStatus*)cp->ptr)->soap = soap; + *size = sizeof(ngwt__DelegateeStatus); + ((ngwt__DelegateeStatus*)cp->ptr)->soap = soap; } else - { cp->ptr = (void*)new ngwt__DelegateetqStatus[n]; + { cp->ptr = (void*)new ngwt__DelegateeStatus[n]; if (size) - *size = n * sizeof(ngwt__DelegateetqStatus); + *size = n * sizeof(ngwt__DelegateeStatus); for (int i = 0; i < n; i++) - ((ngwt__DelegateetqStatus*)cp->ptr)[i].soap = soap; + ((ngwt__DelegateeStatus*)cp->ptr)[i].soap = soap; } DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr)); - return (ngwt__DelegateetqStatus*)cp->ptr; + return (ngwt__DelegateeStatus*)cp->ptr; } if (type && !soap_match_tag(soap, type, "ngwt:TransferFailedStatus")) - { cp->type = SOAP_TYPE_ngwt__TransferFailedtqStatus; + { cp->type = SOAP_TYPE_ngwt__TransferFailedStatus; if (n < 0) - { cp->ptr = (void*)new ngwt__TransferFailedtqStatus; + { cp->ptr = (void*)new ngwt__TransferFailedStatus; if (size) - *size = sizeof(ngwt__TransferFailedtqStatus); - ((ngwt__TransferFailedtqStatus*)cp->ptr)->soap = soap; + *size = sizeof(ngwt__TransferFailedStatus); + ((ngwt__TransferFailedStatus*)cp->ptr)->soap = soap; } else - { cp->ptr = (void*)new ngwt__TransferFailedtqStatus[n]; + { cp->ptr = (void*)new ngwt__TransferFailedStatus[n]; if (size) - *size = n * sizeof(ngwt__TransferFailedtqStatus); + *size = n * sizeof(ngwt__TransferFailedStatus); for (int i = 0; i < n; i++) - ((ngwt__TransferFailedtqStatus*)cp->ptr)[i].soap = soap; + ((ngwt__TransferFailedStatus*)cp->ptr)[i].soap = soap; } DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr)); - return (ngwt__TransferFailedtqStatus*)cp->ptr; + return (ngwt__TransferFailedStatus*)cp->ptr; } if (n < 0) - { cp->ptr = (void*)new ngwt__RecipientqStatus; + { cp->ptr = (void*)new ngwt__RecipienStatus; if (size) - *size = sizeof(ngwt__RecipientqStatus); - ((ngwt__RecipientqStatus*)cp->ptr)->soap = soap; + *size = sizeof(ngwt__RecipienStatus); + ((ngwt__RecipienStatus*)cp->ptr)->soap = soap; } else - { cp->ptr = (void*)new ngwt__RecipientqStatus[n]; + { cp->ptr = (void*)new ngwt__RecipienStatus[n]; if (size) - *size = n * sizeof(ngwt__RecipientqStatus); + *size = n * sizeof(ngwt__RecipienStatus); for (int i = 0; i < n; i++) - ((ngwt__RecipientqStatus*)cp->ptr)[i].soap = soap; + ((ngwt__RecipienStatus*)cp->ptr)[i].soap = soap; } DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr)); - return (ngwt__RecipientqStatus*)cp->ptr; + return (ngwt__RecipienStatus*)cp->ptr; } -SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__RecipientqStatus(struct soap *soap, int st, int tt, void *p, const void *q, size_t n) +SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__RecipienStatus(struct soap *soap, int st, int tt, void *p, const void *q, size_t n) { - DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying ngwt__RecipientqStatus %p -> %p\n", q, p)); - *(ngwt__RecipientqStatus*)p = *(ngwt__RecipientqStatus*)q; + DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying ngwt__RecipienStatus %p -> %p\n", q, p)); + *(ngwt__RecipienStatus*)p = *(ngwt__RecipienStatus*)q; } void ngwt__RecipientList::soap_serialize(struct soap *soap) const @@ -47986,8 +47986,8 @@ void ngwt__Recipient::soap_serialize(struct soap *soap) const (void)soap; /* appease -Wall -Werror */ soap_embedded(soap, &((ngwt__Recipient*)this)->distType, SOAP_TYPE_ngwt__DistributionType); soap_embedded(soap, &((ngwt__Recipient*)this)->recipType, SOAP_TYPE_ngwt__RecipientType); - soap_embedded(soap, &((ngwt__Recipient*)this)->recipientqStatus, SOAP_TYPE_PointerTongwt__RecipientqStatus); - soap_serialize_PointerTongwt__RecipientqStatus(soap, &((ngwt__Recipient*)this)->recipientqStatus); + soap_embedded(soap, &((ngwt__Recipient*)this)->recipienStatus, SOAP_TYPE_PointerTongwt__RecipienStatus); + soap_serialize_PointerTongwt__RecipienStatus(soap, &((ngwt__Recipient*)this)->recipienStatus); soap_embedded(soap, &((ngwt__Recipient*)this)->acceptLevel, SOAP_TYPE_PointerTongwt__AcceptLevel); soap_serialize_PointerTongwt__AcceptLevel(soap, &((ngwt__Recipient*)this)->acceptLevel); soap_embedded(soap, &((ngwt__NameAndEmail*)this)->displayName, SOAP_TYPE_PointerTostd__string); @@ -48004,7 +48004,7 @@ void ngwt__Recipient::soap_default(struct soap *soap) this->soap = soap; ((ngwt__Recipient*)this)->distType = (enum ngwt__DistributionType)0; ((ngwt__Recipient*)this)->recipType = (enum ngwt__RecipientType)0; - ((ngwt__Recipient*)this)->recipientqStatus = NULL; + ((ngwt__Recipient*)this)->recipienStatus = NULL; ((ngwt__Recipient*)this)->acceptLevel = NULL; ((ngwt__NameAndEmail*)this)->displayName = NULL; ((ngwt__NameAndEmail*)this)->email = NULL; @@ -48034,7 +48034,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__Recipient(struct soap *soap, const char /* transient soap skipped */ soap_out_ngwt__DistributionType(soap, "ngwt:distType", -1, &(((ngwt__Recipient*)a)->distType), ""); soap_out_ngwt__RecipientType(soap, "ngwt:recipType", -1, &(((ngwt__Recipient*)a)->recipType), ""); - soap_out_PointerTongwt__RecipientqStatus(soap, "ngwt:recipienStatus", -1, &(((ngwt__Recipient*)a)->recipientqStatus), ""); + soap_out_PointerTongwt__RecipienStatus(soap, "ngwt:recipienStatus", -1, &(((ngwt__Recipient*)a)->recipienStatus), ""); soap_out_PointerTongwt__AcceptLevel(soap, "ngwt:acceptLevel", -1, &(((ngwt__Recipient*)a)->acceptLevel), ""); soap_element_end_out(soap, tag); return SOAP_OK; @@ -48071,7 +48071,7 @@ SOAP_FMAC3 ngwt__Recipient * SOAP_FMAC4 soap_in_ngwt__Recipient(struct soap *soa return (ngwt__Recipient *)a->soap_in(soap, tag, type); } } - short soap_flag_displayName2 = 1, soap_flag_email2 = 1, soap_flag_uuid2 = 1, soap_flag_distType1 = 1, soap_flag_recipType1 = 1, soap_flag_recipientqStatus1 = 1, soap_flag_acceptLevel1 = 1; + short soap_flag_displayName2 = 1, soap_flag_email2 = 1, soap_flag_uuid2 = 1, soap_flag_distType1 = 1, soap_flag_recipType1 = 1, soap_flag_recipienStatus1 = 1, soap_flag_acceptLevel1 = 1; if (soap->body && !*soap->href) { for (;;) @@ -48102,9 +48102,9 @@ SOAP_FMAC3 ngwt__Recipient * SOAP_FMAC4 soap_in_ngwt__Recipient(struct soap *soa { soap_flag_recipType1 = 0; continue; } - if (soap_flag_recipientqStatus1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__RecipientqStatus(soap, "ngwt:recipienStatus", &(((ngwt__Recipient*)a)->recipientqStatus), "ngwt:RecipienStatus")) - { soap_flag_recipientqStatus1 = 0; + if (soap_flag_recipienStatus1 && soap->error == SOAP_TAG_MISMATCH) + if (soap_in_PointerTongwt__RecipienStatus(soap, "ngwt:recipienStatus", &(((ngwt__Recipient*)a)->recipienStatus), "ngwt:RecipienStatus")) + { soap_flag_recipienStatus1 = 0; continue; } if (soap_flag_acceptLevel1 && soap->error == SOAP_TAG_MISMATCH) @@ -50061,8 +50061,8 @@ void ngwt__PhoneMessage::soap_serialize(struct soap *soap) const soap_serialize_PointerTobool(soap, &((ngwt__Mail*)this)->nntpOrImap); soap_embedded(soap, &((ngwt__Mail*)this)->smimeType, SOAP_TYPE_PointerTongwt__SMimeOperation); soap_serialize_PointerTongwt__SMimeOperation(soap, &((ngwt__Mail*)this)->smimeType); - soap_embedded(soap, &((ngwt__BoxEntry*)this)->status, SOAP_TYPE_PointerTongwt__ItemtqStatus); - soap_serialize_PointerTongwt__ItemtqStatus(soap, &((ngwt__BoxEntry*)this)->status); + soap_embedded(soap, &((ngwt__BoxEntry*)this)->status, SOAP_TYPE_PointerTongwt__ItemStatus); + soap_serialize_PointerTongwt__ItemStatus(soap, &((ngwt__BoxEntry*)this)->status); soap_embedded(soap, &((ngwt__BoxEntry*)this)->thread, SOAP_TYPE_PointerTostd__string); soap_serialize_PointerTostd__string(soap, &((ngwt__BoxEntry*)this)->thread); soap_embedded(soap, &((ngwt__BoxEntry*)this)->msgId, SOAP_TYPE_PointerTostd__string); @@ -50169,7 +50169,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__PhoneMessage(struct soap *soap, const c soap_out_PointerTongwt__CategoryRefList(soap, "ngwt:categories", -1, &(((ngwt__ContainerItem*)a)->categories), ""); soap_out_string(soap, "ngwt:created", -1, &(((ngwt__ContainerItem*)a)->created), ""); soap_out_PointerTongwt__CustomList(soap, "ngwt:customs", -1, &(((ngwt__ContainerItem*)a)->customs), ""); - soap_out_PointerTongwt__ItemtqStatus(soap, "ngwt:status", -1, &(((ngwt__BoxEntry*)a)->status), ""); + soap_out_PointerTongwt__ItemStatus(soap, "ngwt:status", -1, &(((ngwt__BoxEntry*)a)->status), ""); soap_out_PointerTostd__string(soap, "ngwt:thread", -1, &(((ngwt__BoxEntry*)a)->thread), ""); soap_out_PointerTostd__string(soap, "ngwt:msgId", -1, &(((ngwt__BoxEntry*)a)->msgId), ""); soap_out_PointerTostd__string(soap, "ngwt:messageId", -1, &(((ngwt__BoxEntry*)a)->messageId), ""); @@ -50281,7 +50281,7 @@ SOAP_FMAC3 ngwt__PhoneMessage * SOAP_FMAC4 soap_in_ngwt__PhoneMessage(struct soa continue; } if (soap_flag_status3 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__ItemtqStatus(soap, "ngwt:status", &(((ngwt__BoxEntry*)a)->status), "ngwt:ItemStatus")) + if (soap_in_PointerTongwt__ItemStatus(soap, "ngwt:status", &(((ngwt__BoxEntry*)a)->status), "ngwt:ItemStatus")) { soap_flag_status3 = 0; continue; } @@ -51464,8 +51464,8 @@ void ngwt__Note::soap_serialize(struct soap *soap) const soap_serialize_PointerTobool(soap, &((ngwt__Mail*)this)->nntpOrImap); soap_embedded(soap, &((ngwt__Mail*)this)->smimeType, SOAP_TYPE_PointerTongwt__SMimeOperation); soap_serialize_PointerTongwt__SMimeOperation(soap, &((ngwt__Mail*)this)->smimeType); - soap_embedded(soap, &((ngwt__BoxEntry*)this)->status, SOAP_TYPE_PointerTongwt__ItemtqStatus); - soap_serialize_PointerTongwt__ItemtqStatus(soap, &((ngwt__BoxEntry*)this)->status); + soap_embedded(soap, &((ngwt__BoxEntry*)this)->status, SOAP_TYPE_PointerTongwt__ItemStatus); + soap_serialize_PointerTongwt__ItemStatus(soap, &((ngwt__BoxEntry*)this)->status); soap_embedded(soap, &((ngwt__BoxEntry*)this)->thread, SOAP_TYPE_PointerTostd__string); soap_serialize_PointerTostd__string(soap, &((ngwt__BoxEntry*)this)->thread); soap_embedded(soap, &((ngwt__BoxEntry*)this)->msgId, SOAP_TYPE_PointerTostd__string); @@ -51574,7 +51574,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__Note(struct soap *soap, const char *tag soap_out_PointerTongwt__CategoryRefList(soap, "ngwt:categories", -1, &(((ngwt__ContainerItem*)a)->categories), ""); soap_out_string(soap, "ngwt:created", -1, &(((ngwt__ContainerItem*)a)->created), ""); soap_out_PointerTongwt__CustomList(soap, "ngwt:customs", -1, &(((ngwt__ContainerItem*)a)->customs), ""); - soap_out_PointerTongwt__ItemtqStatus(soap, "ngwt:status", -1, &(((ngwt__BoxEntry*)a)->status), ""); + soap_out_PointerTongwt__ItemStatus(soap, "ngwt:status", -1, &(((ngwt__BoxEntry*)a)->status), ""); soap_out_PointerTostd__string(soap, "ngwt:thread", -1, &(((ngwt__BoxEntry*)a)->thread), ""); soap_out_PointerTostd__string(soap, "ngwt:msgId", -1, &(((ngwt__BoxEntry*)a)->msgId), ""); soap_out_PointerTostd__string(soap, "ngwt:messageId", -1, &(((ngwt__BoxEntry*)a)->messageId), ""); @@ -51688,7 +51688,7 @@ SOAP_FMAC3 ngwt__Note * SOAP_FMAC4 soap_in_ngwt__Note(struct soap *soap, const c continue; } if (soap_flag_status4 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__ItemtqStatus(soap, "ngwt:status", &(((ngwt__BoxEntry*)a)->status), "ngwt:ItemStatus")) + if (soap_in_PointerTongwt__ItemStatus(soap, "ngwt:status", &(((ngwt__BoxEntry*)a)->status), "ngwt:ItemStatus")) { soap_flag_status4 = 0; continue; } @@ -52798,8 +52798,8 @@ void ngwt__Mail::soap_serialize(struct soap *soap) const soap_serialize_PointerTobool(soap, &((ngwt__Mail*)this)->nntpOrImap); soap_embedded(soap, &((ngwt__Mail*)this)->smimeType, SOAP_TYPE_PointerTongwt__SMimeOperation); soap_serialize_PointerTongwt__SMimeOperation(soap, &((ngwt__Mail*)this)->smimeType); - soap_embedded(soap, &((ngwt__BoxEntry*)this)->status, SOAP_TYPE_PointerTongwt__ItemtqStatus); - soap_serialize_PointerTongwt__ItemtqStatus(soap, &((ngwt__BoxEntry*)this)->status); + soap_embedded(soap, &((ngwt__BoxEntry*)this)->status, SOAP_TYPE_PointerTongwt__ItemStatus); + soap_serialize_PointerTongwt__ItemStatus(soap, &((ngwt__BoxEntry*)this)->status); soap_embedded(soap, &((ngwt__BoxEntry*)this)->thread, SOAP_TYPE_PointerTostd__string); soap_serialize_PointerTostd__string(soap, &((ngwt__BoxEntry*)this)->thread); soap_embedded(soap, &((ngwt__BoxEntry*)this)->msgId, SOAP_TYPE_PointerTostd__string); @@ -52902,7 +52902,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__Mail(struct soap *soap, const char *tag soap_out_PointerTongwt__CategoryRefList(soap, "ngwt:categories", -1, &(((ngwt__ContainerItem*)a)->categories), ""); soap_out_string(soap, "ngwt:created", -1, &(((ngwt__ContainerItem*)a)->created), ""); soap_out_PointerTongwt__CustomList(soap, "ngwt:customs", -1, &(((ngwt__ContainerItem*)a)->customs), ""); - soap_out_PointerTongwt__ItemtqStatus(soap, "ngwt:status", -1, &(((ngwt__BoxEntry*)a)->status), ""); + soap_out_PointerTongwt__ItemStatus(soap, "ngwt:status", -1, &(((ngwt__BoxEntry*)a)->status), ""); soap_out_PointerTostd__string(soap, "ngwt:thread", -1, &(((ngwt__BoxEntry*)a)->thread), ""); soap_out_PointerTostd__string(soap, "ngwt:msgId", -1, &(((ngwt__BoxEntry*)a)->msgId), ""); soap_out_PointerTostd__string(soap, "ngwt:messageId", -1, &(((ngwt__BoxEntry*)a)->messageId), ""); @@ -53010,7 +53010,7 @@ SOAP_FMAC3 ngwt__Mail * SOAP_FMAC4 soap_in_ngwt__Mail(struct soap *soap, const c continue; } if (soap_flag_status2 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__ItemtqStatus(soap, "ngwt:status", &(((ngwt__BoxEntry*)a)->status), "ngwt:ItemStatus")) + if (soap_in_PointerTongwt__ItemStatus(soap, "ngwt:status", &(((ngwt__BoxEntry*)a)->status), "ngwt:ItemStatus")) { soap_flag_status2 = 0; continue; } @@ -54112,104 +54112,104 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__JunkEntry(struct soap *soap, int st, *(ngwt__JunkEntry*)p = *(ngwt__JunkEntry*)q; } -void ngwt__ItemtqStatus::soap_serialize(struct soap *soap) const +void ngwt__ItemStatus::soap_serialize(struct soap *soap) const { (void)soap; /* appease -Wall -Werror */ - soap_embedded(soap, &((ngwt__ItemtqStatus*)this)->accepted, SOAP_TYPE_PointerTobool); - soap_serialize_PointerTobool(soap, &((ngwt__ItemtqStatus*)this)->accepted); - soap_embedded(soap, &((ngwt__ItemtqStatus*)this)->completed, SOAP_TYPE_PointerTobool); - soap_serialize_PointerTobool(soap, &((ngwt__ItemtqStatus*)this)->completed); - soap_embedded(soap, &((ngwt__ItemtqStatus*)this)->delegated, SOAP_TYPE_PointerTobool); - soap_serialize_PointerTobool(soap, &((ngwt__ItemtqStatus*)this)->delegated); - soap_embedded(soap, &((ngwt__ItemtqStatus*)this)->deleted, SOAP_TYPE_PointerTobool); - soap_serialize_PointerTobool(soap, &((ngwt__ItemtqStatus*)this)->deleted); - soap_embedded(soap, &((ngwt__ItemtqStatus*)this)->forwarded, SOAP_TYPE_PointerTobool); - soap_serialize_PointerTobool(soap, &((ngwt__ItemtqStatus*)this)->forwarded); - soap_embedded(soap, &((ngwt__ItemtqStatus*)this)->private_, SOAP_TYPE_PointerTobool); - soap_serialize_PointerTobool(soap, &((ngwt__ItemtqStatus*)this)->private_); - soap_embedded(soap, &((ngwt__ItemtqStatus*)this)->opened, SOAP_TYPE_PointerTobool); - soap_serialize_PointerTobool(soap, &((ngwt__ItemtqStatus*)this)->opened); - soap_embedded(soap, &((ngwt__ItemtqStatus*)this)->read, SOAP_TYPE_PointerTobool); - soap_serialize_PointerTobool(soap, &((ngwt__ItemtqStatus*)this)->read); - soap_embedded(soap, &((ngwt__ItemtqStatus*)this)->replied, SOAP_TYPE_PointerTobool); - soap_serialize_PointerTobool(soap, &((ngwt__ItemtqStatus*)this)->replied); - /* transient soap skipped */ -} - -void ngwt__ItemtqStatus::soap_default(struct soap *soap) + soap_embedded(soap, &((ngwt__ItemStatus*)this)->accepted, SOAP_TYPE_PointerTobool); + soap_serialize_PointerTobool(soap, &((ngwt__ItemStatus*)this)->accepted); + soap_embedded(soap, &((ngwt__ItemStatus*)this)->completed, SOAP_TYPE_PointerTobool); + soap_serialize_PointerTobool(soap, &((ngwt__ItemStatus*)this)->completed); + soap_embedded(soap, &((ngwt__ItemStatus*)this)->delegated, SOAP_TYPE_PointerTobool); + soap_serialize_PointerTobool(soap, &((ngwt__ItemStatus*)this)->delegated); + soap_embedded(soap, &((ngwt__ItemStatus*)this)->deleted, SOAP_TYPE_PointerTobool); + soap_serialize_PointerTobool(soap, &((ngwt__ItemStatus*)this)->deleted); + soap_embedded(soap, &((ngwt__ItemStatus*)this)->forwarded, SOAP_TYPE_PointerTobool); + soap_serialize_PointerTobool(soap, &((ngwt__ItemStatus*)this)->forwarded); + soap_embedded(soap, &((ngwt__ItemStatus*)this)->private_, SOAP_TYPE_PointerTobool); + soap_serialize_PointerTobool(soap, &((ngwt__ItemStatus*)this)->private_); + soap_embedded(soap, &((ngwt__ItemStatus*)this)->opened, SOAP_TYPE_PointerTobool); + soap_serialize_PointerTobool(soap, &((ngwt__ItemStatus*)this)->opened); + soap_embedded(soap, &((ngwt__ItemStatus*)this)->read, SOAP_TYPE_PointerTobool); + soap_serialize_PointerTobool(soap, &((ngwt__ItemStatus*)this)->read); + soap_embedded(soap, &((ngwt__ItemStatus*)this)->replied, SOAP_TYPE_PointerTobool); + soap_serialize_PointerTobool(soap, &((ngwt__ItemStatus*)this)->replied); + /* transient soap skipped */ +} + +void ngwt__ItemStatus::soap_default(struct soap *soap) { this->soap = soap; - ((ngwt__ItemtqStatus*)this)->accepted = NULL; - ((ngwt__ItemtqStatus*)this)->completed = NULL; - ((ngwt__ItemtqStatus*)this)->delegated = NULL; - ((ngwt__ItemtqStatus*)this)->deleted = NULL; - ((ngwt__ItemtqStatus*)this)->forwarded = NULL; - ((ngwt__ItemtqStatus*)this)->private_ = NULL; - ((ngwt__ItemtqStatus*)this)->opened = NULL; - ((ngwt__ItemtqStatus*)this)->read = NULL; - ((ngwt__ItemtqStatus*)this)->replied = NULL; + ((ngwt__ItemStatus*)this)->accepted = NULL; + ((ngwt__ItemStatus*)this)->completed = NULL; + ((ngwt__ItemStatus*)this)->delegated = NULL; + ((ngwt__ItemStatus*)this)->deleted = NULL; + ((ngwt__ItemStatus*)this)->forwarded = NULL; + ((ngwt__ItemStatus*)this)->private_ = NULL; + ((ngwt__ItemStatus*)this)->opened = NULL; + ((ngwt__ItemStatus*)this)->read = NULL; + ((ngwt__ItemStatus*)this)->replied = NULL; /* transient soap skipped */ } -int ngwt__ItemtqStatus::soap_put(struct soap *soap, const char *tag, const char *type) const +int ngwt__ItemStatus::soap_put(struct soap *soap, const char *tag, const char *type) const { - register int id = soap_embed(soap, (void*)this, NULL, 0, tag, SOAP_TYPE_ngwt__ItemtqStatus); + register int id = soap_embed(soap, (void*)this, NULL, 0, tag, SOAP_TYPE_ngwt__ItemStatus); if (this->soap_out(soap, tag, id, type)) return soap->error; return soap_putindependent(soap); } -int ngwt__ItemtqStatus::soap_out(struct soap *soap, const char *tag, int id, const char *type) const +int ngwt__ItemStatus::soap_out(struct soap *soap, const char *tag, int id, const char *type) const { - return soap_out_ngwt__ItemtqStatus(soap, tag, id, this, type); + return soap_out_ngwt__ItemStatus(soap, tag, id, this, type); } -SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__ItemtqStatus(struct soap *soap, const char *tag, int id, const ngwt__ItemtqStatus *a, const char *type) +SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__ItemStatus(struct soap *soap, const char *tag, int id, const ngwt__ItemStatus *a, const char *type) { - soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ngwt__ItemtqStatus), type); - soap_out_PointerTobool(soap, "ngwt:accepted", -1, &(((ngwt__ItemtqStatus*)a)->accepted), ""); - soap_out_PointerTobool(soap, "ngwt:completed", -1, &(((ngwt__ItemtqStatus*)a)->completed), ""); - soap_out_PointerTobool(soap, "ngwt:delegated", -1, &(((ngwt__ItemtqStatus*)a)->delegated), ""); - soap_out_PointerTobool(soap, "ngwt:deleted", -1, &(((ngwt__ItemtqStatus*)a)->deleted), ""); - soap_out_PointerTobool(soap, "ngwt:forwarded", -1, &(((ngwt__ItemtqStatus*)a)->forwarded), ""); - soap_out_PointerTobool(soap, "ngwt:private", -1, &(((ngwt__ItemtqStatus*)a)->private_), ""); - soap_out_PointerTobool(soap, "ngwt:opened", -1, &(((ngwt__ItemtqStatus*)a)->opened), ""); - soap_out_PointerTobool(soap, "ngwt:read", -1, &(((ngwt__ItemtqStatus*)a)->read), ""); - soap_out_PointerTobool(soap, "ngwt:replied", -1, &(((ngwt__ItemtqStatus*)a)->replied), ""); + soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ngwt__ItemStatus), type); + soap_out_PointerTobool(soap, "ngwt:accepted", -1, &(((ngwt__ItemStatus*)a)->accepted), ""); + soap_out_PointerTobool(soap, "ngwt:completed", -1, &(((ngwt__ItemStatus*)a)->completed), ""); + soap_out_PointerTobool(soap, "ngwt:delegated", -1, &(((ngwt__ItemStatus*)a)->delegated), ""); + soap_out_PointerTobool(soap, "ngwt:deleted", -1, &(((ngwt__ItemStatus*)a)->deleted), ""); + soap_out_PointerTobool(soap, "ngwt:forwarded", -1, &(((ngwt__ItemStatus*)a)->forwarded), ""); + soap_out_PointerTobool(soap, "ngwt:private", -1, &(((ngwt__ItemStatus*)a)->private_), ""); + soap_out_PointerTobool(soap, "ngwt:opened", -1, &(((ngwt__ItemStatus*)a)->opened), ""); + soap_out_PointerTobool(soap, "ngwt:read", -1, &(((ngwt__ItemStatus*)a)->read), ""); + soap_out_PointerTobool(soap, "ngwt:replied", -1, &(((ngwt__ItemStatus*)a)->replied), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; } -void *ngwt__ItemtqStatus::soap_get(struct soap *soap, const char *tag, const char *type) +void *ngwt__ItemStatus::soap_get(struct soap *soap, const char *tag, const char *type) { - return soap_get_ngwt__ItemtqStatus(soap, this, tag, type); + return soap_get_ngwt__ItemStatus(soap, this, tag, type); } -SOAP_FMAC3 ngwt__ItemtqStatus * SOAP_FMAC4 soap_get_ngwt__ItemtqStatus(struct soap *soap, ngwt__ItemtqStatus *p, const char *tag, const char *type) +SOAP_FMAC3 ngwt__ItemStatus * SOAP_FMAC4 soap_get_ngwt__ItemStatus(struct soap *soap, ngwt__ItemStatus *p, const char *tag, const char *type) { - if ((p = soap_in_ngwt__ItemtqStatus(soap, tag, p, type))) + if ((p = soap_in_ngwt__ItemStatus(soap, tag, p, type))) soap_getindependent(soap); return p; } -void *ngwt__ItemtqStatus::soap_in(struct soap *soap, const char *tag, const char *type) -{ return soap_in_ngwt__ItemtqStatus(soap, tag, this, type); +void *ngwt__ItemStatus::soap_in(struct soap *soap, const char *tag, const char *type) +{ return soap_in_ngwt__ItemStatus(soap, tag, this, type); } -SOAP_FMAC3 ngwt__ItemtqStatus * SOAP_FMAC4 soap_in_ngwt__ItemtqStatus(struct soap *soap, const char *tag, ngwt__ItemtqStatus *a, const char *type) +SOAP_FMAC3 ngwt__ItemStatus * SOAP_FMAC4 soap_in_ngwt__ItemStatus(struct soap *soap, const char *tag, ngwt__ItemStatus *a, const char *type) { if (soap_element_begin_in(soap, tag, 0)) return NULL; - a = (ngwt__ItemtqStatus *)soap_class_id_enter(soap, soap->id, a, SOAP_TYPE_ngwt__ItemtqStatus, sizeof(ngwt__ItemtqStatus), soap->type, soap->arrayType); + a = (ngwt__ItemStatus *)soap_class_id_enter(soap, soap->id, a, SOAP_TYPE_ngwt__ItemStatus, sizeof(ngwt__ItemStatus), soap->type, soap->arrayType); if (!a) return NULL; if (soap->alloced) { a->soap_default(soap); - if (soap->clist->type != SOAP_TYPE_ngwt__ItemtqStatus) + if (soap->clist->type != SOAP_TYPE_ngwt__ItemStatus) { soap_revert(soap); *soap->id = '\0'; - return (ngwt__ItemtqStatus *)a->soap_in(soap, tag, type); + return (ngwt__ItemStatus *)a->soap_in(soap, tag, type); } } short soap_flag_accepted1 = 1, soap_flag_completed1 = 1, soap_flag_delegated1 = 1, soap_flag_deleted1 = 1, soap_flag_forwarded1 = 1, soap_flag_private_1 = 1, soap_flag_opened1 = 1, soap_flag_read1 = 1, soap_flag_replied1 = 1; @@ -54218,47 +54218,47 @@ SOAP_FMAC3 ngwt__ItemtqStatus * SOAP_FMAC4 soap_in_ngwt__ItemtqStatus(struct soa for (;;) { soap->error = SOAP_TAG_MISMATCH; if (soap_flag_accepted1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTobool(soap, "ngwt:accepted", &(((ngwt__ItemtqStatus*)a)->accepted), "")) + if (soap_in_PointerTobool(soap, "ngwt:accepted", &(((ngwt__ItemStatus*)a)->accepted), "")) { soap_flag_accepted1 = 0; continue; } if (soap_flag_completed1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTobool(soap, "ngwt:completed", &(((ngwt__ItemtqStatus*)a)->completed), "")) + if (soap_in_PointerTobool(soap, "ngwt:completed", &(((ngwt__ItemStatus*)a)->completed), "")) { soap_flag_completed1 = 0; continue; } if (soap_flag_delegated1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTobool(soap, "ngwt:delegated", &(((ngwt__ItemtqStatus*)a)->delegated), "")) + if (soap_in_PointerTobool(soap, "ngwt:delegated", &(((ngwt__ItemStatus*)a)->delegated), "")) { soap_flag_delegated1 = 0; continue; } if (soap_flag_deleted1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTobool(soap, "ngwt:deleted", &(((ngwt__ItemtqStatus*)a)->deleted), "")) + if (soap_in_PointerTobool(soap, "ngwt:deleted", &(((ngwt__ItemStatus*)a)->deleted), "")) { soap_flag_deleted1 = 0; continue; } if (soap_flag_forwarded1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTobool(soap, "ngwt:forwarded", &(((ngwt__ItemtqStatus*)a)->forwarded), "")) + if (soap_in_PointerTobool(soap, "ngwt:forwarded", &(((ngwt__ItemStatus*)a)->forwarded), "")) { soap_flag_forwarded1 = 0; continue; } if (soap_flag_private_1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTobool(soap, "ngwt:private", &(((ngwt__ItemtqStatus*)a)->private_), "")) + if (soap_in_PointerTobool(soap, "ngwt:private", &(((ngwt__ItemStatus*)a)->private_), "")) { soap_flag_private_1 = 0; continue; } if (soap_flag_opened1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTobool(soap, "ngwt:opened", &(((ngwt__ItemtqStatus*)a)->opened), "")) + if (soap_in_PointerTobool(soap, "ngwt:opened", &(((ngwt__ItemStatus*)a)->opened), "")) { soap_flag_opened1 = 0; continue; } if (soap_flag_read1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTobool(soap, "ngwt:read", &(((ngwt__ItemtqStatus*)a)->read), "")) + if (soap_in_PointerTobool(soap, "ngwt:read", &(((ngwt__ItemStatus*)a)->read), "")) { soap_flag_read1 = 0; continue; } if (soap_flag_replied1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTobool(soap, "ngwt:replied", &(((ngwt__ItemtqStatus*)a)->replied), "")) + if (soap_in_PointerTobool(soap, "ngwt:replied", &(((ngwt__ItemStatus*)a)->replied), "")) { soap_flag_replied1 = 0; continue; } @@ -54274,48 +54274,48 @@ SOAP_FMAC3 ngwt__ItemtqStatus * SOAP_FMAC4 soap_in_ngwt__ItemtqStatus(struct soa return NULL; } else - { a = (ngwt__ItemtqStatus *)soap_id_forward(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__ItemtqStatus, 0, sizeof(ngwt__ItemtqStatus), 0, soap_copy_ngwt__ItemtqStatus); + { a = (ngwt__ItemStatus *)soap_id_forward(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__ItemStatus, 0, sizeof(ngwt__ItemStatus), 0, soap_copy_ngwt__ItemStatus); if (soap->body && soap_element_end_in(soap, tag)) return NULL; } return a; } -SOAP_FMAC5 ngwt__ItemtqStatus * SOAP_FMAC6 soap_new_ngwt__ItemtqStatus(struct soap *soap, int n) -{ return soap_instantiate_ngwt__ItemtqStatus(soap, n, NULL, NULL, NULL); +SOAP_FMAC5 ngwt__ItemStatus * SOAP_FMAC6 soap_new_ngwt__ItemStatus(struct soap *soap, int n) +{ return soap_instantiate_ngwt__ItemStatus(soap, n, NULL, NULL, NULL); } -SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__ItemtqStatus(struct soap *soap, ngwt__ItemtqStatus *p) +SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__ItemStatus(struct soap *soap, ngwt__ItemStatus *p) { soap_delete(soap, p); } -SOAP_FMAC5 ngwt__ItemtqStatus * SOAP_FMAC6 soap_instantiate_ngwt__ItemtqStatus(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size) +SOAP_FMAC5 ngwt__ItemStatus * SOAP_FMAC6 soap_instantiate_ngwt__ItemStatus(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size) { - DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_ngwt__ItemtqStatus(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:"")); - struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_ngwt__ItemtqStatus, n, soap_fdelete); + DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_ngwt__ItemStatus(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:"")); + struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_ngwt__ItemStatus, n, soap_fdelete); if (!cp) return NULL; if (n < 0) - { cp->ptr = (void*)new ngwt__ItemtqStatus; + { cp->ptr = (void*)new ngwt__ItemStatus; if (size) - *size = sizeof(ngwt__ItemtqStatus); - ((ngwt__ItemtqStatus*)cp->ptr)->soap = soap; + *size = sizeof(ngwt__ItemStatus); + ((ngwt__ItemStatus*)cp->ptr)->soap = soap; } else - { cp->ptr = (void*)new ngwt__ItemtqStatus[n]; + { cp->ptr = (void*)new ngwt__ItemStatus[n]; if (size) - *size = n * sizeof(ngwt__ItemtqStatus); + *size = n * sizeof(ngwt__ItemStatus); for (int i = 0; i < n; i++) - ((ngwt__ItemtqStatus*)cp->ptr)[i].soap = soap; + ((ngwt__ItemStatus*)cp->ptr)[i].soap = soap; } DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr)); - return (ngwt__ItemtqStatus*)cp->ptr; + return (ngwt__ItemStatus*)cp->ptr; } -SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__ItemtqStatus(struct soap *soap, int st, int tt, void *p, const void *q, size_t n) +SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__ItemStatus(struct soap *soap, int st, int tt, void *p, const void *q, size_t n) { - DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying ngwt__ItemtqStatus %p -> %p\n", q, p)); - *(ngwt__ItemtqStatus*)p = *(ngwt__ItemtqStatus*)q; + DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying ngwt__ItemStatus %p -> %p\n", q, p)); + *(ngwt__ItemStatus*)p = *(ngwt__ItemStatus*)q; } void ngwt__Items::soap_serialize(struct soap *soap) const @@ -58192,8 +58192,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__FolderList(struct soap *soap, int st, void ngwt__FolderACLEntry::soap_serialize(struct soap *soap) const { (void)soap; /* appease -Wall -Werror */ - soap_embedded(soap, &((ngwt__FolderACLEntry*)this)->status, SOAP_TYPE_PointerTongwt__FolderACLtqStatus); - soap_serialize_PointerTongwt__FolderACLtqStatus(soap, &((ngwt__FolderACLEntry*)this)->status); + soap_embedded(soap, &((ngwt__FolderACLEntry*)this)->status, SOAP_TYPE_PointerTongwt__FolderACLStatus); + soap_serialize_PointerTongwt__FolderACLStatus(soap, &((ngwt__FolderACLEntry*)this)->status); soap_embedded(soap, &((ngwt__AccessControlListEntry*)this)->rights, SOAP_TYPE_PointerTongwt__Rights); soap_serialize_PointerTongwt__Rights(soap, &((ngwt__AccessControlListEntry*)this)->rights); soap_embedded(soap, &((ngwt__NameAndEmail*)this)->displayName, SOAP_TYPE_PointerTostd__string); @@ -58237,7 +58237,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__FolderACLEntry(struct soap *soap, const soap_out_PointerTongwt__UUID(soap, "ngwt:uuid", -1, &(((ngwt__NameAndEmail*)a)->uuid), ""); /* transient soap skipped */ soap_out_PointerTongwt__Rights(soap, "ngwt:rights", -1, &(((ngwt__AccessControlListEntry*)a)->rights), ""); - soap_out_PointerTongwt__FolderACLtqStatus(soap, "ngwt:status", -1, &(((ngwt__FolderACLEntry*)a)->status), ""); + soap_out_PointerTongwt__FolderACLStatus(soap, "ngwt:status", -1, &(((ngwt__FolderACLEntry*)a)->status), ""); soap_element_end_out(soap, tag); return SOAP_OK; } @@ -58300,7 +58300,7 @@ SOAP_FMAC3 ngwt__FolderACLEntry * SOAP_FMAC4 soap_in_ngwt__FolderACLEntry(struct continue; } if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__FolderACLtqStatus(soap, "ngwt:status", &(((ngwt__FolderACLEntry*)a)->status), "")) + if (soap_in_PointerTongwt__FolderACLStatus(soap, "ngwt:status", &(((ngwt__FolderACLEntry*)a)->status), "")) { soap_flag_status1 = 0; continue; } @@ -59926,8 +59926,8 @@ void ngwt__DocumentRef::soap_serialize(struct soap *soap) const soap_serialize_PointerTobool(soap, &((ngwt__Mail*)this)->nntpOrImap); soap_embedded(soap, &((ngwt__Mail*)this)->smimeType, SOAP_TYPE_PointerTongwt__SMimeOperation); soap_serialize_PointerTongwt__SMimeOperation(soap, &((ngwt__Mail*)this)->smimeType); - soap_embedded(soap, &((ngwt__BoxEntry*)this)->status, SOAP_TYPE_PointerTongwt__ItemtqStatus); - soap_serialize_PointerTongwt__ItemtqStatus(soap, &((ngwt__BoxEntry*)this)->status); + soap_embedded(soap, &((ngwt__BoxEntry*)this)->status, SOAP_TYPE_PointerTongwt__ItemStatus); + soap_serialize_PointerTongwt__ItemStatus(soap, &((ngwt__BoxEntry*)this)->status); soap_embedded(soap, &((ngwt__BoxEntry*)this)->thread, SOAP_TYPE_PointerTostd__string); soap_serialize_PointerTostd__string(soap, &((ngwt__BoxEntry*)this)->thread); soap_embedded(soap, &((ngwt__BoxEntry*)this)->msgId, SOAP_TYPE_PointerTostd__string); @@ -60042,7 +60042,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__DocumentRef(struct soap *soap, const ch soap_out_PointerTongwt__CategoryRefList(soap, "ngwt:categories", -1, &(((ngwt__ContainerItem*)a)->categories), ""); soap_out_string(soap, "ngwt:created", -1, &(((ngwt__ContainerItem*)a)->created), ""); soap_out_PointerTongwt__CustomList(soap, "ngwt:customs", -1, &(((ngwt__ContainerItem*)a)->customs), ""); - soap_out_PointerTongwt__ItemtqStatus(soap, "ngwt:status", -1, &(((ngwt__BoxEntry*)a)->status), ""); + soap_out_PointerTongwt__ItemStatus(soap, "ngwt:status", -1, &(((ngwt__BoxEntry*)a)->status), ""); soap_out_PointerTostd__string(soap, "ngwt:thread", -1, &(((ngwt__BoxEntry*)a)->thread), ""); soap_out_PointerTostd__string(soap, "ngwt:msgId", -1, &(((ngwt__BoxEntry*)a)->msgId), ""); soap_out_PointerTostd__string(soap, "ngwt:messageId", -1, &(((ngwt__BoxEntry*)a)->messageId), ""); @@ -60162,7 +60162,7 @@ SOAP_FMAC3 ngwt__DocumentRef * SOAP_FMAC4 soap_in_ngwt__DocumentRef(struct soap continue; } if (soap_flag_status3 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__ItemtqStatus(soap, "ngwt:status", &(((ngwt__BoxEntry*)a)->status), "ngwt:ItemStatus")) + if (soap_in_PointerTongwt__ItemStatus(soap, "ngwt:status", &(((ngwt__BoxEntry*)a)->status), "ngwt:ItemStatus")) { soap_flag_status3 = 0; continue; } @@ -61040,167 +61040,167 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__DeltaInfo(struct soap *soap, int st, *(ngwt__DeltaInfo*)p = *(ngwt__DeltaInfo*)q; } -void ngwt__DelegateetqStatus::soap_serialize(struct soap *soap) const +void ngwt__DelegateeStatus::soap_serialize(struct soap *soap) const { (void)soap; /* appease -Wall -Werror */ - soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->delivered, SOAP_TYPE_string); - soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->delivered); - soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->undeliverable, SOAP_TYPE_string); - soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->undeliverable); - soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->transferred, SOAP_TYPE_string); - soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->transferred); - soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->transferDelayed, SOAP_TYPE_string); - soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->transferDelayed); - soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->transferFailed, SOAP_TYPE_PointerTongwt__TransferFailedtqStatus); - soap_serialize_PointerTongwt__TransferFailedtqStatus(soap, &((ngwt__RecipientqStatus*)this)->transferFailed); - soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->downloaded, SOAP_TYPE_string); - soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->downloaded); - soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->downloadedByThirdParty, SOAP_TYPE_string); - soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->downloadedByThirdParty); - soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->retractRequested, SOAP_TYPE_string); - soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->retractRequested); - soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->retracted, SOAP_TYPE_string); - soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->retracted); - soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->opened, SOAP_TYPE_string); - soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->opened); - soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->deleted, SOAP_TYPE_string); - soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->deleted); - soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->undeleted, SOAP_TYPE_string); - soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->undeleted); - soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->purged, SOAP_TYPE_string); - soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->purged); - soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->accepted, SOAP_TYPE_PointerTongwt__CommentqStatus); - soap_serialize_PointerTongwt__CommentqStatus(soap, &((ngwt__RecipientqStatus*)this)->accepted); - soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->declined, SOAP_TYPE_PointerTongwt__CommentqStatus); - soap_serialize_PointerTongwt__CommentqStatus(soap, &((ngwt__RecipientqStatus*)this)->declined); - soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->replied, SOAP_TYPE_string); - soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->replied); - soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->forwarded, SOAP_TYPE_string); - soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->forwarded); - soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->shared, SOAP_TYPE_string); - soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->shared); - soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->started, SOAP_TYPE_string); - soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->started); - soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->completed, SOAP_TYPE_string); - soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->completed); - soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->incomplete, SOAP_TYPE_string); - soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->incomplete); - soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->delegated, SOAP_TYPE_PointerTongwt__DelegatedtqStatus); - soap_serialize_PointerTongwt__DelegatedtqStatus(soap, &((ngwt__RecipientqStatus*)this)->delegated); - soap_serialize_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(soap, &((ngwt__RecipientqStatus*)this)->delegateetqStatus); - /* transient soap skipped */ -} - -void ngwt__DelegateetqStatus::soap_default(struct soap *soap) + soap_embedded(soap, &((ngwt__RecipienStatus*)this)->delivered, SOAP_TYPE_string); + soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->delivered); + soap_embedded(soap, &((ngwt__RecipienStatus*)this)->undeliverable, SOAP_TYPE_string); + soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->undeliverable); + soap_embedded(soap, &((ngwt__RecipienStatus*)this)->transferred, SOAP_TYPE_string); + soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->transferred); + soap_embedded(soap, &((ngwt__RecipienStatus*)this)->transferDelayed, SOAP_TYPE_string); + soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->transferDelayed); + soap_embedded(soap, &((ngwt__RecipienStatus*)this)->transferFailed, SOAP_TYPE_PointerTongwt__TransferFailedStatus); + soap_serialize_PointerTongwt__TransferFailedStatus(soap, &((ngwt__RecipienStatus*)this)->transferFailed); + soap_embedded(soap, &((ngwt__RecipienStatus*)this)->downloaded, SOAP_TYPE_string); + soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->downloaded); + soap_embedded(soap, &((ngwt__RecipienStatus*)this)->downloadedByThirdParty, SOAP_TYPE_string); + soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->downloadedByThirdParty); + soap_embedded(soap, &((ngwt__RecipienStatus*)this)->retractRequested, SOAP_TYPE_string); + soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->retractRequested); + soap_embedded(soap, &((ngwt__RecipienStatus*)this)->retracted, SOAP_TYPE_string); + soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->retracted); + soap_embedded(soap, &((ngwt__RecipienStatus*)this)->opened, SOAP_TYPE_string); + soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->opened); + soap_embedded(soap, &((ngwt__RecipienStatus*)this)->deleted, SOAP_TYPE_string); + soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->deleted); + soap_embedded(soap, &((ngwt__RecipienStatus*)this)->undeleted, SOAP_TYPE_string); + soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->undeleted); + soap_embedded(soap, &((ngwt__RecipienStatus*)this)->purged, SOAP_TYPE_string); + soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->purged); + soap_embedded(soap, &((ngwt__RecipienStatus*)this)->accepted, SOAP_TYPE_PointerTongwt__CommenStatus); + soap_serialize_PointerTongwt__CommenStatus(soap, &((ngwt__RecipienStatus*)this)->accepted); + soap_embedded(soap, &((ngwt__RecipienStatus*)this)->declined, SOAP_TYPE_PointerTongwt__CommenStatus); + soap_serialize_PointerTongwt__CommenStatus(soap, &((ngwt__RecipienStatus*)this)->declined); + soap_embedded(soap, &((ngwt__RecipienStatus*)this)->replied, SOAP_TYPE_string); + soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->replied); + soap_embedded(soap, &((ngwt__RecipienStatus*)this)->forwarded, SOAP_TYPE_string); + soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->forwarded); + soap_embedded(soap, &((ngwt__RecipienStatus*)this)->shared, SOAP_TYPE_string); + soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->shared); + soap_embedded(soap, &((ngwt__RecipienStatus*)this)->started, SOAP_TYPE_string); + soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->started); + soap_embedded(soap, &((ngwt__RecipienStatus*)this)->completed, SOAP_TYPE_string); + soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->completed); + soap_embedded(soap, &((ngwt__RecipienStatus*)this)->incomplete, SOAP_TYPE_string); + soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->incomplete); + soap_embedded(soap, &((ngwt__RecipienStatus*)this)->delegated, SOAP_TYPE_PointerTongwt__DelegatedStatus); + soap_serialize_PointerTongwt__DelegatedStatus(soap, &((ngwt__RecipienStatus*)this)->delegated); + soap_serialize_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, &((ngwt__RecipienStatus*)this)->delegateeStatus); + /* transient soap skipped */ +} + +void ngwt__DelegateeStatus::soap_default(struct soap *soap) { this->soap = soap; - ((ngwt__DelegateetqStatus*)this)->userid = NULL; - soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->delivered); - soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->undeliverable); - soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->transferred); - soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->transferDelayed); - ((ngwt__RecipientqStatus*)this)->transferFailed = NULL; - soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->downloaded); - soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->downloadedByThirdParty); - soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->retractRequested); - soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->retracted); - soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->opened); - soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->deleted); - soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->undeleted); - soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->purged); - ((ngwt__RecipientqStatus*)this)->accepted = NULL; - ((ngwt__RecipientqStatus*)this)->declined = NULL; - soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->replied); - soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->forwarded); - soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->shared); - soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->started); - soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->completed); - soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->incomplete); - ((ngwt__RecipientqStatus*)this)->delegated = NULL; - soap_default_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(soap, &((ngwt__RecipientqStatus*)this)->delegateetqStatus); - /* transient soap skipped */ -} - -int ngwt__DelegateetqStatus::soap_put(struct soap *soap, const char *tag, const char *type) const -{ - register int id = soap_embed(soap, (void*)this, NULL, 0, tag, SOAP_TYPE_ngwt__DelegateetqStatus); + ((ngwt__DelegateeStatus*)this)->userid = NULL; + soap_default_string(soap, &((ngwt__RecipienStatus*)this)->delivered); + soap_default_string(soap, &((ngwt__RecipienStatus*)this)->undeliverable); + soap_default_string(soap, &((ngwt__RecipienStatus*)this)->transferred); + soap_default_string(soap, &((ngwt__RecipienStatus*)this)->transferDelayed); + ((ngwt__RecipienStatus*)this)->transferFailed = NULL; + soap_default_string(soap, &((ngwt__RecipienStatus*)this)->downloaded); + soap_default_string(soap, &((ngwt__RecipienStatus*)this)->downloadedByThirdParty); + soap_default_string(soap, &((ngwt__RecipienStatus*)this)->retractRequested); + soap_default_string(soap, &((ngwt__RecipienStatus*)this)->retracted); + soap_default_string(soap, &((ngwt__RecipienStatus*)this)->opened); + soap_default_string(soap, &((ngwt__RecipienStatus*)this)->deleted); + soap_default_string(soap, &((ngwt__RecipienStatus*)this)->undeleted); + soap_default_string(soap, &((ngwt__RecipienStatus*)this)->purged); + ((ngwt__RecipienStatus*)this)->accepted = NULL; + ((ngwt__RecipienStatus*)this)->declined = NULL; + soap_default_string(soap, &((ngwt__RecipienStatus*)this)->replied); + soap_default_string(soap, &((ngwt__RecipienStatus*)this)->forwarded); + soap_default_string(soap, &((ngwt__RecipienStatus*)this)->shared); + soap_default_string(soap, &((ngwt__RecipienStatus*)this)->started); + soap_default_string(soap, &((ngwt__RecipienStatus*)this)->completed); + soap_default_string(soap, &((ngwt__RecipienStatus*)this)->incomplete); + ((ngwt__RecipienStatus*)this)->delegated = NULL; + soap_default_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, &((ngwt__RecipienStatus*)this)->delegateeStatus); + /* transient soap skipped */ +} + +int ngwt__DelegateeStatus::soap_put(struct soap *soap, const char *tag, const char *type) const +{ + register int id = soap_embed(soap, (void*)this, NULL, 0, tag, SOAP_TYPE_ngwt__DelegateeStatus); if (this->soap_out(soap, tag, id, type)) return soap->error; return soap_putindependent(soap); } -int ngwt__DelegateetqStatus::soap_out(struct soap *soap, const char *tag, int id, const char *type) const +int ngwt__DelegateeStatus::soap_out(struct soap *soap, const char *tag, int id, const char *type) const { - return soap_out_ngwt__DelegateetqStatus(soap, tag, id, this, type); + return soap_out_ngwt__DelegateeStatus(soap, tag, id, this, type); } -SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__DelegateetqStatus(struct soap *soap, const char *tag, int id, const ngwt__DelegateetqStatus *a, const char *type) +SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__DelegateeStatus(struct soap *soap, const char *tag, int id, const ngwt__DelegateeStatus *a, const char *type) { - if (((ngwt__DelegateetqStatus *)a)->userid) - soap_set_attr(soap, "userid", ((ngwt__DelegateetqStatus *)a)->userid->c_str()); - soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ngwt__DelegateetqStatus), "ngwt:DelegateeStatus"); - soap_out_string(soap, "ngwt:delivered", -1, &(((ngwt__RecipientqStatus*)a)->delivered), ""); - soap_out_string(soap, "ngwt:undeliverable", -1, &(((ngwt__RecipientqStatus*)a)->undeliverable), ""); - soap_out_string(soap, "ngwt:transferred", -1, &(((ngwt__RecipientqStatus*)a)->transferred), ""); - soap_out_string(soap, "ngwt:transferDelayed", -1, &(((ngwt__RecipientqStatus*)a)->transferDelayed), ""); - soap_out_PointerTongwt__TransferFailedtqStatus(soap, "ngwt:transferFailed", -1, &(((ngwt__RecipientqStatus*)a)->transferFailed), ""); - soap_out_string(soap, "ngwt:downloaded", -1, &(((ngwt__RecipientqStatus*)a)->downloaded), ""); - soap_out_string(soap, "ngwt:downloadedByThirdParty", -1, &(((ngwt__RecipientqStatus*)a)->downloadedByThirdParty), ""); - soap_out_string(soap, "ngwt:retractRequested", -1, &(((ngwt__RecipientqStatus*)a)->retractRequested), ""); - soap_out_string(soap, "ngwt:retracted", -1, &(((ngwt__RecipientqStatus*)a)->retracted), ""); - soap_out_string(soap, "ngwt:opened", -1, &(((ngwt__RecipientqStatus*)a)->opened), ""); - soap_out_string(soap, "ngwt:deleted", -1, &(((ngwt__RecipientqStatus*)a)->deleted), ""); - soap_out_string(soap, "ngwt:undeleted", -1, &(((ngwt__RecipientqStatus*)a)->undeleted), ""); - soap_out_string(soap, "ngwt:purged", -1, &(((ngwt__RecipientqStatus*)a)->purged), ""); - soap_out_PointerTongwt__CommentqStatus(soap, "ngwt:accepted", -1, &(((ngwt__RecipientqStatus*)a)->accepted), ""); - soap_out_PointerTongwt__CommentqStatus(soap, "ngwt:declined", -1, &(((ngwt__RecipientqStatus*)a)->declined), ""); - soap_out_string(soap, "ngwt:replied", -1, &(((ngwt__RecipientqStatus*)a)->replied), ""); - soap_out_string(soap, "ngwt:forwarded", -1, &(((ngwt__RecipientqStatus*)a)->forwarded), ""); - soap_out_string(soap, "ngwt:shared", -1, &(((ngwt__RecipientqStatus*)a)->shared), ""); - soap_out_string(soap, "ngwt:started", -1, &(((ngwt__RecipientqStatus*)a)->started), ""); - soap_out_string(soap, "ngwt:completed", -1, &(((ngwt__RecipientqStatus*)a)->completed), ""); - soap_out_string(soap, "ngwt:incomplete", -1, &(((ngwt__RecipientqStatus*)a)->incomplete), ""); - soap_out_PointerTongwt__DelegatedtqStatus(soap, "ngwt:delegated", -1, &(((ngwt__RecipientqStatus*)a)->delegated), ""); - soap_out_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(soap, "ngwt:delegateeStatus", -1, &(((ngwt__RecipientqStatus*)a)->delegateetqStatus), ""); + if (((ngwt__DelegateeStatus *)a)->userid) + soap_set_attr(soap, "userid", ((ngwt__DelegateeStatus *)a)->userid->c_str()); + soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ngwt__DelegateeStatus), "ngwt:DelegateeStatus"); + soap_out_string(soap, "ngwt:delivered", -1, &(((ngwt__RecipienStatus*)a)->delivered), ""); + soap_out_string(soap, "ngwt:undeliverable", -1, &(((ngwt__RecipienStatus*)a)->undeliverable), ""); + soap_out_string(soap, "ngwt:transferred", -1, &(((ngwt__RecipienStatus*)a)->transferred), ""); + soap_out_string(soap, "ngwt:transferDelayed", -1, &(((ngwt__RecipienStatus*)a)->transferDelayed), ""); + soap_out_PointerTongwt__TransferFailedStatus(soap, "ngwt:transferFailed", -1, &(((ngwt__RecipienStatus*)a)->transferFailed), ""); + soap_out_string(soap, "ngwt:downloaded", -1, &(((ngwt__RecipienStatus*)a)->downloaded), ""); + soap_out_string(soap, "ngwt:downloadedByThirdParty", -1, &(((ngwt__RecipienStatus*)a)->downloadedByThirdParty), ""); + soap_out_string(soap, "ngwt:retractRequested", -1, &(((ngwt__RecipienStatus*)a)->retractRequested), ""); + soap_out_string(soap, "ngwt:retracted", -1, &(((ngwt__RecipienStatus*)a)->retracted), ""); + soap_out_string(soap, "ngwt:opened", -1, &(((ngwt__RecipienStatus*)a)->opened), ""); + soap_out_string(soap, "ngwt:deleted", -1, &(((ngwt__RecipienStatus*)a)->deleted), ""); + soap_out_string(soap, "ngwt:undeleted", -1, &(((ngwt__RecipienStatus*)a)->undeleted), ""); + soap_out_string(soap, "ngwt:purged", -1, &(((ngwt__RecipienStatus*)a)->purged), ""); + soap_out_PointerTongwt__CommenStatus(soap, "ngwt:accepted", -1, &(((ngwt__RecipienStatus*)a)->accepted), ""); + soap_out_PointerTongwt__CommenStatus(soap, "ngwt:declined", -1, &(((ngwt__RecipienStatus*)a)->declined), ""); + soap_out_string(soap, "ngwt:replied", -1, &(((ngwt__RecipienStatus*)a)->replied), ""); + soap_out_string(soap, "ngwt:forwarded", -1, &(((ngwt__RecipienStatus*)a)->forwarded), ""); + soap_out_string(soap, "ngwt:shared", -1, &(((ngwt__RecipienStatus*)a)->shared), ""); + soap_out_string(soap, "ngwt:started", -1, &(((ngwt__RecipienStatus*)a)->started), ""); + soap_out_string(soap, "ngwt:completed", -1, &(((ngwt__RecipienStatus*)a)->completed), ""); + soap_out_string(soap, "ngwt:incomplete", -1, &(((ngwt__RecipienStatus*)a)->incomplete), ""); + soap_out_PointerTongwt__DelegatedStatus(soap, "ngwt:delegated", -1, &(((ngwt__RecipienStatus*)a)->delegated), ""); + soap_out_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, "ngwt:delegateeStatus", -1, &(((ngwt__RecipienStatus*)a)->delegateeStatus), ""); /* transient soap skipped */ soap_element_end_out(soap, tag); return SOAP_OK; } -void *ngwt__DelegateetqStatus::soap_get(struct soap *soap, const char *tag, const char *type) +void *ngwt__DelegateeStatus::soap_get(struct soap *soap, const char *tag, const char *type) { - return soap_get_ngwt__DelegateetqStatus(soap, this, tag, type); + return soap_get_ngwt__DelegateeStatus(soap, this, tag, type); } -SOAP_FMAC3 ngwt__DelegateetqStatus * SOAP_FMAC4 soap_get_ngwt__DelegateetqStatus(struct soap *soap, ngwt__DelegateetqStatus *p, const char *tag, const char *type) +SOAP_FMAC3 ngwt__DelegateeStatus * SOAP_FMAC4 soap_get_ngwt__DelegateeStatus(struct soap *soap, ngwt__DelegateeStatus *p, const char *tag, const char *type) { - if ((p = soap_in_ngwt__DelegateetqStatus(soap, tag, p, type))) + if ((p = soap_in_ngwt__DelegateeStatus(soap, tag, p, type))) soap_getindependent(soap); return p; } -void *ngwt__DelegateetqStatus::soap_in(struct soap *soap, const char *tag, const char *type) -{ return soap_in_ngwt__DelegateetqStatus(soap, tag, this, type); +void *ngwt__DelegateeStatus::soap_in(struct soap *soap, const char *tag, const char *type) +{ return soap_in_ngwt__DelegateeStatus(soap, tag, this, type); } -SOAP_FMAC3 ngwt__DelegateetqStatus * SOAP_FMAC4 soap_in_ngwt__DelegateetqStatus(struct soap *soap, const char *tag, ngwt__DelegateetqStatus *a, const char *type) +SOAP_FMAC3 ngwt__DelegateeStatus * SOAP_FMAC4 soap_in_ngwt__DelegateeStatus(struct soap *soap, const char *tag, ngwt__DelegateeStatus *a, const char *type) { if (soap_element_begin_in(soap, tag, 0)) return NULL; - a = (ngwt__DelegateetqStatus *)soap_class_id_enter(soap, soap->id, a, SOAP_TYPE_ngwt__DelegateetqStatus, sizeof(ngwt__DelegateetqStatus), soap->type, soap->arrayType); + a = (ngwt__DelegateeStatus *)soap_class_id_enter(soap, soap->id, a, SOAP_TYPE_ngwt__DelegateeStatus, sizeof(ngwt__DelegateeStatus), soap->type, soap->arrayType); if (!a) return NULL; if (soap->alloced) { a->soap_default(soap); - if (soap->clist->type != SOAP_TYPE_ngwt__DelegateetqStatus) + if (soap->clist->type != SOAP_TYPE_ngwt__DelegateeStatus) { soap_revert(soap); *soap->id = '\0'; - return (ngwt__DelegateetqStatus *)a->soap_in(soap, tag, type); + return (ngwt__DelegateeStatus *)a->soap_in(soap, tag, type); } } { const char *t = soap_attr_value(soap, "userid", 0); if (t) - { if (!(((ngwt__DelegateetqStatus *)a)->userid = (std::string *)soap_malloc(soap, sizeof(std::string)))) + { if (!(((ngwt__DelegateeStatus *)a)->userid = (std::string *)soap_malloc(soap, sizeof(std::string)))) { soap->error = SOAP_EOM; return NULL; } @@ -61208,8 +61208,8 @@ SOAP_FMAC3 ngwt__DelegateetqStatus * SOAP_FMAC4 soap_in_ngwt__DelegateetqStatus( if (soap_s2string(soap, t, &s)) return NULL; if (s) - { ((ngwt__DelegateetqStatus *)a)->userid = soap_new_std__string(soap, -1); - ((ngwt__DelegateetqStatus *)a)->userid->assign(s); + { ((ngwt__DelegateeStatus *)a)->userid = soap_new_std__string(soap, -1); + ((ngwt__DelegateeStatus *)a)->userid->assign(s); } } } @@ -61219,117 +61219,117 @@ SOAP_FMAC3 ngwt__DelegateetqStatus * SOAP_FMAC4 soap_in_ngwt__DelegateetqStatus( for (;;) { soap->error = SOAP_TAG_MISMATCH; if (soap_flag_delivered2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) - if (soap_in_string(soap, "ngwt:delivered", &(((ngwt__RecipientqStatus*)a)->delivered), "")) + if (soap_in_string(soap, "ngwt:delivered", &(((ngwt__RecipienStatus*)a)->delivered), "")) { soap_flag_delivered2 = 0; continue; } if (soap_flag_undeliverable2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) - if (soap_in_string(soap, "ngwt:undeliverable", &(((ngwt__RecipientqStatus*)a)->undeliverable), "")) + if (soap_in_string(soap, "ngwt:undeliverable", &(((ngwt__RecipienStatus*)a)->undeliverable), "")) { soap_flag_undeliverable2 = 0; continue; } if (soap_flag_transferred2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) - if (soap_in_string(soap, "ngwt:transferred", &(((ngwt__RecipientqStatus*)a)->transferred), "")) + if (soap_in_string(soap, "ngwt:transferred", &(((ngwt__RecipienStatus*)a)->transferred), "")) { soap_flag_transferred2 = 0; continue; } if (soap_flag_transferDelayed2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) - if (soap_in_string(soap, "ngwt:transferDelayed", &(((ngwt__RecipientqStatus*)a)->transferDelayed), "")) + if (soap_in_string(soap, "ngwt:transferDelayed", &(((ngwt__RecipienStatus*)a)->transferDelayed), "")) { soap_flag_transferDelayed2 = 0; continue; } if (soap_flag_transferFailed2 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__TransferFailedtqStatus(soap, "ngwt:transferFailed", &(((ngwt__RecipientqStatus*)a)->transferFailed), "ngwt:TransferFailedStatus")) + if (soap_in_PointerTongwt__TransferFailedStatus(soap, "ngwt:transferFailed", &(((ngwt__RecipienStatus*)a)->transferFailed), "ngwt:TransferFailedStatus")) { soap_flag_transferFailed2 = 0; continue; } if (soap_flag_downloaded2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) - if (soap_in_string(soap, "ngwt:downloaded", &(((ngwt__RecipientqStatus*)a)->downloaded), "")) + if (soap_in_string(soap, "ngwt:downloaded", &(((ngwt__RecipienStatus*)a)->downloaded), "")) { soap_flag_downloaded2 = 0; continue; } if (soap_flag_downloadedByThirdParty2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) - if (soap_in_string(soap, "ngwt:downloadedByThirdParty", &(((ngwt__RecipientqStatus*)a)->downloadedByThirdParty), "")) + if (soap_in_string(soap, "ngwt:downloadedByThirdParty", &(((ngwt__RecipienStatus*)a)->downloadedByThirdParty), "")) { soap_flag_downloadedByThirdParty2 = 0; continue; } if (soap_flag_retractRequested2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) - if (soap_in_string(soap, "ngwt:retractRequested", &(((ngwt__RecipientqStatus*)a)->retractRequested), "")) + if (soap_in_string(soap, "ngwt:retractRequested", &(((ngwt__RecipienStatus*)a)->retractRequested), "")) { soap_flag_retractRequested2 = 0; continue; } if (soap_flag_retracted2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) - if (soap_in_string(soap, "ngwt:retracted", &(((ngwt__RecipientqStatus*)a)->retracted), "")) + if (soap_in_string(soap, "ngwt:retracted", &(((ngwt__RecipienStatus*)a)->retracted), "")) { soap_flag_retracted2 = 0; continue; } if (soap_flag_opened2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) - if (soap_in_string(soap, "ngwt:opened", &(((ngwt__RecipientqStatus*)a)->opened), "")) + if (soap_in_string(soap, "ngwt:opened", &(((ngwt__RecipienStatus*)a)->opened), "")) { soap_flag_opened2 = 0; continue; } if (soap_flag_deleted2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) - if (soap_in_string(soap, "ngwt:deleted", &(((ngwt__RecipientqStatus*)a)->deleted), "")) + if (soap_in_string(soap, "ngwt:deleted", &(((ngwt__RecipienStatus*)a)->deleted), "")) { soap_flag_deleted2 = 0; continue; } if (soap_flag_undeleted2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) - if (soap_in_string(soap, "ngwt:undeleted", &(((ngwt__RecipientqStatus*)a)->undeleted), "")) + if (soap_in_string(soap, "ngwt:undeleted", &(((ngwt__RecipienStatus*)a)->undeleted), "")) { soap_flag_undeleted2 = 0; continue; } if (soap_flag_purged2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) - if (soap_in_string(soap, "ngwt:purged", &(((ngwt__RecipientqStatus*)a)->purged), "")) + if (soap_in_string(soap, "ngwt:purged", &(((ngwt__RecipienStatus*)a)->purged), "")) { soap_flag_purged2 = 0; continue; } if (soap_flag_accepted2 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__CommentqStatus(soap, "ngwt:accepted", &(((ngwt__RecipientqStatus*)a)->accepted), "ngwt:CommenStatus")) + if (soap_in_PointerTongwt__CommenStatus(soap, "ngwt:accepted", &(((ngwt__RecipienStatus*)a)->accepted), "ngwt:CommenStatus")) { soap_flag_accepted2 = 0; continue; } if (soap_flag_declined2 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__CommentqStatus(soap, "ngwt:declined", &(((ngwt__RecipientqStatus*)a)->declined), "ngwt:CommenStatus")) + if (soap_in_PointerTongwt__CommenStatus(soap, "ngwt:declined", &(((ngwt__RecipienStatus*)a)->declined), "ngwt:CommenStatus")) { soap_flag_declined2 = 0; continue; } if (soap_flag_replied2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) - if (soap_in_string(soap, "ngwt:replied", &(((ngwt__RecipientqStatus*)a)->replied), "")) + if (soap_in_string(soap, "ngwt:replied", &(((ngwt__RecipienStatus*)a)->replied), "")) { soap_flag_replied2 = 0; continue; } if (soap_flag_forwarded2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) - if (soap_in_string(soap, "ngwt:forwarded", &(((ngwt__RecipientqStatus*)a)->forwarded), "")) + if (soap_in_string(soap, "ngwt:forwarded", &(((ngwt__RecipienStatus*)a)->forwarded), "")) { soap_flag_forwarded2 = 0; continue; } if (soap_flag_shared2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) - if (soap_in_string(soap, "ngwt:shared", &(((ngwt__RecipientqStatus*)a)->shared), "")) + if (soap_in_string(soap, "ngwt:shared", &(((ngwt__RecipienStatus*)a)->shared), "")) { soap_flag_shared2 = 0; continue; } if (soap_flag_started2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) - if (soap_in_string(soap, "ngwt:started", &(((ngwt__RecipientqStatus*)a)->started), "")) + if (soap_in_string(soap, "ngwt:started", &(((ngwt__RecipienStatus*)a)->started), "")) { soap_flag_started2 = 0; continue; } if (soap_flag_completed2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) - if (soap_in_string(soap, "ngwt:completed", &(((ngwt__RecipientqStatus*)a)->completed), "")) + if (soap_in_string(soap, "ngwt:completed", &(((ngwt__RecipienStatus*)a)->completed), "")) { soap_flag_completed2 = 0; continue; } if (soap_flag_incomplete2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) - if (soap_in_string(soap, "ngwt:incomplete", &(((ngwt__RecipientqStatus*)a)->incomplete), "")) + if (soap_in_string(soap, "ngwt:incomplete", &(((ngwt__RecipienStatus*)a)->incomplete), "")) { soap_flag_incomplete2 = 0; continue; } if (soap_flag_delegated2 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__DelegatedtqStatus(soap, "ngwt:delegated", &(((ngwt__RecipientqStatus*)a)->delegated), "ngwt:DelegatedStatus")) + if (soap_in_PointerTongwt__DelegatedStatus(soap, "ngwt:delegated", &(((ngwt__RecipienStatus*)a)->delegated), "ngwt:DelegatedStatus")) { soap_flag_delegated2 = 0; continue; } if (soap->error == SOAP_TAG_MISMATCH) - if (soap_in_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(soap, "ngwt:delegateeStatus", &(((ngwt__RecipientqStatus*)a)->delegateetqStatus), "ngwt:DelegateeStatus")) + if (soap_in_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, "ngwt:delegateeStatus", &(((ngwt__RecipienStatus*)a)->delegateeStatus), "ngwt:DelegateeStatus")) continue; /* transient soap skipped */ if (soap->error == SOAP_TAG_MISMATCH) @@ -61343,120 +61343,120 @@ SOAP_FMAC3 ngwt__DelegateetqStatus * SOAP_FMAC4 soap_in_ngwt__DelegateetqStatus( return NULL; } else - { a = (ngwt__DelegateetqStatus *)soap_id_forward(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__DelegateetqStatus, 0, sizeof(ngwt__DelegateetqStatus), 0, soap_copy_ngwt__DelegateetqStatus); + { a = (ngwt__DelegateeStatus *)soap_id_forward(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__DelegateeStatus, 0, sizeof(ngwt__DelegateeStatus), 0, soap_copy_ngwt__DelegateeStatus); if (soap->body && soap_element_end_in(soap, tag)) return NULL; } return a; } -SOAP_FMAC5 ngwt__DelegateetqStatus * SOAP_FMAC6 soap_new_ngwt__DelegateetqStatus(struct soap *soap, int n) -{ return soap_instantiate_ngwt__DelegateetqStatus(soap, n, NULL, NULL, NULL); +SOAP_FMAC5 ngwt__DelegateeStatus * SOAP_FMAC6 soap_new_ngwt__DelegateeStatus(struct soap *soap, int n) +{ return soap_instantiate_ngwt__DelegateeStatus(soap, n, NULL, NULL, NULL); } -SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__DelegateetqStatus(struct soap *soap, ngwt__DelegateetqStatus *p) +SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__DelegateeStatus(struct soap *soap, ngwt__DelegateeStatus *p) { soap_delete(soap, p); } -SOAP_FMAC5 ngwt__DelegateetqStatus * SOAP_FMAC6 soap_instantiate_ngwt__DelegateetqStatus(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size) +SOAP_FMAC5 ngwt__DelegateeStatus * SOAP_FMAC6 soap_instantiate_ngwt__DelegateeStatus(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size) { - DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_ngwt__DelegateetqStatus(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:"")); - struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_ngwt__DelegateetqStatus, n, soap_fdelete); + DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_ngwt__DelegateeStatus(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:"")); + struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_ngwt__DelegateeStatus, n, soap_fdelete); if (!cp) return NULL; if (n < 0) - { cp->ptr = (void*)new ngwt__DelegateetqStatus; + { cp->ptr = (void*)new ngwt__DelegateeStatus; if (size) - *size = sizeof(ngwt__DelegateetqStatus); - ((ngwt__DelegateetqStatus*)cp->ptr)->soap = soap; + *size = sizeof(ngwt__DelegateeStatus); + ((ngwt__DelegateeStatus*)cp->ptr)->soap = soap; } else - { cp->ptr = (void*)new ngwt__DelegateetqStatus[n]; + { cp->ptr = (void*)new ngwt__DelegateeStatus[n]; if (size) - *size = n * sizeof(ngwt__DelegateetqStatus); + *size = n * sizeof(ngwt__DelegateeStatus); for (int i = 0; i < n; i++) - ((ngwt__DelegateetqStatus*)cp->ptr)[i].soap = soap; + ((ngwt__DelegateeStatus*)cp->ptr)[i].soap = soap; } DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr)); - return (ngwt__DelegateetqStatus*)cp->ptr; + return (ngwt__DelegateeStatus*)cp->ptr; } -SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__DelegateetqStatus(struct soap *soap, int st, int tt, void *p, const void *q, size_t n) +SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__DelegateeStatus(struct soap *soap, int st, int tt, void *p, const void *q, size_t n) { - DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying ngwt__DelegateetqStatus %p -> %p\n", q, p)); - *(ngwt__DelegateetqStatus*)p = *(ngwt__DelegateetqStatus*)q; + DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying ngwt__DelegateeStatus %p -> %p\n", q, p)); + *(ngwt__DelegateeStatus*)p = *(ngwt__DelegateeStatus*)q; } -void ngwt__DelegatedtqStatus::soap_serialize(struct soap *soap) const +void ngwt__DelegatedStatus::soap_serialize(struct soap *soap) const { (void)soap; /* appease -Wall -Werror */ - soap_embedded(soap, &((ngwt__DelegatedtqStatus*)this)->__item, SOAP_TYPE_PointerTongwt__CommentqStatus); - soap_serialize_PointerTongwt__CommentqStatus(soap, &((ngwt__DelegatedtqStatus*)this)->__item); + soap_embedded(soap, &((ngwt__DelegatedStatus*)this)->__item, SOAP_TYPE_PointerTongwt__CommenStatus); + soap_serialize_PointerTongwt__CommenStatus(soap, &((ngwt__DelegatedStatus*)this)->__item); /* transient soap skipped */ } -void ngwt__DelegatedtqStatus::soap_default(struct soap *soap) +void ngwt__DelegatedStatus::soap_default(struct soap *soap) { this->soap = soap; - ((ngwt__DelegatedtqStatus*)this)->__item = NULL; - ((ngwt__DelegatedtqStatus*)this)->userid = NULL; + ((ngwt__DelegatedStatus*)this)->__item = NULL; + ((ngwt__DelegatedStatus*)this)->userid = NULL; /* transient soap skipped */ } -int ngwt__DelegatedtqStatus::soap_put(struct soap *soap, const char *tag, const char *type) const +int ngwt__DelegatedStatus::soap_put(struct soap *soap, const char *tag, const char *type) const { - register int id = soap_embed(soap, (void*)this, NULL, 0, tag, SOAP_TYPE_ngwt__DelegatedtqStatus); + register int id = soap_embed(soap, (void*)this, NULL, 0, tag, SOAP_TYPE_ngwt__DelegatedStatus); if (this->soap_out(soap, tag, id, type)) return soap->error; return soap_putindependent(soap); } -int ngwt__DelegatedtqStatus::soap_out(struct soap *soap, const char *tag, int id, const char *type) const +int ngwt__DelegatedStatus::soap_out(struct soap *soap, const char *tag, int id, const char *type) const { - return soap_out_ngwt__DelegatedtqStatus(soap, tag, id, this, type); + return soap_out_ngwt__DelegatedStatus(soap, tag, id, this, type); } -SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__DelegatedtqStatus(struct soap *soap, const char *tag, int id, const ngwt__DelegatedtqStatus *a, const char *type) +SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__DelegatedStatus(struct soap *soap, const char *tag, int id, const ngwt__DelegatedStatus *a, const char *type) { - if (((ngwt__DelegatedtqStatus *)a)->userid) - soap_set_attr(soap, "userid", ((ngwt__DelegatedtqStatus *)a)->userid->c_str()); - soap_out_PointerTongwt__CommentqStatus(soap, tag, id, &(((ngwt__DelegatedtqStatus*)a)->__item), ""); + if (((ngwt__DelegatedStatus *)a)->userid) + soap_set_attr(soap, "userid", ((ngwt__DelegatedStatus *)a)->userid->c_str()); + soap_out_PointerTongwt__CommenStatus(soap, tag, id, &(((ngwt__DelegatedStatus*)a)->__item), ""); return SOAP_OK; } -void *ngwt__DelegatedtqStatus::soap_get(struct soap *soap, const char *tag, const char *type) +void *ngwt__DelegatedStatus::soap_get(struct soap *soap, const char *tag, const char *type) { - return soap_get_ngwt__DelegatedtqStatus(soap, this, tag, type); + return soap_get_ngwt__DelegatedStatus(soap, this, tag, type); } -SOAP_FMAC3 ngwt__DelegatedtqStatus * SOAP_FMAC4 soap_get_ngwt__DelegatedtqStatus(struct soap *soap, ngwt__DelegatedtqStatus *p, const char *tag, const char *type) +SOAP_FMAC3 ngwt__DelegatedStatus * SOAP_FMAC4 soap_get_ngwt__DelegatedStatus(struct soap *soap, ngwt__DelegatedStatus *p, const char *tag, const char *type) { - if ((p = soap_in_ngwt__DelegatedtqStatus(soap, tag, p, type))) + if ((p = soap_in_ngwt__DelegatedStatus(soap, tag, p, type))) soap_getindependent(soap); return p; } -void *ngwt__DelegatedtqStatus::soap_in(struct soap *soap, const char *tag, const char *type) -{ return soap_in_ngwt__DelegatedtqStatus(soap, tag, this, type); +void *ngwt__DelegatedStatus::soap_in(struct soap *soap, const char *tag, const char *type) +{ return soap_in_ngwt__DelegatedStatus(soap, tag, this, type); } -SOAP_FMAC3 ngwt__DelegatedtqStatus * SOAP_FMAC4 soap_in_ngwt__DelegatedtqStatus(struct soap *soap, const char *tag, ngwt__DelegatedtqStatus *a, const char *type) +SOAP_FMAC3 ngwt__DelegatedStatus * SOAP_FMAC4 soap_in_ngwt__DelegatedStatus(struct soap *soap, const char *tag, ngwt__DelegatedStatus *a, const char *type) { if (soap_peek_element(soap)) return NULL; - if (!(a = (ngwt__DelegatedtqStatus *)soap_class_id_enter(soap, soap->id, a, SOAP_TYPE_ngwt__DelegatedtqStatus, sizeof(ngwt__DelegatedtqStatus), soap->type, soap->arrayType))) + if (!(a = (ngwt__DelegatedStatus *)soap_class_id_enter(soap, soap->id, a, SOAP_TYPE_ngwt__DelegatedStatus, sizeof(ngwt__DelegatedStatus), soap->type, soap->arrayType))) { soap->error = SOAP_TAG_MISMATCH; return NULL; } *soap->id = '\0'; if (soap->alloced) { a->soap_default(soap); - if (soap->clist->type != SOAP_TYPE_ngwt__DelegatedtqStatus) - return (ngwt__DelegatedtqStatus *)a->soap_in(soap, tag, type); + if (soap->clist->type != SOAP_TYPE_ngwt__DelegatedStatus) + return (ngwt__DelegatedStatus *)a->soap_in(soap, tag, type); } { const char *t = soap_attr_value(soap, "userid", 0); if (t) - { if (!(((ngwt__DelegatedtqStatus *)a)->userid = (std::string *)soap_malloc(soap, sizeof(std::string)))) + { if (!(((ngwt__DelegatedStatus *)a)->userid = (std::string *)soap_malloc(soap, sizeof(std::string)))) { soap->error = SOAP_EOM; return NULL; } @@ -61464,51 +61464,51 @@ SOAP_FMAC3 ngwt__DelegatedtqStatus * SOAP_FMAC4 soap_in_ngwt__DelegatedtqStatus( if (soap_s2string(soap, t, &s)) return NULL; if (s) - { ((ngwt__DelegatedtqStatus *)a)->userid = soap_new_std__string(soap, -1); - ((ngwt__DelegatedtqStatus *)a)->userid->assign(s); + { ((ngwt__DelegatedStatus *)a)->userid = soap_new_std__string(soap, -1); + ((ngwt__DelegatedStatus *)a)->userid->assign(s); } } } - if (!soap_in_PointerTongwt__CommentqStatus(soap, tag, &(((ngwt__DelegatedtqStatus*)a)->__item), "ngwt:DelegatedStatus")) + if (!soap_in_PointerTongwt__CommenStatus(soap, tag, &(((ngwt__DelegatedStatus*)a)->__item), "ngwt:DelegatedStatus")) return NULL; return a; } -SOAP_FMAC5 ngwt__DelegatedtqStatus * SOAP_FMAC6 soap_new_ngwt__DelegatedtqStatus(struct soap *soap, int n) -{ return soap_instantiate_ngwt__DelegatedtqStatus(soap, n, NULL, NULL, NULL); +SOAP_FMAC5 ngwt__DelegatedStatus * SOAP_FMAC6 soap_new_ngwt__DelegatedStatus(struct soap *soap, int n) +{ return soap_instantiate_ngwt__DelegatedStatus(soap, n, NULL, NULL, NULL); } -SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__DelegatedtqStatus(struct soap *soap, ngwt__DelegatedtqStatus *p) +SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__DelegatedStatus(struct soap *soap, ngwt__DelegatedStatus *p) { soap_delete(soap, p); } -SOAP_FMAC5 ngwt__DelegatedtqStatus * SOAP_FMAC6 soap_instantiate_ngwt__DelegatedtqStatus(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size) +SOAP_FMAC5 ngwt__DelegatedStatus * SOAP_FMAC6 soap_instantiate_ngwt__DelegatedStatus(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size) { - DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_ngwt__DelegatedtqStatus(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:"")); - struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_ngwt__DelegatedtqStatus, n, soap_fdelete); + DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_ngwt__DelegatedStatus(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:"")); + struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_ngwt__DelegatedStatus, n, soap_fdelete); if (!cp) return NULL; if (n < 0) - { cp->ptr = (void*)new ngwt__DelegatedtqStatus; + { cp->ptr = (void*)new ngwt__DelegatedStatus; if (size) - *size = sizeof(ngwt__DelegatedtqStatus); - ((ngwt__DelegatedtqStatus*)cp->ptr)->soap = soap; + *size = sizeof(ngwt__DelegatedStatus); + ((ngwt__DelegatedStatus*)cp->ptr)->soap = soap; } else - { cp->ptr = (void*)new ngwt__DelegatedtqStatus[n]; + { cp->ptr = (void*)new ngwt__DelegatedStatus[n]; if (size) - *size = n * sizeof(ngwt__DelegatedtqStatus); + *size = n * sizeof(ngwt__DelegatedStatus); for (int i = 0; i < n; i++) - ((ngwt__DelegatedtqStatus*)cp->ptr)[i].soap = soap; + ((ngwt__DelegatedStatus*)cp->ptr)[i].soap = soap; } DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr)); - return (ngwt__DelegatedtqStatus*)cp->ptr; + return (ngwt__DelegatedStatus*)cp->ptr; } -SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__DelegatedtqStatus(struct soap *soap, int st, int tt, void *p, const void *q, size_t n) +SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__DelegatedStatus(struct soap *soap, int st, int tt, void *p, const void *q, size_t n) { - DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying ngwt__DelegatedtqStatus %p -> %p\n", q, p)); - *(ngwt__DelegatedtqStatus*)p = *(ngwt__DelegatedtqStatus*)q; + DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying ngwt__DelegatedStatus %p -> %p\n", q, p)); + *(ngwt__DelegatedStatus*)p = *(ngwt__DelegatedStatus*)q; } void ngwt__DayOfYearWeekList::soap_serialize(struct soap *soap) const @@ -63703,76 +63703,76 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__Contact(struct soap *soap, int st, in *(ngwt__Contact*)p = *(ngwt__Contact*)q; } -void ngwt__CommentqStatus::soap_serialize(struct soap *soap) const +void ngwt__CommenStatus::soap_serialize(struct soap *soap) const { (void)soap; /* appease -Wall -Werror */ - soap_embedded(soap, &((ngwt__CommentqStatus*)this)->__item, SOAP_TYPE_string); - soap_serialize_string(soap, &((ngwt__CommentqStatus*)this)->__item); + soap_embedded(soap, &((ngwt__CommenStatus*)this)->__item, SOAP_TYPE_string); + soap_serialize_string(soap, &((ngwt__CommenStatus*)this)->__item); /* transient soap skipped */ } -void ngwt__CommentqStatus::soap_default(struct soap *soap) +void ngwt__CommenStatus::soap_default(struct soap *soap) { this->soap = soap; - soap_default_string(soap, &((ngwt__CommentqStatus*)this)->__item); - ((ngwt__CommentqStatus*)this)->comment = NULL; + soap_default_string(soap, &((ngwt__CommenStatus*)this)->__item); + ((ngwt__CommenStatus*)this)->comment = NULL; /* transient soap skipped */ } -int ngwt__CommentqStatus::soap_put(struct soap *soap, const char *tag, const char *type) const +int ngwt__CommenStatus::soap_put(struct soap *soap, const char *tag, const char *type) const { - register int id = soap_embed(soap, (void*)this, NULL, 0, tag, SOAP_TYPE_ngwt__CommentqStatus); + register int id = soap_embed(soap, (void*)this, NULL, 0, tag, SOAP_TYPE_ngwt__CommenStatus); if (this->soap_out(soap, tag, id, type)) return soap->error; return soap_putindependent(soap); } -int ngwt__CommentqStatus::soap_out(struct soap *soap, const char *tag, int id, const char *type) const +int ngwt__CommenStatus::soap_out(struct soap *soap, const char *tag, int id, const char *type) const { - return soap_out_ngwt__CommentqStatus(soap, tag, id, this, type); + return soap_out_ngwt__CommenStatus(soap, tag, id, this, type); } -SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__CommentqStatus(struct soap *soap, const char *tag, int id, const ngwt__CommentqStatus *a, const char *type) +SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__CommenStatus(struct soap *soap, const char *tag, int id, const ngwt__CommenStatus *a, const char *type) { - if (((ngwt__CommentqStatus *)a)->comment) - soap_set_attr(soap, "comment", ((ngwt__CommentqStatus *)a)->comment->c_str()); - soap_out_string(soap, tag, id, &(((ngwt__CommentqStatus*)a)->__item), ""); + if (((ngwt__CommenStatus *)a)->comment) + soap_set_attr(soap, "comment", ((ngwt__CommenStatus *)a)->comment->c_str()); + soap_out_string(soap, tag, id, &(((ngwt__CommenStatus*)a)->__item), ""); return SOAP_OK; } -void *ngwt__CommentqStatus::soap_get(struct soap *soap, const char *tag, const char *type) +void *ngwt__CommenStatus::soap_get(struct soap *soap, const char *tag, const char *type) { - return soap_get_ngwt__CommentqStatus(soap, this, tag, type); + return soap_get_ngwt__CommenStatus(soap, this, tag, type); } -SOAP_FMAC3 ngwt__CommentqStatus * SOAP_FMAC4 soap_get_ngwt__CommentqStatus(struct soap *soap, ngwt__CommentqStatus *p, const char *tag, const char *type) +SOAP_FMAC3 ngwt__CommenStatus * SOAP_FMAC4 soap_get_ngwt__CommenStatus(struct soap *soap, ngwt__CommenStatus *p, const char *tag, const char *type) { - if ((p = soap_in_ngwt__CommentqStatus(soap, tag, p, type))) + if ((p = soap_in_ngwt__CommenStatus(soap, tag, p, type))) soap_getindependent(soap); return p; } -void *ngwt__CommentqStatus::soap_in(struct soap *soap, const char *tag, const char *type) -{ return soap_in_ngwt__CommentqStatus(soap, tag, this, type); +void *ngwt__CommenStatus::soap_in(struct soap *soap, const char *tag, const char *type) +{ return soap_in_ngwt__CommenStatus(soap, tag, this, type); } -SOAP_FMAC3 ngwt__CommentqStatus * SOAP_FMAC4 soap_in_ngwt__CommentqStatus(struct soap *soap, const char *tag, ngwt__CommentqStatus *a, const char *type) +SOAP_FMAC3 ngwt__CommenStatus * SOAP_FMAC4 soap_in_ngwt__CommenStatus(struct soap *soap, const char *tag, ngwt__CommenStatus *a, const char *type) { if (soap_peek_element(soap)) return NULL; - if (!(a = (ngwt__CommentqStatus *)soap_class_id_enter(soap, soap->id, a, SOAP_TYPE_ngwt__CommentqStatus, sizeof(ngwt__CommentqStatus), soap->type, soap->arrayType))) + if (!(a = (ngwt__CommenStatus *)soap_class_id_enter(soap, soap->id, a, SOAP_TYPE_ngwt__CommenStatus, sizeof(ngwt__CommenStatus), soap->type, soap->arrayType))) { soap->error = SOAP_TAG_MISMATCH; return NULL; } *soap->id = '\0'; if (soap->alloced) { a->soap_default(soap); - if (soap->clist->type != SOAP_TYPE_ngwt__CommentqStatus) - return (ngwt__CommentqStatus *)a->soap_in(soap, tag, type); + if (soap->clist->type != SOAP_TYPE_ngwt__CommenStatus) + return (ngwt__CommenStatus *)a->soap_in(soap, tag, type); } { const char *t = soap_attr_value(soap, "comment", 0); if (t) - { if (!(((ngwt__CommentqStatus *)a)->comment = (std::string *)soap_malloc(soap, sizeof(std::string)))) + { if (!(((ngwt__CommenStatus *)a)->comment = (std::string *)soap_malloc(soap, sizeof(std::string)))) { soap->error = SOAP_EOM; return NULL; } @@ -63780,51 +63780,51 @@ SOAP_FMAC3 ngwt__CommentqStatus * SOAP_FMAC4 soap_in_ngwt__CommentqStatus(struct if (soap_s2string(soap, t, &s)) return NULL; if (s) - { ((ngwt__CommentqStatus *)a)->comment = soap_new_std__string(soap, -1); - ((ngwt__CommentqStatus *)a)->comment->assign(s); + { ((ngwt__CommenStatus *)a)->comment = soap_new_std__string(soap, -1); + ((ngwt__CommenStatus *)a)->comment->assign(s); } } } - if (!soap_in_string(soap, tag, &(((ngwt__CommentqStatus*)a)->__item), "ngwt:CommenStatus")) + if (!soap_in_string(soap, tag, &(((ngwt__CommenStatus*)a)->__item), "ngwt:CommenStatus")) return NULL; return a; } -SOAP_FMAC5 ngwt__CommentqStatus * SOAP_FMAC6 soap_new_ngwt__CommentqStatus(struct soap *soap, int n) -{ return soap_instantiate_ngwt__CommentqStatus(soap, n, NULL, NULL, NULL); +SOAP_FMAC5 ngwt__CommenStatus * SOAP_FMAC6 soap_new_ngwt__CommenStatus(struct soap *soap, int n) +{ return soap_instantiate_ngwt__CommenStatus(soap, n, NULL, NULL, NULL); } -SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__CommentqStatus(struct soap *soap, ngwt__CommentqStatus *p) +SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__CommenStatus(struct soap *soap, ngwt__CommenStatus *p) { soap_delete(soap, p); } -SOAP_FMAC5 ngwt__CommentqStatus * SOAP_FMAC6 soap_instantiate_ngwt__CommentqStatus(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size) +SOAP_FMAC5 ngwt__CommenStatus * SOAP_FMAC6 soap_instantiate_ngwt__CommenStatus(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size) { - DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_ngwt__CommentqStatus(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:"")); - struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_ngwt__CommentqStatus, n, soap_fdelete); + DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_ngwt__CommenStatus(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:"")); + struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_ngwt__CommenStatus, n, soap_fdelete); if (!cp) return NULL; if (n < 0) - { cp->ptr = (void*)new ngwt__CommentqStatus; + { cp->ptr = (void*)new ngwt__CommenStatus; if (size) - *size = sizeof(ngwt__CommentqStatus); - ((ngwt__CommentqStatus*)cp->ptr)->soap = soap; + *size = sizeof(ngwt__CommenStatus); + ((ngwt__CommenStatus*)cp->ptr)->soap = soap; } else - { cp->ptr = (void*)new ngwt__CommentqStatus[n]; + { cp->ptr = (void*)new ngwt__CommenStatus[n]; if (size) - *size = n * sizeof(ngwt__CommentqStatus); + *size = n * sizeof(ngwt__CommenStatus); for (int i = 0; i < n; i++) - ((ngwt__CommentqStatus*)cp->ptr)[i].soap = soap; + ((ngwt__CommenStatus*)cp->ptr)[i].soap = soap; } DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr)); - return (ngwt__CommentqStatus*)cp->ptr; + return (ngwt__CommenStatus*)cp->ptr; } -SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__CommentqStatus(struct soap *soap, int st, int tt, void *p, const void *q, size_t n) +SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__CommenStatus(struct soap *soap, int st, int tt, void *p, const void *q, size_t n) { - DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying ngwt__CommentqStatus %p -> %p\n", q, p)); - *(ngwt__CommentqStatus*)p = *(ngwt__CommentqStatus*)q; + DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying ngwt__CommenStatus %p -> %p\n", q, p)); + *(ngwt__CommenStatus*)p = *(ngwt__CommenStatus*)q; } void ngwt__CategoryRefList::soap_serialize(struct soap *soap) const @@ -64330,8 +64330,8 @@ void ngwt__CalendarItem::soap_serialize(struct soap *soap) const soap_serialize_PointerTobool(soap, &((ngwt__Mail*)this)->nntpOrImap); soap_embedded(soap, &((ngwt__Mail*)this)->smimeType, SOAP_TYPE_PointerTongwt__SMimeOperation); soap_serialize_PointerTongwt__SMimeOperation(soap, &((ngwt__Mail*)this)->smimeType); - soap_embedded(soap, &((ngwt__BoxEntry*)this)->status, SOAP_TYPE_PointerTongwt__ItemtqStatus); - soap_serialize_PointerTongwt__ItemtqStatus(soap, &((ngwt__BoxEntry*)this)->status); + soap_embedded(soap, &((ngwt__BoxEntry*)this)->status, SOAP_TYPE_PointerTongwt__ItemStatus); + soap_serialize_PointerTongwt__ItemStatus(soap, &((ngwt__BoxEntry*)this)->status); soap_embedded(soap, &((ngwt__BoxEntry*)this)->thread, SOAP_TYPE_PointerTostd__string); soap_serialize_PointerTostd__string(soap, &((ngwt__BoxEntry*)this)->thread); soap_embedded(soap, &((ngwt__BoxEntry*)this)->msgId, SOAP_TYPE_PointerTostd__string); @@ -64439,7 +64439,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__CalendarItem(struct soap *soap, const c soap_out_PointerTongwt__CategoryRefList(soap, "ngwt:categories", -1, &(((ngwt__ContainerItem*)a)->categories), ""); soap_out_string(soap, "ngwt:created", -1, &(((ngwt__ContainerItem*)a)->created), ""); soap_out_PointerTongwt__CustomList(soap, "ngwt:customs", -1, &(((ngwt__ContainerItem*)a)->customs), ""); - soap_out_PointerTongwt__ItemtqStatus(soap, "ngwt:status", -1, &(((ngwt__BoxEntry*)a)->status), ""); + soap_out_PointerTongwt__ItemStatus(soap, "ngwt:status", -1, &(((ngwt__BoxEntry*)a)->status), ""); soap_out_PointerTostd__string(soap, "ngwt:thread", -1, &(((ngwt__BoxEntry*)a)->thread), ""); soap_out_PointerTostd__string(soap, "ngwt:msgId", -1, &(((ngwt__BoxEntry*)a)->msgId), ""); soap_out_PointerTostd__string(soap, "ngwt:messageId", -1, &(((ngwt__BoxEntry*)a)->messageId), ""); @@ -64552,7 +64552,7 @@ SOAP_FMAC3 ngwt__CalendarItem * SOAP_FMAC4 soap_in_ngwt__CalendarItem(struct soa continue; } if (soap_flag_status3 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__ItemtqStatus(soap, "ngwt:status", &(((ngwt__BoxEntry*)a)->status), "ngwt:ItemStatus")) + if (soap_in_PointerTongwt__ItemStatus(soap, "ngwt:status", &(((ngwt__BoxEntry*)a)->status), "ngwt:ItemStatus")) { soap_flag_status3 = 0; continue; } @@ -64951,8 +64951,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__CalendarFolderAttribute(struct soap * void ngwt__BoxEntry::soap_serialize(struct soap *soap) const { (void)soap; /* appease -Wall -Werror */ - soap_embedded(soap, &((ngwt__BoxEntry*)this)->status, SOAP_TYPE_PointerTongwt__ItemtqStatus); - soap_serialize_PointerTongwt__ItemtqStatus(soap, &((ngwt__BoxEntry*)this)->status); + soap_embedded(soap, &((ngwt__BoxEntry*)this)->status, SOAP_TYPE_PointerTongwt__ItemStatus); + soap_serialize_PointerTongwt__ItemStatus(soap, &((ngwt__BoxEntry*)this)->status); soap_embedded(soap, &((ngwt__BoxEntry*)this)->thread, SOAP_TYPE_PointerTostd__string); soap_serialize_PointerTostd__string(soap, &((ngwt__BoxEntry*)this)->thread); soap_embedded(soap, &((ngwt__BoxEntry*)this)->msgId, SOAP_TYPE_PointerTostd__string); @@ -65042,7 +65042,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__BoxEntry(struct soap *soap, const char soap_out_PointerTongwt__CategoryRefList(soap, "ngwt:categories", -1, &(((ngwt__ContainerItem*)a)->categories), ""); soap_out_string(soap, "ngwt:created", -1, &(((ngwt__ContainerItem*)a)->created), ""); soap_out_PointerTongwt__CustomList(soap, "ngwt:customs", -1, &(((ngwt__ContainerItem*)a)->customs), ""); - soap_out_PointerTongwt__ItemtqStatus(soap, "ngwt:status", -1, &(((ngwt__BoxEntry*)a)->status), ""); + soap_out_PointerTongwt__ItemStatus(soap, "ngwt:status", -1, &(((ngwt__BoxEntry*)a)->status), ""); soap_out_PointerTostd__string(soap, "ngwt:thread", -1, &(((ngwt__BoxEntry*)a)->thread), ""); soap_out_PointerTostd__string(soap, "ngwt:msgId", -1, &(((ngwt__BoxEntry*)a)->msgId), ""); soap_out_PointerTostd__string(soap, "ngwt:messageId", -1, &(((ngwt__BoxEntry*)a)->messageId), ""); @@ -65137,7 +65137,7 @@ SOAP_FMAC3 ngwt__BoxEntry * SOAP_FMAC4 soap_in_ngwt__BoxEntry(struct soap *soap, continue; } if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__ItemtqStatus(soap, "ngwt:status", &(((ngwt__BoxEntry*)a)->status), "ngwt:ItemStatus")) + if (soap_in_PointerTongwt__ItemStatus(soap, "ngwt:status", &(((ngwt__BoxEntry*)a)->status), "ngwt:ItemStatus")) { soap_flag_status1 = 0; continue; } @@ -66068,8 +66068,8 @@ void ngwt__Appointment::soap_serialize(struct soap *soap) const soap_serialize_PointerTobool(soap, &((ngwt__Mail*)this)->nntpOrImap); soap_embedded(soap, &((ngwt__Mail*)this)->smimeType, SOAP_TYPE_PointerTongwt__SMimeOperation); soap_serialize_PointerTongwt__SMimeOperation(soap, &((ngwt__Mail*)this)->smimeType); - soap_embedded(soap, &((ngwt__BoxEntry*)this)->status, SOAP_TYPE_PointerTongwt__ItemtqStatus); - soap_serialize_PointerTongwt__ItemtqStatus(soap, &((ngwt__BoxEntry*)this)->status); + soap_embedded(soap, &((ngwt__BoxEntry*)this)->status, SOAP_TYPE_PointerTongwt__ItemStatus); + soap_serialize_PointerTongwt__ItemStatus(soap, &((ngwt__BoxEntry*)this)->status); soap_embedded(soap, &((ngwt__BoxEntry*)this)->thread, SOAP_TYPE_PointerTostd__string); soap_serialize_PointerTostd__string(soap, &((ngwt__BoxEntry*)this)->thread); soap_embedded(soap, &((ngwt__BoxEntry*)this)->msgId, SOAP_TYPE_PointerTostd__string); @@ -66186,7 +66186,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__Appointment(struct soap *soap, const ch soap_out_PointerTongwt__CategoryRefList(soap, "ngwt:categories", -1, &(((ngwt__ContainerItem*)a)->categories), ""); soap_out_string(soap, "ngwt:created", -1, &(((ngwt__ContainerItem*)a)->created), ""); soap_out_PointerTongwt__CustomList(soap, "ngwt:customs", -1, &(((ngwt__ContainerItem*)a)->customs), ""); - soap_out_PointerTongwt__ItemtqStatus(soap, "ngwt:status", -1, &(((ngwt__BoxEntry*)a)->status), ""); + soap_out_PointerTongwt__ItemStatus(soap, "ngwt:status", -1, &(((ngwt__BoxEntry*)a)->status), ""); soap_out_PointerTostd__string(soap, "ngwt:thread", -1, &(((ngwt__BoxEntry*)a)->thread), ""); soap_out_PointerTostd__string(soap, "ngwt:msgId", -1, &(((ngwt__BoxEntry*)a)->msgId), ""); soap_out_PointerTostd__string(soap, "ngwt:messageId", -1, &(((ngwt__BoxEntry*)a)->messageId), ""); @@ -66308,7 +66308,7 @@ SOAP_FMAC3 ngwt__Appointment * SOAP_FMAC4 soap_in_ngwt__Appointment(struct soap continue; } if (soap_flag_status4 && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTongwt__ItemtqStatus(soap, "ngwt:status", &(((ngwt__BoxEntry*)a)->status), "ngwt:ItemStatus")) + if (soap_in_PointerTongwt__ItemStatus(soap, "ngwt:status", &(((ngwt__BoxEntry*)a)->status), "ngwt:ItemStatus")) { soap_flag_status4 = 0; continue; } @@ -84091,49 +84091,49 @@ SOAP_FMAC3 ngwt__FullName ** SOAP_FMAC4 soap_in_PointerTongwt__FullName(struct s return a; } -SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__VersiontqStatus(struct soap *soap, enum ngwt__VersiontqStatus *const*a) +SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__VersionStatus(struct soap *soap, enum ngwt__VersionStatus *const*a) { - soap_reference(soap, *a, SOAP_TYPE_ngwt__VersiontqStatus); + soap_reference(soap, *a, SOAP_TYPE_ngwt__VersionStatus); } -SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__VersiontqStatus(struct soap *soap, enum ngwt__VersiontqStatus *const*a, const char *tag, const char *type) +SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__VersionStatus(struct soap *soap, enum ngwt__VersionStatus *const*a, const char *tag, const char *type) { - register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_PointerTongwt__VersiontqStatus); - if (soap_out_PointerTongwt__VersiontqStatus(soap, tag, id, a, type)) + register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_PointerTongwt__VersionStatus); + if (soap_out_PointerTongwt__VersionStatus(soap, tag, id, a, type)) return soap->error; return soap_putindependent(soap); } -SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__VersiontqStatus(struct soap *soap, const char *tag, int id, enum ngwt__VersiontqStatus *const*a, const char *type) +SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__VersionStatus(struct soap *soap, const char *tag, int id, enum ngwt__VersionStatus *const*a, const char *type) { - id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_ngwt__VersiontqStatus); + id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_ngwt__VersionStatus); if (id < 0) return soap->error; - return soap_out_ngwt__VersiontqStatus(soap, tag, id, *a, type); + return soap_out_ngwt__VersionStatus(soap, tag, id, *a, type); } -SOAP_FMAC3 enum ngwt__VersiontqStatus ** SOAP_FMAC4 soap_get_PointerTongwt__VersiontqStatus(struct soap *soap, enum ngwt__VersiontqStatus **p, const char *tag, const char *type) +SOAP_FMAC3 enum ngwt__VersionStatus ** SOAP_FMAC4 soap_get_PointerTongwt__VersionStatus(struct soap *soap, enum ngwt__VersionStatus **p, const char *tag, const char *type) { - if ((p = soap_in_PointerTongwt__VersiontqStatus(soap, tag, p, type))) + if ((p = soap_in_PointerTongwt__VersionStatus(soap, tag, p, type))) soap_getindependent(soap); return p; } -SOAP_FMAC3 enum ngwt__VersiontqStatus ** SOAP_FMAC4 soap_in_PointerTongwt__VersiontqStatus(struct soap *soap, const char *tag, enum ngwt__VersiontqStatus **a, const char *type) +SOAP_FMAC3 enum ngwt__VersionStatus ** SOAP_FMAC4 soap_in_PointerTongwt__VersionStatus(struct soap *soap, const char *tag, enum ngwt__VersionStatus **a, const char *type) { if (soap_element_begin_in(soap, tag, 1)) return NULL; if (!a) - if (!(a = (enum ngwt__VersiontqStatus **)soap_malloc(soap, sizeof(enum ngwt__VersiontqStatus *)))) + if (!(a = (enum ngwt__VersionStatus **)soap_malloc(soap, sizeof(enum ngwt__VersionStatus *)))) return NULL; *a = NULL; if (!soap->null && *soap->href != '#') { soap_revert(soap); - if (!(*a = soap_in_ngwt__VersiontqStatus(soap, tag, *a, type))) + if (!(*a = soap_in_ngwt__VersionStatus(soap, tag, *a, type))) return NULL; } else - { a = (enum ngwt__VersiontqStatus **)soap_id_lookup(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__VersiontqStatus, sizeof(enum ngwt__VersiontqStatus), 0); + { a = (enum ngwt__VersionStatus **)soap_id_lookup(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__VersionStatus, sizeof(enum ngwt__VersionStatus), 0); if (soap->body && soap_element_end_in(soap, tag)) return NULL; } @@ -84348,49 +84348,49 @@ SOAP_FMAC3 ngwt__Query ** SOAP_FMAC4 soap_in_PointerTongwt__Query(struct soap *s return a; } -SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__FolderACLtqStatus(struct soap *soap, enum ngwt__FolderACLtqStatus *const*a) +SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__FolderACLStatus(struct soap *soap, enum ngwt__FolderACLStatus *const*a) { - soap_reference(soap, *a, SOAP_TYPE_ngwt__FolderACLtqStatus); + soap_reference(soap, *a, SOAP_TYPE_ngwt__FolderACLStatus); } -SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__FolderACLtqStatus(struct soap *soap, enum ngwt__FolderACLtqStatus *const*a, const char *tag, const char *type) +SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__FolderACLStatus(struct soap *soap, enum ngwt__FolderACLStatus *const*a, const char *tag, const char *type) { - register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_PointerTongwt__FolderACLtqStatus); - if (soap_out_PointerTongwt__FolderACLtqStatus(soap, tag, id, a, type)) + register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_PointerTongwt__FolderACLStatus); + if (soap_out_PointerTongwt__FolderACLStatus(soap, tag, id, a, type)) return soap->error; return soap_putindependent(soap); } -SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__FolderACLtqStatus(struct soap *soap, const char *tag, int id, enum ngwt__FolderACLtqStatus *const*a, const char *type) +SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__FolderACLStatus(struct soap *soap, const char *tag, int id, enum ngwt__FolderACLStatus *const*a, const char *type) { - id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_ngwt__FolderACLtqStatus); + id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_ngwt__FolderACLStatus); if (id < 0) return soap->error; - return soap_out_ngwt__FolderACLtqStatus(soap, tag, id, *a, type); + return soap_out_ngwt__FolderACLStatus(soap, tag, id, *a, type); } -SOAP_FMAC3 enum ngwt__FolderACLtqStatus ** SOAP_FMAC4 soap_get_PointerTongwt__FolderACLtqStatus(struct soap *soap, enum ngwt__FolderACLtqStatus **p, const char *tag, const char *type) +SOAP_FMAC3 enum ngwt__FolderACLStatus ** SOAP_FMAC4 soap_get_PointerTongwt__FolderACLStatus(struct soap *soap, enum ngwt__FolderACLStatus **p, const char *tag, const char *type) { - if ((p = soap_in_PointerTongwt__FolderACLtqStatus(soap, tag, p, type))) + if ((p = soap_in_PointerTongwt__FolderACLStatus(soap, tag, p, type))) soap_getindependent(soap); return p; } -SOAP_FMAC3 enum ngwt__FolderACLtqStatus ** SOAP_FMAC4 soap_in_PointerTongwt__FolderACLtqStatus(struct soap *soap, const char *tag, enum ngwt__FolderACLtqStatus **a, const char *type) +SOAP_FMAC3 enum ngwt__FolderACLStatus ** SOAP_FMAC4 soap_in_PointerTongwt__FolderACLStatus(struct soap *soap, const char *tag, enum ngwt__FolderACLStatus **a, const char *type) { if (soap_element_begin_in(soap, tag, 1)) return NULL; if (!a) - if (!(a = (enum ngwt__FolderACLtqStatus **)soap_malloc(soap, sizeof(enum ngwt__FolderACLtqStatus *)))) + if (!(a = (enum ngwt__FolderACLStatus **)soap_malloc(soap, sizeof(enum ngwt__FolderACLStatus *)))) return NULL; *a = NULL; if (!soap->null && *soap->href != '#') { soap_revert(soap); - if (!(*a = soap_in_ngwt__FolderACLtqStatus(soap, tag, *a, type))) + if (!(*a = soap_in_ngwt__FolderACLStatus(soap, tag, *a, type))) return NULL; } else - { a = (enum ngwt__FolderACLtqStatus **)soap_id_lookup(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__FolderACLtqStatus, sizeof(enum ngwt__FolderACLtqStatus), 0); + { a = (enum ngwt__FolderACLStatus **)soap_id_lookup(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__FolderACLStatus, sizeof(enum ngwt__FolderACLStatus), 0); if (soap->body && soap_element_end_in(soap, tag)) return NULL; } @@ -84695,53 +84695,53 @@ SOAP_FMAC3 enum ngwt__ItemSource ** SOAP_FMAC4 soap_in_PointerTongwt__ItemSource return a; } -SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__ItemtqStatus(struct soap *soap, ngwt__ItemtqStatus *const*a) +SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__ItemStatus(struct soap *soap, ngwt__ItemStatus *const*a) { - if (!soap_reference(soap, *a, SOAP_TYPE_ngwt__ItemtqStatus)) + if (!soap_reference(soap, *a, SOAP_TYPE_ngwt__ItemStatus)) (*a)->soap_serialize(soap); } -SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__ItemtqStatus(struct soap *soap, ngwt__ItemtqStatus *const*a, const char *tag, const char *type) +SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__ItemStatus(struct soap *soap, ngwt__ItemStatus *const*a, const char *tag, const char *type) { - register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_PointerTongwt__ItemtqStatus); - if (soap_out_PointerTongwt__ItemtqStatus(soap, tag, id, a, type)) + register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_PointerTongwt__ItemStatus); + if (soap_out_PointerTongwt__ItemStatus(soap, tag, id, a, type)) return soap->error; return soap_putindependent(soap); } -SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__ItemtqStatus(struct soap *soap, const char *tag, int id, ngwt__ItemtqStatus *const*a, const char *type) +SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__ItemStatus(struct soap *soap, const char *tag, int id, ngwt__ItemStatus *const*a, const char *type) { - id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_ngwt__ItemtqStatus); + id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_ngwt__ItemStatus); if (id < 0) return soap->error; return (*a)->soap_out(soap, tag, id, type); } -SOAP_FMAC3 ngwt__ItemtqStatus ** SOAP_FMAC4 soap_get_PointerTongwt__ItemtqStatus(struct soap *soap, ngwt__ItemtqStatus **p, const char *tag, const char *type) +SOAP_FMAC3 ngwt__ItemStatus ** SOAP_FMAC4 soap_get_PointerTongwt__ItemStatus(struct soap *soap, ngwt__ItemStatus **p, const char *tag, const char *type) { - if ((p = soap_in_PointerTongwt__ItemtqStatus(soap, tag, p, type))) + if ((p = soap_in_PointerTongwt__ItemStatus(soap, tag, p, type))) soap_getindependent(soap); return p; } -SOAP_FMAC3 ngwt__ItemtqStatus ** SOAP_FMAC4 soap_in_PointerTongwt__ItemtqStatus(struct soap *soap, const char *tag, ngwt__ItemtqStatus **a, const char *type) +SOAP_FMAC3 ngwt__ItemStatus ** SOAP_FMAC4 soap_in_PointerTongwt__ItemStatus(struct soap *soap, const char *tag, ngwt__ItemStatus **a, const char *type) { if (soap_element_begin_in(soap, tag, 1)) return NULL; if (!a) - if (!(a = (ngwt__ItemtqStatus **)soap_malloc(soap, sizeof(ngwt__ItemtqStatus *)))) + if (!(a = (ngwt__ItemStatus **)soap_malloc(soap, sizeof(ngwt__ItemStatus *)))) return NULL; *a = NULL; if (!soap->null && *soap->href != '#') { soap_revert(soap); - if (!(*a = (ngwt__ItemtqStatus *)soap_instantiate_ngwt__ItemtqStatus(soap, -1, soap->type, soap->arrayType, NULL))) + if (!(*a = (ngwt__ItemStatus *)soap_instantiate_ngwt__ItemStatus(soap, -1, soap->type, soap->arrayType, NULL))) return NULL; (*a)->soap_default(soap); if (!(*a)->soap_in(soap, tag, NULL)) return NULL; } else - { a = (ngwt__ItemtqStatus **)soap_id_lookup(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__ItemtqStatus, sizeof(ngwt__ItemtqStatus), 0); + { a = (ngwt__ItemStatus **)soap_id_lookup(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__ItemStatus, sizeof(ngwt__ItemStatus), 0); if (soap->body && soap_element_end_in(soap, tag)) return NULL; } @@ -84797,53 +84797,53 @@ SOAP_FMAC3 enum ngwt__DeltaSyncType ** SOAP_FMAC4 soap_in_PointerTongwt__DeltaSy return a; } -SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__RecipientqStatus(struct soap *soap, ngwt__RecipientqStatus *const*a) +SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__RecipienStatus(struct soap *soap, ngwt__RecipienStatus *const*a) { - if (!soap_reference(soap, *a, SOAP_TYPE_ngwt__RecipientqStatus)) + if (!soap_reference(soap, *a, SOAP_TYPE_ngwt__RecipienStatus)) (*a)->soap_serialize(soap); } -SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__RecipientqStatus(struct soap *soap, ngwt__RecipientqStatus *const*a, const char *tag, const char *type) +SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__RecipienStatus(struct soap *soap, ngwt__RecipienStatus *const*a, const char *tag, const char *type) { - register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_PointerTongwt__RecipientqStatus); - if (soap_out_PointerTongwt__RecipientqStatus(soap, tag, id, a, type)) + register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_PointerTongwt__RecipienStatus); + if (soap_out_PointerTongwt__RecipienStatus(soap, tag, id, a, type)) return soap->error; return soap_putindependent(soap); } -SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__RecipientqStatus(struct soap *soap, const char *tag, int id, ngwt__RecipientqStatus *const*a, const char *type) +SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__RecipienStatus(struct soap *soap, const char *tag, int id, ngwt__RecipienStatus *const*a, const char *type) { - id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_ngwt__RecipientqStatus); + id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_ngwt__RecipienStatus); if (id < 0) return soap->error; return (*a)->soap_out(soap, tag, id, type); } -SOAP_FMAC3 ngwt__RecipientqStatus ** SOAP_FMAC4 soap_get_PointerTongwt__RecipientqStatus(struct soap *soap, ngwt__RecipientqStatus **p, const char *tag, const char *type) +SOAP_FMAC3 ngwt__RecipienStatus ** SOAP_FMAC4 soap_get_PointerTongwt__RecipienStatus(struct soap *soap, ngwt__RecipienStatus **p, const char *tag, const char *type) { - if ((p = soap_in_PointerTongwt__RecipientqStatus(soap, tag, p, type))) + if ((p = soap_in_PointerTongwt__RecipienStatus(soap, tag, p, type))) soap_getindependent(soap); return p; } -SOAP_FMAC3 ngwt__RecipientqStatus ** SOAP_FMAC4 soap_in_PointerTongwt__RecipientqStatus(struct soap *soap, const char *tag, ngwt__RecipientqStatus **a, const char *type) +SOAP_FMAC3 ngwt__RecipienStatus ** SOAP_FMAC4 soap_in_PointerTongwt__RecipienStatus(struct soap *soap, const char *tag, ngwt__RecipienStatus **a, const char *type) { if (soap_element_begin_in(soap, tag, 1)) return NULL; if (!a) - if (!(a = (ngwt__RecipientqStatus **)soap_malloc(soap, sizeof(ngwt__RecipientqStatus *)))) + if (!(a = (ngwt__RecipienStatus **)soap_malloc(soap, sizeof(ngwt__RecipienStatus *)))) return NULL; *a = NULL; if (!soap->null && *soap->href != '#') { soap_revert(soap); - if (!(*a = (ngwt__RecipientqStatus *)soap_instantiate_ngwt__RecipientqStatus(soap, -1, soap->type, soap->arrayType, NULL))) + if (!(*a = (ngwt__RecipienStatus *)soap_instantiate_ngwt__RecipienStatus(soap, -1, soap->type, soap->arrayType, NULL))) return NULL; (*a)->soap_default(soap); if (!(*a)->soap_in(soap, tag, NULL)) return NULL; } else - { a = (ngwt__RecipientqStatus **)soap_id_lookup(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__RecipientqStatus, sizeof(ngwt__RecipientqStatus), 0); + { a = (ngwt__RecipienStatus **)soap_id_lookup(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__RecipienStatus, sizeof(ngwt__RecipienStatus), 0); if (soap->body && soap_element_end_in(soap, tag)) return NULL; } @@ -87507,53 +87507,53 @@ SOAP_FMAC3 std::string ** SOAP_FMAC4 soap_in_PointerTongwt__View(struct soap *so return a; } -SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__tqStatus(struct soap *soap, ngwt__tqStatus *const*a) +SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__Status(struct soap *soap, ngwt__Status *const*a) { - if (!soap_reference(soap, *a, SOAP_TYPE_ngwt__tqStatus)) + if (!soap_reference(soap, *a, SOAP_TYPE_ngwt__Status)) (*a)->soap_serialize(soap); } -SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__tqStatus(struct soap *soap, ngwt__tqStatus *const*a, const char *tag, const char *type) +SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__Status(struct soap *soap, ngwt__Status *const*a, const char *tag, const char *type) { - register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_PointerTongwt__tqStatus); - if (soap_out_PointerTongwt__tqStatus(soap, tag, id, a, type)) + register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_PointerTongwt__Status); + if (soap_out_PointerTongwt__Status(soap, tag, id, a, type)) return soap->error; return soap_putindependent(soap); } -SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__tqStatus(struct soap *soap, const char *tag, int id, ngwt__tqStatus *const*a, const char *type) +SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__Status(struct soap *soap, const char *tag, int id, ngwt__Status *const*a, const char *type) { - id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_ngwt__tqStatus); + id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_ngwt__Status); if (id < 0) return soap->error; return (*a)->soap_out(soap, tag, id, type); } -SOAP_FMAC3 ngwt__tqStatus ** SOAP_FMAC4 soap_get_PointerTongwt__tqStatus(struct soap *soap, ngwt__tqStatus **p, const char *tag, const char *type) +SOAP_FMAC3 ngwt__Status ** SOAP_FMAC4 soap_get_PointerTongwt__Status(struct soap *soap, ngwt__Status **p, const char *tag, const char *type) { - if ((p = soap_in_PointerTongwt__tqStatus(soap, tag, p, type))) + if ((p = soap_in_PointerTongwt__Status(soap, tag, p, type))) soap_getindependent(soap); return p; } -SOAP_FMAC3 ngwt__tqStatus ** SOAP_FMAC4 soap_in_PointerTongwt__tqStatus(struct soap *soap, const char *tag, ngwt__tqStatus **a, const char *type) +SOAP_FMAC3 ngwt__Status ** SOAP_FMAC4 soap_in_PointerTongwt__Status(struct soap *soap, const char *tag, ngwt__Status **a, const char *type) { if (soap_element_begin_in(soap, tag, 1)) return NULL; if (!a) - if (!(a = (ngwt__tqStatus **)soap_malloc(soap, sizeof(ngwt__tqStatus *)))) + if (!(a = (ngwt__Status **)soap_malloc(soap, sizeof(ngwt__Status *)))) return NULL; *a = NULL; if (!soap->null && *soap->href != '#') { soap_revert(soap); - if (!(*a = (ngwt__tqStatus *)soap_instantiate_ngwt__tqStatus(soap, -1, soap->type, soap->arrayType, NULL))) + if (!(*a = (ngwt__Status *)soap_instantiate_ngwt__Status(soap, -1, soap->type, soap->arrayType, NULL))) return NULL; (*a)->soap_default(soap); if (!(*a)->soap_in(soap, tag, NULL)) return NULL; } else - { a = (ngwt__tqStatus **)soap_id_lookup(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__tqStatus, sizeof(ngwt__tqStatus), 0); + { a = (ngwt__Status **)soap_id_lookup(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__Status, sizeof(ngwt__Status), 0); if (soap->body && soap_element_end_in(soap, tag)) return NULL; } @@ -88967,212 +88967,212 @@ SOAP_FMAC3 enum ngwt__Frequency ** SOAP_FMAC4 soap_in_PointerTongwt__Frequency(s return a; } -SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__DelegateetqStatus(struct soap *soap, ngwt__DelegateetqStatus *const*a) +SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__DelegateeStatus(struct soap *soap, ngwt__DelegateeStatus *const*a) { - if (!soap_reference(soap, *a, SOAP_TYPE_ngwt__DelegateetqStatus)) + if (!soap_reference(soap, *a, SOAP_TYPE_ngwt__DelegateeStatus)) (*a)->soap_serialize(soap); } -SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__DelegateetqStatus(struct soap *soap, ngwt__DelegateetqStatus *const*a, const char *tag, const char *type) +SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__DelegateeStatus(struct soap *soap, ngwt__DelegateeStatus *const*a, const char *tag, const char *type) { - register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_PointerTongwt__DelegateetqStatus); - if (soap_out_PointerTongwt__DelegateetqStatus(soap, tag, id, a, type)) + register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_PointerTongwt__DelegateeStatus); + if (soap_out_PointerTongwt__DelegateeStatus(soap, tag, id, a, type)) return soap->error; return soap_putindependent(soap); } -SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__DelegateetqStatus(struct soap *soap, const char *tag, int id, ngwt__DelegateetqStatus *const*a, const char *type) +SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__DelegateeStatus(struct soap *soap, const char *tag, int id, ngwt__DelegateeStatus *const*a, const char *type) { - id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_ngwt__DelegateetqStatus); + id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_ngwt__DelegateeStatus); if (id < 0) return soap->error; return (*a)->soap_out(soap, tag, id, type); } -SOAP_FMAC3 ngwt__DelegateetqStatus ** SOAP_FMAC4 soap_get_PointerTongwt__DelegateetqStatus(struct soap *soap, ngwt__DelegateetqStatus **p, const char *tag, const char *type) +SOAP_FMAC3 ngwt__DelegateeStatus ** SOAP_FMAC4 soap_get_PointerTongwt__DelegateeStatus(struct soap *soap, ngwt__DelegateeStatus **p, const char *tag, const char *type) { - if ((p = soap_in_PointerTongwt__DelegateetqStatus(soap, tag, p, type))) + if ((p = soap_in_PointerTongwt__DelegateeStatus(soap, tag, p, type))) soap_getindependent(soap); return p; } -SOAP_FMAC3 ngwt__DelegateetqStatus ** SOAP_FMAC4 soap_in_PointerTongwt__DelegateetqStatus(struct soap *soap, const char *tag, ngwt__DelegateetqStatus **a, const char *type) +SOAP_FMAC3 ngwt__DelegateeStatus ** SOAP_FMAC4 soap_in_PointerTongwt__DelegateeStatus(struct soap *soap, const char *tag, ngwt__DelegateeStatus **a, const char *type) { if (soap_element_begin_in(soap, tag, 1)) return NULL; if (!a) - if (!(a = (ngwt__DelegateetqStatus **)soap_malloc(soap, sizeof(ngwt__DelegateetqStatus *)))) + if (!(a = (ngwt__DelegateeStatus **)soap_malloc(soap, sizeof(ngwt__DelegateeStatus *)))) return NULL; *a = NULL; if (!soap->null && *soap->href != '#') { soap_revert(soap); - if (!(*a = (ngwt__DelegateetqStatus *)soap_instantiate_ngwt__DelegateetqStatus(soap, -1, soap->type, soap->arrayType, NULL))) + if (!(*a = (ngwt__DelegateeStatus *)soap_instantiate_ngwt__DelegateeStatus(soap, -1, soap->type, soap->arrayType, NULL))) return NULL; (*a)->soap_default(soap); if (!(*a)->soap_in(soap, tag, NULL)) return NULL; } else - { a = (ngwt__DelegateetqStatus **)soap_id_lookup(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__DelegateetqStatus, sizeof(ngwt__DelegateetqStatus), 0); + { a = (ngwt__DelegateeStatus **)soap_id_lookup(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__DelegateeStatus, sizeof(ngwt__DelegateeStatus), 0); if (soap->body && soap_element_end_in(soap, tag)) return NULL; } return a; } -SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__DelegatedtqStatus(struct soap *soap, ngwt__DelegatedtqStatus *const*a) +SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__DelegatedStatus(struct soap *soap, ngwt__DelegatedStatus *const*a) { - if (!soap_reference(soap, *a, SOAP_TYPE_ngwt__DelegatedtqStatus)) + if (!soap_reference(soap, *a, SOAP_TYPE_ngwt__DelegatedStatus)) (*a)->soap_serialize(soap); } -SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__DelegatedtqStatus(struct soap *soap, ngwt__DelegatedtqStatus *const*a, const char *tag, const char *type) +SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__DelegatedStatus(struct soap *soap, ngwt__DelegatedStatus *const*a, const char *tag, const char *type) { - register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_PointerTongwt__DelegatedtqStatus); - if (soap_out_PointerTongwt__DelegatedtqStatus(soap, tag, id, a, type)) + register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_PointerTongwt__DelegatedStatus); + if (soap_out_PointerTongwt__DelegatedStatus(soap, tag, id, a, type)) return soap->error; return soap_putindependent(soap); } -SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__DelegatedtqStatus(struct soap *soap, const char *tag, int id, ngwt__DelegatedtqStatus *const*a, const char *type) +SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__DelegatedStatus(struct soap *soap, const char *tag, int id, ngwt__DelegatedStatus *const*a, const char *type) { - id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_ngwt__DelegatedtqStatus); + id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_ngwt__DelegatedStatus); if (id < 0) return soap->error; return (*a)->soap_out(soap, tag, id, type); } -SOAP_FMAC3 ngwt__DelegatedtqStatus ** SOAP_FMAC4 soap_get_PointerTongwt__DelegatedtqStatus(struct soap *soap, ngwt__DelegatedtqStatus **p, const char *tag, const char *type) +SOAP_FMAC3 ngwt__DelegatedStatus ** SOAP_FMAC4 soap_get_PointerTongwt__DelegatedStatus(struct soap *soap, ngwt__DelegatedStatus **p, const char *tag, const char *type) { - if ((p = soap_in_PointerTongwt__DelegatedtqStatus(soap, tag, p, type))) + if ((p = soap_in_PointerTongwt__DelegatedStatus(soap, tag, p, type))) soap_getindependent(soap); return p; } -SOAP_FMAC3 ngwt__DelegatedtqStatus ** SOAP_FMAC4 soap_in_PointerTongwt__DelegatedtqStatus(struct soap *soap, const char *tag, ngwt__DelegatedtqStatus **a, const char *type) +SOAP_FMAC3 ngwt__DelegatedStatus ** SOAP_FMAC4 soap_in_PointerTongwt__DelegatedStatus(struct soap *soap, const char *tag, ngwt__DelegatedStatus **a, const char *type) { if (soap_element_begin_in(soap, tag, 1)) return NULL; if (!a) - if (!(a = (ngwt__DelegatedtqStatus **)soap_malloc(soap, sizeof(ngwt__DelegatedtqStatus *)))) + if (!(a = (ngwt__DelegatedStatus **)soap_malloc(soap, sizeof(ngwt__DelegatedStatus *)))) return NULL; *a = NULL; if (!soap->null && *soap->href != '#') { soap_revert(soap); - if (!(*a = (ngwt__DelegatedtqStatus *)soap_instantiate_ngwt__DelegatedtqStatus(soap, -1, soap->type, soap->arrayType, NULL))) + if (!(*a = (ngwt__DelegatedStatus *)soap_instantiate_ngwt__DelegatedStatus(soap, -1, soap->type, soap->arrayType, NULL))) return NULL; (*a)->soap_default(soap); if (!(*a)->soap_in(soap, tag, NULL)) return NULL; } else - { a = (ngwt__DelegatedtqStatus **)soap_id_lookup(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__DelegatedtqStatus, sizeof(ngwt__DelegatedtqStatus), 0); + { a = (ngwt__DelegatedStatus **)soap_id_lookup(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__DelegatedStatus, sizeof(ngwt__DelegatedStatus), 0); if (soap->body && soap_element_end_in(soap, tag)) return NULL; } return a; } -SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__CommentqStatus(struct soap *soap, ngwt__CommentqStatus *const*a) +SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__CommenStatus(struct soap *soap, ngwt__CommenStatus *const*a) { - if (!soap_reference(soap, *a, SOAP_TYPE_ngwt__CommentqStatus)) + if (!soap_reference(soap, *a, SOAP_TYPE_ngwt__CommenStatus)) (*a)->soap_serialize(soap); } -SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__CommentqStatus(struct soap *soap, ngwt__CommentqStatus *const*a, const char *tag, const char *type) +SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__CommenStatus(struct soap *soap, ngwt__CommenStatus *const*a, const char *tag, const char *type) { - register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_PointerTongwt__CommentqStatus); - if (soap_out_PointerTongwt__CommentqStatus(soap, tag, id, a, type)) + register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_PointerTongwt__CommenStatus); + if (soap_out_PointerTongwt__CommenStatus(soap, tag, id, a, type)) return soap->error; return soap_putindependent(soap); } -SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__CommentqStatus(struct soap *soap, const char *tag, int id, ngwt__CommentqStatus *const*a, const char *type) +SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__CommenStatus(struct soap *soap, const char *tag, int id, ngwt__CommenStatus *const*a, const char *type) { - id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_ngwt__CommentqStatus); + id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_ngwt__CommenStatus); if (id < 0) return soap->error; return (*a)->soap_out(soap, tag, id, type); } -SOAP_FMAC3 ngwt__CommentqStatus ** SOAP_FMAC4 soap_get_PointerTongwt__CommentqStatus(struct soap *soap, ngwt__CommentqStatus **p, const char *tag, const char *type) +SOAP_FMAC3 ngwt__CommenStatus ** SOAP_FMAC4 soap_get_PointerTongwt__CommenStatus(struct soap *soap, ngwt__CommenStatus **p, const char *tag, const char *type) { - if ((p = soap_in_PointerTongwt__CommentqStatus(soap, tag, p, type))) + if ((p = soap_in_PointerTongwt__CommenStatus(soap, tag, p, type))) soap_getindependent(soap); return p; } -SOAP_FMAC3 ngwt__CommentqStatus ** SOAP_FMAC4 soap_in_PointerTongwt__CommentqStatus(struct soap *soap, const char *tag, ngwt__CommentqStatus **a, const char *type) +SOAP_FMAC3 ngwt__CommenStatus ** SOAP_FMAC4 soap_in_PointerTongwt__CommenStatus(struct soap *soap, const char *tag, ngwt__CommenStatus **a, const char *type) { if (soap_element_begin_in(soap, tag, 1)) return NULL; if (!a) - if (!(a = (ngwt__CommentqStatus **)soap_malloc(soap, sizeof(ngwt__CommentqStatus *)))) + if (!(a = (ngwt__CommenStatus **)soap_malloc(soap, sizeof(ngwt__CommenStatus *)))) return NULL; *a = NULL; if (!soap->null && *soap->href != '#') { soap_revert(soap); - if (!(*a = (ngwt__CommentqStatus *)soap_instantiate_ngwt__CommentqStatus(soap, -1, soap->type, soap->arrayType, NULL))) + if (!(*a = (ngwt__CommenStatus *)soap_instantiate_ngwt__CommenStatus(soap, -1, soap->type, soap->arrayType, NULL))) return NULL; (*a)->soap_default(soap); if (!(*a)->soap_in(soap, tag, NULL)) return NULL; } else - { a = (ngwt__CommentqStatus **)soap_id_lookup(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__CommentqStatus, sizeof(ngwt__CommentqStatus), 0); + { a = (ngwt__CommenStatus **)soap_id_lookup(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__CommenStatus, sizeof(ngwt__CommenStatus), 0); if (soap->body && soap_element_end_in(soap, tag)) return NULL; } return a; } -SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__TransferFailedtqStatus(struct soap *soap, ngwt__TransferFailedtqStatus *const*a) +SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__TransferFailedStatus(struct soap *soap, ngwt__TransferFailedStatus *const*a) { - if (!soap_reference(soap, *a, SOAP_TYPE_ngwt__TransferFailedtqStatus)) + if (!soap_reference(soap, *a, SOAP_TYPE_ngwt__TransferFailedStatus)) (*a)->soap_serialize(soap); } -SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__TransferFailedtqStatus(struct soap *soap, ngwt__TransferFailedtqStatus *const*a, const char *tag, const char *type) +SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__TransferFailedStatus(struct soap *soap, ngwt__TransferFailedStatus *const*a, const char *tag, const char *type) { - register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_PointerTongwt__TransferFailedtqStatus); - if (soap_out_PointerTongwt__TransferFailedtqStatus(soap, tag, id, a, type)) + register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_PointerTongwt__TransferFailedStatus); + if (soap_out_PointerTongwt__TransferFailedStatus(soap, tag, id, a, type)) return soap->error; return soap_putindependent(soap); } -SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__TransferFailedtqStatus(struct soap *soap, const char *tag, int id, ngwt__TransferFailedtqStatus *const*a, const char *type) +SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__TransferFailedStatus(struct soap *soap, const char *tag, int id, ngwt__TransferFailedStatus *const*a, const char *type) { - id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_ngwt__TransferFailedtqStatus); + id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_ngwt__TransferFailedStatus); if (id < 0) return soap->error; return (*a)->soap_out(soap, tag, id, type); } -SOAP_FMAC3 ngwt__TransferFailedtqStatus ** SOAP_FMAC4 soap_get_PointerTongwt__TransferFailedtqStatus(struct soap *soap, ngwt__TransferFailedtqStatus **p, const char *tag, const char *type) +SOAP_FMAC3 ngwt__TransferFailedStatus ** SOAP_FMAC4 soap_get_PointerTongwt__TransferFailedStatus(struct soap *soap, ngwt__TransferFailedStatus **p, const char *tag, const char *type) { - if ((p = soap_in_PointerTongwt__TransferFailedtqStatus(soap, tag, p, type))) + if ((p = soap_in_PointerTongwt__TransferFailedStatus(soap, tag, p, type))) soap_getindependent(soap); return p; } -SOAP_FMAC3 ngwt__TransferFailedtqStatus ** SOAP_FMAC4 soap_in_PointerTongwt__TransferFailedtqStatus(struct soap *soap, const char *tag, ngwt__TransferFailedtqStatus **a, const char *type) +SOAP_FMAC3 ngwt__TransferFailedStatus ** SOAP_FMAC4 soap_in_PointerTongwt__TransferFailedStatus(struct soap *soap, const char *tag, ngwt__TransferFailedStatus **a, const char *type) { if (soap_element_begin_in(soap, tag, 1)) return NULL; if (!a) - if (!(a = (ngwt__TransferFailedtqStatus **)soap_malloc(soap, sizeof(ngwt__TransferFailedtqStatus *)))) + if (!(a = (ngwt__TransferFailedStatus **)soap_malloc(soap, sizeof(ngwt__TransferFailedStatus *)))) return NULL; *a = NULL; if (!soap->null && *soap->href != '#') { soap_revert(soap); - if (!(*a = (ngwt__TransferFailedtqStatus *)soap_instantiate_ngwt__TransferFailedtqStatus(soap, -1, soap->type, soap->arrayType, NULL))) + if (!(*a = (ngwt__TransferFailedStatus *)soap_instantiate_ngwt__TransferFailedStatus(soap, -1, soap->type, soap->arrayType, NULL))) return NULL; (*a)->soap_default(soap); if (!(*a)->soap_in(soap, tag, NULL)) return NULL; } else - { a = (ngwt__TransferFailedtqStatus **)soap_id_lookup(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__TransferFailedtqStatus, sizeof(ngwt__TransferFailedtqStatus), 0); + { a = (ngwt__TransferFailedStatus **)soap_id_lookup(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__TransferFailedStatus, sizeof(ngwt__TransferFailedStatus), 0); if (soap->body && soap_element_end_in(soap, tag)) return NULL; } @@ -93265,61 +93265,61 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy_std__vectorTemplateOfxsd__date(struct soap *(std::vector<std::string >*)p = *(std::vector<std::string >*)q; } -SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(struct soap *soap, const std::vector<ngwt__DelegateetqStatus * >*a) +SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_std__vectorTemplateOfPointerTongwt__DelegateeStatus(struct soap *soap, const std::vector<ngwt__DelegateeStatus * >*a) { - for (std::vector<ngwt__DelegateetqStatus * >::const_iterator i = a->begin(); i != a->end(); ++i) - soap_serialize_PointerTongwt__DelegateetqStatus(soap, &(*i)); + for (std::vector<ngwt__DelegateeStatus * >::const_iterator i = a->begin(); i != a->end(); ++i) + soap_serialize_PointerTongwt__DelegateeStatus(soap, &(*i)); } -SOAP_FMAC3 void SOAP_FMAC4 soap_default_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(struct soap *soap, std::vector<ngwt__DelegateetqStatus * >*p) +SOAP_FMAC3 void SOAP_FMAC4 soap_default_std__vectorTemplateOfPointerTongwt__DelegateeStatus(struct soap *soap, std::vector<ngwt__DelegateeStatus * >*p) { p->clear(); } -SOAP_FMAC3 int SOAP_FMAC4 soap_put_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(struct soap *soap, const std::vector<ngwt__DelegateetqStatus * >*a, const char *tag, const char *type) +SOAP_FMAC3 int SOAP_FMAC4 soap_put_std__vectorTemplateOfPointerTongwt__DelegateeStatus(struct soap *soap, const std::vector<ngwt__DelegateeStatus * >*a, const char *tag, const char *type) { - register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_std__vectorTemplateOfPointerTongwt__DelegateetqStatus); - if (soap_out_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(soap, tag, id, a, type)) + register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_std__vectorTemplateOfPointerTongwt__DelegateeStatus); + if (soap_out_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, tag, id, a, type)) return soap->error; return soap_putindependent(soap); } -SOAP_FMAC3 int SOAP_FMAC4 soap_out_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(struct soap *soap, const char *tag, int id, const std::vector<ngwt__DelegateetqStatus * >*a, const char *type) +SOAP_FMAC3 int SOAP_FMAC4 soap_out_std__vectorTemplateOfPointerTongwt__DelegateeStatus(struct soap *soap, const char *tag, int id, const std::vector<ngwt__DelegateeStatus * >*a, const char *type) { - for (std::vector<ngwt__DelegateetqStatus * >::const_iterator i = a->begin(); i != a->end(); ++i) + for (std::vector<ngwt__DelegateeStatus * >::const_iterator i = a->begin(); i != a->end(); ++i) { - if (soap_out_PointerTongwt__DelegateetqStatus(soap, tag, id, &(*i), "")) + if (soap_out_PointerTongwt__DelegateeStatus(soap, tag, id, &(*i), "")) return soap->error; } return SOAP_OK; } -SOAP_FMAC3 std::vector<ngwt__DelegateetqStatus * >* SOAP_FMAC4 soap_get_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(struct soap *soap, std::vector<ngwt__DelegateetqStatus * >*p, const char *tag, const char *type) +SOAP_FMAC3 std::vector<ngwt__DelegateeStatus * >* SOAP_FMAC4 soap_get_std__vectorTemplateOfPointerTongwt__DelegateeStatus(struct soap *soap, std::vector<ngwt__DelegateeStatus * >*p, const char *tag, const char *type) { - if ((p = soap_in_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(soap, tag, p, type))) + if ((p = soap_in_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, tag, p, type))) soap_getindependent(soap); return p; } -SOAP_FMAC3 std::vector<ngwt__DelegateetqStatus * >* SOAP_FMAC4 soap_in_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(struct soap *soap, const char *tag, std::vector<ngwt__DelegateetqStatus * >*a, const char *type) +SOAP_FMAC3 std::vector<ngwt__DelegateeStatus * >* SOAP_FMAC4 soap_in_std__vectorTemplateOfPointerTongwt__DelegateeStatus(struct soap *soap, const char *tag, std::vector<ngwt__DelegateeStatus * >*a, const char *type) { if (soap_element_begin_in(soap, tag, 1)) return NULL; - if (!a && !(a = soap_new_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(soap, -1))) + if (!a && !(a = soap_new_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, -1))) return NULL; - ngwt__DelegateetqStatus *n; - ngwt__DelegateetqStatus **p; + ngwt__DelegateeStatus *n; + ngwt__DelegateeStatus **p; do { soap_revert(soap); if (*soap->id || *soap->href) - { if (!soap_container_id_forward(soap, *soap->id?soap->id:soap->href, a, SOAP_TYPE_ngwt__DelegateetqStatus, SOAP_TYPE_std__vectorTemplateOfPointerTongwt__DelegateetqStatus, sizeof(ngwt__DelegateetqStatus), 1)) + { if (!soap_container_id_forward(soap, *soap->id?soap->id:soap->href, a, SOAP_TYPE_ngwt__DelegateeStatus, SOAP_TYPE_std__vectorTemplateOfPointerTongwt__DelegateeStatus, sizeof(ngwt__DelegateeStatus), 1)) break; - if (!(p = soap_in_PointerTongwt__DelegateetqStatus(soap, tag, NULL, "ngwt:DelegateeStatus"))) + if (!(p = soap_in_PointerTongwt__DelegateeStatus(soap, tag, NULL, "ngwt:DelegateeStatus"))) break; } else { n = NULL; - if (!soap_in_PointerTongwt__DelegateetqStatus(soap, tag, &n, "ngwt:DelegateeStatus")) + if (!soap_in_PointerTongwt__DelegateeStatus(soap, tag, &n, "ngwt:DelegateeStatus")) break; a->insert(a->end(), n); } @@ -93332,38 +93332,38 @@ SOAP_FMAC3 std::vector<ngwt__DelegateetqStatus * >* SOAP_FMAC4 soap_in_std__vect return NULL; } -SOAP_FMAC5 std::vector<ngwt__DelegateetqStatus * > * SOAP_FMAC6 soap_new_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(struct soap *soap, int n) -{ return soap_instantiate_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(soap, n, NULL, NULL, NULL); +SOAP_FMAC5 std::vector<ngwt__DelegateeStatus * > * SOAP_FMAC6 soap_new_std__vectorTemplateOfPointerTongwt__DelegateeStatus(struct soap *soap, int n) +{ return soap_instantiate_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, n, NULL, NULL, NULL); } -SOAP_FMAC5 void SOAP_FMAC6 soap_delete_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(struct soap *soap, std::vector<ngwt__DelegateetqStatus * >*p) +SOAP_FMAC5 void SOAP_FMAC6 soap_delete_std__vectorTemplateOfPointerTongwt__DelegateeStatus(struct soap *soap, std::vector<ngwt__DelegateeStatus * >*p) { soap_delete(soap, p); } -SOAP_FMAC5 std::vector<ngwt__DelegateetqStatus * > * SOAP_FMAC6 soap_instantiate_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size) +SOAP_FMAC5 std::vector<ngwt__DelegateeStatus * > * SOAP_FMAC6 soap_instantiate_std__vectorTemplateOfPointerTongwt__DelegateeStatus(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size) { - DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:"")); - struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_std__vectorTemplateOfPointerTongwt__DelegateetqStatus, n, soap_fdelete); + DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_std__vectorTemplateOfPointerTongwt__DelegateeStatus(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:"")); + struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_std__vectorTemplateOfPointerTongwt__DelegateeStatus, n, soap_fdelete); if (!cp) return NULL; if (n < 0) - { cp->ptr = (void*)new std::vector<ngwt__DelegateetqStatus * >; + { cp->ptr = (void*)new std::vector<ngwt__DelegateeStatus * >; if (size) - *size = sizeof(std::vector<ngwt__DelegateetqStatus * >); + *size = sizeof(std::vector<ngwt__DelegateeStatus * >); } else - { cp->ptr = (void*)new std::vector<ngwt__DelegateetqStatus * >[n]; + { cp->ptr = (void*)new std::vector<ngwt__DelegateeStatus * >[n]; if (size) - *size = n * sizeof(std::vector<ngwt__DelegateetqStatus * >); + *size = n * sizeof(std::vector<ngwt__DelegateeStatus * >); } DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr)); - return (std::vector<ngwt__DelegateetqStatus * >*)cp->ptr; + return (std::vector<ngwt__DelegateeStatus * >*)cp->ptr; } -SOAP_FMAC5 void SOAP_FMAC6 soap_copy_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(struct soap *soap, int st, int tt, void *p, const void *q, size_t n) +SOAP_FMAC5 void SOAP_FMAC6 soap_copy_std__vectorTemplateOfPointerTongwt__DelegateeStatus(struct soap *soap, int st, int tt, void *p, const void *q, size_t n) { - DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying std::vector<ngwt__DelegateetqStatus * > %p -> %p\n", q, p)); - *(std::vector<ngwt__DelegateetqStatus * >*)p = *(std::vector<ngwt__DelegateetqStatus * >*)q; + DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying std::vector<ngwt__DelegateeStatus * > %p -> %p\n", q, p)); + *(std::vector<ngwt__DelegateeStatus * >*)p = *(std::vector<ngwt__DelegateeStatus * >*)q; } SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_std__vectorTemplateOfPointerTongwt__Recipient(struct soap *soap, const std::vector<ngwt__Recipient * >*a) diff --git a/kresources/groupwise/soap/soapH.h b/kresources/groupwise/soap/soapH.h index 175b59521..b31edcc9e 100644 --- a/kresources/groupwise/soap/soapH.h +++ b/kresources/groupwise/soap/soapH.h @@ -225,18 +225,18 @@ SOAP_FMAC3 enum ngwt__WeekDay * SOAP_FMAC4 soap_in_ngwt__WeekDay(struct soap*, c SOAP_FMAC3S int SOAP_FMAC4S soap_s2ngwt__WeekDay(struct soap*, const char*, enum ngwt__WeekDay *); -#ifndef SOAP_TYPE_ngwt__VersiontqStatus -#define SOAP_TYPE_ngwt__VersiontqStatus (385) +#ifndef SOAP_TYPE_ngwt__VersionStatus +#define SOAP_TYPE_ngwt__VersionStatus (385) #endif -SOAP_FMAC3 void SOAP_FMAC4 soap_default_ngwt__VersiontqStatus(struct soap*, enum ngwt__VersiontqStatus *); -SOAP_FMAC3 int SOAP_FMAC4 soap_put_ngwt__VersiontqStatus(struct soap*, const enum ngwt__VersiontqStatus *, const char*, const char*); -SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__VersiontqStatus(struct soap*, const char*, int, const enum ngwt__VersiontqStatus *, const char*); +SOAP_FMAC3 void SOAP_FMAC4 soap_default_ngwt__VersionStatus(struct soap*, enum ngwt__VersionStatus *); +SOAP_FMAC3 int SOAP_FMAC4 soap_put_ngwt__VersionStatus(struct soap*, const enum ngwt__VersionStatus *, const char*, const char*); +SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__VersionStatus(struct soap*, const char*, int, const enum ngwt__VersionStatus *, const char*); -SOAP_FMAC3S const char* SOAP_FMAC4S soap_ngwt__VersiontqStatus2s(struct soap*, enum ngwt__VersiontqStatus); -SOAP_FMAC3 enum ngwt__VersiontqStatus * SOAP_FMAC4 soap_get_ngwt__VersiontqStatus(struct soap*, enum ngwt__VersiontqStatus *, const char*, const char*); -SOAP_FMAC3 enum ngwt__VersiontqStatus * SOAP_FMAC4 soap_in_ngwt__VersiontqStatus(struct soap*, const char*, enum ngwt__VersiontqStatus *, const char*); +SOAP_FMAC3S const char* SOAP_FMAC4S soap_ngwt__VersionStatus2s(struct soap*, enum ngwt__VersionStatus); +SOAP_FMAC3 enum ngwt__VersionStatus * SOAP_FMAC4 soap_get_ngwt__VersionStatus(struct soap*, enum ngwt__VersionStatus *, const char*, const char*); +SOAP_FMAC3 enum ngwt__VersionStatus * SOAP_FMAC4 soap_in_ngwt__VersionStatus(struct soap*, const char*, enum ngwt__VersionStatus *, const char*); -SOAP_FMAC3S int SOAP_FMAC4S soap_s2ngwt__VersiontqStatus(struct soap*, const char*, enum ngwt__VersiontqStatus *); +SOAP_FMAC3S int SOAP_FMAC4S soap_s2ngwt__VersionStatus(struct soap*, const char*, enum ngwt__VersionStatus *); #ifndef SOAP_TYPE_ngwt__VersionEventType #define SOAP_TYPE_ngwt__VersionEventType (384) @@ -498,18 +498,18 @@ SOAP_FMAC3 enum ngwt__FolderType * SOAP_FMAC4 soap_in_ngwt__FolderType(struct so SOAP_FMAC3S int SOAP_FMAC4S soap_s2ngwt__FolderType(struct soap*, const char*, enum ngwt__FolderType *); -#ifndef SOAP_TYPE_ngwt__FolderACLtqStatus -#define SOAP_TYPE_ngwt__FolderACLtqStatus (358) +#ifndef SOAP_TYPE_ngwt__FolderACLStatus +#define SOAP_TYPE_ngwt__FolderACLStatus (358) #endif -SOAP_FMAC3 void SOAP_FMAC4 soap_default_ngwt__FolderACLtqStatus(struct soap*, enum ngwt__FolderACLtqStatus *); -SOAP_FMAC3 int SOAP_FMAC4 soap_put_ngwt__FolderACLtqStatus(struct soap*, const enum ngwt__FolderACLtqStatus *, const char*, const char*); -SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__FolderACLtqStatus(struct soap*, const char*, int, const enum ngwt__FolderACLtqStatus *, const char*); +SOAP_FMAC3 void SOAP_FMAC4 soap_default_ngwt__FolderACLStatus(struct soap*, enum ngwt__FolderACLStatus *); +SOAP_FMAC3 int SOAP_FMAC4 soap_put_ngwt__FolderACLStatus(struct soap*, const enum ngwt__FolderACLStatus *, const char*, const char*); +SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__FolderACLStatus(struct soap*, const char*, int, const enum ngwt__FolderACLStatus *, const char*); -SOAP_FMAC3S const char* SOAP_FMAC4S soap_ngwt__FolderACLtqStatus2s(struct soap*, enum ngwt__FolderACLtqStatus); -SOAP_FMAC3 enum ngwt__FolderACLtqStatus * SOAP_FMAC4 soap_get_ngwt__FolderACLtqStatus(struct soap*, enum ngwt__FolderACLtqStatus *, const char*, const char*); -SOAP_FMAC3 enum ngwt__FolderACLtqStatus * SOAP_FMAC4 soap_in_ngwt__FolderACLtqStatus(struct soap*, const char*, enum ngwt__FolderACLtqStatus *, const char*); +SOAP_FMAC3S const char* SOAP_FMAC4S soap_ngwt__FolderACLStatus2s(struct soap*, enum ngwt__FolderACLStatus); +SOAP_FMAC3 enum ngwt__FolderACLStatus * SOAP_FMAC4 soap_get_ngwt__FolderACLStatus(struct soap*, enum ngwt__FolderACLStatus *, const char*, const char*); +SOAP_FMAC3 enum ngwt__FolderACLStatus * SOAP_FMAC4 soap_in_ngwt__FolderACLStatus(struct soap*, const char*, enum ngwt__FolderACLStatus *, const char*); -SOAP_FMAC3S int SOAP_FMAC4S soap_s2ngwt__FolderACLtqStatus(struct soap*, const char*, enum ngwt__FolderACLtqStatus *); +SOAP_FMAC3S int SOAP_FMAC4S soap_s2ngwt__FolderACLStatus(struct soap*, const char*, enum ngwt__FolderACLStatus *); #ifndef SOAP_TYPE_ngwt__FilterOp #define SOAP_TYPE_ngwt__FilterOp (357) @@ -2930,17 +2930,17 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__TrustedApplication(struct soap*, ng SOAP_FMAC5 ngwt__TrustedApplication * SOAP_FMAC6 soap_instantiate_ngwt__TrustedApplication(struct soap*, int, const char*, const char*, size_t*); SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__TrustedApplication(struct soap*, int, int, void*, const void*, size_t); -#ifndef SOAP_TYPE_ngwt__TransferFailedtqStatus -#define SOAP_TYPE_ngwt__TransferFailedtqStatus (154) +#ifndef SOAP_TYPE_ngwt__TransferFailedStatus +#define SOAP_TYPE_ngwt__TransferFailedStatus (154) #endif -SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__TransferFailedtqStatus(struct soap*, const char*, int, const ngwt__TransferFailedtqStatus *, const char*); -SOAP_FMAC3 ngwt__TransferFailedtqStatus * SOAP_FMAC4 soap_get_ngwt__TransferFailedtqStatus(struct soap*, ngwt__TransferFailedtqStatus *, const char*, const char*); -SOAP_FMAC3 ngwt__TransferFailedtqStatus * SOAP_FMAC4 soap_in_ngwt__TransferFailedtqStatus(struct soap*, const char*, ngwt__TransferFailedtqStatus *, const char*); -SOAP_FMAC5 ngwt__TransferFailedtqStatus * SOAP_FMAC6 soap_new_ngwt__TransferFailedtqStatus(struct soap*, int); -SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__TransferFailedtqStatus(struct soap*, ngwt__TransferFailedtqStatus*); -SOAP_FMAC5 ngwt__TransferFailedtqStatus * SOAP_FMAC6 soap_instantiate_ngwt__TransferFailedtqStatus(struct soap*, int, const char*, const char*, size_t*); -SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__TransferFailedtqStatus(struct soap*, int, int, void*, const void*, size_t); +SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__TransferFailedStatus(struct soap*, const char*, int, const ngwt__TransferFailedStatus *, const char*); +SOAP_FMAC3 ngwt__TransferFailedStatus * SOAP_FMAC4 soap_get_ngwt__TransferFailedStatus(struct soap*, ngwt__TransferFailedStatus *, const char*, const char*); +SOAP_FMAC3 ngwt__TransferFailedStatus * SOAP_FMAC4 soap_in_ngwt__TransferFailedStatus(struct soap*, const char*, ngwt__TransferFailedStatus *, const char*); +SOAP_FMAC5 ngwt__TransferFailedStatus * SOAP_FMAC6 soap_new_ngwt__TransferFailedStatus(struct soap*, int); +SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__TransferFailedStatus(struct soap*, ngwt__TransferFailedStatus*); +SOAP_FMAC5 ngwt__TransferFailedStatus * SOAP_FMAC6 soap_instantiate_ngwt__TransferFailedStatus(struct soap*, int, const char*, const char*, size_t*); +SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__TransferFailedStatus(struct soap*, int, int, void*, const void*, size_t); #ifndef SOAP_TYPE_ngwt__TimezoneList #define SOAP_TYPE_ngwt__TimezoneList (153) @@ -3014,17 +3014,17 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__StatusTracking(struct soap*, ngwt__ SOAP_FMAC5 ngwt__StatusTracking * SOAP_FMAC6 soap_instantiate_ngwt__StatusTracking(struct soap*, int, const char*, const char*, size_t*); SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__StatusTracking(struct soap*, int, int, void*, const void*, size_t); -#ifndef SOAP_TYPE_ngwt__tqStatus -#define SOAP_TYPE_ngwt__tqStatus (147) +#ifndef SOAP_TYPE_ngwt__Status +#define SOAP_TYPE_ngwt__Status (147) #endif -SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__tqStatus(struct soap*, const char*, int, const ngwt__tqStatus *, const char*); -SOAP_FMAC3 ngwt__tqStatus * SOAP_FMAC4 soap_get_ngwt__tqStatus(struct soap*, ngwt__tqStatus *, const char*, const char*); -SOAP_FMAC3 ngwt__tqStatus * SOAP_FMAC4 soap_in_ngwt__tqStatus(struct soap*, const char*, ngwt__tqStatus *, const char*); -SOAP_FMAC5 ngwt__tqStatus * SOAP_FMAC6 soap_new_ngwt__tqStatus(struct soap*, int); -SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__tqStatus(struct soap*, ngwt__tqStatus*); -SOAP_FMAC5 ngwt__tqStatus * SOAP_FMAC6 soap_instantiate_ngwt__tqStatus(struct soap*, int, const char*, const char*, size_t*); -SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__tqStatus(struct soap*, int, int, void*, const void*, size_t); +SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__Status(struct soap*, const char*, int, const ngwt__Status *, const char*); +SOAP_FMAC3 ngwt__Status * SOAP_FMAC4 soap_get_ngwt__Status(struct soap*, ngwt__Status *, const char*, const char*); +SOAP_FMAC3 ngwt__Status * SOAP_FMAC4 soap_in_ngwt__Status(struct soap*, const char*, ngwt__Status *, const char*); +SOAP_FMAC5 ngwt__Status * SOAP_FMAC6 soap_new_ngwt__Status(struct soap*, int); +SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__Status(struct soap*, ngwt__Status*); +SOAP_FMAC5 ngwt__Status * SOAP_FMAC6 soap_instantiate_ngwt__Status(struct soap*, int, const char*, const char*, size_t*); +SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__Status(struct soap*, int, int, void*, const void*, size_t); #ifndef SOAP_TYPE_ngwt__SMimeOperation #define SOAP_TYPE_ngwt__SMimeOperation (146) @@ -3302,17 +3302,17 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__RecurrenceDateType(struct soap*, ng SOAP_FMAC5 ngwt__RecurrenceDateType * SOAP_FMAC6 soap_instantiate_ngwt__RecurrenceDateType(struct soap*, int, const char*, const char*, size_t*); SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__RecurrenceDateType(struct soap*, int, int, void*, const void*, size_t); -#ifndef SOAP_TYPE_ngwt__RecipientqStatus -#define SOAP_TYPE_ngwt__RecipientqStatus (123) +#ifndef SOAP_TYPE_ngwt__RecipienStatus +#define SOAP_TYPE_ngwt__RecipienStatus (123) #endif -SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__RecipientqStatus(struct soap*, const char*, int, const ngwt__RecipientqStatus *, const char*); -SOAP_FMAC3 ngwt__RecipientqStatus * SOAP_FMAC4 soap_get_ngwt__RecipientqStatus(struct soap*, ngwt__RecipientqStatus *, const char*, const char*); -SOAP_FMAC3 ngwt__RecipientqStatus * SOAP_FMAC4 soap_in_ngwt__RecipientqStatus(struct soap*, const char*, ngwt__RecipientqStatus *, const char*); -SOAP_FMAC5 ngwt__RecipientqStatus * SOAP_FMAC6 soap_new_ngwt__RecipientqStatus(struct soap*, int); -SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__RecipientqStatus(struct soap*, ngwt__RecipientqStatus*); -SOAP_FMAC5 ngwt__RecipientqStatus * SOAP_FMAC6 soap_instantiate_ngwt__RecipientqStatus(struct soap*, int, const char*, const char*, size_t*); -SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__RecipientqStatus(struct soap*, int, int, void*, const void*, size_t); +SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__RecipienStatus(struct soap*, const char*, int, const ngwt__RecipienStatus *, const char*); +SOAP_FMAC3 ngwt__RecipienStatus * SOAP_FMAC4 soap_get_ngwt__RecipienStatus(struct soap*, ngwt__RecipienStatus *, const char*, const char*); +SOAP_FMAC3 ngwt__RecipienStatus * SOAP_FMAC4 soap_in_ngwt__RecipienStatus(struct soap*, const char*, ngwt__RecipienStatus *, const char*); +SOAP_FMAC5 ngwt__RecipienStatus * SOAP_FMAC6 soap_new_ngwt__RecipienStatus(struct soap*, int); +SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__RecipienStatus(struct soap*, ngwt__RecipienStatus*); +SOAP_FMAC5 ngwt__RecipienStatus * SOAP_FMAC6 soap_instantiate_ngwt__RecipienStatus(struct soap*, int, const char*, const char*, size_t*); +SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__RecipienStatus(struct soap*, int, int, void*, const void*, size_t); #ifndef SOAP_TYPE_ngwt__RecipientList #define SOAP_TYPE_ngwt__RecipientList (122) @@ -3698,17 +3698,17 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__JunkEntry(struct soap*, ngwt__JunkE SOAP_FMAC5 ngwt__JunkEntry * SOAP_FMAC6 soap_instantiate_ngwt__JunkEntry(struct soap*, int, const char*, const char*, size_t*); SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__JunkEntry(struct soap*, int, int, void*, const void*, size_t); -#ifndef SOAP_TYPE_ngwt__ItemtqStatus -#define SOAP_TYPE_ngwt__ItemtqStatus (90) +#ifndef SOAP_TYPE_ngwt__ItemStatus +#define SOAP_TYPE_ngwt__ItemStatus (90) #endif -SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__ItemtqStatus(struct soap*, const char*, int, const ngwt__ItemtqStatus *, const char*); -SOAP_FMAC3 ngwt__ItemtqStatus * SOAP_FMAC4 soap_get_ngwt__ItemtqStatus(struct soap*, ngwt__ItemtqStatus *, const char*, const char*); -SOAP_FMAC3 ngwt__ItemtqStatus * SOAP_FMAC4 soap_in_ngwt__ItemtqStatus(struct soap*, const char*, ngwt__ItemtqStatus *, const char*); -SOAP_FMAC5 ngwt__ItemtqStatus * SOAP_FMAC6 soap_new_ngwt__ItemtqStatus(struct soap*, int); -SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__ItemtqStatus(struct soap*, ngwt__ItemtqStatus*); -SOAP_FMAC5 ngwt__ItemtqStatus * SOAP_FMAC6 soap_instantiate_ngwt__ItemtqStatus(struct soap*, int, const char*, const char*, size_t*); -SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__ItemtqStatus(struct soap*, int, int, void*, const void*, size_t); +SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__ItemStatus(struct soap*, const char*, int, const ngwt__ItemStatus *, const char*); +SOAP_FMAC3 ngwt__ItemStatus * SOAP_FMAC4 soap_get_ngwt__ItemStatus(struct soap*, ngwt__ItemStatus *, const char*, const char*); +SOAP_FMAC3 ngwt__ItemStatus * SOAP_FMAC4 soap_in_ngwt__ItemStatus(struct soap*, const char*, ngwt__ItemStatus *, const char*); +SOAP_FMAC5 ngwt__ItemStatus * SOAP_FMAC6 soap_new_ngwt__ItemStatus(struct soap*, int); +SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__ItemStatus(struct soap*, ngwt__ItemStatus*); +SOAP_FMAC5 ngwt__ItemStatus * SOAP_FMAC6 soap_instantiate_ngwt__ItemStatus(struct soap*, int, const char*, const char*, size_t*); +SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__ItemStatus(struct soap*, int, int, void*, const void*, size_t); #ifndef SOAP_TYPE_ngwt__Items #define SOAP_TYPE_ngwt__Items (89) @@ -4142,29 +4142,29 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__DeltaInfo(struct soap*, ngwt__Delta SOAP_FMAC5 ngwt__DeltaInfo * SOAP_FMAC6 soap_instantiate_ngwt__DeltaInfo(struct soap*, int, const char*, const char*, size_t*); SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__DeltaInfo(struct soap*, int, int, void*, const void*, size_t); -#ifndef SOAP_TYPE_ngwt__DelegateetqStatus -#define SOAP_TYPE_ngwt__DelegateetqStatus (53) +#ifndef SOAP_TYPE_ngwt__DelegateeStatus +#define SOAP_TYPE_ngwt__DelegateeStatus (53) #endif -SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__DelegateetqStatus(struct soap*, const char*, int, const ngwt__DelegateetqStatus *, const char*); -SOAP_FMAC3 ngwt__DelegateetqStatus * SOAP_FMAC4 soap_get_ngwt__DelegateetqStatus(struct soap*, ngwt__DelegateetqStatus *, const char*, const char*); -SOAP_FMAC3 ngwt__DelegateetqStatus * SOAP_FMAC4 soap_in_ngwt__DelegateetqStatus(struct soap*, const char*, ngwt__DelegateetqStatus *, const char*); -SOAP_FMAC5 ngwt__DelegateetqStatus * SOAP_FMAC6 soap_new_ngwt__DelegateetqStatus(struct soap*, int); -SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__DelegateetqStatus(struct soap*, ngwt__DelegateetqStatus*); -SOAP_FMAC5 ngwt__DelegateetqStatus * SOAP_FMAC6 soap_instantiate_ngwt__DelegateetqStatus(struct soap*, int, const char*, const char*, size_t*); -SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__DelegateetqStatus(struct soap*, int, int, void*, const void*, size_t); +SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__DelegateeStatus(struct soap*, const char*, int, const ngwt__DelegateeStatus *, const char*); +SOAP_FMAC3 ngwt__DelegateeStatus * SOAP_FMAC4 soap_get_ngwt__DelegateeStatus(struct soap*, ngwt__DelegateeStatus *, const char*, const char*); +SOAP_FMAC3 ngwt__DelegateeStatus * SOAP_FMAC4 soap_in_ngwt__DelegateeStatus(struct soap*, const char*, ngwt__DelegateeStatus *, const char*); +SOAP_FMAC5 ngwt__DelegateeStatus * SOAP_FMAC6 soap_new_ngwt__DelegateeStatus(struct soap*, int); +SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__DelegateeStatus(struct soap*, ngwt__DelegateeStatus*); +SOAP_FMAC5 ngwt__DelegateeStatus * SOAP_FMAC6 soap_instantiate_ngwt__DelegateeStatus(struct soap*, int, const char*, const char*, size_t*); +SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__DelegateeStatus(struct soap*, int, int, void*, const void*, size_t); -#ifndef SOAP_TYPE_ngwt__DelegatedtqStatus -#define SOAP_TYPE_ngwt__DelegatedtqStatus (52) +#ifndef SOAP_TYPE_ngwt__DelegatedStatus +#define SOAP_TYPE_ngwt__DelegatedStatus (52) #endif -SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__DelegatedtqStatus(struct soap*, const char*, int, const ngwt__DelegatedtqStatus *, const char*); -SOAP_FMAC3 ngwt__DelegatedtqStatus * SOAP_FMAC4 soap_get_ngwt__DelegatedtqStatus(struct soap*, ngwt__DelegatedtqStatus *, const char*, const char*); -SOAP_FMAC3 ngwt__DelegatedtqStatus * SOAP_FMAC4 soap_in_ngwt__DelegatedtqStatus(struct soap*, const char*, ngwt__DelegatedtqStatus *, const char*); -SOAP_FMAC5 ngwt__DelegatedtqStatus * SOAP_FMAC6 soap_new_ngwt__DelegatedtqStatus(struct soap*, int); -SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__DelegatedtqStatus(struct soap*, ngwt__DelegatedtqStatus*); -SOAP_FMAC5 ngwt__DelegatedtqStatus * SOAP_FMAC6 soap_instantiate_ngwt__DelegatedtqStatus(struct soap*, int, const char*, const char*, size_t*); -SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__DelegatedtqStatus(struct soap*, int, int, void*, const void*, size_t); +SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__DelegatedStatus(struct soap*, const char*, int, const ngwt__DelegatedStatus *, const char*); +SOAP_FMAC3 ngwt__DelegatedStatus * SOAP_FMAC4 soap_get_ngwt__DelegatedStatus(struct soap*, ngwt__DelegatedStatus *, const char*, const char*); +SOAP_FMAC3 ngwt__DelegatedStatus * SOAP_FMAC4 soap_in_ngwt__DelegatedStatus(struct soap*, const char*, ngwt__DelegatedStatus *, const char*); +SOAP_FMAC5 ngwt__DelegatedStatus * SOAP_FMAC6 soap_new_ngwt__DelegatedStatus(struct soap*, int); +SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__DelegatedStatus(struct soap*, ngwt__DelegatedStatus*); +SOAP_FMAC5 ngwt__DelegatedStatus * SOAP_FMAC6 soap_instantiate_ngwt__DelegatedStatus(struct soap*, int, const char*, const char*, size_t*); +SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__DelegatedStatus(struct soap*, int, int, void*, const void*, size_t); #ifndef SOAP_TYPE_ngwt__DayOfYearWeekList #define SOAP_TYPE_ngwt__DayOfYearWeekList (51) @@ -4298,17 +4298,17 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__Contact(struct soap*, ngwt__Contact SOAP_FMAC5 ngwt__Contact * SOAP_FMAC6 soap_instantiate_ngwt__Contact(struct soap*, int, const char*, const char*, size_t*); SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__Contact(struct soap*, int, int, void*, const void*, size_t); -#ifndef SOAP_TYPE_ngwt__CommentqStatus -#define SOAP_TYPE_ngwt__CommentqStatus (40) +#ifndef SOAP_TYPE_ngwt__CommenStatus +#define SOAP_TYPE_ngwt__CommenStatus (40) #endif -SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__CommentqStatus(struct soap*, const char*, int, const ngwt__CommentqStatus *, const char*); -SOAP_FMAC3 ngwt__CommentqStatus * SOAP_FMAC4 soap_get_ngwt__CommentqStatus(struct soap*, ngwt__CommentqStatus *, const char*, const char*); -SOAP_FMAC3 ngwt__CommentqStatus * SOAP_FMAC4 soap_in_ngwt__CommentqStatus(struct soap*, const char*, ngwt__CommentqStatus *, const char*); -SOAP_FMAC5 ngwt__CommentqStatus * SOAP_FMAC6 soap_new_ngwt__CommentqStatus(struct soap*, int); -SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__CommentqStatus(struct soap*, ngwt__CommentqStatus*); -SOAP_FMAC5 ngwt__CommentqStatus * SOAP_FMAC6 soap_instantiate_ngwt__CommentqStatus(struct soap*, int, const char*, const char*, size_t*); -SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__CommentqStatus(struct soap*, int, int, void*, const void*, size_t); +SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__CommenStatus(struct soap*, const char*, int, const ngwt__CommenStatus *, const char*); +SOAP_FMAC3 ngwt__CommenStatus * SOAP_FMAC4 soap_get_ngwt__CommenStatus(struct soap*, ngwt__CommenStatus *, const char*, const char*); +SOAP_FMAC3 ngwt__CommenStatus * SOAP_FMAC4 soap_in_ngwt__CommenStatus(struct soap*, const char*, ngwt__CommenStatus *, const char*); +SOAP_FMAC5 ngwt__CommenStatus * SOAP_FMAC6 soap_new_ngwt__CommenStatus(struct soap*, int); +SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__CommenStatus(struct soap*, ngwt__CommenStatus*); +SOAP_FMAC5 ngwt__CommenStatus * SOAP_FMAC6 soap_instantiate_ngwt__CommenStatus(struct soap*, int, const char*, const char*, size_t*); +SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__CommenStatus(struct soap*, int, int, void*, const void*, size_t); #ifndef SOAP_TYPE_ngwt__CategoryRefList #define SOAP_TYPE_ngwt__CategoryRefList (39) @@ -7218,14 +7218,14 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__FullName(struct soap*, const c SOAP_FMAC3 ngwt__FullName ** SOAP_FMAC4 soap_get_PointerTongwt__FullName(struct soap*, ngwt__FullName **, const char*, const char*); SOAP_FMAC3 ngwt__FullName ** SOAP_FMAC4 soap_in_PointerTongwt__FullName(struct soap*, const char*, ngwt__FullName **, const char*); -#ifndef SOAP_TYPE_PointerTongwt__VersiontqStatus -#define SOAP_TYPE_PointerTongwt__VersiontqStatus (584) +#ifndef SOAP_TYPE_PointerTongwt__VersionStatus +#define SOAP_TYPE_PointerTongwt__VersionStatus (584) #endif -SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__VersiontqStatus(struct soap*, enum ngwt__VersiontqStatus *const*); -SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__VersiontqStatus(struct soap*, enum ngwt__VersiontqStatus *const*, const char*, const char*); -SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__VersiontqStatus(struct soap*, const char *, int, enum ngwt__VersiontqStatus *const*, const char *); -SOAP_FMAC3 enum ngwt__VersiontqStatus ** SOAP_FMAC4 soap_get_PointerTongwt__VersiontqStatus(struct soap*, enum ngwt__VersiontqStatus **, const char*, const char*); -SOAP_FMAC3 enum ngwt__VersiontqStatus ** SOAP_FMAC4 soap_in_PointerTongwt__VersiontqStatus(struct soap*, const char*, enum ngwt__VersiontqStatus **, const char*); +SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__VersionStatus(struct soap*, enum ngwt__VersionStatus *const*); +SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__VersionStatus(struct soap*, enum ngwt__VersionStatus *const*, const char*, const char*); +SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__VersionStatus(struct soap*, const char *, int, enum ngwt__VersionStatus *const*, const char *); +SOAP_FMAC3 enum ngwt__VersionStatus ** SOAP_FMAC4 soap_get_PointerTongwt__VersionStatus(struct soap*, enum ngwt__VersionStatus **, const char*, const char*); +SOAP_FMAC3 enum ngwt__VersionStatus ** SOAP_FMAC4 soap_in_PointerTongwt__VersionStatus(struct soap*, const char*, enum ngwt__VersionStatus **, const char*); #ifndef SOAP_TYPE_PointerTongwt__FolderACL #define SOAP_TYPE_PointerTongwt__FolderACL (583) @@ -7263,14 +7263,14 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__Query(struct soap*, const char SOAP_FMAC3 ngwt__Query ** SOAP_FMAC4 soap_get_PointerTongwt__Query(struct soap*, ngwt__Query **, const char*, const char*); SOAP_FMAC3 ngwt__Query ** SOAP_FMAC4 soap_in_PointerTongwt__Query(struct soap*, const char*, ngwt__Query **, const char*); -#ifndef SOAP_TYPE_PointerTongwt__FolderACLtqStatus -#define SOAP_TYPE_PointerTongwt__FolderACLtqStatus (579) +#ifndef SOAP_TYPE_PointerTongwt__FolderACLStatus +#define SOAP_TYPE_PointerTongwt__FolderACLStatus (579) #endif -SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__FolderACLtqStatus(struct soap*, enum ngwt__FolderACLtqStatus *const*); -SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__FolderACLtqStatus(struct soap*, enum ngwt__FolderACLtqStatus *const*, const char*, const char*); -SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__FolderACLtqStatus(struct soap*, const char *, int, enum ngwt__FolderACLtqStatus *const*, const char *); -SOAP_FMAC3 enum ngwt__FolderACLtqStatus ** SOAP_FMAC4 soap_get_PointerTongwt__FolderACLtqStatus(struct soap*, enum ngwt__FolderACLtqStatus **, const char*, const char*); -SOAP_FMAC3 enum ngwt__FolderACLtqStatus ** SOAP_FMAC4 soap_in_PointerTongwt__FolderACLtqStatus(struct soap*, const char*, enum ngwt__FolderACLtqStatus **, const char*); +SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__FolderACLStatus(struct soap*, enum ngwt__FolderACLStatus *const*); +SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__FolderACLStatus(struct soap*, enum ngwt__FolderACLStatus *const*, const char*, const char*); +SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__FolderACLStatus(struct soap*, const char *, int, enum ngwt__FolderACLStatus *const*, const char *); +SOAP_FMAC3 enum ngwt__FolderACLStatus ** SOAP_FMAC4 soap_get_PointerTongwt__FolderACLStatus(struct soap*, enum ngwt__FolderACLStatus **, const char*, const char*); +SOAP_FMAC3 enum ngwt__FolderACLStatus ** SOAP_FMAC4 soap_in_PointerTongwt__FolderACLStatus(struct soap*, const char*, enum ngwt__FolderACLStatus **, const char*); #ifndef SOAP_TYPE_PointerTongwt__AccessControlList #define SOAP_TYPE_PointerTongwt__AccessControlList (578) @@ -7326,14 +7326,14 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__ItemSource(struct soap*, const SOAP_FMAC3 enum ngwt__ItemSource ** SOAP_FMAC4 soap_get_PointerTongwt__ItemSource(struct soap*, enum ngwt__ItemSource **, const char*, const char*); SOAP_FMAC3 enum ngwt__ItemSource ** SOAP_FMAC4 soap_in_PointerTongwt__ItemSource(struct soap*, const char*, enum ngwt__ItemSource **, const char*); -#ifndef SOAP_TYPE_PointerTongwt__ItemtqStatus -#define SOAP_TYPE_PointerTongwt__ItemtqStatus (572) +#ifndef SOAP_TYPE_PointerTongwt__ItemStatus +#define SOAP_TYPE_PointerTongwt__ItemStatus (572) #endif -SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__ItemtqStatus(struct soap*, ngwt__ItemtqStatus *const*); -SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__ItemtqStatus(struct soap*, ngwt__ItemtqStatus *const*, const char*, const char*); -SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__ItemtqStatus(struct soap*, const char *, int, ngwt__ItemtqStatus *const*, const char *); -SOAP_FMAC3 ngwt__ItemtqStatus ** SOAP_FMAC4 soap_get_PointerTongwt__ItemtqStatus(struct soap*, ngwt__ItemtqStatus **, const char*, const char*); -SOAP_FMAC3 ngwt__ItemtqStatus ** SOAP_FMAC4 soap_in_PointerTongwt__ItemtqStatus(struct soap*, const char*, ngwt__ItemtqStatus **, const char*); +SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__ItemStatus(struct soap*, ngwt__ItemStatus *const*); +SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__ItemStatus(struct soap*, ngwt__ItemStatus *const*, const char*, const char*); +SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__ItemStatus(struct soap*, const char *, int, ngwt__ItemStatus *const*, const char *); +SOAP_FMAC3 ngwt__ItemStatus ** SOAP_FMAC4 soap_get_PointerTongwt__ItemStatus(struct soap*, ngwt__ItemStatus **, const char*, const char*); +SOAP_FMAC3 ngwt__ItemStatus ** SOAP_FMAC4 soap_in_PointerTongwt__ItemStatus(struct soap*, const char*, ngwt__ItemStatus **, const char*); #ifndef SOAP_TYPE_PointerTongwt__DeltaSyncType #define SOAP_TYPE_PointerTongwt__DeltaSyncType (571) @@ -7344,14 +7344,14 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__DeltaSyncType(struct soap*, co SOAP_FMAC3 enum ngwt__DeltaSyncType ** SOAP_FMAC4 soap_get_PointerTongwt__DeltaSyncType(struct soap*, enum ngwt__DeltaSyncType **, const char*, const char*); SOAP_FMAC3 enum ngwt__DeltaSyncType ** SOAP_FMAC4 soap_in_PointerTongwt__DeltaSyncType(struct soap*, const char*, enum ngwt__DeltaSyncType **, const char*); -#ifndef SOAP_TYPE_PointerTongwt__RecipientqStatus -#define SOAP_TYPE_PointerTongwt__RecipientqStatus (570) +#ifndef SOAP_TYPE_PointerTongwt__RecipienStatus +#define SOAP_TYPE_PointerTongwt__RecipienStatus (570) #endif -SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__RecipientqStatus(struct soap*, ngwt__RecipientqStatus *const*); -SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__RecipientqStatus(struct soap*, ngwt__RecipientqStatus *const*, const char*, const char*); -SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__RecipientqStatus(struct soap*, const char *, int, ngwt__RecipientqStatus *const*, const char *); -SOAP_FMAC3 ngwt__RecipientqStatus ** SOAP_FMAC4 soap_get_PointerTongwt__RecipientqStatus(struct soap*, ngwt__RecipientqStatus **, const char*, const char*); -SOAP_FMAC3 ngwt__RecipientqStatus ** SOAP_FMAC4 soap_in_PointerTongwt__RecipientqStatus(struct soap*, const char*, ngwt__RecipientqStatus **, const char*); +SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__RecipienStatus(struct soap*, ngwt__RecipienStatus *const*); +SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__RecipienStatus(struct soap*, ngwt__RecipienStatus *const*, const char*, const char*); +SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__RecipienStatus(struct soap*, const char *, int, ngwt__RecipienStatus *const*, const char *); +SOAP_FMAC3 ngwt__RecipienStatus ** SOAP_FMAC4 soap_get_PointerTongwt__RecipienStatus(struct soap*, ngwt__RecipienStatus **, const char*, const char*); +SOAP_FMAC3 ngwt__RecipienStatus ** SOAP_FMAC4 soap_in_PointerTongwt__RecipienStatus(struct soap*, const char*, ngwt__RecipienStatus **, const char*); #ifndef SOAP_TYPE_PointerTongwt__FreeBusyBlockList #define SOAP_TYPE_PointerTongwt__FreeBusyBlockList (569) @@ -7812,14 +7812,14 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__View(struct soap*, const char SOAP_FMAC3 std::string ** SOAP_FMAC4 soap_get_PointerTongwt__View(struct soap*, std::string **, const char*, const char*); SOAP_FMAC3 std::string ** SOAP_FMAC4 soap_in_PointerTongwt__View(struct soap*, const char*, std::string **, const char*); -#ifndef SOAP_TYPE_PointerTongwt__tqStatus -#define SOAP_TYPE_PointerTongwt__tqStatus (510) +#ifndef SOAP_TYPE_PointerTongwt__Status +#define SOAP_TYPE_PointerTongwt__Status (510) #endif -SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__tqStatus(struct soap*, ngwt__tqStatus *const*); -SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__tqStatus(struct soap*, ngwt__tqStatus *const*, const char*, const char*); -SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__tqStatus(struct soap*, const char *, int, ngwt__tqStatus *const*, const char *); -SOAP_FMAC3 ngwt__tqStatus ** SOAP_FMAC4 soap_get_PointerTongwt__tqStatus(struct soap*, ngwt__tqStatus **, const char*, const char*); -SOAP_FMAC3 ngwt__tqStatus ** SOAP_FMAC4 soap_in_PointerTongwt__tqStatus(struct soap*, const char*, ngwt__tqStatus **, const char*); +SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__Status(struct soap*, ngwt__Status *const*); +SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__Status(struct soap*, ngwt__Status *const*, const char*, const char*); +SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__Status(struct soap*, const char *, int, ngwt__Status *const*, const char *); +SOAP_FMAC3 ngwt__Status ** SOAP_FMAC4 soap_get_PointerTongwt__Status(struct soap*, ngwt__Status **, const char*, const char*); +SOAP_FMAC3 ngwt__Status ** SOAP_FMAC4 soap_in_PointerTongwt__Status(struct soap*, const char*, ngwt__Status **, const char*); #ifndef SOAP_TYPE_PointerTongwt__ItemRefList #define SOAP_TYPE_PointerTongwt__ItemRefList (509) @@ -8064,41 +8064,41 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__Frequency(struct soap*, const SOAP_FMAC3 enum ngwt__Frequency ** SOAP_FMAC4 soap_get_PointerTongwt__Frequency(struct soap*, enum ngwt__Frequency **, const char*, const char*); SOAP_FMAC3 enum ngwt__Frequency ** SOAP_FMAC4 soap_in_PointerTongwt__Frequency(struct soap*, const char*, enum ngwt__Frequency **, const char*); -#ifndef SOAP_TYPE_PointerTongwt__DelegateetqStatus -#define SOAP_TYPE_PointerTongwt__DelegateetqStatus (474) +#ifndef SOAP_TYPE_PointerTongwt__DelegateeStatus +#define SOAP_TYPE_PointerTongwt__DelegateeStatus (474) #endif -SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__DelegateetqStatus(struct soap*, ngwt__DelegateetqStatus *const*); -SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__DelegateetqStatus(struct soap*, ngwt__DelegateetqStatus *const*, const char*, const char*); -SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__DelegateetqStatus(struct soap*, const char *, int, ngwt__DelegateetqStatus *const*, const char *); -SOAP_FMAC3 ngwt__DelegateetqStatus ** SOAP_FMAC4 soap_get_PointerTongwt__DelegateetqStatus(struct soap*, ngwt__DelegateetqStatus **, const char*, const char*); -SOAP_FMAC3 ngwt__DelegateetqStatus ** SOAP_FMAC4 soap_in_PointerTongwt__DelegateetqStatus(struct soap*, const char*, ngwt__DelegateetqStatus **, const char*); +SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__DelegateeStatus(struct soap*, ngwt__DelegateeStatus *const*); +SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__DelegateeStatus(struct soap*, ngwt__DelegateeStatus *const*, const char*, const char*); +SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__DelegateeStatus(struct soap*, const char *, int, ngwt__DelegateeStatus *const*, const char *); +SOAP_FMAC3 ngwt__DelegateeStatus ** SOAP_FMAC4 soap_get_PointerTongwt__DelegateeStatus(struct soap*, ngwt__DelegateeStatus **, const char*, const char*); +SOAP_FMAC3 ngwt__DelegateeStatus ** SOAP_FMAC4 soap_in_PointerTongwt__DelegateeStatus(struct soap*, const char*, ngwt__DelegateeStatus **, const char*); -#ifndef SOAP_TYPE_PointerTongwt__DelegatedtqStatus -#define SOAP_TYPE_PointerTongwt__DelegatedtqStatus (473) +#ifndef SOAP_TYPE_PointerTongwt__DelegatedStatus +#define SOAP_TYPE_PointerTongwt__DelegatedStatus (473) #endif -SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__DelegatedtqStatus(struct soap*, ngwt__DelegatedtqStatus *const*); -SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__DelegatedtqStatus(struct soap*, ngwt__DelegatedtqStatus *const*, const char*, const char*); -SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__DelegatedtqStatus(struct soap*, const char *, int, ngwt__DelegatedtqStatus *const*, const char *); -SOAP_FMAC3 ngwt__DelegatedtqStatus ** SOAP_FMAC4 soap_get_PointerTongwt__DelegatedtqStatus(struct soap*, ngwt__DelegatedtqStatus **, const char*, const char*); -SOAP_FMAC3 ngwt__DelegatedtqStatus ** SOAP_FMAC4 soap_in_PointerTongwt__DelegatedtqStatus(struct soap*, const char*, ngwt__DelegatedtqStatus **, const char*); +SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__DelegatedStatus(struct soap*, ngwt__DelegatedStatus *const*); +SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__DelegatedStatus(struct soap*, ngwt__DelegatedStatus *const*, const char*, const char*); +SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__DelegatedStatus(struct soap*, const char *, int, ngwt__DelegatedStatus *const*, const char *); +SOAP_FMAC3 ngwt__DelegatedStatus ** SOAP_FMAC4 soap_get_PointerTongwt__DelegatedStatus(struct soap*, ngwt__DelegatedStatus **, const char*, const char*); +SOAP_FMAC3 ngwt__DelegatedStatus ** SOAP_FMAC4 soap_in_PointerTongwt__DelegatedStatus(struct soap*, const char*, ngwt__DelegatedStatus **, const char*); -#ifndef SOAP_TYPE_PointerTongwt__CommentqStatus -#define SOAP_TYPE_PointerTongwt__CommentqStatus (472) +#ifndef SOAP_TYPE_PointerTongwt__CommenStatus +#define SOAP_TYPE_PointerTongwt__CommenStatus (472) #endif -SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__CommentqStatus(struct soap*, ngwt__CommentqStatus *const*); -SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__CommentqStatus(struct soap*, ngwt__CommentqStatus *const*, const char*, const char*); -SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__CommentqStatus(struct soap*, const char *, int, ngwt__CommentqStatus *const*, const char *); -SOAP_FMAC3 ngwt__CommentqStatus ** SOAP_FMAC4 soap_get_PointerTongwt__CommentqStatus(struct soap*, ngwt__CommentqStatus **, const char*, const char*); -SOAP_FMAC3 ngwt__CommentqStatus ** SOAP_FMAC4 soap_in_PointerTongwt__CommentqStatus(struct soap*, const char*, ngwt__CommentqStatus **, const char*); +SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__CommenStatus(struct soap*, ngwt__CommenStatus *const*); +SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__CommenStatus(struct soap*, ngwt__CommenStatus *const*, const char*, const char*); +SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__CommenStatus(struct soap*, const char *, int, ngwt__CommenStatus *const*, const char *); +SOAP_FMAC3 ngwt__CommenStatus ** SOAP_FMAC4 soap_get_PointerTongwt__CommenStatus(struct soap*, ngwt__CommenStatus **, const char*, const char*); +SOAP_FMAC3 ngwt__CommenStatus ** SOAP_FMAC4 soap_in_PointerTongwt__CommenStatus(struct soap*, const char*, ngwt__CommenStatus **, const char*); -#ifndef SOAP_TYPE_PointerTongwt__TransferFailedtqStatus -#define SOAP_TYPE_PointerTongwt__TransferFailedtqStatus (471) +#ifndef SOAP_TYPE_PointerTongwt__TransferFailedStatus +#define SOAP_TYPE_PointerTongwt__TransferFailedStatus (471) #endif -SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__TransferFailedtqStatus(struct soap*, ngwt__TransferFailedtqStatus *const*); -SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__TransferFailedtqStatus(struct soap*, ngwt__TransferFailedtqStatus *const*, const char*, const char*); -SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__TransferFailedtqStatus(struct soap*, const char *, int, ngwt__TransferFailedtqStatus *const*, const char *); -SOAP_FMAC3 ngwt__TransferFailedtqStatus ** SOAP_FMAC4 soap_get_PointerTongwt__TransferFailedtqStatus(struct soap*, ngwt__TransferFailedtqStatus **, const char*, const char*); -SOAP_FMAC3 ngwt__TransferFailedtqStatus ** SOAP_FMAC4 soap_in_PointerTongwt__TransferFailedtqStatus(struct soap*, const char*, ngwt__TransferFailedtqStatus **, const char*); +SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__TransferFailedStatus(struct soap*, ngwt__TransferFailedStatus *const*); +SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__TransferFailedStatus(struct soap*, ngwt__TransferFailedStatus *const*, const char*, const char*); +SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__TransferFailedStatus(struct soap*, const char *, int, ngwt__TransferFailedStatus *const*, const char *); +SOAP_FMAC3 ngwt__TransferFailedStatus ** SOAP_FMAC4 soap_get_PointerTongwt__TransferFailedStatus(struct soap*, ngwt__TransferFailedStatus **, const char*, const char*); +SOAP_FMAC3 ngwt__TransferFailedStatus ** SOAP_FMAC4 soap_in_PointerTongwt__TransferFailedStatus(struct soap*, const char*, ngwt__TransferFailedStatus **, const char*); #ifndef SOAP_TYPE_PointerTongwt__Recipient #define SOAP_TYPE_PointerTongwt__Recipient (469) @@ -8762,19 +8762,19 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_delete_std__vectorTemplateOfxsd__date(struct soa SOAP_FMAC5 std::vector<std::string > * SOAP_FMAC6 soap_instantiate_std__vectorTemplateOfxsd__date(struct soap*, int, const char*, const char*, size_t*); SOAP_FMAC5 void SOAP_FMAC6 soap_copy_std__vectorTemplateOfxsd__date(struct soap*, int, int, void*, const void*, size_t); -#ifndef SOAP_TYPE_std__vectorTemplateOfPointerTongwt__DelegateetqStatus -#define SOAP_TYPE_std__vectorTemplateOfPointerTongwt__DelegateetqStatus (475) -#endif -SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(struct soap*, const std::vector<ngwt__DelegateetqStatus * >*); -SOAP_FMAC3 void SOAP_FMAC4 soap_default_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(struct soap*, std::vector<ngwt__DelegateetqStatus * >*); -SOAP_FMAC3 int SOAP_FMAC4 soap_put_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(struct soap*, const std::vector<ngwt__DelegateetqStatus * >*, const char*, const char*); -SOAP_FMAC3 int SOAP_FMAC4 soap_out_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(struct soap*, const char*, int, const std::vector<ngwt__DelegateetqStatus * >*, const char*); -SOAP_FMAC3 std::vector<ngwt__DelegateetqStatus * >* SOAP_FMAC4 soap_get_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(struct soap*, std::vector<ngwt__DelegateetqStatus * >*, const char*, const char*); -SOAP_FMAC3 std::vector<ngwt__DelegateetqStatus * >* SOAP_FMAC4 soap_in_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(struct soap*, const char*, std::vector<ngwt__DelegateetqStatus * >*, const char*); -SOAP_FMAC5 std::vector<ngwt__DelegateetqStatus * > * SOAP_FMAC6 soap_new_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(struct soap*, int); -SOAP_FMAC5 void SOAP_FMAC6 soap_delete_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(struct soap*, std::vector<ngwt__DelegateetqStatus * >*); -SOAP_FMAC5 std::vector<ngwt__DelegateetqStatus * > * SOAP_FMAC6 soap_instantiate_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(struct soap*, int, const char*, const char*, size_t*); -SOAP_FMAC5 void SOAP_FMAC6 soap_copy_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(struct soap*, int, int, void*, const void*, size_t); +#ifndef SOAP_TYPE_std__vectorTemplateOfPointerTongwt__DelegateeStatus +#define SOAP_TYPE_std__vectorTemplateOfPointerTongwt__DelegateeStatus (475) +#endif +SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_std__vectorTemplateOfPointerTongwt__DelegateeStatus(struct soap*, const std::vector<ngwt__DelegateeStatus * >*); +SOAP_FMAC3 void SOAP_FMAC4 soap_default_std__vectorTemplateOfPointerTongwt__DelegateeStatus(struct soap*, std::vector<ngwt__DelegateeStatus * >*); +SOAP_FMAC3 int SOAP_FMAC4 soap_put_std__vectorTemplateOfPointerTongwt__DelegateeStatus(struct soap*, const std::vector<ngwt__DelegateeStatus * >*, const char*, const char*); +SOAP_FMAC3 int SOAP_FMAC4 soap_out_std__vectorTemplateOfPointerTongwt__DelegateeStatus(struct soap*, const char*, int, const std::vector<ngwt__DelegateeStatus * >*, const char*); +SOAP_FMAC3 std::vector<ngwt__DelegateeStatus * >* SOAP_FMAC4 soap_get_std__vectorTemplateOfPointerTongwt__DelegateeStatus(struct soap*, std::vector<ngwt__DelegateeStatus * >*, const char*, const char*); +SOAP_FMAC3 std::vector<ngwt__DelegateeStatus * >* SOAP_FMAC4 soap_in_std__vectorTemplateOfPointerTongwt__DelegateeStatus(struct soap*, const char*, std::vector<ngwt__DelegateeStatus * >*, const char*); +SOAP_FMAC5 std::vector<ngwt__DelegateeStatus * > * SOAP_FMAC6 soap_new_std__vectorTemplateOfPointerTongwt__DelegateeStatus(struct soap*, int); +SOAP_FMAC5 void SOAP_FMAC6 soap_delete_std__vectorTemplateOfPointerTongwt__DelegateeStatus(struct soap*, std::vector<ngwt__DelegateeStatus * >*); +SOAP_FMAC5 std::vector<ngwt__DelegateeStatus * > * SOAP_FMAC6 soap_instantiate_std__vectorTemplateOfPointerTongwt__DelegateeStatus(struct soap*, int, const char*, const char*, size_t*); +SOAP_FMAC5 void SOAP_FMAC6 soap_copy_std__vectorTemplateOfPointerTongwt__DelegateeStatus(struct soap*, int, int, void*, const void*, size_t); #ifndef SOAP_TYPE_std__vectorTemplateOfPointerTongwt__Recipient #define SOAP_TYPE_std__vectorTemplateOfPointerTongwt__Recipient (470) diff --git a/kresources/groupwise/soap/soapStub.h b/kresources/groupwise/soap/soapStub.h index 46461d08e..7fdb0f68c 100644 --- a/kresources/groupwise/soap/soapStub.h +++ b/kresources/groupwise/soap/soapStub.h @@ -31,7 +31,7 @@ enum ngwt__MessageTypeList {Appointment = 1, CalendarItem = 2, DocumentReference #ifndef SOAP_TYPE_ngwe__FieldList #define SOAP_TYPE_ngwe__FieldList (339) /* Bimask ngwe:FieldList */ -enum ngwe__FieldList {AcceptLevel = 1, Alarm = 2, AllDayEvent = 4, Attachment = 8, Category = 16, Classification = 32, Contact = 64, DueDate = 128, Duration = 256, EmailAddress = 512, ExpirationDate = 1024, Hidden = 2048, IMAddress = 4096, MessageBody = 8192, Name = 16384, Organization = 32768, Owner = 65536, PersonalSubject = 131072, PhoneNumber = 262144, Place = 524288, PostalAddress = 1048576, RecipientqStatus = 2097152, Rights = 4194304, Security = 8388608, SendPriority = 16777216, StartDate = 33554432, Subject = 67108864, TaskCategory = 134217728, TaskPriority = 268435456}; +enum ngwe__FieldList {AcceptLevel = 1, Alarm = 2, AllDayEvent = 4, Attachment = 8, Category = 16, Classification = 32, Contact = 64, DueDate = 128, Duration = 256, EmailAddress = 512, ExpirationDate = 1024, Hidden = 2048, IMAddress = 4096, MessageBody = 8192, Name = 16384, Organization = 32768, Owner = 65536, PersonalSubject = 131072, PhoneNumber = 262144, Place = 524288, PostalAddress = 1048576, RecipienStatus = 2097152, Rights = 4194304, Security = 8388608, SendPriority = 16777216, StartDate = 33554432, Subject = 67108864, TaskCategory = 134217728, TaskPriority = 268435456}; #endif #ifndef SOAP_TYPE_ngwe__ItemTypeList @@ -118,10 +118,10 @@ enum ngwt__FilterDate {Today = 0, Tomorrow = 1, ThisMonth = 2, ThisWeek = 3, Thi enum ngwt__FilterOp {and_ = 0, or_ = 1, not_ = 2, eq = 3, ne = 4, gt = 5, lt = 6, gte = 7, lte = 8, contains = 9, containsWord = 10, begins = 11, exists = 12, notExist = 13, isOf = 14, isNotOf = 15, fieldEqual = 16, fieldGTE = 17, fieldGT = 18, fieldLTE = 19, fieldLT = 20, fieldNE = 21, fieldDateEqual = 22}; #endif -#ifndef SOAP_TYPE_ngwt__FolderACLtqStatus -#define SOAP_TYPE_ngwt__FolderACLtqStatus (358) -/* ngwt:FolderACLtqStatus */ -enum ngwt__FolderACLtqStatus {pending = 0, accepted = 1, deleted = 2, opened = 3, owner = 4}; +#ifndef SOAP_TYPE_ngwt__FolderACLStatus +#define SOAP_TYPE_ngwt__FolderACLStatus (358) +/* ngwt:FolderACLStatus */ +enum ngwt__FolderACLStatus {pending = 0, accepted = 1, deleted = 2, opened = 3, owner = 4}; #endif #ifndef SOAP_TYPE_ngwt__FolderType @@ -241,13 +241,13 @@ 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, resetqStatus = 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, reseStatus = 9, restore = 10, retrieve = 11, securityModified = 12, versionDownloaded = 13, viewed = 14, unknown = 15}; #endif -#ifndef SOAP_TYPE_ngwt__VersiontqStatus -#define SOAP_TYPE_ngwt__VersiontqStatus (385) -/* ngwt:VersiontqStatus */ -enum ngwt__VersiontqStatus {available = 0, checkedOut = 1, inUse = 2, deleted_ = 3, archived = 4, massInUse = 5, unavailable = 6}; +#ifndef SOAP_TYPE_ngwt__VersionStatus +#define SOAP_TYPE_ngwt__VersionStatus (385) +/* ngwt:VersionStatus */ +enum ngwt__VersionStatus {available = 0, checkedOut = 1, inUse = 2, deleted_ = 3, archived = 4, massInUse = 5, unavailable = 6}; #endif #ifndef SOAP_TYPE_ngwt__WeekDay @@ -1278,10 +1278,10 @@ public: }; #endif -#ifndef SOAP_TYPE_ngwt__ItemtqStatus -#define SOAP_TYPE_ngwt__ItemtqStatus (90) -/* ngwt:ItemtqStatus */ -class SOAP_CMAC ngwt__ItemtqStatus +#ifndef SOAP_TYPE_ngwt__ItemStatus +#define SOAP_TYPE_ngwt__ItemStatus (90) +/* ngwt:ItemStatus */ +class SOAP_CMAC ngwt__ItemStatus { public: bool *accepted; /* optional element of type xsd:boolean */ @@ -1295,15 +1295,15 @@ public: bool *replied; /* optional element of type xsd:boolean */ struct soap *soap; /* transient */ public: - virtual int soap_type() const { return 90; } /* = unique id SOAP_TYPE_ngwt__ItemtqStatus */ + virtual int soap_type() const { return 90; } /* = unique id SOAP_TYPE_ngwt__ItemStatus */ virtual void soap_default(struct soap*); virtual void soap_serialize(struct soap*) const; virtual int soap_put(struct soap*, const char*, const char*) const; virtual int soap_out(struct soap*, const char*, int, const char*) const; virtual void *soap_get(struct soap*, const char*, const char*); virtual void *soap_in(struct soap*, const char*, const char*); - ngwt__ItemtqStatus() { } - virtual ~ngwt__ItemtqStatus() { } + ngwt__ItemStatus() { } + virtual ~ngwt__ItemStatus() { } }; #endif @@ -1764,17 +1764,17 @@ public: }; #endif -#ifndef SOAP_TYPE_ngwt__RecipientqStatus -#define SOAP_TYPE_ngwt__RecipientqStatus (123) -/* ngwt:RecipientqStatus */ -class SOAP_CMAC ngwt__RecipientqStatus +#ifndef SOAP_TYPE_ngwt__RecipienStatus +#define SOAP_TYPE_ngwt__RecipienStatus (123) +/* ngwt:RecipienStatus */ +class SOAP_CMAC ngwt__RecipienStatus { public: char *delivered; /* optional element of type xsd:string */ char *undeliverable; /* optional element of type xsd:string */ char *transferred; /* optional element of type xsd:string */ char *transferDelayed; /* optional element of type xsd:string */ - class ngwt__TransferFailedtqStatus *transferFailed; /* optional element of type ngwt:TransferFailedtqStatus */ + class ngwt__TransferFailedStatus *transferFailed; /* optional element of type ngwt:TransferFailedStatus */ char *downloaded; /* optional element of type xsd:string */ char *downloadedByThirdParty; /* optional element of type xsd:string */ char *retractRequested; /* optional element of type xsd:string */ @@ -1783,27 +1783,27 @@ public: char *deleted; /* optional element of type xsd:string */ char *undeleted; /* optional element of type xsd:string */ char *purged; /* optional element of type xsd:string */ - class ngwt__CommentqStatus *accepted; /* optional element of type ngwt:CommentqStatus */ - ngwt__CommentqStatus *declined; /* optional element of type ngwt:CommentqStatus */ + class ngwt__CommenStatus *accepted; /* optional element of type ngwt:CommenStatus */ + ngwt__CommenStatus *declined; /* optional element of type ngwt:CommenStatus */ char *replied; /* optional element of type xsd:string */ char *forwarded; /* optional element of type xsd:string */ char *shared; /* optional element of type xsd:string */ char *started; /* optional element of type xsd:string */ char *completed; /* optional element of type xsd:string */ char *incomplete; /* optional element of type xsd:string */ - class ngwt__DelegatedtqStatus *delegated; /* optional element of type ngwt:DelegatedtqStatus */ - std::vector<class ngwt__DelegateetqStatus * >delegateetqStatus; /* optional element of type ngwt:DelegateetqStatus */ + class ngwt__DelegatedStatus *delegated; /* optional element of type ngwt:DelegatedStatus */ + std::vector<class ngwt__DelegateeStatus * >delegateeStatus; /* optional element of type ngwt:DelegateeStatus */ struct soap *soap; /* transient */ public: - virtual int soap_type() const { return 123; } /* = unique id SOAP_TYPE_ngwt__RecipientqStatus */ + virtual int soap_type() const { return 123; } /* = unique id SOAP_TYPE_ngwt__RecipienStatus */ virtual void soap_default(struct soap*); virtual void soap_serialize(struct soap*) const; virtual int soap_put(struct soap*, const char*, const char*) const; virtual int soap_out(struct soap*, const char*, int, const char*) const; virtual void *soap_get(struct soap*, const char*, const char*); virtual void *soap_in(struct soap*, const char*, const char*); - ngwt__RecipientqStatus() { } - virtual ~ngwt__RecipientqStatus() { } + ngwt__RecipienStatus() { } + virtual ~ngwt__RecipienStatus() { } }; #endif @@ -2244,10 +2244,10 @@ public: }; #endif -#ifndef SOAP_TYPE_ngwt__tqStatus -#define SOAP_TYPE_ngwt__tqStatus (147) -/* ngwt:tqStatus */ -class SOAP_CMAC ngwt__tqStatus +#ifndef SOAP_TYPE_ngwt__Status +#define SOAP_TYPE_ngwt__Status (147) +/* ngwt:Status */ +class SOAP_CMAC ngwt__Status { public: int code; /* required element of type xsd:int */ @@ -2256,15 +2256,15 @@ public: ngwt__ProblemList *problems; /* optional element of type ngwt:ProblemList */ struct soap *soap; /* transient */ public: - virtual int soap_type() const { return 147; } /* = unique id SOAP_TYPE_ngwt__tqStatus */ + virtual int soap_type() const { return 147; } /* = unique id SOAP_TYPE_ngwt__Status */ virtual void soap_default(struct soap*); virtual void soap_serialize(struct soap*) const; virtual int soap_put(struct soap*, const char*, const char*) const; virtual int soap_out(struct soap*, const char*, int, const char*) const; virtual void *soap_get(struct soap*, const char*, const char*); virtual void *soap_in(struct soap*, const char*, const char*); - ngwt__tqStatus() { } - virtual ~ngwt__tqStatus() { } + ngwt__Status() { } + virtual ~ngwt__Status() { } }; #endif @@ -2418,7 +2418,7 @@ public: class SOAP_CMAC _ngwm__acceptResponse { public: - ngwt__tqStatus *status; /* RPC return element */ /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* RPC return element */ /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 161; } /* = unique id SOAP_TYPE__ngwm__acceptResponse */ @@ -2465,7 +2465,7 @@ class SOAP_CMAC _ngwm__acceptShareResponse { public: std::string *id; /* RPC return element */ /* optional element of type ngwt:uid */ - ngwt__tqStatus *status; /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 163; } /* = unique id SOAP_TYPE__ngwm__acceptShareResponse */ @@ -2509,7 +2509,7 @@ public: class SOAP_CMAC _ngwm__addItemResponse { public: - ngwt__tqStatus *status; /* RPC return element */ /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* RPC return element */ /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 165; } /* = unique id SOAP_TYPE__ngwm__addItemResponse */ @@ -2553,7 +2553,7 @@ public: class SOAP_CMAC _ngwm__addItemsResponse { public: - ngwt__tqStatus *status; /* RPC return element */ /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* RPC return element */ /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 167; } /* = unique id SOAP_TYPE__ngwm__addItemsResponse */ @@ -2597,7 +2597,7 @@ public: class SOAP_CMAC _ngwm__addMembersResponse { public: - ngwt__tqStatus *status; /* RPC return element */ /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* RPC return element */ /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 169; } /* = unique id SOAP_TYPE__ngwm__addMembersResponse */ @@ -2639,7 +2639,7 @@ public: class SOAP_CMAC _ngwm__closeFreeBusySessionResponse { public: - ngwt__tqStatus *status; /* RPC return element */ /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* RPC return element */ /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 171; } /* = unique id SOAP_TYPE__ngwm__closeFreeBusySessionResponse */ @@ -2681,7 +2681,7 @@ public: class SOAP_CMAC _ngwm__completeResponse { public: - ngwt__tqStatus *status; /* RPC return element */ /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* RPC return element */ /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 173; } /* = unique id SOAP_TYPE__ngwm__completeResponse */ @@ -2727,7 +2727,7 @@ class SOAP_CMAC _ngwm__createCursorResponse { public: int *cursor; /* RPC return element */ /* optional element of type xsd:int */ - ngwt__tqStatus *status; /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 175; } /* = unique id SOAP_TYPE__ngwm__createCursorResponse */ @@ -2771,7 +2771,7 @@ class SOAP_CMAC _ngwm__createItemResponse { public: std::vector<std::string >id; /* RPC return element */ /* optional element of type ngwt:uid */ - ngwt__tqStatus *status; /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 177; } /* = unique id SOAP_TYPE__ngwm__createItemResponse */ @@ -2814,7 +2814,7 @@ class SOAP_CMAC _ngwm__createItemsResponse { public: std::vector<std::string >id; /* RPC return element */ /* optional element of type ngwt:uid */ - ngwt__tqStatus *status; /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 179; } /* = unique id SOAP_TYPE__ngwm__createItemsResponse */ @@ -2857,7 +2857,7 @@ class SOAP_CMAC _ngwm__createJunkEntryResponse { public: std::string *id; /* RPC return element */ /* optional element of type ngwt:uid */ - ngwt__tqStatus *status; /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 181; } /* = unique id SOAP_TYPE__ngwm__createJunkEntryResponse */ @@ -2900,7 +2900,7 @@ class SOAP_CMAC _ngwm__createProxyAccessResponse { public: std::string *id; /* RPC return element */ /* optional element of type ngwt:uid */ - ngwt__tqStatus *status; /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 183; } /* = unique id SOAP_TYPE__ngwm__createProxyAccessResponse */ @@ -2942,7 +2942,7 @@ public: class SOAP_CMAC _ngwm__createSignatureResponse { public: - ngwt__tqStatus *status; /* RPC return element */ /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* RPC return element */ /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 185; } /* = unique id SOAP_TYPE__ngwm__createSignatureResponse */ @@ -2986,7 +2986,7 @@ public: class SOAP_CMAC _ngwm__declineResponse { public: - ngwt__tqStatus *status; /* RPC return element */ /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* RPC return element */ /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 187; } /* = unique id SOAP_TYPE__ngwm__declineResponse */ @@ -3033,7 +3033,7 @@ public: class SOAP_CMAC _ngwm__delegateResponse { public: - ngwt__tqStatus *status; /* RPC return element */ /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* RPC return element */ /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 189; } /* = unique id SOAP_TYPE__ngwm__delegateResponse */ @@ -3077,7 +3077,7 @@ public: class SOAP_CMAC _ngwm__destroyCursorResponse { public: - ngwt__tqStatus *status; /* RPC return element */ /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* RPC return element */ /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 191; } /* = unique id SOAP_TYPE__ngwm__destroyCursorResponse */ @@ -3120,7 +3120,7 @@ public: class SOAP_CMAC _ngwm__executeRuleResponse { public: - ngwt__tqStatus *status; /* RPC return element */ /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* RPC return element */ /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 193; } /* = unique id SOAP_TYPE__ngwm__executeRuleResponse */ @@ -3166,7 +3166,7 @@ class SOAP_CMAC _ngwm__forwardResponse { public: ngwt__Item *item; /* RPC return element */ /* optional element of type ngwt:Item */ - ngwt__tqStatus *status; /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 195; } /* = unique id SOAP_TYPE__ngwm__forwardResponse */ @@ -3208,7 +3208,7 @@ class SOAP_CMAC _ngwm__getAddressBookListResponse { public: ngwt__AddressBookList *books; /* RPC return element */ /* optional element of type ngwt:AddressBookList */ - ngwt__tqStatus *status; /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 197; } /* = unique id SOAP_TYPE__ngwm__getAddressBookListResponse */ @@ -3254,7 +3254,7 @@ class SOAP_CMAC _ngwm__getAttachmentResponse { public: ngwt__MessagePart *part; /* RPC return element */ /* optional element of type ngwt:MessagePart */ - ngwt__tqStatus *status; /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 199; } /* = unique id SOAP_TYPE__ngwm__getAttachmentResponse */ @@ -3296,7 +3296,7 @@ class SOAP_CMAC _ngwm__getCategoryListResponse { public: ngwt__CategoryList *categories; /* RPC return element */ /* optional element of type ngwt:CategoryList */ - ngwt__tqStatus *status; /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 201; } /* = unique id SOAP_TYPE__ngwm__getCategoryListResponse */ @@ -3338,7 +3338,7 @@ class SOAP_CMAC _ngwm__getCustomListResponse { public: ngwt__CustomList *customs; /* RPC return element */ /* optional element of type ngwt:CustomList */ - ngwt__tqStatus *status; /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 203; } /* = unique id SOAP_TYPE__ngwm__getCustomListResponse */ @@ -3385,7 +3385,7 @@ class SOAP_CMAC _ngwm__getDeltasResponse public: ngwt__Items *items; /* RPC return element */ /* optional element of type ngwt:Items */ ngwt__DeltaInfo *deltaInfo; /* required element of type ngwt:DeltaInfo */ - ngwt__tqStatus *status; /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 205; } /* = unique id SOAP_TYPE__ngwm__getDeltasResponse */ @@ -3429,7 +3429,7 @@ class SOAP_CMAC _ngwm__getDeltaInfoResponse { public: ngwt__DeltaInfo *deltaInfo; /* RPC return element */ /* required element of type ngwt:DeltaInfo */ - ngwt__tqStatus *status; /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 207; } /* = unique id SOAP_TYPE__ngwm__getDeltaInfoResponse */ @@ -3473,7 +3473,7 @@ class SOAP_CMAC _ngwm__getDocumentTypeListResponse { public: ngwt__DocumentTypeList *items; /* RPC return element */ /* optional element of type ngwt:DocumentTypeList */ - ngwt__tqStatus *status; /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 209; } /* = unique id SOAP_TYPE__ngwm__getDocumentTypeListResponse */ @@ -3520,7 +3520,7 @@ class SOAP_CMAC _ngwm__getFolderResponse { public: ngwt__Folder *folder; /* RPC return element */ /* optional element of type ngwt:Folder */ - ngwt__tqStatus *status; /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 211; } /* = unique id SOAP_TYPE__ngwm__getFolderResponse */ @@ -3568,7 +3568,7 @@ class SOAP_CMAC _ngwm__getFolderListResponse { public: ngwt__FolderList *folders; /* RPC return element */ /* optional element of type ngwt:FolderList */ - ngwt__tqStatus *status; /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 213; } /* = unique id SOAP_TYPE__ngwm__getFolderListResponse */ @@ -3613,7 +3613,7 @@ class SOAP_CMAC _ngwm__getFreeBusyResponse public: ngwt__FreeBusyStats *freeBusyStats; /* RPC return element */ /* optional element of type ngwt:FreeBusyStats */ ngwt__FreeBusyInfoList *freeBusyInfo; /* optional element of type ngwt:FreeBusyInfoList */ - ngwt__tqStatus *status; /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 215; } /* = unique id SOAP_TYPE__ngwm__getFreeBusyResponse */ @@ -3658,7 +3658,7 @@ class SOAP_CMAC _ngwm__getItemResponse { public: ngwt__Item *item; /* RPC return element */ /* optional element of type ngwt:Item */ - ngwt__tqStatus *status; /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 217; } /* = unique id SOAP_TYPE__ngwm__getItemResponse */ @@ -3705,7 +3705,7 @@ class SOAP_CMAC _ngwm__getItemsResponse { public: ngwt__Items *items; /* RPC return element */ /* optional element of type ngwt:Items */ - ngwt__tqStatus *status; /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 219; } /* = unique id SOAP_TYPE__ngwm__getItemsResponse */ @@ -3750,7 +3750,7 @@ public: ngwt__JunkHandlingList *junk; /* RPC return element */ /* optional element of type ngwt:JunkHandlingList */ ngwt__JunkHandlingList *block; /* optional element of type ngwt:JunkHandlingList */ ngwt__JunkHandlingList *trust; /* optional element of type ngwt:JunkHandlingList */ - ngwt__tqStatus *status; /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 221; } /* = unique id SOAP_TYPE__ngwm__getJunkEntriesResponse */ @@ -3792,7 +3792,7 @@ class SOAP_CMAC _ngwm__getJunkMailSettingsResponse { public: ngwt__SettingsList *settings; /* RPC return element */ /* optional element of type ngwt:SettingsList */ - ngwt__tqStatus *status; /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 223; } /* = unique id SOAP_TYPE__ngwm__getJunkMailSettingsResponse */ @@ -3838,7 +3838,7 @@ class SOAP_CMAC _ngwm__getLibraryItemResponse { public: ngwt__Item *item; /* RPC return element */ /* optional element of type ngwt:Item */ - ngwt__tqStatus *status; /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 225; } /* = unique id SOAP_TYPE__ngwm__getLibraryItemResponse */ @@ -3880,7 +3880,7 @@ class SOAP_CMAC _ngwm__getLibraryListResponse { public: ngwt__LibraryList *libraries; /* RPC return element */ /* optional element of type ngwt:LibraryList */ - ngwt__tqStatus *status; /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 227; } /* = unique id SOAP_TYPE__ngwm__getLibraryListResponse */ @@ -3930,7 +3930,7 @@ class SOAP_CMAC _ngwm__getQuickMessagesResponse public: char *ngwt__startDate; /* RPC return element */ /* optional element of type xsd:string */ ngwt__Items *items; /* optional element of type ngwt:Items */ - ngwt__tqStatus *status; /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 229; } /* = unique id SOAP_TYPE__ngwm__getQuickMessagesResponse */ @@ -3972,7 +3972,7 @@ class SOAP_CMAC _ngwm__getProxyAccessListResponse { public: ngwt__AccessRightList *accessRights; /* RPC return element */ /* optional element of type ngwt:AccessRightList */ - ngwt__tqStatus *status; /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 231; } /* = unique id SOAP_TYPE__ngwm__getProxyAccessListResponse */ @@ -4014,7 +4014,7 @@ class SOAP_CMAC _ngwm__getProxyListResponse { public: ngwt__ProxyList *proxies; /* RPC return element */ /* optional element of type ngwt:ProxyList */ - ngwt__tqStatus *status; /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 233; } /* = unique id SOAP_TYPE__ngwm__getProxyListResponse */ @@ -4056,7 +4056,7 @@ class SOAP_CMAC _ngwm__getRuleListResponse { public: ngwt__RuleList *rules; /* RPC return element */ /* optional element of type ngwt:RuleList */ - ngwt__tqStatus *status; /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 235; } /* = unique id SOAP_TYPE__ngwm__getRuleListResponse */ @@ -4099,7 +4099,7 @@ class SOAP_CMAC _ngwm__getSettingsResponse { public: ngwt__Settings *settings; /* RPC return element */ /* optional element of type ngwt:Settings */ - ngwt__tqStatus *status; /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 237; } /* = unique id SOAP_TYPE__ngwm__getSettingsResponse */ @@ -4142,7 +4142,7 @@ class SOAP_CMAC _ngwm__getSignaturesResponse { public: ngwt__Signatures *signatures; /* RPC return element */ /* optional element of type ngwt:Signatures */ - ngwt__tqStatus *status; /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 239; } /* = unique id SOAP_TYPE__ngwm__getSignaturesResponse */ @@ -4188,7 +4188,7 @@ class SOAP_CMAC _ngwm__getTimestampResponse public: char *backup; /* RPC return element */ /* optional element of type xsd:string */ char *retention; /* optional element of type xsd:string */ - ngwt__tqStatus *status; /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 241; } /* = unique id SOAP_TYPE__ngwm__getTimestampResponse */ @@ -4230,7 +4230,7 @@ class SOAP_CMAC _ngwm__getTimezoneListResponse { public: ngwt__TimezoneList *timezones; /* RPC return element */ /* optional element of type ngwt:TimezoneList */ - ngwt__tqStatus *status; /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 243; } /* = unique id SOAP_TYPE__ngwm__getTimezoneListResponse */ @@ -4274,7 +4274,7 @@ class SOAP_CMAC _ngwm__getUserListResponse { public: ngwt__UserList *users; /* RPC return element */ /* optional element of type ngwt:UserList */ - ngwt__tqStatus *status; /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 245; } /* = unique id SOAP_TYPE__ngwm__getUserListResponse */ @@ -4327,7 +4327,7 @@ public: std::string *build; /* optional element of type xsd:string */ std::vector<ngwt__Host * >redirectToHost; /* optional element of type ngwt:Host */ char *serverUTCTime; /* optional element of type xsd:string */ - ngwt__tqStatus *status; /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 247; } /* = unique id SOAP_TYPE__ngwm__loginResponse */ @@ -4368,7 +4368,7 @@ public: class SOAP_CMAC _ngwm__logoutResponse { public: - ngwt__tqStatus *status; /* RPC return element */ /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* RPC return element */ /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 249; } /* = unique id SOAP_TYPE__ngwm__logoutResponse */ @@ -4410,7 +4410,7 @@ public: class SOAP_CMAC _ngwm__markPrivateResponse { public: - ngwt__tqStatus *status; /* RPC return element */ /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* RPC return element */ /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 251; } /* = unique id SOAP_TYPE__ngwm__markPrivateResponse */ @@ -4452,7 +4452,7 @@ public: class SOAP_CMAC _ngwm__markReadResponse { public: - ngwt__tqStatus *status; /* RPC return element */ /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* RPC return element */ /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 253; } /* = unique id SOAP_TYPE__ngwm__markReadResponse */ @@ -4494,7 +4494,7 @@ public: class SOAP_CMAC _ngwm__markUnPrivateResponse { public: - ngwt__tqStatus *status; /* RPC return element */ /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* RPC return element */ /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 255; } /* = unique id SOAP_TYPE__ngwm__markUnPrivateResponse */ @@ -4536,7 +4536,7 @@ public: class SOAP_CMAC _ngwm__markUnReadResponse { public: - ngwt__tqStatus *status; /* RPC return element */ /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* RPC return element */ /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 257; } /* = unique id SOAP_TYPE__ngwm__markUnReadResponse */ @@ -4584,7 +4584,7 @@ class SOAP_CMAC _ngwm__modifyItemResponse public: char *ngwt__modified; /* RPC return element */ /* optional element of type xsd:string */ std::vector<std::string >id; /* optional element of type ngwt:uid */ - ngwt__tqStatus *status; /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 259; } /* = unique id SOAP_TYPE__ngwm__modifyItemResponse */ @@ -4628,7 +4628,7 @@ class SOAP_CMAC _ngwm__modifyItemsResponse public: std::vector<char * >ngwt__modified; /* optional element of type xsd:string */ std::vector<std::string >id; /* optional element of type ngwt:uid */ - ngwt__tqStatus *status; /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 261; } /* = unique id SOAP_TYPE__ngwm__modifyItemsResponse */ @@ -4670,7 +4670,7 @@ public: class SOAP_CMAC _ngwm__modifyJunkEntryResponse { public: - ngwt__tqStatus *status; /* RPC return element */ /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* RPC return element */ /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 263; } /* = unique id SOAP_TYPE__ngwm__modifyJunkEntryResponse */ @@ -4712,7 +4712,7 @@ public: class SOAP_CMAC _ngwm__modifyJunkMailSettingsResponse { public: - ngwt__tqStatus *status; /* RPC return element */ /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* RPC return element */ /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 265; } /* = unique id SOAP_TYPE__ngwm__modifyJunkMailSettingsResponse */ @@ -4755,7 +4755,7 @@ public: class SOAP_CMAC _ngwm__modifyPasswordResponse { public: - ngwt__tqStatus *status; /* RPC return element */ /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* RPC return element */ /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 267; } /* = unique id SOAP_TYPE__ngwm__modifyPasswordResponse */ @@ -4799,7 +4799,7 @@ public: class SOAP_CMAC _ngwm__modifyProxyAccessResponse { public: - ngwt__tqStatus *status; /* RPC return element */ /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* RPC return element */ /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 269; } /* = unique id SOAP_TYPE__ngwm__modifyProxyAccessResponse */ @@ -4841,7 +4841,7 @@ public: class SOAP_CMAC _ngwm__modifySettingsResponse { public: - ngwt__tqStatus *status; /* RPC return element */ /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* RPC return element */ /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 271; } /* = unique id SOAP_TYPE__ngwm__modifySettingsResponse */ @@ -4883,7 +4883,7 @@ public: class SOAP_CMAC _ngwm__modifySignaturesResponse { public: - ngwt__tqStatus *status; /* RPC return element */ /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* RPC return element */ /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 273; } /* = unique id SOAP_TYPE__ngwm__modifySignaturesResponse */ @@ -4928,7 +4928,7 @@ public: class SOAP_CMAC _ngwm__moveItemResponse { public: - ngwt__tqStatus *status; /* RPC return element */ /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* RPC return element */ /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 275; } /* = unique id SOAP_TYPE__ngwm__moveItemResponse */ @@ -4974,7 +4974,7 @@ public: class SOAP_CMAC _ngwm__positionCursorResponse { public: - ngwt__tqStatus *status; /* RPC return element */ /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* RPC return element */ /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 277; } /* = unique id SOAP_TYPE__ngwm__positionCursorResponse */ @@ -5015,7 +5015,7 @@ public: class SOAP_CMAC _ngwm__purgeDeletedItemsResponse { public: - ngwt__tqStatus *status; /* RPC return element */ /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* RPC return element */ /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 279; } /* = unique id SOAP_TYPE__ngwm__purgeDeletedItemsResponse */ @@ -5057,7 +5057,7 @@ public: class SOAP_CMAC _ngwm__purgeResponse { public: - ngwt__tqStatus *status; /* RPC return element */ /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* RPC return element */ /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 281; } /* = unique id SOAP_TYPE__ngwm__purgeResponse */ @@ -5105,7 +5105,7 @@ class SOAP_CMAC _ngwm__readCursorResponse { public: ngwt__ItemList *items; /* RPC return element */ /* optional element of type ngwt:ItemList */ - ngwt__tqStatus *status; /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 283; } /* = unique id SOAP_TYPE__ngwm__readCursorResponse */ @@ -5149,7 +5149,7 @@ public: class SOAP_CMAC _ngwm__removeCustomDefinitionResponse { public: - ngwt__tqStatus *status; /* RPC return element */ /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* RPC return element */ /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 285; } /* = unique id SOAP_TYPE__ngwm__removeCustomDefinitionResponse */ @@ -5193,7 +5193,7 @@ public: class SOAP_CMAC _ngwm__removeItemResponse { public: - ngwt__tqStatus *status; /* RPC return element */ /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* RPC return element */ /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 287; } /* = unique id SOAP_TYPE__ngwm__removeItemResponse */ @@ -5237,7 +5237,7 @@ public: class SOAP_CMAC _ngwm__removeItemsResponse { public: - ngwt__tqStatus *status; /* RPC return element */ /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* RPC return element */ /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 289; } /* = unique id SOAP_TYPE__ngwm__removeItemsResponse */ @@ -5280,7 +5280,7 @@ public: class SOAP_CMAC _ngwm__removeJunkEntryResponse { public: - ngwt__tqStatus *status; /* RPC return element */ /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* RPC return element */ /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 291; } /* = unique id SOAP_TYPE__ngwm__removeJunkEntryResponse */ @@ -5324,7 +5324,7 @@ public: class SOAP_CMAC _ngwm__removeMembersResponse { public: - ngwt__tqStatus *status; /* RPC return element */ /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* RPC return element */ /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 293; } /* = unique id SOAP_TYPE__ngwm__removeMembersResponse */ @@ -5367,7 +5367,7 @@ public: class SOAP_CMAC _ngwm__removeProxyAccessResponse { public: - ngwt__tqStatus *status; /* RPC return element */ /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* RPC return element */ /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 295; } /* = unique id SOAP_TYPE__ngwm__removeProxyAccessResponse */ @@ -5410,7 +5410,7 @@ public: class SOAP_CMAC _ngwm__removeProxyUserResponse { public: - ngwt__tqStatus *status; /* RPC return element */ /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* RPC return element */ /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 297; } /* = unique id SOAP_TYPE__ngwm__removeProxyUserResponse */ @@ -5454,7 +5454,7 @@ public: class SOAP_CMAC _ngwm__removeSignatureResponse { public: - ngwt__tqStatus *status; /* RPC return element */ /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* RPC return element */ /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 299; } /* = unique id SOAP_TYPE__ngwm__removeSignatureResponse */ @@ -5499,7 +5499,7 @@ class SOAP_CMAC _ngwm__replyResponse { public: ngwt__Item *item; /* RPC return element */ /* optional element of type ngwt:Item */ - ngwt__tqStatus *status; /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 301; } /* = unique id SOAP_TYPE__ngwm__replyResponse */ @@ -5545,7 +5545,7 @@ public: class SOAP_CMAC _ngwm__retractResponse { public: - ngwt__tqStatus *status; /* RPC return element */ /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* RPC return element */ /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 303; } /* = unique id SOAP_TYPE__ngwm__retractResponse */ @@ -5588,7 +5588,7 @@ class SOAP_CMAC _ngwm__sendItemResponse { public: std::vector<std::string >id; /* RPC return element */ /* optional element of type ngwt:uid */ - ngwt__tqStatus *status; /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 305; } /* = unique id SOAP_TYPE__ngwm__sendItemResponse */ @@ -5631,7 +5631,7 @@ public: class SOAP_CMAC _ngwm__setTimestampResponse { public: - ngwt__tqStatus *status; /* RPC return element */ /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* RPC return element */ /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 307; } /* = unique id SOAP_TYPE__ngwm__setTimestampResponse */ @@ -5676,7 +5676,7 @@ class SOAP_CMAC _ngwm__startFreeBusySessionResponse { public: int *freeBusySessionId; /* RPC return element */ /* optional element of type xsd:int */ - ngwt__tqStatus *status; /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 309; } /* = unique id SOAP_TYPE__ngwm__startFreeBusySessionResponse */ @@ -5718,7 +5718,7 @@ public: class SOAP_CMAC _ngwm__unacceptResponse { public: - ngwt__tqStatus *status; /* RPC return element */ /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* RPC return element */ /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 311; } /* = unique id SOAP_TYPE__ngwm__unacceptResponse */ @@ -5760,7 +5760,7 @@ public: class SOAP_CMAC _ngwm__uncompleteResponse { public: - ngwt__tqStatus *status; /* RPC return element */ /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* RPC return element */ /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 313; } /* = unique id SOAP_TYPE__ngwm__uncompleteResponse */ @@ -5806,7 +5806,7 @@ class SOAP_CMAC _ngwm__updateVersionStatusResponse { public: ngwt__SignatureData *part; /* RPC return element */ /* optional element of type ngwt:SignatureData */ - ngwt__tqStatus *status; /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 315; } /* = unique id SOAP_TYPE__ngwm__updateVersionStatusResponse */ @@ -6038,7 +6038,7 @@ public: class SOAP_CMAC _ngwe__cleanEventConfigurationResponse { public: - ngwt__tqStatus *status; /* RPC return element */ /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* RPC return element */ /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 325; } /* = unique id SOAP_TYPE__ngwe__cleanEventConfigurationResponse */ @@ -6080,7 +6080,7 @@ public: class SOAP_CMAC _ngwe__configureEventsResponse { public: - ngwt__tqStatus *status; /* RPC return element */ /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* RPC return element */ /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 327; } /* = unique id SOAP_TYPE__ngwe__configureEventsResponse */ @@ -6123,7 +6123,7 @@ class SOAP_CMAC _ngwe__getEventConfigurationResponse { public: ngwe__EventsList *events; /* RPC return element */ /* optional element of type ngwe:EventsList */ - ngwt__tqStatus *status; /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 329; } /* = unique id SOAP_TYPE__ngwe__getEventConfigurationResponse */ @@ -6173,7 +6173,7 @@ class SOAP_CMAC _ngwe__getEventsResponse { public: ngwe__EventList *events; /* RPC return element */ /* optional element of type ngwe:EventList */ - ngwt__tqStatus *status; /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 331; } /* = unique id SOAP_TYPE__ngwe__getEventsResponse */ @@ -6216,7 +6216,7 @@ public: class SOAP_CMAC _ngwe__removeEventConfigurationResponse { public: - ngwt__tqStatus *status; /* RPC return element */ /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* RPC return element */ /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 333; } /* = unique id SOAP_TYPE__ngwe__removeEventConfigurationResponse */ @@ -6261,7 +6261,7 @@ public: class SOAP_CMAC _ngwe__removeEventsResponse { public: - ngwt__tqStatus *status; /* RPC return element */ /* required element of type ngwt:tqStatus */ + ngwt__Status *status; /* RPC return element */ /* required element of type ngwt:Status */ struct soap *soap; /* transient */ public: virtual int soap_type() const { return 335; } /* = unique id SOAP_TYPE__ngwe__removeEventsResponse */ @@ -6386,25 +6386,25 @@ public: }; #endif -#ifndef SOAP_TYPE_ngwt__CommentqStatus -#define SOAP_TYPE_ngwt__CommentqStatus (40) -/* Primitive ngwt:CommentqStatus schema type: */ -class SOAP_CMAC ngwt__CommentqStatus +#ifndef SOAP_TYPE_ngwt__CommenStatus +#define SOAP_TYPE_ngwt__CommenStatus (40) +/* Primitive ngwt:CommenStatus schema type: */ +class SOAP_CMAC ngwt__CommenStatus { public: char *__item; std::string *comment; /* optional attribute */ struct soap *soap; /* transient */ public: - virtual int soap_type() const { return 40; } /* = unique id SOAP_TYPE_ngwt__CommentqStatus */ + virtual int soap_type() const { return 40; } /* = unique id SOAP_TYPE_ngwt__CommenStatus */ virtual void soap_default(struct soap*); virtual void soap_serialize(struct soap*) const; virtual int soap_put(struct soap*, const char*, const char*) const; virtual int soap_out(struct soap*, const char*, int, const char*) const; virtual void *soap_get(struct soap*, const char*, const char*); virtual void *soap_in(struct soap*, const char*, const char*); - ngwt__CommentqStatus() { } - virtual ~ngwt__CommentqStatus() { } + ngwt__CommenStatus() { } + virtual ~ngwt__CommenStatus() { } }; #endif @@ -6454,45 +6454,45 @@ public: }; #endif -#ifndef SOAP_TYPE_ngwt__DelegatedtqStatus -#define SOAP_TYPE_ngwt__DelegatedtqStatus (52) -/* Primitive ngwt:DelegatedtqStatus schema type: */ -class SOAP_CMAC ngwt__DelegatedtqStatus +#ifndef SOAP_TYPE_ngwt__DelegatedStatus +#define SOAP_TYPE_ngwt__DelegatedStatus (52) +/* Primitive ngwt:DelegatedStatus schema type: */ +class SOAP_CMAC ngwt__DelegatedStatus { public: - ngwt__CommentqStatus *__item; + ngwt__CommenStatus *__item; std::string *userid; /* optional attribute */ struct soap *soap; /* transient */ public: - virtual int soap_type() const { return 52; } /* = unique id SOAP_TYPE_ngwt__DelegatedtqStatus */ + virtual int soap_type() const { return 52; } /* = unique id SOAP_TYPE_ngwt__DelegatedStatus */ virtual void soap_default(struct soap*); virtual void soap_serialize(struct soap*) const; virtual int soap_put(struct soap*, const char*, const char*) const; virtual int soap_out(struct soap*, const char*, int, const char*) const; virtual void *soap_get(struct soap*, const char*, const char*); virtual void *soap_in(struct soap*, const char*, const char*); - ngwt__DelegatedtqStatus() { } - virtual ~ngwt__DelegatedtqStatus() { } + ngwt__DelegatedStatus() { } + virtual ~ngwt__DelegatedStatus() { } }; #endif -#ifndef SOAP_TYPE_ngwt__DelegateetqStatus -#define SOAP_TYPE_ngwt__DelegateetqStatus (53) -/* ngwt:DelegateetqStatus */ -class SOAP_CMAC ngwt__DelegateetqStatus : public ngwt__RecipientqStatus +#ifndef SOAP_TYPE_ngwt__DelegateeStatus +#define SOAP_TYPE_ngwt__DelegateeStatus (53) +/* ngwt:DelegateeStatus */ +class SOAP_CMAC ngwt__DelegateeStatus : public ngwt__RecipienStatus { public: std::string *userid; /* optional attribute */ public: - virtual int soap_type() const { return 53; } /* = unique id SOAP_TYPE_ngwt__DelegateetqStatus */ + virtual int soap_type() const { return 53; } /* = unique id SOAP_TYPE_ngwt__DelegateeStatus */ virtual void soap_default(struct soap*); virtual void soap_serialize(struct soap*) const; virtual int soap_put(struct soap*, const char*, const char*) const; virtual int soap_out(struct soap*, const char*, int, const char*) const; virtual void *soap_get(struct soap*, const char*, const char*); virtual void *soap_in(struct soap*, const char*, const char*); - ngwt__DelegateetqStatus() { } - virtual ~ngwt__DelegateetqStatus() { } + ngwt__DelegateeStatus() { } + virtual ~ngwt__DelegateeStatus() { } }; #endif @@ -6774,7 +6774,7 @@ class SOAP_CMAC ngwt__Recipient : public ngwt__NameAndEmail public: enum ngwt__DistributionType distType; /* optional element of type ngwt:DistributionType */ enum ngwt__RecipientType recipType; /* optional element of type ngwt:RecipientType */ - ngwt__RecipientqStatus *recipientqStatus; /* optional element of type ngwt:RecipientqStatus */ + ngwt__RecipienStatus *recipienStatus; /* optional element of type ngwt:RecipienStatus */ enum ngwt__AcceptLevel *acceptLevel; /* optional element of type ngwt:AcceptLevel */ public: virtual int soap_type() const { return 121; } /* = unique id SOAP_TYPE_ngwt__Recipient */ @@ -6789,23 +6789,23 @@ public: }; #endif -#ifndef SOAP_TYPE_ngwt__TransferFailedtqStatus -#define SOAP_TYPE_ngwt__TransferFailedtqStatus (154) -/* ngwt:TransferFailedtqStatus */ -class SOAP_CMAC ngwt__TransferFailedtqStatus : public ngwt__RecipientqStatus +#ifndef SOAP_TYPE_ngwt__TransferFailedStatus +#define SOAP_TYPE_ngwt__TransferFailedStatus (154) +/* ngwt:TransferFailedStatus */ +class SOAP_CMAC ngwt__TransferFailedStatus : public ngwt__RecipienStatus { public: std::string *FailureReason; /* optional attribute */ public: - virtual int soap_type() const { return 154; } /* = unique id SOAP_TYPE_ngwt__TransferFailedtqStatus */ + virtual int soap_type() const { return 154; } /* = unique id SOAP_TYPE_ngwt__TransferFailedStatus */ virtual void soap_default(struct soap*); virtual void soap_serialize(struct soap*) const; virtual int soap_put(struct soap*, const char*, const char*) const; virtual int soap_out(struct soap*, const char*, int, const char*) const; virtual void *soap_get(struct soap*, const char*, const char*); virtual void *soap_in(struct soap*, const char*, const char*); - ngwt__TransferFailedtqStatus() { } - virtual ~ngwt__TransferFailedtqStatus() { } + ngwt__TransferFailedStatus() { } + virtual ~ngwt__TransferFailedStatus() { } }; #endif @@ -6886,7 +6886,7 @@ public: class SOAP_CMAC ngwt__BoxEntry : public ngwt__ContainerItem { public: - ngwt__ItemtqStatus *status; /* optional element of type ngwt:ItemtqStatus */ + ngwt__ItemStatus *status; /* optional element of type ngwt:ItemStatus */ std::string *thread; /* optional element of type xsd:string */ std::string *msgId; /* optional element of type xsd:string */ std::string *messageId; /* optional element of type xsd:string */ @@ -6989,7 +6989,7 @@ public: class SOAP_CMAC ngwt__FolderACLEntry : public ngwt__AccessControlListEntry { public: - enum ngwt__FolderACLtqStatus *status; /* optional element of type ngwt:FolderACLtqStatus */ + enum ngwt__FolderACLStatus *status; /* optional element of type ngwt:FolderACLStatus */ public: virtual int soap_type() const { return 67; } /* = unique id SOAP_TYPE_ngwt__FolderACLEntry */ virtual void soap_default(struct soap*); @@ -7133,7 +7133,7 @@ public: char *retrievedDate; /* optional element of type xsd:string */ unsigned long versionNumber; /* required element of type xsd:unsignedLong */ std::string *versionDescription; /* optional element of type xsd:string */ - enum ngwt__VersiontqStatus *versiontqStatus; /* optional element of type ngwt:VersiontqStatus */ + enum ngwt__VersionStatus *versionStatus; /* optional element of type ngwt:VersionStatus */ unsigned long *life; /* optional element of type xsd:unsignedLong */ enum ngwt__AgeAction *ageAction; /* optional element of type ngwt:AgeAction */ unsigned long *fileSize; /* optional element of type xsd:unsignedLong */ diff --git a/kresources/kolab/kabc/contact.cpp b/kresources/kolab/kabc/contact.cpp index 7a26f62f7..3bb0054ed 100644 --- a/kresources/kolab/kabc/contact.cpp +++ b/kresources/kolab/kabc/contact.cpp @@ -487,7 +487,7 @@ void Contact::saveCustomAttributes( TQDomElement& element ) const writeString( element, (*it).name, (*it).value ); } else { // skip writing the freebusyurl as it is a hack we need to remove eventually - if ( (*it).name == TQString::tqfromLatin1( "FreeBusyURL" ) ) { + if ( (*it).name == TQString::fromLatin1( "FreeBusyURL" ) ) { continue; } @@ -1110,7 +1110,7 @@ void Contact::setFields( const KABC::Addressee* addressee ) // (includes e.g. crypto settings, and extra im addresses) TQStringList knownCustoms; for ( const char** p = s_knownCustomFields; *p; ++p ) - knownCustoms << TQString::tqfromLatin1( *p ); + knownCustoms << TQString::fromLatin1( *p ); TQStringList customs = addressee->customs(); for( TQStringList::Iterator it = customs.begin(); it != customs.end(); ++it ) { // KABC::Addressee doesn't offer a real way to iterate over customs, other than splitting strings ourselves @@ -1253,7 +1253,7 @@ void Contact::saveTo( KABC::Addressee* addressee ) } for( TQValueList<Custom>::ConstIterator it = mCustomList.begin(); it != mCustomList.end(); ++it ) { - TQString app = (*it).app.isEmpty() ? TQString::tqfromLatin1( "KADDRESSBOOK" ) : (*it).app; + TQString app = (*it).app.isEmpty() ? TQString::fromLatin1( "KADDRESSBOOK" ) : (*it).app; addressee->insertCustom( app, (*it).name, (*it).value ); } //kdDebug(5006) << addressee->customs() << endl; diff --git a/kresources/kolab/kcal/event.cpp b/kresources/kolab/kcal/event.cpp index fedeca0c2..5f85cde22 100644 --- a/kresources/kolab/kcal/event.cpp +++ b/kresources/kolab/kcal/event.cpp @@ -82,18 +82,18 @@ void Event::setEndDate( const TQDateTime& date ) { mEndDate = date; mHasEndDate = true; - if ( mFloatingtqStatus == AllDay ) + if ( mFloatingStatus == AllDay ) kdDebug() << "ERROR: Time on end date but no time on the event\n"; - mFloatingtqStatus = HasTime; + mFloatingStatus = HasTime; } void Event::setEndDate( const TQDate& date ) { mEndDate = date; mHasEndDate = true; - if ( mFloatingtqStatus == HasTime ) + if ( mFloatingStatus == HasTime ) kdDebug() << "ERROR: No time on end date but time on the event\n"; - mFloatingtqStatus = AllDay; + mFloatingStatus = AllDay; } void Event::setEndDate( const TQString& endDate ) @@ -142,7 +142,7 @@ bool Event::saveAttributes( TQDomElement& element ) const else writeString( element, "show-time-as", "busy" ); if ( mHasEndDate ) { - if ( mFloatingtqStatus == HasTime ) + if ( mFloatingStatus == HasTime ) writeString( element, "end-date", dateTimeToString( endDate() ) ); else writeString( element, "end-date", dateToString( endDate().date() ) ); @@ -195,10 +195,10 @@ void Event::setFields( const KCal::Event* event ) if ( event->hasEndDate() || event->hasDuration() ) { if ( event->doesFloat() ) { // This is a floating event. Don't timezone move this one - mFloatingtqStatus = AllDay; + mFloatingStatus = AllDay; setEndDate( event->dtEnd().date() ); } else { - mFloatingtqStatus = HasTime; + mFloatingStatus = HasTime; setEndDate( localToUTC( event->dtEnd() ) ); } } else { @@ -213,7 +213,7 @@ void Event::saveTo( KCal::Event* event ) event->setHasEndDate( mHasEndDate ); if ( mHasEndDate ) { - if ( mFloatingtqStatus == AllDay ) + if ( mFloatingStatus == AllDay ) // This is a floating event. Don't timezone move this one event->setDtEnd( endDate() ); else diff --git a/kresources/kolab/kcal/incidence.cpp b/kresources/kolab/kcal/incidence.cpp index 602321795..9155ad43c 100644 --- a/kresources/kolab/kcal/incidence.cpp +++ b/kresources/kolab/kcal/incidence.cpp @@ -51,7 +51,7 @@ using namespace Kolab; Incidence::Incidence( KCal::ResourceKolab *res, const TQString &subResource, TQ_UINT32 sernum, const TQString& tz ) - : KolabBase( tz ), mFloatingtqStatus( Unset ), mHasAlarm( false ), + : KolabBase( tz ), mFloatingStatus( Unset ), mHasAlarm( false ), mResource( res ), mSubResource( subResource ), mSernum( sernum ) @@ -95,17 +95,17 @@ KolabBase::Email Incidence::organizer() const void Incidence::setStartDate( const TQDateTime& startDate ) { mStartDate = startDate; - if ( mFloatingtqStatus == AllDay ) + if ( mFloatingStatus == AllDay ) kdDebug() << "ERROR: Time on start date but no time on the event\n"; - mFloatingtqStatus = HasTime; + mFloatingStatus = HasTime; } void Incidence::setStartDate( const TQDate& startDate ) { mStartDate = startDate; - if ( mFloatingtqStatus == HasTime ) + if ( mFloatingStatus == HasTime ) kdDebug() << "ERROR: No time on start date but time on the event\n"; - mFloatingtqStatus = AllDay; + mFloatingStatus = AllDay; } void Incidence::setStartDate( const TQString& startDate ) @@ -546,7 +546,7 @@ bool Incidence::saveAttributes( TQDomElement& element ) const // Save the base class elements KolabBase::saveAttributes( element ); - if ( mFloatingtqStatus == HasTime ) + if ( mFloatingStatus == HasTime ) writeString( element, "start-date", dateTimeToString( startDate() ) ); else writeString( element, "start-date", dateToString( startDate().date() ) ); @@ -595,7 +595,7 @@ void Incidence::loadCustomAttributes( TQDomElement& element ) mCustomList.append( custom ); } -static KCal::Attendee::PartStat attendeeStringTotqStatus( const TQString& s ) +static KCal::Attendee::PartStat attendeeStringToStatus( const TQString& s ) { if ( s == "none" ) return KCal::Attendee::NeedsAction; @@ -771,10 +771,10 @@ void Incidence::setFields( const KCal::Incidence* incidence ) if ( incidence->doesFloat() ) { // This is a floating event. Don't timezone move this one - mFloatingtqStatus = AllDay; + mFloatingStatus = AllDay; setStartDate( incidence->dtStart().date() ); } else { - mFloatingtqStatus = HasTime; + mFloatingStatus = HasTime; setStartDate( localToUTC( incidence->dtStart() ) ); } @@ -856,7 +856,7 @@ void Incidence::setFields( const KCal::Incidence* incidence ) if ( incidence->pilotId() != 0 ) setPilotSyncId( incidence->pilotId() ); - setPilotSynctqStatus( incidence->synctqStatus() ); + setPilotSyncStatus( incidence->syncStatus() ); // Unhandled tags and other custom properties (see libkcal/customproperties.h) const TQMap<TQCString, TQString> map = incidence->customProperties(); @@ -886,7 +886,7 @@ void Incidence::saveTo( KCal::Incidence* incidence ) { KolabBase::saveTo( incidence ); - if ( mFloatingtqStatus == AllDay ) { + if ( mFloatingStatus == AllDay ) { // This is a floating event. Don't timezone move this one incidence->setDtStart( startDate() ); incidence->setFloats( true ); @@ -920,7 +920,7 @@ void Incidence::saveTo( KCal::Incidence* incidence ) incidence->clearAttendees(); TQValueList<Attendee>::ConstIterator it; for ( it = mAttendees.begin(); it != mAttendees.end(); ++it ) { - KCal::Attendee::PartStat status = attendeeStringTotqStatus( (*it).status ); + KCal::Attendee::PartStat status = attendeeStringToStatus( (*it).status ); KCal::Attendee::Role role = attendeeStringToRole( (*it).role ); KCal::Attendee* attendee = new KCal::Attendee( (*it).displayName, (*it).smtpAddress, @@ -994,8 +994,8 @@ void Incidence::saveTo( KCal::Incidence* incidence ) } if ( hasPilotSyncId() ) incidence->setPilotId( pilotSyncId() ); - if ( hasPilotSynctqStatus() ) - incidence->setSynctqStatus( pilotSynctqStatus() ); + if ( hasPilotSyncStatus() ) + incidence->setSyncStatus( pilotSyncStatus() ); for( TQValueList<Custom>::ConstIterator it = mCustomList.constBegin(); it != mCustomList.constEnd(); ++it ) { incidence->setNonKDECustomProperty( (*it).key, (*it).value ); diff --git a/kresources/kolab/kcal/incidence.h b/kresources/kolab/kcal/incidence.h index e5df23820..926ec1e4f 100644 --- a/kresources/kolab/kcal/incidence.h +++ b/kresources/kolab/kcal/incidence.h @@ -123,7 +123,7 @@ public: virtual bool saveAttributes( TQDomElement& ) const; protected: - enum FloatingtqStatus { Unset, AllDay, HasTime }; + enum FloatingStatus { Unset, AllDay, HasTime }; // Read all known fields from this ical incidence void setFields( const KCal::Incidence* ); @@ -150,7 +150,7 @@ protected: TQString mLocation; Email mOrganizer; TQDateTime mStartDate; - FloatingtqStatus mFloatingtqStatus; + FloatingStatus mFloatingStatus; float mAlarm; bool mHasAlarm; Recurrence mRecurrence; diff --git a/kresources/kolab/kcal/resourcekolab.cpp b/kresources/kolab/kcal/resourcekolab.cpp index e0ea6d164..8fa16eea3 100644 --- a/kresources/kolab/kcal/resourcekolab.cpp +++ b/kresources/kolab/kcal/resourcekolab.cpp @@ -70,7 +70,7 @@ static const char* incidenceInlineMimeType = "text/calendar"; ResourceKolab::ResourceKolab( const KConfig *config ) : ResourceCalendar( config ), ResourceKolabBase( "ResourceKolab-libkcal" ), - mCalendar( TQString::tqfromLatin1("UTC") ), mOpen( false ),mResourceChangedTimer( 0, + mCalendar( TQString::fromLatin1("UTC") ), mOpen( false ),mResourceChangedTimer( 0, "mResourceChangedTimer" ), mBatchAddingInProgress( false ) { if ( !config ) { @@ -370,7 +370,7 @@ void ResourceKolab::incidenceUpdated( KCal::IncidenceBase* incidencebase ) } incidencebase->setSyncStatusSilent( KCal::Event::SYNCMOD ); - incidencebase->setLastModified( TQDateTime::tqcurrentDateTime() ); + incidencebase->setLastModified( TQDateTime::currentDateTime() ); // we should probably update the revision number here, // or internally in the Event itself when certain things change. diff --git a/kresources/kolab/kcal/task.cpp b/kresources/kolab/kcal/task.cpp index 570bb47bc..488daf4af 100644 --- a/kresources/kolab/kcal/task.cpp +++ b/kresources/kolab/kcal/task.cpp @@ -94,7 +94,7 @@ Task::Task( KCal::ResourceKolab *res, const TQString &subResource, TQ_UINT32 ser const TQString& tz, KCal::Todo* task ) : Incidence( res, subResource, sernum, tz ), mPriority( 5 ), mPercentCompleted( 0 ), - mtqStatus( KCal::Incidence::StatusNone ), + mStatus( KCal::Incidence::StatusNone ), mHasStartDate( false ), mHasDueDate( false ), mHasCompletedDate( false ) { @@ -126,14 +126,14 @@ int Task::percentCompleted() const return mPercentCompleted; } -void Task::setqStatus( KCal::Incidence::tqStatus status ) +void Task::seStatus( KCal::Incidence::Status status ) { - mtqStatus = status; + mStatus = status; } -KCal::Incidence::tqStatus Task::status() const +KCal::Incidence::Status Task::status() const { - return mtqStatus; + return mStatus; } void Task::setParent( const TQString& parentUid ) @@ -150,14 +150,14 @@ void Task::setDueDate( const TQDateTime& date ) { mDueDate = date; mHasDueDate = true; - mFloatingtqStatus = HasTime; + mFloatingStatus = HasTime; } void Task::setDueDate( const TQDate &date ) { mDueDate = date; mHasDueDate = true; - mFloatingtqStatus = AllDay; + mFloatingStatus = AllDay; } @@ -234,17 +234,17 @@ bool Task::loadAttribute( TQDomElement& element ) setPercentCompleted( percent ); } else if ( tagName == "status" ) { if ( element.text() == "in-progress" ) - setqStatus( KCal::Incidence::StatusInProcess ); + seStatus( KCal::Incidence::StatusInProcess ); else if ( element.text() == "completed" ) - setqStatus( KCal::Incidence::StatusCompleted ); + seStatus( KCal::Incidence::StatusCompleted ); else if ( element.text() == "waiting-on-someone-else" ) - setqStatus( KCal::Incidence::StatusNeedsAction ); + seStatus( KCal::Incidence::StatusNeedsAction ); else if ( element.text() == "deferred" ) // Guessing a status here - setqStatus( KCal::Incidence::StatusCanceled ); + seStatus( KCal::Incidence::StatusCanceled ); else // Default - setqStatus( KCal::Incidence::StatusNone ); + seStatus( KCal::Incidence::StatusNone ); } else if ( tagName == "due-date" ) { setDueDate( element.text() ); } else if ( tagName == "parent" ) { @@ -300,7 +300,7 @@ bool Task::saveAttributes( TQDomElement& element ) const } if ( hasDueDate() ) { - if ( mFloatingtqStatus == HasTime ) { + if ( mFloatingStatus == HasTime ) { writeString( element, "due-date", dateTimeToString( dueDate() ) ); } else { writeString( element, "due-date", dateToString( dueDate().date() ) ); @@ -374,17 +374,17 @@ void Task::setFields( const KCal::Todo* task ) setPriority( task->priority() ); setPercentCompleted( task->percentComplete() ); - setqStatus( task->status() ); + seStatus( task->status() ); setHasStartDate( task->hasStartDate() ); if ( task->hasDueDate() ) { setDueDate( localToUTC( task->dtDue() ) ); if ( task->doesFloat() ) { // This is a floating task. Don't timezone move this one - mFloatingtqStatus = AllDay; + mFloatingStatus = AllDay; setDueDate( task->dtDue().date() ); } else { - mFloatingtqStatus = HasTime; + mFloatingStatus = HasTime; setDueDate( localToUTC( task->dtDue() ) ); } } else { @@ -447,7 +447,7 @@ void Task::saveTo( KCal::Todo* task ) task->setPriority( priority() ); task->setPercentComplete( percentCompleted() ); - task->setqStatus( status() ); + task->seStatus( status() ); task->setHasStartDate( hasStartDate() ); task->setHasDueDate( hasDueDate() ); if ( hasDueDate() ) diff --git a/kresources/kolab/kcal/task.h b/kresources/kolab/kcal/task.h index 43780c00e..981c56ab7 100644 --- a/kresources/kolab/kcal/task.h +++ b/kresources/kolab/kcal/task.h @@ -77,8 +77,8 @@ public: virtual void setPercentCompleted( int percent ); virtual int percentCompleted() const; - virtual void setqStatus( KCal::Incidence::tqStatus status ); - virtual KCal::Incidence::tqStatus status() const; + virtual void seStatus( KCal::Incidence::Status status ); + virtual KCal::Incidence::Status status() const; virtual void setParent( const TQString& parentUid ); virtual TQString parent() const; @@ -126,7 +126,7 @@ protected: int mKCalPriorityFromDom; int mPercentCompleted; - KCal::Incidence::tqStatus mtqStatus; + KCal::Incidence::Status mStatus; TQString mParent; bool mHasStartDate; diff --git a/kresources/kolab/knotes/resourcekolab.cpp b/kresources/kolab/knotes/resourcekolab.cpp index 132decdf5..b92a723a5 100644 --- a/kresources/kolab/knotes/resourcekolab.cpp +++ b/kresources/kolab/knotes/resourcekolab.cpp @@ -52,7 +52,7 @@ static const char* inlineMimeType = "text/calendar"; ResourceKolab::ResourceKolab( const KConfig *config ) : ResourceNotes( config ), ResourceKolabBase( "ResourceKolab-KNotes" ), - mCalendar( TQString::tqfromLatin1("UTC") ) + mCalendar( TQString::fromLatin1("UTC") ) { if ( !config ) { setResourceName( i18n( "Kolab Server" ) ); diff --git a/kresources/kolab/shared/kolabbase.cpp b/kresources/kolab/shared/kolabbase.cpp index 09ec2cd6b..a0f32529f 100644 --- a/kresources/kolab/shared/kolabbase.cpp +++ b/kresources/kolab/shared/kolabbase.cpp @@ -44,10 +44,10 @@ using namespace Kolab; KolabBase::KolabBase( const TQString& tz ) - : mCreationDate( TQDateTime::tqcurrentDateTime() ), - mLastModified( TQDateTime::tqcurrentDateTime() ), + : mCreationDate( TQDateTime::currentDateTime() ), + mLastModified( TQDateTime::currentDateTime() ), mSensitivity( Public ), mTimeZoneId( tz ), - mHasPilotSyncId( false ), mHasPilotSynctqStatus( false ) + mHasPilotSyncId( false ), mHasPilotSyncStatus( false ) { } @@ -58,7 +58,7 @@ KolabBase::~KolabBase() void KolabBase::setFields( const KCal::Incidence* incidence ) { // So far unhandled KCal::IncidenceBase fields: - // mPilotID, mSynctqStatus, mFloats + // mPilotID, mSyncStatus, mFloats setUid( incidence->uid() ); setBody( incidence->description() ); @@ -94,7 +94,7 @@ void KolabBase::setFields( const KABC::Addressee* addressee ) kdDebug(5006) << "Creation time string: " << creationString << endl; TQDateTime creationDate; if ( creationString.isEmpty() ) { - creationDate = TQDateTime::tqcurrentDateTime(); + creationDate = TQDateTime::currentDateTime(); kdDebug(5006) << "Creation date set to current time\n"; } else { @@ -103,7 +103,7 @@ void KolabBase::setFields( const KABC::Addressee* addressee ) } TQDateTime modified = addressee->revision(); if ( !modified.isValid() ) - modified = TQDateTime::tqcurrentDateTime(); + modified = TQDateTime::currentDateTime(); setLastModified( modified ); if ( modified < creationDate ) { // It's not possible that the modification date is earlier than creation @@ -233,20 +233,20 @@ unsigned long KolabBase::pilotSyncId() const return mPilotSyncId; } -void KolabBase::setPilotSynctqStatus( int status ) +void KolabBase::setPilotSyncStatus( int status ) { - mHasPilotSynctqStatus = true; - mPilotSynctqStatus = status; + mHasPilotSyncStatus = true; + mPilotSyncStatus = status; } -bool KolabBase::hasPilotSynctqStatus() const +bool KolabBase::hasPilotSyncStatus() const { - return mHasPilotSynctqStatus; + return mHasPilotSyncStatus; } -int KolabBase::pilotSynctqStatus() const +int KolabBase::pilotSyncStatus() const { - return mPilotSynctqStatus; + return mPilotSyncStatus; } bool KolabBase::loadEmailAttribute( TQDomElement& element, Email& email ) @@ -335,7 +335,7 @@ bool KolabBase::loadAttribute( TQDomElement& element ) return true; } if ( tagName == "pilot-sync-status" ) { - setPilotSynctqStatus( element.text().toInt() ); + setPilotSyncStatus( element.text().toInt() ); return true; } break; @@ -357,8 +357,8 @@ bool KolabBase::saveAttributes( TQDomElement& element ) const writeString( element, "sensitivity", sensitivityToString( sensitivity() ) ); if ( hasPilotSyncId() ) writeString( element, "pilot-sync-id", TQString::number( pilotSyncId() ) ); - if ( hasPilotSynctqStatus() ) - writeString( element, "pilot-sync-status", TQString::number( pilotSynctqStatus() ) ); + if ( hasPilotSyncStatus() ) + writeString( element, "pilot-sync-status", TQString::number( pilotSyncStatus() ) ); return true; } diff --git a/kresources/kolab/shared/kolabbase.h b/kresources/kolab/shared/kolabbase.h index d4621c722..294a7d81b 100644 --- a/kresources/kolab/shared/kolabbase.h +++ b/kresources/kolab/shared/kolabbase.h @@ -94,9 +94,9 @@ public: virtual bool hasPilotSyncId() const; virtual unsigned long pilotSyncId() const; - virtual void setPilotSynctqStatus( int status ); - virtual bool hasPilotSynctqStatus() const; - virtual int pilotSynctqStatus() const; + virtual void setPilotSyncStatus( int status ); + virtual bool hasPilotSyncStatus() const; + virtual int pilotSyncStatus() const; // String - Date conversion methods static TQString dateTimeToString( const TQDateTime& time ); @@ -167,9 +167,9 @@ protected: TQString mTimeZoneId; // KPilot synchronization stuff - bool mHasPilotSyncId, mHasPilotSynctqStatus; + bool mHasPilotSyncId, mHasPilotSyncStatus; unsigned long mPilotSyncId; - int mPilotSynctqStatus; + int mPilotSyncStatus; }; } diff --git a/kresources/kolab/shared/resourcekolabbase.cpp b/kresources/kolab/shared/resourcekolabbase.cpp index a357b0d62..1599acaa0 100644 --- a/kresources/kolab/shared/resourcekolabbase.cpp +++ b/kresources/kolab/shared/resourcekolabbase.cpp @@ -126,7 +126,7 @@ 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::tqfromLatin1( firstPartTextToTranslate ).tqarg( url ); + TQString firstPartTextUntranslated = TQString::fromLatin1( firstPartTextToTranslate ).tqarg( url ); TQString firstPartText = i18n( firstPartTextToTranslate ).tqarg( url ); if ( firstPartText != firstPartTextUntranslated ) { firstPartText.append("\n\n-----------------------------------------------------\n\n"); diff --git a/kresources/lib/folderlistview.cpp b/kresources/lib/folderlistview.cpp index 8cbdffd5e..b29e61c9d 100644 --- a/kresources/lib/folderlistview.cpp +++ b/kresources/lib/folderlistview.cpp @@ -134,7 +134,7 @@ void FolderListView::showPopupMenu( FolderListItem *i, const TQPoint &globalPos void FolderListView::showPopupMenu( TQListViewItem *i ) { if ( dynamic_cast<FolderListItem*>(i) ) - showPopupMenu( (FolderListItem*)i, viewport()->mapToGlobal(tqitemRect(i).topLeft()) ); + showPopupMenu( (FolderListItem*)i, viewport()->mapToGlobal(itemRect(i).topLeft()) ); } void FolderListView::slotPopupHandler( int z ) @@ -152,7 +152,7 @@ void FolderListView::slotMousePressed(int btn, TQListViewItem* i, const TQPoint& } else if ( btn == Qt::LeftButton && c > 0 ) { // map pos to item/column and call FolderListItem::activate(col, pos) - ((FolderListItem*)i)->activate( c, viewport()->mapFromGlobal( pos ) - TQPoint( 0, tqitemRect(i).top() ) ); + ((FolderListItem*)i)->activate( c, viewport()->mapFromGlobal( pos ) - TQPoint( 0, itemRect(i).top() ) ); // } else { // KListView::slotMousePressed( btn, i, pos, c ); } @@ -242,7 +242,7 @@ void FolderListItem::paintCell( TQPainter *p, const TQColorGroup &cg, int col, i if ( !lv ) return; // use a private color group and set the text/highlighted text colors -// TQColorGroup mcg = lv->viewport()->tqcolorGroup(); +// TQColorGroup mcg = lv->viewport()->colorGroup(); FolderListView::Property prop( mFolderListView->typeForColumn(col) ); if ( prop == FolderListView::FolderName ) { diff --git a/kresources/newexchange/Incidence.mapping b/kresources/newexchange/Incidence.mapping index 145ca4802..ef0914b56 100644 --- a/kresources/newexchange/Incidence.mapping +++ b/kresources/newexchange/Incidence.mapping @@ -104,7 +104,7 @@ DAV:id Incidence::pilotId() -Incidence::synctqStatus() +Incidence::syncStatus() Incidence::relatedToUid() @@ -156,7 +156,7 @@ h1:0x00008101 b:dt='int' | status: 0_Open, 1_InProgress, 2 No correspondence: ================== Incidence::pilotId() -Incidence::synctqStatus() +Incidence::syncStatus() Incidence::relatedToUid() Incidence::custom() diff --git a/kresources/newexchange/exchangeconvertercalendar.cpp b/kresources/newexchange/exchangeconvertercalendar.cpp index 53cc7e78d..529409362 100644 --- a/kresources/newexchange/exchangeconvertercalendar.cpp +++ b/kresources/newexchange/exchangeconvertercalendar.cpp @@ -34,7 +34,7 @@ using namespace KCal; #define TaskNamespace1 "http://schemas.microsoft.com/mapi/id/{00062003-0000-0000-C000-000000000046}/" -#define TaskProp_tqStatus "0x00008101" +#define TaskProp_Status "0x00008101" #define TaskProp_PercentCompleted "0x00008102" #define TaskProp_DtStart "0x00008104" #define TaskProp_DtDue "0x00008105" @@ -164,7 +164,7 @@ void ExchangeConverterCalendar::createRequestTask( TQDomDocument &doc, TQDomElem propertyTask2( TaskProp_ReminderTime ); propertyTask2( TaskProp_ReminderPlaySound ); propertyTask2( TaskProp_ReminderSoundFile ); - propertyTask1( TaskProp_tqStatus ); + propertyTask1( TaskProp_Status ); } #undef propertyTask1 #undef propertyTask2 @@ -497,7 +497,7 @@ kdDebug()<<"ExchangeConverterCalendar::readIncidence: ERROR: No UID given"<<endl // What to do about recurrence rules? // FIXME: Reminders, use TaskProp_ReminderSet, TaskProp_ReminderTime, - // TaskProp_ReminderPlaySound, TaskProp_ReminderSoundFile, TaskProp_tqStatus + // TaskProp_ReminderPlaySound, TaskProp_ReminderSoundFile, TaskProp_Status // But how do I get the offset? return true; @@ -747,7 +747,7 @@ class ExchangeConverterCalendar::createWebDAVVisitor : public IncidenceBase::Vis propertyTask2( TaskProp_ReminderTime ); propertyTask2( TaskProp_ReminderPlaySound ); propertyTask2( TaskProp_ReminderSoundFile ); - propertyTask1( TaskProp_tqStatus );*/ + propertyTask1( TaskProp_Status );*/ return true; } bool visit( Journal *journal ) diff --git a/kresources/scalix/kcal/resourcescalix.cpp b/kresources/scalix/kcal/resourcescalix.cpp index 645c5b88e..21f05f04e 100644 --- a/kresources/scalix/kcal/resourcescalix.cpp +++ b/kresources/scalix/kcal/resourcescalix.cpp @@ -63,7 +63,7 @@ static const char* incidenceInlineMimeType = "text/calendar"; ResourceScalix::ResourceScalix( const KConfig *config ) : ResourceCalendar( config ), ResourceScalixBase( "ResourceScalix-libkcal" ), - mCalendar( TQString::tqfromLatin1("UTC") ), mOpen( false ) + mCalendar( TQString::fromLatin1("UTC") ), mOpen( false ) { setType( "scalix" ); connect( &mResourceChangedTimer, TQT_SIGNAL( timeout() ), @@ -268,8 +268,8 @@ bool ResourceScalix::doSave() void ResourceScalix::incidenceUpdated( KCal::IncidenceBase* incidencebase ) { if ( incidencebase->isReadOnly() ) return; // Should not happen (TM) - incidencebase->setSynctqStatus( KCal::Event::SYNCMOD ); - incidencebase->setLastModified( TQDateTime::tqcurrentDateTime() ); + incidencebase->setSyncStatus( KCal::Event::SYNCMOD ); + incidencebase->setLastModified( TQDateTime::currentDateTime() ); // we should probably update the revision number here, // or internally in the Event itself when certain things change. // need to verify with ical documentation. diff --git a/kresources/scalix/knotes/resourcescalix.cpp b/kresources/scalix/knotes/resourcescalix.cpp index 69922283e..0289fab0a 100644 --- a/kresources/scalix/knotes/resourcescalix.cpp +++ b/kresources/scalix/knotes/resourcescalix.cpp @@ -49,7 +49,7 @@ static const char* inlineMimeType = "text/calendar"; ResourceScalix::ResourceScalix( const KConfig *config ) : ResourceNotes( config ), ResourceScalixBase( "ResourceScalix-KNotes" ), - mCalendar( TQString::tqfromLatin1("UTC") ) + mCalendar( TQString::fromLatin1("UTC") ) { setType( "scalix" ); } diff --git a/kresources/scalix/shared/scalixbase.cpp b/kresources/scalix/shared/scalixbase.cpp index 5a23623bc..0d305c0af 100644 --- a/kresources/scalix/shared/scalixbase.cpp +++ b/kresources/scalix/shared/scalixbase.cpp @@ -42,10 +42,10 @@ using namespace Scalix; ScalixBase::ScalixBase( const TQString& tz ) - : mCreationDate( TQDateTime::tqcurrentDateTime() ), - mLastModified( TQDateTime::tqcurrentDateTime() ), + : mCreationDate( TQDateTime::currentDateTime() ), + mLastModified( TQDateTime::currentDateTime() ), mSensitivity( Public ), mTimeZoneId( tz ), - mHasPilotSyncId( false ), mHasPilotSynctqStatus( false ) + mHasPilotSyncId( false ), mHasPilotSyncStatus( false ) { } @@ -56,7 +56,7 @@ ScalixBase::~ScalixBase() void ScalixBase::setFields( const KCal::Incidence* incidence ) { // So far unhandled KCal::IncidenceBase fields: - // mPilotID, mSynctqStatus, mFloats + // mPilotID, mSyncStatus, mFloats setUid( incidence->uid() ); setBody( incidence->description() ); @@ -92,7 +92,7 @@ void ScalixBase::setFields( const KABC::Addressee* addressee ) kdDebug(5006) << "Creation time string: " << creationString << endl; TQDateTime creationDate; if ( creationString.isEmpty() ) { - creationDate = TQDateTime::tqcurrentDateTime(); + creationDate = TQDateTime::currentDateTime(); kdDebug(5006) << "Creation date set to current time\n"; } else { @@ -101,7 +101,7 @@ void ScalixBase::setFields( const KABC::Addressee* addressee ) } TQDateTime modified = addressee->revision(); if ( !modified.isValid() ) - modified = TQDateTime::tqcurrentDateTime(); + modified = TQDateTime::currentDateTime(); setLastModified( modified ); if ( modified < creationDate ) { // It's not possible that the modification date is earlier than creation @@ -231,20 +231,20 @@ unsigned long ScalixBase::pilotSyncId() const return mPilotSyncId; } -void ScalixBase::setPilotSynctqStatus( int status ) +void ScalixBase::setPilotSyncStatus( int status ) { - mHasPilotSynctqStatus = true; - mPilotSynctqStatus = status; + mHasPilotSyncStatus = true; + mPilotSyncStatus = status; } -bool ScalixBase::hasPilotSynctqStatus() const +bool ScalixBase::hasPilotSyncStatus() const { - return mHasPilotSynctqStatus; + return mHasPilotSyncStatus; } -int ScalixBase::pilotSynctqStatus() const +int ScalixBase::pilotSyncStatus() const { - return mPilotSynctqStatus; + return mPilotSyncStatus; } bool ScalixBase::loadEmailAttribute( TQDomElement& element, Email& email ) @@ -300,7 +300,7 @@ bool ScalixBase::loadAttribute( TQDomElement& element ) else if ( tagName == "pilot-sync-id" ) setPilotSyncId( element.text().toULong() ); else if ( tagName == "pilot-sync-status" ) - setPilotSynctqStatus( element.text().toInt() ); + setPilotSyncStatus( element.text().toInt() ); else return false; @@ -320,8 +320,8 @@ bool ScalixBase::saveAttributes( TQDomElement& element ) const writeString( element, "sensitivity", sensitivityToString( sensitivity() ) ); if ( hasPilotSyncId() ) writeString( element, "pilot-sync-id", TQString::number( pilotSyncId() ) ); - if ( hasPilotSynctqStatus() ) - writeString( element, "pilot-sync-status", TQString::number( pilotSynctqStatus() ) ); + if ( hasPilotSyncStatus() ) + writeString( element, "pilot-sync-status", TQString::number( pilotSyncStatus() ) ); return true; } diff --git a/kresources/scalix/shared/scalixbase.h b/kresources/scalix/shared/scalixbase.h index b837ab03e..7bff80a4b 100644 --- a/kresources/scalix/shared/scalixbase.h +++ b/kresources/scalix/shared/scalixbase.h @@ -93,9 +93,9 @@ public: virtual bool hasPilotSyncId() const; virtual unsigned long pilotSyncId() const; - virtual void setPilotSynctqStatus( int status ); - virtual bool hasPilotSynctqStatus() const; - virtual int pilotSynctqStatus() const; + virtual void setPilotSyncStatus( int status ); + virtual bool hasPilotSyncStatus() const; + virtual int pilotSyncStatus() const; // String - Date conversion methods static TQString dateTimeToString( const TQDateTime& time ); @@ -166,9 +166,9 @@ protected: TQString mTimeZoneId; // KPilot synchronization stuff - bool mHasPilotSyncId, mHasPilotSynctqStatus; + bool mHasPilotSyncId, mHasPilotSyncStatus; unsigned long mPilotSyncId; - int mPilotSynctqStatus; + int mPilotSyncStatus; }; } diff --git a/kresources/slox/kabcresourceslox.cpp b/kresources/slox/kabcresourceslox.cpp index f45108b42..6412de4a0 100644 --- a/kresources/slox/kabcresourceslox.cpp +++ b/kresources/slox/kabcresourceslox.cpp @@ -218,7 +218,7 @@ bool ResourceSlox::asyncLoad() TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), TQT_SLOT( cancelDownload() ) ); - mPrefs->setLastSync( TQDateTime::tqcurrentDateTime() ); + mPrefs->setLastSync( TQDateTime::currentDateTime() ); return true; } @@ -255,7 +255,7 @@ void ResourceSlox::slotResult( KIO::Job *job ) Addressee a; a.setUid( uid ); - mWebdavHandler.clearSloxAttributetqStatus(); + mWebdavHandler.clearSloxAttributeStatus(); TQDomNode n; for( n = item.domNode.firstChild(); !n.isNull(); n = n.nextSibling() ) { diff --git a/kresources/slox/kcalresourceslox.cpp b/kresources/slox/kcalresourceslox.cpp index a47c64b6f..39e3be399 100644 --- a/kresources/slox/kcalresourceslox.cpp +++ b/kresources/slox/kcalresourceslox.cpp @@ -237,7 +237,7 @@ void KCalResourceSlox::requestEvents() TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), TQT_SLOT( cancelLoadEvents() ) ); - mPrefs->setLastEventSync( TQDateTime::tqcurrentDateTime() ); + mPrefs->setLastEventSync( TQDateTime::currentDateTime() ); } void KCalResourceSlox::requestTodos() @@ -282,7 +282,7 @@ void KCalResourceSlox::requestTodos() TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), TQT_SLOT( cancelLoadTodos() ) ); - mPrefs->setLastTodoSync( TQDateTime::tqcurrentDateTime() ); + mPrefs->setLastTodoSync( TQDateTime::currentDateTime() ); } void KCalResourceSlox::uploadIncidences() @@ -629,11 +629,11 @@ void KCalResourceSlox::parseMembersAttribute( const TQDomElement &e, TQString status = memberElement.attribute( "confirm" ); if ( !status.isEmpty() ) { if ( status == "accept" ) { - a->setqStatus( Attendee::Accepted ); + a->seStatus( Attendee::Accepted ); } else if ( status == "decline" ) { - a->setqStatus( Attendee::Declined ); + a->seStatus( Attendee::Declined ); } else { - a->setqStatus( Attendee::NeedsAction ); + a->seStatus( Attendee::NeedsAction ); } } } else { @@ -953,7 +953,7 @@ void KCalResourceSlox::slotLoadTodosResult( KIO::Job *job ) todo->setCustomProperty( "SLOX", "ID", item.sloxId ); - mWebdavHandler.clearSloxAttributetqStatus(); + mWebdavHandler.clearSloxAttributeStatus(); TQDomNode n; for( n = item.domNode.firstChild(); !n.isNull(); n = n.nextSibling() ) { @@ -1032,7 +1032,7 @@ void KCalResourceSlox::slotLoadEventsResult( KIO::Job *job ) bool doesRecur = false; - mWebdavHandler.clearSloxAttributetqStatus(); + mWebdavHandler.clearSloxAttributeStatus(); for( n = item.domNode.firstChild(); !n.isNull(); n = n.nextSibling() ) { TQDomElement e = n.toElement(); diff --git a/kresources/slox/sloxbase.h b/kresources/slox/sloxbase.h index 6f291c8f6..8e9309c9d 100644 --- a/kresources/slox/sloxbase.h +++ b/kresources/slox/sloxbase.h @@ -35,7 +35,7 @@ class KDE_EXPORT SloxBase { FolderId, LastSync, ObjectType, - ObjectqStatus, + ObjecStatus, CreatedBy, Categories, IncidenceTitle, // incidence fields diff --git a/kresources/slox/webdavhandler.cpp b/kresources/slox/webdavhandler.cpp index cb8acde02..6b2c733a4 100644 --- a/kresources/slox/webdavhandler.cpp +++ b/kresources/slox/webdavhandler.cpp @@ -129,9 +129,9 @@ TQValueList<SloxItem> WebdavHandler::getSloxItems( SloxBase *res, const TQDomDoc item.status = SloxItem::New; } - TQDomNode sloxtqStatus = prop.namedItem( res->fieldName( SloxBase::ObjectqStatus ) ); - if ( !sloxtqStatus.isNull() ) { - TQDomElement sloxStatusElement = sloxtqStatus.toElement(); + TQDomNode sloxStatus = prop.namedItem( res->fieldName( SloxBase::ObjecStatus ) ); + if ( !sloxStatus.isNull() ) { + TQDomElement sloxStatusElement = sloxStatus.toElement(); if ( sloxStatusElement.text() == "DELETE" ) { item.status = SloxItem::Delete; } else if ( sloxStatusElement.text() == "CREATE" ) { @@ -276,7 +276,7 @@ void WebdavHandler::parseSloxAttribute( const TQDomElement &e ) } } -void WebdavHandler::clearSloxAttributetqStatus() +void WebdavHandler::clearSloxAttributeStatus() { if ( mRes->resType() == "ox" ) mWritable = true; // parseSloxAttribute() won't work for OX diff --git a/kresources/slox/webdavhandler.h b/kresources/slox/webdavhandler.h index 8dedf0a72..136be879e 100644 --- a/kresources/slox/webdavhandler.h +++ b/kresources/slox/webdavhandler.h @@ -37,14 +37,14 @@ class SloxBase; class KDE_EXPORT SloxItem { public: - enum tqStatus { Invalid, Delete, Create, New }; + enum Status { Invalid, Delete, Create, New }; SloxItem(); TQDomNode domNode; TQString sloxId; TQString clientId; - tqStatus status; + Status status; TQString response; TQString responseDescription; }; @@ -78,7 +78,7 @@ class KDE_EXPORT WebdavHandler static TQValueList<SloxItem> getSloxItems( SloxBase *res, const TQDomDocument &doc ); - void clearSloxAttributetqStatus(); + void clearSloxAttributeStatus(); void parseSloxAttribute( const TQDomElement & ); void setSloxAttributes( KCal::Incidence * ); void setSloxAttributes( KABC::Addressee & ); diff --git a/kresources/tvanytime/kcal_resourcetvanytime.cpp b/kresources/tvanytime/kcal_resourcetvanytime.cpp index f819bba5a..4933768ab 100644 --- a/kresources/tvanytime/kcal_resourcetvanytime.cpp +++ b/kresources/tvanytime/kcal_resourcetvanytime.cpp @@ -320,7 +320,7 @@ bool ResourceTVAnytime::readService( const TQString & serviceId ) TQStringList entries = mScheduleArchive->directory()->entries(); TQRegExp re( "^(\\d{8})" + serviceId ); TQStringList dates; - TQString todaysDate = TQDate::tqcurrentDate().toString( "yyyyMMdd" ); + TQString todaysDate = TQDate::currentDate().toString( "yyyyMMdd" ); for( TQStringList::Iterator it = entries.begin(); it != entries.end(); ++it ) { if ( re.search( *it ) != -1 ) // this entry belongs to the requested service @@ -328,7 +328,7 @@ bool ResourceTVAnytime::readService( const TQString & serviceId ) TQString entry = re.cap( 1 ); // handle this date according to user preferences TQDate entryDate( entry.left( 4 ).toInt(), entry.mid( 4, 2 ).toInt(), entry.right( 2 ).toInt() ); - if ( entryDate < TQDate::tqcurrentDate() || ( entryDate > TQDate::tqcurrentDate().addDays( prefs()->days() - 1 ) ) ) + if ( entryDate < TQDate::currentDate() || ( entryDate > TQDate::currentDate().addDays( prefs()->days() - 1 ) ) ) continue; if ( !dates.contains( re.cap( 1 ) ) ) diff --git a/ktnef/gui/attachpropertydialog.cpp b/ktnef/gui/attachpropertydialog.cpp index fbf4d6e36..564e3b712 100644 --- a/ktnef/gui/attachpropertydialog.cpp +++ b/ktnef/gui/attachpropertydialog.cpp @@ -53,7 +53,7 @@ void AttachPropertyDialog::setAttachment(KTNEFAttach *attach) s.append(" bytes"); size_->setText(s); KMimeType::Ptr mimetype = KMimeType::mimeType(attach->mimeTag()); - TQPixmap pix = loadRenderingPixmap( attach, tqcolorGroup().background() ); + TQPixmap pix = loadRenderingPixmap( attach, colorGroup().background() ); if ( !pix.isNull() ) icon_->setPixmap( pix ); else diff --git a/ktnef/gui/attachpropertydialogbase.ui b/ktnef/gui/attachpropertydialogbase.ui index 808df4e71..2227e6630 100644 --- a/ktnef/gui/attachpropertydialogbase.ui +++ b/ktnef/gui/attachpropertydialogbase.ui @@ -169,7 +169,7 @@ <property name="name"> <cstring>icon_</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>16</width> <height>16</height> @@ -227,7 +227,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>150</width> <height>20</height> diff --git a/ktnef/gui/ktnefmain.cpp b/ktnef/gui/ktnefmain.cpp index b16b2029c..df9dfa67d 100644 --- a/ktnef/gui/ktnefmain.cpp +++ b/ktnef/gui/ktnefmain.cpp @@ -358,7 +358,7 @@ void KTNEFMain::viewDragRequested( const TQValueList<KTNEFAttach*>& list ) void KTNEFMain::slotEditToolbars() { - saveMainWindowSettings( KGlobal::config(), TQString::tqfromLatin1("MainWindow") ); + saveMainWindowSettings( KGlobal::config(), TQString::fromLatin1("MainWindow") ); KEditToolbar dlg(actionCollection()); connect(&dlg, TQT_SIGNAL( newToolbarConfig() ), this, TQT_SLOT( slotNewToolbarConfig() )); dlg.exec(); @@ -367,7 +367,7 @@ void KTNEFMain::slotEditToolbars() void KTNEFMain::slotNewToolbarConfig() { createGUI(); - applyMainWindowSettings( KGlobal::config(), TQString::tqfromLatin1("MainWindow") ); + applyMainWindowSettings( KGlobal::config(), TQString::fromLatin1("MainWindow") ); } void KTNEFMain::slotShowMessageProperties() diff --git a/ktnef/gui/ktnefview.cpp b/ktnef/gui/ktnefview.cpp index 676dd4b9f..05ff229db 100644 --- a/ktnef/gui/ktnefview.cpp +++ b/ktnef/gui/ktnefview.cpp @@ -49,7 +49,7 @@ Attachment::Attachment(TQListView *parent, KTNEFAttach *attach) if (!attach_->fileName().isEmpty()) setText(0, attach_->fileName()); KMimeType::Ptr mimeType = KMimeType::mimeType( attach_->mimeTag() ); setText(1, mimeType->comment()); - TQPixmap pix = loadRenderingPixmap( attach, parent->tqcolorGroup().base() ); + TQPixmap pix = loadRenderingPixmap( attach, parent->colorGroup().base() ); if ( !pix.isNull() ) setPixmap( 0, pix ); else diff --git a/ktnef/gui/qwmf.cpp b/ktnef/gui/qwmf.cpp index d60d661d3..7e5193be2 100644 --- a/ktnef/gui/qwmf.cpp +++ b/ktnef/gui/qwmf.cpp @@ -482,7 +482,7 @@ void TQWinMetaFile::polygon( long, short* parm ) TQPointArray* pa; pa = pointArray( parm[ 0 ], &parm[ 1 ] ); - mPainter.tqdrawPolygon( *pa, mWinding ); + mPainter.drawPolygon( *pa, mWinding ); } diff --git a/ktnef/lib/ktnefwriter.cpp b/ktnef/lib/ktnefwriter.cpp index ddbf3bef1..c63f094d6 100644 --- a/ktnef/lib/ktnefwriter.cpp +++ b/ktnef/lib/ktnefwriter.cpp @@ -34,7 +34,7 @@ class KTNEFWriter::PrivateData { public: - PrivateData() { mFirstAttachNum = TQDateTime::tqcurrentDateTime().toTime_t(); } + PrivateData() { mFirstAttachNum = TQDateTime::currentDateTime().toTime_t(); } KTNEFPropertySet properties; TQ_UINT16 mFirstAttachNum; diff --git a/libemailfunctions/networkstatus.cpp b/libemailfunctions/networkstatus.cpp index 100d99227..e5e311f94 100644 --- a/libemailfunctions/networkstatus.cpp +++ b/libemailfunctions/networkstatus.cpp @@ -29,58 +29,58 @@ using namespace KPIM; -static KStaticDeleter<NetworktqStatus> networkStatusDeleter; -NetworktqStatus *NetworktqStatus::mSelf = 0; +static KStaticDeleter<NetworkStatus> networkStatusDeleter; +NetworkStatus *NetworkStatus::mSelf = 0; -NetworktqStatus::NetworktqStatus() +NetworkStatus::NetworkStatus() : TQObject( 0, "NetworkStatus" ), DCOPObject( "NetworkStatus" ) { KConfigGroup group( KGlobal::config(), "NetworkStatus" ); if ( group.readBoolEntry( "Online", true ) == true ) - mtqStatus = Online; + mStatus = Online; else - mtqStatus = Offline; + mStatus = Offline; connectDCOPSignal( 0, 0, "onlineStatusChanged()", "onlineStatusChanged()", false ); } -NetworktqStatus::~NetworktqStatus() +NetworkStatus::~NetworkStatus() { KConfigGroup group( KGlobal::config(), "NetworkStatus" ); - group.writeEntry( "Online", mtqStatus == Online ); + group.writeEntry( "Online", mStatus == Online ); } -void NetworktqStatus::setqStatus( tqStatus status ) +void NetworkStatus::seStatus( Status status ) { - mtqStatus = status; + mStatus = status; - emit statusChanged( mtqStatus ); + emit statusChanged( mStatus ); } -NetworktqStatus::tqStatus NetworktqStatus::status() const +NetworkStatus::Status NetworkStatus::status() const { - return mtqStatus; + return mStatus; } -void NetworktqStatus::onlineStatusChanged() +void NetworkStatus::onlineStatusChanged() { DCOPRef dcopCall( "kded", "networkstatus" ); DCOPReply reply = dcopCall.call( "onlineStatus()", true ); if ( reply.isValid() ) { int status = reply; if ( status == 3 ) - setqStatus( Online ); + seStatus( Online ); else { - if ( mtqStatus != Offline ) - setqStatus( Offline ); + if ( mStatus != Offline ) + seStatus( Offline ); } } } -NetworktqStatus *NetworktqStatus::self() +NetworkStatus *NetworkStatus::self() { if ( !mSelf ) - networkStatusDeleter.setObject( mSelf, new NetworktqStatus ); + networkStatusDeleter.setObject( mSelf, new NetworkStatus ); return mSelf; } diff --git a/libemailfunctions/networkstatus.h b/libemailfunctions/networkstatus.h index 963aa6fed..7a8b3c1b2 100644 --- a/libemailfunctions/networkstatus.h +++ b/libemailfunctions/networkstatus.h @@ -32,7 +32,7 @@ namespace KPIM { the machine KDE is running on going from "online" mode to offline. What this means is left as an exercise for the reader. */ -class NetworktqStatus : public TQObject, public DCOPObject +class NetworkStatus : public TQObject, public DCOPObject { Q_OBJECT @@ -40,7 +40,7 @@ class NetworktqStatus : public TQObject, public DCOPObject /** * The possible states. */ - enum tqStatus { + enum Status { Online, //< The machine now has internet connectivity Offline //< The machine has no internet connectivity }; @@ -48,24 +48,24 @@ class NetworktqStatus : public TQObject, public DCOPObject /** * Destructor. */ - ~NetworktqStatus(); + ~NetworkStatus(); /** * Returns the only instance of this class. */ - static NetworktqStatus *self(); + static NetworkStatus *self(); /** * Sets a new status. * * @param status The new status. */ - void setqStatus( tqStatus status ); + void seStatus( Status status ); /** * Returns the current status. */ - tqStatus status() const; + Status status() const; k_dcop: /** @@ -79,18 +79,18 @@ class NetworktqStatus : public TQObject, public DCOPObject * * @param status The new status. */ - void statusChanged( tqStatus status ); + void statusChanged( Status status ); protected: /** * Constructor. This is protected, so you must use self() * to get the singleton object of this class. */ - NetworktqStatus(); + NetworkStatus(); private: - tqStatus mtqStatus; - static NetworktqStatus *mSelf; + Status mStatus; + static NetworkStatus *mSelf; }; } diff --git a/libemailfunctions/tests/testemail.cpp b/libemailfunctions/tests/testemail.cpp index 90a6a862e..c7205ab86 100644 --- a/libemailfunctions/tests/testemail.cpp +++ b/libemailfunctions/tests/testemail.cpp @@ -57,7 +57,7 @@ static bool checkGetNameAndEmail(const TQString& input, const TQString& expName, { TQString name, email; bool retVal = KPIM::getNameAndMail(input, name, email); - check( "getNameAndMail " + input + " retVal", retVal?TQString::tqfromLatin1( "true" ):TQString::tqfromLatin1( "false" ), expRetVal?TQString::tqfromLatin1( "true" ):TQString::tqfromLatin1( "false" ) ); + check( "getNameAndMail " + input + " retVal", retVal?TQString::fromLatin1( "true" ):TQString::fromLatin1( "false" ), expRetVal?TQString::fromLatin1( "true" ):TQString::fromLatin1( "false" ) ); check( "getNameAndMail " + input + " name", name, expName ); check( "getNameAndMail " + input + " email", email, expEmail ); return true; diff --git a/libkcal/attendee.cpp b/libkcal/attendee.cpp index a34f97598..d129bc36b 100644 --- a/libkcal/attendee.cpp +++ b/libkcal/attendee.cpp @@ -33,7 +33,7 @@ Attendee::Attendee( const TQString &name, const TQString &email, bool _rsvp, : Person( name, email ) { mRSVP = _rsvp; - mtqStatus = s; + mStatus = s; mRole = r; mUid = u; } @@ -53,19 +53,19 @@ bool KCal::operator==( const Attendee& a1, const Attendee& a2 ) a1.delegator() == a2.delegator() ); } -void Attendee::setqStatus( Attendee::PartStat s ) +void Attendee::seStatus( Attendee::PartStat s ) { - mtqStatus = s; + mStatus = s; } Attendee::PartStat Attendee::status() const { - return mtqStatus; + return mStatus; } TQString Attendee::statusStr() const { - return statusName( mtqStatus ); + return statusName( mStatus ); } TQString Attendee::statusName( Attendee::PartStat s ) diff --git a/libkcal/attendee.h b/libkcal/attendee.h index 609974e9d..bf29fb485 100644 --- a/libkcal/attendee.h +++ b/libkcal/attendee.h @@ -48,7 +48,7 @@ class LIBKCAL_EXPORT Attendee : public Person @param name Name @param email Email address @param rsvp Request for reply - @param status tqStatus (see enum for list) + @param status Status (see enum for list) @param role Role @param u the uid for the attendee */ @@ -96,7 +96,7 @@ class LIBKCAL_EXPORT Attendee : public Person /** Set status. See enum for definitions of possible values. */ - void setqStatus( PartStat s ); + void seStatus( PartStat s ); /** Return status. @@ -146,7 +146,7 @@ class LIBKCAL_EXPORT Attendee : public Person private: bool mRSVP; Role mRole; - PartStat mtqStatus; + PartStat mStatus; TQString mUid; TQString mDelegate; TQString mDelegator; diff --git a/libkcal/calendar.cpp b/libkcal/calendar.cpp index 897e90175..6fbb39c31 100644 --- a/libkcal/calendar.cpp +++ b/libkcal/calendar.cpp @@ -960,8 +960,8 @@ void Calendar::setModified( bool modified ) void Calendar::incidenceUpdated( IncidenceBase *incidence ) { - incidence->setSynctqStatus( Event::SYNCMOD ); - incidence->setLastModified( TQDateTime::tqcurrentDateTime() ); + incidence->setSyncStatus( Event::SYNCMOD ); + incidence->setLastModified( TQDateTime::currentDateTime() ); // we should probably update the revision number here, // or internally in the Event itself when certain things change. // need to verify with ical documentation. diff --git a/libkcal/calendarlocal.cpp b/libkcal/calendarlocal.cpp index 310c65d23..f49f527ca 100644 --- a/libkcal/calendarlocal.cpp +++ b/libkcal/calendarlocal.cpp @@ -499,7 +499,7 @@ void CalendarLocal::appendRecurringAlarms( Alarm::List &alarms, void CalendarLocal::incidenceUpdated( IncidenceBase *incidence ) { incidence->setSyncStatusSilent( Event::SYNCMOD ); - incidence->setLastModified( TQDateTime::tqcurrentDateTime() ); + incidence->setLastModified( TQDateTime::currentDateTime() ); // we should probably update the revision number here, // or internally in the Event itself when certain things change. // need to verify with ical documentation. diff --git a/libkcal/calendarnull.cpp b/libkcal/calendarnull.cpp index 39993e448..f4b07789c 100644 --- a/libkcal/calendarnull.cpp +++ b/libkcal/calendarnull.cpp @@ -36,7 +36,7 @@ CalendarNull *CalendarNull::mSelf = 0; CalendarNull *CalendarNull::self() { - if ( !mSelf ) mSelf = new CalendarNull( TQString::tqfromLatin1( "UTC" ) ); + if ( !mSelf ) mSelf = new CalendarNull( TQString::fromLatin1( "UTC" ) ); return mSelf; } diff --git a/libkcal/calendarresources.h b/libkcal/calendarresources.h index 1b884b6a2..a2ba6738c 100644 --- a/libkcal/calendarresources.h +++ b/libkcal/calendarresources.h @@ -162,7 +162,7 @@ class LIBKCAL_EXPORT CalendarResources : */ CalendarResources( const TQString &timeZoneId, - const TQString &family = TQString::tqfromLatin1( "calendar" ) ); + const TQString &family = TQString::fromLatin1( "calendar" ) ); /** Destructor diff --git a/libkcal/calfilter.cpp b/libkcal/calfilter.cpp index c065bf448..898ec79cf 100644 --- a/libkcal/calfilter.cpp +++ b/libkcal/calfilter.cpp @@ -108,14 +108,14 @@ bool CalFilter::filterIncidence(Incidence *incidence) const if ( (mCriteria & HideCompleted) && todo->isCompleted() ) { // Check if completion date is suffently long ago: if ( todo->completed().addDays( mCompletedTimeSpan ) < - TQDateTime::tqcurrentDateTime() ) { + TQDateTime::currentDateTime() ) { return false; } } if( ( mCriteria & HideInactiveTodos ) && ( todo->hasStartDate() && - TQDateTime::tqcurrentDateTime() < todo->dtStart() || + TQDateTime::currentDateTime() < todo->dtStart() || todo->isCompleted() ) ) return false; diff --git a/libkcal/calformat.cpp b/libkcal/calformat.cpp index be26c3fcf..5035622b3 100644 --- a/libkcal/calformat.cpp +++ b/libkcal/calformat.cpp @@ -27,8 +27,8 @@ using namespace KCal; -TQString CalFormat::mApplication = TQString::tqfromLatin1("libkcal"); -TQString CalFormat::mProductId = TQString::tqfromLatin1("-//K Desktop Environment//NONSGML libkcal 3.5//EN"); +TQString CalFormat::mApplication = TQString::fromLatin1("libkcal"); +TQString CalFormat::mProductId = TQString::fromLatin1("-//K Desktop Environment//NONSGML libkcal 3.5//EN"); CalFormat::CalFormat() diff --git a/libkcal/icaldrag.cpp b/libkcal/icaldrag.cpp index 2c5f2309d..39315f5a6 100644 --- a/libkcal/icaldrag.cpp +++ b/libkcal/icaldrag.cpp @@ -46,7 +46,7 @@ bool ICalDrag::decode( TQMimeSource *de, Calendar *cal ) { bool success = false; - TQByteArray payload = de->tqencodedData( "text/calendar" ); + TQByteArray payload = de->encodedData( "text/calendar" ); if ( payload.size() ) { TQString txt = TQString::fromUtf8( payload.data() ); diff --git a/libkcal/icalformat.cpp b/libkcal/icalformat.cpp index 25feb42fa..cdf2f43f4 100644 --- a/libkcal/icalformat.cpp +++ b/libkcal/icalformat.cpp @@ -440,7 +440,7 @@ ScheduleMessage *ICalFormat::parseScheduleMessage( Calendar *cal, if (messageText.isEmpty()) { - setException( new ErrorFormat( ErrorFormat::ParseErrorKcal, TQString::tqfromLatin1( "messageText was empty, unable to parse into a ScheduleMessage" ) ) ); + setException( new ErrorFormat( ErrorFormat::ParseErrorKcal, TQString::fromLatin1( "messageText was empty, unable to parse into a ScheduleMessage" ) ) ); return 0; } // TODO FIXME: Don't we have to ical-free message??? MEMLEAK @@ -449,7 +449,7 @@ ScheduleMessage *ICalFormat::parseScheduleMessage( Calendar *cal, if (!message) { - setException( new ErrorFormat( ErrorFormat::ParseErrorKcal, TQString::tqfromLatin1( "icalparser was unable to parse messageText into a ScheduleMessage" ) ) ); + setException( new ErrorFormat( ErrorFormat::ParseErrorKcal, TQString::fromLatin1( "icalparser was unable to parse messageText into a ScheduleMessage" ) ) ); return 0; } @@ -457,7 +457,7 @@ ScheduleMessage *ICalFormat::parseScheduleMessage( Calendar *cal, ICAL_METHOD_PROPERTY); if (!m) { - setException( new ErrorFormat( ErrorFormat::ParseErrorKcal, TQString::tqfromLatin1( "message didn't contain an ICAL_METHOD_PROPERTY" ) ) ); + setException( new ErrorFormat( ErrorFormat::ParseErrorKcal, TQString::fromLatin1( "message didn't contain an ICAL_METHOD_PROPERTY" ) ) ); return 0; } @@ -495,7 +495,7 @@ ScheduleMessage *ICalFormat::parseScheduleMessage( Calendar *cal, if (!incidence) { kdDebug(5800) << "ICalFormat:parseScheduleMessage: object is not a freebusy, event, todo or journal" << endl; - setException( new ErrorFormat( ErrorFormat::ParseErrorKcal, TQString::tqfromLatin1( "object is not a freebusy, event, todo or journal" ) ) ); + setException( new ErrorFormat( ErrorFormat::ParseErrorKcal, TQString::fromLatin1( "object is not a freebusy, event, todo or journal" ) ) ); return 0; } @@ -577,7 +577,7 @@ ScheduleMessage *ICalFormat::parseScheduleMessage( Calendar *cal, kdDebug(5800) << "ICalFormat::parseScheduleMessage() returning..." << endl; kdDebug(5800) << "ICalFormat::parseScheduleMessage(), result = " << result << endl; - ScheduleMessage::tqStatus status; + ScheduleMessage::Status status; switch (result) { case ICAL_XLICCLASS_PUBLISHNEW: diff --git a/libkcal/icalformatimpl.cpp b/libkcal/icalformatimpl.cpp index bb53a3531..0af7b4c52 100644 --- a/libkcal/icalformatimpl.cpp +++ b/libkcal/icalformatimpl.cpp @@ -75,7 +75,7 @@ static TQString quoteForParam( const TQString &text ) tmp.remove( '"' ); if ( tmp.contains( ';' ) || tmp.contains( ':' ) || tmp.contains( ',' ) ) return tmp; // libical quotes in this case already, see icalparameter_as_ical_string() - return TQString::tqfromLatin1( "\"" ) + tmp + TQString::tqfromLatin1( "\"" ); + return TQString::fromLatin1( "\"" ) + tmp + TQString::fromLatin1( "\"" ); } const int gSecondsPerMinute = 60; @@ -157,7 +157,7 @@ icalcomponent *ICalFormatImpl::writeTodo(Todo *todo) if (!todo->hasCompletedDate()) { // If todo was created by KOrganizer <2.2 it has no correct completion // date. Set it to now. - todo->setCompleted(TQDateTime::tqcurrentDateTime()); + todo->setCompleted(TQDateTime::currentDateTime()); } icaltimetype completed = writeICalDateTime(todo->completed()); icalcomponent_add_property(vtodo,icalproperty_new_completed(completed)); @@ -312,11 +312,11 @@ void ICalFormatImpl::writeIncidence(icalcomponent *parent,Incidence *incidence) if (incidence->pilotId()) { // NOTE: we can't do setNonKDECustomProperty here because this changes // data and triggers an updated() event... - // incidence->setNonKDECustomProperty("X-PILOTSTAT", TQString::number(incidence->synctqStatus())); + // incidence->setNonKDECustomProperty("X-PILOTSTAT", TQString::number(incidence->syncStatus())); // incidence->setNonKDECustomProperty("X-PILOTID", TQString::number(incidence->pilotId())); icalproperty *p = 0; - p = icalproperty_new_x(TQString::number(incidence->synctqStatus()).utf8()); + p = icalproperty_new_x(TQString::number(incidence->syncStatus()).utf8()); icalproperty_set_x_name(p,"X-PILOTSTAT"); icalcomponent_add_property(parent,p); @@ -535,7 +535,7 @@ void ICalFormatImpl::writeIncidenceBase( icalcomponent *parent, IncidenceBase * incidenceBase ) { icalcomponent_add_property( parent, icalproperty_new_dtstamp( - writeICalDateTime( TQDateTime::tqcurrentDateTime() ) ) ); + writeICalDateTime( TQDateTime::currentDateTime() ) ) ); // organizer stuff if ( !incidenceBase->organizer().isEmpty() ) { @@ -1081,7 +1081,7 @@ Event *ICalFormatImpl::readEvent( icalcomponent *vevent, icalcomponent *vtimezon const TQString msade = event->nonKDECustomProperty("X-MICROSOFT-CDO-ALLDAYEVENT"); if ( !msade.isEmpty() ) { - const bool floats = ( msade == TQString::tqfromLatin1("TRUE") ); + const bool floats = ( msade == TQString::fromLatin1("TRUE") ); event->setFloats(floats); } @@ -1171,7 +1171,7 @@ Attendee *ICalFormatImpl::readAttendee(icalproperty *attendee) icalparameter *p = 0; TQString email = TQString::fromUtf8(icalproperty_get_attendee(attendee)); - if ( email.tqstartsWith( "mailto:", false ) ) { + if ( email.startsWith( "mailto:", false ) ) { email = email.mid( 7 ); } @@ -1267,7 +1267,7 @@ Attendee *ICalFormatImpl::readAttendee(icalproperty *attendee) Person ICalFormatImpl::readOrganizer( icalproperty *organizer ) { TQString email = TQString::fromUtf8(icalproperty_get_organizer(organizer)); - if ( email.tqstartsWith( "mailto:", false ) ) { + if ( email.startsWith( "mailto:", false ) ) { email = email.mid( 7 ); } TQString cn; @@ -1420,7 +1420,7 @@ void ICalFormatImpl::readIncidence(icalcomponent *parent, icaltimezone *tz, Inci break; case ICAL_STATUS_PROPERTY: { // status - Incidence::tqStatus stat; + Incidence::Status stat; switch (icalproperty_get_status(p)) { case ICAL_STATUS_TENTATIVE: stat = Incidence::StatusTentative; break; case ICAL_STATUS_CONFIRMED: stat = Incidence::StatusConfirmed; break; @@ -1431,14 +1431,14 @@ void ICalFormatImpl::readIncidence(icalcomponent *parent, icaltimezone *tz, Inci case ICAL_STATUS_DRAFT: stat = Incidence::StatusDraft; break; case ICAL_STATUS_FINAL: stat = Incidence::StatusFinal; break; case ICAL_STATUS_X: - incidence->setCustomtqStatus(TQString::fromUtf8(icalvalue_get_x(icalproperty_get_value(p)))); + incidence->setCustomStatus(TQString::fromUtf8(icalvalue_get_x(icalproperty_get_value(p)))); stat = Incidence::StatusX; break; case ICAL_STATUS_NONE: default: stat = Incidence::StatusNone; break; } if (stat != Incidence::StatusX) - incidence->setqStatus(stat); + incidence->seStatus(stat); break; } @@ -1618,7 +1618,7 @@ void ICalFormatImpl::readIncidenceBase(icalcomponent *parent,IncidenceBase *inci incidenceBase->setPilotId(value.toInt()); icalcomponent_remove_property(parent,p); } else if (name == "X-PILOTSTAT" && !value.isEmpty()) { - incidenceBase->setSynctqStatus(value.toInt()); + incidenceBase->setSyncStatus(value.toInt()); icalcomponent_remove_property(parent,p); } } @@ -1855,7 +1855,7 @@ void ICalFormatImpl::readAlarm(icalcomponent *alarm,Incidence *incidence) // Only in EMAIL alarm case ICAL_ATTENDEE_PROPERTY: { TQString email = TQString::fromUtf8(icalproperty_get_attendee(p)); - if ( email.tqstartsWith("mailto:", false ) ) { + if ( email.startsWith("mailto:", false ) ) { email = email.mid( 7 ); } TQString name; diff --git a/libkcal/incidence.cpp b/libkcal/incidence.cpp index 0c27da432..b26b62147 100644 --- a/libkcal/incidence.cpp +++ b/libkcal/incidence.cpp @@ -33,7 +33,7 @@ using namespace KCal; Incidence::Incidence() : IncidenceBase(), - mRelatedTo(0), mtqStatus(StatusNone), mSecrecy(SecrecyPublic), + mRelatedTo(0), mStatus(StatusNone), mSecrecy(SecrecyPublic), mPriority(0), mRecurrence(0), mHasRecurrenceID( false ), mChildRecurrenceEvents() { @@ -57,7 +57,7 @@ Incidence::Incidence( const Incidence &i ) : IncidenceBase( i ),Recurrence::Obse // Incidence::List mRelations; Incidence::List mRelations; mResources = i.mResources; mStatusString = i.mStatusString; - mtqStatus = i.mtqStatus; + mStatus = i.mStatus; mSecrecy = i.mSecrecy; mPriority = i.mPriority; mLocation = i.mLocation; @@ -125,7 +125,7 @@ Incidence& Incidence::operator=( const Incidence &i ) mRelations.clear(); mResources = i.mResources; mStatusString = i.mStatusString; - mtqStatus = i.mtqStatus; + mStatus = i.mStatus; mSecrecy = i.mSecrecy; mPriority = i.mPriority; mLocation = i.mLocation; @@ -196,8 +196,8 @@ bool Incidence::operator==( const Incidence& i2 ) const relations() == i2.relations() && attachments() == i2.attachments() && resources() == i2.resources() && - mtqStatus == i2.mtqStatus && - ( mtqStatus == StatusNone || stringCompare( mStatusString, i2.mStatusString ) ) && + mStatus == i2.mStatus && + ( mStatus == StatusNone || stringCompare( mStatusString, i2.mStatusString ) ) && secrecy() == i2.secrecy() && priority() == i2.priority() && stringCompare( location(), i2.location() ) && @@ -207,16 +207,16 @@ bool Incidence::operator==( const Incidence& i2 ) const void Incidence::recreate() { - setCreated(TQDateTime::tqcurrentDateTime()); + setCreated(TQDateTime::currentDateTime()); setUid(CalFormat::createUniqueId()); setSchedulingID( TQString() ); setRevision(0); - setLastModified(TQDateTime::tqcurrentDateTime()); + setLastModified(TQDateTime::currentDateTime()); setPilotId( 0 ); - setSynctqStatus( SYNCNONE ); + setSyncStatus( SYNCNONE ); } void Incidence::setReadOnly( bool readOnly ) @@ -738,35 +738,35 @@ int Incidence::priority() const return mPriority; } -void Incidence::setqStatus(Incidence::tqStatus status) +void Incidence::seStatus(Incidence::Status status) { if (mReadOnly || status == StatusX) return; - mtqStatus = status; + mStatus = status; mStatusString = TQString(); updated(); } -void Incidence::setCustomtqStatus(const TQString &status) +void Incidence::setCustomStatus(const TQString &status) { if (mReadOnly) return; - mtqStatus = status.isEmpty() ? StatusNone : StatusX; + mStatus = status.isEmpty() ? StatusNone : StatusX; mStatusString = status; updated(); } -Incidence::tqStatus Incidence::status() const +Incidence::Status Incidence::status() const { - return mtqStatus; + return mStatus; } TQString Incidence::statusStr() const { - if (mtqStatus == StatusX) + if (mStatus == StatusX) return mStatusString; - return statusName(mtqStatus); + return statusName(mStatus); } -TQString Incidence::statusName(Incidence::tqStatus status) +TQString Incidence::statusName(Incidence::Status status) { switch (status) { case StatusTentative: return i18n("incidence status", "Tentative"); diff --git a/libkcal/incidence.h b/libkcal/incidence.h index 089056fba..c1aa402b6 100644 --- a/libkcal/incidence.h +++ b/libkcal/incidence.h @@ -114,7 +114,7 @@ class LIBKCAL_EXPORT Incidence : public IncidenceBase, public Recurrence::Observ }; /** Enumeration for describing an event's status. */ - enum tqStatus { + enum Status { StatusNone, StatusTentative, StatusConfirmed, StatusCompleted, StatusNeedsAction, StatusCanceled, StatusInProcess, StatusDraft, StatusFinal, @@ -352,7 +352,7 @@ class LIBKCAL_EXPORT Incidence : public IncidenceBase, public Recurrence::Observ // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -// %%%%% Secrecy and tqStatus methods +// %%%%% Secrecy and Status methods // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% /** @@ -381,17 +381,17 @@ 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 setqStatus( tqStatus status ); + void seStatus( Status status ); /** Sets the incidence status to a non-standard status value. @param status non-standard status string. If empty, the incidence status will be set to StatusNone. */ - void setCustomtqStatus( const TQString &status ); + void setCustomStatus( const TQString &status ); /** Return the event's status. */ - tqStatus status() const; + Status status() const; /** Return the event's status string. */ @@ -399,7 +399,7 @@ class LIBKCAL_EXPORT Incidence : public IncidenceBase, public Recurrence::Observ /** Return human-readable translated name of status value. */ - static TQString statusName( tqStatus ); + static TQString statusName( Status ); // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -566,7 +566,7 @@ class LIBKCAL_EXPORT Incidence : public IncidenceBase, public Recurrence::Observ TQStringList mResources; TQString mStatusString; - tqStatus mtqStatus; + Status mStatus; int mSecrecy; int mPriority; // 1 = highest, 2 = less, etc. diff --git a/libkcal/incidencebase.cpp b/libkcal/incidencebase.cpp index d5dbef56c..a8a6bdb05 100644 --- a/libkcal/incidencebase.cpp +++ b/libkcal/incidencebase.cpp @@ -32,7 +32,7 @@ using namespace KCal; IncidenceBase::IncidenceBase() : mReadOnly( false ), mFloats( true ), mDuration( 0 ), mHasDuration( false ), - mPilotId( 0 ), mSynctqStatus( SYNCMOD ) + mPilotId( 0 ), mSyncStatus( SYNCMOD ) { setUid( CalFormat::createUniqueId() ); @@ -56,7 +56,7 @@ IncidenceBase::IncidenceBase(const IncidenceBase &i) : mFloats = i.mFloats; mLastModified = i.mLastModified; mPilotId = i.mPilotId; - mSynctqStatus = i.mSynctqStatus; + mSyncStatus = i.mSyncStatus; mComments = i.mComments; // The copied object is a new one, so it isn't observed by the observer @@ -88,7 +88,7 @@ IncidenceBase& IncidenceBase::operator=( const IncidenceBase& i ) mFloats = i.mFloats; mLastModified = i.mLastModified; mPilotId = i.mPilotId; - mSynctqStatus = i.mSynctqStatus; + mSyncStatus = i.mSyncStatus; mComments = i.mComments; return *this; @@ -124,7 +124,7 @@ bool IncidenceBase::operator==( const IncidenceBase& i2 ) const duration() == i2.duration() && hasDuration() == i2.hasDuration() && pilotId() == i2.pilotId() && - synctqStatus() == i2.synctqStatus() ); + syncStatus() == i2.syncStatus() ); // no need to compare mObserver } @@ -174,7 +174,7 @@ void IncidenceBase::setOrganizer( const Person &o ) void IncidenceBase::setOrganizer(const TQString &o) { TQString mail( o ); - if ( mail.tqstartsWith("MAILTO:", false) ) + if ( mail.startsWith("MAILTO:", false) ) mail = mail.remove( 0, 7 ); // split the string into full name plus email. Person organizer( mail ); @@ -361,22 +361,22 @@ bool IncidenceBase::hasDuration() const return mHasDuration; } -void IncidenceBase::setSynctqStatus(int stat) +void IncidenceBase::setSyncStatus(int stat) { if (mReadOnly) return; - if ( mSynctqStatus == stat ) return; - mSynctqStatus = stat; + if ( mSyncStatus == stat ) return; + mSyncStatus = stat; updatedSilent(); } void IncidenceBase::setSyncStatusSilent(int stat) { if (mReadOnly) return; - mSynctqStatus = stat; + mSyncStatus = stat; } -int IncidenceBase::synctqStatus() const +int IncidenceBase::syncStatus() const { - return mSynctqStatus; + return mSyncStatus; } void IncidenceBase::setPilotId( unsigned long id ) diff --git a/libkcal/incidencebase.h b/libkcal/incidencebase.h index 7d4eec7ec..d54ca8791 100644 --- a/libkcal/incidencebase.h +++ b/libkcal/incidencebase.h @@ -235,12 +235,12 @@ class LIBKCAL_EXPORT IncidenceBase : public CustomProperties /** Set synchronisation satus. */ - void setSynctqStatus( int status ); + void setSyncStatus( int status ); void setSyncStatusSilent( int status ); /** Return synchronisation status. */ - int synctqStatus() const; + int syncStatus() const; /** Set Pilot Id. @@ -292,7 +292,7 @@ class LIBKCAL_EXPORT IncidenceBase : public CustomProperties // PILOT SYNCHRONIZATION STUFF unsigned long mPilotId; // unique id for pilot sync - int mSynctqStatus; // status (for sync) + int mSyncStatus; // status (for sync) TQPtrList<Observer> mObservers; diff --git a/libkcal/incidenceformatter.cpp b/libkcal/incidenceformatter.cpp index 49c3967aa..a220cd191 100644 --- a/libkcal/incidenceformatter.cpp +++ b/libkcal/incidenceformatter.cpp @@ -2426,9 +2426,9 @@ TQString IncidenceFormatter::formatICalInvitationHelper( TQString invitation, // First make the text of the message TQString html; - TQString tableStyle = TQString::tqfromLatin1( + TQString tableStyle = TQString::fromLatin1( "style=\"border: solid 1px; margin: 0em;\"" ); - TQString tableHead = TQString::tqfromLatin1( + TQString tableHead = TQString::fromLatin1( "<div align=\"center\">" "<table width=\"80%\" cellpadding=\"1\" cellspacing=\"0\" %1>" "<tr><td>").tqarg(tableStyle); @@ -2831,7 +2831,7 @@ TQString IncidenceFormatter::msTNEFToVPart( const TQByteArray& tnef ) KTNEFParser parser; TQBuffer buf( tnef ); - CalendarLocal cal ( TQString::tqfromLatin1( "UTC" ) ); + CalendarLocal cal ( TQString::fromLatin1( "UTC" ) ); KABC::Addressee addressee; KABC::VCardConverter cardConv; ICalFormat calFormat; @@ -2926,13 +2926,13 @@ TQString IncidenceFormatter::msTNEFToVPart( const TQByteArray& tnef ) Attendee *attendee = new Attendee( s, s, true ); if( bIsReply ) { if( bCompatMethodAccepted ) - attendee->setqStatus( Attendee::Accepted ); + attendee->seStatus( Attendee::Accepted ); if( bCompatMethodDeclined ) - attendee->setqStatus( Attendee::Declined ); + attendee->seStatus( Attendee::Declined ); if( bCompatMethodAcceptedCond ) - attendee->setqStatus(Attendee::Tentative); + attendee->seStatus(Attendee::Tentative); } else { - attendee->setqStatus( Attendee::NeedsAction ); + attendee->seStatus( 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->setqStatus( Attendee::Accepted ); + attendee->seStatus( Attendee::Accepted ); if( bCompatMethodAcceptedCond ) - attendee->setqStatus( Attendee::Declined ); + attendee->seStatus( Attendee::Declined ); if( bCompatMethodDeclined ) - attendee->setqStatus( Attendee::Tentative ); + attendee->seStatus( Attendee::Tentative ); } else { - attendee->setqStatus(Attendee::NeedsAction); + attendee->seStatus(Attendee::NeedsAction); attendee->setRole(Attendee::ReqParticipant); } event->addAttendee(attendee); @@ -2990,7 +2990,7 @@ TQString IncidenceFormatter::msTNEFToVPart( const TQByteArray& tnef ) // Outlook - we ignore it for now. s = tnefMsg->findProp( 0x8202 ).replace( TQChar( '-' ), TQString() ) .replace( TQChar( ':' ), TQString() ); - // ### libkcal always uses tqcurrentDateTime() + // ### libkcal always uses currentDateTime() // event->setDtStamp(TQDateTime::fromString(s)); s = tnefMsg->findNamedProp( "Keywords" ); diff --git a/libkcal/person.cpp b/libkcal/person.cpp index 00f17ed84..aad80f68f 100644 --- a/libkcal/person.cpp +++ b/libkcal/person.cpp @@ -88,7 +88,7 @@ void Person::setName(const TQString &name) void Person::setEmail(const TQString &email) { - if ( email.tqstartsWith( "mailto:", false ) ) { + if ( email.startsWith( "mailto:", false ) ) { mEmail = email.mid(7); } else { mEmail = email; diff --git a/libkcal/resourcecached.cpp b/libkcal/resourcecached.cpp index bab09728b..c61fa009d 100644 --- a/libkcal/resourcecached.cpp +++ b/libkcal/resourcecached.cpp @@ -49,7 +49,7 @@ using namespace KCal; static bool m_editoropen = false; ResourceCached::ResourceCached( const KConfig* config ) - : ResourceCalendar( config ), mCalendar( TQString::tqfromLatin1( "UTC" ) ), + : ResourceCalendar( config ), mCalendar( TQString::fromLatin1( "UTC" ) ), mReloadPolicy( ReloadNever ), mReloadInterval( 10 ), mReloadTimer( 0, "mReloadTimer" ), mReloaded( false ), mSavePolicy( SaveNever ), mSaveInterval( 10 ), @@ -353,7 +353,7 @@ void ResourceCached::clearJournalsCache() void ResourceCached::cleanUpEventCache( const Event::List &eventList ) { - CalendarLocal calendar ( TQString::tqfromLatin1( "UTC" ) ); + CalendarLocal calendar ( TQString::fromLatin1( "UTC" ) ); if ( KStandardDirs::exists( cacheFile() ) ) calendar.load( cacheFile() ); @@ -382,7 +382,7 @@ void ResourceCached::cleanUpEventCache( const Event::List &eventList ) void ResourceCached::cleanUpTodoCache( const Todo::List &todoList ) { - CalendarLocal calendar ( TQString::tqfromLatin1( "UTC" ) ); + CalendarLocal calendar ( TQString::fromLatin1( "UTC" ) ); if ( KStandardDirs::exists( cacheFile() ) ) calendar.load( cacheFile() ); @@ -427,7 +427,7 @@ TQString ResourceCached::changesCacheFile( const TQString &type ) const void ResourceCached::saveChangesCache( const TQMap<Incidence*, bool> &map, const TQString &type ) { - CalendarLocal calendar ( TQString::tqfromLatin1( "UTC" ) ); + CalendarLocal calendar ( TQString::fromLatin1( "UTC" ) ); bool isEmpty = true; TQMap<Incidence *,bool>::ConstIterator it; @@ -455,7 +455,7 @@ void ResourceCached::saveChangesCache() void ResourceCached::loadChangesCache( TQMap<Incidence*, bool> &map, const TQString &type ) { - CalendarLocal calendar ( TQString::tqfromLatin1( "UTC" ) ); + CalendarLocal calendar ( TQString::fromLatin1( "UTC" ) ); if ( KStandardDirs::exists( changesCacheFile( type ) ) ) calendar.load( changesCacheFile( type ) ); diff --git a/libkcal/scheduler.cpp b/libkcal/scheduler.cpp index 70f4dbdf5..e0d44f530 100644 --- a/libkcal/scheduler.cpp +++ b/libkcal/scheduler.cpp @@ -39,14 +39,14 @@ using namespace KCal; -ScheduleMessage::ScheduleMessage(IncidenceBase *incidence,int method,ScheduleMessage::tqStatus status) +ScheduleMessage::ScheduleMessage(IncidenceBase *incidence,int method,ScheduleMessage::Status status) { mIncidence = incidence; mMethod = method; - mtqStatus = status; + mStatus = status; } -TQString ScheduleMessage::statusName(ScheduleMessage::tqStatus status) +TQString ScheduleMessage::statusName(ScheduleMessage::Status status) { switch (status) { case PublishUpdate: @@ -99,7 +99,7 @@ FreeBusyCache *Scheduler::freeBusyCache() const bool Scheduler::acceptTransaction( IncidenceBase *incidence, Method method, - ScheduleMessage::tqStatus status, + ScheduleMessage::Status status, const TQString &attendee ) { kdDebug(5800) << "Scheduler::acceptTransaction, method=" @@ -133,23 +133,23 @@ TQString Scheduler::methodName(Method method) { switch (method) { case Publish: - return TQString::tqfromLatin1("Publish"); + return TQString::fromLatin1("Publish"); case Request: - return TQString::tqfromLatin1("Request"); + return TQString::fromLatin1("Request"); case Refresh: - return TQString::tqfromLatin1("Refresh"); + return TQString::fromLatin1("Refresh"); case Cancel: - return TQString::tqfromLatin1("Cancel"); + return TQString::fromLatin1("Cancel"); case Add: - return TQString::tqfromLatin1("Add"); + return TQString::fromLatin1("Add"); case Reply: - return TQString::tqfromLatin1("Reply"); + return TQString::fromLatin1("Reply"); case Counter: - return TQString::tqfromLatin1("Counter"); + return TQString::fromLatin1("Counter"); case Declinecounter: - return TQString::tqfromLatin1("Decline Counter"); + return TQString::fromLatin1("Decline Counter"); default: - return TQString::tqfromLatin1("Unknown"); + return TQString::fromLatin1("Unknown"); } } @@ -183,7 +183,7 @@ bool Scheduler::deleteTransaction(IncidenceBase *) } bool Scheduler::acceptPublish( IncidenceBase *newIncBase, - ScheduleMessage::tqStatus status, Method method ) + ScheduleMessage::Status status, Method method ) { if( newIncBase->type() == "FreeBusy" ) { return acceptFreeBusy( newIncBase, method ); @@ -225,7 +225,7 @@ bool Scheduler::acceptPublish( IncidenceBase *newIncBase, } bool Scheduler::acceptRequest( IncidenceBase *incidence, - ScheduleMessage::tqStatus status, + ScheduleMessage::Status status, const TQString &attendee ) { Incidence *inc = static_cast<Incidence *>(incidence); @@ -389,14 +389,14 @@ TryAgain: return true; } -bool Scheduler::acceptAdd(IncidenceBase *incidence,ScheduleMessage::tqStatus /* status */) +bool Scheduler::acceptAdd(IncidenceBase *incidence,ScheduleMessage::Status /* status */) { deleteTransaction(incidence); return false; } bool Scheduler::acceptCancel( IncidenceBase *incidence, - ScheduleMessage::tqStatus status, + ScheduleMessage::Status status, const TQString &attendee ) { Incidence *inc = static_cast<Incidence *>( incidence ); @@ -492,7 +492,7 @@ bool Scheduler::acceptCancel( IncidenceBase *incidence, return ret; } -bool Scheduler::acceptCancel(IncidenceBase *incidence,ScheduleMessage::tqStatus /* status */) +bool Scheduler::acceptCancel(IncidenceBase *incidence,ScheduleMessage::Status /* status */) { const IncidenceBase *toDelete = mCalendar->incidenceFromSchedulingID( incidence->uid() ); @@ -525,19 +525,19 @@ bool Scheduler::acceptCancel(IncidenceBase *incidence,ScheduleMessage::tqStatus return ret; } -bool Scheduler::acceptDeclineCounter(IncidenceBase *incidence,ScheduleMessage::tqStatus /* status */) +bool Scheduler::acceptDeclineCounter(IncidenceBase *incidence,ScheduleMessage::Status /* status */) { deleteTransaction(incidence); return false; } -//bool Scheduler::acceptFreeBusy(Incidence *incidence,ScheduleMessage::tqStatus status) +//bool Scheduler::acceptFreeBusy(Incidence *incidence,ScheduleMessage::Status status) //{ // deleteTransaction(incidence); // return false; //} -bool Scheduler::acceptReply(IncidenceBase *incidence,ScheduleMessage::tqStatus /* status */, Method method) +bool Scheduler::acceptReply(IncidenceBase *incidence,ScheduleMessage::Status /* status */, Method method) { if(incidence->type()=="FreeBusy") { return acceptFreeBusy(incidence, method); @@ -576,7 +576,7 @@ bool Scheduler::acceptReply(IncidenceBase *incidence,ScheduleMessage::tqStatus / if (attIn->email().lower()==attEv->email().lower()) { //update attendee-info kdDebug(5800) << "Scheduler::acceptTransaction update attendee" << endl; - attEv->setqStatus(attIn->status()); + attEv->seStatus(attIn->status()); attEv->setDelegate(attIn->delegate()); attEv->setDelegator(attIn->delegator()); ret = true; @@ -668,14 +668,14 @@ bool Scheduler::acceptReply(IncidenceBase *incidence,ScheduleMessage::tqStatus / return ret; } -bool Scheduler::acceptRefresh(IncidenceBase *incidence,ScheduleMessage::tqStatus /* status */) +bool Scheduler::acceptRefresh(IncidenceBase *incidence,ScheduleMessage::Status /* status */) { // handled in korganizer's IncomingDialog deleteTransaction(incidence); return false; } -bool Scheduler::acceptCounter(IncidenceBase *incidence,ScheduleMessage::tqStatus /* status */) +bool Scheduler::acceptCounter(IncidenceBase *incidence,ScheduleMessage::Status /* status */) { deleteTransaction(incidence); return false; diff --git a/libkcal/scheduler.h b/libkcal/scheduler.h index ceeace4a1..4d97ab515 100644 --- a/libkcal/scheduler.h +++ b/libkcal/scheduler.h @@ -47,14 +47,14 @@ class ScheduleMessage /** Message status. */ - enum tqStatus { PublishNew, PublishUpdate, Obsolete, RequestNew, + enum Status { PublishNew, PublishUpdate, Obsolete, RequestNew, RequestUpdate, Unknown }; /** Create a scheduling message with method as defined in Scheduler::Method and a status. */ - ScheduleMessage( IncidenceBase *, int method, tqStatus status ); + ScheduleMessage( IncidenceBase *, int method, Status status ); ~ScheduleMessage() {}; /** @@ -68,7 +68,7 @@ class ScheduleMessage /** Return status of this message. */ - tqStatus status() { return mtqStatus; } + Status status() { return mStatus; } /** Return error message if there is any. */ @@ -77,12 +77,12 @@ class ScheduleMessage /** Return a human-readable name for an iTIP message status. */ - static TQString statusName( tqStatus status ); + static TQString statusName( Status status ); private: IncidenceBase *mIncidence; int mMethod; - tqStatus mtqStatus; + Status mStatus; TQString mError; class Private; @@ -140,7 +140,7 @@ class LIBKCAL_EXPORT Scheduler on who's behalf this transaction is to be performed. */ bool acceptTransaction( IncidenceBase *, Method method, - ScheduleMessage::tqStatus status, + ScheduleMessage::Status status, const TQString& attendee = TQString() ); /** @@ -169,20 +169,20 @@ class LIBKCAL_EXPORT Scheduler FreeBusyCache *freeBusyCache() const; protected: - bool acceptPublish( IncidenceBase *, ScheduleMessage::tqStatus status, + bool acceptPublish( IncidenceBase *, ScheduleMessage::Status status, Method method ); - bool acceptRequest( IncidenceBase *, ScheduleMessage::tqStatus status, + bool acceptRequest( IncidenceBase *, ScheduleMessage::Status status, const TQString & attendee ); - bool acceptAdd( IncidenceBase *, ScheduleMessage::tqStatus status ); - KDE_DEPRECATED bool acceptCancel( IncidenceBase *, ScheduleMessage::tqStatus status ); - bool acceptCancel( IncidenceBase *, ScheduleMessage::tqStatus status, + bool acceptAdd( IncidenceBase *, ScheduleMessage::Status status ); + KDE_DEPRECATED bool acceptCancel( IncidenceBase *, ScheduleMessage::Status status ); + bool acceptCancel( IncidenceBase *, ScheduleMessage::Status status, const TQString & attendee ); bool acceptDeclineCounter( IncidenceBase *, - ScheduleMessage::tqStatus status ); - bool acceptReply( IncidenceBase *, ScheduleMessage::tqStatus status, + ScheduleMessage::Status status ); + bool acceptReply( IncidenceBase *, ScheduleMessage::Status status, Method method ); - bool acceptRefresh( IncidenceBase *, ScheduleMessage::tqStatus status ); - bool acceptCounter( IncidenceBase *, ScheduleMessage::tqStatus status ); + bool acceptRefresh( IncidenceBase *, ScheduleMessage::Status status ); + bool acceptCounter( IncidenceBase *, ScheduleMessage::Status status ); bool acceptFreeBusy( IncidenceBase *, Method method ); Calendar *mCalendar; diff --git a/libkcal/tests/fbrecurring.cpp b/libkcal/tests/fbrecurring.cpp index 8088c1d64..be70a7c8d 100644 --- a/libkcal/tests/fbrecurring.cpp +++ b/libkcal/tests/fbrecurring.cpp @@ -13,7 +13,7 @@ int main() { ICalFormat f; - CalendarLocal cal( TQString::tqfromLatin1("UTC") ); + CalendarLocal cal( TQString::fromLatin1("UTC") ); Event *event1 = new Event; event1->setSummary("A"); diff --git a/libkcal/tests/readandwrite.cpp b/libkcal/tests/readandwrite.cpp index a1ab54930..076f55cbf 100644 --- a/libkcal/tests/readandwrite.cpp +++ b/libkcal/tests/readandwrite.cpp @@ -71,7 +71,7 @@ int main( int argc, char **argv ) kdDebug(5800) << "Output file: " << output << endl; - CalendarLocal cal( TQString::tqfromLatin1("UTC") ); + CalendarLocal cal( TQString::fromLatin1("UTC") ); if ( !cal.load( input ) ) return 1; TQString tz = cal.nonKDECustomProperty( "X-LibKCal-Testsuite-OutTZ" ); diff --git a/libkcal/tests/testcalendar.cpp b/libkcal/tests/testcalendar.cpp index 48fb68aa0..7d781fc54 100644 --- a/libkcal/tests/testcalendar.cpp +++ b/libkcal/tests/testcalendar.cpp @@ -48,7 +48,7 @@ int main(int argc,char **argv) Q_UNUSED( args ); - CalendarLocal cal( TQString::tqfromLatin1("UTC") ); + CalendarLocal cal( TQString::fromLatin1("UTC") ); cal.save("mycal"); } diff --git a/libkcal/tests/testfields.cpp b/libkcal/tests/testfields.cpp index cc835927b..6e63faa98 100644 --- a/libkcal/tests/testfields.cpp +++ b/libkcal/tests/testfields.cpp @@ -50,18 +50,18 @@ int main(int argc,char **argv) Q_UNUSED(args) - CalendarLocal cal( TQString::tqfromLatin1("UTC") ); + CalendarLocal cal( TQString::fromLatin1("UTC") ); - TQString file = TQString::tqfromLatin1( INPUT ); + TQString file = TQString::fromLatin1( INPUT ); if (!cal.load( file ) ) { kdError() << "Can't load " << file << endl; return 1; } - // 2 tests... first uid should result in a synctqStatus of 0. second uid - // should have a new summary and a 1 for synctqStatus. - TQString uid1 = TQString::tqfromLatin1("KOrganizer-1345486115.965"); - TQString uid2 = TQString::tqfromLatin1("KOrganizer-1345486115.967"); + // 2 tests... first uid should result in a syncStatus of 0. second uid + // should have a new summary and a 1 for syncStatus. + TQString uid1 = TQString::fromLatin1("KOrganizer-1345486115.965"); + TQString uid2 = TQString::fromLatin1("KOrganizer-1345486115.967"); Event *e = cal.event( uid1 ); if (!e) { @@ -78,7 +78,7 @@ int main(int argc,char **argv) if (e->pilotId()) { kdDebug() << "Pilot ID = " << e->pilotId() << endl; - kdDebug() << "Pilot Sync Status = " << e->synctqStatus() << endl; + kdDebug() << "Pilot Sync Status = " << e->syncStatus() << endl; } else { kdError() << "No Pilot ID" << endl; return 1; @@ -86,9 +86,9 @@ int main(int argc,char **argv) kdDebug() << "First test passed. Able to read fields." << endl; - e->setSynctqStatus(KCal::Incidence::SYNCNONE); + e->setSyncStatus(KCal::Incidence::SYNCNONE); - TQString newSummary = TQString::tqfromLatin1("Mooo summary"); + TQString newSummary = TQString::fromLatin1("Mooo summary"); Event *f = new Event(*e); @@ -112,7 +112,7 @@ int main(int argc,char **argv) // now try to read the file back in and see if our changes made it - CalendarLocal cal2( TQString::tqfromLatin1("UTC") ); + CalendarLocal cal2( TQString::fromLatin1("UTC") ); if (!cal2.load( filew ) ) { kdError() << "Can't load " << filew << endl; return 1; @@ -120,7 +120,7 @@ int main(int argc,char **argv) TQFile::remove( filew ); - // check for uid1--should have synctqStatus of 0 + // check for uid1--should have syncStatus of 0 e = cal2.event( uid1 ); if (!e) { kdError() << "No event for first read test" << uid1 << endl; @@ -131,13 +131,13 @@ int main(int argc,char **argv) if (e->pilotId()) { kdDebug() << "First Pilot ID = " << e->pilotId() << endl; - kdDebug() << "First Pilot Sync Status = " << e->synctqStatus() << endl; + kdDebug() << "First Pilot Sync Status = " << e->syncStatus() << endl; } else { kdError() << "No Pilot ID for first test" << endl; return 1; } - if (e->synctqStatus() != KCal::Incidence::SYNCNONE) { + if (e->syncStatus() != KCal::Incidence::SYNCNONE) { kdError() << "Wrong Pilot sync status." << endl; return 1; } @@ -154,13 +154,13 @@ int main(int argc,char **argv) if (f->pilotId()) { kdDebug() << "Second Pilot ID = " << f->pilotId() << endl; - kdDebug() << "Second Pilot Sync Status = " << f->synctqStatus() << endl; + kdDebug() << "Second Pilot Sync Status = " << f->syncStatus() << endl; } else { kdError() << "No Pilot ID for second read test" << endl; return 1; } - if (f->synctqStatus() != KCal::Incidence::SYNCMOD) { + if (f->syncStatus() != KCal::Incidence::SYNCMOD) { kdError() << "Wrong Pilot sync status for second read test." << endl; return 1; } diff --git a/libkcal/tests/testrecurprevious.cpp b/libkcal/tests/testrecurprevious.cpp index ca65dbfd2..4fc87b9ea 100644 --- a/libkcal/tests/testrecurprevious.cpp +++ b/libkcal/tests/testrecurprevious.cpp @@ -80,7 +80,7 @@ int main( int argc, char **argv ) outstream = new TQTextStream( &outfile ); } - CalendarLocal cal( TQString::tqfromLatin1("UTC") ); + CalendarLocal cal( TQString::fromLatin1("UTC") ); if ( !cal.load( input ) ) return 1; TQString tz = cal.nonKDECustomProperty( "X-LibKCal-Testsuite-OutTZ" ); diff --git a/libkcal/tests/testrecurrence.cpp b/libkcal/tests/testrecurrence.cpp index bc1c0d37f..6499abfc0 100644 --- a/libkcal/tests/testrecurrence.cpp +++ b/libkcal/tests/testrecurrence.cpp @@ -80,7 +80,7 @@ int main( int argc, char **argv ) outstream = new TQTextStream( &outfile ); } - CalendarLocal cal( TQString::tqfromLatin1("UTC") ); + CalendarLocal cal( TQString::fromLatin1("UTC") ); if ( !cal.load( input ) ) return 1; TQString tz = cal.nonKDECustomProperty( "X-LibKCal-Testsuite-OutTZ" ); diff --git a/libkcal/tests/testrecurrencetype.cpp b/libkcal/tests/testrecurrencetype.cpp index bc1c0d37f..6499abfc0 100644 --- a/libkcal/tests/testrecurrencetype.cpp +++ b/libkcal/tests/testrecurrencetype.cpp @@ -80,7 +80,7 @@ int main( int argc, char **argv ) outstream = new TQTextStream( &outfile ); } - CalendarLocal cal( TQString::tqfromLatin1("UTC") ); + CalendarLocal cal( TQString::fromLatin1("UTC") ); if ( !cal.load( input ) ) return 1; TQString tz = cal.nonKDECustomProperty( "X-LibKCal-Testsuite-OutTZ" ); diff --git a/libkcal/tests/testrecurson.cpp b/libkcal/tests/testrecurson.cpp index fe949f6dd..e8e33e2b4 100644 --- a/libkcal/tests/testrecurson.cpp +++ b/libkcal/tests/testrecurson.cpp @@ -80,7 +80,7 @@ int main( int argc, char **argv ) outstream = new TQTextStream( &outfile ); } - CalendarLocal cal( TQString::tqfromLatin1("UTC") ); + CalendarLocal cal( TQString::fromLatin1("UTC") ); if ( !cal.load( input ) ) return 1; TQString tz = cal.nonKDECustomProperty( "X-LibKCal-Testsuite-OutTZ" ); diff --git a/libkcal/tests/testvcalexport.cpp b/libkcal/tests/testvcalexport.cpp index 9e76dcd99..7f8b61c09 100644 --- a/libkcal/tests/testvcalexport.cpp +++ b/libkcal/tests/testvcalexport.cpp @@ -75,7 +75,7 @@ int main( int argc, char **argv ) kdDebug(5800) << "Output file: " << output << endl; - CalendarLocal cal( TQString::tqfromLatin1("UTC") ); + CalendarLocal cal( TQString::fromLatin1("UTC") ); if ( !cal.load( input ) ) return 1; TQString tz = cal.nonKDECustomProperty( "X-LibKCal-Testsuite-OutTZ" ); diff --git a/libkcal/todo.cpp b/libkcal/todo.cpp index c527cbbc7..b3fe65d9c 100644 --- a/libkcal/todo.cpp +++ b/libkcal/todo.cpp @@ -288,7 +288,7 @@ TQDateTime Todo::dtRecurrence() const bool Todo::recursOn( const TQDate &date ) const { - TQDate today = TQDate::tqcurrentDate(); + TQDate today = TQDate::currentDate(); return ( Incidence::recursOn(date) && !( date < today && mDtRecurrence.date() < today && mDtRecurrence > recurrence()->startDateTime() ) ); @@ -304,7 +304,7 @@ bool Todo::recurTodo() if ( ( r->duration() == -1 || ( nextDate.isValid() && endDateTime.isValid() && nextDate <= endDateTime ) ) ) { - while ( !recursAt( nextDate ) || nextDate <= TQDateTime::tqcurrentDateTime() ) { + while ( !recursAt( nextDate ) || nextDate <= TQDateTime::currentDateTime() ) { if ( !nextDate.isValid() || ( nextDate > endDateTime && r->duration() != -1 ) ) { @@ -327,7 +327,7 @@ bool Todo::recurTodo() bool Todo::isOverdue() const { - bool inPast = doesFloat() ? dtDue().date() < TQDate::tqcurrentDate() - : dtDue() < TQDateTime::tqcurrentDateTime(); + bool inPast = doesFloat() ? dtDue().date() < TQDate::currentDate() + : dtDue() < TQDateTime::currentDateTime(); return ( inPast && !isCompleted() ); } diff --git a/libkcal/vcaldrag.cpp b/libkcal/vcaldrag.cpp index 853c5187e..9bcfdb8d4 100644 --- a/libkcal/vcaldrag.cpp +++ b/libkcal/vcaldrag.cpp @@ -42,7 +42,7 @@ bool VCalDrag::decode( TQMimeSource *de, Calendar *cal ) { bool success = false; - TQByteArray payload = de->tqencodedData( "text/x-vCalendar" ); + TQByteArray payload = de->encodedData( "text/x-vCalendar" ); if ( payload.size() ) { TQString txt = TQString::fromUtf8( payload.data() ); diff --git a/libkcal/vcalformat.cpp b/libkcal/vcalformat.cpp index 16deee5b7..8335ee769 100644 --- a/libkcal/vcalformat.cpp +++ b/libkcal/vcalformat.cpp @@ -262,7 +262,7 @@ VObject *VCalFormat::eventToVTodo(const Todo *anEvent) kdDebug(5800) << "warning! this Event has an attendee w/o name or email!" << endl; VObject *aProp = addPropValue(vtodo, VCAttendeeProp, tmpStr.local8Bit()); addPropValue(aProp, VCRSVPProp, curAttendee->RSVP() ? "TRUE" : "FALSE"); - addPropValue(aProp, VCStatusProp, writetqStatus(curAttendee->status())); + addPropValue(aProp, VCStatusProp, writeStatus(curAttendee->status())); } } @@ -355,7 +355,7 @@ VObject *VCalFormat::eventToVTodo(const Todo *anEvent) // pilot sync stuff tmpStr.sprintf("%lu",anEvent->pilotId()); addPropValue(vtodo, KPilotIdProp, tmpStr.local8Bit()); - tmpStr.sprintf("%i",anEvent->synctqStatus()); + tmpStr.sprintf("%i",anEvent->syncStatus()); addPropValue(vtodo, KPiloStatusProp, tmpStr.local8Bit()); } @@ -422,7 +422,7 @@ VObject* VCalFormat::eventToVEvent(const Event *anEvent) kdDebug(5800) << "warning! this Event has an attendee w/o name or email!" << endl; VObject *aProp = addPropValue(vevent, VCAttendeeProp, tmpStr.local8Bit()); addPropValue(aProp, VCRSVPProp, curAttendee->RSVP() ? "TRUE" : "FALSE"); - addPropValue(aProp, VCStatusProp, writetqStatus(curAttendee->status())); + addPropValue(aProp, VCStatusProp, writeStatus(curAttendee->status())); } } @@ -641,7 +641,7 @@ VObject* VCalFormat::eventToVEvent(const Event *anEvent) // pilot sync stuff tmpStr.sprintf("%lu",anEvent->pilotId()); addPropValue(vevent, KPilotIdProp, tmpStr.local8Bit()); - tmpStr.sprintf("%i",anEvent->synctqStatus()); + tmpStr.sprintf("%i",anEvent->syncStatus()); addPropValue(vevent, KPiloStatusProp, tmpStr.local8Bit()); } @@ -677,7 +677,7 @@ Todo *VCalFormat::VTodoToEvent(VObject *vtodo) deleteStr(s); } else - anEvent->setLastModified(TQDateTime(TQDate::tqcurrentDate(), + anEvent->setLastModified(TQDateTime(TQDate::currentDate(), TQTime::currentTime())); // organizer @@ -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->setqStatus(readtqStatus(vObjectStringZValue(vp))); + a->seStatus(readStatus(vObjectStringZValue(vp))); // add the attendee anEvent->addAttendee(a); } @@ -845,11 +845,11 @@ Todo *VCalFormat::VTodoToEvent(VObject *vtodo) anEvent->setPilotId(0); if ((vo = isAPropertyOf(vtodo, KPiloStatusProp))) { - anEvent->setSynctqStatus(atoi(s = fakeCString(vObjectUStringZValue(vo)))); + anEvent->setSyncStatus(atoi(s = fakeCString(vObjectUStringZValue(vo)))); deleteStr(s); } else - anEvent->setSynctqStatus(Event::SYNCMOD); + anEvent->setSyncStatus(Event::SYNCMOD); return anEvent; } @@ -892,7 +892,7 @@ Event* VCalFormat::VEventToEvent(VObject *vevent) deleteStr(s); } else - anEvent->setLastModified(TQDateTime(TQDate::tqcurrentDate(), + anEvent->setLastModified(TQDateTime(TQDate::currentDate(), TQTime::currentTime())); // organizer @@ -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->setqStatus(readtqStatus(vObjectStringZValue(vp))); + a->seStatus(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->setqStatus(tmpStr); +// anEvent->seStatus(tmpStr); } else -// anEvent->setqStatus("NEEDS ACTION"); +// anEvent->seStatus("NEEDS ACTION"); #endif // secrecy @@ -1311,11 +1311,11 @@ Event* VCalFormat::VEventToEvent(VObject *vevent) anEvent->setPilotId(0); if ((vo = isAPropertyOf(vevent, KPiloStatusProp))) { - anEvent->setSynctqStatus(atoi(s = fakeCString(vObjectUStringZValue(vo)))); + anEvent->setSyncStatus(atoi(s = fakeCString(vObjectUStringZValue(vo)))); deleteStr(s); } else - anEvent->setSynctqStatus(Event::SYNCMOD); + anEvent->setSyncStatus(Event::SYNCMOD); return anEvent; } @@ -1565,7 +1565,7 @@ int VCalFormat::numFromDay(const TQString &day) return -1; // something bad happened. :) } -Attendee::PartStat VCalFormat::readtqStatus(const char *s) const +Attendee::PartStat VCalFormat::readStatus(const char *s) const { TQString statStr = s; statStr = statStr.upper(); @@ -1597,7 +1597,7 @@ Attendee::PartStat VCalFormat::readtqStatus(const char *s) const return status; } -TQCString VCalFormat::writetqStatus(Attendee::PartStat status) const +TQCString VCalFormat::writeStatus(Attendee::PartStat status) const { switch(status) { default: diff --git a/libkcal/vcalformat.h b/libkcal/vcalformat.h index 0e1818a2f..facda241e 100644 --- a/libkcal/vcalformat.h +++ b/libkcal/vcalformat.h @@ -103,8 +103,8 @@ class LIBKCAL_EXPORT VCalFormat : public CalFormat /** the reverse of the above function. */ int numFromDay(const TQString &day); - Attendee::PartStat readtqStatus(const char *s) const; - TQCString writetqStatus(Attendee::PartStat status) const; + Attendee::PartStat readStatus(const char *s) const; + TQCString writeStatus(Attendee::PartStat status) const; private: Calendar *mCalendar; diff --git a/libkmime/CLASSTREE.bodyparts b/libkmime/CLASSTREE.bodyparts index 5952c2082..eeaa7726a 100644 --- a/libkmime/CLASSTREE.bodyparts +++ b/libkmime/CLASSTREE.bodyparts @@ -15,7 +15,7 @@ + Message::RFC822 + Message::Partial + Message::ExternalBody - + Message::DeliverytqStatus + + Message::DeliveryStatus + GText + Text::Plain + Text::Enriched diff --git a/libkmime/kmime_header_parsing.cpp b/libkmime/kmime_header_parsing.cpp index 59957f10b..14d4ed118 100644 --- a/libkmime/kmime_header_parsing.cpp +++ b/libkmime/kmime_header_parsing.cpp @@ -256,7 +256,7 @@ bool parseAtom( const char * & scursor, const char * const send, TQPair<const char*,int> maybeResult; if ( parseAtom( scursor, send, maybeResult, allow8Bit ) ) { - result += TQString::tqfromLatin1( maybeResult.first, maybeResult.second ); + result += TQString::fromLatin1( maybeResult.first, maybeResult.second ); return true; } @@ -296,7 +296,7 @@ bool parseToken( const char * & scursor, const char * const send, TQPair<const char*,int> maybeResult; if ( parseToken( scursor, send, maybeResult, allow8Bit ) ) { - result += TQString::tqfromLatin1( maybeResult.first, maybeResult.second ); + result += TQString::fromLatin1( maybeResult.first, maybeResult.second ); return true; } @@ -1065,9 +1065,9 @@ bool parseAddressList( const char* & scursor, const char * const send, } -static TQString asterisk = TQString::tqfromLatin1("*0*",1); -static TQString asteriskZero = TQString::tqfromLatin1("*0*",2); -//static TQString asteriskZeroAsterisk = TQString::tqfromLatin1("*0*",3); +static TQString asterisk = TQString::fromLatin1("*0*",1); +static TQString asteriskZero = TQString::fromLatin1("*0*",2); +//static TQString asteriskZeroAsterisk = TQString::fromLatin1("*0*",3); bool parseParameter( const char* & scursor, const char * const send, TQPair<TQString,TQStringOrTQPair> & result, bool isCRLF ) { @@ -1223,7 +1223,7 @@ static void decodeRFC2231Value( Codec* & rfc2231Codec, // take the whole value to be in latin-1: KMIME_WARN << "No charset in extended-initial-value. " "Assuming \"iso-8859-1\"." << endl; - value += TQString::tqfromLatin1( decBegin, source.second ); + value += TQString::fromLatin1( decBegin, source.second ); return; } @@ -1263,7 +1263,7 @@ static void decodeRFC2231Value( Codec* & rfc2231Codec, } if ( !textcodec ) { - value += TQString::tqfromLatin1( decCursor, decEnd - decCursor ); + value += TQString::fromLatin1( decCursor, decEnd - decCursor ); return; } @@ -1348,7 +1348,7 @@ bool parseParameterList( const char* & scursor, const char * const send, } else { // not encoded. if ( (*it).qpair.first ) - value += TQString::tqfromLatin1( (*it).qpair.first, (*it).qpair.second ); + value += TQString::fromLatin1( (*it).qpair.first, (*it).qpair.second ); else value += (*it).qstring; } @@ -1377,7 +1377,7 @@ bool parseParameterList( const char* & scursor, const char * const send, } else { // not encoded if ( (*it).qpair.first ) - value += TQString::tqfromLatin1( (*it).qpair.first, (*it).qpair.second ); + value += TQString::fromLatin1( (*it).qpair.first, (*it).qpair.second ); else value += (*it).qstring; } diff --git a/libkmime/kmime_headers.cpp b/libkmime/kmime_headers.cpp index 85d4c4049..3a454551d 100644 --- a/libkmime/kmime_headers.cpp +++ b/libkmime/kmime_headers.cpp @@ -529,7 +529,7 @@ void MessageID::fromUnicodeString(const TQString &s, const TQCString&) TQString MessageID::asUnicodeString() { - return TQString::tqfromLatin1(m_id); + return TQString::fromLatin1(m_id); } @@ -567,7 +567,7 @@ void Control::fromUnicodeString(const TQString &s, const TQCString&) TQString Control::asUnicodeString() { - return TQString::tqfromLatin1(c_trlMsg); + return TQString::fromLatin1(c_trlMsg); } //-----</Control>------------------------------ @@ -797,7 +797,7 @@ void Date::fromUnicodeString(const TQString &s, const TQCString&) TQString Date::asUnicodeString() { - return TQString::tqfromLatin1(as7BitString(false)); + return TQString::fromLatin1(as7BitString(false)); } @@ -1075,7 +1075,7 @@ void References::fromUnicodeString(const TQString &s, const TQCString&) TQString References::asUnicodeString() { - return TQString::tqfromLatin1(r_ef); + return TQString::fromLatin1(r_ef); } @@ -1221,7 +1221,7 @@ void UserAgent::fromUnicodeString(const TQString &s, const TQCString&) TQString UserAgent::asUnicodeString() { - return TQString::tqfromLatin1(u_agent); + return TQString::fromLatin1(u_agent); } //-----</UserAgent>---------------------------- @@ -1268,7 +1268,7 @@ void ContentType::fromUnicodeString(const TQString &s, const TQCString&) TQString ContentType::asUnicodeString() { - return TQString::tqfromLatin1(as7BitString(false)); + return TQString::fromLatin1(as7BitString(false)); } @@ -1544,7 +1544,7 @@ void CTEncoding::fromUnicodeString(const TQString &s, const TQCString&) TQString CTEncoding::asUnicodeString() { - return TQString::tqfromLatin1(as7BitString(false)); + return TQString::fromLatin1(as7BitString(false)); } //-----</CTEncoding>--------------------------- diff --git a/libkmime/kmime_util.cpp b/libkmime/kmime_util.cpp index 8110227e5..eecf1ba09 100644 --- a/libkmime/kmime_util.cpp +++ b/libkmime/kmime_util.cpp @@ -739,7 +739,7 @@ DateFormatter::localized(time_t otime, bool shortFormat, bool includeSecs, TQString DateFormatter::cTime(time_t otime) const { - return TQString::tqfromLatin1( ctime( &otime ) ).stripWhiteSpace() ; + return TQString::fromLatin1( ctime( &otime ) ).stripWhiteSpace() ; } TQString diff --git a/libkmime/tests/test_dates.cpp b/libkmime/tests/test_dates.cpp index e3a40f812..7087a01a6 100644 --- a/libkmime/tests/test_dates.cpp +++ b/libkmime/tests/test_dates.cpp @@ -80,14 +80,14 @@ main() "Z MMMM dddd yyyy") <<endl; t.setFormat(DateFormatter::Fancy); kdDebug()<<"TQDateTime taking: (dates as in first test)"<<endl; - kdDebug()<<"\tFancy : \t"<<t.dateString((TQDateTime::tqcurrentDateTime()))<<endl; + kdDebug()<<"\tFancy : \t"<<t.dateString((TQDateTime::currentDateTime()))<<endl; t.setFormat(DateFormatter::Localized); - kdDebug()<<"\tLocalized : \t"<<t.dateString(TQDateTime::tqcurrentDateTime())<<endl; + kdDebug()<<"\tLocalized : \t"<<t.dateString(TQDateTime::currentDateTime())<<endl; t.setFormat(DateFormatter::CTime); - kdDebug()<<"\tCTime : \t"<<t.dateString(TQDateTime::tqcurrentDateTime())<<endl; + kdDebug()<<"\tCTime : \t"<<t.dateString(TQDateTime::currentDateTime())<<endl; t.setFormat(DateFormatter::Iso); - kdDebug()<<"\tIso : \t"<<t.dateString(TQDateTime::tqcurrentDateTime())<<endl; + kdDebug()<<"\tIso : \t"<<t.dateString(TQDateTime::currentDateTime())<<endl; t.setCustomFormat("MMMM d dddd yyyy Z"); - kdDebug()<<"\tCustom : \t"<<t.dateString(TQDateTime::tqcurrentDateTime())<<endl; + kdDebug()<<"\tCustom : \t"<<t.dateString(TQDateTime::currentDateTime())<<endl; } diff --git a/libkpgp/kpgpbase.cpp b/libkpgp/kpgpbase.cpp index d30f0fd15..591a99439 100644 --- a/libkpgp/kpgpbase.cpp +++ b/libkpgp/kpgpbase.cpp @@ -70,7 +70,7 @@ Base::run( const char *cmd, const char *passphrase, bool onlyReadFromPGP ) int len, len2; FILE *pass; pid_t child_pid; - int childExitqStatus; + int childExiStatus; struct pollfd pollin, pollout, pollerr; int pollstatus; @@ -251,8 +251,8 @@ Base::run( const char *cmd, const char *passphrase, bool onlyReadFromPGP ) do { //kdDebug(5100) << "Checking if PGP is still running..." << endl; - childExitqStatus = 0; - waitpidRetVal = waitpid(child_pid, &childExitqStatus, WNOHANG); + childExiStatus = 0; + waitpidRetVal = waitpid(child_pid, &childExiStatus, WNOHANG); //kdDebug(5100) << "waitpid returned " << waitpidRetVal << endl; if (pout[0] >= 0) { do { @@ -351,14 +351,14 @@ Base::run( const char *cmd, const char *passphrase, bool onlyReadFromPGP ) close(ppass[0]); // Did the child exit normally? - if (WIFEXITED(childExitqStatus) != 0) { + if (WIFEXITED(childExiStatus) != 0) { // Get the return code of the child - childExitqStatus = WEXITSTATUS(childExitqStatus); - kdDebug(5100) << "PGP exited with exit status " << childExitqStatus + childExiStatus = WEXITSTATUS(childExiStatus); + kdDebug(5100) << "PGP exited with exit status " << childExiStatus << endl; } else { - childExitqStatus = -1; + childExiStatus = -1; kdDebug(5100) << "PGP exited abnormally!" << endl; } @@ -371,7 +371,7 @@ Base::run( const char *cmd, const char *passphrase, bool onlyReadFromPGP ) */ kdDebug(5100) << error << endl; - return childExitqStatus; + return childExiStatus; } @@ -387,7 +387,7 @@ Base::runGpg( const char *cmd, const char *passphrase, bool onlyReadFromGnuPG ) int len, len2; FILE *pass; pid_t child_pid; - int childExitqStatus; + int childExiStatus; char gpgcmd[1024] = "\0"; struct pollfd poller[3]; int num_pollers = 0; @@ -529,8 +529,8 @@ Base::runGpg( const char *cmd, const char *passphrase, bool onlyReadFromGnuPG ) do { //kdDebug(5100) << "Checking if GnuPG is still running..." << endl; - childExitqStatus = 0; - waitpidRetVal = waitpid(child_pid, &childExitqStatus, WNOHANG); + childExiStatus = 0; + waitpidRetVal = waitpid(child_pid, &childExiStatus, WNOHANG); //kdDebug(5100) << "waitpid returned " << waitpidRetVal << endl; do { // poll the pipes @@ -645,14 +645,14 @@ Base::runGpg( const char *cmd, const char *passphrase, bool onlyReadFromGnuPG ) close(ppass[0]); // Did the child exit normally? - if (WIFEXITED(childExitqStatus) != 0) { + if (WIFEXITED(childExiStatus) != 0) { // Get the return code of the child - childExitqStatus = WEXITSTATUS(childExitqStatus); - kdDebug(5100) << "GnuPG exited with exit status " << childExitqStatus + childExiStatus = WEXITSTATUS(childExiStatus); + kdDebug(5100) << "GnuPG exited with exit status " << childExiStatus << endl; } else { - childExitqStatus = -1; + childExiStatus = -1; kdDebug(5100) << "GnuPG exited abnormally!" << endl; } @@ -663,7 +663,7 @@ Base::runGpg( const char *cmd, const char *passphrase, bool onlyReadFromGnuPG ) // get to know what's going on during the gpg calls. kdDebug(5100) << "gpg stderr:\n" << error << endl; - return childExitqStatus; + return childExiStatus; } diff --git a/libkpgp/kpgpbase2.cpp b/libkpgp/kpgpbase2.cpp index 97db773a7..4ba4043f4 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 exitqStatus = 0; + int exiStatus = 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(); - exitqStatus = run(cmd.data(), passphrase); + exiStatus = run(cmd.data(), passphrase); if( !output.isEmpty() ) block.setProcessedText( output ); block.setError( error ); - if(exitqStatus != 0) + if(exiStatus != 0) status = ERROR; #if 0 @@ -218,7 +218,7 @@ Base2::encsign( Block& block, const KeyIDList& recipients, } //kdDebug(5100) << "status = " << status << endl; - block.setqStatus( status ); + block.seStatus( status ); return status; } @@ -227,11 +227,11 @@ int Base2::decrypt( Block& block, const char *passphrase ) { int index, index2; - int exitqStatus = 0; + int exiStatus = 0; clear(); input = block.text(); - exitqStatus = run(PGP2 " +batchmode +language=en -f", passphrase); + exiStatus = 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); - exitqStatus = run(PGP2 " +batchmode +language=en -f", passphrase); + exiStatus = run(PGP2 " +batchmode +language=en -f", passphrase); if( !output.isEmpty() ) block.setProcessedText( output ); block.setError( error ); } - if(exitqStatus == -1) { + if(exiStatus == -1) { errMsg = i18n("error running PGP"); status = RUN_ERR; - block.setqStatus( status ); + block.seStatus( status ); return status; } @@ -457,7 +457,7 @@ Base2::decrypt( Block& block, const char *passphrase ) } } //kdDebug(5100) << "status = " << status << endl; - block.setqStatus( status ); + block.seStatus( status ); return status; } @@ -467,13 +467,13 @@ Base2::readPublicKey( const KeyID& keyID, const bool readTrust /* = false */, Key* key /* = 0 */ ) { - int exitqStatus = 0; + int exiStatus = 0; status = 0; - exitqStatus = run( PGP2 " +batchmode +language=en +verbose=0 -kvc -f 0x" + + exiStatus = run( PGP2 " +batchmode +language=en +verbose=0 -kvc -f 0x" + keyID, 0, true ); - if(exitqStatus != 0) { + if(exiStatus != 0) { status = ERROR; return 0; } @@ -487,10 +487,10 @@ Base2::readPublicKey( const KeyID& keyID, if( readTrust ) { - exitqStatus = run( PGP2 " +batchmode +language=en +verbose=0 -kc -f", + exiStatus = run( PGP2 " +batchmode +language=en +verbose=0 -kc -f", 0, true ); - if(exitqStatus != 0) { + if(exiStatus != 0) { status = ERROR; return 0; } @@ -512,14 +512,14 @@ Base2::publicKeys( const TQStringList & patterns ) KeyList Base2::doGetPublicKeys( const TQCString & cmd, const TQStringList & patterns ) { - int exitqStatus = 0; + int exiStatus = 0; KeyList publicKeys; status = 0; if ( patterns.isEmpty() ) { - exitqStatus = run( cmd, 0, true ); + exiStatus = run( cmd, 0, true ); - if ( exitqStatus != 0 ) { + if ( exiStatus != 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 ) { - exitqStatus = run( cmd + " " + KProcess::quote( *it ).local8Bit(), + exiStatus = run( cmd + " " + KProcess::quote( *it ).local8Bit(), 0, true ); - if ( exitqStatus != 0 ) { + if ( exiStatus != 0 ) { status = ERROR; return KeyList(); } @@ -576,16 +576,16 @@ int Base2::signKey(const KeyID& keyID, const char *passphrase) { TQCString cmd; - int exitqStatus = 0; + int exiStatus = 0; cmd = PGP2 " +batchmode +language=en -ks -f "; cmd += addUserId(); cmd += " 0x" + keyID; status = 0; - exitqStatus = run(cmd.data(),passphrase); + exiStatus = run(cmd.data(),passphrase); - if (exitqStatus != 0) + if (exiStatus != 0) status = ERROR; return status; @@ -594,16 +594,16 @@ Base2::signKey(const KeyID& keyID, const char *passphrase) TQCString Base2::getAsciiPublicKey(const KeyID& keyID) { - int exitqStatus = 0; + int exiStatus = 0; if (keyID.isEmpty()) return TQCString(); status = 0; - exitqStatus = run( PGP2 " +batchmode +force +language=en -kxaf 0x" + keyID, + exiStatus = run( PGP2 " +batchmode +force +language=en -kxaf 0x" + keyID, 0, true ); - if(exitqStatus != 0) { + if(exiStatus != 0) { status = ERROR; return TQCString(); } diff --git a/libkpgp/kpgpbase5.cpp b/libkpgp/kpgpbase5.cpp index 288957399..52a70f01d 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 exitqStatus = 0; + int exiStatus = 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 - exitqStatus = run(cmd.data(), passphrase); + exiStatus = run(cmd.data(), passphrase); block.setError( error ); - if(exitqStatus != 0) + if(exiStatus != 0) status = ERROR; // now parse the returned info @@ -185,7 +185,7 @@ Base5::encsign( Block& block, const KeyIDList& recipients, } block.setProcessedText( output ); - block.setqStatus( status ); + block.seStatus( status ); return status; } @@ -193,19 +193,19 @@ Base5::encsign( Block& block, const KeyIDList& recipients, int Base5::decrypt( Block& block, const char *passphrase ) { - int exitqStatus = 0; + int exiStatus = 0; clear(); input = block.text(); - exitqStatus = run("pgpv -f +batchmode=1", passphrase); + exiStatus = run("pgpv -f +batchmode=1", passphrase); if( !output.isEmpty() ) block.setProcessedText( output ); block.setError( error ); - if(exitqStatus == -1) { + if(exiStatus == -1) { errMsg = i18n("Error running PGP"); status = RUN_ERR; - block.setqStatus( status ); + block.seStatus( status ); return status; } @@ -313,7 +313,7 @@ Base5::decrypt( Block& block, const char *passphrase ) } //kdDebug(5100) << "status = " << status << endl; - block.setqStatus( status ); + block.seStatus( 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 exitqStatus = 0; + int exiStatus = 0; status = 0; - exitqStatus = run( "pgpk -ll 0x" + keyId, 0, true ); + exiStatus = run( "pgpk -ll 0x" + keyId, 0, true ); - if(exitqStatus != 0) { + if(exiStatus != 0) { status = ERROR; return 0; } @@ -340,9 +340,9 @@ Base5::readPublicKey( const KeyID& keyId, const bool readTrust, Key* key ) if( readTrust ) { - exitqStatus = run( "pgpk -c 0x" + keyId, 0, true ); + exiStatus = run( "pgpk -c 0x" + keyId, 0, true ); - if(exitqStatus != 0) { + if(exiStatus != 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 exitqStatus = 0; + int exiStatus = 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; - exitqStatus = run( cmd, 0, true ); + exiStatus = run( cmd, 0, true ); - if(exitqStatus != 0) { + if(exiStatus != 0) { status = ERROR; return KeyList(); } @@ -386,7 +386,7 @@ Base5::publicKeys( const TQStringList & patterns ) KeyList Base5::secretKeys( const TQStringList & patterns ) { - int exitqStatus = 0; + int exiStatus = 0; status = 0; TQCString cmd = "pgpk -ll"; @@ -396,9 +396,9 @@ Base5::secretKeys( const TQStringList & patterns ) cmd += KProcess::quote( *it ).local8Bit(); } status = 0; - exitqStatus = run( cmd, 0, true ); + exiStatus = run( cmd, 0, true ); - if(exitqStatus != 0) { + if(exiStatus != 0) { status = ERROR; return KeyList(); } @@ -415,15 +415,15 @@ Base5::secretKeys( const TQStringList & patterns ) TQCString Base5::getAsciiPublicKey(const KeyID& keyID) { - int exitqStatus = 0; + int exiStatus = 0; if (keyID.isEmpty()) return TQCString(); status = 0; - exitqStatus = run( "pgpk -xa 0x" + keyID, 0, true ); + exiStatus = run( "pgpk -xa 0x" + keyID, 0, true ); - if(exitqStatus != 0) { + if(exiStatus != 0) { status = ERROR; return TQCString(); } @@ -436,7 +436,7 @@ int Base5::signKey(const KeyID& keyID, const char *passphrase) { TQCString cmd; - int exitqStatus = 0; + int exiStatus = 0; if(passphrase == 0) return false; @@ -445,9 +445,9 @@ Base5::signKey(const KeyID& keyID, const char *passphrase) cmd += addUserId(); status = 0; - exitqStatus = run(cmd.data(), passphrase); + exiStatus = run(cmd.data(), passphrase); - if (exitqStatus != 0) + if (exiStatus != 0) status = ERROR; return status; @@ -579,7 +579,7 @@ Base5::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ ) TQDateTime dt( TQDate( year, month, day ), TQTime( 00, 00 ) ); subkey->setCreationDate( epoch.secsTo( dt ) ); // has the key already expired? - if( TQDateTime::tqcurrentDateTime() >= dt ) + if( TQDateTime::currentDateTime() >= dt ) { subkey->setExpired( true ); key->setExpired( true ); diff --git a/libkpgp/kpgpbase6.cpp b/libkpgp/kpgpbase6.cpp index 0972a46e1..0b5073931 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 exitqStatus = 0; + int exiStatus = 0; clear(); input = block.text(); - exitqStatus = run( PGP6 " +batchmode +language=C -f", passphrase); + exiStatus = run( PGP6 " +batchmode +language=C -f", passphrase); if( !output.isEmpty() ) block.setProcessedText( output ); block.setError( error ); - if(exitqStatus == -1) { + if(exiStatus == -1) { errMsg = i18n("error running PGP"); status = RUN_ERR; - block.setqStatus( status ); + block.seStatus( status ); return status; } @@ -180,7 +180,7 @@ Base6::decrypt( Block& block, const char *passphrase ) } } //kdDebug(5100) << "status = " << status << endl; - block.setqStatus( status ); + block.seStatus( status ); return status; } @@ -190,13 +190,13 @@ Base6::readPublicKey( const KeyID& keyID, const bool readTrust /* = false */, Key* key /* = 0 */ ) { - int exitqStatus = 0; + int exiStatus = 0; status = 0; - exitqStatus = run( PGP6 " +batchmode -compatible +verbose=0 +language=C -kvvc " + exiStatus = run( PGP6 " +batchmode -compatible +verbose=0 +language=C -kvvc " "0x" + keyID, 0, true ); - if(exitqStatus != 0) { + if(exiStatus != 0) { status = ERROR; return 0; } @@ -210,10 +210,10 @@ Base6::readPublicKey( const KeyID& keyID, if( readTrust ) { - exitqStatus = run( PGP6 " +batchmode -compatible +verbose=0 +language=C -kc " + exiStatus = run( PGP6 " +batchmode -compatible +verbose=0 +language=C -kc " "0x" + keyID, 0, true ); - if(exitqStatus != 0) { + if(exiStatus != 0) { status = ERROR; return 0; } @@ -238,13 +238,13 @@ TQStrList Base6::pubKeys() { int index, index2; - int exitqStatus = 0; + int exiStatus = 0; int compatibleMode = 1; status = 0; - exitqStatus = run("pgp +batchmode +language=C -kv -f"); + exiStatus = run("pgp +batchmode +language=C -kv -f"); - if(exitqStatus != 0) { + if(exiStatus != 0) { status = ERROR; return 0; } @@ -319,9 +319,9 @@ Base6::pubKeys() } // Also look for pgp key groups - exitqStatus = run("pgp +batchmode +language=C -gv -f"); + exiStatus = run("pgp +batchmode +language=C -gv -f"); - if(exitqStatus != 0) { + if(exiStatus != 0) { status = ERROR; return 0; } @@ -352,11 +352,11 @@ Base6::secretKeys( const TQStringList & patterns ) int Base6::isVersion6() { - int exitqStatus = 0; + int exiStatus = 0; - exitqStatus = run( PGP6, 0, true ); + exiStatus = run( PGP6, 0, true ); - if(exitqStatus == -1) { + if(exiStatus == -1) { errMsg = i18n("error running PGP"); status = RUN_ERR; return 0; diff --git a/libkpgp/kpgpbaseG.cpp b/libkpgp/kpgpbaseG.cpp index ecb5af195..adbc84b98 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 exitqStatus = 0; + int exiStatus = 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(); - exitqStatus = runGpg(cmd.data(), passphrase); + exiStatus = runGpg(cmd.data(), passphrase); if( !output.isEmpty() ) block.setProcessedText( output ); block.setError( error ); - if( exitqStatus != 0 ) + if( exiStatus != 0 ) { // this error message is later hopefully overwritten errMsg = i18n( "Unknown error." ); @@ -199,7 +199,7 @@ BaseG::encsign( Block& block, const KeyIDList& recipients, } //kdDebug(5100) << "status = " << status << endl; - block.setqStatus( status ); + block.seStatus( status ); return status; } @@ -208,19 +208,19 @@ int BaseG::decrypt( Block& block, const char *passphrase ) { int index, index2; - int exitqStatus = 0; + int exiStatus = 0; clear(); input = block.text(); - exitqStatus = runGpg("--batch --decrypt", passphrase); + exiStatus = runGpg("--batch --decrypt", passphrase); if( !output.isEmpty() && ( error.find( "gpg: quoted printable" ) == -1 ) ) block.setProcessedText( output ); block.setError( error ); - if(exitqStatus == -1) { + if(exiStatus == -1) { errMsg = i18n("Error running gpg"); status = RUN_ERR; - block.setqStatus( status ); + block.seStatus( status ); return status; } @@ -361,7 +361,7 @@ BaseG::decrypt( Block& block, const char *passphrase ) } } //kdDebug(5100) << "status = " << status << endl; - block.setqStatus( status ); + block.seStatus( status ); return status; } @@ -371,15 +371,15 @@ BaseG::readPublicKey( const KeyID& keyID, const bool readTrust /* = false */, Key* key /* = 0 */ ) { - int exitqStatus = 0; + int exiStatus = 0; status = 0; if( readTrust ) - exitqStatus = runGpg( "--batch --list-public-keys --with-fingerprint --with-colons --fixed-list-mode 0x" + keyID, 0, true ); + exiStatus = runGpg( "--batch --list-public-keys --with-fingerprint --with-colons --fixed-list-mode 0x" + keyID, 0, true ); else - exitqStatus = runGpg( "--batch --list-public-keys --with-fingerprint --with-colons --fixed-list-mode --no-expensive-trust-checks 0x" + keyID, 0, true ); + exiStatus = runGpg( "--batch --list-public-keys --with-fingerprint --with-colons --fixed-list-mode --no-expensive-trust-checks 0x" + keyID, 0, true ); - if(exitqStatus != 0) { + if(exiStatus != 0) { status = ERROR; return 0; } @@ -405,7 +405,7 @@ BaseG::readPublicKey( const KeyID& keyID, KeyList BaseG::publicKeys( const TQStringList & patterns ) { - int exitqStatus = 0; + int exiStatus = 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; - exitqStatus = runGpg( cmd, 0, true ); + exiStatus = runGpg( cmd, 0, true ); - if(exitqStatus != 0) { + if(exiStatus != 0) { status = ERROR; return KeyList(); } @@ -437,7 +437,7 @@ BaseG::publicKeys( const TQStringList & patterns ) KeyList BaseG::secretKeys( const TQStringList & patterns ) { - int exitqStatus = 0; + int exiStatus = 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; - exitqStatus = runGpg( cmd, 0, true ); + exiStatus = runGpg( cmd, 0, true ); - if(exitqStatus != 0) { + if(exiStatus != 0) { status = ERROR; return KeyList(); } @@ -470,7 +470,7 @@ int BaseG::signKey(const KeyID& keyID, const char *passphrase) { TQCString cmd; - int exitqStatus = 0; + int exiStatus = 0; cmd = "--batch"; cmd += addUserId(); @@ -478,9 +478,9 @@ BaseG::signKey(const KeyID& keyID, const char *passphrase) cmd += keyID; status = 0; - exitqStatus = runGpg(cmd.data(), passphrase); + exiStatus = runGpg(cmd.data(), passphrase); - if (exitqStatus != 0) + if (exiStatus != 0) status = ERROR; return status; @@ -490,15 +490,15 @@ BaseG::signKey(const KeyID& keyID, const char *passphrase) TQCString BaseG::getAsciiPublicKey(const KeyID& keyID) { - int exitqStatus = 0; + int exiStatus = 0; if (keyID.isEmpty()) return TQCString(); status = 0; - exitqStatus = runGpg("--batch --armor --export 0x" + keyID, 0, true); + exiStatus = runGpg("--batch --armor --export 0x" + keyID, 0, true); - if(exitqStatus != 0) { + if(exiStatus != 0) { status = ERROR; return TQCString(); } @@ -778,7 +778,7 @@ BaseG::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ ) else { // assume latin1 encoding kdDebug(5100) << "Assume latin1 encoding." << endl; - uidString = TQString::tqfromLatin1( uid.data() ); + uidString = TQString::fromLatin1( uid.data() ); } } userID->setText( uidString ); diff --git a/libkpgp/kpgpblock.cpp b/libkpgp/kpgpblock.cpp index 4e5f92393..ba1d8fec2 100644 --- a/libkpgp/kpgpblock.cpp +++ b/libkpgp/kpgpblock.cpp @@ -27,7 +27,7 @@ Block::Block( const TQCString& str ) : mText(str), mProcessedText(), mError(), mSignatureUserId(), mSignatureKeyId(), mSignatureDate(), mRequiredKey(), mEncryptedFor(), - mtqStatus(0), mHasBeenProcessed(false), mType(NoPgpBlock) + mStatus(0), mHasBeenProcessed(false), mType(NoPgpBlock) { mEncryptedFor.setAutoDelete( true ); } @@ -46,7 +46,7 @@ Block::reset() mSignatureDate = TQCString(); mRequiredKey = TQCString(); mEncryptedFor.clear(); - mtqStatus = 0; + mStatus = 0; mHasBeenProcessed = false; } diff --git a/libkpgp/kpgpblock.h b/libkpgp/kpgpblock.h index e3308eab9..c5af0241c 100644 --- a/libkpgp/kpgpblock.h +++ b/libkpgp/kpgpblock.h @@ -58,7 +58,7 @@ typedef enum { NO_SEC_KEY = 0x0100, MISSINGKEY = 0x0200, CANCEL = 0x8000 -} MessagetqStatus; +} MessageStatus; class Base; class Module; @@ -103,7 +103,7 @@ class KDE_EXPORT Block void setProcessedText( const TQCString& str ); int status() const; - void setqStatus( const int status ); + void seStatus( const int status ); BlockType type(); @@ -186,7 +186,7 @@ class KDE_EXPORT Block TQCString mRequiredKey; TQString mRequiredUserId; TQStrList mEncryptedFor; - int mtqStatus; + int mStatus; bool mHasBeenProcessed; BlockType mType; }; @@ -231,13 +231,13 @@ Block::setError( const TQCString& str ) inline int Block::status() const { - return mtqStatus; + return mStatus; } inline void -Block::setqStatus( const int status ) +Block::seStatus( const int status ) { - mtqStatus = status; + mStatus = status; } inline BlockType @@ -317,7 +317,7 @@ Block::encryptedFor() const inline bool Block::isEncrypted() const { - if( mtqStatus & ENCRYPTED ) + if( mStatus & ENCRYPTED ) return true; return false; } @@ -325,7 +325,7 @@ Block::isEncrypted() const inline bool Block::isSigned() const { - if( mtqStatus & SIGNED ) + if( mStatus & SIGNED ) return true; return false; } @@ -333,7 +333,7 @@ Block::isSigned() const inline bool Block::goodSignature() const { - if( mtqStatus & GOODSIG ) + if( mStatus & GOODSIG ) return true; return false; } @@ -342,7 +342,7 @@ Block::goodSignature() const inline bool Block::unknownSigner() const { - if( mtqStatus & UNKNOWN_SIG ) + if( mStatus & UNKNOWN_SIG ) return true; return false; } diff --git a/libkpgp/kpgpui.cpp b/libkpgp/kpgpui.cpp index c9288b01b..a9c62d83e 100644 --- a/libkpgp/kpgpui.cpp +++ b/libkpgp/kpgpui.cpp @@ -126,9 +126,9 @@ Config::Config( TQWidget *parent, const char *name, bool encrypt ) labelFont.setBold( true ); label->setFont( labelFont ); // 3. and activate wordwarp: - label->tqsetAlignment( AlignLeft|WordBreak ); + label->setAlignment( AlignLeft|WordBreak ); // end; to remove the workaround, add <qt><b>..</b></qt> around the - // text and remove lines TQFont... -> label->tqsetAlignment(...). + // text and remove lines TQFont... -> label->setAlignment(...). topLayout->addWidget( group ); group = new TQVGroupBox( i18n("Encryption Tool"), this ); @@ -1176,7 +1176,7 @@ KeyRequester::KeyRequester( TQWidget * parent, bool multipleKeys, // the button to unset any key: mEraseButton = new TQPushButton( this ); mEraseButton->setAutoDefault( false ); - mEraseButton->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, + mEraseButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) ); mEraseButton->setPixmap( SmallIcon( "clear_left" ) ); TQToolTip::add( mEraseButton, i18n("Clear") ); @@ -1192,7 +1192,7 @@ KeyRequester::KeyRequester( TQWidget * parent, bool multipleKeys, connect( mEraseButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotEraseButtonClicked()) ); connect( mDialogButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotDialogButtonClicked()) ); - tqsetSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, + setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed ) ); } @@ -1480,21 +1480,21 @@ KeyApprovalDialog::KeyApprovalDialog( const TQStringList& addresses, // calculate the optimal width for the dialog int dialogWidth = marginHint() + sv->frameWidth() - + bigvbox->tqsizeHint().width() - + sv->verticalScrollBar()->tqsizeHint().width() + + bigvbox->sizeHint().width() + + sv->verticalScrollBar()->sizeHint().width() + sv->frameWidth() + marginHint() + 2; // calculate the optimal height for the dialog int dialogHeight = marginHint() - + label->tqsizeHint().height() + + label->sizeHint().height() + topLayout->spacing() + sv->frameWidth() - + bigvbox->tqsizeHint().height() - + sv->horizontalScrollBar()->tqsizeHint().height() + + bigvbox->sizeHint().height() + + sv->horizontalScrollBar()->sizeHint().height() + sv->frameWidth() + topLayout->spacing() - + actionButton( KDialogBase::Cancel )->tqsizeHint().height() + + actionButton( KDialogBase::Cancel )->sizeHint().height() + marginHint() + 2; // don't make the dialog too large diff --git a/libkpimexchange/core/exchangeaccount.cpp b/libkpimexchange/core/exchangeaccount.cpp index acff34f12..23ea8b6f5 100644 --- a/libkpimexchange/core/exchangeaccount.cpp +++ b/libkpimexchange/core/exchangeaccount.cpp @@ -163,7 +163,7 @@ bool ExchangeAccount::authenticate( TQWidget *window ) bool ExchangeAccount::authenticate() { long windowId; - TQWidgetList *widgets = TQApplication::tqtopLevelWidgets(); + TQWidgetList *widgets = TQApplication::topLevelWidgets(); if ( widgets->isEmpty() ) windowId = 0; else diff --git a/libkpimidentities/identity.cpp b/libkpimidentities/identity.cpp index c7bd624cc..6eb33669a 100644 --- a/libkpimidentities/identity.cpp +++ b/libkpimidentities/identity.cpp @@ -143,16 +143,16 @@ TQString Signature::withSeparator( bool * ok ) const } if ( ok ) *ok = true; if ( signature.isEmpty() ) return signature; // don't add a separator in this case - if ( signature.startsWith( TQString::tqfromLatin1("-- \n") ) ) + if ( signature.startsWith( TQString::fromLatin1("-- \n") ) ) // already have signature separator at start of sig: - return TQString::tqfromLatin1("\n") += signature; - else if ( signature.find( TQString::tqfromLatin1("\n-- \n") ) != -1 ) + return TQString::fromLatin1("\n") += signature; + else if ( signature.find( TQString::fromLatin1("\n-- \n") ) != -1 ) // already have signature separator inside sig; don't prepend '\n' // to improve abusing signatures as templates: return signature; else // need to prepend one: - return TQString::tqfromLatin1("\n-- \n") + signature; + return TQString::fromLatin1("\n-- \n") + signature; } diff --git a/libkpimidentities/identitymanager.cpp b/libkpimidentities/identitymanager.cpp index 2c63d0534..363a135ae 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::tqfromLatin1("Identity #%1").tqarg(i) ); + KConfigGroup cg( mConfig, TQString::fromLatin1("Identity #%1").tqarg(i) ); (*it).writeConfig( &cg ); if ( (*it).isDefault() ) { // remember which one is default: diff --git a/libksieve/parser/lexer.cpp b/libksieve/parser/lexer.cpp index a38c61021..ec868ece4 100644 --- a/libksieve/parser/lexer.cpp +++ b/libksieve/parser/lexer.cpp @@ -476,9 +476,9 @@ namespace KSieve { const int identifierLength = mState.cursor - identifierStart; - // Can use the fast tqfromLatin1 here, since identifiers are always + // Can use the fast fromLatin1 here, since identifiers are always // in the us-ascii subset: - result += TQString::tqfromLatin1( identifierStart, identifierLength ); + result += TQString::fromLatin1( identifierStart, identifierLength ); if ( atEnd() || isDelim( *mState.cursor ) ) return true; diff --git a/libtdenetwork/gpgmepp/importresult.cpp b/libtdenetwork/gpgmepp/importresult.cpp index 3b4b713c7..d23c195e3 100644 --- a/libtdenetwork/gpgmepp/importresult.cpp +++ b/libtdenetwork/gpgmepp/importresult.cpp @@ -190,7 +190,7 @@ GpgME::Error GpgME::Import::error() const { return isNull() ? 0 : d->imports[idx]->result ; } -GpgME::Import::tqStatus GpgME::Import::status() const { +GpgME::Import::Status GpgME::Import::status() const { if ( isNull() ) return Unknown; unsigned int s = d->imports[idx]->status; @@ -200,5 +200,5 @@ GpgME::Import::tqStatus GpgME::Import::status() const { if ( s & GPGME_IMPORT_SIG ) result |= NewSignatures; if ( s & GPGME_IMPORT_SUBKEY ) result |= NewSubkeys; if ( s & GPGME_IMPORT_SECRET ) result |= ContainedSecretKey; - return static_cast<tqStatus>( result ); + return static_cast<Status>( result ); } diff --git a/libtdenetwork/gpgmepp/importresult.h b/libtdenetwork/gpgmepp/importresult.h index 61675a299..020ed0c4d 100644 --- a/libtdenetwork/gpgmepp/importresult.h +++ b/libtdenetwork/gpgmepp/importresult.h @@ -83,7 +83,7 @@ namespace GpgME { const char * fingerprint() const; Error error() const; - enum tqStatus { + enum Status { Unknown = 0x0, NewKey = 0x1, NewUserIDs = 0x2, @@ -91,7 +91,7 @@ namespace GpgME { NewSubkeys = 0x8, ContainedSecretKey = 0x10 }; - tqStatus status() const; + Status status() const; private: ImportResult::Private * d; diff --git a/libtdenetwork/gpgmepp/key.cpp b/libtdenetwork/gpgmepp/key.cpp index 13cd0a7ee..cf70aaf03 100644 --- a/libtdenetwork/gpgmepp/key.cpp +++ b/libtdenetwork/gpgmepp/key.cpp @@ -733,7 +733,7 @@ namespace GpgME { return d->sig ? d->sig->sig_class : 0 ; } - UserID::Signature::tqStatus UserID::Signature::status() const { + UserID::Signature::Status UserID::Signature::status() const { if ( !d->sig ) return GeneralError; diff --git a/libtdenetwork/gpgmepp/key.h b/libtdenetwork/gpgmepp/key.h index 15d09371e..f05d372db 100644 --- a/libtdenetwork/gpgmepp/key.h +++ b/libtdenetwork/gpgmepp/key.h @@ -235,9 +235,9 @@ namespace GpgME { unsigned int certClass() const; - enum tqStatus { NoError = 0, SigExpired, KeyExpired, + enum Status { NoError = 0, SigExpired, KeyExpired, BadSignature, NoPublicKey, GeneralError }; - tqStatus status() const; + Status status() const; const char * statusAsString() const; const char * policyURL() const; diff --git a/libtdenetwork/libgpgme-copy/assuan/assuan.h b/libtdenetwork/libgpgme-copy/assuan/assuan.h index 8d0a3960d..cdf0445ab 100644 --- a/libtdenetwork/libgpgme-copy/assuan/assuan.h +++ b/libtdenetwork/libgpgme-copy/assuan/assuan.h @@ -283,9 +283,9 @@ extern "C" #define ASSUAN_Inquire_Error 121 #define ASSUAN_Invalid_Option 122 #define ASSUAN_Invalid_Index 123 -#define ASSUAN_Unexpected_tqStatus 124 +#define ASSUAN_Unexpected_Status 124 #define ASSUAN_Unexpected_Data 125 -#define ASSUAN_Invalid_tqStatus 126 +#define ASSUAN_Invalid_Status 126 #define ASSUAN_Locale_Problem 127 #endif #define ASSUAN_Not_Confirmed 128 diff --git a/libtdenetwork/libgpgme-copy/gpgme/ChangeLog b/libtdenetwork/libgpgme-copy/gpgme/ChangeLog index 85fd28d30..cb2393938 100644 --- a/libtdenetwork/libgpgme-copy/gpgme/ChangeLog +++ b/libtdenetwork/libgpgme-copy/gpgme/ChangeLog @@ -1596,7 +1596,7 @@ (GpgmeSigNotation): Rename to gpgme_sig_notation_t. (GpgmeSignature): Rename to gpgme_signature_t. (GpgmeVerifyResult): Rename to gpgme_verify_result_t. - (GpgmeImporttqStatus): Rename to gpgme_import_status_t. + (GpgmeImportStatus): Rename to gpgme_import_status_t. (GpgmeImportResult): Rename to gpgme_import_result_t. (GpgmeGenKeyResult): Rename to gpgme_genkey_result_t. (GpgmeKeyListResult): Rename to gpgme_keylist_result_t. @@ -1901,7 +1901,7 @@ GPGME_Unsupported_Algorithm, GPGME_Sig_Expired, GPGME_Bad_Signature, GPGME_No_Public_Key added as new error codes. (struct _gpgme_import_status): New structure. - (GpgmeImporttqStatus): New type. + (GpgmeImportStatus): New type. (struct _gpgme_op_import_result): New structure. (GpgmeImportResult): New type. (gpgme_op_import_result): New function. @@ -2030,7 +2030,7 @@ (do_subsystem_inits): Do not call _gpgme_key_cache_init. * mkstatus: Strip trailing comma. - * gpgme.h (GpgmetqStatus): Pretty print. + * gpgme.h (GpgmeStatus): Pretty print. * gpgme.h (GpgmeError): Rename GPGME_No_Passphrase to GPGME_Bad_Passphrase. diff --git a/libtdenetwork/libgpgme-copy/gpgme/engine-gpgsm.c b/libtdenetwork/libgpgme-copy/gpgme/engine-gpgsm.c index 7ad8dc6f2..1d536440d 100644 --- a/libtdenetwork/libgpgme-copy/gpgme/engine-gpgsm.c +++ b/libtdenetwork/libgpgme-copy/gpgme/engine-gpgsm.c @@ -202,9 +202,9 @@ map_assuan_error (gpg_error_t err) case ASSUAN_Inquire_Unknown: case ASSUAN_Inquire_Error: case ASSUAN_Invalid_Option: - case ASSUAN_Unexpected_tqStatus: + case ASSUAN_Unexpected_Status: case ASSUAN_Unexpected_Data: - case ASSUAN_Invalid_tqStatus: + case ASSUAN_Invalid_Status: return gpg_error (GPG_ERR_ASSUAN); case ASSUAN_Invalid_Response: diff --git a/libtdenetwork/libgpgme-copy/gpgme/gpgme.h b/libtdenetwork/libgpgme-copy/gpgme/gpgme.h index f6f31ae2a..e2d53c751 100644 --- a/libtdenetwork/libgpgme-copy/gpgme/gpgme.h +++ b/libtdenetwork/libgpgme-copy/gpgme/gpgme.h @@ -1694,7 +1694,7 @@ typedef gpgme_encrypt_result_t GpgmeEncryptResult _GPGME_DEPRECATED; typedef gpgme_sig_notation_t GpgmeSigNotation _GPGME_DEPRECATED; typedef gpgme_signature_t GpgmeSignature _GPGME_DEPRECATED; typedef gpgme_verify_result_t GpgmeVerifyResult _GPGME_DEPRECATED; -typedef gpgme_import_status_t GpgmeImportqStatus _GPGME_DEPRECATED; +typedef gpgme_import_status_t GpgmeImporStatus _GPGME_DEPRECATED; typedef gpgme_import_result_t GpgmeImportResult _GPGME_DEPRECATED; typedef gpgme_genkey_result_t GpgmeGenKeyResult _GPGME_DEPRECATED; typedef gpgme_trust_item_t GpgmeTrustItem _GPGME_DEPRECATED; diff --git a/libtdepim/addresseeemailselection.cpp b/libtdepim/addresseeemailselection.cpp index dde8f7dd4..5a745b4f4 100644 --- a/libtdepim/addresseeemailselection.cpp +++ b/libtdepim/addresseeemailselection.cpp @@ -143,8 +143,8 @@ bool AddresseeEmailSelection::itemEnabled( const KABC::Addressee &addressee, uin bool AddresseeEmailSelection::itemMatches( const KABC::Addressee &addressee, uint index, const TQString &pattern ) const { - return addressee.formattedName().tqstartsWith( pattern, false ) || - email( addressee, index ).tqstartsWith( pattern, false ); + return addressee.formattedName().startsWith( pattern, false ) || + email( addressee, index ).startsWith( pattern, false ); } bool AddresseeEmailSelection::itemEquals( const KABC::Addressee &addressee, uint index, const TQString &pattern ) const @@ -172,13 +172,13 @@ bool AddresseeEmailSelection::distributionListMatches( const KABC::DistributionL const TQString &pattern ) const { // check whether the name of the distribution list matches the pattern or one of its entries. - bool ok = distributionList->name().tqstartsWith( pattern, false ); + bool ok = distributionList->name().startsWith( pattern, false ); KABC::DistributionList::Entry::List entries = distributionList->entries(); KABC::DistributionList::Entry::List::ConstIterator it; for ( it = entries.begin(); it != entries.end(); ++it ) { - ok = ok || (*it).addressee.formattedName().tqstartsWith( pattern, false ) || - (*it).email.tqstartsWith( pattern, false ); + ok = ok || (*it).addressee.formattedName().startsWith( pattern, false ) || + (*it).email.startsWith( pattern, false ); } return ok; diff --git a/libtdepim/addresseelineedit.cpp b/libtdepim/addresseelineedit.cpp index 687943ec5..1e827d80e 100644 --- a/libtdepim/addresseelineedit.cpp +++ b/libtdepim/addresseelineedit.cpp @@ -389,7 +389,7 @@ void AddresseeLineEdit::dropEvent( TQDropEvent *e ) } } else { // Let's see if this drop contains a comma separated list of emails - TQString dropData = TQString::fromUtf8( e->tqencodedData( "text/plain" ) ); + TQString dropData = TQString::fromUtf8( e->encodedData( "text/plain" ) ); TQStringList addrs = splitEmailAddrList( dropData ); if ( addrs.count() > 0 ) { setText( normalizeAddressesAndDecodeIDNs( dropData ) ); @@ -852,7 +852,7 @@ void AddresseeLineEdit::setCompletedItems( const TQStringList& items, bool autoS TQPoint oldPosOfItemUnderMouse; if ( itemUnderMouse ) { oldTextUnderMouse = itemUnderMouse->text(); - oldPosOfItemUnderMouse = completionBox->tqitemRect( itemUnderMouse ).topLeft(); + oldPosOfItemUnderMouse = completionBox->itemRect( itemUnderMouse ).topLeft(); } completionBox->setItems( items ); @@ -882,7 +882,7 @@ void AddresseeLineEdit::setCompletedItems( const TQStringList& items, bool autoS // if the mouse was over an item, before, but now that's elsewhere, // move the cursor, so folks don't accidently click the wrong item if ( newItemUnderMouse ) { - TQRect r = completionBox->tqitemRect( newItemUnderMouse ); + TQRect r = completionBox->itemRect( newItemUnderMouse ); TQPoint target = r.topLeft(); if ( oldPosOfItemUnderMouse != target ) { target.setX( target.x() + r.width()/2 ); diff --git a/libtdepim/addresseeselector.cpp b/libtdepim/addresseeselector.cpp index 792d57625..b3fbae4ca 100644 --- a/libtdepim/addresseeselector.cpp +++ b/libtdepim/addresseeselector.cpp @@ -303,7 +303,7 @@ void AddresseeSelector::initGUI() mRemoveMapper->setMapping( TQT_TQOBJECT(listView), i ); TQVBoxLayout *buttonLayout = new TQVBoxLayout( this ); - buttonLayout->tqsetAlignment( TQt::AlignBottom ); + buttonLayout->setAlignment( TQt::AlignBottom ); tqlayout->addLayout( buttonLayout, row, 1 ); // move button diff --git a/libtdepim/addresseeview.cpp b/libtdepim/addresseeview.cpp index 15c7215ed..23f01eb5e 100644 --- a/libtdepim/addresseeview.cpp +++ b/libtdepim/addresseeview.cpp @@ -161,17 +161,17 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr // the global background color). // TQString backgroundColor = KGlobalSettings::alternateBackgroundColor().name(); - TQString cellStyle = TQString::tqfromLatin1( + TQString cellStyle = TQString::fromLatin1( "style=\"" "padding-right: 2px; " "border-right: #000 dashed 1px; " "background: %1;\"").tqarg(backgroundColor); TQString backgroundColor2 = KGlobalSettings::baseColor().name(); - TQString cellStyle2 = TQString::tqfromLatin1( + TQString cellStyle2 = TQString::fromLatin1( "style=\"" "padding-left: 2px; " "background: %1;\"").tqarg(backgroundColor2); - TQString tableStyle = TQString::tqfromLatin1( + TQString tableStyle = TQString::fromLatin1( "style=\"" "border: solid 1px; " "margin: 0em;\""); @@ -179,17 +179,17 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr // We'll be building a table to display the vCard in. // Each row of the table will be built using this string for its HTML. // - TQString rowFmtStr = TQString::tqfromLatin1( + TQString rowFmtStr = TQString::fromLatin1( "<tr>" "<td align=\"right\" valign=\"top\" width=\"30%\" "); // Tag unclosed rowFmtStr.append( cellStyle ); - rowFmtStr.append( TQString::tqfromLatin1( + rowFmtStr.append( TQString::fromLatin1( ">" // Close tag "<b>%1</b>" "</td>" "<td align=\"left\" valign=\"top\" width=\"70%\" ") ); // Tag unclosed rowFmtStr.append( cellStyle2 ); - rowFmtStr.append( TQString::tqfromLatin1( + rowFmtStr.append( TQString::fromLatin1( ">" // Close tag "%2" "</td>" @@ -228,9 +228,9 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr TQString url; if ( (*phoneIt).type() & KABC::PhoneNumber::Fax ) - url = TQString::tqfromLatin1( "fax:" ) + number; + url = TQString::fromLatin1( "fax:" ) + number; else - url = TQString::tqfromLatin1( "phone:" ) + number; + url = TQString::fromLatin1( "phone:" ) + number; if ( linkMask & PhoneLinks ) { TQString smsURL; @@ -239,7 +239,7 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr dynamicPart += rowFmtStr .tqarg( (*phoneIt).typeLabel().replace( " ", " " ) ) - .tqarg( TQString::tqfromLatin1( "<a href=\"%1\">%2</a>%3" ).tqarg( url ).tqarg( number ).tqarg( smsURL ) ); + .tqarg( TQString::fromLatin1( "<a href=\"%1\">%2</a>%3" ).tqarg( url ).tqarg( number ).tqarg( smsURL ) ); } else { dynamicPart += rowFmtStr .tqarg( (*phoneIt).typeLabel().replace( " ", " " ) ) @@ -258,7 +258,7 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr if ( linkMask & EmailLinks ) { dynamicPart += rowFmtStr.tqarg( type ) - .tqarg( TQString::tqfromLatin1( "<a href=\"mailto:%1\">%2</a>" ) + .tqarg( TQString::fromLatin1( "<a href=\"mailto:%1\">%2</a>" ) .tqarg( fullEmail, TQStyleSheet::escape( *emailIt ) ) ); } else { dynamicPart += rowFmtStr.tqarg( type ).tqarg( *emailIt ); @@ -393,22 +393,22 @@ 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::tqfromLatin1( "im_status_%1_image").tqarg( addr.uid() ); + imgSrc = TQString::fromLatin1( "im_status_%1_image").tqarg( addr.uid() ); TQMimeSourceFactory::defaultFactory()->setPixmap( imgSrc, proxy->presenceIcon( addr.uid() ) ); } else imgSrc = pixmapAsDataUrl( proxy->presenceIcon( addr.uid() ) ); // make the status a link, if required - TQString imtqStatus; + TQString imStatus; if ( linkMask & IMLinks ) - imtqStatus = TQString::tqfromLatin1( "<a href=\"im:\"><img src=\"%1\"> (%2)</a>" ); + imStatus = TQString::fromLatin1( "<a href=\"im:\"><img src=\"%1\"> (%2)</a>" ); else - imtqStatus = TQString::tqfromLatin1( "<img src=\"%1\"> (%2)" ); + imStatus = TQString::fromLatin1( "<img src=\"%1\"> (%2)" ); // append our status to the rest of the dynamic part of the addressee dynamicPart += rowFmtStr .tqarg( i18n( "Presence" ) ) - .tqarg( imtqStatus + .tqarg( imStatus .tqarg( imgSrc ) .tqarg( proxy->presenceString( addr.uid() ) ) ); @@ -421,51 +421,51 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr // do it this way to avoid cases where the substituted string // contains %1 and the like. // - TQString strAddr = TQString::tqfromLatin1( + TQString strAddr = TQString::fromLatin1( "<div align=\"center\">" "<table cellpadding=\"1\" cellspacing=\"0\" %1>" "<tr>").tqarg(tableStyle); - strAddr.append( TQString::tqfromLatin1( + strAddr.append( TQString::fromLatin1( "<td align=\"right\" valign=\"top\" width=\"30%\" rowspan=\"3\" %2>") .tqarg( cellStyle ) ); - strAddr.append( TQString::tqfromLatin1( + strAddr.append( TQString::fromLatin1( "<img src=\"%1\" width=\"50\" vspace=\"1\">" // image "</td>") .tqarg( image ) ); - strAddr.append( TQString::tqfromLatin1( + strAddr.append( TQString::fromLatin1( "<td align=\"left\" width=\"70%\" %2>") .tqarg( cellStyle2 ) ); - strAddr.append( TQString::tqfromLatin1( + strAddr.append( TQString::fromLatin1( "<font size=\"+2\"><b>%2</b></font></td>" // name "</tr>") .tqarg( name ) ); - strAddr.append( TQString::tqfromLatin1( + strAddr.append( TQString::fromLatin1( "<tr>" "<td align=\"left\" width=\"70%\" %2>") .tqarg( cellStyle2 ) ); - strAddr.append( TQString::tqfromLatin1( + strAddr.append( TQString::fromLatin1( "%3</td>" // role "</tr>") .tqarg( role ) ); - strAddr.append( TQString::tqfromLatin1( + strAddr.append( TQString::fromLatin1( "<tr>" "<td align=\"left\" width=\"70%\" %2>") .tqarg( cellStyle2 ) ); - strAddr.append( TQString::tqfromLatin1( + strAddr.append( TQString::fromLatin1( "%4</td>" // organization "</tr>") .tqarg( organization ) ); - strAddr.append( TQString::tqfromLatin1( + strAddr.append( TQString::fromLatin1( "<tr><td %2>") .tqarg( cellStyle ) ); - strAddr.append( TQString::tqfromLatin1( + strAddr.append( TQString::fromLatin1( " </td><td %2> </td></tr>") .tqarg( cellStyle2 ) ); strAddr.append( dynamicPart ); strAddr.append( notes ); strAddr.append( customData ); - strAddr.append( TQString::tqfromLatin1( "</table></div>\n" ) ); + strAddr.append( TQString::fromLatin1( "</table></div>\n" ) ); if ( addr.resource() ) { TQString addrBookName = addr.resource()->resourceName(); @@ -526,7 +526,7 @@ void AddresseeView::updateView() TQString strAddr = vCardAsHTML( mAddressee, mKIMProxy, (LinkMask)mLinkMask, true, (FieldMask)fieldMask ); - strAddr = TQString::tqfromLatin1( + strAddr = TQString::fromLatin1( "<html>" "<body text=\"%1\" bgcolor=\"%2\">" // text and background color "%3" // dynamic part diff --git a/libtdepim/addresspicker.ui b/libtdepim/addresspicker.ui index fc88d52a0..9dd43bc0a 100644 --- a/libtdepim/addresspicker.ui +++ b/libtdepim/addresspicker.ui @@ -82,7 +82,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -132,7 +132,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -160,7 +160,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/libtdepim/broadcaststatus.cpp b/libtdepim/broadcaststatus.cpp index 1c1613795..f87503f97 100644 --- a/libtdepim/broadcaststatus.cpp +++ b/libtdepim/broadcaststatus.cpp @@ -96,7 +96,7 @@ void BroadcastStatus::seStatusMsgTransmissionCompleted( int numMessages, seStatusMsgWithTimestamp( statusMsg ); if ( item ) - item->setqStatus( statusMsg ); + item->seStatus( statusMsg ); } void BroadcastStatus::seStatusMsgTransmissionCompleted( const TQString& account, @@ -144,7 +144,7 @@ void BroadcastStatus::seStatusMsgTransmissionCompleted( const TQString& account, seStatusMsgWithTimestamp( statusMsg ); if ( item ) - item->setqStatus( statusMsg ); + item->seStatus( statusMsg ); } void BroadcastStatus::setTransienStatusMsg( const TQString& msg ) diff --git a/libtdepim/categoryeditdialog_base.ui b/libtdepim/categoryeditdialog_base.ui index 11cd98740..39d69dc7d 100644 --- a/libtdepim/categoryeditdialog_base.ui +++ b/libtdepim/categoryeditdialog_base.ui @@ -86,7 +86,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/libtdepim/categoryselectdialog_base.ui b/libtdepim/categoryselectdialog_base.ui index 1e45bd468..b708e8538 100644 --- a/libtdepim/categoryselectdialog_base.ui +++ b/libtdepim/categoryselectdialog_base.ui @@ -73,7 +73,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/libtdepim/csshelper.cpp b/libtdepim/csshelper.cpp index 05f20e390..379eb8ea0 100644 --- a/libtdepim/csshelper.cpp +++ b/libtdepim/csshelper.cpp @@ -328,7 +328,7 @@ namespace KPIM { if ( mQuoteFont[i].bold() ) quoteCSS += " font-weight: bold ! important;\n"; if ( mShrinkQuotes ) - quoteCSS += " font-size: " + TQString::tqfromLatin1( quoteFontSizes[i] ) + quoteCSS += " font-size: " + TQString::fromLatin1( quoteFontSizes[i] ) + "% ! important;\n"; quoteCSS += "}\n\n"; } diff --git a/libtdepim/designerfields.cpp b/libtdepim/designerfields.cpp index 1a07655f7..50c05593e 100644 --- a/libtdepim/designerfields.cpp +++ b/libtdepim/designerfields.cpp @@ -154,13 +154,13 @@ void DesignerFields::load( DesignerFields::Storage *storage ) wdg->setChecked( false ); } else if ( widIt.data()->inherits( TQDATETIMEEDIT_OBJECT_NAME_STRING ) ) { TQDateTimeEdit *wdg = static_cast<TQDateTimeEdit*>( widIt.data() ); - wdg->setDateTime( TQDateTime::tqcurrentDateTime() ); + wdg->setDateTime( TQDateTime::currentDateTime() ); } else if ( widIt.data()->inherits( "KDateTimeWidget" ) ) { KDateTimeWidget *wdg = static_cast<KDateTimeWidget*>( widIt.data() ); - wdg->setDateTime( TQDateTime::tqcurrentDateTime() ); + wdg->setDateTime( TQDateTime::currentDateTime() ); } else if ( widIt.data()->inherits( "KDatePicker" ) ) { KDatePicker *wdg = static_cast<KDatePicker*>( widIt.data() ); - wdg->setDate( TQDate::tqcurrentDate() ); + wdg->setDate( TQDate::currentDate() ); } else if ( widIt.data()->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) { TQComboBox *wdg = static_cast<TQComboBox*>( widIt.data() ); wdg->setCurrentItem( 0 ); diff --git a/libtdepim/kcmdesignerfields.cpp b/libtdepim/kcmdesignerfields.cpp index 870d89ce2..5f717b7c1 100644 --- a/libtdepim/kcmdesignerfields.cpp +++ b/libtdepim/kcmdesignerfields.cpp @@ -323,7 +323,7 @@ void KCMDesignerFields::initGUI() hbox->addWidget( activeLabel ); // ### why is this needed? Looks like a KActiveLabel bug... - activeLabel->tqsetSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Maximum ); + activeLabel->setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Maximum ); hbox->addStretch( 1 ); diff --git a/libtdepim/kdateedit.cpp b/libtdepim/kdateedit.cpp index 44c4e696a..df2b98c94 100644 --- a/libtdepim/kdateedit.cpp +++ b/libtdepim/kdateedit.cpp @@ -72,13 +72,13 @@ KDateEdit::KDateEdit( TQWidget *parent, const char *name ) // need at least one entry for popup to work setMaxCount( 1 ); - mDate = TQDate::tqcurrentDate(); + mDate = TQDate::currentDate(); TQString today = KGlobal::locale()->formatDate( mDate, true ); insertItem( today ); setCurrentItem( 0 ); changeItem( today, 0 ); - setMinimumSize( tqsizeHint() ); + setMinimumSize( sizeHint() ); connect( lineEdit(), TQT_SIGNAL( returnPressed() ), this, TQT_SLOT( lineEnterPressed() ) ); @@ -138,13 +138,13 @@ void KDateEdit::popup() TQPoint popupPoint = mapToGlobal( TQPoint( 0,0 ) ); - int dateFrameHeight = mPopup->tqsizeHint().height(); + int dateFrameHeight = mPopup->sizeHint().height(); if ( popupPoint.y() + height() + dateFrameHeight > desk.bottom() ) popupPoint.setY( popupPoint.y() - dateFrameHeight ); else popupPoint.setY( popupPoint.y() + height() ); - int dateFrameWidth = mPopup->tqsizeHint().width(); + int dateFrameWidth = mPopup->sizeHint().width(); if ( popupPoint.x() + dateFrameWidth > desk.right() ) popupPoint.setX( desk.right() - dateFrameWidth ); @@ -157,7 +157,7 @@ void KDateEdit::popup() if ( mDate.isValid() ) mPopup->setDate( mDate ); else - mPopup->setDate( TQDate::tqcurrentDate() ); + mPopup->setDate( TQDate::currentDate() ); mPopup->popup( popupPoint ); @@ -215,7 +215,7 @@ TQDate KDateEdit::parseDate( bool *replaced ) const if ( text.isEmpty() ) result = TQDate(); else if ( mKeywordMap.contains( text.lower() ) ) { - TQDate today = TQDate::tqcurrentDate(); + TQDate today = TQDate::currentDate(); int i = mKeywordMap[ text.lower() ]; if ( i >= 100 ) { /* A day name has been entered. Convert to offset from today. diff --git a/libtdepim/kdatepickerpopup.cpp b/libtdepim/kdatepickerpopup.cpp index 998c44e4a..f6e7031e0 100644 --- a/libtdepim/kdatepickerpopup.cpp +++ b/libtdepim/kdatepickerpopup.cpp @@ -97,12 +97,12 @@ void KDatePickerPopup::slotDateChanged( TQDate date ) void KDatePickerPopup::slotToday() { - emit dateChanged( TQDate::tqcurrentDate() ); + emit dateChanged( TQDate::currentDate() ); } void KDatePickerPopup::slotTomorrow() { - emit dateChanged( TQDate::tqcurrentDate().addDays( 1 ) ); + emit dateChanged( TQDate::currentDate().addDays( 1 ) ); } void KDatePickerPopup::slotNoDate() @@ -112,12 +112,12 @@ void KDatePickerPopup::slotNoDate() void KDatePickerPopup::slotNextWeek() { - emit dateChanged( TQDate::tqcurrentDate().addDays( 7 ) ); + emit dateChanged( TQDate::currentDate().addDays( 7 ) ); } void KDatePickerPopup::slotNextMonth() { - emit dateChanged( TQDate::tqcurrentDate().addMonths( 1 ) ); + emit dateChanged( TQDate::currentDate().addMonths( 1 ) ); } #include "kdatepickerpopup.moc" diff --git a/libtdepim/kdatepickerpopup.h b/libtdepim/kdatepickerpopup.h index 44dc7c668..7bcfea3eb 100644 --- a/libtdepim/kdatepickerpopup.h +++ b/libtdepim/kdatepickerpopup.h @@ -57,7 +57,7 @@ class KDE_EXPORT KDatePickerPopup: public TQPopupMenu @param parent The object's parent. @param name The object's name. */ - KDatePickerPopup( int items = DatePicker, const TQDate &date = TQDate::tqcurrentDate(), + KDatePickerPopup( int items = DatePicker, const TQDate &date = TQDate::currentDate(), TQWidget *parent = 0, const char *name = 0 ); /** diff --git a/libtdepim/kfoldertree.cpp b/libtdepim/kfoldertree.cpp index 64859199a..de29d6a65 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::tqfromLatin1(" + %1").tqarg( KIO::convertSize( recursiveSize - mSize ) ); + size += TQString::fromLatin1(" + %1").tqarg( KIO::convertSize( recursiveSize - mSize ) ); else size = KIO::convertSize( recursiveSize ); } @@ -391,9 +391,9 @@ void KFolderTree::setStyleDependantFrameWidth() // set the width of the frame to a reasonable value for the current GUI style int frameWidth; if( tqstyle().isA("KeramikStyle") ) - frameWidth = tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth ) - 1; + frameWidth = tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth ) - 1; else - frameWidth = tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth ); + frameWidth = tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth ); if ( frameWidth < 0 ) frameWidth = 0; if ( frameWidth != lineWidth() ) diff --git a/libtdepim/kfoldertree.h b/libtdepim/kfoldertree.h index 5ee255731..89c0e6772 100644 --- a/libtdepim/kfoldertree.h +++ b/libtdepim/kfoldertree.h @@ -61,7 +61,7 @@ struct KPaintInfo { showTodo(false), showSpamHam(false), showWatchedIgnored(false), - showtqStatus(false), + showStatus(false), showSigned(false), showCrypto(false), showReceiver(false), @@ -108,7 +108,7 @@ struct KPaintInfo { bool showTodo; bool showSpamHam; bool showWatchedIgnored; - bool showtqStatus; + bool showStatus; bool showSigned; bool showCrypto; bool showReceiver; diff --git a/libtdepim/komposer/core/pluginmanager.cpp b/libtdepim/komposer/core/pluginmanager.cpp index dcfea6f4b..58cffa13d 100644 --- a/libtdepim/komposer/core/pluginmanager.cpp +++ b/libtdepim/komposer/core/pluginmanager.cpp @@ -82,8 +82,8 @@ PluginManager::PluginManager( TQObject *parent ) this, TQT_SLOT( loadAllPlugins() ) ); d->plugins = KPluginInfo::fromServices( - KTrader::self()->query( TQString::tqfromLatin1( "Komposer/Plugin" ), - TQString::tqfromLatin1( "[X-Komposer-Version] == 1" ) ) ); + KTrader::self()->query( TQString::fromLatin1( "Komposer/Plugin" ), + TQString::fromLatin1( "[X-Komposer-Version] == 1" ) ) ); } PluginManager::~PluginManager() @@ -205,7 +205,7 @@ PluginManager::slotShutdownTimeout() kdWarning() << k_funcinfo << "Some plugins didn't shutdown in time!" << endl << "Remaining plugins: " - << remaining.join( TQString::tqfromLatin1( ", " ) ) << endl + << remaining.join( TQString::fromLatin1( ", " ) ) << endl << "Forcing Komposer shutdown now." << endl; #endif @@ -229,18 +229,18 @@ PluginManager::loadAllPlugins() d->config = KSharedConfig::openConfig( "komposerrc" ); TQMap<TQString, TQString> entries = d->config->entryMap( - TQString::tqfromLatin1( "Plugins" ) ); + TQString::fromLatin1( "Plugins" ) ); TQMap<TQString, TQString>::Iterator it; for ( it = entries.begin(); it != entries.end(); ++it ) { TQString key = it.key(); - if ( key.endsWith( TQString::tqfromLatin1( "Enabled" ) ) ) + if ( key.endsWith( TQString::fromLatin1( "Enabled" ) ) ) { key.setLength( key.length() - 7 ); //kdDebug() << k_funcinfo << "Set " << key << " to " << it.data() << endl; - if ( it.data() == TQString::tqfromLatin1( "true" ) ) + if ( it.data() == TQString::fromLatin1( "true" ) ) { if ( !plugin( key ) ) d->pluginsToLoad.push( key ); @@ -310,8 +310,8 @@ PluginManager::loadPluginInternal( const TQString &pluginId ) int error = 0; Plugin *plugin = KParts::ComponentFactory::createInstanceFromQuery<Komposer::Plugin>( - TQString::tqfromLatin1( "Komposer/Plugin" ), - TQString::tqfromLatin1( "[X-KDE-PluginInfo-Name]=='%1'" ).tqarg( pluginId ), + TQString::fromLatin1( "Komposer/Plugin" ), + TQString::fromLatin1( "[X-KDE-PluginInfo-Name]=='%1'" ).tqarg( pluginId ), this, 0, TQStringList(), &error ); if ( plugin ) { @@ -424,7 +424,7 @@ PluginManager::pluginName( const Plugin *plugin ) const return it.key()->name(); } - return TQString::tqfromLatin1( "Unknown" ); + return TQString::fromLatin1( "Unknown" ); } TQString @@ -437,7 +437,7 @@ PluginManager::pluginId( const Plugin *plugin ) const return it.key()->pluginName(); } - return TQString::tqfromLatin1( "unknown" ); + return TQString::fromLatin1( "unknown" ); } TQString @@ -450,7 +450,7 @@ PluginManager::pluginIcon( const Plugin *plugin ) const return it.key()->icon(); } - return TQString::tqfromLatin1( "Unknown" ); + return TQString::fromLatin1( "Unknown" ); } KPluginInfo* @@ -478,7 +478,7 @@ PluginManager::setPluginEnabled( const TQString &pluginId, bool enabled /* = tru if ( !infoForPluginId( pluginId ) ) return false; - d->config->writeEntry( pluginId + TQString::tqfromLatin1( "Enabled" ), enabled ); + d->config->writeEntry( pluginId + TQString::fromLatin1( "Enabled" ), enabled ); d->config->sync(); return true; diff --git a/libtdepim/komposer/core/prefsmodule.cpp b/libtdepim/komposer/core/prefsmodule.cpp index 77e1c264b..4f9a081a8 100644 --- a/libtdepim/komposer/core/prefsmodule.cpp +++ b/libtdepim/komposer/core/prefsmodule.cpp @@ -76,7 +76,7 @@ EditorSelection::EditorSelection( const TQString &text, TQString &reference, { m_box = new TQGroupBox( 0, TQt::Vertical, text, parent ); TQVBoxLayout *boxLayout = new TQVBoxLayout( m_box->tqlayout() ); - boxLayout->tqsetAlignment( TQt::AlignTop ); + boxLayout->setAlignment( TQt::AlignTop ); m_editorsCombo = new KComboBox( m_box ); boxLayout->addWidget( m_editorsCombo ); @@ -101,11 +101,11 @@ EditorSelection::readConfig() m_editorsCombo->clear(); KTrader::OfferList editors = KTrader::self()->query( - TQString::tqfromLatin1( "Komposer/Editor" ) ); + TQString::fromLatin1( "Komposer/Editor" ) ); KTrader::OfferList::ConstIterator it; int i = 0; for ( it = editors.begin(); it != editors.end(); ++it, ++i ) { - if ( !(*it)->hasServiceType( TQString::tqfromLatin1( "Komposer/Editor" ) ) ) + if ( !(*it)->hasServiceType( TQString::fromLatin1( "Komposer/Editor" ) ) ) continue; TQString name = (*it)->property( "X-KDE-KomposerIdentifier" ).toString(); diff --git a/libtdepim/komposer/plugins/default/defaulteditor.cpp b/libtdepim/komposer/plugins/default/defaulteditor.cpp index 27018ce5a..347db891c 100644 --- a/libtdepim/komposer/plugins/default/defaulteditor.cpp +++ b/libtdepim/komposer/plugins/default/defaulteditor.cpp @@ -288,28 +288,28 @@ void DefaultEditor::setAlignLeft( bool yes ) { if ( yes ) - m_textEdit->tqsetAlignment( AlignLeft ); + m_textEdit->setAlignment( AlignLeft ); } void DefaultEditor::setAlignRight( bool yes ) { if ( yes ) - m_textEdit->tqsetAlignment( AlignRight ); + m_textEdit->setAlignment( AlignRight ); } void DefaultEditor::setAlignCenter( bool yes ) { if ( yes ) - m_textEdit->tqsetAlignment( AlignCenter ); + m_textEdit->setAlignment( AlignCenter ); } void DefaultEditor::setAlignJustify( bool yes ) { if ( yes ) - m_textEdit->tqsetAlignment( AlignJustify ); + m_textEdit->setAlignment( AlignJustify ); } // diff --git a/libtdepim/kprefsdialog.cpp b/libtdepim/kprefsdialog.cpp index 466691083..816028726 100644 --- a/libtdepim/kprefsdialog.cpp +++ b/libtdepim/kprefsdialog.cpp @@ -376,7 +376,7 @@ KPrefsWidDate::KPrefsWidDate( KConfigSkeleton::ItemDateTime *item, void KPrefsWidDate::readConfig() { - mDateEdit->setDate( mItem->value().date().isValid() ? mItem->value().date() : TQDate::tqcurrentDate() ); + mDateEdit->setDate( mItem->value().date().isValid() ? mItem->value().date() : TQDate::currentDate() ); } void KPrefsWidDate::writeConfig() diff --git a/libtdepim/krsqueezedtextlabel.cpp b/libtdepim/krsqueezedtextlabel.cpp index 968b56d20..ad674aa84 100644 --- a/libtdepim/krsqueezedtextlabel.cpp +++ b/libtdepim/krsqueezedtextlabel.cpp @@ -24,30 +24,30 @@ KRSqueezedTextLabel::KRSqueezedTextLabel( const TQString &text , TQWidget *parent, const char *name ) : TQLabel ( parent, name ) { - tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); + setSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); fullText = text; squeezeTextToLabel(); } KRSqueezedTextLabel::KRSqueezedTextLabel( TQWidget *parent, const char *name ) : TQLabel ( parent, name ) { - tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); + setSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); } void KRSqueezedTextLabel::resizeEvent( TQResizeEvent * ) { squeezeTextToLabel(); } -TQSize KRSqueezedTextLabel::tqminimumSizeHint() const +TQSize KRSqueezedTextLabel::minimumSizeHint() const { - TQSize sh = TQLabel::tqminimumSizeHint(); + TQSize sh = TQLabel::minimumSizeHint(); sh.setWidth(-1); return sh; } -TQSize KRSqueezedTextLabel::tqsizeHint() const +TQSize KRSqueezedTextLabel::sizeHint() const { - return TQSize(contentsRect().width(), TQLabel::tqsizeHint().height()); + return TQSize(contentsRect().width(), TQLabel::sizeHint().height()); } void KRSqueezedTextLabel::setText( const TQString &text ) { @@ -75,11 +75,11 @@ void KRSqueezedTextLabel::squeezeTextToLabel() { } } -void KRSqueezedTextLabel::tqsetAlignment( int tqalignment ) +void KRSqueezedTextLabel::setAlignment( int tqalignment ) { // save fullText and restore it TQString tmpFull(fullText); - TQLabel::tqsetAlignment(tqalignment); + TQLabel::setAlignment(tqalignment); fullText = tmpFull; } diff --git a/libtdepim/krsqueezedtextlabel.h b/libtdepim/krsqueezedtextlabel.h index 3e216e72d..e48f565d9 100644 --- a/libtdepim/krsqueezedtextlabel.h +++ b/libtdepim/krsqueezedtextlabel.h @@ -49,12 +49,12 @@ public: KRSqueezedTextLabel( TQWidget *parent, const char *name = 0 ); KRSqueezedTextLabel( const TQString &text, TQWidget *parent, const char *name = 0 ); - virtual TQSize tqminimumSizeHint() const; - virtual TQSize tqsizeHint() const; + virtual TQSize minimumSizeHint() const; + virtual TQSize sizeHint() const; /** * Overridden for internal reasons; the API remains unaffected. */ - virtual void tqsetAlignment( int ); + virtual void setAlignment( int ); public slots: void setText( const TQString & ); diff --git a/libtdepim/kscoring.cpp b/libtdepim/kscoring.cpp index cf02d88f4..e97523772 100644 --- a/libtdepim/kscoring.cpp +++ b/libtdepim/kscoring.cpp @@ -773,7 +773,7 @@ TQString KScoringRule::getExpireDateString() const bool KScoringRule::isExpired() const { - return (expires.isValid() && (expires < TQDate::tqcurrentDate())); + return (expires.isValid() && (expires < TQDate::currentDate())); } @@ -925,7 +925,7 @@ KScoringRule* KScoringManager::addRule(const ScorableArticle& a, TQString group, new KScoringExpression("From","CONTAINS", a.from(),"0")); if (score) rule->addAction(new ActionSetScore(score)); - rule->setExpireDate(TQDate::tqcurrentDate().addDays(30)); + rule->setExpireDate(TQDate::currentDate().addDays(30)); addRule(rule); KScoringEditor *edit = KScoringEditor::createEditor(this); edit->setRule(rule); diff --git a/libtdepim/kscoringeditor.cpp b/libtdepim/kscoringeditor.cpp index 6e520e983..18d3a0299 100644 --- a/libtdepim/kscoringeditor.cpp +++ b/libtdepim/kscoringeditor.cpp @@ -91,7 +91,7 @@ SingleConditionWidget::SingleConditionWidget(KScoringManager *m,TQWidget *p, con connect( regExpButton, TQT_SIGNAL( clicked() ), TQT_SLOT( showRegExpDialog() ) ); // occupy at much width as possible - tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Fixed)); + setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Fixed)); setFrameStyle(Box | Sunken); setLineWidth(1); } @@ -421,7 +421,7 @@ RuleEditWidget::RuleEditWidget(KScoringManager *m,TQWidget *p, const char *n) groupsBox = new KComboBox( false, groupB, "groupsBox" ); groupsBox->setDuplicatesEnabled(false); groupsBox->insertStringList(manager->getGroups()); - groupsBox->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed)); + groupsBox->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed)); groupL->addWidget( groupsBox, 3, 1 ); // expires @@ -508,7 +508,7 @@ void RuleEditWidget::slotEditRule(const TQString& ruleName) expireEdit->setEnabled(b); expireLabel->setEnabled(b); if (b) - expireEdit->setValue(TQDate::tqcurrentDate().daysTo(rule->getExpireDate())); + expireEdit->setValue(TQDate::currentDate().daysTo(rule->getExpireDate())); else expireEdit->setValue(30); if (rule->getLinkMode() == KScoringRule::AND) { @@ -546,7 +546,7 @@ void RuleEditWidget::updateRule(KScoringRule *rule) rule->setGroups(TQStringList::split(";",groups)); bool b = expireCheck->isChecked(); if (b) - rule->setExpireDate(TQDate::tqcurrentDate().addDays(expireEdit->value())); + rule->setExpireDate(TQDate::currentDate().addDays(expireEdit->value())); else rule->setExpireDate(TQDate()); actionEditor->updateRule(rule); @@ -655,7 +655,7 @@ RuleListWidget::RuleListWidget(KScoringManager *m, bool standalone, TQWidget *p, TQStringList l = m->getGroups(); filterBox->insertItem(i18n("<all groups>")); filterBox->insertStringList(l); - filterBox->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed)); + filterBox->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed)); connect(filterBox,TQT_SIGNAL(activated(const TQString&)), this,TQT_SLOT(slotGroupFilter(const TQString&))); slotGroupFilter(i18n("<all groups>")); @@ -881,7 +881,7 @@ KScoringEditor::KScoringEditor(KScoringManager* m, connect(ruleEditor, TQT_SIGNAL(shrink()), TQT_SLOT(slotShrink())); connect(this,TQT_SIGNAL(finished()),TQT_SLOT(slotFinished())); ruleLister->slotRuleSelected(0); - resize(550, tqsizeHint().height()); + resize(550, sizeHint().height()); } void KScoringEditor::setDirty() @@ -918,7 +918,7 @@ void KScoringEditor::slotDoShrink() { updateGeometry(); TQApplication::sendPostedEvents(); - resize(width(),tqsizeHint().height()); + resize(width(),sizeHint().height()); } void KScoringEditor::slotApply() @@ -996,7 +996,7 @@ void KScoringEditorWidgetDialog::slotDoShrink() { updateGeometry(); TQApplication::sendPostedEvents(); - resize(width(),tqsizeHint().height()); + resize(width(),sizeHint().height()); } //============================================================================ diff --git a/libtdepim/ksubscription.cpp b/libtdepim/ksubscription.cpp index b611e1260..e3c2ce4f4 100644 --- a/libtdepim/ksubscription.cpp +++ b/libtdepim/ksubscription.cpp @@ -32,7 +32,7 @@ KGroupInfo::KGroupInfo(const TQString &name, const TQString &description, bool newGroup, bool subscribed, - tqStatus status, TQString path) + Status status, TQString path) : name(name), description(description), newGroup(newGroup), subscribed(subscribed), status(status), path(path) diff --git a/libtdepim/ksubscription.h b/libtdepim/ksubscription.h index c819701d1..af8fd37f6 100644 --- a/libtdepim/ksubscription.h +++ b/libtdepim/ksubscription.h @@ -45,7 +45,7 @@ class KAccount; class KDE_EXPORT KGroupInfo { public: - enum tqStatus { + enum Status { unknown, readOnly, postingAllowed, @@ -54,11 +54,11 @@ class KDE_EXPORT KGroupInfo KGroupInfo( const TQString &name, const TQString &description = TQString(), bool newGroup = false, bool subscribed = false, - tqStatus status = unknown, TQString path = TQString() ); + Status status = unknown, TQString path = TQString() ); TQString name, description; bool newGroup, subscribed; - tqStatus status; + Status status; TQString path; bool operator== (const KGroupInfo &gi2); diff --git a/libtdepim/kvcarddrag.cpp b/libtdepim/kvcarddrag.cpp index 054a424e9..d8e83d898 100644 --- a/libtdepim/kvcarddrag.cpp +++ b/libtdepim/kvcarddrag.cpp @@ -68,7 +68,7 @@ bool KVCardDrag::decode( TQMimeSource *e, TQByteArray &content ) if ( !canDecode( e ) ) { return false; } - content = e->tqencodedData( vcard_mime_string ); + content = e->encodedData( vcard_mime_string ); return true; } #else @@ -77,7 +77,7 @@ bool KVCardDrag::decode( TQMimeSource *e, TQString &content ) if ( !canDecode( e ) ) { return false; } - content = TQString::fromUtf8( e->tqencodedData( vcard_mime_string ) ); + content = TQString::fromUtf8( e->encodedData( vcard_mime_string ) ); return true; } #endif @@ -88,9 +88,9 @@ bool KVCardDrag::decode( TQMimeSource *e, KABC::Addressee::List& addressees ) return false; } #if defined(KABC_VCARD_ENCODING_FIX) - addressees = KABC::VCardConverter().parseVCardsRaw( e->tqencodedData( vcard_mime_string ).data() ); + addressees = KABC::VCardConverter().parseVCardsRaw( e->encodedData( vcard_mime_string ).data() ); #else - addressees = KABC::VCardConverter().parseVCards( e->tqencodedData( vcard_mime_string ) ); + addressees = KABC::VCardConverter().parseVCards( e->encodedData( vcard_mime_string ) ); #endif return true; } diff --git a/libtdepim/ldapclient.cpp b/libtdepim/ldapclient.cpp index f8497f084..563728da3 100644 --- a/libtdepim/ldapclient.cpp +++ b/libtdepim/ldapclient.cpp @@ -49,7 +49,7 @@ static KStaticDeleter<KConfig> configDeleter; TQString LdapObject::toString() const { - TQString result = TQString::tqfromLatin1( "\ndn: %1\n" ).tqarg( dn ); + TQString result = TQString::fromLatin1( "\ndn: %1\n" ).tqarg( 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 ) { diff --git a/libtdepim/ldapsearchdialog.cpp b/libtdepim/ldapsearchdialog.cpp index ed1aa2933..0f991686c 100644 --- a/libtdepim/ldapsearchdialog.cpp +++ b/libtdepim/ldapsearchdialog.cpp @@ -160,10 +160,10 @@ LDAPSearchDialog::LDAPSearchDialog( TQWidget* parent, const char* name ) TQSize buttonSize; mSearchButton = new TQPushButton( i18n( "Stop" ), groupBox ); - buttonSize = mSearchButton->tqsizeHint(); + buttonSize = mSearchButton->sizeHint(); mSearchButton->setText( i18n( "Search" ) ); - if ( buttonSize.width() < mSearchButton->tqsizeHint().width() ) - buttonSize = mSearchButton->tqsizeHint(); + if ( buttonSize.width() < mSearchButton->sizeHint().width() ) + buttonSize = mSearchButton->sizeHint(); mSearchButton->setFixedWidth( buttonSize.width() ); mSearchButton->setDefault( true ); @@ -186,7 +186,7 @@ LDAPSearchDialog::LDAPSearchDialog( TQWidget* parent, const char* name ) mResultListView->setShowSortIndicator( true ); topLayout->addWidget( mResultListView ); - resize( TQSize( 600, 400).expandedTo( tqminimumSizeHint() ) ); + resize( TQSize( 600, 400).expandedTo( minimumSizeHint() ) ); setButtonText( User1, i18n( "Unselect All" ) ); setButtonText( User2, i18n( "Select All" ) ); diff --git a/libtdepim/linklocator.cpp b/libtdepim/linklocator.cpp index 399c5d3b3..25a5a6644 100644 --- a/libtdepim/linklocator.cpp +++ b/libtdepim/linklocator.cpp @@ -361,7 +361,7 @@ TQString LinkLocator::pngToDataUrl( const TQString & iconPath ) TQByteArray ba = pngFile.readAll(); pngFile.close(); - return TQString::tqfromLatin1("data:image/png;base64,%1") + return TQString::fromLatin1("data:image/png;base64,%1") .tqarg( KCodecs::base64Encode( ba ).data() ); } @@ -403,14 +403,14 @@ TQString LinkLocator::getEmoticon() #if KDE_IS_VERSION( 3, 3, 91 ) const TQString iconPath = locate( "emoticons", EmotIcons::theme() + - TQString::tqfromLatin1( "/" ) + - imageName + TQString::tqfromLatin1(".png") ); + TQString::fromLatin1( "/" ) + + imageName + TQString::fromLatin1(".png") ); #else const TQString iconPath = locate( "data", - TQString::tqfromLatin1( "kopete/pics/emoticons/" )+ + TQString::fromLatin1( "kopete/pics/emoticons/" )+ EmotIcons::theme() + - TQString::tqfromLatin1( "/" ) + - imageName + TQString::tqfromLatin1(".png") ); + TQString::fromLatin1( "/" ) + + imageName + TQString::fromLatin1(".png") ); #endif const TQString dataUrl = pngToDataUrl( iconPath ); diff --git a/libtdepim/maillistdrag.cpp b/libtdepim/maillistdrag.cpp index a9e2e9fa0..91cd1dca7 100644 --- a/libtdepim/maillistdrag.cpp +++ b/libtdepim/maillistdrag.cpp @@ -150,7 +150,7 @@ TQDataStream& operator>> ( TQDataStream &s, MailList &mailList ) bool MailListDrag::decode( TQDropEvent* e, MailList& mailList ) { - TQByteArray payload = e->tqencodedData( MailListDrag::format() ); + TQByteArray payload = e->encodedData( MailListDrag::format() ); TQDataStream buffer( payload, IO_ReadOnly ); if ( payload.size() ) { e->accept(); @@ -221,16 +221,16 @@ bool MailListDrag::provides(const char *mimeType) const return TQStoredDrag::provides(mimeType); } -TQByteArray MailListDrag::tqencodedData(const char *mimeType) const +TQByteArray MailListDrag::encodedData(const char *mimeType) const { if (TQCString(mimeType) != "message/rfc822") { - return TQStoredDrag::tqencodedData(mimeType); + return TQStoredDrag::encodedData(mimeType); } TQByteArray rc; if (_src) { MailList ml; - TQByteArray enc = TQStoredDrag::tqencodedData(format()); + TQByteArray enc = TQStoredDrag::encodedData(format()); decode(enc, ml); KProgressDialog *dlg = new KProgressDialog(0, 0, TQString(), i18n("Retrieving and storing messages..."), true); diff --git a/libtdepim/maillistdrag.h b/libtdepim/maillistdrag.h index 9ec1cba20..130ec29fb 100644 --- a/libtdepim/maillistdrag.h +++ b/libtdepim/maillistdrag.h @@ -103,7 +103,7 @@ public: bool provides(const char *mimeType) const; - TQByteArray tqencodedData(const char *) const; + TQByteArray encodedData(const char *) const; /* Reset the list of mail summaries */ void setMailList( MailList ); diff --git a/libtdepim/overlaywidget.cpp b/libtdepim/overlaywidget.cpp index ac05d84fd..338a6c428 100644 --- a/libtdepim/overlaywidget.cpp +++ b/libtdepim/overlaywidget.cpp @@ -51,9 +51,9 @@ void OverlayWidget::reposition() p.setX( mAlignWidget->width() - width() ); p.setY( -height() ); // Position in the toplevelwidget's coordinates - TQPoint pTopLevel = mAlignWidget->mapTo( tqtopLevelWidget(), p ); + TQPoint pTopLevel = mAlignWidget->mapTo( topLevelWidget(), p ); // Position in the widget's parentWidget coordinates - TQPoint pParent = parentWidget()->mapFrom( tqtopLevelWidget(), pTopLevel ); + TQPoint pParent = parentWidget()->mapFrom( topLevelWidget(), pTopLevel ); // Move 'this' to that position. move( pParent ); } diff --git a/libtdepim/progressdialog.cpp b/libtdepim/progressdialog.cpp index bd5b594c6..b5b6c6ce3 100644 --- a/libtdepim/progressdialog.cpp +++ b/libtdepim/progressdialog.cpp @@ -91,7 +91,7 @@ void TransactionItemView::resizeContents( int w, int h ) TQApplication::sendPostedEvents( 0, TQEvent::ChildInserted ); TQApplication::sendPostedEvents( 0, TQEvent::LayoutHint ); - TQSize sz = parentWidget()->tqsizeHint(); + TQSize sz = parentWidget()->sizeHint(); int currentWidth = parentWidget()->width(); // Don't resize to sz.width() every time when it only reduces a little bit if ( currentWidth < sz.width() || currentWidth > sz.width() + 100 ) @@ -99,19 +99,19 @@ void TransactionItemView::resizeContents( int w, int h ) parentWidget()->resize( currentWidth, sz.height() ); } -TQSize TransactionItemView::tqsizeHint() const +TQSize TransactionItemView::sizeHint() const { - return tqminimumSizeHint(); + return minimumSizeHint(); } -TQSize TransactionItemView::tqminimumSizeHint() const +TQSize TransactionItemView::minimumSizeHint() const { int f = 2 * frameWidth(); // Make room for a vertical scrollbar in all cases, to avoid a horizontal one - int vsbExt = verticalScrollBar()->tqsizeHint().width(); - int minw = tqtopLevelWidget()->width() / 3; - int maxh = tqtopLevelWidget()->height() / 2; - TQSize sz( mBigBox->tqminimumSizeHint() ); + int vsbExt = verticalScrollBar()->sizeHint().width(); + int minw = topLevelWidget()->width() / 3; + int maxh = topLevelWidget()->height() / 2; + TQSize sz( mBigBox->minimumSizeHint() ); sz.setWidth( TQMAX( sz.width(), minw ) + f + vsbExt ); sz.setHeight( TQMIN( sz.height(), maxh ) + f ); return sz; @@ -146,7 +146,7 @@ TransactionItem::TransactionItem( TQWidget* parent, { setSpacing( 2 ); setMargin( 2 ); - tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) ); + setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) ); mFrame = new TQFrame( this ); mFrame->setFrameShape( TQFrame::HLine ); @@ -160,8 +160,8 @@ TransactionItem::TransactionItem( TQWidget* parent, mItemLabel = new TQLabel( item->label(), h ); // always interpret the label text as RichText, but disable word wrapping mItemLabel->setTextFormat( TQt::RichText ); - mItemLabel->tqsetAlignment( TQt::AlignAuto | TQt::AlignVCenter | TQt::SingleLine ); - h->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) ); + mItemLabel->setAlignment( TQt::AlignAuto | TQt::AlignVCenter | TQt::SingleLine ); + h->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) ); mProgress = new TQProgressBar( 100, h ); mProgress->setProgress( item->progress() ); @@ -175,17 +175,17 @@ TransactionItem::TransactionItem( TQWidget* parent, h = new TQHBox( this ); h->setSpacing( 5 ); - h->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) ); + h->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) ); mSSLLabel = new SSLLabel( h ); - mSSLLabel->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); - mItemtqStatus = new TQLabel( item->status(), h ); + mSSLLabel->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); + mItemStatus = new TQLabel( item->status(), h ); // always interpret the status text as RichText, but disable word wrapping - mItemtqStatus->setTextFormat( TQt::RichText ); - mItemtqStatus->tqsetAlignment( TQt::AlignAuto | TQt::AlignVCenter | TQt::SingleLine ); - // richtext leads to tqsizeHint acting as if wrapping was enabled though, + mItemStatus->setTextFormat( TQt::RichText ); + mItemStatus->setAlignment( TQt::AlignAuto | TQt::AlignVCenter | TQt::SingleLine ); + // richtext leads to sizeHint acting as if wrapping was enabled though, // so make sure we only ever have the height of one line. - mItemtqStatus->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Ignored ) ); - mItemtqStatus->setFixedHeight( mItemLabel->tqsizeHint().height() ); + mItemStatus->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Ignored ) ); + mItemStatus->setFixedHeight( mItemLabel->sizeHint().height() ); setCrypto( item->usesCrypto() ); if( first ) hideHLine(); } @@ -209,9 +209,9 @@ void TransactionItem::setLabel( const TQString& label ) mItemLabel->setText( label ); } -void TransactionItem::setqStatus( const TQString& status ) +void TransactionItem::seStatus( const TQString& status ) { - mItemtqStatus->setText( status ); + mItemStatus->setText( status ); } void TransactionItem::setCrypto( bool on ) @@ -258,7 +258,7 @@ ProgressDialog::ProgressDialog( TQWidget* alignWidget, TQWidget* parent, const c TQVBox* rightBox = new TQVBox( this ); TQToolButton* pbClose = new TQToolButton( rightBox ); pbClose->setAutoRaise(true); - pbClose->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); + pbClose->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); pbClose->setFixedSize( 16, 16 ); pbClose->setIconSet( KGlobal::iconLoader()->loadIconSet( "fileclose", KIcon::Small, 14 ) ); TQToolTip::add( pbClose, i18n( "Hide detailed progress window" ) ); @@ -278,8 +278,8 @@ ProgressDialog::ProgressDialog( TQWidget* alignWidget, TQWidget* parent, const c this, TQT_SLOT( slotTransactionCompleted( KPIM::ProgressItem* ) ) ); connect ( pm, TQT_SIGNAL( progressItemProgress( KPIM::ProgressItem*, unsigned int ) ), this, TQT_SLOT( slotTransactionProgress( KPIM::ProgressItem*, unsigned int ) ) ); - connect ( pm, TQT_SIGNAL( progressItemtqStatus( KPIM::ProgressItem*, const TQString& ) ), - this, TQT_SLOT( slotTransactiontqStatus( KPIM::ProgressItem*, const TQString& ) ) ); + connect ( pm, TQT_SIGNAL( progressItemStatus( KPIM::ProgressItem*, const TQString& ) ), + this, TQT_SLOT( slotTransactionStatus( KPIM::ProgressItem*, const TQString& ) ) ); connect ( pm, TQT_SIGNAL( progressItemLabel( KPIM::ProgressItem*, const TQString& ) ), this, TQT_SLOT( slotTransactionLabel( KPIM::ProgressItem*, const TQString& ) ) ); connect ( pm, TQT_SIGNAL( progressItemUsesCrypto(KPIM::ProgressItem*, bool) ), @@ -353,12 +353,12 @@ void ProgressDialog::slotTransactionProgress( ProgressItem *item, } } -void ProgressDialog::slotTransactiontqStatus( ProgressItem *item, +void ProgressDialog::slotTransactionStatus( ProgressItem *item, const TQString& status ) { if ( mTransactionsToListviewItems.contains( item ) ) { TransactionItem *ti = mTransactionsToListviewItems[ item ]; - ti->setqStatus( status ); + ti->seStatus( status ); } } diff --git a/libtdepim/progressdialog.h b/libtdepim/progressdialog.h index b2511624e..e144e34eb 100644 --- a/libtdepim/progressdialog.h +++ b/libtdepim/progressdialog.h @@ -63,8 +63,8 @@ public: TransactionItem* addTransactionItem( ProgressItem *item, bool first ); - TQSize tqsizeHint() const; - TQSize tqminimumSizeHint() const; + TQSize sizeHint() const; + TQSize minimumSizeHint() const; public slots: void slotLayoutFirstItem(); @@ -90,7 +90,7 @@ public: void setProgress( int progress ); void setLabel( const TQString& ); - void setqStatus( const TQString& ); + void seStatus( const TQString& ); void setCrypto( bool ); void setTotalSteps( int totalSteps ); @@ -109,7 +109,7 @@ protected: TQProgressBar* mProgress; TQPushButton* mCancelButton; TQLabel* mItemLabel; - TQLabel* mItemtqStatus; + TQLabel* mItemStatus; TQFrame* mFrame; SSLLabel* mSSLLabel; ProgressItem* mItem; @@ -133,7 +133,7 @@ void slotTransactionAdded( KPIM::ProgressItem *item ); void slotTransactionCompleted( KPIM::ProgressItem *item ); void slotTransactionCanceled( KPIM::ProgressItem *item ); void slotTransactionProgress( KPIM::ProgressItem *item, unsigned int progress ); - void slotTransactiontqStatus( KPIM::ProgressItem *item, const TQString& ); + void slotTransactionStatus( KPIM::ProgressItem *item, const TQString& ); void slotTransactionLabel( KPIM::ProgressItem *item, const TQString& ); void slotTransactionUsesCrypto( KPIM::ProgressItem *item, bool ); void slotTransactionUsesBusyIndicator( KPIM::ProgressItem*, bool ); diff --git a/libtdepim/progressmanager.cpp b/libtdepim/progressmanager.cpp index 544b62cef..2c6e1a3cf 100644 --- a/libtdepim/progressmanager.cpp +++ b/libtdepim/progressmanager.cpp @@ -38,7 +38,7 @@ ProgressItem::ProgressItem( ProgressItem* parent, const TQString& id, const TQString& label, const TQString& status, bool canBeCanceled, bool usesCrypto ) - :mId( id ), mLabel( label ), mtqStatus( status ), mParent( parent ), + :mId( id ), mLabel( label ), mStatus( status ), mParent( parent ), mCanBeCanceled( canBeCanceled ), mProgress( 0 ), mTotal( 0 ), mCompleted( 0 ), mWaitingForKids( false ), mCanceled( false ), mUsesCrypto( usesCrypto ), mUsesBusyIndicator( false ) @@ -93,7 +93,7 @@ void ProgressItem::cancel() if ( kid->canBeCanceled() ) kid->cancel(); } - setqStatus( i18n( "Aborting..." ) ); + seStatus( i18n( "Aborting..." ) ); emit progressItemCanceled( this ); } @@ -111,10 +111,10 @@ void ProgressItem::setLabel( const TQString& v ) emit progressItemLabel( this, mLabel ); } -void ProgressItem::setqStatus( const TQString& v ) +void ProgressItem::seStatus( const TQString& v ) { - mtqStatus = v; - emit progressItemtqStatus( this, mtqStatus ); + mStatus = v; + emit progressItemStatus( this, mStatus ); } void ProgressItem::setUsesCrypto( bool v ) @@ -170,8 +170,8 @@ ProgressItem* ProgressManager::createProgressItemImpl( this, TQT_SIGNAL( progressItemAdded(KPIM::ProgressItem*) ) ); connect ( t, TQT_SIGNAL( progressItemCanceled(KPIM::ProgressItem*) ), this, TQT_SIGNAL( progressItemCanceled(KPIM::ProgressItem*) ) ); - connect ( t, TQT_SIGNAL( progressItemtqStatus(KPIM::ProgressItem*, const TQString&) ), - this, TQT_SIGNAL( progressItemtqStatus(KPIM::ProgressItem*, const TQString&) ) ); + connect ( t, TQT_SIGNAL( progressItemStatus(KPIM::ProgressItem*, const TQString&) ), + this, TQT_SIGNAL( progressItemStatus(KPIM::ProgressItem*, const TQString&) ) ); connect ( t, TQT_SIGNAL( progressItemLabel(KPIM::ProgressItem*, const TQString&) ), this, TQT_SIGNAL( progressItemLabel(KPIM::ProgressItem*, const TQString&) ) ); connect ( t, TQT_SIGNAL( progressItemUsesCrypto(KPIM::ProgressItem*, bool) ), diff --git a/libtdepim/progressmanager.h b/libtdepim/progressmanager.h index 2e4f4ee2a..bb8e864ad 100644 --- a/libtdepim/progressmanager.h +++ b/libtdepim/progressmanager.h @@ -70,13 +70,13 @@ class KDE_EXPORT ProgressItem : public TQObject /** * @return The string to be used for showing this item's current status. */ - const TQString& status() const { return mtqStatus; } + const TQString& status() const { return mStatus; } /** * Set the string to be used for showing this item's current status. * @p v will be interpreted as rich text, so it might have to be escaped. * @param v The status string. */ - void setqStatus( const TQString& v ); + void seStatus( 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 ); setqStatus( TQString() ); mCompleted = 0; } + void reset() { setProgress( 0 ); seStatus( TQString() ); mCompleted = 0; } void cancel(); @@ -189,7 +189,7 @@ signals: * @param The updated item. * @param The new message. */ - void progressItemtqStatus( KPIM::ProgressItem*, const TQString& ); + void progressItemStatus( KPIM::ProgressItem*, const TQString& ); /** * Emitted when the label of an item changed. Should be used by * progress dialogs to update the label of an item. @@ -229,7 +229,7 @@ signals: private: TQString mId; TQString mLabel; - TQString mtqStatus; + TQString mStatus; ProgressItem* mParent; bool mCanBeCanceled; unsigned int mProgress; @@ -382,8 +382,8 @@ class KDE_EXPORT ProgressManager : public TQObject void progressItemCompleted( KPIM::ProgressItem* ); /** @see ProgressItem::progressItemCanceled() */ void progressItemCanceled( KPIM::ProgressItem* ); - /** @see ProgressItem::progressItemtqStatus() */ - void progressItemtqStatus( KPIM::ProgressItem*, const TQString& ); + /** @see ProgressItem::progressItemStatus() */ + void progressItemStatus( KPIM::ProgressItem*, const TQString& ); /** @see ProgressItem::progressItemLabel() */ void progressItemLabel( KPIM::ProgressItem*, const TQString& ); /** @see ProgressItem::progressItemUsesCrypto() */ diff --git a/libtdepim/sendsmsdialog.cpp b/libtdepim/sendsmsdialog.cpp index 218f9617d..d7ffd57c8 100644 --- a/libtdepim/sendsmsdialog.cpp +++ b/libtdepim/sendsmsdialog.cpp @@ -37,7 +37,7 @@ SendSMSDialog::SendSMSDialog( const TQString &recipientName, TQWidget *parent, c tqlayout->addWidget( new TQLabel( i18n( "Message" ), page ), 0, 0 ); mMessageLength = new TQLabel( "0/160", page ); - mMessageLength->tqsetAlignment( TQt::AlignRight ); + mMessageLength->setAlignment( TQt::AlignRight ); tqlayout->addWidget( mMessageLength, 0, 2 ); mText = new TQTextEdit( page ); diff --git a/libtdepim/statusbarprogresswidget.cpp b/libtdepim/statusbarprogresswidget.cpp index c417905a0..99a035b89 100644 --- a/libtdepim/statusbarprogresswidget.cpp +++ b/libtdepim/statusbarprogresswidget.cpp @@ -67,7 +67,7 @@ StatusbarProgressWidget::StatusbarProgressWidget( ProgressDialog* progressDialog box = new TQHBoxLayout( this, 0, 0 ); m_pButton = new TQPushButton( this ); - m_pButton->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, + m_pButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) ); m_pButton->setPixmap( SmallIcon( "up" ) ); box->addWidget( m_pButton ); @@ -88,12 +88,12 @@ StatusbarProgressWidget::StatusbarProgressWidget( ProgressDialog* progressDialog stack->addWidget( m_pProgressBar, 1 ); m_pLabel = new TQLabel( TQString(), this ); - m_pLabel->tqsetAlignment( AlignHCenter | AlignVCenter ); + m_pLabel->setAlignment( AlignHCenter | AlignVCenter ); m_pLabel->installEventFilter( this ); m_pLabel->setMinimumWidth( w ); stack->addWidget( m_pLabel, 2 ); m_pButton->setMaximumHeight( fontMetrics().height() ); - setMinimumWidth( tqminimumSizeHint().width() ); + setMinimumWidth( minimumSizeHint().width() ); mode = None; setMode(); diff --git a/libtdepim/tests/test_kregexp.cpp b/libtdepim/tests/test_kregexp.cpp index 511687d07..a44e3be0f 100644 --- a/libtdepim/tests/test_kregexp.cpp +++ b/libtdepim/tests/test_kregexp.cpp @@ -9,8 +9,8 @@ main() // test for http://bugs.kde.org/show_bug.cgi?id=54886 KRegExp3 reg("^"); - TQString res = reg.replace(TQString::tqfromLatin1("Fun stuff"), - TQString::tqfromLatin1("[fun] ")); + TQString res = reg.replace(TQString::fromLatin1("Fun stuff"), + TQString::fromLatin1("[fun] ")); kdDebug() << res << endl; } diff --git a/libtdepim/tests/testutf7encoder.cpp b/libtdepim/tests/testutf7encoder.cpp index 2938cd660..a28a6bf3a 100644 --- a/libtdepim/tests/testutf7encoder.cpp +++ b/libtdepim/tests/testutf7encoder.cpp @@ -9,7 +9,7 @@ void main( int argc, char * argv[] ) { TQTextEncoder * enc; - TQString arg = TQString::tqfromLatin1( argv[1] ); + TQString arg = TQString::fromLatin1( argv[1] ); int len; cout << "Original string:\n" diff --git a/plugins/kmail/bodypartformatter/text_calendar.cpp b/plugins/kmail/bodypartformatter/text_calendar.cpp index 6a8e01996..0a2d2b30b 100644 --- a/plugins/kmail/bodypartformatter/text_calendar.cpp +++ b/plugins/kmail/bodypartformatter/text_calendar.cpp @@ -190,7 +190,7 @@ class Formatter : public KMail::Interface::BodyPartFormatter } }; -static TQString directoryFortqStatus( Attendee::PartStat status ) +static TQString directoryForStatus( Attendee::PartStat status ) { TQString dir; switch ( status ) { @@ -367,7 +367,7 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler TQString recv = to; if ( recv.isEmpty() ) recv = incidence->organizer().fullName(); - TQString statusString = directoryFortqStatus( status ); //it happens to return the right strings + TQString statusString = directoryForStatus( status ); //it happens to return the right strings return callback.mailICal( recv, msg, subject, statusString, type != Forward ); } @@ -426,7 +426,7 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler bool cancelPastInvites( Incidence *incidence, const TQString &path ) const { TQString warnStr; - TQDateTime now = TQDateTime::tqcurrentDateTime(); + TQDateTime now = TQDateTime::currentDateTime(); TQDate today = now.date(); Event * const event = dynamic_cast<Event *>( incidence ); Todo * const todo = dynamic_cast<Todo *>( incidence ); @@ -567,7 +567,7 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler } // First, save it for KOrganizer to handle - TQString dir = directoryFortqStatus( status ); + TQString dir = directoryForStatus( status ); if ( dir.isEmpty() ) return true; // unknown status if ( status != Attendee::Delegated ) // we do that below for delegated incidences @@ -649,7 +649,7 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler if ( status == Attendee::Delegated ) { incidence = icalToString( iCal ); myself = findMyself( incidence, receiver ); - myself->setqStatus( status ); + myself->seStatus( status ); myself->setDelegate( delegateString ); TQString name, email; KPIM::getNameAndMail( delegateString, name, email ); diff --git a/plugins/kmail/bodypartformatter/text_vcard.cpp b/plugins/kmail/bodypartformatter/text_vcard.cpp index c99fd1c08..69a098b96 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::tqfromLatin1( "addToAddressBook:%1" ).tqarg( count ); + TQString op = TQString::fromLatin1( "addToAddressBook:%1" ).tqarg( count ); writer->queue( "<div align=\"center\"><a href=\"" + bodyPart->makeLink( op ) + diff --git a/plugins/kmail/bodypartformatter/text_xdiff.cpp b/plugins/kmail/bodypartformatter/text_xdiff.cpp index df89306f6..c11fed5c9 100644 --- a/plugins/kmail/bodypartformatter/text_xdiff.cpp +++ b/plugins/kmail/bodypartformatter/text_xdiff.cpp @@ -71,19 +71,19 @@ namespace { - TQString addedLineStyle = TQString::tqfromLatin1( + TQString addedLineStyle = TQString::fromLatin1( "style=\"" "color: green;\""); TQString fileAddStyle( "style=\"font-weight: bold; " "color: green; \"" ); - TQString removedLineStyle = TQString::tqfromLatin1( + TQString removedLineStyle = TQString::fromLatin1( "style=\"" "color: red;\""); TQString fileRemoveStyle( "style=\"font-weight: bold; " "color: red ;\"" ); - TQString tableStyle = TQString::tqfromLatin1( + TQString tableStyle = TQString::fromLatin1( "style=\"" "text-align: -khtml-auto; " "border: solid black 1px; " diff --git a/plugins/kmail/bodypartformatter/ui_attendeeselector.ui b/plugins/kmail/bodypartformatter/ui_attendeeselector.ui index 7ccbcc742..e74f4dce0 100644 --- a/plugins/kmail/bodypartformatter/ui_attendeeselector.ui +++ b/plugins/kmail/bodypartformatter/ui_attendeeselector.ui @@ -48,7 +48,7 @@ <property name="name"> <cstring>attendeeEdit</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>250</width> <height>0</height> @@ -65,7 +65,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>140</height> diff --git a/wizards/egroupwarewizard.cpp b/wizards/egroupwarewizard.cpp index 444e2d453..8c0c37a1f 100644 --- a/wizards/egroupwarewizard.cpp +++ b/wizards/egroupwarewizard.cpp @@ -347,7 +347,7 @@ EGroupwareWizard::EGroupwareWizard() : KConfigWizard( new EGroupwarePropagator ) setupRulesPage(); setupChangesPage(); - resize( tqsizeHint() ); + resize( sizeHint() ); } EGroupwareWizard::~EGroupwareWizard() |