diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-15 15:50:21 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-15 15:50:21 -0600 |
| commit | 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12 (patch) | |
| tree | 89de88213bd261e4ccaade899ab2d6ec34b3a5a7 | |
| parent | 1dad5f662a09dfc5cc041caffe0f674044a4dcec (diff) | |
| download | tdepim-3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.tar.gz tdepim-3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.zip | |
Rename a number of old tq methods that are no longer tq specific
1213 files changed, 11562 insertions, 11562 deletions
diff --git a/NewsLog.txt b/NewsLog.txt index 9bd2bde62..bc32c09de 100644 --- a/NewsLog.txt +++ b/NewsLog.txt @@ -66,7 +66,7 @@ Problems addressed ------------------ * kolab/issue4335 (partly): D'n'D a mail attachment with the icon is not working (rt#6126) -* kolab/issue3908 (partly): Mail view and print tqlayout problem if description of attachment is to long (#5872) +* kolab/issue3908 (partly): Mail view and print layout problem if description of attachment is to long (#5872) * kolab/issue4455: calendar activate/deactivate handling broken * kolab/issue4282: Adding a new event from an invitation update mail shows unnecssary message dialog 'store/throw away' (rt#6094) @@ -269,7 +269,7 @@ Problems addressed * kolab/issue3902: Delete a folder while syncing leads to crash * kolab/issue4250: Edit "Out of office" replies: Resend notification only after: days is missing (rt#6076) * kolab/issue4249: Crash while printing a mail without preview pane (rt#6075) -* kolab/issue4142: Composer: view all fields tqlayout and small problems (rt#6032) +* kolab/issue4142: Composer: view all fields layout and small problems (rt#6032) * kolab/issue4012: Calender view update problem, if the same appointment is moved on the server in other folders (rt#5930) @@ -551,7 +551,7 @@ Problems addressed * kolab/issue3923(partial): Save as of an attachment of an invitation crashes kontact * kolab/issue3930: time on the Marcus Bains line doesn't change -* kolab/issue3908(partial): Mail view and print tqlayout problem if description of attachment is to long (rt#5872) +* kolab/issue3908(partial): Mail view and print layout problem if description of attachment is to long (rt#5872) * kolab/issue3926: Start khelpcenter instead of webbrowser help: from the introduction/welcome screen (rt#5881) * kolab/issue3481: Keep current email in front after saving an attachment (rt#5746) * kolab/issue3098: OnlineIMAP, sometimes Mail body no longer shown -> Crash @@ -565,7 +565,7 @@ Problems addressed * kolab/issue3065: Crash in KOAgendaItem::paintEvent * kolab/issue3902: Delete a folder while syncing leads to crash * kolab/issue3903: Kontact hangs when switching to calendar view (rt#5870) -* kolab/issue3908 (partial): Mail view and print tqlayout problem if description of attachment is to long (rt#5872) +* kolab/issue3908 (partial): Mail view and print layout problem if description of attachment is to long (rt#5872) * kolab/issue3807: Reminder: None of the buttons should be the default (rt#5845) * kolab/issue3809: Reminder: sorting in look&feel of kontact (rt#5846) * kolab/issue3813: reccuring events show wrong dates (rt#5855) @@ -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. @@ -1474,7 +1474,7 @@ Friday, February 29th 2008 Problems addressed ------------------- -* Prevent crash after changing the tqlayout and replying then. (778728) +* Prevent crash after changing the layout and replying then. (778728) * kolab/issue2442 kolab/issue2442 (kioslave crashs after closing kontact, if the vacation reminder is activated. (779694) * "Enterprise headers" makes impossible to select text in first paragraph of body. [ kde-bug#151150 ] (779994) * kolab/issue1700 kleopatra crashes after ldap search. (780211) @@ -2063,7 +2063,7 @@ Bugfixes Korganizer ----------- -- proko35 W1-9 icon tqalignment was improved. +- proko35 W1-9 icon alignment was improved. Additional Fixes ================ diff --git a/akregator/src/addfeeddialog.cpp b/akregator/src/addfeeddialog.cpp index 1cca9d903..bb37d26e0 100644 --- a/akregator/src/addfeeddialog.cpp +++ b/akregator/src/addfeeddialog.cpp @@ -83,7 +83,7 @@ void AddFeedDialog::slotOk( ) feedURL.prepend("http://"); f->setXmlUrl(feedURL); - widget->statusLabel->setText( i18n("Downloading %1").tqarg(feedURL) ); + widget->statusLabel->setText( i18n("Downloading %1").arg(feedURL) ); connect( feed, TQT_SIGNAL(fetched(Feed* )), this, TQT_SLOT(fetchCompleted(Feed *)) ); @@ -102,7 +102,7 @@ void AddFeedDialog::fetchCompleted(Feed */*f*/) void AddFeedDialog::fetchError(Feed *) { - KMessageBox::error(this, i18n("Feed not found from %1.").tqarg(feedURL)); + KMessageBox::error(this, i18n("Feed not found from %1.").arg(feedURL)); KDialogBase::slotCancel(); } diff --git a/akregator/src/addfeedwidgetbase.ui b/akregator/src/addfeedwidgetbase.ui index 7d9a8a482..8ee0614dc 100644 --- a/akregator/src/addfeedwidgetbase.ui +++ b/akregator/src/addfeedwidgetbase.ui @@ -24,7 +24,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout16</cstring> + <cstring>layout16</cstring> </property> <hbox> <property name="name"> @@ -56,7 +56,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -65,7 +65,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout15</cstring> + <cstring>layout15</cstring> </property> <grid> <property name="name"> @@ -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..a21aaa70e 100644 --- a/akregator/src/akregator_part.cpp +++ b/akregator/src/akregator_part.cpp @@ -146,7 +146,7 @@ Part::Part( TQWidget *parentWidget, const char * /*widgetName*/, TQStringList storageParams; - storageParams.append(TQString("taggingEnabled=%1").tqarg(Settings::showTaggingGUI() ? "true" : "false")); + storageParams.append(TQString("taggingEnabled=%1").arg(Settings::showTaggingGUI() ? "true" : "false")); if (factory != 0) { @@ -168,7 +168,7 @@ Part::Part( TQWidget *parentWidget, const char * /*widgetName*/, { m_storage = Backend::StorageFactoryRegistry::self()->getFactory("dummy")->createStorage(storageParams); - KMessageBox::error(parentWidget, i18n("Unable to load storage backend plugin \"%1\". No feeds are archived.").tqarg(Settings::archiveBackend()), i18n("Plugin error") ); + KMessageBox::error(parentWidget, i18n("Unable to load storage backend plugin \"%1\". No feeds are archived.").arg(Settings::archiveBackend()), i18n("Plugin error") ); } Filters::ArticleFilterList list; @@ -232,7 +232,7 @@ Part::Part( TQWidget *parentWidget, const char * /*widgetName*/, initFonts(); - RSS::FileRetriever::setUserAgent(TQString("Akregator/%1; librss/remnants").tqarg(AKREGATOR_VERSION)); + RSS::FileRetriever::setUserAgent(TQString("Akregator/%1; librss/remnants").arg(AKREGATOR_VERSION)); } void Part::loadPlugins() @@ -428,11 +428,11 @@ 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 (invalid XML). A backup was created:<p><b>%2</b></p></qt>").tqarg(backup), i18n("XML Parsing Error") ); + KMessageBox::error(m_view, i18n("<qt>The standard feed list is corrupted (invalid XML). A backup was created:<p><b>%2</b></p></qt>").arg(backup), i18n("XML Parsing Error") ); } if (!doc.setContent(listBackup)) @@ -444,10 +444,10 @@ 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") ); + KMessageBox::error(m_view, i18n("<qt>The standard feed list is corrupted (no valid OPML). A backup was created:<p><b>%2</b></p></qt>").arg(backup), i18n("OPML Parsing Error") ); } m_view->loadFeeds(createDefaultFeedList()); } @@ -486,7 +486,7 @@ void Part::slotSaveFeedList() if (file.open(IO_WriteOnly) == false) { //FIXME: allow to save the feedlist into different location -tpr 20041118 - KMessageBox::error(m_view, i18n("Access denied: cannot save feed list (%1)").tqarg(m_file), i18n("Write error") ); + KMessageBox::error(m_view, i18n("Access denied: cannot save feed list (%1)").arg(m_file), i18n("Write error") ); return; } @@ -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; @@ -639,10 +639,10 @@ void Part::importFile(const KURL& url) if (doc.setContent(TQByteArray(file.readAll()))) m_view->importFeeds(doc); else - KMessageBox::error(m_view, i18n("Could not import the file %1 (no valid OPML)").tqarg(filename), i18n("OPML Parsing Error") ); + KMessageBox::error(m_view, i18n("Could not import the file %1 (no valid OPML)").arg(filename), i18n("OPML Parsing Error") ); } else - KMessageBox::error(m_view, i18n("The file %1 could not be read, check if it exists or if it is readable for the current user.").tqarg(filename), i18n("Read Error")); + KMessageBox::error(m_view, i18n("The file %1 could not be read, check if it exists or if it is readable for the current user.").arg(filename), i18n("Read Error")); if (isRemote) KIO::NetAccess::removeTempFile(filename); @@ -656,7 +656,7 @@ void Part::exportFile(const KURL& url) if ( file.exists() && KMessageBox::questionYesNo(m_view, - i18n("The file %1 already exists; do you want to overwrite it?").tqarg(file.name()), + i18n("The file %1 already exists; do you want to overwrite it?").arg(file.name()), i18n("Export"), i18n("Overwrite"), KStdGuiItem::cancel()) == KMessageBox::No ) @@ -664,7 +664,7 @@ void Part::exportFile(const KURL& url) if ( !file.open(IO_WriteOnly) ) { - KMessageBox::error(m_view, i18n("Access denied: cannot write to file %1").tqarg(file.name()), i18n("Write Error") ); + KMessageBox::error(m_view, i18n("Access denied: cannot write to file %1").arg(file.name()), i18n("Write Error") ); return; } @@ -978,11 +978,11 @@ bool Part::tryToLock(const TQString& backendName) "can cause the loss of archived articles and crashes at startup.</b> " "You should disable the archive for now " "unless you are sure that %2 is not already running.</qt>") - .tqarg( programName, programName, backendName ); + .arg( programName, programName, backendName ); // TQString::arg( st ) only replaces the first occurrence of %1 // with st while TQString::arg( s1, s2 ) replacess all occurrences // of %1 with s1 and all occurrences of %2 with s2. So don't - // even think about changing the above to .tqarg( programName ). + // even think about changing the above to .arg( programName ). else msg = i18n("<qt>%1 seems to be running on another display on this " "machine. <b>Running %1 and %2 at the same " @@ -990,7 +990,7 @@ bool Part::tryToLock(const TQString& backendName) "the loss of archived articles and crashes at startup.</b> " "You should disable the archive for now " "unless you are sure that %2 is not already running.</qt>") - .tqarg( oldProgramName, programName, backendName ); + .arg( oldProgramName, programName, backendName ); } else { @@ -1001,7 +1001,7 @@ bool Part::tryToLock(const TQString& backendName) "You should disable the archive for now " "unless you are sure that it is " "not already running on %2.</qt>") - .tqarg( programName, oldHostName, backendName ); + .arg( programName, oldHostName, backendName ); else msg = i18n("<qt>%1 seems to be running on %3. <b>Running %1 and %2 at the " "same time is not supported by the %4 backend and can cause " @@ -1009,7 +1009,7 @@ bool Part::tryToLock(const TQString& backendName) "You should disable the archive for now " "unless you are sure that %1 is " "not running on %3.</qt>") - .tqarg( oldProgramName, programName, oldHostName, backendName ); + .arg( oldProgramName, programName, oldHostName, backendName ); } KCursorSaver idle( KBusyPtr::idle() ); diff --git a/akregator/src/akregator_view.cpp b/akregator/src/akregator_view.cpp index 3aa9dd2c6..e296f29cb 100644 --- a/akregator/src/akregator_view.cpp +++ b/akregator/src/akregator_view.cpp @@ -90,18 +90,18 @@ #include <tqfile.h> #include <tqhbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqmultilineedit.h> #include <tqpopupmenu.h> #include <tqptrlist.h> -#include <tqstylesheet.h> -#include <tqtextstream.h> +#include <stylesheet.h> +#include <textstream.h> #include <tqtimer.h> #include <tqtoolbutton.h> #include <tqtooltip.h> #include <tqvaluevector.h> #include <tqwhatsthis.h> -#include <tqclipboard.h> +#include <clipboard.h> namespace Akregator { @@ -145,7 +145,7 @@ class View::DeleteNodeVisitor : public TreeNodeVisitor virtual bool visitTagNode(TagNode* node) { - TQString msg = i18n("<qt>Are you sure you want to delete tag <b>%1</b>? The tag will be removed from all articles.</qt>").tqarg(node->title()); + TQString msg = i18n("<qt>Are you sure you want to delete tag <b>%1</b>? The tag will be removed from all articles.</qt>").arg(node->title()); if (KMessageBox::warningContinueCancel(0, msg, i18n("Delete Tag"), KStdGuiItem::del()) == KMessageBox::Continue) { Tag tag = node->tag(); @@ -166,7 +166,7 @@ class View::DeleteNodeVisitor : public TreeNodeVisitor if (node->title().isEmpty()) msg = i18n("<qt>Are you sure you want to delete this folder and its feeds and subfolders?</qt>"); else - msg = i18n("<qt>Are you sure you want to delete folder <b>%1</b> and its feeds and subfolders?</qt>").tqarg(node->title()); + msg = i18n("<qt>Are you sure you want to delete folder <b>%1</b> and its feeds and subfolders?</qt>").arg(node->title()); if (KMessageBox::warningContinueCancel(0, msg, i18n("Delete Folder"), KStdGuiItem::del()) == KMessageBox::Continue) { @@ -182,7 +182,7 @@ class View::DeleteNodeVisitor : public TreeNodeVisitor if (node->title().isEmpty()) msg = i18n("<qt>Are you sure you want to delete this feed?</qt>"); else - msg = i18n("<qt>Are you sure you want to delete feed <b>%1</b>?</qt>").tqarg(node->title()); + msg = i18n("<qt>Are you sure you want to delete feed <b>%1</b>?</qt>").arg(node->title()); if (KMessageBox::warningContinueCancel(0, msg, i18n("Delete Feed"), KStdGuiItem::del()) == KMessageBox::Continue) { @@ -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()); } @@ -884,7 +884,7 @@ void View::slotFeedAdd() } - TreeNode* lastChild = group->tqchildren().last(); + TreeNode* lastChild = group->children().last(); addFeed(TQString(), lastChild, group, false); } @@ -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); } } @@ -1266,7 +1266,7 @@ void View::slotCopyLinkAddress() link = article.link().url(); else link = article.guid(); - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); cb->setText(link, TQClipboard::Clipboard); cb->setText(link, TQClipboard::Selection); } @@ -1312,7 +1312,7 @@ void View::slotArticleDelete() case 0: return; case 1: - msg = i18n("<qt>Are you sure you want to delete article <b>%1</b>?</qt>").tqarg(TQStyleSheet::escape(articles.first().title())); + msg = i18n("<qt>Are you sure you want to delete article <b>%1</b>?</qt>").arg(TQStyleSheet::escape(articles.first().title())); break; default: msg = i18n("<qt>Are you sure you want to delete the selected article?</qt>", @@ -1370,7 +1370,7 @@ void View::slotSetSelectedArticleRead() return; for (TQValueList<Article>::Iterator it = articles.begin(); it != articles.end(); ++it) - (*it).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/articleviewer.cpp b/akregator/src/articleviewer.cpp index f8ad74bc8..401950694 100644 --- a/akregator/src/articleviewer.cpp +++ b/akregator/src/articleviewer.cpp @@ -72,9 +72,9 @@ class ArticleViewer::ShowSummaryVisitor : public TreeNodeVisitor m_view->m_link = TQString(); TQString text; - text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").tqarg(TQApplication::reverseLayout() ? "rtl" : "ltr"); + text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").arg(TQApplication::reverseLayout() ? "rtl" : "ltr"); - text += TQString("<div class=\"headertitle\" dir=\"%1\">").tqarg(directionOf(Utils::stripTags(node->title()))); + text += TQString("<div class=\"headertitle\" dir=\"%1\">").arg(directionOf(Utils::stripTags(node->title()))); text += node->title(); if(node->unread() == 0) text += i18n(" (no unread articles)"); @@ -90,26 +90,26 @@ class ArticleViewer::ShowSummaryVisitor : public TreeNodeVisitor TQString file = url.replace("/", "_").replace(":", "_"); KURL u(m_view->m_imageDir); u.setFileName(file); - text += TQString("<a href=\"%1\"><img class=\"headimage\" src=\"%2.png\"></a>\n").tqarg(node->htmlUrl()).tqarg(u.url()); + text += TQString("<a href=\"%1\"><img class=\"headimage\" src=\"%2.png\"></a>\n").arg(node->htmlUrl()).arg(u.url()); } else text += "<div class=\"body\">"; if( !node->description().isEmpty() ) { - text += TQString("<div dir=\"%1\">").tqarg(Utils::stripTags(directionOf(node->description()))); - text += i18n("<b>Description:</b> %1<br><br>").tqarg(node->description()); + text += TQString("<div dir=\"%1\">").arg(Utils::stripTags(directionOf(node->description()))); + text += i18n("<b>Description:</b> %1<br><br>").arg(node->description()); text += "</div>\n"; // /description } if ( !node->htmlUrl().isEmpty() ) { - text += TQString("<div dir=\"%1\">").tqarg(directionOf(node->htmlUrl())); - text += i18n("<b>Homepage:</b> <a href=\"%1\">%2</a>").tqarg(node->htmlUrl()).tqarg(node->htmlUrl()); + text += TQString("<div dir=\"%1\">").arg(directionOf(node->htmlUrl())); + text += i18n("<b>Homepage:</b> <a href=\"%1\">%2</a>").arg(node->htmlUrl()).arg(node->htmlUrl()); text += "</div>\n"; // / link } - //text += i18n("<b>Unread articles:</b> %1").tqarg(node->unread()); + //text += i18n("<b>Unread articles:</b> %1").arg(node->unread()); text += "</div>"; // /body m_view->renderContent(text); @@ -121,8 +121,8 @@ class ArticleViewer::ShowSummaryVisitor : public TreeNodeVisitor m_view->m_link = TQString(); TQString text; - text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").tqarg(TQApplication::reverseLayout() ? "rtl" : "ltr"); - text += TQString("<div class=\"headertitle\" dir=\"%1\">%2").tqarg(directionOf(Utils::stripTags(node->title()))).tqarg(node->title()); + text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").arg(TQApplication::reverseLayout() ? "rtl" : "ltr"); + text += TQString("<div class=\"headertitle\" dir=\"%1\">%2").arg(directionOf(Utils::stripTags(node->title()))).arg(node->title()); if(node->unread() == 0) text += i18n(" (no unread articles)"); else @@ -139,8 +139,8 @@ class ArticleViewer::ShowSummaryVisitor : public TreeNodeVisitor m_view->m_link = TQString(); TQString text; - text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").tqarg(TQApplication::reverseLayout() ? "rtl" : "ltr"); - text += TQString("<div class=\"headertitle\" dir=\"%1\">%2").tqarg(directionOf(Utils::stripTags(node->title()))).tqarg(node->title()); + text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").arg(TQApplication::reverseLayout() ? "rtl" : "ltr"); + text += TQString("<div class=\"headertitle\" dir=\"%1\">%2").arg(directionOf(Utils::stripTags(node->title()))).arg(node->title()); if(node->unread() == 0) text += i18n(" (no unread articles)"); else @@ -188,7 +188,7 @@ ArticleViewer::~ArticleViewer() void ArticleViewer::generateNormalModeCSS() { - const TQColorGroup & cg = TQApplication::tqpalette().active(); + const TQColorGroup & cg = TQApplication::palette().active(); // from kmail::headerstyle.cpp m_normalModeCSS = TQString( @@ -198,10 +198,10 @@ void ArticleViewer::generateNormalModeCSS() " font-size: %2 ! important;\n" " color: %3 ! important;\n" " background: %4 ! important;\n" - "}\n\n").tqarg(Settings::standardFont()) - .tqarg(TQString::number(pointsToPixel(Settings::mediumFontSize()))+"px") - .tqarg(cg.text().name()) - .tqarg(cg.base().name()); + "}\n\n").arg(Settings::standardFont()) + .arg(TQString::number(pointsToPixel(Settings::mediumFontSize()))+"px") + .arg(cg.text().name()) + .arg(cg.base().name()); m_normalModeCSS += TQString( "a {\n" + TQString(" color: %1 ! important;\n") @@ -214,18 +214,18 @@ void ArticleViewer::generateNormalModeCSS() +" margin-bottom: 10pt;\n" // +" width: 99%;\n" + "}\n\n") - .tqarg(cg.link().name()) - .tqarg(cg.background().name()) - .tqarg(cg.text().name()); + .arg(cg.link().name()) + .arg(cg.background().name()) + .arg(cg.text().name()); m_normalModeCSS += TQString(".headertitle a:link { color: %1 ! important; }\n" ".headertitle a:visited { color: %2 ! important; }\n" ".headertitle a:hover{ color: %3 ! important; }\n" ".headertitle a:active { color: %4 ! important; }\n") - .tqarg(cg.highlightedText().name()) - .tqarg(cg.highlightedText().name()) - .tqarg(cg.highlightedText().name()) - .tqarg(cg.highlightedText().name()); + .arg(cg.highlightedText().name()) + .arg(cg.highlightedText().name()) + .arg(cg.highlightedText().name()) + .arg(cg.highlightedText().name()); m_normalModeCSS += TQString( ".headertitle {\n" @@ -244,8 +244,8 @@ void ArticleViewer::generateNormalModeCSS() ".headimage {\n" " float: right;\n" " margin-left: 5px;\n" - "}\n\n").tqarg(cg.highlight().name()) - .tqarg(cg.highlightedText().name()); + "}\n\n").arg(cg.highlight().name()) + .arg(cg.highlightedText().name()); m_normalModeCSS += TQString( "body { clear: none; }\n\n" @@ -267,7 +267,7 @@ void ArticleViewer::generateNormalModeCSS() void ArticleViewer::generateCombinedModeCSS() { - const TQColorGroup & cg = TQApplication::tqpalette().active(); + const TQColorGroup & cg = TQApplication::palette().active(); // from kmail::headerstyle.cpp m_combinedModeCSS = TQString ( @@ -278,10 +278,10 @@ void ArticleViewer::generateCombinedModeCSS() " font-size: %2 ! important;\n" " color: %3 ! important;\n" " background: %4 ! important;\n" - "}\n\n").tqarg(Settings::standardFont()) - .tqarg(TQString::number(pointsToPixel(Settings::mediumFontSize()))+"px") - .tqarg(cg.text().name()) - .tqarg(cg.base().name()); + "}\n\n").arg(Settings::standardFont()) + .arg(TQString::number(pointsToPixel(Settings::mediumFontSize()))+"px") + .arg(cg.text().name()) + .arg(cg.base().name()); m_combinedModeCSS += ( "a {\n" + TQString(" color: %1 ! important;\n") @@ -294,18 +294,18 @@ void ArticleViewer::generateCombinedModeCSS() +" margin-bottom: 10pt;\n" // +" width: 99%;\n" + "}\n\n") - .tqarg(cg.link().name()) - .tqarg(cg.background().name()) - .tqarg(cg.text().name()); + .arg(cg.link().name()) + .arg(cg.background().name()) + .arg(cg.text().name()); m_combinedModeCSS += TQString(".headertitle a:link { color: %1 ! important; }\n" ".headertitle a:visited { color: %2 ! important; }\n" ".headertitle a:hover{ color: %3 ! important; }\n" ".headertitle a:active { color: %4 ! important; }\n") - .tqarg(cg.highlightedText().name()) - .tqarg(cg.highlightedText().name()) - .tqarg(cg.highlightedText().name()) - .tqarg(cg.highlightedText().name()); + .arg(cg.highlightedText().name()) + .arg(cg.highlightedText().name()) + .arg(cg.highlightedText().name()) + .arg(cg.highlightedText().name()); m_combinedModeCSS += TQString( ".headertitle {\n" " background: %1 ! important;\n" @@ -323,8 +323,8 @@ void ArticleViewer::generateCombinedModeCSS() ".headimage {\n" " float: right;\n" " margin-left: 5px;\n" - "}\n\n").tqarg(cg.highlight().name()) - .tqarg(cg.highlightedText().name()); + "}\n\n").arg(cg.highlight().name()) + .arg(cg.highlightedText().name()); m_combinedModeCSS += TQString( "body { clear: none; }\n\n" @@ -368,11 +368,11 @@ void ArticleViewer::displayAboutPage() { TQString location = locate("data", "akregator/about/main.html"); TQString content = KPIM::kFileToString(location); - content = content.tqarg( locate( "data", "libtdepim/about/kde_infopage.css" ) ); + content = content.arg( locate( "data", "libtdepim/about/kde_infopage.css" ) ); if ( kapp->reverseLayout() ) - content = content.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "libtdepim/about/kde_infopage_rtl.css" ) ); + content = content.arg( "@import \"%1\";" ).arg( locate( "data", "libtdepim/about/kde_infopage_rtl.css" ) ); else - content = content.tqarg( "" ); + content = content.arg( "" ); begin(KURL( location )); TQString info = @@ -389,25 +389,25 @@ void ArticleViewer::displayAboutPage() "<p>We hope that you will enjoy Akregator.</p>\n" "<p>Thank you,</p>\n" "<p style='margin-bottom: 0px'> The Akregator Team</p>\n") - .tqarg(AKREGATOR_VERSION) // Akregator version - .tqarg("http://akregator.kde.org/"); // Akregator homepage URL + .arg(AKREGATOR_VERSION) // Akregator version + .arg("http://akregator.kde.org/"); // Akregator homepage URL TQString fontSize = TQString::number( pointsToPixel( Settings::mediumFontSize() )); TQString appTitle = i18n("Akregator"); TQString catchPhrase = ""; //not enough space for a catch phrase at default window size i18n("Part of the Kontact Suite"); TQString quickDescription = i18n("An RSS feed reader for the K Desktop Environment."); - write(content.tqarg(fontSize).tqarg(appTitle).tqarg(catchPhrase).tqarg(quickDescription).tqarg(info)); + write(content.arg(fontSize).arg(appTitle).arg(catchPhrase).arg(quickDescription).arg(info)); end(); } TQString ArticleViewer::formatArticleNormalMode(Feed* feed, const Article& article) { TQString text; - text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").tqarg(TQApplication::reverseLayout() ? "rtl" : "ltr"); + text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").arg(TQApplication::reverseLayout() ? "rtl" : "ltr"); if (!article.title().isEmpty()) { - text += TQString("<div class=\"headertitle\" dir=\"%1\">\n").tqarg(directionOf(Utils::stripTags(article.title()))); + text += TQString("<div class=\"headertitle\" dir=\"%1\">\n").arg(directionOf(Utils::stripTags(article.title()))); if (article.link().isValid()) text += "<a href=\""+article.link().url()+"\">"; text += article.title().replace("<", "<").replace(">", ">"); // TODO: better leave things escaped in the parser @@ -417,16 +417,16 @@ TQString ArticleViewer::formatArticleNormalMode(Feed* feed, const Article& artic } if (article.pubDate().isValid()) { - text += TQString("<span class=\"header\" dir=\"%1\">").tqarg(directionOf(i18n("Date"))); - text += TQString ("%1:").tqarg(i18n("Date")); + text += TQString("<span class=\"header\" dir=\"%1\">").arg(directionOf(i18n("Date"))); + text += TQString ("%1:").arg(i18n("Date")); text += "</span><span class=\"headertext\">"; text += KGlobal::locale()->formatDateTime(article.pubDate(), false, false)+"</span>\n"; // TODO: might need RTL? } TQString author = article.author(); if (!author.isEmpty()) { - text += TQString("<br/><span class=\"header\" dir=\"%1\">").tqarg(directionOf(i18n("Author"))); - text += TQString ("%1:").tqarg(i18n("Author")); + text += TQString("<br/><span class=\"header\" dir=\"%1\">").arg(directionOf(i18n("Author"))); + text += TQString ("%1:").arg(i18n("Author")); text += "</span><span class=\"headertext\">"; text += author+"</span>\n"; // TODO: might need RTL? } @@ -437,14 +437,14 @@ TQString ArticleViewer::formatArticleNormalMode(Feed* feed, const Article& artic TQString file = Utils::fileNameForUrl(feed->xmlUrl()); KURL u(m_imageDir); u.setFileName(file); - text += TQString("<a href=\"%1\"><img class=\"headimage\" src=\"%2.png\"></a>\n").tqarg(feed->htmlUrl()).tqarg(u.url()); + text += TQString("<a href=\"%1\"><img class=\"headimage\" src=\"%2.png\"></a>\n").arg(feed->htmlUrl()).arg(u.url()); } if (!article.description().isEmpty()) { - text += TQString("<div dir=\"%1\">").tqarg(directionOf(Utils::stripTags(article.description())) ); + text += TQString("<div dir=\"%1\">").arg(directionOf(Utils::stripTags(article.description())) ); text += "<span class=\"content\">"+article.description()+"</span>"; text += "</div>"; } @@ -486,7 +486,7 @@ TQString ArticleViewer::formatArticleNormalMode(Feed* feed, const Article& artic //int length = article.enclosure().length(); //TQString lengthStr = KIO::convertSize(length); - //text += TQString("<hr><div><a href=\"%1\">%2</a> (%3, %4)</div>").tqarg(url).tqarg(url).tqarg(lengthStr).tqarg(type); + //text += TQString("<hr><div><a href=\"%1\">%2</a> (%3, %4)</div>").arg(url).arg(url).arg(lengthStr).arg(type); } //kdDebug() << text << endl; return text; @@ -496,13 +496,13 @@ TQString ArticleViewer::formatArticleNormalMode(Feed* feed, const Article& artic TQString ArticleViewer::formatArticleCombinedMode(Feed* feed, const Article& article) { TQString text; - text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").tqarg(TQApplication::reverseLayout() ? "rtl" : "ltr"); + text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").arg(TQApplication::reverseLayout() ? "rtl" : "ltr"); KURL link = article.link(); if (!article.title().isEmpty()) { - text += TQString("<div class=\"headertitle\" dir=\"%1\">\n").tqarg(directionOf(Utils::stripTags(article.title()))); + text += TQString("<div class=\"headertitle\" dir=\"%1\">\n").arg(directionOf(Utils::stripTags(article.title()))); if (link.isValid()) text += "<a href=\""+link.url()+"\">"; text += article.title().replace("<", "<").replace(">", ">"); // TODO: better leave things escaped in the parser @@ -512,8 +512,8 @@ TQString ArticleViewer::formatArticleCombinedMode(Feed* feed, const Article& art } if (article.pubDate().isValid()) { - text += TQString("<span class=\"header\" dir=\"%1\">").tqarg(directionOf(i18n("Date"))); - text += TQString ("%1:").tqarg(i18n("Date")); + text += TQString("<span class=\"header\" dir=\"%1\">").arg(directionOf(i18n("Date"))); + text += TQString ("%1:").arg(i18n("Date")); text += "</span><span class=\"headertext\">"; text += KGlobal::locale()->formatDateTime(article.pubDate(), false, false)+"</span>\n"; // TODO: might need RTL? } @@ -521,8 +521,8 @@ TQString ArticleViewer::formatArticleCombinedMode(Feed* feed, const Article& art TQString author = article.author(); if (!author.isEmpty()) { - text += TQString("<br/><span class=\"header\" dir=\"%1\">").tqarg(directionOf(i18n("Author"))); - text += TQString ("%1:").tqarg(i18n("Author")); + text += TQString("<br/><span class=\"header\" dir=\"%1\">").arg(directionOf(i18n("Author"))); + text += TQString ("%1:").arg(i18n("Author")); text += "</span><span class=\"headertext\">"; text += author+"</span>\n"; // TODO: might need RTL? } @@ -534,14 +534,14 @@ TQString ArticleViewer::formatArticleCombinedMode(Feed* feed, const Article& art TQString file = Utils::fileNameForUrl(feed->xmlUrl()); KURL u(m_imageDir); u.setFileName(file); - text += TQString("<a href=\"%1\"><img class=\"headimage\" src=\"%2.png\"></a>\n").tqarg(feed->htmlUrl()).tqarg(u.url()); + text += TQString("<a href=\"%1\"><img class=\"headimage\" src=\"%2.png\"></a>\n").arg(feed->htmlUrl()).arg(u.url()); } if (!article.description().isEmpty()) { - text += TQString("<div dir=\"%1\">").tqarg(directionOf(Utils::stripTags(article.description())) ); + text += TQString("<div dir=\"%1\">").arg(directionOf(Utils::stripTags(article.description())) ); text += "<span class=\"content\">"+article.description()+"</span>"; text += "</div>"; } diff --git a/akregator/src/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/feedlist.cpp b/akregator/src/feedlist.cpp index 1daf1aa63..e05aded8a 100644 --- a/akregator/src/feedlist.cpp +++ b/akregator/src/feedlist.cpp @@ -222,10 +222,10 @@ void FeedList::append(FeedList* list, Folder* parent, TreeNode* after) if ( !flatList()->contains(parent) ) parent = rootNode(); - TQValueList<TreeNode*> tqchildren = list->rootNode()->tqchildren(); + TQValueList<TreeNode*> children = list->rootNode()->children(); - TQValueList<TreeNode*>::ConstIterator end( tqchildren.end() ); - for (TQValueList<TreeNode*>::ConstIterator it = tqchildren.begin(); it != end; ++it) + TQValueList<TreeNode*>::ConstIterator end( children.end() ); + for (TQValueList<TreeNode*>::ConstIterator it = children.begin(); it != end; ++it) { list->rootNode()->removeChild(*it); parent->insertChild(*it, after); @@ -254,11 +254,11 @@ TQDomDocument FeedList::toXML() const TQDomElement body = doc.createElement( "body" ); root.appendChild( body ); - TQValueList<TreeNode*> tqchildren = rootNode()->tqchildren(); + TQValueList<TreeNode*> children = rootNode()->children(); - TQValueList<TreeNode*>::ConstIterator end( tqchildren.end() ); + TQValueList<TreeNode*>::ConstIterator end( children.end() ); - for (TQValueList<TreeNode*>::ConstIterator it = tqchildren.begin(); it != end; ++it) + for (TQValueList<TreeNode*>::ConstIterator it = children.begin(); it != end; ++it) body.appendChild( (*it)->toOPML(body, doc) ); return doc; diff --git a/akregator/src/feedlistview.cpp b/akregator/src/feedlistview.cpp index aa6101ded..8998882ff 100644 --- a/akregator/src/feedlistview.cpp +++ b/akregator/src/feedlistview.cpp @@ -180,8 +180,8 @@ class NodeListView::DeleteItemVisitor : public TreeNodeVisitor virtual bool visitFolder(Folder* node) { // delete child items recursively before deleting parent - TQValueList<TreeNode*> tqchildren = node->tqchildren(); - for (TQValueList<TreeNode*>::ConstIterator it = tqchildren.begin(); it != tqchildren.end(); ++it ) + TQValueList<TreeNode*> children = node->children(); + for (TQValueList<TreeNode*>::ConstIterator it = children.begin(); it != children.end(); ++it ) visit(*it); visitTreeNode(node); @@ -267,10 +267,10 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor } m_view->d->itemDict.insert(node, item); - TQValueList<TreeNode*> tqchildren = node->tqchildren(); + TQValueList<TreeNode*> children = node->children(); - // add tqchildren recursively - for (TQValueList<TreeNode*>::ConstIterator it = tqchildren.begin(); it != tqchildren.end(); ++it ) + // add children recursively + for (TQValueList<TreeNode*>::ConstIterator it = children.begin(); it != children.end(); ++it ) visit(*it); m_view->connectToNode(node); @@ -305,9 +305,9 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor } m_view->d->itemDict.insert(node, item); - // add tqchildren recursively - TQValueList<TreeNode*> tqchildren = node->tqchildren(); - for (TQValueList<TreeNode*>::ConstIterator it = tqchildren.begin(); it != tqchildren.end(); ++it ) + // add children recursively + TQValueList<TreeNode*> children = node->children(); + for (TQValueList<TreeNode*>::ConstIterator it = children.begin(); it != children.end(); ++it ) visit(*it); m_view->connectToNode(node); diff --git a/akregator/src/feedlistview.h b/akregator/src/feedlistview.h index 52952089d..8d4394e10 100644 --- a/akregator/src/feedlistview.h +++ b/akregator/src/feedlistview.h @@ -157,7 +157,7 @@ protected slots: /** Called when a node in the tree is taken out of the tree (parent->removeChild()) - Removes a node and its tqchildren from the tree. Note that it doesn't delete the corresponding view items (get deleted only when the node itself gets deleted) */ + Removes a node and its children from the tree. Note that it doesn't delete the corresponding view items (get deleted only when the node itself gets deleted) */ virtual void slotNodeRemoved(Folder* parent, TreeNode* node); /** deletes the item belonging to the deleted node */ diff --git a/akregator/src/feedstorage.h b/akregator/src/feedstorage.h index 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..739b0cf19 100644 --- a/akregator/src/folder.cpp +++ b/akregator/src/folder.cpp @@ -39,9 +39,9 @@ namespace Akregator { class Folder::FolderPrivate { public: - /** List of tqchildren */ - TQValueList<TreeNode*> tqchildren; - /** caching unread count of tqchildren */ + /** List of children */ + TQValueList<TreeNode*> children; + /** caching unread count of children */ int unread; /** whether or not the folder is expanded */ bool open; @@ -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; } @@ -77,7 +77,7 @@ Folder::Folder(const TQString& title) : TreeNode(), d(new FolderPrivate) Folder::~Folder() { TreeNode* tmp = 0; - for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != d->tqchildren.end(); ++it) + for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != d->children.end(); ++it) { delete tmp; tmp = *it; @@ -93,8 +93,8 @@ Folder::~Folder() TQStringList Folder::tags() const { TQStringList t; - TQValueList<TreeNode*>::ConstIterator en = d->tqchildren.end(); - for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != en; ++it) + TQValueList<TreeNode*>::ConstIterator en = d->children.end(); + for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it) { // intersect tag sets instead of appending lists, to avoid dupes. This sucks. Definitely. I want TQSet. Now. TQStringList t2 = (*it)->tags(); @@ -108,8 +108,8 @@ TQStringList Folder::tags() const TQValueList<Article> Folder::articles(const TQString& tag) { TQValueList<Article> seq; - TQValueList<TreeNode*>::ConstIterator en = d->tqchildren.end(); - for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != en; ++it) + TQValueList<TreeNode*>::ConstIterator en = d->children.end(); + for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it) seq += (*it)->articles(tag); return seq; @@ -123,21 +123,21 @@ TQDomElement Folder::toOPML( TQDomElement parent, TQDomDocument document ) const el.setAttribute("isOpen", d->open ? "true" : "false"); el.setAttribute( "id", TQString::number(id()) ); - TQValueList<TreeNode*>::ConstIterator en = d->tqchildren.end(); - for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != en; ++it) + TQValueList<TreeNode*>::ConstIterator en = d->children.end(); + for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it) el.appendChild( (*it)->toOPML(el, document) ); return el; } -TQValueList<TreeNode*> Folder::tqchildren() const +TQValueList<TreeNode*> Folder::children() const { - return d->tqchildren; + return d->children; } void Folder::insertChild(TreeNode* node, TreeNode* after) { - int pos = d->tqchildren.findIndex(after); + int pos = d->children.findIndex(after); if (pos < 0) prependChild(node); @@ -150,10 +150,10 @@ void Folder::insertChild(uint index, TreeNode* node) // kdDebug() << "enter Folder::insertChild(int, node) " << node->title() << endl; if (node) { - if (index >= d->tqchildren.size()) - d->tqchildren.append(node); + if (index >= d->children.size()) + d->children.append(node); else - d->tqchildren.insert(d->tqchildren.at(index), node); + d->children.insert(d->children.at(index), node); node->setParent(this); connectToNode(node); updateUnreadCount(); @@ -170,7 +170,7 @@ void Folder::appendChild(TreeNode* node) // kdDebug() << "enter Folder::appendChild() " << node->title() << endl; if (node) { - d->tqchildren.append(node); + d->children.append(node); node->setParent(this); connectToNode(node); updateUnreadCount(); @@ -187,7 +187,7 @@ void Folder::prependChild(TreeNode* node) // kdDebug() << "enter Folder::prependChild() " << node->title() << endl; if (node) { - d->tqchildren.prepend(node); + d->children.prepend(node); node->setParent(this); connectToNode(node); updateUnreadCount(); @@ -202,10 +202,10 @@ void Folder::prependChild(TreeNode* node) void Folder::removeChild(TreeNode* node) { // kdDebug() << "enter Folder::removeChild() node:" << (node ? node->title() : "null") << endl; - if (node && d->tqchildren.contains(node)) + if (node && d->children.contains(node)) { node->setParent(0); - d->tqchildren.remove(node); + d->children.remove(node); disconnectFromNode(node); updateUnreadCount(); emit signalChildRemoved(this, node); @@ -219,12 +219,12 @@ void Folder::removeChild(TreeNode* node) TreeNode* Folder::firstChild() { - return d->tqchildren.isEmpty() ? 0 : d->tqchildren.first(); + return d->children.isEmpty() ? 0 : d->children.first(); } TreeNode* Folder::lastChild() { - return d->tqchildren.isEmpty() ? 0 : d->tqchildren.last(); + return d->children.isEmpty() ? 0 : d->children.last(); } bool Folder::isOpen() const @@ -246,8 +246,8 @@ int Folder::totalCount() const { int totalCount = 0; - TQValueList<TreeNode*>::ConstIterator en = d->tqchildren.end(); - for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != en; ++it) + TQValueList<TreeNode*>::ConstIterator en = d->children.end(); + for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it) totalCount += (*it)->totalCount(); return totalCount; @@ -257,8 +257,8 @@ void Folder::updateUnreadCount() { int unread = 0; - TQValueList<TreeNode*>::ConstIterator en = d->tqchildren.end(); - for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != en; ++it) + TQValueList<TreeNode*>::ConstIterator en = d->children.end(); + for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it) unread += (*it)->unread(); d->unread = unread; @@ -267,8 +267,8 @@ void Folder::updateUnreadCount() void Folder::slotMarkAllArticlesAsRead() { setNotificationMode(false); - TQValueList<TreeNode*>::ConstIterator en = d->tqchildren.end(); - for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != en; ++it) + TQValueList<TreeNode*>::ConstIterator en = d->children.end(); + for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it) (*it)->slotMarkAllArticlesAsRead(); setNotificationMode(true, true); } @@ -281,7 +281,7 @@ void Folder::slotChildChanged(TreeNode* /*node*/) void Folder::slotChildDestroyed(TreeNode* node) { - d->tqchildren.remove(node); + d->children.remove(node); updateUnreadCount(); nodeModified(); } @@ -289,16 +289,16 @@ void Folder::slotChildDestroyed(TreeNode* node) void Folder::slotDeleteExpiredArticles() { setNotificationMode(false); - TQValueList<TreeNode*>::ConstIterator en = d->tqchildren.end(); - for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != en; ++it) + TQValueList<TreeNode*>::ConstIterator en = d->children.end(); + for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it) (*it)->slotDeleteExpiredArticles(); setNotificationMode(true, true); } void Folder::slotAddToFetchQueue(FetchQueue* queue, bool intervalFetchOnly) { - TQValueList<TreeNode*>::ConstIterator en = d->tqchildren.end(); - for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != en; ++it) + TQValueList<TreeNode*>::ConstIterator en = d->children.end(); + for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it) (*it)->slotAddToFetchQueue(queue, intervalFetchOnly); } diff --git a/akregator/src/folder.h b/akregator/src/folder.h index 6743dd573..f2a024dd6 100644 --- a/akregator/src/folder.h +++ b/akregator/src/folder.h @@ -61,18 +61,18 @@ namespace Akregator virtual bool accept(TreeNodeVisitor* visitor); - /** returns recursively concatenated articles of tqchildren - @return an article sequence containing articles of tqchildren */ + /** returns recursively concatenated articles of children + @return an article sequence containing articles of children */ virtual TQValueList<Article> articles(const TQString& tag=TQString()); /** returns a list of all tags occurring in the subtree of this folder */ virtual TQStringList tags() const; - /** returns the number of unread articles in all tqchildren + /** returns the number of unread articles in all children @return number of unread articles */ virtual int unread() const; - /** returns the number of articles in all tqchildren + /** returns the number of articles in all children @return number of articles */ virtual int totalCount() const; @@ -86,10 +86,10 @@ namespace Akregator @return The newly created element representing this feed group */ virtual TQDomElement toOPML( TQDomElement parent, TQDomDocument document ) const; - /** returns the (direct) tqchildren of this node. + /** returns the (direct) children of this node. @return a list of pointers to the child nodes */ - virtual TQValueList<TreeNode*> tqchildren() const; + virtual TQValueList<TreeNode*> children() const; /** inserts @c node as child after child node @c after. if @c after is not a child of this group, @c node will be inserted as first child @@ -105,7 +105,7 @@ namespace Akregator @param node the tree node to insert */ virtual void appendChild(TreeNode* node); - /** remove @c node from tqchildren. Note that @c node will not be deleted + /** remove @c node from children. Note that @c node will not be deleted @param node the child node to remove */ virtual void removeChild(TreeNode* node); @@ -134,7 +134,7 @@ namespace Akregator /** Delete expired articles recursively. */ virtual void slotDeleteExpiredArticles(); - /** Mark articles of tqchildren recursively as read. */ + /** Mark articles of children recursively as read. */ virtual void slotMarkAllArticlesAsRead(); /** Called when a child was modified. @@ -147,7 +147,7 @@ namespace Akregator */ virtual void slotChildDestroyed(TreeNode* node); - /** enqueues tqchildren recursively for fetching + /** enqueues children recursively for fetching @param queue a fetch queue @param internvalFetchesOnly */ virtual void slotAddToFetchQueue(FetchQueue* queue, bool intervalFetchesOnly=false); diff --git a/akregator/src/frame.cpp b/akregator/src/frame.cpp index 647f580cf..23cd86efd 100644 --- a/akregator/src/frame.cpp +++ b/akregator/src/frame.cpp @@ -23,7 +23,7 @@ */ #include <tqregexp.h> -#include <tqstylesheet.h> +#include <stylesheet.h> #include <kactioncollection.h> #include <kdebug.h> @@ -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..95dca1f6e 100644 --- a/akregator/src/kcursorsaver.h +++ b/akregator/src/kcursorsaver.h @@ -17,9 +17,9 @@ namespace Akregator { class KCursorSaver : public TQt { public: - /// constructor taking TQCursor tqshapes - KCursorSaver(TQt::tqCursorShape tqshape) { - TQApplication::setOverrideCursor( TQCursor(tqshape) ); + /// constructor taking TQCursor shapes + KCursorSaver(TQt::CursorShape shape) { + TQApplication::setOverrideCursor( TQCursor(shape) ); inited = true; } diff --git a/akregator/src/librss/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..bd8ce39b3 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(); @@ -239,7 +239,7 @@ TQString parseItemAuthor(const TQDomElement& element, Format format, Version ver name = email; if (!email.isNull()) - return TQString("<a href=\"mailto:%1\">%2</a>").tqarg(email).tqarg(name); + return TQString("<a href=\"mailto:%1\">%2</a>").arg(email).arg(name); else return name; } diff --git a/akregator/src/listtabwidget.cpp b/akregator/src/listtabwidget.cpp index a137f1fe7..59e713b5f 100644 --- a/akregator/src/listtabwidget.cpp +++ b/akregator/src/listtabwidget.cpp @@ -30,7 +30,7 @@ #include <kmultitabbar.h> #include <tqiconset.h> -#include <tqlayout.h> +#include <layout.h> #include <tqmap.h> #include <tqptrlist.h> #include <tqstring.h> @@ -52,7 +52,7 @@ public: int currentID; TQValueList<NodeListView*> views; TQMap<int, NodeListView*> idToView; - TQHBoxLayout* tqlayout; + TQHBoxLayout* layout; ViewMode viewMode; TQMap<TQWidget*, TQString> captions; }; @@ -125,7 +125,7 @@ void ListTabWidget::slotRootNodeChanged(NodeListView* view, TreeNode* node) if (unread > 0) { //uncomment this to append unread count - //d->tabWidget->changeTab(view, TQString("<qt>%1 (%2)").tqarg(d->captions[view]).tqarg(node->unread())); + //d->tabWidget->changeTab(view, TQString("<qt>%1 (%2)").arg(d->captions[view]).arg(node->unread())); d->tabWidget->changeTab(view, d->captions[view]); } else @@ -158,17 +158,17 @@ ListTabWidget::ListTabWidget(TQWidget* parent, const char* name) : TQWidget(pare d->current = 0; d->currentID = -1; d->viewMode = verticalTabs; - d->tqlayout = new TQHBoxLayout(this); - //d->tqlayout = new TQGridLayout(this, 1, 2); + d->layout = new TQHBoxLayout(this); + //d->layout = new TQGridLayout(this, 1, 2); d->tabBar = new KMultiTabBar(KMultiTabBar::Vertical, this); d->tabBar->setStyle(KMultiTabBar::KDEV3ICON); //d->tabBar->setStyle(KMultiTabBar::KDEV3); d->tabBar->showActiveTabTexts(true); d->tabBar->setPosition(KMultiTabBar::Left); - d->tqlayout->addWidget(d->tabBar/*, 0, 0*/); + d->layout->addWidget(d->tabBar/*, 0, 0*/); d->stack = new TQWidgetStack(this); - d->tqlayout->addWidget(d->stack/*, 0, 1*/); + d->layout->addWidget(d->stack/*, 0, 1*/); // connect(d->tabBar, TQT_SIGNAL(currentChanged(TQWidget*)), this, TQT_SLOT(slotCurrentChanged(TQWidget*))); } 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/metakit/CHANGES b/akregator/src/mk4storage/metakit/CHANGES index 4f167afbc..160c4bad9 100644 --- a/akregator/src/mk4storage/metakit/CHANGES +++ b/akregator/src/mk4storage/metakit/CHANGES @@ -211,9 +211,9 @@ One was in SCXX, PWONumber.h - ouch and apologies (jcw). Changed comparison logic in mk4too.cpp (64-bit ints, new code). -2003-02-28 Fixed relaxed tqlayout in Mk4tcl, several Mk4py fixes +2003-02-28 Fixed relaxed layout in Mk4tcl, several Mk4py fixes - Use list operators to convert a Tcl tqlayout to MK format. This used + Use list operators to convert a Tcl layout to MK format. This used to crash, Tcl test 6.7 added to verify the fix. Changed test 3.1 to use a different notation for nested defs (^). @@ -605,13 +605,13 @@ c4_Storage::SaveTo function, memo's would sometimes not be written, leading to a *damaged* datafile (and incorrect free-space tracking). -2002-03-15 Better configure logic, "mk::view tqlayout" fix +2002-03-15 Better configure logic, "mk::view layout" fix Many tweaks to configures, makes, and libtool setup. Get rid of the library version numbers and the special Mk4*.so targets. Instead of Mk4tcl.so use libmk4tcl.so (likewise Mk4py.so is now libmk4py.so). - Fixed "mk::view tqlayout", it was broken by the 10-2-2002 change. + Fixed "mk::view layout", it was broken by the 10-2-2002 change. 2002-03-13 Extend partial access 'B' usage @@ -658,9 +658,9 @@ causing it to detach empty top-level views, even when in use. Fixed, added s39 to test for this case. -2002-02-10 Improve Mk4tcl's "mk::view tqlayout" +2002-02-10 Improve Mk4tcl's "mk::view layout" - Avoid crash when asking for the tqlayout of a non-existent view. Now + Avoid crash when asking for the layout of a non-existent view. Now returns an error instead. 2002-02-07 Fast commit with many empty subviews @@ -996,9 +996,9 @@ M-solaris.sh and M-dyn.sh scripts need to be manually edited when choosing between CC and gcc. -2001-03-27 Double-tqalignment bug on Solaris +2001-03-27 Double-alignment bug on Solaris - Two changes (c4_Bytes in mk4.h and src/column.h) to fix an tqalignment + Two changes (c4_Bytes in mk4.h and src/column.h) to fix an alignment problem for 8-byte doubles on Solaris. This caused tests b17, b23, b24, s22, and s28 to fail. @@ -1084,7 +1084,7 @@ 2000-10-03 Fixes for Alpha Unix - Moved _item in column.h up to fix tqalignment sensitivity. Config.h + Moved _item in column.h up to fix alignment sensitivity. Config.h did not get SIZE_LONG right on Alpha Unix (0?). 2000-09-27 Contributed fixes and Python 2.0b2 @@ -1614,7 +1614,7 @@ new version in c4_Sequence allocate the c4_Bytes object lazily. Faster, and decreases sequence object size (for lots of subviews). - Mk4tcl, mk::tqlayout now returns the proper tqlayout even if the views + Mk4tcl, mk::layout now returns the proper layout even if the views are empty. Solved by adding extra arg to c4_Storage::Description, to return structure of a single top-level view. Fixes "mk8basic.1", and the returned string now has one bogus list layer stripped off. diff --git a/akregator/src/mk4storage/metakit/README b/akregator/src/mk4storage/metakit/README index 314c956b9..21edd0fc2 100644 --- a/akregator/src/mk4storage/metakit/README +++ b/akregator/src/mk4storage/metakit/README @@ -40,7 +40,7 @@ WEBSITE URLS - The main pages on the world wide web, for news and downloads: License info: http://www.equi4.com/mklicense.html Contact info: http://www.equi4.com/contact.html -ACKNOWLEDGEMENTS - Thanks to everyone who has helped tqshape and extend Metakit, +ACKNOWLEDGEMENTS - Thanks to everyone who has helped shape and extend Metakit, including Kyrill Denisenko, Mark Roseman, Gordon McMillan, Matt Newman, Christian Tismer, John Bushakra, Steve Landers, Jacob Levy, John Barnard, Nicholas Riley, Brian Kelley, and many more people who have reported bugs diff --git a/akregator/src/mk4storage/metakit/src/column.h b/akregator/src/mk4storage/metakit/src/column.h index 96d1622ef..3f6e4f157 100644 --- a/akregator/src/mk4storage/metakit/src/column.h +++ b/akregator/src/mk4storage/metakit/src/column.h @@ -169,7 +169,7 @@ private: tSetter _setter; union { - t4_byte _item[8]; // holds temp result (careful with tqalignment!) + t4_byte _item[8]; // holds temp result (careful with alignment!) double _aligner; // needed for SPARC }; diff --git a/akregator/src/mk4storage/metakit/tests/regress.cpp b/akregator/src/mk4storage/metakit/tests/regress.cpp index 2cd5f0841..0725f57f5 100644 --- a/akregator/src/mk4storage/metakit/tests/regress.cpp +++ b/akregator/src/mk4storage/metakit/tests/regress.cpp @@ -100,7 +100,7 @@ main() } // Recursively display the entire view contents. The results shown do not -// depend on file tqlayout (free space, file positions, flat vs. on-demand). +// depend on file layout (free space, file positions, flat vs. on-demand). static void ViewDisplay(const c4_View& v_, FILE* fp, int l_ =0) { diff --git a/akregator/src/mk4storage/mk4confwidgetbase.ui b/akregator/src/mk4storage/mk4confwidgetbase.ui index e2b8c63a3..c5c837a5b 100644 --- a/akregator/src/mk4storage/mk4confwidgetbase.ui +++ b/akregator/src/mk4storage/mk4confwidgetbase.ui @@ -27,7 +27,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <vbox> <property name="name"> @@ -46,7 +46,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -74,7 +74,7 @@ </widget> <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -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/nodelist.cpp b/akregator/src/nodelist.cpp index 6bcee5f6d..e79acb20d 100644 --- a/akregator/src/nodelist.cpp +++ b/akregator/src/nodelist.cpp @@ -165,9 +165,9 @@ void NodeList::clear() { Q_ASSERT(rootNode()); - TQValueList<TreeNode*> tqchildren = rootNode()->tqchildren(); + TQValueList<TreeNode*> children = rootNode()->children(); - for (TQValueList<TreeNode*>::ConstIterator it = tqchildren.begin(); it != tqchildren.end(); ++it) + for (TQValueList<TreeNode*>::ConstIterator it = children.begin(); it != children.end(); ++it) delete *it; // emits signal "emitSignalDestroyed" } diff --git a/akregator/src/notificationmanager.cpp b/akregator/src/notificationmanager.cpp index ce4251b87..6220e97c0 100644 --- a/akregator/src/notificationmanager.cpp +++ b/akregator/src/notificationmanager.cpp @@ -76,7 +76,7 @@ void NotificationManager::slotNotifyFeeds(const TQStringList& feeds) if (feeds.count() == 1) { KNotifyClient::Instance inst(m_instance); - KNotifyClient::event(m_widget->winId(), "feed_added", i18n("Feed added:\n %1").tqarg(feeds[0])); + KNotifyClient::event(m_widget->winId(), "feed_added", i18n("Feed added:\n %1").arg(feeds[0])); } else if (feeds.count() > 1) { @@ -84,7 +84,7 @@ void NotificationManager::slotNotifyFeeds(const TQStringList& feeds) for (TQStringList::ConstIterator it = feeds.begin(); it != feeds.end(); ++it) message += *it + "\n"; KNotifyClient::Instance inst(m_instance); - KNotifyClient::event(m_widget->winId(), "feed_added", i18n("Feeds added:\n %1").tqarg(message)); + KNotifyClient::event(m_widget->winId(), "feed_added", i18n("Feeds added:\n %1").arg(message)); } } @@ -99,7 +99,7 @@ void NotificationManager::doNotify() if (feedTitle != (*it).feed()->title()) { feedTitle = (*it).feed()->title(); - message += TQString("<p><b>%1:</b></p>").tqarg(feedTitle); + message += TQString("<p><b>%1:</b></p>").arg(feedTitle); } message += (*it).title() + "<br>"; } diff --git a/akregator/src/pageviewer.cpp b/akregator/src/pageviewer.cpp index 7a0423913..df96d80fe 100644 --- a/akregator/src/pageviewer.cpp +++ b/akregator/src/pageviewer.cpp @@ -44,7 +44,7 @@ #include <kstdaccel.h> #include <kparts/browserinterface.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqcstring.h> #include <tqdatastream.h> #include <tqdatetime.h> @@ -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/pluginmanager.cpp b/akregator/src/pluginmanager.cpp index 108fcf9b1..d12016d45 100644 --- a/akregator/src/pluginmanager.cpp +++ b/akregator/src/pluginmanager.cpp @@ -92,8 +92,8 @@ PluginManager::createFromService( const KService::Ptr service ) if ( !lib ) { KMessageBox::error( 0, i18n( "<p>KLibLoader could not load the plugin:<br/><i>%1</i></p>" "<p>Error message:<br/><i>%2</i></p>" ) - .tqarg( service->library() ) - .tqarg( loader->lastErrorMessage() ) ); + .arg( service->library() ) + .arg( loader->lastErrorMessage() ) ); return 0; } //look up address of init function and cast it to pointer-to-function @@ -167,12 +167,12 @@ PluginManager::showAbout( const TQString &constraint ) TQString str = "<html><body><table width=\"100%\" border=\"1\">"; - str += body.tqarg( i18n( "Name" ), s->name() ); - str += body.tqarg( i18n( "Library" ), s->library() ); - str += body.tqarg( i18n( "Authors" ), s->property( "X-KDE-akregator-authors" ).toStringList().join( "\n" ) ); - str += body.tqarg( i18n( "Email" ), s->property( "X-KDE-akregator-email" ).toStringList().join( "\n" ) ); - str += body.tqarg( i18n( "Version" ), s->property( "X-KDE-akregator-version" ).toString() ); - str += body.tqarg( i18n( "Framework Version" ), s->property( "X-KDE-akregator-framework-version" ).toString() ); + str += body.arg( i18n( "Name" ), s->name() ); + str += body.arg( i18n( "Library" ), s->library() ); + str += body.arg( i18n( "Authors" ), s->property( "X-KDE-akregator-authors" ).toStringList().join( "\n" ) ); + str += body.arg( i18n( "Email" ), s->property( "X-KDE-akregator-email" ).toStringList().join( "\n" ) ); + str += body.arg( i18n( "Version" ), s->property( "X-KDE-akregator-version" ).toString() ); + str += body.arg( i18n( "Framework Version" ), s->property( "X-KDE-akregator-framework-version" ).toString() ); str += "</table></body></html>"; diff --git a/akregator/src/progressmanager.cpp b/akregator/src/progressmanager.cpp index 7831a24fd..b83faca32 100644 --- a/akregator/src/progressmanager.cpp +++ b/akregator/src/progressmanager.cpp @@ -23,7 +23,7 @@ */ #include <tqmap.h> -#include <tqstylesheet.h> +#include <stylesheet.h> #include <klocale.h> #include <kstaticdeleter.h> @@ -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/propertiesdialog.cpp b/akregator/src/propertiesdialog.cpp index b5b732bae..a0f13c479 100644 --- a/akregator/src/propertiesdialog.cpp +++ b/akregator/src/propertiesdialog.cpp @@ -102,7 +102,7 @@ void FeedPropertiesDialog::slotSetCaption(const TQString& c) if(c.isEmpty()) setCaption(i18n("Feed Properties")); else - setCaption(i18n("Properties of %1").tqarg(c)); + setCaption(i18n("Properties of %1").arg(c)); } diff --git a/akregator/src/propertieswidgetbase.ui b/akregator/src/propertieswidgetbase.ui index 14adeb001..4ab1ea910 100644 --- a/akregator/src/propertieswidgetbase.ui +++ b/akregator/src/propertieswidgetbase.ui @@ -39,7 +39,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <grid> <property name="name"> @@ -100,7 +100,7 @@ </widget> <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <hbox> <property name="name"> @@ -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> @@ -362,7 +362,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <vbox> <property name="name"> @@ -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..68107e398 100644 --- a/akregator/src/settings_archive.ui +++ b/akregator/src/settings_archive.ui @@ -25,7 +25,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <vbox> <property name="name"> @@ -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..b40d1c27a 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> @@ -96,7 +96,7 @@ </spacer> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <grid> <property name="name"> 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/simplenodeselector.cpp b/akregator/src/simplenodeselector.cpp index 5370bebef..1bceb6722 100644 --- a/akregator/src/simplenodeselector.cpp +++ b/akregator/src/simplenodeselector.cpp @@ -31,7 +31,7 @@ #include <klistview.h> #include <klocale.h> -#include <tqlayout.h> +#include <layout.h> #include <tqmap.h> #include <tqwidget.h> @@ -102,9 +102,9 @@ class SimpleNodeSelector::NodeVisitor : public TreeNodeVisitor virtual bool visitFolder(Folder* node) { visitTreeNode(node); - TQValueList<TreeNode*> tqchildren = node->tqchildren(); + TQValueList<TreeNode*> children = node->children(); m_view->d->nodeToItem[node]->setExpandable(true); - for (TQValueList<TreeNode*>::ConstIterator it = tqchildren.begin(); it != tqchildren.end(); ++it) + for (TQValueList<TreeNode*>::ConstIterator it = children.begin(); it != children.end(); ++it) createItems(*it); return true; } @@ -142,8 +142,8 @@ SimpleNodeSelector::SimpleNodeSelector(FeedList* feedList, TQWidget* parent, con connect(d->view, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(slotItemSelected(TQListViewItem*))); - TQGridLayout* tqlayout = new TQGridLayout(this, 1, 1); - tqlayout->addWidget(d->view, 0, 0); + TQGridLayout* layout = new TQGridLayout(this, 1, 1); + layout->addWidget(d->view, 0, 0); d->visitor = new NodeVisitor(this); diff --git a/akregator/src/tabwidget.cpp b/akregator/src/tabwidget.cpp index be7857b6a..7132bcec4 100644 --- a/akregator/src/tabwidget.cpp +++ b/akregator/src/tabwidget.cpp @@ -27,7 +27,7 @@ #include <tqstyle.h> #include <tqapplication.h> #include <tqiconset.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqmap.h> #include <tqptrdict.h> #include <tqstring.h> @@ -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() ) @@ -288,8 +288,8 @@ void TabWidget::slotCopyLinkAddress() url = view->part()->url(); - kapp->tqclipboard()->setText(url.prettyURL(), TQClipboard::Selection); - kapp->tqclipboard()->setText(url.prettyURL(), TQClipboard::Clipboard); + kapp->clipboard()->setText(url.prettyURL(), TQClipboard::Selection); + kapp->clipboard()->setText(url.prettyURL(), TQClipboard::Clipboard); } void TabWidget::slotCloseTab() diff --git a/akregator/src/tag.h b/akregator/src/tag.h index d215eb8f2..4e1e02228 100644 --- a/akregator/src/tag.h +++ b/akregator/src/tag.h @@ -81,7 +81,7 @@ class Tag bool isNull() const; - /** tag identifier, used as key throughout the app and archive. Must be unique in the tag set. Can be an arbitrary tqunicode string, an URI etc. */ + /** tag identifier, used as key throughout the app and archive. Must be unique in the tag set. Can be an arbitrary unicode string, an URI etc. */ TQString id() const; /** user-visible name of the tag */ 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..e6b4c34be 100644 --- a/akregator/src/tagpropertieswidgetbase.ui +++ b/akregator/src/tagpropertieswidgetbase.ui @@ -22,7 +22,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -53,7 +53,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>31</height> @@ -62,7 +62,7 @@ </spacer> <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <hbox> <property name="name"> @@ -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/akregator/src/trayicon.cpp b/akregator/src/trayicon.cpp index 8bfb78958..31ced17a8 100644 --- a/akregator/src/trayicon.cpp +++ b/akregator/src/trayicon.cpp @@ -116,7 +116,7 @@ TQPixmap TrayIcon::takeScreenshot() const // Paint the border const int BORDER = 1; TQPixmap finalShot(w + 2*BORDER, h + 2*BORDER); - finalShot.fill(KApplication::tqpalette().active().foreground()); + finalShot.fill(KApplication::palette().active().foreground()); painter.begin(&finalShot); painter.drawPixmap(BORDER, BORDER, shot); painter.end(); diff --git a/akregator/src/treenode.cpp b/akregator/src/treenode.cpp index 9cc716b45..a4ae0936e 100644 --- a/akregator/src/treenode.cpp +++ b/akregator/src/treenode.cpp @@ -93,23 +93,23 @@ TreeNode* TreeNode::nextSibling() const { if (!d->parent) return 0; - TQValueList<TreeNode*> tqchildren = d->parent->tqchildren(); + TQValueList<TreeNode*> children = d->parent->children(); TreeNode* me = (TreeNode*)this; - int idx = tqchildren.findIndex(me); + int idx = children.findIndex(me); - return idx+1 < tqchildren.size() ? *(tqchildren.at(idx+1)) : 0L; + return idx+1 < children.size() ? *(children.at(idx+1)) : 0L; } TreeNode* TreeNode::prevSibling() const { if (!d->parent) return 0; - TQValueList<TreeNode*> tqchildren = d->parent->tqchildren(); + TQValueList<TreeNode*> children = d->parent->children(); TreeNode* me = (TreeNode*)this; - int idx = tqchildren.findIndex(me); - return idx > 0 ? *(d->parent->tqchildren().at(idx-1)) : 0L; + int idx = children.findIndex(me); + return idx > 0 ? *(d->parent->children().at(idx-1)) : 0L; } Folder* TreeNode::parent() const diff --git a/akregator/src/treenodeitem.cpp b/akregator/src/treenodeitem.cpp index 32b12c9c5..3299e2783 100644 --- a/akregator/src/treenodeitem.cpp +++ b/akregator/src/treenodeitem.cpp @@ -105,7 +105,7 @@ FolderItem* TreeNodeItem::parent() const } -// TODO: reverse for reverse tqlayout +// TODO: reverse for reverse layout void TreeNodeItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int align ) diff --git a/akregator/src/viewer.cpp b/akregator/src/viewer.cpp index d24e715f8..d108d2632 100644 --- a/akregator/src/viewer.cpp +++ b/akregator/src/viewer.cpp @@ -38,7 +38,7 @@ #include <kparts/browserextension.h> #include <tqaccel.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqpaintdevicemetrics.h> #include "viewer.h" @@ -203,7 +203,7 @@ void Viewer::slotCopy() { TQString text = selectedText(); text.replace( TQChar( 0xa0 ), ' ' ); - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); disconnect( cb, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotClearSelection() ) ); cb->setText(text); connect( cb, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotClearSelection() ) ); @@ -212,7 +212,7 @@ void Viewer::slotCopy() void Viewer::slotCopyLinkAddress() { if(m_url.isEmpty()) return; - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); cb->setText(m_url.prettyURL(), TQClipboard::Clipboard); cb->setText(m_url.prettyURL(), TQClipboard::Selection); } 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/certificateinfowidgetimpl.cpp b/certmanager/certificateinfowidgetimpl.cpp index 1cf5a2b4b..7c9a2467e 100644 --- a/certmanager/certificateinfowidgetimpl.cpp +++ b/certmanager/certificateinfowidgetimpl.cpp @@ -56,14 +56,14 @@ // TQt #include <tqlistview.h> -#include <tqtextedit.h> +#include <textedit.h> #include <tqheader.h> #include <tqpushbutton.h> #include <tqcursor.h> #include <tqapplication.h> #include <tqdatetime.h> -#include <tqstylesheet.h> -#include <tqtextcodec.h> +#include <stylesheet.h> +#include <textcodec.h> // other #include <assert.h> @@ -126,7 +126,7 @@ void CertificateInfoWidgetImpl::setKey( const GpgME::Key & key ) { TQListViewItem * item = 0; item = new TQListViewItem( listView, item, i18n("Valid"), TQString("From %1 to %2") - .tqarg( time_t2string( key.subkey(0).creationTime() ), + .arg( time_t2string( key.subkey(0).creationTime() ), time_t2string( key.subkey(0).expirationTime() ) ) ); item = new TQListViewItem( listView, item, i18n("Can be used for signing"), key.canSign() ? i18n("Yes") : i18n("No") ); @@ -187,7 +187,7 @@ static void showChainListError( TQWidget * parent, const GpgME::Error & err, con const TQString msg = i18n("<qt><p>An error occurred while fetching " "the certificate <b>%1</b> from the backend:</p>" "<p><b>%2</b></p></qt>") - .tqarg( subject ? TQString::fromUtf8( subject ) : TQString(), + .arg( subject ? TQString::fromUtf8( subject ) : TQString(), TQString::fromLocal8Bit( err.asString() ) ); KMessageBox::error( parent, msg, i18n("Certificate Listing Failed" ) ); } @@ -266,7 +266,7 @@ void CertificateInfoWidgetImpl::startCertificateDump() { this, TQT_SLOT( slotDumpProcessExited(KProcess*) ) ); if ( !proc->start( KProcess::NotifyOnExit, (KProcess::Communication)(KProcess::Stdout | KProcess::Stderr) ) ) { - TQString wmsg = i18n("Failed to execute gpgsm:\n%1").tqarg( i18n( "program not found" ) ); + TQString wmsg = i18n("Failed to execute gpgsm:\n%1").arg( i18n( "program not found" ) ); dumpView->setText( TQStyleSheet::escape( wmsg ) ); delete proc; } @@ -294,9 +294,9 @@ void CertificateInfoWidgetImpl::slotDumpProcessExited(KProcess* proc) { { TQString wmsg = i18n("Failed to execute gpgsm:\n%1"); if ( rc == -1 ) - wmsg = wmsg.tqarg( i18n( "program cannot be executed" ) ); + wmsg = wmsg.arg( i18n( "program cannot be executed" ) ); else - wmsg = wmsg.tqarg( strerror(rc) ); + wmsg = wmsg.arg( strerror(rc) ); dumpView->setText( TQStyleSheet::escape( wmsg ) ); } } @@ -328,7 +328,7 @@ void CertificateInfoWidgetImpl::updateChainView() { item = new TQListViewItem( pathView, Kleo::DN( (*it++).userID(0).id() ).prettyDN() ); else { item = new TQListViewItem( pathView, i18n("Issuer certificate not found ( %1)") - .tqarg( Kleo::DN( (*it).issuerName() ).prettyDN() ) ); + .arg( Kleo::DN( (*it).issuerName() ).prettyDN() ) ); item->setOpen( true ); // TQt bug: doesn't open after setEnabled( false ) :/ item->setEnabled( false ); } diff --git a/certmanager/certificatewizard.ui b/certmanager/certificatewizard.ui index b0c2626a1..54b5f877d 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> @@ -82,7 +82,7 @@ The key pair will be generated in a decentralized manner. Please contact your lo <property name="text"> <string>On this page, you will configure the cryptographic key length and the type of certificate to create.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -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> @@ -226,7 +226,7 @@ The key pair will be generated in a decentralized manner. Please contact your lo <property name="text"> <string>On this page, you will enter some personal data that will be stored in your certificate and that will help other people to determine that it is actually you who is sending a message.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -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> @@ -322,7 +322,7 @@ Once you are done with your settings, click a kmail composer will be opened; you can add detailed information for the CA there.</p><qt></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -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> @@ -485,7 +485,7 @@ Your key pair has now been created and stored locally. The corresponding certifi If you want to change anything, press Back and make your changes; otherwise, press Finish to send the certificate request to the CA. </qt></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> diff --git a/certmanager/certificatewizardimpl.cpp b/certmanager/certificatewizardimpl.cpp index d24c7df99..cc9dadab3 100644 --- a/certmanager/certificatewizardimpl.cpp +++ b/certmanager/certificatewizardimpl.cpp @@ -65,11 +65,11 @@ // TQt #include <tqlineedit.h> -#include <tqtextedit.h> +#include <textedit.h> #include <tqpushbutton.h> #include <tqcheckbox.h> #include <tqradiobutton.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqcombobox.h> @@ -88,10 +88,10 @@ static TQString attributeLabel( const TQString & attr, bool required ) { if ( !label.isEmpty() ) if ( required ) return i18n("Format string for the labels in the \"Your Personal Data\" page - required field", - "*%1 (%2):").tqarg( label, attr ); + "*%1 (%2):").arg( label, attr ); else return i18n("Format string for the labels in the \"Your Personal Data\" page", - "%1 (%2):").tqarg( label, attr ); + "%1 (%2):").arg( label, attr ); else if ( required ) return '*' + attr + ':'; @@ -196,7 +196,7 @@ void CertificateWizardImpl::slotGenerateCertificate() TQString certParms; certParms += "<GnupgKeyParms format=\"internal\">\n"; certParms += "Key-Type: RSA\n"; - certParms += TQString( "Key-Length: %1\n" ).tqarg( keyLengths[keyLengthCB->currentItem()] ); + certParms += TQString( "Key-Length: %1\n" ).arg( keyLengths[keyLengthCB->currentItem()] ); certParms += "Key-Usage: "; if ( signOnlyCB->isChecked() ) certParms += "Sign"; @@ -255,7 +255,7 @@ void CertificateWizardImpl::slotGenerateCertificate() if ( err ) KMessageBox::error( this, i18n( "Could not start certificate generation: %1" ) - .tqarg( TQString::fromLocal8Bit( err.asString() ) ), + .arg( TQString::fromLocal8Bit( err.asString() ) ), i18n( "Certificate Manager Error" ) ); else { generatePB->setEnabled( false ); @@ -278,7 +278,7 @@ void CertificateWizardImpl::slotResult( const GpgME::KeyGenerationResult & res, if ( !res.error().isCanceled() ) KMessageBox::error( this, i18n( "Could not generate certificate: %1" ) - .tqarg( TQString::tqfromLatin1( res.error().asString() ) ), + .arg( TQString::fromLatin1( res.error().asString() ) ), i18n( "Certificate Manager Error" ) ); } else { // next will stay enabled until the user clicks Generate @@ -434,7 +434,7 @@ void CertificateWizardImpl::sendCertificate( const TQString& email, const TQByte if ( result != 0 ) { kdDebug() << "Couldn't connect to KMail\n"; KMessageBox::error( this, - i18n( "DCOP Communication Error, unable to send certificate using KMail.\n%1" ).tqarg( error ) ); + i18n( "DCOP Communication Error, unable to send certificate using KMail.\n%1" ).arg( error ) ); return; } @@ -481,7 +481,7 @@ void CertificateWizardImpl::accept() if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel( this, i18n( "A file named \"%1\" already exists. " - "Are you sure you want to overwrite it?" ).tqarg( url.prettyURL() ), + "Are you sure you want to overwrite it?" ).arg( url.prettyURL() ), i18n( "Overwrite File?" ), i18n( "&Overwrite" ) ) ) return; diff --git a/certmanager/certmanager.cpp b/certmanager/certmanager.cpp index 6d9557031..fdf33f3a6 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; } @@ -523,7 +523,7 @@ void CertManager::slotRefreshKeysResult( const GpgME::Error & err ) { return; if ( err ) KMessageBox::error( this, i18n("An error occurred while trying to refresh " - "keys:\n%1").tqarg( TQString::fromLocal8Bit( err.asString() ) ), + "keys:\n%1").arg( TQString::fromLocal8Bit( err.asString() ) ), i18n("Refreshing Keys Failed") ); } @@ -532,7 +532,7 @@ static void showKeyListError( TQWidget * parent, const GpgME::Error & err ) { const TQString msg = i18n( "<qt><p>An error occurred while fetching " "the certificates from the backend:</p>" "<p><b>%1</b></p></qt>" ) - .tqarg( TQString::fromLocal8Bit( err.asString() ) ); + .arg( TQString::fromLocal8Bit( err.asString() ) ); KMessageBox::error( parent, msg, i18n( "Certificate Listing Failed" ) ); } @@ -705,8 +705,8 @@ static void showCertificateDownloadError( TQWidget * parent, const GpgME::Error const TQString msg = i18n( "<qt><p>An error occurred while trying " "to download the certificate %1:</p>" "<p><b>%2</b></p></qt>" ) - .tqarg( certDisplayName ) - .tqarg( TQString::fromLocal8Bit( err.asString() ) ); + .arg( certDisplayName ) + .arg( TQString::fromLocal8Bit( err.asString() ) ); KMessageBox::error( parent, msg, i18n( "Certificate Download Failed" ) ); } @@ -773,8 +773,8 @@ static void showCertificateImportError( TQWidget * parent, const GpgME::Error & const TQString msg = i18n( "<qt><p>An error occurred while trying " "to import the certificate %1:</p>" "<p><b>%2</b></p></qt>" ) - .tqarg( certDisplayName ) - .tqarg( TQString::fromLocal8Bit( err.asString() ) ); + .arg( certDisplayName ) + .arg( TQString::fromLocal8Bit( err.asString() ) ); KMessageBox::error( parent, msg, i18n( "Certificate Import Failed" ) ); } @@ -810,50 +810,50 @@ void CertManager::slotCertificateImportResult( const GpgME::ImportResult & res ) const TQString boldLine = i18n("<tr><td align=\"right\"><b>%1</b></td><td>%2</td></tr>"); TQStringList lines; - lines.push_back( normalLine.tqarg( i18n("Total number processed:"), + lines.push_back( normalLine.arg( i18n("Total number processed:"), TQString::number( res.numConsidered() ) ) ); - lines.push_back( normalLine.tqarg( i18n("Imported:"), + lines.push_back( normalLine.arg( i18n("Imported:"), TQString::number( res.numImported() ) ) ); if ( res.newSignatures() ) - lines.push_back( normalLine.tqarg( i18n("New signatures:"), + lines.push_back( normalLine.arg( i18n("New signatures:"), TQString::number( res.newSignatures() ) ) ); if ( res.newUserIDs() ) - lines.push_back( normalLine.tqarg( i18n("New user IDs:"), + lines.push_back( normalLine.arg( i18n("New user IDs:"), TQString::number( res.newUserIDs() ) ) ); if ( res.numKeysWithoutUserID() ) - lines.push_back( normalLine.tqarg( i18n("Keys without user IDs:"), + lines.push_back( normalLine.arg( i18n("Keys without user IDs:"), TQString::number( res.numKeysWithoutUserID() ) ) ); if ( res.newSubkeys() ) - lines.push_back( normalLine.tqarg( i18n("New subkeys:"), + lines.push_back( normalLine.arg( i18n("New subkeys:"), TQString::number( res.newSubkeys() ) ) ); if ( res.newRevocations() ) - lines.push_back( boldLine.tqarg( i18n("Newly revoked:"), + lines.push_back( boldLine.arg( i18n("Newly revoked:"), TQString::number( res.newRevocations() ) ) ); if ( res.notImported() ) - lines.push_back( boldLine.tqarg( i18n("Not imported:"), + lines.push_back( boldLine.arg( i18n("Not imported:"), TQString::number( res.notImported() ) ) ); if ( res.numUnchanged() ) - lines.push_back( normalLine.tqarg( i18n("Unchanged:"), + lines.push_back( normalLine.arg( i18n("Unchanged:"), TQString::number( res.numUnchanged() ) ) ); if ( res.numSecretKeysConsidered() ) - lines.push_back( normalLine.tqarg( i18n("Secret keys processed:"), + lines.push_back( normalLine.arg( i18n("Secret keys processed:"), TQString::number( res.numSecretKeysConsidered() ) ) ); if ( res.numSecretKeysImported() ) - lines.push_back( normalLine.tqarg( i18n("Secret keys imported:"), + lines.push_back( normalLine.arg( i18n("Secret keys imported:"), TQString::number( res.numSecretKeysImported() ) ) ); if ( res.numSecretKeysConsidered() - res.numSecretKeysImported() - res.numSecretKeysUnchanged() > 0 ) - lines.push_back( boldLine.tqarg( i18n("Secret keys <em>not</em> imported:"), + lines.push_back( boldLine.arg( i18n("Secret keys <em>not</em> imported:"), TQString::number( res.numSecretKeysConsidered() - res.numSecretKeysImported() - res.numSecretKeysUnchanged() ) ) ); if ( res.numSecretKeysUnchanged() ) - lines.push_back( normalLine.tqarg( i18n("Secret keys unchanged:"), + lines.push_back( normalLine.arg( i18n("Secret keys unchanged:"), TQString::number( res.numSecretKeysUnchanged() ) ) ); KMessageBox::information( this, i18n( "<qt><p>Detailed results of importing %1:</p>" "<table>%2</table></qt>" ) - .tqarg( displayName ).tqarg( lines.join( TQString() ) ), + .arg( displayName ).arg( lines.join( TQString() ) ), i18n( "Certificate Import Result" ) ); disconnectJobFromStatusBarProgress( res.error() ); @@ -875,7 +875,7 @@ void CertManager::slotDirmngrExited() { if ( !mDirmngrProc->normalExit() ) KMessageBox::error( this, i18n( "The GpgSM process that tried to import the CRL file ended prematurely because of an unexpected error." ), i18n( "Certificate Manager Error" ) ); else if ( mDirmngrProc->exitStatus() ) - KMessageBox::error( this, i18n( "An error occurred when trying to import the CRL file. The output from GpgSM was:\n%1").tqarg( mErrorbuffer ), i18n( "Certificate Manager Error" ) ); + KMessageBox::error( this, i18n( "An error occurred when trying to import the CRL file. The output from GpgSM was:\n%1").arg( mErrorbuffer ), i18n( "Certificate Manager Error" ) ); else KMessageBox::information( this, i18n( "CRL file imported successfully." ), i18n( "Certificate Manager Information" ) ); @@ -935,7 +935,7 @@ bool CertManager::connectAndStartDirmngr( const char * slot, const char * proces this, TQT_SLOT(slotStderr(KProcess*,char*,int)) ); if( !mDirmngrProc->start( KProcess::NotifyOnExit, KProcess::Stderr ) ) { delete mDirmngrProc; mDirmngrProc = 0; - KMessageBox::error( this, i18n( "Unable to start %1 process. Please check your installation." ).tqarg( processname ), i18n( "Certificate Manager Error" ) ); + KMessageBox::error( this, i18n( "Unable to start %1 process. Please check your installation." ).arg( processname ), i18n( "Certificate Manager Error" ) ); return false; } return true; @@ -992,7 +992,7 @@ void CertManager::slotClearCRLsResult() { if ( !mDirmngrProc->normalExit() ) KMessageBox::error( this, i18n( "The DirMngr process that tried to clear the CRL cache ended prematurely because of an unexpected error." ), i18n( "Certificate Manager Error" ) ); else if ( mDirmngrProc->exitStatus() ) - KMessageBox::error( this, i18n( "An error occurred when trying to clear the CRL cache. The output from DirMngr was:\n%1").tqarg( mErrorbuffer ), i18n( "Certificate Manager Error" ) ); + KMessageBox::error( this, i18n( "An error occurred when trying to clear the CRL cache. The output from DirMngr was:\n%1").arg( mErrorbuffer ), i18n( "Certificate Manager Error" ) ); else KMessageBox::information( this, i18n( "CRL cache cleared successfully." ), i18n( "Certificate Manager Information" ) ); delete mDirmngrProc; mDirmngrProc = 0; @@ -1003,7 +1003,7 @@ static void showDeleteError( TQWidget * parent, const GpgME::Error & err ) { const TQString msg = i18n("<qt><p>An error occurred while trying to delete " "the certificates:</p>" "<p><b>%1</b></p></qt>") - .tqarg( TQString::fromLocal8Bit( err.asString() ) ); + .arg( TQString::fromLocal8Bit( err.asString() ) ); KMessageBox::error( parent, msg, i18n("Certificate Deletion Failed") ); } @@ -1076,7 +1076,7 @@ void CertManager::slotDeleteCertificate() { const TQString msg = keysToDelete.size() > keys.size() ? i18n("Do you really want to delete this certificate and the %1 certificates it certified?", "Do you really want to delete these %n certificates and the %1 certificates they certified?", - keys.size() ).tqarg( keysToDelete.size() - keys.size() ) + keys.size() ).arg( keysToDelete.size() - keys.size() ) : i18n("Do you really want to delete this certificate?", "Do you really want to delete these %n certificates?", keys.size() ) ; @@ -1098,7 +1098,7 @@ void CertManager::slotDeleteCertificate() { "the certificates:</p>" "<p><b>%1</b><p></qt>" ); KMessageBox::error( this, - str.tqarg( i18n("Operation not supported by the backend.") ), + str.arg( i18n("Operation not supported by the backend.") ), i18n("Certificate Deletion Failed") ); } @@ -1206,7 +1206,7 @@ static void showCertificateExportError( TQWidget * parent, const GpgME::Error & const TQString msg = i18n("<qt><p>An error occurred while trying to export " "the certificate:</p>" "<p><b>%1</b></p></qt>") - .tqarg( TQString::fromLocal8Bit( err.asString() ) ); + .arg( TQString::fromLocal8Bit( err.asString() ) ); KMessageBox::error( parent, msg, i18n("Certificate Export Failed") ); } @@ -1239,7 +1239,7 @@ static bool checkOverwrite( const KURL& url, bool& overwrite, TQWidget* w ) KMessageBox::warningContinueCancel( w, i18n( "A file named \"%1\" already exists. " - "Are you sure you want to overwrite it?" ).tqarg( url.prettyURL() ), + "Are you sure you want to overwrite it?" ).arg( url.prettyURL() ), i18n( "Overwrite File?" ), i18n( "&Overwrite" ) ) ) return false; @@ -1301,7 +1301,7 @@ static void showSecretKeyExportError( TQWidget * parent, const GpgME::Error & er const TQString msg = i18n("<qt><p>An error occurred while trying to export " "the secret key:</p>" "<p><b>%1</b></p></qt>") - .tqarg( TQString::fromLocal8Bit( err.asString() ) ); + .arg( TQString::fromLocal8Bit( err.asString() ) ); KMessageBox::error( parent, msg, i18n("Secret-Key Export Failed") ); } @@ -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/certmanager.h b/certmanager/certmanager.h index 6df2a9f61..07f9aa9e1 100644 --- a/certmanager/certmanager.h +++ b/certmanager/certmanager.h @@ -137,7 +137,7 @@ private slots: void slotConfigureGpgME(); void slotContextMenu(Kleo::KeyListViewItem*, const TQPoint& point); void slotDropped(const KURL::List&); - /** Schedule a tqrepaint for the listview items. E.g. when the + /** Schedule a repaint for the listview items. E.g. when the colour config has changed */ void slotRepaint(); /** Schedule a validating keylisting for the selected items (or diff --git a/certmanager/conf/appearanceconfigpage.cpp b/certmanager/conf/appearanceconfigpage.cpp index 9e5d0f74a..02889b9e8 100644 --- a/certmanager/conf/appearanceconfigpage.cpp +++ b/certmanager/conf/appearanceconfigpage.cpp @@ -30,7 +30,7 @@ */ #include "appearanceconfigpage.h" -#include <tqlayout.h> +#include <layout.h> #include "appearanceconfigwidget.h" #include <kmessagebox.h> #include <klocale.h> diff --git a/certmanager/conf/appearanceconfigwidget.cpp b/certmanager/conf/appearanceconfigwidget.cpp index 309d03be1..ad9089551 100644 --- a/certmanager/conf/appearanceconfigwidget.cpp +++ b/certmanager/conf/appearanceconfigwidget.cpp @@ -50,7 +50,7 @@ #include <kcolordialog.h> #include <tqpushbutton.h> -#include <tqlayout.h> +#include <layout.h> #include <tqheader.h> #include <tqcolor.h> #include <tqfont.h> @@ -139,7 +139,7 @@ private: setText( 0, name ); } - void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment ); + void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ); private: TQColor mForegroundColor, mBackgroundColor; @@ -152,7 +152,7 @@ private: bool mDirty; }; -void CategoryListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment ) { +void CategoryListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ) { TQColorGroup _cg = cg; TQFont font = p->font(); if ( mHasFont ) @@ -172,7 +172,7 @@ void CategoryListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, in if ( mBackgroundColor.isValid() ) _cg.setColor( TQColorGroup::Base, mBackgroundColor ); - TQListViewItem::paintCell( p, _cg, column, width, tqalignment ); + TQListViewItem::paintCell( p, _cg, column, width, alignment ); } //// @@ -227,7 +227,7 @@ void AppearanceConfigWidget::slotDefaultClicked() if ( !item ) return; item->setDefaultAppearance(); - item->tqrepaint(); + item->repaint(); slotSelectionChanged( item ); emit changed(); } @@ -280,7 +280,7 @@ void AppearanceConfigWidget::slotForegroundClicked() { int result = KColorDialog::getColor( fg ); if ( result == KColorDialog::Accepted ) { item->setForegroundColor( fg ); - item->tqrepaint(); + item->repaint(); emit changed(); } } @@ -294,7 +294,7 @@ void AppearanceConfigWidget::slotBackgroundClicked() { int result = KColorDialog::getColor( bg ); if ( result == KColorDialog::Accepted ) { item->setBackgroundColor( bg ); - item->tqrepaint(); + item->repaint(); emit changed(); } } @@ -308,7 +308,7 @@ void AppearanceConfigWidget::slotFontClicked() { int result = KFontDialog::getFont( font ); if ( result == KFontDialog::Accepted ) { item->setFont( font ); - item->tqrepaint(); + item->repaint(); emit changed(); } } @@ -320,7 +320,7 @@ void AppearanceConfigWidget::defaults() for ( ; lvit.current() ; ++lvit ) { CategoryListViewItem* item = static_cast<CategoryListViewItem *>( lvit.current() ); item->setDefaultAppearance(); - item->tqrepaint(); + item->repaint(); } emit changed(); } @@ -330,7 +330,7 @@ void AppearanceConfigWidget::slotItalicClicked() CategoryListViewItem* item = static_cast<CategoryListViewItem*>(categoriesLV->selectedItem() ); if ( item ) { item->toggleItalic(); - item->tqrepaint(); + item->repaint(); emit changed(); } } @@ -340,7 +340,7 @@ void AppearanceConfigWidget::slotBoldClicked() CategoryListViewItem* item = static_cast<CategoryListViewItem*>(categoriesLV->selectedItem() ); if ( item ) { item->toggleBold(); - item->tqrepaint(); + item->repaint(); emit changed(); } } @@ -350,7 +350,7 @@ void AppearanceConfigWidget::slotStrikeoutClicked() CategoryListViewItem* item = static_cast<CategoryListViewItem*>(categoriesLV->selectedItem() ); if ( item ) { item->toggleStrikeout(); - item->tqrepaint(); + item->repaint(); emit changed(); } } diff --git a/certmanager/conf/appearanceconfigwidgetbase.ui b/certmanager/conf/appearanceconfigwidgetbase.ui index 0d97a877b..570292013 100644 --- a/certmanager/conf/appearanceconfigwidgetbase.ui +++ b/certmanager/conf/appearanceconfigwidgetbase.ui @@ -37,7 +37,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <vbox> <property name="name"> @@ -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/conf/configuredialog.cpp b/certmanager/conf/configuredialog.cpp index 2aa622d08..db9c7739f 100644 --- a/certmanager/conf/configuredialog.cpp +++ b/certmanager/conf/configuredialog.cpp @@ -52,9 +52,9 @@ ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal // the KCMultiDialog starts with the size of the first kcm, not // the largest one. This way at least after the first showing of // the largest kcm the size is kept. - const KConfigGroup tqgeometry( KGlobal::config(), "Geometry" ); - const int width = tqgeometry.readNumEntry( "ConfigureDialogWidth" ); - const int height = tqgeometry.readNumEntry( "ConfigureDialogHeight" ); + const KConfigGroup geometry( KGlobal::config(), "Geometry" ); + const int width = geometry.readNumEntry( "ConfigureDialogWidth" ); + const int height = geometry.readNumEntry( "ConfigureDialogHeight" ); if ( width != 0 && height != 0 ) { setMinimumSize( width, height ); } @@ -62,9 +62,9 @@ ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal } void ConfigureDialog::hideEvent( TQHideEvent * ) { - KConfigGroup tqgeometry( KGlobal::config(), "Geometry" ); - tqgeometry.writeEntry( "ConfigureDialogWidth", width() ); - tqgeometry.writeEntry( "ConfigureDialogHeight",height() ); + KConfigGroup geometry( KGlobal::config(), "Geometry" ); + geometry.writeEntry( "ConfigureDialogWidth", width() ); + geometry.writeEntry( "ConfigureDialogHeight",height() ); } ConfigureDialog::~ConfigureDialog() { diff --git a/certmanager/conf/dirservconfigpage.cpp b/certmanager/conf/dirservconfigpage.cpp index 436ef28ec..a90a6c091 100644 --- a/certmanager/conf/dirservconfigpage.cpp +++ b/certmanager/conf/dirservconfigpage.cpp @@ -45,7 +45,7 @@ #include <tqlabel.h> #include <tqdatetimeedit.h> #include <tqcheckbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tdepimmacros.h> @@ -283,11 +283,11 @@ Kleo::CryptoConfigEntry* DirectoryServicesConfigurationPage::configEntry( const { Kleo::CryptoConfigEntry* entry = mConfig->entry( componentName, groupName, entryName ); if ( !entry ) { - KMessageBox::error( this, i18n( "Backend error: gpgconf does not seem to know the entry for %1/%2/%3" ).tqarg( componentName, groupName, entryName ) ); + KMessageBox::error( this, i18n( "Backend error: gpgconf does not seem to know the entry for %1/%2/%3" ).arg( componentName, groupName, entryName ) ); return 0; } if( entry->argType() != argType || entry->isList() != isList ) { - KMessageBox::error( this, i18n( "Backend error: gpgconf has wrong type for %1/%2/%3: %4 %5" ).tqarg( componentName, groupName, entryName ).tqarg( entry->argType() ).tqarg( entry->isList() ) ); + KMessageBox::error( this, i18n( "Backend error: gpgconf has wrong type for %1/%2/%3: %4 %5" ).arg( componentName, groupName, entryName ).arg( entry->argType() ).arg( entry->isList() ) ); return 0; } return entry; diff --git a/certmanager/conf/dnorderconfigpage.cpp b/certmanager/conf/dnorderconfigpage.cpp index a224b6f7a..b16c9a90b 100644 --- a/certmanager/conf/dnorderconfigpage.cpp +++ b/certmanager/conf/dnorderconfigpage.cpp @@ -36,7 +36,7 @@ #include <tdepimmacros.h> -#include <tqlayout.h> +#include <layout.h> DNOrderConfigPage::DNOrderConfigPage( TQWidget * parent, const char * name ) : KCModule( parent, name ) diff --git a/certmanager/crlview.cpp b/certmanager/crlview.cpp index 3318f8ddf..e23993c24 100644 --- a/certmanager/crlview.cpp +++ b/certmanager/crlview.cpp @@ -43,9 +43,9 @@ #include <kstdguiitem.h> #include <kglobalsettings.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> -#include <tqtextedit.h> +#include <textedit.h> #include <tqfontmetrics.h> #include <tqtimer.h> diff --git a/certmanager/hierarchyanalyser.cpp b/certmanager/hierarchyanalyser.cpp index fe0835ebf..9e2c388f1 100644 --- a/certmanager/hierarchyanalyser.cpp +++ b/certmanager/hierarchyanalyser.cpp @@ -69,7 +69,7 @@ const std::vector<GpgME::Key> & HierarchyAnalyser::subjectsForIssuer( const char std::vector<GpgME::Key> HierarchyAnalyser::subjectsForIssuerRecursive( const char * issuer_dn ) const { std::vector<GpgME::Key> keys = subjectsForIssuer( issuer_dn ); - for ( unsigned int i = 0 ; i < keys.size() ; ++i ) // can't use iterators here, since appending would tqinvalidate them + for ( unsigned int i = 0 ; i < keys.size() ; ++i ) // can't use iterators here, since appending would invalidate them if ( const char * fpr = keys[i].primaryFingerprint() ) { const std::vector<GpgME::Key> & tmp = subjectsForIssuer( fpr ); std::copy( tmp.begin(), tmp.end(), std::back_inserter( keys ) ); diff --git a/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp b/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp index 20c474a44..4f84c7866 100644 --- a/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp +++ b/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp @@ -38,7 +38,7 @@ #include <kapplication.h> #include <tqframe.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqspinbox.h> #include <tqcheckbox.h> @@ -80,7 +80,7 @@ KWatchGnuPGConfig::KWatchGnuPGConfig( TQWidget* parent, const char* name ) TQVBoxLayout * vlay = new TQVBoxLayout( top, 0, spacingHint() ); group = new TQVGroupBox( i18n("WatchGnuPG"), top ); - group->tqlayout()->setSpacing( spacingHint() ); + group->layout()->setSpacing( spacingHint() ); w = new TQWidget( group ); @@ -116,7 +116,7 @@ KWatchGnuPGConfig::KWatchGnuPGConfig( TQWidget* parent, const char* name ) /******************* Log Window group *******************/ group = new TQVGroupBox( i18n("Log Window"), top ); - group->tqlayout()->setSpacing( spacingHint() ); + group->layout()->setSpacing( spacingHint() ); w = new TQWidget( group ); diff --git a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp index e7690d4ff..f8dc45a6e 100644 --- a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp +++ b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp @@ -49,11 +49,11 @@ #include <kedittoolbar.h> #include <kkeydialog.h> -#include <tqtextedit.h> +#include <textedit.h> #include <tqdir.h> #include <tqeventloop.h> #include <tqtimer.h> -#include <tqtextcodec.h> +#include <textcodec.h> #define WATCHGNUPGBINARY "watchgnupg" #define WATCHGNUPGSOCKET ( TQDir::home().canonicalPath() + "/.gnupg/log-socket") @@ -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").arg( 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))); + .arg( TQDateTime::currentDateTime().toString(Qt::ISODate))); } mWatcher->clearArguments(); KConfig* config = kapp->config(); @@ -148,7 +148,7 @@ void KWatchGnuPGMainWindow::startWatcher() KMessageBox::sorry( this, i18n("The watchgnupg logging process could not be started.\nPlease install watchgnupg somewhere in your $PATH.\nThis log window is now completely useless." ) ); } else { mCentralWidget->append( tqtr("[%1] Log started") - .tqarg( TQDateTime::tqcurrentDateTime().toString(Qt::ISODate) ) ); + .arg( TQDateTime::currentDateTime().toString(Qt::ISODate) ) ); } connect( mWatcher, TQT_SIGNAL( processExited(KProcess*) ), this, TQT_SLOT( slotWatcherExited() ) ); @@ -176,7 +176,7 @@ void KWatchGnuPGMainWindow::setGnuPGConfig() entry->setStringValue( TQString("socket://")+ config->readEntry("Socket", WATCHGNUPGSOCKET )); - logclients << TQString("%1 (%2)").tqarg(*it).tqarg(comp->description()); + logclients << TQString("%1 (%2)").arg(*it).arg(comp->description()); } entry = group->entry("debug-level"); if( entry ) { @@ -237,7 +237,7 @@ void KWatchGnuPGMainWindow::slotSaveAs() if( KMessageBox::Yes != KMessageBox::warningYesNo( this, i18n("The file named \"%1\" already " "exists. Are you sure you want " - "to overwrite it?").tqarg(filename), + "to overwrite it?").arg(filename), i18n("Overwrite File"), i18n("Overwrite"), KStdGuiItem::cancel() ) ) { return; } diff --git a/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp b/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp index f27dad3b6..e47909e28 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 ); } } @@ -432,13 +432,13 @@ Kleo::CryptoBackend::Protocol * Kleo::ChiasmusBackend::protocol( const char * na bool Kleo::ChiasmusBackend::checkForOpenPGP( TQString * reason ) const { if ( reason ) - *reason = i18n( "Unsupported protocol \"%1\"" ).tqarg( "OpenPGP" ); + *reason = i18n( "Unsupported protocol \"%1\"" ).arg( "OpenPGP" ); return false; } bool Kleo::ChiasmusBackend::checkForSMIME( TQString * reason ) const { if ( reason ) - *reason = i18n( "Unsupported protocol \"%1\"" ).tqarg( "SMIME" ); + *reason = i18n( "Unsupported protocol \"%1\"" ).arg( "SMIME" ); return false; } @@ -454,7 +454,7 @@ bool Kleo::ChiasmusBackend::checkForChiasmus( TQString * reason ) const { const TQFileInfo fi( KShell::tildeExpand( chiasmus ) ); if ( !fi.isExecutable() ) { if ( reason ) - *reason = i18n( "File \"%1\" does not exist or is not executable." ).tqarg( chiasmus ); + *reason = i18n( "File \"%1\" does not exist or is not executable." ).arg( chiasmus ); return false; } @@ -467,7 +467,7 @@ bool Kleo::ChiasmusBackend::checkForProtocol( const char * name, TQString * reas if ( qstricmp( name, "Chiasmus" ) == 0 ) return checkForChiasmus( reason ); if ( reason ) - *reason = i18n( "Unsupported protocol \"%1\"" ).tqarg( name ); + *reason = i18n( "Unsupported protocol \"%1\"" ).arg( name ); return 0; } diff --git a/certmanager/lib/backends/chiasmus/chiasmusjob.cpp b/certmanager/lib/backends/chiasmus/chiasmusjob.cpp index 9daaa620d..edfe9be52 100644 --- a/certmanager/lib/backends/chiasmus/chiasmusjob.cpp +++ b/certmanager/lib/backends/chiasmus/chiasmusjob.cpp @@ -208,9 +208,9 @@ void Kleo::ChiasmusJob::showErrorDialog( TQWidget * parent, const TQString & cap const TQString msg = ( mMode == Encrypt ? i18n( "Encryption failed: %1" ) : i18n( "Decryption failed: %1" ) ) - .tqarg( TQString::fromLocal8Bit( mError.asString() ) ); + .arg( TQString::fromLocal8Bit( mError.asString() ) ); if ( !mStderr.isEmpty() ) { - const TQString details = i18n( "The following was received on stderr:\n%1" ).tqarg( mStderr ); + const TQString details = i18n( "The following was received on stderr:\n%1" ).arg( mStderr ); KMessageBox::detailedError( parent, msg, details, caption ); } else { KMessageBox::error( parent, msg, caption ); diff --git a/certmanager/lib/backends/chiasmus/chiasmuslibrary.cpp b/certmanager/lib/backends/chiasmus/chiasmuslibrary.cpp index a57685f28..002bf0182 100644 --- a/certmanager/lib/backends/chiasmus/chiasmuslibrary.cpp +++ b/certmanager/lib/backends/chiasmus/chiasmuslibrary.cpp @@ -71,7 +71,7 @@ Kleo::ChiasmusLibrary::main_func Kleo::ChiasmusLibrary::chiasmus( TQString * rea if ( !mXiaLibrary ) { if ( reason ) *reason = i18n( "Failed to load %1: %2" ) - .tqarg( libfile,KLibLoader::self()->lastErrorMessage() ); + .arg( libfile,KLibLoader::self()->lastErrorMessage() ); kdDebug(5150) << "ChiasmusLibrary: loading \"" << libfile << "\" failed: " << KLibLoader::self()->lastErrorMessage() << endl; return 0; @@ -79,7 +79,7 @@ Kleo::ChiasmusLibrary::main_func Kleo::ChiasmusLibrary::chiasmus( TQString * rea if ( !mXiaLibrary->hasSymbol( "Chiasmus" ) ) { if ( reason ) *reason = i18n( "Failed to load %1: %2" ) - .tqarg( libfile, i18n( "Library does not contain the symbol \"Chiasmus\"." ) ); + .arg( libfile, i18n( "Library does not contain the symbol \"Chiasmus\"." ) ); kdDebug(5150) << "ChiasmusLibrary: loading \"" << libfile << "\" failed: " << "Library does not contain the symbol \"Chiasmus\"." << endl; return 0; diff --git a/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp b/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp index eccdf9219..677fc6ec2 100644 --- a/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp +++ b/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp @@ -96,7 +96,7 @@ void Kleo::ObtainKeysJob::slotPerform( bool async ) { return; } - emit progress( i18n( "Scanning directory %1..." ).tqarg( mKeyPaths[mIndex] ), + emit progress( i18n( "Scanning directory %1..." ).arg( mKeyPaths[mIndex] ), mIndex, mKeyPaths.size() ); const TQDir dir( KShell::tildeExpand( mKeyPaths[mIndex] ) ); diff --git a/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp b/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp index ab413080c..ea3506b8a 100644 --- a/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp +++ b/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp @@ -36,7 +36,7 @@ #include <kurl.h> #include <tqsocketnotifier.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <tqstringlist.h> #include <unistd.h> @@ -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/qgpgmebackend.cpp b/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp index 9594edfa2..27680585b 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp @@ -88,15 +88,15 @@ static bool check( GpgME::Context::Protocol proto, TQString * reason ) { // error, check why: const GpgME::EngineInfo ei = GpgME::engineInfo( proto ); if ( ei.isNull() ) - *reason = i18n("GPGME was compiled without support for %1.").tqarg( proto == GpgME::Context::CMS ? "S/MIME" : "OpenPGP" ); + *reason = i18n("GPGME was compiled without support for %1.").arg( proto == GpgME::Context::CMS ? "S/MIME" : "OpenPGP" ); else if ( ei.fileName() && !ei.version() ) - *reason = i18n("Engine %1 is not installed properly.").tqarg( TQFile::decodeName( ei.fileName() ) ); + *reason = i18n("Engine %1 is not installed properly.").arg( TQFile::decodeName( ei.fileName() ) ); else if ( ei.fileName() && ei.version() && ei.requiredVersion() ) *reason = i18n("Engine %1 version %2 installed, " "but at least version %3 is required.") - .tqarg( TQFile::decodeName( ei.fileName() ), ei.version(), ei.requiredVersion() ); + .arg( TQFile::decodeName( ei.fileName() ), ei.version(), ei.requiredVersion() ); else - *reason = i18n("Unknown problem with engine for protocol %1.").tqarg( proto == GpgME::Context::CMS ? "S/MIME" : "OpenPGP" ); + *reason = i18n("Unknown problem with engine for protocol %1.").arg( proto == GpgME::Context::CMS ? "S/MIME" : "OpenPGP" ); return false; } @@ -114,7 +114,7 @@ bool Kleo::QGpgMEBackend::checkForProtocol( const char * name, TQString * reason if ( qstricmp( name, SMIME ) == 0 ) return check( GpgME::Context::CMS, reason ); if ( reason ) - *reason = i18n( "Unsupported protocol \"%1\"" ).tqarg( name ); + *reason = i18n( "Unsupported protocol \"%1\"" ).arg( name ); return false; } diff --git a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp index 51f8f68c8..65ed93811 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp @@ -41,7 +41,7 @@ #include <ktempfile.h> #include <tqfile.h> #include <stdlib.h> -#include <tqtextcodec.h> +#include <textcodec.h> // Just for the Q_ASSERT in the dtor. Not thread-safe, but who would // have 2 threads talking to gpgconf anyway? :) @@ -89,11 +89,11 @@ void QGpgMECryptoConfig::runGpgConf( bool showErrors ) if ( showErrors && rc != 0 ) { TQString wmsg = i18n("<qt>Failed to execute gpgconf:<br>%1</qt>"); if ( rc == -1 ) - wmsg = wmsg.tqarg( i18n( "program not found" ) ); + wmsg = wmsg.arg( i18n( "program not found" ) ); else if ( rc == -2 ) - wmsg = wmsg.tqarg( i18n( "program cannot be executed" ) ); + wmsg = wmsg.arg( i18n( "program cannot be executed" ) ); else - wmsg = wmsg.tqarg( strerror(rc) ); + wmsg = wmsg.arg( strerror(rc) ); kdWarning(5150) << wmsg << endl; // to see it from test_cryptoconfig.cpp KMessageBox::error(0, wmsg); } @@ -306,7 +306,7 @@ void QGpgMECryptoConfigComponent::sync( bool runtime ) } else if( rc != 0 ) // Happens due to bugs in gpgconf (e.g. issues 104/115) { - TQString wmsg = i18n( "Error from gpgconf while saving configuration: %1" ).tqarg( TQString::fromLocal8Bit( strerror( rc ) ) ); + TQString wmsg = i18n( "Error from gpgconf while saving configuration: %1" ).arg( TQString::fromLocal8Bit( strerror( rc ) ) ); kdWarning(5150) << k_funcinfo << ":" << strerror( rc ) << endl; KMessageBox::error(0, wmsg); } @@ -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/qgpgmejob.cpp b/certmanager/lib/backends/qgpgme/qgpgmejob.cpp index e55f237dc..61da793ed 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmejob.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmejob.cpp @@ -276,21 +276,21 @@ char * Kleo::QGpgMEJob::getPassphrase( const char * useridHint, const char * /*d TQString msg = previousWasBad ? i18n( "You need a passphrase to unlock the secret key for user:<br/> %1 (retry)" ) : i18n( "You need a passphrase to unlock the secret key for user:<br/> %1" ); - msg = msg.tqarg( TQString::fromUtf8( useridHint ) ) + "<br/><br/>"; + msg = msg.arg( TQString::fromUtf8( useridHint ) ) + "<br/><br/>"; msg.prepend( "<qt>" ); msg += i18n( "This dialog will reappear every time the passphrase is needed. For a more secure solution that also allows caching the passphrase, use gpg-agent." ) + "<br/>"; const TQString gpgAgent = KStandardDirs::findExe( "gpg-agent" ); if ( !gpgAgent.isEmpty() ) { msg += i18n( "gpg-agent was found in %1, but does not appear to be running." ) - .tqarg( gpgAgent ); + .arg( gpgAgent ); } else { msg += i18n( "gpg-agent is part of gnupg-%1, which you can download from %2" ) - .tqarg( "1.9" ) - .tqarg( "http://www.gnupg.org/download" ); // add #gnupg2 if you can make this a real link + .arg( "1.9" ) + .arg( "http://www.gnupg.org/download" ); // add #gnupg2 if you can make this a real link } msg += "<br/>"; msg += i18n( "For information on how to set up gpg-agent, see %1" ) - .tqarg( "http://kmail.kde.org/kmail-pgpmime-howto.html" ); + .arg( "http://kmail.kde.org/kmail-pgpmime-howto.html" ); msg += "<br/><br/>"; msg += i18n( "Enter passphrase:" ); Kleo::PassphraseDialog dlg( msg, i18n("Passphrase Dialog") ); diff --git a/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp index d1d2591da..c6370674b 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp @@ -196,7 +196,7 @@ void Kleo::QGpgMEKeyListJob::showErrorDialog( TQWidget * parent, const TQString const TQString msg = i18n( "<qt><p>An error occurred while fetching " "the keys from the backend:</p>" "<p><b>%1</b></p></qt>" ) - .tqarg( TQString::fromLocal8Bit( mResult.error().asString() ) ); + .arg( TQString::fromLocal8Bit( mResult.error().asString() ) ); KMessageBox::error( parent, msg, caption ); } diff --git a/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp b/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp index de673faf1..c2e21bb9b 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 ); @@ -151,9 +151,9 @@ TQString Kleo::QGpgMEProgressTokenMapper::map( const TQString & token, int subto const Desc & desc = it2->second; TQString result = i18n( desc.display ); if ( desc.useCur ) - result = result.tqarg( cur ); + result = result.arg( cur ); if ( desc.useTot ) - result = result.tqarg( tot ); + result = result.arg( tot ); return result; } diff --git a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp index 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..6f07c954b 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,26 +515,26 @@ 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 ); + _lastError = i18n("Error while initializing plugin \"%1\"").arg( _libName ); if ( errorMsg ) *errorMsg = _lastError; 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/kleo/cryptobackendfactory.cpp b/certmanager/lib/kleo/cryptobackendfactory.cpp index b79e1772b..0d3cb1e96 100644 --- a/certmanager/lib/kleo/cryptobackendfactory.cpp +++ b/certmanager/lib/kleo/cryptobackendfactory.cpp @@ -154,7 +154,7 @@ void Kleo::CryptoBackendFactory::scanForBackends( TQStringList * reasons ) { if ( (*it)->supportsProtocol( protocol ) && !(*it)->checkForProtocol( protocol, &reason ) ) { if ( reasons ) { reasons->push_back( i18n("While scanning for %1 support in backend %2:") - .tqarg( protocol, (*it)->displayName() ) ); + .arg( protocol, (*it)->displayName() ) ); reasons->push_back( " " + reason ); } } diff --git a/certmanager/lib/kleo/dn.cpp b/certmanager/lib/kleo/dn.cpp index 685d241bc..774302ba7 100644 --- a/certmanager/lib/kleo/dn.cpp +++ b/certmanager/lib/kleo/dn.cpp @@ -272,7 +272,7 @@ static TQString dn_escape( const TQString & s ) { TQString result; for ( unsigned int i = 0, end = s.length() ; i != end ; ++i ) { const TQChar ch = s[i]; - switch ( ch.tqunicode() ) { + switch ( ch.unicode() ) { case ',': case '+': case '"': diff --git a/certmanager/lib/kleo/hierarchicalkeylistjob.cpp b/certmanager/lib/kleo/hierarchicalkeylistjob.cpp index a5944315a..ffd3c6db9 100644 --- a/certmanager/lib/kleo/hierarchicalkeylistjob.cpp +++ b/certmanager/lib/kleo/hierarchicalkeylistjob.cpp @@ -131,7 +131,7 @@ void Kleo::HierarchicalKeyListJob::slotResult( const GpgME::KeyListResult & res #if 0 // FIXME const int current = mIt - mKeys.begin(); const int total = mKeys.size(); - emit progress( i18n("progress info: \"%1 of %2\"","%1/%2").tqarg( current ).tqarg( total ), current, total ); + emit progress( i18n("progress info: \"%1 of %2\"","%1/%2").arg( current ).arg( total ), current, total ); #endif } diff --git a/certmanager/lib/kleo/multideletejob.cpp b/certmanager/lib/kleo/multideletejob.cpp index e83f923ee..7d1a27302 100644 --- a/certmanager/lib/kleo/multideletejob.cpp +++ b/certmanager/lib/kleo/multideletejob.cpp @@ -92,7 +92,7 @@ void Kleo::MultiDeleteJob::slotResult( const GpgME::Error & err ) { const int current = mIt - mKeys.begin(); const int total = mKeys.size(); - emit progress( i18n("progress info: \"%1 of %2\"","%1/%2").tqarg( current ).tqarg( total ), current, total ); + emit progress( i18n("progress info: \"%1 of %2\"","%1/%2").arg( current ).arg( total ), current, total ); } GpgME::Error Kleo::MultiDeleteJob::startAJob() { diff --git a/certmanager/lib/tests/gnupgviewer.h b/certmanager/lib/tests/gnupgviewer.h index bc589ec48..a8bbb074f 100644 --- a/certmanager/lib/tests/gnupgviewer.h +++ b/certmanager/lib/tests/gnupgviewer.h @@ -33,7 +33,7 @@ #ifndef __KLEO_TESTS_GNUPGVIEWER_H__ #define __KLEO_TESTS_GNUPGVIEWER_H__ -#include <tqtextedit.h> +#include <textedit.h> #include <tqstring.h> namespace Kleo { @@ -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/tests/test_keygen.cpp b/certmanager/lib/tests/test_keygen.cpp index 8acef90f0..a707b000d 100644 --- a/certmanager/lib/tests/test_keygen.cpp +++ b/certmanager/lib/tests/test_keygen.cpp @@ -52,7 +52,7 @@ #include <tqmessagebox.h> #include <tqstringlist.h> #include <tqtimer.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlineedit.h> #include <tqlabel.h> @@ -137,7 +137,7 @@ void KeyGenerator::slotResult( const GpgME::KeyGenerationResult & res, const TQB if ( res.error() ) showError( res.error() ); else - KMessageBox::information( this, TQString("Key generated successfully, %1 bytes long").tqarg( keyData.size() ), + KMessageBox::information( this, TQString("Key generated successfully, %1 bytes long").arg( keyData.size() ), "Key Generation Finished" ); } diff --git a/certmanager/lib/tests/test_keylister.cpp b/certmanager/lib/tests/test_keylister.cpp index ca31b39ab..363ec26a9 100644 --- a/certmanager/lib/tests/test_keylister.cpp +++ b/certmanager/lib/tests/test_keylister.cpp @@ -104,7 +104,7 @@ void CertListView::slotResult( const GpgME::KeyListResult & result ) { TQMessageBox::information( this, "Key Listing Result", "KeyListResult is null!" ); else if ( result.error() ) TQMessageBox::critical( this, "Key Listing Result", - TQString("KeyListResult Error: %1").tqarg( result.error().asString() ) ); + TQString("KeyListResult Error: %1").arg( result.error().asString() ) ); else if ( result.isTruncated() ) TQMessageBox::information( this, "Key Listing Result", "KeyListResult is truncated!" ); else diff --git a/certmanager/lib/ui/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..255cb981a 100644 --- a/certmanager/lib/ui/backendconfigwidget.cpp +++ b/certmanager/lib/ui/backendconfigwidget.cpp @@ -50,7 +50,7 @@ #include <dcopclient.h> #include <tqpushbutton.h> -#include <tqlayout.h> +#include <layout.h> #include <tqheader.h> #include <tqtimer.h> @@ -144,13 +144,13 @@ 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...) const TQString impName = protocol ? protocol->displayName() : i18n( "failed" ); return i18n( "Items in Kleo::BackendConfigWidget listview (1: protocol; 2: implementation name)", - "%1 (%2)" ).tqarg( protoName, impName ); + "%1 (%2)" ).arg( protoName, impName ); } const CryptoBackend::Protocol* mProtocol; // can be 0 diff --git a/certmanager/lib/ui/cryptoconfigmodule.cpp b/certmanager/lib/ui/cryptoconfigmodule.cpp index a16dcd22e..b97884a5c 100644 --- a/certmanager/lib/ui/cryptoconfigmodule.cpp +++ b/certmanager/lib/ui/cryptoconfigmodule.cpp @@ -47,7 +47,7 @@ #include <tqgrid.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqvbox.h> #include <tqhbox.h> #include <tqpushbutton.h> @@ -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 ); @@ -134,9 +134,9 @@ Kleo::CryptoConfigModule::CryptoConfigModule( Kleo::CryptoConfig* config, TQWidg "properly. It did not return any components. " "Try running \"%1\" on the command line for more " "information.") - .tqarg( components.empty() ? "gpgconf --list-components" : "gpgconf --list-options gpg" ); + .arg( components.empty() ? "gpgconf --list-components" : "gpgconf --list-options gpg" ); TQLabel * label = new TQLabel( msg, vbox ); - label->tqsetAlignment( TQt::WordBreak ); + label->setAlignment( TQt::WordBreak ); label->setMinimumHeight( fontMetrics().lineSpacing() * 5 ); } } @@ -356,7 +356,7 @@ TQString Kleo::CryptoConfigEntryGUI::description() const { TQString descr = mEntry->description(); if ( descr.isEmpty() ) // shouldn't happen - descr = TQString( "<%1>" ).tqarg( mName ); + descr = TQString( "<%1>" ).arg( mName ); return descr; } diff --git a/certmanager/lib/ui/cryptoconfigmodule_p.h b/certmanager/lib/ui/cryptoconfigmodule_p.h index 65cae2499..0c5f0087b 100644 --- a/certmanager/lib/ui/cryptoconfigmodule_p.h +++ b/certmanager/lib/ui/cryptoconfigmodule_p.h @@ -82,7 +82,7 @@ namespace Kleo { public: CryptoConfigGroupGUI( CryptoConfigModule* module, Kleo::CryptoConfigGroup* group, - TQGridLayout * tqlayout, TQWidget* parent, const char* name = 0 ); + TQGridLayout * layout, TQWidget* parent, const char* name = 0 ); bool save(); void load(); @@ -102,7 +102,7 @@ namespace Kleo { static CryptoConfigEntryGUI* createEntryGUI( CryptoConfigModule* module, Kleo::CryptoConfigEntry* entry, const TQString& entryName, - TQGridLayout * tqlayout, TQWidget* widget, const char* name = 0 ); + TQGridLayout * layout, TQWidget* widget, const char* name = 0 ); }; /** @@ -154,7 +154,7 @@ namespace Kleo { CryptoConfigEntryLineEdit( CryptoConfigModule* module, Kleo::CryptoConfigEntry* entry, const TQString& entryName, - TQGridLayout * tqlayout, + TQGridLayout * layout, TQWidget* parent, const char* name = 0 ); virtual void doSave(); @@ -174,7 +174,7 @@ namespace Kleo { CryptoConfigEntryPath( CryptoConfigModule* module, Kleo::CryptoConfigEntry* entry, const TQString& entryName, - TQGridLayout * tqlayout, + TQGridLayout * layout, TQWidget* parent, const char* name = 0 ); virtual void doSave(); @@ -194,7 +194,7 @@ namespace Kleo { CryptoConfigEntryDirPath( CryptoConfigModule* module, Kleo::CryptoConfigEntry* entry, const TQString& entryName, - TQGridLayout * tqlayout, + TQGridLayout * layout, TQWidget* parent, const char* name = 0 ); virtual void doSave(); @@ -214,7 +214,7 @@ namespace Kleo { CryptoConfigEntryURL( CryptoConfigModule* module, Kleo::CryptoConfigEntry* entry, const TQString& entryName, - TQGridLayout * tqlayout, + TQGridLayout * layout, TQWidget* parent, const char* name = 0 ); virtual void doSave(); @@ -234,7 +234,7 @@ namespace Kleo { CryptoConfigEntrySpinBox( CryptoConfigModule* module, Kleo::CryptoConfigEntry* entry, const TQString& entryName, - TQGridLayout * tqlayout, + TQGridLayout * layout, TQWidget* parent, const char* name = 0 ); virtual void doSave(); virtual void doLoad(); @@ -254,7 +254,7 @@ namespace Kleo { CryptoConfigEntryCheckBox( CryptoConfigModule* module, Kleo::CryptoConfigEntry* entry, const TQString& entryName, - TQGridLayout * tqlayout, + TQGridLayout * layout, TQWidget* parent, const char* name = 0 ); virtual void doSave(); virtual void doLoad(); @@ -273,7 +273,7 @@ namespace Kleo { CryptoConfigEntryLDAPURL( CryptoConfigModule* module, Kleo::CryptoConfigEntry* entry, const TQString& entryName, - TQGridLayout * tqlayout, + TQGridLayout * layout, TQWidget* parent, const char* name = 0 ); virtual void doSave(); virtual void doLoad(); 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..fcc7d493c 100644 --- a/certmanager/lib/ui/directoryserviceswidgetbase.ui +++ b/certmanager/lib/ui/directoryserviceswidgetbase.ui @@ -44,7 +44,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -126,7 +126,7 @@ If you do not use a directory service, you can still use local certificates. </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <vbox> <property name="name"> @@ -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> @@ -171,7 +171,7 @@ If you do not use a directory service, you can still use local certificates. </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -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..e86bd1d9d 100644 --- a/certmanager/lib/ui/dnattributeorderconfigwidget.cpp +++ b/certmanager/lib/ui/dnattributeorderconfigwidget.cpp @@ -46,7 +46,7 @@ #include <kapplication.h> #include <tqtoolbutton.h> -#include <tqlayout.h> +#include <layout.h> #include <tqheader.h> #include <tqlabel.h> #include <tqlistview.h> @@ -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..c901a2fd1 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(); @@ -134,11 +134,11 @@ void KDHorizontalLine::paintEvent( TQPaintEvent * e ) { const int h = fm.height(); const int tw = fm.width( mTitle, mLenVisible ) + fm.width(TQChar(' ')); int x; - if ( mAlign & AlignHCenter ) // center tqalignment + if ( mAlign & AlignHCenter ) // center alignment x = frameRect().width()/2 - tw/2; - else if ( mAlign & AlignRight ) // right tqalignment + else if ( mAlign & AlignRight ) // right alignment x = frameRect().width() - tw; - else if ( mAlign & AlignLeft ) // left tqalignment + else if ( mAlign & AlignLeft ) // left alignment x = 0; else { // auto align if( TQApplication::reverseLayout() ) @@ -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..530b89081 100644 --- a/certmanager/lib/ui/kdhorizontalline.h +++ b/certmanager/lib/ui/kdhorizontalline.h @@ -55,11 +55,11 @@ public: TQString title() const { return mTitle; } - /*! \reimp to hard-code the frame tqshape */ + /*! \reimp to hard-code the frame shape */ void setFrameStyle( int style ); - TQSize 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..706c4d9cb 100644 --- a/certmanager/lib/ui/keyapprovaldialog.cpp +++ b/certmanager/lib/ui/keyapprovaldialog.cpp @@ -51,7 +51,7 @@ #include <tqstringlist.h> #include <tqframe.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqcombobox.h> #include <tqscrollview.h> @@ -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..100334f20 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 ) ) @@ -173,7 +173,7 @@ Kleo::KeyListView::KeyListView( const ColumnStrategy * columnStrategy, const Dis Kleo::KeyListView::~KeyListView() { d->updateTimer->stop(); - // need to clear here, since in ~TQListView, our tqchildren won't have + // need to clear here, since in ~TQListView, our children won't have // a valid listView() pointing to us anymore, and their dtors try to // unregister from us. clear(); @@ -395,7 +395,7 @@ Kleo::KeyListViewItem::KeyListViewItem( KeyListViewItem * parent, KeyListViewIte } Kleo::KeyListViewItem::~KeyListViewItem() { - // delete the tqchildren first... When tqchildren are deleted in the + // delete the children first... When children are deleted in the // TQLVI dtor, they don't have listView() anymore, thus they don't // call deregister( this ), leading to stale entries in the // itemMap... @@ -428,7 +428,7 @@ void Kleo::KeyListViewItem::setKey( const GpgME::Key & key ) { if ( const TQPixmap * pix = cs->pixmap( key, i ) ) setPixmap( i, *pix ); } - tqrepaint(); + repaint(); } TQString Kleo::KeyListViewItem::toolTip( int col ) const { @@ -444,10 +444,10 @@ int Kleo::KeyListViewItem::compare( TQListViewItem * item, int col, bool ascendi return listView()->columnStrategy()->compare( this->key(), that->key(), col ); } -void Kleo::KeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment ) { +void Kleo::KeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ) { const KeyListView::DisplayStrategy * ds = listView() ? listView()->displayStrategy() : 0 ; if ( !ds ) { - TQListViewItem::paintCell( p, cg, column, width, tqalignment ); + TQListViewItem::paintCell( p, cg, column, width, alignment ); return; } const TQColor fg = ds->keyForeground( key(), cg.text() ); @@ -459,7 +459,7 @@ void Kleo::KeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, i _cg.setColor( TQColorGroup::Text, fg ); _cg.setColor( TQColorGroup::Base, bg ); - TQListViewItem::paintCell( p, _cg, column, width, tqalignment ); + TQListViewItem::paintCell( p, _cg, column, width, alignment ); } void Kleo::KeyListViewItem::insertItem( TQListViewItem * qlvi ) { @@ -536,10 +536,10 @@ int Kleo::SubkeyKeyListViewItem::compare( TQListViewItem * item, int col, bool a return listView()->columnStrategy()->subkeyCompare( this->subkey(), that->subkey(), col ); } -void Kleo::SubkeyKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment ) { +void Kleo::SubkeyKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ) { const KeyListView::DisplayStrategy * ds = listView() ? listView()->displayStrategy() : 0 ; if ( !ds ) { - TQListViewItem::paintCell( p, cg, column, width, tqalignment ); + TQListViewItem::paintCell( p, cg, column, width, alignment ); return; } const TQColor fg = ds->subkeyForeground( subkey(), cg.text() ); @@ -551,7 +551,7 @@ void Kleo::SubkeyKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & _cg.setColor( TQColorGroup::Text, fg ); _cg.setColor( TQColorGroup::Base, bg ); - TQListViewItem::paintCell( p, _cg, column, width, tqalignment ); + TQListViewItem::paintCell( p, _cg, column, width, alignment ); } @@ -615,10 +615,10 @@ int Kleo::UserIDKeyListViewItem::compare( TQListViewItem * item, int col, bool a } -void Kleo::UserIDKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment ) { +void Kleo::UserIDKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ) { const KeyListView::DisplayStrategy * ds = listView() ? listView()->displayStrategy() : 0 ; if ( !ds ) { - TQListViewItem::paintCell( p, cg, column, width, tqalignment ); + TQListViewItem::paintCell( p, cg, column, width, alignment ); return; } const TQColor fg = ds->useridForeground( userID(), cg.text() ); @@ -630,7 +630,7 @@ void Kleo::UserIDKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & _cg.setColor( TQColorGroup::Text, fg ); _cg.setColor( TQColorGroup::Base, bg ); - TQListViewItem::paintCell( p, _cg, column, width, tqalignment ); + TQListViewItem::paintCell( p, _cg, column, width, alignment ); } @@ -693,10 +693,10 @@ int Kleo::SignatureKeyListViewItem::compare( TQListViewItem * item, int col, boo return listView()->columnStrategy()->signatureCompare( this->signature(), that->signature(), col ); } -void Kleo::SignatureKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment ) { +void Kleo::SignatureKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ) { const KeyListView::DisplayStrategy * ds = listView() ? listView()->displayStrategy() : 0 ; if ( !ds ) { - TQListViewItem::paintCell( p, cg, column, width, tqalignment ); + TQListViewItem::paintCell( p, cg, column, width, alignment ); return; } const TQColor fg = ds->signatureForeground( signature(), cg.text() ); @@ -708,7 +708,7 @@ void Kleo::SignatureKeyListViewItem::paintCell( TQPainter * p, const TQColorGrou _cg.setColor( TQColorGroup::Text, fg ); _cg.setColor( TQColorGroup::Base, bg ); - TQListViewItem::paintCell( p, _cg, column, width, tqalignment ); + TQListViewItem::paintCell( p, _cg, column, width, alignment ); } diff --git a/certmanager/lib/ui/keylistview.h b/certmanager/lib/ui/keylistview.h index 38ad0f5ab..ada8354e2 100644 --- a/certmanager/lib/ui/keylistview.h +++ b/certmanager/lib/ui/keylistview.h @@ -91,7 +91,7 @@ namespace Kleo { /*! \reimp */ int rtti() const { return RTTI; } /*! \reimp */ - void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment ); + void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ); /*! \reimp */ void insertItem( TQListViewItem * item ); /*! \reimp */ @@ -127,7 +127,7 @@ namespace Kleo { /*! \reimp */ int rtti() const { return RTTI; } /*! \reimp */ - void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment ); + void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ); private: GpgME::Subkey mSubkey; @@ -159,7 +159,7 @@ namespace Kleo { /*! \reimp */ int rtti() const { return RTTI; } /*! \reimp */ - void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment ); + void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ); private: GpgME::UserID mUserID; @@ -191,7 +191,7 @@ namespace Kleo { /*! \reimp */ int rtti() const { return RTTI; } /*! \reimp */ - void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment ); + void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ); private: GpgME::UserID::Signature mSignature; diff --git a/certmanager/lib/ui/keyrequester.cpp b/certmanager/lib/ui/keyrequester.cpp index ebde2c163..f793c0fa9 100644 --- a/certmanager/lib/ui/keyrequester.cpp +++ b/certmanager/lib/ui/keyrequester.cpp @@ -72,7 +72,7 @@ // TQt #include <tqapplication.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtooltip.h> #include <tqstring.h> #include <tqstringlist.h> @@ -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 ); @@ -231,7 +231,7 @@ static void showKeyListError( TQWidget * parent, const GpgME::Error & err ) { const TQString msg = i18n( "<qt><p>An error occurred while fetching " "the keys from the backend:</p>" "<p><b>%1</b></p></qt>" ) - .tqarg( TQString::fromLocal8Bit( err.asString() ) ); + .arg( TQString::fromLocal8Bit( err.asString() ) ); KMessageBox::error( parent, msg, i18n( "Key Listing Failed" ) ); } diff --git a/certmanager/lib/ui/keyselectiondialog.cpp b/certmanager/lib/ui/keyselectiondialog.cpp index f017f2024..998ff1122 100644 --- a/certmanager/lib/ui/keyselectiondialog.cpp +++ b/certmanager/lib/ui/keyselectiondialog.cpp @@ -70,7 +70,7 @@ #include <tqlabel.h> #include <tqpixmap.h> #include <tqtimer.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlineedit.h> #include <tqwhatsthis.h> #include <tqpopupmenu.h> @@ -248,19 +248,19 @@ namespace { "Created: %2\n" "Expiry: %3\n" "Fingerprint: %4" ) - .tqarg( uid ? TQString::fromUtf8( uid ) : i18n("unknown"), + .arg( uid ? TQString::fromUtf8( uid ) : i18n("unknown"), creation, expiry, - fpr ? TQString::tqfromLatin1( fpr ) : i18n("unknown") ); + fpr ? TQString::fromLatin1( fpr ) : i18n("unknown") ); else return i18n( "S/MIME key for %1\n" "Created: %2\n" "Expiry: %3\n" "Fingerprint: %4\n" "Issuer: %5" ) - .tqarg( uid ? Kleo::DN( uid ).prettyDN() : i18n("unknown"), + .arg( uid ? Kleo::DN( uid ).prettyDN() : i18n("unknown"), creation, expiry, - fpr ? TQString::tqfromLatin1( fpr ) : i18n("unknown") ) - .tqarg( issuer ? Kleo::DN( issuer ).prettyDN() : i18n("unknown") ); + fpr ? TQString::fromLatin1( fpr ) : i18n("unknown") ) + .arg( issuer ? Kleo::DN( issuer ).prettyDN() : i18n("unknown") ); } const TQPixmap * ColumnStrategy::pixmap( const GpgME::Key & key, int col ) const { @@ -374,11 +374,11 @@ void Kleo::KeySelectionDialog::init( bool rememberChoice, bool extendedSelection KActiveLabel *textLabel = new KActiveLabel( text, page ); disconnect( textLabel, TQT_SIGNAL(linkClicked(const TQString&)), textLabel, TQT_SLOT(openLink(const TQString&)) ); connect( textLabel, TQT_SIGNAL(linkClicked(const TQString&)), TQT_SLOT(slotStartCertificateManager(const TQString&)) ); - textLabel->tqsetAlignment( textLabel->tqalignment() | TQt::WordBreak ); + textLabel->setAlignment( textLabel->alignment() | TQt::WordBreak ); mTopLayout->addWidget( textLabel ); } else { KActiveLabel *textLabel = new KActiveLabel( text, page ); - textLabel->tqsetAlignment( textLabel->tqalignment() | TQt::WordBreak ); + textLabel->setAlignment( textLabel->alignment() | TQt::WordBreak ); mTopLayout->addWidget( textLabel ); } } @@ -567,7 +567,7 @@ static void showKeyListError( TQWidget * parent, const GpgME::Error & err ) { const TQString msg = i18n( "<qt><p>An error occurred while fetching " "the keys from the backend:</p>" "<p><b>%1</b></p></qt>" ) - .tqarg( TQString::fromLocal8Bit( err.asString() ) ); + .arg( TQString::fromLocal8Bit( err.asString() ) ); KMessageBox::error( parent, msg, i18n( "Key Listing Failed" ) ); } diff --git a/certmanager/lib/ui/messagebox.cpp b/certmanager/lib/ui/messagebox.cpp index 2dfe083d5..429f7d010 100644 --- a/certmanager/lib/ui/messagebox.cpp +++ b/certmanager/lib/ui/messagebox.cpp @@ -48,11 +48,11 @@ #include <kguiitem.h> #include <kdebug.h> -#include <tqtextedit.h> -#include <tqtextstream.h> +#include <textedit.h> +#include <textstream.h> #include <tqvbox.h> #include <tqapplication.h> -#include <tqstylesheet.h> +#include <stylesheet.h> #include <gpg-error.h> @@ -127,7 +127,7 @@ private: if ( const int err = file.status() ) KMessageBox::error( this, i18n("Couldn't save to file \"%1\": %2") - .tqarg( file.name(), TQString::fromLocal8Bit( strerror( err ) ) ), + .arg( file.name(), TQString::fromLocal8Bit( strerror( err ) ) ), i18n("File Save Error") ); } void slotUser2() { @@ -159,7 +159,7 @@ void MessageBox::auditLog( TQWidget * parent, const Job * job, const TQString & if ( err.code() != GPG_ERR_NO_DATA ) { KMessageBox::information( parent, i18n("An error occurred while trying to retrieve the GnuPG Audit Log:\n%1") - .tqarg( TQString::fromLocal8Bit( err.asString() ) ), + .arg( TQString::fromLocal8Bit( err.asString() ) ), i18n("GnuPG Audit Log Error") ); return; } @@ -194,7 +194,7 @@ void MessageBox::auditLog( TQWidget * parent, const TQString & log ) { static TQString to_information_string( const SigningResult & result ) { return result.error() - ? i18n("Signing failed: %1").tqarg( TQString::fromLocal8Bit( result.error().asString() ) ) + ? i18n("Signing failed: %1").arg( TQString::fromLocal8Bit( result.error().asString() ) ) : i18n("Signing successful") ; } @@ -204,7 +204,7 @@ static TQString to_error_string( const SigningResult & result ) { static TQString to_information_string( const EncryptionResult & result ) { return result.error() - ? i18n("Encryption failed: %1").tqarg( TQString::fromLocal8Bit( result.error().asString() ) ) + ? i18n("Encryption failed: %1").arg( TQString::fromLocal8Bit( result.error().asString() ) ) : i18n("Encryption successful") ; } diff --git a/certmanager/lib/ui/passphrasedialog.cpp b/certmanager/lib/ui/passphrasedialog.cpp index c97493d31..9ef0bad21 100644 --- a/certmanager/lib/ui/passphrasedialog.cpp +++ b/certmanager/lib/ui/passphrasedialog.cpp @@ -57,7 +57,7 @@ #include <klocale.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqfontmetrics.h> struct Kleo::PassphraseDialog::Private { diff --git a/certmanager/lib/ui/progressdialog.cpp b/certmanager/lib/ui/progressdialog.cpp index e0149b8f3..d6552922c 100644 --- a/certmanager/lib/ui/progressdialog.cpp +++ b/certmanager/lib/ui/progressdialog.cpp @@ -83,7 +83,7 @@ void Kleo::ProgressDialog::slotProgress( const TQString & what, int current, int else if ( what.isEmpty() ) setLabelText( mBaseText ); else - setLabelText( i18n( "%1: %2" ).tqarg( mBaseText, what ) ); + setLabelText( i18n( "%1: %2" ).arg( mBaseText, what ) ); setProgress( current, total ); } diff --git a/certmanager/storedtransferjob.cpp b/certmanager/storedtransferjob.cpp index b111b081f..fd9e601b8 100644 --- a/certmanager/storedtransferjob.cpp +++ b/certmanager/storedtransferjob.cpp @@ -49,7 +49,7 @@ void StoredTransferJob::slotData( KIO::Job *, const TQByteArray &data ) if ( data.size() == 0 ) return; unsigned int oldSize = m_data.size(); - m_data.tqresize( oldSize + data.size(), TQGArray::SpeedOptim ); + m_data.resize( oldSize + data.size(), TQGArray::SpeedOptim ); memcpy( m_data.data() + oldSize, data.data(), data.size() ); } diff --git a/doc/api/doxygen.css b/doc/api/doxygen.css index 9e45a5473..e059f34a5 100644 --- a/doc/api/doxygen.css +++ b/doc/api/doxygen.css @@ -362,7 +362,7 @@ display: none; @media aural { .doNotDisplay { display: inline; }} -/* Stylesheet that handles PIM-specific classes and tqlayout */ +/* Stylesheet that handles PIM-specific classes and layout */ #content h1 { diff --git a/indexlib/boost-compat/config/abi/borland_prefix.hpp b/indexlib/boost-compat/config/abi/borland_prefix.hpp index f8d23b7a2..49f424949 100644 --- a/indexlib/boost-compat/config/abi/borland_prefix.hpp +++ b/indexlib/boost-compat/config/abi/borland_prefix.hpp @@ -8,11 +8,11 @@ // -b (on or off - effect emum sizes) // -Vx (on or off - empty members) // -Ve (on or off - empty base classes) -// -aX (tqalignment - 5 options). +// -aX (alignment - 5 options). // -pX (Calling convention - 4 options) -// -VmX (member pointer size and tqlayout - 5 options) +// -VmX (member pointer size and layout - 5 options) // -VC (on or off, changes name mangling) -// -Vl (on or off, changes struct tqlayout). +// -Vl (on or off, changes struct layout). // In addition the following warnings are sufficiently annoying (and // unfixable) to have them turned off by default: diff --git a/indexlib/boost-compat/config/user.hpp b/indexlib/boost-compat/config/user.hpp index c83e9af6b..5a4a9d477 100644 --- a/indexlib/boost-compat/config/user.hpp +++ b/indexlib/boost-compat/config/user.hpp @@ -67,12 +67,12 @@ // BOOST_DISABLE_ABI_HEADERS: Stops boost headers from including any // prefix/suffix headers that normally control things like struct -// packing and tqalignment. +// packing and alignment. // #define BOOST_DISABLE_ABI_HEADERS // BOOST_ABI_PREFIX: A prefix header to include in place of whatever // boost.config would normally select, any replacement should set up -// struct packing and tqalignment options as required. +// struct packing and alignment options as required. // #define BOOST_ABI_PREFIX my-header-name // BOOST_ABI_SUFFIX: A suffix header to include in place of whatever diff --git a/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/TODO b/kaddressbook/TODO index 83f335873..df0db82b0 100644 --- a/kaddressbook/TODO +++ b/kaddressbook/TODO @@ -22,7 +22,7 @@ Improvements (things that just need to be improved/rewritten) file to get a list of views) - DONE - Redo and move the DCOP interface - 50% - Cleanup the tableview more - DONE -- Retqlayout the edit contact dialog - DONE +- Relayout the edit contact dialog - DONE - Remove ContactEntry*. Impelement supporting classes required for this. - DONE - Update the way the ConfigureView dialog gets the view config page - DONE diff --git a/kaddressbook/addresseditwidget.cpp b/kaddressbook/addresseditwidget.cpp index cc71bd4f9..1008169e5 100644 --- a/kaddressbook/addresseditwidget.cpp +++ b/kaddressbook/addresseditwidget.cpp @@ -26,13 +26,13 @@ #include <tqcheckbox.h> #include <tqhbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlistbox.h> #include <tqlistview.h> #include <tqpushbutton.h> #include <tqsignal.h> #include <tqstring.h> -#include <tqtextedit.h> +#include <textedit.h> #include <tqtoolbutton.h> #include <tqtooltip.h> @@ -82,25 +82,25 @@ class TabPressEater : public TQObject AddressEditWidget::AddressEditWidget( TQWidget *parent, const char *name ) : TQWidget( parent, name ) { - TQBoxLayout *tqlayout = new TQVBoxLayout( this, 4, 2 ); - tqlayout->setSpacing( KDialog::spacingHint() ); + TQBoxLayout *layout = new TQVBoxLayout( this, 4, 2 ); + layout->setSpacing( KDialog::spacingHint() ); mTypeCombo = new AddressTypeCombo( mAddressList, this ); connect( mTypeCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( updateAddressEdit() ) ); - tqlayout->addWidget( mTypeCombo ); + layout->addWidget( mTypeCombo ); 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 ); + layout->addWidget( mAddressField ); mEditButton = new TQPushButton( i18n( "street/postal", "&Edit Addresses..." ), this ); connect( mEditButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( edit() ) ); - tqlayout->addWidget( mEditButton ); + layout->addWidget( mEditButton ); } AddressEditWidget::~AddressEditWidget() @@ -273,8 +273,8 @@ AddressEditDialog::AddressEditDialog( const KABC::Address::List &list, mTypeCombo = new AddressTypeCombo( mAddressList, page ); topLayout->addMultiCellWidget( mTypeCombo, 0, 0, 0, 1 ); - TQLabel *label = new TQLabel( i18n( "<streetLabel>:", "%1:" ).tqarg( KABC::Address::streetLabel() ), page ); - label->tqsetAlignment( TQt::AlignTop | TQt::AlignLeft ); + TQLabel *label = new TQLabel( i18n( "<streetLabel>:", "%1:" ).arg( KABC::Address::streetLabel() ), page ); + label->setAlignment( TQt::AlignTop | TQt::AlignLeft ); topLayout->addWidget( label, 1, 0 ); mStreetTextEdit = new TQTextEdit( page ); mStreetTextEdit->setTextFormat( TQt::PlainText ); @@ -284,31 +284,31 @@ AddressEditDialog::AddressEditDialog( const KABC::Address::List &list, TabPressEater *eater = new TabPressEater( TQT_TQOBJECT(this) ); mStreetTextEdit->installEventFilter( eater ); - label = new TQLabel( i18n( "<postOfficeBoxLabel>:", "%1:" ).tqarg( KABC::Address::postOfficeBoxLabel() ), page ); + label = new TQLabel( i18n( "<postOfficeBoxLabel>:", "%1:" ).arg( KABC::Address::postOfficeBoxLabel() ), page ); topLayout->addWidget( label, 2 , 0 ); mPOBoxEdit = new KLineEdit( page ); label->setBuddy( mPOBoxEdit ); topLayout->addWidget( mPOBoxEdit, 2, 1 ); - label = new TQLabel( i18n( "<localityLabel>:", "%1:" ).tqarg( KABC::Address::localityLabel() ), page ); + label = new TQLabel( i18n( "<localityLabel>:", "%1:" ).arg( KABC::Address::localityLabel() ), page ); topLayout->addWidget( label, 3, 0 ); mLocalityEdit = new KLineEdit( page ); label->setBuddy( mLocalityEdit ); topLayout->addWidget( mLocalityEdit, 3, 1 ); - label = new TQLabel( i18n( "<regionLabel>:", "%1:" ).tqarg( KABC::Address::regionLabel() ), page ); + label = new TQLabel( i18n( "<regionLabel>:", "%1:" ).arg( KABC::Address::regionLabel() ), page ); topLayout->addWidget( label, 4, 0 ); mRegionEdit = new KLineEdit( page ); label->setBuddy( mRegionEdit ); topLayout->addWidget( mRegionEdit, 4, 1 ); - label = new TQLabel( i18n( "<postalCodeLabel>:", "%1:" ).tqarg( KABC::Address::postalCodeLabel() ), page ); + label = new TQLabel( i18n( "<postalCodeLabel>:", "%1:" ).arg( KABC::Address::postalCodeLabel() ), page ); topLayout->addWidget( label, 5, 0 ); mPostalCodeEdit = new KLineEdit( page ); label->setBuddy( mPostalCodeEdit ); topLayout->addWidget( mPostalCodeEdit, 5, 1 ); - label = new TQLabel( i18n( "<countryLabel>:", "%1:" ).tqarg( KABC::Address::countryLabel() ), page ); + label = new TQLabel( i18n( "<countryLabel>:", "%1:" ).arg( KABC::Address::countryLabel() ), page ); topLayout->addWidget( label, 6, 0 ); mCountryCombo = new KComboBox( page ); mCountryCombo->setEditable( true ); @@ -604,10 +604,10 @@ AddressTypeDialog::AddressTypeDialog( int type, TQWidget *parent ) parent, "AddressTypeDialog" ) { TQWidget *page = plainPage(); - TQVBoxLayout *tqlayout = new TQVBoxLayout( page ); + TQVBoxLayout *layout = new TQVBoxLayout( page ); mGroup = new TQButtonGroup( 2, Qt::Horizontal, i18n( "street/postal", "Address Types" ), page ); - tqlayout->addWidget( mGroup ); + layout->addWidget( mGroup ); mTypeList = KABC::Address::typeList(); mTypeList.remove( KABC::Address::Pref ); diff --git a/kaddressbook/addresseeeditordialog.cpp b/kaddressbook/addresseeeditordialog.cpp index a742c3f76..b2e9345d3 100644 --- a/kaddressbook/addresseeeditordialog.cpp +++ b/kaddressbook/addresseeeditordialog.cpp @@ -22,7 +22,7 @@ */ #include <tqapplication.h> -#include <tqlayout.h> +#include <layout.h> #include <kdebug.h> #include <klocale.h> @@ -48,7 +48,7 @@ AddresseeEditorDialog::AddresseeEditorDialog( KAB::Core *core, TQWidget *page = plainPage(); - TQVBoxLayout *tqlayout = new TQVBoxLayout( page ); + TQVBoxLayout *layout = new TQVBoxLayout( page ); if ( KABPrefs::instance()->editorType() == KABPrefs::SimpleEditor ) { mEditorWidget = new SimpleAddresseeEditor( page ); @@ -56,7 +56,7 @@ AddresseeEditorDialog::AddresseeEditorDialog( KAB::Core *core, mEditorWidget = new AddresseeEditorWidget( page ); } connect( mEditorWidget, TQT_SIGNAL( modified() ), TQT_SLOT( widgetModified() ) ); - tqlayout->addWidget( mEditorWidget ); + layout->addWidget( mEditorWidget ); enableButton( KDialogBase::Apply, false ); @@ -147,7 +147,7 @@ void AddresseeEditorDialog::slotCancel() void AddresseeEditorDialog::setTitle( const KABC::Addressee &addr ) { if ( !addr.realName().isEmpty() ) - setCaption( i18n( "Edit Contact '%1'" ).tqarg( addr.realName() ) ); + setCaption( i18n( "Edit Contact '%1'" ).arg( addr.realName() ) ); } #include "addresseeeditordialog.moc" diff --git a/kaddressbook/addresseeeditorextension.cpp b/kaddressbook/addresseeeditorextension.cpp index 72e119d9a..f2719f5b3 100644 --- a/kaddressbook/addresseeeditorextension.cpp +++ b/kaddressbook/addresseeeditorextension.cpp @@ -21,7 +21,7 @@ without including the source code for TQt in the source distribution. */ -#include <tqlayout.h> +#include <layout.h> #include <tqtimer.h> #include <klocale.h> @@ -36,14 +36,14 @@ AddresseeEditorExtension::AddresseeEditorExtension( KAB::Core *core, TQWidget *parent, const char *name ) : KAB::ExtensionWidget( core, parent, name ) { - TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); + TQVBoxLayout *layout = new TQVBoxLayout( this ); if ( KABPrefs::instance()->editorType() == KABPrefs::SimpleEditor ) mAddresseeEditor = new SimpleAddresseeEditor( this ); else mAddresseeEditor = new AddresseeEditorWidget( this ); - tqlayout->addWidget( mAddresseeEditor ); + layout->addWidget( mAddresseeEditor ); } AddresseeEditorExtension::~AddresseeEditorExtension() diff --git a/kaddressbook/addresseeeditorwidget.cpp b/kaddressbook/addresseeeditorwidget.cpp index 6d2e2ea8b..690f9fd58 100644 --- a/kaddressbook/addresseeeditorwidget.cpp +++ b/kaddressbook/addresseeeditorwidget.cpp @@ -24,11 +24,11 @@ #include <tqcheckbox.h> #include <tqhbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlistbox.h> #include <tqpushbutton.h> #include <tqtabwidget.h> -#include <tqtextedit.h> +#include <textedit.h> #include <tqtoolbutton.h> #include <tqtooltip.h> @@ -125,10 +125,10 @@ void AddresseeEditorWidget::textChanged( const TQString& ) void AddresseeEditorWidget::initGUI() { - TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); + TQVBoxLayout *layout = new TQVBoxLayout( this ); mTabWidget = new TQTabWidget( this ); - tqlayout->addWidget( mTabWidget ); + layout->addWidget( mTabWidget ); setupTab1(); setupTab2(); @@ -144,9 +144,9 @@ void AddresseeEditorWidget::setupTab1() // This is the General tab TQWidget *tab1 = new TQWidget( mTabWidget ); - TQGridLayout *tqlayout = new TQGridLayout( tab1, 11, 7 ); - tqlayout->setMargin( KDialogBase::marginHint() ); - tqlayout->setSpacing( KDialogBase::spacingHint() ); + TQGridLayout *layout = new TQGridLayout( tab1, 11, 7 ); + layout->setMargin( KDialogBase::marginHint() ); + layout->setSpacing( KDialogBase::spacingHint() ); TQLabel *label; KSeparator* bar; @@ -159,7 +159,7 @@ void AddresseeEditorWidget::setupTab1() label = new TQLabel( tab1 ); label->setPixmap( KGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop, KIcon::SizeMedium ) ); - tqlayout->addMultiCellWidget( label, 0, 1, 0, 0 ); + layout->addMultiCellWidget( label, 0, 1, 0, 0 ); // First name button = new TQPushButton( i18n( "Edit Name..." ), tab1 ); @@ -178,76 +178,76 @@ void AddresseeEditorWidget::setupTab1() mNameLabel->show(); } - tqlayout->addWidget( button, 0, 1 ); - tqlayout->addWidget( mNameEdit, 0, 2 ); - tqlayout->addWidget( mNameLabel, 0, 2 ); - label = new TQLabel( i18n( "<roleLabel>:", "%1:" ).tqarg( KABC::Addressee::roleLabel() ), tab1 ); + layout->addWidget( button, 0, 1 ); + layout->addWidget( mNameEdit, 0, 2 ); + layout->addWidget( mNameLabel, 0, 2 ); + label = new TQLabel( i18n( "<roleLabel>:", "%1:" ).arg( KABC::Addressee::roleLabel() ), tab1 ); mRoleEdit = new KLineEdit( tab1 ); connect( mRoleEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( textChanged( const TQString& ) ) ); label->setBuddy( mRoleEdit ); - tqlayout->addWidget( label, 1, 1 ); - tqlayout->addWidget( mRoleEdit, 1, 2 ); + layout->addWidget( label, 1, 1 ); + layout->addWidget( mRoleEdit, 1, 2 ); // Organization - label = new TQLabel( i18n( "<organizationLabel>:", "%1:" ).tqarg( KABC::Addressee::organizationLabel() ), tab1 ); + label = new TQLabel( i18n( "<organizationLabel>:", "%1:" ).arg( KABC::Addressee::organizationLabel() ), tab1 ); mOrgEdit = new KLineEdit( tab1 ); label->setBuddy( mOrgEdit ); connect( mOrgEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( organizationTextChanged( const TQString& ) ) ); - tqlayout->addWidget( label, 2, 1 ); - tqlayout->addWidget( mOrgEdit, 2, 2 ); + layout->addWidget( label, 2, 1 ); + layout->addWidget( mOrgEdit, 2, 2 ); // File as (formatted name) label = new TQLabel( i18n( "Formatted name:" ), tab1 ); mFormattedNameLabel = new KSqueezedTextLabel( tab1 ); - tqlayout->addWidget( label, 3, 1 ); - tqlayout->addWidget( mFormattedNameLabel, 3, 2 ); + layout->addWidget( label, 3, 1 ); + layout->addWidget( mFormattedNameLabel, 3, 2 ); // Left hand separator. This separator doesn't go all the way // across so the dialog still flows from top to bottom bar = new KSeparator( KSeparator::HLine, tab1 ); - tqlayout->addMultiCellWidget( bar, 4, 4, 0, 2 ); + layout->addMultiCellWidget( bar, 4, 4, 0, 2 ); ////////////////////////////////////// // Phone numbers (upper right) label = new TQLabel( tab1 ); label->setPixmap( KGlobal::iconLoader()->loadIcon( "kaddressbook", KIcon::Desktop, KIcon::SizeMedium ) ); - tqlayout->addMultiCellWidget( label, 0, 1, 3, 3 ); + layout->addMultiCellWidget( label, 0, 1, 3, 3 ); mPhoneEditWidget = new PhoneEditWidget( tab1 ); connect( mPhoneEditWidget, TQT_SIGNAL( modified() ), TQT_SLOT( emitModified() ) ); - tqlayout->addMultiCellWidget( mPhoneEditWidget, 0, 3, 4, 6 ); + layout->addMultiCellWidget( mPhoneEditWidget, 0, 3, 4, 6 ); bar = new KSeparator( KSeparator::HLine, tab1 ); - tqlayout->addMultiCellWidget( bar, 4, 4, 3, 6 ); + layout->addMultiCellWidget( bar, 4, 4, 3, 6 ); ////////////////////////////////////// // Addresses (lower left) label = new TQLabel( tab1 ); label->setPixmap( KGlobal::iconLoader()->loadIcon( "kfm_home", KIcon::Desktop, KIcon::SizeMedium ) ); - tqlayout->addMultiCellWidget( label, 5, 6, 0, 0 ); + layout->addMultiCellWidget( label, 5, 6, 0, 0 ); mAddressEditWidget = new AddressEditWidget( tab1 ); connect( mAddressEditWidget, TQT_SIGNAL( modified() ), TQT_SLOT( emitModified() ) ); - tqlayout->addMultiCellWidget( mAddressEditWidget, 5, 10, 1, 2 ); + layout->addMultiCellWidget( mAddressEditWidget, 5, 10, 1, 2 ); ////////////////////////////////////// // Email / Web (lower right) label = new TQLabel( tab1 ); label->setPixmap( KGlobal::iconLoader()->loadIcon( "email", KIcon::Desktop, KIcon::SizeMedium ) ); - tqlayout->addMultiCellWidget( label, 5, 6, 3, 3 ); + layout->addMultiCellWidget( label, 5, 6, 3, 3 ); mEmailWidget = new EmailEditWidget( tab1 ); connect( mEmailWidget, TQT_SIGNAL( modified() ), TQT_SLOT( emitModified() ) ); - tqlayout->addMultiCellWidget( mEmailWidget, 5, 6, 4, 6 ); + layout->addMultiCellWidget( mEmailWidget, 5, 6, 4, 6 ); // add the separator bar = new KSeparator( KSeparator::HLine, tab1 ); - tqlayout->addMultiCellWidget( bar, 7, 7, 3, 6 ); + layout->addMultiCellWidget( bar, 7, 7, 3, 6 ); TQHBoxLayout *homePageLayout = new TQHBoxLayout( 0, 11, 7 ); @@ -256,14 +256,14 @@ void AddresseeEditorWidget::setupTab1() KIcon::SizeMedium ) ); homePageLayout->addWidget( label ); - label = new TQLabel( i18n( "<urlLabel>:", "%1:" ).tqarg( KABC::Addressee::urlLabel() ), tab1 ); + label = new TQLabel( i18n( "<urlLabel>:", "%1:" ).arg( KABC::Addressee::urlLabel() ), tab1 ); mURLEdit = new KLineEdit( tab1 ); connect( mURLEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( textChanged( const TQString& ) ) ); label->setBuddy( mURLEdit ); homePageLayout->addWidget( label ); homePageLayout->addWidget( mURLEdit ); - tqlayout->addMultiCellLayout( homePageLayout, 8, 8, 3, 6 ); + layout->addMultiCellLayout( homePageLayout, 8, 8, 3, 6 ); TQHBoxLayout *blogLayout = new TQHBoxLayout( 0, 11, 7 ); label = new TQLabel( i18n("Blog feed:"), tab1 ); @@ -273,16 +273,16 @@ void AddresseeEditorWidget::setupTab1() connect( mBlogEdit, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( textChanged( const TQString & ) ) ); label->setBuddy( mBlogEdit ); - tqlayout->addMultiCellLayout( blogLayout, 9, 9, 4, 6 ); + layout->addMultiCellLayout( blogLayout, 9, 9, 4, 6 ); mIMWidget = new IMEditWidget( tab1, mAddressee ); connect( mIMWidget, TQT_SIGNAL( modified() ), TQT_SLOT( emitModified() ) ); - tqlayout->addMultiCellWidget( mIMWidget, 10, 10, 4, 6 ); + layout->addMultiCellWidget( mIMWidget, 10, 10, 4, 6 ); - tqlayout->addColSpacing( 6, 50 ); + layout->addColSpacing( 6, 50 ); bar = new KSeparator( KSeparator::HLine, tab1 ); - tqlayout->addMultiCellWidget( bar, 11, 11, 0, 6 ); + layout->addMultiCellWidget( bar, 11, 11, 0, 6 ); /////////////////////////////////////// TQHBox *categoryBox = new TQHBox( tab1 ); @@ -300,10 +300,10 @@ void AddresseeEditorWidget::setupTab1() mSecrecyWidget = new SecrecyWidget( categoryBox ); connect( mSecrecyWidget, TQT_SIGNAL( changed() ), TQT_SLOT( emitModified() ) ); - tqlayout->addMultiCellWidget( categoryBox, 12, 12, 0, 6 ); + layout->addMultiCellWidget( categoryBox, 12, 12, 0, 6 ); - // Build the tqlayout and add to the tab widget - tqlayout->activate(); // required + // Build the layout and add to the tab widget + layout->activate(); // required mTabWidget->addTab( tab1, i18n( "&General" ) ); } @@ -313,9 +313,9 @@ void AddresseeEditorWidget::setupTab2() // This is the Details tab TQWidget *tab2 = new TQWidget( mTabWidget ); - TQGridLayout *tqlayout = new TQGridLayout( tab2, 6, 6 ); - tqlayout->setMargin( KDialogBase::marginHint() ); - tqlayout->setSpacing( KDialogBase::spacingHint() ); + TQGridLayout *layout = new TQGridLayout( tab2, 6, 6 ); + layout->setMargin( KDialogBase::marginHint() ); + layout->setSpacing( KDialogBase::spacingHint() ); TQLabel *label; KSeparator* bar; @@ -327,58 +327,58 @@ void AddresseeEditorWidget::setupTab2() label = new TQLabel( tab2 ); label->setPixmap( KGlobal::iconLoader()->loadIcon( "folder", KIcon::Desktop, KIcon::SizeMedium ) ); - tqlayout->addMultiCellWidget( label, 0, 1, 0, 0 ); + layout->addMultiCellWidget( label, 0, 1, 0, 0 ); label = new TQLabel( i18n( "Department:" ), tab2 ); - tqlayout->addWidget( label, 0, 1 ); + layout->addWidget( label, 0, 1 ); mDepartmentEdit = new KLineEdit( tab2 ); connect( mDepartmentEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( textChanged( const TQString& ) ) ); label->setBuddy( mDepartmentEdit ); - tqlayout->addWidget( mDepartmentEdit, 0, 2 ); + layout->addWidget( mDepartmentEdit, 0, 2 ); label = new TQLabel( i18n( "Office:" ), tab2 ); - tqlayout->addWidget( label, 1, 1 ); + layout->addWidget( label, 1, 1 ); mOfficeEdit = new KLineEdit( tab2 ); connect( mOfficeEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( textChanged( const TQString& ) ) ); label->setBuddy( mOfficeEdit ); - tqlayout->addWidget( mOfficeEdit, 1, 2 ); + layout->addWidget( mOfficeEdit, 1, 2 ); label = new TQLabel( i18n( "Profession:" ), tab2 ); - tqlayout->addWidget( label, 2, 1 ); + layout->addWidget( label, 2, 1 ); mProfessionEdit = new KLineEdit( tab2 ); connect( mProfessionEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( textChanged( const TQString& ) ) ); label->setBuddy( mProfessionEdit ); - tqlayout->addWidget( mProfessionEdit, 2, 2 ); + layout->addWidget( mProfessionEdit, 2, 2 ); label = new TQLabel( i18n( "Manager\'s name:" ), tab2 ); - tqlayout->addWidget( label, 0, 3 ); + layout->addWidget( label, 0, 3 ); mManagerEdit = new KPIM::AddresseeLineEdit( tab2 ); connect( mManagerEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( textChanged( const TQString& ) ) ); label->setBuddy( mManagerEdit ); - tqlayout->addMultiCellWidget( mManagerEdit, 0, 0, 4, 5 ); + layout->addMultiCellWidget( mManagerEdit, 0, 0, 4, 5 ); label = new TQLabel( i18n( "Assistant's name:" ), tab2 ); - tqlayout->addWidget( label, 1, 3 ); + layout->addWidget( label, 1, 3 ); mAssistantEdit = new KPIM::AddresseeLineEdit( tab2 ); connect( mAssistantEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( textChanged( const TQString& ) ) ); label->setBuddy( mAssistantEdit ); - tqlayout->addMultiCellWidget( mAssistantEdit, 1, 1, 4, 5 ); + layout->addMultiCellWidget( mAssistantEdit, 1, 1, 4, 5 ); - label = new TQLabel( i18n( "<titleLabel>:", "%1:" ).tqarg( KABC::Addressee::titleLabel() ), tab2 ); - tqlayout->addWidget( label, 2, 3 ); + label = new TQLabel( i18n( "<titleLabel>:", "%1:" ).arg( KABC::Addressee::titleLabel() ), tab2 ); + layout->addWidget( label, 2, 3 ); mTitleEdit = new KLineEdit( tab2 ); connect( mTitleEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( textChanged( const TQString& ) ) ); label->setBuddy( mTitleEdit ); - tqlayout->addMultiCellWidget( mTitleEdit, 2, 2, 4, 5 ); + layout->addMultiCellWidget( mTitleEdit, 2, 2, 4, 5 ); bar = new KSeparator( KSeparator::HLine, tab2 ); - tqlayout->addMultiCellWidget( bar, 3, 3, 0, 5 ); + layout->addMultiCellWidget( bar, 3, 3, 0, 5 ); ///////////////////////////////////////////////// // Personal info @@ -386,61 +386,61 @@ void AddresseeEditorWidget::setupTab2() label = new TQLabel( tab2 ); label->setPixmap( KGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop, KIcon::SizeMedium ) ); - tqlayout->addMultiCellWidget( label, 4, 5, 0, 0 ); + layout->addMultiCellWidget( label, 4, 5, 0, 0 ); label = new TQLabel( i18n( "Nickname:" ), tab2 ); - tqlayout->addWidget( label, 4, 1 ); + layout->addWidget( label, 4, 1 ); mNicknameEdit = new KLineEdit( tab2 ); connect( mNicknameEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( textChanged( const TQString& ) ) ); label->setBuddy( mNicknameEdit ); - tqlayout->addWidget( mNicknameEdit, 4, 2 ); + layout->addWidget( mNicknameEdit, 4, 2 ); label = new TQLabel( i18n( "Partner's name:" ), tab2 ); - tqlayout->addWidget( label, 5, 1 ); + layout->addWidget( label, 5, 1 ); mSpouseEdit = new KPIM::AddresseeLineEdit( tab2 ); connect( mSpouseEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( textChanged( const TQString& ) ) ); label->setBuddy( mSpouseEdit ); - tqlayout->addWidget( mSpouseEdit, 5, 2 ); + layout->addWidget( mSpouseEdit, 5, 2 ); label = new TQLabel( i18n( "Birthdate:" ), tab2 ); - tqlayout->addWidget( label, 4, 3 ); + layout->addWidget( label, 4, 3 ); mBirthdayPicker = new KDateEdit( tab2 ); connect( mBirthdayPicker, TQT_SIGNAL( dateChanged( const TQDate& ) ), TQT_SLOT( dateChanged( const TQDate& ) ) ); connect( mBirthdayPicker, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( emitModified() ) ); label->setBuddy( mBirthdayPicker ); - tqlayout->addWidget( mBirthdayPicker, 4, 4 ); + layout->addWidget( mBirthdayPicker, 4, 4 ); label = new TQLabel( i18n( "Anniversary:" ), tab2 ); - tqlayout->addWidget( label, 5, 3 ); + layout->addWidget( label, 5, 3 ); mAnniversaryPicker = new KDateEdit( tab2 ); connect( mAnniversaryPicker, TQT_SIGNAL( dateChanged( const TQDate& ) ), TQT_SLOT( dateChanged( const TQDate& ) ) ); connect( mAnniversaryPicker, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( emitModified() ) ); label->setBuddy( mAnniversaryPicker ); - tqlayout->addWidget( mAnniversaryPicker, 5, 4 ); + layout->addWidget( mAnniversaryPicker, 5, 4 ); bar = new KSeparator( KSeparator::HLine, tab2 ); - tqlayout->addMultiCellWidget( bar, 6, 6, 0, 5 ); + layout->addMultiCellWidget( bar, 6, 6, 0, 5 ); ////////////////////////////////////// // Notes label = new TQLabel( i18n( "Note:" ), tab2 ); - label->tqsetAlignment( TQt::AlignTop | TQt::AlignLeft ); - tqlayout->addWidget( label, 7, 0 ); + label->setAlignment( TQt::AlignTop | TQt::AlignLeft ); + layout->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 ); + layout->addMultiCellWidget( mNoteEdit, 7, 7, 1, 5 ); - // Build the tqlayout and add to the tab widget - tqlayout->activate(); // required + // Build the layout and add to the tab widget + layout->activate(); // required mTabWidget->addTab( tab2, i18n( "&Details" ) ); } @@ -474,7 +474,7 @@ void AddresseeEditorWidget::setupAdditionalTabs() page->addWidget( widget ); } - // query the tqlayout update + // query the layout update TQDictIterator<ContactEditorTabPage> it( mTabPages ); for ( ; it.current(); ++it ) it.current()->updateLayout(); diff --git a/kaddressbook/addviewdialog.cpp b/kaddressbook/addviewdialog.cpp index d63a33fab..d2ac4cf72 100644 --- a/kaddressbook/addviewdialog.cpp +++ b/kaddressbook/addviewdialog.cpp @@ -23,7 +23,7 @@ #include <tqbuttongroup.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlineedit.h> #include <tqradiobutton.h> @@ -44,23 +44,23 @@ AddViewDialog::AddViewDialog( TQDict<ViewFactory> *viewFactoryDict, TQWidget *page = plainPage(); - TQGridLayout *tqlayout = new TQGridLayout( page, 2, 2 ); - tqlayout->setSpacing( spacingHint() ); - tqlayout->setRowStretch( 1, 1 ); - tqlayout->setColStretch( 1, 1 ); + TQGridLayout *layout = new TQGridLayout( page, 2, 2 ); + layout->setSpacing( spacingHint() ); + layout->setRowStretch( 1, 1 ); + layout->setColStretch( 1, 1 ); TQLabel *label = new TQLabel( i18n( "View name:" ), page ); - tqlayout->addWidget( label, 0, 0 ); + layout->addWidget( label, 0, 0 ); mViewNameEdit = new TQLineEdit( page ); connect( mViewNameEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( textChanged( const TQString& ) ) ); - tqlayout->addWidget( mViewNameEdit, 0, 1 ); + layout->addWidget( mViewNameEdit, 0, 1 ); mTypeGroup = new TQButtonGroup( 0, Qt::Horizontal, i18n( "View Type" ), page ); connect( mTypeGroup, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( clicked( int ) ) ); - tqlayout->addMultiCellWidget( mTypeGroup, 1, 1, 0, 1 ); - TQGridLayout *groupLayout = new TQGridLayout( mTypeGroup->tqlayout(), 3, 2 ); + layout->addMultiCellWidget( mTypeGroup, 1, 1, 0, 1 ); + TQGridLayout *groupLayout = new TQGridLayout( mTypeGroup->layout(), 3, 2 ); groupLayout->setSpacing( spacingHint() ); int row = 0; @@ -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/advancedcustomfields.cpp b/kaddressbook/advancedcustomfields.cpp index 9ba590525..753c6cc93 100644 --- a/kaddressbook/advancedcustomfields.cpp +++ b/kaddressbook/advancedcustomfields.cpp @@ -26,11 +26,11 @@ #include <tqcheckbox.h> #include <tqcombobox.h> #include <tqdatetimeedit.h> -#include <tqlayout.h> +#include <layout.h> #include <tqobjectlist.h> #include <tqspinbox.h> #include <tqregexp.h> -#include <tqtextedit.h> +#include <textedit.h> #include <tqwidgetfactory.h> #include <kdatepicker.h> @@ -126,11 +126,11 @@ void AdvancedCustomFields::setReadOnly( bool readOnly ) void AdvancedCustomFields::initGUI( const TQString &uiFile ) { - TQVBoxLayout *tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), + TQVBoxLayout *layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); mFields = new KPIM::DesignerFields( uiFile, this ); - tqlayout->addWidget( mFields ); + layout->addWidget( mFields ); connect( mFields, TQT_SIGNAL( modified() ), TQT_SLOT( setModified() ) ); } diff --git a/kaddressbook/common/filter.cpp b/kaddressbook/common/filter.cpp index 910fc151e..932f6f108 100644 --- a/kaddressbook/common/filter.cpp +++ b/kaddressbook/common/filter.cpp @@ -147,7 +147,7 @@ void Filter::save( KConfig *config, const TQString &baseGroup, Filter::List &lis // remove the old filters uint count = config->readNumEntry( "Count" ); for ( uint i = 0; i < count; ++i ) - config->deleteGroup( TQString( "%1_%2" ).tqarg( baseGroup ).tqarg( i ) ); + config->deleteGroup( TQString( "%1_%2" ).arg( baseGroup ).arg( i ) ); } @@ -155,8 +155,8 @@ void Filter::save( KConfig *config, const TQString &baseGroup, Filter::List &lis Filter::List::Iterator iter; for ( iter = list.begin(); iter != list.end(); ++iter ) { if ( !(*iter).mInternal ) { - KConfigGroupSaver s( config, TQString( "%1_%2" ).tqarg( baseGroup ) - .tqarg( index ) ); + KConfigGroupSaver s( config, TQString( "%1_%2" ).arg( baseGroup ) + .arg( index ) ); (*iter).save( config ); index++; } @@ -179,7 +179,7 @@ Filter::List Filter::restore( KConfig *config, const TQString &baseGroup ) for ( int i = 0; i < count; i++ ) { { - KConfigGroupSaver s( config, TQString( "%1_%2" ).tqarg( baseGroup ).tqarg( i ) ); + KConfigGroupSaver s( config, TQString( "%1_%2" ).arg( baseGroup ).arg( i ) ); f.restore( config ); } diff --git a/kaddressbook/common/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/common/locationmap.cpp b/kaddressbook/common/locationmap.cpp index 0e1d4e9cf..2fbda71cb 100644 --- a/kaddressbook/common/locationmap.cpp +++ b/kaddressbook/common/locationmap.cpp @@ -72,7 +72,7 @@ TQString LocationMap::createUrl( const KABC::Address &addr ) %c country (in ISO format) */ - TQString urlTemplate = KABPrefs::instance()->locationMapURL().tqarg( KGlobal::locale()->country() ); + TQString urlTemplate = KABPrefs::instance()->locationMapURL().arg( KGlobal::locale()->country() ); if ( urlTemplate.isEmpty() ) { KMessageBox::error( 0, i18n( "No service provider available for map lookup!\nPlease add one in the configuration dialog." ) ); return TQString(); diff --git a/kaddressbook/contacteditorwidgetmanager.cpp b/kaddressbook/contacteditorwidgetmanager.cpp index 1e3677c55..c4f65e6ce 100644 --- a/kaddressbook/contacteditorwidgetmanager.cpp +++ b/kaddressbook/contacteditorwidgetmanager.cpp @@ -21,7 +21,7 @@ without including the source code for TQt in the source distribution. */ -#include <tqlayout.h> +#include <layout.h> #include <kapplication.h> #include <kdialog.h> @@ -76,7 +76,7 @@ void ContactEditorWidgetManager::reload() mFactories.clear(); kdDebug(5720) << "ContactEditorWidgetManager::reload()" << endl; const KTrader::OfferList plugins = KTrader::self()->query( "KAddressBook/ContactEditorWidget", - TQString( "[X-KDE-KAddressBook-CEWPluginVersion] == %1" ).tqarg( KAB_CEW_PLUGIN_VERSION ) ); + TQString( "[X-KDE-KAddressBook-CEWPluginVersion] == %1" ).arg( KAB_CEW_PLUGIN_VERSION ) ); KTrader::OfferList::ConstIterator it; for ( it = plugins.begin(); it != plugins.end(); ++it ) { diff --git a/kaddressbook/contacteditorwidgetmanager.h b/kaddressbook/contacteditorwidgetmanager.h index 5c7ff9fb1..6bc418eb9 100644 --- a/kaddressbook/contacteditorwidgetmanager.h +++ b/kaddressbook/contacteditorwidgetmanager.h @@ -96,7 +96,7 @@ class ContactEditorTabPage : public TQWidget void setReadOnly( bool readOnly ); /** - Calculates the tqlayout of the widgets and moves them to the + Calculates the layout of the widgets and moves them to the correct position. */ void updateLayout(); diff --git a/kaddressbook/customfieldswidget.cpp b/kaddressbook/customfieldswidget.cpp index 1466e9900..54571a238 100644 --- a/kaddressbook/customfieldswidget.cpp +++ b/kaddressbook/customfieldswidget.cpp @@ -25,7 +25,7 @@ #include <tqdatetimeedit.h> #include <tqframe.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <tqvalidator.h> #include <tqspinbox.h> @@ -48,26 +48,26 @@ AddFieldDialog::AddFieldDialog( TQWidget *parent, const char *name ) { TQWidget *page = plainPage(); - TQGridLayout *tqlayout = new TQGridLayout( page, 3, 2, marginHint(), spacingHint() ); + TQGridLayout *layout = new TQGridLayout( page, 3, 2, marginHint(), spacingHint() ); TQLabel *label = new TQLabel( i18n( "Title:" ), page ); - tqlayout->addWidget( label, 0, 0 ); + layout->addWidget( label, 0, 0 ); mTitle = new KLineEdit( page ); mTitle->setValidator( new TQRegExpValidator( TQRegExp( "([a-zA-Z]|\\d|-)+" ), TQT_TQOBJECT(mTitle) ) ); label->setBuddy( mTitle ); - tqlayout->addWidget( mTitle, 0, 1 ); + layout->addWidget( mTitle, 0, 1 ); label = new TQLabel( i18n( "Type:" ), page ); - tqlayout->addWidget( label, 1, 0 ); + layout->addWidget( label, 1, 0 ); mType = new KComboBox( page ); label->setBuddy( mType ); - tqlayout->addWidget( mType, 1, 1 ); + layout->addWidget( mType, 1, 1 ); mGlobal = new TQCheckBox( i18n( "Is available for all contacts" ), page ); mGlobal->setChecked( true ); - tqlayout->addMultiCellWidget( mGlobal, 2, 2, 0, 1 ); + layout->addMultiCellWidget( mGlobal, 2, 2, 0, 1 ); connect( mTitle, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( nameChanged( const TQString& ) ) ); @@ -124,19 +124,19 @@ void AddFieldDialog::nameChanged( const TQString &name ) FieldWidget::FieldWidget( TQWidget *parent, const char *name ) : TQWidget( parent, name ) { - TQVBoxLayout *tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), + TQVBoxLayout *layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); - mGlobalLayout = new TQVBoxLayout( tqlayout, KDialog::spacingHint() ); - mGlobalLayout->tqsetAlignment( TQt::AlignTop ); + mGlobalLayout = new TQVBoxLayout( layout, KDialog::spacingHint() ); + mGlobalLayout->setAlignment( TQt::AlignTop ); mSeparator = new TQFrame( this ); mSeparator->setFrameStyle( TQFrame::HLine | TQFrame::Sunken ); mSeparator->hide(); - tqlayout->addWidget( mSeparator ); + layout->addWidget( mSeparator ); - mLocalLayout = new TQVBoxLayout( tqlayout, KDialog::spacingHint() ); - mLocalLayout->tqsetAlignment( TQt::AlignTop ); + mLocalLayout = new TQVBoxLayout( layout, KDialog::spacingHint() ); + 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 ); @@ -485,18 +485,18 @@ void CustomFieldsWidget::removeField() void CustomFieldsWidget::initGUI() { - TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3, KDialog::marginHint(), + TQGridLayout *layout = new TQGridLayout( this, 2, 3, KDialog::marginHint(), KDialog::spacingHint() ); mFieldWidget = new FieldWidget( this ); - tqlayout->addMultiCellWidget( mFieldWidget, 0, 0, 0, 2 ); + layout->addMultiCellWidget( mFieldWidget, 0, 0, 0, 2 ); mAddButton = new TQPushButton( i18n( "Add Field..." ), this ); - tqlayout->addWidget( mAddButton, 1, 1, TQt::AlignRight ); + layout->addWidget( mAddButton, 1, 1, TQt::AlignRight ); mRemoveButton = new TQPushButton( i18n( "Remove Field..." ), this ); mRemoveButton->setEnabled( false ); - tqlayout->addWidget( mRemoveButton, 1, 2, TQt::AlignRight ); + layout->addWidget( mRemoveButton, 1, 2, TQt::AlignRight ); // load global fields TQStringList globalFields = KABPrefs::instance()->globalCustomFields(); diff --git a/kaddressbook/distributionlisteditor.cpp b/kaddressbook/distributionlisteditor.cpp index 9a06fb399..9f18818b7 100644 --- a/kaddressbook/distributionlisteditor.cpp +++ b/kaddressbook/distributionlisteditor.cpp @@ -39,7 +39,7 @@ #include <kmessagebox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqsignalmapper.h> #include <tqtoolbutton.h> #include <tqguardedptr.h> @@ -67,16 +67,16 @@ public: KPIM::DistributionListEditor::Line::Line( KABC::AddressBook* book, TQWidget* parent ) : TQWidget( parent ), m_addressBook( book ) { Q_ASSERT( m_addressBook ); - TQBoxLayout* tqlayout = new TQHBoxLayout( this ); - tqlayout->setSpacing( KDialog::spacingHint() ); + TQBoxLayout* layout = new TQHBoxLayout( this ); + layout->setSpacing( KDialog::spacingHint() ); m_lineEdit = new KPIM::DistributionListEditor::LineEdit( this ); connect( m_lineEdit, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( textChanged( const TQString& ) ) ); - tqlayout->addWidget( m_lineEdit ); + layout->addWidget( m_lineEdit ); m_clearButton = new TQToolButton( this ); m_clearButton->setIconSet( KApplication::reverseLayout() ? SmallIconSet("locationbar_erase") : SmallIconSet( "clear_left" ) ); m_clearButton->setEnabled( false ); - tqlayout->addWidget( m_clearButton ); + layout->addWidget( m_clearButton ); connect( m_clearButton, TQT_SIGNAL( clicked() ), m_lineEdit, TQT_SLOT( clear() ) ); } @@ -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() ); } @@ -261,7 +261,7 @@ void KPIM::DistributionListEditor::EditorWidget::slotOk() const KPIM::DistributionList existing = KPIM::DistributionList::findByName( d->addressBook, name ); if ( !existing.isEmpty() && existing.uid() != d->distListUid ) { - KMessageBox::error( this, i18n( "A distribution list with the name %1 already exists. Please choose another name." ).tqarg( name ), i18n( "Name in Use" ) ); + KMessageBox::error( this, i18n( "A distribution list with the name %1 already exists. Please choose another name." ).arg( name ), i18n( "Name in Use" ) ); return; } diff --git a/kaddressbook/distributionlistentryview.cpp b/kaddressbook/distributionlistentryview.cpp index ef0fe9bbc..c6a8e1fa4 100644 --- a/kaddressbook/distributionlistentryview.cpp +++ b/kaddressbook/distributionlistentryview.cpp @@ -15,7 +15,7 @@ #include <tqbuttongroup.h> #include <tqcombobox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqradiobutton.h> #include <tqstringlist.h> #include <tqvbuttongroup.h> @@ -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; @@ -106,11 +106,11 @@ void KAB::DistributionListEntryView::setEntry( const KPIM::DistributionList& lis TQPixmap pixmap; pixmap.convertFromImage( m_entry.addressee.photo().data() ); m_imageLabel->setPixmap( pixmap.isNull() ? KGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop ) : pixmap ); - m_addresseeLabel->setText( i18n( "Formatted name, role, organization", "<qt><h2>%1</h2><p>%2<br/>%3</p></qt>" ).tqarg( m_entry.addressee.formattedName(), m_entry.addressee.role(), m_entry.addressee.organization() ) ); + m_addresseeLabel->setText( i18n( "Formatted name, role, organization", "<qt><h2>%1</h2><p>%2<br/>%3</p></qt>" ).arg( m_entry.addressee.formattedName(), m_entry.addressee.role(), m_entry.addressee.organization() ) ); m_distListLabel->setURL( m_list.name() ); m_distListLabel->setText( m_list.name() ); - m_resourceLabel->setText( i18n( "<b>Address book:</b> %1" ).tqarg( m_entry.addressee.resource() ? m_entry.addressee.resource()->resourceName() : TQString() ) ); - m_resourceLabel->tqsetAlignment( TQt::SingleLine ); + m_resourceLabel->setText( i18n( "<b>Address book:</b> %1" ).arg( m_entry.addressee.resource() ? m_entry.addressee.resource()->resourceName() : TQString() ) ); + m_resourceLabel->setAlignment( TQt::SingleLine ); m_emailGroup = new TQVButtonGroup( this ); m_emailGroup->setFlat( true ); @@ -133,7 +133,7 @@ void KAB::DistributionListEntryView::setEntry( const KPIM::DistributionList& lis this, TQT_SLOT( emailButtonClicked( int ) ) ); m_radioLayout->addWidget( m_emailGroup, 0, 0 ); m_emailGroup->setShown( true ); - m_mainLayout->tqinvalidate(); + m_mainLayout->invalidate(); } diff --git a/kaddressbook/distributionlistpicker.cpp b/kaddressbook/distributionlistpicker.cpp index 9f8626fb9..feacf2435 100644 --- a/kaddressbook/distributionlistpicker.cpp +++ b/kaddressbook/distributionlistpicker.cpp @@ -36,7 +36,7 @@ #include <kmessagebox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <tqregexp.h> #include <tqvalidator.h> @@ -48,12 +48,12 @@ KPIM::DistributionListPickerDialog::DistributionListPickerDialog( KABC::AddressB enableButton( Ok, false ); setButtonText( User1, i18n( "Add New Distribution List" ) ); TQWidget* main = new TQWidget( this ); - TQGridLayout* tqlayout = new TQGridLayout( main ); - tqlayout->setSpacing( KDialog::spacingHint() ); + TQGridLayout* layout = new TQGridLayout( main ); + layout->setSpacing( KDialog::spacingHint() ); m_label = new TQLabel( main ); - tqlayout->addWidget( m_label, 0, 0 ); + layout->addWidget( m_label, 0, 0 ); m_listBox = new KListBox( main ); - tqlayout->addWidget( m_listBox, 1, 0 ); + layout->addWidget( m_listBox, 1, 0 ); connect( m_listBox, TQT_SIGNAL( highlighted( const TQString& ) ), this, TQT_SLOT( entrySelected( const TQString& ) ) ); connect( m_listBox, TQT_SIGNAL( selected( const TQString& ) ), @@ -112,7 +112,7 @@ void KPIM::DistributionListPickerDialog::slotUser1() } else { - KMessageBox::error( this, i18n( "A distribution list with the the name %1 already exists. Please choose another name" ).tqarg( name ), i18n( "Name Exists" ) ); + KMessageBox::error( this, i18n( "A distribution list with the the name %1 already exists. Please choose another name" ).arg( name ), i18n( "Name Exists" ) ); } } while ( !validName ); diff --git a/kaddressbook/editors/cryptowidget.cpp b/kaddressbook/editors/cryptowidget.cpp index 89d41ab35..954c8397a 100644 --- a/kaddressbook/editors/cryptowidget.cpp +++ b/kaddressbook/editors/cryptowidget.cpp @@ -35,7 +35,7 @@ #include <kiconloader.h> #include <klocale.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqcheckbox.h> #include <tqcombobox.h> 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..0e7357ea0 100644 --- a/kaddressbook/editors/imeditorwidget.cpp +++ b/kaddressbook/editors/imeditorwidget.cpp @@ -25,7 +25,7 @@ #include <tqlistview.h> #include <tqstringlist.h> #include <tqvbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqfont.h> #include <tqpainter.h> @@ -64,7 +64,7 @@ bool IMAddressLVI::preferred() const } void IMAddressLVI::paintCell( TQPainter *p, const TQColorGroup &cg, - int column, int width, int tqalignment ) + int column, int width, int alignment ) { if ( mPreferred ) { TQFont font = p->font(); @@ -72,7 +72,7 @@ void IMAddressLVI::paintCell( TQPainter *p, const TQColorGroup &cg, p->setFont( font ); } - KListViewItem::paintCell( p, cg, column, width, tqalignment ); + KListViewItem::paintCell( p, cg, column, width, alignment ); } void IMAddressLVI::setAddress( const TQString &address ) @@ -85,7 +85,7 @@ void IMAddressLVI::setAddress( const TQString &address ) else { TQString nickname = address.section( TQChar( 0xE120 ), 0, 0 ); setText( 1, i18n( "<nickname> on <server>","%1 on %2" ) - .tqarg( nickname ).tqarg( serverOrGroup ) ); + .arg( nickname ).arg( serverOrGroup ) ); } mAddress = address; @@ -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/editors/imeditorwidget.h b/kaddressbook/editors/imeditorwidget.h index 3c9b85cee..417e62f4d 100644 --- a/kaddressbook/editors/imeditorwidget.h +++ b/kaddressbook/editors/imeditorwidget.h @@ -116,7 +116,7 @@ class IMAddressLVI : public KListViewItem bool preferred() const; protected: - virtual void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment ); + virtual void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment ); private: KPluginInfo * mProtocol; diff --git a/kaddressbook/emaileditwidget.cpp b/kaddressbook/emaileditwidget.cpp index 4ecee68a1..bc0d2173e 100644 --- a/kaddressbook/emaileditwidget.cpp +++ b/kaddressbook/emaileditwidget.cpp @@ -23,7 +23,7 @@ #include <tqcheckbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpainter.h> #include <tqpushbutton.h> #include <tqvalidator.h> @@ -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 ) ), @@ -302,7 +302,7 @@ void EmailEditDialog::remove() { TQString address = mEmailListBox->currentText(); - TQString text = i18n( "<qt>Are you sure that you want to remove the email address <b>%1</b>?</qt>" ).tqarg( address ); + TQString text = i18n( "<qt>Are you sure that you want to remove the email address <b>%1</b>?</qt>" ).arg( address ); TQString caption = i18n( "Confirm Remove" ); if ( KMessageBox::warningContinueCancel( this, text, caption, KGuiItem( i18n("&Delete"), "editdelete") ) == KMessageBox::Continue) { diff --git a/kaddressbook/extensionmanager.cpp b/kaddressbook/extensionmanager.cpp index 6e854ebca..e06b53f93 100644 --- a/kaddressbook/extensionmanager.cpp +++ b/kaddressbook/extensionmanager.cpp @@ -27,7 +27,7 @@ #include <klocale.h> #include <ktrader.h> -#include <tqlayout.h> +#include <layout.h> #include <tqobjectlist.h> #include <tqsignalmapper.h> #include <tqsplitter.h> @@ -50,10 +50,10 @@ ExtensionManager::ExtensionManager( TQWidget* extensionBar, TQWidgetStack* detai mMapper( 0 ), mDetailsStack( detailsStack ), mActiveDetailsWidget( 0 ) { Q_ASSERT( mExtensionBar ); - TQVBoxLayout* tqlayout = new TQVBoxLayout( mExtensionBar ); + TQVBoxLayout* layout = new TQVBoxLayout( mExtensionBar ); mSplitter = new TQSplitter( mExtensionBar ); mSplitter->setOrientation( Qt::Vertical ); - tqlayout->addWidget( mSplitter ); + layout->addWidget( mSplitter ); createExtensionWidgets(); @@ -217,7 +217,7 @@ void ExtensionManager::createExtensionWidgets() // load the other extensions const KTrader::OfferList plugins = KTrader::self()->query( "KAddressBook/Extension", - TQString( "[X-KDE-KAddressBook-ExtensionPluginVersion] == %1" ).tqarg( KAB_EXTENSIONWIDGET_PLUGIN_VERSION ) ); + TQString( "[X-KDE-KAddressBook-ExtensionPluginVersion] == %1" ).arg( KAB_EXTENSIONWIDGET_PLUGIN_VERSION ) ); KTrader::OfferList::ConstIterator it; for ( it = plugins.begin(); it != plugins.end(); ++it ) { diff --git a/kaddressbook/features/distributionlistngwidget.cpp b/kaddressbook/features/distributionlistngwidget.cpp index 7e6034881..5a786f76b 100644 --- a/kaddressbook/features/distributionlistngwidget.cpp +++ b/kaddressbook/features/distributionlistngwidget.cpp @@ -38,7 +38,7 @@ #include <tqevent.h> #include <tqguardedptr.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpoint.h> #include <tqtimer.h> #include <tqpushbutton.h> @@ -56,7 +56,7 @@ void KAB::DistributionListNg::ListBox::dragMoveEvent( TQDragMoveEvent *event ) event->ignore(); } else { - event->accept( tqitemRect( item ) ); + event->accept( itemRect( item ) ); } } @@ -117,11 +117,11 @@ TQString KAB::DistributionListNg::MainWidget::identifier() const KAB::DistributionListNg::MainWidget::MainWidget( KAB::Core *core, TQWidget *parent, const char *name ) : KAB::ExtensionWidget( core, parent, name ) { - TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); - tqlayout->setSpacing( KDialog::spacingHint() ); + TQVBoxLayout *layout = new TQVBoxLayout( this ); + layout->setSpacing( KDialog::spacingHint() ); TQHBoxLayout *buttonLayout = new TQHBoxLayout(); - tqlayout->addLayout( buttonLayout ); + layout->addLayout( buttonLayout ); TQLabel *label = new TQLabel( this ); label->setText( i18n( "Distribution Lists" ) ); @@ -154,7 +154,7 @@ KAB::DistributionListNg::MainWidget::MainWidget( KAB::Core *core, TQWidget *pare connect( mListBox, TQT_SIGNAL( highlighted( int ) ), this, TQT_SLOT( itemSelected( int ) ) ); connect( mListBox, TQT_SIGNAL(doubleClicked(TQListBoxItem*)), TQT_SLOT(editSelectedDistributionList()) ); - tqlayout->addWidget( mListBox ); + layout->addWidget( mListBox ); connect( core, TQT_SIGNAL( contactsUpdated() ), this, TQT_SLOT( updateEntries() ) ); diff --git a/kaddressbook/features/distributionlistwidget.cpp b/kaddressbook/features/distributionlistwidget.cpp index 035eba6ce..48393ce4a 100644 --- a/kaddressbook/features/distributionlistwidget.cpp +++ b/kaddressbook/features/distributionlistwidget.cpp @@ -25,7 +25,7 @@ #include <tqbuttongroup.h> #include <tqcombobox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlistview.h> #include <tqpushbutton.h> #include <tqradiobutton.h> @@ -343,7 +343,7 @@ void DistributionListWidget::editList() void DistributionListWidget::removeList() { int result = KMessageBox::warningContinueCancel( this, - i18n( "<qt>Delete distribution list <b>%1</b>?</qt>" ) .tqarg( mNameCombo->currentText() ), + i18n( "<qt>Delete distribution list <b>%1</b>?</qt>" ) .arg( mNameCombo->currentText() ), TQString(), KGuiItem( i18n("Delete"), "editdelete") ); if ( result != KMessageBox::Continue ) diff --git a/kaddressbook/features/resourceselection.cpp b/kaddressbook/features/resourceselection.cpp index a7f0d36dd..5c1c62b9b 100644 --- a/kaddressbook/features/resourceselection.cpp +++ b/kaddressbook/features/resourceselection.cpp @@ -21,7 +21,7 @@ without including the source code for TQt in the source distribution. */ -#include <tqlayout.h> +#include <layout.h> #include <tqpopupmenu.h> #include <tqpushbutton.h> #include <tqtimer.h> @@ -247,7 +247,7 @@ void ResourceSelection::add() KABC::Resource *resource = mManager->createResource( type ); if ( !resource ) { KMessageBox::error( this, i18n("<qt>Unable to create an address book of type <b>%1</b>.</qt>") - .tqarg( type ) ); + .arg( type ) ); return; } @@ -298,7 +298,7 @@ void ResourceSelection::remove() int result = KMessageBox::warningContinueCancel( this, i18n( "<qt>Do you really want to remove the address book <b>%1</b>?</qt>" ) - .tqarg( item->resource()->resourceName() ), "", + .arg( item->resource()->resourceName() ), "", KGuiItem( i18n( "&Remove" ), "editdelete" ) ); if ( result == KMessageBox::Cancel ) return; diff --git a/kaddressbook/filtereditdialog.cpp b/kaddressbook/filtereditdialog.cpp index 5e1586e11..ad0571d56 100644 --- a/kaddressbook/filtereditdialog.cpp +++ b/kaddressbook/filtereditdialog.cpp @@ -24,7 +24,7 @@ #include <tqbuttongroup.h> #include <tqhbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <tqradiobutton.h> #include <tqregexp.h> @@ -272,7 +272,7 @@ void FilterDialog::initGUI() mRemoveButton = buttonBox->addButton( i18n( "&Remove" ), TQT_TQOBJECT(this), TQT_SLOT( remove() ) ); mRemoveButton->setEnabled( false ); - buttonBox->tqlayout(); + buttonBox->layout(); topLayout->addWidget( buttonBox, 0, 1 ); } diff --git a/kaddressbook/freebusywidget.cpp b/kaddressbook/freebusywidget.cpp index 7b81d9ccb..ada62b166 100644 --- a/kaddressbook/freebusywidget.cpp +++ b/kaddressbook/freebusywidget.cpp @@ -22,7 +22,7 @@ */ #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <kdialog.h> #include <klocale.h> @@ -35,15 +35,15 @@ FreeBusyWidget::FreeBusyWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name ) : KAB::ContactEditorWidget( ab, parent, name ) { - TQHBoxLayout *tqlayout = new TQHBoxLayout( this, KDialog::marginHint(), + TQHBoxLayout *layout = new TQHBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); TQLabel *label = new TQLabel( i18n( "Location of Free/Busy information:" ), this ); - tqlayout->addWidget( label ); + layout->addWidget( label ); mURL = new KURLRequester( this ); label->setBuddy( mURL ); - tqlayout->addWidget( mURL ); + layout->addWidget( mURL ); connect( mURL, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( setModified() ) ); diff --git a/kaddressbook/geowidget.cpp b/kaddressbook/geowidget.cpp index 725dde3dc..304eb5a50 100644 --- a/kaddressbook/geowidget.cpp +++ b/kaddressbook/geowidget.cpp @@ -34,7 +34,7 @@ #include <tqfile.h> #include <tqgroupbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlistbox.h> #include <tqpainter.h> #include <tqpixmap.h> @@ -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 ); @@ -175,7 +175,7 @@ GeoDialog::GeoDialog( TQWidget *parent, const char *name ) topLayout->addWidget( mCityCombo, 0, 1 ); TQGroupBox *sexagesimalGroup = new TQGroupBox( 0, Qt::Vertical, i18n( "Sexagesimal" ), page ); - TQGridLayout *sexagesimalLayout = new TQGridLayout( sexagesimalGroup->tqlayout(), + TQGridLayout *sexagesimalLayout = new TQGridLayout( sexagesimalGroup->layout(), 2, 5, spacingHint() ); TQLabel *label = new TQLabel( i18n( "Latitude:" ), sexagesimalGroup ); @@ -537,7 +537,7 @@ void GeoMapWidget::paintEvent( TQPaintEvent* ) TQPixmap pm( w, h ); TQPainter p; - p.tqbegin( &pm, this ); + p.begin( &pm, this ); p.setPen( TQColor( 255, 0, 0 ) ); p.setBrush( TQColor( 255, 0, 0 ) ); diff --git a/kaddressbook/imagewidget.cpp b/kaddressbook/imagewidget.cpp index f0917eca7..b148b756f 100644 --- a/kaddressbook/imagewidget.cpp +++ b/kaddressbook/imagewidget.cpp @@ -39,7 +39,7 @@ #include <tqeventloop.h> #include <tqgroupbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpixmap.h> #include <tqpopupmenu.h> @@ -255,12 +255,12 @@ ImageBaseWidget::ImageBaseWidget( const TQString &title, TQVBoxLayout *topLayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); TQGroupBox *box = new TQGroupBox( 0, Qt::Vertical, title, this ); - TQVBoxLayout *tqlayout = new TQVBoxLayout( box->tqlayout(), KDialog::spacingHint() ); + TQVBoxLayout *layout = new TQVBoxLayout( box->layout(), KDialog::spacingHint() ); mImageButton = new ImageButton( i18n( "Picture" ), box ); mImageButton->setFixedSize( 100, 140 ); mImageButton->setImageLoader( mImageLoader ); - tqlayout->addWidget( mImageButton ); + layout->addWidget( mImageButton ); topLayout->addWidget( box ); @@ -293,14 +293,14 @@ KABC::Picture ImageBaseWidget::image() const ImageWidget::ImageWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name ) : KAB::ContactEditorWidget( ab, parent, name ) { - TQHBoxLayout *tqlayout = new TQHBoxLayout( this, KDialog::marginHint(), + TQHBoxLayout *layout = new TQHBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); mPhotoWidget = new ImageBaseWidget( KABC::Addressee::photoLabel(), this ); - tqlayout->addWidget( mPhotoWidget ); + layout->addWidget( mPhotoWidget ); mLogoWidget = new ImageBaseWidget( KABC::Addressee::logoLabel(), this ); - tqlayout->addWidget( mLogoWidget ); + layout->addWidget( mLogoWidget ); connect( mPhotoWidget, TQT_SIGNAL( changed() ), TQT_SLOT( setModified() ) ); connect( mLogoWidget, TQT_SIGNAL( changed() ), TQT_SLOT( setModified() ) ); diff --git a/kaddressbook/imeditwidget.cpp b/kaddressbook/imeditwidget.cpp index 2f40f5de3..557cdcc94 100644 --- a/kaddressbook/imeditwidget.cpp +++ b/kaddressbook/imeditwidget.cpp @@ -23,7 +23,7 @@ #include <tqcheckbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpainter.h> #include <tqpushbutton.h> #include <tqstring.h> diff --git a/kaddressbook/incsearchwidget.cpp b/kaddressbook/incsearchwidget.cpp index aaad464f1..d21b849d6 100644 --- a/kaddressbook/incsearchwidget.cpp +++ b/kaddressbook/incsearchwidget.cpp @@ -24,7 +24,7 @@ #include <tqapplication.h> #include <tqcombobox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtimer.h> #include <tqtoolbutton.h> #include <tqtooltip.h> @@ -40,32 +40,32 @@ IncSearchWidget::IncSearchWidget( TQWidget *parent, const char *name ) : TQWidget( parent, name ) { - TQHBoxLayout *tqlayout = new TQHBoxLayout( this, 2, KDialog::spacingHint() ); + TQHBoxLayout *layout = 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 ); TQToolTip::add( button, i18n( "Reset" ) ); - tqlayout->addWidget( button ); + layout->addWidget( button ); TQLabel *label = new TQLabel( i18n( "Search:" ), this, "kde toolbar widget" ); - label->tqsetAlignment( TQLabel::AlignVCenter | TQLabel::AlignRight ); - tqlayout->addWidget( label ); + label->setAlignment( TQLabel::AlignVCenter | TQLabel::AlignRight ); + layout->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 ); + layout->addWidget( mSearchText ); label = new TQLabel( i18n( "as in 'Search in:'", "&in:" ), this, "kde toolbar widget" ); - label->tqsetAlignment( TQLabel::AlignVCenter | TQLabel::AlignRight ); - tqlayout->addWidget( label ); + label->setAlignment( TQLabel::AlignVCenter | TQLabel::AlignRight ); + layout->addWidget( label ); mFieldCombo = new TQComboBox( false, this ); - tqlayout->addWidget( mFieldCombo ); + layout->addWidget( mFieldCombo ); label->setBuddy(mFieldCombo); TQToolTip::add( mFieldCombo, i18n( "Select incremental search field" ) ); diff --git a/kaddressbook/interfaces/xxport.h b/kaddressbook/interfaces/xxport.h index 73710d82b..377263fce 100644 --- a/kaddressbook/interfaces/xxport.h +++ b/kaddressbook/interfaces/xxport.h @@ -95,7 +95,7 @@ class KDE_EXPORT XXPort : public TQObject, virtual public KXMLGUIClient /** Processes outstanding KApplication events. It should be called occasionally when the import/export filter is busy performing - a long operation (e.g. reading from slow external tqdevices). + a long operation (e.g. reading from slow external devices). @see: TQApplication::processEvents() */ void processEvents() const; diff --git a/kaddressbook/jumpbuttonbar.cpp b/kaddressbook/jumpbuttonbar.cpp index 2b603fe23..090d854f0 100644 --- a/kaddressbook/jumpbuttonbar.cpp +++ b/kaddressbook/jumpbuttonbar.cpp @@ -24,7 +24,7 @@ #include <tqapplication.h> #include <tqbuttongroup.h> #include <tqevent.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <tqstring.h> #include <tqstyle.h> @@ -57,7 +57,7 @@ JumpButton::JumpButton( const TQString &firstChar, const TQString &lastChar, { setToggleButton( true ); if ( !lastChar.isEmpty() ) - setText( TQString( "%1 - %2" ).tqarg( firstChar.upper() ).tqarg( lastChar.upper() ) ); + setText( TQString( "%1 - %2" ).arg( firstChar.upper() ).arg( lastChar.upper() ) ); else setText( firstChar.upper() ); } @@ -67,15 +67,15 @@ 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->setAutoAdd( true ); - tqlayout->setResizeMode( TQLayout::FreeResize ); + TQVBoxLayout *layout = new TQVBoxLayout( this, 0, 0 ); + layout->setAlignment( TQt::AlignTop ); + layout->setAutoAdd( true ); + layout->setResizeMode( TQLayout::FreeResize ); mGroupBox = new TQButtonGroup( 1, Qt::Horizontal, this ); mGroupBox->setExclusive( true ); - mGroupBox->tqlayout()->setSpacing( 0 ); - mGroupBox->tqlayout()->setMargin( 0 ); + mGroupBox->layout()->setSpacing( 0 ); + mGroupBox->layout()->setMargin( 0 ); mGroupBox->setFrameStyle( TQFrame::NoFrame ); } @@ -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..f0b45f5bc 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp @@ -25,11 +25,11 @@ #include <unistd.h> // for usleep #include <tqeventloop.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqdir.h> #include <tqfile.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqptrlist.h> #include <tqwidgetstack.h> #include <tqregexp.h> @@ -114,7 +114,7 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, TQWidget *parent, mAddressBook = new KABC::AddressBook; mAddressBook->addResource( new KABC::ResourceFile( file ) ); if ( !mAddressBook->load() ) { - KMessageBox::error( parent, i18n("Unable to load '%1'.").tqarg( file ) ); + KMessageBox::error( parent, i18n("Unable to load '%1'.").arg( file ) ); } } mAddressBook->setErrorHandler( new KABC::GuiErrorHandler( mWidget ) ); @@ -430,10 +430,10 @@ void KABCore::setContactSelected( const TQString &uid ) mActionMerge->setEnabled( ( list.size() == 2 ) && writable ); if ( mReadWrite ) { - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); #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 @@ -552,11 +552,11 @@ void KABCore::copyContacts() #if defined(KABC_VCARD_ENCODING_FIX) TQByteArray clipText = AddresseeUtil::addresseesToClipboard( addrList ); - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); cb->setText( TQString::fromUtf8( clipText.data() ) ); #else TQString clipText = AddresseeUtil::addresseesToClipboard( addrList ); - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); cb->setText( clipText ); #endif } @@ -575,10 +575,10 @@ void KABCore::cutContacts() void KABCore::pasteContacts() { - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); #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 @@ -640,7 +640,7 @@ void KABCore::setWhoAmI() } TQString text( i18n( "<qt>Do you really want to use <b>%1</b> as your new personal contact?</qt>" ) ); - if ( KMessageBox::questionYesNo( mWidget, text.tqarg( addrList[ 0 ].assembledName() ), TQString(), i18n("Use"), i18n("Do Not Use") ) == KMessageBox::Yes ) + if ( KMessageBox::questionYesNo( mWidget, text.arg( addrList[ 0 ].assembledName() ), TQString(), i18n("Use"), i18n("Do Not Use") ) == KMessageBox::Yes ) static_cast<KABC::StdAddressBook*>( KABC::StdAddressBook::self( true ) )->setWhoAmI( addrList[ 0 ] ); } @@ -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; } @@ -720,7 +720,7 @@ void KABCore::newDistributionList() bool foundUnused = false; int i = 1; while ( !foundUnused ) { - name = i18n( "New Distribution List (%1)" ).tqarg( i++ ); + name = i18n( "New Distribution List (%1)" ).arg( i++ ); foundUnused = KPIM::DistributionList::findByName( addressBook(), name ).isEmpty(); } } @@ -897,7 +897,7 @@ void KABCore::save() if ( ticket ) { if ( !mAddressBook->save( ticket ) ) { KMessageBox::error( mWidget, - i18n( "<qt>Unable to save address book <b>%1</b>.</qt>" ).tqarg( it.current()->resourceName() ) ); + i18n( "<qt>Unable to save address book <b>%1</b>.</qt>" ).arg( it.current()->resourceName() ) ); mAddressBook->releaseSaveTicket( ticket ); } else { setModified( false ); @@ -905,7 +905,7 @@ void KABCore::save() } else { KMessageBox::error( mWidget, i18n( "<qt>Unable to get access for saving the address book <b>%1</b>.</qt>" ) - .tqarg( it.current()->resourceName() ) ); + .arg( it.current()->resourceName() ) ); } ++it; @@ -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 ); @@ -1311,7 +1311,7 @@ void KABCore::createJumpButtonBar() void KABCore::initActions() { - connect( TQApplication::tqclipboard(), TQT_SIGNAL( dataChanged() ), + connect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ), TQT_SLOT( clipboardDataChanged() ) ); KAction *action; @@ -1432,7 +1432,7 @@ void KABCore::initActions() void KABCore::clipboardDataChanged() { if ( mReadWrite ) - mActionPaste->setEnabled( !TQApplication::tqclipboard()->text().isEmpty() ); + mActionPaste->setEnabled( !TQApplication::clipboard()->text().isEmpty() ); } void KABCore::updateIncSearchWidget() @@ -1634,7 +1634,7 @@ void KABCore::removeSelectedContactsFromDistList() "<b>Note:</b>The contacts will be not be removed from your addressbook nor from " "any other distribution list." "</qt>", - uids.count() ).tqarg( mSelectedDistributionList ), + uids.count() ).arg( mSelectedDistributionList ), names, TQString(), KStdGuiItem::del() ) == KMessageBox::Cancel ) { return; } @@ -1729,7 +1729,7 @@ void KABCore::setSelectedDistributionList( const TQString &name ) mSearchManager->setSelectedDistributionList( name ); mViewHeaderLabel->setText( name.isNull() ? i18n( "Contacts" ) : - i18n( "Distribution List: %1" ).tqarg( name ) ); + i18n( "Distribution List: %1" ).arg( name ) ); mDistListButtonWidget->setShown( !mSelectedDistributionList.isNull() ); if ( !name.isNull() ) { mDetailsStack->raiseWidget( mDistListEntryView ); diff --git a/kaddressbook/kabtools.cpp b/kaddressbook/kabtools.cpp index 3efa42772..db623dbad 100644 --- a/kaddressbook/kabtools.cpp +++ b/kaddressbook/kabtools.cpp @@ -43,7 +43,7 @@ static TQString uniqueFileName( const KABC::Addressee &addressee, TQStringList & name.replace( '/', '_' ); ++number; - uniquePart = TQString( "_%1" ).tqarg( number ); + uniquePart = TQString( "_%1" ).arg( number ); } while ( existingFiles.contains( name ) ); existingFiles.append( name ); diff --git a/kaddressbook/kaddressbook_part.cpp b/kaddressbook/kaddressbook_part.cpp index 5f978b4d1..a2c079d93 100644 --- a/kaddressbook/kaddressbook_part.cpp +++ b/kaddressbook/kaddressbook_part.cpp @@ -21,7 +21,7 @@ without including the source code for TQt in the source distribution. */ -#include <tqlayout.h> +#include <layout.h> #include <kaction.h> #include <kapplication.h> diff --git a/kaddressbook/kaddressbookview.cpp b/kaddressbook/kaddressbookview.cpp index 43d709d2d..00212a5f1 100644 --- a/kaddressbook/kaddressbookview.cpp +++ b/kaddressbook/kaddressbookview.cpp @@ -21,7 +21,7 @@ without including the source code for TQt in the source distribution. */ -#include <tqlayout.h> +#include <layout.h> #include <tqpopupmenu.h> #include <kabc/addressbook.h> @@ -121,12 +121,12 @@ KABC::Addressee::List KAddressBookView::addressees() void KAddressBookView::initGUI() { - // Create the tqlayout - TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); + // Create the layout + TQVBoxLayout *layout = new TQVBoxLayout( this ); // Add the view widget mViewWidget = new TQWidget( this ); - tqlayout->addWidget( mViewWidget ); + layout->addWidget( mViewWidget ); } KABC::Field::List KAddressBookView::fields() const diff --git a/kaddressbook/kcmconfigs/addhostdialog.cpp b/kaddressbook/kcmconfigs/addhostdialog.cpp index 155f6f6ba..51faef690 100644 --- a/kaddressbook/kcmconfigs/addhostdialog.cpp +++ b/kaddressbook/kcmconfigs/addhostdialog.cpp @@ -22,7 +22,7 @@ */ #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <tqspinbox.h> #include <tqtooltip.h> @@ -39,7 +39,7 @@ AddHostDialog::AddHostDialog( KPIM::LdapServer *server, TQWidget* parent, const mServer = server; TQWidget *page = plainPage(); - TQHBoxLayout *tqlayout = new TQHBoxLayout( page, marginHint(), spacingHint() ); + TQHBoxLayout *layout = new TQHBoxLayout( page, marginHint(), spacingHint() ); mCfg = new KABC::LdapConfigWidget( KABC::LdapConfigWidget::W_USER | @@ -56,7 +56,7 @@ AddHostDialog::AddHostDialog( KPIM::LdapServer *server, TQWidget* parent, const KABC::LdapConfigWidget::W_AUTHBOX, page ); - tqlayout->addWidget( mCfg ); + layout->addWidget( mCfg ); mCfg->setHost( mServer->host() ); mCfg->setPort( mServer->port() ); mCfg->setDn( mServer->baseDN() ); diff --git a/kaddressbook/kcmconfigs/addresseewidget.cpp b/kaddressbook/kcmconfigs/addresseewidget.cpp index 8c04002d5..42f0eb6b0 100644 --- a/kaddressbook/kcmconfigs/addresseewidget.cpp +++ b/kaddressbook/kcmconfigs/addresseewidget.cpp @@ -24,7 +24,7 @@ #include <tqcstring.h> #include <tqgroupbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlistbox.h> #include <tqpushbutton.h> @@ -44,10 +44,10 @@ NamePartWidget::NamePartWidget( const TQString &title, const TQString &label, TQWidget *parent, const char *name ) : TQWidget( parent, name ), mTitle( title ), mLabel( label ) { - TQHBoxLayout *tqlayout = new TQHBoxLayout( this ); + TQHBoxLayout *layout = new TQHBoxLayout( this ); TQGroupBox *group = new TQGroupBox( 0, Qt::Vertical, title, this ); - TQGridLayout *groupLayout = new TQGridLayout( group->tqlayout(), 2, 2, + TQGridLayout *groupLayout = new TQGridLayout( group->layout(), 2, 2, KDialog::spacingHint() ); mBox = new TQListBox( group ); @@ -61,10 +61,10 @@ NamePartWidget::NamePartWidget( const TQString &title, const TQString &label, mEditButton->setEnabled( false ); mRemoveButton = bbox->addButton( i18n( "Remove" ), TQT_TQOBJECT(this), TQT_SLOT( remove() ) ); mRemoveButton->setEnabled( false ); - bbox->tqlayout(); + bbox->layout(); groupLayout->addWidget( bbox, 0, 1 ); - tqlayout->addWidget( group ); + layout->addWidget( group ); } NamePartWidget::~NamePartWidget() @@ -134,20 +134,20 @@ void NamePartWidget::selectionChanged( TQListBoxItem *item ) AddresseeWidget::AddresseeWidget( TQWidget *parent, const char *name ) : TQWidget( parent, name ) { - TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3, KDialog::marginHint(), + TQGridLayout *layout = new TQGridLayout( this, 2, 3, KDialog::marginHint(), KDialog::spacingHint() ); mPrefix = new NamePartWidget( i18n( "Prefixes"), i18n( "Enter prefix:" ), this ); - tqlayout->addWidget( mPrefix, 0, 0 ); + layout->addWidget( mPrefix, 0, 0 ); mInclusion = new NamePartWidget( i18n( "Inclusions"), i18n( "Enter inclusion:" ), this ); - tqlayout->addWidget( mInclusion, 0, 1 ); + layout->addWidget( mInclusion, 0, 1 ); mSuffix = new NamePartWidget( i18n( "Suffixes" ), i18n( "Enter suffix:" ), this ); - tqlayout->addWidget( mSuffix, 0, 2 ); + layout->addWidget( mSuffix, 0, 2 ); TQLabel *label = new TQLabel( i18n( "Default formatted name:" ), this ); - tqlayout->addWidget( label, 1, 0 ); + layout->addWidget( label, 1, 0 ); mFormattedNameCombo = new KComboBox( this ); mFormattedNameCombo->insertItem( i18n( "Empty" ) ); @@ -155,7 +155,7 @@ AddresseeWidget::AddresseeWidget( TQWidget *parent, const char *name ) mFormattedNameCombo->insertItem( i18n( "Full Name" ) ); mFormattedNameCombo->insertItem( i18n( "Reverse Name with Comma" ) ); mFormattedNameCombo->insertItem( i18n( "Reverse Name" ) ); - tqlayout->addMultiCellWidget( mFormattedNameCombo, 1, 1, 1, 2 ); + layout->addMultiCellWidget( mFormattedNameCombo, 1, 1, 1, 2 ); connect( mPrefix, TQT_SIGNAL( modified() ), TQT_SIGNAL( modified() ) ); connect( mInclusion, TQT_SIGNAL( modified() ), TQT_SIGNAL( modified() ) ); diff --git a/kaddressbook/kcmconfigs/extensionconfigdialog.cpp b/kaddressbook/kcmconfigs/extensionconfigdialog.cpp index 68f4643ab..e88f91c92 100644 --- a/kaddressbook/kcmconfigs/extensionconfigdialog.cpp +++ b/kaddressbook/kcmconfigs/extensionconfigdialog.cpp @@ -21,7 +21,7 @@ without including the source code for TQt in the source distribution. */ -#include <tqlayout.h> +#include <layout.h> #include <klocale.h> @@ -35,10 +35,10 @@ ExtensionConfigDialog::ExtensionConfigDialog( KAB::ExtensionFactory *factory, KC name, true, true ), mWidget( 0 ), mConfig( config ) { TQFrame *page = plainPage(); - TQGridLayout *tqlayout = new TQGridLayout( page, 1, 1, marginHint(), spacingHint() ); + TQGridLayout *layout = new TQGridLayout( page, 1, 1, marginHint(), spacingHint() ); mWidget = factory->configureWidget( page, "ExtensionConfigWidget" ); - tqlayout->addWidget( mWidget, 0, 0 ); + layout->addWidget( mWidget, 0, 0 ); mWidget->restoreSettings( mConfig ); } diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.cpp b/kaddressbook/kcmconfigs/kabconfigwidget.cpp index 6f99bbcde..3d335e845 100644 --- a/kaddressbook/kcmconfigs/kabconfigwidget.cpp +++ b/kaddressbook/kcmconfigs/kabconfigwidget.cpp @@ -25,7 +25,7 @@ #include <tqframe.h> #include <tqgroupbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlineedit.h> #include <tqpushbutton.h> #include <tqtabwidget.h> @@ -56,12 +56,12 @@ KABConfigWidget::KABConfigWidget( TQWidget *parent, const char *name ) // General page TQWidget *generalPage = new TQWidget( this ); - TQVBoxLayout *tqlayout = new TQVBoxLayout( generalPage, KDialog::marginHint(), + TQVBoxLayout *layout = new TQVBoxLayout( generalPage, KDialog::marginHint(), KDialog::spacingHint() ); TQGroupBox *groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "General" ), generalPage ); - TQBoxLayout *boxLayout = new TQVBoxLayout( groupBox->tqlayout() ); - boxLayout->tqsetAlignment( TQt::AlignTop ); + TQBoxLayout *boxLayout = new TQVBoxLayout( groupBox->layout() ); + boxLayout->setAlignment( TQt::AlignTop ); mViewsSingleClickBox = new TQCheckBox( i18n( "Honor KDE single click" ), groupBox, "msingle" ); boxLayout->addWidget( mViewsSingleClickBox ); @@ -94,10 +94,10 @@ KABConfigWidget::KABConfigWidget( TQWidget *parent, const char *name ) editorLayout->addStretch( 1 ); - tqlayout->addWidget( groupBox ); + layout->addWidget( groupBox ); groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Script-Hooks" ), generalPage ); - TQGridLayout *grid = new TQGridLayout( groupBox->tqlayout(), 3, 2, + TQGridLayout *grid = new TQGridLayout( groupBox->layout(), 3, 2, KDialog::spacingHint() ); label = new TQLabel( i18n( "Phone:" ), groupBox ); grid->addWidget( label, 0, 0 ); @@ -124,14 +124,14 @@ KABConfigWidget::KABConfigWidget( TQWidget *parent, const char *name ) grid->setColStretch( 1, 1 ); - tqlayout->addWidget( groupBox ); + layout->addWidget( groupBox ); groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Location Map" ), generalPage ); - boxLayout = new TQVBoxLayout( groupBox->tqlayout(), KDialog::spacingHint() ); - boxLayout->tqsetAlignment( TQt::AlignTop ); + boxLayout = new TQVBoxLayout( groupBox->layout(), KDialog::spacingHint() ); + 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>" @@ -139,7 +139,7 @@ KABConfigWidget::KABConfigWidget( TQWidget *parent, const char *name ) "<li>%c: Country ISO Code</li> </ul>" ) ); mLocationMapURL->insertStringList( KABPrefs::instance()->locationMapURLs() ); boxLayout->addWidget( mLocationMapURL ); - tqlayout->addWidget( groupBox ); + layout->addWidget( groupBox ); connect( mNameParsing, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( modified() ) ); connect( mViewsSingleClickBox, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( modified() ) ); @@ -171,7 +171,7 @@ void KABConfigWidget::restoreSettings() mFaxHook->setText( KABPrefs::instance()->faxHookApplication() ); mAddresseeWidget->restoreSettings(); mEditorCombo->setCurrentItem( KABPrefs::instance()->editorType() ); - mLocationMapURL->setCurrentText( KABPrefs::instance()->locationMapURL().tqarg( KGlobal::locale()->country() ) ); + mLocationMapURL->setCurrentText( KABPrefs::instance()->locationMapURL().arg( KGlobal::locale()->country() ) ); mLocationMapURL->lineEdit()->setCursorPosition( 0 ); KConfig config( "kabcrc", false, false ); diff --git a/kaddressbook/kcmconfigs/kcmkabconfig.cpp b/kaddressbook/kcmconfigs/kcmkabconfig.cpp index 4217a0a82..1b3c76f9a 100644 --- a/kaddressbook/kcmconfigs/kcmkabconfig.cpp +++ b/kaddressbook/kcmconfigs/kcmkabconfig.cpp @@ -21,7 +21,7 @@ without including the source code for TQt in the source distribution. */ -#include <tqlayout.h> +#include <layout.h> #include <kaboutdata.h> #include <kdebug.h> @@ -43,9 +43,9 @@ extern "C" KCMKabConfig::KCMKabConfig( TQWidget *parent, const char *name ) : KCModule( parent, name ) { - TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); + TQVBoxLayout *layout = new TQVBoxLayout( this ); mConfigWidget = new KABConfigWidget( this, "mConfigWidget" ); - tqlayout->addWidget( mConfigWidget ); + layout->addWidget( mConfigWidget ); connect( mConfigWidget, TQT_SIGNAL( changed( bool ) ), TQT_SIGNAL( changed( bool ) ) ); diff --git a/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp b/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp index e9541ea9f..e5a854492 100644 --- a/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp +++ b/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp @@ -23,7 +23,7 @@ #include <tqcheckbox.h> #include <tqframe.h> -#include <tqlayout.h> +#include <layout.h> #include <kaboutdata.h> #include <klocale.h> @@ -44,9 +44,9 @@ extern "C" KCMKabLdapConfig::KCMKabLdapConfig( TQWidget *parent, const char *name ) : KCModule( parent, name ) { - TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); + TQVBoxLayout *layout = new TQVBoxLayout( this ); mConfigWidget = new LDAPOptionsWidget( this ); - tqlayout->addWidget( mConfigWidget ); + layout->addWidget( mConfigWidget ); connect( mConfigWidget, TQT_SIGNAL( changed( bool ) ), TQT_SIGNAL( changed( bool ) ) ); diff --git a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp index a091c0f0c..3294dd96f 100644 --- a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp +++ b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp @@ -24,7 +24,7 @@ #include <tqgroupbox.h> #include <tqheader.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <tqtoolbutton.h> #include <tqstring.h> @@ -258,7 +258,7 @@ void LDAPOptionsWidget::defaults() void LDAPOptionsWidget::initGUI() { - TQVBoxLayout *tqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); + TQVBoxLayout *layout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); TQVGroupBox *groupBox = new TQVGroupBox( i18n( "LDAP Servers" ), this ); groupBox->setInsideSpacing( KDialog::spacingHint() ); @@ -285,7 +285,7 @@ void LDAPOptionsWidget::initGUI() TQWidget* spacer = new TQWidget( upDownBox ); upDownBox->setStretchFactor( spacer, 100 ); - tqlayout->addWidget( groupBox ); + layout->addWidget( groupBox ); KButtonBox *buttons = new KButtonBox( this ); buttons->addButton( i18n( "&Add Host..." ), TQT_TQOBJECT(this), TQT_SLOT( slotAddHost() ) ); @@ -293,11 +293,11 @@ void LDAPOptionsWidget::initGUI() mEditButton->setEnabled( false ); mRemoveButton = buttons->addButton( i18n( "&Remove Host" ), TQT_TQOBJECT(this), TQT_SLOT( slotRemoveHost() ) ); mRemoveButton->setEnabled( false ); - buttons->tqlayout(); + buttons->layout(); - tqlayout->addWidget( buttons ); + layout->addWidget( buttons ); - resize( TQSize( 460, 300 ).expandedTo( tqsizeHint() ) ); + resize( TQSize( 460, 300 ).expandedTo( sizeHint() ) ); } #include "ldapoptionswidget.moc" diff --git a/kaddressbook/keywidget.cpp b/kaddressbook/keywidget.cpp index 739672fc7..775401c74 100644 --- a/kaddressbook/keywidget.cpp +++ b/kaddressbook/keywidget.cpp @@ -23,7 +23,7 @@ #include <tqfile.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <kapplication.h> @@ -41,25 +41,25 @@ KeyWidget::KeyWidget( TQWidget *parent, const char *name ) : TQWidget( parent, name ) { - TQGridLayout *tqlayout = new TQGridLayout( this, 4, 2, KDialog::marginHint(), + TQGridLayout *layout = new TQGridLayout( this, 4, 2, KDialog::marginHint(), KDialog::spacingHint() ); TQLabel *label = new TQLabel( i18n( "Keys:" ), this ); - tqlayout->addWidget( label, 0, 0 ); + layout->addWidget( label, 0, 0 ); mKeyCombo = new KComboBox( this ); - tqlayout->addWidget( mKeyCombo, 0, 1 ); + layout->addWidget( mKeyCombo, 0, 1 ); mAddButton = new TQPushButton( i18n( "Add..." ), this ); - tqlayout->addMultiCellWidget( mAddButton, 1, 1, 0, 1 ); + layout->addMultiCellWidget( mAddButton, 1, 1, 0, 1 ); mRemoveButton = new TQPushButton( i18n( "Remove" ), this ); mRemoveButton->setEnabled( false ); - tqlayout->addMultiCellWidget( mRemoveButton, 2, 2, 0, 1 ); + layout->addMultiCellWidget( mRemoveButton, 2, 2, 0, 1 ); mExportButton = new TQPushButton( i18n( "Export..." ), this ); mExportButton->setEnabled( false ); - tqlayout->addMultiCellWidget( mExportButton, 3, 3, 0, 1 ); + layout->addMultiCellWidget( mExportButton, 3, 3, 0, 1 ); connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addKey() ) ); connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeKey() ) ); @@ -122,7 +122,7 @@ void KeyWidget::addKey() TQFile file( tmpFile ); if ( !file.open( IO_ReadOnly ) ) { TQString text( i18n( "<qt>Unable to open file <b>%1</b>.</qt>" ) ); - KMessageBox::error( this, text.tqarg( url.url() ) ); + KMessageBox::error( this, text.arg( url.url() ) ); return; } @@ -154,7 +154,7 @@ void KeyWidget::removeKey() TQString type = mKeyCombo->currentText(); TQString text = i18n( "<qt>Do you really want to remove the key <b>%1</b>?</qt>" ); - if ( KMessageBox::warningContinueCancel( this, text.tqarg( type ), "", KGuiItem( i18n("&Delete"), "editdelete") ) == KMessageBox::Cancel ) + if ( KMessageBox::warningContinueCancel( this, text.arg( type ), "", KGuiItem( i18n("&Delete"), "editdelete") ) == KMessageBox::Cancel ) return; mKeyList.remove( mKeyList.at( pos ) ); diff --git a/kaddressbook/ldapsearchdialog.cpp b/kaddressbook/ldapsearchdialog.cpp index 4722feac7..ceac59bb9 100644 --- a/kaddressbook/ldapsearchdialog.cpp +++ b/kaddressbook/ldapsearchdialog.cpp @@ -24,7 +24,7 @@ #include <tqgroupbox.h> #include <tqheader.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlistview.h> #include <tqmap.h> #include <tqpushbutton.h> @@ -153,7 +153,7 @@ LDAPSearchDialog::LDAPSearchDialog( KABC::AddressBook *ab, KABCore *core, groupBox->setFrameShape( TQGroupBox::Box ); groupBox->setFrameShadow( TQGroupBox::Sunken ); groupBox->setColumnLayout( 0, Qt::Vertical ); - TQGridLayout *boxLayout = new TQGridLayout( groupBox->tqlayout(), 2, + TQGridLayout *boxLayout = new TQGridLayout( groupBox->layout(), 2, 5, spacingHint() ); boxLayout->setColStretch( 1, 1 ); @@ -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" ) ); @@ -361,15 +361,15 @@ TQString LDAPSearchDialog::makeFilter( const TQString& query, const TQString& at if ( attr == i18n( "Name" ) ) { result += startsWith ? "|(cn=%1*)(sn=%2*)" : "|(cn=*%1*)(sn=*%2*)"; - result = result.tqarg( query ).tqarg( query ); + result = result.arg( query ).arg( query ); } else { result += (startsWith ? "%1=%2*" : "%1=*%2*"); if ( attr == i18n( "Email" ) ) { - result = result.tqarg( "mail" ).tqarg( query ); + result = result.arg( "mail" ).arg( query ); } else if ( attr == i18n( "Home Number" ) ) { - result = result.tqarg( "homePhone" ).tqarg( query ); + result = result.arg( "homePhone" ).arg( query ); } else if ( attr == i18n( "Work Number" ) ) { - result = result.tqarg( "telephoneNumber" ).tqarg( query ); + result = result.arg( "telephoneNumber" ).arg( query ); } else { // Error? result = TQString(); @@ -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; @@ -573,7 +573,7 @@ KABC::Addressee::List LDAPSearchDialog::importContactsUnlessTheyExist( const TQV if ( existing.isEmpty() ) { addr.setUid( KApplication::randomString( 10 ) ); - addr.setNote( i18n( "arguments are host name, datetime", "Imported from LDAP directory %1 on %2" ).tqarg( d->itemToServer[cli], KGlobal::locale()->formatDateTime( now ) ) ); + addr.setNote( i18n( "arguments are host name, datetime", "Imported from LDAP directory %1 on %2" ).arg( d->itemToServer[cli], KGlobal::locale()->formatDateTime( now ) ) ); addr.setResource( resource ); mCore->addressBook()->insertAddressee( addr ); TQString displayString; diff --git a/kaddressbook/nameeditdialog.cpp b/kaddressbook/nameeditdialog.cpp index 4bb6e3700..64fbf2f20 100644 --- a/kaddressbook/nameeditdialog.cpp +++ b/kaddressbook/nameeditdialog.cpp @@ -21,7 +21,7 @@ without including the source code for TQt in the source distribution. */ -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqlistbox.h> #include <tqlistview.h> @@ -51,71 +51,71 @@ NameEditDialog::NameEditDialog( const KABC::Addressee &addr, int type, Ok, parent, name, true ), mAddressee( addr ) { TQWidget *page = plainPage(); - TQGridLayout *tqlayout = new TQGridLayout( page ); - tqlayout->setSpacing( spacingHint() ); - tqlayout->addColSpacing( 2, 100 ); + TQGridLayout *layout = new TQGridLayout( page ); + layout->setSpacing( spacingHint() ); + layout->addColSpacing( 2, 100 ); TQLabel *label; label = new TQLabel( i18n( "Honorific prefixes:" ), page ); - tqlayout->addWidget( label, 0, 0 ); + layout->addWidget( label, 0, 0 ); mPrefixCombo = new KComboBox( page ); mPrefixCombo->setDuplicatesEnabled( false ); mPrefixCombo->setEditable( true ); mPrefixCombo->setEnabled( !readOnly ); label->setBuddy( mPrefixCombo ); - tqlayout->addMultiCellWidget( mPrefixCombo, 0, 0, 1, 2 ); + layout->addMultiCellWidget( mPrefixCombo, 0, 0, 1, 2 ); TQWhatsThis::add( mPrefixCombo, i18n( "The predefined honorific prefixes can be extended in the settings dialog." ) ); label = new TQLabel( i18n( "Given name:" ), page ); - tqlayout->addWidget( label, 1, 0 ); + layout->addWidget( label, 1, 0 ); mGivenNameEdit = new KLineEdit( page ); mGivenNameEdit->setReadOnly( readOnly ); label->setBuddy( mGivenNameEdit ); - tqlayout->addMultiCellWidget( mGivenNameEdit, 1, 1, 1, 2 ); + layout->addMultiCellWidget( mGivenNameEdit, 1, 1, 1, 2 ); label = new TQLabel( i18n( "Additional names:" ), page ); - tqlayout->addWidget( label, 2, 0 ); + layout->addWidget( label, 2, 0 ); mAdditionalNameEdit = new KLineEdit( page ); mAdditionalNameEdit->setReadOnly( readOnly ); label->setBuddy( mAdditionalNameEdit ); - tqlayout->addMultiCellWidget( mAdditionalNameEdit, 2, 2, 1, 2 ); + layout->addMultiCellWidget( mAdditionalNameEdit, 2, 2, 1, 2 ); label = new TQLabel( i18n( "Family names:" ), page ); - tqlayout->addWidget( label, 3, 0 ); + layout->addWidget( label, 3, 0 ); mFamilyNameEdit = new KLineEdit( page ); mFamilyNameEdit->setReadOnly( readOnly ); label->setBuddy( mFamilyNameEdit ); - tqlayout->addMultiCellWidget( mFamilyNameEdit, 3, 3, 1, 2 ); + layout->addMultiCellWidget( mFamilyNameEdit, 3, 3, 1, 2 ); label = new TQLabel( i18n( "Honorific suffixes:" ), page ); - tqlayout->addWidget( label, 4, 0 ); + layout->addWidget( label, 4, 0 ); mSuffixCombo = new KComboBox( page ); mSuffixCombo->setDuplicatesEnabled( false ); mSuffixCombo->setEditable( true ); mSuffixCombo->setEnabled( !readOnly ); label->setBuddy( mSuffixCombo ); - tqlayout->addMultiCellWidget( mSuffixCombo, 4, 4, 1, 2 ); + layout->addMultiCellWidget( mSuffixCombo, 4, 4, 1, 2 ); TQWhatsThis::add( mSuffixCombo, i18n( "The predefined honorific suffixes can be extended in the settings dialog." ) ); label = new TQLabel( i18n( "Formatted name:" ), page ); - tqlayout->addWidget( label, 5, 0 ); + layout->addWidget( label, 5, 0 ); mFormattedNameCombo = new KComboBox( page ); mFormattedNameCombo->setEnabled( !readOnly ); - tqlayout->addWidget( mFormattedNameCombo, 5, 1 ); + layout->addWidget( mFormattedNameCombo, 5, 1 ); connect( mFormattedNameCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( typeChanged( int ) ) ); mFormattedNameEdit = new KLineEdit( page ); mFormattedNameEdit->setEnabled( type == CustomName && !readOnly ); - tqlayout->addWidget( mFormattedNameEdit, 5, 2 ); + layout->addWidget( mFormattedNameEdit, 5, 2 ); mParseBox = new TQCheckBox( i18n( "Parse name automatically" ), page ); mParseBox->setEnabled( !readOnly ); connect( mParseBox, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( parseBoxChanged(bool) ) ); connect( mParseBox, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( modified() ) ); - tqlayout->addMultiCellWidget( mParseBox, 6, 6, 0, 1 ); + layout->addMultiCellWidget( mParseBox, 6, 6, 0, 1 ); // Fill in the values mFamilyNameEdit->setText( addr.familyName() ); diff --git a/kaddressbook/phoneeditwidget.cpp b/kaddressbook/phoneeditwidget.cpp index 5c5733142..16853ea2b 100644 --- a/kaddressbook/phoneeditwidget.cpp +++ b/kaddressbook/phoneeditwidget.cpp @@ -24,7 +24,7 @@ #include <tqbuttongroup.h> #include <tqcheckbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlistbox.h> #include <tqlistview.h> #include <tqpushbutton.h> @@ -129,13 +129,13 @@ void PhoneTypeCombo::otherSelected() PhoneNumberWidget::PhoneNumberWidget( TQWidget *parent ) : TQWidget( parent ) { - TQHBoxLayout *tqlayout = new TQHBoxLayout( this, 6, 11 ); + TQHBoxLayout *layout = new TQHBoxLayout( this, 6, 11 ); mTypeCombo = new PhoneTypeCombo( this ); mNumberEdit = new KLineEdit( this ); - tqlayout->addWidget( mTypeCombo ); - tqlayout->addWidget( mNumberEdit ); + layout->addWidget( mTypeCombo ); + layout->addWidget( mNumberEdit ); connect( mTypeCombo, TQT_SIGNAL( modified() ), TQT_SIGNAL( modified() ) ); connect( mNumberEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SIGNAL( modified() ) ); @@ -169,19 +169,19 @@ void PhoneNumberWidget::setReadOnly( bool readOnly ) PhoneEditWidget::PhoneEditWidget( TQWidget *parent, const char *name ) : TQWidget( parent, name ), mReadOnly( false ) { - TQGridLayout *tqlayout = new TQGridLayout( this, 2, 2 ); - tqlayout->setSpacing( KDialog::spacingHint() ); + TQGridLayout *layout = new TQGridLayout( this, 2, 2 ); + layout->setSpacing( KDialog::spacingHint() ); - mWidgetLayout = new TQVBoxLayout( tqlayout ); - tqlayout->addMultiCellLayout( mWidgetLayout, 0, 0, 0, 1 ); + mWidgetLayout = new TQVBoxLayout( layout ); + layout->addMultiCellLayout( mWidgetLayout, 0, 0, 0, 1 ); mAddButton = new TQPushButton( i18n( "Add" ), this ); - mAddButton->setMaximumSize( mAddButton->tqsizeHint() ); - tqlayout->addWidget( mAddButton, 1, 0, TQt::AlignRight ); + mAddButton->setMaximumSize( mAddButton->sizeHint() ); + layout->addWidget( mAddButton, 1, 0, TQt::AlignRight ); mRemoveButton = new TQPushButton( i18n( "Remove" ), this ); - mRemoveButton->setMaximumSize( mRemoveButton->tqsizeHint() ); - tqlayout->addWidget( mRemoveButton, 1, 1 ); + mRemoveButton->setMaximumSize( mRemoveButton->sizeHint() ); + layout->addWidget( mRemoveButton, 1, 1 ); mMapper = new TQSignalMapper( TQT_TQOBJECT(this) ); connect( mMapper, TQT_SIGNAL( mapped( int ) ), TQT_SLOT( changed( int ) ) ); @@ -298,13 +298,13 @@ PhoneTypeDialog::PhoneTypeDialog( int type, TQWidget *parent ) { TQWidget *page = plainPage(); - TQVBoxLayout *tqlayout = new TQVBoxLayout( page, spacingHint() ); + TQVBoxLayout *layout = new TQVBoxLayout( page, spacingHint() ); mPreferredBox = new TQCheckBox( i18n( "This is the preferred phone number" ), page ); - tqlayout->addWidget( mPreferredBox ); + layout->addWidget( mPreferredBox ); mGroup = new TQButtonGroup( 2, Qt::Horizontal, i18n( "Types" ), page ); - tqlayout->addWidget( mGroup ); + layout->addWidget( mGroup ); // fill widgets mTypeList = KABC::PhoneNumber::typeList(); diff --git a/kaddressbook/printing/detailledstyle.cpp b/kaddressbook/printing/detailledstyle.cpp index 5d970b3b7..1019d1c25 100644 --- a/kaddressbook/printing/detailledstyle.cpp +++ b/kaddressbook/printing/detailledstyle.cpp @@ -29,7 +29,7 @@ #include <kdialog.h> #include <kfontcombo.h> #include <kglobalsettings.h> -#include <tqlayout.h> +#include <layout.h> #include <klocale.h> #include <knuminput.h> #include <tqpaintdevicemetrics.h> @@ -112,8 +112,8 @@ DetailledPrintStyle::DetailledPrintStyle( PrintingWizard *parent, const char *na mPageAppearance->kcbHeaderTextColor->setColor( config->readColorEntry( ContactHeaderForeColor, &TQt::white ) ); - mPageAppearance->tqlayout()->setMargin( KDialog::marginHint() ); - mPageAppearance->tqlayout()->setSpacing( KDialog::spacingHint() ); + mPageAppearance->layout()->setMargin( KDialog::marginHint() ); + mPageAppearance->layout()->setSpacing( KDialog::spacingHint() ); } DetailledPrintStyle::~DetailledPrintStyle() diff --git a/kaddressbook/printing/ds_appearance.ui b/kaddressbook/printing/ds_appearance.ui index 989b360d8..9dc64b9e6 100644 --- a/kaddressbook/printing/ds_appearance.ui +++ b/kaddressbook/printing/ds_appearance.ui @@ -68,7 +68,7 @@ <property name="scaledContents"> <bool>false</bool> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignLeft</set> </property> </widget> @@ -138,7 +138,7 @@ <property name="text"> <string>Details font:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -149,7 +149,7 @@ <property name="text"> <string>Size:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -160,7 +160,7 @@ <property name="text"> <string>Body font:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -171,7 +171,7 @@ <property name="text"> <string>Size:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -182,7 +182,7 @@ <property name="text"> <string>Fixed font:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -203,7 +203,7 @@ <property name="text"> <string>Size:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -245,7 +245,7 @@ <property name="text"> <string>Contact header font:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -274,7 +274,7 @@ <property name="text"> <string>Size:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -285,7 +285,7 @@ <property name="text"> <string>Size:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -301,7 +301,7 @@ <property name="text"> <string>Headlines:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -400,7 +400,7 @@ <property name="text"> <string>Headline background color:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -411,7 +411,7 @@ <property name="text"> <string>Headline text color:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> diff --git a/kaddressbook/printing/kabentrypainter.cpp b/kaddressbook/printing/kabentrypainter.cpp index 91bf9f342..d7be5bd53 100644 --- a/kaddressbook/printing/kabentrypainter.cpp +++ b/kaddressbook/printing/kabentrypainter.cpp @@ -172,7 +172,7 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr, KABC::Address address; // this is used to prepare some fields for printing and decide about - // the tqlayout later: + // the layout later: TQValueList<TQStringList> parts; TQValueList<TQRectList*> contents; @@ -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..62f89d558 100644 --- a/kaddressbook/printing/mikesstyle.cpp +++ b/kaddressbook/printing/mikesstyle.cpp @@ -68,7 +68,7 @@ void MikesStyle::print( const KABC::Addressee::List &contacts, PrintProgress *pr mBoldFont = p.font(); mBoldFont.setBold( true ); TQFontMetrics fm( mFont ); - TQPaintDeviceMetrics metrics( p.tqdevice() ); + TQPaintDeviceMetrics metrics( p.device() ); int height = 0; KABC::Addressee::List::ConstIterator it; @@ -141,7 +141,7 @@ void MikesStyle::doPaint( TQPainter &painter, const KABC::Addressee &addr, { TQFontMetrics fm( font ); TQFontMetrics bfm( bFont ); - TQPaintDeviceMetrics metrics( painter.tqdevice() ); + TQPaintDeviceMetrics metrics( painter.device() ); int margin = 10; int width = metrics.width() - 10; int xPos = 5; @@ -205,7 +205,7 @@ void MikesStyle::paintTagLine( TQPainter &p, const TQFont &font ) TQFontMetrics fm( font ); TQString text = i18n( "Printed on %1 by KAddressBook (http://www.kde.org)" ) - .tqarg( KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime() ) ); + .arg( KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime() ) ); p.setPen( TQt::black ); p.drawText( 0, fm.height(), text ); diff --git a/kaddressbook/printing/printingwizard.cpp b/kaddressbook/printing/printingwizard.cpp index 1ea33d53b..fd6977919 100644 --- a/kaddressbook/printing/printingwizard.cpp +++ b/kaddressbook/printing/printingwizard.cpp @@ -25,7 +25,7 @@ #include <tqcombobox.h> #include <tqheader.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlistview.h> #include <tqpixmap.h> #include <tqpushbutton.h> diff --git a/kaddressbook/printing/printprogress.cpp b/kaddressbook/printing/printprogress.cpp index 3a9c00d19..da6d78fcf 100644 --- a/kaddressbook/printing/printprogress.cpp +++ b/kaddressbook/printing/printprogress.cpp @@ -21,9 +21,9 @@ without including the source code for TQt in the source distribution. */ -#include <tqlayout.h> +#include <layout.h> #include <tqprogressbar.h> -#include <tqtextbrowser.h> +#include <textbrowser.h> #include <kapplication.h> #include <kdebug.h> @@ -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..3813f08fe 100644 --- a/kaddressbook/printing/selectionpage.cpp +++ b/kaddressbook/printing/selectionpage.cpp @@ -29,7 +29,7 @@ #include <tqcombobox.h> #include <tqheader.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlistview.h> #include <tqpushbutton.h> #include <tqradiobutton.h> @@ -52,11 +52,11 @@ SelectionPage::SelectionPage( TQWidget* parent, const char* name ) mButtonGroup = new TQButtonGroup( this ); mButtonGroup->setFrameShape( TQButtonGroup::NoFrame ); mButtonGroup->setColumnLayout( 0, Qt::Vertical ); - mButtonGroup->tqlayout()->setSpacing( KDialog::spacingHint() ); - mButtonGroup->tqlayout()->setMargin( KDialog::marginHint() ); + mButtonGroup->layout()->setSpacing( KDialog::spacingHint() ); + mButtonGroup->layout()->setMargin( KDialog::marginHint() ); - TQGridLayout *groupLayout = new TQGridLayout( mButtonGroup->tqlayout() ); - groupLayout->tqsetAlignment( TQt::AlignTop ); + TQGridLayout *groupLayout = new TQGridLayout( mButtonGroup->layout() ); + 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..4288919bf 100644 --- a/kaddressbook/printing/stylepage.cpp +++ b/kaddressbook/printing/stylepage.cpp @@ -24,7 +24,7 @@ #include <tqbuttongroup.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpixmap.h> #include <tqradiobutton.h> @@ -122,9 +122,9 @@ void StylePage::initGUI() TQButtonGroup *group = new TQButtonGroup( i18n( "Sorting" ), this ); group->setColumnLayout( 0, Qt::Vertical ); - TQGridLayout *sortLayout = new TQGridLayout( group->tqlayout(), 2, 2, + TQGridLayout *sortLayout = new TQGridLayout( group->layout(), 2, 2, KDialog::spacingHint() ); - sortLayout->tqsetAlignment( TQt::AlignTop ); + sortLayout->setAlignment( TQt::AlignTop ); label = new TQLabel( i18n( "Criterion:" ), group ); sortLayout->addWidget( label, 0, 0 ); @@ -142,7 +142,7 @@ void StylePage::initGUI() group = new TQButtonGroup( i18n( "Print Style" ), this ); group->setColumnLayout( 0, Qt::Vertical ); - TQVBoxLayout *styleLayout = new TQVBoxLayout( group->tqlayout(), + TQVBoxLayout *styleLayout = new TQVBoxLayout( group->layout(), KDialog::spacingHint() ); mStyleCombo = new KComboBox( false, group ); @@ -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/secrecywidget.cpp b/kaddressbook/secrecywidget.cpp index 29942cb71..7a0520a9b 100644 --- a/kaddressbook/secrecywidget.cpp +++ b/kaddressbook/secrecywidget.cpp @@ -21,7 +21,7 @@ without including the source code for TQt in the source distribution. */ -#include <tqlayout.h> +#include <layout.h> #include <kabc/secrecy.h> #include <kcombobox.h> @@ -32,10 +32,10 @@ SecrecyWidget::SecrecyWidget( TQWidget *parent, const char *name ) : TQWidget( parent, name ) { - TQVBoxLayout *tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), + TQVBoxLayout *layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); mSecrecyCombo = new KComboBox( this ); - tqlayout->addWidget( mSecrecyCombo ); + layout->addWidget( mSecrecyCombo ); const KABC::Secrecy::TypeList list = KABC::Secrecy::typeList(); KABC::Secrecy::TypeList::ConstIterator it; diff --git a/kaddressbook/simpleaddresseeeditor.cpp b/kaddressbook/simpleaddresseeeditor.cpp index 3a371dc67..6ae925e65 100644 --- a/kaddressbook/simpleaddresseeeditor.cpp +++ b/kaddressbook/simpleaddresseeeditor.cpp @@ -21,7 +21,7 @@ without including the source code for TQt in the source distribution. */ -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <klineedit.h> diff --git a/kaddressbook/soundwidget.cpp b/kaddressbook/soundwidget.cpp index e50e129ba..8e34e2998 100644 --- a/kaddressbook/soundwidget.cpp +++ b/kaddressbook/soundwidget.cpp @@ -33,7 +33,7 @@ #include <tqcheckbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <tqwhatsthis.h> @@ -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/thumbnailcreator/ldifvcardcreator.cpp b/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp index 3216ea733..b5a4ecde5 100644 --- a/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp +++ b/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp @@ -31,7 +31,7 @@ #include <tqpixmap.h> #include <tqimage.h> #include <tqpainter.h> -#include <tqtextstream.h> +#include <textstream.h> #include <kdebug.h> #include <kglobal.h> diff --git a/kaddressbook/typecombo.h b/kaddressbook/typecombo.h index 2ff6591c7..e5cf64296 100644 --- a/kaddressbook/typecombo.h +++ b/kaddressbook/typecombo.h @@ -91,8 +91,8 @@ void TypeCombo<T>::updateTypes() } labelCount[ type ] = count; if ( count > 1 ) { - label = i18n("label (number)", "%1 (%2)").tqarg( label ) - .tqarg( TQString::number( count ) ); + label = i18n("label (number)", "%1 (%2)").arg( label ) + .arg( TQString::number( count ) ); } insertItem( label ); } diff --git a/kaddressbook/undocmds.cpp b/kaddressbook/undocmds.cpp index e05024bdc..def62d675 100644 --- a/kaddressbook/undocmds.cpp +++ b/kaddressbook/undocmds.cpp @@ -23,7 +23,7 @@ */ #include <tqapplication.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <klocale.h> #include <kapplication.h> @@ -261,7 +261,7 @@ void CutCommand::unexecute() mAddresseeList.clear(); - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); kapp->processEvents(); cb->setText( mOldText ); } @@ -289,7 +289,7 @@ void CutCommand::execute() // Convert to clipboard mClipText = AddresseeUtil::addresseesToClipboard( mAddresseeList ); - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); mOldText = cb->text(); kapp->processEvents(); #if defined(KABC_VCARD_ENCODING_FIX) diff --git a/kaddressbook/viewconfigurefieldspage.cpp b/kaddressbook/viewconfigurefieldspage.cpp index 9ab4b26e2..78ec53f16 100644 --- a/kaddressbook/viewconfigurefieldspage.cpp +++ b/kaddressbook/viewconfigurefieldspage.cpp @@ -22,7 +22,7 @@ */ #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlistbox.h> #include <tqpushbutton.h> #include <tqtoolbutton.h> @@ -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..d74ec783d 100644 --- a/kaddressbook/viewconfigurefilterpage.cpp +++ b/kaddressbook/viewconfigurefilterpage.cpp @@ -23,7 +23,7 @@ #include <tqbuttongroup.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqradiobutton.h> #include <kconfig.h> @@ -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/viewconfigurewidget.cpp b/kaddressbook/viewconfigurewidget.cpp index efefbd818..9f4e7c923 100644 --- a/kaddressbook/viewconfigurewidget.cpp +++ b/kaddressbook/viewconfigurewidget.cpp @@ -21,7 +21,7 @@ without including the source code for TQt in the source distribution. */ -#include <tqlayout.h> +#include <layout.h> #include <tqvbox.h> #include <kapplication.h> diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp index b6ab807ba..2433d722c 100644 --- a/kaddressbook/viewmanager.cpp +++ b/kaddressbook/viewmanager.cpp @@ -22,7 +22,7 @@ */ #include <tqfile.h> -#include <tqlayout.h> +#include <layout.h> #include <tqwidgetstack.h> #include <libtdepim/kvcarddrag.h> @@ -307,7 +307,7 @@ void ViewManager::editView() void ViewManager::deleteView() { TQString text = i18n( "<qt>Are you sure that you want to delete the view <b>%1</b>?</qt>" ) - .tqarg( mActiveView->caption() ); + .arg( mActiveView->caption() ); TQString caption = i18n( "Confirm Delete" ); if ( KMessageBox::warningContinueCancel( this, text, caption, KGuiItem( i18n("&Delete"), "editdelete") ) == KMessageBox::Continue ) { @@ -348,7 +348,7 @@ void ViewManager::addView() firstConflict = false; } - newName = TQString( "%1 <%2>" ).tqarg( newName ).tqarg( numTries ); + newName = TQString( "%1 <%2>" ).arg( newName ).arg( numTries ); numTries++; } @@ -387,7 +387,7 @@ void ViewManager::scrollDown() void ViewManager::createViewFactories() { const KTrader::OfferList plugins = KTrader::self()->query( "KAddressBook/View", - TQString( "[X-KDE-KAddressBook-ViewPluginVersion] == %1" ).tqarg( KAB_VIEW_PLUGIN_VERSION ) ); + TQString( "[X-KDE-KAddressBook-ViewPluginVersion] == %1" ).arg( KAB_VIEW_PLUGIN_VERSION ) ); KTrader::OfferList::ConstIterator it; for ( it = plugins.begin(); it != plugins.end(); ++it ) { if ( !(*it)->hasServiceType( "KAddressBook/View" ) ) @@ -601,9 +601,9 @@ void ViewManager::initActions() void ViewManager::initGUI() { - TQHBoxLayout *tqlayout = new TQHBoxLayout( this ); + TQHBoxLayout *layout = new TQHBoxLayout( this ); mViewWidgetStack = new TQWidgetStack( this ); - tqlayout->addWidget( mViewWidgetStack ); + layout->addWidget( mViewWidgetStack ); } #include "viewmanager.moc" diff --git a/kaddressbook/views/cardview.cpp b/kaddressbook/views/cardview.cpp index df956398e..03216b05b 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() ); } @@ -843,7 +843,7 @@ void CardView::drawContents( TQPainter *p, int clipx, int clipy, calcLayout(); // allow setting costum colors in the viewport pale - TQColorGroup cg = viewport()->tqpalette().active(); + TQColorGroup cg = viewport()->palette().active(); TQRect clipRect( clipx, clipy, clipw, cliph ); TQRect cardRect; @@ -893,7 +893,7 @@ void CardView::resizeEvent( TQResizeEvent *event ) void CardView::calcLayout() { - // Start in the upper left corner and tqlayout all the + // Start in the upper left corner and layout all the // cars using their height and width int maxWidth = 0; int maxHeight = 0; @@ -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 ) { @@ -1392,7 +1392,7 @@ void CardView::setLayoutDirty( bool dirty ) { if ( d->mLayoutDirty != dirty ) { d->mLayoutDirty = dirty; - tqrepaint(); + repaint(); } } @@ -1400,7 +1400,7 @@ void CardView::setDrawCardBorder( bool enabled ) { if ( enabled != d->mDrawCardBorder ) { d->mDrawCardBorder = enabled; - tqrepaint(); + repaint(); } } @@ -1426,7 +1426,7 @@ void CardView::setDrawFieldLabels( bool enabled ) { if ( enabled != d->mDrawFieldLabels ) { d->mDrawFieldLabels = enabled; - tqrepaint(); + repaint(); } } @@ -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..0bd70e1de 100644 --- a/kaddressbook/views/cardview.h +++ b/kaddressbook/views/cardview.h @@ -87,7 +87,7 @@ class CardViewItem virtual void paintCard( TQPainter *p, TQColorGroup &cg ); /** - Repaints the card. This is done by sending a tqrepaint event to the + Repaints the card. This is done by sending a repaint event to the view with the clip rect defined as this card. */ virtual void repaintCard(); @@ -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 @@ -516,7 +516,7 @@ class CardView : public TQScrollView void drawContents( TQPainter *p, int clipx, int clipy, int clipw, int cliph ); /** - Sets the tqlayout to dirty and repaints. + Sets the layout to dirty and repaints. */ void resizeEvent( TQResizeEvent* ); @@ -526,13 +526,13 @@ class CardView : public TQScrollView void contentsWheelEvent( TQWheelEvent* ); /** - Sets the tqlayout to dirty and calls for a tqrepaint. + Sets the layout to dirty and calls for a repaint. */ void setLayoutDirty( bool dirty ); /** Does the math based on the bounding rect of the cards to properly - lay the cards out on the screen. This is only done if the tqlayout is + lay the cards out on the screen. This is only done if the layout is marked as dirty. */ void calcLayout(); diff --git a/kaddressbook/views/configurecardviewdialog.cpp b/kaddressbook/views/configurecardviewdialog.cpp index 8cacbfec6..a2861c712 100644 --- a/kaddressbook/views/configurecardviewdialog.cpp +++ b/kaddressbook/views/configurecardviewdialog.cpp @@ -22,7 +22,7 @@ */ #include <tqstring.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqcheckbox.h> #include <tqvbox.h> @@ -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 ) ) ); @@ -120,7 +120,7 @@ void CardViewLookNFeelPage::restoreSettings( KConfig *config ) cbEnableCustomFonts->setChecked( config->readBoolEntry( "EnableCustomFonts", false ) ); enableFonts(); - // tqlayout + // layout sbMargin->setValue( config->readNumEntry( "ItemMargin", 0 ) ); sbSpacing->setValue( config->readNumEntry( "ItemSpacing", 10 ) ); sbSepWidth->setValue( config->readNumEntry( "SeparatorWidth", 2 ) ); @@ -152,7 +152,7 @@ void CardViewLookNFeelPage::saveSettings( KConfig *config ) config->writeEntry( "TextFont", lTextFont->font() ); config->writeEntry( "HeaderFont", lHeaderFont->font() ); } - // tqlayout + // layout config->writeEntry( "ItemMargin", sbMargin->value() ); config->writeEntry( "ItemSpacing", sbSpacing->value() ); config->writeEntry( "SeparatorWidth", sbSepWidth->value() ); @@ -313,7 +313,7 @@ void CardViewLookNFeelPage::initGUI() void CardViewLookNFeelPage::updateFontLabel( TQFont fnt, TQLabel *l ) { l->setFont( fnt ); - l->setText( TQString( fnt.family() + " %1" ).tqarg( fnt.pointSize() ) ); + l->setText( TQString( fnt.family() + " %1" ).arg( fnt.pointSize() ) ); } #include "configurecardviewdialog.moc" diff --git a/kaddressbook/views/configuretableviewdialog.cpp b/kaddressbook/views/configuretableviewdialog.cpp index 404746dc1..4e3cba97f 100644 --- a/kaddressbook/views/configuretableviewdialog.cpp +++ b/kaddressbook/views/configuretableviewdialog.cpp @@ -23,7 +23,7 @@ #include <tqstring.h> #include <tqwidget.h> -#include <tqlayout.h> +#include <layout.h> #include <tqradiobutton.h> #include <tqcheckbox.h> #include <tqvbox.h> @@ -111,11 +111,11 @@ void LookAndFeelPage::saveSettings( KConfig *config ) void LookAndFeelPage::initGUI() { - TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 0, KDialogBase::spacingHint()); + TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialogBase::spacingHint()); TQButtonGroup *group = new TQButtonGroup(1, Qt::Horizontal, i18n("Row Separator"), this); - tqlayout->addWidget(group); + layout->addWidget(group); mAlternateButton = new TQRadioButton(i18n("Alternating backgrounds"), group, "mAlternateButton"); @@ -124,7 +124,7 @@ void LookAndFeelPage::initGUI() // Background Checkbox/Selector TQHBoxLayout *backgroundLayout = new TQHBoxLayout(); - tqlayout->addLayout(backgroundLayout); + layout->addLayout(backgroundLayout); mBackgroundBox = new TQCheckBox(i18n("Enable background image:"), this, "mBackgroundBox"); @@ -141,10 +141,10 @@ void LookAndFeelPage::initGUI() // ToolTip Checkbox mToolTipBox = new TQCheckBox(i18n("Enable contact tooltips"), this, "mToolTipBox"); - tqlayout->addWidget(mToolTipBox); + layout->addWidget(mToolTipBox); #if KDE_IS_VERSION(3,2,90) mIMPresenceBox = new TQCheckBox( i18n( "Show instant messaging presence" ), this, "mIMPresenceBox" ); - tqlayout->addWidget( mIMPresenceBox ); + layout->addWidget( mIMPresenceBox ); #endif } diff --git a/kaddressbook/views/contactlistview.cpp b/kaddressbook/views/contactlistview.cpp index 0807cce64..75d521dad 100644 --- a/kaddressbook/views/contactlistview.cpp +++ b/kaddressbook/views/contactlistview.cpp @@ -27,7 +27,7 @@ #include <tqdragobject.h> #include <tqcombobox.h> #include <tqpainter.h> -#include <tqbrush.h> +#include <brush.h> #include <tqevent.h> #include <klocale.h> @@ -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() @@ -82,17 +82,17 @@ void DynamicTip::maybeTip( const TQPoint &pos ) if (a.isEmpty()) return; - s += i18n("label: value", "%1: %2").tqarg(a.formattedNameLabel()) - .tqarg(a.formattedName()); + s += i18n("label: value", "%1: %2").arg(a.formattedNameLabel()) + .arg(a.formattedName()); s += '\n'; - s += i18n("label: value", "%1: %2").tqarg(a.organizationLabel()) - .tqarg(a.organization()); + s += i18n("label: value", "%1: %2").arg(a.organizationLabel()) + .arg(a.organization()); TQString notes = a.note().stripWhiteSpace(); if ( !notes.isEmpty() ) { notes += '\n'; - s += '\n' + i18n("label: value", "%1: \n").tqarg(a.noteLabel()); + s += '\n' + i18n("label: value", "%1: \n").arg(a.noteLabel()); TQFontMetrics fm( font() ); // Begin word wrap code based on TQMultiLineEdit code diff --git a/kaddressbook/views/kaddressbookcardview.cpp b/kaddressbook/views/kaddressbookcardview.cpp index 211b62dd4..b2eb54305 100644 --- a/kaddressbook/views/kaddressbookcardview.cpp +++ b/kaddressbook/views/kaddressbookcardview.cpp @@ -25,7 +25,7 @@ #include <tqdragobject.h> #include <tqevent.h> #include <tqiconview.h> -#include <tqlayout.h> +#include <layout.h> #include <tqstringlist.h> #include <kabc/addressbook.h> @@ -96,7 +96,7 @@ class AddresseeCardViewItem : public CardViewItem const KABC::Field::List::ConstIterator endIt( mFields.end() ); for ( ; it != endIt; ++it ) { // insert empty fields or not? not doing so saves a bit of memory and CPU - // (during tqgeometry calculations), but prevents having equally + // (during geometry calculations), but prevents having equally // wide label columns in all cards, unless CardViewItem/CardView search // globally for the widest label. (anders) @@ -149,11 +149,11 @@ KAddressBookCardView::KAddressBookCardView( KAB::Core *core, { mShowEmptyFields = false; - TQVBoxLayout *tqlayout = new TQVBoxLayout( viewWidget() ); + TQVBoxLayout *layout = new TQVBoxLayout( viewWidget() ); mCardView = new AddresseeCardView( viewWidget(), "mCardView" ); mCardView->setSelectionMode( CardView::Extended ); - tqlayout->addWidget( mCardView ); + layout->addWidget( mCardView ); // Connect up the signals connect( mCardView, TQT_SIGNAL( executed( CardViewItem* ) ), diff --git a/kaddressbook/views/kaddressbookiconview.cpp b/kaddressbook/views/kaddressbookiconview.cpp index b99bca85c..c7907ef2f 100644 --- a/kaddressbook/views/kaddressbookiconview.cpp +++ b/kaddressbook/views/kaddressbookiconview.cpp @@ -23,7 +23,7 @@ #include <tqapplication.h> #include <tqiconview.h> -#include <tqlayout.h> +#include <layout.h> #include <tqstringlist.h> #include <kabc/addressbook.h> @@ -139,10 +139,10 @@ KAddressBookIconView::KAddressBookIconView( KAB::Core *core, TQWidget *parent, const char *name) : KAddressBookView( core, parent, name ) { - TQVBoxLayout *tqlayout = new TQVBoxLayout( viewWidget() ); + TQVBoxLayout *layout = new TQVBoxLayout( viewWidget() ); mIconView = new AddresseeIconView( viewWidget(), "mIconView" ); - tqlayout->addWidget( mIconView ); + layout->addWidget( mIconView ); // Connect up the signals connect( mIconView, TQT_SIGNAL( executed( TQIconViewItem* ) ), diff --git a/kaddressbook/views/kaddressbooktableview.cpp b/kaddressbook/views/kaddressbooktableview.cpp index 19364d597..25e7f6719 100644 --- a/kaddressbook/views/kaddressbooktableview.cpp +++ b/kaddressbook/views/kaddressbooktableview.cpp @@ -22,7 +22,7 @@ */ #include <tqapplication.h> -#include <tqlayout.h> +#include <layout.h> #include <tqheader.h> #include <tqvbox.h> #include <tqlistbox.h> @@ -210,7 +210,7 @@ void KAddressBookTableView::readConfig( KConfig *config ) if ( config->readBoolEntry( "Background", false ) ) mListView->setBackgroundPixmap( config->readPathEntry( "BackgroundName" ) ); - // Restore the tqlayout of the listview + // Restore the layout of the listview mListView->restoreLayout( config, config->group() ); } @@ -244,7 +244,7 @@ void KAddressBookTableView::refresh( const TQString &uid ) // Sometimes the background pixmap gets messed up when we add lots // of items. - mListView->tqrepaint(); + mListView->repaint(); if ( currentItem ) { mListView->setCurrentItem( currentItem ); diff --git a/kaddressbook/xxport/csv_xxport.cpp b/kaddressbook/xxport/csv_xxport.cpp index 22f6afadb..9c270a2e3 100644 --- a/kaddressbook/xxport/csv_xxport.cpp +++ b/kaddressbook/xxport/csv_xxport.cpp @@ -50,7 +50,7 @@ bool CSVXXPort::exportContacts( const KABC::AddresseeList &list, const TQString& return true; if( TQFileInfo(url.path()).exists() ) { - if(KMessageBox::questionYesNo( parentWidget(), i18n("Do you want to overwrite file \"%1\"").tqarg( url.path()) ) == KMessageBox::No) + if(KMessageBox::questionYesNo( parentWidget(), i18n("Do you want to overwrite file \"%1\"").arg( url.path()) ) == KMessageBox::No) return false; } @@ -58,8 +58,8 @@ bool CSVXXPort::exportContacts( const KABC::AddresseeList &list, const TQString& KTempFile tmpFile; if ( tmpFile.status() != 0 ) { TQString txt = i18n( "<qt>Unable to open file <b>%1</b>.%2.</qt>" ); - KMessageBox::error( parentWidget(), txt.tqarg( url.url() ) - .tqarg( strerror( tmpFile.status() ) ) ); + KMessageBox::error( parentWidget(), txt.arg( url.url() ) + .arg( strerror( tmpFile.status() ) ) ); return false; } @@ -71,7 +71,7 @@ bool CSVXXPort::exportContacts( const KABC::AddresseeList &list, const TQString& TQFile file( url.path() ); if ( !file.open( IO_WriteOnly ) ) { TQString txt = i18n( "<qt>Unable to open file <b>%1</b>.</qt>" ); - KMessageBox::error( parentWidget(), txt.tqarg( url.path() ) ); + KMessageBox::error( parentWidget(), txt.arg( url.path() ) ); return false; } diff --git a/kaddressbook/xxport/csvimportdialog.cpp b/kaddressbook/xxport/csvimportdialog.cpp index 88a2c087a..5f24875f9 100644 --- a/kaddressbook/xxport/csvimportdialog.cpp +++ b/kaddressbook/xxport/csvimportdialog.cpp @@ -24,12 +24,12 @@ #include <tqcheckbox.h> #include <tqcombobox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlineedit.h> #include <tqpushbutton.h> #include <tqradiobutton.h> #include <tqtable.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <tqtooltip.h> #include <kapplication.h> @@ -367,7 +367,7 @@ void CSVImportDialog::initGUI() { mPage = plainPage(); - TQGridLayout *tqlayout = new TQGridLayout( mPage, 1, 1, marginHint(), + TQGridLayout *layout = new TQGridLayout( mPage, 1, 1, marginHint(), spacingHint() ); TQHBoxLayout *hbox = new TQHBoxLayout(); hbox->setSpacing( spacingHint() ); @@ -379,16 +379,16 @@ void CSVImportDialog::initGUI() mUrlRequester->setFilter( "*.csv" ); hbox->addWidget( mUrlRequester ); - tqlayout->addMultiCellLayout( hbox, 0, 0, 0, 4 ); + layout->addMultiCellLayout( hbox, 0, 0, 0, 4 ); // Delimiter: comma, semicolon, tab, space, other mDelimiterBox = new TQButtonGroup( i18n( "Delimiter" ), mPage ); mDelimiterBox->setColumnLayout( 0, Qt::Vertical ); - mDelimiterBox->tqlayout()->setSpacing( spacingHint() ); - mDelimiterBox->tqlayout()->setMargin( marginHint() ); - TQGridLayout *delimiterLayout = new TQGridLayout( mDelimiterBox->tqlayout() ); - delimiterLayout->tqsetAlignment( TQt::AlignTop ); - tqlayout->addMultiCellWidget( mDelimiterBox, 1, 4, 0, 0 ); + mDelimiterBox->layout()->setSpacing( spacingHint() ); + mDelimiterBox->layout()->setMargin( marginHint() ); + TQGridLayout *delimiterLayout = new TQGridLayout( mDelimiterBox->layout() ); + delimiterLayout->setAlignment( TQt::AlignTop ); + layout->addMultiCellWidget( mDelimiterBox, 1, 4, 0, 0 ); mRadioComma = new TQRadioButton( i18n( "Comma" ), mDelimiterBox ); mRadioComma->setChecked( true ); @@ -411,13 +411,13 @@ void CSVImportDialog::initGUI() mComboLine = new TQComboBox( false, mPage ); mComboLine->insertItem( i18n( "1" ) ); - tqlayout->addWidget( mComboLine, 2, 3 ); + layout->addWidget( mComboLine, 2, 3 ); mComboQuote = new TQComboBox( false, mPage ); mComboQuote->insertItem( i18n( "\"" ), 0 ); mComboQuote->insertItem( i18n( "'" ), 1 ); mComboQuote->insertItem( i18n( "None" ), 2 ); - tqlayout->addWidget( mComboQuote, 2, 2 ); + layout->addWidget( mComboQuote, 2, 2 ); mDatePatternEdit = new TQLineEdit( mPage ); mDatePatternEdit->setText( "Y-M-D" ); // ISO 8601 format as default @@ -427,28 +427,28 @@ void CSVImportDialog::initGUI() "<li>M: month with 2 digits</li>" "<li>d: day with 1 or 2 digits</li>" "<li>D: day with 2 digits</li></ul>" ) ); - tqlayout->addWidget( mDatePatternEdit, 2, 4 ); + layout->addWidget( mDatePatternEdit, 2, 4 ); label = new TQLabel( i18n( "Start at line:" ), mPage ); - tqlayout->addWidget( label, 1, 3 ); + layout->addWidget( label, 1, 3 ); label = new TQLabel( i18n( "Textquote:" ), mPage ); - tqlayout->addWidget( label, 1, 2 ); + layout->addWidget( label, 1, 2 ); label = new TQLabel( i18n( "Date format:" ), mPage ); - tqlayout->addWidget( label, 1, 4 ); + layout->addWidget( label, 1, 4 ); mIgnoreDuplicates = new TQCheckBox( mPage ); mIgnoreDuplicates->setText( i18n( "Ignore duplicate delimiters" ) ); - tqlayout->addMultiCellWidget( mIgnoreDuplicates, 3, 3, 2, 4 ); + layout->addMultiCellWidget( mIgnoreDuplicates, 3, 3, 2, 4 ); mCodecCombo = new TQComboBox( mPage ); - tqlayout->addMultiCellWidget( mCodecCombo, 4, 4, 2, 4 ); + layout->addMultiCellWidget( mCodecCombo, 4, 4, 2, 4 ); mTable = new TQTable( 0, 0, mPage ); mTable->setSelectionMode( TQTable::NoSelection ); mTable->horizontalHeader()->hide(); - tqlayout->addMultiCellWidget( mTable, 5, 5, 0, 4 ); + layout->addMultiCellWidget( mTable, 5, 5, 0, 4 ); setButtonText( User1, i18n( "Apply Template..." ) ); setButtonText( User2, i18n( "Save Template..." ) ); @@ -503,7 +503,7 @@ void CSVImportDialog::fillTable() else if ( code == Guess ) { TQTextCodec* codec = TQTextCodec::codecForContent( mFileArray.data(), mFileArray.size() ); if ( codec ) { - KMessageBox::information( this, i18n( "Using codec '%1'" ).tqarg( codec->name() ), i18n( "Encoding" ) ); + KMessageBox::information( this, i18n( "Using codec '%1'" ).arg( codec->name() ), i18n( "Encoding" ) ); inputStream.setCodec( codec ); } } @@ -663,7 +663,7 @@ void CSVImportDialog::reloadCodecs() for ( int i = 0; ( codec = TQTextCodec::codecForIndex( i ) ); i++ ) mCodecs.append( codec ); - mCodecCombo->insertItem( i18n( "Local (%1)" ).tqarg( TQTextCodec::codecForLocale()->name() ), Local ); + mCodecCombo->insertItem( i18n( "Local (%1)" ).arg( TQTextCodec::codecForLocale()->name() ), Local ); mCodecCombo->insertItem( i18n( "[guess]" ), Guess ); mCodecCombo->insertItem( i18n( "Latin1" ), Latin1 ); mCodecCombo->insertItem( i18n( "Unicode" ), Uni ); @@ -858,7 +858,7 @@ void CSVImportDialog::saveTemplate() fileName += ".desktop"; if( TQFileInfo(fileName).exists() ) { - if(KMessageBox::questionYesNo( this, i18n("Do you want to overwrite file \"%1\"").tqarg(fileName) ) == KMessageBox::No) + if(KMessageBox::questionYesNo( this, i18n("Do you want to overwrite file \"%1\"").arg(fileName) ) == KMessageBox::No) return; } TQString name = KInputDialog::getText( i18n( "Template Name" ), i18n( "Please enter a name for the template:" ) ); diff --git a/kaddressbook/xxport/gnokii_xxport.cpp b/kaddressbook/xxport/gnokii_xxport.cpp index abd3234b7..9f7b628f4 100644 --- a/kaddressbook/xxport/gnokii_xxport.cpp +++ b/kaddressbook/xxport/gnokii_xxport.cpp @@ -63,7 +63,7 @@ extern "C" { #define GNOKII_CHECK_ERROR(error) \ do { \ if (error) \ - kdError() << TQString("ERROR %1: %2\n").tqarg(error).tqarg(gn_error_print(error));\ + kdError() << TQString("ERROR %1: %2\n").arg(error).arg(gn_error_print(error));\ } while (0) // Locale conversion routines: @@ -126,8 +126,8 @@ static TQString businit(void) { GNOKII_DEBUG( "Using new gnokii version." ); - GNOKII_DEBUG( TQString("Compiled with libgnokii version 0x%1\n").tqarg(TQString::number(LIBGNOKII_VERSION,16)) ); - GNOKII_DEBUG( TQString("Using libgnokii runtime version 0x%1\n").tqarg(TQString::number(gn_lib_version(),16)) ); + GNOKII_DEBUG( TQString("Compiled with libgnokii version 0x%1\n").arg(TQString::number(LIBGNOKII_VERSION,16)) ); + GNOKII_DEBUG( TQString("Using libgnokii runtime version 0x%1\n").arg(TQString::number(gn_lib_version(),16)) ); gn_error error = gn_lib_phoneprofile_load(NULL, &state); if (error) @@ -142,7 +142,7 @@ static TQString businit(void) "You might try to run \"gnokii --identify\" on the command line to " "check any cable/transport issues and to verify if your gnokii " "configuration is correct.</center></qt>") - .tqarg(gn_error_print(error)); + .arg(gn_error_print(error)); } // identify phone @@ -152,7 +152,7 @@ static TQString businit(void) imei = gn_lib_get_phone_imei(state); GNOKII_DEBUG( TQString("Found mobile phone: %1 %2, Revision: %3, IMEI: %4\n") - .tqarg(manufacturer, model, revision, imei) ); + .arg(manufacturer, model, revision, imei) ); return TQString(); } @@ -166,23 +166,23 @@ static gn_error read_phone_memstat( const gn_memory_type memtype, gn_memory_stat error = gn_lib_addressbook_memstat(state, memtype, &memstat->used, &memstat->free); GNOKII_DEBUG( TQString("\n\nMobile phone memory status: Type: %1, used=%2, free=%3, total=%4\n\n") - .tqarg(memtype).tqarg(memstat->used).tqarg(memstat->free).tqarg(memstat->used+memstat->free) ); + .arg(memtype).arg(memstat->used).arg(memstat->free).arg(memstat->used+memstat->free) ); return error; } static TQString buildPhoneInfoString( const gn_memory_status &memstat ) { - TQString format = TQString::tqfromLatin1("<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>") - .tqarg(i18n("Mobile Phone information:")) - .tqarg(format.tqarg(i18n("Manufacturer")).tqarg(GN_FROM(manufacturer))) - .tqarg(format.tqarg(i18n("Phone model")).tqarg(GN_FROM(model))) - .tqarg(format.tqarg(i18n("Revision")).tqarg(GN_FROM(revision))) - .tqarg(format.tqarg(i18n("IMEI")).tqarg(GN_FROM(imei))) - .tqarg(format.tqarg(i18n("Phonebook status")) - .tqarg(i18n("%1 out of %2 contacts used").tqarg(memstat.used).tqarg(memstat.used+memstat.free))); + TQString format = TQString::fromLatin1("<tr><td><b>%1</b></td><td>%2</td></tr>"); + + return TQString::fromLatin1("<b>%1</b><br><table>%2%3%4%5%6</table><br>") + .arg(i18n("Mobile Phone information:")) + .arg(format.arg(i18n("Manufacturer")).arg(GN_FROM(manufacturer))) + .arg(format.arg(i18n("Phone model")).arg(GN_FROM(model))) + .arg(format.arg(i18n("Revision")).arg(GN_FROM(revision))) + .arg(format.arg(i18n("IMEI")).arg(GN_FROM(imei))) + .arg(format.arg(i18n("Phonebook status")) + .arg(i18n("%1 out of %2 contacts used").arg(memstat.used).arg(memstat.used+memstat.free))); } // read and evaluate all phone entries @@ -209,9 +209,9 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty progress->setTotalSteps(memstat.used); m_progressDlg->setLabel(i18n("<qt>Importing <b>%1</b> contacts from <b>%2</b> of the Mobile Phone.<br><br>%3</qt>") - .tqarg(memstat.used) - .tqarg(gn_memory_type2str(memtype)) - .tqarg(buildPhoneInfoString(memstat)) ); + .arg(memstat.used) + .arg(gn_memory_type2str(memtype)) + .arg(buildPhoneInfoString(memstat)) ); int num_read = 0; @@ -233,10 +233,10 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty const char *name = gn_lib_get_pb_name(state); const char *number = gn_lib_get_pb_number(state); - GNOKII_DEBUG(TQString("%1: %2, num=%3, location=%4, group=%5, count=%6\n").tqarg(i) - .tqarg(GN_FROM(name)).tqarg(GN_FROM(number)) - .tqarg(gn_lib_get_pb_location(state)).tqarg(gn_lib_get_pb_caller_group(state)) - .tqarg(subentries_count)); + GNOKII_DEBUG(TQString("%1: %2, num=%3, location=%4, group=%5, count=%6\n").arg(i) + .arg(GN_FROM(name)).arg(GN_FROM(number)) + .arg(gn_lib_get_pb_location(state)).arg(gn_lib_get_pb_caller_group(state)) + .arg(subentries_count)); KABC::Addressee *a = new KABC::Addressee(); // try to split Name into FamilyName and GivenName @@ -263,20 +263,20 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty } a->insertCustom(APP, "X_GSM_CALLERGROUP", s.setNum(gn_lib_get_pb_caller_group(state))); - a->insertCustom(APP, "X_GSM_STORE_AT", TQString("%1%2").tqarg(memtypestr).tqarg(gn_lib_get_pb_location(state))); + a->insertCustom(APP, "X_GSM_STORE_AT", TQString("%1%2").arg(memtypestr).arg(gn_lib_get_pb_location(state))); // set ProductId - a->setProductId(TQString("%1-%2-%3-%4").tqarg(APP).tqarg(model).tqarg(revision).tqarg(imei)); + a->setProductId(TQString("%1-%2-%3-%4").arg(APP).arg(model).arg(revision).arg(imei)); // evaluate timestamp (ignore timezone) TQDateTime datetime; 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) ); - GNOKII_DEBUG(TQString(" date=%1\n").tqarg(datetime.toString())); + GNOKII_DEBUG(TQString(" date=%1\n").arg(datetime.toString())); a->setRevision(datetime); if (!subentries_count) @@ -295,7 +295,7 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty TQString s = GN_FROM(number).simplifyWhiteSpace(); GNOKII_DEBUG(TQString(" Subentry#%1, entry_type=%2, number_type=%3, number=%4\n") - .tqarg(n).tqarg(entry_type).tqarg(number_type).tqarg(s)); + .arg(n).arg(entry_type).arg(number_type).arg(s)); if (s.isEmpty()) continue; switch(entry_type) { @@ -362,7 +362,7 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty break; default: GNOKII_DEBUG(TQString(" Not handled id=%1, entry=%2\n") - .tqarg(entry_type).tqarg(s)); + .arg(entry_type).arg(s)); break; } // switch() } // if(subentry) @@ -425,8 +425,8 @@ static gn_error xxport_phone_write_entry( int phone_location, gn_memory_type mem time.hour(), time.minute(), time.second(), 0 ); gn_lib_set_pb_date(state, ts); - GNOKII_DEBUG(TQString("Write #%1: name=%2, number=%3\n").tqarg(phone_location) - .tqarg(GN_FROM(gn_lib_get_pb_name(state))).tqarg(GN_FROM(gn_lib_get_pb_number(state)))); + GNOKII_DEBUG(TQString("Write #%1: name=%2, number=%3\n").arg(phone_location) + .arg(GN_FROM(gn_lib_get_pb_name(state))).arg(GN_FROM(gn_lib_get_pb_number(state)))); const KABC::Address homeAddr = addr->address(KABC::Address::Home); const KABC::Address workAddr = addr->address(KABC::Address::Work); @@ -467,7 +467,7 @@ static gn_error xxport_phone_write_entry( int phone_location, gn_memory_type mem // only one email allowed if we have URLS, notes, addresses (to avoid phone limitations) if (n && !addr->url().isEmpty() && !addr->note().isEmpty() && addr->addresses().count()) { GNOKII_DEBUG(TQString(" DROPPED email %1 in favor of URLs, notes and addresses.\n") - .tqarg(s)); + .arg(s)); continue; } gn_lib_set_pb_subentry(state, -1 /* index to append entry */, @@ -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 ) ); @@ -507,8 +507,8 @@ static gn_error xxport_phone_write_entry( int phone_location, gn_memory_type mem const char *number; gn_lib_get_pb_subentry(state, st, &entry_type, &number_type, &number); GNOKII_DEBUG(TQString(" SubTel #%1: entry_type=%2, number_type=%3, number=%4\n") - .tqarg(st).tqarg(entry_type) - .tqarg(number_type).tqarg(GN_FROM(number))); + .arg(st).arg(entry_type) + .arg(number_type).arg(GN_FROM(number))); } gn_error error = gn_lib_phonebook_write_entry(state, memtype, phone_location); @@ -656,9 +656,9 @@ bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQStri m_progressDlg->setButtonText(i18n("&Stop Export")); m_progressDlg->setLabel(i18n("<qt>Exporting <b>%1</b> contacts to the <b>%2</b> " "of the Mobile Phone.<br><br>%3</qt>") - .tqarg(list.count()) - .tqarg(gn_memory_type2str(memtype)) - .tqarg(buildPhoneInfoString(memstat)) ); + .arg(list.count()) + .arg(gn_memory_type2str(memtype)) + .arg(buildPhoneInfoString(memstat)) ); // Now run the loop... phone_entry_no = 1; @@ -682,7 +682,7 @@ try_next_phone_entry: break; GNOKII_DEBUG(TQString("Try to write entry '%1' at phone_entry_no=%2, phone_count=%3\n") - .tqarg(addr->realName()).tqarg(phone_entry_no).tqarg(phone_count)); + .arg(addr->realName()).arg(phone_entry_no).arg(phone_count)); error = GN_ERR_NONE; @@ -755,7 +755,7 @@ finish: delete m_progressDlg; if (!failedList.isEmpty()) { - GNOKII_DEBUG(TQString("Failed to export: %1\n").tqarg(failedList.join(", "))); + GNOKII_DEBUG(TQString("Failed to export: %1\n").arg(failedList.join(", "))); KMessageBox::informationList(parentWidget(), i18n("<qt>The following contacts could not be exported to the Mobile Phone. " "Possible Reasons for this problem could be:<br><ul>" @@ -801,7 +801,7 @@ static gn_data data; static void busterminate(void) { gn_sm_functions(GN_OP_Terminate, NULL, &state); - if (lockfile) gn_tqdevice_unlock(lockfile); + if (lockfile) gn_device_unlock(lockfile); } static TQString businit(void) @@ -830,7 +830,7 @@ static TQString businit(void) aux = gn_cfg_get(gn_cfg_info, "global", "use_locking"); // Defaults to 'no' if (aux && !strcmp(aux, "yes")) { - lockfile = gn_tqdevice_lock(state.config.port_tqdevice); + lockfile = gn_device_lock(state.config.port_device); if (lockfile == NULL) { return i18n("Gnokii reports a 'Lock File Error'.\n " "Please exit all other running instances of gnokii, check if you have " @@ -851,7 +851,7 @@ static TQString businit(void) "You might try to run \"gnokii --identify\" on the command line to " "check any cable/transport issues and to verify if your gnokii " "configuration is correct.</center></qt>") - .tqarg(gn_error_print(error)); + .arg(gn_error_print(error)); } // identify phone @@ -874,9 +874,9 @@ static TQString businit(void) GNOKII_CHECK_ERROR(error); GNOKII_DEBUG( TQString("Found mobile phone: %1 %2, Revision: %3, IMEI: %4\n") - .tqarg(manufacturer, model, revision, imei) ); + .arg(manufacturer, model, revision, imei) ); - PhoneProductId = TQString("%1-%2-%3-%4").tqarg(APP).tqarg(model).tqarg(revision).tqarg(imei); + PhoneProductId = TQString("%1-%2-%3-%4").arg(APP).arg(model).arg(revision).arg(imei); return TQString(); } @@ -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) { @@ -908,7 +908,7 @@ static gn_error read_phone_memstat( const gn_memory_type memtype, gn_memory_stat } } GNOKII_DEBUG( TQString("\n\nMobile phone memory status: Type: %1, used=%2, free=%3, total=%4\n\n") - .tqarg(memtype).tqarg(memstat->used).tqarg(memstat->free).tqarg(memstat->used+memstat->free) ); + .arg(memtype).arg(memstat->used).arg(memstat->free).arg(memstat->used+memstat->free) ); return error; } @@ -943,16 +943,16 @@ 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>"); - - return TQString::tqfromLatin1("<b>%1</b><br><table>%2%3%4%5%6</table><br>") - .tqarg(i18n("Mobile Phone information:")) - .tqarg(format.tqarg(i18n("Manufacturer")).tqarg(GN_FROM(manufacturer))) - .tqarg(format.tqarg(i18n("Phone model")).tqarg(GN_FROM(model))) - .tqarg(format.tqarg(i18n("Revision")).tqarg(GN_FROM(revision))) - .tqarg(format.tqarg(i18n("IMEI")).tqarg(GN_FROM(imei))) - .tqarg(format.tqarg(i18n("Phonebook status")) - .tqarg(i18n("%1 out of %2 contacts used").tqarg(memstat.used).tqarg(memstat.used+memstat.free))); + TQString format = TQString::fromLatin1("<tr><td><b>%1</b></td><td>%2</td></tr>"); + + return TQString::fromLatin1("<b>%1</b><br><table>%2%3%4%5%6</table><br>") + .arg(i18n("Mobile Phone information:")) + .arg(format.arg(i18n("Manufacturer")).arg(GN_FROM(manufacturer))) + .arg(format.arg(i18n("Phone model")).arg(GN_FROM(model))) + .arg(format.arg(i18n("Revision")).arg(GN_FROM(revision))) + .arg(format.arg(i18n("IMEI")).arg(GN_FROM(imei))) + .arg(format.arg(i18n("Phonebook status")) + .arg(i18n("%1 out of %2 contacts used").arg(memstat.used).arg(memstat.used+memstat.free))); } static TQString buildMemoryTypeString( gn_memory_type memtype ) @@ -989,9 +989,9 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty progress->setTotalSteps(memstat.used); m_progressDlg->setLabel(i18n("<qt>Importing <b>%1</b> contacts from <b>%2</b> of the Mobile Phone.<br><br>%3</qt>") - .tqarg(memstat.used) - .tqarg(buildMemoryTypeString(memtype)) - .tqarg(buildPhoneInfoString(memstat)) ); + .arg(memstat.used) + .arg(buildMemoryTypeString(memtype)) + .arg(buildPhoneInfoString(memstat)) ); int num_read = 0; @@ -1008,8 +1008,8 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty if (error == GN_ERR_INVALIDMEMORYTYPE) break; if (error == GN_ERR_NONE) { - GNOKII_DEBUG(TQString("%1: %2, num=%3, location=%4, group=%5, count=%6\n").tqarg(i).tqarg(GN_FROM(entry.name)) - .tqarg(GN_FROM(entry.number)).tqarg(entry.location).tqarg(entry.caller_group).tqarg(entry.subentries_count)); + GNOKII_DEBUG(TQString("%1: %2, num=%3, location=%4, group=%5, count=%6\n").arg(i).arg(GN_FROM(entry.name)) + .arg(GN_FROM(entry.number)).arg(entry.location).arg(entry.caller_group).arg(entry.subentries_count)); KABC::Addressee *a = new KABC::Addressee(); // try to split Name into FamilyName and GivenName @@ -1036,7 +1036,7 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty } a->insertCustom(APP, "X_GSM_CALLERGROUP", s.setNum(entry.caller_group)); - a->insertCustom(APP, "X_GSM_STORE_AT", TQString("%1%2").tqarg(memtypestr).tqarg(entry.location)); + a->insertCustom(APP, "X_GSM_STORE_AT", TQString("%1%2").arg(memtypestr).arg(entry.location)); // set ProductId a->setProductId(PhoneProductId); @@ -1044,11 +1044,11 @@ 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) ); - GNOKII_DEBUG(TQString(" date=%1\n").tqarg(datetime.toString())); + GNOKII_DEBUG(TQString(" date=%1\n").arg(datetime.toString())); a->setRevision(datetime); if (!entry.subentries_count) @@ -1059,8 +1059,8 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty for (int n=0; n<entry.subentries_count; n++) { TQString s = GN_FROM(entry.subentries[n].data.number).simplifyWhiteSpace(); GNOKII_DEBUG(TQString(" Subentry#%1, entry_type=%2, number_type=%3, number=%4\n") - .tqarg(n).tqarg(entry.subentries[n].entry_type) - .tqarg(entry.subentries[n].number_type).tqarg(s)); + .arg(n).arg(entry.subentries[n].entry_type) + .arg(entry.subentries[n].number_type).arg(s)); if (s.isEmpty()) continue; switch(entry.subentries[n].entry_type) { @@ -1127,7 +1127,7 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty break; default: GNOKII_DEBUG(TQString(" Not handled id=%1, entry=%2\n") - .tqarg(entry.subentries[n].entry_type).tqarg(s)); + .arg(entry.subentries[n].entry_type).arg(s)); break; } // switch() } // if(subentry) @@ -1191,8 +1191,8 @@ static gn_error xxport_phone_write_entry( int phone_location, gn_memory_type mem entry.date.minute = time.minute(); entry.date.second = time.second(); - GNOKII_DEBUG(TQString("Write #%1: name=%2, number=%3\n").tqarg(phone_location) - .tqarg(GN_FROM(entry.name)).tqarg(GN_FROM(entry.number))); + GNOKII_DEBUG(TQString("Write #%1: name=%2, number=%3\n").arg(phone_location) + .arg(GN_FROM(entry.name)).arg(GN_FROM(entry.number))); const KABC::Address homeAddr = addr->address(KABC::Address::Home); const KABC::Address workAddr = addr->address(KABC::Address::Work); @@ -1244,7 +1244,7 @@ static gn_error xxport_phone_write_entry( int phone_location, gn_memory_type mem // only one email allowed if we have URLS, notes, addresses (to avoid phone limitations) if (n && !addr->url().isEmpty() && !addr->note().isEmpty() && addr->addresses().count()) { GNOKII_DEBUG(TQString(" DROPPED email %1 in favor of URLs, notes and addresses.\n") - .tqarg(s)); + .arg(s)); continue; } subentry->entry_type = GN_PHONEBOOK_ENTRY_Email; @@ -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 ) ); @@ -1289,8 +1289,8 @@ static gn_error xxport_phone_write_entry( int phone_location, gn_memory_type mem for (int st=0; st<entry.subentries_count; st++) { gn_phonebook_subentry *subentry = &entry.subentries[st]; GNOKII_DEBUG(TQString(" SubTel #%1: entry_type=%2, number_type=%3, number=%4\n") - .tqarg(st).tqarg(subentry->entry_type) - .tqarg(subentry->number_type).tqarg(GN_FROM(subentry->data.number))); + .arg(st).arg(subentry->entry_type) + .arg(subentry->number_type).arg(GN_FROM(subentry->data.number))); } data.phonebook_entry = &entry; @@ -1309,7 +1309,7 @@ static gn_error xxport_phone_delete_entry( int phone_location, gn_memory_type me entry.memory_type = memtype; entry.location = phone_location; data.phonebook_entry = &entry; - GNOKII_DEBUG(TQString("Deleting entry %1\n").tqarg(phone_location)); + GNOKII_DEBUG(TQString("Deleting entry %1\n").arg(phone_location)); gn_error error = gn_sm_functions(GN_OP_WritePhonebook, &data, &state); GNOKII_CHECK_ERROR(error); return error; @@ -1447,9 +1447,9 @@ bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQStri m_progressDlg->setButtonText(i18n("&Stop Export")); m_progressDlg->setLabel(i18n("<qt>Exporting <b>%1</b> contacts to the <b>%2</b> " "of the Mobile Phone.<br><br>%3</qt>") - .tqarg(list.count()) - .tqarg(buildMemoryTypeString(memtype)) - .tqarg(buildPhoneInfoString(memstat)) ); + .arg(list.count()) + .arg(buildMemoryTypeString(memtype)) + .arg(buildPhoneInfoString(memstat)) ); // Now run the loop... phone_entry_no = 1; @@ -1473,7 +1473,7 @@ try_next_phone_entry: break; GNOKII_DEBUG(TQString("Try to write entry '%1' at phone_entry_no=%2, phone_count=%3\n") - .tqarg(addr->realName()).tqarg(phone_entry_no).tqarg(phone_count)); + .arg(addr->realName()).arg(phone_entry_no).arg(phone_count)); error = GN_ERR_NONE; @@ -1546,7 +1546,7 @@ finish: delete m_progressDlg; if (!failedList.isEmpty()) { - GNOKII_DEBUG(TQString("Failed to export: %1\n").tqarg(failedList.join(", "))); + GNOKII_DEBUG(TQString("Failed to export: %1\n").arg(failedList.join(", "))); KMessageBox::informationList(parentWidget(), i18n("<qt>The following contacts could not be exported to the Mobile Phone. " "Possible Reasons for this problem could be:<br><ul>" diff --git a/kaddressbook/xxport/kde2_xxport.cpp b/kaddressbook/xxport/kde2_xxport.cpp index 3b60ca5e1..309bb9b5b 100644 --- a/kaddressbook/xxport/kde2_xxport.cpp +++ b/kaddressbook/xxport/kde2_xxport.cpp @@ -49,7 +49,7 @@ KABC::AddresseeList KDE2XXPort::importContacts( const TQString& ) const { TQString fileName = locateLocal( "data", "kabc/std.vcf" ); if ( !TQFile::exists( fileName ) ) { - KMessageBox::sorry( parentWidget(), i18n( "<qt>Could not find a KDE 2 address book <b>%1</b>.</qt>" ).tqarg( fileName ) ); + KMessageBox::sorry( parentWidget(), i18n( "<qt>Could not find a KDE 2 address book <b>%1</b>.</qt>" ).arg( fileName ) ); return KABC::AddresseeList(); } diff --git a/kaddressbook/xxport/ldif_xxport.cpp b/kaddressbook/xxport/ldif_xxport.cpp index a51169e7d..30718a9f0 100644 --- a/kaddressbook/xxport/ldif_xxport.cpp +++ b/kaddressbook/xxport/ldif_xxport.cpp @@ -71,7 +71,7 @@ KABC::AddresseeList LDIFXXPort::importContacts( const TQString& ) const TQFile file( fileName ); if ( !file.open( IO_ReadOnly ) ) { TQString msg = i18n( "<qt>Unable to open <b>%1</b> for reading.</qt>" ); - KMessageBox::error( parentWidget(), msg.tqarg( fileName ) ); + KMessageBox::error( parentWidget(), msg.arg( fileName ) ); return addrList; } @@ -97,7 +97,7 @@ bool LDIFXXPort::exportContacts( const KABC::AddresseeList &list, const TQString return true; if( TQFileInfo(url.path()).exists() ) { - if(KMessageBox::questionYesNo( parentWidget(), i18n("Do you want to overwrite file \"%1\"").tqarg( url.path()) ) == KMessageBox::No) + if(KMessageBox::questionYesNo( parentWidget(), i18n("Do you want to overwrite file \"%1\"").arg( url.path()) ) == KMessageBox::No) return false; } @@ -106,8 +106,8 @@ bool LDIFXXPort::exportContacts( const KABC::AddresseeList &list, const TQString KTempFile tmpFile; if ( tmpFile.status() != 0 ) { TQString txt = i18n( "<qt>Unable to open file <b>%1</b>.%2.</qt>" ); - KMessageBox::error( parentWidget(), txt.tqarg( url.url() ) - .tqarg( strerror( tmpFile.status() ) ) ); + KMessageBox::error( parentWidget(), txt.arg( url.url() ) + .arg( strerror( tmpFile.status() ) ) ); return false; } @@ -121,7 +121,7 @@ bool LDIFXXPort::exportContacts( const KABC::AddresseeList &list, const TQString if ( !file.open( IO_WriteOnly ) ) { TQString txt = i18n( "<qt>Unable to open file <b>%1</b>.</qt>" ); - KMessageBox::error( parentWidget(), txt.tqarg( filename ) ); + KMessageBox::error( parentWidget(), txt.arg( filename ) ); return false; } diff --git a/kaddressbook/xxport/opera_xxport.cpp b/kaddressbook/xxport/opera_xxport.cpp index 4c2949cc9..800f11fa6 100644 --- a/kaddressbook/xxport/opera_xxport.cpp +++ b/kaddressbook/xxport/opera_xxport.cpp @@ -48,14 +48,14 @@ 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; TQFile file( fileName ); if ( !file.open( IO_ReadOnly ) ) { TQString msg = i18n( "<qt>Unable to open <b>%1</b> for reading.</qt>" ); - KMessageBox::error( parentWidget(), msg.tqarg( fileName ) ); + KMessageBox::error( parentWidget(), msg.arg( fileName ) ); return addrList; } @@ -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/pab_pablib.cpp b/kaddressbook/xxport/pab_pablib.cpp index 198e683fd..344647f6f 100644 --- a/kaddressbook/xxport/pab_pablib.cpp +++ b/kaddressbook/xxport/pab_pablib.cpp @@ -46,7 +46,7 @@ adr_t A; bool ret; if (!in.isOpen()) {TQString msg; - msg=i18n("Cannot open %1 for reading").tqarg(pabfile); + msg=i18n("Cannot open %1 for reading").arg(pabfile); // info->alert(msg); return false; } @@ -243,7 +243,7 @@ bool pab::knownPAB(void) content_t id; id=go(0); if (id!=PAB_FILE_ID) {TQString msg; - msg=i18n("%1 has no PAB id that I know of, cannot convert this").tqarg(pabfile); + msg=i18n("%1 has no PAB id that I know of, cannot convert this").arg(pabfile); // info->alert(msg); return false; } diff --git a/kaddressbook/xxport/pab_xxport.cpp b/kaddressbook/xxport/pab_xxport.cpp index 021f671c8..911e92ded 100644 --- a/kaddressbook/xxport/pab_xxport.cpp +++ b/kaddressbook/xxport/pab_xxport.cpp @@ -55,7 +55,7 @@ KABC::AddresseeList PABXXPort::importContacts( const TQString& ) const if ( fileName.isEmpty() ) return addrList; if ( !TQFile::exists( fileName ) ) { - KMessageBox::sorry( parentWidget(), i18n( "<qt>Could not find a MS Exchange Personal Address Book <b>%1</b>.</qt>" ).tqarg( fileName ) ); + KMessageBox::sorry( parentWidget(), i18n( "<qt>Could not find a MS Exchange Personal Address Book <b>%1</b>.</qt>" ).arg( fileName ) ); return addrList; } diff --git a/kaddressbook/xxport/vcard_xxport.cpp b/kaddressbook/xxport/vcard_xxport.cpp index e752b9057..1e5d7ee94 100644 --- a/kaddressbook/xxport/vcard_xxport.cpp +++ b/kaddressbook/xxport/vcard_xxport.cpp @@ -25,7 +25,7 @@ #include <tqfile.h> #include <tqfont.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <kabc/vcardconverter.h> @@ -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 ); } @@ -250,15 +250,15 @@ KABC::AddresseeList VCardXXPort::importContacts( const TQString& ) const KIO::NetAccess::removeTempFile( fileName ); } else { TQString text = i18n( "<qt>When trying to read the vCard, there was an error opening the file '%1': %2</qt>" ); - text = text.tqarg( (*it).url() ); - text = text.tqarg( kapp->translate( "TQFile", + text = text.arg( (*it).url() ); + text = text.arg( kapp->translate( "TQFile", TQString(file.errorString()).latin1() ) ); KMessageBox::error( parentWidget(), text, caption ); anyFailures = true; } } else { TQString text = i18n( "<qt>Unable to access vCard: %1</qt>" ); - text = text.tqarg( KIO::NetAccess::lastErrorString() ); + text = text.arg( KIO::NetAccess::lastErrorString() ); KMessageBox::error( parentWidget(), text, caption ); anyFailures = true; } @@ -293,7 +293,7 @@ KABC::AddresseeList VCardXXPort::parseVCard( const TQByteArray &data ) const bool VCardXXPort::doExport( const KURL &url, const TQByteArray &data ) { if( TQFileInfo(url.path()).exists() ) { - if(KMessageBox::questionYesNo( parentWidget(), i18n("Do you want to overwrite file \"%1\"").tqarg( url.path()) ) == KMessageBox::No) + if(KMessageBox::questionYesNo( parentWidget(), i18n("Do you want to overwrite file \"%1\"").arg( url.path()) ) == KMessageBox::No) return false; } KTempFile tmpFile; @@ -315,7 +315,7 @@ KABC::AddresseeList VCardXXPort::parseVCard( const TQString &data ) const bool VCardXXPort::doExport( const KURL &url, const TQString &data ) { if( TQFileInfo(url.path()).exists() ) { - if(KMessageBox::questionYesNo( parentWidget(), i18n("Do you want to overwrite file \"%1\"").tqarg( url.path()) ) == KMessageBox::No) + if(KMessageBox::questionYesNo( parentWidget(), i18n("Do you want to overwrite file \"%1\"").arg( url.path()) ) == KMessageBox::No) return false; } KTempFile tmpFile; @@ -471,18 +471,18 @@ VCardViewerDialog::VCardViewerDialog( const KABC::Addressee::List &list, mContacts( list ) { TQFrame *page = plainPage(); - TQVBoxLayout *tqlayout = new TQVBoxLayout( page, marginHint(), spacingHint() ); + TQVBoxLayout *layout = new TQVBoxLayout( page, marginHint(), spacingHint() ); TQLabel *label = new TQLabel( i18n( "Do you want to import this contact in your address book?" ), page ); TQFont font = label->font(); font.setBold( true ); label->setFont( font ); - tqlayout->addWidget( label ); + layout->addWidget( label ); mView = new KPIM::AddresseeView( page ); mView->enableLinks( 0 ); mView->setVScrollBarMode( TQScrollView::Auto ); - tqlayout->addWidget( mView ); + layout->addWidget( mView ); setButtonText( Apply, i18n( "Import All..." ) ); @@ -544,22 +544,22 @@ VCardExportSelectionDialog::VCardExportSelectionDialog( TQWidget *parent, { TQFrame *page = plainPage(); - TQVBoxLayout *tqlayout = new TQVBoxLayout( page, marginHint(), spacingHint() ); + TQVBoxLayout *layout = new TQVBoxLayout( page, marginHint(), spacingHint() ); TQLabel *label = new TQLabel( i18n( "Select the fields which shall be exported in the vCard." ), page ); - tqlayout->addWidget( label ); + layout->addWidget( label ); mPrivateBox = new TQCheckBox( i18n( "Private fields" ), page ); - tqlayout->addWidget( mPrivateBox ); + layout->addWidget( mPrivateBox ); mBusinessBox = new TQCheckBox( i18n( "Business fields" ), page ); - tqlayout->addWidget( mBusinessBox ); + layout->addWidget( mBusinessBox ); mOtherBox = new TQCheckBox( i18n( "Other fields" ), page ); - tqlayout->addWidget( mOtherBox ); + layout->addWidget( mOtherBox ); mEncryptionKeys = new TQCheckBox( i18n( "Encryption keys" ), page ); - tqlayout->addWidget( mEncryptionKeys ); + layout->addWidget( mEncryptionKeys ); KConfig config( "kaddressbookrc" ); config.setGroup( "XXPortVCard" ); diff --git a/kaddressbook/xxportmanager.cpp b/kaddressbook/xxportmanager.cpp index 642f8bfe3..0baf8614f 100644 --- a/kaddressbook/xxportmanager.cpp +++ b/kaddressbook/xxportmanager.cpp @@ -21,7 +21,7 @@ without including the source code for TQt in the source distribution. */ -#include <tqlayout.h> +#include <layout.h> #include <kabc/addressbook.h> #include <kabc/resource.h> @@ -77,7 +77,7 @@ void XXPortManager::slotImport( const TQString &identifier, const TQString &data { KAB::XXPort *obj = mXXPortObjects[ identifier ]; if ( !obj ) { - KMessageBox::error( mCore->widget(), i18n( "<qt>No import plugin available for <b>%1</b>.</qt>" ).tqarg( identifier ) ); + KMessageBox::error( mCore->widget(), i18n( "<qt>No import plugin available for <b>%1</b>.</qt>" ).arg( identifier ) ); return; } @@ -101,7 +101,7 @@ void XXPortManager::slotExport( const TQString &identifier, const TQString &data { KAB::XXPort *obj = mXXPortObjects[ identifier ]; if ( !obj ) { - KMessageBox::error( mCore->widget(), i18n( "<qt>No export plugin available for <b>%1</b>.</qt>" ).tqarg( identifier ) ); + KMessageBox::error( mCore->widget(), i18n( "<qt>No export plugin available for <b>%1</b>.</qt>" ).arg( identifier ) ); return; } @@ -121,7 +121,7 @@ void XXPortManager::loadPlugins() mXXPortObjects.clear(); const KTrader::OfferList plugins = KTrader::self()->query( "KAddressBook/XXPort", - TQString( "[X-KDE-KAddressBook-XXPortPluginVersion] == %1" ).tqarg( KAB_XXPORT_PLUGIN_VERSION ) ); + TQString( "[X-KDE-KAddressBook-XXPortPluginVersion] == %1" ).arg( KAB_XXPORT_PLUGIN_VERSION ) ); KTrader::OfferList::ConstIterator it; for ( it = plugins.begin(); it != plugins.end(); ++it ) { if ( !(*it)->hasServiceType( "KAddressBook/XXPort" ) ) diff --git a/kaddressbook/xxportselectdialog.cpp b/kaddressbook/xxportselectdialog.cpp index b932f9d97..1b567b2c4 100644 --- a/kaddressbook/xxportselectdialog.cpp +++ b/kaddressbook/xxportselectdialog.cpp @@ -31,7 +31,7 @@ #include <tqcombobox.h> #include <tqheader.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlistview.h> #include <tqpushbutton.h> #include <tqradiobutton.h> @@ -187,11 +187,11 @@ void XXPortSelectDialog::initGUI() mButtonGroup = new TQButtonGroup( i18n( "Selection" ), page ); mButtonGroup->setColumnLayout( 0, Qt::Vertical ); - mButtonGroup->tqlayout()->setSpacing( KDialog::spacingHint() ); - mButtonGroup->tqlayout()->setMargin( KDialog::marginHint() ); + mButtonGroup->layout()->setSpacing( KDialog::spacingHint() ); + mButtonGroup->layout()->setMargin( KDialog::marginHint() ); - TQGridLayout *groupLayout = new TQGridLayout( mButtonGroup->tqlayout() ); - groupLayout->tqsetAlignment( TQt::AlignTop ); + TQGridLayout *groupLayout = new TQGridLayout( mButtonGroup->layout() ); + groupLayout->setAlignment( TQt::AlignTop ); mUseWholeBook = new TQRadioButton( i18n( "&All contacts" ), mButtonGroup ); mUseWholeBook->setChecked( true ); @@ -226,9 +226,9 @@ void XXPortSelectDialog::initGUI() TQButtonGroup *sortingGroup = new TQButtonGroup( i18n( "Sorting" ), page ); sortingGroup->setColumnLayout( 0, Qt::Vertical ); - TQGridLayout *sortLayout = new TQGridLayout( sortingGroup->tqlayout(), 2, 2, + TQGridLayout *sortLayout = new TQGridLayout( sortingGroup->layout(), 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/Changelog b/kalarm/Changelog index 2671941a5..a3a1c6590 100644 --- a/kalarm/Changelog +++ b/kalarm/Changelog @@ -142,7 +142,7 @@ KAlarm Change Log - Add context help for sound file fade options. === Version 1.4.5 (KDE 3.5.5) --- 29 September 2006 === -- Improve alarm edit dialogue tqlayout (Reminder controls moved to below Time box). +- Improve alarm edit dialogue layout (Reminder controls moved to below Time box). === Version 1.4.4 --- 11 July 2006 === - Use an alarm's previous deferral time interval as default for its next deferral. @@ -261,7 +261,7 @@ KAlarm Change Log - Fix crash when the last recurrence of an alarm is reached. - Fix random limit on expired alarm discard time if stepping with spinbox buttons. - Fix dialog layouts for right-to-left languages. -- Fix time spin box tqlayout for right-to-left languages. +- Fix time spin box layout for right-to-left languages. === Version 1.2.2 --- 27 November 2004 === - Make alarm daemon (kalarmd) exclusive to KAlarm. diff --git a/kalarm/alarmcalendar.cpp b/kalarm/alarmcalendar.cpp index 85bc17392..67cadfe8c 100644 --- a/kalarm/alarmcalendar.cpp +++ b/kalarm/alarmcalendar.cpp @@ -23,7 +23,7 @@ #include <time.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqregexp.h> #include <tqtimer.h> @@ -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").arg(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)); @@ -112,7 +112,7 @@ bool AlarmCalendar::initialiseCalendars() { kdError(5950) << "AlarmCalendar::initialiseCalendars(): '" << errorKey1 << "' calendar name = display calendar name\n"; TQString file = config->readPathEntry(errorKey1); - KAlarmApp::displayFatalError(i18n("%1: file name not permitted: %2").tqarg(errorKey1).tqarg(file)); + KAlarmApp::displayFatalError(i18n("%1: file name not permitted: %2").arg(errorKey1).arg(file)); return false; } if (activeCal == expiredCal) @@ -133,14 +133,14 @@ bool AlarmCalendar::initialiseCalendars() if (!errorKey1.isNull()) { kdError(5950) << "AlarmCalendar::initialiseCalendars(): calendar names clash: " << errorKey1 << ", " << errorKey2 << endl; - KAlarmApp::displayFatalError(i18n("%1, %2: file names must be different").tqarg(errorKey1).tqarg(errorKey2)); + KAlarmApp::displayFatalError(i18n("%1, %2: file names must be different").arg(errorKey1).arg(errorKey2)); return false; } if (!mCalendars[ACTIVE]->valid()) { TQString path = mCalendars[ACTIVE]->path(); kdError(5950) << "AlarmCalendar::initialiseCalendars(): invalid name: " << path << endl; - KAlarmApp::displayFatalError(i18n("Invalid calendar file name: %1").tqarg(path)); + KAlarmApp::displayFatalError(i18n("Invalid calendar file name: %1").arg(path)); return false; } return true; @@ -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, @@ -321,7 +321,7 @@ int AlarmCalendar::load() if (!KIO::NetAccess::download(mUrl, tmpFile, MainWindow::mainMainWindow())) { kdError(5950) << "AlarmCalendar::load(): Load failure" << endl; - KMessageBox::error(0, i18n("Cannot open calendar:\n%1").tqarg(mUrl.prettyURL())); + KMessageBox::error(0, i18n("Cannot open calendar:\n%1").arg(mUrl.prettyURL())); return -1; } kdDebug(5950) << "AlarmCalendar::load(): --- Downloaded to " << tmpFile << endl; @@ -338,7 +338,7 @@ int AlarmCalendar::load() if (!fi.size()) return 0; // file is zero length kdError(5950) << "AlarmCalendar::load(): Error loading calendar file '" << tmpFile << "'" << endl; - KMessageBox::error(0, i18n("Error loading calendar:\n%1\n\nPlease fix or delete the file.").tqarg(mUrl.prettyURL())); + KMessageBox::error(0, i18n("Error loading calendar:\n%1\n\nPlease fix or delete the file.").arg(mUrl.prettyURL())); // load() could have partially populated the calendar, so clear it out mCalendar->close(); delete mCalendar; @@ -383,7 +383,7 @@ bool AlarmCalendar::saveCal(const TQString& newFile) if (!mCalendar->save(saveFilename, new ICalFormat)) { kdError(5950) << "AlarmCalendar::saveCal(" << saveFilename << "): failed.\n"; - KMessageBox::error(0, i18n("Failed to save calendar to\n'%1'").tqarg(mICalUrl.prettyURL())); + KMessageBox::error(0, i18n("Failed to save calendar to\n'%1'").arg(mICalUrl.prettyURL())); return false; } @@ -392,7 +392,7 @@ bool AlarmCalendar::saveCal(const TQString& newFile) if (!KIO::NetAccess::upload(saveFilename, mICalUrl, MainWindow::mainMainWindow())) { kdError(5950) << "AlarmCalendar::saveCal(" << saveFilename << "): upload failed.\n"; - KMessageBox::error(0, i18n("Cannot upload calendar to\n'%1'").tqarg(mICalUrl.prettyURL())); + KMessageBox::error(0, i18n("Cannot upload calendar to\n'%1'").arg(mICalUrl.prettyURL())); return false; } } @@ -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").arg(i18n("Calendar Files")), parent); if (url.isEmpty()) { kdError(5950) << "AlarmCalendar::importAlarms(): Empty URL" << endl; @@ -468,7 +468,7 @@ bool AlarmCalendar::importAlarms(TQWidget* parent) if (!KStandardDirs::exists(filename)) { kdDebug(5950) << "AlarmCalendar::importAlarms(): File '" << url.prettyURL() << "' not found" << endl; - KMessageBox::error(parent, i18n("Could not load calendar '%1'.").tqarg(url.prettyURL())); + KMessageBox::error(parent, i18n("Could not load calendar '%1'.").arg(url.prettyURL())); return false; } } @@ -477,20 +477,20 @@ bool AlarmCalendar::importAlarms(TQWidget* parent) if (!KIO::NetAccess::download(url, filename, MainWindow::mainMainWindow())) { kdError(5950) << "AlarmCalendar::importAlarms(): Download failure" << endl; - KMessageBox::error(parent, i18n("Cannot download calendar:\n%1").tqarg(url.prettyURL())); + KMessageBox::error(parent, i18n("Cannot download calendar:\n%1").arg(url.prettyURL())); return false; } kdDebug(5950) << "--- Downloaded to " << filename << endl; } // 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) { kdDebug(5950) << "AlarmCalendar::importAlarms(): error loading calendar '" << filename << "'" << endl; - KMessageBox::error(parent, i18n("Could not load calendar '%1'.").tqarg(url.prettyURL())); + KMessageBox::error(parent, i18n("Could not load calendar '%1'.").arg(url.prettyURL())); } else { @@ -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..d39567938 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; @@ -1000,7 +1000,7 @@ bool KAEvent::updateKCalEvent(Event& ev, bool checkUid, bool original, bool canc if (mEmailBcc) cats.append(EMAIL_BCC_CATEGORY); if (mKMailSerialNumber) - cats.append(TQString("%1%2").tqarg(KMAIL_SERNUM_CATEGORY).tqarg(mKMailSerialNumber)); + cats.append(TQString("%1%2").arg(KMAIL_SERNUM_CATEGORY).arg(mKMailSerialNumber)); if (mCopyToKOrganizer) cats.append(KORGANIZER_CATEGORY); if (mCommandXterm) @@ -1008,11 +1008,11 @@ bool KAEvent::updateKCalEvent(Event& ev, bool checkUid, bool original, bool canc else if (!mLogFile.isEmpty()) cats.append(LOG_CATEGORY + mLogFile); if (mLateCancel) - cats.append(TQString("%1%2").tqarg(mAutoClose ? AUTO_CLOSE_CATEGORY : LATE_CANCEL_CATEGORY).tqarg(mLateCancel)); + cats.append(TQString("%1%2").arg(mAutoClose ? AUTO_CLOSE_CATEGORY : LATE_CANCEL_CATEGORY).arg(mLateCancel)); if (mDeferDefaultMinutes) - cats.append(TQString("%1%2").tqarg(DEFER_CATEGORY).tqarg(mDeferDefaultMinutes)); + cats.append(TQString("%1%2").arg(DEFER_CATEGORY).arg(mDeferDefaultMinutes)); if (!mTemplateName.isEmpty() && mTemplateAfterTime >= 0) - cats.append(TQString("%1%2").tqarg(TEMPL_AFTER_TIME_CATEGORY).tqarg(mTemplateAfterTime)); + cats.append(TQString("%1%2").arg(TEMPL_AFTER_TIME_CATEGORY).arg(mTemplateAfterTime)); if (mArchive && !original) { TQStringList params; @@ -1032,21 +1032,21 @@ bool KAEvent::updateKCalEvent(Event& ev, bool checkUid, bool original, bool canc unit = 'H'; count /= 60; } - params += TQString("%1%2").tqarg(count).tqarg(unit); + params += TQString("%1%2").arg(count).arg(unit); } if (mArchiveRepeatAtLogin) params += AT_LOGIN_TYPE; 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(); @@ -1084,7 +1084,7 @@ bool KAEvent::updateKCalEvent(Event& ev, bool checkUid, bool original, bool canc { // Alarm repetition is normally held in the main alarm, but since // the main alarm has expired, store in a custom property. - TQString param = TQString("%1:%2").tqarg(mRepeatInterval).tqarg(mRepeatCount); + TQString param = TQString("%1:%2").arg(mRepeatInterval).arg(mRepeatCount); ev.setCustomProperty(APPNAME, REPEAT_PROPERTY, param); } @@ -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,9 +1251,9 @@ 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)) - .tqarg(TQString::number(mFadeVolume, 'f', 2)) - .tqarg(mFadeSeconds)); + TQString::fromLatin1("%1;%2;%3").arg(TQString::number(mSoundVolume, 'f', 2)) + .arg(TQString::number(mFadeVolume, 'f', 2)) + .arg(mFadeSeconds)); break; case KAAlarm::PRE_ACTION_ALARM: setProcedureAlarm(alarm, mPreAction); @@ -1277,9 +1277,9 @@ Alarm* KAEvent::initKCalAlarm(Event& event, int startOffsetSecs, const TQStringL case T_MESSAGE: alarm->setDisplayAlarm(AlarmText::toCalendarText(mText)); alarm->setCustomProperty(APPNAME, FONT_COLOUR_PROPERTY, - TQString::tqfromLatin1("%1;%2;%3").tqarg(mBgColour.name()) - .tqarg(mFgColour.name()) - .tqarg(mDefaultFont ? TQString() : mFont.toString())); + TQString::fromLatin1("%1;%2;%3").arg(mBgColour.name()) + .arg(mFgColour.name()) + .arg(mDefaultFont ? TQString() : mFont.toString())); break; case T_COMMAND: if (mCommandScript) @@ -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; @@ -2093,7 +2093,7 @@ TQString KAEvent::recurrenceText(bool brief) const else { TQString mins; - return i18n("Hours and Minutes", "%1H %2M").tqarg(TQString::number(frequency/60)).tqarg(mins.sprintf("%02d", frequency%60)); + return i18n("Hours and Minutes", "%1H %2M").arg(TQString::number(frequency/60)).arg(mins.sprintf("%02d", frequency%60)); } case RecurrenceRule::rDaily: return i18n("1 Day", "%n Days", frequency); @@ -2125,7 +2125,7 @@ TQString KAEvent::repetitionText(bool brief) const if (mRepeatInterval % 60 == 0) return i18n("1 Hour", "%n Hours", mRepeatInterval/60); TQString mins; - return i18n("Hours and Minutes", "%1H %2M").tqarg(TQString::number(mRepeatInterval/60)).tqarg(mins.sprintf("%02d", mRepeatInterval%60)); + return i18n("Hours and Minutes", "%1H %2M").arg(TQString::number(mRepeatInterval/60)).arg(mins.sprintf("%02d", mRepeatInterval%60)); } if (mRepeatInterval % (7*1440)) return i18n("1 Day", "%n Days", mRepeatInterval/1440); @@ -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;;").arg(cats[0])); } cats.remove(cats.begin()); } @@ -2918,7 +2918,7 @@ void KAEvent::convertKCalEvents(KCal::Calendar& calendar, int version, bool adju while ((it = cats.find(TEMPL_DEF_TIME_CAT)) != cats.end()) { cats.remove(it); - cats.append(TQString("%1%2").tqarg(TEMPL_AFTER_TIME_CATEGORY).tqarg(0)); + cats.append(TQString("%1%2").arg(TEMPL_AFTER_TIME_CATEGORY).arg(0)); } } @@ -2937,7 +2937,7 @@ void KAEvent::convertKCalEvents(KCal::Calendar& calendar, int version, bool adju } if (addLateCancel) - cats.append(TQString("%1%2").tqarg(LATE_CANCEL_CATEGORY).tqarg(1)); + cats.append(TQString("%1%2").arg(LATE_CANCEL_CATEGORY).arg(1)); event->setCategories(cats); diff --git a/kalarm/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..3e3db18d4 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()) @@ -503,7 +503,7 @@ TQString AlarmListViewItem::alarmTimeText(const DateTime& dateTime) const { // Initialise the position of the hour within the time string, if leading // zeroes are omitted, so that displayed times can be aligned with each other. - mTimeHourPos = -1; // default = tqalignment isn't possible/sensible + mTimeHourPos = -1; // default = alignment isn't possible/sensible if (!TQApplication::reverseLayout()) // don't try to align right-to-left languages { TQString fmt = locale->timeFormat(); @@ -514,7 +514,7 @@ TQString AlarmListViewItem::alarmTimeText(const DateTime& dateTime) const } if (mTimeHourPos >= 0 && (int)time.length() > mTimeHourPos + 1 && time[mTimeHourPos].isDigit() && !time[mTimeHourPos + 1].isDigit()) - dateTimeText += '~'; // improve tqalignment of times with no leading zeroes + dateTimeText += '~'; // improve alignment of times with no leading zeroes dateTimeText += time; } return dateTimeText + ' '; @@ -531,7 +531,7 @@ TQString AlarmListViewItem::timeToAlarmText(const TQDateTime& now) const if (dateTime.isDateOnly()) { int days = now.date().daysTo(dateTime.date()); - return i18n("n days", " %1d ").tqarg(days); + return i18n("n days", " %1d ").arg(days); } int mins = (now.secsTo(dateTime.dateTime()) + 59) / 60; if (mins < 0) @@ -540,10 +540,10 @@ TQString AlarmListViewItem::timeToAlarmText(const TQDateTime& now) const minutes[0] = (mins%60) / 10 + '0'; minutes[1] = (mins%60) % 10 + '0'; if (mins < 24*60) - return i18n("hours:minutes", " %1:%2 ").tqarg(mins/60).tqarg(minutes); + return i18n("hours:minutes", " %1:%2 ").arg(mins/60).arg(minutes); int days = mins / (24*60); mins = mins % (24*60); - return i18n("days hours:minutes", " %1d %2:%3 ").tqarg(days).tqarg(mins/60).tqarg(minutes); + return i18n("days hours:minutes", " %1d %2:%3 ").arg(days).arg(mins/60).arg(minutes); } /****************************************************************************** @@ -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..e650072ec 100644 --- a/kalarm/alarmtimewidget.cpp +++ b/kalarm/alarmtimewidget.cpp @@ -20,7 +20,7 @@ #include "kalarm.h" -#include <tqlayout.h> +#include <layout.h> #include <tqgroupbox.h> #include <tqhbox.h> #include <tqpushbutton.h> @@ -93,30 +93,30 @@ 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 - : TQString("%1\n%2").tqarg(enterDateText).tqarg(recurText))); + : TQString("%1\n%2").arg(enterDateText).arg(recurText))); mAtTimeRadio->setFocusWidget(mDateEdit); // Time edit box and Any time checkbox 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, - ((mode & DEFER_TIME) ? TQString("%1\n\n%2").tqarg(enterTimeText).tqarg(TimeSpinBox::shiftWhatsThis()) - : TQString("%1\n%2\n\n%3").tqarg(enterTimeText).tqarg(recurText).tqarg(TimeSpinBox::shiftWhatsThis()))); + ((mode & DEFER_TIME) ? TQString("%1\n\n%2").arg(enterTimeText).arg(TimeSpinBox::shiftWhatsThis()) + : TQString("%1\n%2\n\n%3").arg(enterTimeText).arg(recurText).arg(TimeSpinBox::shiftWhatsThis()))); mAnyTime = -1; // current status is uninitialised if (mode & DEFER_TIME) @@ -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,14 +144,14 @@ 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()) - : TQString("%1\n%2\n\n%3").tqarg(i18n_TimeAfterPeriod()).tqarg(recurText).tqarg(TimeSpinBox::shiftWhatsThis()))); + ((mode & DEFER_TIME) ? TQString("%1\n\n%2").arg(i18n_TimeAfterPeriod()).arg(TimeSpinBox::shiftWhatsThis()) + : TQString("%1\n%2\n\n%3").arg(i18n_TimeAfterPeriod()).arg(recurText).arg(TimeSpinBox::shiftWhatsThis()))); mAfterTimeRadio->setFocusWidget(mDelayTimeEdit); - // Set up the tqlayout, either narrow or wide + // Set up the layout, either narrow or wide if (mode & NARROW) { TQGridLayout* grid = new TQGridLayout(topLayout, 2, 2, KDialog::spacingHint()); @@ -160,10 +160,10 @@ void AlarmTimeWidget::init(int mode) grid->addWidget(timeBox, 1, 1, TQt::AlignAuto); grid->setColStretch(2, 1); topLayout->addStretch(); - TQBoxLayout* tqlayout = new TQHBoxLayout(topLayout, KDialog::spacingHint()); - tqlayout->addWidget(mAfterTimeRadio); - tqlayout->addWidget(mDelayTimeEdit); - tqlayout->addStretch(); + TQBoxLayout* layout = new TQHBoxLayout(topLayout, KDialog::spacingHint()); + layout->addWidget(mAfterTimeRadio); + layout->addWidget(mDelayTimeEdit); + layout->addStretch(); } else { @@ -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..a9364967c 100644 --- a/kalarm/birthdaydlg.cpp +++ b/kalarm/birthdaydlg.cpp @@ -20,7 +20,7 @@ #include "kalarm.h" -#include <tqlayout.h> +#include <layout.h> #include <tqgroupbox.h> #include <tqhbox.h> #include <tqlabel.h> @@ -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,36 +142,36 @@ 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); // Acknowledgement confirmation required - default = no confirmation - TQHBoxLayout* tqlayout = new TQHBoxLayout(groupLayout, 2*spacingHint()); + TQHBoxLayout* layout = new TQHBoxLayout(groupLayout, 2*spacingHint()); mConfirmAck = EditAlarmDlg::createConfirmAckCheckbox(group); - tqlayout->addWidget(mConfirmAck); - tqlayout->addSpacing(2*spacingHint()); - tqlayout->addStretch(); + layout->addWidget(mConfirmAck); + layout->addSpacing(2*spacingHint()); + layout->addStretch(); if (ShellProcess::authorised()) // don't display if shell commands not allowed (e.g. kiosk mode) { // Special actions button mSpecialActionsButton = new SpecialActionsButton(i18n("Special Actions..."), group); - tqlayout->addWidget(mSpecialActionsButton); + layout->addWidget(mSpecialActionsButton); } // Late display checkbox - default = allow late display - tqlayout = new TQHBoxLayout(groupLayout, 2*spacingHint()); + layout = new TQHBoxLayout(groupLayout, 2*spacingHint()); mLateCancel = new LateCancelSelector(false, group); - tqlayout->addWidget(mLateCancel); - tqlayout->addStretch(); + layout->addWidget(mLateCancel); + layout->addStretch(); // Sub-repetition button mSubRepetition = new RepetitionButton(i18n("Sub-Repetition"), false, group); mSubRepetition->set(0, 0, true, 364*24*60); TQWhatsThis::add(mSubRepetition, i18n("Set up an additional alarm repetition")); - tqlayout->addWidget(mSubRepetition); + layout->addWidget(mSubRepetition); // Set the values to their defaults mFontColourButton->setDefaultFont(); @@ -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..877084970 100644 --- a/kalarm/calendarcompat.cpp +++ b/kalarm/calendarcompat.cpp @@ -21,7 +21,7 @@ #include "kalarm.h" #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqstringlist.h> #include <kapplication.h> @@ -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..4ad785552 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)); + .arg(TQString::fromLatin1(DAEMON_APP_NAME)); } else { @@ -236,8 +236,8 @@ void Daemon::registrationResult(bool reregister, int result, int version) kdError(5950) << "Daemon::registrationResult(" << reregister << "): registerApp dcop call: " << kapp->aboutData()->appName() << " not found\n"; KMessageBox::error(0, i18n("Alarms will be disabled if you stop KAlarm.\n" "(Installation or configuration error: %1 cannot locate %2 executable.)") - .tqarg(TQString::tqfromLatin1(DAEMON_APP_NAME)) - .tqarg(kapp->aboutData()->appName())); + .arg(TQString::fromLatin1(DAEMON_APP_NAME)) + .arg(kapp->aboutData()->appName())); break; case KAlarmd::FAILURE: default: @@ -248,7 +248,7 @@ void Daemon::registrationResult(bool reregister, int result, int version) if (!reregister) { errmsg = i18n("Cannot enable alarms:\nFailed to register with Alarm Daemon (%1)") - .tqarg(TQString::tqfromLatin1(DAEMON_APP_NAME)); + .arg(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)").arg(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/deferdlg.cpp b/kalarm/deferdlg.cpp index 8c7edd3ce..059d7a79b 100644 --- a/kalarm/deferdlg.cpp +++ b/kalarm/deferdlg.cpp @@ -20,7 +20,7 @@ #include "kalarm.h" -#include <tqlayout.h> +#include <layout.h> #include <kglobal.h> #include <klocale.h> @@ -48,14 +48,14 @@ DeferAlarmDlg::DeferAlarmDlg(const TQString& caption, const DateTime& initialDT, TQWidget* page = new TQWidget(this); setMainWidget(page); - TQVBoxLayout* tqlayout = new TQVBoxLayout(page, 0, spacingHint()); + TQVBoxLayout* layout = new TQVBoxLayout(page, 0, spacingHint()); mTimeWidget = new AlarmTimeWidget(AlarmTimeWidget::DEFER_TIME, page, "timeGroup"); mTimeWidget->setDateTime(initialDT); mTimeWidget->setMinDateTimeIsCurrent(); connect(mTimeWidget, TQT_SIGNAL(pastMax()), TQT_SLOT(slotPastLimit())); - tqlayout->addWidget(mTimeWidget); - tqlayout->addSpacing(spacingHint()); + layout->addWidget(mTimeWidget); + layout->addSpacing(spacingHint()); setButtonWhatsThis(Ok, i18n("Defer the alarm until the specified time.")); setButtonWhatsThis(User1, i18n("Cancel the deferred alarm. This does not affect future recurrences.")); @@ -107,7 +107,7 @@ void DeferAlarmDlg::slotOk() case KAEvent::LIMIT_NONE: break; // can't happen with a valid endTime } - KMessageBox::sorry(this, text.tqarg(endTime.formatLocale())); + KMessageBox::sorry(this, text.arg(endTime.formatLocale())); } else accept(); diff --git a/kalarm/editdlg.cpp b/kalarm/editdlg.cpp index 15a2b38ae..02f16912a 100644 --- a/kalarm/editdlg.cpp +++ b/kalarm/editdlg.cpp @@ -22,7 +22,7 @@ #include <limits.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpopupmenu.h> #include <tqvbox.h> #include <tqgroupbox.h> @@ -129,10 +129,10 @@ 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").arg(event.recurrenceText()).arg(event.repetitionText()); else r = event.recurrenceText(); - return i18n("&Recurrence - [%1]").tqarg(r); + return i18n("&Recurrence - [%1]").arg(r); } // Collect these widget labels together to ensure consistent wording and @@ -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()); @@ -230,13 +230,13 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par mActionGroup = new ButtonGroup(i18n("Action"), mainPage, "actionGroup"); connect(mActionGroup, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(slotAlarmTypeChanged(int))); topLayout->addWidget(mActionGroup, 1); - TQBoxLayout* tqlayout = new TQVBoxLayout(mActionGroup, marginHint(), spacingHint()); - tqlayout->addSpacing(fontMetrics().lineSpacing()/2); - TQGridLayout* grid = new TQGridLayout(tqlayout, 1, 5); + TQBoxLayout* layout = new TQVBoxLayout(mActionGroup, marginHint(), spacingHint()); + layout->addSpacing(fontMetrics().lineSpacing()/2); + TQGridLayout* grid = new TQGridLayout(layout, 1, 5); // 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,81 +260,81 @@ 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); initDisplayAlarms(mActionGroup); - tqlayout->addWidget(mDisplayAlarmsFrame); + layout->addWidget(mDisplayAlarmsFrame); initCommand(mActionGroup); - tqlayout->addWidget(mCommandFrame); + layout->addWidget(mCommandFrame); initEmail(mActionGroup); - tqlayout->addWidget(mEmailFrame); + layout->addWidget(mEmailFrame); // Deferred date/time: visible only for a deferred recurring event. 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); - tqlayout = new TQHBoxLayout(topLayout); + layout = new TQHBoxLayout(topLayout); // Date and time entry if (mTemplate) { mTemplateTimeGroup = new ButtonGroup(i18n("Time"), mainPage, "templateGroup"); connect(mTemplateTimeGroup, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(slotTemplateTimeType(int))); - tqlayout->addWidget(mTemplateTimeGroup); + layout->addWidget(mTemplateTimeGroup); grid = new TQGridLayout(mTemplateTimeGroup, 2, 2, marginHint(), spacingHint()); grid->addRowSpacing(0, fontMetrics().lineSpacing()/2); - // Get tqalignment to use in TQGridLayout (AlignAuto doesn't work correctly there) - int tqalignment = TQApplication::reverseLayout() ? TQt::AlignRight : TQt::AlignLeft; + // Get alignment to use in TQGridLayout (AlignAuto doesn't work correctly there) + int alignment = TQApplication::reverseLayout() ? TQt::AlignRight : TQt::AlignLeft; mTemplateDefaultTime = new RadioButton(i18n("&Default time"), mTemplateTimeGroup, "templateDefTimeButton"); - mTemplateDefaultTime->setFixedSize(mTemplateDefaultTime->tqsizeHint()); + mTemplateDefaultTime->setFixedSize(mTemplateDefaultTime->sizeHint()); mTemplateDefaultTime->setReadOnly(mReadOnly); TQWhatsThis::add(mTemplateDefaultTime, i18n("Do not specify a start time for alarms based on this template. " "The normal default start time will be used.")); - grid->addWidget(mTemplateDefaultTime, 0, 0, tqalignment); + grid->addWidget(mTemplateDefaultTime, 0, 0, alignment); TQHBox* box = new TQHBox(mTemplateTimeGroup); box->setSpacing(spacingHint()); 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())); + TQString("%1\n\n%2").arg(i18n("Enter the start time for alarms based on this template.")) + .arg(TimeSpinBox::shiftWhatsThis())); box->setStretchFactor(new TQWidget(box), 1); // left adjust the controls - box->setFixedHeight(box->tqsizeHint().height()); - grid->addWidget(box, 0, 1, tqalignment); + box->setFixedHeight(box->sizeHint().height()); + grid->addWidget(box, 0, 1, alignment); 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"))); - grid->addWidget(mTemplateAnyTime, 1, 0, tqalignment); + i18n("Set the '%1' option for alarms based on this template.").arg(i18n("Any time"))); + grid->addWidget(mTemplateAnyTime, 1, 0, alignment); box = new TQHBox(mTemplateTimeGroup); box->setSpacing(spacingHint()); 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,15 +342,15 @@ 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()); - grid->addWidget(box, 1, 1, tqalignment); + TQString("%1\n\n%2").arg(AlarmTimeWidget::i18n_TimeAfterPeriod()) + .arg(TimeSpinBox::shiftWhatsThis())); + box->setFixedHeight(box->sizeHint().height()); + grid->addWidget(box, 1, 1, alignment); - tqlayout->addStretch(); + layout->addStretch(); } else { @@ -363,9 +363,9 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par static const TQString reminderText = i18n("Enter how long in advance of the main alarm to display a reminder alarm."); mReminder = new Reminder(i18n("Rem&inder:"), i18n("Check to additionally display a reminder in advance of the main alarm time(s)."), - TQString("%1\n\n%2").tqarg(reminderText).tqarg(TimeSpinBox::shiftWhatsThis()), + TQString("%1\n\n%2").arg(reminderText).arg(TimeSpinBox::shiftWhatsThis()), true, true, mainPage); - mReminder->setFixedSize(mReminder->tqsizeHint()); + mReminder->setFixedSize(mReminder->sizeHint()); topLayout->addWidget(mReminder, 0, TQt::AlignAuto); // Late cancel selector - default = allow late display @@ -373,20 +373,20 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par topLayout->addWidget(mLateCancel, 0, TQt::AlignAuto); // Acknowledgement confirmation required - default = no confirmation - tqlayout = new TQHBoxLayout(topLayout, 0); + layout = new TQHBoxLayout(topLayout, 0); mConfirmAck = createConfirmAckCheckbox(mainPage); - mConfirmAck->setFixedSize(mConfirmAck->tqsizeHint()); - tqlayout->addWidget(mConfirmAck); - tqlayout->addSpacing(2*spacingHint()); - tqlayout->addStretch(); + mConfirmAck->setFixedSize(mConfirmAck->sizeHint()); + layout->addWidget(mConfirmAck); + layout->addSpacing(2*spacingHint()); + layout->addStretch(); if (theApp()->korganizerEnabled()) { // 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); + layout->addWidget(mShowInKorganizer); } setButtonWhatsThis(Ok, i18n("Schedule the alarm at the specified time.")); @@ -436,40 +436,40 @@ 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); + TQHBoxLayout* layout = new TQHBoxLayout(frameLayout, 0, 0); mBgColourBox = new TQHBox(mDisplayAlarmsFrame); mBgColourBox->setSpacing(spacingHint()); - tqlayout->addWidget(mBgColourBox); - tqlayout->addStretch(); + layout->addWidget(mBgColourBox); + layout->addStretch(); TQLabel* label = new TQLabel(i18n("&Background color:"), mBgColourBox); mBgColourButton = new ColourCombo(mBgColourBox); label->setBuddy(mBgColourButton); TQWhatsThis::add(mBgColourBox, i18n("Select the alarm message background color")); // Sound checkbox and file selector - tqlayout = new TQHBoxLayout(frameLayout); + layout = new TQHBoxLayout(frameLayout); mSoundPicker = new SoundPicker(mDisplayAlarmsFrame); - mSoundPicker->setFixedSize(mSoundPicker->tqsizeHint()); - tqlayout->addWidget(mSoundPicker); - tqlayout->addSpacing(2*spacingHint()); - tqlayout->addStretch(); + mSoundPicker->setFixedSize(mSoundPicker->sizeHint()); + layout->addWidget(mSoundPicker); + layout->addSpacing(2*spacingHint()); + layout->addStretch(); if (ShellProcess::authorised()) // don't display if shell commands not allowed (e.g. kiosk mode) { // Special actions button mSpecialActionsButton = new SpecialActionsButton(i18n_SpecialActions(), mDisplayAlarmsFrame); - mSpecialActionsButton->setFixedSize(mSpecialActionsButton->tqsizeHint()); - tqlayout->addWidget(mSpecialActionsButton); + mSpecialActionsButton->setFixedSize(mSpecialActionsButton->sizeHint()); + layout->addWidget(mSpecialActionsButton); } // Top-adjust the controls @@ -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); @@ -505,20 +505,20 @@ void EditAlarmDlg::initCommand(TQWidget* parent) mCmdOutputGroup = new ButtonGroup(i18n("Command Output"), mCommandFrame); frameLayout->addWidget(mCmdOutputGroup); - TQBoxLayout* tqlayout = new TQVBoxLayout(mCmdOutputGroup, marginHint(), spacingHint()); - tqlayout->addSpacing(fontMetrics().lineSpacing()/2); + TQBoxLayout* layout = new TQVBoxLayout(mCmdOutputGroup, marginHint(), spacingHint()); + layout->addSpacing(fontMetrics().lineSpacing()/2); // 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); + layout->addWidget(button, 0, TQt::AlignAuto); // 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,25 +527,25 @@ 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); - tqlayout->addWidget(button, 0, TQt::AlignAuto); - tqlayout->addWidget(box); + layout->addWidget(button, 0, TQt::AlignAuto); + layout->addWidget(box); // 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); + layout->addWidget(button, 0, TQt::AlignAuto); // Top-adjust the controls mCmdPadding = new TQHBox(mCommandFrame); @@ -560,8 +560,8 @@ void EditAlarmDlg::initEmail(TQWidget* parent) { mEmailFrame = new TQFrame(parent); mEmailFrame->setFrameStyle(TQFrame::NoFrame); - TQBoxLayout* tqlayout = new TQVBoxLayout(mEmailFrame, 0, spacingHint()); - TQGridLayout* grid = new TQGridLayout(tqlayout, 3, 3, spacingHint()); + TQBoxLayout* layout = new TQVBoxLayout(mEmailFrame, 0, spacingHint()); + TQGridLayout* grid = new TQGridLayout(layout, 3, 3, spacingHint()); grid->setColStretch(1, 1); mEmailFromList = 0; @@ -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); @@ -614,19 +614,19 @@ void EditAlarmDlg::initEmail(TQWidget* parent) // Email body mEmailMessageEdit = new TextEdit(mEmailFrame); TQWhatsThis::add(mEmailMessageEdit, i18n("Enter the email message.")); - tqlayout->addWidget(mEmailMessageEdit); + layout->addWidget(mEmailMessageEdit); // Email attachments - grid = new TQGridLayout(tqlayout, 2, 3, spacingHint()); + grid = new TQGridLayout(layout, 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(); +TQRect rect = list->geometry(); list->setGeometry(rect.left() - 50, rect.top(), rect.width(), rect.height()); label->setBuddy(mEmailAttachList); TQWhatsThis::add(mEmailAttachList, @@ -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()) @@ -1424,7 +1424,7 @@ void EditAlarmDlg::slotOk() mTabs->setCurrentPage(mMainPageIndex); mReminder->setFocusOnCount(); KMessageBox::sorry(this, i18n("Reminder period must be less than the recurrence interval, unless '%1' is checked." - ).tqarg(Reminder::i18n_first_recurrence_only())); + ).arg(Reminder::i18n_first_recurrence_only())); return; } } @@ -1479,15 +1479,15 @@ void EditAlarmDlg::slotTry() if (mCommandRadio->isOn() && mCmdOutputGroup->selectedId() != EXEC_IN_TERMINAL) { theApp()->commandMessage((ShellProcess*)proc, this); - KMessageBox::information(this, i18n("Command executed:\n%1").tqarg(text)); + KMessageBox::information(this, i18n("Command executed:\n%1").arg(text)); theApp()->commandMessage((ShellProcess*)proc, 0); } else if (mEmailRadio->isOn()) { TQString bcc; if (mEmailBcc->isChecked()) - bcc = i18n("\nBcc: %1").tqarg(Preferences::emailBccAddress()); - KMessageBox::information(this, i18n("Email sent to:\n%1%2").tqarg(mEmailAddresses.join("\n")).tqarg(bcc)); + bcc = i18n("\nBcc: %1").arg(Preferences::emailBccAddress()); + KMessageBox::information(this, i18n("Email sent to:\n%1%2").arg(mEmailAddresses.join("\n")).arg(bcc)); } } } @@ -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) @@ -1728,7 +1728,7 @@ bool EditAlarmDlg::checkEmailData() if (!bad.isEmpty()) { mEmailToEdit->setFocus(); - KMessageBox::error(this, i18n("Invalid email address:\n%1").tqarg(bad)); + KMessageBox::error(this, i18n("Invalid email address:\n%1").arg(bad)); return false; } } @@ -1752,7 +1752,7 @@ bool EditAlarmDlg::checkEmailData() break; // empty case -1: mEmailAttachList->setFocus(); - KMessageBox::error(this, i18n("Invalid email attachment:\n%1").tqarg(att)); + KMessageBox::error(this, i18n("Invalid email attachment:\n%1").arg(att)); return false; } } @@ -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; @@ -2012,7 +2012,7 @@ bool EditAlarmDlg::checkText(TQString& result, bool showErrorMessage) const default: break; } - if (KMessageBox::warningContinueCancel(const_cast<EditAlarmDlg*>(this), errmsg.tqarg(alarmtext)) + if (KMessageBox::warningContinueCancel(const_cast<EditAlarmDlg*>(this), errmsg.arg(alarmtext)) == KMessageBox::Cancel) return false; } @@ -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..29ba4a6d2 100644 --- a/kalarm/find.cpp +++ b/kalarm/find.cpp @@ -20,7 +20,7 @@ #include "kalarm.h" -#include <tqlayout.h> +#include <layout.h> #include <tqwhatsthis.h> #include <tqgroupbox.h> #include <tqcheckbox.h> @@ -93,21 +93,21 @@ void Find::display() TQWidget* kalarmWidgets = mDialog->findExtension(); // Alarm types - TQBoxLayout* tqlayout = new TQVBoxLayout(kalarmWidgets, 0, KDialog::spacingHint()); + TQBoxLayout* layout = new TQVBoxLayout(kalarmWidgets, 0, KDialog::spacingHint()); TQGroupBox* group = new TQGroupBox(i18n("Alarm Type"), kalarmWidgets); - tqlayout->addWidget(group); + layout->addWidget(group); TQGridLayout* grid = new TQGridLayout(group, 2, 2, KDialog::marginHint(), KDialog::spacingHint()); grid->addRowSpacing(0, mDialog->fontMetrics().lineSpacing()/2); grid->setColStretch(1, 1); // 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..936cc4c8d 100644 --- a/kalarm/fontcolour.cpp +++ b/kalarm/fontcolour.cpp @@ -24,7 +24,7 @@ #include <tqpushbutton.h> #include <tqhbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqwhatsthis.h> #include <kglobal.h> @@ -57,8 +57,8 @@ FontColourChooser::FontColourChooser(TQWidget *parent, const char *name, topLayout = new TQVBoxLayout(page, KDialog::marginHint(), KDialog::spacingHint()); topLayout->addSpacing(fontMetrics().height() - KDialog::marginHint() + KDialog::spacingHint()); } - TQHBoxLayout* htqlayout = new TQHBoxLayout(topLayout); - TQVBoxLayout* colourLayout = new TQVBoxLayout(htqlayout); + TQHBoxLayout* hlayout = new TQHBoxLayout(topLayout); + TQVBoxLayout* colourLayout = new TQVBoxLayout(hlayout); if (fg) { TQHBox* box = new TQHBox(page); // to group widgets for TQWhatsThis text @@ -83,35 +83,35 @@ FontColourChooser::FontColourChooser(TQWidget *parent, const char *name, connect(mBgColourButton, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(setSampleColour())); label->setBuddy(mBgColourButton); TQWhatsThis::add(box, i18n("Select the alarm message background color")); - htqlayout->addStretch(); + hlayout->addStretch(); if (editColours) { - TQHBoxLayout* tqlayout = new TQHBoxLayout(topLayout); + TQHBoxLayout* layout = 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); + layout->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.")); - tqlayout->addWidget(mRemoveColourButton); + layout->addWidget(mRemoveColourButton); } if (defaultFont) { - TQHBoxLayout* tqlayout = new TQHBoxLayout(topLayout); + TQHBoxLayout* layout = 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.")); - tqlayout->addWidget(mDefaultFont); - tqlayout->addWidget(new TQWidget(page)); // left adjust the widget + layout->addWidget(mDefaultFont); + layout->addWidget(new TQWidget(page)); // left adjust the widget } else mDefaultFont = 0; diff --git a/kalarm/fontcolourbutton.cpp b/kalarm/fontcolourbutton.cpp index e5dd90b92..4f276361d 100644 --- a/kalarm/fontcolourbutton.cpp +++ b/kalarm/fontcolourbutton.cpp @@ -21,7 +21,7 @@ #include "kalarm.h" #include <tqcheckbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqwhatsthis.h> #include <klocale.h> @@ -43,26 +43,26 @@ FontColourButton::FontColourButton(TQWidget* parent, const char* name) mReadOnly(false) { setFrameStyle(NoFrame); - TQHBoxLayout* tqlayout = new TQHBoxLayout(this, 0, KDialog::spacingHint()); + TQHBoxLayout* layout = 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.")); - tqlayout->addWidget(mButton); + layout->addWidget(mButton); // 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.")); - tqlayout->addWidget(mSample); + layout->addWidget(mSample); } void FontColourButton::setDefaultFont() @@ -125,7 +125,7 @@ FontColourDlg::FontColourDlg(const TQColor& bgColour, const TQColor& fgColour, c { TQWidget* page = new TQWidget(this); setMainWidget(page); - TQVBoxLayout* tqlayout = new TQVBoxLayout(page, 0, spacingHint()); + TQVBoxLayout* layout = new TQVBoxLayout(page, 0, spacingHint()); mChooser = new FontColourChooser(page, 0, false, TQStringList(), TQString(), false, true, true); mChooser->setBgColour(bgColour); mChooser->setFgColour(fgColour); @@ -133,8 +133,8 @@ FontColourDlg::FontColourDlg(const TQColor& bgColour, const TQColor& fgColour, c mChooser->setDefaultFont(); else mChooser->setFont(font); - tqlayout->addWidget(mChooser); - tqlayout->addSpacing(KDialog::spacingHint()); + layout->addWidget(mChooser); + layout->addSpacing(KDialog::spacingHint()); } /****************************************************************************** diff --git a/kalarm/functions.cpp b/kalarm/functions.cpp index d7a6383f2..0221ea86b 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(); @@ -633,13 +633,13 @@ void outputAlarmWarnings(TQWidget* parent, const KAEvent* event) if (event && event->action() == KAEvent::EMAIL && Preferences::emailAddress().isEmpty()) KMessageBox::information(parent, i18n("Please set the 'From' email address...", - "%1\nPlease set it in the Preferences dialog.").tqarg(KAMail::i18n_NeedFromEmailAddress())); + "%1\nPlease set it in the Preferences dialog.").arg(KAMail::i18n_NeedFromEmailAddress())); if (!Daemon::monitoringAlarms()) { 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(); } @@ -705,7 +705,7 @@ TQString runKMail(bool minimise) TQCString dcopName; TQString errmsg; if (!runProgram("kmail", (minimise ? KMAIL_DCOP_WINDOW : ""), dcopName, errmsg)) - return i18n("Unable to start KMail\n(%1)").tqarg(errmsg); + return i18n("Unable to start KMail\n(%1)").arg(errmsg); return TQString(); } @@ -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").arg(desktop->width()), 0), + config->readNumEntry(TQString::fromLatin1("Height %1").arg(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").arg(desktop->width()), size.width()); + config->writeEntry(TQString::fromLatin1("Height %1").arg(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])) @@ -905,7 +905,7 @@ TQString stripAccel(const TQString& text) { unsigned len = text.length(); TQString out = TQDeepCopy<TQString>(text); - TQChar *corig = (TQChar*)out.tqunicode(); + TQChar *corig = (TQChar*)out.unicode(); TQChar *cout = corig; TQChar *cin = cout; while (len) 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..25dd60f49 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").arg(TQString::fromLatin1("--calendarURL")).arg(TQString::fromLatin1("--handleEvent")).arg(TQString::fromLatin1("--triggerEvent")).arg(TQString::fromLatin1("--cancelEvent"))) if (count > 1) - USAGE(i18n("%1, %2, %3 mutually exclusive").tqarg(TQString::tqfromLatin1("--handleEvent")).tqarg(TQString::tqfromLatin1("--triggerEvent")).tqarg(TQString::tqfromLatin1("--cancelEvent"))); + USAGE(i18n("%1, %2, %3 mutually exclusive").arg(TQString::fromLatin1("--handleEvent")).arg(TQString::fromLatin1("--triggerEvent")).arg(TQString::fromLatin1("--cancelEvent"))); if (!initCheck(true)) // open the calendar, don't register with daemon yet { exitCode = 1; @@ -341,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").arg(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").arg(TQString::fromLatin1("--edit")).arg(eventID)) exitCode = 1; break; } @@ -401,11 +401,11 @@ int KAlarmApp::newInstance() { kdDebug(5950)<<"KAlarmApp::newInstance(): file\n"; if (args->isSet("exec")) - USAGE(i18n("%1 incompatible with %2").tqarg(TQString::tqfromLatin1("--exec")).tqarg(TQString::tqfromLatin1("--file"))) + USAGE(i18n("%1 incompatible with %2").arg(TQString::fromLatin1("--exec")).arg(TQString::fromLatin1("--file"))) if (args->isSet("mail")) - USAGE(i18n("%1 incompatible with %2").tqarg(TQString::tqfromLatin1("--mail")).tqarg(TQString::tqfromLatin1("--file"))) + USAGE(i18n("%1 incompatible with %2").arg(TQString::fromLatin1("--mail")).arg(TQString::fromLatin1("--file"))) if (args->count()) - USAGE(i18n("message incompatible with %1").tqarg(TQString::tqfromLatin1("--file"))) + USAGE(i18n("message incompatible with %1").arg(TQString::fromLatin1("--file"))) alMessage = args->getOption("file"); action = KAEvent::FILE; } @@ -413,7 +413,7 @@ int KAlarmApp::newInstance() { kdDebug(5950)<<"KAlarmApp::newInstance(): exec\n"; if (args->isSet("mail")) - USAGE(i18n("%1 incompatible with %2").tqarg(TQString::tqfromLatin1("--mail")).tqarg(TQString::tqfromLatin1("--exec"))) + USAGE(i18n("%1 incompatible with %2").arg(TQString::fromLatin1("--mail")).arg(TQString::fromLatin1("--exec"))) alMessage = args->getOption("exec"); int n = args->count(); for (int i = 0; i < n; ++i) @@ -435,7 +435,7 @@ int KAlarmApp::newInstance() { TQString addr = TQString::fromLocal8Bit(*i); if (!KAMail::checkAddress(addr)) - USAGE(i18n("%1: invalid email address").tqarg(TQString::tqfromLatin1("--mail"))) + USAGE(i18n("%1: invalid email address").arg(TQString::fromLatin1("--mail"))) alAddresses += KCal::Person(TQString(), addr); } params = args->getOptionList("attach"); @@ -453,13 +453,13 @@ int KAlarmApp::newInstance() if (action != KAEvent::EMAIL) { if (args->isSet("subject")) - USAGE(i18n("%1 requires %2").tqarg(TQString::tqfromLatin1("--subject")).tqarg(TQString::tqfromLatin1("--mail"))) + USAGE(i18n("%1 requires %2").arg(TQString::fromLatin1("--subject")).arg(TQString::fromLatin1("--mail"))) if (args->isSet("from-id")) - USAGE(i18n("%1 requires %2").tqarg(TQString::tqfromLatin1("--from-id")).tqarg(TQString::tqfromLatin1("--mail"))) + USAGE(i18n("%1 requires %2").arg(TQString::fromLatin1("--from-id")).arg(TQString::fromLatin1("--mail"))) if (args->isSet("attach")) - USAGE(i18n("%1 requires %2").tqarg(TQString::tqfromLatin1("--attach")).tqarg(TQString::tqfromLatin1("--mail"))) + USAGE(i18n("%1 requires %2").arg(TQString::fromLatin1("--attach")).arg(TQString::fromLatin1("--mail"))) if (args->isSet("bcc")) - USAGE(i18n("%1 requires %2").tqarg(TQString::tqfromLatin1("--bcc")).tqarg(TQString::tqfromLatin1("--mail"))) + USAGE(i18n("%1 requires %2").arg(TQString::fromLatin1("--bcc")).arg(TQString::fromLatin1("--mail"))) } bool alarmNoTime = false; @@ -478,7 +478,7 @@ int KAlarmApp::newInstance() colourText.replace(0, 2, "#"); bgColour.setNamedColor(colourText); if (!bgColour.isValid()) - USAGE(i18n("Invalid %1 parameter").tqarg(TQString::tqfromLatin1("--color"))) + USAGE(i18n("Invalid %1 parameter").arg(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").arg(TQString::fromLatin1("--colorfg"))) } if (args->isSet("time")) { TQCString dateTime = args->getOption("time"); if (!convWakeTime(dateTime, alarmTime, alarmNoTime)) - USAGE(i18n("Invalid %1 parameter").tqarg(TQString::tqfromLatin1("--time"))) + USAGE(i18n("Invalid %1 parameter").arg(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").arg(TQString::fromLatin1("--login")).arg(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").arg(TQString::fromLatin1("--until")).arg(TQString::fromLatin1("--recurrence"))) TQCString rule = args->getOption("recurrence"); recurrence.set(TQString::fromLocal8Bit(static_cast<const char*>(rule))); } @@ -516,24 +516,24 @@ int KAlarmApp::newInstance() // Repeat count is specified int count; if (args->isSet("login")) - USAGE(i18n("%1 incompatible with %2").tqarg(TQString::tqfromLatin1("--login")).tqarg(TQString::tqfromLatin1("--interval"))) + USAGE(i18n("%1 incompatible with %2").arg(TQString::fromLatin1("--login")).arg(TQString::fromLatin1("--interval"))) bool ok; if (args->isSet("repeat")) { count = args->getOption("repeat").toInt(&ok); if (!ok || !count || count < -1 || (count < 0 && haveRecurrence)) - USAGE(i18n("Invalid %1 parameter").tqarg(TQString::tqfromLatin1("--repeat"))) + USAGE(i18n("Invalid %1 parameter").arg(TQString::fromLatin1("--repeat"))) } else if (haveRecurrence) - USAGE(i18n("%1 requires %2").tqarg(TQString::tqfromLatin1("--interval")).tqarg(TQString::tqfromLatin1("--repeat"))) + USAGE(i18n("%1 requires %2").arg(TQString::fromLatin1("--interval")).arg(TQString::fromLatin1("--repeat"))) else if (args->isSet("until")) { count = 0; TQCString dateTime = args->getOption("until"); if (!convWakeTime(dateTime, endTime, alarmNoTime)) - USAGE(i18n("Invalid %1 parameter").tqarg(TQString::tqfromLatin1("--until"))) + USAGE(i18n("Invalid %1 parameter").arg(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").arg(TQString::fromLatin1("--until")).arg(TQString::fromLatin1("--time"))) } else count = -1; @@ -543,16 +543,16 @@ int KAlarmApp::newInstance() KARecurrence::Type recurType; if (!convInterval(args->getOption("interval"), recurType, interval, !haveRecurrence) || interval < 0) - USAGE(i18n("Invalid %1 parameter").tqarg(TQString::tqfromLatin1("--interval"))) + USAGE(i18n("Invalid %1 parameter").arg(TQString::fromLatin1("--interval"))) if (alarmNoTime && recurType == KARecurrence::MINUTELY) - USAGE(i18n("Invalid %1 parameter for date-only alarm").tqarg(TQString::tqfromLatin1("--interval"))) + USAGE(i18n("Invalid %1 parameter for date-only alarm").arg(TQString::fromLatin1("--interval"))) if (haveRecurrence) { // There is a also a recurrence specified, so set up a sub-repetition int longestInterval = recurrence.longestInterval(); if (count * interval > longestInterval) - USAGE(i18n("Invalid %1 and %2 parameters: repetition is longer than %3 interval").tqarg(TQString::tqfromLatin1("--interval")).tqarg(TQString::tqfromLatin1("--repeat")).tqarg(TQString::tqfromLatin1("--recurrence"))); + USAGE(i18n("Invalid %1 and %2 parameters: repetition is longer than %3 interval").arg(TQString::fromLatin1("--interval")).arg(TQString::fromLatin1("--repeat")).arg(TQString::fromLatin1("--recurrence"))); repeatCount = count; repeatInterval = interval; } @@ -566,9 +566,9 @@ int KAlarmApp::newInstance() else { if (args->isSet("repeat")) - USAGE(i18n("%1 requires %2").tqarg(TQString::tqfromLatin1("--repeat")).tqarg(TQString::tqfromLatin1("--interval"))) + USAGE(i18n("%1 requires %2").arg(TQString::fromLatin1("--repeat")).arg(TQString::fromLatin1("--interval"))) if (args->isSet("until")) - USAGE(i18n("%1 requires %2").tqarg(TQString::tqfromLatin1("--until")).tqarg(TQString::tqfromLatin1("--interval"))) + USAGE(i18n("%1 requires %2").arg(TQString::fromLatin1("--until")).arg(TQString::fromLatin1("--interval"))) } TQCString audioFile; @@ -582,11 +582,11 @@ int KAlarmApp::newInstance() { // Play a sound with the alarm if (audioRepeat && args->isSet("play")) - USAGE(i18n("%1 incompatible with %2").tqarg(TQString::tqfromLatin1("--play")).tqarg(TQString::tqfromLatin1("--play-repeat"))) + USAGE(i18n("%1 incompatible with %2").arg(TQString::fromLatin1("--play")).arg(TQString::fromLatin1("--play-repeat"))) if (args->isSet("beep")) - USAGE(i18n("%1 incompatible with %2").tqarg(TQString::tqfromLatin1("--beep")).tqarg(TQString::tqfromLatin1(audioRepeat ? "--play-repeat" : "--play"))) + USAGE(i18n("%1 incompatible with %2").arg(TQString::fromLatin1("--beep")).arg(TQString::fromLatin1(audioRepeat ? "--play-repeat" : "--play"))) if (args->isSet("speak")) - USAGE(i18n("%1 incompatible with %2").tqarg(TQString::tqfromLatin1("--speak")).tqarg(TQString::tqfromLatin1(audioRepeat ? "--play-repeat" : "--play"))) + USAGE(i18n("%1 incompatible with %2").arg(TQString::fromLatin1("--speak")).arg(TQString::fromLatin1(audioRepeat ? "--play-repeat" : "--play"))) audioFile = args->getOption(audioRepeat ? "play-repeat" : "play"); #ifndef WITHOUT_ARTS if (args->isSet("volume")) @@ -594,21 +594,21 @@ int KAlarmApp::newInstance() bool ok; int volumepc = args->getOption("volume").toInt(&ok); if (!ok || volumepc < 0 || volumepc > 100) - USAGE(i18n("Invalid %1 parameter").tqarg(TQString::tqfromLatin1("--volume"))) + USAGE(i18n("Invalid %1 parameter").arg(TQString::fromLatin1("--volume"))) audioVolume = static_cast<float>(volumepc) / 100; } #endif } #ifndef WITHOUT_ARTS else if (args->isSet("volume")) - USAGE(i18n("%1 requires %2 or %3").tqarg(TQString::tqfromLatin1("--volume")).tqarg(TQString::tqfromLatin1("--play")).tqarg(TQString::tqfromLatin1("--play-repeat"))) + USAGE(i18n("%1 requires %2 or %3").arg(TQString::fromLatin1("--volume")).arg(TQString::fromLatin1("--play")).arg(TQString::fromLatin1("--play-repeat"))) #endif if (args->isSet("speak")) { if (args->isSet("beep")) - USAGE(i18n("%1 incompatible with %2").tqarg(TQString::tqfromLatin1("--beep")).tqarg(TQString::tqfromLatin1("--speak"))) + USAGE(i18n("%1 incompatible with %2").arg(TQString::fromLatin1("--beep")).arg(TQString::fromLatin1("--speak"))) if (!mSpeechEnabled) - USAGE(i18n("%1 requires speech synthesis to be configured using KTTSD").tqarg(TQString::tqfromLatin1("--speak"))) + USAGE(i18n("%1 requires speech synthesis to be configured using KTTSD").arg(TQString::fromLatin1("--speak"))) } int reminderMinutes = 0; bool onceOnly = args->isSet("reminder-once"); @@ -616,18 +616,18 @@ int KAlarmApp::newInstance() { // Issue a reminder alarm in advance of the main alarm if (onceOnly && args->isSet("reminder")) - USAGE(i18n("%1 incompatible with %2").tqarg(TQString::tqfromLatin1("--reminder")).tqarg(TQString::tqfromLatin1("--reminder-once"))) - TQString opt = onceOnly ? TQString::tqfromLatin1("--reminder-once") : TQString::tqfromLatin1("--reminder"); + USAGE(i18n("%1 incompatible with %2").arg(TQString::fromLatin1("--reminder")).arg(TQString::fromLatin1("--reminder-once"))) + TQString opt = onceOnly ? TQString::fromLatin1("--reminder-once") : TQString::fromLatin1("--reminder"); if (args->isSet("exec")) - USAGE(i18n("%1 incompatible with %2").tqarg(opt).tqarg(TQString::tqfromLatin1("--exec"))) + USAGE(i18n("%1 incompatible with %2").arg(opt).arg(TQString::fromLatin1("--exec"))) if (args->isSet("mail")) - USAGE(i18n("%1 incompatible with %2").tqarg(opt).tqarg(TQString::tqfromLatin1("--mail"))) + USAGE(i18n("%1 incompatible with %2").arg(opt).arg(TQString::fromLatin1("--mail"))) KARecurrence::Type recurType; TQString optval = args->getOption(onceOnly ? "reminder-once" : "reminder"); if (!convInterval(args->getOption(onceOnly ? "reminder-once" : "reminder"), recurType, reminderMinutes)) - USAGE(i18n("Invalid %1 parameter").tqarg(opt)) + USAGE(i18n("Invalid %1 parameter").arg(opt)) if (recurType == KARecurrence::MINUTELY && alarmNoTime) - USAGE(i18n("Invalid %1 parameter for date-only alarm").tqarg(opt)) + USAGE(i18n("Invalid %1 parameter for date-only alarm").arg(opt)) } int lateCancel = 0; @@ -636,10 +636,10 @@ int KAlarmApp::newInstance() KARecurrence::Type recurType; bool ok = convInterval(args->getOption("late-cancel"), recurType, lateCancel); if (!ok || lateCancel <= 0) - USAGE(i18n("Invalid %1 parameter").tqarg(TQString::tqfromLatin1("late-cancel"))) + USAGE(i18n("Invalid %1 parameter").arg(TQString::fromLatin1("late-cancel"))) } else if (args->isSet("auto-close")) - USAGE(i18n("%1 requires %2").tqarg(TQString::tqfromLatin1("--auto-close")).tqarg(TQString::tqfromLatin1("--late-cancel"))) + USAGE(i18n("%1 requires %2").arg(TQString::fromLatin1("--auto-close")).arg(TQString::fromLatin1("--late-cancel"))) int flags = KAEvent::DEFAULT_FONT; if (args->isSet("ack-confirm")) @@ -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").arg(TQString::fromLatin1("--file")).arg(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").arg(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..383d03caf 100644 --- a/kalarm/kamail.cpp +++ b/kalarm/kamail.cpp @@ -115,14 +115,14 @@ bool KAMail::send(const KAEvent& event, TQStringList& errmsgs, bool allowNotify) if (identity.isNull()) { kdError(5950) << "KAMail::send(): identity" << event.emailFromId() << "not found" << endl; - errmsgs = errors(i18n("Invalid 'From' email address.\nKMail identity '%1' not found.").tqarg(event.emailFromId())); + errmsgs = errors(i18n("Invalid 'From' email address.\nKMail identity '%1' not found.").arg(event.emailFromId())); return false; } from = identity.fullEmailAddr(); if (from.isEmpty()) { kdError(5950) << "KAMail::send(): identity" << identity.identityName() << "uoid" << identity.uoid() << ": no email address" << endl; - errmsgs = errors(i18n("Invalid 'From' email address.\nEmail identity '%1' has no email address").tqarg(identity.identityName())); + errmsgs = errors(i18n("Invalid 'From' email address.\nEmail identity '%1' has no email address").arg(identity.identityName())); return false; } } @@ -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").arg(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").arg(timenow).arg(tod.tv_usec).arg(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).arg(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").arg(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").arg(boundary.data()); message += event.message(); } @@ -446,12 +446,12 @@ TQString KAMail::appendBodyAttachments(TQString& message, const KAEvent& event) KIO::UDSEntry uds; if (!KIO::NetAccess::stat(url, uds, MainWindow::mainMainWindow())) { kdError(5950) << "KAMail::appendBodyAttachments(): not found: " << attachment << endl; - return i18n("Attachment not found:\n%1").tqarg(attachment); + return i18n("Attachment not found:\n%1").arg(attachment); } KFileItem fi(uds, url); if (fi.isDir() || !fi.isReadable()) { kdError(5950) << "KAMail::appendBodyAttachments(): not file/not readable: " << attachment << endl; - return attachError.tqarg(attachment); + return attachError.arg(attachment); } // Check if the attachment is a text file @@ -463,21 +463,21 @@ TQString KAMail::appendBodyAttachments(TQString& message, const KAEvent& event) text = (mimeType == textMimeTypes[i]); } - message += TQString::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").arg(boundary.data()); + message += TQString::fromLatin1("\nContent-Type: %2; name=\"%3\"").arg(mimeType).arg(fi.text()); + message += TQString::fromLatin1("\nContent-Transfer-Encoding: %1").arg(TQString::fromLatin1(text ? "8bit" : "BASE64")); + message += TQString::fromLatin1("\nContent-Disposition: attachment; filename=\"%4\"\n\n").arg(fi.text()); // Read the file contents TQString tmpFile; if (!KIO::NetAccess::download(url, tmpFile, MainWindow::mainMainWindow())) { kdError(5950) << "KAMail::appendBodyAttachments(): load failure: " << attachment << endl; - return attachError.tqarg(attachment); + return attachError.arg(attachment); } TQFile file(tmpFile); if (!file.open(IO_ReadOnly) ) { kdDebug(5950) << "KAMail::appendBodyAttachments() tmp load error: " << attachment << endl; - return attachError.tqarg(attachment); + return attachError.arg(attachment); } TQIODevice::Offset size = file.size(); char* contents = new char [size + 1]; @@ -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); + return attachError.arg(attachment); } - message += TQString::tqfromLatin1("\n--%1--\n.\n").tqarg(boundary.data()); + message += TQString::fromLatin1("\n--%1--\n.\n").arg(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) @@ -922,10 +922,10 @@ char* KAMail::base64Encode(const char* in, TQIODevice::Offset size, TQIODevice:: TQStringList KAMail::errors(const TQString& err, bool sendfail) { TQString error1 = sendfail ? i18n("Failed to send email") - : i18n("Error copying sent email to KMail %1 folder").tqarg(i18n_sent_mail()); + : i18n("Error copying sent email to KMail %1 folder").arg(i18n_sent_mail()); if (err.isEmpty()) return TQStringList(error1); - TQStringList errs(TQString::tqfromLatin1("%1:").tqarg(error1)); + TQStringList errs(TQString::fromLatin1("%1:").arg(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..e8f1d79bd 100644 --- a/kalarm/latecancel.cpp +++ b/kalarm/latecancel.cpp @@ -21,7 +21,7 @@ #include "kalarm.h" #include <tqwidgetstack.h> -#include <tqlayout.h> +#include <layout.h> #include <tqwhatsthis.h> #include <klocale.h> #include <kdialog.h> @@ -58,31 +58,31 @@ LateCancelSelector::LateCancelSelector(bool allowHourMinute, TQWidget* parent, c mCheckboxFrame = new TQFrame(mStack); mCheckboxFrame->setFrameStyle(TQFrame::NoFrame); mStack->addWidget(mCheckboxFrame, 1); - TQBoxLayout* tqlayout = new TQVBoxLayout(mCheckboxFrame, 0, 0); + TQBoxLayout* layout = 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); + layout->addWidget(mCheckbox, 0, TQt::AlignAuto); mTimeSelectorFrame = new TQFrame(mStack); mTimeSelectorFrame->setFrameStyle(TQFrame::NoFrame); mStack->addWidget(mTimeSelectorFrame, 2); - tqlayout = new TQVBoxLayout(mTimeSelectorFrame, 0, 0); + layout = new TQVBoxLayout(mTimeSelectorFrame, 0, 0); mTimeSelector = new TimeSelector(i18n("Cancel if late by 10 minutes", "Ca&ncel if late by"), TQString(), whatsThis, i18n("Enter how late will cause the alarm to be canceled"), allowHourMinute, mTimeSelectorFrame); connect(mTimeSelector, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotToggled(bool))); - tqlayout->addWidget(mTimeSelector); + layout->addWidget(mTimeSelector); mLayout->addWidget(mStack); - tqlayout = new TQHBoxLayout(mLayout, KDialog::spacingHint()); - tqlayout->addSpacing(3*KDialog::spacingHint()); + layout = new TQHBoxLayout(mLayout, KDialog::spacingHint()); + layout->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(); + layout->addWidget(mAutoClose); + layout->addStretch(); mAutoClose->hide(); mAutoClose->setEnabled(false); diff --git a/kalarm/latecancel.h b/kalarm/latecancel.h index ba03d07d7..08fcf2c3e 100644 --- a/kalarm/latecancel.h +++ b/kalarm/latecancel.h @@ -55,7 +55,7 @@ class LateCancelSelector : public TQFrame void slotToggled(bool); private: - TQBoxLayout* mLayout; // overall tqlayout for the widget + TQBoxLayout* mLayout; // overall layout for the widget TQWidgetStack* mStack; // contains mCheckboxFrame and mTimeSelectorFrame TQFrame* mCheckboxFrame; CheckBox* mCheckbox; // displayed when late cancellation is not selected diff --git a/kalarm/lib/buttongroup.cpp b/kalarm/lib/buttongroup.cpp index 018640123..2905147f3 100644 --- a/kalarm/lib/buttongroup.cpp +++ b/kalarm/lib/buttongroup.cpp @@ -19,7 +19,7 @@ */ #include "kalarm.h" -#include <tqlayout.h> +#include <layout.h> #include <tqbutton.h> #include <kdialog.h> 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..2fef25de5 100644 --- a/kalarm/lib/dateedit.cpp +++ b/kalarm/lib/dateedit.cpp @@ -77,11 +77,11 @@ 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); - errString = defaultError.tqarg(errString); + errString = defaultError.arg(errString); } KMessageBox::sorry(this, errString); } 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..b3df822e8 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):"); @@ -174,8 +174,8 @@ const TQCString& ShellProcess::shellPath() struct stat fileinfo; if (stat(envshell.data(), &fileinfo) != -1 // ensure file exists && !S_ISDIR(fileinfo.st_mode) // and it's not a directory - && !S_ISCHR(fileinfo.st_mode) // and it's not a character tqdevice - && !S_ISBLK(fileinfo.st_mode) // and it's not a block tqdevice + && !S_ISCHR(fileinfo.st_mode) // and it's not a character device + && !S_ISBLK(fileinfo.st_mode) // and it's not a block device #ifdef S_ISSOCK && !S_ISSOCK(fileinfo.st_mode) // and it's not a socket #endif diff --git a/kalarm/lib/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..a45a5b4e9 100644 --- a/kalarm/lib/spinbox2.cpp +++ b/kalarm/lib/spinbox2.cpp @@ -142,7 +142,7 @@ void SpinBox2::setLineStep(int step) { mLineStep = step; if (reverseButtons()) - mUpdown2->setLineStep(step); // reverse tqlayout, but still set the right buttons + mUpdown2->setLineStep(step); // reverse layout, but still set the right buttons else mSpinbox->setLineStep(step); } @@ -153,7 +153,7 @@ void SpinBox2::setSteps(int line, int page) mPageStep = page; if (reverseButtons()) { - mUpdown2->setLineStep(line); // reverse tqlayout, but still set the right buttons + mUpdown2->setLineStep(line); // reverse layout, but still set the right buttons mSpinbox->setLineStep(page); } else @@ -169,7 +169,7 @@ void SpinBox2::setShiftSteps(int line, int page) mPageShiftStep = page; if (reverseButtons()) { - mUpdown2->setLineShiftStep(line); // reverse tqlayout, but still set the right buttons + mUpdown2->setLineShiftStep(line); // reverse layout, but still set the right buttons mSpinbox->setLineShiftStep(page); } else @@ -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..14c2f16e1 100644 --- a/kalarm/lib/spinbox2.h +++ b/kalarm/lib/spinbox2.h @@ -115,8 +115,8 @@ class SpinBox2 : public TQFrame */ bool wrapping() const { return mSpinbox->wrapping(); } - /** Set the text tqalignment of the widget */ - void tqsetAlignment(int a) { mSpinbox->tqsetAlignment(a); } + /** Set the text alignment of the widget */ + void setAlignment(int a) { mSpinbox->setAlignment(a); } /** Sets the button symbols to use (arrows or plus/minus). */ virtual void setButtonSymbols(TQSpinBox::ButtonSymbols); /** 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; } @@ -149,13 +149,13 @@ class SpinBox2 : public TQFrame /** Returns the specified value clamped to the range of the spin box. */ int bound(int val) const; - /** Returns the tqgeometry of the right-hand "up" button. */ + /** Returns the geometry of the right-hand "up" button. */ TQRect upRect() const { return mSpinbox->upRect(); } - /** Returns the tqgeometry of the right-hand "down" button. */ + /** Returns the geometry of the right-hand "down" button. */ TQRect downRect() const { return mSpinbox->downRect(); } - /** Returns the tqgeometry of the left-hand "up" button. */ + /** Returns the geometry of the left-hand "up" button. */ TQRect up2Rect() const; - /** Returns the tqgeometry of the left-hand "down" button. */ + /** Returns the geometry of the left-hand "down" button. */ TQRect down2Rect() const; /** Returns the unshifted step increment for the right-hand spin buttons, @@ -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); } @@ -310,7 +310,7 @@ class SpinBox2 : public TQFrame int mLineShiftStep; // right button increment with shift pressed int mPageStep; // left button increment int mPageShiftStep; // left button increment with shift pressed - bool mReverseWithLayout; // reverse button positions if reverse tqlayout (default = true) + bool mReverseWithLayout; // reverse button positions if reverse layout (default = true) friend class MainSpinBox; }; 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..e9445d43a 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)").arg(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 } /****************************************************************************** @@ -1023,8 +1023,8 @@ void MainWindow::initUndoMenu(KPopupMenu* menu, Undo::Type type) TQString actText = Undo::actionText(type, id); TQString descrip = Undo::description(type, id); TQString text = descrip.isEmpty() - ? i18n("Undo/Redo [action]", "%1 %2").tqarg(action).tqarg(actText) - : i18n("Undo [action]: message", "%1 %2: %3").tqarg(action).tqarg(actText).tqarg(descrip); + ? i18n("Undo/Redo [action]", "%1 %2").arg(action).arg(actText) + : i18n("Undo [action]: message", "%1 %2: %3").arg(action).arg(actText).arg(descrip); menu->insertItem(text, id); } } @@ -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()) { @@ -1043,7 +1043,7 @@ void MainWindow::slotUndotqStatus(const TQString& undo, const TQString& redo) else { mActionUndo->setEnabled(true); - mActionUndo->setText(TQString("%1 %2").tqarg(undoText).tqarg(undo)); + mActionUndo->setText(TQString("%1 %2").arg(undoText).arg(undo)); } if (redo.isNull()) { @@ -1053,7 +1053,7 @@ void MainWindow::slotUndotqStatus(const TQString& undo, const TQString& redo) else { mActionRedo->setEnabled(true); - mActionRedo->setText(TQString("%1 %2").tqarg(redoText).tqarg(redo)); + mActionRedo->setText(TQString("%1 %2").arg(redoText).arg(redo)); } } @@ -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..2c455b128 100644 --- a/kalarm/messagewin.cpp +++ b/kalarm/messagewin.cpp @@ -25,13 +25,13 @@ #include <tqfile.h> #include <tqfileinfo.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <tqlabel.h> #include <tqwhatsthis.h> #include <tqtooltip.h> #include <tqdragobject.h> -#include <tqtextedit.h> +#include <textedit.h> #include <tqtimer.h> #include <kstandarddirs.h> @@ -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()) @@ -298,13 +298,13 @@ void MessageWin::initView() { // Show the alarm date/time, together with an "Advance reminder" text where appropriate TQFrame* frame = 0; - TQVBoxLayout* tqlayout = topLayout; + TQVBoxLayout* layout = topLayout; if (reminder) { frame = new TQFrame(topWidget); frame->setFrameStyle(TQFrame::Box | TQFrame::Raised); topLayout->addWidget(frame, 0, TQt::AlignHCenter); - tqlayout = new TQVBoxLayout(frame, leading + frame->frameWidth(), leading); + layout = new TQVBoxLayout(frame, leading + frame->frameWidth(), leading); } // Alarm date/time @@ -314,8 +314,8 @@ void MessageWin::initView() : KGlobal::locale()->formatDateTime(mDateTime.dateTime())); if (!frame) label->setFrameStyle(TQFrame::Box | TQFrame::Raised); - label->setFixedSize(label->tqsizeHint()); - tqlayout->addWidget(label, 0, TQt::AlignHCenter); + label->setFixedSize(label->sizeHint()); + layout->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()); - tqlayout->addWidget(label, 0, TQt::AlignHCenter); - frame->setFixedSize(frame->tqsizeHint()); + label->setFixedSize(label->sizeHint()); + layout->addWidget(label, 0, TQt::AlignHCenter); + 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,14 +401,14 @@ 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 { - TQBoxLayout* tqlayout = new TQHBoxLayout(topLayout); - tqlayout->addSpacing(hspace); - tqlayout->addWidget(text, 1, TQt::AlignHCenter); - tqlayout->addSpacing(hspace); + TQBoxLayout* layout = new TQHBoxLayout(topLayout); + layout->addSpacing(hspace); + layout->addWidget(text, 1, TQt::AlignHCenter); + layout->addSpacing(hspace); } if (!reminder) topLayout->addStretch(); @@ -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; } @@ -484,21 +484,21 @@ void MessageWin::initView() else { setCaption(i18n("Error")); - TQBoxLayout* tqlayout = new TQHBoxLayout(topLayout); - tqlayout->setMargin(2*KDialog::marginHint()); - tqlayout->addStretch(); + TQBoxLayout* layout = new TQHBoxLayout(topLayout); + layout->setMargin(2*KDialog::marginHint()); + layout->addStretch(); TQLabel* label = new TQLabel(topWidget); label->setPixmap(DesktopIcon("error")); - label->setFixedSize(label->tqsizeHint()); - tqlayout->addWidget(label, 0, TQt::AlignRight); - TQBoxLayout* vtqlayout = new TQVBoxLayout(tqlayout); + label->setFixedSize(label->sizeHint()); + layout->addWidget(label, 0, TQt::AlignRight); + TQBoxLayout* vlayout = new TQVBoxLayout(layout); for (TQStringList::Iterator it = mErrorMsgs.begin(); it != mErrorMsgs.end(); ++it) { label = new TQLabel(*it, topWidget); - label->setFixedSize(label->tqsizeHint()); - vtqlayout->addWidget(label, 0, TQt::AlignLeft); + label->setFixedSize(label->sizeHint()); + vlayout->addWidget(label, 0, TQt::AlignLeft); } - tqlayout->addStretch(); + layout->addStretch(); } TQGridLayout* grid = new TQGridLayout(1, 4); @@ -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) @@ -650,7 +650,7 @@ void MessageWin::setRemainingTextMinute() else if (mins % 60 == 1) text = i18n("in 1 hour 1 minute's time", "in %n hours 1 minute's time", mins/60); else - text = i18n("in 1 hour %1 minutes' time", "in %n hours %1 minutes' time", mins/60).tqarg(mins%60); + text = i18n("in 1 hour %1 minutes' time", "in %n hours %1 minutes' time", mins/60).arg(mins%60); mRemainingText->setText(text); } @@ -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)); @@ -859,7 +859,7 @@ void MessageWin::slotPlayAudio() kdError(5950) << "MessageWin::playAudio(): Open failure: " << mAudioFile << endl; if (!haveErrorMessage(ErrMsg_AudioFile)) { - KMessageBox::error(this, i18n("Cannot open audio file:\n%1").tqarg(mAudioFile)); + KMessageBox::error(this, i18n("Cannot open audio file:\n%1").arg(mAudioFile)); clearErrorMessage(ErrMsg_AudioFile); } return; @@ -882,8 +882,8 @@ void MessageWin::slotPlayAudio() kdWarning(5950) << "Unable to set master volume (KMix: " << mKMixError << ")\n"; if (!haveErrorMessage(ErrMsg_Volume)) { - KMessageBox::information(this, i18n("Unable to set master volume\n(Error accessing KMix:\n%1)").tqarg(mKMixError), - TQString(), TQString::tqfromLatin1("KMixError")); + KMessageBox::information(this, i18n("Unable to set master volume\n(Error accessing KMix:\n%1)").arg(mKMixError), + 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,18 +1200,18 @@ 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(); - TQSize contents = tqgeometry().size(); + TQSize contents = geometry().size(); TQSize desktop = mWinModule->workArea().size(); TQSize maxSize(desktop.width() - (frame.width() - contents.width()), desktop.height() - (frame.height() - contents.height())); - 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); @@ -1246,10 +1246,10 @@ void MessageWin::showEvent(TQShowEvent* se) * To achieve this, move the window so that the OK button is as far away * from the cursor as possible. If the buttons are still too close to the * cursor, disable the buttons for a short time. - * N.B. This can't be done in show(), since the tqgeometry of the window + * N.B. This can't be done in show(), since the geometry of the window * is not known until it is displayed. Unfortunately by moving the * window in showEvent(), a flicker is unavoidable. - * See the TQt documentation on window tqgeometry for more details. + * See the TQt documentation on window geometry for more details. */ // PROBLEM: The frame size is not known yet! @@ -1267,7 +1267,7 @@ void MessageWin::showEvent(TQShowEvent* se) desk &= dw->screenGeometry(dw->screenNumber(cursor)); TQRect frame = frameGeometry(); - TQRect rect = tqgeometry(); + TQRect rect = geometry(); // Find the offsets from the outside of the frame to the edges of the OK button TQRect button(mOkButton->mapToParent(TQPoint(0, 0)), mOkButton->mapToParent(mOkButton->rect().bottomRight())); int buttonLeft = button.left() + rect.left() - frame.left(); @@ -1282,7 +1282,7 @@ void MessageWin::showEvent(TQShowEvent* se) // Find the enclosing rectangle for the new button positions // and check if the cursor is too near - TQRect buttons = mOkButton->tqgeometry().unite(mKAlarmButton->tqgeometry()); + TQRect buttons = mOkButton->geometry().unite(mKAlarmButton->geometry()); buttons.moveBy(rect.left() + x - frame.left(), rect.top() + y - frame.top()); int minDistance = proximityMultiple * mOkButton->height(); if ((abs(cursor.x() - buttons.left()) < minDistance @@ -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..442144108 100644 --- a/kalarm/prefdlg.cpp +++ b/kalarm/prefdlg.cpp @@ -21,7 +21,7 @@ #include "kalarm.h" #include <tqobjectlist.h> -#include <tqlayout.h> +#include <layout.h> #include <tqbuttongroup.h> #include <tqvbox.h> #include <tqlineedit.h> @@ -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! }; @@ -250,8 +250,8 @@ void PrefsTabBase::apply(bool syncToDisc) MiscPrefTab::MiscPrefTab(TQVBox* frame) : PrefsTabBase(frame) { - // Get tqalignment to use in TQGridLayout (AlignAuto doesn't work correctly there) - int tqalignment = TQApplication::reverseLayout() ? TQt::AlignRight : TQt::AlignLeft; + // Get alignment to use in TQGridLayout (AlignAuto doesn't work correctly there) + int alignment = TQApplication::reverseLayout() ? TQt::AlignRight : TQt::AlignLeft; TQGroupBox* group = new TQButtonGroup(i18n("Run Mode"), mPage, "modeGroup"); TQGridLayout* grid = new TQGridLayout(group, 6, 2, KDialog::marginHint(), KDialog::spacingHint()); @@ -262,18 +262,18 @@ 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" "Notes:\n" "1. Alarms are displayed even when KAlarm is not running, since alarm monitoring is done by the alarm daemon.\n" "2. With this option selected, the system tray icon can be displayed or hidden independently of KAlarm.")); - grid->addMultiCellWidget(mRunOnDemand, 1, 1, 0, 2, tqalignment); + grid->addMultiCellWidget(mRunOnDemand, 1, 1, 0, 2, alignment); // Run-in-system-tray radio button mRunInSystemTray = new TQRadioButton(i18n("Run continuously in system &tray"), group, "runTray"); - 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" @@ -281,39 +281,39 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame) "1. With this option selected, closing the system tray icon will quit KAlarm.\n" "2. You do not need to select this option in order for alarms to be displayed, since alarm monitoring is done by the alarm daemon." " Running in the system tray simply provides easy access and a status indication.")); - grid->addMultiCellWidget(mRunInSystemTray, 2, 2, 0, 2, tqalignment); + grid->addMultiCellWidget(mRunInSystemTray, 2, 2, 0, 2, alignment); // Run continuously options mDisableAlarmsIfStopped = new TQCheckBox(i18n("Disa&ble alarms while not running"), group, "disableAl"); - 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); + grid->addMultiCellWidget(mDisableAlarmsIfStopped, 3, 3, 1, 2, alignment); 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); + grid->addWidget(mQuitWarn, 4, 2, alignment); mAutostartTrayIcon = new TQCheckBox(i18n("Autostart at &login"), group, "autoTray"); #ifdef AUTOSTART_BY_KALARMD connect(mAutostartTrayIcon, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotAutostartToggled(bool))); #endif - grid->addMultiCellWidget(mAutostartTrayIcon, 5, 5, 0, 2, tqalignment); + grid->addMultiCellWidget(mAutostartTrayIcon, 5, 5, 0, 2, alignment); // Autostart alarm daemon mAutostartDaemon = new TQCheckBox(i18n("Start alarm monitoring at lo&gin"), group, "startDaemon"); - 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))); - grid->addMultiCellWidget(mAutostartDaemon, 6, 6, 0, 2, tqalignment); + .arg(TQString::fromLatin1(DAEMON_APP_NAME))); + grid->addMultiCellWidget(mAutostartDaemon, 6, 6, 0, 2, alignment); - group->setFixedHeight(group->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())); + TQWhatsThis::add(box, TQString("%1\n\n%2").arg(startOfDayText).arg(TimeSpinBox::shiftWhatsThis())); itemBox->setStretchFactor(new TQWidget(itemBox), 1); // left adjust the controls - itemBox->setFixedHeight(box->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,35 +345,35 @@ 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).")); - grid->addMultiCellWidget(mKeepExpired, 1, 1, 0, 1, tqalignment); + grid->addMultiCellWidget(mKeepExpired, 1, 1, 0, 1, alignment); 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); + grid->addWidget(box, 2, 1, alignment); 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()); + grid->addWidget(mClearExpired, 3, 1, alignment); + 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 @@ -404,7 +404,7 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame) cmd.replace("%w", "<command; sleep>"); cmd.replace("%C", "[command]"); cmd.replace("%W", "[command; sleep]"); - TQWhatsThis::add(radio, whatsThis.tqarg(cmd)); + TQWhatsThis::add(radio, whatsThis.arg(cmd)); grid->addWidget(radio, (row = index/3 + 1), index % 3, TQt::AlignAuto); ++index; } @@ -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) @@ -470,7 +470,7 @@ void MiscPrefTab::apply(bool syncToDisc) if (KStandardDirs::findExe(cmd).isEmpty()) { mXtermCommand->setFocus(); - if (KMessageBox::warningContinueCancel(this, i18n("Command to invoke terminal window not found:\n%1").tqarg(cmd)) + if (KMessageBox::warningContinueCancel(this, i18n("Command to invoke terminal window not found:\n%1").arg(cmd)) != KMessageBox::Continue) return; } @@ -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" @@ -618,12 +618,12 @@ EmailPrefTab::EmailPrefTab(TQVBox* frame) "your system is configured to use sendmail or a sendmail compatible mail transport agent.")); box = new TQHBox(mPage); // this is to allow left adjustment - mEmailCopyToKMail = new TQCheckBox(i18n("Co&py sent emails into KMail's %1 folder").tqarg(KAMail::i18n_sent_mail()), box); - mEmailCopyToKMail->setFixedSize(mEmailCopyToKMail->tqsizeHint()); + mEmailCopyToKMail = new TQCheckBox(i18n("Co&py sent emails into KMail's %1 folder").arg(KAMail::i18n_sent_mail()), box); + mEmailCopyToKMail->setFixedSize(mEmailCopyToKMail->sizeHint()); TQWhatsThis::add(mEmailCopyToKMail, - i18n("After sending an email, store a copy in KMail's %1 folder").tqarg(KAMail::i18n_sent_mail())); + i18n("After sending an email, store a copy in KMail's %1 folder").arg(KAMail::i18n_sent_mail())); box->setStretchFactor(new TQWidget(box), 1); // left adjust the controls - box->setFixedHeight(box->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 } @@ -793,18 +793,18 @@ TQString EmailPrefTab::validate() TQString EmailPrefTab::validateAddr(ButtonGroup* group, TQLineEdit* addr, const TQString& msg) { - TQString errmsg = i18n("%1\nAre you sure you want to save your changes?").tqarg(msg); + TQString errmsg = i18n("%1\nAre you sure you want to save your changes?").arg(msg); switch (group->selectedId()) { case Preferences::MAIL_FROM_CONTROL_CENTRE: if (!KAMail::controlCentreAddress().isEmpty()) return TQString(); - errmsg = i18n("No email address is currently set in the KDE Control Center. %1").tqarg(errmsg); + errmsg = i18n("No email address is currently set in the KDE Control Center. %1").arg(errmsg); break; case Preferences::MAIL_FROM_KMAIL: if (KAMail::identitiesExist()) return TQString(); - errmsg = i18n("No KMail identities currently exist. %1").tqarg(errmsg); + errmsg = i18n("No KMail identities currently exist. %1").arg(errmsg); break; case Preferences::MAIL_FROM_ADDR: if (!addr->text().stripWhiteSpace().isEmpty()) @@ -826,9 +826,9 @@ FontColourPrefTab::FontColourPrefTab(TQVBox* frame) mPage->setStretchFactor(mFontChooser, 1); TQFrame* layoutBox = new TQFrame(mPage); - TQHBoxLayout* htqlayout = new TQHBoxLayout(layoutBox); - TQVBoxLayout* colourLayout = new TQVBoxLayout(htqlayout, KDialog::spacingHint()); - htqlayout->addStretch(); + TQHBoxLayout* hlayout = new TQHBoxLayout(layoutBox); + TQVBoxLayout* colourLayout = new TQVBoxLayout(hlayout, KDialog::spacingHint()); + hlayout->addStretch(); TQHBox* box = new TQHBox(layoutBox); // to group widgets for TQWhatsThis text box->setSpacing(KDialog::spacingHint()/2); @@ -887,9 +887,9 @@ void FontColourPrefTab::setDefaults() EditPrefTab::EditPrefTab(TQVBox* frame) : PrefsTabBase(frame) { - // Get tqalignment to use in TQLabel::tqsetAlignment(tqalignment | TQt::WordBreak) + // Get alignment to use in TQLabel::setAlignment(alignment | TQt::WordBreak) // (AlignAuto doesn't work correctly there) - int tqalignment = TQApplication::reverseLayout() ? TQt::AlignRight : TQt::AlignLeft; + int alignment = TQApplication::reverseLayout() ? TQt::AlignRight : TQt::AlignLeft; int groupTopMargin = fontMetrics().lineSpacing()/2; TQString defsetting = i18n("The default setting for \"%1\" in the alarm edit dialog."); @@ -897,126 +897,126 @@ EditPrefTab::EditPrefTab(TQVBox* frame) // DISPLAY ALARMS TQGroupBox* group = new TQGroupBox(i18n("Display Alarms"), mPage); - TQBoxLayout* tqlayout = new TQVBoxLayout(group, KDialog::marginHint(), KDialog::spacingHint()); - tqlayout->addSpacing(groupTopMargin); + TQBoxLayout* layout = new TQVBoxLayout(group, KDialog::marginHint(), KDialog::spacingHint()); + layout->addSpacing(groupTopMargin); mConfirmAck = new TQCheckBox(EditAlarmDlg::i18n_k_ConfirmAck(), group, "defConfAck"); - mConfirmAck->setMinimumSize(mConfirmAck->tqsizeHint()); - TQWhatsThis::add(mConfirmAck, defsetting.tqarg(EditAlarmDlg::i18n_ConfirmAck())); - tqlayout->addWidget(mConfirmAck, 0, TQt::AlignAuto); + mConfirmAck->setMinimumSize(mConfirmAck->sizeHint()); + TQWhatsThis::add(mConfirmAck, defsetting.arg(EditAlarmDlg::i18n_ConfirmAck())); + layout->addWidget(mConfirmAck, 0, TQt::AlignAuto); mAutoClose = new TQCheckBox(LateCancelSelector::i18n_i_AutoCloseWinLC(), group, "defAutoClose"); - mAutoClose->setMinimumSize(mAutoClose->tqsizeHint()); - TQWhatsThis::add(mAutoClose, defsetting.tqarg(LateCancelSelector::i18n_AutoCloseWin())); - tqlayout->addWidget(mAutoClose, 0, TQt::AlignAuto); + mAutoClose->setMinimumSize(mAutoClose->sizeHint()); + TQWhatsThis::add(mAutoClose, defsetting.arg(LateCancelSelector::i18n_AutoCloseWin())); + layout->addWidget(mAutoClose, 0, TQt::AlignAuto); TQHBox* box = new TQHBox(group); box->setSpacing(KDialog::spacingHint()); - tqlayout->addWidget(box); + layout->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"); - tqlayout = new TQVBoxLayout(bgroup, KDialog::marginHint(), KDialog::spacingHint()); - tqlayout->addSpacing(groupTopMargin); + layout = new TQVBoxLayout(bgroup, KDialog::marginHint(), KDialog::spacingHint()); + layout->addSpacing(groupTopMargin); - TQBoxLayout* htqlayout = new TQHBoxLayout(tqlayout, KDialog::spacingHint()); + TQBoxLayout* hlayout = new TQHBoxLayout(layout, KDialog::spacingHint()); mSound = new TQComboBox(false, bgroup, "defSound"); mSound->insertItem(SoundPicker::i18n_None()); // index 0 mSound->insertItem(SoundPicker::i18n_Beep()); // index 1 mSound->insertItem(SoundPicker::i18n_File()); // index 2 if (theApp()->speechEnabled()) mSound->insertItem(SoundPicker::i18n_Speak()); // index 3 - mSound->setMinimumSize(mSound->tqsizeHint()); - TQWhatsThis::add(mSound, defsetting.tqarg(SoundPicker::i18n_Sound())); - htqlayout->addWidget(mSound); - htqlayout->addStretch(1); + mSound->setMinimumSize(mSound->sizeHint()); + TQWhatsThis::add(mSound, defsetting.arg(SoundPicker::i18n_Sound())); + hlayout->addWidget(mSound); + hlayout->addStretch(1); #ifndef WITHOUT_ARTS mSoundRepeat = new TQCheckBox(i18n("Repea&t sound file"), bgroup, "defRepeatSound"); - mSoundRepeat->setMinimumSize(mSoundRepeat->tqsizeHint()); - 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); + mSoundRepeat->setMinimumSize(mSoundRepeat->sizeHint()); + TQWhatsThis::add(mSoundRepeat, i18n("sound file \"Repeat\" checkbox", "The default setting for sound file \"%1\" in the alarm edit dialog.").arg(SoundDlg::i18n_Repeat())); + hlayout->addWidget(mSoundRepeat); #endif 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()); - tqlayout->addWidget(box); - bgroup->setFixedHeight(bgroup->tqsizeHint().height()); + box->setFixedHeight(box->sizeHint().height()); + layout->addWidget(box); + bgroup->setFixedHeight(bgroup->sizeHint().height()); // COMMAND ALARMS group = new TQGroupBox(i18n("Command Alarms"), mPage); - tqlayout = new TQVBoxLayout(group, KDialog::marginHint(), KDialog::spacingHint()); - tqlayout->addSpacing(groupTopMargin); - tqlayout = new TQHBoxLayout(tqlayout, KDialog::spacingHint()); + layout = new TQVBoxLayout(group, KDialog::marginHint(), KDialog::spacingHint()); + layout->addSpacing(groupTopMargin); + layout = new TQHBoxLayout(layout, KDialog::spacingHint()); mCmdScript = new TQCheckBox(EditAlarmDlg::i18n_p_EnterScript(), group, "defCmdScript"); - mCmdScript->setMinimumSize(mCmdScript->tqsizeHint()); - TQWhatsThis::add(mCmdScript, defsetting.tqarg(EditAlarmDlg::i18n_EnterScript())); - tqlayout->addWidget(mCmdScript); - tqlayout->addStretch(); + mCmdScript->setMinimumSize(mCmdScript->sizeHint()); + TQWhatsThis::add(mCmdScript, defsetting.arg(EditAlarmDlg::i18n_EnterScript())); + layout->addWidget(mCmdScript); + layout->addStretch(); mCmdXterm = new TQCheckBox(EditAlarmDlg::i18n_w_ExecInTermWindow(), group, "defCmdXterm"); - mCmdXterm->setMinimumSize(mCmdXterm->tqsizeHint()); - TQWhatsThis::add(mCmdXterm, defsetting.tqarg(EditAlarmDlg::i18n_ExecInTermWindow())); - tqlayout->addWidget(mCmdXterm); + mCmdXterm->setMinimumSize(mCmdXterm->sizeHint()); + TQWhatsThis::add(mCmdXterm, defsetting.arg(EditAlarmDlg::i18n_ExecInTermWindow())); + layout->addWidget(mCmdXterm); // EMAIL ALARMS group = new TQGroupBox(i18n("Email Alarms"), mPage); - tqlayout = new TQVBoxLayout(group, KDialog::marginHint(), KDialog::spacingHint()); - tqlayout->addSpacing(groupTopMargin); + layout = new TQVBoxLayout(group, KDialog::marginHint(), KDialog::spacingHint()); + layout->addSpacing(groupTopMargin); // BCC email to sender mEmailBcc = new TQCheckBox(EditAlarmDlg::i18n_e_CopyEmailToSelf(), group, "defEmailBcc"); - mEmailBcc->setMinimumSize(mEmailBcc->tqsizeHint()); - TQWhatsThis::add(mEmailBcc, defsetting.tqarg(EditAlarmDlg::i18n_CopyEmailToSelf())); - tqlayout->addWidget(mEmailBcc, 0, TQt::AlignAuto); + mEmailBcc->setMinimumSize(mEmailBcc->sizeHint()); + TQWhatsThis::add(mEmailBcc, defsetting.arg(EditAlarmDlg::i18n_CopyEmailToSelf())); + layout->addWidget(mEmailBcc, 0, TQt::AlignAuto); // MISCELLANEOUS // Show in KOrganizer mCopyToKOrganizer = new TQCheckBox(EditAlarmDlg::i18n_g_ShowInKOrganizer(), mPage, "defShowKorg"); - mCopyToKOrganizer->setMinimumSize(mCopyToKOrganizer->tqsizeHint()); - TQWhatsThis::add(mCopyToKOrganizer, defsetting.tqarg(EditAlarmDlg::i18n_ShowInKOrganizer())); + mCopyToKOrganizer->setMinimumSize(mCopyToKOrganizer->sizeHint()); + TQWhatsThis::add(mCopyToKOrganizer, defsetting.arg(EditAlarmDlg::i18n_ShowInKOrganizer())); // Late cancellation box = new TQHBox(mPage); box->setSpacing(KDialog::spacingHint()); mLateCancel = new TQCheckBox(LateCancelSelector::i18n_n_CancelIfLate(), box, "defCancelLate"); - mLateCancel->setMinimumSize(mLateCancel->tqsizeHint()); - TQWhatsThis::add(mLateCancel, defsetting.tqarg(LateCancelSelector::i18n_CancelIfLate())); + mLateCancel->setMinimumSize(mLateCancel->sizeHint()); + TQWhatsThis::add(mLateCancel, defsetting.arg(LateCancelSelector::i18n_CancelIfLate())); box->setStretchFactor(new TQWidget(box), 1); // left adjust the control // Recurrence 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(alignment | 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.")); @@ -1179,7 +1179,7 @@ TQString EditPrefTab::validate() if (mSound->currentItem() == SoundPicker::PLAY_FILE && mSoundFile->text().isEmpty()) { mSoundFile->setFocus(); - return i18n("You must enter a sound file when %1 is selected as the default sound type").tqarg(SoundPicker::i18n_File());; + return i18n("You must enter a sound file when %1 is selected as the default sound type").arg(SoundPicker::i18n_File());; } return TQString(); } @@ -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..43b95c7ef 100644 --- a/kalarm/recurrenceedit.cpp +++ b/kalarm/recurrenceedit.cpp @@ -24,7 +24,7 @@ #include "kalarm.h" #include <tqtooltip.h> -#include <tqlayout.h> +#include <layout.h> #include <tqvbox.h> #include <tqwidgetstack.h> #include <tqlistbox.h> @@ -93,7 +93,7 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name mNoEmitTypeChanged(true), mReadOnly(readOnly) { - TQBoxLayout* tqlayout; + TQBoxLayout* layout; TQVBoxLayout* topLayout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); /* Create the recurrence rule Group box which holds the recurrence period @@ -106,11 +106,11 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name TQGroupBox* recurGroup = new TQGroupBox(1, Qt::Vertical, i18n("Recurrence Rule"), this, "recurGroup"); topLayout->addWidget(recurGroup); TQFrame* ruleFrame = new TQFrame(recurGroup, "ruleFrame"); - tqlayout = new TQVBoxLayout(ruleFrame, 0); - tqlayout->addSpacing(KDialog::spacingHint()/2); + layout = new TQVBoxLayout(ruleFrame, 0); + layout->addSpacing(KDialog::spacingHint()/2); - tqlayout = new TQHBoxLayout(tqlayout, 0); - TQBoxLayout* lay = new TQVBoxLayout(tqlayout, 0); + layout = new TQHBoxLayout(layout, 0); + TQBoxLayout* lay = new TQVBoxLayout(layout, 0); mRuleButtonGroup = new ButtonGroup(1, Qt::Horizontal, ruleFrame); mRuleButtonGroup->setInsideMargin(0); mRuleButtonGroup->setFrameStyle(TQFrame::NoFrame); @@ -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())); @@ -178,16 +178,16 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name lay->addSpacing(KDialog::spacingHint()); lay->addWidget(mSubRepetition); - lay = new TQVBoxLayout(tqlayout); + lay = new TQVBoxLayout(layout); lay->addStretch(); - tqlayout = new TQHBoxLayout(lay); + layout = new TQHBoxLayout(lay); - tqlayout->addSpacing(KDialog::marginHint()); + layout->addSpacing(KDialog::marginHint()); TQFrame* divider = new TQFrame(ruleFrame); divider->setFrameStyle(TQFrame::VLine | TQFrame::Sunken); - tqlayout->addWidget(divider); - tqlayout->addSpacing(KDialog::marginHint()); + layout->addWidget(divider); + layout->addSpacing(KDialog::marginHint()); mNoRule = new NoRule(ruleFrame, "noFrame"); mSubDailyRule = new SubDailyRule(mReadOnly, ruleFrame, "subdayFrame"); @@ -203,15 +203,15 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name connect(mYearlyRule, TQT_SIGNAL(frequencyChanged()), this, TQT_SIGNAL(frequencyChanged())); mRuleStack = new TQWidgetStack(ruleFrame); - tqlayout->addWidget(mRuleStack); - tqlayout->addStretch(1); + layout->addWidget(mRuleStack); + layout->addStretch(1); mRuleStack->addWidget(mNoRule, 0); mRuleStack->addWidget(mSubDailyRule, 1); mRuleStack->addWidget(mDailyRule, 2); mRuleStack->addWidget(mWeeklyRule, 3); mRuleStack->addWidget(mMonthlyRule, 4); mRuleStack->addWidget(mYearlyRule, 5); - tqlayout->addSpacing(KDialog::marginHint()); + layout->addSpacing(KDialog::marginHint()); // Create the recurrence range group which contains the controls // which specify how long the recurrence is to last. @@ -220,22 +220,22 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name connect(mRangeButtonGroup, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(rangeTypeClicked())); topLayout->addWidget(mRangeButtonGroup); - TQVBoxLayout* vtqlayout = new TQVBoxLayout(mRangeButtonGroup, KDialog::marginHint(), KDialog::spacingHint()); - vtqlayout->addSpacing(fontMetrics().lineSpacing()/2); + TQVBoxLayout* vlayout = new TQVBoxLayout(mRangeButtonGroup, KDialog::marginHint(), KDialog::spacingHint()); + vlayout->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); + vlayout->addWidget(mNoEndDateButton, 1, TQt::AlignAuto); TQSize size = mNoEndDateButton->size(); - tqlayout = new TQHBoxLayout(vtqlayout, KDialog::spacingHint()); + layout = new TQHBoxLayout(vlayout, KDialog::spacingHint()); mRepeatCountButton = new RadioButton(i18n("End a&fter:"), mRangeButtonGroup); mRepeatCountButton->setReadOnly(mReadOnly); 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,44 +244,44 @@ 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()); - tqlayout->addWidget(mRepeatCountButton); - tqlayout->addSpacing(KDialog::spacingHint()); - tqlayout->addWidget(mRepeatCountEntry); - tqlayout->addWidget(mRepeatCountLabel); - tqlayout->addStretch(); - size = size.expandedTo(mRepeatCountButton->tqsizeHint()); - - tqlayout = new TQHBoxLayout(vtqlayout, KDialog::spacingHint()); + mRepeatCountLabel->setFixedSize(mRepeatCountLabel->sizeHint()); + layout->addWidget(mRepeatCountButton); + layout->addSpacing(KDialog::spacingHint()); + layout->addWidget(mRepeatCountEntry); + layout->addWidget(mRepeatCountLabel); + layout->addStretch(); + size = size.expandedTo(mRepeatCountButton->sizeHint()); + + layout = new TQHBoxLayout(vlayout, KDialog::spacingHint()); mEndDateButton = new RadioButton(i18n("End &by:"), mRangeButtonGroup); mEndDateButton->setReadOnly(mReadOnly); TQWhatsThis::add(mEndDateButton, 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())); + TQWhatsThis::add(mEndTimeEdit, TQString("%1\n\n%2").arg(lastTimeText).arg(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, i18n("Stop repeating the alarm after your first login on or after the specified end date")); - tqlayout->addWidget(mEndDateButton); - tqlayout->addSpacing(KDialog::spacingHint()); - tqlayout->addWidget(mEndDateEdit); - tqlayout->addWidget(mEndTimeEdit); - tqlayout->addWidget(mEndAnyTimeCheckBox); - tqlayout->addStretch(); - size = size.expandedTo(mEndDateButton->tqsizeHint()); + layout->addWidget(mEndDateButton); + layout->addSpacing(KDialog::spacingHint()); + layout->addWidget(mEndDateEdit); + layout->addWidget(mEndTimeEdit); + layout->addWidget(mEndAnyTimeCheckBox); + layout->addStretch(); + size = size.expandedTo(mEndDateButton->sizeHint()); // Line up the widgets to the right of the radio buttons mRepeatCountButton->setFixedSize(size); @@ -293,17 +293,17 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name mExceptionGroup = new TQGroupBox(i18n("E&xceptions"), this, "mExceptionGroup"); topLayout->addWidget(mExceptionGroup); topLayout->setStretchFactor(mExceptionGroup, 2); - vtqlayout = new TQVBoxLayout(mExceptionGroup, KDialog::marginHint(), KDialog::spacingHint()); - vtqlayout->addSpacing(fontMetrics().lineSpacing()/2); - tqlayout = new TQHBoxLayout(vtqlayout, KDialog::spacingHint()); - vtqlayout = new TQVBoxLayout(tqlayout); + vlayout = new TQVBoxLayout(mExceptionGroup, KDialog::marginHint(), KDialog::spacingHint()); + vlayout->addSpacing(fontMetrics().lineSpacing()/2); + layout = new TQHBoxLayout(vlayout, KDialog::spacingHint()); + vlayout = new TQVBoxLayout(layout); 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")); - vtqlayout->addWidget(mExceptionDateList); + vlayout->addWidget(mExceptionDateList); if (mReadOnly) { @@ -313,36 +313,36 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name } else { - vtqlayout = new TQVBoxLayout(tqlayout); + vlayout = new TQVBoxLayout(layout); 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.")); - vtqlayout->addWidget(mExceptionDateEdit); + vlayout->addWidget(mExceptionDateEdit); - tqlayout = new TQHBoxLayout(vtqlayout, KDialog::spacingHint()); + layout = new TQHBoxLayout(vlayout, 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); + layout->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); + layout->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")); - tqlayout->addWidget(mDeleteExceptionButton); + layout->addWidget(mDeleteExceptionButton); } mNoEmitTypeChanged = false; @@ -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); } @@ -1112,11 +1112,11 @@ DayWeekRule::DayWeekRule(const TQString& freqText, const TQString& freqWhatsThis : Rule(freqText, freqWhatsThis, false, readOnly, parent, name), mSavedDays(7) { - TQGridLayout* grid = new TQGridLayout(tqlayout(), 1, 4, KDialog::spacingHint()); + TQGridLayout* grid = new TQGridLayout(layout(), 1, 4, KDialog::spacingHint()); 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]); @@ -1258,10 +1258,10 @@ MonthYearRule::MonthYearRule(const TQString& freqText, const TQString& freqWhats // Month day selector TQHBox* box = new TQHBox(this); box->setSpacing(KDialog::spacingHint()); - tqlayout()->addWidget(box); + layout()->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,22 +1271,22 @@ 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); box->setSpacing(KDialog::spacingHint()); - tqlayout()->addWidget(box); + layout()->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))); } @@ -1456,47 +1456,47 @@ YearlyRule::YearlyRule(bool readOnly, TQWidget* parent, const char* name) true, readOnly, parent, name) { // Set up the month selection widgets - TQBoxLayout* htqlayout = new TQHBoxLayout(tqlayout(), KDialog::spacingHint()); + TQBoxLayout* hlayout = new TQHBoxLayout(layout(), KDialog::spacingHint()); TQLabel* label = new TQLabel(i18n("List of months to select", "Months:"), this); - label->setFixedSize(label->tqsizeHint()); - htqlayout->addWidget(label, 0, TQt::AlignAuto | TQt::AlignTop); + label->setFixedSize(label->sizeHint()); + hlayout->addWidget(label, 0, TQt::AlignAuto | TQt::AlignTop); // List the months of the year. TQWidget* w = new TQWidget(this); // this is to control the TQWhatsThis text display area - htqlayout->addWidget(w, 1, TQt::AlignAuto); + hlayout->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 TQHBox* f29box = new TQHBox(this); - tqlayout()->addWidget(f29box); + layout()->addWidget(f29box); 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/recurrenceeditprivate.h b/kalarm/recurrenceeditprivate.h index 68dd429b9..94472c379 100644 --- a/kalarm/recurrenceeditprivate.h +++ b/kalarm/recurrenceeditprivate.h @@ -54,7 +54,7 @@ class Rule : public NoRule int frequency() const; void setFrequency(int); virtual void setFrequencyFocus() { mSpinBox->setFocus(); } - TQVBoxLayout* tqlayout() const { return mLayout; } + TQVBoxLayout* layout() const { return mLayout; } virtual TQWidget* validate(TQString&) { return 0; } virtual void saveState(); virtual bool stateChanged() const; diff --git a/kalarm/reminder.cpp b/kalarm/reminder.cpp index e10e04e22..aa6aa222a 100644 --- a/kalarm/reminder.cpp +++ b/kalarm/reminder.cpp @@ -20,7 +20,7 @@ #include "kalarm.h" -#include <tqlayout.h> +#include <layout.h> #include <tqwhatsthis.h> #include <kglobal.h> @@ -51,19 +51,19 @@ 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); if (showOnceOnly) { - TQBoxLayout* tqlayout = new TQHBoxLayout(topLayout, KDialog::spacingHint()); - tqlayout->addSpacing(3*KDialog::spacingHint()); + TQBoxLayout* layout = new TQHBoxLayout(topLayout, KDialog::spacingHint()); + layout->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(); + layout->addWidget(mOnceOnly); + layout->addStretch(); } else mOnceOnly = 0; diff --git a/kalarm/repetition.cpp b/kalarm/repetition.cpp index 403250ba5..db17c9fbc 100644 --- a/kalarm/repetition.cpp +++ b/kalarm/repetition.cpp @@ -20,7 +20,7 @@ #include "kalarm.h" -#include <tqlayout.h> +#include <layout.h> #include <tqwhatsthis.h> #include <kdebug.h> @@ -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); @@ -174,38 +174,38 @@ RepetitionDlg::RepetitionDlg(const TQString& caption, bool readOnly, TQWidget* p connect(mButtonGroup, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(typeClicked())); topLayout->addWidget(mButtonGroup); - TQBoxLayout* vtqlayout = new TQVBoxLayout(mButtonGroup, marginHint(), spacing); - TQBoxLayout* tqlayout = new TQHBoxLayout(vtqlayout, spacing); + TQBoxLayout* vlayout = new TQVBoxLayout(mButtonGroup, marginHint(), spacing); + TQBoxLayout* layout = new TQHBoxLayout(vlayout, 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); + layout->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))); TQWhatsThis::add(mCount, i18n("Enter the number of times to trigger the alarm after its initial occurrence")); - tqlayout->addWidget(mCount); + layout->addWidget(mCount); mCountButton->setFocusWidget(mCount); - tqlayout->addStretch(); + layout->addStretch(); - tqlayout = new TQHBoxLayout(vtqlayout, spacing); + layout = new TQHBoxLayout(vlayout, 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); + layout->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")); - tqlayout->addWidget(mDuration); + layout->addWidget(mDuration); mDurationButton->setFocusWidget(mDuration); - tqlayout->addStretch(); + layout->addStretch(); mCountButton->setChecked(true); repetitionToggled(false); diff --git a/kalarm/sounddlg.cpp b/kalarm/sounddlg.cpp index c7a6adcfb..0359810f2 100644 --- a/kalarm/sounddlg.cpp +++ b/kalarm/sounddlg.cpp @@ -25,7 +25,7 @@ #include <tqlabel.h> #include <tqhbox.h> #include <tqgroupbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqfile.h> #include <tqdir.h> #include <tqwhatsthis.h> @@ -78,14 +78,14 @@ SoundDlg::SoundDlg(const TQString& file, float volume, float fadeVolume, int fad { TQWidget* page = new TQWidget(this); setMainWidget(page); - TQVBoxLayout* tqlayout = new TQVBoxLayout(page, 0, spacingHint()); + TQVBoxLayout* layout = new TQVBoxLayout(page, 0, spacingHint()); // File play button TQHBox* box = new TQHBox(page); - tqlayout->addWidget(box); + layout->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,36 +98,36 @@ 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); + layout->addWidget(mRepeatCheckbox); // Volume TQGroupBox* group = new TQGroupBox(i18n("Volume"), page); - tqlayout->addWidget(group); + layout->addWidget(group); TQGridLayout* grid = new TQGridLayout(group, 4, 3, marginHint(), spacingHint()); grid->addRowSpacing(0, fontMetrics().height() - marginHint() + spacingHint()); grid->setColStretch(2, 1); int indentWidth = 3 * KDialog::spacingHint(); grid->addColSpacing(0, indentWidth); grid->addColSpacing(1, indentWidth); - // Get tqalignment to use in TQGridLayout (AlignAuto doesn't work correctly there) - int tqalignment = TQApplication::reverseLayout() ? TQt::AlignRight : TQt::AlignLeft; + // Get alignment to use in TQGridLayout (AlignAuto doesn't work correctly there) + int alignment = TQApplication::reverseLayout() ? TQt::AlignRight : TQt::AlignLeft; // 'Set volume' checkbox box = new TQHBox(group); 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,30 +136,30 @@ 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.")); - grid->addMultiCellWidget(mFadeCheckbox, 2, 2, 1, 2, tqalignment); + grid->addMultiCellWidget(mFadeCheckbox, 2, 2, 1, 2, alignment); // Fade time mFadeBox = new TQHBox(group); mFadeBox->setSpacing(spacingHint()); - grid->addWidget(mFadeBox, 3, 2, tqalignment); + grid->addWidget(mFadeBox, 3, 2, alignment); TQLabel* label = new TQLabel(i18n("Time period over which to fade the sound", "Fade time:"), mFadeBox); - label->setFixedSize(label->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.")); @@ -299,7 +299,7 @@ void SoundDlg::playSound() || !KIO::NetAccess::download(url, mLocalAudioFile, mmw)) { kdError(5950) << "SoundDlg::playAudio(): Open failure: " << mFileName << endl; - KMessageBox::error(this, i18n("Cannot open audio file:\n%1").tqarg(mFileName)); + KMessageBox::error(this, i18n("Cannot open audio file:\n%1").arg(mFileName)); return; } mPlayTimer = new TQTimer(this); diff --git a/kalarm/soundpicker.cpp b/kalarm/soundpicker.cpp index ed55b8112..caa13d88d 100644 --- a/kalarm/soundpicker.cpp +++ b/kalarm/soundpicker.cpp @@ -20,7 +20,7 @@ #include "kalarm.h" -#include <tqlayout.h> +#include <layout.h> #include <tqregexp.h> #include <tqtooltip.h> #include <tqtimer.h> @@ -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.")); @@ -114,9 +114,9 @@ void SoundPicker::showSpeak(bool show) if (show == mSpeakShowing) return; // no change TQString whatsThis = "<p>" + i18n("Choose a sound to play when the message is displayed.") - + "<br>" + i18n("%1: the message is displayed silently.").tqarg("<b>" + i18n_None() + "</b>") - + "<br>" + i18n("%1: a simple beep is sounded.").tqarg("<b>" + i18n_Beep() + "</b>") - + "<br>" + i18n("%1: an audio file is played. You will be prompted to choose the file and set play options.").tqarg("<b>" + i18n_File() + "</b>"); + + "<br>" + i18n("%1: the message is displayed silently.").arg("<b>" + i18n_None() + "</b>") + + "<br>" + i18n("%1: a simple beep is sounded.").arg("<b>" + i18n_Beep() + "</b>") + + "<br>" + i18n("%1: an audio file is played. You will be prompted to choose the file and set play options.").arg("<b>" + i18n_File() + "</b>"); if (!show && mTypeCombo->currentItem() == SPEAK) mTypeCombo->setCurrentItem(NONE); if (mTypeCombo->count() == SPEAK+1) @@ -124,7 +124,7 @@ void SoundPicker::showSpeak(bool show) if (show) { mTypeCombo->insertItem(i18n_Speak()); - whatsThis += "<br>" + i18n("%1: the message text is spoken.").tqarg("<b>" + i18n_Speak() + "</b>") + "</p>"; + whatsThis += "<br>" + i18n("%1: the message text is spoken.").arg("<b>" + i18n_Speak() + "</b>") + "</p>"; } TQWhatsThis::add(mTypeBox, whatsThis + "</p>"); mSpeakShowing = show; @@ -283,7 +283,7 @@ TQString SoundPicker::browseFile(TQString& defaultDir, const TQString& initialFi defaultDir = kdeSoundDir; } #ifdef WITHOUT_ARTS - TQString filter = TQString::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").arg(i18n("Sound Files")).arg(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..3c028a68c 100644 --- a/kalarm/specialactions.cpp +++ b/kalarm/specialactions.cpp @@ -21,7 +21,7 @@ #include "kalarm.h" #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqwhatsthis.h> #include <klineedit.h> @@ -95,12 +95,12 @@ SpecialActionsDlg::SpecialActionsDlg(const TQString& preAction, const TQString& { TQWidget* page = new TQWidget(this); setMainWidget(page); - TQVBoxLayout* tqlayout = new TQVBoxLayout(page, 0, spacingHint()); + TQVBoxLayout* layout = new TQVBoxLayout(page, 0, spacingHint()); mActions = new SpecialActions(page); mActions->setActions(preAction, postAction); - tqlayout->addWidget(mActions); - tqlayout->addSpacing(KDialog::spacingHint()); + layout->addWidget(mActions); + layout->addSpacing(KDialog::spacingHint()); TQSize s; if (KAlarm::readConfigWindowSize(SPEC_ACT_DIALOG_NAME, s)) @@ -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..a493e0ed7 100644 --- a/kalarm/templatedlg.cpp +++ b/kalarm/templatedlg.cpp @@ -20,7 +20,7 @@ #include "kalarm.h" -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <tqwhatsthis.h> @@ -50,34 +50,34 @@ TemplateDlg::TemplateDlg(TQWidget* parent, const char* name) TQBoxLayout* topLayout = new TQHBoxLayout(topWidget); topLayout->setSpacing(spacingHint()); - TQBoxLayout* tqlayout = new TQVBoxLayout(topLayout); + TQBoxLayout* layout = 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); + layout->addWidget(mTemplateList); - tqlayout = new TQVBoxLayout(topLayout); + layout = new TQVBoxLayout(topLayout); TQPushButton* button = new TQPushButton(i18n("&New..."), topWidget); connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(slotNew())); TQWhatsThis::add(button, i18n("Create a new alarm template")); - tqlayout->addWidget(button); + layout->addWidget(button); mEditButton = new TQPushButton(i18n("&Edit..."), topWidget); connect(mEditButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotEdit())); TQWhatsThis::add(mEditButton, i18n("Edit the currently highlighted alarm template")); - tqlayout->addWidget(mEditButton); + layout->addWidget(mEditButton); mCopyButton = new TQPushButton(i18n("Co&py"), topWidget); connect(mCopyButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotCopy())); TQWhatsThis::add(mCopyButton, i18n("Create a new alarm template based on a copy of the currently highlighted template")); - tqlayout->addWidget(mCopyButton); + layout->addWidget(mCopyButton); mDeleteButton = new TQPushButton(i18n("&Delete"), topWidget); connect(mDeleteButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotDelete())); TQWhatsThis::add(mDeleteButton, i18n("Delete the currently highlighted alarm template")); - tqlayout->addWidget(mDeleteButton); + layout->addWidget(mDeleteButton); KAccel* accel = new KAccel(this); accel->insert(KStdAccel::SelectAll, TQT_TQOBJECT(mTemplateList), TQT_SLOT(slotSelectAll())); @@ -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/templatepickdlg.cpp b/kalarm/templatepickdlg.cpp index 3df2d8dd7..9aff1c94b 100644 --- a/kalarm/templatepickdlg.cpp +++ b/kalarm/templatepickdlg.cpp @@ -20,7 +20,7 @@ #include "kalarm.h" -#include <tqlayout.h> +#include <layout.h> #include <tqwhatsthis.h> #include <klocale.h> diff --git a/kalarm/timeselector.cpp b/kalarm/timeselector.cpp index 31e69d749..53e0805cb 100644 --- a/kalarm/timeselector.cpp +++ b/kalarm/timeselector.cpp @@ -20,7 +20,7 @@ #include "kalarm.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqhbox.h> #include <tqwhatsthis.h> @@ -41,18 +41,18 @@ TimeSelector::TimeSelector(const TQString& selectText, const TQString& postfix, { setFrameStyle(TQFrame::NoFrame); TQVBoxLayout* topLayout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); - TQHBoxLayout* tqlayout = new TQHBoxLayout(topLayout, KDialog::spacingHint()); + TQHBoxLayout* layout = 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); + layout->addWidget(mSelect); TQHBox* box = new TQHBox(this); // to group widgets for TQWhatsThis text box->setSpacing(KDialog::spacingHint()); - tqlayout->addWidget(box); + layout->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..81af39266 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; @@ -266,9 +266,9 @@ void TrayWindow::tooltipAlarmText(TQString& text) const minutes[0] = (mins%60) / 10 + '0'; minutes[1] = (mins%60) % 10 + '0'; if (Preferences::showTooltipAlarmTime()) - item.text += i18n("prefix + hours:minutes", "(%1%2:%3)").tqarg(prefix).tqarg(mins/60).tqarg(minutes); + item.text += i18n("prefix + hours:minutes", "(%1%2:%3)").arg(prefix).arg(mins/60).arg(minutes); else - item.text += i18n("prefix + hours:minutes", "%1%2:%3").tqarg(prefix).tqarg(mins/60).tqarg(minutes); + item.text += i18n("prefix + hours:minutes", "%1%2:%3").arg(prefix).arg(mins/60).arg(minutes); item.text += ' '; space = true; } @@ -326,13 +326,13 @@ bool TrayWindow::inSystemTray() const #ifdef HAVE_X11_HEADERS Window xParent; // receives parent window Window root; - Window* tqchildren = 0; - unsigned int ntqchildren; + Window* children = 0; + unsigned int nchildren; // Find the X parent window of the widget. This is not the same as the TQt parent widget. - if (!XQueryTree(qt_xdisplay(), winId(), &root, &xParent, &tqchildren, &ntqchildren)) + if (!XQueryTree(qt_xdisplay(), winId(), &root, &xParent, &children, &nchildren)) return true; // error determining its parent X window - if (tqchildren) - XFree(tqchildren); + if (children) + XFree(children); // If it is in the system tray, the system tray window will be its X parent. // Otherwise, the root window will be its X parent. @@ -353,7 +353,7 @@ void TrayTooltip::maybeTip(const TQPoint&) if (Daemon::monitoringAlarms()) text = kapp->aboutData()->programName(); else - text = i18n("%1 - disabled").tqarg(kapp->aboutData()->programName()); + text = i18n("%1 - disabled").arg(kapp->aboutData()->programName()); kdDebug(5950) << "TrayTooltip::maybeTip(): " << text << endl; if (Preferences::tooltipAlarmCount()) parent->tooltipAlarmText(text); diff --git a/kalarm/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..b2703d0f7 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; } @@ -357,7 +357,7 @@ bool Undo::undo(Undo::Iterator it, Undo::Type type, TQWidget* parent, const TQSt case UndoItem::ERR_PROG: err = i18n("Program error"); break; default: err = i18n("Unknown error"); break; } - KMessageBox::sorry(parent, i18n("Undo-action: message", "%1: %2").tqarg(action).tqarg(err)); + KMessageBox::sorry(parent, i18n("Undo-action: message", "%1: %2").arg(action).arg(err)); return false; } @@ -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/RELEASENOTES b/kandy/RELEASENOTES index 8527e34e4..f40c0f818 100644 --- a/kandy/RELEASENOTES +++ b/kandy/RELEASENOTES @@ -1,7 +1,7 @@ Kandy 0.5.1 (18.11.2004) ------------------------ -+ Support of user-defined baud rates via setting in serial tqdevice configuration ++ Support of user-defined baud rates via setting in serial device configuration dialog. + Full support for SIM phone books starting with an entry != 1 and having an @@ -65,7 +65,7 @@ Kandy 0.5 (16.11.2004) + The GUI is heavily restructured and simplified. -+ All the improvements of Kandy 0.5 were tested with the following tqdevices: ++ All the improvements of Kandy 0.5 were tested with the following devices: + Phones: - Siemens ME45 - Siemens C65 diff --git a/kandy/configure.in.in b/kandy/configure.in.in index 7d1a00af0..c21c2e307 100644 --- a/kandy/configure.in.in +++ b/kandy/configure.in.in @@ -1,4 +1,4 @@ -# check for lockdev, optionally used to lock serial tqdevice +# check for lockdev, optionally used to lock serial device AH_TEMPLATE(HAVE_LOCKDEV) AC_CHECK_HEADERS(lockdev.h, HAVE_LOCKDEV_H=1, HAVE_LOCKDEV_H=) AC_SUBST(HAVE_LOCKDEV_H) diff --git a/kandy/src/atcommand.cpp b/kandy/src/atcommand.cpp index f03bb6794..2fcf5f24c 100644 --- a/kandy/src/atcommand.cpp +++ b/kandy/src/atcommand.cpp @@ -306,7 +306,7 @@ void ATCommand::extractParameters() TQStringList::ConstIterator end = paraList.end(); int argNum = 1; while(it != end) { - addParameter(new ATParameter(*it,i18n("Arg %1").tqarg(TQString::number(argNum++)), + addParameter(new ATParameter(*it,i18n("Arg %1").arg(TQString::number(argNum++)), false)); ++it; } diff --git a/kandy/src/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/commandset.cpp b/kandy/src/commandset.cpp index e6e5d70f8..1b8e94a39 100644 --- a/kandy/src/commandset.cpp +++ b/kandy/src/commandset.cpp @@ -24,7 +24,7 @@ #include <tqdom.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include <kdebug.h> diff --git a/kandy/src/kandy.cpp b/kandy/src/kandy.cpp index 5e68abe43..512f1550e 100644 --- a/kandy/src/kandy.cpp +++ b/kandy/src/kandy.cpp @@ -102,7 +102,7 @@ Kandy::~Kandy() void Kandy::load(const TQString& filename) { if (!mView->loadFile(filename)) { - KMessageBox::error(this,i18n("Could not load file %1").tqarg(filename)); + KMessageBox::error(this,i18n("Could not load file %1").arg(filename)); } mFilename = filename; @@ -113,7 +113,7 @@ void Kandy::save(const TQString & filename) { if (!filename.isEmpty()) { if (!mView->saveFile(filename)) { - KMessageBox::error(this,i18n("Could not save file %1.").tqarg(filename)); + KMessageBox::error(this,i18n("Could not save file %1.").arg(filename)); } else { mFilename = filename; setTitle(); @@ -300,7 +300,7 @@ bool Kandy::queryClose() { if (mView->isModified()) { switch (KMessageBox::warningYesNoCancel(this, - i18n("Save changes to profile %1?").tqarg(mFilename), TQString(), KStdGuiItem::save(), KStdGuiItem::discard())) { + i18n("Save changes to profile %1?").arg(mFilename), TQString(), KStdGuiItem::save(), KStdGuiItem::discard())) { case KMessageBox::Yes : fileSave(); return true; @@ -318,8 +318,8 @@ void Kandy::modemConnect() { if (!mScheduler->modem()->open()) { KMessageBox::sorry(this, - i18n("Cannot open modem tqdevice %1.") - .tqarg(KandyPrefs::serialDevice()), i18n("Modem Error")); + i18n("Cannot open modem device %1.") + .arg(KandyPrefs::serialDevice()), i18n("Modem Error")); return; } diff --git a/kandy/src/kandy.kcfg b/kandy/src/kandy.kcfg index f8d44ab35..a93f674b8 100644 --- a/kandy/src/kandy.kcfg +++ b/kandy/src/kandy.kcfg @@ -7,7 +7,7 @@ <group name="Serial Port"> <entry type="String" key="Serial Device"> - <label>Serial tqdevice</label> + <label>Serial device</label> <default>/dev/ttyS1</default> </entry> <entry type="String" key="Baud Rate"> diff --git a/kandy/src/kandyprefsdialog.cpp b/kandy/src/kandyprefsdialog.cpp index 1bb03eb1a..9d3eedfe4 100644 --- a/kandy/src/kandyprefsdialog.cpp +++ b/kandy/src/kandyprefsdialog.cpp @@ -22,7 +22,7 @@ without including the source code for TQt in the source distribution. */ -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqgroupbox.h> #include <tqbuttongroup.h> @@ -30,7 +30,7 @@ #include <tqfont.h> #include <tqslider.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqcombobox.h> #include <tqvbox.h> #include <tqhbox.h> @@ -81,7 +81,7 @@ void KandyPrefsDialog::setupSerialTab() topLayout->setSpacing(spacingHint()); topLayout->setMargin(marginHint()); - // Define serial tqdevice + // Define serial device serialDevice = addWidString( KandyPrefs::self()->serialDeviceItem(), topFrame ); topLayout->addWidget(serialDevice->label(),0,0); diff --git a/kandy/src/kandyview.cpp b/kandy/src/kandyview.cpp index d47f5bcb7..749b0e815 100644 --- a/kandy/src/kandyview.cpp +++ b/kandy/src/kandyview.cpp @@ -25,13 +25,13 @@ #include <unistd.h> #include <tqpainter.h> -#include <tqlayout.h> +#include <layout.h> #include <tqhbox.h> #include <tqvbox.h> -#include <tqtextedit.h> +#include <textedit.h> #include <tqlistview.h> #include <tqdom.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqfile.h> #include <tqlineedit.h> #include <tqcheckbox.h> @@ -250,7 +250,7 @@ void KandyView::executeCommand() if (p->userInput()) { bool ok = false; TQString value = KInputDialog::getText(TQString(), - i18n("Enter value for %1:").tqarg(p->name()),TQString(),&ok,this); + i18n("Enter value for %1:").arg(p->name()),TQString(),&ok,this); if (!ok) return; p->setValue(value); diff --git a/kandy/src/mobilegui.cpp b/kandy/src/mobilegui.cpp index 70d0656f3..ce7d86961 100644 --- a/kandy/src/mobilegui.cpp +++ b/kandy/src/mobilegui.cpp @@ -27,10 +27,10 @@ #include <tqlabel.h> #include <tqlistview.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqmessagebox.h> -#include <tqtextedit.h> +#include <textedit.h> #include <tqgroupbox.h> #include <tqpushbutton.h> @@ -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..9140a2a99 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> @@ -318,7 +318,7 @@ </widget> <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout21</cstring> + <cstring>layout21</cstring> </property> <hbox> <property name="name"> @@ -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/kandy/src/mobilemain.cpp b/kandy/src/mobilemain.cpp index de3e2b3e8..945ff7c47 100644 --- a/kandy/src/mobilemain.cpp +++ b/kandy/src/mobilemain.cpp @@ -169,7 +169,7 @@ bool MobileMain::queryClose() #if 0 if (m_view->isModified()) { switch (KMessageBox::warningYesNoCancel(this, - i18n("Save changes to profile %1?").tqarg(mFilename))) { + i18n("Save changes to profile %1?").arg(mFilename))) { case KMessageBox::Yes : fileSave(); return true; diff --git a/kandy/src/modem.cpp b/kandy/src/modem.cpp index 3956376a8..a7d246950 100644 --- a/kandy/src/modem.cpp +++ b/kandy/src/modem.cpp @@ -194,9 +194,9 @@ bool Modem::open() TQCString dev = TQFile::encodeName( (*prefs).serialDevice() ); const char *fdev = dev.data(); if ( ( fd = ::open( fdev, O_RDWR | O_NOCTTY | O_NONBLOCK ) ) == -1 ) { - emit errorMessage( i18n( "Unable to open tqdevice '%1'. " + emit errorMessage( i18n( "Unable to open device '%1'. " "Please check that you have sufficient permissions." ) - .tqarg( fdev ) ); + .arg( fdev ) ); return false; } @@ -204,7 +204,7 @@ bool Modem::open() if ( tcgetattr( fd, &init_tty ) == -1 ) { int errnumber = errno; emit errorMessage( i18n( "Communication setup failed (tcgetattr code: %1)" ) - .tqarg(strerror(errnumber)) ); + .arg(strerror(errnumber)) ); ::close( fd ); fd = 0; return false; @@ -279,7 +279,7 @@ bool Modem::lockDevice() #ifdef HAVE_LOCKDEV is_locked = !dev_lock( (*prefs).serialDevice().local8Bit() ); if (!is_locked) - emit errorMessage( i18n( "Unable to lock tqdevice '%1'." ).tqarg( + emit errorMessage( i18n( "Unable to lock device '%1'." ).arg( (*prefs).serialDevice() )); return is_locked; #else @@ -299,7 +299,7 @@ bool Modem::lockDevice() if ( ( lfd = ::open( TQFile::encodeName( fileName ), O_RDONLY ) ) < 0 ) { emit errorMessage( i18n( "Unable to open lock file '%1'.") - .tqarg( fileName ) ); + .arg( fileName ) ); return false; } @@ -307,7 +307,7 @@ bool Modem::lockDevice() if ( count < 0 ) { emit errorMessage( i18n( "Unable to read lock file '%1'.") - .tqarg( fileName ) ); + .arg( fileName ) ); ::close( lfd ); return false; } @@ -317,13 +317,13 @@ bool Modem::lockDevice() count = sscanf( buf, "%d", &pid ); if ( ( count != 1 ) || ( pid <= 0 ) ) { emit errorMessage( i18n( "Unable to get PID from file '%1'.") - .tqarg( fileName ) ); + .arg( fileName ) ); return false; } if ( !kill( (pid_t) pid, 0 ) ) { - emit errorMessage( i18n( "Process with PID %1, which is locking the tqdevice, is still running.") - .tqarg( pid ) ); + emit errorMessage( i18n( "Process with PID %1, which is locking the device, is still running.") + .arg( pid ) ); return false; } @@ -336,7 +336,7 @@ bool Modem::lockDevice() if ( ( lfd = creat( TQFile::encodeName( fileName ).data(), 0644 ) ) == -1 ) { emit errorMessage( i18n( "Unable to create lock file '%1'. " "Please check that you have sufficient permissions.") - .tqarg( fileName ) ); + .arg( fileName ) ); return false; } diff --git a/karm/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/doc/design b/karm/doc/design index b647f2822..be9a425fa 100644 --- a/karm/doc/design +++ b/karm/doc/design @@ -36,7 +36,7 @@ On Thursday 24 October 2002 06:37 pm, tomas pospisek wrote: > > --------------------------------------------------------------------- > > 1 Karm shall provide a hierarchical structure of tasks. If a task > > has at least one subtask it will be referred to as a parent task. -> > If a task has no tqchildren it will be referred to as a leaf task. +> > If a task has no children it will be referred to as a leaf task. > > If a task has no parent tasks it will be referred to as a root > > task. > > 2 A new task can be created as a child of any existing task. @@ -63,7 +63,7 @@ On Thursday 24 October 2002 06:37 pm, tomas pospisek wrote: > > --------------------------------------------------------------------- > > 1 Karm shall provide a hierarchical structure of tasks. If a task > > has at least one subtask it will be referred to as a parent task. -> > If a task has no tqchildren it will be referred to as a leaf task. +> > If a task has no children it will be referred to as a leaf task. > > If a task has no parent tasks it will be referred to as a root > > task. > > 2 A new task can be created as a child of any existing task. diff --git a/karm/edittaskdialog.cpp b/karm/edittaskdialog.cpp index 9b404d0af..b0286dd14 100644 --- a/karm/edittaskdialog.cpp +++ b/karm/edittaskdialog.cpp @@ -25,7 +25,7 @@ #include <tqgroupbox.h> #include <tqhbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlineedit.h> #include <tqradiobutton.h> #include <tqsizepolicy.h> @@ -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..bd0b253c2 100644 --- a/karm/idletimedetector.cpp +++ b/karm/idletimedetector.cpp @@ -67,22 +67,22 @@ 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"), i18n("Desktop has been idle since %1." - " What should we do?").tqarg(idleStartTQString), + " What should we do?").arg(idleStartTQString), i18n("Revert && Stop"), i18n("Revert && Continue"), i18n("Continue Timing"),0,2); - 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..7d0c7a22a 100644 --- a/karm/karm_part.cpp +++ b/karm/karm_part.cpp @@ -16,7 +16,7 @@ #include <klocale.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqmultilineedit.h> #include <tqpopupmenu.h> #include "mainwindow.h" @@ -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() ), @@ -576,7 +576,7 @@ int karmPart::bookTime TQString karmPart::getError( int mkb ) const { if ( mkb <= KARM_MAX_ERROR_NO ) return m_error[ mkb ]; - else return i18n( "Invalid error number: %1" ).tqarg( mkb ); + else return i18n( "Invalid error number: %1" ).arg( mkb ); } int karmPart::totalMinutesForTaskId( const TQString& taskId ) diff --git a/karm/karmstorage.cpp b/karm/karmstorage.cpp index 1e4f92a1f..e895d2639 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(); @@ -199,8 +199,8 @@ TQString KarmStorage::load (TaskView* view, const Preferences* preferences, TQSt // Complete the loading but return a message if ( !newParent ) err = i18n("Error loading \"%1\": could not find parent (uid=%2)") - .tqarg(task->name()) - .tqarg((*todo)->relatedToUid()); + .arg(task->name()) + .arg((*todo)->relatedToUid()); if (!err) task->move( newParent); } @@ -268,8 +268,8 @@ TQString KarmStorage::buildTaskView(KCal::ResourceCalendar *rc, TaskView *view) // Complete the loading but return a message if ( !newParent ) err = i18n("Error loading \"%1\": could not find parent (uid=%2)") - .tqarg(task->name()) - .tqarg((*todo)->relatedToUid()); + .arg(task->name()) + .arg((*todo)->relatedToUid()); if (!err) task->move( newParent); } @@ -391,12 +391,12 @@ TQString KarmStorage::loadFromFlatFile(TaskView* taskview, TQFile f(filename); if( !f.exists() ) - err = i18n("File \"%1\" not found.").tqarg(filename); + err = i18n("File \"%1\" not found.").arg(filename); if (!err) { if( !f.open( IO_ReadOnly ) ) - err = i18n("Could not open \"%1\".").tqarg(filename); + err = i18n("Could not open \"%1\".").arg(filename); } if (!err) @@ -667,7 +667,7 @@ TQString KarmStorage::exportcsvFile( TaskView *taskview, if (filename.isEmpty()) filename=rc.url.url(); TQFile f( filename ); if( !f.open( IO_WriteOnly ) ) { - err = i18n( "Could not open \"%1\"." ).tqarg( filename ); + err = i18n( "Could not open \"%1\"." ).arg( filename ); } if (!err) { @@ -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,15 +807,15 @@ 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") - .tqarg(daykey) - .tqarg(task->uid()); + daykey = day.toString(TQString::fromLatin1("yyyyMMdd")); + daytaskkey = TQString::fromLatin1("%1_%2") + .arg(daykey) + .arg(task->uid()); if (taskdaytotals.contains(daytaskkey)) { - cell.push_back(TQString::tqfromLatin1("%1") - .tqarg(formatTime(taskdaytotals[daytaskkey]/60, rc.decimalMinutes))); + cell.push_back(TQString::fromLatin1("%1") + .arg(formatTime(taskdaytotals[daytaskkey]/60, rc.decimalMinutes))); sum += taskdaytotals[daytaskkey]; // in seconds if (daytotals.contains(daykey)) @@ -829,7 +829,7 @@ long KarmStorage::printTaskHistory ( } // Total for task - cell.push_back(TQString::tqfromLatin1("%1").tqarg(formatTime(sum/60, rc.decimalMinutes))); + cell.push_back(TQString::fromLatin1("%1").arg(formatTime(sum/60, rc.decimalMinutes))); // room for the recursive total time (that cannot be calculated now) cell.push_back(delim); @@ -865,7 +865,7 @@ long KarmStorage::printTaskHistory ( add += printTaskHistory( subTask, taskdaytotals, daytotals, from, to , level+1, matrix, rc ); } - cell[colrectot]=(TQString::tqfromLatin1("%1").tqarg(formatTime((add+sum)/60, rc.decimalMinutes ))); + cell[colrectot]=(TQString::fromLatin1("%1").arg(formatTime((add+sum)/60, rc.decimalMinutes ))); for (unsigned int i=0; i < cell.size(); i++) matrix[ownline]+=cell[i]; return add+sum; } @@ -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,18 +910,18 @@ 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'."); } // header retval += i18n("Task History\n"); retval += i18n("From %1 to %2") - .tqarg(KGlobal::locale()->formatDate(from)) - .tqarg(KGlobal::locale()->formatDate(to)); + .arg(KGlobal::locale()->formatDate(from)) + .arg(KGlobal::locale()->formatDate(to)); retval += cr; retval += i18n("Printed on: %1") - .tqarg(KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime())); + .arg(KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime())); retval += cr; day=from; @@ -936,10 +936,10 @@ 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")) - .tqarg(daykey) - .tqarg((*event).todoUid()); + daykey = (*event).start().date().toString(TQString::fromLatin1("yyyyMMdd")); + daytaskkey = TQString(TQString::fromLatin1("%1_%2")) + .arg(daykey) + .arg((*event).todoUid()); if (taskdaytotals.contains(daytaskkey)) taskdaytotals.replace(daytaskkey, @@ -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,22 +993,22 @@ 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") - .tqarg(formatTime(daytotals[daykey]/60, rc.decimalMinutes)); + retval += TQString::fromLatin1("%1") + .arg(formatTime(daytotals[daykey]/60, rc.decimalMinutes)); sum += daytotals[daykey]; // in seconds } retval += delim; day = day.addDays(1); } - retval += TQString::tqfromLatin1("%1%2%3%4") - .tqarg( formatTime( sum/60, rc.decimalMinutes ) ) - .tqarg( delim ).tqarg( delim ) - .tqarg( i18n( "Total" ) ); + retval += TQString::fromLatin1("%1%2%3%4") + .arg( formatTime( sum/60, rc.decimalMinutes ) ) + .arg( delim ).arg( delim ) + .arg( i18n( "Total" ) ); } // above taken from timekard.cpp @@ -1021,7 +1021,7 @@ TQString KarmStorage::exportcsvHistory ( TaskView *taskview, if (filename.isEmpty()) filename=rc.url.url(); TQFile f( filename ); if( !f.open( IO_WriteOnly ) ) { - err = i18n( "Could not open \"%1\"." ).tqarg( filename ); + err = i18n( "Could not open \"%1\"." ).arg( filename ); } if (!err) { @@ -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..7e8b04b1a 100644 --- a/karm/karmstorage.h +++ b/karm/karmstorage.h @@ -132,7 +132,7 @@ class KarmStorage * Read tasks and their total times from a text file (legacy storage). * * This reads from one of the two legacy file formats. In this version, - * the parent task times do not include the sum of all their tqchildren's + * the parent task times do not include the sum of all their children's * times. * * The format of the file is zero or more lines of: @@ -147,7 +147,7 @@ class KarmStorage * Reads tasks and their total times from text file (legacy). * * This is the older legacy format, where the task totals included the - * tqchildren totals. + * children totals. * * @see loadFromFlatFile */ @@ -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..c287867d3 100644 --- a/karm/ktimewidget.cpp +++ b/karm/ktimewidget.cpp @@ -1,7 +1,7 @@ #include <stdlib.h> // abs() #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlineedit.h> #include <tqstring.h> #include <tqvalidator.h> @@ -63,38 +63,38 @@ protected: KArmTimeWidget::KArmTimeWidget( TQWidget* parent, const char* name ) : TQWidget(parent, name) { - TQHBoxLayout *tqlayout = new TQHBoxLayout(this); + TQHBoxLayout *layout = new TQHBoxLayout(this); _hourLE = new TQLineEdit( this); // 9999 hours > 1 year! // 999 hours = 41 days (That should be enough ...) _hourLE->setFixedWidth( fontMetrics().maxWidth() * 3 + 2 * _hourLE->frameWidth() + 2); - tqlayout->addWidget(_hourLE); + layout->addWidget(_hourLE); 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 ); - tqlayout->addWidget( hr ); + layout->addWidget( hr ); _minuteLE = new KarmLineEdit(this); // Minutes lineedit: Make room for 2 digits _minuteLE->setFixedWidth( fontMetrics().maxWidth() * 2 + 2 * _minuteLE->frameWidth() + 2); - tqlayout->addWidget(_minuteLE); + layout->addWidget(_minuteLE); 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 ); + layout->addWidget( min ); - tqlayout->addStretch(1); + layout->addStretch(1); setFocusProxy( _hourLE ); } @@ -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..287c5a96f 100644 --- a/karm/mainwindow.cpp +++ b/karm/mainwindow.cpp @@ -202,10 +202,10 @@ void MainWindow::updateStatusBar( ) TQString time; time = formatTime( _sessionSum ); - statusBar()->changeItem( i18n("Session: %1").tqarg(time), 0 ); + statusBar()->changeItem( i18n("Session: %1").arg(time), 0 ); time = formatTime( _totalSum ); - statusBar()->changeItem( i18n("Total: %1" ).tqarg(time), 1); + statusBar()->changeItem( i18n("Total: %1" ).arg(time), 1); } void MainWindow::starStatusBar() @@ -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(); } @@ -610,7 +610,7 @@ int MainWindow::bookTime TQString MainWindow::getError( int mkb ) const { if ( mkb <= KARM_MAX_ERROR_NO ) return m_error[ mkb ]; - else return i18n( "Invalid error number: %1" ).tqarg( mkb ); + else return i18n( "Invalid error number: %1" ).arg( mkb ); } int MainWindow::totalMinutesForTaskId( const TQString& taskId ) diff --git a/karm/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..464842b8f 100644 --- a/karm/preferences.cpp +++ b/karm/preferences.cpp @@ -3,7 +3,7 @@ #include <tqlabel.h> #include <tqstring.h> #include <tqspinbox.h> -#include <tqlayout.h> +#include <layout.h> #include <kapplication.h> // kapp #include <kconfig.h> @@ -51,8 +51,8 @@ void Preferences::makeBehaviorPage() icon ); TQVBoxLayout* topLevel = new TQVBoxLayout( behaviorPage, 0, spacingHint() ); - TQGridLayout* tqlayout = new TQGridLayout( topLevel, 2, 2 ); - tqlayout->setColStretch( 1, 1 ); + TQGridLayout* layout = new TQGridLayout( topLevel, 2, 2 ); + layout->setColStretch( 1, 1 ); _doIdleDetectionW = new TQCheckBox ( i18n("Detect desktop as idle after"), behaviorPage, "_doIdleDetectionW"); @@ -62,9 +62,9 @@ void Preferences::makeBehaviorPage() _promptDeleteW = new TQCheckBox ( i18n( "Prompt before deleting tasks" ), behaviorPage, "_promptDeleteW" ); - tqlayout->addWidget(_doIdleDetectionW, 0, 0 ); - tqlayout->addWidget(_idleDetectValueW, 0, 1 ); - tqlayout->addWidget(_promptDeleteW, 1, 0 ); + layout->addWidget(_doIdleDetectionW, 0, 0 ); + layout->addWidget(_idleDetectValueW, 0, 1 ); + layout->addWidget(_promptDeleteW, 1, 0 ); topLevel->addStretch(); @@ -79,8 +79,8 @@ void Preferences::makeDisplayPage() icon ); TQVBoxLayout* topLevel = new TQVBoxLayout( displayPage, 0, spacingHint() ); - TQGridLayout* tqlayout = new TQGridLayout( topLevel, 5, 2 ); - tqlayout->setColStretch( 1, 1 ); + TQGridLayout* layout = new TQGridLayout( topLevel, 5, 2 ); + layout->setColStretch( 1, 1 ); TQLabel* _displayColumnsLabelW = new TQLabel( i18n("Columns displayed:"), displayPage ); @@ -93,11 +93,11 @@ void Preferences::makeDisplayPage() _displayTotalTimeW = new TQCheckBox ( i18n("Total task time"), displayPage, "_displayTotalTimeW"); - tqlayout->addMultiCellWidget( _displayColumnsLabelW, 0, 0, 0, 1 ); - tqlayout->addWidget(_displaySessionW, 1, 1 ); - tqlayout->addWidget(_displayTimeW, 2, 1 ); - tqlayout->addWidget(_displayTotalSessionW, 3, 1 ); - tqlayout->addWidget(_displayTotalTimeW, 4, 1 ); + layout->addMultiCellWidget( _displayColumnsLabelW, 0, 0, 0, 1 ); + layout->addWidget(_displaySessionW, 1, 1 ); + layout->addWidget(_displayTimeW, 2, 1 ); + layout->addWidget(_displayTotalSessionW, 3, 1 ); + layout->addWidget(_displayTotalTimeW, 4, 1 ); topLevel->addStretch(); } @@ -109,8 +109,8 @@ void Preferences::makeStoragePage() icon ); TQVBoxLayout* topLevel = new TQVBoxLayout( storagePage, 0, spacingHint() ); - TQGridLayout* tqlayout = new TQGridLayout( topLevel, 4, 2 ); - tqlayout->setColStretch( 1, 1 ); + TQGridLayout* layout = new TQGridLayout( topLevel, 4, 2 ); + layout->setColStretch( 1, 1 ); // autosave _doAutoSaveW = new TQCheckBox @@ -121,19 +121,19 @@ 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? _loggingW = new TQCheckBox ( i18n("Log history"), storagePage, "_loggingW" ); - // add widgets to tqlayout - tqlayout->addWidget(_doAutoSaveW, 0, 0); - tqlayout->addWidget(_autoSaveValueW, 0, 1); - tqlayout->addWidget(_iCalFileLabel, 1, 0 ); - tqlayout->addWidget(_iCalFileW, 1, 1 ); - tqlayout->addWidget(_loggingW, 2, 0 ); + // add widgets to layout + layout->addWidget(_doAutoSaveW, 0, 0); + layout->addWidget(_autoSaveValueW, 0, 1); + layout->addWidget(_iCalFileLabel, 1, 0 ); + layout->addWidget(_iCalFileW, 1, 1 ); + layout->addWidget(_loggingW, 2, 0 ); topLevel->addStretch(); @@ -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..536883687 100644 --- a/karm/print.cpp +++ b/karm/print.cpp @@ -25,10 +25,10 @@ void MyPrinter::print() if (setup(0L, i18n("Print Times"))) { // setup TQPainter painter(this); - TQPaintDeviceMetrics tqdeviceMetrics(this); + TQPaintDeviceMetrics deviceMetrics(this); TQFontMetrics metrics = painter.fontMetrics(); - pageHeight = tqdeviceMetrics.height(); - int pageWidth = tqdeviceMetrics.width(); + pageHeight = deviceMetrics.height(); + int pageWidth = deviceMetrics.width(); xMargin = margins().width(); yMargin = margins().height(); yoff = yMargin; @@ -36,7 +36,7 @@ void MyPrinter::print() // Calculate the totals // Note the totals are only calculated at the top most levels, as the - // totals are increased together with its tqchildren. + // totals are increased together with its children. int totalTotal = 0; int sessionTotal = 0; for (Task* task = _taskView->first_child(); @@ -75,11 +75,11 @@ 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, - i18n("KArm - %1").tqarg(now)); + i18n("KArm - %1").arg(now)); painter.setFont(origFont); yoff += height + 10; diff --git a/karm/printdialog.cpp b/karm/printdialog.cpp index 197875491..3e57fa092 100644 --- a/karm/printdialog.cpp +++ b/karm/printdialog.cpp @@ -24,7 +24,7 @@ #include <tqcheckbox.h> #include <tqhbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlineedit.h> #include <tqpixmap.h> #include <tqpushbutton.h> @@ -48,14 +48,14 @@ PrintDialog::PrintDialog() setMainWidget(page); int year, month; - TQVBoxLayout *tqlayout = new TQVBoxLayout(page, KDialog::spacingHint()); - tqlayout->addSpacing(10); - tqlayout->addStretch(1); + TQVBoxLayout *layout = new TQVBoxLayout(page, KDialog::spacingHint()); + layout->addSpacing(10); + layout->addStretch(1); // Date Range TQGroupBox *rangeGroup = new TQGroupBox(1, Qt::Horizontal, i18n("Date Range"), page); - tqlayout->addWidget(rangeGroup); + layout->addWidget(rangeGroup); TQWidget *rangeWidget = new TQWidget(rangeGroup); TQHBoxLayout *rangeLayout = new TQHBoxLayout(rangeWidget, 0, spacingHint()); @@ -64,29 +64,29 @@ 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)); _to = new KDateEdit(rangeWidget); rangeLayout->addWidget(_to); - tqlayout->addSpacing(10); - tqlayout->addStretch(1); + layout->addSpacing(10); + layout->addStretch(1); _allTasks = new TQComboBox( page ); _allTasks->insertItem( i18n( "Selected Task" ) ); _allTasks->insertItem( i18n( "All Tasks" ) ); - tqlayout->addWidget( _allTasks ); + layout->addWidget( _allTasks ); _perWeek = new TQCheckBox( i18n( "Summarize per week" ), page ); - tqlayout->addWidget( _perWeek ); + layout->addWidget( _perWeek ); _totalsOnly = new TQCheckBox( i18n( "Totals only" ), page ); - tqlayout->addWidget( _totalsOnly ); + layout->addWidget( _totalsOnly ); - tqlayout->addSpacing(10); - tqlayout->addStretch(1); + layout->addSpacing(10); + layout->addStretch(1); } TQDate PrintDialog::from() const diff --git a/karm/task.cpp b/karm/task.cpp index 03eb1d3b2..7d84bcd2c 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"))); } } } @@ -164,13 +164,13 @@ void Task::setPercentComplete(const int percent, KarmStorage *storage) setPixmapProgress(); - // When parent marked as complete, mark all tqchildren as complete as well. + // When parent marked as complete, mark all children as complete as well. // Complete tasks are not displayed in the task view, so if a parent is - // marked as complete and some of the tqchildren are not, then we get an error + // marked as complete and some of the children are not, then we get an error // message. KArm actually keep chugging along in this case and displays the // child tasks just fine, so an alternative solution is to remove that error // message (from KarmStorage::load). But I think it makes more sense that - // if you mark a parent task as complete, then all tqchildren should be + // if you mark a parent task as complete, then all children should be // complete as well. // // This behavior is consistent with KOrganizer (as of 2003-09-24). @@ -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..2d3d5a55a 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 @@ -208,7 +208,7 @@ class Task : public TQObject, public TQListViewItem /** tells you whether this task is the root of the task tree */ bool isRoot() const { return parent() == 0; } - /** remove Task with all it's tqchildren + /** remove Task with all it's children * @param activeTasks - list of aktive tasks * @param storage a pointer to a KarmStorage object. */ @@ -231,7 +231,7 @@ class Task : public TQObject, public TQListViewItem /** Return true if task is complete (percent complete equals 100). */ bool isComplete(); - /** Remove current task and all it's tqchildren from the view. */ + /** Remove current task and all it's children from the view. */ void removeFromView(); /** delivers when the task was started last */ diff --git a/karm/taskview.cpp b/karm/taskview.cpp index b4f655ff9..d59ec65bf 100644 --- a/karm/taskview.cpp +++ b/karm/taskview.cpp @@ -1,12 +1,12 @@ -#include <tqclipboard.h> +#include <clipboard.h> #include <tqfile.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlistbox.h> #include <tqlistview.h> #include <tqptrlist.h> #include <tqptrstack.h> #include <tqstring.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqtimer.h> #include <tqxml.h> @@ -255,7 +255,7 @@ void TaskView::refresh() t->setPixmapProgress(); } - // remove root decoration if there is no more tqchildren. + // remove root decoration if there is no more children. bool anyChilds = false; for(Task* child = first_child(); child; @@ -613,7 +613,7 @@ void TaskView::editTask() // bool ok; // TQString comment = KLineEditDlg::getText(i18n("Comment"), -// i18n("Log comment for task '%1':").tqarg(task->name()), +// i18n("Log comment for task '%1':").arg(task->name()), // TQString(), &ok, this); // if ( ok ) // task->addComment( comment, _storage ); @@ -651,7 +651,7 @@ void TaskView::deleteTask(bool markingascomplete) response = KMessageBox::warningContinueCancel( 0, i18n( "Are you sure you want to delete " "the task named\n\"%1\" and its entire history?") - .tqarg(task->name()), + .arg(task->name()), i18n( "Deleting Task"), KStdGuiItem::del()); } else { @@ -659,7 +659,7 @@ void TaskView::deleteTask(bool markingascomplete) i18n( "Are you sure you want to delete the task named" "\n\"%1\" and its entire history?\n" "NOTE: all its subtasks and their history will also " - "be deleted.").tqarg(task->name()), + "be deleted.").arg(task->name()), i18n( "Deleting Task"), KStdGuiItem::del()); } } @@ -688,7 +688,7 @@ void TaskView::deleteTask(bool markingascomplete) save(); } - // remove root decoration if there is no more tqchildren. + // remove root decoration if there is no more children. refresh(); // Stop idle detection if no more counters are running @@ -820,16 +820,16 @@ void TaskView::clipTotals() i18n("Copy This Task"), i18n("Copy All Tasks") ); if (response == KMessageBox::Yes) // This task only { - KApplication::tqclipboard()->setText(t.totalsAsText(this, true, TimeKard::TotalTime)); + KApplication::clipboard()->setText(t.totalsAsText(this, true, TimeKard::TotalTime)); } else // All tasks { - KApplication::tqclipboard()->setText(t.totalsAsText(this, false, TimeKard::TotalTime)); + KApplication::clipboard()->setText(t.totalsAsText(this, false, TimeKard::TotalTime)); } } else { - KApplication::tqclipboard()->setText(t.totalsAsText(this, true, TimeKard::TotalTime)); + KApplication::clipboard()->setText(t.totalsAsText(this, true, TimeKard::TotalTime)); } } @@ -844,16 +844,16 @@ void TaskView::clipSession() i18n("Copy This Task"), i18n("Copy All Tasks") ); if (response == KMessageBox::Yes) // this task only { - KApplication::tqclipboard()->setText(t.totalsAsText(this, true, TimeKard::SessionTime)); + KApplication::clipboard()->setText(t.totalsAsText(this, true, TimeKard::SessionTime)); } else // only task { - KApplication::tqclipboard()->setText(t.totalsAsText(this, false, TimeKard::SessionTime)); + KApplication::clipboard()->setText(t.totalsAsText(this, false, TimeKard::SessionTime)); } } else { - KApplication::tqclipboard()->setText(t.totalsAsText(this, true, TimeKard::SessionTime)); + KApplication::clipboard()->setText(t.totalsAsText(this, true, TimeKard::SessionTime)); } } @@ -863,7 +863,7 @@ void TaskView::clipHistory() if (dialog.exec()== TQDialog::Accepted) { TimeKard t; - KApplication::tqclipboard()-> + KApplication::clipboard()-> setText( t.historyAsText(this, dialog.from(), dialog.to(), !dialog.allTasks(), dialog.perWeek(), dialog.totalsOnly() ) ); } } diff --git a/karm/taskview.h b/karm/taskview.h index f1b22048f..4c5df371a 100644 --- a/karm/taskview.h +++ b/karm/taskview.h @@ -142,11 +142,11 @@ class TaskView : public KListView KarmStorage* storage(); /** - * Delete task (and tqchildren) from view. + * Delete task (and children) from view. * * @param markingascomplete If false (the default), deletes history for - * current task and all tqchildren. If markingascomplete is true, then sets - * percent complete to 100 and removes task and all it's tqchildren from the + * current task and all children. If markingascomplete is true, then sets + * percent complete to 100 and removes task and all it's children from the * list view. */ void deleteTask(bool markingascomplete=false); @@ -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/README b/karm/test/README index a5307e6ee..32a32f6e2 100644 --- a/karm/test/README +++ b/karm/test/README @@ -1,6 +1,6 @@ This directory holds automated tests for karm. -It's in very rough tqshape. +It's in very rough shape. How you start: diff --git a/karm/test/lifetest.php b/karm/test/lifetest.php index afd423ccb..7a24bd3d7 100644 --- a/karm/test/lifetest.php +++ b/karm/test/lifetest.php @@ -96,7 +96,7 @@ if ($argv[1]!="--batch") echo "(b) make sure the code still builds (make)\n"; echo "(c) run automated test routines like this (make check)\n\n"; - echo "This program simulates keypresses, so please leave the keyboard alone during the test. Please use a us or de keyboardtqlayout (setxkbmap us). This must be run in X environment.\n + echo "This program simulates keypresses, so please leave the keyboard alone during the test. Please use a us or de keyboardlayout (setxkbmap us). This must be run in X environment.\n You must have XAutomation installed to run this."; system("xte -h 2&>/dev/null",$rc); if ($rc==0) echo " You have.\n"; @@ -132,7 +132,7 @@ else // the mouse can be in the way, so, move it out. This here even works with "focus strictly under mouse". system("xte 'mousemove 1 1'"); echo "\nStarting karm"; - $process=popen("karm --tqgeometry 200x100+0+0 /tmp/karmtest.ics >/dev/null 2>&1", 'w'); + $process=popen("karm --geometry 200x100+0+0 /tmp/karmtest.ics >/dev/null 2>&1", 'w'); $rc=1; while ($rc==1) system("dcop `dcop 2>/dev/null | grep karm` KarmDCOPIface version",$rc); echo "mainwindow is ready"; diff --git a/karm/test/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/runscripts.cpp b/karm/test/runscripts.cpp index e3a25a15f..1d9be75c1 100644 --- a/karm/test/runscripts.cpp +++ b/karm/test/runscripts.cpp @@ -22,7 +22,7 @@ #include <tqfile.h> #include <tqstring.h> #include <tqstringlist.h> -#include <tqtextstream.h> +#include <textstream.h> #include "script.h" 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..984baf741 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,11 +59,11 @@ 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")) - .tqarg(i18n("Time"), timeWidth) - .tqarg(i18n("Task")); + retval += TQString(TQString::fromLatin1("%1 %2")) + .arg(i18n("Time"), timeWidth) + .arg(i18n("Task")); retval += cr; retval += line; @@ -92,10 +92,10 @@ TQString TimeKard::totalsAsText(TaskView* taskview, bool justThisTask, WhichTime // total buf.fill('-', reportWidth); - retval += TQString(TQString::tqfromLatin1("%1")).tqarg(buf, timeWidth) + cr; - retval += TQString(TQString::tqfromLatin1("%1 %2")) - .tqarg(formatTime(sum),timeWidth) - .tqarg(i18n("Total")); + retval += TQString(TQString::fromLatin1("%1")).arg(buf, timeWidth) + cr; + retval += TQString(TQString::fromLatin1("%1 %2")) + .arg(formatTime(sum),timeWidth) + .arg(i18n("Total")); } else retval += i18n("No tasks."); @@ -109,9 +109,9 @@ void TimeKard::printTask(Task *task, TQString &s, int level, WhichTime which) TQString buf; s += buf.fill(' ', level); - s += TQString(TQString::tqfromLatin1("%1 %2")) - .tqarg(formatTime(which == TotalTime?task->totalTime():task->totalSessionTime()), timeWidth) - .tqarg(task->name()); + s += TQString(TQString::fromLatin1("%1 %2")) + .arg(formatTime(which == TotalTime?task->totalTime():task->totalSessionTime()), timeWidth) + .arg(task->name()); s += cr; for (Task* subTask = task->firstChild(); @@ -134,17 +134,17 @@ 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") - .tqarg(daykey) - .tqarg(task->uid()); + TQString daykey = day.toString(TQString::fromLatin1("yyyyMMdd")); + TQString daytaskkey = TQString::fromLatin1("%1_%2") + .arg(daykey) + .arg(task->uid()); if (taskdaytotals.contains(daytaskkey)) { if ( !totalsOnly ) { - s += TQString::tqfromLatin1("%1") - .tqarg(formatTime(taskdaytotals[daytaskkey]/60), timeWidth); + s += TQString::fromLatin1("%1") + .arg(formatTime(taskdaytotals[daytaskkey]/60), timeWidth); } sectionsum += taskdaytotals[daytaskkey]; // in seconds @@ -162,12 +162,12 @@ void TimeKard::printTaskHistory(const Task *task, } // Total for task this section (e.g. week) - s += TQString::tqfromLatin1("%1").tqarg(formatTime(sectionsum/60), totalTimeWidth); + s += TQString::fromLatin1("%1").arg(formatTime(sectionsum/60), totalTimeWidth); // Task name TQString buf; s += buf.fill(' ', level + 1); - s += TQString::tqfromLatin1("%1").tqarg(task->name()); + s += TQString::fromLatin1("%1").arg(task->name()); s += cr; for (Task* subTask = task->firstChild(); @@ -221,10 +221,10 @@ 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") - .tqarg(daykey) - .tqarg((*event).todoUid()); + TQString daykey = (*event).start().date().toString(TQString::fromLatin1("yyyyMMdd")); + TQString daytaskkey = TQString::fromLatin1("%1_%2") + .arg(daykey) + .arg((*event).todoUid()); if (taskdaytotals.contains(daytaskkey)) taskdaytotals.replace(daytaskkey, @@ -246,7 +246,7 @@ TQString TimeKard::sectionHistoryAsText( // day headings for (TQDate day = sectionFrom; day <= sectionTo; day = day.addDays(1)) { - retval += TQString::tqfromLatin1("%1").tqarg(day.day(), timeWidth); + retval += TQString::fromLatin1("%1").arg(day.day(), timeWidth); } retval += cr; retval += line; @@ -280,14 +280,14 @@ 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") - .tqarg(formatTime(daytotals[daykey]/60), timeWidth); + retval += TQString::fromLatin1("%1") + .arg(formatTime(daytotals[daykey]/60), timeWidth); } sum += daytotals[daykey]; // in seconds } @@ -298,9 +298,9 @@ TQString TimeKard::sectionHistoryAsText( } } - retval += TQString::tqfromLatin1("%1 %2") - .tqarg(formatTime(sum/60), totalTimeWidth) - .tqarg(i18n("Total")); + retval += TQString::fromLatin1("%1 %2") + .arg(formatTime(sum/60), totalTimeWidth) + .arg(i18n("Total")); } return retval; } @@ -313,11 +313,11 @@ TQString TimeKard::historyAsText(TaskView* taskview, const TQDate& from, retval += totalsOnly ? i18n("Task Totals") : i18n("Task History"); retval += cr; retval += i18n("From %1 to %2") - .tqarg(KGlobal::locale()->formatDate(from)) - .tqarg(KGlobal::locale()->formatDate(to)); + .arg(KGlobal::locale()->formatDate(from)) + .arg(KGlobal::locale()->formatDate(to)); retval += cr; retval += i18n("Printed on: %1") - .tqarg(KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime())); + .arg(KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime())); if ( perWeek ) { @@ -353,7 +353,7 @@ TQDate Week::end() const TQString Week::name() const { - return i18n("Week of %1").tqarg(KGlobal::locale()->formatDate(start())); + return i18n("Week of %1").arg(KGlobal::locale()->formatDate(start())); } TQValueList<Week> Week::weeksFromDateRange(const TQDate& from, const TQDate& to) diff --git a/karm/tray.cpp b/karm/tray.cpp index 20c2f51e6..55e050c52 100644 --- a/karm/tray.cpp +++ b/karm/tray.cpp @@ -9,7 +9,7 @@ // #include <tqkeycode.h> -// #include <tqlayout.h> +// #include <layout.h> #include <tqpixmap.h> #include <tqptrlist.h> #include <tqstring.h> @@ -59,9 +59,9 @@ KarmTray::KarmTray(MainWindow* parent) // this are experiments/tests /* for (int i=0; i<30; i++) - _tray->insertTitle(i 18n("bla ").tqarg(i)); + _tray->insertTitle(i 18n("bla ").arg(i)); for (int i=0; i<30; i++) - _tray->insertTitle2(i 18n("bli ").tqarg(i)); + _tray->insertTitle2(i 18n("bli ").arg(i)); */ // experimenting with menus for the tray /* diff --git a/kdgantt/KDGanttMinimizeSplitter.cpp b/kdgantt/KDGanttMinimizeSplitter.cpp index f11832f37..1e9a9783c 100644 --- a/kdgantt/KDGanttMinimizeSplitter.cpp +++ b/kdgantt/KDGanttMinimizeSplitter.cpp @@ -39,8 +39,8 @@ #include "tqbitmap.h" #include "tqptrlist.h" #include "tqmemarray.h" -#include "tqlayout.h" -#include "tqlayoutengine_p.h" +#include "layout.h" +#include "layoutengine_p.h" #include "tqobjectlist.h" #include "tqstyle.h" #include "tqapplication.h" //sendPostedEvents @@ -64,7 +64,7 @@ KDGanttSplitterHandle::KDGanttSplitterHandle( Qt::Orientation o, setMouseTracking( true ); } -TQSize KDGanttSplitterHandle::tqsizeHint() const +TQSize KDGanttSplitterHandle::sizeHint() const { return TQSize(8,8); } @@ -108,7 +108,7 @@ void KDGanttSplitterHandle::mousePressEvent( TQMouseEvent *e ) _activeButton = onButton( e->pos() ); mouseOffset = s->pick(e->pos()); if ( _activeButton != 0) - tqrepaint(); + repaint(); updateCursor( e->pos() ); } } @@ -165,7 +165,7 @@ void KDGanttSplitterHandle::mouseReleaseEvent( TQMouseEvent *e ) s->moveSplitter( pos, id() ); } } - tqrepaint(); + repaint(); } int KDGanttSplitterHandle::onButton( const TQPoint& p ) @@ -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++; } @@ -319,7 +319,7 @@ void kdganttGeomCalc( TQMemArray<TQLayoutStruct> &chain, int start, int count, i such a license) and are (C) Trolltech AS. A splitter lets the user control the size of child widgets by - dragging the boundary between the tqchildren. Any number of widgets + dragging the boundary between the children. Any number of widgets may be controlled. To show a TQListBox, a TQListView and a TQTextEdit side by side: @@ -332,14 +332,14 @@ void kdganttGeomCalc( TQMemArray<TQLayoutStruct> &chain, int start, int count, i \endcode In KDGanttMinimizeSplitter, the boundary can be either horizontal or - vertical. The default is horizontal (the tqchildren are side by side) + vertical. The default is horizontal (the children are side by side) but you can use setOrientation( TQSplitter::Vertical ) to set it to vertical. Use setResizeMode() to specify that a widget should keep its size when the splitter is resized. - Although KDGanttMinimizeSplitter normally resizes the tqchildren only + Although KDGanttMinimizeSplitter normally resizes the children only at the end of a resize operation, if you call setOpaqueResize( TRUE ) the widgets are resized as often as possible. @@ -349,7 +349,7 @@ void kdganttGeomCalc( TQMemArray<TQLayoutStruct> &chain, int start, int count, i sizes set by the user. If you hide() a child, its space will be distributed among the other - tqchildren. It will be reinstated when you show() it again. It is also + children. It will be reinstated when you show() it again. It is also possible to reorder the widgets within the splitter using moveToFirst() and moveToLast(). */ @@ -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 ) @@ -400,7 +400,7 @@ KDGanttMinimizeSplitter::KDGanttMinimizeSplitter( Qt::Orientation o, TQWidget *p } /*! - Destroys the splitter and any tqchildren. + Destroys the splitter and any children. */ KDGanttMinimizeSplitter::~KDGanttMinimizeSplitter() { @@ -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)); } @@ -632,7 +632,7 @@ int KDGanttMinimizeSplitter::idAfter( TQWidget* w ) const close as possible to position \a p, which is the distance from the left (or top) edge of the widget. - For Arabic and Hebrew the tqlayout is reversed, and using this + For Arabic and Hebrew the layout is reversed, and using this function to set the position of the splitter might lead to unexpected results, since in Arabic and Hebrew the position of splitter one is to the left of the position of splitter zero. @@ -705,13 +705,13 @@ void KDGanttMinimizeSplitter::moveBefore( int pos, int id, bool upLeft ) } else { int dd, newLeft, nextPos; if( TQApplication::reverseLayout() && orient == Qt::Horizontal ) { - dd = w->tqgeometry().right() - pos; - dd = TQMAX( pick(minSize(w)), TQMIN(dd, pick(w->tqmaximumSize()))); + dd = w->geometry().right() - pos; + 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() ); + right = pick( w->geometry().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 ); } @@ -966,7 +966,7 @@ void KDGanttMinimizeSplitter::recalc( bool update ) // nested splitters; be nice maxl = maxt = 0; } else { - // KDGanttMinimizeSplitter with no tqchildren yet + // KDGanttMinimizeSplitter with no children yet maxl = TQWIDGETSIZE_MAX; } } else { @@ -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; @@ -1229,7 +1229,7 @@ bool KDGanttMinimizeSplitter::isHidden( TQWidget *w ) const splitter. Giving the values to another splitter's setSizes() function will - produce a splitter with the same tqlayout as this one. + produce a splitter with the same layout as this one. Note that if you want to iterate over the list, you should iterate over a copy, e.g. @@ -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..dcc2f40d2 100644 --- a/kdgantt/KDGanttSemiSizingControl.cpp +++ b/kdgantt/KDGanttSemiSizingControl.cpp @@ -247,9 +247,9 @@ 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; + _layout = 0; TQWhatsThis::add( _but, "Click on this button to show the \nlegend at the bottom of the widget"); TQToolTip::add( _but, "Show / hide legend"); @@ -258,19 +258,19 @@ void KDGanttSemiSizingControl::init() void KDGanttSemiSizingControl::setup() { - //-------------------------------------------------- Setup tqlayout - delete _tqlayout; - TQBoxLayout* butLayout; // _tqlayout will delete me + //-------------------------------------------------- Setup layout + delete _layout; + TQBoxLayout* butLayout; // _layout will delete me if ( _orient == Qt::Horizontal || isMinimized() ) - _tqlayout = new TQHBoxLayout( this ); + _layout = new TQHBoxLayout( this ); else - _tqlayout = new TQVBoxLayout( this ); + _layout = new TQVBoxLayout( this ); if ( _orient == Qt::Vertical && !isMinimized() ) - butLayout = new TQHBoxLayout( _tqlayout ); + butLayout = new TQHBoxLayout( _layout ); else - butLayout = new TQVBoxLayout( _tqlayout ); + butLayout = new TQVBoxLayout( _layout ); @@ -306,9 +306,9 @@ void KDGanttSemiSizingControl::setup() widget = _maximizedWidget; if( widget ) { if ( _arrowPos == Before || _orient == Qt::Vertical && !isMinimized() ) - _tqlayout->addWidget( widget, 1 ); + _layout->addWidget( widget, 1 ); else - _tqlayout->insertWidget( 0, widget, 1 ); + _layout->insertWidget( 0, widget, 1 ); } ************************************************** */ // hack for the usage in KDGantt as pop-up legend widget @@ -319,16 +319,16 @@ void KDGanttSemiSizingControl::setup() widget = _minimizedWidget; if( widget ) { if ( _arrowPos == Before || _orient == Qt::Vertical && !isMinimized() ) - _tqlayout->addWidget( widget, 1 ); + _layout->addWidget( widget, 1 ); else - _tqlayout->insertWidget( 0, widget, 1 ); + _layout->insertWidget( 0, widget, 1 ); } } else { if ( _arrowPos == Before || _orient == Qt::Vertical && !isMinimized() ) - _tqlayout->addStretch( 1 ); + _layout->addStretch( 1 ); else - _tqlayout->insertStretch( 0, 1 ); + _layout->insertStretch( 0, 1 ); widget = _maximizedWidget; // the following is only the special case // arrowPos == Before and _orient == Qt::Vertical @@ -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/KDGanttSemiSizingControl.h b/kdgantt/KDGanttSemiSizingControl.h index c1cc0b597..823eddacd 100644 --- a/kdgantt/KDGanttSemiSizingControl.h +++ b/kdgantt/KDGanttSemiSizingControl.h @@ -36,7 +36,7 @@ #define KDGANTTSEMISIZINGCONTROL_H #include "KDGanttSizingControl.h" -#include <tqlayout.h> +#include <layout.h> class TQPushButton; class TQBoxLayout; @@ -83,7 +83,7 @@ private: ArrowPosition _arrowPos; TQWidget* _minimizedWidget; TQWidget* _maximizedWidget; - TQBoxLayout* _tqlayout; + TQBoxLayout* _layout; TQPushButton* _but; }; diff --git a/kdgantt/KDGanttView.cpp b/kdgantt/KDGanttView.cpp index 5a1618a31..1aaa1e468 100644 --- a/kdgantt/KDGanttView.cpp +++ b/kdgantt/KDGanttView.cpp @@ -41,7 +41,7 @@ #include "itemAttributeDialog.h" #include <tqprinter.h> #include <tqpainter.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpaintdevicemetrics.h> #include <tqfile.h> #include <tqheader.h> @@ -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 ); @@ -532,7 +532,7 @@ void KDGanttView::slotMouseButtonPressed ( int button, TQListViewItem * item, the fastest mode. If Medium, there is extra repainting after releasing the scrollbar. This provides fast scrolling with updated content - after scrolling. Recommended, when tqrepaint problems occur. + after scrolling. Recommended, when repaint problems occur. This is the default value after startup. If Always, there is an extra update after every move of the scrollbar. This entails slow scrolling with updated @@ -615,7 +615,7 @@ void KDGanttView::slotHeaderSizeChanged() // legend is cleared - reinit legend with list legendItem* li; for ( li = myLegendItems->first(); li; li = myLegendItems->next() ) { - myLegend->addLegendItem(li->tqshape, li->color, li->text ); + myLegend->addLegendItem(li->shape, li->color, li->text ); } } } @@ -766,25 +766,25 @@ bool KDGanttView::editable() const /*! - Saves the state of the Gantt view in an IO tqdevice in XML format. The saved + Saves the state of the Gantt view in an IO device in XML format. The saved data can be reloaded with \a loadProject(). - \param tqdevice a pointer to the IO tqdevice in which to store the Gantt + \param device a pointer to the IO device in which to store the Gantt view state. \return true if the data could be written, false if an error occurred \sa loadProject() */ -bool KDGanttView::saveProject( TQIODevice* tqdevice ) +bool KDGanttView::saveProject( TQIODevice* device ) { - Q_ASSERT( tqdevice ); + Q_ASSERT( device ); TQDomDocument doc = saveXML(); - if( tqdevice->isOpen() ) - tqdevice->close(); - if( tqdevice->open( IO_WriteOnly ) ) { - TQTextStream ts( tqdevice ); + if( device->isOpen() ) + device->close(); + if( device->open( IO_WriteOnly ) ) { + TQTextStream ts( device ); ts << doc.toString(); return true; } else @@ -796,30 +796,30 @@ bool KDGanttView::saveProject( TQIODevice* tqdevice ) Loads a previously saved state of the Gantt view. All current settings and items are discarded before loading the data. - \param tqdevice a pointer to the IO tqdevice from which to load the + \param device a pointer to the IO device from which to load the Gantt view state. \return true if the file could be read, false if an error occurred \sa saveProject() */ -bool KDGanttView::loadProject( TQIODevice* tqdevice ) +bool KDGanttView::loadProject( TQIODevice* device ) { - Q_ASSERT( tqdevice ); + Q_ASSERT( device ); - if( tqdevice->isOpen() ) - tqdevice->close(); - if( tqdevice->open( IO_ReadOnly ) ) { + if( device->isOpen() ) + device->close(); + if( device->open( IO_ReadOnly ) ) { TQDomDocument doc( "GanttView" ); TQString err; int errline, errcol; - if ( !doc.setContent( tqdevice, &err, &errline, &errcol ) ) { + if ( !doc.setContent( device, &err, &errline, &errcol ) ) { qDebug("KDGantt::Error parsing XML data at line %d. Message is:", errline ); qDebug("%s ", err.latin1()); - tqdevice->close(); + device->close(); return false; } - tqdevice->close(); + device->close(); return loadXML( doc ); } else return false; @@ -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 ); @@ -1209,7 +1209,7 @@ bool KDGanttView::showTaskLinks() const void KDGanttView::setFont(const TQFont& font) { myListView->setFont(font); - myListView->tqrepaint(); + myListView->repaint(); myTimeHeader->setFont(font); myLegend->setFont( font ); TQWidget::setFont( font ); @@ -1299,21 +1299,21 @@ bool KDGanttView::showTimeTablePopupMenu() const /*! - Sets the tqshapes for a certain type of Gantt item. Not all items use - all three tqshapes (e.g., only summary items use the middle tqshape). + Sets the shapes for a certain type of Gantt item. Not all items use + all three shapes (e.g., only summary items use the middle shape). - This setting overrides any tqshape settings made on individual items. + This setting overrides any shape settings made on individual items. These settings will be taken as initial values of any newly created item of this certain type. See also the documentation of the KDGanttViewItem class. - \param type the type of Gantt items for which to set the tqshapes - \param start the tqshape to use for the beginning of the item - \param middle the tqshape to use for the middle of the item - \param end the tqshape to use for the end of the item - \param overwriteExisting if true, overwrites existing tqshape settings + \param type the type of Gantt items for which to set the shapes + \param start the shape to use for the beginning of the item + \param middle the shape to use for the middle of the item + \param end the shape to use for the end of the item + \param overwriteExisting if true, overwrites existing shape settings in the individual items - \sa tqshapes() + \sa shapes() */ void KDGanttView::setShapes( KDGanttViewItem::Type type, KDGanttViewItem::Shape start, @@ -1337,18 +1337,18 @@ void KDGanttView::setShapes( KDGanttViewItem::Type type, /*! - Queries the tqshapes for a particular type of Gantt item. + Queries the shapes for a particular type of Gantt item. - \param type the type of Gantt items for which to query the tqshapes - \param start the start tqshape is returned in this parameter - \param middle the middle tqshape is returned in this parameter - \param end the end tqshape is returned in this parameter - \return true if there was a general tqshape set for the specified - type. If the return value is false, the values of the three tqshape + \param type the type of Gantt items for which to query the shapes + \param start the start shape is returned in this parameter + \param middle the middle shape is returned in this parameter + \param end the end shape is returned in this parameter + \return true if there was a general shape set for the specified + type. If the return value is false, the values of the three shape parameters are undefined. \sa setShapes() */ -bool KDGanttView::tqshapes( KDGanttViewItem::Type type, +bool KDGanttView::shapes( KDGanttViewItem::Type type, KDGanttViewItem::Shape& start, KDGanttViewItem::Shape& middle, KDGanttViewItem::Shape& end ) const @@ -1562,19 +1562,19 @@ void KDGanttView::clearLegend( ) /*! Adds an item to the legend. - \param tqshape the tqshape to display - \param tqshapeColor the color in which to display the tqshape + \param shape the shape to display + \param shapeColor the color in which to display the shape \param text the text to display \sa clearLegend() */ -void KDGanttView::addLegendItem( KDGanttViewItem::Shape tqshape, - const TQColor& tqshapeColor, +void KDGanttView::addLegendItem( KDGanttViewItem::Shape shape, + const TQColor& shapeColor, const TQString& text ) { - myLegend->addLegendItem( tqshape,tqshapeColor,text ); + myLegend->addLegendItem( shape,shapeColor,text ); legendItem* item = new legendItem; - item->tqshape = tqshape; - item->color = tqshapeColor; + item->shape = shape; + item->color = shapeColor; item->text = text; myLegendItems->append( item ); } @@ -3415,58 +3415,58 @@ TQDomDocument KDGanttView::saveXML( bool withPI ) const showTimeTablePopupMenu() ); // the Shapes element - TQDomElement tqshapesElement = doc.createElement( "Shapes" ); - docRoot.appendChild( tqshapesElement ); - TQDomElement tqshapesEventElement = doc.createElement( "Event" ); - tqshapesElement.appendChild( tqshapesEventElement ); + TQDomElement shapesElement = doc.createElement( "Shapes" ); + docRoot.appendChild( shapesElement ); + TQDomElement shapesEventElement = doc.createElement( "Event" ); + shapesElement.appendChild( shapesEventElement ); KDGanttViewItem::Shape start, middle, end; - if( tqshapes( KDGanttViewItem::Event, start, middle, end ) ) { - KDGanttXML::createStringNode( doc, tqshapesEventElement, "Start", - KDGanttViewItem::tqshapeToString( start ) ); - KDGanttXML::createStringNode( doc, tqshapesEventElement, "Middle", - KDGanttViewItem::tqshapeToString( middle ) ); - KDGanttXML::createStringNode( doc, tqshapesEventElement, "End", - KDGanttViewItem::tqshapeToString( end ) ); + if( shapes( KDGanttViewItem::Event, start, middle, end ) ) { + KDGanttXML::createStringNode( doc, shapesEventElement, "Start", + KDGanttViewItem::shapeToString( start ) ); + KDGanttXML::createStringNode( doc, shapesEventElement, "Middle", + KDGanttViewItem::shapeToString( middle ) ); + KDGanttXML::createStringNode( doc, shapesEventElement, "End", + KDGanttViewItem::shapeToString( end ) ); } else { - KDGanttXML::createStringNode( doc, tqshapesEventElement, "Start", + KDGanttXML::createStringNode( doc, shapesEventElement, "Start", "Undefined" ); - KDGanttXML::createStringNode( doc, tqshapesEventElement, "Middle", + KDGanttXML::createStringNode( doc, shapesEventElement, "Middle", "Undefined" ); - KDGanttXML::createStringNode( doc, tqshapesEventElement, "End", + KDGanttXML::createStringNode( doc, shapesEventElement, "End", "Undefined" ); } - TQDomElement tqshapesTaskElement = doc.createElement( "Task" ); - tqshapesElement.appendChild( tqshapesTaskElement ); - if( tqshapes( KDGanttViewItem::Task, start, middle, end ) ) { - KDGanttXML::createStringNode( doc, tqshapesTaskElement, "Start", - KDGanttViewItem::tqshapeToString( start ) ); - KDGanttXML::createStringNode( doc, tqshapesTaskElement, "Middle", - KDGanttViewItem::tqshapeToString( middle ) ); - KDGanttXML::createStringNode( doc, tqshapesTaskElement, "End", - KDGanttViewItem::tqshapeToString( end ) ); + TQDomElement shapesTaskElement = doc.createElement( "Task" ); + shapesElement.appendChild( shapesTaskElement ); + if( shapes( KDGanttViewItem::Task, start, middle, end ) ) { + KDGanttXML::createStringNode( doc, shapesTaskElement, "Start", + KDGanttViewItem::shapeToString( start ) ); + KDGanttXML::createStringNode( doc, shapesTaskElement, "Middle", + KDGanttViewItem::shapeToString( middle ) ); + KDGanttXML::createStringNode( doc, shapesTaskElement, "End", + KDGanttViewItem::shapeToString( end ) ); } else { - KDGanttXML::createStringNode( doc, tqshapesTaskElement, "Start", + KDGanttXML::createStringNode( doc, shapesTaskElement, "Start", "Undefined" ); - KDGanttXML::createStringNode( doc, tqshapesTaskElement, "Middle", + KDGanttXML::createStringNode( doc, shapesTaskElement, "Middle", "Undefined" ); - KDGanttXML::createStringNode( doc, tqshapesTaskElement, "End", + KDGanttXML::createStringNode( doc, shapesTaskElement, "End", "Undefined" ); } - TQDomElement tqshapesSummaryElement = doc.createElement( "Summary" ); - tqshapesElement.appendChild( tqshapesSummaryElement ); - if( tqshapes( KDGanttViewItem::Event, start, middle, end ) ) { - KDGanttXML::createStringNode( doc, tqshapesSummaryElement, "Start", - KDGanttViewItem::tqshapeToString( start ) ); - KDGanttXML::createStringNode( doc, tqshapesSummaryElement, "Middle", - KDGanttViewItem::tqshapeToString( middle ) ); - KDGanttXML::createStringNode( doc, tqshapesSummaryElement, "End", - KDGanttViewItem::tqshapeToString( end ) ); + TQDomElement shapesSummaryElement = doc.createElement( "Summary" ); + shapesElement.appendChild( shapesSummaryElement ); + if( shapes( KDGanttViewItem::Event, start, middle, end ) ) { + KDGanttXML::createStringNode( doc, shapesSummaryElement, "Start", + KDGanttViewItem::shapeToString( start ) ); + KDGanttXML::createStringNode( doc, shapesSummaryElement, "Middle", + KDGanttViewItem::shapeToString( middle ) ); + KDGanttXML::createStringNode( doc, shapesSummaryElement, "End", + KDGanttViewItem::shapeToString( end ) ); } else { - KDGanttXML::createStringNode( doc, tqshapesSummaryElement, "Start", + KDGanttXML::createStringNode( doc, shapesSummaryElement, "Start", "Undefined" ); - KDGanttXML::createStringNode( doc, tqshapesSummaryElement, "Middle", + KDGanttXML::createStringNode( doc, shapesSummaryElement, "Middle", "Undefined" ); - KDGanttXML::createStringNode( doc, tqshapesSummaryElement, "End", + KDGanttXML::createStringNode( doc, shapesSummaryElement, "End", "Undefined" ); } @@ -3604,7 +3604,7 @@ TQDomDocument KDGanttView::saveXML( bool withPI ) const TQDomElement legendItemElement = doc.createElement( "LegendItem" ); legendItemsElement.appendChild( legendItemElement ); KDGanttXML::createStringNode( doc, legendItemElement, "Shape", - KDGanttViewItem::tqshapeToString( current->tqshape ) ); + KDGanttViewItem::shapeToString( current->shape ) ); KDGanttXML::createColorNode( doc, legendItemElement, "Color", current->color ); KDGanttXML::createStringNode( doc, legendItemElement, "Text", @@ -3757,17 +3757,17 @@ void KDGanttView::editItem( KDGanttViewItem* item) /*! - This method returns the pixmap used for a certain tqshape, in the + This method returns the pixmap used for a certain shape, in the selected color and size. - \param tqshape the tqshape to generate - \param tqshapeColor the foreground color of the tqshape - \param backgroundColor the background color of the tqshape - \param itemSize the size of the tqshape - \return the generated tqshape pixmap + \param shape the shape to generate + \param shapeColor the foreground color of the shape + \param backgroundColor the background color of the shape + \param itemSize the size of the shape + \return the generated shape pixmap */ -TQPixmap KDGanttView::getPixmap( KDGanttViewItem::Shape tqshape, - const TQColor& tqshapeColor, +TQPixmap KDGanttView::getPixmap( KDGanttViewItem::Shape shape, + const TQColor& shapeColor, const TQColor& backgroundColor, int itemSize) { // 10 is a good value as size @@ -3777,11 +3777,11 @@ TQPixmap KDGanttView::getPixmap( KDGanttViewItem::Shape tqshape, p.fill( backgroundColor ); TQPainter paint (&p); TQBrush b = TQBrush ( TQt::SolidPattern ); - b.setColor( tqshapeColor ); + b.setColor( shapeColor ); paint.setBrush( b ); TQPen pen( TQt::black, 1 ) ; paint.setPen( pen ); - switch (tqshape) { + switch (shape) { case KDGanttViewItem::TriangleDown:{ TQPointArray arr = TQPointArray(3); arr.setPoint(0,-size/2,-hei); @@ -3864,8 +3864,8 @@ void KDGanttView::initDefaults() myDefaultColor [ getIndex( KDGanttViewItem::Summary ) ] = TQt::cyan;//summary myDefaultColorHL [ getIndex( KDGanttViewItem::Summary ) ] = TQt::red; - // setting the default tqshape types - // currently, we take for each item for all three tqshapes (start, middle, end) the same default tqshape + // setting the default shape types + // currently, we take for each item for all three shapes (start, middle, end) the same default shape for (i = 0;i<3;++i) { myDefaultShape [3*getIndex( KDGanttViewItem::Event )+ i] = KDGanttViewItem::Diamond; //event myDefaultShape [3*getIndex( KDGanttViewItem::Task ) +i] = KDGanttViewItem::Square; //task @@ -4239,7 +4239,7 @@ TQColor KDGanttView::legendHeaderBackgroundColor () const may add as many widgets as you want. They are ordered horizontally from left to right. To remove a widget from the spacer widget, call widget->reparent(newParent,...) or delete the widget. Since the spacer - is a TQHBox, the tqlayout of the added widgets is managed by this + is a TQHBox, the layout of the added widgets is managed by this TQHBox. \param w A pointer to the widget to be added. diff --git a/kdgantt/KDGanttView.h b/kdgantt/KDGanttView.h index 70b423218..ca0f78f3f 100644 --- a/kdgantt/KDGanttView.h +++ b/kdgantt/KDGanttView.h @@ -39,7 +39,7 @@ #include <tqwidget.h> #include <tqlistview.h> #include <tqsplitter.h> -#include <tqlayout.h> +#include <layout.h> #include <tqfont.h> #include <tqdom.h> #include <tqvbox.h> @@ -193,7 +193,7 @@ public: KDGanttViewItem::Shape middle, KDGanttViewItem::Shape end, bool overwriteExisting = true ); - bool tqshapes( KDGanttViewItem::Type type, + bool shapes( KDGanttViewItem::Type type, KDGanttViewItem::Shape& start, KDGanttViewItem::Shape& middle, KDGanttViewItem::Shape& end ) const; @@ -228,7 +228,7 @@ public: TQPtrList<KDGanttViewTaskLinkGroup> taskLinkGroups() const; // Legend-related stuff - void addLegendItem( KDGanttViewItem::Shape tqshape, const TQColor& tqshapeColor, const TQString& text ); + void addLegendItem( KDGanttViewItem::Shape shape, const TQColor& shapeColor, const TQString& text ); void clearLegend(); // Header-related stuff void setHorizonStart( const TQDateTime& start ); @@ -298,7 +298,7 @@ public: void setWeekendDays( int start, int end ); void weekendDays( int& start, int& end ) const; - static TQPixmap getPixmap( KDGanttViewItem::Shape tqshape, const TQColor& tqshapeColor,const TQColor& backgroundColor, int itemSize); + static TQPixmap getPixmap( KDGanttViewItem::Shape shape, const TQColor& shapeColor,const TQColor& backgroundColor, int itemSize); void setHeaderVisible( bool ); bool headerVisible() const; @@ -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; @@ -422,7 +422,7 @@ private slots: void slot_lvDropped(TQDropEvent* e, KDGanttViewItem* droppedItem, KDGanttViewItem* itemBelowMouse ); private: struct legendItem { - KDGanttViewItem::Shape tqshape; + KDGanttViewItem::Shape shape; TQColor color; TQString text; }; diff --git a/kdgantt/KDGanttViewItem.cpp b/kdgantt/KDGanttViewItem.cpp index de80477a5..0bfc72794 100644 --- a/kdgantt/KDGanttViewItem.cpp +++ b/kdgantt/KDGanttViewItem.cpp @@ -52,20 +52,20 @@ directly. Instead, you should create items of one of the subclasses. This class provides methods common to all Gantt items. - The initialization of the tqshapes/colors of the item works as follows: + The initialization of the shapes/colors of the item works as follows: Shapes: - When a new item is created, the tqshapes are set to the default values + When a new item is created, the shapes are set to the default values for items of the type of this item, defined in the KDGanttView class with void setShapes( KDGanttViewItem::Type type, KDGanttViewItem::Shape start, KDGanttViewItem::Shape middle, KDGanttViewItem::Shape end ); If there is no default value defined for this type, - the tqshapes are set as follows: - For TaskViewItems all three tqshapes are set to Square. - For SummaryViewItems all three tqshapes are set to TriangleDown. - For EventViewItems all three tqshapes are set to Diamond. + the shapes are set as follows: + For TaskViewItems all three shapes are set to Square. + For SummaryViewItems all three shapes are set to TriangleDown. + For EventViewItems all three shapes are set to Diamond. Colors: When a new item is created, the colors are set to the default values @@ -75,7 +75,7 @@ const TQColor& middle, const TQColor& end ); If there is no default value defined for this type, - the colors of the tqshapes are set to the default color for items of this type, + the colors of the shapes are set to the default color for items of this type, defined in the KDGanttView class with: void setDefaultColor( KDGanttViewItem::Type type, const TQColor& ); The initial default color in the KDGanttView class is set to @@ -92,7 +92,7 @@ const TQColor& middle, const TQColor& end ); If there is no default value defined for this type, - the highlight colors of the tqshapes are set to the default color for + the highlight colors of the shapes are set to the default color for items of this type, defined in the KDGanttView class with: void setDefaultHighlightColor( KDGanttViewItem::Type type, const TQColor& ); The initial default highlight color in the KDGanttView class is set to red @@ -122,15 +122,15 @@ shown or not. In the other mode (set with setDisplaySubitemsAsGroup( true ); ), called "calendar mode", the item is displayed as follows: - If the item has no tqchildren, it is displayed as usual. - If the item is opened (i.e., its tqchildren are displayed), the + If the item has no children, it is displayed as usual. + If the item is opened (i.e., its children are displayed), the start/end time of this item is computed automatically according to - the earliest start time/latest end time of its tqchildren. The item - and its tqchildren are displayed as usual. - If the item is closed (i.e., its tqchildren are hidden in the left - list view), the item itself is hidden, and its tqchildren are displayed + the earliest start time/latest end time of its children. The item + and its children are displayed as usual. + If the item is closed (i.e., its children are hidden in the left + list view), the item itself is hidden, and its children are displayed on the timeline of this item instead. To control the painting of - overlapping tqchildren, call \a setPriority() for the childs. + overlapping children, call \a setPriority() for the childs. Blocking of user interaction to open item: If you want to block users to open items used as parents of calendar items, @@ -138,7 +138,7 @@ Example 1, Color: If you create an instance of a KDGanttView class and add a SummaryViewItem - without setting any color/tqshape values, you get an item with three tqshapes + without setting any color/shape values, you get an item with three shapes of the form TriangleDown in the color magenta. If the item is highlighted, the color will change to the highlight color red. @@ -147,12 +147,12 @@ \a KDGanttView::setCalendarMode( true ); \a KDGanttView::setDisplaySubitemsAsGroup( true ); Insert root items in the Gantt view. - Insert items as tqchildren of these root item in the Gantt view. + Insert items as children of these root item in the Gantt view. You may use any item type as parent and child; there are no limitations. It is, however, recommended to use KDGanttViewTaskItems - Actually, you may add child items to the tqchildren themselves. + Actually, you may add child items to the children themselves. Such a child behaves then like a parent. - Now set the start/end time of the tqchildren to specify a time + Now set the start/end time of the children to specify a time interval for these items. */ @@ -451,7 +451,7 @@ bool KDGanttViewItem::editable() const Useful to get a so called "calendar view" with many items in one row. When \a displaySubitemsAsGroup() is set to true, this item has a normal view, when it is expanded. If it is not expanded (and has at least one child), - the item itself is hidden, and all tqchildren are displayed instead. + the item itself is hidden, and all children are displayed instead. To manage the painting priority of the childs (if overlapping), you may set \a priority() of these items. @@ -735,7 +735,7 @@ TQString KDGanttViewItem::whatsThisText() const /*! Specifies whether this item should be shown highlighted. The user can also highlight items with the mouse. - If the item displays its subitems (tqchildren) as a group + If the item displays its subitems (children) as a group (displaySubitemsAsGroup() == true), all changes apply to all subitems as well. @@ -773,16 +773,16 @@ bool KDGanttViewItem::highlight() const /*! - Specifies the tqshapes to be used for this item. + Specifies the shapes to be used for this item. - It is advisable not to use this method, but rather set the tqshapes + It is advisable not to use this method, but rather set the shapes for all items of a type with KDGanttView::setShapes() in order to get a uniform Gantt view. - \param start the start tqshape - \param middle the middle tqshape - \param end the end tqshape - \sa tqshapes(), setColors(), colors() + \param start the start shape + \param middle the middle shape + \param end the end shape + \sa shapes(), setColors(), colors() */ void KDGanttViewItem::setShapes( Shape start, Shape middle, Shape end ) { @@ -799,20 +799,20 @@ void KDGanttViewItem::setShapes( Shape start, Shape middle, Shape end ) /*! - Creates tqshapes of the specified type \a tqshape. - The background tqshape color is set to black and the background tqshape - is slightly bit bigger than the foreground tqshape to have a black border - around the foreground tqshape. + Creates shapes of the specified type \a shape. + The background shape color is set to black and the background shape + is slightly bit bigger than the foreground shape to have a black border + around the foreground shape. - \param itemShape the foreground tqshape - \param middle itemShapeBack the background tqshape - \param tqshape the type of the tqshape + \param itemShape the foreground shape + \param middle itemShapeBack the background shape + \param shape the type of the shape (may be TriangleDown, TriangleUp, Diamond, Square, Circle) - \sa tqshapes(), setColors(), colors() + \sa shapes(), setColors(), colors() */ void KDGanttViewItem::createShape( KDCanvasPolygonItem* &itemShape, KDCanvasPolygonItem* &itemShapeBack, - Shape tqshape ) + Shape shape ) { if ( itemShape && type() == Task ) return; @@ -823,7 +823,7 @@ void KDGanttViewItem::createShape( KDCanvasPolygonItem* &itemShape, TQCanvasPolygonalItem * itemBack; int size = myItemSize+2; int hei = (myItemSize/3)/2; - switch (tqshape) { + switch (shape) { case TriangleDown: { item = new KDCanvasPolygon(myGanttView->myTimeTable, this,Type_is_KDGanttViewItem); @@ -912,8 +912,8 @@ void KDGanttViewItem::createShape( KDCanvasPolygonItem* &itemShape, break; } default: - // Uninitialized tqshape, can e.g. be the case with free-busy - // items which don't have any tqshapes + // Uninitialized shape, can e.g. be the case with free-busy + // items which don't have any shapes return; } item->setBrush(Qt::SolidPattern); @@ -927,14 +927,14 @@ void KDGanttViewItem::createShape( KDCanvasPolygonItem* &itemShape, /*! - Returns the tqshapes used for this item + Returns the shapes used for this item - \param start returns the start tqshape - \param middle returns the middle tqshape - \param end returns the end tqshape + \param start returns the start shape + \param middle returns the middle shape + \param end returns the end shape \sa setShapes(), setColors(), colors() */ -void KDGanttViewItem::tqshapes( Shape& start, Shape& middle, Shape& end ) const +void KDGanttViewItem::shapes( Shape& start, Shape& middle, Shape& end ) const { start = myStartShape; middle = myMiddleShape; @@ -943,16 +943,16 @@ void KDGanttViewItem::tqshapes( Shape& start, Shape& middle, Shape& end ) const /*! - Specifies the colors in which to draw the tqshapes of this item. + Specifies the colors in which to draw the shapes of this item. It is advisable not to use this method, but rather set the colors for all items of a type with KDGanttView::setColors() in order to get a uniform Gantt view. - \param start the color for the start tqshape - \param middle the color for the middle tqshape - \param end the color for the end tqshape - \sa colors(), setShapes(), tqshapes(), setDefaultColor(), defaultColor() + \param start the color for the start shape + \param middle the color for the middle shape + \param end the color for the end shape + \sa colors(), setShapes(), shapes(), setDefaultColor(), defaultColor() */ void KDGanttViewItem::setColors( const TQColor& start, const TQColor& middle, const TQColor& end ) @@ -980,7 +980,7 @@ void KDGanttViewItem::setColors( const TQColor& start, const TQColor& middle, \param start returns the start color \param middle returns the middle color \param end returns the end color - \sa setColors(), setShapes(), tqshapes(), setDefaultColor(), defaultColor() + \sa setColors(), setShapes(), shapes(), setDefaultColor(), defaultColor() */ void KDGanttViewItem::colors( TQColor& start, TQColor& middle, TQColor& end ) const { @@ -992,21 +992,21 @@ void KDGanttViewItem::colors( TQColor& start, TQColor& middle, TQColor& end ) co /*! - Specifies the highlight colors in which to draw the tqshapes of this item. + Specifies the highlight colors in which to draw the shapes of this item. It is advisable not to use this method, but rather set the highlight colors for all items of a type with KDGanttView::setHighlightColors() in order to get a uniform Gantt view. - If the item displays its subitems (tqchildren) as a group, + If the item displays its subitems (children) as a group, (displaySubitemsAsGroup() == true) all changes apply to all subitems as well. - \param start the highlight color for the start tqshape - \param middle the highlight color for the middle tqshape - \param end the highlight color for the end tqshape - \sa highlightColors(), setShapes(), tqshapes() + \param start the highlight color for the start shape + \param middle the highlight color for the middle shape + \param end the highlight color for the end shape + \sa highlightColors(), setShapes(), shapes() */ void KDGanttViewItem::setHighlightColors( const TQColor& start, const TQColor& middle, const TQColor& end ) { @@ -1032,7 +1032,7 @@ void KDGanttViewItem::setHighlightColors( const TQColor& start, const TQColor& m \param start returns the start highlight color \param middle returns the middle highlight color \param end returns the end highlight color - \sa setHighlightColors(), setShapes(), tqshapes() + \sa setHighlightColors(), setShapes(), shapes() */ void KDGanttViewItem::highlightColors( TQColor& start, TQColor& middle, TQColor& end ) const { @@ -1048,7 +1048,7 @@ void KDGanttViewItem::highlightColors( TQColor& start, TQColor& middle, TQColor& It is advisable not to use this method, but rather set the text color for all items with KDGanttView::setTextColor() in order to get a uniform Gantt view. - If the item displays its subitems (tqchildren) as a group, + If the item displays its subitems (children) as a group, (displaySubitemsAsGroup() == true) all changes apply to all subitems as well. \param color the text color @@ -1086,7 +1086,7 @@ TQColor KDGanttViewItem::textColor() const /*! \enum KDGanttViewItem::Shape - This enum is used in order to specify the tqshapes of a Gantt chart + This enum is used in order to specify the shapes of a Gantt chart item. */ @@ -1140,7 +1140,7 @@ const TQPixmap* KDGanttViewItem::pixmap( int column ) const for all items of a type with KDGanttView::setDefaultColor() in order to get a uniform Gantt view. - If the item displays its subitems (tqchildren) as a group, + If the item displays its subitems (children) as a group, (displaySubitemsAsGroup() == true) all changes apply to all subitems as well. @@ -1187,7 +1187,7 @@ TQColor KDGanttViewItem::defaultColor() const for all items of a type with KDGanttView::setDefaultHighlightColor() in order to get a uniform Gantt view. - If the item displays its subitems (tqchildren) as a group, + If the item displays its subitems (children) as a group, (displaySubitemsAsGroup() == true) all changes apply to all subitems as well. @@ -1226,7 +1226,7 @@ TQColor KDGanttViewItem::defaultHighlightColor() const /*! Returns the first child of this item. - \return the first child of this item, 0 if this item has no tqchildren + \return the first child of this item, 0 if this item has no children */ KDGanttViewItem* KDGanttViewItem::firstChild() const { @@ -1469,10 +1469,10 @@ void KDGanttViewItem::initColorAndShapes(Type t) setDefaultColor( myGanttView->defaultColor(myType)); // set default highlight color setDefaultHighlightColor(myGanttView->defaultHighlightColor(myType)); - // set tqshapes - if (!( tqshapeDefined = (myGanttView->tqshapes(myType,myStartShape,myMiddleShape,myEndShape)))) { + // set shapes + if (!( shapeDefined = (myGanttView->shapes(myType,myStartShape,myMiddleShape,myEndShape)))) { - //qDebug("KDGantt::KDGanttViewItem created with not user defined tqshapes"); + //qDebug("KDGantt::KDGanttViewItem created with not user defined shapes"); }; setShapes(myStartShape,myMiddleShape,myEndShape); @@ -1486,12 +1486,12 @@ void KDGanttViewItem::initColorAndShapes(Type t) floatStartShape = (KDCanvasPolygonItem*)new KDCanvasRectangle(myGanttView->myTimeTable,this,Type_is_KDGanttViewItem); floatEndShape = (KDCanvasPolygonItem*)new KDCanvasRectangle(myGanttView->myTimeTable,this,Type_is_KDGanttViewItem); - // set color of tqshapes + // set color of shapes if (!( colorDefined = (myGanttView->colors(myType,myStartColor,myMiddleColor,myEndColor)))) { }; setColors(defaultColor(),defaultColor(), defaultColor()); - // set highlight color of tqshapes + // set highlight color of shapes if (!( colorHLDefined = (myGanttView->highlightColors(myType,myStartColorHL,myMiddleColorHL,myEndColorHL)))) { }; @@ -1508,9 +1508,9 @@ void KDGanttViewItem::initColorAndShapes(Type t) } -TQString KDGanttViewItem::tqshapeToString( Shape tqshape ) +TQString KDGanttViewItem::shapeToString( Shape shape ) { - switch( tqshape ) { + switch( shape ) { case TriangleDown: return "TriangleDown"; case TriangleUp: @@ -1571,13 +1571,13 @@ void KDGanttViewItem::createNode( TQDomDocument& doc, KDGanttXML::createBoolNode( doc, itemElement, "Open", isOpen() ); KDGanttXML::createBoolNode( doc, itemElement, "Highlight", highlight() ); Shape startShape, middleShape, endShape; - tqshapes( startShape, middleShape, endShape ); + shapes( startShape, middleShape, endShape ); KDGanttXML::createStringNode( doc, itemElement, "StartShape", - tqshapeToString( startShape ) ); + shapeToString( startShape ) ); KDGanttXML::createStringNode( doc, itemElement, "MiddleShape", - tqshapeToString( middleShape ) ); + shapeToString( middleShape ) ); KDGanttXML::createStringNode( doc, itemElement, "EndShape", - tqshapeToString( endShape ) ); + shapeToString( endShape ) ); KDGanttXML::createColorNode( doc, itemElement, "DefaultColor", defaultColor() ); TQColor startColor, middleColor, endColor; colors( startColor, middleColor, endColor ); @@ -1944,9 +1944,9 @@ void KDGanttViewItem::showSubitemTree( int CoordY ) /*! - Returns the start time of the tqchildren of this item. + Returns the start time of the children of this item. - \return the start time of the tqchildren of this item + \return the start time of the children of this item */ TQDateTime KDGanttViewItem::myChildStartTime() { @@ -1978,9 +1978,9 @@ TQDateTime KDGanttViewItem::myChildStartTime() /*! - Returns the end time of the tqchildren of this item. + Returns the end time of the children of this item. - \return the end time of the tqchildren of this item + \return the end time of the children of this item */ TQDateTime KDGanttViewItem::myChildEndTime() { @@ -2044,7 +2044,7 @@ void KDGanttViewItem::setShowNoInformation( bool show ) /*! If the name of this item is \a name (i.e., listViewText() == name), the pointer to this item is returned. Otherwise, it looks for an - item with name \a name in the set of tqchildren and subtqchildren of + item with name \a name in the set of children and subchildren of this item. \param name the name of the item \return the pointer to the item with name \a name @@ -2365,37 +2365,37 @@ bool KDGanttViewItem::isCalendar( ) const /*! \var KDGanttViewItem::startShape - the tqshape at the beginning of the item + the shape at the beginning of the item */ /*! \var KDGanttViewItem::midShape - the tqshape in the middle of the item + the shape in the middle of the item */ /*! \var KDGanttViewItem::endShape - the tqshape at the end of the item + the shape at the end of the item */ /*! \var KDGanttViewItem::startShapeBack - the background tqshape at the beginning of the item + the background shape at the beginning of the item */ /*! \var KDGanttViewItem::midShapeBack - the background tqshape in the middle of the item + the background shape in the middle of the item */ /*! \var KDGanttViewItem::endShapeBack - the background tqshape at the end of the item + the background shape at the end of the item */ diff --git a/kdgantt/KDGanttViewItem.h b/kdgantt/KDGanttViewItem.h index 9e54755b8..e645029d8 100644 --- a/kdgantt/KDGanttViewItem.h +++ b/kdgantt/KDGanttViewItem.h @@ -146,7 +146,7 @@ public: //bool isCalendar( ) const; void setShapes( Shape start, Shape middle, Shape end ); - void tqshapes( Shape& start, Shape& middle, Shape& end ) const; + void shapes( Shape& start, Shape& middle, Shape& end ) const; void setDefaultColor( const TQColor& ); TQColor defaultColor() const; void setColors( const TQColor& start, const TQColor& middle, @@ -202,7 +202,7 @@ private: friend class KDGanttViewItemDrag; friend class itemAttributeDialog; - static TQString tqshapeToString( Shape tqshape ); + static TQString shapeToString( Shape shape ); static Shape stringToShape( const TQString& string ); static TQString typeToString( Type type ); @@ -242,7 +242,7 @@ private: bool isMyTextCanvas(TQCanvasItem *tc); TQPoint myTextOffset; TQString _name; - bool tqshapeDefined; + bool shapeDefined; int _priority; static TQDict<KDGanttViewItem> sItemDict; diff --git a/kdgantt/KDGanttViewItemDrag.cpp b/kdgantt/KDGanttViewItemDrag.cpp index c73eff67f..158da0411 100644 --- a/kdgantt/KDGanttViewItemDrag.cpp +++ b/kdgantt/KDGanttViewItemDrag.cpp @@ -63,7 +63,7 @@ KDGanttViewItemDrag::KDGanttViewItemDrag( KDGanttViewItem* item , TQWidget *sour pix = *(item->pixmap()) ; else { KDGanttViewItem::Shape start, middle, end; - item->tqshapes( start, middle, end ); + item->shapes( start, middle, end ); TQColor st, mi, en; item->colors( st, mi, en ); pix =item->myGanttView->getPixmap( start, st, item->myGanttView->lvBackgroundColor(), 11 ); @@ -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..bb0756f38 100644 --- a/kdgantt/KDGanttViewSubwidgets.cpp +++ b/kdgantt/KDGanttViewSubwidgets.cpp @@ -48,7 +48,7 @@ #include <tqtooltip.h> #include <tqapplication.h> #include <tqdrawutil.h> -#include <tqpalette.h> +#include <palette.h> #include <tqdragobject.h> #include <tqptrlist.h> #include <tqpen.h> @@ -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; @@ -792,7 +792,7 @@ void KDTimeHeaderWidget::preparePopupMenu() if (flagZoomToFit) myPopupMenu->changeItem( 1, i18n("Zoom (Fit)")); else - myPopupMenu->changeItem( 1, i18n("Zoom (%1)").tqarg( TQString::number( zoomFactor(), 'f',3) ) ); + myPopupMenu->changeItem( 1, i18n("Zoom (%1)").arg( TQString::number( zoomFactor(), 'f',3) ) ); int i = 0; int id; while ( ( id = scalePopupMenu->idAt( i++ )) >= 0 ) { @@ -1140,7 +1140,7 @@ void KDTimeHeaderWidget::zoomToSelection( TQDateTime start, TQDateTime end) } flagDoNotRepaintAfterChange = false; updateTimeTable(); - tqrepaint(); + repaint(); moveTimeLineTo((getCoordX(start)-(viewWid-timeWid)/2)); // Since we have disconnected autoupdate of scrollbars, we must do it ourselves if (myGanttView && myGanttView->myCanvasView) @@ -1487,7 +1487,7 @@ void KDTimeHeaderWidget::computeIntervals( int height ) { IntervalColorList::const_iterator it; for ( it = icList.begin(); it != icList.end(); ++it ) { - (*it)->tqlayout( this, height ); + (*it)->layout( this, height ); } } @@ -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; @@ -2207,13 +2207,13 @@ void KDTimeHeaderWidget::computeTicks(bool doNotComputeRealScale) myGridMinorWidth = Width; // the width of this widget is the gridwidth * the amount of items Width *= minorItems; - // if size changed, reset tqgeometry + // if size changed, reset geometry if (width() != Width || height() != Height ) { resize( Width, Height ); emit sizeChanged( Width ); } - myMajorGridHeight = tqitemRectMajor.height()+5; + myMajorGridHeight = itemRectMajor.height()+5; TQTime tempTime = myRealStart.time(); TQDateTime tempDateTime; int i; @@ -2343,7 +2343,7 @@ void KDTimeHeaderWidget::computeTicks(bool doNotComputeRealScale) myGanttView->myTimeTable->setBlockUpdating( block ); updateTimeTable(); centerDateTime(myCenterDateTime); - tqrepaint(); + repaint(); } @@ -2489,7 +2489,7 @@ void KDTimeHeaderWidget::mouseReleaseEvent ( TQMouseEvent * ) //zoomToSelection( getDateTimeForIndex(start),getDateTimeForIndex(end) ); } mouseDown = false; - tqrepaint(); + repaint(); } @@ -2504,11 +2504,11 @@ void KDTimeHeaderWidget::mouseMoveEvent ( TQMouseEvent * e ) if ( mouseDown ) { if ( e->pos().y() < -height() || e->pos().y() > 2* height() ) { mouseDown = false; - tqrepaint(); + repaint(); return; } endMouseDown = e->pos().x(); - //tqrepaint; + //repaint; int val = -1; if (endMouseDown < -x() ) { val = myGanttView->myCanvasView->horizontalScrollBar()->value() - @@ -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()); } @@ -2652,7 +2652,7 @@ void KDLegendWidget::clearLegend ( ) myLegend->setFont( font() ); scroll->addChild( myLegend ); scroll->setResizePolicy( TQScrollView::AutoOneFit ); - myLegend->tqlayout()->setMargin( 11 ); + myLegend->layout()->setMargin( 11 ); myLegend->setFrameStyle( TQFrame::NoFrame ); if ( dock ) scroll->setMaximumHeight( 32000 ); @@ -2661,10 +2661,10 @@ void KDLegendWidget::clearLegend ( ) } -void KDLegendWidget::addLegendItem( KDGanttViewItem::Shape tqshape, const TQColor& tqshapeColor, const TQString& text ) +void KDLegendWidget::addLegendItem( KDGanttViewItem::Shape shape, const TQColor& shapeColor, const TQString& text ) { TQLabel * temp; - TQPixmap p = KDGanttView::getPixmap( tqshape, tqshapeColor, TQt::white, 10); + TQPixmap p = KDGanttView::getPixmap( shape, shapeColor, TQt::white, 10); TQWidget *w = new TQWidget( myLegend ); w->setBackgroundColor( TQt::white ); TQHBoxLayout *lay = new TQHBoxLayout( w ,0, 6); @@ -2884,7 +2884,7 @@ void KDListView::drawAllContents(TQPainter * p, int cx, int cy, int cw, int ch) c = fc; // draw to last interesting column - const TQColorGroup &cg = ( tqpalette().inactive() ); + const TQColorGroup &cg = ( palette().inactive() ); while ( c < lc && !drawables.isEmpty() ) { int i = header()->mapToLogical( c ); @@ -2921,7 +2921,7 @@ void KDListView::drawAllContents(TQPainter * p, int cx, int cy, int cw, int ch) if ( tx < 0 ) tx = header()->cellPos( cell ); - // do any tqchildren of current need to be painted? + // do any children of current need to be painted? /* FIXME: painting branches doesn't work for some reason... if ( ih != ith && rootIsDecorated() && @@ -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; @@ -4018,7 +4018,7 @@ void KDIntervalColorRectangle::setColor( const TQColor& color ) /*! \internal */ -void KDIntervalColorRectangle::tqlayout( KDTimeHeaderWidget* timeHeader, int height ) +void KDIntervalColorRectangle::layout( KDTimeHeaderWidget* timeHeader, int height ) { int left = timeHeader->getCoordX(mStart); int right = timeHeader->getCoordX(mEnd); diff --git a/kdgantt/KDGanttViewSubwidgets.h b/kdgantt/KDGanttViewSubwidgets.h index 7b553222a..e8f27f8eb 100644 --- a/kdgantt/KDGanttViewSubwidgets.h +++ b/kdgantt/KDGanttViewSubwidgets.h @@ -49,9 +49,9 @@ #include <tqtimer.h> #include <tqgroupbox.h> #include <tqvgroupbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> -#include <tqbrush.h> +#include <brush.h> #include <tqvbox.h> #include <tqdockwindow.h> #include <tqtimer.h> @@ -337,7 +337,7 @@ public: KDLegendWidget ( TQWidget* parent, KDGanttMinimizeSplitter* legendParent ); void showMe(bool); bool isShown(); - void addLegendItem( KDGanttViewItem::Shape tqshape, const TQColor& tqshapeColor, const TQString& text ); + void addLegendItem( KDGanttViewItem::Shape shape, const TQColor& shapeColor, const TQString& text ); void clearLegend(); void setFont( TQFont ); void drawToPainter( TQPainter *p ); @@ -471,7 +471,7 @@ public: enum HitTest { Start, Middle, End }; HitTest hitTest( KDTimeHeaderWidget* timeHeader, const TQPoint& pos ) const; - void tqlayout( KDTimeHeaderWidget* timeHeader, int height ); + void layout( KDTimeHeaderWidget* timeHeader, int height ); static const int RTTI = 0x0c58; /*reimp*/ int rtti() const { return RTTI; } diff --git a/kdgantt/KDGanttViewTaskItem.cpp b/kdgantt/KDGanttViewTaskItem.cpp index a89f23603..605cb9919 100644 --- a/kdgantt/KDGanttViewTaskItem.cpp +++ b/kdgantt/KDGanttViewTaskItem.cpp @@ -43,7 +43,7 @@ This class represents calendar items in Gantt charts. - A calendar item in a Gantt chart has no start/end tqshape, + A calendar item in a Gantt chart has no start/end shape, it is displayed as a rectangle. You can set the colors as usual, where only the first argument of setColors( col, col, col ) diff --git a/kdgantt/KDGanttXMLTools.cpp b/kdgantt/KDGanttXMLTools.cpp index 5f2909c07..367c8035a 100644 --- a/kdgantt/KDGanttXMLTools.cpp +++ b/kdgantt/KDGanttXMLTools.cpp @@ -33,7 +33,7 @@ **********************************************************************/ #include "KDGanttXMLTools.h" -#include <tqbrush.h> +#include <brush.h> #include <tqbuffer.h> #include <tqimage.h> #include <zlib.h> diff --git a/kdgantt/Makefile.am b/kdgantt/Makefile.am index 39e20bcb8..81222706b 100644 --- a/kdgantt/Makefile.am +++ b/kdgantt/Makefile.am @@ -33,7 +33,7 @@ noinst_HEADERS = \ KDGanttViewTaskLink.h \ KDGanttXMLTools.h \ itemAttributeDialog.ui.h \ - qtqlayoutengine_p.h + qlayoutengine_p.h METASOURCES = AUTO diff --git a/kdgantt/itemAttributeDialog.ui b/kdgantt/itemAttributeDialog.ui index a3616dcad..5a34dbb5e 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> @@ -462,7 +462,7 @@ <property name="text"> <string>Text color:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> diff --git a/kdgantt/itemAttributeDialog.ui.h b/kdgantt/itemAttributeDialog.ui.h index 3ab24af83..8624d45d5 100644 --- a/kdgantt/itemAttributeDialog.ui.h +++ b/kdgantt/itemAttributeDialog.ui.h @@ -54,7 +54,7 @@ void itemAttributeDialog::ChangeText_clicked() myItem->setTextColor( c ); TQPixmap * pix = (TQPixmap *)ChangeText->pixmap(); pix->fill( myItem->textColor() ); - ChangeText->tqrepaint(); + ChangeText->repaint(); } @@ -62,7 +62,7 @@ void itemAttributeDialog::ChangeStart_clicked() { if ( !myItem) return; KDGanttViewItem::Shape start, middle, end; - myItem->tqshapes( start, middle, end ); + myItem->shapes( start, middle, end ); TQColor st, mi, en; myItem->colors( st, mi, en ); TQColor c = TQColorDialog::getColor( st, this ); @@ -79,7 +79,7 @@ void itemAttributeDialog::ChangeMiddle_clicked() { if ( !myItem) return; KDGanttViewItem::Shape start, middle, end; - myItem->tqshapes( start, middle, end ); + myItem->shapes( start, middle, end ); TQColor st, mi, en; myItem->colors( st, mi, en ); TQColor c = TQColorDialog::getColor( mi, this ); @@ -95,7 +95,7 @@ void itemAttributeDialog::ChangeEnd_clicked() { if ( !myItem) return; KDGanttViewItem::Shape start, middle, end; - myItem->tqshapes( start, middle, end ); + myItem->shapes( start, middle, end ); TQColor st, mi, en; myItem->colors( st, mi, en ); TQColor c = TQColorDialog::getColor( en, this ); @@ -244,7 +244,7 @@ void itemAttributeDialog::reset( KDGanttViewItem * item ) // DateEdit3->setRange(item->startTime().date(), item->endTime().date().addYears(10)); LineEdit1->setText( item->text() ); KDGanttViewItem::Shape start, middle, end; - item->tqshapes( start, middle, end ); + item->shapes( start, middle, end ); TQColor st, mi, en; item->colors( st, mi, en ); ChangeStart->setPixmap( KDGanttView::getPixmap( start, st, backgroundColor(), 10 ) ); @@ -272,7 +272,7 @@ void itemAttributeDialog::HighStart_clicked() { if ( !myItem) return; KDGanttViewItem::Shape start, middle, end; - myItem->tqshapes( start, middle, end ); + myItem->shapes( start, middle, end ); TQColor st, mi, en; myItem->highlightColors( st, mi, en ); TQColor c = TQColorDialog::getColor( st, this ); @@ -289,7 +289,7 @@ void itemAttributeDialog::HighMiddle_clicked() { if ( !myItem) return; KDGanttViewItem::Shape start, middle, end; - myItem->tqshapes( start, middle, end ); + myItem->shapes( start, middle, end ); TQColor st, mi, en; myItem->highlightColors( st, mi, en ); TQColor c = TQColorDialog::getColor( mi, this ); @@ -306,7 +306,7 @@ void itemAttributeDialog::HighEnd_clicked() { if ( !myItem) return; KDGanttViewItem::Shape start, middle, end; - myItem->tqshapes( start, middle, end ); + myItem->shapes( start, middle, end ); TQColor st, mi, en; myItem->highlightColors( st, mi, en ); TQColor c = TQColorDialog::getColor( en, this ); @@ -409,7 +409,7 @@ void itemAttributeDialog::LineEdit1_textChanged( const TQString & ) void itemAttributeDialog::StartBox_activated( const TQString & s ) { KDGanttViewItem::Shape start, middle, end; - myItem->tqshapes( start, middle, end ); + myItem->shapes( start, middle, end ); start = KDGanttViewItem::stringToShape( s ); myItem->setShapes( start, middle, end ); reset( myItem ); @@ -419,7 +419,7 @@ void itemAttributeDialog::StartBox_activated( const TQString & s ) void itemAttributeDialog::MiddleBox_activated( const TQString & s ) { KDGanttViewItem::Shape start, middle, end; - myItem->tqshapes( start, middle, end ); + myItem->shapes( start, middle, end ); middle = KDGanttViewItem::stringToShape( s ); myItem->setShapes( start, middle, end ); reset( myItem ); @@ -430,7 +430,7 @@ void itemAttributeDialog::MiddleBox_activated( const TQString & s ) void itemAttributeDialog::EndBox_activated( const TQString & s ) { KDGanttViewItem::Shape start, middle, end; - myItem->tqshapes( start, middle, end ); + myItem->shapes( start, middle, end ); end = KDGanttViewItem::stringToShape( s ); myItem->setShapes( start, middle, end ); reset( myItem ); diff --git a/kdgantt/qlayoutengine_p.h b/kdgantt/qlayoutengine_p.h index 1f03331d2..27fd861b9 100644 --- a/kdgantt/qlayoutengine_p.h +++ b/kdgantt/qlayoutengine_p.h @@ -46,7 +46,7 @@ // ------------- // // This file is not part of the TQt API. It exists for the convenience -// of qtqlayout.cpp, qlayoutengine.cpp, qmainwindow.cpp and qsplitter.cpp. +// of qlayout.cpp, qlayoutengine.cpp, qmainwindow.cpp and qsplitter.cpp. // This header file may change from version to version without notice, // or even be removed. // @@ -56,21 +56,21 @@ #ifndef TQT_H -#include "tqabstractqlayout.h" +#include "tqabstraclayout.h" #endif // TQT_H #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/KGanttItem.h b/kgantt/kgantt/KGanttItem.h index 1113c9d00..ee95ba48f 100644 --- a/kgantt/kgantt/KGanttItem.h +++ b/kgantt/kgantt/KGanttItem.h @@ -34,7 +34,7 @@ #include <tqobject.h> #include <tqdatetime.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqptrlist.h> #include <tqpainter.h> diff --git a/kgantt/kgantt/KGanttRelation.h b/kgantt/kgantt/KGanttRelation.h index 42323026e..ff2199c83 100644 --- a/kgantt/kgantt/KGanttRelation.h +++ b/kgantt/kgantt/KGanttRelation.h @@ -30,7 +30,7 @@ #include <tqobject.h> #include <tqdatetime.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqptrlist.h> #include <tqpainter.h> diff --git a/kgantt/kgantt/itemedit.ui b/kgantt/kgantt/itemedit.ui index 3810b43a7..8ebfc02b1 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> @@ -47,7 +47,7 @@ <property name="text"> <string>Item text:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignBottom|AlignLeft</set> </property> <property name="vAlign" stdset="0"> @@ -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..4e990183c 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> @@ -314,7 +314,7 @@ <property name="textFormat"> <enum>PlainText</enum> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignBottom|AlignLeft</set> </property> <property name="vAlign" stdset="0"> diff --git a/kioslaves/imap4/imap4.cc b/kioslaves/imap4/imap4.cc index 6671981eb..8e15274f2 100644 --- a/kioslaves/imap4/imap4.cc +++ b/kioslaves/imap4/imap4.cc @@ -610,9 +610,9 @@ IMAP4Protocol::listDir (const KURL & _url) } if ( !selectInfo.alert().isNull() ) { if ( !myBox.isEmpty() ) { - warning( i18n( "Message from %1 while processing '%2': %3" ).tqarg( myHost, myBox, selectInfo.alert() ) ); + warning( i18n( "Message from %1 while processing '%2': %3" ).arg( myHost, myBox, selectInfo.alert() ) ); } else { - warning( i18n( "Message from %1: %2" ).tqarg( myHost, TQString(selectInfo.alert()) ) ); + warning( i18n( "Message from %1: %2" ).arg( myHost, TQString(selectInfo.alert()) ) ); } selectInfo.setAlert( 0 ); } @@ -934,7 +934,7 @@ IMAP4Protocol::mkdir (const KURL & _url, int) if ( ask && messageBox(QuestionYesNo, i18n("The following folder will be created on the server: %1 " - "What do you want to store in this folder?").tqarg( aBox ), + "What do you want to store in this folder?").arg( aBox ), i18n("Create Folder"), i18n("&Messages"), i18n("&Subfolders")) == KMessageBox::No ) { @@ -1272,8 +1272,8 @@ IMAP4Protocol::special (const TQByteArray & aData) completeQueue.removeRef (cmd); error(ERR_SLAVE_DEFINED, i18n("Unsubscribe of folder %1 " "failed. The server returned: %2") - .tqarg(_url.prettyURL()) - .tqarg(cmd->resultInfo())); + .arg(_url.prettyURL()) + .arg(cmd->resultInfo())); return; } completeQueue.removeRef (cmd); @@ -1293,8 +1293,8 @@ IMAP4Protocol::special (const TQByteArray & aData) completeQueue.removeRef (cmd); error(ERR_SLAVE_DEFINED, i18n("Subscribe of folder %1 " "failed. The server returned: %2") - .tqarg(_url.prettyURL()) - .tqarg(cmd->resultInfo())); + .arg(_url.prettyURL()) + .arg(cmd->resultInfo())); return; } completeQueue.removeRef (cmd); @@ -1361,7 +1361,7 @@ IMAP4Protocol::special (const TQByteArray & aData) { completeQueue.removeRef (cmd); error(ERR_COULD_NOT_WRITE, i18n("Changing the flags of message %1 " - "failed.").tqarg(_url.prettyURL())); + "failed.").arg(_url.prettyURL())); return; } completeQueue.removeRef (cmd); @@ -1373,7 +1373,7 @@ IMAP4Protocol::special (const TQByteArray & aData) { completeQueue.removeRef (cmd); error(ERR_COULD_NOT_WRITE, i18n("Changing the flags of message %1 " - "failed.").tqarg(_url.prettyURL())); + "failed.").arg(_url.prettyURL())); return; } completeQueue.removeRef (cmd); @@ -1404,7 +1404,7 @@ IMAP4Protocol::special (const TQByteArray & aData) { completeQueue.removeRef (cmd); error(ERR_COULD_NOT_WRITE, i18n("Changing the flags of message %1 " - "failed.").tqarg(_url.prettyURL())); + "failed.").arg(_url.prettyURL())); return; } completeQueue.removeRef (cmd); @@ -1451,9 +1451,9 @@ IMAP4Protocol::specialACLCommand( int command, TQDataStream& stream ) { error(ERR_SLAVE_DEFINED, i18n("Setting the Access Control List on folder %1 " "for user %2 failed. The server returned: %3") - .tqarg(_url.prettyURL()) - .tqarg(user) - .tqarg(cmd->resultInfo())); + .arg(_url.prettyURL()) + .arg(user) + .arg(cmd->resultInfo())); return; } completeQueue.removeRef (cmd); @@ -1470,9 +1470,9 @@ IMAP4Protocol::specialACLCommand( int command, TQDataStream& stream ) { error(ERR_SLAVE_DEFINED, i18n("Deleting the Access Control List on folder %1 " "for user %2 failed. The server returned: %3") - .tqarg(_url.prettyURL()) - .tqarg(user) - .tqarg(cmd->resultInfo())); + .arg(_url.prettyURL()) + .arg(user) + .arg(cmd->resultInfo())); return; } completeQueue.removeRef (cmd); @@ -1487,8 +1487,8 @@ IMAP4Protocol::specialACLCommand( int command, TQDataStream& stream ) { error(ERR_SLAVE_DEFINED, i18n("Retrieving the Access Control List on folder %1 " "failed. The server returned: %2") - .tqarg(_url.prettyURL()) - .tqarg(cmd->resultInfo())); + .arg(_url.prettyURL()) + .arg(cmd->resultInfo())); return; } // Returning information to the application from a special() command isn't easy. @@ -1514,8 +1514,8 @@ IMAP4Protocol::specialACLCommand( int command, TQDataStream& stream ) { error(ERR_SLAVE_DEFINED, i18n("Retrieving the Access Control List on folder %1 " "failed. The server returned: %2") - .tqarg(_url.prettyURL()) - .tqarg(cmd->resultInfo())); + .arg(_url.prettyURL()) + .arg(cmd->resultInfo())); return; } TQStringList lst = getResults(); @@ -1548,8 +1548,8 @@ IMAP4Protocol::specialSearchCommand( TQDataStream& stream ) { error(ERR_SLAVE_DEFINED, i18n("Searching of folder %1 " "failed. The server returned: %2") - .tqarg(aBox) - .tqarg(cmd->resultInfo())); + .arg(aBox) + .arg(cmd->resultInfo())); return; } completeQueue.removeRef(cmd); @@ -1582,9 +1582,9 @@ IMAP4Protocol::specialCustomCommand( TQDataStream& stream ) { error(ERR_SLAVE_DEFINED, i18n("Custom command %1:%2 " "failed. The server returned: %3") - .tqarg(command) - .tqarg(arguments) - .tqarg(cmd->resultInfo())); + .arg(command) + .arg(arguments) + .arg(cmd->resultInfo())); return; } completeQueue.removeRef(cmd); @@ -1665,9 +1665,9 @@ IMAP4Protocol::specialAnnotateMoreCommand( int command, TQDataStream& stream ) { error(ERR_SLAVE_DEFINED, i18n("Setting the annotation %1 on folder %2 " " failed. The server returned: %3") - .tqarg(entry) - .tqarg(_url.prettyURL()) - .tqarg(cmd->resultInfo())); + .arg(entry) + .arg(_url.prettyURL()) + .arg(cmd->resultInfo())); return; } completeQueue.removeRef (cmd); @@ -1689,9 +1689,9 @@ IMAP4Protocol::specialAnnotateMoreCommand( int command, TQDataStream& stream ) { error(ERR_SLAVE_DEFINED, i18n("Retrieving the annotation %1 on folder %2 " "failed. The server returned: %3") - .tqarg(entry) - .tqarg(_url.prettyURL()) - .tqarg(cmd->resultInfo())); + .arg(entry) + .arg(_url.prettyURL()) + .arg(cmd->resultInfo())); return; } // Returning information to the application from a special() command isn't easy. @@ -1726,8 +1726,8 @@ IMAP4Protocol::specialQuotaCommand( int command, TQDataStream& stream ) { error(ERR_SLAVE_DEFINED, i18n("Retrieving the quota root information on folder %1 " "failed. The server returned: %2") - .tqarg(_url.prettyURL()) - .tqarg(cmd->resultInfo())); + .arg(_url.prettyURL()) + .arg(cmd->resultInfo())); return; } infoMessage(getResults().join( "\r" )); @@ -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 @@ -2051,7 +2051,7 @@ bool IMAP4Protocol::makeLogin () { error(ERR_COULD_NOT_LOGIN, i18n("The server %1 supports neither " "IMAP4 nor IMAP4rev1.\nIt identified itself with: %2") - .tqarg(myHost).tqarg(greeting)); + .arg(myHost).arg(greeting)); closeConnection(); return false; } @@ -2102,7 +2102,7 @@ bool IMAP4Protocol::makeLogin () else { if (!hasCapability (TQString ("AUTH=") + myAuth)) { error (ERR_COULD_NOT_LOGIN, i18n("The authentication method %1 is not " - "supported by the server.").tqarg(myAuth)); + "supported by the server.").arg(myAuth)); closeConnection(); return false; } @@ -2144,14 +2144,14 @@ bool IMAP4Protocol::makeLogin () } if (!clientLogin (myUser, myPass, resultInfo)) error(KIO::ERR_COULD_NOT_AUTHENTICATE, i18n("Unable to login. Probably the " - "password is wrong.\nThe server %1 replied:\n%2").tqarg(myHost).tqarg(resultInfo)); + "password is wrong.\nThe server %1 replied:\n%2").arg(myHost).arg(resultInfo)); } else { #ifdef HAVE_LIBSASL2 if (!clientAuthenticate (this, authInfo, myHost, myAuth, mySSL, resultInfo)) error(KIO::ERR_COULD_NOT_AUTHENTICATE, i18n("Unable to authenticate via %1.\n" - "The server %2 replied:\n%3").tqarg(myAuth).tqarg(myHost).tqarg(resultInfo)); + "The server %2 replied:\n%3").arg(myAuth).arg(myHost).arg(resultInfo)); else { myUser = authInfo.username; myPass = authInfo.password; @@ -2701,7 +2701,7 @@ IMAP4Protocol::assureBox (const TQString & aBox, bool readonly) // not allowed to enter this folder error(ERR_ACCESS_DENIED, cmdInfo); } else { - error(ERR_SLAVE_DEFINED, i18n("Unable to open folder %1. The server replied: %2").tqarg(aBox).tqarg(cmdInfo)); + error(ERR_SLAVE_DEFINED, i18n("Unable to open folder %1. The server replied: %2").arg(aBox).arg(cmdInfo)); } } else { error(KIO::ERR_DOES_NOT_EXIST, aBox); @@ -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/imaplist.cc b/kioslaves/imap4/imaplist.cc index 13309089e..92918d8c1 100644 --- a/kioslaves/imap4/imaplist.cc +++ b/kioslaves/imap4/imaplist.cc @@ -124,9 +124,9 @@ void imapList::parseAttributes( parseString & str ) marked_ = true; else if (-1 != attribute.find ("\\unmarked")) unmarked_ = true; - else if (-1 != attribute.find ("\\hastqchildren")) + else if (-1 != attribute.find ("\\haschildren")) hasChildren_ = true; - else if (-1 != attribute.find ("\\hasnotqchildren")) + else if (-1 != attribute.find ("\\hasnochildren")) hasNoChildren_ = true; else kdDebug(7116) << "imapList::imapList: bogus attribute " << attribute << endl; diff --git a/kioslaves/imap4/imapparser.cc b/kioslaves/imap4/imapparser.cc index 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/mailheader.h b/kioslaves/imap4/mailheader.h index 72ac6e48d..633d61b78 100644 --- a/kioslaves/imap4/mailheader.h +++ b/kioslaves/imap4/mailheader.h @@ -94,7 +94,7 @@ public: } /** - * set a tqunicode subject + * set a unicode subject */ void setSubject (const TQString & _str) { @@ -109,7 +109,7 @@ public: } /** - * get the tqunicode subject + * get the unicode subject */ const TQString getSubject () { 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/imap4/rfcdecoder.cc b/kioslaves/imap4/rfcdecoder.cc index 4eeb207d5..88cbe2abd 100644 --- a/kioslaves/imap4/rfcdecoder.cc +++ b/kioslaves/imap4/rfcdecoder.cc @@ -28,7 +28,7 @@ #include <stdio.h> #include <stdlib.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <tqbuffer.h> #include <tqregexp.h> #include <kmdcodec.h> @@ -653,13 +653,13 @@ rfcDecoder::decodeRFC2231String (const TQString & _str) { if (st.at (p) == 37) { - ch = st.tqat (p + 1).latin1 () - 48; + ch = st.at (p + 1).latin1 () - 48; if (ch > 16) ch -= 7; - ch2 = st.tqat (p + 2).latin1 () - 48; + ch2 = st.at (p + 2).latin1 () - 48; if (ch2 > 16) ch2 -= 7; - st.tqat (p) = ch * 16 + ch2; + st.at (p) = ch * 16 + ch2; st.remove (p + 1, 2); } p++; diff --git a/kioslaves/mbox/readmbox.cc b/kioslaves/mbox/readmbox.cc index f2af8716b..f762bf3ed 100644 --- a/kioslaves/mbox/readmbox.cc +++ b/kioslaves/mbox/readmbox.cc @@ -29,7 +29,7 @@ #include <tqfile.h> #include <tqfileinfo.h> #include <tqstring.h> -#include <tqtextstream.h> +#include <textstream.h> #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> @@ -145,7 +145,7 @@ void ReadMBox::rewind() if( !m_stream ) return; //Rewinding not possible - m_stream->tqdevice()->reset(); + m_stream->device()->reset(); m_atend = m_stream->atEnd(); } diff --git a/kioslaves/mbox/stat.cc b/kioslaves/mbox/stat.cc index 6d5bf75a6..00285b149 100644 --- a/kioslaves/mbox/stat.cc +++ b/kioslaves/mbox/stat.cc @@ -50,7 +50,7 @@ KIO::UDSEntry Stat::stat( ReadMBox& mbox, const UrlInfo& info ) Stat::addAtom( entry, KIO::UDS_FILE_TYPE, S_IFREG ); Stat::addAtom( entry, KIO::UDS_MIME_TYPE, "message/rfc822" ); - url = TQString( "mbox:%1/%2" ).tqarg( info.filename(), mbox.currentID() ); + url = TQString( "mbox:%1/%2" ).arg( info.filename(), mbox.currentID() ); Stat::addAtom( entry, KIO::UDS_URL, url ); if( mbox.currentID().isEmpty() ) Stat::addAtom( entry, KIO::UDS_NAME, "foobar" ); @@ -79,7 +79,7 @@ KIO::UDSEntry Stat::statMessage( const UrlInfo& info ) { kdDebug() << "statMessage( " << info.url() << " )" << endl; KIO::UDSEntry entry; - TQString url = TQString( "mbox:%1" ).tqarg( info.url() ); + TQString url = TQString( "mbox:%1" ).arg( info.url() ); //Specific things for a message Stat::addAtom( entry, KIO::UDS_FILE_TYPE, S_IFREG ); diff --git a/kioslaves/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..4e7e75d30 100644 --- a/kioslaves/sieve/sieve.cpp +++ b/kioslaves/sieve/sieve.cpp @@ -340,7 +340,7 @@ bool kio_sieveProtocol::connect(bool useTLSIfAvailable) if (isConnectionValid()) return true; - infoMessage(i18n("Connecting to %1...").tqarg( m_sServer)); + infoMessage(i18n("Connecting to %1...").arg( m_sServer)); if (m_connMode == CONNECTION_ORIENTED && m_shouldBeConnected) { error(ERR_CONNECTION_BROKEN, i18n("The connection to the server was lost.")); @@ -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(); }*/ @@ -626,7 +626,7 @@ void kio_sieveProtocol::put(const KURL& url, int /*permissions*/, bool /*overwri error(ERR_UNSUPPORTED_PROTOCOL, i18n("A protocol error occurred " "while trying to negotiate script uploading.\n" "The server responded:\n%1") - .tqarg(r.getAction().right(r.getAction().length() - 3))); + .arg(r.getAction().right(r.getAction().length() - 3))); return; } }*/ @@ -672,7 +672,7 @@ void kio_sieveProtocol::put(const KURL& url, int /*permissions*/, bool /*overwri error(ERR_INTERNAL_SERVER, i18n("The script did not upload successfully.\n" "This is probably due to errors in the script.\n" - "The server responded:\n%1").tqarg(TQString(errmsg))); + "The server responded:\n%1").arg(TQString(errmsg))); // clear the rest of the incoming data receiveData(); @@ -680,7 +680,7 @@ void kio_sieveProtocol::put(const KURL& url, int /*permissions*/, bool /*overwri error(ERR_INTERNAL_SERVER, i18n("The script did not upload successfully.\n" "This is probably due to errors in the script.\n" - "The server responded:\n%1").tqarg(TQString(r.getKey()))); + "The server responded:\n%1").arg(TQString(r.getKey()))); } else error(ERR_INTERNAL_SERVER, i18n("The script did not upload successfully.\n" @@ -1016,7 +1016,7 @@ bool kio_sieveProtocol::saslInteract( void *in, AuthInfo &ai ) return true; } -#define SASLERROR error(ERR_COULD_NOT_AUTHENTICATE, i18n("An error occurred during authentication: %1").tqarg( \ +#define SASLERROR error(ERR_COULD_NOT_AUTHENTICATE, i18n("An error occurred during authentication: %1").arg( \ TQString::fromUtf8( sasl_errdetail( conn ) ))); bool kio_sieveProtocol::authenticate() @@ -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 += "\""; } @@ -1109,7 +1109,7 @@ bool kio_sieveProtocol::authenticate() sasl_dispose( &conn ); error(ERR_SLAVE_DEFINED, i18n("A protocol error occurred during authentication.\n" - "Choose a different authentication method to %1.").tqarg(mechusing)); + "Choose a different authentication method to %1.").arg(mechusing)); return false; } @@ -1121,7 +1121,7 @@ bool kio_sieveProtocol::authenticate() sasl_dispose( &conn ); error(ERR_UNSUPPORTED_PROTOCOL, i18n("A protocol error occurred during authentication.\n" - "Choose a different authentication method to %1.").tqarg(mechusing)); + "Choose a different authentication method to %1.").arg(mechusing)); return false; } @@ -1168,7 +1168,7 @@ bool kio_sieveProtocol::authenticate() return true; } else { // Authentication failed. - error(ERR_COULD_NOT_AUTHENTICATE, i18n("Authentication failed.\nMost likely the password is wrong.\nThe server responded:\n%1").tqarg( TQString(r.getAction()) ) ); + error(ERR_COULD_NOT_AUTHENTICATE, i18n("Authentication failed.\nMost likely the password is wrong.\nThe server responded:\n%1").arg( TQString(r.getAction()) ) ); return false; } } diff --git a/kitchensync/libqopensync/group.cpp b/kitchensync/libqopensync/group.cpp index d716e1c4c..bc94e2208 100644 --- a/kitchensync/libqopensync/group.cpp +++ b/kitchensync/libqopensync/group.cpp @@ -46,7 +46,7 @@ TQStringList GroupConfig::activeObjectTypes() const { Q_ASSERT( mGroup ); - const TQString fileName = TQString( "%1/filter.conf" ).tqarg( osync_group_get_configdir( mGroup ) ); + const TQString fileName = TQString( "%1/filter.conf" ).arg( osync_group_get_configdir( mGroup ) ); TQFile file( fileName ); if ( !file.open( IO_ReadOnly ) ) @@ -92,7 +92,7 @@ void GroupConfig::setActiveObjectTypes( const TQStringList &objectTypes ) element.appendChild( entry ); } - const TQString fileName = TQString( "%1/filter.conf" ).tqarg( osync_group_get_configdir( mGroup ) ); + const TQString fileName = TQString( "%1/filter.conf" ).arg( osync_group_get_configdir( mGroup ) ); TQFile file( fileName ); if ( !file.open( IO_WriteOnly ) ) @@ -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..35cb04632 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 @@ -160,7 +160,7 @@ TQString Member::scanDevices( const TQString &query ) Q_ASSERT( mMember ); OSyncError *error = 0; - char *data = (char*)osync_member_call_plugin( mMember, "scan_tqdevices", const_cast<char*>( query.utf8().data() ), &error ); + char *data = (char*)osync_member_call_plugin( mMember, "scan_devices", const_cast<char*>( query.utf8().data() ), &error ); if ( error != 0 ) { osync_error_free( &error ); return TQString(); diff --git a/kitchensync/libqopensync/member.h b/kitchensync/libqopensync/member.h index 48a1164b1..6fa3ee737 100644 --- a/kitchensync/libqopensync/member.h +++ b/kitchensync/libqopensync/member.h @@ -107,7 +107,7 @@ class Member bool operator==( const Member& ) const; /** - This method can be used to query the plugin for scanning tqdevices. + This method can be used to query the plugin for scanning devices. The @param query is a plugin specific xml document as well as the return value. */ @@ -115,7 +115,7 @@ class Member /** This method can be used to test whether the plugin can connect - to the tqdevice with the given configuration. + to the device with the given configuration. */ bool testConnection( const TQString &configuration ); diff --git a/kitchensync/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/opensyncdbus/dbusclient.cpp b/kitchensync/opensyncdbus/dbusclient.cpp index 39cd1cc94..f53ee74e3 100644 --- a/kitchensync/opensyncdbus/dbusclient.cpp +++ b/kitchensync/opensyncdbus/dbusclient.cpp @@ -85,7 +85,7 @@ TQDBusMessage OpenSyncService::showMember( const TQDBusMessage &message ) if ( message.count() != 2 ) { return error( message, "arg_count", TQString("Wrong number of arguments. Expected 2, got %1.") - .tqarg( message.count() ) ); + .arg( message.count() ) ); } TQString groupName = message[ 0 ].toString(); @@ -111,14 +111,14 @@ TQDBusMessage OpenSyncService::showMember( const TQDBusMessage &message ) QSync::Group group = env.groupByName( groupName ); if ( !group.isValid() ) { return error( message, "group_name", TQString("Unknown group '%1'.") - .tqarg( groupName ) ); + .arg( groupName ) ); } QSync::Member member = group.memberById( memberId ); if ( !member.isValid() ) { return error( message, "member_id", - TQString("Unknown member id '%1' in group '%2'.").tqarg( groupName ) - .tqarg( memberId ) ); + TQString("Unknown member id '%1' in group '%2'.").arg( groupName ) + .arg( memberId ) ); } reply.append( memberId ); @@ -136,7 +136,7 @@ TQDBusMessage OpenSyncService::showGroup( const TQDBusMessage &message ) if ( message.count() != 1 ) { return error( message, "arg_count", TQString("Wrong number of arguments. Expected 1, got %1") - .tqarg( message.count() ) ); + .arg( message.count() ) ); } TQString groupName = message[ 0 ].toString(); @@ -156,7 +156,7 @@ TQDBusMessage OpenSyncService::showGroup( const TQDBusMessage &message ) QSync::Group group = env.groupByName( groupName ); if ( !group.isValid() ) { return error( message, "group_name", TQString("Unknown group '%1'") - .tqarg( groupName ) ); + .arg( groupName ) ); } QSync::Group::Iterator it( &group ); diff --git a/kitchensync/src/aboutpage.cpp b/kitchensync/src/aboutpage.cpp index 97ee86c0b..e0bb2600b 100644 --- a/kitchensync/src/aboutpage.cpp +++ b/kitchensync/src/aboutpage.cpp @@ -19,7 +19,7 @@ */ #include <tqfile.h> -#include <tqlayout.h> +#include <layout.h> #include <kaboutdata.h> #include <kapplication.h> @@ -51,18 +51,18 @@ static TQString readFile( const TQString &fileName ) AboutPage::AboutPage( TQWidget *parent ) : TQWidget( parent, "AboutPage" ) { - TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); + TQVBoxLayout *layout = new TQVBoxLayout( this ); TQString location = locate( "data", "kitchensync/about/main.html" ); TQString content = readFile( location ); - content = content.tqarg( locate( "data", "libtdepim/about/kde_infopage.css" ) ); + content = content.arg( locate( "data", "libtdepim/about/kde_infopage.css" ) ); if ( kapp->reverseLayout() ) - content = content.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "libtdepim/about/kde_infopage_rtl.css" ) ); + content = content.arg( "@import \"%1\";" ).arg( locate( "data", "libtdepim/about/kde_infopage_rtl.css" ) ); else - content = content.tqarg( "" ); + content = content.arg( "" ); KHTMLPart *part = new KHTMLPart( this ); - tqlayout->addWidget( part->view() ); + layout->addWidget( part->view() ); part->begin( KURL( location ) ); @@ -70,8 +70,8 @@ AboutPage::AboutPage( TQWidget *parent ) TQString catchPhrase( i18n( "Get Synchronized!" ) ); TQString quickDescription( i18n( "The KDE Synchronization Tool" ) ); - part->write( content.tqarg( TQFont().pointSize() + 2 ).tqarg( appName ) - .tqarg( catchPhrase ).tqarg( quickDescription ).tqarg( htmlText() ) ); + part->write( content.arg( TQFont().pointSize() + 2 ).arg( appName ) + .arg( catchPhrase ).arg( quickDescription ).arg( htmlText() ) ); part->end(); connect( part->browserExtension(), @@ -111,29 +111,29 @@ TQString AboutPage::htmlText() const "<tr><td><a href=\"%1\"><img width=\"%1\" height=\"%1\" src=\"%1\" /></a></td>" "<td><a href=\"%1\">%1</a><br><span id=\"subtext\"><nobr>%1</td></tr>" "</table>" ) - .tqarg( kapp->aboutData()->version() ) - .tqarg( i18n( "KitchenSync synchronizes your e-mail, addressbook, calendar, to-do list and more." ) ) - .tqarg( "help:/kitchensync" ) - .tqarg( iconSize ) - .tqarg( iconSize ) - .tqarg( handbook_icon_path ) - .tqarg( "help:/kitchensync" ) - .tqarg( i18n( "Read Manual" ) ) - .tqarg( i18n( "Learn more about KitchenSync and its components" ) ) - .tqarg( "http://pim.kde.org" ) - .tqarg( iconSize ) - .tqarg( iconSize ) - .tqarg( html_icon_path ) - .tqarg( "http://pim.kde.org" ) - .tqarg( i18n( "Visit KitchenSync Website" ) ) - .tqarg( i18n( "Access online resources and tutorials" ) ) - .tqarg( "exec:/addGroup" ) - .tqarg( iconSize ) - .tqarg( iconSize ) - .tqarg( wizard_icon_path ) - .tqarg( "exec:/addGroup" ) - .tqarg( i18n( "Add Synchronization Group" ) ) - .tqarg( i18n( "Create group of tqdevices for synchronization" ) ); + .arg( kapp->aboutData()->version() ) + .arg( i18n( "KitchenSync synchronizes your e-mail, addressbook, calendar, to-do list and more." ) ) + .arg( "help:/kitchensync" ) + .arg( iconSize ) + .arg( iconSize ) + .arg( handbook_icon_path ) + .arg( "help:/kitchensync" ) + .arg( i18n( "Read Manual" ) ) + .arg( i18n( "Learn more about KitchenSync and its components" ) ) + .arg( "http://pim.kde.org" ) + .arg( iconSize ) + .arg( iconSize ) + .arg( html_icon_path ) + .arg( "http://pim.kde.org" ) + .arg( i18n( "Visit KitchenSync Website" ) ) + .arg( i18n( "Access online resources and tutorials" ) ) + .arg( "exec:/addGroup" ) + .arg( iconSize ) + .arg( iconSize ) + .arg( wizard_icon_path ) + .arg( "exec:/addGroup" ) + .arg( i18n( "Add Synchronization Group" ) ) + .arg( i18n( "Create group of devices for synchronization" ) ); return info; } diff --git a/kitchensync/src/configgui.cpp b/kitchensync/src/configgui.cpp index 553b2f5e5..d59a5f82e 100644 --- a/kitchensync/src/configgui.cpp +++ b/kitchensync/src/configgui.cpp @@ -45,9 +45,9 @@ #include <klocale.h> #include <klineedit.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> -#include <tqtextedit.h> +#include <textedit.h> ConfigGui::ConfigGui( const QSync::Member &member, TQWidget *parent ) : TQWidget( parent ), mMember( member ) diff --git a/kitchensync/src/configguiblank.cpp b/kitchensync/src/configguiblank.cpp index 3e9d47b65..cfeeeb332 100644 --- a/kitchensync/src/configguiblank.cpp +++ b/kitchensync/src/configguiblank.cpp @@ -24,7 +24,7 @@ #include <klocale.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> ConfigGuiBlank::ConfigGuiBlank( const QSync::Member &member, TQWidget *parent ) : ConfigGui( member, parent ) diff --git a/kitchensync/src/configguievo2.cpp b/kitchensync/src/configguievo2.cpp index 0c79fedf0..a5bcd6f3c 100644 --- a/kitchensync/src/configguievo2.cpp +++ b/kitchensync/src/configguievo2.cpp @@ -23,7 +23,7 @@ #include <tqdom.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqstring.h> #include <kurlrequester.h> @@ -60,9 +60,9 @@ TQString ConfigGuiEvo2::save() const { TQString config = "<config>\n"; - config += TQString( "<address_path>%1</address_path>\n" ).tqarg( mAddressPath->url() ); - config += TQString( "<calendar_path>%1</calendar_path>\n" ).tqarg( mCalendarPath->url() ); - config += TQString( "<tasks_path>%1</tasks_path>\n" ).tqarg( mTasksPath->url() ); + config += TQString( "<address_path>%1</address_path>\n" ).arg( mAddressPath->url() ); + config += TQString( "<calendar_path>%1</calendar_path>\n" ).arg( mCalendarPath->url() ); + config += TQString( "<tasks_path>%1</tasks_path>\n" ).arg( mTasksPath->url() ); config += "</config>"; @@ -71,21 +71,21 @@ TQString ConfigGuiEvo2::save() const void ConfigGuiEvo2::initGUI() { - TQGridLayout *tqlayout = new TQGridLayout( topLayout(), 12, 3, KDialog::spacingHint() ); - tqlayout->setMargin( KDialog::marginHint() ); + TQGridLayout *layout = new TQGridLayout( topLayout(), 12, 3, KDialog::spacingHint() ); + layout->setMargin( KDialog::marginHint() ); - tqlayout->addWidget( new TQLabel( i18n( "Address Book location:" ), this ), 0, 0 ); + layout->addWidget( new TQLabel( i18n( "Address Book location:" ), this ), 0, 0 ); mAddressPath = new KURLRequester( this ); mAddressPath->setMode( KFile::Directory ); - tqlayout->addMultiCellWidget( mAddressPath, 0, 0, 1, 2 ); + layout->addMultiCellWidget( mAddressPath, 0, 0, 1, 2 ); - tqlayout->addWidget( new TQLabel( i18n( "Calendar location:" ), this ), 1, 0 ); + layout->addWidget( new TQLabel( i18n( "Calendar location:" ), this ), 1, 0 ); mCalendarPath = new KURLRequester( this ); mCalendarPath->setMode( KFile::Directory ); - tqlayout->addMultiCellWidget( mCalendarPath, 1, 1, 1, 2 ); + layout->addMultiCellWidget( mCalendarPath, 1, 1, 1, 2 ); - tqlayout->addWidget( new TQLabel( i18n( "Task list location:" ), this ), 2, 0 ); + layout->addWidget( new TQLabel( i18n( "Task list location:" ), this ), 2, 0 ); mTasksPath = new KURLRequester( this ); mTasksPath->setMode( KFile::Directory ); - tqlayout->addMultiCellWidget( mTasksPath, 2, 2, 1, 2 ); + layout->addMultiCellWidget( mTasksPath, 2, 2, 1, 2 ); } diff --git a/kitchensync/src/configguifile.cpp b/kitchensync/src/configguifile.cpp index 6a8b0402c..fd7b9ff84 100644 --- a/kitchensync/src/configguifile.cpp +++ b/kitchensync/src/configguifile.cpp @@ -25,7 +25,7 @@ #include <klocale.h> #include <kdialog.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> #include <tqlabel.h> #include <tqdom.h> diff --git a/kitchensync/src/configguigcalendar.cpp b/kitchensync/src/configguigcalendar.cpp index 8e8006764..1cee57ea8 100644 --- a/kitchensync/src/configguigcalendar.cpp +++ b/kitchensync/src/configguigcalendar.cpp @@ -24,7 +24,7 @@ #include <klocale.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqdom.h> #include <tqlineedit.h> diff --git a/kitchensync/src/configguignokii.cpp b/kitchensync/src/configguignokii.cpp index 84db02752..dd2697f06 100644 --- a/kitchensync/src/configguignokii.cpp +++ b/kitchensync/src/configguignokii.cpp @@ -27,7 +27,7 @@ #include <kdebug.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqlineedit.h> #include <tqcombobox.h> @@ -37,14 +37,14 @@ ConfigGuiGnokii::ConfigGuiGnokii( const QSync::Member &member, TQWidget *parent ) : ConfigGui( member, parent ) { - TQGridLayout *tqlayout = new TQGridLayout( topLayout() ); + TQGridLayout *layout = new TQGridLayout( topLayout() ); // Model TQLabel *label = new TQLabel( i18n("Model:"), this ); - tqlayout->addWidget( label, 0, 0 ); + layout->addWidget( label, 0, 0 ); mModel = new KComboBox( true, this ); - tqlayout->addWidget( mModel, 0, 1 ); + layout->addWidget( mModel, 0, 1 ); mModel->insertItem( "2110" ); mModel->insertItem( "3110" ); mModel->insertItem( "6110" ); @@ -67,10 +67,10 @@ ConfigGuiGnokii::ConfigGuiGnokii( const QSync::Member &member, TQWidget *parent // Connection label = new TQLabel( i18n("Connection:"), this ); - tqlayout->addWidget( label, 1, 0 ); + layout->addWidget( label, 1, 0 ); mConnection = new TQComboBox( this ); - tqlayout->addWidget( mConnection, 1, 1 ); + layout->addWidget( mConnection, 1, 1 ); connect( mConnection, TQT_SIGNAL (activated( int ) ), this, TQT_SLOT( slotConnectionChanged ( int ) ) ); @@ -100,15 +100,15 @@ ConfigGuiGnokii::ConfigGuiGnokii( const QSync::Member &member, TQWidget *parent mBluetooth = new BluetoothWidget( connectionWidget ); mBluetooth->hide(); - tqlayout->addMultiCellWidget( connectionWidget, 2, 2, 0, 1 ); + layout->addMultiCellWidget( connectionWidget, 2, 2, 0, 1 ); // Port mPortLabel = new TQLabel( i18n("Port:"), this ); - tqlayout->addWidget( mPortLabel, 2, 0 ); + layout->addWidget( mPortLabel, 2, 0 ); mPortLabel->hide(); mPort = new KComboBox( true, this ); - tqlayout->addWidget( mPort, 2, 1 ); + layout->addWidget( mPort, 2, 1 ); mPort->hide(); mPort->insertItem( "/dev/ircomm0" ); @@ -118,7 +118,7 @@ ConfigGuiGnokii::ConfigGuiGnokii( const QSync::Member &member, TQWidget *parent mPort->insertItem( "/dev/ttyUSB0" ); mPort->insertItem( "/dev/ttyUSB1" ); - tqlayout->setColStretch( 1, 1 ); + layout->setColStretch( 1, 1 ); topLayout()->addStretch( 1 ); } diff --git a/kitchensync/src/configguigpe.cpp b/kitchensync/src/configguigpe.cpp index 118aed14a..a57831203 100644 --- a/kitchensync/src/configguigpe.cpp +++ b/kitchensync/src/configguigpe.cpp @@ -24,7 +24,7 @@ #include <tqcheckbox.h> #include <tqdom.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqspinbox.h> #include <kcombobox.h> @@ -68,11 +68,11 @@ TQString ConfigGuiGpe::save() const { TQString config = "<config>"; - config += TQString( "<use_local>%1</use_local>" ).tqarg( mConnectionMode->currentItem() == 0 ); - config += TQString( "<use_ssh>%1</use_ssh>" ).tqarg( mConnectionMode->currentItem() == 1 ); - config += TQString( "<handheld_ip>%1</handheld_ip>" ).tqarg( mIP->text() ); - config += TQString( "<handheld_port>%1</handheld_port>" ).tqarg( mPort->value() ); - config += TQString( "<handheld_user>%1</handheld_user>" ).tqarg( mUser->text() ); + config += TQString( "<use_local>%1</use_local>" ).arg( mConnectionMode->currentItem() == 0 ); + config += TQString( "<use_ssh>%1</use_ssh>" ).arg( mConnectionMode->currentItem() == 1 ); + config += TQString( "<handheld_ip>%1</handheld_ip>" ).arg( mIP->text() ); + config += TQString( "<handheld_port>%1</handheld_port>" ).arg( mPort->value() ); + config += TQString( "<handheld_user>%1</handheld_user>" ).arg( mUser->text() ); config += "</config>"; @@ -81,23 +81,23 @@ TQString ConfigGuiGpe::save() const void ConfigGuiGpe::initGUI() { - TQGridLayout *tqlayout = new TQGridLayout( topLayout(), 12, 4, KDialog::spacingHint() ); - tqlayout->setMargin( KDialog::marginHint() ); + TQGridLayout *layout = new TQGridLayout( topLayout(), 12, 4, KDialog::spacingHint() ); + layout->setMargin( KDialog::marginHint() ); - tqlayout->addWidget( new TQLabel( i18n( "Connection Mode:" ), this ), 0, 0 ); + layout->addWidget( new TQLabel( i18n( "Connection Mode:" ), this ), 0, 0 ); mConnectionMode = new KComboBox( this ); - tqlayout->addMultiCellWidget( mConnectionMode, 0, 0, 0, 3 ); + layout->addMultiCellWidget( mConnectionMode, 0, 0, 0, 3 ); - tqlayout->addWidget( new TQLabel( i18n( "IP Address:" ), this ), 1, 0 ); + layout->addWidget( new TQLabel( i18n( "IP Address:" ), this ), 1, 0 ); mIP = new KLineEdit( this ); mIP->setInputMask( "000.000.000.000" ); - tqlayout->addWidget( mIP, 1, 1 ); + layout->addWidget( mIP, 1, 1 ); - tqlayout->addWidget( new TQLabel( i18n( "Port:" ), this ), 1, 2, TQt::AlignRight ); + layout->addWidget( new TQLabel( i18n( "Port:" ), this ), 1, 2, TQt::AlignRight ); mPort = new TQSpinBox( 1, 65536, 1, this ); - tqlayout->addWidget( mPort, 1, 3 ); + layout->addWidget( mPort, 1, 3 ); - tqlayout->addWidget( new TQLabel( i18n( "User:" ), this ), 2, 0 ); + layout->addWidget( new TQLabel( i18n( "User:" ), this ), 2, 0 ); mUser = new KLineEdit( this ); - tqlayout->addMultiCellWidget( mUser, 2, 2, 1, 3 ); + layout->addMultiCellWidget( mUser, 2, 2, 1, 3 ); } diff --git a/kitchensync/src/configguiirmc.cpp b/kitchensync/src/configguiirmc.cpp index 721c82d70..abd765d02 100644 --- a/kitchensync/src/configguiirmc.cpp +++ b/kitchensync/src/configguiirmc.cpp @@ -33,7 +33,7 @@ #include <tqapplication.h> #include <tqeventloop.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <tqspinbox.h> #include <tqtabwidget.h> diff --git a/kitchensync/src/configguijescs.cpp b/kitchensync/src/configguijescs.cpp index b7a94c447..a1e2c1539 100644 --- a/kitchensync/src/configguijescs.cpp +++ b/kitchensync/src/configguijescs.cpp @@ -24,7 +24,7 @@ #include <tqcheckbox.h> #include <tqdom.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <klineedit.h> #include <kdialog.h> @@ -61,13 +61,13 @@ TQString ConfigGuiJescs::save() const int delNotifyState; TQString config = "<config>\n"; - config += TQString( "<url>%1</url>\n" ).tqarg( mUrl->text() ); - config += TQString( "<username>%1</username>\n" ).tqarg( mUsername->text() ); - config += TQString( "<password>%1</password>\n" ).tqarg( mPassword->text() ); + config += TQString( "<url>%1</url>\n" ).arg( mUrl->text() ); + config += TQString( "<username>%1</username>\n" ).arg( mUsername->text() ); + config += TQString( "<password>%1</password>\n" ).arg( mPassword->text() ); if ( mDelNotify->isChecked() ) { delNotifyState = 1; } else { delNotifyState = 0; } - config += TQString( "<del_notify>%1</del_notify>\n" ).tqarg( delNotifyState ); + config += TQString( "<del_notify>%1</del_notify>\n" ).arg( delNotifyState ); config += "</config>"; @@ -76,23 +76,23 @@ TQString ConfigGuiJescs::save() const void ConfigGuiJescs::initGUI() { - TQGridLayout *tqlayout = new TQGridLayout( topLayout(), 12, 3, KDialog::spacingHint() ); - tqlayout->setMargin( KDialog::marginHint() ); + TQGridLayout *layout = new TQGridLayout( topLayout(), 12, 3, KDialog::spacingHint() ); + layout->setMargin( KDialog::marginHint() ); - tqlayout->addWidget( new TQLabel( i18n( "URL:" ), this ), 0, 0 ); + layout->addWidget( new TQLabel( i18n( "URL:" ), this ), 0, 0 ); mUrl = new KLineEdit( this ); - tqlayout->addMultiCellWidget( mUrl, 0, 0, 1, 2 ); + layout->addMultiCellWidget( mUrl, 0, 0, 1, 2 ); - tqlayout->addWidget( new TQLabel( i18n( "Username:" ), this ), 1, 0 ); + layout->addWidget( new TQLabel( i18n( "Username:" ), this ), 1, 0 ); mUsername = new KLineEdit( this ); - tqlayout->addMultiCellWidget( mUsername, 1, 1, 1, 2 ); + layout->addMultiCellWidget( mUsername, 1, 1, 1, 2 ); - tqlayout->addWidget( new TQLabel( i18n( "Password:" ), this ), 2, 0 ); + layout->addWidget( new TQLabel( i18n( "Password:" ), this ), 2, 0 ); mPassword = new KLineEdit( this ); mPassword->setEchoMode( KLineEdit::Password ); - tqlayout->addMultiCellWidget( mPassword, 2, 2, 1, 2 ); + layout->addMultiCellWidget( mPassword, 2, 2, 1, 2 ); mDelNotify = new TQCheckBox( this ); mDelNotify->setText( "Notify attendees about event/task deletion" ); - tqlayout->addMultiCellWidget( mDelNotify, 3, 3, 0, 2 ); + layout->addMultiCellWidget( mDelNotify, 3, 3, 0, 2 ); } diff --git a/kitchensync/src/configguildap.cpp b/kitchensync/src/configguildap.cpp index fd9dad4b6..18c9aebcd 100644 --- a/kitchensync/src/configguildap.cpp +++ b/kitchensync/src/configguildap.cpp @@ -24,7 +24,7 @@ #include <tqcheckbox.h> #include <tqdom.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqspinbox.h> #include <kcombobox.h> @@ -93,26 +93,26 @@ TQString ConfigGuiLdap::save() const { TQString config = "<config>\n"; - config += TQString( "<servername>%1</servername>\n" ).tqarg( mLdapWidget->host() ); - config += TQString( "<serverport>%1</serverport>\n" ).tqarg( mLdapWidget->port() ); - config += TQString( "<binddn>%1</binddn>\n" ).tqarg( mLdapWidget->bindDN() ); - config += TQString( "<password>%1</password>\n" ).tqarg( mLdapWidget->password() ); - config += TQString( "<anonymous>%1</anonymous>\n" ).tqarg( mLdapWidget->isAuthAnon() ? "1" : "0" ); - config += TQString( "<searchbase>%1</searchbase>\n" ).tqarg( mLdapWidget->dn() ); - config += TQString( "<searchfilter>%1</searchfilter>\n" ).tqarg( mLdapWidget->filter() ); - config += TQString( "<storebase>%1</storebase>\n" ).tqarg( mLdapWidget->dn() ); - config += TQString( "<keyattr>%1</keyattr>\n" ).tqarg( mKeyAttribute->text() ); + config += TQString( "<servername>%1</servername>\n" ).arg( mLdapWidget->host() ); + config += TQString( "<serverport>%1</serverport>\n" ).arg( mLdapWidget->port() ); + config += TQString( "<binddn>%1</binddn>\n" ).arg( mLdapWidget->bindDN() ); + config += TQString( "<password>%1</password>\n" ).arg( mLdapWidget->password() ); + config += TQString( "<anonymous>%1</anonymous>\n" ).arg( mLdapWidget->isAuthAnon() ? "1" : "0" ); + config += TQString( "<searchbase>%1</searchbase>\n" ).arg( mLdapWidget->dn() ); + config += TQString( "<searchfilter>%1</searchfilter>\n" ).arg( mLdapWidget->filter() ); + config += TQString( "<storebase>%1</storebase>\n" ).arg( mLdapWidget->dn() ); + config += TQString( "<keyattr>%1</keyattr>\n" ).arg( mKeyAttribute->text() ); TQStringList scopes; scopes << "base" << "one" << "sub"; - config += TQString( "<scope>%1</scope>\n" ).tqarg( scopes[ mSearchScope->currentItem() ] ); + config += TQString( "<scope>%1</scope>\n" ).arg( scopes[ mSearchScope->currentItem() ] ); config += TQString( "<authmech>SIMPLE</authmech>\n" ); - config += TQString( "<encryption>%1</encryption>\n" ).tqarg( mEncryption->isChecked() ? "1" : "0" ); + config += TQString( "<encryption>%1</encryption>\n" ).arg( mEncryption->isChecked() ? "1" : "0" ); - config += TQString( "<ldap_read>%1</ldap_read>\n" ).tqarg( mReadLdap->isChecked() ? "1" : "0" ); - config += TQString( "<ldap_write>%1</ldap_write>\n" ).tqarg( mWriteLdap->isChecked() ? "1" : "0" ); + config += TQString( "<ldap_read>%1</ldap_read>\n" ).arg( mReadLdap->isChecked() ? "1" : "0" ); + config += TQString( "<ldap_write>%1</ldap_write>\n" ).arg( mWriteLdap->isChecked() ? "1" : "0" ); config += "</config>"; @@ -121,8 +121,8 @@ TQString ConfigGuiLdap::save() const void ConfigGuiLdap::initGUI() { - TQGridLayout *tqlayout = new TQGridLayout( topLayout(), 12, 4, KDialog::spacingHint() ); - tqlayout->setMargin( KDialog::marginHint() ); + TQGridLayout *layout = new TQGridLayout( topLayout(), 12, 4, KDialog::spacingHint() ); + layout->setMargin( KDialog::marginHint() ); mLdapWidget = new KABC::LdapConfigWidget( KABC::LdapConfigWidget::W_HOST | KABC::LdapConfigWidget::W_PORT | @@ -139,14 +139,14 @@ void ConfigGuiLdap::initGUI() mReadLdap = new TQCheckBox( i18n( "Load data from LDAP" ), this ); mWriteLdap = new TQCheckBox( i18n( "Save data to LDAP" ), this ); - tqlayout->addMultiCellWidget( mLdapWidget, 0, 9, 0, 3 ); - tqlayout->addWidget( new TQLabel( i18n( "Key Attribute:" ), this ), 10, 0 ); - tqlayout->addMultiCellWidget( mKeyAttribute, 10, 10, 1, 2 ); - tqlayout->addWidget( new TQLabel( i18n( "Search Scope:" ), this ), 11, 0 ); - tqlayout->addMultiCellWidget( mSearchScope, 11, 11, 1, 2 ); - tqlayout->addWidget( mEncryption, 12, 0 ); - tqlayout->addWidget( mReadLdap, 13, 0 ); - tqlayout->addWidget( mWriteLdap, 13, 3 ); + layout->addMultiCellWidget( mLdapWidget, 0, 9, 0, 3 ); + layout->addWidget( new TQLabel( i18n( "Key Attribute:" ), this ), 10, 0 ); + layout->addMultiCellWidget( mKeyAttribute, 10, 10, 1, 2 ); + layout->addWidget( new TQLabel( i18n( "Search Scope:" ), this ), 11, 0 ); + layout->addMultiCellWidget( mSearchScope, 11, 11, 1, 2 ); + layout->addWidget( mEncryption, 12, 0 ); + layout->addWidget( mReadLdap, 13, 0 ); + layout->addWidget( mWriteLdap, 13, 3 ); } diff --git a/kitchensync/src/configguimoto.cpp b/kitchensync/src/configguimoto.cpp index e461a808f..da17454e3 100644 --- a/kitchensync/src/configguimoto.cpp +++ b/kitchensync/src/configguimoto.cpp @@ -23,7 +23,7 @@ #include <tqdom.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <klineedit.h> #include <kdialog.h> @@ -43,7 +43,7 @@ void ConfigGuiMoto::load( const TQString &xml ) TQDomNode node; for( node = docElement.firstChild(); !node.isNull(); node = node.nextSibling() ) { TQDomElement element = node.toElement(); - if ( element.tagName() == "tqdevice" ) { + if ( element.tagName() == "device" ) { mDeviceString->setText( element.text() ); } } @@ -53,7 +53,7 @@ TQString ConfigGuiMoto::save() const { TQString config = "<config>\n"; - config += TQString( "<tqdevice>%1</tqdevice>\n" ).tqarg( mDeviceString->text() ); + config += TQString( "<device>%1</device>\n" ).arg( mDeviceString->text() ); config += "</config>"; @@ -62,10 +62,10 @@ TQString ConfigGuiMoto::save() const void ConfigGuiMoto::initGUI() { - TQGridLayout *tqlayout = new TQGridLayout( topLayout(), 12, 3, KDialog::spacingHint() ); - tqlayout->setMargin( KDialog::marginHint() ); + TQGridLayout *layout = new TQGridLayout( topLayout(), 12, 3, KDialog::spacingHint() ); + layout->setMargin( KDialog::marginHint() ); - tqlayout->addWidget( new TQLabel( i18n( "Device String:" ), this ), 0, 0 ); + layout->addWidget( new TQLabel( i18n( "Device String:" ), this ), 0, 0 ); mDeviceString = new KLineEdit( this ); - tqlayout->addMultiCellWidget( mDeviceString, 0, 0, 1, 2 ); + layout->addMultiCellWidget( mDeviceString, 0, 0, 1, 2 ); } diff --git a/kitchensync/src/configguiopie.cpp b/kitchensync/src/configguiopie.cpp index c74623345..9620f9c34 100644 --- a/kitchensync/src/configguiopie.cpp +++ b/kitchensync/src/configguiopie.cpp @@ -26,59 +26,59 @@ #include <tqcombobox.h> #include <tqdom.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlineedit.h> #include <tqspinbox.h> ConfigGuiOpie::ConfigGuiOpie( const QSync::Member &member, TQWidget *parent ) : ConfigGui( member, parent ) { - TQGridLayout *tqlayout = new TQGridLayout( topLayout() ); + TQGridLayout *layout = new TQGridLayout( topLayout() ); TQLabel *label = new TQLabel( i18n("Device IP:"), this ); - tqlayout->addWidget( label, 0, 0 ); + layout->addWidget( label, 0, 0 ); mDeviceIP = new TQLineEdit( this ); mDeviceIP->setInputMask( "000.000.000.000" ); label->setBuddy( mDeviceIP ); - tqlayout->addWidget( mDeviceIP, 0, 1 ); + layout->addWidget( mDeviceIP, 0, 1 ); label = new TQLabel( i18n("Device Type:"), this ); - tqlayout->addWidget( label, 1, 0 ); + layout->addWidget( label, 1, 0 ); mDeviceType = new TQComboBox( this ); label->setBuddy( mDeviceType ); - tqlayout->addWidget( mDeviceType, 1, 1 ); + layout->addWidget( mDeviceType, 1, 1 ); label = new TQLabel( i18n("Username:"), this ); - tqlayout->addWidget( label, 2, 0 ); + layout->addWidget( label, 2, 0 ); mUserName = new TQLineEdit( this ); label->setBuddy( mUserName ); - tqlayout->addWidget( mUserName, 2, 1 ); + layout->addWidget( mUserName, 2, 1 ); label = new TQLabel( i18n("Password:"), this ); - tqlayout->addWidget( label, 3, 0 ); + layout->addWidget( label, 3, 0 ); mPassword = new TQLineEdit( this ); mPassword->setEchoMode( TQLineEdit::Password ); label->setBuddy( mPassword ); - tqlayout->addWidget( mPassword, 3, 1 ); + layout->addWidget( mPassword, 3, 1 ); label = new TQLabel( i18n("Protocol:"), this ); - tqlayout->addWidget( label, 4, 0 ); + layout->addWidget( label, 4, 0 ); mConnectionType = new TQComboBox( this ); label->setBuddy( mConnectionType ); - tqlayout->addWidget( mConnectionType, 4, 1 ); + layout->addWidget( mConnectionType, 4, 1 ); label = new TQLabel( i18n("Port:"), this ); - tqlayout->addWidget( label, 5, 0 ); + layout->addWidget( label, 5, 0 ); mPort = new TQSpinBox( this ); mPort->setRange( 0, 65335 ); label->setBuddy( mPort ); - tqlayout->addWidget( mPort, 5, 1 ); + layout->addWidget( mPort, 5, 1 ); mDeviceType->insertItem( i18n("Opie/OpenZaurus") ); mDeviceType->insertItem( i18n("TQtopia2") ); @@ -105,7 +105,7 @@ void ConfigGuiOpie::load( const TQString &xml ) mDeviceIP->setText( e.text() ); } else if ( e.tagName() == "port" ) { mPort->setValue( e.text().toInt() ); - } else if ( e.tagName() == "tqdevice" ) { + } else if ( e.tagName() == "device" ) { if ( e.text() == "opie" ) mDeviceType->setCurrentItem( 0 ); else @@ -126,7 +126,7 @@ TQString ConfigGuiOpie::save() const xml += "<username>" + mUserName->text() + "</username>"; xml += "<password>" + mPassword->text() + "</password>"; xml += "<url>" + mDeviceIP->text() + "</url>"; - xml += "<tqdevice>" + TQString( mDeviceType->currentItem() == 0 ? "opie" : "qtopia2" ) + "</tqdevice>"; + xml += "<device>" + TQString( mDeviceType->currentItem() == 0 ? "opie" : "qtopia2" ) + "</device>"; xml += "<port>" + TQString::number( mPort->value() ) + "</port>"; xml += "<conntype>" + TQString( mConnectionType->currentItem() == 0 ? "scp" : "ftp" ) + "</conntype>"; xml += "</config>"; diff --git a/kitchensync/src/configguipalm.cpp b/kitchensync/src/configguipalm.cpp index 03d87cdb4..a3a337191 100644 --- a/kitchensync/src/configguipalm.cpp +++ b/kitchensync/src/configguipalm.cpp @@ -28,7 +28,7 @@ #include <tqcheckbox.h> #include <tqdom.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqradiobutton.h> #include <tqspinbox.h> #include <tqtabwidget.h> diff --git a/kitchensync/src/configguisunbird.cpp b/kitchensync/src/configguisunbird.cpp index d51101aeb..de8a14c6c 100644 --- a/kitchensync/src/configguisunbird.cpp +++ b/kitchensync/src/configguisunbird.cpp @@ -25,7 +25,7 @@ #include <tqdom.h> #include <tqtabwidget.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqbuttongroup.h> #include <tqcheckbox.h> #include <tqsizepolicy.h> @@ -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 ); @@ -140,10 +140,10 @@ TQString ConfigGuiSunbird::save() const for ( uint i = 0; i < mLocalList.count(); ++i ) { LocalCalendar *lcal = mLocalList[ i ]; config += TQString( "<file " ); - config += TQString( "path=\"%1\" " ).tqarg( lcal->mPathRequester->url() ); + config += TQString( "path=\"%1\" " ).arg( lcal->mPathRequester->url() ); if ( lcal->mDaysCheckBox->isChecked() ) { - config += TQString( "deletedaysold=\"%1\" " ).tqarg( lcal->mDaysSpinBox->value() ); + config += TQString( "deletedaysold=\"%1\" " ).arg( lcal->mDaysSpinBox->value() ); } if ( lcal->mDefaultCheckBox->isChecked() ) { config += TQString( "default=\"1\" " ); @@ -154,12 +154,12 @@ TQString ConfigGuiSunbird::save() const for ( uint i = 0; i < mWebdavList.count(); ++i ) { WebdavCalendar *wcal = mWebdavList[ i ]; config += TQString( "<webdav " ); - config += TQString( "username=\"%1\" " ).tqarg( wcal->mUsername->text() ); - config += TQString( "password=\"%1\" " ).tqarg( wcal->mPassword->text() ); - config += TQString( "url=\"%1\" " ).tqarg( wcal->mUrl->text() ); + config += TQString( "username=\"%1\" " ).arg( wcal->mUsername->text() ); + config += TQString( "password=\"%1\" " ).arg( wcal->mPassword->text() ); + config += TQString( "url=\"%1\" " ).arg( wcal->mUrl->text() ); if ( wcal->mDaysCheckBox->isChecked() ) { - config += TQString( "deletedaysold=\"%1\" " ).tqarg( wcal->mDaysSpinBox->value() ); + config += TQString( "deletedaysold=\"%1\" " ).arg( wcal->mDaysSpinBox->value() ); } if ( wcal->mDefaultCheckBox->isChecked() ) { config += TQString( "default=\"1\" " ); @@ -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/configguisynce.cpp b/kitchensync/src/configguisynce.cpp index 898300769..c5c8a8583 100644 --- a/kitchensync/src/configguisynce.cpp +++ b/kitchensync/src/configguisynce.cpp @@ -23,7 +23,7 @@ #include <tqdom.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> #include <klineedit.h> @@ -60,10 +60,10 @@ TQString ConfigGuiSynce::save() const { TQString config = "<config>\n"; - config += TQString( "<contact>%1</contact>\n" ).tqarg( mContacts->isChecked() ? "1" : "0" ); - config += TQString( "<todos>%1</todos>\n" ).tqarg( mTodos->isChecked() ? "1" : "0" ); - config += TQString( "<calendar>%1</calendar>\n" ).tqarg( mCalendar->isChecked() ? "1" : "0" ); - config += TQString( "<file>%1</file>\n" ).tqarg( mFile->text() ); + config += TQString( "<contact>%1</contact>\n" ).arg( mContacts->isChecked() ? "1" : "0" ); + config += TQString( "<todos>%1</todos>\n" ).arg( mTodos->isChecked() ? "1" : "0" ); + config += TQString( "<calendar>%1</calendar>\n" ).arg( mCalendar->isChecked() ? "1" : "0" ); + config += TQString( "<file>%1</file>\n" ).arg( mFile->text() ); config += "</config>"; @@ -72,22 +72,22 @@ TQString ConfigGuiSynce::save() const void ConfigGuiSynce::initGUI() { - TQGridLayout *tqlayout = new TQGridLayout( topLayout(), 12, 2, KDialog::spacingHint() ); - tqlayout->setMargin( KDialog::marginHint() ); + TQGridLayout *layout = new TQGridLayout( topLayout(), 12, 2, KDialog::spacingHint() ); + layout->setMargin( KDialog::marginHint() ); mContacts = new TQCheckBox( this ); mContacts->setText( "Sync Contacts" ); - tqlayout->addMultiCellWidget( mContacts, 0, 0, 0, 1 ); + layout->addMultiCellWidget( mContacts, 0, 0, 0, 1 ); mTodos = new TQCheckBox( this ); mTodos->setText( "Sync \'Todo\' items" ); - tqlayout->addMultiCellWidget( mTodos, 1, 1, 0, 1 ); + layout->addMultiCellWidget( mTodos, 1, 1, 0, 1 ); mCalendar = new TQCheckBox( this ); mCalendar->setText( "Sync Calendar" ); - tqlayout->addMultiCellWidget( mCalendar, 2, 2, 0, 1 ); + layout->addMultiCellWidget( mCalendar, 2, 2, 0, 1 ); - tqlayout->addWidget( new TQLabel( i18n( "File:" ), this ), 3, 0 ); + layout->addWidget( new TQLabel( i18n( "File:" ), this ), 3, 0 ); mFile = new KLineEdit( this ); - tqlayout->addWidget( mFile, 3, 1 ); + layout->addWidget( mFile, 3, 1 ); } diff --git a/kitchensync/src/configguisyncmlhttp.cpp b/kitchensync/src/configguisyncmlhttp.cpp index 26a8c2241..9340f6e57 100644 --- a/kitchensync/src/configguisyncmlhttp.cpp +++ b/kitchensync/src/configguisyncmlhttp.cpp @@ -30,7 +30,7 @@ #include <tqcheckbox.h> #include <tqdom.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqspinbox.h> #include <tqtabwidget.h> #include <tqvbox.h> diff --git a/kitchensync/src/configguisyncmlobex.cpp b/kitchensync/src/configguisyncmlobex.cpp index 61833b4eb..479593e5a 100644 --- a/kitchensync/src/configguisyncmlobex.cpp +++ b/kitchensync/src/configguisyncmlobex.cpp @@ -28,7 +28,7 @@ #include <klocale.h> #include <kurlrequester.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> #include <tqcombobox.h> #include <tqlabel.h> @@ -246,7 +246,7 @@ TQString ConfigGuiSyncmlObex::save() const ConnectionTypeList::ConstIterator it; for ( it = mConnectionTypes.begin(); it != mConnectionTypes.end(); it++ ) { if ( mConnection->currentText() == (*it).second ) { - xml += "<type>" + TQString("%1").tqarg((*it).first) + "</type>\n"; + xml += "<type>" + TQString("%1").arg((*it).first) + "</type>\n"; break; } } @@ -264,7 +264,7 @@ TQString ConfigGuiSyncmlObex::save() const SyncmlVersionList::ConstIterator itVersion; for ( itVersion = mSyncmlVersions.begin(); itVersion != mSyncmlVersions.end(); itVersion++ ) { if ( mSyncmlVersion->currentText() == (*itVersion).second ) { - xml += "<version>" + TQString("%1").tqarg((*itVersion).first) + "</version>\n"; + xml += "<version>" + TQString("%1").arg((*itVersion).first) + "</version>\n"; break; } } diff --git a/kitchensync/src/connectionwidgets.cpp b/kitchensync/src/connectionwidgets.cpp index bb25c271d..e1a0b9101 100644 --- a/kitchensync/src/connectionwidgets.cpp +++ b/kitchensync/src/connectionwidgets.cpp @@ -31,7 +31,7 @@ #include <tqapplication.h> #include <tqeventloop.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <tqspinbox.h> #include <tqtabwidget.h> @@ -43,24 +43,24 @@ BluetoothWidget::BluetoothWidget( TQWidget *parent ) : TQWidget( parent ) { - TQGridLayout *tqlayout = new TQGridLayout( this ); + TQGridLayout *layout = new TQGridLayout( this ); mAddress = new KLineEdit( this ); mAddress->setInputMask( ">NN:NN:NN:NN:NN:NN;" ); - tqlayout->addWidget( mAddress, 1, 0 ); + layout->addWidget( mAddress, 1, 0 ); TQLabel *label = new TQLabel( i18n( "Bluetooth address:" ), this ); label->setBuddy( mAddress ); - tqlayout->addWidget( label, 0, 0 ); + layout->addWidget( label, 0, 0 ); mChannel = new KLineEdit( this ); - tqlayout->addWidget( mChannel, 1, 1 ); + layout->addWidget( mChannel, 1, 1 ); mChannelLabel = new TQLabel( i18n( "Channel:" ), this ); mChannelLabel->setBuddy( mChannel ); - tqlayout->addWidget( mChannelLabel, 0, 1 ); + layout->addWidget( mChannelLabel, 0, 1 ); - tqlayout->setRowStretch( 2, 1 ); + layout->setRowStretch( 2, 1 ); } void BluetoothWidget::hideChannel() @@ -103,23 +103,23 @@ TQString BluetoothWidget::channel() const IRWidget::IRWidget( TQWidget *parent ) : TQWidget( parent ) { - TQGridLayout *tqlayout = new TQGridLayout( this, 3, 3, 11, 3 ); + TQGridLayout *layout = new TQGridLayout( this, 3, 3, 11, 3 ); mDevice = new KLineEdit( this ); mSerialNumber = new KLineEdit( this ); - tqlayout->addWidget( mDevice, 1, 0 ); - tqlayout->addWidget( mSerialNumber, 1, 1 ); + layout->addWidget( mDevice, 1, 0 ); + layout->addWidget( mSerialNumber, 1, 1 ); TQLabel *label = new TQLabel( i18n( "Device Name:" ), this ); label->setBuddy( mDevice ); - tqlayout->addWidget( label, 0, 0 ); + layout->addWidget( label, 0, 0 ); label = new TQLabel( i18n( "Serial Number:" ), this ); label->setBuddy( mSerialNumber ); - tqlayout->addWidget( label, 0, 1 ); + layout->addWidget( label, 0, 1 ); - tqlayout->setRowStretch( 2, 1 ); + layout->setRowStretch( 2, 1 ); } void IRWidget::load( const TQDomElement &parent ) @@ -149,23 +149,23 @@ void IRWidget::save( TQDomDocument &doc, TQDomElement &parent ) CableWidget::CableWidget( TQWidget *parent ) : TQWidget( parent ) { - TQGridLayout *tqlayout = new TQGridLayout( this, 3, 2, 11, 3 ); + TQGridLayout *layout = new TQGridLayout( this, 3, 2, 11, 3 ); mManufacturer = new KComboBox( this ); mDevice = new KComboBox( true, this ); - tqlayout->addWidget( mManufacturer, 0, 1 ); - tqlayout->addWidget( mDevice, 1, 1 ); + layout->addWidget( mManufacturer, 0, 1 ); + layout->addWidget( mDevice, 1, 1 ); TQLabel *label = new TQLabel( i18n( "Device Manufacturer:" ), this ); label->setBuddy( mManufacturer ); - tqlayout->addWidget( label, 0, 0 ); + layout->addWidget( label, 0, 0 ); label = new TQLabel( i18n( "Device:" ), this ); label->setBuddy( mDevice ); - tqlayout->addWidget( label, 1, 0 ); + layout->addWidget( label, 1, 0 ); - tqlayout->setRowStretch( 2, 1 ); + layout->setRowStretch( 2, 1 ); mManufacturer->insertItem( i18n( "SonyEricsson/Ericsson" ) ); mManufacturer->insertItem( i18n( "Siemens" ) ); @@ -202,16 +202,16 @@ void CableWidget::save( TQDomDocument &doc, TQDomElement &parent ) UsbWidget::UsbWidget( TQWidget *parent ) : TQWidget( parent ) { - TQGridLayout *tqlayout = new TQGridLayout( this, 3, 2, 11, 3); + TQGridLayout *layout = new TQGridLayout( this, 3, 2, 11, 3); mInterface = new TQSpinBox( this ); - tqlayout->addWidget( mInterface, 0, 1 ); + layout->addWidget( mInterface, 0, 1 ); TQLabel *label = new TQLabel( i18n( "USB Interface:" ), this ); label->setBuddy( mInterface ); - tqlayout->addWidget( label, 0, 0 ); + layout->addWidget( label, 0, 0 ); - tqlayout->setRowStretch( 2, 1 ); + layout->setRowStretch( 2, 1 ); } void UsbWidget::setInterface( int interface ) diff --git a/kitchensync/src/genericdiffalgo.cpp b/kitchensync/src/genericdiffalgo.cpp index 209382ed7..21b83f454 100644 --- a/kitchensync/src/genericdiffalgo.cpp +++ b/kitchensync/src/genericdiffalgo.cpp @@ -57,11 +57,11 @@ void GenericDiffAlgo::run() for ( uint i = 0; i < lines; ++i ) { if ( i < leftList.count() && i < rightList.count() ) { if ( !compareString( leftList[ i ], rightList[ i ] ) ) - conflictField( i18n( "Line %1" ).tqarg( i ), leftList[ i ], rightList[ i ] ); + conflictField( i18n( "Line %1" ).arg( i ), leftList[ i ], rightList[ i ] ); } else if ( i < leftList.count() && i >= rightList.count() ) { - additionalLeftField( i18n( "Line %1" ).tqarg( i ), leftList[ i ] ); + additionalLeftField( i18n( "Line %1" ).arg( i ), leftList[ i ] ); } else if ( i >= leftList.count() && i < rightList.count() ) { - additionalRightField( i18n( "Line %1" ).tqarg( i ), rightList[ i ] ); + additionalRightField( i18n( "Line %1" ).arg( i ), rightList[ i ] ); } } diff --git a/kitchensync/src/groupconfig.cpp b/kitchensync/src/groupconfig.cpp index 99ff35fdb..8fb6bdc04 100644 --- a/kitchensync/src/groupconfig.cpp +++ b/kitchensync/src/groupconfig.cpp @@ -38,7 +38,7 @@ #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> GroupConfig::GroupConfig( TQWidget *parent ) @@ -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 ); @@ -131,7 +131,7 @@ void GroupConfig::updateMembers() QSync::Member member = *it; MemberInfo mi( member ); TQFrame *page = mMemberView->addPage( mi.name(), - TQString( "%1 (%2)" ).tqarg( mi.name() ).tqarg(member.pluginName()), mi.desktopIcon() ); + TQString( "%1 (%2)" ).arg( mi.name() ).arg(member.pluginName()), mi.desktopIcon() ); TQBoxLayout *pageLayout = new TQVBoxLayout( page ); mConfigPages.append( page ); @@ -165,7 +165,7 @@ void GroupConfig::addMember() QSync::Result result = SyncProcessManager::self()->addMember( mProcess, plugin ); if ( result.isError() ) { KMessageBox::error( this, i18n("Error adding member %1\n%2\nType: %3") - .tqarg( plugin.name() ).tqarg( result.message() ).tqarg( result.type() ) ); + .arg( plugin.name() ).arg( result.message() ).arg( result.type() ) ); } else { updateMembers(); diff --git a/kitchensync/src/groupconfigcommon.cpp b/kitchensync/src/groupconfigcommon.cpp index 5a0cf49d8..dbbc89589 100644 --- a/kitchensync/src/groupconfigcommon.cpp +++ b/kitchensync/src/groupconfigcommon.cpp @@ -26,7 +26,7 @@ #include <kdebug.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> #include <libqopensync/group.h> @@ -41,8 +41,8 @@ ObjectTypeSelector::ObjectTypeSelector( TQWidget *parent ) : TQWidget( parent ) { - TQGridLayout *tqlayout = new TQGridLayout( this ); - tqlayout->setMargin( 0 ); + TQGridLayout *layout = new TQGridLayout( this ); + layout->setMargin( 0 ); const QSync::Conversion conversion = SyncProcessManager::self()->environment()->conversion(); @@ -78,7 +78,7 @@ ObjectTypeSelector::ObjectTypeSelector( TQWidget *parent ) continue; TQCheckBox *objectCheckBox = new TQCheckBox( objectTypeMap[ objectType ], this ); - tqlayout->addWidget( objectCheckBox, row, col ); + layout->addWidget( objectCheckBox, row, col ); mObjectTypeChecks.insert( objectType, objectCheckBox ); col++; @@ -128,19 +128,19 @@ void ObjectTypeSelector::save( QSync::Group group ) GroupConfigCommon::GroupConfigCommon( TQWidget *parent ) : TQWidget( parent ) { - TQGridLayout *tqlayout = new TQGridLayout( this, 2, 2, KDialog::marginHint(), KDialog::spacingHint() ); + TQGridLayout *layout = new TQGridLayout( this, 2, 2, KDialog::marginHint(), KDialog::spacingHint() ); - tqlayout->addWidget( new TQLabel( i18n( "Name:" ), this ), 0, 0 ); + layout->addWidget( new TQLabel( i18n( "Name:" ), this ), 0, 0 ); mGroupName = new KLineEdit( this ); - tqlayout->addWidget( mGroupName, 0, 1 ); + layout->addWidget( mGroupName, 0, 1 ); - tqlayout->addWidget( new TQLabel( i18n( "Object Types to be Synchronized:"), this ), 1, 0, TQt::AlignTop ); + layout->addWidget( new TQLabel( i18n( "Object Types to be Synchronized:"), this ), 1, 0, TQt::AlignTop ); mObjectTypeSelector = new ObjectTypeSelector( this ); - tqlayout->addWidget( mObjectTypeSelector, 1, 1 ); + layout->addWidget( mObjectTypeSelector, 1, 1 ); - tqlayout->setRowStretch( 2, 1 ); + layout->setRowStretch( 2, 1 ); } void GroupConfigCommon::setSyncProcess( SyncProcess *syncProcess ) diff --git a/kitchensync/src/groupconfigdialog.cpp b/kitchensync/src/groupconfigdialog.cpp index 4d8be65d0..b2bfe470a 100644 --- a/kitchensync/src/groupconfigdialog.cpp +++ b/kitchensync/src/groupconfigdialog.cpp @@ -24,7 +24,7 @@ #include <klocale.h> -#include <tqlayout.h> +#include <layout.h> GroupConfigDialog::GroupConfigDialog( TQWidget *parent, SyncProcess *process ) : KDialogBase( parent, 0, true, i18n("Configure Synchronization Group"), diff --git a/kitchensync/src/groupitem.cpp b/kitchensync/src/groupitem.cpp index 3a294f5ba..ed240cd32 100644 --- a/kitchensync/src/groupitem.cpp +++ b/kitchensync/src/groupitem.cpp @@ -28,7 +28,7 @@ #include <kurllabel.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpixmap.h> #include <tqprogressbar.h> #include <tqvbox.h> @@ -50,7 +50,7 @@ GroupItem::GroupItem( KWidgetList *parent, SyncProcess *process ) boldFont.setBold( true ); boldFont.setPointSize( boldFont.pointSize() + 2 ); - TQGridLayout *tqlayout = new TQGridLayout( this, 4, 4, KDialog::marginHint(), KDialog::spacingHint() ); + TQGridLayout *layout = new TQGridLayout( this, 4, 4, KDialog::marginHint(), KDialog::spacingHint() ); mBox = new TQVBox( this ); mBox->setMargin( 5 ); @@ -71,38 +71,38 @@ 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() ); - - 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" ) ); - - hbox->setPaletteBackgroundColor( tqcolorGroup().mid() ); - hbox->setMaximumHeight( hbox->tqminimumSizeHint().height() ); - - tqlayout->addMultiCellWidget( hbox, 0, 0, 0, 3 ); - tqlayout->addMultiCellWidget( mBox, 1, 1, 0, 3 ); - tqlayout->addWidget( mTime, 2, 0 ); - tqlayout->addWidget( mSyncAction, 2, 1 ); - tqlayout->addWidget( mConfigureAction, 2, 2 ); - tqlayout->addWidget( mProgressBar, 2, 3 ); - tqlayout->setColStretch( 0, 1 ); - tqlayout->setRowStretch( 3, 1 ); - - setPaletteBackgroundColor( kapp->tqpalette().active().base() ); + mGroupName->setPaletteForegroundColor( colorGroup().light() ); + mGroupName->setPaletteBackgroundColor( colorGroup().mid() ); + + 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( colorGroup().mid() ); + hbox->setMaximumHeight( hbox->minimumSizeHint().height() ); + + layout->addMultiCellWidget( hbox, 0, 0, 0, 3 ); + layout->addMultiCellWidget( mBox, 1, 1, 0, 3 ); + layout->addWidget( mTime, 2, 0 ); + layout->addWidget( mSyncAction, 2, 1 ); + layout->addWidget( mConfigureAction, 2, 2 ); + layout->addWidget( mProgressBar, 2, 3 ); + layout->setColStretch( 0, 1 ); + layout->setRowStretch( 3, 1 ); + + setPaletteBackgroundColor( kapp->palette().active().base() ); connect( mCallbackHandler, TQT_SIGNAL( conflict( QSync::SyncMapping ) ), this, TQT_SLOT( conflict( QSync::SyncMapping ) ) ); @@ -139,11 +139,11 @@ void GroupItem::update() { clear(); - mGroupName->setText( i18n( "Group: %1" ).tqarg( mSyncProcess->group().name() ) ); + mGroupName->setText( i18n( "Group: %1" ).arg( mSyncProcess->group().name() ) ); TQDateTime dateTime = mSyncProcess->group().lastSynchronization(); if ( dateTime.isValid() ) - mTime->setText( i18n( "Last synchronized on: %1" ).tqarg( KGlobal::locale()->formatDateTime( dateTime ) ) ); + mTime->setText( i18n( "Last synchronized on: %1" ).arg( KGlobal::locale()->formatDateTime( dateTime ) ) ); else mTime->setText( i18n( "Not synchronized yet" ) ); @@ -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" ).arg( 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" ).arg( 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; } } @@ -298,19 +298,19 @@ void GroupItem::member( const QSync::SyncMemberUpdate &update ) (*it)->seStatusMessage( i18n( "Disconnected" ) ); break; case QSync::SyncMemberUpdate::ConnectError: - (*it)->seStatusMessage( i18n( "Error: %1" ).tqarg( update.result().message() ) ); + (*it)->seStatusMessage( i18n( "Error: %1" ).arg( update.result().message() ) ); break; case QSync::SyncMemberUpdate::GetChangesError: - (*it)->seStatusMessage( i18n( "Error: %1" ).tqarg( update.result().message() ) ); + (*it)->seStatusMessage( i18n( "Error: %1" ).arg( update.result().message() ) ); break; case QSync::SyncMemberUpdate::CommittedAllError: - (*it)->seStatusMessage( i18n( "Error: %1" ).tqarg( update.result().message() ) ); + (*it)->seStatusMessage( i18n( "Error: %1" ).arg( update.result().message() ) ); break; case QSync::SyncMemberUpdate::SyncDoneError: - (*it)->seStatusMessage( i18n( "Error: %1" ).tqarg( update.result().message() ) ); + (*it)->seStatusMessage( i18n( "Error: %1" ).arg( update.result().message() ) ); break; case QSync::SyncMemberUpdate::DisconnectedError: - (*it)->seStatusMessage( i18n( "Error: %1" ).tqarg( update.result().message() ) ); + (*it)->seStatusMessage( i18n( "Error: %1" ).arg( update.result().message() ) ); break; default: break; @@ -358,24 +358,24 @@ MemberItem::MemberItem( TQWidget *parent, SyncProcess *process, QSync::Plugin plugin = member.plugin(); - TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); + TQVBoxLayout *layout = new TQVBoxLayout( this ); TQHBox* box = new TQHBox( this ); box->setMargin( 5 ); box->setSpacing( 6 ); - tqlayout->addWidget( box ); + layout->addWidget( box ); 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/groupview.cpp b/kitchensync/src/groupview.cpp index 8e1adf87e..42d5b9690 100644 --- a/kitchensync/src/groupview.cpp +++ b/kitchensync/src/groupview.cpp @@ -18,7 +18,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <tqlayout.h> +#include <layout.h> #include "aboutpage.h" #include "groupitem.h" diff --git a/kitchensync/src/htmldiffalgodisplay.cpp b/kitchensync/src/htmldiffalgodisplay.cpp index 9558eaecd..1b4c2fe1b 100644 --- a/kitchensync/src/htmldiffalgodisplay.cpp +++ b/kitchensync/src/htmldiffalgodisplay.cpp @@ -45,13 +45,13 @@ void HTMLDiffAlgoDisplay::begin() mText.append( "<html>" ); mText.append( TQString( "<body text=\"%1\" bgcolor=\"%2\">" ) - .tqarg( KGlobalSettings::textColor().name() ) - .tqarg( KGlobalSettings::baseColor().name() ) ); + .arg( KGlobalSettings::textColor().name() ) + .arg( KGlobalSettings::baseColor().name() ) ); mText.append( "<center><table>" ); mText.append( TQString( "<tr><th></th><th align=\"center\">%1</th><td> </td><th align=\"center\">%2</th></tr>" ) - .tqarg( mLeftTitle ) - .tqarg( mRightTitle ) ); + .arg( mLeftTitle ) + .arg( mRightTitle ) ); } void HTMLDiffAlgoDisplay::end() @@ -76,22 +76,22 @@ void HTMLDiffAlgoDisplay::setRightSourceTitle( const TQString &title ) void HTMLDiffAlgoDisplay::additionalLeftField( const TQString &id, const TQString &value ) { mText.append( TQString( "<tr><td align=\"right\"><b>%1:</b></td><td bgcolor=\"#9cff83\">%2</td><td></td><td></td></tr>" ) - .tqarg( id ) - .tqarg( textToHTML( value ) ) ); + .arg( id ) + .arg( textToHTML( value ) ) ); } void HTMLDiffAlgoDisplay::additionalRightField( const TQString &id, const TQString &value ) { mText.append( TQString( "<tr><td align=\"right\"><b>%1:</b></td><td></td><td></td><td bgcolor=\"#9cff83\">%2</td></tr>" ) - .tqarg( id ) - .tqarg( textToHTML( value ) ) ); + .arg( id ) + .arg( textToHTML( value ) ) ); } void HTMLDiffAlgoDisplay::conflictField( const TQString &id, const TQString &leftValue, const TQString &rightValue ) { mText.append( TQString( "<tr><td align=\"right\"><b>%1:</b></td><td bgcolor=\"#ff8686\">%2</td><td></td><td bgcolor=\"#ff8686\">%3</td></tr>" ) - .tqarg( id ) - .tqarg( textToHTML( leftValue ) ) - .tqarg( textToHTML( rightValue ) ) ); + .arg( id ) + .arg( textToHTML( leftValue ) ) + .arg( textToHTML( rightValue ) ) ); } diff --git a/kitchensync/src/mainwidget.cpp b/kitchensync/src/mainwidget.cpp index 8dbef8cab..70451ee4f 100644 --- a/kitchensync/src/mainwidget.cpp +++ b/kitchensync/src/mainwidget.cpp @@ -38,7 +38,7 @@ #include <kstdaction.h> #include <kxmlguiclient.h> -#include <tqlayout.h> +#include <layout.h> MainWidget::MainWidget( KXMLGUIClient *guiClient, TQWidget *widget, const char *name ) : TQWidget( widget, name ), mGUIClient( guiClient ) @@ -141,7 +141,7 @@ void MainWidget::deleteGroup() SyncProcess *syncProcess = mGroupView->selectedSyncProcess(); if ( syncProcess ) { int result = KMessageBox::warningContinueCancel( this, - i18n("Delete synchronization group '%1'?").tqarg( syncProcess->group().name() ) ); + i18n("Delete synchronization group '%1'?").arg( syncProcess->group().name() ) ); if ( result == KMessageBox::Continue ) { SyncProcessManager::self()->remove( syncProcess ); enableActions(); diff --git a/kitchensync/src/memberconfig.cpp b/kitchensync/src/memberconfig.cpp index c2216546c..f7fed0141 100644 --- a/kitchensync/src/memberconfig.cpp +++ b/kitchensync/src/memberconfig.cpp @@ -27,7 +27,7 @@ #include <kmessagebox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtabwidget.h> MemberConfig::MemberConfig( TQWidget *parent, const QSync::Member &member ) @@ -51,7 +51,7 @@ void MemberConfig::loadData() if ( error ) { KMessageBox::error( this, i18n("Unable to read config from plugin '%1':\n%2") - .tqarg( mMember.pluginName() ).tqarg( error.message() ) ); + .arg( mMember.pluginName() ).arg( error.message() ) ); } else { TQString txt = TQString::fromUtf8( cfg.data(), cfg.size() ); mGui->load( txt ); @@ -65,7 +65,7 @@ void MemberConfig::saveData() TQString txt = mGui->save(); if ( txt.isEmpty() ) { - KMessageBox::sorry( this, i18n("Configuration of %1 is empty.").tqarg( mMember.pluginName() ) ); + KMessageBox::sorry( this, i18n("Configuration of %1 is empty.").arg( mMember.pluginName() ) ); } else { TQByteArray cfg = txt.utf8(); cfg.truncate(cfg.size() - 1); /* discard NUL terminator */ diff --git a/kitchensync/src/multiconflictdialog.cpp b/kitchensync/src/multiconflictdialog.cpp index e7c037610..2e630cace 100644 --- a/kitchensync/src/multiconflictdialog.cpp +++ b/kitchensync/src/multiconflictdialog.cpp @@ -23,7 +23,7 @@ #include <kwidgetlist.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include "memberinfo.h" @@ -37,10 +37,10 @@ class ChangeItem : public KWidgetListItem : KWidgetListItem( parent ), mChange( change ) { - TQGridLayout *tqlayout = new TQGridLayout( this, 2, 1, KDialog::marginHint(), KDialog::spacingHint() ); + TQGridLayout *layout = new TQGridLayout( this, 2, 1, KDialog::marginHint(), KDialog::spacingHint() ); MemberInfo mi( change.member() ); - tqlayout->addWidget( new TQLabel( mi.name(), this ), 0, 0 ); + layout->addWidget( new TQLabel( mi.name(), this ), 0, 0 ); TQString type; switch ( change.changeType() ) { @@ -62,7 +62,7 @@ class ChangeItem : public KWidgetListItem break; } - tqlayout->addWidget( new TQLabel( type, this ), 1, 0 ); + layout->addWidget( new TQLabel( type, this ), 1, 0 ); } QSync::SyncChange change() const { return mChange; } @@ -118,24 +118,24 @@ void MultiConflictDialog::ignoreChange() void MultiConflictDialog::initGUI() { - TQGridLayout *tqlayout = new TQGridLayout( this, 3, 3, KDialog::marginHint(), KDialog::spacingHint() ); + TQGridLayout *layout = new TQGridLayout( this, 3, 3, KDialog::marginHint(), KDialog::spacingHint() ); - tqlayout->addMultiCellWidget( new TQLabel( i18n( "A conflict has appeared, please solve it manually." ), this ), 0, 0, 0, 2 ); + layout->addMultiCellWidget( new TQLabel( i18n( "A conflict has appeared, please solve it manually." ), this ), 0, 0, 0, 2 ); mWidgetList = new KWidgetList( this ); - tqlayout->addMultiCellWidget( mWidgetList, 1, 1, 0, 2 ); + layout->addMultiCellWidget( mWidgetList, 1, 1, 0, 2 ); TQPushButton *button = new TQPushButton( i18n( "Use Selected Item" ), this ); connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( useSelectedChange() ) ); - tqlayout->addWidget( button, 2, 0 ); + layout->addWidget( button, 2, 0 ); button = new TQPushButton( i18n( "Duplicate Items" ), this ); connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( duplicateChange() ) ); - tqlayout->addWidget( button, 2, 1 ); + layout->addWidget( button, 2, 1 ); button = new TQPushButton( i18n( "Ignore Conflict" ), this ); connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( ignoreChange() ) ); - tqlayout->addWidget( button, 2, 2 ); + layout->addWidget( button, 2, 2 ); } #include "multiconflictdialog.moc" diff --git a/kitchensync/src/part.cpp b/kitchensync/src/part.cpp index f66eece63..086a8ef73 100644 --- a/kitchensync/src/part.cpp +++ b/kitchensync/src/part.cpp @@ -18,7 +18,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <tqlayout.h> +#include <layout.h> #include <tqvbox.h> #include <kaction.h> diff --git a/kitchensync/src/pluginpicker.cpp b/kitchensync/src/pluginpicker.cpp index d8d6c46d5..64b025b62 100644 --- a/kitchensync/src/pluginpicker.cpp +++ b/kitchensync/src/pluginpicker.cpp @@ -32,17 +32,17 @@ #include <klocale.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> PluginItem::PluginItem( KWidgetList *list, const QSync::Plugin &plugin ) : KWidgetListItem( list ), mPlugin( plugin ) { TQString iconName = MemberInfo::pluginIconName( mPlugin.name() ); - TQGridLayout *tqlayout = new TQGridLayout( this, 2, 2, KDialog::marginHint(), KDialog::spacingHint() ); + TQGridLayout *layout = new TQGridLayout( this, 2, 2, KDialog::marginHint(), KDialog::spacingHint() ); 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 ); @@ -51,19 +51,19 @@ PluginItem::PluginItem( KWidgetList *list, const QSync::Plugin &plugin ) font.setBold( true ); name->setFont( font ); - tqlayout->addWidget( icon, 0, 0 ); - tqlayout->addWidget( name, 0, 1 ); - tqlayout->addWidget( description, 1, 1 ); + layout->addWidget( icon, 0, 0 ); + layout->addWidget( name, 0, 1 ); + layout->addWidget( description, 1, 1 ); } PluginPicker::PluginPicker( TQWidget *parent ) : TQWidget( parent ) { - TQBoxLayout *tqlayout = new TQVBoxLayout( this ); + TQBoxLayout *layout = new TQVBoxLayout( this ); mPluginList = new KWidgetList( this ); - tqlayout->addWidget( mPluginList ); + layout->addWidget( mPluginList ); connect( mPluginList, TQT_SIGNAL( doubleClicked( KWidgetListItem* ) ), TQT_SIGNAL( selected() ) ); diff --git a/kitchensync/src/singleconflictdialog.cpp b/kitchensync/src/singleconflictdialog.cpp index f9228e174..3c11cd058 100644 --- a/kitchensync/src/singleconflictdialog.cpp +++ b/kitchensync/src/singleconflictdialog.cpp @@ -22,7 +22,7 @@ #include <klocale.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include "addresseediffalgo.h" @@ -96,28 +96,28 @@ void SingleConflictDialog::ignoreChange() void SingleConflictDialog::initGUI() { - TQGridLayout *tqlayout = new TQGridLayout( this, 3, 4, KDialog::marginHint(), KDialog::spacingHint() ); + TQGridLayout *layout = new TQGridLayout( this, 3, 4, KDialog::marginHint(), KDialog::spacingHint() ); - tqlayout->addMultiCellWidget( new TQLabel( i18n( "A conflict has appeared, please solve it manually." ), this ), 0, 0, 0, 3 ); + layout->addMultiCellWidget( new TQLabel( i18n( "A conflict has appeared, please solve it manually." ), this ), 0, 0, 0, 3 ); mDiffAlgoDisplay = new KSync::HTMLDiffAlgoDisplay( this ); - tqlayout->addMultiCellWidget( mDiffAlgoDisplay, 1, 1, 0, 3 ); + layout->addMultiCellWidget( mDiffAlgoDisplay, 1, 1, 0, 3 ); TQPushButton *button = new TQPushButton( i18n( "Use Item" ), this ); connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( useFirstChange() ) ); - tqlayout->addWidget( button, 2, 0 ); + layout->addWidget( button, 2, 0 ); button = new TQPushButton( i18n( "Duplicate Items" ), this ); connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( duplicateChange() ) ); - tqlayout->addWidget( button, 2, 1 ); + layout->addWidget( button, 2, 1 ); button = new TQPushButton( i18n( "Ignore Conflict" ), this ); connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( ignoreChange() ) ); - tqlayout->addWidget( button, 2, 2 ); + layout->addWidget( button, 2, 2 ); button = new TQPushButton( i18n( "Use Item" ), this ); connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( useSecondChange() ) ); - tqlayout->addWidget( button, 2, 3 ); + layout->addWidget( button, 2, 3 ); } #include "singleconflictdialog.moc" 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/kitchensync/src/syncprocessmanager.cpp b/kitchensync/src/syncprocessmanager.cpp index 67fe3095c..fda111efd 100644 --- a/kitchensync/src/syncprocessmanager.cpp +++ b/kitchensync/src/syncprocessmanager.cpp @@ -47,7 +47,7 @@ SyncProcessManager::SyncProcessManager() QSync::Result result = mEnvironment->initialize(); if ( result.isError() ) { KMessageBox::error( 0, i18n("Error initializing OpenSync.\n%1") - .tqarg( result.message() ) ); + .arg( result.message() ) ); } else { init( mEnvironment ); } diff --git a/kmail/ChangeLog b/kmail/ChangeLog index 8c7c6664c..4af2bcb1e 100644 --- a/kmail/ChangeLog +++ b/kmail/ChangeLog @@ -184,7 +184,7 @@ please visit http://webcvs.kde.org Do the right thing when sending to "me@there (John Doe)" Waldo's folderless-acount-segv-fix More against destroyed last char in message - Better long/normal folder-list tqgeometry bugfix + Better long/normal folder-list geometry bugfix Don't quit while sending, and show a label while you send. 1999-02-03 Sven Radej <radej@kde.org> (KMail-1.0.16) @@ -245,7 +245,7 @@ please visit http://webcvs.kde.org 1999-01-23 Stefan Taferner <taferner@kde.org> (KMail-1.0.14) - * New feature: tqlayout can now be switched between + * New feature: layout can now be switched between "long folder list" and "short folder list". Option setable in settings->appearance. @@ -264,7 +264,7 @@ please visit http://webcvs.kde.org Now it is possible to have more folders than the screen is high and still select them in the filter dialog. * Filter Dialog: changed folder combo box to (semi) auto - resize. Changed tqlayout of dialog to better display all + resize. Changed layout of dialog to better display all elements. Also enabled vertical resizing of dialog. 1999-01-17 Stefan Taferner <taferner@kde.org> (KMail-1.0.12) @@ -553,7 +553,7 @@ Sun Sep 6 18:28:45 1998 Markus Wuebben <markus@kde.org> quoted text to catch smileys at the beginning of the line ;-) - * Main window configuration (tqgeometry, etc.) is now + * Main window configuration (geometry, etc.) is now stored again. * Composer: changed completion key from Ctrl-. to Ctrl-T diff --git a/kmail/Mainpage.dox b/kmail/Mainpage.dox index 9c24f4598..d970bbe8a 100644 --- a/kmail/Mainpage.dox +++ b/kmail/Mainpage.dox @@ -316,9 +316,9 @@ with questions... length := Q_UINT16 ; little endian (native?) - value := tqunicode-string-value / ulong-value + value := unicode-string-value / ulong-value - tqunicode-string-value := 0*256QChar ; network-byte-order + unicode-string-value := 0*256QChar ; network-byte-order ulong-value := unsigned_long ; little endian @@ -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,9 +342,9 @@ 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 + u: unicode-string-value; l: ulong-value Proposed new (KDE 3.2 / KMail 1.6) entry format: @@ -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) @@ -589,11 +589,11 @@ Strategy: case. These are messages that have neither an In-Reply-To header nor a References header and have a subject that is not prefixed. In case there is a perfect parent, the current sort cache item is - appended to the parents list of unsorted tqchildren, or to that of + appended to the parents list of unsorted children, or to that of root, if there is not. A sort cache item is created in the mSortCache for the parent, if it is not already there. Messages with a parent of -1 are appended to the "unparented" list, which is later traversed and - its elements threaded. Messages with -2 as the parent are tqchildren of + its elements threaded. Messages with -2 as the parent are children of root as well, as noted above, and will remain so. Once the end of the file is reached, we should have a nicely filled @@ -677,13 +677,13 @@ Strategy: cache items happen at the same time. As previously mentioned (or not) each sort cache item holds a list of its - sorted and one of its unsorted tqchildren. Starting with the root node the + sorted and one of its unsorted children. Starting with the root node the unsorted list is first qsorted, and then merged with the list of already - sorted tqchildren. To achieve that, the heads of both lists are compared and + sorted children. To achieve that, the heads of both lists are compared and the one with the "better" key is added to the list view next by creating a KMHeaderListItem for it. That header item receives both its sort key as well as its id from the sort cache item. Should the current sort cache item have - tqchildren, it is added to the end of a queue of nodes to repeat these steps + children, it is added to the end of a queue of nodes to repeat these steps on after the current level is sorted. This way, a breadth first merge sort is performed on the sort cache items and header items are created at each node. @@ -714,7 +714,7 @@ What happens when a message arrives in the folder? After those house keeping tasks are performed, the list of as of yet imper- fectly threaded messages is traversed and our newly arrived message is considered as a new parent for each item on it. This is especially important - to ensure that parents arriving out of order after their tqchildren still end + to ensure that parents arriving out of order after their children still end up as parents. If necessary, the entries in the .sorted file of rethreaded messages are updated. An entry for the new message itself is appended to the .sorted file as well. @@ -732,9 +732,9 @@ What happens when a message is removed from the folder? In this case the msgRemoved slot kicks in and updates the headers list. First the sort cache item and header item representing our message are removed from the data structures and the ids of all items after it in the store decre- - mented. Then a list of tqchildren of the message is assembled containing those - tqchildren that have to be reparented now that our message has gone away. If - one of those tqchildren has been marked as toBeDeleted, it is simply added to + mented. Then a list of children of the message is assembled containing those + children that have to be reparented now that our message has gone away. If + one of those children has been marked as toBeDeleted, it is simply added to root at top level, because there is no need to find a parent for it if it is to go away as well. This is an optimization to avoid rethreading all messages in a thread when deleting several messages in a thread, or even the @@ -743,7 +743,7 @@ What happens when a message is removed from the folder? can be avoided. Note that that does not work when moving messages via filter action. - That list of tqchildren is then traversed and a new parent found for each one + That list of children is then traversed and a new parent found for each one using, again, findParent and findParentBySubject. When a message becomes imperfectly threaded in the process, it is added to the corresponding list. diff --git a/kmail/aboutdata.cpp b/kmail/aboutdata.cpp index 0fa29906d..2ed80f7bc 100644 --- a/kmail/aboutdata.cpp +++ b/kmail/aboutdata.cpp @@ -175,7 +175,7 @@ namespace KMail { "heiko@ist.eigentlich.net", 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 @@ -196,7 +196,7 @@ namespace KMail { "jan@simonson.pp.se", 0 }, { "Paul Sprakes", 0, 0, 0 }, // fix for bug:63619 (filter button in toolbar doesn't work), context menu clean up { "Will Stephenson", 0, 0, 0 }, // added IM status indicator - { "Hasso Tepper", 0, 0, 0 }, // improve tqlayout of recipients editor + { "Hasso Tepper", 0, 0, 0 }, // improve layout of recipients editor { "Patrick S. Vogt", I18N_NOOP("timestamp for 'Transmission completed' status messages"), "patrick.vogt@unibas.ch", 0 }, { "Jan-Oliver Wagner", I18N_NOOP("\xC3\x84gypten and Kroupware project management"), diff --git a/kmail/accountdialog.cpp b/kmail/accountdialog.cpp index 93616ac8f..b919f88ed 100644 --- a/kmail/accountdialog.cpp +++ b/kmail/accountdialog.cpp @@ -23,7 +23,7 @@ #include <tqbuttongroup.h> #include <tqcheckbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtabwidget.h> #include <tqradiobutton.h> #include <tqvalidator.h> @@ -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; } @@ -358,10 +358,10 @@ void AccountDialog::makeLocalAccountPage() TQButtonGroup *group = new TQButtonGroup(i18n("Locking Method"), page ); group->setColumnLayout(0, Qt::Horizontal); - group->tqlayout()->setSpacing( 0 ); - group->tqlayout()->setMargin( 0 ); - TQGridLayout *groupLayout = new TQGridLayout( group->tqlayout() ); - groupLayout->tqsetAlignment( TQt::AlignTop ); + group->layout()->setSpacing( 0 ); + group->layout()->setMargin( 0 ); + TQGridLayout *groupLayout = new TQGridLayout( group->layout() ); + 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()) ); @@ -1127,7 +1127,7 @@ void AccountDialog::makeImapAccountPage( bool connected ) // TODO (marc/bo): Test this mSieveConfigEditor = new SieveConfigEditor( tabWidget ); - mSieveConfigEditor->tqlayout()->setMargin( KDialog::marginHint() ); + mSieveConfigEditor->layout()->setMargin( KDialog::marginHint() ); tabWidget->addTab( mSieveConfigEditor, i18n("&Filtering") ); connect(kapp,TQT_SIGNAL(kdisplayFontChanged()),TQT_SLOT(slotFontChanged())); @@ -1191,7 +1191,7 @@ void AccountDialog::setupSettings() mPop.loginEdit->setText( ap.login() ); mPop.passwordEdit->setText( ap.passwd()); mPop.hostEdit->setText( ap.host() ); - mPop.portEdit->setText( TQString("%1").tqarg( ap.port() ) ); + mPop.portEdit->setText( TQString("%1").arg( ap.port() ) ); mPop.usePipeliningCheck->setChecked( ap.usePipelining() ); mPop.storePasswordCheck->setChecked( ap.storePasswd() ); mPop.leaveOnServerCheck->setChecked( ap.leaveOnServer() ); @@ -1256,7 +1256,7 @@ void AccountDialog::setupSettings() mImap.loginEdit->setText( ai.login() ); mImap.passwordEdit->setText( ai.passwd()); mImap.hostEdit->setText( ai.host() ); - mImap.portEdit->setText( TQString("%1").tqarg( ai.port() ) ); + mImap.portEdit->setText( TQString("%1").arg( ai.port() ) ); mImap.autoExpungeCheck->setChecked( ai.autoExpunge() ); mImap.hiddenFoldersCheck->setChecked( ai.hiddenFolders() ); mImap.subscribedFoldersCheck->setChecked( ai.onlySubscribedFolders() ); @@ -1309,7 +1309,7 @@ void AccountDialog::setupSettings() mImap.loginEdit->setText( ai.login() ); mImap.passwordEdit->setText( ai.passwd()); mImap.hostEdit->setText( ai.host() ); - mImap.portEdit->setText( TQString("%1").tqarg( ai.port() ) ); + mImap.portEdit->setText( TQString("%1").arg( ai.port() ) ); #if 0 mImap.resourceCheck->setChecked( ai.resource() ); #endif @@ -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 " @@ -2293,7 +2293,7 @@ NamespaceEditDialog::NamespaceEditDialog( TQWidget *parent, } else { ns = i18n("Shared"); } - setCaption( i18n("Edit Namespace '%1'").tqarg(ns) ); + setCaption( i18n("Edit Namespace '%1'").arg(ns) ); TQGrid* grid = new TQGrid( 2, page ); mBg = new TQButtonGroup( 0 ); @@ -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..e4d22eefd 100644 --- a/kmail/accountmanager.cpp +++ b/kmail/accountmanager.cpp @@ -100,7 +100,7 @@ void AccountManager::readConfig(void) acctType = "pop"; acctName = config->readEntry("Name"); id = config->readUnsignedNumEntry("Id", 0); - if (acctName.isEmpty()) acctName = i18n("Account %1").tqarg(i); + if (acctName.isEmpty()) acctName = i18n("Account %1").arg(i); acct = create(acctType, acctName, id); if (!acct) continue; add(acct); @@ -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() ) { @@ -183,7 +183,7 @@ void AccountManager::processNextCheck( bool _newMail ) TQString tmp = i18n("Account %1 has no mailbox defined:\n" "mail checking aborted;\n" "check your account settings.") - .tqarg(curAccount->name()); + .arg(curAccount->name()); KMessageBox::information(0,tmp); emit checkedMail( false, mInteractive, mTotalNewInFolder ); mTotalNewMailsArrived = 0; @@ -219,11 +219,11 @@ 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( - i18n("Checking account %1 for new mail").tqarg(curAccount->name())); + i18n("Checking account %1 for new mail").arg(curAccount->name())); kdDebug(5006) << "processing next mail check for " << curAccount->name() << endl; diff --git a/kmail/accountwizard.cpp b/kmail/accountwizard.cpp index 6a188fbb5..04be2add9 100644 --- a/kmail/accountwizard.cpp +++ b/kmail/accountwizard.cpp @@ -36,7 +36,7 @@ #include <tqdir.h> #include <tqhbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <tqvbox.h> @@ -215,29 +215,29 @@ void AccountWizard::setupAccountTypePage() void AccountWizard::setupAccountInformationPage() { mAccountInformationPage = new TQWidget( this ); - TQGridLayout *tqlayout = new TQGridLayout( mAccountInformationPage, 3, 2, + TQGridLayout *layout = new TQGridLayout( mAccountInformationPage, 3, 2, KDialog::marginHint(), KDialog::spacingHint() ); TQLabel *label = new TQLabel( i18n( "Real name:" ), mAccountInformationPage ); mRealName = new KLineEdit( mAccountInformationPage ); label->setBuddy( mRealName ); - tqlayout->addWidget( label, 0, 0 ); - tqlayout->addWidget( mRealName, 0, 1 ); + layout->addWidget( label, 0, 0 ); + layout->addWidget( mRealName, 0, 1 ); label = new TQLabel( i18n( "E-mail address:" ), mAccountInformationPage ); mEMailAddress = new KLineEdit( mAccountInformationPage ); label->setBuddy( mEMailAddress ); - tqlayout->addWidget( label, 1, 0 ); - tqlayout->addWidget( mEMailAddress, 1, 1 ); + layout->addWidget( label, 1, 0 ); + layout->addWidget( mEMailAddress, 1, 1 ); label = new TQLabel( i18n( "Organization:" ), mAccountInformationPage ); mOrganization = new KLineEdit( mAccountInformationPage ); label->setBuddy( mOrganization ); - tqlayout->addWidget( label, 2, 0 ); - tqlayout->addWidget( mOrganization, 2, 1 ); + layout->addWidget( label, 2, 0 ); + layout->addWidget( mOrganization, 2, 1 ); addPage( mAccountInformationPage, i18n( "Account Information" ) ); } @@ -245,23 +245,23 @@ void AccountWizard::setupAccountInformationPage() void AccountWizard::setupLoginInformationPage() { mLoginInformationPage = new TQWidget( this ); - TQGridLayout *tqlayout = new TQGridLayout( mLoginInformationPage, 2, 2, + TQGridLayout *layout = new TQGridLayout( mLoginInformationPage, 2, 2, KDialog::marginHint(), KDialog::spacingHint() ); TQLabel *label = new TQLabel( i18n( "Login name:" ), mLoginInformationPage ); mLoginName = new KLineEdit( mLoginInformationPage ); label->setBuddy( mLoginName ); - tqlayout->addWidget( label, 0, 0 ); - tqlayout->addWidget( mLoginName, 0, 1 ); + layout->addWidget( label, 0, 0 ); + layout->addWidget( mLoginName, 0, 1 ); label = new TQLabel( i18n( "Password:" ), mLoginInformationPage ); mPassword = new KLineEdit( mLoginInformationPage ); mPassword->setEchoMode( TQLineEdit::Password ); label->setBuddy( mPassword ); - tqlayout->addWidget( label, 1, 0 ); - tqlayout->addWidget( mPassword, 1, 1 ); + layout->addWidget( label, 1, 0 ); + layout->addWidget( mPassword, 1, 1 ); addPage( mLoginInformationPage, i18n( "Login Information" ) ); } @@ -269,7 +269,7 @@ void AccountWizard::setupLoginInformationPage() void AccountWizard::setupServerInformationPage() { mServerInformationPage = new TQWidget( this ); - TQGridLayout *tqlayout = new TQGridLayout( mServerInformationPage, 3, 2, + TQGridLayout *layout = new TQGridLayout( mServerInformationPage, 3, 2, KDialog::marginHint(), KDialog::spacingHint() ); mIncomingLabel = new TQLabel( mServerInformationPage ); @@ -285,23 +285,23 @@ void AccountWizard::setupServerInformationPage() connect( mChooseLocation, TQT_SIGNAL( clicked() ), this, TQT_SLOT( chooseLocation() ) ); - tqlayout->addWidget( mIncomingLabel, 0, 0, AlignTop ); - tqlayout->addWidget( mIncomingLocationWdg, 0, 1 ); - tqlayout->addWidget( mIncomingServerWdg, 0, 1 ); + layout->addWidget( mIncomingLabel, 0, 0, AlignTop ); + layout->addWidget( mIncomingLocationWdg, 0, 1 ); + layout->addWidget( mIncomingServerWdg, 0, 1 ); TQLabel *label = new TQLabel( i18n( "Outgoing server:" ), mServerInformationPage ); mOutgoingServer = new KLineEdit( mServerInformationPage ); label->setBuddy( mOutgoingServer ); - tqlayout->addWidget( label, 1, 0 ); - tqlayout->addWidget( mOutgoingServer, 1, 1 ); + layout->addWidget( label, 1, 0 ); + layout->addWidget( mOutgoingServer, 1, 1 ); mOutgoingUseSSL = new TQCheckBox( i18n( "Use secure connection (SSL)" ), mServerInformationPage ); - tqlayout->addWidget( mOutgoingUseSSL, 2, 1 ); + layout->addWidget( mOutgoingUseSSL, 2, 1 ); mLocalDelivery = new TQCheckBox( i18n( "Use local delivery" ), mServerInformationPage ); - tqlayout->addWidget( mLocalDelivery, 3, 0 ); + layout->addWidget( mLocalDelivery, 3, 0 ); connect( mLocalDelivery, TQT_SIGNAL( toggled( bool ) ), mOutgoingServer, TQT_SLOT( setDisabled( bool ) ) ); @@ -516,7 +516,7 @@ void AccountWizard::checkPopCapabilities( const TQString &server, int port ) connect( mServerTest, TQT_SIGNAL( capabilities( const TQStringList&, const TQStringList& ) ), this, TQT_SLOT( popCapabilities( const TQStringList&, const TQStringList& ) ) ); - mAuthInfoLabel = createInfoLabel( i18n( "Check for supported security capabilities of %1..." ).tqarg( server ) ); + mAuthInfoLabel = createInfoLabel( i18n( "Check for supported security capabilities of %1..." ).arg( server ) ); } void AccountWizard::checkImapCapabilities( const TQString &server, int port ) @@ -527,7 +527,7 @@ void AccountWizard::checkImapCapabilities( const TQString &server, int port ) connect( mServerTest, TQT_SIGNAL( capabilities( const TQStringList&, const TQStringList& ) ), this, TQT_SLOT( imapCapabilities( const TQStringList&, const TQStringList& ) ) ); - mAuthInfoLabel = createInfoLabel( i18n( "Check for supported security capabilities of %1..." ).tqarg( server ) ); + mAuthInfoLabel = createInfoLabel( i18n( "Check for supported security capabilities of %1..." ).arg( server ) ); } void AccountWizard::checkSmtpCapabilities( const TQString &server, int port ) @@ -540,7 +540,7 @@ void AccountWizard::checkSmtpCapabilities( const TQString &server, int port ) this, TQT_SLOT( smtpCapabilities( const TQStringList&, const TQStringList&, const TQString&, const TQString&, const TQString& ) ) ); - mAuthInfoLabel = createInfoLabel( i18n( "Check for supported security capabilities of %1..." ).tqarg( server ) ); + mAuthInfoLabel = createInfoLabel( i18n( "Check for supported security capabilities of %1..." ).arg( server ) ); } void AccountWizard::popCapabilities( const TQStringList &capaNormalList, diff --git a/kmail/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..ccc011b3d 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 ); @@ -625,7 +625,7 @@ void ActionScheduler::actionMessage(KMFilterAction::ReturnCode res) if (msg) { if ( FilterLog::instance()->isLogging() ) { TQString logText( i18n( "<b>Applying filter action:</b> %1" ) - .tqarg( mFilterAction->displayString() ) ); + .arg( mFilterAction->displayString() ) ); FilterLog::instance()->add( logText, FilterLog::appliedAction ); } KMFilterAction *action = mFilterAction; @@ -786,19 +786,19 @@ TQString ActionScheduler::debug() TQValueList<ActionScheduler*>::iterator it; int i = 1; for ( it = schedulerList->begin(); it != schedulerList->end(); ++it ) { - res.append( TQString( "ActionScheduler #%1.\n" ).tqarg( i ) ); + res.append( TQString( "ActionScheduler #%1.\n" ).arg( i ) ); if ((*it)->mAccount && kmkernel->find( (*it)->mAccountId )) { res.append( TQString( "Account %1, Name %2.\n" ) - .tqarg( (*it)->mAccountId ) - .tqarg( kmkernel->acctMgr()->find( (*it)->mAccountId )->name() ) ); + .arg( (*it)->mAccountId ) + .arg( kmkernel->acctMgr()->find( (*it)->mAccountId )->name() ) ); } - res.append( TQString( "mExecuting %1, " ).tqarg( (*it)->mExecuting ? "true" : "false" ) ); - res.append( TQString( "mExecutingLock %1, " ).tqarg( (*it)->mExecutingLock ? "true" : "false" ) ); - res.append( TQString( "mFetchExecuting %1.\n" ).tqarg( (*it)->mFetchExecuting ? "true" : "false" ) ); - res.append( TQString( "mOriginalSerNum %1.\n" ).tqarg( (*it)->mOriginalSerNum ) ); - res.append( TQString( "mMessageIt %1.\n" ).tqarg( ((*it)->mMessageIt != 0) ? *(*it)->mMessageIt : 0 ) ); - res.append( TQString( "mSerNums count %1, " ).tqarg( (*it)->mSerNums.count() ) ); - res.append( TQString( "mFetchSerNums count %1.\n" ).tqarg( (*it)->mFetchSerNums.count() ) ); + res.append( TQString( "mExecuting %1, " ).arg( (*it)->mExecuting ? "true" : "false" ) ); + res.append( TQString( "mExecutingLock %1, " ).arg( (*it)->mExecutingLock ? "true" : "false" ) ); + res.append( TQString( "mFetchExecuting %1.\n" ).arg( (*it)->mFetchExecuting ? "true" : "false" ) ); + res.append( TQString( "mOriginalSerNum %1.\n" ).arg( (*it)->mOriginalSerNum ) ); + res.append( TQString( "mMessageIt %1.\n" ).arg( ((*it)->mMessageIt != 0) ? *(*it)->mMessageIt : 0 ) ); + res.append( TQString( "mSerNums count %1, " ).arg( (*it)->mSerNums.count() ) ); + res.append( TQString( "mFetchSerNums count %1.\n" ).arg( (*it)->mFetchSerNums.count() ) ); res.append( TQString( "mResult " ) ); if ((*it)->mResult == ResultOk) res.append( TQString( "ResultOk.\n" ) ); diff --git a/kmail/antispamconfig.cpp b/kmail/antispamconfig.cpp index 500529953..0cb047fd4 100644 --- a/kmail/antispamconfig.cpp +++ b/kmail/antispamconfig.cpp @@ -59,7 +59,7 @@ void AntiSpamConfig::readConfig() KConfigGroup general( &config, "General" ); unsigned int totalTools = general.readUnsignedNumEntry( "tools", 0 ); for ( unsigned int i = 1; i <= totalTools; ++i ) { - KConfigGroup tool( &config, TQString("Spamtool #%1").tqarg( i ) ); + KConfigGroup tool( &config, TQString("Spamtool #%1").arg( i ) ); if ( tool.hasKey( "ScoreHeader" ) ) { TQString name = tool.readEntry( "ScoreName" ); TQCString header = tool.readEntry( "ScoreHeader" ).latin1(); diff --git a/kmail/antispamwizard.cpp b/kmail/antispamwizard.cpp index 4091c715c..427e6e6c4 100644 --- a/kmail/antispamwizard.cpp +++ b/kmail/antispamwizard.cpp @@ -50,7 +50,7 @@ #include <tqdom.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtooltip.h> #include <tqwhatsthis.h> @@ -495,7 +495,7 @@ void AntiSpamWizard::checkToolAvailability() bool found = false; for ( TQValueListIterator<SpamToolConfig> it = mToolList.begin(); it != mToolList.end(); ++it ) { - TQString text( i18n("Scanning for %1...").tqarg( (*it).getId() ) ); + TQString text( i18n("Scanning for %1...").arg( (*it).getId() ) ); mInfoPage->setScanProgressText( text ); if ( (*it).isSpamTool() && (*it).isServerBased() ) { // check the configured account for pattern in <server> @@ -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; @@ -702,7 +702,7 @@ void AntiSpamWizard::ConfigReader::readAndMergeConfig() int registeredTools = general.readNumEntry( "tools", 0 ); for (int i = 1; i <= registeredTools; i++) { - KConfigGroup toolConfig( mConfig, groupName.tqarg( i ) ); + KConfigGroup toolConfig( mConfig, groupName.arg( i ) ); if( !toolConfig.readBoolEntry( "HeadersOnly", false ) ) mToolList.append( readToolConfig( toolConfig ) ); } @@ -714,7 +714,7 @@ void AntiSpamWizard::ConfigReader::readAndMergeConfig() int user_registeredTools = user_general.readNumEntry( "tools", 0 ); for (int i = 1; i <= user_registeredTools; i++) { - KConfigGroup toolConfig( mConfig, groupName.tqarg( i ) ); + KConfigGroup toolConfig( mConfig, groupName.arg( i ) ); if( !toolConfig.readBoolEntry( "HeadersOnly", false ) ) mergeToolConfig( readToolConfig( toolConfig ) ); } @@ -855,7 +855,7 @@ ASWizInfoPage::ASWizInfoPage( AntiSpamWizard::WizardMode mode, TQWidget * parent, const char * name ) : ASWizPage( parent, name ) { - TQBoxLayout * tqlayout = new TQVBoxLayout( mLayout ); + TQBoxLayout * layout = new TQVBoxLayout( mLayout ); mIntroText = new TQLabel( this ); mIntroText->setText( @@ -879,26 +879,26 @@ ASWizInfoPage::ASWizInfoPage( AntiSpamWizard::WizardMode mode, "deleting the filter rules created by the wizard to get " "back to the former behavior." ) ); - tqlayout->addWidget( mIntroText ); + layout->addWidget( mIntroText ); mScanProgressText = new TQLabel( this ); mScanProgressText->setText( "" ) ; - tqlayout->addWidget( mScanProgressText ); + layout->addWidget( mScanProgressText ); mToolsList = new KListBox( this ); mToolsList->hide(); mToolsList->setSelectionMode( TQListBox::Multi ); mToolsList->setRowMode( TQListBox::FixedNumber ); mToolsList->setRowMode( 10 ); - tqlayout->addWidget( mToolsList ); + layout->addWidget( mToolsList ); connect( mToolsList, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(processSelectionChange(void)) ); mSelectionHint = new TQLabel( this ); mSelectionHint->setText( "" ); - tqlayout->addWidget( mSelectionHint ); + layout->addWidget( mSelectionHint ); - tqlayout->addStretch(); + layout->addStretch(); } @@ -940,18 +940,18 @@ ASWizSpamRulesPage::ASWizSpamRulesPage( TQWidget * parent, const char * name, KMFolderTree * mainFolderTree ) : ASWizPage( parent, name ) { - TQVBoxLayout *tqlayout = new TQVBoxLayout( mLayout ); + TQVBoxLayout *layout = new TQVBoxLayout( mLayout ); mMarkRules = new TQCheckBox( i18n("&Mark detected spam messages as read"), this ); TQWhatsThis::add( mMarkRules, i18n( "Mark messages which have been classified as spam as read.") ); - tqlayout->addWidget( mMarkRules); + layout->addWidget( mMarkRules); mMoveSpamRules = new TQCheckBox( i18n("Move &known spam to:"), this ); TQWhatsThis::add( mMoveSpamRules, i18n( "The default folder for spam messages is the trash folder, " "but you may change that in the folder view below.") ); - tqlayout->addWidget( mMoveSpamRules ); + layout->addWidget( mMoveSpamRules ); mFolderReqForSpamFolder = new FolderRequester( this, mainFolderTree ); mFolderReqForSpamFolder->setFolder( "trash" ); @@ -959,7 +959,7 @@ ASWizSpamRulesPage::ASWizSpamRulesPage( TQWidget * parent, const char * name, mFolderReqForSpamFolder->setShowOutbox( false ); mFolderReqForSpamFolder->setShowImapFolders( false ); - TQHBoxLayout *hLayout1 = new TQHBoxLayout( tqlayout ); + TQHBoxLayout *hLayout1 = new TQHBoxLayout( layout ); hLayout1->addSpacing( KDialog::spacingHint() * 3 ); hLayout1->addWidget( mFolderReqForSpamFolder ); @@ -969,7 +969,7 @@ ASWizSpamRulesPage::ASWizSpamRulesPage( TQWidget * parent, const char * name, "in the folder view below.<p>" "Not all tools support a classification as unsure. If you haven't " "selected a capable tool, you can't select a folder as well.") ); - tqlayout->addWidget( mMoveUnsureRules ); + layout->addWidget( mMoveUnsureRules ); mFolderReqForUnsureFolder = new FolderRequester( this, mainFolderTree ); mFolderReqForUnsureFolder->setFolder( "inbox" ); @@ -977,11 +977,11 @@ ASWizSpamRulesPage::ASWizSpamRulesPage( TQWidget * parent, const char * name, mFolderReqForUnsureFolder->setShowOutbox( false ); mFolderReqForUnsureFolder->setShowImapFolders( false ); - TQHBoxLayout *hLayout2 = new TQHBoxLayout( tqlayout ); + TQHBoxLayout *hLayout2 = new TQHBoxLayout( layout ); hLayout2->addSpacing( KDialog::spacingHint() * 3 ); hLayout2->addWidget( mFolderReqForUnsureFolder ); - tqlayout->addStretch(); + layout->addStretch(); connect( mMarkRules, TQT_SIGNAL(clicked()), this, TQT_SLOT(processSelectionChange(void)) ); @@ -1138,11 +1138,11 @@ void ASWizVirusRulesPage::processSelectionChange() ASWizSummaryPage::ASWizSummaryPage( TQWidget * parent, const char * name ) : ASWizPage( parent, name ) { - TQBoxLayout * tqlayout = new TQVBoxLayout( mLayout ); + TQBoxLayout * layout = new TQVBoxLayout( mLayout ); mSummaryText = new TQLabel( this ); - tqlayout->addWidget( mSummaryText ); - tqlayout->addStretch(); + layout->addWidget( mSummaryText ); + layout->addStretch(); } diff --git a/kmail/antispamwizard.h b/kmail/antispamwizard.h index 04ec41046..23f215041 100644 --- a/kmail/antispamwizard.h +++ b/kmail/antispamwizard.h @@ -37,7 +37,7 @@ #include <tqcheckbox.h> #include <tqdict.h> -#include <tqlayout.h> +#include <layout.h> class KActionCollection; class KMFolder; diff --git a/kmail/archivefolderdialog.cpp b/kmail/archivefolderdialog.cpp index 21c345fb3..b8cdd3516 100644 --- a/kmail/archivefolderdialog.cpp +++ b/kmail/archivefolderdialog.cpp @@ -33,7 +33,7 @@ #include <tqlabel.h> #include <tqcheckbox.h> -#include <tqlayout.h> +#include <layout.h> using namespace KMail; @@ -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/attachmentcollector.cpp b/kmail/attachmentcollector.cpp index 688af6233..b902f596f 100644 --- a/kmail/attachmentcollector.cpp +++ b/kmail/attachmentcollector.cpp @@ -65,7 +65,7 @@ void KMail::AttachmentCollector::collectAttachmentsFrom( partNode * node ) { continue; } if ( isInSkipList( node ) ) { - node = node->next( false ); // skip even the tqchildren + node = node->next( false ); // skip even the children continue; } if ( isInExclusionList( node ) ) { diff --git a/kmail/backupjob.cpp b/kmail/backupjob.cpp index 43209ca7b..a20e4118e 100644 --- a/kmail/backupjob.cpp +++ b/kmail/backupjob.cpp @@ -148,7 +148,7 @@ void BackupJob::abort( const TQString &errorMessage ) // The progressmanager will delete it } - TQString text = i18n( "Failed to archive the folder '%1'." ).tqarg( mRootFolder->name() ); + TQString text = i18n( "Failed to archive the folder '%1'." ).arg( mRootFolder->name() ); text += "\n" + errorMessage; KMessageBox::sorry( mParentWidget, text, i18n( "Archiving failed." ) ); deleteLater(); @@ -165,19 +165,19 @@ void BackupJob::finish() } } - mProgressItem->setqStatus( i18n( "Archiving finished" ) ); + mProgressItem->seStatus( i18n( "Archiving finished" ) ); mProgressItem->setComplete(); mProgressItem = 0; TQFileInfo archiveFileInfo( mMailArchivePath.path() ); TQString text = i18n( "Archiving folder '%1' successfully completed. " "The archive was written to the file '%2'." ) - .tqarg( mRootFolder->name() ).tqarg( mMailArchivePath.path() ); + .arg( mRootFolder->name() ).arg( mMailArchivePath.path() ); text += "\n" + i18n( "1 message of size %1 was archived.", "%n messages with the total size of %1 were archived.", mArchivedMessages ) - .tqarg( KIO::convertSize( mArchivedSize ) ); + .arg( KIO::convertSize( mArchivedSize ) ); text += "\n" + i18n( "The archive file has a size of %1." ) - .tqarg( KIO::convertSize( archiveFileInfo.size() ) ); + .arg( KIO::convertSize( archiveFileInfo.size() ) ); KMessageBox::information( mParentWidget, text, i18n( "Archiving finished." ) ); if ( mDeleteFoldersAfterCompletion ) { @@ -213,7 +213,7 @@ void BackupJob::archiveNextMessage() KMMsgDict::instance()->getLocation( serNum, &folder, &mMessageIndex ); if ( mMessageIndex == -1 ) { kdWarning(5006) << "Failed to get message location for sernum " << serNum << endl; - abort( i18n( "Unable to retrieve a message for folder '%1'." ).tqarg( mCurrentFolder->name() ) ); + abort( i18n( "Unable to retrieve a message for folder '%1'." ).arg( mCurrentFolder->name() ) ); return; } @@ -223,7 +223,7 @@ void BackupJob::archiveNextMessage() KMMessage *message = mCurrentFolder->getMsg( mMessageIndex ); if ( !message ) { kdWarning(5006) << "Failed to retrieve message with index " << mMessageIndex << endl; - abort( i18n( "Unable to retrieve a message for folder '%1'." ).tqarg( mCurrentFolder->name() ) ); + abort( i18n( "Unable to retrieve a message for folder '%1'." ).arg( mCurrentFolder->name() ) ); return; } @@ -249,7 +249,7 @@ void BackupJob::archiveNextMessage() kdWarning(5006) << "Message with subject " << mCurrentMessage->subject() << " is neither complete nor has a parent!" << endl; abort( i18n( "Internal error while trying to retrieve a message from folder '%1'." ) - .tqarg( mCurrentFolder->name() ) ); + .arg( mCurrentFolder->name() ) ); } mProgressItem->setProgress( ( mProgressItem->progress() + 5 ) ); @@ -318,7 +318,7 @@ void BackupJob::processCurrentMessage() if ( !mArchive->writeFile( fileName, user, group, messageSize, permissions, accessTime, modificationTime, creationTime, messageString ) ) { - abort( i18n( "Failed to write a message into the archive folder '%1'." ).tqarg( mCurrentFolder->name() ) ); + abort( i18n( "Failed to write a message into the archive folder '%1'." ).arg( mCurrentFolder->name() ) ); return; } @@ -357,7 +357,7 @@ void BackupJob::folderJobFinished( KMail::FolderJob *job ) if ( job->error() ) { if ( mCurrentFolder ) - abort( i18n( "Downloading a message in folder '%1' failed." ).tqarg( mCurrentFolder->name() ) ); + abort( i18n( "Downloading a message in folder '%1' failed." ).arg( mCurrentFolder->name() ) ); else abort( i18n( "Downloading a message in the current folder failed." ) ); } @@ -388,9 +388,9 @@ void BackupJob::archiveNextFolder() mCurrentFolder = mPendingFolders.take( 0 ); kdDebug(5006) << "===> Archiving next folder: " << mCurrentFolder->name() << endl; - mProgressItem->setqStatus( i18n( "Archiving folder %1" ).tqarg( mCurrentFolder->name() ) ); + mProgressItem->seStatus( i18n( "Archiving folder %1" ).arg( mCurrentFolder->name() ) ); if ( mCurrentFolder->open( "BackupJob" ) != 0 ) { - abort( i18n( "Unable to open folder '%1'.").tqarg( mCurrentFolder->name() ) ); + abort( i18n( "Unable to open folder '%1'.").arg( mCurrentFolder->name() ) ); return; } mCurrentFolderOpen = true; @@ -411,7 +411,7 @@ void BackupJob::archiveNextFolder() success = false; if ( !success ) { abort( i18n( "Unable to create folder structure for folder '%1' within archive file." ) - .tqarg( mCurrentFolder->name() ) ); + .arg( mCurrentFolder->name() ) ); return; } @@ -423,7 +423,7 @@ void BackupJob::archiveNextFolder() << " at index " << i << "!" << endl; // TODO: handle error in a nicer way. this is _very_ bad abort( i18n( "Unable to backup messages in folder '%1', the index file is corrupted." ) - .tqarg( mCurrentFolder->name() ) ); + .arg( mCurrentFolder->name() ) ); return; } else diff --git a/kmail/bodyvisitor.h b/kmail/bodyvisitor.h index 1f236c4a7..a436fb443 100644 --- a/kmail/bodyvisitor.h +++ b/kmail/bodyvisitor.h @@ -60,7 +60,7 @@ namespace KMail { protected: /** - * Checks if one of the parents needs loaded tqchildren + * Checks if one of the parents needs loaded children * This is e.g. needed for multipart/signed where all parts have to be loaded */ static bool parentNeedsLoading( KMMessagePart * part ); diff --git a/kmail/cachedimapjob.cpp b/kmail/cachedimapjob.cpp index f47cc9ddf..4d35e308f 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").arg(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,9 +339,9 @@ 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)); + url.setPath(mFolder->imapPath() + TQString(";UID=%1;SECTION=BODY.PEEK[]").arg(mfd.uid)); ImapAccountBase::jobData jd( url.url(), mFolder->folder() ); jd.cancellable = true; @@ -408,10 +408,10 @@ void CachedImapJob::slotPutNextMessage() unsigned int i = 0; for( char *ch = cstr.data(); *ch; ch++ ) { if ( *ch == '\n' ) { - mData.tqat(i) = '\r'; + mData.at(i) = '\r'; i++; } - mData.tqat(i) = *ch; i++; + mData.at(i) = *ch; i++; } jd.data = mData; jd.msgList.append( mMsg ); @@ -539,7 +539,7 @@ void CachedImapJob::slotAddNextSubfolder( KIO::Job * job ) if ( job->error() && !silentUpload ) { TQString myError = "<p><b>" + i18n("Error while uploading folder") - + "</b></p><p>" + i18n("Could not make the folder <b>%1</b> on the server.").tqarg((*it).items[0]) + + "</b></p><p>" + i18n("Could not make the folder <b>%1</b> on the server.").arg((*it).items[0]) + "</p><p>" + i18n("This could be because you do not have permission to do this, or because the folder is already present on the server; the error message from the server communication is here:") + "</p>"; mAccount->handleJobError( job, myError ); } @@ -597,8 +597,8 @@ void CachedImapJob::slotAddNextSubfolder( KIO::Job * job ) TQDataStream stream( packedArgs, IO_WriteOnly ); const TQString command = TQString( "X-CREATE-SPECIAL" ); - const TQString argument = TQString( "%1 %2" ).tqarg( Scalix::Utils::contentsTypeToScalixId( folder->contentsType() ) ) - .tqarg( path ); + const TQString argument = TQString( "%1 %2" ).arg( Scalix::Utils::contentsTypeToScalixId( folder->contentsType() ) ) + .arg( path ); stream << (int) 'X' << 'N' << command << argument; @@ -626,7 +626,7 @@ void CachedImapJob::slotDeleteNextFolder( KIO::Job *job ) mAccount->removeDeletedFolder( (*it).path ); if( job->error() ) { - mAccount->handleJobError( job, i18n( "Error while deleting folder %1 on the server: " ).tqarg( (*it).path ) + '\n' ); + mAccount->handleJobError( job, i18n( "Error while deleting folder %1 on the server: " ).arg( (*it).path ) + '\n' ); delete this; return; } @@ -679,7 +679,7 @@ void CachedImapJob::slotCheckUidValidityResult(KIO::Job * job) if( job->error() ) { mErrorCode = job->error(); - mAccount->handleJobError( job, i18n( "Error while reading folder %1 on the server: " ).tqarg( (*it).parent->label() ) + '\n' ); + mAccount->handleJobError( job, i18n( "Error while reading folder %1 on the server: " ).arg( (*it).parent->label() ) + '\n' ); delete this; return; } @@ -813,7 +813,7 @@ void CachedImapJob::slotSubscribtionChange1Failed( const TQString &errorMessage "from the folder list after the next sync since it is unsubscribed on the server.\n" "You can try to manually subscribe to the folder yourself.\n\n" "%2" ) - .tqarg( mFolder->label() ).tqarg( errorMessage ) ); + .arg( mFolder->label() ).arg( errorMessage ) ); delete this; } @@ -854,7 +854,7 @@ void CachedImapJob::slotRenameFolderResult( KIO::Job *job ) if( job->error() ) { revertLabelChange(); - const TQString errorMessage = i18n( "Error while trying to rename folder %1" ).tqarg( mFolder->label() ); + const TQString errorMessage = i18n( "Error while trying to rename folder %1" ).arg( mFolder->label() ); mAccount->handleJobError( job, errorMessage ); delete this; } else { diff --git a/kmail/callback.cpp b/kmail/callback.cpp index 0b94a5d1f..7a7a583f2 100644 --- a/kmail/callback.cpp +++ b/kmail/callback.cpp @@ -94,13 +94,13 @@ bool Callback::mailICal( const TQString& to, const TQString &iCal, msg->setSubject( subject ); if ( GlobalSettings::self()->exchangeCompatibleInvitations() ) { if ( status == TQString("cancel") ) - msg->setSubject( i18n( "Declined: %1" ).tqarg(subject).replace("Answer: ","") ); + msg->setSubject( i18n( "Declined: %1" ).arg(subject).replace("Answer: ","") ); else if ( status == TQString("tentative") ) - msg->setSubject( i18n( "Tentative: %1" ).tqarg(subject).replace("Answer: ","") ); + msg->setSubject( i18n( "Tentative: %1" ).arg(subject).replace("Answer: ","") ); else if ( status == TQString("accepted") ) - msg->setSubject( i18n( "Accepted: %1" ).tqarg(subject).replace("Answer: ","") ); + msg->setSubject( i18n( "Accepted: %1" ).arg(subject).replace("Answer: ","") ); else if ( status == TQString("delegated") ) - msg->setSubject( i18n( "Delegated: %1" ).tqarg(subject).replace("Answer: ","") ); + msg->setSubject( i18n( "Delegated: %1" ).arg(subject).replace("Answer: ","") ); } msg->setTo( to ); msg->setFrom( receiver() ); diff --git a/kmail/chiasmuskeyselector.cpp b/kmail/chiasmuskeyselector.cpp index 475ddd44f..fd2f42cb7 100644 --- a/kmail/chiasmuskeyselector.cpp +++ b/kmail/chiasmuskeyselector.cpp @@ -4,7 +4,7 @@ #include <klistbox.h> #include <klocale.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> ChiasmusKeySelector::ChiasmusKeySelector( TQWidget* parent, const TQString& caption, @@ -14,26 +14,26 @@ ChiasmusKeySelector::ChiasmusKeySelector( TQWidget* parent, const TQString& capt { TQWidget *page = makeMainWidget(); - TQVBoxLayout *tqlayout = new TQVBoxLayout(page, KDialog::spacingHint()); + TQVBoxLayout *layout = new TQVBoxLayout(page, KDialog::spacingHint()); mLabel = new TQLabel( i18n( "Please select the Chiasmus key file to use:" ), page ); - tqlayout->addWidget( mLabel ); + layout->addWidget( mLabel ); mListBox = new KListBox( page ); mListBox->insertStringList( keys ); const int current = keys.findIndex( currentKey ); mListBox->setSelected( TQMAX( 0, current ), true ); mListBox->ensureCurrentVisible(); - tqlayout->addWidget( mListBox, 1 ); + layout->addWidget( mListBox, 1 ); TQLabel* optionLabel = new TQLabel( i18n( "Additional arguments for chiasmus:" ), page ); - tqlayout->addWidget( optionLabel ); + layout->addWidget( optionLabel ); mOptions = new KLineEdit( lastOptions, page ); optionLabel->setBuddy( mOptions ); - tqlayout->addWidget( mOptions ); + layout->addWidget( mOptions ); - tqlayout->addStretch(); + layout->addStretch(); connect( mListBox, TQT_SIGNAL( doubleClicked( TQListBoxItem * ) ), this, TQT_SLOT( slotOk() ) ); connect( mListBox, TQT_SIGNAL( returnPressed( TQListBoxItem * ) ), this, TQT_SLOT( slotOk() ) ); diff --git a/kmail/compactionjob.cpp b/kmail/compactionjob.cpp index 35aa6ef3f..741052c2d 100644 --- a/kmail/compactionjob.cpp +++ b/kmail/compactionjob.cpp @@ -96,14 +96,14 @@ int MboxCompactionJob::executeNow( bool silent ) if (!storage->compactable()) { kdDebug(5006) << storage->location() << " compaction skipped." << endl; if ( !mSilent ) { - TQString str = i18n( "For safety reasons, compaction has been disabled for %1" ).tqarg( mbox->label() ); + TQString str = i18n( "For safety reasons, compaction has been disabled for %1" ).arg( mbox->label() ); BroadcastStatus::instance()->seStatusMsg( str ); } return 0; } 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 @@ -173,11 +173,11 @@ void MboxCompactionJob::done( int rc ) mbox->close("mboxcompact", true); mbox->setAutoCreateIndex( autoCreate ); mbox->setNeedsCompacting( false ); // We are clean now - str = i18n( "Folder \"%1\" successfully compacted" ).tqarg( mSrcFolder->label() ); + str = i18n( "Folder \"%1\" successfully compacted" ).arg( mSrcFolder->label() ); kdDebug(5006) << str << endl; } else { mbox->close("mboxcompact"); - str = i18n( "Error occurred while compacting \"%1\". Compaction aborted." ).tqarg( mSrcFolder->label() ); + str = i18n( "Error occurred while compacting \"%1\". Compaction aborted." ).arg( mSrcFolder->label() ); kdDebug(5006) << "Error occurred while compacting " << mbox->location() << endl; kdDebug(5006) << "Compaction aborted." << endl; TQFile::remove( mTempName ); @@ -256,9 +256,9 @@ void MaildirCompactionJob::done( int rc ) mCancellable = false; TQString str; if ( !rc ) { - str = i18n( "Folder \"%1\" successfully compacted" ).tqarg( mSrcFolder->label() ); + str = i18n( "Folder \"%1\" successfully compacted" ).arg( mSrcFolder->label() ); } else { - str = i18n( "Error occurred while compacting \"%1\". Compaction aborted." ).tqarg( mSrcFolder->label() ); + str = i18n( "Error occurred while compacting \"%1\". Compaction aborted." ).arg( mSrcFolder->label() ); } mErrorCode = rc; storage->setNeedsCompacting( false ); 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..10653b8b4 100644 --- a/kmail/configuredialog.cpp +++ b/kmail/configuredialog.cpp @@ -110,11 +110,11 @@ using KMime::DateFormatter; #include <tqhbuttongroup.h> #include <tqtooltip.h> #include <tqlabel.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <tqheader.h> #include <tqpopupmenu.h> #include <tqradiobutton.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> #include <tqwidgetstack.h> @@ -167,7 +167,7 @@ namespace { void populateButtonGroup( TQButtonGroup * g, const EnumConfigEntry & e ) { g->setTitle( i18n( e.desc ) ); - g->tqlayout()->setSpacing( KDialog::spacingHint() ); + g->layout()->setSpacing( KDialog::spacingHint() ); for ( int i = 0 ; i < e.numItems ; ++i ) g->insert( new TQRadioButton( i18n( e.items[i].desc ), g ), i ); } @@ -233,9 +233,9 @@ ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal // the KCMultiDialog starts with the size of the first kcm, not // the largest one. This way at least after the first showing of // the largest kcm the size is kept. - KConfigGroup tqgeometry( KMKernel::config(), "Geometry" ); - int width = tqgeometry.readNumEntry( "ConfigureDialogWidth" ); - int height = tqgeometry.readNumEntry( "ConfigureDialogHeight" ); + KConfigGroup geometry( KMKernel::config(), "Geometry" ); + int width = geometry.readNumEntry( "ConfigureDialogWidth" ); + int height = geometry.readNumEntry( "ConfigureDialogHeight" ); if ( width != 0 && height != 0 ) { setMinimumSize( width, height ); } @@ -243,9 +243,9 @@ ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal } void ConfigureDialog::hideEvent( TQHideEvent *ev ) { - KConfigGroup tqgeometry( KMKernel::config(), "Geometry" ); - tqgeometry.writeEntry( "ConfigureDialogWidth", width() ); - tqgeometry.writeEntry( "ConfigureDialogHeight",height() ); + KConfigGroup geometry( KMKernel::config(), "Geometry" ); + geometry.writeEntry( "ConfigureDialogWidth", width() ); + geometry.writeEntry( "ConfigureDialogHeight",height() ); KDialogBase::hideEvent( ev ); } @@ -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 ) @@ -451,7 +451,7 @@ void IdentityPage::slotRemoveIdentity() if ( !item ) return; TQString msg = i18n("<qt>Do you really want to remove the identity named " - "<b>%1</b>?</qt>").tqarg( item->identity().identityName() ); + "<b>%1</b>?</qt>").arg( item->identity().identityName() ); if( KMessageBox::warningContinueCancel( this, msg, i18n("Remove Identity"), KGuiItem(i18n("&Remove"),"editdelete") ) == KMessageBox::Continue ) if ( im->removeIdentity( item->identity().identityName() ) ) { @@ -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 ) @@ -597,9 +597,9 @@ AccountsPageSendingTab::AccountsPageSendingTab( TQWidget * parent, const char * // label: zero stretch ### FIXME more vlay->addWidget( new TQLabel( i18n("Outgoing accounts (add at least one):"), this ) ); - // hbox tqlayout: stretch 10, spacing inherited from vlay + // hbox layout: 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: @@ -614,7 +614,7 @@ AccountsPageSendingTab::AccountsPageSendingTab( TQWidget * parent, const char * this, TQT_SLOT(slotModifySelectedTransport()) ); hlay->addWidget( mTransportList, 1 ); - // a vbox tqlayout for the buttons: zero stretch, spacing inherited from hlay + // a vbox layout for the buttons: zero stretch, spacing inherited from hlay btn_vlay = new TQVBoxLayout( hlay ); // "add..." button: stretch 0 @@ -653,8 +653,8 @@ AccountsPageSendingTab::AccountsPageSendingTab( TQWidget * parent, const char * i18n("Common Options"), this ); vlay->addWidget(group); - // a grid tqlayout for the contents of the "common options" group box - glay = new TQGridLayout( group->tqlayout(), 5, 3, KDialog::spacingHint() ); + // a grid layout for the contents of the "common options" group box + glay = new TQGridLayout( group->layout(), 5, 3, KDialog::spacingHint() ); glay->setColStretch( 2, 10 ); // "confirm before send" check box: @@ -742,7 +742,7 @@ static inline TQString uniqueName( const TQStringList & list, while ( list.find( result ) != list.end() ) { result = i18n("%1: name; %2: number appended to it to make it unique " "among a list of names", "%1 %2") - .tqarg( name ).tqarg( suffix ); + .arg( name ).arg( suffix ); suffix++; } return result; @@ -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; @@ -830,7 +830,7 @@ void AccountsPage::SendingTab::slotAddTransport() "Configure->Accounts->Sending listview, \"type\" " "column, first row, to indicate that this is the " "default transport", "%1 (Default)") - .tqarg( transportInfo->type ); + .arg( transportInfo->type ); GlobalSettings::self()->setDefaultTransport( transportInfo->name ); } (void) new TQListViewItem( mTransportList, lastItem, transportInfo->name, @@ -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 ) @@ -1071,7 +1071,7 @@ AccountsPageReceivingTab::AccountsPageReceivingTab( TQWidget * parent, const cha // label: zero stretch vlay->addWidget( new TQLabel( i18n("Incoming accounts (add at least one):"), this ) ); - // hbox tqlayout: stretch 10, spacing inherited from vlay + // hbox layout: stretch 10, spacing inherited from vlay hlay = new TQHBoxLayout(); vlay->addLayout( hlay, 10 ); // high stretch to suppress groupbox's growing @@ -1088,7 +1088,7 @@ AccountsPageReceivingTab::AccountsPageReceivingTab( TQWidget * parent, const cha this, TQT_SLOT(slotModifySelectedAccount()) ); hlay->addWidget( mAccountList, 1 ); - // a vbox tqlayout for the buttons: zero stretch, spacing inherited from hlay + // a vbox layout for the buttons: zero stretch, spacing inherited from hlay btn_vlay = new TQVBoxLayout( hlay ); // "add..." button: stretch 0 @@ -1123,11 +1123,11 @@ AccountsPageReceivingTab::AccountsPageReceivingTab( TQWidget * parent, const cha // "New Mail Notification" group box: stretch 0 group = new TQVGroupBox( i18n("New Mail Notification"), this ); vlay->addWidget( group ); - group->tqlayout()->setSpacing( KDialog::spacingHint() ); + group->layout()->setSpacing( KDialog::spacingHint() ); // "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? @@ -1364,7 +1364,7 @@ void AccountsPage::ReceivingTab::slotRemoveSelectedAccount() { if ( !acct ) { // ### FIXME: see above KMessageBox::sorry( this, i18n("<qt>Unable to locate account <b>%1</b>.</qt>") - .tqarg(listItem->text(0)) ); + .arg(listItem->text(0)) ); return; } @@ -1444,7 +1444,7 @@ void AccountsPage::ReceivingTab::save() { kmkernel->acctMgr()->writeConfig( true ); if ( (*it) && !kmkernel->acctMgr()->remove(*it) ) KMessageBox::sorry( this, i18n("<qt>Unable to locate account <b>%1</b>.</qt>") - .tqarg( (*it)->name() ) ); + .arg( (*it)->name() ) ); } mAccountsToDelete.clear(); @@ -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"); } @@ -1793,9 +1793,9 @@ void AppearancePage::ColorsTab::doLoadOther() { mCloseToQuotaThreshold->setValue( GlobalSettings::closeToQuotaThreshold() ); static const TQColor defaultColor[ numColorNames ] = { - kapp->tqpalette().active().base(), // bg + kapp->palette().active().base(), // bg KGlobalSettings::alternateBackgroundColor(), // alt bg - kapp->tqpalette().active().text(), // fg + kapp->palette().active().text(), // fg TQColor( 0x00, 0x80, 0x00 ), // quoted l1 TQColor( 0x00, 0x70, 0x00 ), // quoted l2 TQColor( 0x00, 0x60, 0x00 ), // quoted l3 @@ -1857,7 +1857,7 @@ void AppearancePage::ColorsTab::save() { } TQString AppearancePage::LayoutTab::helpAnchor() const { - return TQString::tqfromLatin1("configure-appearance-tqlayout"); + return TQString::fromLatin1("configure-appearance-layout"); } static const EnumConfigEntryItem folderListModes[] = { @@ -1941,33 +1941,33 @@ AppearancePageLayoutTab::AppearancePageLayoutTab( TQWidget * parent, const char void AppearancePage::LayoutTab::doLoadOther() { const KConfigGroup reader( KMKernel::config(), "Reader" ); - const KConfigGroup tqgeometry( KMKernel::config(), "Geometry" ); + const KConfigGroup geometry( KMKernel::config(), "Geometry" ); - loadWidget( mFolderListGroup, tqgeometry, folderListMode ); + loadWidget( mFolderListGroup, geometry, folderListMode ); loadWidget( mMIMETreeLocationGroup, reader, mimeTreeLocation ); loadWidget( mMIMETreeModeGroup, reader, mimeTreeMode ); - loadWidget( mReaderWindowModeGroup, tqgeometry, readerWindowMode ); + loadWidget( mReaderWindowModeGroup, geometry, readerWindowMode ); mFavoriteFolderViewCB->setChecked( GlobalSettings::self()->enableFavoriteFolderView() ); } void AppearancePage::LayoutTab::installProfile( KConfig * profile ) { const KConfigGroup reader( profile, "Reader" ); - const KConfigGroup tqgeometry( profile, "Geometry" ); + const KConfigGroup geometry( profile, "Geometry" ); - loadProfile( mFolderListGroup, tqgeometry, folderListMode ); + loadProfile( mFolderListGroup, geometry, folderListMode ); loadProfile( mMIMETreeLocationGroup, reader, mimeTreeLocation ); loadProfile( mMIMETreeModeGroup, reader, mimeTreeMode ); - loadProfile( mReaderWindowModeGroup, tqgeometry, readerWindowMode ); + loadProfile( mReaderWindowModeGroup, geometry, readerWindowMode ); } void AppearancePage::LayoutTab::save() { KConfigGroup reader( KMKernel::config(), "Reader" ); - KConfigGroup tqgeometry( KMKernel::config(), "Geometry" ); + KConfigGroup geometry( KMKernel::config(), "Geometry" ); - saveButtonGroup( mFolderListGroup, tqgeometry, folderListMode ); + saveButtonGroup( mFolderListGroup, geometry, folderListMode ); saveButtonGroup( mMIMETreeLocationGroup, reader, mimeTreeLocation ); saveButtonGroup( mMIMETreeModeGroup, reader, mimeTreeMode ); - saveButtonGroup( mReaderWindowModeGroup, tqgeometry, readerWindowMode ); + saveButtonGroup( mReaderWindowModeGroup, geometry, readerWindowMode ); GlobalSettings::self()->setEnableFavoriteFolderView( mFavoriteFolderViewCB->isChecked() ); } @@ -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 { @@ -2004,7 +2004,7 @@ AppearancePageHeadersTab::AppearancePageHeadersTab( TQWidget * parent, const cha // "General Options" group: group = new TQVButtonGroup( i18n( "General Options" ), this ); - group->tqlayout()->setSpacing( KDialog::spacingHint() ); + group->layout()->setSpacing( KDialog::spacingHint() ); mMessageSizeCheck = new TQCheckBox( i18n("Display messa&ge sizes"), group ); @@ -2030,7 +2030,7 @@ AppearancePageHeadersTab::AppearancePageHeadersTab( TQWidget * parent, const cha // "Message Header Threading Options" group: mNestingPolicy = new TQVButtonGroup( i18n("Threaded Message List Options"), this ); - mNestingPolicy->tqlayout()->setSpacing( KDialog::spacingHint() ); + mNestingPolicy->layout()->setSpacing( KDialog::spacingHint() ); mNestingPolicy->insert( new TQRadioButton( i18n("Always &keep threads open"), @@ -2053,12 +2053,12 @@ AppearancePageHeadersTab::AppearancePageHeadersTab( TQWidget * parent, const cha // "Date Display" group: mDateDisplay = new TQVButtonGroup( i18n("Date Display"), this ); - mDateDisplay->tqlayout()->setSpacing( KDialog::spacingHint() ); + mDateDisplay->layout()->setSpacing( KDialog::spacingHint() ); for ( int i = 0 ; i < numDateDisplayConfig ; i++ ) { TQString buttonLabel = i18n(dateDisplayConfig[i].displayName); if ( buttonLabel.contains("%1") ) - buttonLabel = buttonLabel.tqarg( DateFormatter::formatCurrentDate( dateDisplayConfig[i].dateDisplay ) ); + buttonLabel = buttonLabel.arg( DateFormatter::formatCurrentDate( dateDisplayConfig[i].dateDisplay ) ); radio = new TQRadioButton( buttonLabel, mDateDisplay ); mDateDisplay->insert( radio, i ); if ( dateDisplayConfig[i].dateDisplay == DateFormatter::Custom ) { @@ -2115,16 +2115,16 @@ AppearancePageHeadersTab::AppearancePageHeadersTab( TQWidget * parent, const cha void AppearancePage::HeadersTab::doLoadOther() { KConfigGroup general( KMKernel::config(), "General" ); - KConfigGroup tqgeometry( KMKernel::config(), "Geometry" ); + KConfigGroup geometry( KMKernel::config(), "Geometry" ); // "General Options": - mNestedMessagesCheck->setChecked( tqgeometry.readBoolEntry( "nestedMessages", false ) ); + mNestedMessagesCheck->setChecked( geometry.readBoolEntry( "nestedMessages", false ) ); mMessageSizeCheck->setChecked( general.readBoolEntry( "showMessageSize", false ) ); mCryptoIconsCheck->setChecked( general.readBoolEntry( "showCryptoIcons", false ) ); mAttachmentCheck->setChecked( general.readBoolEntry( "showAttachmentIcon", true ) ); // "Message Header Threading Options": - int num = tqgeometry.readNumEntry( "nestingPolicy", 3 ); + int num = geometry.readNumEntry( "nestingPolicy", 3 ); if ( num < 0 || num > 3 ) num = 3; mNestingPolicy->setButton( num ); @@ -2152,10 +2152,10 @@ void AppearancePage::HeadersTab::setDateDisplay( int num, const TQString & forma void AppearancePage::HeadersTab::installProfile( KConfig * profile ) { KConfigGroup general( profile, "General" ); - KConfigGroup tqgeometry( profile, "Geometry" ); + KConfigGroup geometry( profile, "Geometry" ); - if ( tqgeometry.hasKey( "nestedMessages" ) ) - mNestedMessagesCheck->setChecked( tqgeometry.readBoolEntry( "nestedMessages" ) ); + if ( geometry.hasKey( "nestedMessages" ) ) + mNestedMessagesCheck->setChecked( geometry.readBoolEntry( "nestedMessages" ) ); if ( general.hasKey( "showMessageSize" ) ) mMessageSizeCheck->setChecked( general.readBoolEntry( "showMessageSize" ) ); @@ -2164,8 +2164,8 @@ void AppearancePage::HeadersTab::installProfile( KConfig * profile ) { if ( general.hasKey( "showAttachmentIcon" ) ) mAttachmentCheck->setChecked( general.readBoolEntry( "showAttachmentIcon" ) ); - if ( tqgeometry.hasKey( "nestingPolicy" ) ) { - int num = tqgeometry.readNumEntry( "nestingPolicy" ); + if ( geometry.hasKey( "nestingPolicy" ) ) { + int num = geometry.readNumEntry( "nestingPolicy" ); if ( num < 0 || num > 3 ) num = 3; mNestingPolicy->setButton( num ); } @@ -2177,16 +2177,16 @@ void AppearancePage::HeadersTab::installProfile( KConfig * profile ) { void AppearancePage::HeadersTab::save() { KConfigGroup general( KMKernel::config(), "General" ); - KConfigGroup tqgeometry( KMKernel::config(), "Geometry" ); + KConfigGroup geometry( KMKernel::config(), "Geometry" ); - if ( tqgeometry.readBoolEntry( "nestedMessages", false ) + if ( geometry.readBoolEntry( "nestedMessages", false ) != mNestedMessagesCheck->isChecked() ) { int result = KMessageBox::warningContinueCancel( this, i18n("Changing the global threading setting will override " "all folder specific values."), TQString(), KStdGuiItem::cont(), "threadOverride" ); if ( result == KMessageBox::Continue ) { - tqgeometry.writeEntry( "nestedMessages", mNestedMessagesCheck->isChecked() ); + geometry.writeEntry( "nestedMessages", mNestedMessagesCheck->isChecked() ); // remove all threadMessagesOverride keys from all [Folder-*] groups: TQStringList groups = KMKernel::config()->groupList().grep( TQRegExp("^Folder-") ); kdDebug(5006) << "groups.count() == " << groups.count() << endl; @@ -2197,7 +2197,7 @@ void AppearancePage::HeadersTab::save() { } } - tqgeometry.writeEntry( "nestingPolicy", + geometry.writeEntry( "nestingPolicy", mNestingPolicy->id( mNestingPolicy->selected() ) ); general.writeEntry( "showMessageSize", mMessageSizeCheck->isChecked() ); general.writeEntry( "showCryptoIcons", mCryptoIconsCheck->isChecked() ); @@ -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, @@ -2490,7 +2490,7 @@ AppearancePageSystemTrayTab::AppearancePageSystemTrayTab( TQWidget * parent, // System tray modes mSystemTrayGroup = new TQVButtonGroup( i18n("System Tray Mode"), this ); - mSystemTrayGroup->tqlayout()->setSpacing( KDialog::spacingHint() ); + mSystemTrayGroup->layout()->setSpacing( KDialog::spacingHint() ); vlay->addWidget( mSystemTrayGroup ); connect( mSystemTrayGroup, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotEmitChanged( void ) ) ); @@ -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 ) @@ -2766,7 +2766,7 @@ ComposerPageGeneralTab::ComposerPageGeneralTab( TQWidget * parent, const char * // The "external editor" group: group = new TQVGroupBox( i18n("External Editor"), this ); - group->tqlayout()->setSpacing( KDialog::spacingHint() ); + group->layout()->setSpacing( KDialog::spacingHint() ); mExternalEditorCheck = new TQCheckBox( GlobalSettings::self()->useExternalEditorItem()->label(), @@ -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 ) @@ -3185,12 +3185,12 @@ ComposerPageSubjectTab::ComposerPageSubjectTab( TQWidget * parent, const char * vlay = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); group = new TQVGroupBox( i18n("Repl&y Subject Prefixes"), this ); - group->tqlayout()->setSpacing( KDialog::spacingHint() ); + group->layout()->setSpacing( KDialog::spacingHint() ); // 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 = @@ -3214,12 +3214,12 @@ ComposerPageSubjectTab::ComposerPageSubjectTab( TQWidget * parent, const char * group = new TQVGroupBox( i18n("For&ward Subject Prefixes"), this ); - group->tqlayout()->setSpacing( KDialog::marginHint() ); + group->layout()->setSpacing( KDialog::marginHint() ); // 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,21 +3297,21 @@ 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)") - .tqarg( TQString( kmkernel->networkCodec()->mimeName() ).lower() ); + if ( charset.lower() == TQString::fromLatin1("locale") ) { + charset = TQString::fromLatin1("%1 (locale)") + .arg( TQString( kmkernel->networkCodec()->mimeName() ).lower() ); return; } 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,10 +3325,10 @@ 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) ); + (*it) = TQString("%1 (locale)").arg( TQString(cset) ); } mCharsetListEditor->setStringList( charsets ); @@ -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 ) @@ -3798,7 +3798,7 @@ SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char * // "HTML Messages" group box: group = new TQVGroupBox( i18n( "HTML Messages" ), this ); - group->tqlayout()->setSpacing( KDialog::spacingHint() ); + group->layout()->setSpacing( KDialog::spacingHint() ); mHtmlMailCheck = new TQCheckBox( i18n("Prefer H&TML to plain text"), group ); TQWhatsThis::add( mHtmlMailCheck, htmlWhatsThis ); @@ -3815,21 +3815,21 @@ SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char * "exploits. <a href=\"whatsthis:%1\">More about " "HTML mails...</a> <a href=\"whatsthis:%2\">More " "about external references...</a>") - .tqarg(htmlWhatsThis).tqarg(externalWhatsThis), + .arg(htmlWhatsThis).arg(externalWhatsThis), group ); vlay->addWidget( group ); // encrypted messages group group = new TQVGroupBox( i18n("Encrypted Messages"), this ); - group->tqlayout()->setSpacing( KDialog::spacingHint() ); + group->layout()->setSpacing( KDialog::spacingHint() ); mAlwaysDecrypt = new TQCheckBox( i18n( "Attempt decryption of encrypted messages when viewing" ), group ); connect( mAlwaysDecrypt, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(slotEmitChanged()) ); vlay->addWidget( group ); // "Message Disposition Notification" groupbox: group = new TQVGroupBox( i18n("Message Disposition Notifications"), this ); - group->tqlayout()->setSpacing( KDialog::spacingHint() ); + group->layout()->setSpacing( KDialog::spacingHint() ); // "ignore", "ask", "deny", "always send" radiobutton line: @@ -3890,14 +3890,14 @@ SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char * label = new KActiveLabel( i18n("<b>WARNING:</b> Unconditionally returning " "confirmations undermines your privacy. " "<a href=\"whatsthis:%1\">More...</a>") - .tqarg(receiptWhatsThis), + .arg(receiptWhatsThis), group ); vlay->addWidget( group ); // "Attached keys" group box: group = new TQVGroupBox( i18n( "Certificate && Key Bundle Attachments" ), this ); - group->tqlayout()->setSpacing( KDialog::spacingHint() ); + group->layout()->setSpacing( KDialog::spacingHint() ); mAutomaticallyImportAttachedKeysCheck = new TQCheckBox( i18n("Automatically import keys and certificates"), group ); connect( mAutomaticallyImportAttachedKeysCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotEmitChanged()) ); @@ -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 ) @@ -4358,7 +4358,7 @@ void SecurityPage::SMimeTab::doLoadOther() { TQString systemProxy = TQString::fromLocal8Bit( getenv( "http_proxy" ) ); if ( systemProxy.isEmpty() ) systemProxy = i18n( "no proxy" ); - mWidget->systemHTTPProxy->setText( i18n( "(Current system setting: %1)" ).tqarg( systemProxy ) ); + mWidget->systemHTTPProxy->setText( i18n( "(Current system setting: %1)" ).arg( systemProxy ) ); bool honor = e.mHonorHTTPProxy && e.mHonorHTTPProxy->boolValue(); mWidget->honorHTTPProxyRB->setChecked( honor ); mWidget->useCustomHTTPProxyRB->setChecked( !honor ); @@ -4482,11 +4482,11 @@ Kleo::CryptoConfigEntry* SMIMECryptoConfigEntries::configEntry( const char* comp { Kleo::CryptoConfigEntry* entry = mConfig->entry( componentName, groupName, entryName ); if ( !entry ) { - kdWarning(5006) << TQString( "Backend error: gpgconf doesn't seem to know the entry for %1/%2/%3" ).tqarg( componentName, groupName, entryName ) << endl; + kdWarning(5006) << TQString( "Backend error: gpgconf doesn't seem to know the entry for %1/%2/%3" ).arg( componentName, groupName, entryName ) << endl; return 0; } if( entry->argType() != argType || entry->isList() != isList ) { - kdWarning(5006) << TQString( "Backend error: gpgconf has wrong type for %1/%2/%3: %4 %5" ).tqarg( componentName, groupName, entryName ).tqarg( entry->argType() ).tqarg( entry->isList() ) << endl; + kdWarning(5006) << TQString( "Backend error: gpgconf has wrong type for %1/%2/%3: %4 %5" ).arg( componentName, groupName, entryName ).arg( entry->argType() ).arg( entry->isList() ) << endl; return 0; } return entry; @@ -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 ) @@ -5135,7 +5135,7 @@ void MiscPage::GroupwareTab::save() { // Inbox folder of the selected account KMAccount* acct = mAccountCombo->currentAccount(); if ( acct ) { - folderId = TQString( ".%1.directory/INBOX" ).tqarg( acct->id() ); + folderId = TQString( ".%1.directory/INBOX" ).arg( acct->id() ); GlobalSettings::self()->setTheIMAPResourceAccount( acct->id() ); } } diff --git a/kmail/configuredialog_p.cpp b/kmail/configuredialog_p.cpp index 6357e1e86..7609be3c8 100644 --- a/kmail/configuredialog_p.cpp +++ b/kmail/configuredialog_p.cpp @@ -31,7 +31,7 @@ #include <tqradiobutton.h> #include <tqbuttongroup.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> // Other headers: #include <assert.h> @@ -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,33 +169,33 @@ 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, bool modal ) : KDialogBase( parent, name, modal, i18n("New Language"), Ok|Cancel, Ok, true ) { - // tqlayout the page (a combobox with label): + // layout the page (a combobox with label): TQWidget *page = makeMainWidget(); TQHBoxLayout *hlay = new TQHBoxLayout( page, 0, spacingHint() ); mComboBox = new TQComboBox( false, page ); @@ -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,8 +224,8 @@ NewLanguageDialog::NewLanguageDialog( LanguageItemList & suppressedLangs, if ( suppressedAcronyms.find( acronym ) == suppressedAcronyms.end() ) { // not found: - TQString displayname = TQString::tqfromLatin1("%1 (%2)") - .tqarg( name ).tqarg( acronym ); + TQString displayname = TQString::fromLatin1("%1 (%2)") + .arg( name ).arg( 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)").arg( name ).arg( language ); insertItem( TQPixmap( locate("locale", language + flagPng ) ), output ); return listBox()->index( listBox()->findItem(output) ); } @@ -269,7 +269,7 @@ TQString LanguageComboBox::language() const void LanguageComboBox::setLanguage( const TQString & language ) { - TQString parenthizedLanguage = TQString::tqfromLatin1("(%1)").tqarg( language ); + TQString parenthizedLanguage = TQString::fromLatin1("(%1)").arg( language ); for (int i = 0; i < count(); i++) // ### FIXME: use .endWith(): if ( text(i).find( parenthizedLanguage ) >= 0 ) { @@ -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/copyfolderjob.cpp b/kmail/copyfolderjob.cpp index 9be07213e..a83b1cd6c 100644 --- a/kmail/copyfolderjob.cpp +++ b/kmail/copyfolderjob.cpp @@ -67,7 +67,7 @@ CopyFolderJob::~CopyFolderJob() /* * The basic strategy is to first create the target folder, then copy all the mail - * from the source to the target folder, then recurse for each of the folder's tqchildren + * from the source to the target folder, then recurse for each of the folder's children */ void CopyFolderJob::execute() { @@ -113,7 +113,7 @@ void CopyFolderJob::slotCopyCompleted( KMCommand* command ) rollback(); return; } - // if we have tqchildren, recurse + // if we have children, recurse if ( mStorage->folder()->child() ) { slotCopyNextChild(); } else { @@ -144,7 +144,7 @@ void CopyFolderJob::slotCopyNextChild( bool success ) mNextChildFolder = static_cast<KMFolder*>(node); ++mChildFolderNodeIterator; } else { - // no more tqchildren, we are done + // no more children, we are done emit folderCopyComplete( true ); deleteLater(); return; diff --git a/kmail/csshelper.cpp b/kmail/csshelper.cpp index 86166dbc2..3fe2fd78b 100644 --- a/kmail/csshelper.cpp +++ b/kmail/csshelper.cpp @@ -77,7 +77,7 @@ namespace KMail { TQFont defaultFont = mBodyFont; defaultFont.setItalic( true ); for ( int i = 0 ; i < 3 ; ++i ) { - const TQString key = TQString( "quote%1-font" ).tqarg( i+1 ); + const TQString key = TQString( "quote%1-font" ).arg( i+1 ); mQuoteFont[i] = fonts.readFontEntry( key, &defaultFont ); } } diff --git a/kmail/customtemplates.cpp b/kmail/customtemplates.cpp index 279c71ae6..aa0a6c415 100644 --- a/kmail/customtemplates.cpp +++ b/kmail/customtemplates.cpp @@ -22,7 +22,7 @@ #include <tqpopupmenu.h> #include <tqpushbutton.h> -#include <tqtextedit.h> +#include <textedit.h> #include <tqlabel.h> #include <tqlineedit.h> #include <tqtoolbox.h> @@ -117,7 +117,7 @@ CustomTemplates::CustomTemplates( TQWidget *parent, const char *name ) "<i>Universal</i> which can be used for all kind of operations. " "You cannot bind keyboard shortcut to <i>Universal</i> templates.</p>" "</qt>" ); - mHelp->setText( i18n( "<a href=\"whatsthis:%1\">How does this work?</a>" ).tqarg( help ) ); + mHelp->setText( i18n( "<a href=\"whatsthis:%1\">How does this work?</a>" ).arg( help ) ); const TQString toToolTip = i18n( "Additional recipients of the message when forwarding" ); const TQString ccToolTip = i18n( "Additional recipients who get a copy of the message when forwarding" ); diff --git a/kmail/customtemplates_base.ui b/kmail/customtemplates_base.ui index 7060794cc..df92c4f3e 100644 --- a/kmail/customtemplates_base.ui +++ b/kmail/customtemplates_base.ui @@ -15,7 +15,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <vbox> <property name="name"> @@ -26,7 +26,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <hbox> <property name="name"> @@ -47,7 +47,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -147,7 +147,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <hbox> <property name="name"> @@ -155,7 +155,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <vbox> <property name="name"> @@ -181,7 +181,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <vbox> <property name="name"> @@ -222,7 +222,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <grid> <property name="name"> @@ -260,7 +260,7 @@ <property name="text"> <string>Shortc&ut:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -282,7 +282,7 @@ <property name="text"> <string>&Template type:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> diff --git a/kmail/distributionlistdialog.cpp b/kmail/distributionlistdialog.cpp index 26f720ad6..5c9f87382 100644 --- a/kmail/distributionlistdialog.cpp +++ b/kmail/distributionlistdialog.cpp @@ -39,7 +39,7 @@ #include <kmessagebox.h> #include <kinputdialog.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqlineedit.h> @@ -196,7 +196,7 @@ void DistributionListDialog::slotUser1() #endif KMessageBox::information( this, i18n( "<qt>Distribution list with the given name <b>%1</b> " - "already exists. Please select a different name.</qt>" ).tqarg( name ) ); + "already exists. Please select a different name.</qt>" ).arg( name ) ); return; } diff --git a/kmail/encodingdetector.cpp b/kmail/encodingdetector.cpp index 06537981b..4c26caab3 100644 --- a/kmail/encodingdetector.cpp +++ b/kmail/encodingdetector.cpp @@ -38,7 +38,7 @@ #include "encodingdetector_ja_p.h" #include <tqregexp.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <kglobal.h> #include <kcharsets.h> diff --git a/kmail/encodingdetector.h b/kmail/encodingdetector.h index 0f2231782..9fe173069 100644 --- a/kmail/encodingdetector.h +++ b/kmail/encodingdetector.h @@ -35,7 +35,7 @@ class EncodingDetectorPrivate; * Searches for encoding declaration inside raw data -- meta and xml tags. * In the case it can't find it, uses heuristics for specified language. * - * If it finds tqunicode BOM marks, it changes encoding regardless of what the user has told + * If it finds unicode BOM marks, it changes encoding regardless of what the user has told * * Intended lifetime of the object: one instance per document. * diff --git a/kmail/expirejob.cpp b/kmail/expirejob.cpp index 65de61a33..5106e2f2f 100644 --- a/kmail/expirejob.cpp +++ b/kmail/expirejob.cpp @@ -162,7 +162,7 @@ void ExpireJob::done() moving = true; str = i18n( "Removing 1 old message from folder %1...", "Removing %n old messages from folder %1...", count ) - .tqarg( mSrcFolder->label() ); + .arg( mSrcFolder->label() ); } else { // Expire by moving mMoveToFolder = @@ -170,7 +170,7 @@ void ExpireJob::done() if ( !mMoveToFolder ) { str = i18n( "Cannot expire messages from folder %1: destination " "folder %2 not found" ) - .tqarg( mSrcFolder->label(), mSrcFolder->expireToFolderId() ); + .arg( mSrcFolder->label(), mSrcFolder->expireToFolderId() ); kdWarning(5006) << str << endl; } else { kdDebug(5006) << "ExpireJob: finished expiring in folder " @@ -185,7 +185,7 @@ void ExpireJob::done() str = i18n( "Moving 1 old message from folder %1 to folder %2...", "Moving %n old messages from folder %1 to folder %2...", count ) - .tqarg( mSrcFolder->label(), mMoveToFolder->label() ); + .arg( mSrcFolder->label(), mMoveToFolder->label() ); } } } @@ -213,34 +213,34 @@ void ExpireJob::slotMessagesMoved( KMCommand *command ) msg = i18n( "Removed 1 old message from folder %1.", "Removed %n old messages from folder %1.", mRemovedMsgs.count() ) - .tqarg( mSrcFolder->label() ); + .arg( mSrcFolder->label() ); } else { msg = i18n( "Moved 1 old message from folder %1 to folder %2.", "Moved %n old messages from folder %1 to folder %2.", mRemovedMsgs.count() ) - .tqarg( mSrcFolder->label(), mMoveToFolder->label() ); + .arg( mSrcFolder->label(), mMoveToFolder->label() ); } break; case KMCommand::Failed: if ( mSrcFolder->expireAction() == KMFolder::ExpireDelete ) { msg = i18n( "Removing old messages from folder %1 failed." ) - .tqarg( mSrcFolder->label() ); + .arg( mSrcFolder->label() ); } else { msg = i18n( "Moving old messages from folder %1 to folder %2 failed." ) - .tqarg( mSrcFolder->label(), mMoveToFolder->label() ); + .arg( mSrcFolder->label(), mMoveToFolder->label() ); } break; case KMCommand::Canceled: if ( mSrcFolder->expireAction() == KMFolder::ExpireDelete ) { msg = i18n( "Removing old messages from folder %1 was canceled." ) - .tqarg( mSrcFolder->label() ); + .arg( mSrcFolder->label() ); } else { msg = i18n( "Moving old messages from folder %1 to folder %2 was " "canceled." ) - .tqarg( mSrcFolder->label(), mMoveToFolder->label() ); + .arg( mSrcFolder->label(), mMoveToFolder->label() ); } default: ; } diff --git a/kmail/expirypropertiesdialog.cpp b/kmail/expirypropertiesdialog.cpp index e992eace5..bf0c7ffe0 100644 --- a/kmail/expirypropertiesdialog.cpp +++ b/kmail/expirypropertiesdialog.cpp @@ -13,7 +13,7 @@ #include <tqradiobutton.h> #include <tqbuttongroup.h> #include <tqcombobox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtooltip.h> #include <tqwhatsthis.h> @@ -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/favoritefolderview.cpp b/kmail/favoritefolderview.cpp index e1689a9af..6715f4865 100644 --- a/kmail/favoritefolderview.cpp +++ b/kmail/favoritefolderview.cpp @@ -253,7 +253,7 @@ void FavoriteFolderView::itemClicked(TQListViewItem * item) if ( !item ) return; if ( !item->isSelected() ) item->setSelected( true ); - item->tqrepaint(); + item->repaint(); handleGroupwareFolder( static_cast<KMFolderTreeItem*>( item ) ); } @@ -267,11 +267,11 @@ void FavoriteFolderView::folderTreeSelectionChanged(KMFolder * folder) fti->setSelected( true ); setCurrentItem( fti ); ensureItemVisible( fti ); - fti->tqrepaint(); + fti->repaint(); found = true; } else if ( fti->folder() != folder && fti->isSelected() ) { fti->setSelected( false ); - fti->tqrepaint(); + fti->repaint(); } } blockSignals( false ); @@ -405,13 +405,13 @@ TQString FavoriteFolderView::prettyName(KMFolderTreeItem * fti) if ( fti->protocol() == KFolderTreeItem::Local || fti->protocol() == KFolderTreeItem::NONE ) { name = i18n( "Local Inbox" ); } else { - name = i18n( "Inbox of %1" ).tqarg( accountFti->text( 0 ) ); + name = i18n( "Inbox of %1" ).arg( accountFti->text( 0 ) ); } } else { if ( fti->protocol() != KFolderTreeItem::Local && fti->protocol() != KFolderTreeItem::NONE ) { - name = i18n( "%1 on %2" ).tqarg( fti->text( 0 ) ).tqarg( accountFti->text( 0 ) ); + name = i18n( "%1 on %2" ).arg( fti->text( 0 ) ).arg( accountFti->text( 0 ) ); } else { - name = i18n( "%1 (local)" ).tqarg( fti->text( 0 ) ); + name = i18n( "%1 (local)" ).arg( fti->text( 0 ) ); } } return name; @@ -524,7 +524,7 @@ void FavoriteFolderView::refresh() KMFolderTreeItem* fti = static_cast<KMFolderTreeItem*>(it.current()); if (!fti || !fti->folder()) continue; - fti->tqrepaint(); + fti->repaint(); } update(); } diff --git a/kmail/filehtmlwriter.h b/kmail/filehtmlwriter.h index 879143228..ec008adf5 100644 --- a/kmail/filehtmlwriter.h +++ b/kmail/filehtmlwriter.h @@ -35,7 +35,7 @@ #include "interfaces/htmlwriter.h" #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> class TQString; diff --git a/kmail/filterimporterexporter.cpp b/kmail/filterimporterexporter.cpp index d63278ad7..5fe88636b 100644 --- a/kmail/filterimporterexporter.cpp +++ b/kmail/filterimporterexporter.cpp @@ -41,7 +41,7 @@ #include <kpushbutton.h> #include <tqregexp.h> -#include <tqlayout.h> +#include <layout.h> using namespace KMail; diff --git a/kmail/filterlog.h b/kmail/filterlog.h index 83a2b3833..de73ac253 100644 --- a/kmail/filterlog.h +++ b/kmail/filterlog.h @@ -31,7 +31,7 @@ #include <tqobject.h> #include <tqstringlist.h> -#include <tqstylesheet.h> +#include <stylesheet.h> namespace KMail { diff --git a/kmail/filterlogdlg.cpp b/kmail/filterlogdlg.cpp index 33bfa8d39..137f61655 100644 --- a/kmail/filterlogdlg.cpp +++ b/kmail/filterlogdlg.cpp @@ -40,7 +40,7 @@ #include <tqlabel.h> #include <tqspinbox.h> #include <tqstringlist.h> -#include <tqtextedit.h> +#include <textedit.h> #include <tqvbox.h> #include <tqwhatsthis.h> #include <tqvgroupbox.h> @@ -257,7 +257,7 @@ void FilterLogDialog::slotUser2() KMessageBox::error( this, i18n( "Could not write the file %1:\n" "\"%2\" is the detailed error description." ) - .tqarg( fileName, + .arg( fileName, TQString::fromLocal8Bit( strerror( errno ) ) ), i18n( "KMail Error" ) ); } diff --git a/kmail/folderdiaacltab.cpp b/kmail/folderdiaacltab.cpp index 26daf6a23..507b34c37 100644 --- a/kmail/folderdiaacltab.cpp +++ b/kmail/folderdiaacltab.cpp @@ -52,7 +52,7 @@ #include <kdebug.h> #include <klocale.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqvbox.h> #include <tqvbuttongroup.h> @@ -244,7 +244,7 @@ static TQString permissionsToUserString( unsigned int permissions, const TQStrin if ( internalRightsList.isEmpty() ) return i18n( "Custom Permissions" ); // not very helpful, but shouldn't happen else - return i18n( "Custom Permissions (%1)" ).tqarg( internalRightsList ); + return i18n( "Custom Permissions (%1)" ).arg( internalRightsList ); } void KMail::FolderDiaACLTab::ListViewItem::setPermissions( unsigned int permissions ) @@ -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() ) ); @@ -453,7 +453,7 @@ void KMail::FolderDiaACLTab::load() KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->parentFolder(); if ( folder && folder->storage() == mImapAccount->rootFolder() ) return; // nothing to be done for the (virtual) account folder - mLabel->setText( i18n( "Connecting to server %1, please wait..." ).tqarg( mImapAccount->host() ) ); + mLabel->setText( i18n( "Connecting to server %1, please wait..." ).arg( mImapAccount->host() ) ); ImapAccountBase::ConnectionState state = mImapAccount->makeConnection(); if ( state == ImapAccountBase::Error ) { // Cancelled by user, or slave can't start slotConnectionResult( -1, TQString() ); @@ -471,7 +471,7 @@ void KMail::FolderDiaACLTab::slotConnectionResult( int errorCode, const TQString this, TQT_SLOT( slotConnectionResult(int, const TQString&) ) ); if ( errorCode ) { if ( errorCode == -1 ) // unspecified error - mLabel->setText( i18n( "Error connecting to server %1" ).tqarg( mImapAccount->host() ) ); + mLabel->setText( i18n( "Error connecting to server %1" ).arg( mImapAccount->host() ) ); else // Connection error (error message box already shown by the account) mLabel->setText( KIO::buildErrorString( errorCode, errorMsg ) ); @@ -521,7 +521,7 @@ void KMail::FolderDiaACLTab::slotReceivedACL( KMFolder* folder, KIO::Job* job, c if ( job->error() == KIO::ERR_UNSUPPORTED_ACTION ) mLabel->setText( i18n( "This IMAP server does not have support for access control lists (ACL)" ) ); else - mLabel->setText( i18n( "Error retrieving access control list (ACL) from server\n%1" ).tqarg( job->errorString() ) ); + mLabel->setText( i18n( "Error retrieving access control list (ACL) from server\n%1" ).arg( job->errorString() ) ); return; } @@ -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..06a5d4198 100644 --- a/kmail/folderdiaquotatab.cpp +++ b/kmail/folderdiaquotatab.cpp @@ -39,7 +39,7 @@ #include "imapaccountbase.h" #include <tqwidgetstack.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqprogressbar.h> #include <tqwhatsthis.h> @@ -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 ); @@ -117,7 +117,7 @@ void KMail::FolderDiaQuotaTab::load() KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->parentFolder(); if ( folder && folder->storage() == mImapAccount->rootFolder() ) return; // nothing to be done for the (virtual) account folder - mLabel->setText( i18n( "Connecting to server %1, please wait..." ).tqarg( mImapAccount->host() ) ); + mLabel->setText( i18n( "Connecting to server %1, please wait..." ).arg( mImapAccount->host() ) ); ImapAccountBase::ConnectionState state = mImapAccount->makeConnection(); if ( state == ImapAccountBase::Error ) { // Cancelled by user, or slave can't start slotConnectionResult( -1, TQString() ); @@ -136,7 +136,7 @@ void KMail::FolderDiaQuotaTab::slotConnectionResult( int errorCode, const TQStri this, TQT_SLOT( slotConnectionResult(int, const TQString&) ) ); if ( errorCode ) { if ( errorCode == -1 ) // unspecified error - mLabel->setText( i18n( "Error connecting to server %1" ).tqarg( mImapAccount->host() ) ); + mLabel->setText( i18n( "Error connecting to server %1" ).arg( mImapAccount->host() ) ); else // Connection error (error message box already shown by the account) mLabel->setText( KIO::buildErrorString( errorCode, errorMsg ) ); @@ -162,7 +162,7 @@ void KMail::FolderDiaQuotaTab::slotReceivedQuotaInfo( KMFolder* folder, if ( job->error() == KIO::ERR_UNSUPPORTED_ACTION ) mLabel->setText( i18n( "This account does not have support for quota information." ) ); else - mLabel->setText( i18n( "Error retrieving quota information from server\n%1" ).tqarg( job->errorString() ) ); + mLabel->setText( i18n( "Error retrieving quota information from server\n%1" ).arg( job->errorString() ) ); } else { mQuotaInfo = info; } @@ -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/folderdiaquotatab_p.cpp b/kmail/folderdiaquotatab_p.cpp index 98c3579c8..70885b7d3 100644 --- a/kmail/folderdiaquotatab_p.cpp +++ b/kmail/folderdiaquotatab_p.cpp @@ -31,7 +31,7 @@ #include "folderdiaquotatab_p.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqprogressbar.h> #include <tqwhatsthis.h> @@ -56,19 +56,19 @@ QuotaWidget::QuotaWidget( TQWidget* parent, const char* name ) { TQVBoxLayout *box = new TQVBoxLayout(this); TQWidget *stuff = new TQWidget( this ); - TQGridLayout* tqlayout = + TQGridLayout* layout = new TQGridLayout( stuff, 3, 3, KDialog::marginHint(), KDialog::spacingHint() ); mInfoLabel = new TQLabel("", stuff ); mRootLabel = new TQLabel("", stuff ); mProgressBar = new TQProgressBar( stuff ); - tqlayout->addWidget( new TQLabel( i18n("Root:" ), stuff ), 0, 0 ); - tqlayout->addWidget( mRootLabel, 0, 1 ); - tqlayout->addWidget( new TQLabel( i18n("Usage:"), stuff ), 1, 0 ); - //tqlayout->addWidget( new TQLabel( i18n("Status:"), stuff ), 2, 0 ); - tqlayout->addWidget( mInfoLabel, 1, 1 ); - tqlayout->addWidget( mProgressBar, 2, 1 ); + layout->addWidget( new TQLabel( i18n("Root:" ), stuff ), 0, 0 ); + layout->addWidget( mRootLabel, 0, 1 ); + layout->addWidget( new TQLabel( i18n("Usage:"), stuff ), 1, 0 ); + //layout->addWidget( new TQLabel( i18n("Status:"), stuff ), 2, 0 ); + layout->addWidget( mInfoLabel, 1, 1 ); + layout->addWidget( mProgressBar, 2, 1 ); box->addWidget( stuff ); box->addStretch( 2 ); } 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..0730e7bfe 100644 --- a/kmail/folderrequester.cpp +++ b/kmail/folderrequester.cpp @@ -36,7 +36,7 @@ #include <kiconloader.h> #include <kdialog.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtoolbutton.h> namespace KMail { @@ -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 ); } @@ -104,7 +104,7 @@ void FolderRequester::setFolder( const TQString &idString ) setFolder( folder ); } else { if ( !idString.isEmpty() ) { - edit->setText( i18n( "Unknown folder '%1'" ).tqarg( idString ) ); + edit->setText( i18n( "Unknown folder '%1'" ).arg( idString ) ); } else { edit->setText( i18n( "Please select a folder" ) ); } diff --git a/kmail/foldershortcutdialog.cpp b/kmail/foldershortcutdialog.cpp index 9095a647b..770b6cfc6 100644 --- a/kmail/foldershortcutdialog.cpp +++ b/kmail/foldershortcutdialog.cpp @@ -56,7 +56,7 @@ FolderShortcutDialog::FolderShortcutDialog( KMFolder *folder, TQWidget *parent, const char *name ) : KDialogBase( parent, name, true, - i18n( "Shortcut for Folder %1" ).tqarg( folder->label() ), + i18n( "Shortcut for Folder %1" ).arg( folder->label() ), KDialogBase::Ok | KDialogBase::Cancel ), mFolder( folder ), mMainWidget( mainwidget ) { diff --git a/kmail/folderstorage.cpp b/kmail/folderstorage.cpp index 63dc91fb5..53d7f66d8 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); } } @@ -503,7 +503,7 @@ KMMessage* FolderStorage::getMsg(int idx) kdDebug(5006) << "Error: " << location() << " Index file is inconsistent with folder file. This should never happen." << endl; - // We can't recreate the index at this point, since that would tqinvalidate the current + // We can't recreate the index at this point, since that would invalidate the current // message list and delete KMMsgBase or KMMessage objects that are in use. // Do it later in KMFolderIndex::readIndexHeader() instead. mCompactable = false; // Don't compact @@ -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..6bc04df15 100644 --- a/kmail/folderstorage.h +++ b/kmail/folderstorage.h @@ -71,7 +71,7 @@ typedef TQValueList<TQ_UINT32> SerNumList; * * @section Accounts * The accounts (of KMail) that are fed into the folder are - * represented as the tqchildren of the folder. They are only stored here + * represented as the children of the folder. They are only stored here * during runtime to have a reference for which accounts point to a * specific folder. */ @@ -109,10 +109,10 @@ public: /** Specify, that the folder can't contain mails. */ virtual void setNoContent(bool aNoContent); - /** Returns, if the folder can't have tqchildren */ + /** Returns, if the folder can't have children */ virtual bool noChildren() const { return mNoChildren; } - /** Specify, that the folder can't have tqchildren */ + /** Specify, that the folder can't have children */ virtual void setNoChildren( bool aNoChildren ); enum ChildrenState { @@ -120,11 +120,11 @@ public: HasNoChildren, ChildrenUnknown }; - /** Returns if the folder has tqchildren, - * has no tqchildren or we don't know */ + /** Returns if the folder has children, + * has no children or we don't know */ virtual ChildrenState hasChildren() const { return mHasChildren; } - /** Specify if the folder has tqchildren */ + /** Specify if the folder has children */ virtual void setHasChildren( ChildrenState state ) { mHasChildren = state; } @@ -245,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/foldertreebase.cpp b/kmail/foldertreebase.cpp index 8557388ac..4355c9df2 100644 --- a/kmail/foldertreebase.cpp +++ b/kmail/foldertreebase.cpp @@ -108,9 +108,9 @@ void FolderTreeBase::readColorConfig() KConfig* conf = KMKernel::config(); // Custom/System color support KConfigGroupSaver saver(conf, "Reader"); - TQColor c1=TQColor(kapp->tqpalette().active().text()); + TQColor c1=TQColor(kapp->palette().active().text()); TQColor c2=TQColor("blue"); - TQColor c4=TQColor(kapp->tqpalette().active().base()); + TQColor c4=TQColor(kapp->palette().active().base()); TQColor c5=TQColor("red"); if (!conf->readBoolEntry("defaultColors",true)) { @@ -179,10 +179,10 @@ void FolderTreeBase::slotUpdateCounts(KMFolder * folder, bool force /* = false*/ } // set it - bool tqrepaint = false; + bool repaint = false; if (fti->unreadCount() != count) { fti->adjustUnreadCount( count ); - tqrepaint = true; + repaint = true; } if (isTotalActive() || force) { @@ -196,7 +196,7 @@ void FolderTreeBase::slotUpdateCounts(KMFolder * folder, bool force /* = false*/ // set it if ( count != fti->totalCount() ) { fti->setTotalCount(count); - tqrepaint = true; + repaint = true; } } if ( isSizeActive() || force ) { @@ -204,7 +204,7 @@ void FolderTreeBase::slotUpdateCounts(KMFolder * folder, bool force /* = false*/ TQ_INT64 size = folder->storage()->folderSize(); if ( size != fti->folderSize() ) { fti->setFolderSize( size ); - tqrepaint = true; + repaint = true; } } } @@ -213,8 +213,8 @@ void FolderTreeBase::slotUpdateCounts(KMFolder * folder, bool force /* = false*/ } if (fti->parent() && !fti->parent()->isOpen()) - tqrepaint = false; // we're not visible - if (tqrepaint) { + repaint = false; // we're not visible + if (repaint) { fti->setNeedsRepaint( true ); emit triggerRefresh(); } diff --git a/kmail/folderutil.cpp b/kmail/folderutil.cpp index 40b543be7..0c2554dc0 100644 --- a/kmail/folderutil.cpp +++ b/kmail/folderutil.cpp @@ -92,7 +92,7 @@ void KMail::FolderUtil::deleteFolder( KMFolder *folderToDelete, TQWidget *parent KMessageBox::information(parent, i18n("<qt>The folder you deleted was associated with the account " "<b>%1</b> which delivered mail into it. The folder the account " - "delivers new mail into was reset to the main Inbox folder.</qt>").tqarg( (*it)->name())); + "delivers new mail into was reset to the main Inbox folder.</qt>").arg( (*it)->name())); } } if (folderToDelete->folderType() == KMFolderTypeImap) diff --git a/kmail/folderviewtooltip.h b/kmail/folderviewtooltip.h index 8e4f56ddd..dfc3bbbaf 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() ) @@ -32,18 +32,18 @@ class FolderViewToolTip : public TQToolTip item->updateCount(); TQString tipText = i18n("<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4" ) - .tqarg( item->folder()->prettyURL().replace( " ", " " ) ) - .tqarg( item->totalCount() < 0 ? "-" : TQString::number( item->totalCount() ) ) - .tqarg( item->unreadCount() < 0 ? "-" : TQString::number( item->unreadCount() ) ) - .tqarg( KIO::convertSize( item->folderSize() ) ); + .arg( item->folder()->prettyURL().replace( " ", " " ) ) + .arg( item->totalCount() < 0 ? "-" : TQString::number( item->totalCount() ) ) + .arg( item->unreadCount() < 0 ? "-" : TQString::number( item->unreadCount() ) ) + .arg( KIO::convertSize( item->folderSize() ) ); if ( KMFolderCachedImap* imap = dynamic_cast<KMFolderCachedImap*>( item->folder()->storage() ) ) { QuotaInfo info = imap->quotaInfo(); if ( info.isValid() && !info.isEmpty() ) - tipText += i18n("<br>Quota: %1").tqarg( info.toString() ); + tipText += i18n("<br>Quota: %1").arg( info.toString() ); } - tip( TQRect( headerRect.left(), 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..7decd39f2 100644 --- a/kmail/headeritem.cpp +++ b/kmail/headeritem.cpp @@ -145,7 +145,7 @@ TQ_UINT32 HeaderItem::msgSerNum() const // Update this item to summarise a new folder and message -//Opens all tqchildren in the thread +//Opens all children in the thread void HeaderItem::setOpenRecursive( bool open ) { if (open){ @@ -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; } @@ -458,7 +458,7 @@ TQString HeaderItem::generate_key( KMHeaders *headers, int column = sortOrder & ((1 << 5) - 1); TQString ret = TQChar( (char)sortOrder ); - TQString sortArrival = TQString( "%1" ).tqarg( msg->getMsgSerNum(), 0, 36 ); + TQString sortArrival = TQString( "%1" ).arg( msg->getMsgSerNum(), 0, 36 ); while (sortArrival.length() < 7) sortArrival = '0' + sortArrival; if (column == paintInfo->dateCol) { diff --git a/kmail/headeritem.h b/kmail/headeritem.h index 2142cf71b..34dee4de0 100644 --- a/kmail/headeritem.h +++ b/kmail/headeritem.h @@ -80,20 +80,20 @@ public: /** Returns whether the item has other items below it. */ bool hasChildren() const { return mSortedChildren.count() || mUnsortedCount; } - /** The sorted tqchildren are an array of sortcache items we know are below the + /** The sorted children are an array of sortcache items we know are below the * current one and are already properly sorted (as read from the cache ) */ const TQPtrList<SortCacheItem> *sortedChildren() const { return &mSortedChildren; } - /** The unsorted tqchildren are an array of sortcache items we know are below the + /** The unsorted children are an array of sortcache items we know are below the * current one, but are yet to be threaded and sorted properly. */ SortCacheItem **unsortedChildren(int &count) const { count = mUnsortedCount; return mUnsortedChildren; } - /** Add an item to this itme's list of already sorted tqchildren. */ + /** Add an item to this itme's list of already sorted children. */ void addSortedChild(SortCacheItem *i) { i->mParent = this; mSortedChildren.append(i); } - /** Add an item to this itme's list of unsorted tqchildren. */ + /** Add an item to this itme's list of unsorted children. */ void addUnsortedChild(SortCacheItem *i) { i->mParent = this; if(!mUnsortedChildren) @@ -104,7 +104,7 @@ public: mUnsortedChildren[mUnsortedCount++] = i; } - /** Clear the sorted and unsorted tqchildren datastructures. */ + /** Clear the sorted and unsorted children datastructures. */ void clearChildren() { mSortedChildren.clear(); free( mUnsortedChildren ); @@ -185,7 +185,7 @@ public: // Return the serial number of the message associated with this item; TQ_UINT32 msgSerNum() const; - /** Expands all tqchildren of the list view item. */ + /** Expands all children of the list view item. */ void setOpenRecursive( bool open ); /** Returns the text of the list view item. */ diff --git a/kmail/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..5686d2c0d 100644 --- a/kmail/headerstyle.cpp +++ b/kmail/headerstyle.cpp @@ -82,10 +82,10 @@ namespace KMail { static TQString convertToHtmlBlock( const TQString & str, bool useSpan=false ) { TQString dir = directionOf( str ); TQString format = "<%1 dir=\"%3\">%4</%2>"; - return format.tqarg( useSpan ? "span" : "div" ) - .tqarg( useSpan ? "span" : "div" ) - .tqarg( dir ) - .tqarg( LinkLocator::convertToHtml( str ) ); + return format.arg( useSpan ? "span" : "div" ) + .arg( useSpan ? "span" : "div" ) + .arg( dir ) + .arg( LinkLocator::convertToHtml( str ) ); } #endif @@ -124,7 +124,7 @@ namespace KMail { strategy = HeaderStrategy::brief(); // The direction of the header is determined according to the direction - // of the application tqlayout. + // of the application layout. TQString dir = TQApplication::reverseLayout() ? "rtl" : "ltr" ; @@ -223,7 +223,7 @@ namespace KMail { strategy = HeaderStrategy::rich(); // The direction of the header is determined according to the direction - // of the application tqlayout. + // of the application layout. TQString dir = ( TQApplication::reverseLayout() ? "rtl" : "ltr" ); @@ -262,13 +262,13 @@ namespace KMail { return headerStr + "</div>"; } - headerStr = TQString("<div class=\"header\" dir=\"%1\">").tqarg(dir); + headerStr = TQString("<div class=\"header\" dir=\"%1\">").arg(dir); //case HdrLong: if ( strategy->showHeader( "subject" ) ) headerStr += TQString("<div dir=\"%1\"><b style=\"font-size:130%\">" + strToHtml(message->subject()) + "</b></div>\n") - .tqarg(subjectDir); + .arg(subjectDir); if ( strategy->showHeader( "date" ) ) headerStr.append(i18n("Date: ") + strToHtml(dateString)+"<br>\n"); @@ -408,9 +408,9 @@ namespace KMail { } } TQString titleText = i18n("%1% probability of being spam.\n\nFull report:\n%2") - .tqarg( TQString::number( percent ), filterHeader ); + .arg( TQString::number( percent ), filterHeader ); return TQString("<img src=\"%1\" width=\"%2\" height=\"%3\" style=\"border: 1px solid black;\" title=\"%4\"> ") - .tqarg( imgToDataUrl( meterBar, "PPM" ), TQString::number( 20 ), + .arg( imgToDataUrl( meterBar, "PPM" ), TQString::number( 20 ), TQString::number( 5 ), titleText ); } @@ -427,10 +427,10 @@ namespace KMail { // ### from kmreaderwin begin // The direction of the header is determined according to the direction - // of the application tqlayout. + // of the application layout. TQString dir = ( TQApplication::reverseLayout() ? "rtl" : "ltr" ); - TQString headerStr = TQString("<div class=\"fancy header\" dir=\"%1\">\n").tqarg(dir); + TQString headerStr = TQString("<div class=\"fancy header\" dir=\"%1\">\n").arg(dir); // However, the direction of the message subject within the header is // determined according to the contents of the subject itself. Since @@ -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,8 +493,8 @@ namespace KMail { presence = imProxy->presenceString( kabcUid ); if ( !presence.isEmpty() ) { - TQString presenceIcon = TQString::tqfromLatin1( " <img src=\"%1\"/>" ) - .tqarg( imgToDataUrl( imProxy->presenceIcon( kabcUid ).convertToImage() ) ); + TQString presenceIcon = TQString::fromLatin1( " <img src=\"%1\"/>" ) + .arg( imgToDataUrl( imProxy->presenceIcon( kabcUid ).convertToImage() ) ); presence += presenceIcon; } } @@ -585,26 +585,26 @@ namespace KMail { { //kdDebug( 5006 ) << "Got a photo: " << photoURL << endl; userHTML = TQString("<img src=\"%1\" width=\"%2\" height=\"%3\">") - .tqarg( photoURL ).tqarg( photoWidth ).tqarg( photoHeight ); + .arg( photoURL ).arg( photoWidth ).arg( photoHeight ); if ( presence.isEmpty() ) { userHTML = TQString("<div class=\"senderpic\">") + userHTML + "</div>"; } else { userHTML = TQString( "<div class=\"senderpic\">" "<a href=\"im:%1\">%2<div class=\"senderstatus\">" "<span name=\"presence-%3\">%4</span></div></a>" - "</div>" ).tqarg( kabcUid ) - .tqarg( userHTML ) - .tqarg( kabcUid ) - .tqarg( presence ); + "</div>" ).arg( kabcUid ) + .arg( userHTML ) + .arg( kabcUid ) + .arg( presence ); } } else { // we don't have a photo, just show presence, if we have it if ( !presence.isEmpty() ) userHTML = TQString( "<a href=\"im:%1\"><div class=\"senderstatus\">" "<span name=\"presence-%2\">%3</span></div></a>" ) - .tqarg( kabcUid ) - .tqarg( kabcUid ) - .tqarg( presence ); + .arg( kabcUid ) + .arg( kabcUid ) + .arg( presence ); } #if 0 // Disabled 'Launch IM' link in headers - Will @@ -719,12 +719,12 @@ namespace KMail { "margin: 0px 0px 3px 0px;" "\" class=\"curtime\">%4<br />%5<br />%6</div>" ) - .tqarg( bg_color ) - .tqarg( color ) - .tqarg( bg_image ) - .tqarg( i18n( "Now:" ) ) - .tqarg( currTime.toString( tformat ) ) - .tqarg( timeofday ) + .arg( bg_color ) + .arg( color ) + .arg( bg_image ) + .arg( i18n( "Now:" ) ) + .arg( currTime.toString( tformat ) ) + .arg( timeofday ) ); } else { @@ -739,8 +739,8 @@ namespace KMail { ( GlobalSettings::self()->showEmoticons() ? LinkLocator::ReplaceSmileys : 0 ); headerStr += TQString("<div dir=\"%1\">%2</div>\n") - .tqarg(subjectDir) - .tqarg(message->subject().isEmpty()? + .arg(subjectDir) + .arg(message->subject().isEmpty()? i18n("No Subject") : strToHtml( message->subject(), flags )); } @@ -755,11 +755,11 @@ namespace KMail { fromStr = message->fromStrip(); // let's use that headerStr += TQString("<tr><th>%1</th>\n" "<td>") - .tqarg(i18n("From: ")) + .arg(i18n("From: ")) + KMMessage::emailAddrAsAnchor( fromStr, false ) + ( !message->headerField( "Resent-From" ).isEmpty() ? " " + i18n("(resent from %1)") - .tqarg( KMMessage::emailAddrAsAnchor( + .arg( KMMessage::emailAddrAsAnchor( message->headerField( "Resent-From" ),false) ) : TQString("") ) + ( !vCardName.isEmpty() ? " <a href=\"" + vCardName + "\">" @@ -781,37 +781,37 @@ namespace KMail { if ( strategy->showHeader( "to" ) ) headerStr.append(TQString("<tr><th>%1</th>\n" "<td>%2</td></tr>\n") - .tqarg(i18n("To: ")) - .tqarg(KMMessage::emailAddrAsAnchor(message->to(),false))); + .arg(i18n("To: ")) + .arg(KMMessage::emailAddrAsAnchor(message->to(),false))); // cc line, if any if ( strategy->showHeader( "cc" ) && !message->cc().isEmpty()) headerStr.append(TQString("<tr><th>%1</th>\n" "<td>%2</td></tr>\n") - .tqarg(i18n("CC: ")) - .tqarg(KMMessage::emailAddrAsAnchor(message->cc(),false))); + .arg(i18n("CC: ")) + .arg(KMMessage::emailAddrAsAnchor(message->cc(),false))); // Bcc line, if any if ( strategy->showHeader( "bcc" ) && !message->bcc().isEmpty()) headerStr.append(TQString("<tr><th>%1</th>\n" "<td>%2</td></tr>\n") - .tqarg(i18n("BCC: ")) - .tqarg(KMMessage::emailAddrAsAnchor(message->bcc(),false))); + .arg(i18n("BCC: ")) + .arg(KMMessage::emailAddrAsAnchor(message->bcc(),false))); if ( strategy->showHeader( "date" ) ) headerStr.append(TQString("<tr><th>%1</th>\n" "<td dir=\"%2\">%3</td></tr>\n") - .tqarg(i18n("Date: ")) - .tqarg( directionOf( message->dateStr() ) ) - .tqarg(strToHtml(dateString))); + .arg(i18n("Date: ")) + .arg( directionOf( message->dateStr() ) ) + .arg(strToHtml(dateString))); if ( GlobalSettings::self()->showUserAgent() ) { if ( strategy->showHeader( "user-agent" ) ) { if ( !message->headerField("User-Agent").isEmpty() ) { headerStr.append(TQString("<tr><th>%1</th>\n" "<td>%2</td></tr>\n") - .tqarg(i18n("User-Agent: ")) - .tqarg( strToHtml( message->headerField("User-Agent") ) ) ); + .arg(i18n("User-Agent: ")) + .arg( strToHtml( message->headerField("User-Agent") ) ) ); } } @@ -819,8 +819,8 @@ namespace KMail { if ( !message->headerField("X-Mailer").isEmpty() ) { headerStr.append(TQString("<tr><th>%1</th>\n" "<td>%2</td></tr>\n") - .tqarg(i18n("X-Mailer: ")) - .tqarg( strToHtml( message->headerField("X-Mailer") ) ) ); + .arg(i18n("X-Mailer: ")) + .arg( strToHtml( message->headerField("X-Mailer") ) ) ); } } } @@ -829,19 +829,19 @@ namespace KMail { /* if( strategy->showHeader( "status" ) ) headerStr.append( TQString( "<tr><th>%1</th>\n" "<td dir=\"%2\">%3</td></tr>\n") - .tqarg(i18n("Sender status: ")) - .tqarg( directionOf( onlinetqStatus ) ) - .tqarg(onlinetqStatus)); + .arg(i18n("Sender status: ")) + .arg( directionOf( onlineStatus ) ) + .arg(onlineStatus)); */ headerStr.append( TQString("<tr><td colspan=\"2\"><div id=\"attachmentInjectionPoint\"></div></td></tr>" ) ); headerStr.append( TQString( "</table></td><td align=\"center\" valign=\"top\">%1%2</td></tr></table>\n" ) - .tqarg(timeHTML) - .tqarg(userHTML) ); + .arg(timeHTML) + .arg(userHTML) ); if ( !spamHTML.isEmpty() ) headerStr.append( TQString( "<div class=\"spamheader\" dir=\"%1\"><b>%2</b> <span style=\"padding-left: 20px;\">%3</span></div>\n") - .tqarg( subjectDir, i18n("Spam Status:"), spamHTML ) ); + .arg( subjectDir, i18n("Spam Status:"), spamHTML ) ); headerStr += "</div>\n\n"; return headerStr; @@ -853,8 +853,8 @@ namespace KMail { TQBuffer buffer( ba ); buffer.open( IO_WriteOnly ); image.save( &buffer, fmt ); - return TQString::tqfromLatin1("data:image/%1;base64,%2") - .tqarg( fmt, KCodecs::base64Encode( ba ).data() ); + return TQString::fromLatin1("data:image/%1;base64,%2") + .arg( fmt, KCodecs::base64Encode( ba ).data() ); } // ##################### @@ -882,7 +882,7 @@ namespace KMail { strategy = HeaderStrategy::brief(); // The direction of the header is determined according to the direction - // of the application tqlayout. + // of the application layout. TQString dir = TQApplication::reverseLayout() ? "rtl" : "ltr" ; @@ -901,7 +901,7 @@ namespace KMail { // colors depend on if its encapsulated or not TQColor fontColor(TQt::white); TQString linkColor = "class =\"white\""; - const TQColor activeColor = tqApp->tqpalette().active().highlight(); + const TQColor activeColor = tqApp->palette().active().highlight(); TQColor activeColorDark = activeColor.dark(130); // reverse colors for encapsulated if( !topLevel ){ 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/identitydialog.cpp b/kmail/identitydialog.cpp index f32c014ae..1b621ef95 100644 --- a/kmail/identitydialog.cpp +++ b/kmail/identitydialog.cpp @@ -73,12 +73,12 @@ using KMail::FolderRequester; #include <tqtabwidget.h> #include <tqlabel.h> #include <tqwhatsthis.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <tqcheckbox.h> #include <tqcombobox.h> #include <tqgroupbox.h> -#include <tqtextedit.h> +#include <textedit.h> // other headers: #include <gpgmepp/key.h> @@ -427,16 +427,16 @@ namespace KMail { // Tab Widget: Signature // mSignatureConfigurator = new SignatureConfigurator( tabWidget ); - mSignatureConfigurator->tqlayout()->setMargin( KDialog::marginHint() ); + mSignatureConfigurator->layout()->setMargin( KDialog::marginHint() ); tabWidget->addTab( mSignatureConfigurator, i18n("&Signature") ); mXFaceConfigurator = new XFaceConfigurator( tabWidget ); - mXFaceConfigurator->tqlayout()->setMargin( KDialog::marginHint() ); + mXFaceConfigurator->layout()->setMargin( KDialog::marginHint() ); tabWidget->addTab( mXFaceConfigurator, i18n("&Picture") ); - KConfigGroup tqgeometry( KMKernel::config(), "Geometry" ); - if ( tqgeometry.hasKey( "Identity Dialog size" ) ) - resize( tqgeometry.readSizeEntry( "Identity Dialog size" ) ); + KConfigGroup geometry( KMKernel::config(), "Geometry" ); + if ( geometry.hasKey( "Identity Dialog size" ) ) + resize( geometry.readSizeEntry( "Identity Dialog size" ) ); mNameEdit->setFocus(); connect( tabWidget, TQT_SIGNAL(currentChanged(TQWidget*)), @@ -444,8 +444,8 @@ namespace KMail { } IdentityDialog::~IdentityDialog() { - KConfigGroup tqgeometry( KMKernel::config(), "Geometry" ); - tqgeometry.writeEntry( "Identity Dialog size", size() ); + KConfigGroup geometry( KMKernel::config(), "Geometry" ); + geometry.writeEntry( "Identity Dialog size", size() ); } void IdentityDialog::slotAboutToShow( TQWidget * w ) { @@ -527,7 +527,7 @@ void IdentityDialog::slotOk() { for ( TQStringList::const_iterator it = aliases.begin(), end = aliases.end() ; it != end ; ++it ) { if ( !isValidSimpleEmailAddress( *it ) ) { TQString errorMsg( simpleEmailAddressErrorMsg()); - KMessageBox::sorry( this, errorMsg, i18n("Invalid Email Alias \"%1\"").tqarg( *it ) ); + KMessageBox::sorry( this, errorMsg, i18n("Invalid Email Alias \"%1\"").arg( *it ) ); return; } } @@ -580,7 +580,7 @@ void IdentityDialog::slotOk() { } if ( err ) - if ( KMessageBox::warningContinueCancel( this, msg.tqarg( email ), + if ( KMessageBox::warningContinueCancel( this, msg.arg( email ), i18n("Email Address Not Found in Key/Certificates"), KStdGuiItem::cont(), "warn_email_not_in_certificate" ) != KMessageBox::Continue) @@ -612,7 +612,7 @@ void IdentityDialog::slotOk() { void IdentityDialog::setIdentity( KPIM::Identity & ident ) { - setCaption( i18n("Edit Identity \"%1\"").tqarg( ident.identityName() ) ); + setCaption( i18n("Edit Identity \"%1\"").arg( ident.identityName() ) ); // "General" tab: mNameEdit->setText( ident.fullName() ); @@ -641,7 +641,7 @@ void IdentityDialog::slotOk() { "\"%1\" does not exist (anymore); " "therefore, the default sent-mail folder " "will be used.") - .tqarg( ident.identityName() ) ) ) + .arg( ident.identityName() ) ) ) mFccCombo->setFolder( kmkernel->sentFolder() ); else mFccCombo->setFolder( ident.fcc() ); @@ -652,7 +652,7 @@ void IdentityDialog::slotOk() { "\"%1\" does not exist (anymore); " "therefore, the default drafts folder " "will be used.") - .tqarg( ident.identityName() ) ) ) + .arg( ident.identityName() ) ) ) mDraftsCombo->setFolder( kmkernel->draftsFolder() ); else mDraftsCombo->setFolder( ident.drafts() ); @@ -663,14 +663,14 @@ void IdentityDialog::slotOk() { "\"%1\" does not exist (anymore); " "therefore, the default templates folder " "will be used.") - .tqarg( ident.identityName() ) ) ) + .arg( ident.identityName() ) ) ) mTemplatesCombo->setFolder( kmkernel->templatesFolder() ); else mTemplatesCombo->setFolder( ident.templates() ); // "Templates" tab: uint identity = ident.uoid(); - TQString iid = TQString("IDENTITY_%1").tqarg( identity ); + TQString iid = TQString("IDENTITY_%1").arg( identity ); Templates t( iid ); mCustom->setChecked(t.useCustomTemplates()); mWidget->loadFromIdentity( identity ); @@ -709,7 +709,7 @@ void IdentityDialog::slotOk() { mTemplatesCombo->folder()->idString() : TQString() ); // "Templates" tab: uint identity = ident.uoid(); - TQString iid = TQString("IDENTITY_%1").tqarg( identity ); + TQString iid = TQString("IDENTITY_%1").arg( identity ); Templates t( iid ); kdDebug() << "use custom templates for identity " << identity << ": " << mCustom->isChecked() << endl; t.setUseCustomTemplates(mCustom->isChecked()); diff --git a/kmail/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/identitylistview.cpp b/kmail/identitylistview.cpp index 5ce6f38c8..7a5134457 100644 --- a/kmail/identitylistview.cpp +++ b/kmail/identitylistview.cpp @@ -83,7 +83,7 @@ namespace KMail { setText( 0, i18n("%1: identity name. Used in the config " "dialog, section Identity, to indicate the " "default identity", "%1 (Default)") - .tqarg( ident.identityName() ) ); + .arg( ident.identityName() ) ); else setText( 0, ident.identityName() ); setText( 1, ident.fullEmailAddr() ); diff --git a/kmail/imapaccountbase.cpp b/kmail/imapaccountbase.cpp index f1dbaae11..73253dfea 100644 --- a/kmail/imapaccountbase.cpp +++ b/kmail/imapaccountbase.cpp @@ -67,7 +67,7 @@ using KIO::PasswordDialog; //using KIO::Scheduler; // use FQN below #include <tqregexp.h> -#include <tqstylesheet.h> +#include <stylesheet.h> namespace KMail { @@ -318,7 +318,7 @@ namespace KMail { mSlave = KIO::Scheduler::getConnectedSlave( getUrl(), slaveConfig() ); if ( !mSlave ) { KMessageBox::error(0, i18n("Could not start process for %1.") - .tqarg( getUrl().protocol() ) ); + .arg( getUrl().protocol() ) ); return Error; } if ( mSlave->isConnected() ) { @@ -400,7 +400,7 @@ namespace KMail { if (job->error()) { if ( !(*it).quiet ) - handleJobError( job, i18n( "Error while trying to subscribe to %1:" ).tqarg( path ) + '\n' ); + handleJobError( job, i18n( "Error while trying to subscribe to %1:" ).arg( path ) + '\n' ); emit subscriptionChangeFailed( job->errorString() ); // ## emit subscriptionChanged here in case anyone needs it to support continue/cancel } @@ -735,7 +735,7 @@ namespace KMail { if ( !done ) { TQString msg = i18n("KMail has detected a prefix entry in the " "configuration of the account \"%1\" which is obsolete with the " - "support of IMAP namespaces.").tqarg( name() ); + "support of IMAP namespaces.").arg( name() ); if ( list.contains( "" ) ) { // replace empty entry with the old prefix list.remove( "" ); @@ -879,13 +879,13 @@ namespace KMail { KMMessage* msg = jd.msgList.first(); // Use double-quotes around the subject to keep the sentence readable, // but don't use double quotes around the sender since from() might return a double-quoted name already - const TQString subject = msg->subject().isEmpty() ? i18n( "<unknown>" ) : TQString("\"%1\"").tqarg( msg->subject() ); + const TQString subject = msg->subject().isEmpty() ? i18n( "<unknown>" ) : TQString("\"%1\"").arg( msg->subject() ); const TQString from = msg->from().isEmpty() ? i18n( "<unknown>" ) : msg->from(); TQString myError = "<p><b>" + i18n("Error while uploading message") + "</b></p><p>" - + i18n("Could not upload the message dated %1 from <i>%2</i> with subject <i>%3</i> to the server.").tqarg( msg->dateStr(), TQStyleSheet::escape( from ), TQStyleSheet::escape( subject ) ) + + i18n("Could not upload the message dated %1 from <i>%2</i> with subject <i>%3</i> to the server.").arg( msg->dateStr(), TQStyleSheet::escape( from ), TQStyleSheet::escape( subject ) ) + "</p><p>" - + i18n("The destination folder was: <b>%1</b>.").tqarg( TQStyleSheet::escape( folder->prettyURL() ) ) + + i18n("The destination folder was: <b>%1</b>.").arg( TQStyleSheet::escape( folder->prettyURL() ) ) + "</p><p>" + i18n("The server reported:") + "</p>"; return handleJobError( job, myError ); @@ -908,7 +908,7 @@ namespace KMail { } readOnly = folder->isReadOnly(); } - error = i18n("The folder is too close to its quota limit. (%1)").tqarg( quotaAsString ); + error = i18n("The folder is too close to its quota limit. (%1)").arg( quotaAsString ); if ( readOnly ) { error += i18n("\nSince you do not have write privileges on this folder, " "please ask the owner of the folder to free up some space in it."); @@ -962,10 +962,10 @@ namespace KMail { // Show it in the status bar, in case the user has ticked "don't show again" if ( errorCode == KIO::ERR_CONNECTION_BROKEN ) KPIM::BroadcastStatus::instance()->seStatusMsg( - i18n( "The connection to account %1 was broken." ).tqarg( name() ) ); + i18n( "The connection to account %1 was broken." ).arg( name() ) ); else if ( errorCode == KIO::ERR_SERVER_TIMEOUT ) KPIM::BroadcastStatus::instance()->seStatusMsg( - i18n( "The connection to account %1 timed out." ).tqarg( name() ) ); + i18n( "The connection to account %1 timed out." ).arg( name() ) ); } else { if ( !errors.isEmpty() ) KMessageBox::detailedError( TQT_TQWIDGET(kapp->activeWindow()), msg, errors.join("\n").prepend("<qt>"), caption ); @@ -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; @@ -1141,10 +1141,10 @@ namespace KMail { void ImapAccountBase::constructParts( TQDataStream & stream, int count, KMMessagePart* parentKMPart, DwBodyPart * parent, const DwMessage * dwmsg ) { - int tqchildren; + int children; for (int i = 0; i < count; i++) { - stream >> tqchildren; + stream >> children; KMMessagePart* part = new KMMessagePart( stream ); part->setParent( parentKMPart ); mBodyPartList.append( part ); @@ -1173,7 +1173,7 @@ namespace KMail { if ( !parentKMPart ) parentKMPart = part; - if (tqchildren > 0) + if (children > 0) { DwBodyPart* newparent = dwpart; const DwMessage* newmsg = dwmsg; @@ -1188,13 +1188,13 @@ namespace KMail { if ( part->partSpecifier().endsWith(".HEADER") ) // we don't want headers as parent newParentKMPart = parentKMPart; - constructParts( stream, tqchildren, newParentKMPart, newparent, newmsg ); + constructParts( stream, children, newParentKMPart, newparent, newmsg ); } } } //----------------------------------------------------------------------------- - 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..165811960 100644 --- a/kmail/imapjob.cpp +++ b/kmail/imapjob.cpp @@ -41,7 +41,7 @@ using KPIM::ProgressManager; #include "util.h" -#include <tqstylesheet.h> +#include <stylesheet.h> #include <kio/scheduler.h> #include <kdebug.h> #include <klocale.h> @@ -140,10 +140,10 @@ void ImapJob::init( JobType jt, TQString sets, KMFolderImap* folder, for ( char *ch = cstr.data(); *ch; ch++ ) { if ( *ch == '\n' && (prevChar != '\r') ) { - jd.data.tqat( i ) = '\r'; + jd.data.at( i ) = '\r'; i++; } - jd.data.tqat( i ) = *ch; + jd.data.at( i ) = *ch; prevChar = *ch; i++; } @@ -191,7 +191,7 @@ void ImapJob::init( JobType jt, TQString sets, KMFolderImap* folder, "ImapJobCopyMove"+ProgressManager::getUniqueID(), i18n("Server operation"), i18n("Source folder: %1 - Destination folder: %2") - .tqarg( TQStyleSheet::escape( msg_parent->prettyURL() ), + .arg( TQStyleSheet::escape( msg_parent->prettyURL() ), TQStyleSheet::escape( mDestFolder->prettyURL() ) ), true, account->useSSL() || account->useTLS() ); @@ -369,7 +369,7 @@ void ImapJob::slotGetMessageResult( KIO::Job * job ) { TQString errorStr = i18n( "Error while retrieving messages from the server." ); if ( (*it).progressItem ) - (*it).progressItem->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..0cbc7cf8b 100644 --- a/kmail/importarchivedialog.cpp +++ b/kmail/importarchivedialog.cpp @@ -27,7 +27,7 @@ #include <klocale.h> #include <kmessagebox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> using namespace KMail; @@ -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..574ed51f8 100644 --- a/kmail/importjob.cpp +++ b/kmail/importjob.cpp @@ -78,7 +78,7 @@ void KMail::ImportJob::finish() mProgressItem->setComplete(); mProgressItem = 0; TQString text = i18n( "Importing the archive file '%1' into the folder '%2' succeeded." ) - .tqarg( mArchiveFile.path() ).tqarg( mRootFolder->name() ); + .arg( mArchiveFile.path() ).arg( mRootFolder->name() ); text += "\n" + i18n( "1 message was imported.", "%n messages were imported.", mNumberOfImportedMessages ); KMessageBox::information( mParentWidget, text, i18n( "Import finished." ) ); deleteLater(); @@ -95,7 +95,7 @@ void KMail::ImportJob::abort( const TQString &errorMessage ) return; mAborted = true; - TQString text = i18n( "Failed to import the archive into folder '%1'." ).tqarg( mRootFolder->name() ); + TQString text = i18n( "Failed to import the archive into folder '%1'." ).arg( mRootFolder->name() ); text += "\n" + errorMessage; if ( mProgressItem ) { mProgressItem->setComplete(); @@ -111,7 +111,7 @@ KMFolder * KMail::ImportJob::createSubFolder( KMFolder *parent, const TQString & KMFolder *newFolder = FolderUtil::createSubFolder( parent, parent->child(), folderName, TQString(), KMFolderTypeMaildir ); if ( !newFolder ) { - abort( i18n( "Unable to create subfolder for folder '%1'." ).tqarg( parent->name() ) ); + abort( i18n( "Unable to create subfolder for folder '%1'." ).arg( parent->name() ) ); return 0; } else { @@ -207,11 +207,11 @@ void KMail::ImportJob::importNextMessage() } mCurrentFolder = folder; if ( mCurrentFolder->open( "ImportJob" ) != 0 ) { - abort( i18n( "Unable to open folder '%1'." ).tqarg( mCurrentFolder->name() ) ); + abort( i18n( "Unable to open folder '%1'." ).arg( mCurrentFolder->name() ) ); return; } kdDebug(5006) << "importNextMessage(): Current folder of queue is now: " << mCurrentFolder->name() << endl; - mProgressItem->setqStatus( i18n( "Importing folder %1" ).tqarg( mCurrentFolder->name() ) ); + mProgressItem->seStatus( i18n( "Importing folder %1" ).arg( mCurrentFolder->name() ) ); } mProgressItem->setProgress( ( mProgressItem->progress() + 5 ) ); @@ -221,7 +221,7 @@ void KMail::ImportJob::importNextMessage() messages.files.removeFirst(); mCurrentMessage = new KMMessage(); - mCurrentMessage->fromByteArray( mCurrentMessageFile->data(), true /* 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 @@ -231,7 +231,7 @@ void KMail::ImportJob::importNextMessage() // uploaded. if ( mCurrentFolder->folderType() != KMFolderTypeImap ) { if ( mCurrentFolder->addMsg( mCurrentMessage, &retIndex ) != 0 ) { - abort( i18n( "Failed to add a message to the folder '%1'." ).tqarg( mCurrentFolder->name() ) ); + abort( i18n( "Failed to add a message to the folder '%1'." ).arg( mCurrentFolder->name() ) ); return; } messageAdded(); @@ -284,7 +284,7 @@ KMFolder* KMail::ImportJob::getOrCreateSubFolder( KMFolder *parentFolder, const mode_t subFolderPermissions ) { if ( !parentFolder->createChildFolder() ) { - abort( i18n( "Unable to create subfolder for folder '%1'." ).tqarg( parentFolder->name() ) ); + abort( i18n( "Unable to create subfolder for folder '%1'." ).arg( parentFolder->name() ) ); return 0; } @@ -334,7 +334,7 @@ void KMail::ImportJob::importNextDirectory() const TQString folderName = folderNameForDirectoryName( entry->name() ); if ( folderName.isEmpty() ) { - abort( i18n( "Unexpected subdirectory named '%1'." ).tqarg( entry->name() ) ); + abort( i18n( "Unexpected subdirectory named '%1'." ).arg( entry->name() ) ); return; } KMFolder *subFolder = getOrCreateSubFolder( currentFolder, folderName, entry->permissions() ); @@ -368,12 +368,12 @@ void KMail::ImportJob::start() else if ( !mimeType->patterns().grep( "zip", false ).isEmpty() ) mArchive = new KZip( mArchiveFile.path() ); else { - abort( i18n( "The file '%1' does not appear to be a valid archive." ).tqarg( mArchiveFile.path() ) ); + abort( i18n( "The file '%1' does not appear to be a valid archive." ).arg( mArchiveFile.path() ) ); return; } if ( !mArchive->open( IO_ReadOnly ) ) { - abort( i18n( "Unable to open archive file '%1'" ).tqarg( mArchiveFile.path() ) ); + abort( i18n( "Unable to open archive file '%1'" ).arg( mArchiveFile.path() ) ); return; } diff --git a/kmail/index.cpp b/kmail/index.cpp index 5604003d4..bb1e2ac67 100644 --- a/kmail/index.cpp +++ b/kmail/index.cpp @@ -550,7 +550,7 @@ void KMMsgIndex::Search::act() { TQString terms; for ( KMSearchRule* rule = pat->first(); rule; rule = pat->next() ) { Q_ASSERT( rule->function() == KMSearchRule::FuncContains ); - terms += TQString::tqfromLatin1( " %1 " ).tqarg( rule->contents() ); + terms += TQString::fromLatin1( " %1 " ).arg( rule->contents() ); } mValues = kmkernel->msgIndex()->simpleSearch( terms, 0 ); diff --git a/kmail/kcursorsaver.h b/kmail/kcursorsaver.h index 3f6526d72..a4efe26de 100644 --- a/kmail/kcursorsaver.h +++ b/kmail/kcursorsaver.h @@ -13,9 +13,9 @@ class KCursorSaver : public TQt { public: - /// constructor taking TQCursor tqshapes - KCursorSaver(TQt::tqCursorShape tqshape) { - TQApplication::setOverrideCursor( TQCursor(tqshape) ); + /// constructor taking TQCursor shapes + KCursorSaver(TQt::CursorShape shape) { + TQApplication::setOverrideCursor( TQCursor(shape) ); inited = true; } diff --git a/kmail/keyresolver.cpp b/kmail/keyresolver.cpp index c6abdd95e..a9f8dc6dc 100644 --- a/kmail/keyresolver.cpp +++ b/kmail/keyresolver.cpp @@ -308,7 +308,7 @@ static std::vector<GpgME::Key> trustedOrConfirmed( const std::vector<GpgME::Key> "for encryption.") : i18n("One or more of the OpenPGP encryption keys or S/MIME " "certificates for recipient \"%1\" is not fully trusted " - "for encryption.").tqarg(address) ; + "for encryption.").arg(address) ; if ( !fishies.empty() ) { // certificates can't have marginal trust @@ -651,7 +651,7 @@ Kpgp::Result Kleo::KeyResolver::checkKeyNearExpiry( const GpgME::Key & key, cons "<p>expired less than a day ago.</p>", "<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>" "<p>expired %n days ago.</p>", - daysSinceExpiry ) ).tqarg( TQString::fromUtf8( key.userID(0).id() ), + daysSinceExpiry ) ).arg( TQString::fromUtf8( key.userID(0).id() ), key.shortKeyID() ) : ( ca ? ( key.isRoot() @@ -698,7 +698,7 @@ Kpgp::Result Kleo::KeyResolver::checkKeyNearExpiry( const GpgME::Key & key, cons "<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>" "<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>" "<p>expired %n days ago.</p>", - daysSinceExpiry ) ) ).tqarg( Kleo::DN( orig.userID(0).id() ).prettyDN(), + daysSinceExpiry ) ) ).arg( Kleo::DN( orig.userID(0).id() ).prettyDN(), orig.issuerSerial(), Kleo::DN( key.userID(0).id() ).prettyDN() ) : ( mine ? sign @@ -716,7 +716,7 @@ Kpgp::Result Kleo::KeyResolver::checkKeyNearExpiry( const GpgME::Key & key, cons "<p>expired less than a day ago.</p>", "<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number %2)</p>" "<p>expired %n days ago.</p>", - daysSinceExpiry ) ).tqarg( Kleo::DN( key.userID(0).id() ).prettyDN(), + daysSinceExpiry ) ).arg( Kleo::DN( key.userID(0).id() ).prettyDN(), key.issuerSerial() ) ); d->alreadyWarnedFingerprints.insert( subkey.fingerprint() ); if ( KMessageBox::warningContinueCancel( 0, msg, @@ -759,7 +759,7 @@ Kpgp::Result Kleo::KeyResolver::checkKeyNearExpiry( const GpgME::Key & key, cons "<p>expires in less than a day.</p>", "<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>" "<p>expires in less than %n days.</p>", - daysTillExpiry ) ).tqarg( TQString::fromUtf8( key.userID(0).id() ), + daysTillExpiry ) ).arg( TQString::fromUtf8( key.userID(0).id() ), key.shortKeyID() ) : ( ca ? ( key.isRoot() @@ -806,7 +806,7 @@ Kpgp::Result Kleo::KeyResolver::checkKeyNearExpiry( const GpgME::Key & key, cons "<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>" "<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>" "<p>expires in less than %n days.</p>", - daysTillExpiry ) ) ).tqarg( Kleo::DN( orig.userID(0).id() ).prettyDN(), + daysTillExpiry ) ) ).arg( Kleo::DN( orig.userID(0).id() ).prettyDN(), orig.issuerSerial(), Kleo::DN( key.userID(0).id() ).prettyDN() ) : ( mine ? sign @@ -824,7 +824,7 @@ Kpgp::Result Kleo::KeyResolver::checkKeyNearExpiry( const GpgME::Key & key, cons "<p>expires in less than a day.</p>", "<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number %2)</p>" "<p>expires in less than %n days.</p>", - daysTillExpiry ) ).tqarg( Kleo::DN( key.userID(0).id() ).prettyDN(), + daysTillExpiry ) ).arg( Kleo::DN( key.userID(0).id() ).prettyDN(), key.issuerSerial() ) ); d->alreadyWarnedFingerprints.insert( subkey.fingerprint() ); if ( KMessageBox::warningContinueCancel( 0, msg, @@ -1628,7 +1628,7 @@ std::vector<GpgME::Key> Kleo::KeyResolver::getEncryptionKeys( const TQString & p "There is a problem with the " "encryption certificate(s) for \"%1\".\n\n" "Please re-select the certificate(s) which should " - "be used for this recipient.").tqarg(person), + "be used for this recipient.").arg(person), keys ); } bool canceled = false; @@ -1680,13 +1680,13 @@ std::vector<GpgME::Key> Kleo::KeyResolver::getEncryptionKeys( const TQString & p "Select the certificate(s) which should " "be used for this recipient. If there is no suitable certificate in the list " "you can also search for external certificates by clicking the button: search for external certificates.</qt>") - .tqarg( TQStyleSheet::escape(person) ) + .arg( TQStyleSheet::escape(person) ) : i18n("if in your language something like " "'certificate(s)' isn't possible please " "use the plural in the translation", "More than one certificate matches \"%1\".\n\n" "Select the certificate(s) which should " - "be used for this recipient.").tqarg( TQStyleSheet::escape(person) ), + "be used for this recipient.").arg( TQStyleSheet::escape(person) ), matchingKeys ), address, canceled ); // we can ignore 'canceled' here, since trustedOrConfirmed() returns // an empty vector when canceled == true, and we'd just do the same @@ -1797,7 +1797,7 @@ void Kleo::KeyResolver::saveContactPreference( const TQString& email, const Cont KABC::Addressee addr; if ( res.isEmpty() ) { bool ok = true; - TQString fullName = KInputDialog::getText( i18n( "Name Selection" ), i18n( "Which name shall the contact '%1' have in your addressbook?" ).tqarg( email ), TQString(), &ok ); + TQString fullName = KInputDialog::getText( i18n( "Name Selection" ), i18n( "Which name shall the contact '%1' have in your addressbook?" ).arg( email ), TQString(), &ok ); if ( ok ) { addr.setNameFromString( fullName ); addr.insertEmail( email, true ); diff --git a/kmail/khtmlparthtmlwriter.cpp b/kmail/khtmlparthtmlwriter.cpp index 2b53e6094..3c8ee388d 100644 --- a/kmail/khtmlparthtmlwriter.cpp +++ b/kmail/khtmlparthtmlwriter.cpp @@ -86,7 +86,7 @@ namespace KMail { mHtmlPart->view()->viewport()->setUpdatesEnabled( true ); mHtmlPart->view()->setUpdatesEnabled( true ); - mHtmlPart->view()->viewport()->tqrepaint( false ); + mHtmlPart->view()->viewport()->repaint( false ); mState = Ended; } diff --git a/kmail/klistboxdialog.cpp b/kmail/klistboxdialog.cpp index 7027edd6d..e5e6619ba 100644 --- a/kmail/klistboxdialog.cpp +++ b/kmail/klistboxdialog.cpp @@ -6,7 +6,7 @@ #include "klistboxdialog.h" #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> KListBoxDialog::KListBoxDialog( TQString& _selectedString, const TQString& caption, diff --git a/kmail/kmaccount.cpp b/kmail/kmaccount.cpp index 7cadcba97..9ffec93e2 100644 --- a/kmail/kmaccount.cpp +++ b/kmail/kmaccount.cpp @@ -46,7 +46,7 @@ KMPrecommand::KMPrecommand(const TQString &precommand, TQObject *parent) : TQObject(parent), mPrecommand(precommand) { BroadcastStatus::instance()->seStatusMsg( - i18n("Executing precommand %1").tqarg(precommand )); + i18n("Executing precommand %1").arg(precommand )); mPrecommandProcess.setUseShell(true); mPrecommandProcess << precommand; @@ -66,7 +66,7 @@ bool KMPrecommand::start() { bool ok = mPrecommandProcess.start( KProcess::NotifyOnExit ); if (!ok) KMessageBox::error(0, i18n("Could not execute precommand '%1'.") - .tqarg(mPrecommand)); + .arg(mPrecommand)); return ok; } @@ -77,7 +77,7 @@ void KMPrecommand::precommandExited(KProcess *p) int exitCode = p->normalExit() ? p->exitStatus() : -1; if (exitCode) KMessageBox::error(0, i18n("The precommand exited with code %1:\n%2") - .tqarg(exitCode).tqarg(strerror(exitCode))); + .arg(exitCode).arg(strerror(exitCode))); emit finished(!exitCode); } @@ -233,10 +233,10 @@ bool KMAccount::processNewMsg(KMMessage* aMsg) // This is only valid for pop accounts and produces wrong stati for imap. if ( type() != "cachedimap" && type() != "imap" ) { if ( aMsg->isOld() ) - aMsg->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" ); @@ -378,7 +378,7 @@ bool KMAccount::runPrecommand(const TQString &precommand) KMPrecommand precommandProcess(precommand, this); BroadcastStatus::instance()->seStatusMsg( - i18n("Executing precommand %1").tqarg(precommand )); + i18n("Executing precommand %1").arg(precommand )); connect(&precommandProcess, TQT_SIGNAL(finished(bool)), TQT_SLOT(precommandExited(bool))); @@ -426,9 +426,9 @@ TQString KMAccount::encryptStr(const TQString &aStr) TQString result; for (uint i = 0; i < aStr.length(); i++) /* yes, no typo. can't encode ' ' or '!' because - they're the tqunicode BOM. stupid scrambling. stupid. */ - result += (aStr[i].tqunicode() <= 0x21 ) ? aStr[i] : - TQChar(0x1001F - aStr[i].tqunicode()); + they're the unicode BOM. stupid scrambling. stupid. */ + result += (aStr[i].unicode() <= 0x21 ) ? aStr[i] : + TQChar(0x1001F - aStr[i].unicode()); return result; } @@ -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..1c12042bc 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 */ @@ -208,7 +208,7 @@ public: virtual void setHasInbox( bool has ) { mHasInbox = has; } /** - * If this account is a disconnected IMAP account, tqinvalidate it. + * If this account is a disconnected IMAP account, invalidate it. */ virtual void invalidateIMAPFolders(); @@ -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..8f2efd89c 100644 --- a/kmail/kmacctcachedimap.cpp +++ b/kmail/kmacctcachedimap.cpp @@ -53,7 +53,7 @@ using KMail::AccountManager; #include <kapplication.h> #include <kconfig.h> -#include <tqstylesheet.h> +#include <stylesheet.h> KMAcctCachedImap::KMAcctCachedImap( AccountManager* aOwner, const TQString& aAccountName, uint id ) @@ -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..cac848937 100644 --- a/kmail/kmacctimap.cpp +++ b/kmail/kmacctimap.cpp @@ -50,7 +50,7 @@ using KPIM::ProgressManager; #include <kmessagebox.h> #include <kdebug.h> -#include <tqstylesheet.h> +#include <stylesheet.h> #include <errno.h> @@ -69,7 +69,7 @@ KMAcctImap::KMAcctImap(AccountManager* aOwner, const TQString& aAccountName, uin connect(&mErrorTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotResetConnectionError())); TQString serNumUri = locateLocal( "data", "kmail/unfiltered." + - TQString("%1").tqarg(KAccount::id()) ); + TQString("%1").arg(KAccount::id()) ); KConfig config( serNumUri ); TQStringList serNums = config.readListEntry( "unfiltered" ); mFilterSerNumsToSave.setAutoDelete( false ); @@ -88,7 +88,7 @@ KMAcctImap::~KMAcctImap() killAllJobs( true ); TQString serNumUri = locateLocal( "data", "kmail/unfiltered." + - TQString("%1").tqarg(KAccount::id()) ); + TQString("%1").arg(KAccount::id()) ); KConfig config( serNumUri ); TQStringList serNums; TQDictIterator<int> it( mFilterSerNumsToSave ); @@ -297,7 +297,7 @@ void KMAcctImap::processNewMail(bool interactive) mMailCheckProgressItem = ProgressManager::createProgressItem( "MailCheckAccount" + name(), - i18n("Checking account: %1" ).tqarg( TQStyleSheet::escape( name() ) ), + i18n("Checking account: %1" ).arg( TQStyleSheet::escape( name() ) ), TQString(), // status true, // can be canceled useSSL() || useTLS() ); @@ -395,7 +395,7 @@ void KMAcctImap::postProcessNewMail( KMFolder * folder ) if ( mMailCheckProgressItem ) { mMailCheckProgressItem->incCompletedItems(); mMailCheckProgressItem->updateProgress(); - mMailCheckProgressItem->setqStatus( folder->prettyURL() + i18n(" completed") ); + mMailCheckProgressItem->seStatus( folder->prettyURL() + i18n(" completed") ); } mCountRemainChecks--; @@ -434,7 +434,7 @@ void KMAcctImap::postProcessNewMail( KMFolder * folder ) // It's possible that the message has been deleted or moved into a // different folder, or that the serNum is stale if ( !folder ) { - mFilterSerNumsToSave.remove( TQString( "%1" ).tqarg( *filterIt ) ); + mFilterSerNumsToSave.remove( TQString( "%1" ).arg( *filterIt ) ); ++filterIt; continue; } @@ -443,7 +443,7 @@ void KMAcctImap::postProcessNewMail( KMFolder * folder ) if (!imapFolder || !imapFolder->folder()->isSystemFolder() || !(imapFolder->imapPath() == "/INBOX/") ) { // sanity checking - mFilterSerNumsToSave.remove( TQString( "%1" ).tqarg( *filterIt ) ); + mFilterSerNumsToSave.remove( TQString( "%1" ).arg( *filterIt ) ); ++filterIt; continue; } @@ -452,7 +452,7 @@ void KMAcctImap::postProcessNewMail( KMFolder * folder ) msg = folder->getMsg( idx ); if (!msg) { // sanity checking - mFilterSerNumsToSave.remove( TQString( "%1" ).tqarg( *filterIt ) ); + mFilterSerNumsToSave.remove( TQString( "%1" ).arg( *filterIt ) ); ++filterIt; continue; } @@ -473,7 +473,7 @@ void KMAcctImap::postProcessNewMail( KMFolder * folder ) TQT_SLOT(slotFilterMsg(KMMessage*))); job->start(); } else { - mFilterSerNumsToSave.remove( TQString( "%1" ).tqarg( *filterIt ) ); + mFilterSerNumsToSave.remove( TQString( "%1" ).arg( *filterIt ) ); if (slotFilterMsg(msg) == 2) break; } } @@ -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; } @@ -498,7 +498,7 @@ void KMAcctImap::postProcessNewMail( KMFolder * folder ) //----------------------------------------------------------------------------- void KMAcctImap::slotFiltered(TQ_UINT32 serNum) { - mFilterSerNumsToSave.remove( TQString( "%1" ).tqarg( serNum ) ); + mFilterSerNumsToSave.remove( TQString( "%1" ).arg( serNum ) ); } //----------------------------------------------------------------------------- @@ -584,7 +584,7 @@ void KMAcctImap::execFilters(TQ_UINT32 serNum) if ( findIt != mFilterSerNums.end() ) return; mFilterSerNums.append( serNum ); - mFilterSerNumsToSave.insert( TQString( "%1" ).tqarg( serNum ), (const int *)1 ); + mFilterSerNumsToSave.insert( TQString( "%1" ).arg( serNum ), (const int *)1 ); } int KMAcctImap::slotFilterMsg( KMMessage *msg ) @@ -596,7 +596,7 @@ int KMAcctImap::slotFilterMsg( KMMessage *msg ) msg->setTransferInProgress(false); TQ_UINT32 serNum = msg->getMsgSerNum(); if ( serNum ) - mFilterSerNumsToSave.remove( TQString( "%1" ).tqarg( serNum ) ); + mFilterSerNumsToSave.remove( TQString( "%1" ).arg( serNum ) ); int filterResult = kmkernel->filterMgr()->process(msg, KMFilterMgr::Inbound, diff --git a/kmail/kmacctlocal.cpp b/kmail/kmacctlocal.cpp index 88424e13e..67cc7d4b4 100644 --- a/kmail/kmacctlocal.cpp +++ b/kmail/kmacctlocal.cpp @@ -21,7 +21,7 @@ using KPIM::ProgressManager; #include <kconfig.h> #include <tqfileinfo.h> -#include <tqstylesheet.h> +#include <stylesheet.h> #include <stdlib.h> #include <stdio.h> @@ -125,7 +125,7 @@ bool KMAcctLocal::preProcess() //BroadcastStatus::instance()->reset(); BroadcastStatus::instance()->seStatusMsg( - i18n("Preparing transmission from \"%1\"...").tqarg(mName)); + i18n("Preparing transmission from \"%1\"...").arg(mName)); Q_ASSERT( !mMailCheckProgressItem ); @@ -133,7 +133,7 @@ bool KMAcctLocal::preProcess() mMailCheckProgressItem = KPIM::ProgressManager::createProgressItem( "MailCheck" + mName, escapedName, - i18n("Preparing transmission from \"%1\"...").tqarg( escapedName ), + i18n("Preparing transmission from \"%1\"...").arg( escapedName ), false, // cannot be canceled false ); // no tls/ssl @@ -164,7 +164,7 @@ bool KMAcctLocal::preProcess() mMailFolder->close("acctlocalMail"); checkDone( mHasNewMail, CheckError ); TQString errMsg = i18n( "Transmission failed: Could not lock %1." ) - .tqarg( mMailFolder->location() ); + .arg( mMailFolder->location() ); BroadcastStatus::instance()->seStatusMsg( errMsg ); return false; } @@ -177,7 +177,7 @@ bool KMAcctLocal::preProcess() // prepare the static parts of the status message: mStatusMsgStub = i18n("Moving message %3 of %2 from %1.") - .tqarg(mMailFolder->location()).tqarg( mNumMsgs ); + .arg(mMailFolder->location()).arg( mNumMsgs ); //BroadcastStatus::instance()->seStatusProgressEnable( "L" + mName, true ); return true; @@ -192,11 +192,11 @@ bool KMAcctLocal::fetchMsg() /* This causes mail eating if (kmkernel->mailCheckAborted()) break; */ - const TQString statusMsg = mStatusMsgStub.tqarg( mMsgsFetched ); + const TQString statusMsg = mStatusMsgStub.arg( mMsgsFetched ); //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)); @@ -244,16 +244,16 @@ void KMAcctLocal::postProcess() KMessageBox::queuedMessageBox( 0, KMessageBox::Information, i18n( "<qt>Cannot remove mail from " "mailbox <b>%1</b>:<br>%2</qt>" ) - .tqarg( mMailFolder->location() ) - .tqarg( strerror( rc ) ) ); + .arg( mMailFolder->location() ) + .arg( strerror( rc ) ) ); } if( mMailCheckProgressItem ) { // do this only once... BroadcastStatus::instance()->seStatusMsgTransmissionCompleted( mName, mNumMsgs ); - mMailCheckProgressItem->setqStatus( + mMailCheckProgressItem->seStatus( i18n( "Fetched 1 message from mailbox %1.", "Fetched %n messages from mailbox %1.", - mNumMsgs ).tqarg( mMailFolder->location() ) ); + mNumMsgs ).arg( mMailFolder->location() ) ); mMailCheckProgressItem->setComplete(); mMailCheckProgressItem = 0; } diff --git a/kmail/kmacctmaildir.cpp b/kmail/kmacctmaildir.cpp index 818e614d0..a65ba6bbb 100644 --- a/kmail/kmacctmaildir.cpp +++ b/kmail/kmacctmaildir.cpp @@ -19,7 +19,7 @@ using KPIM::ProgressManager; #include <kdebug.h> #include <kconfig.h> -#include <tqstylesheet.h> +#include <stylesheet.h> #include <stdlib.h> #include <stdio.h> @@ -107,14 +107,14 @@ void KMAcctMaildir::processNewMail(bool) } BroadcastStatus::instance()->seStatusMsg( - i18n("Preparing transmission from \"%1\"...").tqarg(mName)); + i18n("Preparing transmission from \"%1\"...").arg(mName)); Q_ASSERT( !mMailCheckProgressItem ); TQString escapedName = TQStyleSheet::escape( mName ); mMailCheckProgressItem = KPIM::ProgressManager::createProgressItem( "MailCheck" + mName, escapedName, - i18n("Preparing transmission from \"%1\"...").tqarg( escapedName ), + i18n("Preparing transmission from \"%1\"...").arg( escapedName ), false, // cannot be canceled false ); // no tls/ssl @@ -130,7 +130,7 @@ void KMAcctMaildir::processNewMail(bool) rc = mailFolder.open("acctmaildirMail"); if (rc) { - TQString aStr = i18n("<qt>Cannot open folder <b>%1</b>.</qt>").tqarg( mailFolder.location() ); + TQString aStr = i18n("<qt>Cannot open folder <b>%1</b>.</qt>").arg( mailFolder.location() ); KMessageBox::sorry(0, aStr); kdDebug(5006) << "cannot open folder " << mailFolder.location() << endl; checkDone( hasNewMail, CheckError ); @@ -148,7 +148,7 @@ void KMAcctMaildir::processNewMail(bool) // prepare the static parts of the status message: TQString statusMsgStub = i18n("Moving message %3 of %2 from %1.") - .tqarg(mailFolder.location()).tqarg(num); + .arg(mailFolder.location()).arg(num); mMailCheckProgressItem->setTotalItems( num ); @@ -162,15 +162,15 @@ void KMAcctMaildir::processNewMail(bool) } if (!addedOk) break; - TQString statusMsg = statusMsgStub.tqarg(i); + TQString statusMsg = statusMsgStub.arg(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,10 +189,10 @@ 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() ) ); + num ).arg(mailFolder.location() ) ); mMailCheckProgressItem->setComplete(); mMailCheckProgressItem = 0; diff --git a/kmail/kmacctseldlg.cpp b/kmail/kmacctseldlg.cpp index 44df37c61..327689ddf 100644 --- a/kmail/kmacctseldlg.cpp +++ b/kmail/kmacctseldlg.cpp @@ -25,7 +25,7 @@ #endif #include <tqbuttongroup.h> -#include <tqlayout.h> +#include <layout.h> #include <tqradiobutton.h> #include <klocale.h> 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.kcfg b/kmail/kmail.kcfg index b2cd4d39e..5441da643 100644 --- a/kmail/kmail.kcfg +++ b/kmail/kmail.kcfg @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0 http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" > - <include>tqtextcodec.h</include> + <include>textcodec.h</include> <include>kapplication.h</include> <kcfgfile name="kmailrc"/> <group name="Behaviour"> @@ -561,10 +561,10 @@ <default>true</default> </entry> <entry name="ForegroundColor" type="Color" key="ForegroundColor"> - <default code="true">kapp->tqpalette().active().text()</default> + <default code="true">kapp->palette().active().text()</default> </entry> <entry name="BackgroundColor" type="Color" key="BackgroundColor"> - <default code="true">kapp->tqpalette().active().base()</default> + <default code="true">kapp->palette().active().base()</default> </entry> <entry name="FallbackCharacterEncoding" type="String" key="FallbackCharacterEncoding"> <default code="true"> TQCString(TQTextCodec::codecForLocale()->name()).lower() == "eucjp"? TQCString("jis7") : TQCString(TQTextCodec::codecForLocale()->name()).lower()</default> diff --git a/kmail/kmail_part.cpp b/kmail/kmail_part.cpp index 452f3fe43..bd0fbec87 100644 --- a/kmail/kmail_part.cpp +++ b/kmail/kmail_part.cpp @@ -54,7 +54,7 @@ using KRecentAddress::RecentAddresses; #include <ksettings/dispatcher.h> -#include <tqlayout.h> +#include <layout.h> typedef KParts::GenericFactory< KMailPart > KMailFactory; @@ -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..a27bf2a66 100644 --- a/kmail/kmailicalifaceimpl.cpp +++ b/kmail/kmailicalifaceimpl.cpp @@ -63,7 +63,7 @@ using KMail::AccountManager; #include <tqfile.h> #include <tqmap.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <kdebug.h> #include <kiconloader.h> @@ -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("/") ) ); + .arg( parts[2] ) + .arg( remainder.join( TQString::fromLatin1("/") ) ); } // Another special case is our own folders, under the imap INBOX, make // those prettier too @@ -698,15 +698,15 @@ static TQString subresourceLabelForPresentation( const KMFolder * folder ) // Fix kolab issue 2531 folder->storage() )->account() can be null if( folder->storage() && static_cast<const KMFolderCachedImap*>( folder->storage() )->account() ) { label = i18n( "My %1 (%2)") - .tqarg( remainder.join( TQString::tqfromLatin1("/") ), + .arg( remainder.join( TQString::fromLatin1("/") ), static_cast<const KMFolderCachedImap*>( folder->storage() )->account()->name() ); } else { label = i18n("My %1") - .tqarg( remainder.join( TQString::tqfromLatin1("/") ) ); + .arg( remainder.join( TQString::fromLatin1("/") ) ); } } else { label = i18n("My %1") - .tqarg( remainder.join( TQString::tqfromLatin1("/") ) ); + .arg( 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; @@ -1776,7 +1776,7 @@ void KMailICalIfaceImpl::readConfig() // No subfolder was found, so ask if we can make them msg = i18n("KMail will now create the required groupware folders" " as subfolders of %1; if you do not want this, cancel" - " and the IMAP resource will be disabled").tqarg(parentFolderName); + " and the IMAP resource will be disabled").arg(parentFolderName); } else { // Some subfolders were found, be more precise TQString operations = "<ul>"; @@ -1784,17 +1784,17 @@ void KMailICalIfaceImpl::readConfig() if ( i != KMail::ContentsTypeMail ) { TQString typeName = localizedDefaultFolderName( static_cast<KMail::FolderContentsType>( i ) ); if ( results[i].found == StandardFolderSearchResult::NotFound ) - operations += "<li>" + i18n( "%1: no folder found. It will be created." ).tqarg( typeName ) + "</li>"; + operations += "<li>" + i18n( "%1: no folder found. It will be created." ).arg( typeName ) + "</li>"; else if ( results[i].found == StandardFolderSearchResult::FoundByType || results[i].found == StandardFolderSearchResult::FoundByName ) operations += "<li>" + i18n( "%1: found folder %2. It will be set as the main groupware folder." ). - tqarg( typeName ).tqarg( results[i].folder->label() ) + "</li>"; + arg( typeName ).arg( results[i].folder->label() ) + "</li>"; } } operations += "</ul>"; msg = i18n("<qt>KMail found the following groupware folders in %1 and needs to perform the following operations: %2" "<br>If you do not want this, cancel" - " and the IMAP resource will be disabled").tqarg(parentFolderName, operations); + " and the IMAP resource will be disabled").arg(parentFolderName, operations); } @@ -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(); } @@ -1991,7 +1991,7 @@ KMFolder* KMailICalIfaceImpl::initFolder( KMail::FolderContentsType contentsType labels << (*it)->prettyURL(); const TQString selected = KInputDialog::getItem( i18n("Default folder"), i18n("There are multiple %1 default folders, please choose one:") - .tqarg( localizedDefaultFolderName( contentsType ) ), labels ); + .arg( localizedDefaultFolderName( contentsType ) ), labels ); if ( !selected.isEmpty() ) result.folder = result.folders[ labels.findIndex( selected ) ]; } @@ -2017,7 +2017,7 @@ KMFolder* KMailICalIfaceImpl::initFolder( KMail::FolderContentsType contentsType if( folder->canAccess() != 0 ) { KMessageBox::sorry(0, i18n("You do not have read/write permission to your %1 folder.") - .tqarg( folderName( itemType ) ) ); + .arg( folderName( itemType ) ) ); return 0; } folder->storage()->setContentsType( contentsType ); @@ -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..2a0713c77 100644 --- a/kmail/kmcommands.cpp +++ b/kmail/kmcommands.cpp @@ -54,7 +54,7 @@ #include <kapplication.h> #include <dcopclient.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <tqpopupmenu.h> #include <tqeventloop.h> @@ -133,7 +133,7 @@ using namespace KMime; #include <kleo/cryptobackend.h> #include <kleo/cryptobackendfactory.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <memory> @@ -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(); @@ -586,7 +586,7 @@ KMUrlCopyCommand::KMUrlCopyCommand( const KURL &url, KMMainWidget *mainWidget ) KMCommand::Result KMUrlCopyCommand::execute() { - TQClipboard* clip = TQApplication::tqclipboard(); + TQClipboard* clip = TQApplication::clipboard(); if (mUrl.protocol() == "mailto") { // put the url into the mouse selection and the clipboard @@ -640,7 +640,7 @@ KMCommand::Result KMUrlSaveCommand::execute() { if (KMessageBox::warningContinueCancel(0, i18n("<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>") - .tqarg(saveUrl.prettyURL()), i18n("Save to File"), i18n("&Replace")) + .arg(saveUrl.prettyURL()), i18n("Save to File"), i18n("&Replace")) != KMessageBox::Continue) return Canceled; } @@ -753,8 +753,8 @@ KMCommand::Result KMShowMsgSrcCommand::execute() viewer->resize(TQApplication::desktop()->screenGeometry(scnum).width()/2, 2*TQApplication::desktop()->screenGeometry(scnum).height()/3); } else { - viewer->resize(TQApplication::desktop()->tqgeometry().width()/2, - 2*TQApplication::desktop()->tqgeometry().height()/3); + viewer->resize(TQApplication::desktop()->geometry().width()/2, + 2*TQApplication::desktop()->geometry().height()/3); } viewer->show(); @@ -963,7 +963,7 @@ void KMSaveMsgCommand::slotSaveResult(KIO::Job *job) { if (KMessageBox::warningContinueCancel(0, i18n("File %1 exists.\nDo you want to replace it?") - .tqarg(mUrl.prettyURL()), i18n("Save to File"), i18n("&Replace")) + .arg(mUrl.prettyURL()), i18n("Save to File"), i18n("&Replace")) == KMessageBox::Continue) { mOffset = 0; @@ -1395,14 +1395,14 @@ 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 += TQString( "; CHARSET=%1" ).arg( TQString(msg->charset()) ); msgPartText += '\n'; DwHeaders dwh; dwh.MessageId().CreateDefault(); - msgPartText += TQString( "Content-ID: %1\n" ).tqarg( dwh.MessageId().AsString().c_str() ); - msgPartText += TQString( "Content-Description: %1" ).tqarg( msg->subject() ); + msgPartText += TQString( "Content-ID: %1\n" ).arg( dwh.MessageId().AsString().c_str() ); + msgPartText += TQString( "Content-Description: %1" ).arg( msg->subject() ); if ( !msg->subject().contains( "(fwd)" ) ) msgPartText += " (fwd)"; msgPartText += "\n\n"; @@ -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" ); @@ -1430,7 +1430,7 @@ KMCommand::Result KMForwardDigestCommand::execute() msgPart->setSubtypeStr( tmp ); msgPart->setName( "unnamed" ); msgPart->setCte( DwMime::kCte7bit ); // does it have to be 7bit? - msgPart->setContentDescription( TQString( "Digest of %1 messages." ).tqarg( msgCnt ) ); + msgPart->setContentDescription( TQString( "Digest of %1 messages." ).arg( msgCnt ) ); // THIS HAS TO BE AFTER setCte()!!!! msgPart->setBodyEncoded( TQCString( msgPartText.ascii() ) ); KCursorSaver busy( KBusyPtr::busy() ); @@ -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() ); @@ -1741,7 +1741,7 @@ KMCommand::Result KMFilterActionCommand::execute() if ( diff < 10 || !( msgCount % 20 ) || msgCount <= 10 ) { progressItem->updateProgress(); TQString statusMsg = i18n("Filtering message %1 of %2"); - statusMsg = statusMsg.tqarg( msgCount ).tqarg( msgCountToFilter ); + statusMsg = statusMsg.arg( msgCount ).arg( msgCountToFilter ); KPIM::BroadcastStatus::instance()->seStatusMsg( statusMsg ); KApplication::kApplication()->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 50 ); } @@ -1995,7 +1995,7 @@ KMCommand::Result KMCopyCommand::execute() // corrupt IMAP cache, see FolderStorage::getMsg() if ( msg == 0 ) { KMessageBox::error( parentWidget(), i18n("Corrupt IMAP cache detected in folder %1. " - "Copying of messages aborted.").tqarg( srcFolder->prettyURL() ) ); + "Copying of messages aborted.").arg( srcFolder->prettyURL() ) ); deleteLater(); return Failed; } @@ -2015,7 +2015,7 @@ KMCommand::Result KMCopyCommand::execute() // make sure the attachment state is only calculated when it's complete if (!newMsg->isComplete()) newMsg->setReadyToShow(false); - newMsg->setqStatus(msg->status()); + newMsg->seStatus(msg->status()); if (srcFolder && !newMsg->isComplete()) { @@ -2461,7 +2461,7 @@ KMCommand::Result KMUrlClickedCommand::execute() mime->name() == "application/x-shellscript" ) { if (KMessageBox::warningYesNo( 0, i18n( "<qt>Do you really want to execute <b>%1</b>?</qt>" ) - .tqarg( mUrl.prettyURL() ), TQString(), i18n("Execute"), KStdGuiItem::cancel() ) != KMessageBox::Yes) + .arg( mUrl.prettyURL() ), TQString(), i18n("Execute"), KStdGuiItem::cancel() ) != KMessageBox::Yes) return Canceled; } KRun * runner = new KRun( mUrl ); @@ -2605,7 +2605,7 @@ void KMSaveAttachmentsCommand::slotSaveAll() ++unnamedAtmCount; s = i18n("filename for the %1-th unnamed attachment", "attachment.%1") - .tqarg( unnamedAtmCount ); + .arg( unnamedAtmCount ); } curUrl.setFileName( s ); } else { @@ -2644,7 +2644,7 @@ void KMSaveAttachmentsCommand::slotSaveAll() if ( KIO::NetAccess::exists( curUrl, false, parentWidget() ) ) { if ( KMessageBox::warningContinueCancel( parentWidget(), i18n( "A file named %1 already exists. Do you want to overwrite it?" ) - .tqarg( curUrl.fileName() ), + .arg( curUrl.fileName() ), i18n( "File Already Exists" ), i18n("&Overwrite") ) == KMessageBox::Cancel) { continue; } @@ -2752,8 +2752,8 @@ KMCommand::Result KMSaveAttachmentsCommand::saveItem( partNode *node, KMessageBox::error( parentWidget(), i18n( "%2 is detailed error description", "Could not write the file %1:\n%2" ) - .tqarg( file.name() ) - .tqarg( TQString::fromLocal8Bit( strerror( errno ) ) ), + .arg( file.name() ) + .arg( TQString::fromLocal8Bit( strerror( errno ) ) ), i18n( "KMail Error" ) ); return Failed; } @@ -2777,7 +2777,7 @@ KMCommand::Result KMSaveAttachmentsCommand::saveItem( partNode *node, { KMessageBox::error( parentWidget(), i18n( "Could not write the file %1." ) - .tqarg( url.path() ), + .arg( url.path() ), i18n( "KMail Error" ) ); return Failed; } @@ -3011,8 +3011,8 @@ KMCommand::Result KMIMChatCommand::execute() { nameList.append( (*it).realName() ); } - TQString names = nameList.join( TQString::tqfromLatin1( ",\n" ) ); - apology = apology.tqarg( names ); + TQString names = nameList.join( TQString::fromLatin1( ",\n" ) ); + apology = apology.arg( names ); } KMessageBox::sorry( parentWidget(), apology ); @@ -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 ); } @@ -3563,8 +3563,8 @@ KMCommand::Result CreateTodoCommand::execute() KMail::KorgHelper::ensureRunning(); - TQString txt = i18n("From: %1\nTo: %2\nSubject: %3").tqarg( msg->from() ) - .tqarg( msg->to() ).tqarg( msg->subject() ); + TQString txt = i18n("From: %1\nTo: %2\nSubject: %3").arg( msg->from() ) + .arg( msg->to() ).arg( msg->subject() ); KTempFile tf; tf.setAutoDelete( true ); @@ -3573,7 +3573,7 @@ KMCommand::Result CreateTodoCommand::execute() tf.close(); KCalendarIface_stub *iface = new KCalendarIface_stub( kapp->dcopClient(), "korganizer", "CalendarIface" ); - iface->openTodoEditor( i18n("Mail: %1").tqarg( msg->subject() ), txt, uri, + iface->openTodoEditor( i18n("Mail: %1").arg( msg->subject() ), txt, uri, tf.name(), TQStringList(), "message/rfc822", true ); delete iface; diff --git a/kmail/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..d239f7e60 100644 --- a/kmail/kmcomposewin.cpp +++ b/kmail/kmcomposewin.cpp @@ -121,7 +121,7 @@ using KRecentAddress::RecentAddresses; #include <tqregexp.h> #include <tqbuffer.h> #include <tqtooltip.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <tqheader.h> #include <tqwhatsthis.h> #include <tqfontdatabase.h> @@ -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 ); @@ -648,8 +648,8 @@ bool KMComposeWin::event(TQEvent *e) void KMComposeWin::readColorConfig(void) { if ( GlobalSettings::self()->useDefaultColors() ) { - mForeColor = TQColor(kapp->tqpalette().active().text()); - mBackColor = TQColor(kapp->tqpalette().active().base()); + mForeColor = TQColor(kapp->palette().active().text()); + mBackColor = TQColor(kapp->palette().active().base()); } else { mForeColor = GlobalSettings::self()->foregroundColor(); mBackColor = GlobalSettings::self()->backgroundColor(); @@ -868,7 +868,7 @@ void KMComposeWin::slotContinueAutoSave() i18n("Autosaving the message as %1 " "failed.\n" "Reason: %2" ) - .tqarg( filename, strerror( status ) ), + .arg( filename, strerror( status ) ), i18n("Autosaving Failed") ); mLastAutoSaveErrno = status; } @@ -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) @@ -1109,9 +1109,9 @@ void KMComposeWin::rethinkFields(bool fromSlot) else mAtmListView->hide(); resize(this->size()); - tqrepaint(); + repaint(); - 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++; @@ -1625,9 +1625,9 @@ void KMComposeWin::setupStatusBar(void) statusBar()->insertItem("", 0, 1); statusBar()->setItemAlignment(0, AlignLeft | AlignVCenter); - statusBar()->insertItem(i18n( " Spellcheck: %1 ").tqarg( " " ), 3, 0, true ); - statusBar()->insertItem(i18n( " Column: %1 ").tqarg(" "), 2, 0, true); - statusBar()->insertItem(i18n( " Line: %1 ").tqarg(" "), 1, 0, true); + statusBar()->insertItem(i18n( " Spellcheck: %1 ").arg( " " ), 3, 0, true ); + statusBar()->insertItem(i18n( " Column: %1 ").arg(" "), 2, 0, true); + statusBar()->insertItem(i18n( " Line: %1 ").arg(" "), 1, 0, true); } @@ -1638,9 +1638,9 @@ void KMComposeWin::updateCursorPosition() TQString temp; line = mEditor->currentLine(); col = mEditor->currentColumn(); - temp = i18n(" Line: %1 ").tqarg(line+1); + temp = i18n(" Line: %1 ").arg(line+1); statusBar()->changeItem(temp,1); - temp = i18n(" Column: %1 ").tqarg(col+1); + temp = i18n(" Column: %1 ").arg(col+1); statusBar()->changeItem(temp,2); } @@ -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; @@ -2399,14 +2399,14 @@ bool KMComposeWin::addAttach(const KURL aUrl) if ( !aUrl.isValid() ) { KMessageBox::sorry( this, i18n( "<qt><p>KMail could not recognize the location of the attachment (%1);</p>" "<p>you have to specify the full path if you wish to attach a file.</p></qt>" ) - .tqarg( aUrl.prettyURL() ) ); + .arg( aUrl.prettyURL() ) ); return false; } const int maxAttachmentSize = GlobalSettings::maximumAttachmentSize(); const uint maximumAttachmentSizeInByte = maxAttachmentSize*1024*1024; if ( aUrl.isLocalFile() && TQFileInfo( aUrl.pathOrURL() ).size() > maximumAttachmentSizeInByte ) { - KMessageBox::sorry( this, i18n( "<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</p>" ).tqarg( maxAttachmentSize ) ); + KMessageBox::sorry( this, i18n( "<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</p>" ).arg( maxAttachmentSize ) ); return false; } @@ -3114,7 +3114,7 @@ static void showExportError( TQWidget * w, const GpgME::Error & err ) { const TQString msg = i18n("<qt><p>An error occurred while trying to export " "the key from the backend:</p>" "<p><b>%1</b></p></qt>") - .tqarg( TQString::fromLocal8Bit( err.asString() ) ); + .arg( TQString::fromLocal8Bit( err.asString() ) ); KMessageBox::error( w, msg, i18n("Key Export Failed") ); } @@ -3153,7 +3153,7 @@ void KMComposeWin::slotPublicKeyExportResult( const GpgME::Error & err, const TQ // create message part KMMessagePart * msgPart = new KMMessagePart(); - msgPart->setName( i18n("OpenPGP key 0x%1").tqarg( mFingerprint ) ); + msgPart->setName( i18n("OpenPGP key 0x%1").arg( mFingerprint ) ); msgPart->setTypeStr("application"); msgPart->setSubtypeStr("pgp-keys"); TQValueList<int> dummy; @@ -3665,7 +3665,7 @@ void KMComposeWin::slotPasteClipboardAsQuotation() { if( mEditor->hasFocus() && msg() ) { - TQString s = TQApplication::tqclipboard()->text(); + TQString s = TQApplication::clipboard()->text(); if (!s.isEmpty()) mEditor->insert(addQuotesToText(s)); } @@ -3673,15 +3673,15 @@ void KMComposeWin::slotPasteClipboardAsQuotation() void KMComposeWin::slotPasteClipboardAsAttachment() { - KURL url( TQApplication::tqclipboard()->text( TQClipboard::Clipboard ) ); + KURL url( TQApplication::clipboard()->text( TQClipboard::Clipboard ) ); if ( url.isValid() ) { - addAttach(TQApplication::tqclipboard()->text( TQClipboard::Clipboard ) ); + addAttach(TQApplication::clipboard()->text( TQClipboard::Clipboard ) ); return; } - TQMimeSource *mimeSource = TQApplication::tqclipboard()->data(); + TQMimeSource *mimeSource = TQApplication::clipboard()->data(); if ( TQImageDrag::canDecode(mimeSource) ) { - slotAttachPNGImageData(mimeSource->tqencodedData("image/png")); + slotAttachPNGImageData(mimeSource->encodedData("image/png")); } else { bool ok; @@ -3691,7 +3691,7 @@ void KMComposeWin::slotPasteClipboardAsAttachment() KMMessagePart *msgPart = new KMMessagePart; msgPart->setName(attName); TQValueList<int> dummy; - msgPart->setBodyAndGuessCte(TQCString(TQApplication::tqclipboard()->text().latin1()), dummy, + msgPart->setBodyAndGuessCte(TQCString(TQApplication::clipboard()->text().latin1()), dummy, kmkernel->msgSender()->sendQuotedPrintable()); addAttach(msgPart); } @@ -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 ); + TQMimeSource *mimeSource = TQApplication::clipboard()->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)) @@ -4279,7 +4279,7 @@ bool KMComposeWin::saveDraftOrTemplate( const TQString &folderName, "identify \"%1\" does not exist (anymore); " "therefore, the default drafts or templates " "folder will be used.") - .tqarg( id.identityName() ) ); + .arg( id.identityName() ) ); } } if ( imapTheFolder && imapTheFolder->noContent() ) @@ -4463,7 +4463,7 @@ bool KMComposeWin::checkRecipientNumber() const GlobalSettings::self()->tooManyRecipients() && mRecipientsEditor->recipients().count() > thresHold ) { if ( KMessageBox::questionYesNo( mMainWidget, - i18n("You are trying to send the mail to more than %1 recipients. Send message anyway?").tqarg(thresHold), + i18n("You are trying to send the mail to more than %1 recipients. Send message anyway?").arg(thresHold), i18n("Too many receipients"), i18n("&Send as Is"), i18n("&Edit Recipients")) == KMessageBox::No ) { @@ -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() ); @@ -4982,7 +4982,7 @@ void KMComposeWin::slotSpellcheckConfig() KWin twin; TQTabDialog qtd (this, "tabdialog", true); KSpellConfig mKSpellConfig (&qtd); - mKSpellConfig.tqlayout()->setMargin( KDialog::marginHint() ); + mKSpellConfig.layout()->setMargin( KDialog::marginHint() ); qtd.addTab (&mKSpellConfig, i18n("Spellchecker")); qtd.setCancelButton (); @@ -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..51b4b1dc1 100644 --- a/kmail/kmcomposewin.h +++ b/kmail/kmcomposewin.h @@ -21,8 +21,8 @@ #include <tqcheckbox.h> #include <tqpushbutton.h> -#include <tqclipboard.h> -#include <tqpalette.h> +#include <clipboard.h> +#include <palette.h> #include <tqfont.h> #include <tqptrlist.h> #include <tqvaluevector.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..99382915d 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; @@ -251,7 +251,7 @@ void KMEdit::initializeAutoSpellChecking() TQColor defaultColor1( 0x00, 0x80, 0x00 ); // defaults from kmreaderwin.cpp TQColor defaultColor2( 0x00, 0x70, 0x00 ); TQColor defaultColor3( 0x00, 0x60, 0x00 ); - TQColor defaultForeground( kapp->tqpalette().active().text() ); + TQColor defaultForeground( kapp->palette().active().text() ); TQColor c = TQt::red; KConfigGroup readerConfig( KMKernel::config(), "Reader" ); @@ -281,7 +281,7 @@ TQPopupMenu *KMEdit::createPopupMenu( const TQPoint& pos ) enum { IdUndo, IdRedo, IdSep1, IdCut, IdCopy, IdPaste, IdClear, IdSep2, IdSelectAll }; TQPopupMenu *menu = KEdit::createPopupMenu( pos ); - if ( !TQApplication::tqclipboard()->image().isNull() ) { + if ( !TQApplication::clipboard()->image().isNull() ) { int id = menu->idAt(0); menu->setItemEnabled( id - IdPaste, true); } @@ -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 { @@ -607,7 +607,7 @@ void KMEdit::slotExternalEditorTempFileChanged( const TQString & fileName ) { insertLine(TQString::fromLocal8Bit(KPIM::kFileToString( fileName, true, false )), -1); setAutoUpdate(true); - tqrepaint(); + repaint(); } void KMEdit::slotExternalEditorDone( KProcess * proc ) { @@ -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/kmedit.h b/kmail/kmedit.h index 4d2535e4d..d77e801b7 100644 --- a/kmail/kmedit.h +++ b/kmail/kmedit.h @@ -11,7 +11,7 @@ #include <ksyntaxhighlighter.h> #include <tqmap.h> #include <tqstringlist.h> -#include <tqclipboard.h> +#include <clipboard.h> class KMComposeWin; class KSpellConfig; diff --git a/kmail/kmfawidgets.cpp b/kmail/kmfawidgets.cpp index a4efae487..49ff2930f 100644 --- a/kmail/kmfawidgets.cpp +++ b/kmail/kmfawidgets.cpp @@ -16,7 +16,7 @@ #include <kfiledialog.h> #include <kstandarddirs.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtooltip.h> //============================================================================= @@ -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/kmfilter.cpp b/kmail/kmfilter.cpp index 4441b8611..28a64633d 100644 --- a/kmail/kmfilter.cpp +++ b/kmail/kmfilter.cpp @@ -113,7 +113,7 @@ KMFilter::ReturnCode KMFilter::execActions( KMMessage* msg, bool& stopIt ) const if ( FilterLog::instance()->isLogging() ) { TQString logText( i18n( "<b>Applying filter action:</b> %1" ) - .tqarg( (*it)->displayString() ) ); + .arg( (*it)->displayString() ) ); FilterLog::instance()->add( logText, FilterLog::appliedAction ); } @@ -123,7 +123,7 @@ KMFilter::ReturnCode KMFilter::execActions( KMMessage* msg, bool& stopIt ) const case KMFilterAction::CriticalError: if ( FilterLog::instance()->isLogging() ) { TQString logText = TQString( "<font color=#FF0000>%1</font>" ) - .tqarg( i18n( "A critical error occurred. Processing stops here." ) ); + .arg( i18n( "A critical error occurred. Processing stops here." ) ); FilterLog::instance()->add( logText, FilterLog::appliedAction ); } // in case it's a critical error: return immediately! @@ -131,7 +131,7 @@ KMFilter::ReturnCode KMFilter::execActions( KMMessage* msg, bool& stopIt ) const case KMFilterAction::ErrorButGoOn: if ( FilterLog::instance()->isLogging() ) { TQString logText = TQString( "<font color=#FF0000>%1</font>" ) - .tqarg( i18n( "A problem was found while applying this action." ) ); + .arg( i18n( "A problem was found while applying this action." ) ); FilterLog::instance()->add( logText, FilterLog::appliedAction ); } default: @@ -262,7 +262,7 @@ void KMFilter::readConfig(KConfig* config) numActions = config->readNumEntry("actions",0); if (numActions > FILTER_MAX_ACTIONS) { numActions = FILTER_MAX_ACTIONS ; - KMessageBox::information( 0, i18n("<qt>Too many filter actions in filter rule <b>%1</b>.</qt>").tqarg( mPattern.name() ) ); + KMessageBox::information( 0, i18n("<qt>Too many filter actions in filter rule <b>%1</b>.</qt>").arg( mPattern.name() ) ); } for ( i=0 ; i < numActions ; i++ ) { @@ -287,7 +287,7 @@ void KMFilter::readConfig(KConfig* config) } else KMessageBox::information( 0 /* app-global modal dialog box */, i18n("<qt>Unknown filter action <b>%1</b><br>in filter rule <b>%2</b>.<br>Ignoring it.</qt>") - .tqarg( config->readEntry( actName ) ).tqarg( mPattern.name() ) ); + .arg( config->readEntry( actName ) ).arg( mPattern.name() ) ); } mAccounts = config->readIntListEntry( "accounts-set" ); diff --git a/kmail/kmfilteraction.cpp b/kmail/kmfilteraction.cpp index 6a5e12324..d31eaf7a8 100644 --- a/kmail/kmfilteraction.cpp +++ b/kmail/kmfilteraction.cpp @@ -44,11 +44,11 @@ using KMail::RegExpLineEdit; #include <kurlrequester.h> #include <tqlabel.h> -#include <tqlayout.h> -#include <tqtextcodec.h> +#include <layout.h> +#include <textcodec.h> #include <tqtimer.h> #include <tqobject.h> -#include <tqstylesheet.h> +#include <stylesheet.h> #include <tqtooltip.h> #include <tqwhatsthis.h> #include <assert.h> @@ -185,7 +185,7 @@ const TQString KMFilterActionWithUOID::argsAsString() const const TQString KMFilterActionWithUOID::displayString() const { // FIXME after string freeze: - // return i18n("").tqarg( ); + // return i18n("").arg( ); return label() + " \"" + TQStyleSheet::escape( argsAsString() ) + "\""; } @@ -236,7 +236,7 @@ const TQString KMFilterActionWithString::argsAsString() const const TQString KMFilterActionWithString::displayString() const { // FIXME after string freeze: - // return i18n("").tqarg( ); + // return i18n("").arg( ); return label() + " \"" + TQStyleSheet::escape( argsAsString() ) + "\""; } @@ -483,11 +483,11 @@ TQString KMFilterActionWithCommand::substituteCommandLineArgsFor( KMMessage *aMs } tf->close(); } - // TQString( "%0 and %1 and %1" ).tqarg( 0 ).tqarg( 1 ) + // TQString( "%0 and %1 and %1" ).arg( 0 ).arg( 1 ) // returns "0 and 1 and %1", so we must call .arg as // many times as there are %n's, regardless of their multiplicity. if ((*it) == -1) result.replace( "%-1", tempFileName ); - else result = result.tqarg( tempFileName ); + else result = result.arg( tempFileName ); } // And finally, replace the %{foo} with the content of the foo @@ -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,19 +831,19 @@ 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( ); + // return i18n("").arg( ); return label() + " \"" + TQStyleSheet::escape( argsAsString() ) + "\""; } @@ -938,7 +938,7 @@ const TQString KMFilterActionFakeDisposition::argsAsString() const const TQString KMFilterActionFakeDisposition::displayString() const { // FIXME after string freeze: - // return i18n("").tqarg( ); + // return i18n("").arg( ); return label() + " \"" + TQStyleSheet::escape( argsAsString() ) + "\""; } @@ -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 ); @@ -1123,7 +1123,7 @@ const TQString KMFilterActionAddHeader::argsAsString() const const TQString KMFilterActionAddHeader::displayString() const { // FIXME after string freeze: - // return i18n("").tqarg( ); + // return i18n("").arg( ); return label() + " \"" + TQStyleSheet::escape( argsAsString() ) + "\""; } @@ -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" ); @@ -1299,7 +1299,7 @@ const TQString KMFilterActionRewriteHeader::argsAsString() const const TQString KMFilterActionRewriteHeader::displayString() const { // FIXME after string freeze: - // return i18n("").tqarg( ); + // return i18n("").arg( ); return label() + " \"" + TQStyleSheet::escape( argsAsString() ) + "\""; } @@ -1617,9 +1617,9 @@ const TQString KMFilterActionForward::argsAsString() const const TQString KMFilterActionForward::displayString() const { if ( mTemplate.isEmpty() ) - return i18n( "Forward to %1 with default template " ).tqarg( mParameter ); + return i18n( "Forward to %1 with default template " ).arg( mParameter ); else - return i18n( "Forward to %1 with template %2" ).tqarg( mParameter, mTemplate ); + return i18n( "Forward to %1 with template %2" ).arg( mParameter, mTemplate ); } //============================================================================= @@ -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; } @@ -1878,7 +1878,7 @@ const TQString KMFilterActionWithTest::argsAsString() const const TQString KMFilterActionWithTest::displayString() const { // FIXME after string freeze: - // return i18n("").tqarg( ); + // return i18n("").arg( ); return label() + " \"" + TQStyleSheet::escape( argsAsString() ) + "\""; } @@ -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)); @@ -1955,7 +1955,7 @@ const TQString KMFilterActionWithUrl::argsAsString() const const TQString KMFilterActionWithUrl::displayString() const { // FIXME after string freeze: - // return i18n("").tqarg( ); + // return i18n("").arg( ); return label() + " \"" + TQStyleSheet::escape( argsAsString() ) + "\""; } @@ -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..76c760ad2 100644 --- a/kmail/kmfilterdlg.cpp +++ b/kmail/kmfilterdlg.cpp @@ -33,7 +33,7 @@ using KMail::FilterImporterExporter; #include <kpushbutton.h> // other TQt headers: -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqcombobox.h> #include <tqwidgetstack.h> @@ -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 ); @@ -339,11 +339,11 @@ KMFilterDlg::KMFilterDlg(TQWidget* parent, const char* name, bool popFilter, boo connect( this, TQT_SIGNAL(finished()), this, TQT_SLOT(slotFinished()) ); - KConfigGroup tqgeometry( KMKernel::config(), "Geometry"); + KConfigGroup geometry( KMKernel::config(), "Geometry"); const char * configKey = bPopFilter ? "popFilterDialogSize" : "filterDialogSize"; - if ( tqgeometry.hasKey( configKey ) ) - resize( tqgeometry.readSizeEntry( configKey ) ); + if ( geometry.hasKey( configKey ) ) + resize( geometry.readSizeEntry( configKey ) ); else adjustSize(); @@ -356,8 +356,8 @@ void KMFilterDlg::slotFinished() { } void KMFilterDlg::slotSaveSize() { - KConfigGroup tqgeometry( KMKernel::config(), "Geometry" ); - tqgeometry.writeEntry( bPopFilter ? "popFilterDialogSize" : "filterDialogSize", size() ); + KConfigGroup geometry( KMKernel::config(), "Geometry" ); + geometry.writeEntry( bPopFilter ? "popFilterDialogSize" : "filterDialogSize", size() ); } /** Set action of popFilter */ @@ -558,7 +558,7 @@ void KMFilterDlg::slotUpdateAccountList() TQCheckListItem *listItem = new TQCheckListItem( mAccountList, top, a->name(), TQCheckListItem::CheckBox ); listItem->setText( 1, a->type() ); - listItem->setText( 2, TQString( "%1" ).tqarg( a->id() ) ); + listItem->setText( 2, TQString( "%1" ).arg( a->id() ) ); if ( mFilter ) listItem->setOn( mFilter->applyOnAccount( a->id() ) ); top = listItem; @@ -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") ); @@ -682,7 +682,7 @@ void KMFilterListBox::createFilter( const TQCString & field, KMFilter *newFilter = new KMFilter(0, bPopFilter); newFilter->pattern()->append( newRule ); - newFilter->pattern()->setName( TQString("<%1>:%2").tqarg( TQString(field) ).tqarg( TQString(value) ) ); + newFilter->pattern()->setName( TQString("<%1>:%2").arg( TQString(field) ).arg( TQString(value) ) ); KMFilterActionDesc *desc = (*kmkernel->filterActionDict())["transfer"]; if ( desc ) @@ -712,7 +712,7 @@ void KMFilterListBox::slotUpdateFilterName() if ( mFilterList.at(mIdxSelItem)->isAutoNaming() ) { // auto-naming of patterns if ( !p->isEmpty() && p->first() && !p->first()->field().stripWhiteSpace().isEmpty() ) - shouldBeName = TQString( "<%1>: %2" ).tqarg( TQString(p->first()->field()) ).tqarg( TQString(p->first()->contents()) ); + shouldBeName = TQString( "<%1>: %2" ).arg( TQString(p->first()->field()) ).arg( TQString(p->first()->contents()) ); else shouldBeName = "<" + i18n("unnamed") + ">"; p->setName( shouldBeName ); @@ -946,9 +946,9 @@ void KMFilterListBox::slotRename() ( i18n("Rename Filter"), i18n("Rename filter \"%1\" to:\n(leave the field empty for automatic naming)") - .tqarg( filter->pattern()->name() ) /*label*/, + .arg( filter->pattern()->name() ) /*label*/, filter->pattern()->name() /* initial value */, - &okPressed, tqtopLevelWidget(), 0, validator + &okPressed, topLevelWidget(), 0, validator ); delete validator; @@ -1140,13 +1140,13 @@ 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(), + // layout management: + // 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..1f7407780 100644 --- a/kmail/kmfolder.cpp +++ b/kmail/kmfolder.cpp @@ -80,7 +80,7 @@ KMFolder::KMFolder( KMFolderDir* aParent, const TQString& aFolderName, dirinfo.setFile( mStorage->location() ); if ( !dirinfo.exists() ) { int rc = mStorage->create(); - TQString msg = i18n("<qt>Error while creating file <b>%1</b>:<br>%2</qt>").tqarg(aFolderName).tqarg(strerror(rc)); + TQString msg = i18n("<qt>Error while creating file <b>%1</b>:<br>%2</qt>").arg(aFolderName).arg(strerror(rc)); if ( rc ) { KMessageBox::information(0, msg); } @@ -272,7 +272,7 @@ KMFolderDir* KMFolder::createChildFolder() { if (mkdir(TQFile::encodeName(childDir), S_IRWXU) != 0 && chmod(TQFile::encodeName(childDir), S_IRWXU) != 0) { - TQString wmsg = TQString(" '%1': %2").tqarg(childDir).tqarg(strerror(errno)); + TQString wmsg = TQString(" '%1': %2").arg(childDir).arg(strerror(errno)); KMessageBox::information(0,i18n("Failed to create folder") + wmsg); return 0; } @@ -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, @@ -929,7 +929,7 @@ bool KMFolder::isValidName( const TQString &folderName, TQString &message ) } } if ( !delimiter.isEmpty() && folderName.find( delimiter ) != -1 ) { - message = i18n( "Your IMAP server does not allow the character '%1'; please choose another folder name." ).tqarg( delimiter ); + message = i18n( "Your IMAP server does not allow the character '%1'; please choose another folder name." ).arg( delimiter ); return false; } } diff --git a/kmail/kmfolder.h b/kmail/kmfolder.h index 60db26661..351e55b45 100644 --- a/kmail/kmfolder.h +++ b/kmail/kmfolder.h @@ -60,7 +60,7 @@ typedef TQValueList<TQ_UINT32> SerNumList; * * @section Accounts * The accounts (of KMail) that are fed into the folder are - * represented as the tqchildren of the folder. They are only stored here + * represented as the children of the folder. They are only stored here * during runtime to have a reference for which accounts point to a * specific folder. */ @@ -169,10 +169,10 @@ public: /** Specify, that the folder can't contain mails. */ void setNoContent(bool aNoContent); - /** Returns, if the folder can't have tqchildren */ + /** Returns, if the folder can't have children */ bool noChildren() const; - /** Specify, that the folder can't have tqchildren */ + /** Specify, that the folder can't have children */ void setNoChildren(bool aNoChildren); /** Read message at given index. Indexing starts at zero */ @@ -273,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..d30316a9c 100644 --- a/kmail/kmfoldercachedimap.cpp +++ b/kmail/kmfoldercachedimap.cpp @@ -75,7 +75,7 @@ using KMail::ListJob; #include <tqfile.h> #include <tqhbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqradiobutton.h> #include <tqvaluelist.h> #include "annotationjobs.h" @@ -215,7 +215,7 @@ KMFolderCachedImap::KMFolderCachedImap( KMFolder* folder, const char* aName ) KMessageBox::error( 0, i18n( "The UID cache file for folder %1 could not be read. There " "could be a problem with file system permission, or it is corrupted." - ).tqarg( folder->prettyURL() ) ); + ).arg( folder->prettyURL() ) ); // try to unlink it, in case it was corruped. If it couldn't be read // because of permissions, this will fail, which is fine unlink( TQFile::encodeName( uidCacheLocation() ) ); @@ -486,7 +486,7 @@ int KMFolderCachedImap::writeUidCache() } KMessageBox::error( 0, i18n( "The UID cache file for folder %1 could not be written. There " - "could be a problem with file system permission." ).tqarg( folder()->prettyURL() ) ); + "could be a problem with file system permission." ).arg( folder()->prettyURL() ) ); return -1; } @@ -739,7 +739,7 @@ void KMFolderCachedImap::slotTroubleshoot() TQString str = i18n("Are you sure you want to refresh the IMAP cache of " "the folder %1 and all its subfolders?\nThis will " "remove all changes you have done locally to your " - "folders.").tqarg( label() ); + "folders.").arg( label() ); TQString s1 = i18n("Refresh IMAP Cache"); TQString s2 = i18n("&Refresh"); if( KMessageBox::warningContinueCancel( 0, str, s1, s2 ) == @@ -774,7 +774,7 @@ void KMFolderCachedImap::slotTroubleshoot() void KMFolderCachedImap::serverSync( bool recurse, bool quotaOnly ) { if( mSyncState != SYNC_STATE_INITIAL ) { - if( KMessageBox::warningYesNo( 0, i18n("Folder %1 is not in initial sync state (state was %2). Do you want to reset it to initial sync state and sync anyway?" ).tqarg( imapPath() ).tqarg( mSyncState ), TQString(), i18n("Reset && Sync"), KStdGuiItem::cancel() ) == KMessageBox::Yes ) { + if( KMessageBox::warningYesNo( 0, i18n("Folder %1 is not in initial sync state (state was %2). Do you want to reset it to initial sync state and sync anyway?" ).arg( imapPath() ).arg( mSyncState ), TQString(), i18n("Reset && Sync"), KStdGuiItem::cancel() ) == KMessageBox::Yes ) { mSyncState = SYNC_STATE_INITIAL; } else return; } @@ -899,14 +899,14 @@ void KMFolderCachedImap::serverSyncInternal() // Cancelled by user, or slave can't start // kdDebug(5006) << "makeConnection said Error, aborting." << endl; // We stop here. We're already in SYNC_STATE_INITIAL for the next time. - newState( mProgress, i18n( "Error connecting to server %1" ).tqarg( mAccount->host() ) ); + newState( mProgress, i18n( "Error connecting to server %1" ).arg( mAccount->host() ) ); close("cachedimap"); emit folderComplete(this, false); break; } else if ( cs == ImapAccountBase::Connecting ) { mAccount->setAnnotationCheckPassed( false ); // kdDebug(5006) << "makeConnection said Connecting, waiting for signal." << endl; - newState( mProgress, i18n("Connecting to %1").tqarg( mAccount->host() ) ); + newState( mProgress, i18n("Connecting to %1").arg( mAccount->host() ) ); // We'll wait for the connectionResult signal from the account. connect( mAccount, TQT_SIGNAL( connectionResult(int, const TQString&) ), this, TQT_SLOT( slotConnectionResult(int, const TQString&) ) ); @@ -1478,7 +1478,7 @@ void KMFolderCachedImap::uploadNewMessages() && !(mUserRights & KMail::ACLJobs::Insert) ) { // write access revoked KMessageBox::information( 0, i18n("<p>Your access rights to folder <b>%1</b> have been restricted, " - "it will no longer be possible to add messages to this folder.</p>").tqarg( folder()->prettyURL() ), + "it will no longer be possible to add messages to this folder.</p>").arg( folder()->prettyURL() ), i18n("Acces rights revoked"), "KMailACLRevocationNotification" ); } } @@ -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 ); @@ -1706,7 +1706,7 @@ bool KMFolderCachedImap::deleteMessages() if ( KMessageBox::warningYesNo( 0, i18n( "<qt><p>Mails on the server in folder <b>%1</b> were deleted. " "Do you want to delete them locally?<br>UIDs: %2</p></qt>" ) - .tqarg( folder()->prettyURL() ).tqarg( uids.join(",") ) ) == KMessageBox::Yes ) + .arg( folder()->prettyURL() ).arg( uids.join(",") ) ) == KMessageBox::Yes ) #endif removeMsg( msgsForDeletion ); } @@ -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; @@ -2055,7 +2055,7 @@ void KMFolderCachedImap::listNamespaces() mNamespacesToList.pop_front(); mSyncState = SYNC_STATE_LIST_SUBFOLDERS2; - newState( mProgress, i18n("Retrieving folders for namespace %1").tqarg(ns)); + newState( mProgress, i18n("Retrieving folders for namespace %1").arg(ns)); KMail::ListJob* job = new KMail::ListJob( mAccount, type, this, mAccount->addPathToNamespace( ns ) ); job->setNamespace( ns ); @@ -2297,7 +2297,7 @@ void KMFolderCachedImap::listDirectory2() // (could be that the folder was deleted & recreated meanwhile from another client...) if ( !locallyDeleted && mAccount->isPreviouslyDeletedFolder( subfolderPath ) ) { locallyDeleted = KMessageBox::warningYesNo( - 0, i18n( "<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it from the server?</p></qt>" ).tqarg( mSubfolderNames[i] ), TQString(), KStdGuiItem::del(), KStdGuiItem::cancel() ) == KMessageBox::Yes; + 0, i18n( "<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it from the server?</p></qt>" ).arg( mSubfolderNames[i] ), TQString(), KStdGuiItem::del(), KStdGuiItem::cancel() ) == KMessageBox::Yes; } if ( locallyDeleted ) { @@ -2596,7 +2596,7 @@ void KMFolderCachedImap::resetSyncState() KPIM::ProgressItem *progressItem = mAccount->mailCheckProgressItem(); TQString str = i18n("Aborted"); if (progressItem) - progressItem->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" ).arg( label() ).arg( syncStatus ); if( progressItem ) - progressItem->setqStatus( str ); + progressItem->seStatus( str ); emit statusMsg( str ); } if( progressItem ) @@ -2809,7 +2809,7 @@ void KMFolderCachedImap::slotGetAnnotationResult( KIO::Job* job ) // that's when the imap server doesn't support annotations if ( GlobalSettings::self()->theIMAPResourceStorageFormat() == GlobalSettings::EnumTheIMAPResourceStorageFormat::XML && (uint)GlobalSettings::self()->theIMAPResourceAccount() == mAccount->id() ) - KMessageBox::error( 0, i18n( "The IMAP server %1 does not have support for IMAP annotations. The XML storage cannot be used on this server; please re-configure KMail differently." ).tqarg( mAccount->host() ) ); + KMessageBox::error( 0, i18n( "The IMAP server %1 does not have support for IMAP annotations. The XML storage cannot be used on this server; please re-configure KMail differently." ).arg( mAccount->host() ) ); mAccount->setHasNoAnnotationSupport(); } else @@ -2837,7 +2837,7 @@ void KMFolderCachedImap::slotMultiUrlGetAnnotationResult( KIO::Job* job ) // that's when the imap server doesn't support annotations if ( GlobalSettings::self()->theIMAPResourceStorageFormat() == GlobalSettings::EnumTheIMAPResourceStorageFormat::XML && (uint)GlobalSettings::self()->theIMAPResourceAccount() == mAccount->id() ) - KMessageBox::error( 0, i18n( "The IMAP server %1 doesn't have support for imap annotations. The XML storage cannot be used on this server, please re-configure KMail differently" ).tqarg( mAccount->host() ) ); + KMessageBox::error( 0, i18n( "The IMAP server %1 doesn't have support for imap annotations. The XML storage cannot be used on this server, please re-configure KMail differently" ).arg( mAccount->host() ) ); mAccount->setHasNoAnnotationSupport(); } else @@ -3063,7 +3063,7 @@ KMCommand* KMFolderCachedImap::rescueUnsyncedMessages() bool manualMove = true; while ( GlobalSettings::autoLostFoundMove() ) { // find the inbox of this account - KMFolder *inboxFolder = kmkernel->findFolderById( TQString(".%1.directory/INBOX").tqarg( account()->id() ) ); + KMFolder *inboxFolder = kmkernel->findFolderById( TQString(".%1.directory/INBOX").arg( account()->id() ) ); if ( !inboxFolder ) { kdWarning(5006) << k_funcinfo << "inbox not found!" << endl; break; @@ -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() ); @@ -3119,7 +3119,7 @@ KMCommand* KMFolderCachedImap::rescueUnsyncedMessages() "on the server or you do not " "have sufficient access rights on the folder to upload them.</p>" "<p>All affected messages will therefore be moved to <b>%2</b> " - "to avoid data loss.</p>").tqarg( folder()->prettyURL() ).tqarg( dest->prettyURL() ), + "to avoid data loss.</p>").arg( folder()->prettyURL() ).arg( dest->prettyURL() ), i18n("Insufficient access rights") ); manualMove = false; break; @@ -3132,7 +3132,7 @@ KMCommand* KMFolderCachedImap::rescueUnsyncedMessages() "have sufficient access rights on the folder now to upload them. " "Please contact your administrator to allow upload of new messages " "to you, or move them out of this folder.</p> " - "<p>Do you want to move these messages to another folder now?</p>").tqarg( folder()->prettyURL() ) ); + "<p>Do you want to move these messages to another folder now?</p>").arg( folder()->prettyURL() ) ); if ( KMessageBox::warningYesNo( 0, msg, TQString(), i18n("Move"), i18n("Do Not Move") ) == KMessageBox::Yes ) { KMail::KMFolderSelDlg dlg( kmkernel->getKMMainWidget(), i18n("Move Messages to Folder"), true ); diff --git a/kmail/kmfoldercachedimap.h b/kmail/kmfoldercachedimap.h index 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..3115aef33 100644 --- a/kmail/kmfolderdia.cpp +++ b/kmail/kmfolderdia.cpp @@ -61,7 +61,7 @@ #include <kpushbutton.h> #include <tqcheckbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqgroupbox.h> #include <tqregexp.h> #include <tqlabel.h> @@ -72,7 +72,7 @@ #include <assert.h> #include <tqhbuttongroup.h> #include <tqradiobutton.h> -#include <tqtextedit.h> +#include <textedit.h> #include "templatesconfiguration.h" #include "templatesconfiguration_kfg.h" @@ -100,7 +100,7 @@ KMFolderDialog::KMFolderDialog(KMFolder *aFolder, KMFolderDir *aFolderDir, TQStringList folderNames; TQValueList<TQGuardedPtr<KMFolder> > folders; - // get all folders but search and folders that can not have tqchildren + // get all folders but search and folders that can not have children aParent->createFolderList(&folderNames, &folders, true, true, true, false, true, false); @@ -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; @@ -234,14 +234,14 @@ void KMFolderDialog::setFolder( KMFolder* folder ) mFolder = folder; } -static void addLine( TQWidget *parent, TQVBoxLayout* tqlayout ) +static void addLine( TQWidget *parent, TQVBoxLayout* layout ) { TQFrame *line = new TQFrame( parent, "line" ); line->setGeometry( TQRect( 80, 150, 250, 20 ) ); line->setFrameShape( TQFrame::HLine ); line->setFrameShadow( TQFrame::Sunken ); line->setFrameShape( TQFrame::HLine ); - tqlayout->addWidget( line ); + layout->addWidget( line ); } //---------------------------------------------------------------------------- @@ -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; @@ -449,7 +449,7 @@ KMail::FolderDiaGeneralTab::FolderDiaGeneralTab( KMFolderDialog* dlg, addLine( this, topLayout ); - // use grid tqlayout for the following combobox settings + // use grid layout for the following combobox settings TQGridLayout *gl = new TQGridLayout( topLayout, 3, 2, KDialog::spacingHint() ); gl->setColStretch( 1, 100 ); // make the second column use all available space int row = -1; 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..980d0b14b 100644 --- a/kmail/kmfolderdir.cpp +++ b/kmail/kmfolderdir.cpp @@ -206,7 +206,7 @@ bool KMFolderDir::reload(void) if (!dir.cd(fldPath, TRUE)) { - TQString msg = i18n("<qt>Cannot enter folder <b>%1</b>.</qt>").tqarg(fldPath); + TQString msg = i18n("<qt>Cannot enter folder <b>%1</b>.</qt>").arg(fldPath); KMessageBox::information(0, msg); return FALSE; } @@ -214,7 +214,7 @@ bool KMFolderDir::reload(void) TQFileInfoList* fiList=(TQFileInfoList*)dir.entryInfoList(); if (!fiList) { - TQString msg = i18n("<qt>Folder <b>%1</b> is unreadable.</qt>").tqarg(fldPath); + TQString msg = i18n("<qt>Folder <b>%1</b> is unreadable.</qt>").arg(fldPath); KMessageBox::information(0, msg); return FALSE; } @@ -258,7 +258,7 @@ bool KMFolderDir::reload(void) // For this to be a cached IMAP folder, it must be in the KMail dimap // subdir and must be have a uidcache file or be a maildir folder TQString maildir(fname + "/new"); - TQString imapcachefile = TQString::tqfromLatin1(".%1.uidcache").tqarg(fname); + TQString imapcachefile = TQString::fromLatin1(".%1.uidcache").arg(fname); if ( dir.exists( imapcachefile) || dir.exists( maildir ) ) { folder = new KMFolder( this, fname, KMFolderTypeCachedImap ); diff --git a/kmail/kmfolderdir.h b/kmail/kmfolderdir.h index 687f95637..6d33add36 100644 --- a/kmail/kmfolderdir.h +++ b/kmail/kmfolderdir.h @@ -55,7 +55,7 @@ public: /** Returns the folder manager that manages this folder */ virtual KMFolderMgr* manager() const; - /** Returns the folder whose tqchildren we are holding */ + /** Returns the folder whose children we are holding */ KMFolder* owner() const { return mOwner; } virtual KMFolderDirType type() const { return mDirType; } diff --git a/kmail/kmfolderimap.cpp b/kmail/kmfolderimap.cpp index 05a7864d1..6f853038f 100644 --- a/kmail/kmfolderimap.cpp +++ b/kmail/kmfolderimap.cpp @@ -56,8 +56,8 @@ using KMail::RenameJob; #include <kconfig.h> #include <tqbuffer.h> -#include <tqtextcodec.h> -#include <tqstylesheet.h> +#include <textcodec.h> +#include <stylesheet.h> #include <assert.h> @@ -245,7 +245,7 @@ void KMFolderImap::remove() jd.progressItem = ProgressManager::createProgressItem( "ImapFolderRemove" + ProgressManager::getUniqueID(), i18n("Removing folder"), - i18n( "URL: %1" ).tqarg( TQStyleSheet::escape( folder()->prettyURL() ) ), + i18n( "URL: %1" ).arg( TQStyleSheet::escape( folder()->prettyURL() ) ), false, account()->useSSL() || account()->useTLS() ); account()->insertJob(job, jd); @@ -488,7 +488,7 @@ int KMFolderImap::addMsg(TQPtrList<KMMessage>& msgList, TQValueList<int>& aIndex mAddMessageProgressItem = ProgressManager::createProgressItem( "Uploading"+ProgressManager::getUniqueID(), i18n("Uploading message data"), - i18n("Destination folder: %1").tqarg( TQStyleSheet::escape( folder()->prettyURL() ) ), + i18n("Destination folder: %1").arg( TQStyleSheet::escape( folder()->prettyURL() ) ), true, account()->useSSL() || account()->useTLS() ); mAddMessageProgressItem->setTotalItems( msgList.count() ); @@ -849,7 +849,7 @@ void KMFolderImap::slotListResult( const TQStringList& subfolderNames, // update progress account()->listDirProgressItem()->incCompletedItems(); account()->listDirProgressItem()->updateProgress(); - account()->listDirProgressItem()->setqStatus( folder()->prettyURL() + i18n(" completed") ); + account()->listDirProgressItem()->seStatus( folder()->prettyURL() + i18n(" completed") ); f->initializeFrom( this, subfolderPaths[i], subfolderMimeTypes[i] ); f->setChildrenState( subfolderAttributes[i] ); @@ -1003,11 +1003,11 @@ bool KMFolderImap::mailCheckInProgress() const //----------------------------------------------------------------------------- void KMFolderImap::setChildrenState( TQString attributes ) { - // update tqchildren state - if ( attributes.find( "hastqchildren", 0, false ) != -1 ) + // update children state + if ( attributes.find( "haschildren", 0, false ) != -1 ) { setHasChildren( FolderStorage::HasChildren ); - } else if ( attributes.find( "hasnotqchildren", 0, false ) != -1 || + } else if ( attributes.find( "hasnochildren", 0, false ) != -1 || attributes.find( "noinferiors", 0, false ) != -1 ) { setHasChildren( FolderStorage::HasNoChildren ); @@ -1073,7 +1073,7 @@ void KMFolderImap::checkValidity() mMailCheckProgressItem->setProgress(0); } if ( account()->mailCheckProgressItem() ) { - account()->mailCheckProgressItem()->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); @@ -1271,7 +1271,7 @@ void KMFolderImap::slotListFolderResult(KIO::Job * job) if (job->error()) { account()->handleJobError( job, - i18n("Error while listing the contents of the folder %1.").tqarg( label() ) ); + i18n("Error while listing the contents of the folder %1.").arg( label() ) ); account()->removeJob(it); finishMailCheck( "listfolder", imapNoInformation ); return; @@ -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 ) { @@ -2284,7 +2284,7 @@ void KMFolderImap::setSubfolderState( imapState state ) mSubfolderState = state; if ( state == imapNoInformation && folder()->child() ) { - // pass through to tqchildren + // pass through to children KMFolderNode* node; TQPtrListIterator<KMFolderNode> it( *folder()->child() ); for ( ; (node = it.current()); ) diff --git a/kmail/kmfolderimap.h b/kmail/kmfolderimap.h index c7b31588f..35abc648b 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) @@ -290,7 +290,7 @@ public: /** * Mark the folder as already removed from the server * If set to true the folder will only be deleted locally - * This will recursively be applied to all tqchildren + * This will recursively be applied to all children */ void setAlreadyRemoved(bool removed); @@ -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..dd9cee72a 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 @@ -369,7 +369,7 @@ bool KMFolderIndex::readIndexHeader(int *gv) "The mail index for '%1' is from an unknown version of KMail (%2).\n" "This index can be regenerated from your mail folder, but some " "information, including status flags, may be lost. Do you wish " - "to downgrade your index file?") .tqarg(name()) .tqarg(indexVersion), TQString(), i18n("Downgrade"), i18n("Do Not Downgrade") ); + "to downgrade your index file?") .arg(name()) .arg(indexVersion), TQString(), i18n("Downgrade"), i18n("Do Not Downgrade") ); kapp->restoreOverrideCursor(); if (r == KMessageBox::Yes) createIndexFromContents(); @@ -467,7 +467,7 @@ bool KMFolderIndex::updateIndexStreamPtr(bool) } -KMFolderIndex::IndextqStatus KMFolderIndex::indextqStatus() +KMFolderIndex::IndexStatus KMFolderIndex::indexStatus() { if ( !mCompactable ) return IndexCorrupt; @@ -527,7 +527,7 @@ void KMFolderIndex::recreateIndex( bool readIndexAfterwards ) kapp->setOverrideCursor(KCursor::arrowCursor()); KMessageBox::information(0, i18n("The mail index for '%1' is corrupted and will be regenerated now, " - "but some information, like status flags, might get lost.").tqarg(name())); + "but some information, like status flags, might get lost.").arg(name())); kapp->restoreOverrideCursor(); createIndexFromContents(); if ( readIndexAfterwards ) { @@ -562,10 +562,10 @@ void KMFolderIndex::updateInvitationAndAddressFieldsFromContents() msg.fromDwString( msgString, false ); msg.updateInvitationState(); if ( msg.status() & KMMsgStatusHasInvitation ) { - msgInfo->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..1ae867bdc 100644 --- a/kmail/kmfoldermaildir.cpp +++ b/kmail/kmfoldermaildir.cpp @@ -87,11 +87,11 @@ int KMFolderMaildir::canAccess() KCursorSaver idle(KBusyPtr::idle()); if ( nRetVal == ENOENT ) KMessageBox::sorry(0, i18n("Error opening %1; this folder is missing.") - .tqarg(sBadFolderName)); + .arg(sBadFolderName)); else KMessageBox::sorry(0, i18n("Error opening %1; either this is not a valid " "maildir folder, or you do not have sufficient access permissions.") - .tqarg(sBadFolderName)); + .arg(sBadFolderName)); return nRetVal; } @@ -117,12 +117,12 @@ 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; str = i18n("Folder `%1' changed; recreating index.") - .tqarg(name()); + .arg(name()); emit statusMsg(str); } else { mIndexStream = fopen(TQFile::encodeName(indexLocation()), "r+"); // index file @@ -310,7 +310,7 @@ int KMFolderMaildir::compact( unsigned int startIndex, int nbMessages, const TQS // we can't have any New messages at this point if (mi->isNew()) { - mi->setqStatus(KMMsgStatusUnread); + mi->seStatus(KMMsgStatusUnread); setDirty( true ); } #endif @@ -506,7 +506,7 @@ if( fileD0.open( IO_WriteOnly ) ) { error |= appendToFolderIdsFile( idx ); if (error) { - kdDebug(5006) << "Error: Could not add message to folder (No space left on tqdevice?)" << endl; + kdDebug(5006) << "Error: Could not add message to folder (No space left on device?)" << endl; if (ftell(mIndexStream) > revert) { kdDebug(5006) << "Undoing changes" << endl; truncate( TQFile::encodeName(indexLocation()), revert ); @@ -519,7 +519,7 @@ if( fileD0.open( IO_WriteOnly ) ) { if (busy) kmkernel->kbp()->idle(); KMessageBox::sorry(0, i18n("Unable to add message to folder.\n" - "(No space left on tqdevice or insufficient quota?)\n" + "(No space left on device or insufficient quota?)\n" "Free space and sufficient quota are required to continue safely.")); if (busy) kmkernel->kbp()->busy(); */ @@ -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..deaa69edd 100644 --- a/kmail/kmfoldermbox.cpp +++ b/kmail/kmfoldermbox.cpp @@ -109,7 +109,7 @@ int KMFolderMbox::open(const char *owner) if (!mStream) { KNotifyClient::event( 0, "warning", - i18n("Cannot open file \"%1\":\n%2").tqarg(location()).tqarg(strerror(errno))); + i18n("Cannot open file \"%1\":\n%2").arg(location()).arg(strerror(errno))); kdDebug(5006) << "Cannot open folder `" << location() << "': " << strerror(errno) << endl; mOpenCount = 0; return errno; @@ -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) { @@ -137,8 +137,8 @@ int KMFolderMbox::open(const char *owner) "of KMail</a> for " "information about how to prevent this " "problem from happening again.</p></qt>") - .tqarg("help:/kmail/faq.html#faq-index-regeneration") - .tqarg(name()); + .arg("help:/kmail/faq.html#faq-index-regeneration") + .arg(name()); // When KMail is starting up we have to show a non-blocking message // box so that the initialization can continue. We don't show a // queued message box when KMail isn't starting up because queued @@ -164,7 +164,7 @@ int KMFolderMbox::open(const char *owner) TQString str; mIndexStream = 0; str = i18n("Folder `%1' changed. Recreating index.") - .tqarg(name()); + .arg(name()); emit statusMsg(str); } else { mIndexStream = fopen(TQFile::encodeName(indexLocation()), "r+"); // index file @@ -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 @@ -297,7 +297,7 @@ void KMFolderMbox::sync() if (mOpenCount > 0) if (!mStream || fsync(fileno(mStream)) || !mIndexStream || fsync(fileno(mIndexStream))) { - kmkernel->emergencyExit( i18n("Could not sync index file <b>%1</b>: %2").tqarg( indexLocation() ).tqarg(errno ? TQString::fromLocal8Bit(strerror(errno)) : i18n("Internal error. Please copy down the details and report a bug."))); + kmkernel->emergencyExit( i18n("Could not sync index file <b>%1</b>: %2").arg( indexLocation() ).arg(errno ? TQString::fromLocal8Bit(strerror(errno)) : i18n("Internal error. Please copy down the details and report a bug."))); } } @@ -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); @@ -1047,7 +1047,7 @@ if( fileD1.open( IO_WriteOnly ) ) { if (busy) kmkernel->kbp()->idle(); KMessageBox::sorry(0, i18n("Unable to add message to folder.\n" - "(No space left on tqdevice or insufficient quota?)\n" + "(No space left on device or insufficient quota?)\n" "Free space and sufficient quota are required to continue safely.")); if (busy) kmkernel->kbp()->busy(); kmkernel->kbp()->idle(); @@ -1118,7 +1118,7 @@ if( fileD1.open( IO_WriteOnly ) ) { error |= appendToFolderIdsFile( idx ); if (error) { - kdWarning(5006) << "Error: Could not add message to folder (No space left on tqdevice?)" << endl; + kdWarning(5006) << "Error: Could not add message to folder (No space left on device?)" << endl; if (ftell(mIndexStream) > revert) { kdWarning(5006) << "Undoing changes" << endl; truncate( TQFile::encodeName(indexLocation()), revert ); @@ -1126,14 +1126,14 @@ if( fileD1.open( IO_WriteOnly ) ) { if ( errno ) kmkernel->emergencyExit( i18n("Could not add message to folder:") + TQString::fromLocal8Bit(strerror(errno))); else - kmkernel->emergencyExit( i18n("Could not add message to folder (No space left on tqdevice?)") ); + kmkernel->emergencyExit( i18n("Could not add message to folder (No space left on device?)") ); /* This code may not be 100% reliable bool busy = kmkernel->kbp()->isBusy(); if (busy) kmkernel->kbp()->idle(); KMessageBox::sorry(0, i18n("Unable to add message to folder.\n" - "(No space left on tqdevice or insufficient quota?)\n" + "(No space left on device or insufficient quota?)\n" "Free space and sufficient quota are required to continue safely.")); if (busy) kmkernel->kbp()->busy(); */ @@ -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..68b52acad 100644 --- a/kmail/kmfoldermbox.h +++ b/kmail/kmfoldermbox.h @@ -39,7 +39,7 @@ using KMail::AttachmentStrategy; * * Accounts: * The accounts (of KMail) that are fed into the folder are - * represented as the tqchildren of the folder. They are only stored here + * represented as the children of the folder. They are only stored here * during runtime to have a reference for which accounts point to a * specific folder. */ @@ -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/kmfoldermgr.cpp b/kmail/kmfoldermgr.cpp index c4df4904d..34958e5a7 100644 --- a/kmail/kmfoldermgr.cpp +++ b/kmail/kmfoldermgr.cpp @@ -146,7 +146,7 @@ void KMFolderMgr::setBasePath(const TQString& aBasePath) if ( !info.isDir() ) { KMessageBox::sorry(0, i18n("'%1' does not appear to be a folder.\n" "Please move the file out of the way.") - .tqarg( mBasePath ) ); + .arg( mBasePath ) ); ::exit(-1); } if ( !info.isReadable() || !info.isWritable() ) { @@ -154,7 +154,7 @@ void KMFolderMgr::setBasePath(const TQString& aBasePath) "incorrect;\n" "please make sure that you can view and modify " "the content of this folder.") - .tqarg( mBasePath ) ); + .arg( mBasePath ) ); ::exit(-1); } } else { @@ -163,7 +163,7 @@ void KMFolderMgr::setBasePath(const TQString& aBasePath) KMessageBox::sorry(0, i18n("KMail could not create folder '%1';\n" "please make sure that you can view and " "modify the content of the folder '%2'.") - .tqarg( mBasePath ).tqarg( TQDir::homeDirPath() ) ); + .arg( mBasePath ).arg( TQDir::homeDirPath() ) ); ::exit(-1); } } @@ -326,7 +326,7 @@ KMFolder* KMFolderMgr::findOrCreate(const TQString& aFolderName, bool sysFldr, folder = createFolder(aFolderName, sysFldr, type); if (!folder) { - KMessageBox::error(0,(i18n("Cannot create file `%1' in %2.\nKMail cannot start without it.").tqarg(aFolderName).tqarg(mBasePath))); + KMessageBox::error(0,(i18n("Cannot create file `%1' in %2.\nKMail cannot start without it.").arg(aFolderName).arg(mBasePath))); exit(-1); } if ( id > 0 ) @@ -402,7 +402,7 @@ void KMFolderMgr::removeFolderAux(KMFolder* aFolder, bool success) // aFolder will be deleted by the next call! aFolder->parent()->remove(aFolder); - // update the tqchildren state + // update the children state if ( parentF ) { if ( parentF != aFolder ) diff --git a/kmail/kmfolderseldlg.cpp b/kmail/kmfolderseldlg.cpp index fd841ae6a..57d9f9759 100644 --- a/kmail/kmfolderseldlg.cpp +++ b/kmail/kmfolderseldlg.cpp @@ -11,7 +11,7 @@ #include <kpopupmenu.h> #include <kiconloader.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtoolbutton.h> #include <tqlabel.h> @@ -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..63010f9b5 100644 --- a/kmail/kmfoldertree.cpp +++ b/kmail/kmfoldertree.cpp @@ -267,14 +267,14 @@ void KMFolderTreeItem::slotIconsChanged() else setPixmap( 0, normalIcon( iconSize() ) ); emit iconChanged( this ); - tqrepaint(); + repaint(); } void KMFolderTreeItem::slotNameChanged() { setText( 0, mFolder->label() ); emit nameChanged( this ); - tqrepaint(); + repaint(); } void KMFolderTreeItem::slotNoContentChanged() @@ -495,7 +495,7 @@ void KMFolderTree::readConfig (void) setFont(KGlobalSettings::generalFont()); } - // restore the tqlayout + // restore the layout restoreLayout(conf, "Geometry"); } @@ -510,7 +510,7 @@ void KMFolderTree::writeConfig() writeIsListViewItemOpen(fti); } - // save the current tqlayout + // save the current layout saveLayout(KMKernel::config(), "Geometry"); } @@ -556,7 +556,7 @@ void KMFolderTree::reload(bool openFolders) int top = contentsY(); mLastItem = 0; - // tqinvalidate selected drop item + // invalidate selected drop item oldSelected = 0; // remember last KMFolder* last = currentFolder(); @@ -743,7 +743,7 @@ void KMFolderTree::addDirectory( KMFolderDir *fdir, KMFolderTreeItem* parent ) // create new child fti = new KMFolderTreeItem( parent, folder->label(), folder ); - // set folders explicitely to exandable when they have tqchildren + // set folders explicitely to exandable when they have children // this way we can do a listing for IMAP folders when the user expands them // even when the child folders are not created yet if ( folder->storage()->hasChildren() == FolderStorage::HasChildren ) { @@ -800,7 +800,7 @@ void KMFolderTree::delayedUpdate() continue; if ( fti->needsRepaint() ) { - fti->tqrepaint(); + fti->repaint(); fti->setNeedsRepaint( false ); } } @@ -918,7 +918,7 @@ bool KMFolderTree::checkUnreadFolder (KMFolderTreeItem* fti, bool confirm) // parameter (kept in the config file for kmail) if ( KMessageBox::questionYesNo( this, i18n( "<qt>Go to the next unread message in folder <b>%1</b>?</qt>" ) - .tqarg( fti->folder()->label() ), + .arg( fti->folder()->label() ), i18n( "Go to Next Unread Message" ), i18n("Go To"), i18n("Do Not Go To"), // defaults "AskNextFolder", @@ -1280,7 +1280,7 @@ void KMFolderTree::addChildFolder( KMFolder *folder, TQWidget * parent ) const TQString message = i18n( "<qt>Cannot create folder under <b>%1</b> because of insufficient " "permissions on the server. If you think you should be able to create " "subfolders here, ask your administrator to grant you rights to do so." - "</qt> " ).tqarg(aFolder->label()); + "</qt> " ).arg(aFolder->label()); KMessageBox::error( this, message ); return; } @@ -1419,7 +1419,7 @@ void KMFolderTree::openFolder() autoopen_timer.stop(); if ( dropItem && !dropItem->isOpen() ) { dropItem->setOpen( true ); - dropItem->tqrepaint(); + dropItem->repaint(); } } @@ -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: @@ -1987,7 +1987,7 @@ void KMFolderTree::moveOrCopyFolder( TQValueList<TQGuardedPtr<KMFolder> > source if ( parent->hasNamedFolder( sourceFolderName ) || sourceFolderNames.contains( sourceFolderName ) ) { KMessageBox::error( this, i18n("<qt>Cannot move or copy folder <b>%1</b> here because a folder with the same name already exists.</qt>") - .tqarg( sourceFolderName ) ); + .arg( sourceFolderName ) ); setDragEnabled( true ); return; } @@ -1998,7 +1998,7 @@ void KMFolderTree::moveOrCopyFolder( TQValueList<TQGuardedPtr<KMFolder> > source while ( f ) { if ( f->moveInProgress() ) { KMessageBox::error( this, i18n("<qt>Cannot move or copy folder <b>%1</b> because it is not completely copied itself.</qt>") - .tqarg( sourceFolderName ) ); + .arg( sourceFolderName ) ); setDragEnabled( true ); return; } diff --git a/kmail/kmheaders.cpp b/kmail/kmheaders.cpp index 987f9aa06..5515c8489 100644 --- a/kmail/kmheaders.cpp +++ b/kmail/kmheaders.cpp @@ -49,7 +49,7 @@ using namespace KPIM; #include <tqptrstack.h> #include <tqptrqueue.h> #include <tqpainter.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <tqstyle.h> #include <tqlistview.h> @@ -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) @@ -429,10 +429,10 @@ void KMHeaders::readColorConfig (void) KConfig* config = KMKernel::config(); // Custom/System colors KConfigGroupSaver saver(config, "Reader"); - TQColor c1=TQColor(kapp->tqpalette().active().text()); + TQColor c1=TQColor(kapp->palette().active().text()); TQColor c2=TQColor("red"); TQColor c3=TQColor("blue"); - TQColor c4=TQColor(kapp->tqpalette().active().base()); + TQColor c4=TQColor(kapp->palette().active().base()); TQColor c5=TQColor(0,0x7F,0); TQColor c6=TQColor(0,0x98,0); TQColor c7=KGlobalSettings::alternateBackgroundColor(); @@ -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 @@ -1115,7 +1115,7 @@ void KMHeaders::msgRemoved(int id, TQString msgId ) if ( mSubjThreading && removedItem->sortCacheItem()->subjectThreadingList() ) removedItem->sortCacheItem()->subjectThreadingList()->removeRef( removedItem->sortCacheItem() ); - // Reparent tqchildren of item. + // Reparent children of item. TQListViewItem *myParent = removedItem; TQListViewItem *myChild = myParent->firstChild(); TQListViewItem *threadRoot = myParent; @@ -1214,13 +1214,13 @@ void KMHeaders::msgHeaderChanged(KMFolder*, int msgId) HeaderItem *item = mItems[msgId]; if (item) { item->irefresh(); - item->tqrepaint(); + item->repaint(); } } //----------------------------------------------------------------------------- -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; @@ -1399,10 +1399,10 @@ void KMHeaders::setFolderInfotqStatus () else str = unread ? i18n( "1 unread", "%n unread", unread ) : i18n( "0 unread" ); const int count = mFolder->count(); - str = count ? i18n( "1 message, %1.", "%n messages, %1.", count ).tqarg( str ) + str = count ? i18n( "1 message, %1.", "%n messages, %1.", count ).arg( str ) : i18n( "0 messages" ); // no need for "0 unread" to be added here if ( mFolder->isReadOnly() ) - str = i18n("%1 = n messages, m unread.", "%1 Folder is read-only.").tqarg( str ); + str = i18n("%1 = n messages, m unread.", "%1 Folder is read-only.").arg( str ); BroadcastStatus::instance()->seStatusMsg(str); } @@ -1451,7 +1451,7 @@ void KMHeaders::applyFiltersOnMsg() if ( msgCountToFilter - msgCount < 10 || !( msgCount % 20 ) || msgCount <= 10 ) { progressItem->updateProgress(); TQString statusMsg = i18n("Filtering message %1 of %2"); - statusMsg = statusMsg.tqarg( msgCount ).tqarg( msgCountToFilter ); + statusMsg = statusMsg.arg( msgCount ).arg( msgCountToFilter ); KPIM::BroadcastStatus::instance()->seStatusMsg( statusMsg ); KApplication::kApplication()->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 50 ); } @@ -1624,7 +1624,7 @@ void KMHeaders::slotMoveCompleted( KMCommand *command ) deleted ? i18n("Messages deleted successfully.") : i18n("Messages moved successfully") ); } else { /* The move failed or the user canceled it; reset the state of all - * messages involved and tqrepaint. + * messages involved and repaint. * * Note: This potentially resets too many items if there is more than one * move going on. Oh well, I suppose no animals will be harmed. @@ -1701,7 +1701,7 @@ void KMHeaders::setCurrentMsg(int cur) setSelectionAnchor( currentItem() ); } makeHeaderVisible(); - setFolderInfotqStatus(); + setFolderInfoStatus(); } //----------------------------------------------------------------------------- @@ -1714,7 +1714,7 @@ void KMHeaders::setSelected( TQListViewItem *item, bool selected ) KListView::setSelected( item, selected ); // If the item is the parent of a closed thread recursively select - // tqchildren . + // children . if ( isThreaded() && !item->isOpen() && item->firstChild() ) { TQListViewItem *nextRoot = item->itemBelow(); TQListViewItemIterator it( item->firstChild() ); @@ -1828,12 +1828,12 @@ void KMHeaders::selectNextMessage() temp->firstChild(); temp = temp->parent(); } - lvi->tqrepaint(); + lvi->repaint(); /* test to see if we need to unselect messages on back track */ (below->isSelected() ? setSelected(lvi, false) : setSelected(below, true)); setCurrentItem(below); makeHeaderVisible(); - setFolderInfotqStatus(); + setFolderInfoStatus(); } } } @@ -1866,12 +1866,12 @@ void KMHeaders::selectPrevMessage() temp->firstChild(); temp = temp->parent(); } - lvi->tqrepaint(); + lvi->repaint(); /* test to see if we need to unselect messages on back track */ (above->isSelected() ? setSelected(lvi, false) : setSelected(above, true)); setCurrentItem(above); makeHeaderVisible(); - setFolderInfotqStatus(); + setFolderInfoStatus(); } } } @@ -1997,7 +1997,7 @@ int KMHeaders::findUnread(bool aDirNext, int aStartAt, bool onlyNew, bool accept // first unread item. // // Find the ancestor of the unread item closest to the - // root and recursively sort all of that ancestors tqchildren. + // root and recursively sort all of that ancestors children. if (item) { TQListViewItem *next = item; while (next->parent()) @@ -2138,9 +2138,9 @@ void KMHeaders::highlightMessage(TQListViewItem* lvi, bool markitread) BroadcastStatus::instance()->seStatusMsg(""); if (markitread && idx >= 0) setMsgRead(idx); mItems[idx]->irefresh(); - mItems[idx]->tqrepaint(); + mItems[idx]->repaint(); emit selected( msg ); - setFolderInfotqStatus(); + setFolderInfoStatus(); } void KMHeaders::highlightCurrentThread() @@ -2151,7 +2151,7 @@ void KMHeaders::highlightCurrentThread() for ( it.toFirst() ; it.current() ; ++it ) { TQListViewItem *lvi = *it; lvi->setSelected( true ); - lvi->tqrepaint(); + lvi->repaint(); } } @@ -2192,7 +2192,7 @@ void KMHeaders::updateMessageList( bool set_selection, bool forceJumpToUnread ) noRepaint = false; KListView::setSorting( mSortCol, !mSortDescending ); if (!mFolder) { - tqrepaint(); + repaint(); return; } readSortOrder( set_selection, forceJumpToUnread ); @@ -2290,7 +2290,7 @@ void KMHeaders::contentsMousePressEvent(TQMouseEvent* e) if ( rootDecoClicked ) { // Check if our item is the parent of a closed thread and if so, if the root // decoration of the item was clicked (i.e. the +/- sign) which would expand - // the thread. In that case, deselect all tqchildren, so opening the thread + // the thread. In that case, deselect all children, so opening the thread // doesn't cause a flicker. if ( !lvi->isOpen() && lvi->firstChild() ) { TQListViewItem *nextRoot = lvi->itemBelow(); @@ -2315,7 +2315,7 @@ void KMHeaders::contentsMousePressEvent(TQMouseEvent* e) } if ( rootDecoClicked ) { - // select the thread's tqchildren after closing if the parent is selected + // select the thread's children after closing if the parent is selected if ( lvi && !lvi->isOpen() && lvi->isSelected() ) setSelected( lvi, true ); } @@ -2324,7 +2324,7 @@ void KMHeaders::contentsMousePressEvent(TQMouseEvent* e) if ( lvi != currentItem() ) highlightMessage( lvi ); /* Explicitely set selection state. This is necessary because we want to - * also select all tqchildren of closed threads when the parent is selected. */ + * also select all children of closed threads when the parent is selected. */ // unless ctrl mask, set selected if it isn't already if ( !( e->state() & ControlButton ) && !wasSelected ) @@ -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 @@ -2676,7 +2676,7 @@ static void internalWriteItem(FILE *sortStream, KMFolder *folder, int msgid, TQ_INT32 len = key.length() * sizeof(TQChar); fwrite(&len, sizeof(len), 1, sortStream); if (len) - fwrite(key.tqunicode(), TQMIN(len, KMAIL_MAX_KEY_LEN), 1, sortStream); + fwrite(key.unicode(), TQMIN(len, KMAIL_MAX_KEY_LEN), 1, sortStream); if (update_discover) { //update the discovered change count @@ -2813,9 +2813,9 @@ bool KMHeaders::writeSortOrder() if (sortStream && ferror(sortStream)) { fclose(sortStream); unlink(TQFile::encodeName(sortFile)); - kdWarning(5006) << "Error: Failure modifying " << sortFile << " (No space left on tqdevice?)" << endl; + kdWarning(5006) << "Error: Failure modifying " << sortFile << " (No space left on device?)" << endl; kdWarning(5006) << __FILE__ << ":" << __LINE__ << endl; - kmkernel->emergencyExit( i18n("Failure modifying %1\n(No space left on tqdevice?)").tqarg( sortFile )); + kmkernel->emergencyExit( i18n("Failure modifying %1\n(No space left on device?)").arg( sortFile )); } fclose(sortStream); ::rename(TQFile::encodeName(tempName), TQFile::encodeName(sortFile)); @@ -2853,9 +2853,9 @@ void KMHeaders::appendItemToSortFile(HeaderItem *khi) if (sortStream && ferror(sortStream)) { fclose(sortStream); unlink(TQFile::encodeName(sortFile)); - kdWarning(5006) << "Error: Failure modifying " << sortFile << " (No space left on tqdevice?)" << endl; + kdWarning(5006) << "Error: Failure modifying " << sortFile << " (No space left on device?)" << endl; kdWarning(5006) << __FILE__ << ":" << __LINE__ << endl; - kmkernel->emergencyExit( i18n("Failure modifying %1\n(No space left on tqdevice?)").tqarg( sortFile )); + kmkernel->emergencyExit( i18n("Failure modifying %1\n(No space left on device?)").arg( sortFile )); } fclose(sortStream); } else { @@ -3321,7 +3321,7 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread ) qsort(unsorted, unsorted_count, sizeof(SortCacheItem *), //sort compare_SortCacheItem); - /* The sorted list now contains all sorted tqchildren of this item, while + /* The sorted list now contains all sorted children of this item, while * the (aptly named) unsorted array contains all as of yet unsorted * ones. It has just been qsorted, so it is in itself sorted. These two * sorted lists are now merged into one. */ @@ -3353,11 +3353,11 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread ) if(threaded && i->item()) { // If the parent is watched or ignored, propagate that to it's - // tqchildren + // children if (mFolder->getMsgBase(i->id())->isWatched()) - mFolder->getMsgBase(new_kci->id())->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()); @@ -3499,7 +3499,7 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread ) if ( sortStream ) fclose(sortStream); unlink(TQFile::encodeName(sortFile)); - kdWarning(5006) << "Error: Failure modifying " << sortFile << " (No space left on tqdevice?)" << endl; + kdWarning(5006) << "Error: Failure modifying " << sortFile << " (No space left on device?)" << endl; kdWarning(5006) << __FILE__ << ":" << __LINE__ << endl; return true; diff --git a/kmail/kmheaders.h b/kmail/kmheaders.h index f504c3f30..3dce0a664 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(); @@ -286,12 +286,12 @@ public slots: virtual void ensureCurrentItemVisible(); /** Select an item and if it is the parent of a closed thread, also - recursively select its tqchildren. */ + recursively select its children. */ virtual void setSelected(TQListViewItem *item, bool selected); /** Select several items by message index * and if they are the parent of a closed thread, also - * recursively select their tqchildren. */ + * recursively select their children. */ void setSelectedByIndex(TQValueList<int> items, bool selected); /** switch a column with the given id (see KPaintInfo enum) @@ -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..22b3c584e 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 ) { @@ -1211,9 +1211,9 @@ TQString KMKernel::debugSernum( TQ_UINT32 serialNumber ) msg = folder->getMsgBase( idx ); if (msg) { res.append( TQString( " subject %s,\n sender %s,\n date %s.\n" ) - .tqarg( msg->subject() ) - .tqarg( msg->fromStrip() ) - .tqarg( msg->dateStr() ) ); + .arg( msg->subject() ) + .arg( msg->fromStrip() ) + .arg( msg->dateStr() ) ); } else { res.append( TQString( "Invalid serial number." ) ); } @@ -1360,7 +1360,7 @@ void KMKernel::testDir(const char *_name) KMessageBox::sorry(0, i18n("KMail could not create folder '%1';\n" "please make sure that you can view and " "modify the content of the folder '%2'.") - .tqarg( foldersPath ).tqarg( TQDir::homeDirPath() ) ); + .arg( foldersPath ).arg( TQDir::homeDirPath() ) ); ::exit(-1); } } @@ -1369,7 +1369,7 @@ void KMKernel::testDir(const char *_name) "incorrect;\n" "please make sure that you can view and modify " "the content of this folder.") - .tqarg( foldersPath ) ); + .arg( foldersPath ) ); ::exit(-1); } } @@ -1673,7 +1673,7 @@ void KMKernel::cleanupImapFolders() cfld = static_cast<KMFolderCachedImap*>(the_dimapFolderMgr->createFolder(TQString::number(acct->id()), false, KMFolderTypeCachedImap)->storage()); if (!cfld) { - KMessageBox::error(0,(i18n("Cannot create file `%1' in %2.\nKMail cannot start without it.").tqarg(acct->name()).tqarg(the_dimapFolderMgr->basePath()))); + KMessageBox::error(0,(i18n("Cannot create file `%1' in %2.\nKMail cannot start without it.").arg(acct->name()).arg(the_dimapFolderMgr->basePath()))); exit(-1); } cfld->folder()->setId( acct->id() ); @@ -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 ); } } @@ -1884,8 +1884,8 @@ bool KMKernel::transferMail( TQString & destinationDir ) "the same name in <i>%7</i>.<p>" "<strong>Would you like %3 to move the mail " "files now?</strong></qt>" ) - .tqarg( kmailName, kmailName, kmailName ) - .tqarg( dir, destinationDir, dir, destinationDir ); + .arg( kmailName, kmailName, kmailName ) + .arg( dir, destinationDir, dir, destinationDir ); } else { msg = i18n( "%1-%3 is the application name, %4-%6 are folder path", "<qt>The <i>%4</i> folder exists. " @@ -1894,8 +1894,8 @@ bool KMKernel::transferMail( TQString & destinationDir ) "this folder for you.<p>" "<strong>Would you like %3 to move the mail " "files now?</strong></qt>" ) - .tqarg( kmailName, kmailName, kmailName ) - .tqarg( dir, destinationDir, dir ); + .arg( kmailName, kmailName, kmailName ) + .arg( dir, destinationDir, dir ); } TQString title = i18n( "Migrate Mail Files?" ); TQString buttonText = i18n( "Move" ); @@ -2047,7 +2047,7 @@ void KMKernel::slotResult(KIO::Job *job) { if (KMessageBox::warningContinueCancel(0, i18n("File %1 exists.\nDo you want to replace it?") - .tqarg((*it).url.prettyURL()), i18n("Save to File"), i18n("&Replace")) + .arg((*it).url.prettyURL()), i18n("Save to File"), i18n("&Replace")) == KMessageBox::Continue) byteArrayToRemoteFile((*it).data, (*it).url, true); } @@ -2135,7 +2135,7 @@ void KMKernel::emergencyExit( const TQString& reason ) mesg = i18n("KMail encountered a fatal error and will terminate now"); } else { mesg = i18n("KMail encountered a fatal error and will " - "terminate now.\nThe error was:\n%1").tqarg( reason ); + "terminate now.\nThe error was:\n%1").arg( reason ); } kdWarning() << mesg << endl; @@ -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/kmlineeditspell.cpp b/kmail/kmlineeditspell.cpp index db2763b93..c078cfe7a 100644 --- a/kmail/kmlineeditspell.cpp +++ b/kmail/kmlineeditspell.cpp @@ -132,7 +132,7 @@ void KMLineEdit::dropEvent( TQDropEvent *event ) KIO::NetAccess::removeTempFile( fileName ); } else { TQString caption( i18n( "vCard Import Failed" ) ); - TQString text = i18n( "<qt>Unable to access <b>%1</b>.</qt>" ).tqarg( (*it).url() ); + TQString text = i18n( "<qt>Unable to access <b>%1</b>.</qt>" ).arg( (*it).url() ); KMessageBox::error( parentWidget(), text, caption ); } } diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp index 1dc08d053..13737d5b0 100644 --- a/kmail/kmmainwidget.cpp +++ b/kmail/kmmainwidget.cpp @@ -14,14 +14,14 @@ #undef Unsorted // X headers... #include <tqaccel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqhbox.h> #include <tqvbox.h> #include <tqpopupmenu.h> #include <tqptrlist.h> #include <tqsignalmapper.h> #include <tqvaluevector.h> -#include <tqstylesheet.h> +#include <stylesheet.h> #include <kopenwith.h> #include <kmessagebox.h> @@ -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(); @@ -287,13 +287,13 @@ void KMMainWidget::destruct() //----------------------------------------------------------------------------- void KMMainWidget::readPreConfig(void) { - const KConfigGroup tqgeometry( KMKernel::config(), "Geometry" ); + const KConfigGroup geometry( KMKernel::config(), "Geometry" ); const KConfigGroup reader( KMKernel::config(), "Reader" ); - mLongFolderList = tqgeometry.readEntry( "FolderList", "long" ) != "short"; - mReaderWindowActive = tqgeometry.readEntry( "readerWindowMode", "below" ) != "hide"; - mReaderWindowBelow = tqgeometry.readEntry( "readerWindowMode", "below" ) == "below"; - mThreadPref = tqgeometry.readBoolEntry( "nestedMessages", false ); + mLongFolderList = geometry.readEntry( "FolderList", "long" ) != "short"; + mReaderWindowActive = geometry.readEntry( "readerWindowMode", "below" ) != "hide"; + mReaderWindowBelow = geometry.readEntry( "readerWindowMode", "below" ) == "below"; + mThreadPref = geometry.readBoolEntry( "nestedMessages", false ); mHtmlPref = reader.readBoolEntry( "htmlMail", false ); mHtmlLoadExtPref = reader.readBoolEntry( "htmlLoadExternal", false ); @@ -516,7 +516,7 @@ void KMMainWidget::writeConfig(void) { TQString s; KConfig *config = KMKernel::config(); - KConfigGroup tqgeometry( config, "Geometry" ); + KConfigGroup geometry( config, "Geometry" ); if (mMsgView) mMsgView->writeConfig(); @@ -527,31 +527,31 @@ void KMMainWidget::writeConfig(void) if ( mFavoriteFolderView ) mFavoriteFolderView->writeConfig(); - tqgeometry.writeEntry( "MainWin", this->tqgeometry().size() ); + geometry.writeEntry( "MainWin", this->geometry().size() ); const TQValueList<int> widths = ( mLongFolderList ? mPanner1 : mPanner2 )->sizes(); const TQValueList<int> heights = ( mLongFolderList ? mPanner2 : mPanner1 )->sizes(); - tqgeometry.writeEntry( "FolderPaneWidth", widths[0] ); - tqgeometry.writeEntry( "HeaderPaneWidth", widths[1] ); + geometry.writeEntry( "FolderPaneWidth", widths[0] ); + geometry.writeEntry( "HeaderPaneWidth", widths[1] ); // Only save when the widget is shown (to avoid saving a wrong value) if ( mSearchAndHeaders && mSearchAndHeaders->isShown() ) { - tqgeometry.writeEntry( "HeaderPaneHeight", heights[0] ); - tqgeometry.writeEntry( "ReaderPaneHeight", heights[1] ); + geometry.writeEntry( "HeaderPaneHeight", heights[0] ); + geometry.writeEntry( "ReaderPaneHeight", heights[1] ); } // save the state of the unread/total-columns - tqgeometry.writeEntry( "UnreadColumn", mFolderTree->unreadIndex() ); - tqgeometry.writeEntry( "TotalColumn", mFolderTree->totalIndex() ); - tqgeometry.writeEntry( "SizeColumn", mFolderTree->sizeIndex() ); + geometry.writeEntry( "UnreadColumn", mFolderTree->unreadIndex() ); + geometry.writeEntry( "TotalColumn", mFolderTree->totalIndex() ); + geometry.writeEntry( "SizeColumn", mFolderTree->sizeIndex() ); } //----------------------------------------------------------------------------- void KMMainWidget::createWidgets(void) { - // Create the splitters according to the tqlayout settings + // Create the splitters according to the layout settings TQWidget *headerParent = 0, *mimeParent = 0, *messageParent = 0; @@ -587,7 +587,7 @@ void KMMainWidget::createWidgets(void) mTopLayout->add( mPanner1 ); // BUG -sanders these accelerators stop working after switching - // between long/short folder tqlayout + // between long/short folder layout // Probably need to disconnect them first. // create list of messages @@ -950,7 +950,7 @@ void KMMainWidget::slotMailChecked( bool newMail, bool sendOnCheck, summary += "<br>" + i18n( "1 new message in %1", "%n new messages in %1", newInFolder.find( *it ).data() ) - .tqarg( folder->prettyURL() ); + .arg( folder->prettyURL() ); } } } @@ -965,7 +965,7 @@ void KMMainWidget::slotMailChecked( bool newMail, bool sendOnCheck, if ( GlobalSettings::self()->verboseNewMailNotification() ) { summary = i18n( "%1 is a list of the number of new messages per folder", "<b>New mail arrived</b><br>%1" ) - .tqarg( summary ); + .arg( summary ); } else { summary = i18n( "New mail arrived" ); @@ -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) { @@ -1097,7 +1097,7 @@ void KMMainWidget::modifyFolder( KMFolderTreeItem* folderItem ) KMFolder* folder = folderItem->folder(); KMFolderTree* folderTree = static_cast<KMFolderTree *>( folderItem->listView() ); KMFolderDialog props( folder, folder->parent(), folderTree, - i18n("Properties of Folder %1").tqarg( folder->label() ) ); + i18n("Properties of Folder %1").arg( folder->label() ) ); props.exec(); updateFolderMenu(); //Kolab issue 2152 @@ -1129,7 +1129,7 @@ void KMMainWidget::slotExpireFolder() KConfigGroupSaver saver(config, "General"); if (config->readBoolEntry("warn-before-expire", true)) { - str = i18n("<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>").tqarg(TQStyleSheet::escape( mFolder->label() )); + str = i18n("<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>").arg(TQStyleSheet::escape( mFolder->label() )); if (KMessageBox::warningContinueCancel(this, str, i18n("Expire Folder"), i18n("&Expire")) != KMessageBox::Continue) return; @@ -1152,7 +1152,7 @@ void KMMainWidget::slotEmptyFolder() TQString text = (isTrash) ? i18n("Are you sure you want to empty the trash folder?") : i18n("<qt>Are you sure you want to move all messages from " - "folder <b>%1</b> to the trash?</qt>").tqarg( TQStyleSheet::escape( mFolder->label() ) ); + "folder <b>%1</b> to the trash?</qt>").arg( TQStyleSheet::escape( mFolder->label() ) ); if (KMessageBox::warningContinueCancel(this, text, title, KGuiItem( title, "edittrash")) != KMessageBox::Continue) return; @@ -1209,14 +1209,14 @@ void KMMainWidget::slotRemoveFolder() title = i18n("Delete Search"); str = i18n("<qt>Are you sure you want to delete the search <b>%1</b>?<br>" "Any messages it shows will still be available in their original folder.</qt>") - .tqarg( TQStyleSheet::escape( mFolder->label() ) ); + .arg( TQStyleSheet::escape( mFolder->label() ) ); } else { title = i18n("Delete Folder"); if ( mFolder->count() == 0 ) { if ( !mFolder->child() || mFolder->child()->isEmpty() ) { str = i18n("<qt>Are you sure you want to delete the empty folder " "<b>%1</b>?</qt>") - .tqarg( TQStyleSheet::escape( mFolder->label() ) ); + .arg( TQStyleSheet::escape( mFolder->label() ) ); } else { str = i18n("<qt>Are you sure you want to delete the empty folder " @@ -1224,7 +1224,7 @@ void KMMainWidget::slotRemoveFolder() "not be empty and their contents will be discarded as well. " "<p><b>Beware</b> that discarded messages are not saved " "into your Trash folder and are permanently deleted.</qt>") - .tqarg( TQStyleSheet::escape( mFolder->label() ) ); + .arg( TQStyleSheet::escape( mFolder->label() ) ); } } else { if ( !mFolder->child() || mFolder->child()->isEmpty() ) { @@ -1232,14 +1232,14 @@ void KMMainWidget::slotRemoveFolder() "<b>%1</b>, discarding its contents? " "<p><b>Beware</b> that discarded messages are not saved " "into your Trash folder and are permanently deleted.</qt>") - .tqarg( TQStyleSheet::escape( mFolder->label() ) ); + .arg( TQStyleSheet::escape( mFolder->label() ) ); } else { str = i18n("<qt>Are you sure you want to delete the folder <b>%1</b> " "and all its subfolders, discarding their contents? " "<p><b>Beware</b> that discarded messages are not saved " "into your Trash folder and are permanently deleted.</qt>") - .tqarg( TQStyleSheet::escape( mFolder->label() ) ); + .arg( TQStyleSheet::escape( mFolder->label() ) ); } } } @@ -1636,7 +1636,7 @@ void KMMainWidget::updateListFilterAction() mListFilterAction->setEnabled( false ); else { mListFilterAction->setEnabled( true ); - mListFilterAction->setText( i18n( "Filter on Mailing-List %1..." ).tqarg( lname ) ); + mListFilterAction->setText( i18n( "Filter on Mailing-List %1..." ).arg( lname ) ); } } @@ -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() ); @@ -3514,8 +3514,8 @@ void KMMainWidget::slotMemInfo() { "Memory allocated, not used: %3\n" "Memory total allocated : %4\n" "Max. freeable memory : %5\n") - .tqarg(mi.hblks).tqarg(fmt(mi.uordblks)).tqarg(fmt(mi.fordblks)) - .tqarg(fmt(mi.arena)).tqarg(fmt(mi.keepcost)); + .arg(mi.hblks).arg(fmt(mi.uordblks)).arg(fmt(mi.fordblks)) + .arg(fmt(mi.arena)).arg(fmt(mi.keepcost)); KMessageBox::information(0, s, "Malloc information", s); #endif } @@ -3712,13 +3712,13 @@ void KMMainWidget::initializeFilterActions() TQValueListConstIterator<KMFilter*> it = kmkernel->filterMgr()->filters().constBegin(); for ( ;it != kmkernel->filterMgr()->filters().constEnd(); ++it ) { if (!(*it)->isEmpty() && (*it)->configureShortcut()) { - filterName = TQString("Filter %1").tqarg((*it)->name()); + filterName = TQString("Filter %1").arg((*it)->name()); normalizedName = filterName.replace(" ", "_"); if (action(normalizedName.utf8())) continue; filterCommand = new KMMetaFilterActionCommand(*it, mHeaders, this); mFilterCommands.append(filterCommand); - TQString as = i18n("Filter %1").tqarg((*it)->name()); + TQString as = i18n("Filter %1").arg((*it)->name()); TQString icon = (*it)->icon(); if ( icon.isEmpty() ) icon = "gear"; @@ -3801,8 +3801,8 @@ void KMMainWidget::slotShortcutChanged( KMFolder *folder ) FolderShortcutCommand *c = new FolderShortcutCommand( this, folder ); mFolderShortcutCommands.insert( folder->idString(), c ); - TQString actionlabel = TQString( "FolderShortcut %1").tqarg( folder->prettyURL() ); - TQString actionname = TQString( "FolderShortcut %1").tqarg( folder->idString() ); + TQString actionlabel = TQString( "FolderShortcut %1").arg( folder->prettyURL() ); + TQString actionname = TQString( "FolderShortcut %1").arg( folder->idString() ); TQString normalizedName = actionname.replace(" ", "_"); KAction* action = new KAction(actionlabel, folder->shortcut(), c, TQT_SLOT(start()), @@ -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..aeb4beb46 100644 --- a/kmail/kmmessage.cpp +++ b/kmail/kmmessage.cpp @@ -44,7 +44,7 @@ using KMail::HeaderStrategy; #include <kasciistricmp.h> #include <tqcursor.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <tqmessagebox.h> #include <kmime_util.h> #include <kmime_charfreq.h> @@ -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,26 +394,26 @@ 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() ) ); + setMDNSentState( static_cast<KMMsgMDNSentState>( headerField("X-KMail-MDN-Sent").at(0).latin1() ) ); } if ( invitationState() == KMMsgInvitationUnknown && readyToShow() ) updateInvitationState(); @@ -1081,7 +1081,7 @@ KMMessage* KMMessage::createReply( KMail::ReplyStrategy replyStrategy, parser.process( this ); } } - // setqStatus(KMMsgStatusReplied); + // seStatus(KMMsgStatusReplied); msg->link(this, KMMsgStatusReplied); if ( parent() && parent()->putRepliesInSameFolder() ) @@ -1141,14 +1141,14 @@ KMMessage* KMMessage::createRedirect( const TQString &toStr ) // X-KMail-Redirect-From: content TQString strByWayOf = TQString("%1 (by way of %2 <%3>)") - .tqarg( from() ) - .tqarg( ident.fullName() ) - .tqarg( ident.primaryEmailAddress() ); + .arg( from() ) + .arg( ident.fullName() ) + .arg( ident.primaryEmailAddress() ); // Resent-From: content TQString strFrom = TQString("%1 <%2>") - .tqarg( ident.fullName() ) - .tqarg( ident.primaryEmailAddress() ); + .arg( ident.fullName() ) + .arg( ident.primaryEmailAddress() ); // format the current date to be used in Resent-Date: TQString origDate = msg->headerField( "Date" ); @@ -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; } @@ -3160,7 +3160,7 @@ void KMMessage::bodyPart(int aIdx, KMMessagePart* aPart) const if ( DwBodyPart *part = dwBodyPart( aIdx ) ) { KMMessage::bodyPart(part, aPart); if( aPart->name().isEmpty() ) - aPart->setName( i18n("Attachment: %1").tqarg( aIdx ) ); + aPart->setName( i18n("Attachment: %1").arg( aIdx ) ); } } @@ -3193,7 +3193,7 @@ bool KMMessage::deleteBodyPart( int partIndex ) dummyPart.duplicate( part ); TQString comment = i18n("This attachment has been deleted."); if ( !part.fileName().isEmpty() ) - comment = i18n( "The attachment '%1' has been deleted." ).tqarg( part.fileName() ); + comment = i18n( "The attachment '%1' has been deleted." ).arg( part.fileName() ); dummyPart.setContentDescription( comment ); dummyPart.setBodyEncodedBinary( TQByteArray() ); TQCString cd = dummyPart.contentDisposition(); @@ -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; @@ -4037,7 +4037,7 @@ void KMMessage::readConfig() int languageNr = config->readNumEntry("reply-current-language",0); { // area for config group "KMMessage #n" - KConfigGroupSaver saver(config, TQString("KMMessage #%1").tqarg(languageNr)); + KConfigGroupSaver saver(config, TQString("KMMessage #%1").arg(languageNr)); sReplyLanguage = config->readEntry("language",KGlobal::locale()->language()); sReplyStr = config->readEntry("phrase-reply", i18n("On %D, you wrote:")); @@ -4145,11 +4145,11 @@ void KMMessage::setCharset( const TQCString &charset, DwEntity *entity ) //----------------------------------------------------------------------------- -void KMMessage::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..9acaa7f1d 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(); @@ -545,7 +545,7 @@ public: */ void setBodyFromUnicode( const TQString & str, DwEntity *entity = 0 ); - /** Returns the body part decoded to tqunicode. + /** Returns the body part decoded to unicode. **/ TQString bodyToUnicode(const TQTextCodec* codec=0) const; @@ -746,7 +746,7 @@ public: static TQString guessEmailAddressFromLoginName( const TQString& userName ); /** - * Given argument msg add quoting characters and retqlayout for max width maxLength + * Given argument msg add quoting characters and relayout for max width maxLength * @param msg the string which it to be quoted * @param maxLineLength reformat text to be this amount of columns at maximum, adding * linefeeds at word boundaries to make it fit. @@ -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..299a7c70f 100644 --- a/kmail/kmmimeparttree.cpp +++ b/kmail/kmmimeparttree.cpp @@ -46,7 +46,7 @@ #include <kmessagebox.h> #include <kiconloader.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqheader.h> #include <tqpopupmenu.h> #include <tqstyle.h> @@ -95,7 +95,7 @@ void KMMimePartTree::restoreLayoutIfPresent() { header()->setStretchEnabled( true, 0 ); // rest of the columns: if ( KMKernel::config()->hasGroup( configGroup ) ) { - // there is a saved tqlayout. use it... + // there is a saved layout. use it... restoreLayout( KMKernel::config(), configGroup ); // and disable Maximum mode: for ( int i = 1 ; i < 4 ; ++i ) @@ -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() ) @@ -309,7 +309,7 @@ void KMMimePartTree::slotCopy() if ( !url.isValid() ) return; urls.append( url ); KURLDrag* drag = new KURLDrag( urls, this ); - TQApplication::tqclipboard()->setData( drag, TQClipboard::Clipboard ); + TQApplication::clipboard()->setData( drag, TQClipboard::Clipboard ); } //============================================================================= diff --git a/kmail/kmmsgbase.cpp b/kmail/kmmsgbase.cpp index f1341d6c8..05a128411 100644 --- a/kmail/kmmsgbase.cpp +++ b/kmail/kmmsgbase.cpp @@ -22,7 +22,7 @@ using KMail::MessageProperty; #include <mimelib/mimepp.h> #include <kmime_codecs.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <tqdeepcopy.h> #include <tqregexp.h> @@ -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'; @@ -587,8 +587,8 @@ TQCString KMMsgBase::toUsAscii(const TQString& _str, bool *ok) TQString result = _str; int len = result.length(); for (int i = 0; i < len; i++) - if (result.tqat(i).tqunicode() >= 128) { - result.tqat(i) = '?'; + if (result.at(i).unicode() >= 128) { + result.at(i) = '?'; all_ok = false; } if (ok) @@ -800,7 +800,7 @@ TQCString KMMsgBase::encodeRFC2047String(const TQString& _str, unsigned int nonAscii = 0; unsigned int strLength(_str.length()); for (unsigned int i = 0; i < strLength; i++) - if (_str.tqat(i).tqunicode() >= 128) nonAscii++; + if (_str.at(i).unicode() >= 128) nonAscii++; bool useBase64 = (nonAscii * 6 > strLength); unsigned int start, stop, p, pos = 0, encLength; @@ -813,17 +813,17 @@ TQCString KMMsgBase::encodeRFC2047String(const TQString& _str, start = pos; p = pos; while (p < strLength) { - if (!breakLine && (_str.tqat(p) == ' ' || dontQuote.find(_str.tqat(p)) != -1)) + if (!breakLine && (_str.at(p) == ' ' || dontQuote.find(_str.at(p)) != -1)) start = p + 1; - if (_str.tqat(p).tqunicode() >= 128 || _str.tqat(p).tqunicode() < 32) + if (_str.at(p).unicode() >= 128 || _str.at(p).unicode() < 32) break; p++; } if (breakLine || p < strLength) { - while (dontQuote.find(_str.tqat(start)) != -1) start++; + while (dontQuote.find(_str.at(start)) != -1) start++; stop = start; - while (stop < strLength && dontQuote.find(_str.tqat(stop)) == -1) + while (stop < strLength && dontQuote.find(_str.at(stop)) == -1) stop++; result += _str.mid(pos, start - pos).latin1(); encLength = encodeRFC2047Quoted(codec->fromUnicode(_str. @@ -843,7 +843,7 @@ TQCString KMMsgBase::encodeRFC2047String(const TQString& _str, stop = start + dif; } p = stop; - while (p > start && _str.tqat(p) != ' ') p--; + while (p > start && _str.at(p) != ' ') p--; if (p > start) stop = p; if (result.right(3) == "?= ") start--; if (result.right(5) == "?=\n ") { @@ -956,13 +956,13 @@ TQString KMMsgBase::decodeRFC2231String(const TQCString& _str) p = 0; while (p < (int)st.length()) { - if (st.tqat(p) == 37) + if (st.at(p) == 37) { - ch = st.tqat(p+1) - 48; + ch = st.at(p+1) - 48; if (ch > 16) ch -= 7; - ch2 = st.tqat(p+2) - 48; + ch2 = st.at(p+2) - 48; if (ch2 > 16) ch2 -= 7; - st.tqat(p) = ch * 16 + ch2; + st.at(p) = ch * 16 + ch2; st.remove( p+1, 2 ); } p++; @@ -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) @@ -1119,9 +1119,9 @@ static void swapEndian(TQString &str) { uint len = str.length(); str = TQDeepCopy<TQString>(str); - TQChar *tqunicode = const_cast<TQChar*>( str.tqunicode() ); + TQChar *unicode = const_cast<TQChar*>( str.unicode() ); for (uint i = 0; i < len; i++) - tqunicode[i] = kmail_swap_16(tqunicode[i].tqunicode()); + unicode[i] = kmail_swap_16(unicode[i].unicode()); } //----------------------------------------------------------------------------- @@ -1193,7 +1193,7 @@ retry: } if(type == t) { // This works because the TQString constructor does a memcpy. - // Otherwise we would need to be concerned about the tqalignment. + // Otherwise we would need to be concerned about the alignment. if(l) ret = TQString((TQChar *)(g_chunk + g_chunk_offset), l/2); break; @@ -1371,23 +1371,23 @@ 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; + STORE_DATA_LEN(MsgIdMD5Part, tmp_str.unicode(), tmp_str.length() * 2, true); + tmp = mLegacyStatus; STORE_DATA(MsgLegacyStatusPart, tmp); //these are completely arbitrary order tmp_str = fromStrip().stripWhiteSpace(); - STORE_DATA_LEN(MsgFromStripPart, tmp_str.tqunicode(), tmp_str.length() * 2, true); + STORE_DATA_LEN(MsgFromStripPart, tmp_str.unicode(), tmp_str.length() * 2, true); tmp_str = subject().stripWhiteSpace(); - STORE_DATA_LEN(MsgSubjectPart, tmp_str.tqunicode(), tmp_str.length() * 2, true); + STORE_DATA_LEN(MsgSubjectPart, tmp_str.unicode(), tmp_str.length() * 2, true); tmp_str = toStrip().stripWhiteSpace(); - STORE_DATA_LEN(MsgToStripPart, tmp_str.tqunicode(), tmp_str.length() * 2, true); + STORE_DATA_LEN(MsgToStripPart, tmp_str.unicode(), tmp_str.length() * 2, true); tmp_str = replyToIdMD5().stripWhiteSpace(); - STORE_DATA_LEN(MsgReplyToIdMD5Part, tmp_str.tqunicode(), tmp_str.length() * 2, true); + STORE_DATA_LEN(MsgReplyToIdMD5Part, tmp_str.unicode(), tmp_str.length() * 2, true); tmp_str = xmark().stripWhiteSpace(); - STORE_DATA_LEN(MsgXMarkPart, tmp_str.tqunicode(), tmp_str.length() * 2, true); + STORE_DATA_LEN(MsgXMarkPart, tmp_str.unicode(), tmp_str.length() * 2, true); tmp_str = fileName().stripWhiteSpace(); - STORE_DATA_LEN(MsgFilePart, tmp_str.tqunicode(), tmp_str.length() * 2, true); + STORE_DATA_LEN(MsgFilePart, tmp_str.unicode(), tmp_str.length() * 2, true); tmp = msgSize(); STORE_DATA(MsgSizePart, tmp); tmp = folderOffset(); @@ -1400,10 +1400,10 @@ const uchar *KMMsgBase::asIndexString(int &length) const STORE_DATA(MsgMDNSentPart, tmp); tmp_str = replyToAuxIdMD5().stripWhiteSpace(); - STORE_DATA_LEN(MsgReplyToAuxIdMD5Part, tmp_str.tqunicode(), tmp_str.length() * 2, true); + STORE_DATA_LEN(MsgReplyToAuxIdMD5Part, tmp_str.unicode(), tmp_str.length() * 2, true); tmp_str = strippedSubjectMD5().stripWhiteSpace(); - STORE_DATA_LEN(MsgStrippedSubjectMD5Part, tmp_str.tqunicode(), tmp_str.length() * 2, true); + STORE_DATA_LEN(MsgStrippedSubjectMD5Part, tmp_str.unicode(), tmp_str.length() * 2, true); tmp = status(); STORE_DATA(MsgStatusPart, tmp); @@ -1414,10 +1414,10 @@ const uchar *KMMsgBase::asIndexString(int &length) const STORE_DATA(MsgUIDPart, tmp); tmp_str = from(); - STORE_DATA_LEN( MsgFromPart, tmp_str.tqunicode(), tmp_str.length() * 2, true ); + STORE_DATA_LEN( MsgFromPart, tmp_str.unicode(), tmp_str.length() * 2, true ); tmp_str = to(); - STORE_DATA_LEN( MsgToPart, tmp_str.tqunicode(), tmp_str.length() * 2, true ); + STORE_DATA_LEN( MsgToPart, tmp_str.unicode(), tmp_str.length() * 2, true ); return ret; } @@ -1476,8 +1476,8 @@ 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*") - .tqarg( prefixRegExps.join(")|(?:") ); + TQString bigRegExp = TQString::fromLatin1("^(?:\\s+|(?:%1))+\\s*") + .arg( prefixRegExps.join(")|(?:") ); TQRegExp rx( bigRegExp, false /*case insens.*/ ); if ( !rx.isValid() ) { kdWarning(5006) << "KMMessage::replacePrefixes(): bigRegExp = \"" diff --git a/kmail/kmmsgbase.h b/kmail/kmmsgbase.h index 43a101027..19c327aa2 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,16 +450,16 @@ 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 { MsgNoPart = 0, - //tqunicode strings + //unicode strings MsgFromStripPart = 1, MsgSubjectPart = 2, MsgToStripPart = 3, @@ -474,7 +474,7 @@ public: MsgFilePart = 11, MsgCryptoStatePart = 12, MsgMDNSentPart = 13, - //another two tqunicode strings + //another two unicode strings MsgReplyToAuxIdMD5Part = 14, MsgStrippedSubjectMD5Part = 15, // and another unsigned long 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/kmmsgpart.cpp b/kmail/kmmsgpart.cpp index 447993db8..a76b8d021 100644 --- a/kmail/kmmsgpart.cpp +++ b/kmail/kmmsgpart.cpp @@ -20,7 +20,7 @@ #include <mimelib/string.h> #include <kiconloader.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <assert.h> diff --git a/kmail/kmmsgpart.h b/kmail/kmmsgpart.h index e4c41a402..9d69f87c8 100644 --- a/kmail/kmmsgpart.h +++ b/kmail/kmmsgpart.h @@ -58,7 +58,7 @@ public: **/ void setBodyFromUnicode( const TQString & str ); - /** Returns the body part decoded to tqunicode. + /** Returns the body part decoded to unicode. **/ TQString bodyToUnicode(const TQTextCodec* codec=0) const; diff --git a/kmail/kmmsgpartdlg.cpp b/kmail/kmmsgpartdlg.cpp index 31a1e9321..de9717785 100644 --- a/kmail/kmmsgpartdlg.cpp +++ b/kmail/kmmsgpartdlg.cpp @@ -23,7 +23,7 @@ // other TQt includes: #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqwhatsthis.h> #include <klineedit.h> #include <tqcheckbox.h> @@ -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 ); @@ -89,7 +89,7 @@ KMMsgPartDialog::KMMsgPartDialog( const TQString & caption, "<p>normally, you do not need to touch this setting, since the " "type of the file is automatically checked; but, sometimes, %1 " "may not detect the type correctly -- here is where you can fix " - "that.</p></qt>").tqarg( kapp->aboutData()->programName() ); + "that.</p></qt>").arg( kapp->aboutData()->programName() ); TQWhatsThis::add( mMimeType, msg ); // row 1: Size label: @@ -102,7 +102,7 @@ KMMsgPartDialog::KMMsgPartDialog( const TQString & caption, "because calculating the exact size would take too much time; " "when this is the case, it will be made visible by adding " "\"(est.)\" to the size displayed.</p></qt>") - .tqarg( kapp->aboutData()->programName() ); + .arg( kapp->aboutData()->programName() ); TQWhatsThis::add( mSize, msg ); // row 2: "Name" lineedit and label: @@ -148,7 +148,7 @@ KMMsgPartDialog::KMMsgPartDialog( const TQString & caption, "binary data, but consists of pure text -- in this case, choosing " "\"quoted-printable\" over the default \"base64\" will save up " "to 25% in resulting message size.</p></qt>") - .tqarg( kapp->aboutData()->programName() ); + .arg( kapp->aboutData()->programName() ); TQWhatsThis::add( label, msg ); TQWhatsThis::add( mEncoding, msg ); @@ -210,7 +210,7 @@ void KMMsgPartDialog::setMimeType( const TQString & mimeType ) { void KMMsgPartDialog::setMimeType( const TQString & type, const TQString & subtype ) { - setMimeType( TQString::tqfromLatin1("%1/%2").tqarg(type).tqarg(subtype) ); + setMimeType( TQString::fromLatin1("%1/%2").arg(type).arg(subtype) ); } void KMMsgPartDialog::setMimeTypeList( const TQStringList & mimeTypes ) { @@ -221,7 +221,7 @@ void KMMsgPartDialog::setSize( KIO::filesize_t size, bool estimated ) { TQString text = KIO::convertSize( size ); if ( estimated ) text = i18n("%1: a filesize incl. unit (e.g. \"1.3 KB\")", - "%1 (est.)").tqarg( text ); + "%1 (est.)").arg( text ); mSize->setText( text ); } diff --git a/kmail/kmpopfiltercnfrmdlg.cpp b/kmail/kmpopfiltercnfrmdlg.cpp index 987485969..b8037f7c1 100644 --- a/kmail/kmpopfiltercnfrmdlg.cpp +++ b/kmail/kmpopfiltercnfrmdlg.cpp @@ -12,7 +12,7 @@ #include "kmpopfiltercnfrmdlg.h" #include "kmheaders.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqheader.h> #include <tqcheckbox.h> @@ -292,7 +292,7 @@ KMPopFilterCnfrmDlg::KMPopFilterCnfrmDlg(TQPtrList<KMPopHeaders> *aHeaders, cons TQLabel *l = new TQLabel(i18n("Messages to filter found on POP Account: <b>%1</b><p>" "The messages shown exceed the maximum size limit you defined for this account.<br>You can select " - "what you want to do with them by checking the appropriate button.").tqarg(aAccount), w); + "what you want to do with them by checking the appropriate button.").arg(aAccount), w); vbl->addWidget(l); TQVGroupBox *upperBox = new TQVGroupBox(i18n("Messages Exceeding Size"), w); @@ -360,7 +360,7 @@ KMPopFilterCnfrmDlg::KMPopFilterCnfrmDlg(TQPtrList<KMPopHeaders> *aHeaders, cons } if(rulesetCount) - lowerBox->setTitle(i18n("Ruleset Filtered Messages: %1").tqarg(rulesetCount)); + lowerBox->setTitle(i18n("Ruleset Filtered Messages: %1").arg(rulesetCount)); // connect signals and slots connect(lv, TQT_SIGNAL(pressed(TQListViewItem*, const TQPoint&, int)), @@ -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..ea92f7ee6 100644 --- a/kmail/kmreaderwin.cpp +++ b/kmail/kmreaderwin.cpp @@ -111,11 +111,11 @@ using KMail::TeeHtmlWriter; #include <kasciistricmp.h> #include <kurldrag.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqhbox.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <tqpaintdevicemetrics.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqsplitter.h> #include <tqstyle.h> @@ -150,7 +150,7 @@ NewByteArray& NewByteArray::appendNULL() { TQByteArray::detach(); uint len1 = size(); - if ( !TQByteArray::tqresize( len1 + 1 ) ) + if ( !TQByteArray::resize( len1 + 1 ) ) return *this; *(data() + len1) = '\0'; return *this; @@ -162,7 +162,7 @@ NewByteArray& NewByteArray::operator+=( const char * newData ) TQByteArray::detach(); uint len1 = size(); uint len2 = tqstrlen( newData ); - if ( !TQByteArray::tqresize( len1 + len2 ) ) + if ( !TQByteArray::resize( len1 + len2 ) ) return *this; memcpy( data() + len1, newData, len2 ); return *this; @@ -174,7 +174,7 @@ NewByteArray& NewByteArray::operator+=( const TQByteArray & newData ) TQByteArray::detach(); uint len1 = size(); uint len2 = newData.size(); - if ( !TQByteArray::tqresize( len1 + len2 ) ) + if ( !TQByteArray::resize( len1 + len2 ) ) return *this; memcpy( data() + len1, newData.data(), len2 ); return *this; @@ -186,7 +186,7 @@ NewByteArray& NewByteArray::operator+=( const TQCString & newData ) TQByteArray::detach(); uint len1 = size(); uint len2 = newData.length(); // forget about the trailing 0x00 ! - if ( !TQByteArray::tqresize( len1 + len2 ) ) + if ( !TQByteArray::resize( len1 + len2 ) ) return *this; memcpy( data() + len1, newData.data(), len2 ); return *this; @@ -207,7 +207,7 @@ void KMReaderWin::objectTreeToDecryptedMsg( partNode* node, int recCount ) { kdDebug(5006) << TQString("-------------------------------------------------" ) << endl; - kdDebug(5006) << TQString("KMReaderWin::objectTreeToDecryptedMsg( %1 ) START").tqarg( recCount ) << endl; + kdDebug(5006) << TQString("KMReaderWin::objectTreeToDecryptedMsg( %1 ) START").arg( recCount ) << endl; if( node ) { kdDebug(5006) << node->typeString() << '/' << node->subTypeString() << endl; @@ -309,10 +309,10 @@ kdDebug(5006) << " new Content-Type = " << headers->ContentType( // B) Store the body of this part. if( headers && bIsMultipart && dataNode->firstChild() ) { -kdDebug(5006) << "is valid Multipart, processing tqchildren:" << endl; +kdDebug(5006) << "is valid Multipart, processing children:" << endl; TQCString boundary = headers->ContentType().Boundary().c_str(); curNode = dataNode->firstChild(); - // store tqchildren of multipart + // store children of multipart while( curNode ) { kdDebug(5006) << "--boundary" << endl; if( resultingData.size() && @@ -323,7 +323,7 @@ kdDebug(5006) << "--boundary" << endl; resultingData += boundary; resultingData += "\n"; // note: We are processing a harmless multipart that is *not* - // to be replaced by one of it's tqchildren, therefor + // to be replaced by one of it's children, therefor // we set their doStoreHeaders to true. objectTreeToDecryptedMsg( curNode, resultingData, @@ -336,7 +336,7 @@ kdDebug(5006) << "--boundary--" << endl; resultingData += "\n--"; resultingData += boundary; resultingData += "--\n\n"; -kdDebug(5006) << "Multipart processing tqchildren - DONE" << endl; +kdDebug(5006) << "Multipart processing children - DONE" << endl; } else if( part ){ // store simple part kdDebug(5006) << "is Simple part or invalid Multipart, storing body data .. DONE" << endl; @@ -360,7 +360,7 @@ kdDebug(5006) << " Root node will NOT be replaced." << endl recCount + 1 ); } } - kdDebug(5006) << TQString("\nKMReaderWin::objectTreeToDecryptedMsg( %1 ) END").tqarg( recCount ) << endl; + kdDebug(5006) << TQString("\nKMReaderWin::objectTreeToDecryptedMsg( %1 ) END").arg( recCount ) << endl; } @@ -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; } @@ -1285,11 +1285,11 @@ void KMReaderWin::displaySplashPage( const TQString &info ) TQString location = locate("data", "kmail/about/main.html"); TQString content = KPIM::kFileToString(location); - content = content.tqarg( locate( "data", "libtdepim/about/kde_infopage.css" ) ); + content = content.arg( locate( "data", "libtdepim/about/kde_infopage.css" ) ); if ( kapp->reverseLayout() ) - content = content.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "libtdepim/about/kde_infopage_rtl.css" ) ); + content = content.arg( "@import \"%1\";" ).arg( locate( "data", "libtdepim/about/kde_infopage_rtl.css" ) ); else - content = content.tqarg( "" ); + content = content.arg( "" ); mViewer->begin(KURL( location )); @@ -1297,7 +1297,7 @@ void KMReaderWin::displaySplashPage( const TQString &info ) TQString appTitle = i18n("KMail"); TQString catchPhrase = ""; //not enough space for a catch phrase at default window size i18n("Part of the Kontact Suite"); TQString quickDescription = i18n("The email client for the K Desktop Environment."); - mViewer->write(content.tqarg(fontSize).tqarg(appTitle).tqarg(catchPhrase).tqarg(quickDescription).tqarg(info)); + mViewer->write(content.arg(fontSize).arg(appTitle).arg(catchPhrase).arg(quickDescription).arg(info)); mViewer->end(); } @@ -1345,41 +1345,41 @@ void KMReaderWin::displayAboutPage() "<p>We hope that you will enjoy KMail.</p>\n" "<p>Thank you,</p>\n" "<p style='margin-bottom: 0px'> The KMail Team</p>") - .tqarg(KMAIL_VERSION) // KMail version - .tqarg("help:/kmail/index.html") // KMail help:// URL - .tqarg("http://kontact.kde.org/kmail/") // KMail homepage URL - .tqarg("1.8").tqarg("3.4"); // prior KMail and KDE version + .arg(KMAIL_VERSION) // KMail version + .arg("help:/kmail/index.html") // KMail help:// URL + .arg("http://kontact.kde.org/kmail/") // KMail homepage URL + .arg("1.8").arg("3.4"); // prior KMail and KDE version TQString featureItems; for ( int i = 0 ; i < numKMailNewFeatures ; i++ ) - featureItems += i18n("<li>%1</li>\n").tqarg( i18n( kmailNewFeatures[i] ) ); + featureItems += i18n("<li>%1</li>\n").arg( i18n( kmailNewFeatures[i] ) ); - info = info.tqarg( featureItems ); + info = info.arg( featureItems ); if( kmkernel->firstStart() ) { - info = info.tqarg( i18n("<p>Please take a moment to fill in the KMail " + info = info.arg( i18n("<p>Please take a moment to fill in the KMail " "configuration panel at Settings->Configure " "KMail.\n" "You need to create at least a default identity and " "an incoming as well as outgoing mail account." "</p>\n") ); } else { - info = info.tqarg( TQString() ); + info = info.arg( TQString() ); } if ( ( numKMailChanges > 1 ) || ( numKMailChanges == 1 && strlen(kmailChanges[0]) > 0 ) ) { TQString changesText = i18n("<p><span style='font-size:125%; font-weight:bold;'>" "Important changes</span> (compared to KMail %1):</p>\n") - .tqarg("1.8"); + .arg("1.8"); changesText += "<ul>\n"; for ( int i = 0 ; i < numKMailChanges ; i++ ) - changesText += i18n("<li>%1</li>\n").tqarg( i18n( kmailChanges[i] ) ); + changesText += i18n("<li>%1</li>\n").arg( i18n( kmailChanges[i] ) ); changesText += "</ul>\n"; - info = info.tqarg( changesText ); + info = info.arg( changesText ); } else - info = info.tqarg(""); // remove the %8 + info = info.arg(""); // remove the %8 displaySplashPage( info ); } @@ -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() ) @@ -2041,7 +2041,7 @@ void KMReaderWin::slotHandleAttachment( int choice ) if (!url.isValid() ) return; urls.append( url ); KURLDrag* drag = new KURLDrag( urls, this ); - TQApplication::tqclipboard()->setData( drag, TQClipboard::Clipboard ); + TQApplication::clipboard()->setData( drag, TQClipboard::Clipboard ); } else if ( choice == 10 ) { // Scroll To scrollToAttachment( node ); } @@ -2142,7 +2142,7 @@ void KMReaderWin::setMsgPart( KMMessagePart* aMsgPart, bool aHTML, } htmlWriter()->queue("</body></html>"); htmlWriter()->flush(); - mMainWindow->setCaption(i18n("View Attachment: %1").tqarg(pname)); + mMainWindow->setCaption(i18n("View Attachment: %1").arg(pname)); } else if (kasciistricmp(aMsgPart->typeStr(), "image")==0 || (kasciistricmp(aMsgPart->typeStr(), "application")==0 && kasciistricmp(aMsgPart->subtypeStr(), "postscript")==0)) @@ -2178,7 +2178,7 @@ void KMReaderWin::setMsgPart( KMMessagePart* aMsgPart, bool aHTML, "\" border=\"0\">\n" "</body></html>\n" ); htmlWriter()->end(); - setCaption( i18n("View Attachment: %1").tqarg( pname ) ); + setCaption( i18n("View Attachment: %1").arg( pname ) ); show(); delete iio; } else { @@ -2198,7 +2198,7 @@ void KMReaderWin::setMsgPart( KMMessagePart* aMsgPart, bool aHTML, htmlWriter()->queue( "</pre>" ); htmlWriter()->queue("</body></html>"); htmlWriter()->flush(); - mMainWindow->setCaption(i18n("View Attachment: %1").tqarg(pname)); + mMainWindow->setCaption(i18n("View Attachment: %1").arg(pname)); } // ---Sven's view text, html and image attachments in html widget end --- } @@ -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 */ ); @@ -2287,17 +2287,17 @@ void KMReaderWin::openAttachment( int id, const TQString & name ) if ( filenameText.isEmpty() ) filenameText = msgPart.name(); if ( offer ) { - open_text = i18n("&Open with '%1'").tqarg( offer->name() ); + open_text = i18n("&Open with '%1'").arg( offer->name() ); } else { open_text = i18n("&Open With..."); } const TQString text = i18n("Open attachment '%1'?\n" "Note that opening an attachment may compromise " "your system's security.") - .tqarg( filenameText ); + .arg( filenameText ); const int choice = KMessageBox::questionYesNoCancel( this, text, i18n("Open Attachment?"), KStdGuiItem::saveAs(), open_text, - TQString::tqfromLatin1("askSave") + mimetype->name() ); // dontAskAgainName + TQString::fromLatin1("askSave") + mimetype->name() ); // dontAskAgainName if( choice == KMessageBox::Yes ) { // Save mAtmUpdate = true; @@ -2738,7 +2738,7 @@ void KMReaderWin::fillCommandInfo( partNode *node, KMMessage **msg, int *nodeId void KMReaderWin::slotDeleteAttachment(partNode * node) { if ( KMessageBox::warningContinueCancel( this, - i18n("Deleting an attachment might tqinvalidate any digital signature on this message."), + i18n("Deleting an attachment might invalidate any digital signature on this message."), i18n("Delete Attachment"), KStdGuiItem::del(), "DeleteAttachmentSignatureWarning" ) != KMessageBox::Continue ) { return; @@ -2794,7 +2794,7 @@ void KMReaderWin::disconnectMsgAdded() void KMReaderWin::slotEditAttachment(partNode * node) { if ( KMessageBox::warningContinueCancel( this, - i18n("Modifying an attachment might tqinvalidate any digital signature on this message."), + i18n("Modifying an attachment might invalidate any digital signature on this message."), i18n("Edit Attachment"), KGuiItem( i18n("Edit"), "edit" ), "EditAttachmentSignatureWarning" ) != KMessageBox::Continue ) { return; @@ -2828,12 +2828,12 @@ void KMReaderWin::scrollToAttachment( const partNode *node ) DOM::Document doc = mViewer->htmlDocument(); // The anchors for this are created in ObjectTreeParser::parseObjectTree() - mViewer->gotoAnchor( TQString::tqfromLatin1( "att%1" ).tqarg( node->nodeId() ) ); + mViewer->gotoAnchor( TQString::fromLatin1( "att%1" ).arg( node->nodeId() ) ); // Remove any old color markings which might be there const partNode *root = node->topLevelParent(); for ( int i = 0; i <= root->totalChildCount() + 1; i++ ) { - DOM::Element attachmentDiv = doc.getElementById( TQString( "attachmentDiv%1" ).tqarg( i + 1 ) ); + DOM::Element attachmentDiv = doc.getElementById( TQString( "attachmentDiv%1" ).arg( i + 1 ) ); if ( !attachmentDiv.isNull() ) attachmentDiv.removeAttribute( "style" ); } @@ -2845,14 +2845,14 @@ void KMReaderWin::scrollToAttachment( const partNode *node ) // Now, color the div of the attachment in yellow, so that the user sees what happened. // We created a special marked div for this in writeAttachmentMarkHeader() in ObjectTreeParser, // find and modify that now. - DOM::Element attachmentDiv = doc.getElementById( TQString( "attachmentDiv%1" ).tqarg( node->nodeId() ) ); + DOM::Element attachmentDiv = doc.getElementById( TQString( "attachmentDiv%1" ).arg( node->nodeId() ) ); if ( attachmentDiv.isNull() ) { kdWarning( 5006 ) << "Could not find attachment div for attachment " << node->nodeId() << endl; return; } attachmentDiv.setAttribute( "style", TQString( "border:2px solid %1" ) - .tqarg( cssHelper()->pgpWarnColor().name() ) ); + .arg( cssHelper()->pgpWarnColor().name() ) ); // Update rendering, otherwise the rendering is not updated when the user clicks on an attachment // that causes scrolling and the open attachment dialog @@ -2880,7 +2880,7 @@ void KMReaderWin::injectAttachments() imgSrc.append( "attachmentQuicklistOpened.png" ); } - TQString html = renderAttachments( mRootNode, TQApplication::tqpalette().active().background() ); + TQString html = renderAttachments( mRootNode, TQApplication::palette().active().background() ); if ( html.isEmpty() ) return; @@ -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,9 +2930,9 @@ 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" - "vertical-align:middle; float:%3; %4\">").tqarg( bgColor.name() ).tqarg( margin ) - .tqarg( align ).tqarg( visibility ); + html += TQString::fromLatin1("<div style=\"background:%1; %2" + "vertical-align:middle; float:%3; %4\">").arg( bgColor.name() ).arg( margin ) + .arg( align ).arg( visibility ); html += subHtml; if ( node->msgPart().typeStr().lower() == "message" || node == mRootNode ) html += "</div>"; @@ -2941,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;\">" ).arg( 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/kmreaderwin.h b/kmail/kmreaderwin.h index 7d72cd787..0e102e64c 100644 --- a/kmail/kmreaderwin.h +++ b/kmail/kmreaderwin.h @@ -370,7 +370,7 @@ public slots: /** Refresh the reader window */ void updateReaderWin(); - /** HTML Widget scrollbar and tqlayout handling. */ + /** HTML Widget scrollbar and layout handling. */ void slotScrollUp(); void slotScrollDown(); void slotScrollPrior(); 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..f40f842f5 100644 --- a/kmail/kmsearchpatternedit.cpp +++ b/kmail/kmsearchpatternedit.cpp @@ -18,7 +18,7 @@ using KMail::RuleWidgetHandlerManager; #include <tqcombobox.h> #include <tqbuttongroup.h> #include <tqwidgetstack.h> -#include <tqlayout.h> +#include <layout.h> #include <assert.h> @@ -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..eda44482a 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(); @@ -387,7 +387,7 @@ void KMSender::doSendMsg() "\"outbox\" to the \"sent-mail\" folder failed.\n" "Possible reasons are lack of disk space or write permission. " "Please try to fix the problem and move the message manually.") - .tqarg(mCurrentMsg->subject())); + .arg(mCurrentMsg->subject())); cleanup(); return; } @@ -435,7 +435,7 @@ void KMSender::doSendMsg() "identity '%1' in the Identities " "section of the configuration dialog " "and then try again." ) - .tqarg( id.identityName() ) ); + .arg( id.identityName() ) ); mOutboxFolder->unGetMsg( mFailedMessages ); mCurrentMsg = 0; } @@ -455,7 +455,7 @@ void KMSender::doSendMsg() mSentMessages)); } else { seStatusMsg(i18n("%1 of %2 queued messages successfully sent.") - .tqarg(mSentMessages).tqarg( mTotalMessages )); + .arg(mSentMessages).arg( mTotalMessages )); } } cleanup(); @@ -536,7 +536,7 @@ void KMSender::doSendMsg() } bool KMSender::runPrecommand( const TQString & cmd ) { - seStatusMsg( i18n("Executing precommand %1").tqarg( cmd ) ); + seStatusMsg( i18n("Executing precommand %1").arg( cmd ) ); mPrecommand = new KMPrecommand( cmd ); connect( mPrecommand, TQT_SIGNAL(finished(bool)), TQT_SLOT(slotPrecommandFinished(bool)) ); @@ -596,8 +596,8 @@ void KMSender::doSendMsgAux() // start sending the current message seStatusMsg(i18n("%3: subject of message","Sending message %1 of %2: %3") - .tqarg(mSentMessages+mFailedMessages+1).tqarg(mTotalMessages) - .tqarg(mCurrentMsg->subject())); + .arg(mSentMessages+mFailedMessages+1).arg(mTotalMessages) + .arg(mCurrentMsg->subject())); TQStringList to, cc, bcc; TQString sender; extractSenderToCCAndBcc( mCurrentMsg, &sender, &to, &cc, &bcc ); @@ -696,8 +696,8 @@ void KMSender::slotIdle() "fix the problem (e.g. a broken address) or remove the message " "from the 'outbox' folder.\n" "The following transport protocol was used:\n %2") - .tqarg(errString) - .tqarg(mMethodStr); + .arg(errString) + .arg(mMethodStr); if (!errString.isEmpty()) KMessageBox::error(0,msg); seStatusMsg( i18n( "Sending aborted." ) ); } else { @@ -724,8 +724,8 @@ void KMSender::slotIdle() "from the 'outbox' folder.</p>" "<p>The following transport protocol was used: %2</p>" "<p>Do you want me to continue sending the remaining messages?</p>") - .tqarg(errString) - .tqarg(mMethodStr); + .arg(errString) + .arg(mMethodStr); res = KMessageBox::warningYesNo( 0 , msg , i18n( "Continue Sending" ), i18n( "&Continue Sending" ), i18n("&Abort Sending") ); @@ -735,8 +735,8 @@ void KMSender::slotIdle() "fix the problem (e.g. a broken address) or remove the message " "from the 'outbox' folder.\n" "The following transport protocol was used:\n %2") - .tqarg(errString) - .tqarg(mMethodStr); + .arg(errString) + .arg(mMethodStr); KMessageBox::error(0,msg); } if (res == KMessageBox::Yes) { @@ -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; @@ -934,8 +934,8 @@ bool KMSendSendmail::doStart() { "Please remove it from there if you do not want the message to " "be resent.\n" "The following transport protocol was used:\n %2") - .tqarg(str + "\n") - .tqarg("sendmail://"); + .arg(str + "\n") + .arg("sendmail://"); KMessageBox::information(0,msg); return false; } @@ -978,7 +978,7 @@ bool KMSendSendmail::doSend( const TQString & sender, const TQStringList & to, c if ( !mMailerProc->start( KProcess::NotifyOnExit, KProcess::All ) ) { KMessageBox::information( 0, i18n("Failed to execute mailer program %1") - .tqarg( mSender->transportInfo()->host ) ); + .arg( mSender->transportInfo()->host ) ); return false; } mMsgPos = mMsgStr.data(); diff --git a/kmail/kmstartup.cpp b/kmail/kmstartup.cpp index b5b0680da..264e4b05d 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" { @@ -165,7 +165,7 @@ void lockOrDie() { // On linux with /proc we can even check that it's really kmail and not something else char path_buffer[MAXPATHLEN + 1]; path_buffer[MAXPATHLEN] = 0; - const TQString procPath = TQString("/proc/%1/exe").tqarg(oldPid); + const TQString procPath = TQString("/proc/%1/exe").arg(oldPid); const int length = readlink (procPath.latin1(), path_buffer, MAXPATHLEN); if ( length == -1 ) // not such pid first_instance = true; @@ -199,17 +199,17 @@ void lockOrDie() { "this machine. Running %2 more than once " "can cause the loss of mail. You should not start %1 " "unless you are sure that it is not already running.") - .tqarg( programName, programName ); + .arg( programName, programName ); // TQString::arg( st ) only replaces the first occurrence of %1 // with st while TQString::arg( s1, s2 ) replacess all occurrences // of %1 with s1 and all occurrences of %2 with s2. So don't - // even think about changing the above to .tqarg( programName ). + // even think about changing the above to .arg( programName ). else msg = i18n("%1 seems to be running on another display on this " "machine. Running %1 and %2 at the same " "time can cause the loss of mail. You should not start %2 " "unless you are sure that %1 is not running.") - .tqarg( oldProgramName, programName ); + .arg( oldProgramName, programName ); } else { if ( oldAppName == appName ) @@ -217,19 +217,19 @@ void lockOrDie() { "than once can cause the loss of mail. You should not " "start %1 on this computer unless you are sure that it is " "not already running on %2.") - .tqarg( programName, oldHostName ); + .arg( programName, oldHostName ); else msg = i18n("%1 seems to be running on %3. Running %1 and %2 at the " "same time can cause the loss of mail. You should not " "start %2 on this computer unless you are sure that %1 is " "not running on %3.") - .tqarg( oldProgramName, programName, oldHostName ); + .arg( oldProgramName, programName, oldHostName ); } KCursorSaver idle( KBusyPtr::idle() ); if ( KMessageBox::No == KMessageBox::warningYesNo( 0, msg, TQString(), - i18n("Start %1").tqarg( programName ), + i18n("Start %1").arg( programName ), i18n("Exit") ) ) { exit(1); } diff --git a/kmail/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..a2afcf3d2 100644 --- a/kmail/kmtransport.cpp +++ b/kmail/kmtransport.cpp @@ -24,7 +24,7 @@ #include <tqbuttongroup.h> #include <tqcheckbox.h> -#include <tqlayout.h> +#include <layout.h> #include <klineedit.h> #include <tqradiobutton.h> #include <tqtabwidget.h> @@ -145,7 +145,7 @@ void KMTransportInfo::writeConfig(int id) "but should not be considered secure from decryption efforts " "if access to the configuration file is obtained.\n" "Do you want to store the password for account '%1' in the " - "configuration file?").tqarg( name ), + "configuration file?").arg( name ), i18n("KWallet Not Available"), KGuiItem( i18n("Store Password") ), KGuiItem( i18n("Do Not Store Password") ) ) @@ -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..1d8ac380e 100644 --- a/kmail/listjob.cpp +++ b/kmail/listjob.cpp @@ -44,7 +44,7 @@ using KPIM::ProgressManager; #include <kio/global.h> #include <klocale.h> -#include <tqstylesheet.h> +#include <stylesheet.h> #include <stdlib.h> @@ -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 @@ -174,7 +174,7 @@ void ListJob::slotListResult( KIO::Job* job ) if ( job->error() ) { mAccount->handleJobError( job, - i18n( "Error while listing folder %1: " ).tqarg((*it).path), + i18n( "Error while listing folder %1: " ).arg((*it).path), true ); } else { diff --git a/kmail/localsubscriptiondialog.cpp b/kmail/localsubscriptiondialog.cpp index ca5f2cc9a..3b6f55dc8 100644 --- a/kmail/localsubscriptiondialog.cpp +++ b/kmail/localsubscriptiondialog.cpp @@ -72,7 +72,7 @@ void LocalSubscriptionDialog::processFolderListing() uint done = 0; for (uint i = mCount; i < mFolderNames.count(); ++i) { - // give the dialog a chance to tqrepaint + // give the dialog a chance to repaint if (done == 1000) { emit listChanged(); diff --git a/kmail/mailinglistpropertiesdialog.cpp b/kmail/mailinglistpropertiesdialog.cpp index 85c0c3408..15749d71e 100644 --- a/kmail/mailinglistpropertiesdialog.cpp +++ b/kmail/mailinglistpropertiesdialog.cpp @@ -25,7 +25,7 @@ ** you do not wish to do so, delete this exception statement from ** your version. *******************************************************************************/ -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqcombobox.h> #include <tqgroupbox.h> @@ -55,12 +55,12 @@ MailingListFolderPropertiesDialog::MailingListFolderPropertiesDialog( TQWidget* TQLabel* label; mLastItem = 0; - TQVBoxLayout *topLayout = new TQVBoxLayout( tqlayout(), spacingHint(), + TQVBoxLayout *topLayout = new TQVBoxLayout( layout(), spacingHint(), "topLayout" ); TQGroupBox *mlGroup = new TQGroupBox( i18n("Associated Mailing List" ), this ); mlGroup->setColumnLayout( 0, Qt::Vertical ); - TQGridLayout *groupLayout = new TQGridLayout( mlGroup->tqlayout(), 6, 3, spacingHint() ); + TQGridLayout *groupLayout = new TQGridLayout( mlGroup->layout(), 6, 3, spacingHint() ); topLayout->addWidget( mlGroup ); setMainWidget( mlGroup ); @@ -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..ab8675050 100644 --- a/kmail/managesievescriptsdialog.cpp +++ b/kmail/managesievescriptsdialog.cpp @@ -15,9 +15,9 @@ #include <kglobalsettings.h> #include <kmessagebox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlistview.h> -#include <tqtextedit.h> +#include <textedit.h> #include <tqpopupmenu.h> #include <cassert> @@ -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(); } @@ -253,7 +253,7 @@ void KMail::ManageSieveScriptsDialog::slotDeleteScript() { u.setFileName( mContextMenuItem->text( 0 ) ); - if ( KMessageBox::warningContinueCancel( this, i18n( "Really delete script \"%1\" from the server?" ).tqarg( u.fileName() ), + if ( KMessageBox::warningContinueCancel( this, i18n( "Really delete script \"%1\" from the server?" ).arg( u.fileName() ), i18n( "Delete Sieve Script Confirmation" ), KStdGuiItem::del() ) != KMessageBox::Continue ) @@ -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/managesievescriptsdialog_p.h b/kmail/managesievescriptsdialog_p.h index f860ffb52..fb19f0f9d 100644 --- a/kmail/managesievescriptsdialog_p.h +++ b/kmail/managesievescriptsdialog_p.h @@ -3,7 +3,7 @@ #include <kdialogbase.h> -#include <tqtextedit.h> +#include <textedit.h> namespace KMail { 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..dadc653f4 100644 --- a/kmail/messagecomposer.cpp +++ b/kmail/messagecomposer.cpp @@ -75,8 +75,8 @@ #include <kdebug.h> #include <kaction.h> #include <tqfile.h> -#include <tqtextcodec.h> -#include <tqtextedit.h> +#include <textcodec.h> +#include <textedit.h> #include <tqtimer.h> #include <gpgmepp/key.h> @@ -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; @@ -2038,7 +2038,7 @@ bool MessageComposer::processStructuringInfo( const TQString bugURL, i18n( "<qt><p>Error: The backend did not return " "any encoded data.</p>" "<p>Please report this bug:<br>%2</p></qt>" ) - .tqarg( bugURL ) ); + .arg( bugURL ) ); bOk = false; } resultingPart.setBodyEncodedBinary( resultingBody ); @@ -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/networkaccount.cpp b/kmail/networkaccount.cpp index 23ebea559..145ab2b2d 100644 --- a/kmail/networkaccount.cpp +++ b/kmail/networkaccount.cpp @@ -224,7 +224,7 @@ namespace KMail { "but should not be considered secure from decryption efforts " "if access to the configuration file is obtained.\n" "Do you want to store the password for account '%1' in the " - "configuration file?").tqarg( name() ), + "configuration file?").arg( name() ), i18n("KWallet Not Available"), KGuiItem( i18n("Store Password") ), KGuiItem( i18n("Do Not Store Password") ) ) diff --git a/kmail/newfolderdialog.cpp b/kmail/newfolderdialog.cpp index e6fed27be..13e2c6b72 100644 --- a/kmail/newfolderdialog.cpp +++ b/kmail/newfolderdialog.cpp @@ -31,7 +31,7 @@ #include <tqlabel.h> #include <tqlineedit.h> #include <tqcombobox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtooltip.h> #include <tqwhatsthis.h> #include <tqregexp.h> @@ -66,7 +66,7 @@ NewFolderDialog::NewFolderDialog( TQWidget* parent, KMFolder *folder ) { setWFlags( getWFlags() | WDestructiveClose ); if ( mFolder ) { - setCaption( i18n("New Subfolder of %1").tqarg( mFolder->prettyURL() ) ); + setCaption( i18n("New Subfolder of %1").arg( mFolder->prettyURL() ) ); } TQWidget* privateLayoutWidget = new TQWidget( this, "mTopLevelLayout" ); privateLayoutWidget->setGeometry( TQRect( 10, 10, 260, 80 ) ); @@ -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()); } @@ -213,14 +213,14 @@ void NewFolderDialog::slotOk() && ( selectedFolderDir == mFolder->parent() ) && ( mFolder->storage()->name() == fldName ) ) ) ) { - const TQString message = i18n( "<qt>Failed to create folder <b>%1</b>, folder already exists.</qt>" ).tqarg(fldName); + const TQString message = i18n( "<qt>Failed to create folder <b>%1</b>, folder already exists.</qt>" ).arg(fldName); KMessageBox::error( this, message ); return; } /* Ok, obvious errors caught, let's try creating it for real. */ const TQString message = i18n( "<qt>Failed to create folder <b>%1</b>." - "</qt> " ).tqarg(fldName); + "</qt> " ).arg(fldName); TQString namespaceName; if ( mNamespacesComboBox ) { diff --git a/kmail/objecttreeparser.cpp b/kmail/objecttreeparser.cpp index 0e5103e29..0b827cc79 100644 --- a/kmail/objecttreeparser.cpp +++ b/kmail/objecttreeparser.cpp @@ -98,7 +98,7 @@ #include <kmdcodec.h> // other TQt headers -#include <tqtextcodec.h> +#include <textcodec.h> #include <tqdir.h> #include <tqfile.h> #include <tqapplication.h> @@ -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\"/>").arg( 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"); } @@ -686,11 +686,11 @@ namespace KMail { switch ( cryptPlugError ) { case NOT_INITIALIZED: errorMsg = i18n( "Crypto plug-in \"%1\" is not initialized." ) - .tqarg( cryptPlugLibName ); + .arg( cryptPlugLibName ); break; case CANT_VERIFY_SIGNATURES: errorMsg = i18n( "Crypto plug-in \"%1\" cannot verify signatures." ) - .tqarg( cryptPlugLibName ); + .arg( cryptPlugLibName ); break; case NO_PLUGIN: if ( cryptPlugDisplayName.isEmpty() ) @@ -698,14 +698,14 @@ namespace KMail { else errorMsg = i18n( "%1 is either 'OpenPGP' or 'S/MIME'", "No %1 plug-in was found." ) - .tqarg( cryptPlugDisplayName ); + .arg( cryptPlugDisplayName ); break; } messagePart.errorText = i18n( "The message is signed, but the " "validity of the signature cannot be " "verified.<br />" "Reason: %1" ) - .tqarg( errorMsg ); + .arg( errorMsg ); } if ( mReader ) @@ -887,9 +887,9 @@ bool ObjectTreeParser::okDecryptMIME( partNode& data, + "</div>"; if ( !passphraseError ) aErrorText = i18n("Crypto plug-in \"%1\" could not decrypt the data.") - .tqarg( cryptPlugLibName ) + .arg( cryptPlugLibName ) + "<br />" - + i18n("Error: %1").tqarg( aErrorText ); + + i18n("Error: %1").arg( aErrorText ); } } } @@ -901,11 +901,11 @@ bool ObjectTreeParser::okDecryptMIME( partNode& data, switch ( cryptPlugError ) { case NOT_INITIALIZED: aErrorText = i18n( "Crypto plug-in \"%1\" is not initialized." ) - .tqarg( cryptPlugLibName ); + .arg( cryptPlugLibName ); break; case CANT_DECRYPT: aErrorText = i18n( "Crypto plug-in \"%1\" cannot decrypt messages." ) - .tqarg( cryptPlugLibName ); + .arg( cryptPlugLibName ); break; case NO_PLUGIN: aErrorText = i18n( "No appropriate crypto plug-in was found." ); @@ -1656,7 +1656,7 @@ namespace KMail { const GpgME::ImportResult res = import->exec( certData ); if ( res.error() ) { htmlWriter()->queue( i18n( "Sorry, certificate could not be imported.<br>" - "Reason: %1").tqarg( TQString::fromLocal8Bit( res.error().asString() ) ) ); + "Reason: %1").arg( TQString::fromLocal8Bit( res.error().asString() ) ) ); return true; } @@ -1696,14 +1696,14 @@ namespace KMail { for ( std::vector<GpgME::Import>::const_iterator it = imports.begin() ; it != imports.end() ; ++it ) { if ( (*it).error() ) htmlWriter()->queue( i18n( "Failed: %1 (%2)" ) - .tqarg( (*it).fingerprint(), + .arg( (*it).fingerprint(), TQString::fromLocal8Bit( (*it).error().asString() ) ) ); else if ( (*it).status() & ~GpgME::Import::ContainedSecretKey ) { if ( (*it).status() & GpgME::Import::ContainedSecretKey ) { - htmlWriter()->queue( i18n( "New or changed: %1 (secret key available)" ).tqarg( (*it).fingerprint() ) ); + htmlWriter()->queue( i18n( "New or changed: %1 (secret key available)" ).arg( (*it).fingerprint() ) ); } else { - htmlWriter()->queue( i18n( "New or changed: %1" ).tqarg( (*it).fingerprint() ) ); + htmlWriter()->queue( i18n( "New or changed: %1" ).arg( (*it).fingerprint() ) ); } } htmlWriter()->queue( "<br>" ); @@ -2054,7 +2054,7 @@ bool ObjectTreeParser::processApplicationMsTnefSubtype( partNode *node, ProcessR TQString fileName = mReader->writeMessagePartToTempFile( msgPart, partNum ); - TQString href = TQString( "attachment:%1?place=body" ).tqarg( partNum ); + TQString href = TQString( "attachment:%1?place=body" ).arg( partNum ); TQString iconName; if( inlineImage ) @@ -2280,7 +2280,7 @@ static TQString writeSimpleSigstatHeader( const PartMetaData &block ) if ( addr.isEmpty() ) { html += i18n( "Signature is valid." ); } else { - html += i18n( "Signed by <a href=\"mailto:%1\">%2</a>." ).tqarg( addr, name ); + html += i18n( "Signed by <a href=\"mailto:%1\">%2</a>." ).arg( addr, name ); } } else { // should not happen @@ -2307,7 +2307,7 @@ static TQString makeShowAuditLogLink( const GpgME::Error & err, const TQString & //kdDebug(5006) << "makeShowAuditLogLink: not showing link (not available)" << endl; return i18n("No Audit Log available"); } else { - return i18n("Error Retrieving Audit Log: %1").tqarg( TQString::fromLocal8Bit( err.asString() ) ); + return i18n("Error Retrieving Audit Log: %1").arg( TQString::fromLocal8Bit( err.asString() ) ); } } @@ -2371,7 +2371,7 @@ TQString ObjectTreeParser::writeSigstatHeader( PartMetaData & block, else { htmlStr += i18n("Encrypted message (decryption not possible)"); if( !block.errorText.isEmpty() ) - htmlStr += "<br />" + i18n("Reason: %1").tqarg( block.errorText ); + htmlStr += "<br />" + i18n("Reason: %1").arg( block.errorText ); } htmlStr += "</td></tr><tr class=\"encrB\"><td>"; } @@ -2428,13 +2428,13 @@ TQString ObjectTreeParser::writeSigstatHeader( PartMetaData & block, if( isSMIME ) startKeyHREF = TQString("<a href=\"kmail:showCertificate#%1 ### %2 ### %3\">") - .tqarg( cryptProto->displayName(), + .arg( cryptProto->displayName(), cryptProto->name(), block.keyId ); TQString keyWithWithoutURL = isSMIME ? TQString("%1%2</a>") - .tqarg( startKeyHREF, + .arg( startKeyHREF, cannotCheckSignature ? i18n("[Details]") : ("0x" + block.keyId) ) : "0x" + TQString::fromUtf8( block.keyId ); @@ -2486,7 +2486,7 @@ TQString ObjectTreeParser::writeSigstatHeader( PartMetaData & block, i18n("Warning:") + "</u> " + i18n("Sender's mail address is not stored " - "in the %1 used for signing.").tqarg(certificate) + + "in the %1 used for signing.").arg(certificate) + "<br />" + i18n("sender: ") + msgFrom + @@ -2512,7 +2512,7 @@ TQString ObjectTreeParser::writeSigstatHeader( PartMetaData & block, "</u> " + i18n("No mail address is stored in the %1 used for signing, " "so we cannot compare it to the sender's address %2.") - .tqarg(certificate,msgFrom); + .arg(certificate,msgFrom); } if( !greenCaseWarning.isEmpty() ) { if( !statusStr.isEmpty() ) @@ -2535,7 +2535,7 @@ TQString ObjectTreeParser::writeSigstatHeader( PartMetaData & block, if( cannotCheckSignature ) { htmlStr += i18n( "Not enough information to check " "signature. %1" ) - .tqarg( keyWithWithoutURL ); + .arg( keyWithWithoutURL ); } else { @@ -2553,26 +2553,26 @@ TQString ObjectTreeParser::writeSigstatHeader( PartMetaData & block, htmlStr += i18n( "Message was signed with unknown key." ); else htmlStr += i18n( "Message was signed by %1." ) - .tqarg( signer ); + .arg( signer ); } else { TQDateTime created = block.creationTime; if( created.isValid() ) { if( signer.isEmpty() ) { if( onlyShowKeyURL ) htmlStr += i18n( "Message was signed with key %1." ) - .tqarg( keyWithWithoutURL ); + .arg( keyWithWithoutURL ); else htmlStr += i18n( "Message was signed on %1 with key %2." ) - .tqarg( KGlobal::locale()->formatDateTime( created ), + .arg( KGlobal::locale()->formatDateTime( created ), keyWithWithoutURL ); } else { if( onlyShowKeyURL ) htmlStr += i18n( "Message was signed with key %1." ) - .tqarg( keyWithWithoutURL ); + .arg( keyWithWithoutURL ); else htmlStr += i18n( "Message was signed by %3 on %1 with key %2" ) - .tqarg( KGlobal::locale()->formatDateTime( created ), + .arg( KGlobal::locale()->formatDateTime( created ), keyWithWithoutURL, signer ); } @@ -2580,10 +2580,10 @@ TQString ObjectTreeParser::writeSigstatHeader( PartMetaData & block, else { if( signer.isEmpty() || onlyShowKeyURL ) htmlStr += i18n( "Message was signed with key %1." ) - .tqarg( keyWithWithoutURL ); + .arg( keyWithWithoutURL ); else htmlStr += i18n( "Message was signed by %2 with key %1." ) - .tqarg( keyWithWithoutURL, + .arg( keyWithWithoutURL, signer ); } } @@ -2621,11 +2621,11 @@ TQString ObjectTreeParser::writeSigstatHeader( PartMetaData & block, TQDateTime created = block.creationTime; if ( created.isValid() ) htmlStr += i18n( "Message was signed on %1 with unknown key %2." ) - .tqarg( KGlobal::locale()->formatDateTime( created ), + .arg( KGlobal::locale()->formatDateTime( created ), keyWithWithoutURL ); else htmlStr += i18n( "Message was signed with unknown key %1." ) - .tqarg( keyWithWithoutURL ); + .arg( keyWithWithoutURL ); } else htmlStr += i18n( "Message was signed with unknown key." ); @@ -2663,10 +2663,10 @@ TQString ObjectTreeParser::writeSigstatHeader( PartMetaData & block, simpleHtmlStr += writeSimpleSigstatHeader( block ); if( !block.keyId.isEmpty() ) htmlStr += i18n( "Message was signed by %2 (Key ID: %1)." ) - .tqarg( keyWithWithoutURL, + .arg( keyWithWithoutURL, signer ); else - htmlStr += i18n( "Message was signed by %1." ).tqarg( signer ); + htmlStr += i18n( "Message was signed by %1." ).arg( signer ); htmlStr += "<br />"; switch( block.keyTrust ) @@ -2707,10 +2707,10 @@ TQString ObjectTreeParser::writeSigstatHeader( PartMetaData & block, simpleHtmlStr += writeSimpleSigstatHeader( block ); if( !block.keyId.isEmpty() ) htmlStr += i18n( "Message was signed by %2 (Key ID: %1)." ) - .tqarg( keyWithWithoutURL, + .arg( keyWithWithoutURL, signer ); else - htmlStr += i18n( "Message was signed by %1." ).tqarg( signer ); + htmlStr += i18n( "Message was signed by %1." ).arg( signer ); htmlStr += "<br />"; htmlStr += i18n("Warning: The signature is bad."); frame = "</td></tr>" @@ -2763,7 +2763,7 @@ void ObjectTreeParser::writeAttachmentMarkHeader( partNode *node ) if ( !mReader ) return; - htmlWriter()->queue( TQString( "<div id=\"attachmentDiv%1\">\n" ).tqarg( node->nodeId() ) ); + htmlWriter()->queue( TQString( "<div id=\"attachmentDiv%1\">\n" ).arg( node->nodeId() ) ); } //----------------------------------------------------------------------------- @@ -2798,7 +2798,7 @@ void ObjectTreeParser::writeBodyStr( const TQCString& aStr, const TQTextCodec *a bool isPgpMessage = false; // true if the message contains at least one // PGP MESSAGE or one PGP SIGNED MESSAGE block TQString dir = ( TQApplication::reverseLayout() ? "rtl" : "ltr" ); - TQString headerStr = TQString("<div dir=\"%1\">").tqarg(dir); + TQString headerStr = TQString("<div dir=\"%1\">").arg(dir); inlineSignatureState = KMMsgNotSigned; inlineEncryptionState = KMMsgNotEncrypted; @@ -2970,7 +2970,7 @@ TQString ObjectTreeParser::quotedHTML( const TQString& s, bool decorate ) const unsigned int length = s.length(); // skip leading empty lines - for ( pos = 0; pos < length && s.tqat(pos) <= TQChar(' '); pos++ ) { ; } + for ( pos = 0; pos < length && s.at(pos) <= TQChar(' '); pos++ ) { ; } while (pos > 0 && (s[pos-1] == ' ' || s[pos-1] == '\t')) pos--; beg = pos; @@ -3051,8 +3051,8 @@ TQString ObjectTreeParser::quotedHTML( const TQString& s, bool decorate ) htmlStr += "<div class=\"quotelevelmark\" >" ; htmlStr += TQString( "<a href=\"kmail:levelquote?%1 \">" "<img src=\"%2\" alt=\"\" title=\"\"/></a>" ) - .tqarg(-1) - .tqarg( mExpandIcon ); + .arg(-1) + .arg( mExpandIcon ); htmlStr += "</div><br/>"; htmlStr += quoteEnd; } @@ -3060,8 +3060,8 @@ TQString ObjectTreeParser::quotedHTML( const TQString& s, bool decorate ) htmlStr += "<div class=\"quotelevelmark\" >" ; htmlStr += TQString( "<a href=\"kmail:levelquote?%1 \">" "<img src=\"%2\" alt=\"\" title=\"\"/></a>" ) - .tqarg(actQuoteLevel) - .tqarg( mCollapseIcon); + .arg(actQuoteLevel) + .arg( mCollapseIcon); htmlStr += "</div>"; if ( actQuoteLevel < 3 ) htmlStr += quoteFontTag[actQuoteLevel]; @@ -3085,7 +3085,7 @@ TQString ObjectTreeParser::quotedHTML( const TQString& s, bool decorate ) // ignore ^M DOS linebreaks if( !line.replace('\015', "").isEmpty() ) { - htmlStr +=TQString( "<div dir=\"%1\">" ).tqarg( line.isRightToLeft() ? "rtl":"ltr" ); + htmlStr +=TQString( "<div dir=\"%1\">" ).arg( line.isRightToLeft() ? "rtl":"ltr" ); htmlStr += LinkLocator::convertToHtml( line, convertFlags ); htmlStr += TQString( "</div>" ); } diff --git a/kmail/objecttreeparser.h b/kmail/objecttreeparser.h index b864ea618..f9e71427a 100644 --- a/kmail/objecttreeparser.h +++ b/kmail/objecttreeparser.h @@ -169,13 +169,13 @@ namespace KMail { KMail::CSSHelper * cssHelper() const { return mCSSHelper; } /** Parse beginning at a given node and recursively parsing - the tqchildren of that node and it's next sibling. */ + the children of that node and it's next sibling. */ // Function is called internally by "parseMsg(KMMessage* msg)" // and it will be replaced once KMime is alive. void parseObjectTree( partNode * node ); private: - /** Standard tqchildren handling a.k.a. multipart/mixed (w/o + /** Standard children handling a.k.a. multipart/mixed (w/o kroupware hacks) */ void stdChildHandling( partNode * child ); diff --git a/kmail/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..705a0e2cc 100644 --- a/kmail/partNode.cpp +++ b/kmail/partNode.cpp @@ -209,7 +209,7 @@ void partNode::buildObjectTree( bool processSiblings ) && curNode->dwPart()->Next() ) ) { curNode = curNode->mRoot; } - // we might have to leave when all tqchildren have been processed + // we might have to leave when all children have been processed if( this == curNode && !processSiblings ) return; // store next node @@ -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(); @@ -279,7 +279,7 @@ KMMsgEncryptionState partNode::overallEncryptionState() const { KMMsgEncryptionState myState = KMMsgEncryptionStateUnknown; if( mEncryptionState == KMMsgNotEncrypted ) { - // NOTE: tqchildren are tested ONLY when parent is not encrypted + // NOTE: children are tested ONLY when parent is not encrypted if( mChild ) myState = mChild->overallEncryptionState(); else @@ -320,7 +320,7 @@ KMMsgSignatureState partNode::overallSignatureState() const { KMMsgSignatureState myState = KMMsgSignatureStateUnknown; if( mSignatureState == KMMsgNotSigned ) { - // tqchildren are tested ONLY when parent is not signed + // children are tested ONLY when parent is not signed if( mChild ) myState = mChild->overallSignatureState(); else @@ -746,7 +746,7 @@ void partNode::setDisplayedHidden( bool displayedHidden ) TQString partNode::asHREF( const TQString &place ) const { - return TQString( "attachment:%1?place=%2" ).tqarg( nodeId() ).tqarg( place ); + return TQString( "attachment:%1?place=%2" ).arg( nodeId() ).arg( place ); } partNode::AttachmentDisplayInfo partNode::attachmentDisplayInfo() const diff --git a/kmail/partNode.h b/kmail/partNode.h index a043e1403..242223a31 100644 --- a/kmail/partNode.h +++ b/kmail/partNode.h @@ -150,10 +150,10 @@ public: return mEncryptionState; } - // look at the encryption states of all tqchildren and return result + // look at the encryption states of all children and return result KMMsgEncryptionState overallEncryptionState() const ; - // look at the signature states of all tqchildren and return result + // look at the signature states of all children and return result KMMsgSignatureState overallSignatureState() const ; void setSignatureState( KMMsgSignatureState state ) { diff --git a/kmail/partnodebodypart.cpp b/kmail/partnodebodypart.cpp index d7e6c95d0..45ce28620 100644 --- a/kmail/partnodebodypart.cpp +++ b/kmail/partnodebodypart.cpp @@ -49,8 +49,8 @@ TQString KMail::PartNodeBodyPart::makeLink( const TQString & path ) const { static const int utf8 = 106; // FIXME: use a PRNG for the first arg, instead of a serial number return TQString( "x-kmail:/bodypart/%1/%2/%3" ) - .tqarg( serial++ ).tqarg( mPartNode.nodeId() ) - .tqarg( KURL::encode_string_no_slash( path, utf8 ) ); + .arg( serial++ ).arg( mPartNode.nodeId() ) + .arg( KURL::encode_string_no_slash( path, utf8 ) ); } TQString KMail::PartNodeBodyPart::asText() const { diff --git a/kmail/popaccount.cpp b/kmail/popaccount.cpp index a37bc6d58..2fcf3597f 100644 --- a/kmail/popaccount.cpp +++ b/kmail/popaccount.cpp @@ -47,7 +47,7 @@ using KPIM::BroadcastStatus; #include <kconfig.h> using KIO::MetaData; -#include <tqstylesheet.h> +#include <stylesheet.h> static const unsigned short int pop3DefaultPort = 110; @@ -167,7 +167,7 @@ void PopAccount::processNewMail(bool _interactive) } TQString seenUidList = locateLocal( "data", "kmail/" + mLogin + ":" + "@" + - mHost + ":" + TQString("%1").tqarg(mPort) ); + mHost + ":" + TQString("%1").arg(mPort) ); KConfig config( seenUidList ); TQStringList uidsOfSeenMsgs = config.readListEntry( "seenUidList" ); TQValueList<int> timeOfSeenMsgs = config.readIntListEntry( "seenUidTimeList" ); @@ -370,7 +370,7 @@ void PopAccount::startJob() if (!runPrecommand(precommand())) { KMessageBox::sorry(0, - i18n("Could not execute precommand: %1").tqarg(precommand()), + i18n("Could not execute precommand: %1").arg(precommand()), i18n("KMail Error Message")); checkDone( false, CheckError ); return; @@ -401,7 +401,7 @@ void PopAccount::startJob() mMailCheckProgressItem = KPIM::ProgressManager::createProgressItem( "MailCheck" + mName, escapedName, - i18n("Preparing transmission from \"%1\"...").tqarg( escapedName ), + i18n("Preparing transmission from \"%1\"...").arg( escapedName ), true, // can be canceled useSSL() || useTLS() ); connect( mMailCheckProgressItem, TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem* ) ), @@ -496,7 +496,7 @@ void PopAccount::slotJobFinished() { "the UIDL command: this command is required to determine, in a reliable way, " "which of the mails on the server KMail has already seen before;\n" "the feature to leave the mails on the server will therefore not " - "work properly.").tqarg(NetworkAccount::name()) ); + "work properly.").arg(NetworkAccount::name()) ); // An attempt to work around buggy pop servers, these seem to be popular. mUidsOfNextSeenMsgsDict = mUidsOfSeenMsgsDict; } @@ -747,21 +747,21 @@ void PopAccount::slotJobFinished() { if ( !idsOfMsgsToDelete.isEmpty() ) { stage = Dele; if ( mMailCheckProgressItem ) - mMailCheckProgressItem->setqStatus( + mMailCheckProgressItem->seStatus( i18n( "Fetched 1 message from %1. Deleting messages from server...", "Fetched %n messages from %1. Deleting messages from server...", numMsgs ) - .tqarg( mHost ) ); + .arg( mHost ) ); url.setPath("/remove/" + idsOfMsgsToDelete.join(",")); kdDebug(5006) << "url: " << url.prettyURL() << endl; } else { stage = Quit; if ( mMailCheckProgressItem ) - mMailCheckProgressItem->setqStatus( + mMailCheckProgressItem->seStatus( i18n( "Fetched 1 message from %1. Terminating transmission...", "Fetched %n messages from %1. Terminating transmission...", numMsgs ) - .tqarg( mHost ) ); + .arg( mHost ) ); url.setPath(TQString("/commit")); kdDebug(5006) << "url: " << url.prettyURL() << endl; } @@ -777,11 +777,11 @@ void PopAccount::slotJobFinished() { } idsOfMsgsToDelete.clear(); if ( mMailCheckProgressItem ) - mMailCheckProgressItem->setqStatus( + mMailCheckProgressItem->seStatus( i18n( "Fetched 1 message from %1. Terminating transmission...", "Fetched %n messages from %1. Terminating transmission...", numMsgs ) - .tqarg( mHost ) ); + .arg( mHost ) ); KURL url = getUrl(); url.setPath(TQString("/commit")); job = KIO::get( url, false, false ); @@ -841,7 +841,7 @@ void PopAccount::saveUidList() seenUidTimeList.append( mTimeOfNextSeenMsgsMap[it.currentKey()] ); } TQString seenUidList = locateLocal( "data", "kmail/" + mLogin + ":" + "@" + - mHost + ":" + TQString("%1").tqarg(mPort) ); + mHost + ":" + TQString("%1").arg(mPort) ); KConfig config( seenUidList ); config.writeEntry( "seenUidList", uidsOfNextSeenMsgs ); config.writeEntry( "seenUidTimeList", seenUidTimeList ); @@ -867,7 +867,7 @@ void PopAccount::slotGetNextMsg() curMsgStrm = new TQDataStream( curMsgData, IO_WriteOnly ); curMsgLen = nextLen; ++indexOfCurrentMsg; - kdDebug(5006) << TQString("Length of message about to get %1").tqarg( nextLen ) << endl; + kdDebug(5006) << TQString("Length of message about to get %1").arg( nextLen ) << endl; mMsgsPendingDownload.remove( next.key() ); } } @@ -904,16 +904,16 @@ void PopAccount::slotData( KIO::Job* job, const TQByteArray &data) { msg = i18n("Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 " "(%7 KB remain on the server).") - .tqarg(indexOfCurrentMsg+1).tqarg(numMsgs).tqarg(numBytesRead/1024) - .tqarg(numBytesToRead/1024).tqarg(mLogin).tqarg(mHost).tqarg(numBytes/1024); + .arg(indexOfCurrentMsg+1).arg(numMsgs).arg(numBytesRead/1024) + .arg(numBytesToRead/1024).arg(mLogin).arg(mHost).arg(numBytes/1024); } else { msg = i18n("Fetching message %1 of %2 (%3 of %4 KB) for %5@%6.") - .tqarg(indexOfCurrentMsg+1).tqarg(numMsgs).tqarg(numBytesRead/1024) - .tqarg(numBytesToRead/1024).tqarg(mLogin).tqarg(mHost); + .arg(indexOfCurrentMsg+1).arg(numMsgs).arg(numBytesRead/1024) + .arg(numBytesToRead/1024).arg(mLogin).arg(mHost); } - mMailCheckProgressItem->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/quotajobs.h b/kmail/quotajobs.h index 58b2af575..e53a4f18e 100644 --- a/kmail/quotajobs.h +++ b/kmail/quotajobs.h @@ -73,8 +73,8 @@ class QuotaInfo { if ( isValid() && !isEmpty() ) { readConfig(); int factor = static_cast<int> ( pow( 1000, mFactor ) ); - return i18n("%1 of %2 %3 used").tqarg( mCurrent.toInt() / factor ) - .tqarg( mMax.toInt() / factor ).tqarg( mUnits ); + return i18n("%1 of %2 %3 used").arg( mCurrent.toInt() / factor ) + .arg( mMax.toInt() / factor ).arg( mUnits ); } return TQString(); } diff --git a/kmail/recipientseditor.cpp b/kmail/recipientseditor.cpp index 5b18e044b..2a21d7f05 100644 --- a/kmail/recipientseditor.cpp +++ b/kmail/recipientseditor.cpp @@ -39,14 +39,14 @@ #include <kiconloader.h> #include <kmessagebox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqscrollview.h> #include <tqcombobox.h> #include <tqhbox.h> #include <tqtimer.h> #include <tqpushbutton.h> -#include <tqstylesheet.h> +#include <stylesheet.h> Recipient::Recipient( const TQString &email, Recipient::Type type ) : mEmail( email ), mType( type ) @@ -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 ); @@ -536,7 +536,7 @@ void RecipientsView::resizeView() // setFixedHeight( mLineHeight * mLines.count() ); } - parentWidget()->tqlayout()->activate(); + parentWidget()->layout()->activate(); emit sizeHintChanged(); TQTimer::singleShot( 0, this, TQT_SLOT(moveCompletionPopup()) ); } @@ -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; @@ -742,9 +742,9 @@ void RecipientsToolTip::maybeTip( const TQPoint & p ) text.append( "</qt>" ); - TQRect tqgeometry( p + TQPoint( 2, 2 ), TQPoint( 400, 100 ) ); + TQRect geometry( p + TQPoint( 2, 2 ), TQPoint( 400, 100 ) ); - tip( TQRect( p.x() - 20, p.y() - 20, 40, 40 ), text, tqgeometry ); + tip( TQRect( p.x() - 20, p.y() - 20, 40, 40 ), text, geometry ); } @@ -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(); @@ -915,8 +915,8 @@ void RecipientsEditor::setRecipientString( const TQString &str, if ( count++ > GlobalSettings::self()->maximumRecipients() ) { KMessageBox::sorry( this, i18n("Truncating recipients list to %1 of %2 entries.") - .tqarg( GlobalSettings::self()->maximumRecipients() ) - .tqarg( r.count() ) ); + .arg( GlobalSettings::self()->maximumRecipients() ) + .arg( r.count() ) ); break; } addRecipient( *it, type ); diff --git a/kmail/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..c7be8da3b 100644 --- a/kmail/recipientseditortest.cpp +++ b/kmail/recipientseditortest.cpp @@ -34,10 +34,10 @@ #include "aboutdata.h" #include <tqpushbutton.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqlineedit.h> -#include <tqtextedit.h> +#include <textedit.h> Composer::Composer( TQWidget *parent ) : TQWidget( parent ) @@ -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..154bf97ba 100644 --- a/kmail/recipientspicker.cpp +++ b/kmail/recipientspicker.cpp @@ -40,7 +40,7 @@ #include <twin.h> #include <kmessagebox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcombobox.h> #include <tqpushbutton.h> #include <tqtoolbutton.h> @@ -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 ); @@ -783,7 +783,7 @@ void RecipientsPicker::pick( Recipient::Type type ) "recipients is %1. Please adapt the selection.", "You selected %n recipients. The maximum supported number of " "recipients is %1. Please adapt the selection.", count) - .tqarg( GlobalSettings::self()->maximumRecipients() ) ); + .arg( GlobalSettings::self()->maximumRecipients() ) ); return; } diff --git a/kmail/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..ef72447d0 100644 --- a/kmail/regexplineedit.cpp +++ b/kmail/regexplineedit.cpp @@ -42,7 +42,7 @@ #include <kregexpeditorinterface.h> #include <kdialog.h> -#include <tqlayout.h> +#include <layout.h> #include <tqstring.h> #include <tqpushbutton.h> #include <tqdialog.h> @@ -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/renamejob.cpp b/kmail/renamejob.cpp index ed8aa5cb7..7715c5871 100644 --- a/kmail/renamejob.cpp +++ b/kmail/renamejob.cpp @@ -220,7 +220,7 @@ void RenameJob::folderCopyComplete(bool success) config->writeEntry( it.key(), it.data() ); } mNewFolder->readConfig( config ); - // make sure the tqchildren state is correct + // make sure the children state is correct if ( mNewFolder->child() && ( mNewFolder->storage()->hasChildren() == FolderStorage::HasNoChildren ) ) mNewFolder->storage()->updateChildrenState(); diff --git a/kmail/rulewidgethandlermanager.cpp b/kmail/rulewidgethandlermanager.cpp index 9cc9e3ecb..fd5c811fa 100644 --- a/kmail/rulewidgethandlermanager.cpp +++ b/kmail/rulewidgethandlermanager.cpp @@ -228,7 +228,7 @@ void KMail::RuleWidgetHandlerManager::unregisterHandler( const RuleWidgetHandler } namespace { - /** Returns the number of immediate tqchildren of parent with the given object + /** Returns the number of immediate children of parent with the given object name. Used by RuleWidgetHandlerManager::createWidgets(). */ int childCount( const TQObject *parent, const char *objName ) @@ -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/searchjob.cpp b/kmail/searchjob.cpp index 1a979d4f9..7ef0524d4 100644 --- a/kmail/searchjob.cpp +++ b/kmail/searchjob.cpp @@ -46,7 +46,7 @@ using KPIM::ProgressManager; #include <klocale.h> #include <kmessagebox.h> -#include <tqstylesheet.h> +#include <stylesheet.h> namespace KMail { @@ -252,7 +252,7 @@ void SearchJob::slotSearchFolder() // so we need to download all messages and check TQString question = i18n("To execute your search all messages of the folder %1 " "have to be downloaded from the server. This may take some time. " - "Do you want to continue your search?").tqarg( mFolder->label() ); + "Do you want to continue your search?").arg( mFolder->label() ); if ( KMessageBox::warningContinueCancel( 0, question, i18n("Continue Search"), i18n("&Search"), "continuedownloadingforsearch" ) != KMessageBox::Continue ) @@ -267,7 +267,7 @@ void SearchJob::slotSearchFolder() mProgress = ProgressManager::createProgressItem( "ImapSearchDownload" + ProgressManager::getUniqueID(), i18n("Downloading emails from IMAP server"), - i18n( "URL: %1" ).tqarg( TQStyleSheet::escape( mFolder->folder()->prettyURL() ) ), + i18n( "URL: %1" ).arg( TQStyleSheet::escape( mFolder->folder()->prettyURL() ) ), true, mAccount->useSSL() || mAccount->useTLS() ); mProgress->setTotalItems( numMsgs ); diff --git a/kmail/searchwindow.cpp b/kmail/searchwindow.cpp index ff2248832..dfaa09429 100644 --- a/kmail/searchwindow.cpp +++ b/kmail/searchwindow.cpp @@ -44,7 +44,7 @@ #include <kiconloader.h> #include <tqcheckbox.h> -#include <tqlayout.h> +#include <layout.h> #include <klineedit.h> #include <tqpushbutton.h> #include <tqradiobutton.h> @@ -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; @@ -418,17 +418,17 @@ void SearchWindow::updtqStatus(void) if(!mStopped) { genMsg = i18n("Done."); detailMsg = i18n("%n match in %1", "%n matches in %1", - numMatches).tqarg(procMsg); + numMatches).arg(procMsg); } else { genMsg = i18n("Search canceled."); detailMsg = i18n("%n match so far in %1", "%n matches so far in %1", - numMatches).tqarg(procMsg); + numMatches).arg(procMsg); } } else { procMsg = i18n("%n message", "%n messages", numProcessed); genMsg = i18n("%n match", "%n matches", numMatches); detailMsg = i18n("Searching in %1. %2 searched so far") - .tqarg(folderName).tqarg(procMsg); + .arg(folderName).arg(procMsg); } mStatusBar->changeItem(genMsg, 0); @@ -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; @@ -497,7 +497,7 @@ void SearchWindow::slotSearch() while ((folder = mgr->find(fullName))) { if (folder->storage()->inherits("KMFolderSearch")) break; - fullName = TQString("%1 %2").tqarg(baseName).tqarg(++count); + fullName = TQString("%1 %2").arg(baseName).arg(++count); } if (!folder) @@ -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/sieveconfig.cpp b/kmail/sieveconfig.cpp index 9c22539c2..bf4fbe7bf 100644 --- a/kmail/sieveconfig.cpp +++ b/kmail/sieveconfig.cpp @@ -23,7 +23,7 @@ #include <kdialog.h> #include <kconfigbase.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> #include <tqlabel.h> #include <klineedit.h> diff --git a/kmail/sievedebugdialog.cpp b/kmail/sievedebugdialog.cpp index 1d33e2aac..426c93474 100644 --- a/kmail/sievedebugdialog.cpp +++ b/kmail/sievedebugdialog.cpp @@ -43,7 +43,7 @@ using KMail::AccountManager; #include "kmkernel.h" #include "sievejob.h" -#include <tqtextedit.h> +#include <textedit.h> using KMail::SieveJob; using KMime::Types::AddrSpecList; @@ -253,7 +253,7 @@ void SieveDebugDialog::slotDiagNextAccount() KMAccount *acc = mAccountList.first(); mAccountList.pop_front(); - mEdit->append( i18n( "Collecting data for account '%1'...\n" ).tqarg( acc->name() ) ); + mEdit->append( i18n( "Collecting data for account '%1'...\n" ).arg( acc->name() ) ); mEdit->append( i18n( "------------------------------------------------------------\n" ) ); mAccountBase = dynamic_cast<KMail::ImapAccountBase *>( acc ); if ( mAccountBase ) @@ -295,7 +295,7 @@ void SieveDebugDialog::slotDiagNextScript() TQString scriptFile = mScriptList.first(); mScriptList.pop_front(); - mEdit->append( i18n( "Contents of script '%1':\n" ).tqarg( scriptFile ) ); + mEdit->append( i18n( "Contents of script '%1':\n" ).arg( scriptFile ) ); mUrl = urlFromAccount( mAccountBase ); mUrl.setFileName( scriptFile ); @@ -324,7 +324,7 @@ void SieveDebugDialog::slotGetScript( SieveJob * /* job */, bool success, mEdit->append( i18n( "------------------------------------------------------------\n" "%1\n" - "------------------------------------------------------------\n\n" ).tqarg( script ) ); + "------------------------------------------------------------\n\n" ).arg( script ) ); } // Fetch next script @@ -363,7 +363,7 @@ void SieveDebugDialog::slotGetScriptList( SieveJob *job, bool success, for ( TQStringList::const_iterator it = scriptList.begin(); it != scriptList.end(); ++it ) mEdit->append( "* " + *it + "\n" ); mEdit->append( "\n" ); - mEdit->append( i18n( "Active script: %1\n\n" ).tqarg( activeScript ) ); + mEdit->append( i18n( "Active script: %1\n\n" ).arg( activeScript ) ); } // Handle next job: dump scripts for this server diff --git a/kmail/sievejob.cpp b/kmail/sievejob.cpp index 6993f8f66..0c020f922 100644 --- a/kmail/sievejob.cpp +++ b/kmail/sievejob.cpp @@ -26,7 +26,7 @@ using KIO::UDSEntryList; using KIO::UDSEntry; #include <kdebug.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <cassert> diff --git a/kmail/signatureconfigurator.cpp b/kmail/signatureconfigurator.cpp index fb3c7c40d..0a4603b08 100644 --- a/kmail/signatureconfigurator.cpp +++ b/kmail/signatureconfigurator.cpp @@ -31,8 +31,8 @@ #include <tqdir.h> #include <tqfileinfo.h> #include <tqlabel.h> -#include <tqlayout.h> -#include <tqtextedit.h> +#include <layout.h> +#include <textedit.h> #include <tqwhatsthis.h> #include <tqwidgetstack.h> @@ -52,7 +52,7 @@ namespace KMail { TQVBoxLayout * vlay; TQVBoxLayout * page_vlay; - vlay = new TQVBoxLayout( this, 0, KDialog::spacingHint(), "main tqlayout" ); + vlay = new TQVBoxLayout( this, 0, KDialog::spacingHint(), "main layout" ); // "enable signatue" checkbox: mEnableCheck = new TQCheckBox( i18n("&Enable signature"), this ); @@ -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/simplestringlisteditor.cpp b/kmail/simplestringlisteditor.cpp index 8520af848..ba4e34467 100644 --- a/kmail/simplestringlisteditor.cpp +++ b/kmail/simplestringlisteditor.cpp @@ -41,7 +41,7 @@ #include <kdebug.h> #include <kpushbutton.h> -#include <tqlayout.h> +#include <layout.h> //******************************************************** diff --git a/kmail/smimeconfiguration.ui b/kmail/smimeconfiguration.ui index 287605aa3..430cbe7f9 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"> @@ -54,7 +54,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -80,7 +80,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <hbox> <property name="name"> @@ -109,7 +109,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>150</width> <height>20</height> @@ -202,7 +202,7 @@ </property> <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <grid> <property name="name"> @@ -312,7 +312,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <hbox> <property name="name"> @@ -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/snippetdlg.cpp b/kmail/snippetdlg.cpp index 4197fa196..6c2efb2ec 100644 --- a/kmail/snippetdlg.cpp +++ b/kmail/snippetdlg.cpp @@ -18,7 +18,7 @@ #include <klocale.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <kpushbutton.h> #include <ktextedit.h> #include "kkeybutton.h" @@ -49,8 +49,8 @@ SnippetDlg::SnippetDlg( KActionCollection* ac, TQWidget* parent, const char* nam connect( snippetName, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(slotReturnPressed()) ); - tqlayout3->addWidget( textLabel3, 7, 0 ); - tqlayout3->addWidget( keyButton, 7, 1 ); + layout3->addWidget( textLabel3, 7, 0 ); + layout3->addWidget( keyButton, 7, 1 ); // tab order setTabOrder( snippetText, keyButton ); diff --git a/kmail/snippetdlgbase.ui b/kmail/snippetdlgbase.ui index 5cdf04c73..3f05f08f1 100644 --- a/kmail/snippetdlgbase.ui +++ b/kmail/snippetdlgbase.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <hbox> <property name="name"> @@ -37,7 +37,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -64,7 +64,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <grid> <property name="name"> @@ -85,7 +85,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>80</height> @@ -110,7 +110,7 @@ <property name="text"> <string>&Snippet:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop</set> </property> <property name="buddy" stdset="0"> diff --git a/kmail/snippetsettingsbase.ui b/kmail/snippetsettingsbase.ui index a9949cb55..c266a202f 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> @@ -123,7 +123,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -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..128687fc3 100644 --- a/kmail/snippetwidget.cpp +++ b/kmail/snippetwidget.cpp @@ -14,7 +14,7 @@ #include <kurl.h> #include <kdebug.h> #include <klocale.h> -#include <tqlayout.h> +#include <layout.h> #include <kpushbutton.h> #include <klistview.h> #include <tqheader.h> @@ -145,7 +145,7 @@ void SnippetWidget::slotAdd() SnippetItem* SnippetWidget::makeItem( SnippetItem* parent, const TQString& name, const TQString& text, const KShortcut& shortcut ) { SnippetItem * item = new SnippetItem(parent, name, text); - const TQString actionName = i18n("Snippet %1").tqarg(name); + const TQString actionName = i18n("Snippet %1").arg(name); const TQString normalizedName = TQString(actionName).replace(" ", "_"); if ( !mActionCollection->action(normalizedName.utf8().data() ) ) { KAction * action = new KAction( actionName, shortcut, item, @@ -352,8 +352,8 @@ void SnippetWidget::writeConfig() SnippetGroup * group = dynamic_cast<SnippetGroup*>(item); if (group) { //kdDebug(5006) << "-->GROUP " << item->getName() << group->getId() << " " << iGroupCount<< endl; - strKeyName=TQString("snippetGroupName_%1").tqarg(iGroupCount); - strKeyId=TQString("snippetGroupId_%1").tqarg(iGroupCount); + strKeyName=TQString("snippetGroupName_%1").arg(iGroupCount); + strKeyId=TQString("snippetGroupId_%1").arg(iGroupCount); _cfg->writeEntry(strKeyName, group->getName()); _cfg->writeEntry(strKeyId, group->getId()); @@ -361,9 +361,9 @@ void SnippetWidget::writeConfig() iGroupCount++; } else if (dynamic_cast<SnippetItem*>(item)) { //kdDebug(5006) << "-->ITEM " << item->getName() << item->getParent() << " " << iSnipCount << endl; - strKeyName=TQString("snippetName_%1").tqarg(iSnipCount); - strKeyText=TQString("snippetText_%1").tqarg(iSnipCount); - strKeyId=TQString("snippetParent_%1").tqarg(iSnipCount); + strKeyName=TQString("snippetName_%1").arg(iSnipCount); + strKeyText=TQString("snippetText_%1").arg(iSnipCount); + strKeyId=TQString("snippetParent_%1").arg(iSnipCount); _cfg->writeEntry(strKeyName, item->getName()); _cfg->writeEntry(strKeyText, item->getText()); @@ -373,7 +373,7 @@ void SnippetWidget::writeConfig() assert( action ); const KShortcut& sc = action->shortcut(); if (!sc.isNull() ) { - _cfg->writeEntry( TQString("snippetShortcut_%1").tqarg(iSnipCount), sc.toString() ); + _cfg->writeEntry( TQString("snippetShortcut_%1").arg(iSnipCount), sc.toString() ); } iSnipCount++; } else { @@ -389,8 +389,8 @@ void SnippetWidget::writeConfig() for ( it = _mapSaved.begin(); it != _mapSaved.end(); ++it ) { //write the saved variable values if (it.data().length()<=0) continue; //is the saved value has no length -> no need to save it - strKeyName=TQString("snippetSavedName_%1").tqarg(iCount); - strKeyText=TQString("snippetSavedVal_%1").tqarg(iCount); + strKeyName=TQString("snippetSavedName_%1").arg(iCount); + strKeyText=TQString("snippetSavedVal_%1").arg(iCount); _cfg->writeEntry(strKeyName, it.key()); _cfg->writeEntry(strKeyText, it.data()); @@ -434,8 +434,8 @@ void SnippetWidget::initConfig() int iCount = _cfg->readNumEntry("snippetGroupCount", -1); for ( int i=0; i<iCount; i++) { //read the group-list - strKeyName=TQString("snippetGroupName_%1").tqarg(i); - strKeyId=TQString("snippetGroupId_%1").tqarg(i); + strKeyName=TQString("snippetGroupName_%1").arg(i); + strKeyId=TQString("snippetGroupId_%1").arg(i); TQString strNameVal=""; int iIdVal=-1; @@ -460,9 +460,9 @@ void SnippetWidget::initConfig() if (iCount != -1) { iCount = _cfg->readNumEntry("snippetCount", 0); for ( int i=0; i<iCount; i++) { //read the snippet-list - strKeyName=TQString("snippetName_%1").tqarg(i); - strKeyText=TQString("snippetText_%1").tqarg(i); - strKeyId=TQString("snippetParent_%1").tqarg(i); + strKeyName=TQString("snippetName_%1").arg(i); + strKeyText=TQString("snippetText_%1").arg(i); + strKeyId=TQString("snippetParent_%1").arg(i); TQString strNameVal=""; TQString strTextVal=""; @@ -474,7 +474,7 @@ void SnippetWidget::initConfig() //kdDebug(5006) << "Read item " << strNameVal << " " << iParentVal << endl; if (strNameVal != "" && strTextVal != "" && iParentVal != -1) { - KShortcut shortcut( _cfg->readEntry( TQString("snippetShortcut_%1").tqarg(i), TQString() ) ); + KShortcut shortcut( _cfg->readEntry( TQString("snippetShortcut_%1").arg(i), TQString() ) ); item = makeItem( SnippetItem::findGroupById(iParentVal, _list), strNameVal, strTextVal, shortcut ); //kdDebug(5006) << "Created item " << item->getName() << " " << item->getParent() << endl; _list.append(item); @@ -487,8 +487,8 @@ void SnippetWidget::initConfig() iCount = _cfg->readNumEntry("snippetSavedCount", 0); for ( int i=1; i<=iCount; i++) { //read the saved-values and store in TQMap - strKeyName=TQString("snippetSavedName_%1").tqarg(i); - strKeyText=TQString("snippetSavedVal_%1").tqarg(i); + strKeyName=TQString("snippetSavedName_%1").arg(i); + strKeyText=TQString("snippetSavedVal_%1").arg(i); TQString strNameVal=""; TQString strTextVal=""; @@ -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() ) @@ -586,7 +586,7 @@ TQString SnippetWidget::parseText(TQString text, TQString del) if ( strName != del+del ) { //if not doubel-delimiter if (iInMeth == 0) { //if input-method "single" is selected if ( mapVar[strName].length() <= 0 ) { // and not already in map - strMsg=i18n("Please enter the value for <b>%1</b>:").tqarg(strName); + strMsg=i18n("Please enter the value for <b>%1</b>:").arg(strName); strNew = showSingleVarDialog( strName, &_mapSaved, rSingle ); if (strNew=="") return ""; //user clicked Cancle @@ -660,7 +660,7 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ TQDialog dlg(this); dlg.setCaption(i18n("Enter Values for Variables")); - TQGridLayout * tqlayout = new TQGridLayout( &dlg, 1, 1, 11, 6, "tqlayout"); + TQGridLayout * layout = new TQGridLayout( &dlg, 1, 1, 11, 6, "layout"); TQGridLayout * layoutTop = new TQGridLayout( 0, 1, 1, 0, 6, "layoutTop"); TQGridLayout * layoutVar = new TQGridLayout( 0, 1, 1, 0, 6, "layoutVar"); TQGridLayout * layoutBtn = new TQGridLayout( 0, 1, 1, 0, 6, "layoutBtn"); @@ -670,15 +670,15 @@ 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); - tqlayout->addMultiCellLayout( layoutTop, 0, 0, 0, 1 ); + layout->addMultiCellLayout( layoutTop, 0, 0, 0, 1 ); int i = 0; //walk through the variable map and add - for ( it = map->begin(); it != map->end(); ++it ) { //a checkbox, a lable and a lineedit to the main tqlayout + for ( it = map->begin(); it != map->end(); ++it ) { //a checkbox, a lable and a lineedit to the main layout if (it.key() == _SnippetConfig.getDelimiter() + _SnippetConfig.getDelimiter()) continue; @@ -705,20 +705,20 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ i++; } - tqlayout->addMultiCellLayout( layoutVar, 1, 1, 0, 1 ); + layout->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 ); - tqlayout->addMultiCellLayout( layoutBtn, 2, 2, 0, 1 ); + layout->addMultiCellLayout( layoutBtn, 2, 2, 0, 1 ); // --END-- building a dynamic dialog //connect the buttons to the TQDialog default slots @@ -729,7 +729,7 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ bool bReturn = false; //resize the textedits if (iWidth > 1) { - TQRect r = dlg.tqgeometry(); + TQRect r = dlg.geometry(); r.setHeight(iBasicHeight + iOneHeight*mapVar2Te.count()); r.setWidth(iWidth); dlg.setGeometry(r); @@ -750,9 +750,9 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ } bReturn = true; - iBasicHeight = dlg.tqgeometry().height() - layoutVar->tqgeometry().height(); - iOneHeight = layoutVar->tqgeometry().height() / mapVar2Te.count(); - iWidth = dlg.tqgeometry().width(); + iBasicHeight = dlg.geometry().height() - layoutVar->geometry().height(); + iOneHeight = layoutVar->geometry().height() / mapVar2Te.count(); + iWidth = dlg.geometry().width(); } //do some cleanup @@ -767,7 +767,7 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ delete layoutTop; delete layoutVar; delete layoutBtn; - delete tqlayout; + delete layout; if (i==0) //if nothing happened this means, that there are no variables to translate return true; //.. so just return OK @@ -788,7 +788,7 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri TQDialog dlg(this); dlg.setCaption(i18n("Enter Values for Variables")); - TQGridLayout * tqlayout = new TQGridLayout( &dlg, 1, 1, 11, 6, "tqlayout"); + TQGridLayout * layout = new TQGridLayout( &dlg, 1, 1, 11, 6, "layout"); TQGridLayout * layoutTop = new TQGridLayout( 0, 1, 1, 0, 6, "layoutTop"); TQGridLayout * layoutVar = new TQGridLayout( 0, 1, 1, 0, 6, "layoutVar"); TQGridLayout * layoutBtn = new TQGridLayout( 0, 2, 1, 0, 6, "layoutBtn"); @@ -799,8 +799,8 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri labTop = new TQLabel( &dlg, "label" ); layoutTop->addWidget(labTop, 0, 0); - labTop->setText(i18n("Enter the replacement values for %1:").tqarg( var )); - tqlayout->addMultiCellLayout( layoutTop, 0, 0, 0, 1 ); + labTop->setText(i18n("Enter the replacement values for %1:").arg( var )); + layout->addMultiCellLayout( layoutTop, 0, 0, 0, 1 ); cb = new TQCheckBox( &dlg, "cbVar" ); @@ -820,7 +820,7 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri "If you use the same variable later, even in another snippet, the value entered to the right " "will be the default value for that variable.") ); - tqlayout->addMultiCellLayout( layoutVar, 1, 1, 0, 1 ); + layout->addMultiCellLayout( layoutVar, 1, 1, 0, 1 ); KPushButton * btn1 = new KPushButton( KStdGuiItem::cancel(), &dlg, "pushButton1" ); layoutBtn->addWidget( btn1, 0, 0 ); @@ -829,7 +829,7 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri btn2->setDefault( TRUE ); layoutBtn->addWidget( btn2, 0, 1 ); - tqlayout->addMultiCellLayout( layoutBtn, 2, 2, 0, 1 ); + layout->addMultiCellLayout( layoutBtn, 2, 2, 0, 1 ); te->setFocus(); // --END-- building a dynamic dialog @@ -849,7 +849,7 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri strReturn = te->text(); //copy the entered values back the the given map - dlgSize = dlg.tqgeometry(); + dlgSize = dlg.geometry(); } //do some cleanup @@ -861,7 +861,7 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri delete layoutTop; delete layoutVar; delete layoutBtn; - delete tqlayout; + delete layout; return strReturn; } @@ -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/subscriptiondialog.cpp b/kmail/subscriptiondialog.cpp index 5b9fbf7ee..992ce2c48 100644 --- a/kmail/subscriptiondialog.cpp +++ b/kmail/subscriptiondialog.cpp @@ -374,7 +374,7 @@ void SubscriptionDialog::doSave() if( !a->onlySubscribedFolders() ) { int result = KMessageBox::questionYesNoCancel( this, i18n("Currently subscriptions are not used for server. %1\nDo you want to enable subscriptions?") - .tqarg( a->name() ), + .arg( a->name() ), i18n("Enable Subscriptions?"), i18n("Enable"), i18n("Do Not Enable")); switch(result) { case KMessageBox::Yes: @@ -414,7 +414,7 @@ void SubscriptionDialog::processItems() uint done = 0; for (uint i = mCount; i < mFolderNames.count(); ++i) { - // give the dialog a chance to tqrepaint + // give the dialog a chance to repaint if (done == 1000) { emit listChanged(); diff --git a/kmail/templateparser.cpp b/kmail/templateparser.cpp index 8dce59d4e..2feebf4e1 100644 --- a/kmail/templateparser.cpp +++ b/kmail/templateparser.cpp @@ -261,7 +261,7 @@ void TemplateParser::processWithTemplate( const TQString &tmpl ) } else if ( mDebug ) { KMessageBox::error( 0, i18n( "Cannot insert content from file %1: %2" ). - tqarg( path ).tqarg( file.errorString() ) ); + arg( path ).arg( file.errorString() ) ); } } else if ( cmd.startsWith( "SYSTEM=" ) ) { @@ -294,7 +294,7 @@ void TemplateParser::processWithTemplate( const TQString &tmpl ) } else if ( mDebug ) { KMessageBox::error( 0, i18n( "Cannot insert content from file %1: %2"). - tqarg( path ).tqarg(file.errorString() )); + arg( path ).arg(file.errorString() )); } } else if ( cmd.startsWith( "QUOTEPIPE=" ) ) { @@ -396,7 +396,7 @@ void TemplateParser::processWithTemplate( const TQString &tmpl ) kdDebug() << "Command: OTEXTSIZE" << endl; i += strlen( "OTEXTSIZE" ); if ( mOrigMsg ) { - TQString str = TQString( "%1" ).tqarg( mOrigMsg->body().length() ); + TQString str = TQString( "%1" ).arg( mOrigMsg->body().length() ); body.append( str ); } @@ -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 ); @@ -967,7 +967,7 @@ void TemplateParser::addProcessedBodyToMessage( const TQString &body ) DwParameter *nameParameter = new DwParameter; nameParameter->SetAttribute( "name" ); nameParameter->SetValue( Util::dwString( KMMsgBase::encodeRFC2231StringAutoDetectCharset( - i18n( "Attachment %1" ).tqarg( attachmentNumber ) ) ) ); + i18n( "Attachment %1" ).arg( attachmentNumber ) ) ) ); ct.AddParameter( nameParameter ); } } @@ -1059,7 +1059,7 @@ TQString TemplateParser::findTemplate() TQString iid; if ( mIdentity ) { - iid = TQString("IDENTITY_%1").tqarg( mIdentity ); // templates ID for that identity + iid = TQString("IDENTITY_%1").arg( mIdentity ); // templates ID for that identity } else { iid = "IDENTITY_NO_IDENTITY"; // templates ID for no identity @@ -1148,11 +1148,11 @@ TQString TemplateParser::pipe( const TQString &cmd, const TQString &buf ) if ( mPipeErr.isEmpty() ) { KMessageBox::error( 0, i18n( "Pipe command exit with status %1: %2"). - tqarg( mPipeRc ).tqarg( cmd ) ); + arg( mPipeRc ).arg( cmd ) ); } else { KMessageBox::detailedError( 0, i18n( "Pipe command exit with status %1: %2" ). - tqarg( mPipeRc ).tqarg( cmd ), mPipeErr ); + arg( mPipeRc ).arg( cmd ), mPipeErr ); } } @@ -1163,11 +1163,11 @@ TQString TemplateParser::pipe( const TQString &cmd, const TQString &buf ) if ( mPipeErr.isEmpty() ) { KMessageBox::error( 0, i18n( "Pipe command killed by signal %1: %2" ). - tqarg( -(mPipeRc) ).tqarg( cmd ) ); + arg( -(mPipeRc) ).arg( cmd ) ); } else { KMessageBox::detailedError( 0, i18n( "Pipe command killed by signal %1: %2" ). - tqarg( -(mPipeRc) ).tqarg( cmd ), mPipeErr ); + arg( -(mPipeRc) ).arg( cmd ), mPipeErr ); } } } @@ -1179,7 +1179,7 @@ TQString TemplateParser::pipe( const TQString &cmd, const TQString &buf ) if ( mDebug ) { KMessageBox::error( 0, i18n( "Pipe command did not finish within %1 seconds: %2" ). - tqarg( PipeTimeout ).tqarg( cmd ) ); + arg( PipeTimeout ).arg( cmd ) ); } } @@ -1190,11 +1190,11 @@ TQString TemplateParser::pipe( const TQString &cmd, const TQString &buf ) if ( mDebug ) { if ( mPipeErr.isEmpty() ) { KMessageBox::error( 0, - i18n( "Cannot write to process stdin: %1" ).tqarg( cmd ) ); + i18n( "Cannot write to process stdin: %1" ).arg( cmd ) ); } else { KMessageBox::detailedError( 0, i18n( "Cannot write to process stdin: %1" ). - tqarg( cmd ), mPipeErr ); + arg( cmd ), mPipeErr ); } } } @@ -1202,7 +1202,7 @@ TQString TemplateParser::pipe( const TQString &cmd, const TQString &buf ) } else if ( mDebug ) { KMessageBox::error( 0, i18n( "Cannot start pipe command from template: %1" ). - tqarg( cmd ) ); + arg( cmd ) ); } return mPipeOut; diff --git a/kmail/templatesconfiguration.cpp b/kmail/templatesconfiguration.cpp index b3c05c293..7b80c7c67 100644 --- a/kmail/templatesconfiguration.cpp +++ b/kmail/templatesconfiguration.cpp @@ -24,7 +24,7 @@ #include <kglobal.h> #include <tqpopupmenu.h> #include <tqpushbutton.h> -#include <tqtextedit.h> +#include <textedit.h> #include <tqlineedit.h> #include <tqtoolbox.h> #include <kdebug.h> @@ -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 ) ) ); @@ -102,7 +102,7 @@ TemplatesConfiguration::TemplatesConfiguration( TQWidget *parent, const char *na "if they are specified.</p>" "</qt>" ); } - mHelp->setText( i18n( "<a href=\"whatsthis:%1\">How does this work?</a>" ).tqarg( help ) ); + mHelp->setText( i18n( "<a href=\"whatsthis:%1\">How does this work?</a>" ).arg( help ) ); } void TemplatesConfiguration::slotTextChanged() @@ -163,7 +163,7 @@ void TemplatesConfiguration::saveToGlobal() void TemplatesConfiguration::loadFromIdentity( uint id ) { - Templates t( TQString("IDENTITY_%1").tqarg( id ) ); + Templates t( TQString("IDENTITY_%1").arg( id ) ); TQString str; @@ -215,7 +215,7 @@ void TemplatesConfiguration::loadFromIdentity( uint id ) void TemplatesConfiguration::saveToIdentity( uint id ) { - Templates t( TQString("IDENTITY_%1").tqarg( id ) ); + Templates t( TQString("IDENTITY_%1").arg( id ) ); t.setTemplateNewMessage( strOrBlank( textEdit_new->text() ) ); t.setTemplateReply( strOrBlank( textEdit_reply->text() ) ); @@ -231,7 +231,7 @@ void TemplatesConfiguration::loadFromFolder( TQString id, uint identity ) Templates* tid = 0; if ( identity ) { - tid = new Templates( TQString("IDENTITY_%1").tqarg( identity ) ); + tid = new Templates( TQString("IDENTITY_%1").arg( identity ) ); } TQString str; @@ -344,7 +344,7 @@ void TemplatesConfiguration::loadFromPhrases() "---------- %1 ----------\n" "%TEXT\n" "-------------------------------------------------------\n" - ) ).tqarg( convertPhrases( str ) ) ); + ) ).arg( convertPhrases( str ) ) ); } else { textEdit_forward->setText( defaultForward() ); @@ -400,7 +400,7 @@ void TemplatesConfiguration::importFromPhrases() "\n" "%TEXT\n" "-------------------------------------------------------\n" - ) ).tqarg( convertPhrases( str ) ) ); + ) ).arg( convertPhrases( str ) ) ); } else { GlobalSettings::self()->setTemplateForward( defaultForward() ); diff --git a/kmail/templatesconfiguration_base.ui b/kmail/templatesconfiguration_base.ui index fba3da7ef..c1ed8d44c 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> @@ -258,7 +258,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <hbox> <property name="name"> @@ -284,7 +284,7 @@ <property name="text"> <string>&Quote indicator:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> diff --git a/kmail/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: <20070403084156.C961269606@smtp4-g19.free.fr> 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/urlhandlermanager.cpp b/kmail/urlhandlermanager.cpp index 7b88c0291..ad9c22eb2 100644 --- a/kmail/urlhandlermanager.cpp +++ b/kmail/urlhandlermanager.cpp @@ -561,7 +561,7 @@ namespace { TQString displayName, libName, keyId; if ( !foundSMIMEData( url.path() + '#' + url.ref(), displayName, libName, keyId ) ) return TQString(); - return i18n("Show certificate 0x%1").tqarg( keyId ); + return i18n("Show certificate 0x%1").arg( keyId ); } } @@ -689,8 +689,8 @@ namespace { if ( name.isEmpty() ) name = msgPart.name(); if ( !name.isEmpty() ) - return i18n( "Attachment: %1" ).tqarg( name ); - return i18n( "Attachment #%1 (unnamed)" ).tqarg( KMReaderWin::msgPartFromUrl( url ) ); + return i18n( "Attachment: %1" ).arg( name ); + return i18n( "Attachment #%1 (unnamed)" ).arg( KMReaderWin::msgPartFromUrl( url ) ); } } diff --git a/kmail/util.cpp b/kmail/util.cpp index d153e9d37..bbf15ba56 100644 --- a/kmail/util.cpp +++ b/kmail/util.cpp @@ -146,7 +146,7 @@ void KMail::Util::append( TQByteArray& that, const TQByteArray& str ) that.detach(); uint len1 = that.size(); uint len2 = str.size(); - if ( that.tqresize( len1 + len2, TQGArray::SpeedOptim ) ) + if ( that.resize( len1 + len2, TQGArray::SpeedOptim ) ) memcpy( that.data() + len1, str.data(), len2 ); } @@ -157,7 +157,7 @@ void KMail::Util::append( TQByteArray& that, const char* str ) that.detach(); uint len1 = that.size(); uint len2 = tqstrlen(str); - if ( that.tqresize( len1 + len2, TQGArray::SpeedOptim ) ) + if ( that.resize( len1 + len2, TQGArray::SpeedOptim ) ) memcpy( that.data() + len1, str, len2 ); } @@ -166,7 +166,7 @@ void KMail::Util::append( TQByteArray& that, const TQCString& str ) that.detach(); uint len1 = that.size(); uint len2 = str.size() - 1; - if ( that.tqresize( len1 + len2, TQGArray::SpeedOptim ) ) + if ( that.resize( len1 + len2, TQGArray::SpeedOptim ) ) memcpy( that.data() + len1, str.data(), len2 ); } @@ -180,13 +180,13 @@ void KMail::Util::insert( TQByteArray& that, uint index, const char* s ) int nlen = olen + len; if ( index >= olen ) { // insert after end of string that.detach(); - if ( that.tqresize(nlen+index-olen, TQGArray::SpeedOptim ) ) { + if ( that.resize(nlen+index-olen, TQGArray::SpeedOptim ) ) { memset( that.data()+olen, ' ', index-olen ); memcpy( that.data()+index, s, len ); } } else { that.detach(); - if ( that.tqresize(nlen, TQGArray::SpeedOptim ) ) { // normal insert + if ( that.resize(nlen, TQGArray::SpeedOptim ) ) { // normal insert memmove( that.data()+index+len, that.data()+index, olen-index ); memcpy( that.data()+index, s, len ); } diff --git a/kmail/util.h b/kmail/util.h index 0d1e263f7..9f291a2e0 100644 --- a/kmail/util.h +++ b/kmail/util.h @@ -206,7 +206,7 @@ namespace Util { KMessageBox::warningContinueCancel( w, i18n( "A file named \"%1\" already exists. " - "Are you sure you want to overwrite it?" ).tqarg( url.prettyURL() ), + "Are you sure you want to overwrite it?" ).arg( url.prettyURL() ), i18n( "Overwrite File?" ), i18n( "&Overwrite" ) ) ) return false; diff --git a/kmail/vacation.cpp b/kmail/vacation.cpp index fbcf46c82..d3d374aea 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" ).arg( 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 ").arg( 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 ) ) ); + .arg( KGlobal::locale()->formatDate( TQDate::currentDate().addDays( 1 ) ) ); } int Vacation::defaultNotificationInterval() { diff --git a/kmail/vacationdialog.cpp b/kmail/vacationdialog.cpp index e214a46cd..759ae481d 100644 --- a/kmail/vacationdialog.cpp +++ b/kmail/vacationdialog.cpp @@ -30,11 +30,11 @@ using KMime::HeaderParsing::parseAddressList; #include <twin.h> #include <kapplication.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqcheckbox.h> #include <tqlineedit.h> -#include <tqtextedit.h> +#include <textedit.h> #include <tqvalidator.h> namespace KMail { diff --git a/kmail/warningconfiguration.ui b/kmail/warningconfiguration.ui index c31bdb381..cef88e257 100644 --- a/kmail/warningconfiguration.ui +++ b/kmail/warningconfiguration.ui @@ -103,7 +103,7 @@ It is recommended to leave this option turned on for maximum security. <property name="text"> <string>For signing</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> @@ -114,7 +114,7 @@ It is recommended to leave this option turned on for maximum security. <property name="text"> <string>For encryption</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> @@ -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> @@ -357,7 +357,7 @@ The recommended SPHINX setting is 14 days. </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -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..36e71a2f9 100644 --- a/kmail/xfaceconfigurator.cpp +++ b/kmail/xfaceconfigurator.cpp @@ -57,7 +57,7 @@ using namespace KABC; #include <tqcombobox.h> #include <tqimage.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <tqwhatsthis.h> #include <tqwidgetstack.h> @@ -84,7 +84,7 @@ namespace KMail { TQPushButton * mFromFileBtn; TQPushButton * mFromAddrbkBtn; - vlay = new TQVBoxLayout( this, 0, KDialog::spacingHint(), "main tqlayout" ); + vlay = new TQVBoxLayout( this, 0, KDialog::spacingHint(), "main layout" ); hlay = new TQHBoxLayout( vlay ); // "enable X-Face" checkbox: @@ -147,7 +147,7 @@ namespace KMail { mFromFileBtn = new TQPushButton( i18n("Select File..."), page ); TQWhatsThis::add( mFromFileBtn, i18n("Use this to select an image file to create the picture from. " - "The image should be of high contrast and nearly quadratic tqshape. " + "The image should be of high contrast and nearly quadratic shape. " "A light background helps improve the result." ) ); mFromFileBtn->setAutoDefault( false ); page_vlay->addWidget( mFromFileBtn, 1 ); @@ -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/kmail/xfaceconfigurator.h b/kmail/xfaceconfigurator.h index e8fa1b0e7..6c33ed06f 100644 --- a/kmail/xfaceconfigurator.h +++ b/kmail/xfaceconfigurator.h @@ -18,7 +18,7 @@ #define __KMAIL_XFACECONFIGURATOR_H__ #include <tqwidget.h> -#include <tqtextedit.h> +#include <textedit.h> class KURL; diff --git a/kmailcvt/filter_evolution.cxx b/kmailcvt/filter_evolution.cxx index 713a1bf70..900b134bd 100644 --- a/kmailcvt/filter_evolution.cxx +++ b/kmailcvt/filter_evolution.cxx @@ -73,7 +73,7 @@ void FilterEvolution::import(FilterInfo *info) info->setOverall((int) ((float) currentDir / numSubDirs * 100)); } } - info->addLog( i18n("Finished importing emails from %1").tqarg( mailDir )); + info->addLog( i18n("Finished importing emails from %1").arg( mailDir )); info->setCurrent(100); info->setOverall(100); } @@ -121,7 +121,7 @@ void FilterEvolution::importMBox(FilterInfo *info, const TQString& mboxName, con bool first_msg = true; TQString tmp_from = mboxName; if (!mbox.open(IO_ReadOnly)) { - info->alert(i18n("Unable to open %1, skipping").tqarg(mboxName)); + info->alert(i18n("Unable to open %1, skipping").arg(mboxName)); } else { TQFileInfo filenameInfo(mboxName); @@ -142,7 +142,7 @@ void FilterEvolution::importMBox(FilterInfo *info, const TQString& mboxName, con } else info->setTo(targetDir); - info->addLog(i18n("Importing emails from %1...").tqarg(tmp_from)); + info->addLog(i18n("Importing emails from %1...").arg(tmp_from)); TQByteArray input(MAX_LINE); long l = 0; diff --git a/kmailcvt/filter_evolution_v2.cxx b/kmailcvt/filter_evolution_v2.cxx index e80d7a84a..d60953195 100644 --- a/kmailcvt/filter_evolution_v2.cxx +++ b/kmailcvt/filter_evolution_v2.cxx @@ -87,7 +87,7 @@ void FilterEvolution_v2::import(FilterInfo *info) /** import last but not least all archives from the root-dir */ importDirContents(info, true, mailDir, TQString(), TQString()); - info->addLog( i18n("Finished importing emails from %1").tqarg( mailDir )); + info->addLog( i18n("Finished importing emails from %1").arg( mailDir )); if(count_duplicates > 0) { info->addLog( i18n("1 duplicate message not imported", "%n duplicate messages not imported", count_duplicates)); } @@ -121,7 +121,7 @@ void FilterEvolution_v2::importDirContents(FilterInfo *info, bool root, if (temp_mailfile.endsWith(".cmeta") || temp_mailfile.endsWith(".ev-summary") || temp_mailfile.endsWith(".ev-summary-meta") || temp_mailfile.endsWith(".ibex.index") || temp_mailfile.endsWith(".ibex.index.data") ) {} else { - info->addLog( i18n("Start import file %1...").tqarg( temp_mailfile ) ); + info->addLog( i18n("Start import file %1...").arg( temp_mailfile ) ); if (!root) importMBox(info, (dirName + "/" + temp_mailfile) , KMailRootDir, KMailSubDir); else @@ -157,7 +157,7 @@ void FilterEvolution_v2::importMBox(FilterInfo *info, const TQString& mboxName, TQFile mbox(mboxName); bool first_msg = true; if (!mbox.open(IO_ReadOnly)) { - info->alert(i18n("Unable to open %1, skipping").tqarg(mboxName)); + info->alert(i18n("Unable to open %1, skipping").arg(mboxName)); } else { TQFileInfo filenameInfo(mboxName); diff --git a/kmailcvt/filter_kmail_maildir.cxx b/kmailcvt/filter_kmail_maildir.cxx index e1529b893..2a1961567 100644 --- a/kmailcvt/filter_kmail_maildir.cxx +++ b/kmailcvt/filter_kmail_maildir.cxx @@ -80,7 +80,7 @@ void FilterKMail_maildir::import( FilterInfo *info ) } } - info->addLog( i18n("Finished importing emails from %1").tqarg( mailDir )); + info->addLog( i18n("Finished importing emails from %1").arg( mailDir )); if (count_duplicates > 0) { info->addLog( i18n("1 duplicate message not imported", "%n duplicate messages not imported", count_duplicates)); } @@ -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 */ @@ -125,7 +125,7 @@ TQString FilterKMail_maildir::getMessageFlags( FilterInfo *info, const TQString& TQFile mailfile( fileName ); if (! mailfile.open( IO_ReadOnly ) ) { - info->alert( i18n("Unable to open %1, skipping").tqarg( fileName ) ); + info->alert( i18n("Unable to open %1, skipping").arg( fileName ) ); return status_flag; } else { @@ -193,7 +193,7 @@ void FilterKMail_maildir::importFiles( FilterInfo *info, const TQString& dirName if(_path.endsWith("cur")) _path.remove(_path.length() - 4 , 4); TQString _info = _path; - info->addLog(i18n("Import folder %1...").tqarg(_info.remove(0,12))); + info->addLog(i18n("Import folder %1...").arg(_info.remove(0,12))); info->setFrom(_info); info->setTo(_path); generatedPath = true; @@ -203,12 +203,12 @@ void FilterKMail_maildir::importFiles( FilterInfo *info, const TQString& dirName if(info->removeDupMsg) { if(! addMessage( info, _path, dir.filePath(*mailFile), msg_flag )) { - info->addLog( i18n("Could not import %1").tqarg( *mailFile ) ); + info->addLog( i18n("Could not import %1").arg( *mailFile ) ); } info->setCurrent((int) ((float) currentFile / numFiles * 100)); } else { if(! addMessage_fastImport( info, _path, dir.filePath(*mailFile), msg_flag )) { - info->addLog( i18n("Could not import %1").tqarg( *mailFile ) ); + info->addLog( i18n("Could not import %1").arg( *mailFile ) ); } info->setCurrent((int) ((float) currentFile / numFiles * 100)); } diff --git a/kmailcvt/filter_lnotes.cxx b/kmailcvt/filter_lnotes.cxx index 648f361d4..4bd3c423f 100644 --- a/kmailcvt/filter_lnotes.cxx +++ b/kmailcvt/filter_lnotes.cxx @@ -61,7 +61,7 @@ void FilterLNotes::import(FilterInfo *info) { for ( TQStringList::Iterator filename = filenames.begin(); filename != filenames.end(); ++filename ) { ++currentFile; - info->addLog( i18n("Importing emails from %1").tqarg(*filename) ); + info->addLog( i18n("Importing emails from %1").arg(*filename) ); ImportLNotes( *filename ); inf->setOverall( 100 * currentFile / totalFiles ); if ( info->shouldTerminate() ) @@ -85,7 +85,7 @@ void FilterLNotes::ImportLNotes(const TQString& file) { TQFile f(file); if (! f.open( IO_ReadOnly ) ) { - inf->alert( i18n("Unable to open %1, skipping").tqarg( file ) ); + inf->alert( i18n("Unable to open %1, skipping").arg( file ) ); } else { int ch = 0; @@ -106,7 +106,7 @@ void FilterLNotes::ImportLNotes(const TQString& file) { // open temp output file tempfile = new KTempFile; state = 1; - inf->setCurrent(i18n("Message %1").tqarg(n++)); + inf->setCurrent(i18n("Message %1").arg(n++)); if ( inf->shouldTerminate() ) return; // fall through diff --git a/kmailcvt/filter_mailapp.cxx b/kmailcvt/filter_mailapp.cxx index ebc34fd60..a93519770 100644 --- a/kmailcvt/filter_mailapp.cxx +++ b/kmailcvt/filter_mailapp.cxx @@ -59,7 +59,7 @@ void FilterMailApp::import(FilterInfo *info) if ( info->shouldTerminate() ) break; TQFile mbox( *filename ); if (! mbox.open( IO_ReadOnly ) ) { - info->alert( i18n("Unable to open %1, skipping").tqarg( *filename ) ); + info->alert( i18n("Unable to open %1, skipping").arg( *filename ) ); } else { TQFileInfo filenameInfo( *filename ); kdDebug() << "importing filename " << *filename << endl; @@ -67,7 +67,7 @@ void FilterMailApp::import(FilterInfo *info) TQString folderName(name[name.count() - 2]); info->setCurrent(0); - info->addLog( i18n("Importing emails from %1...").tqarg( *filename ) ); + info->addLog( i18n("Importing emails from %1...").arg( *filename ) ); info->setFrom( *filename ); info->setTo( folderName ); @@ -123,10 +123,10 @@ void FilterMailApp::import(FilterInfo *info) if ( info->shouldTerminate() ) break; } - info->addLog( i18n("Finished importing emails from %1").tqarg( *filename ) ); + info->addLog( i18n("Finished importing emails from %1").arg( *filename ) ); if (count_duplicates > 0) { info->addLog( i18n("1 duplicate message not imported to folder %1 in KMail", - "%n duplicate messages not imported to folder %1 in KMail", count_duplicates).tqarg(folderName)); + "%n duplicate messages not imported to folder %1 in KMail", count_duplicates).arg(folderName)); } count_duplicates = 0; mbox.close(); diff --git a/kmailcvt/filter_mbox.cxx b/kmailcvt/filter_mbox.cxx index d60c06273..76b376683 100644 --- a/kmailcvt/filter_mbox.cxx +++ b/kmailcvt/filter_mbox.cxx @@ -51,13 +51,13 @@ void FilterMBox::import(FilterInfo *info) for ( TQStringList::Iterator filename = filenames.begin(); filename != filenames.end(); ++filename, ++currentFile) { TQFile mbox( *filename ); if (! mbox.open( IO_ReadOnly ) ) { - info->alert( i18n("Unable to open %1, skipping").tqarg( *filename ) ); + info->alert( i18n("Unable to open %1, skipping").arg( *filename ) ); } else { TQFileInfo filenameInfo( *filename ); TQString folderName( "MBOX-" + filenameInfo.baseName(TRUE) ); info->setCurrent(0); - info->addLog( i18n("Importing emails from %1...").tqarg( *filename ) ); + info->addLog( i18n("Importing emails from %1...").arg( *filename ) ); info->setFrom( *filename ); info->setTo( folderName ); @@ -129,11 +129,11 @@ void FilterMBox::import(FilterInfo *info) if ( info->shouldTerminate() ) break; } - info->addLog( i18n("Finished importing emails from %1").tqarg( *filename )); + info->addLog( i18n("Finished importing emails from %1").arg( *filename )); if (count_duplicates > 0) { info->addLog( i18n("1 duplicate message not imported to folder %1 in KMail", "%n duplicate messages not imported to folder %1 in KMail", - count_duplicates).tqarg(folderName)); + count_duplicates).arg(folderName)); } if (info->shouldTerminate()) info->addLog( i18n("Finished import, canceled by user.")); count_duplicates = 0; diff --git a/kmailcvt/filter_oe.cxx b/kmailcvt/filter_oe.cxx index bc5d16fdf..a87ee39af 100644 --- a/kmailcvt/filter_oe.cxx +++ b/kmailcvt/filter_oe.cxx @@ -64,7 +64,7 @@ void FilterOE::import(FilterInfo *info) TQDir dir (mailDir); TQStringList files = dir.entryList("*.[dDmM][bB][xX]", TQDir::Files, TQDir::Name); if (files.isEmpty()) { - info->alert(i18n("No Outlook Express mailboxes found in directory %1.").tqarg(mailDir)); + info->alert(i18n("No Outlook Express mailboxes found in directory %1.").arg(mailDir)); return; } @@ -116,7 +116,7 @@ void FilterOE::importMailBox( FilterInfo *info, const TQString& fileName) info->setFrom(mailfileinfo.fileName()); if (!mailfile.open(IO_ReadOnly)) { - info->addLog(i18n("Unable to open mailbox %1").tqarg(fileName)); + info->addLog(i18n("Unable to open mailbox %1").arg(fileName)); return; } TQDataStream mailbox(&mailfile); @@ -127,7 +127,7 @@ void FilterOE::importMailBox( FilterInfo *info, const TQString& fileName) mailbox >> sig_block1 >> sig_block2; if (sig_block1 == OE4_SIG_1 && sig_block2 == OE4_SIG_2) { folderName = "OE-Import/" + mailfileinfo.baseName(TRUE); - info->addLog(i18n("Importing OE4 Mailbox %1").tqarg( "../" + _nameOfFile)); + info->addLog(i18n("Importing OE4 Mailbox %1").arg( "../" + _nameOfFile)); info->setTo(folderName); mbxImport(info, mailbox); return; @@ -141,13 +141,13 @@ void FilterOE::importMailBox( FilterInfo *info, const TQString& fileName) TQString _tmpFolder = getFolderName(_nameOfFile); if(!_tmpFolder.isEmpty()) folderName = "OE-Import/" + _tmpFolder; } - info->addLog(i18n("Importing OE5+ Mailbox %1").tqarg( "../" + _nameOfFile)); + info->addLog(i18n("Importing OE5+ Mailbox %1").arg( "../" + _nameOfFile)); info->setTo(folderName); dbxImport(info, mailbox); return; } else if (sig_block2 == OE5_FOLDER_SIG_2) { if(!parsedFolder) { - info->addLog(i18n("Importing OE5+ Folder file %1").tqarg( "../" + _nameOfFile)); + info->addLog(i18n("Importing OE5+ Folder file %1").arg( "../" + _nameOfFile)); currentIsFolderFile = true; dbxImport(info, mailbox); currentIsFolderFile = false; @@ -156,7 +156,7 @@ void FilterOE::importMailBox( FilterInfo *info, const TQString& fileName) } } } - // info->addLog(i18n("File %1 does not seem to be an Outlook Express mailbox").tqarg("../" + _nameOfFile)); + // info->addLog(i18n("File %1 does not seem to be an Outlook Express mailbox").arg("../" + _nameOfFile)); } /* ------------------- MBX support ------------------- */ @@ -167,7 +167,7 @@ void FilterOE::mbxImport( FilterInfo *info, TQDataStream& ds) // Read the header ds >> msgCount >> lastMsgNum >> fileSize; - ds.tqdevice()->at( ds.tqdevice()->at() + 64 ); // Skip 0's + ds.device()->at( ds.device()->at() + 64 ); // Skip 0's kdDebug() << "This mailbox has " << msgCount << " messages" << endl; if (msgCount == 0) return; // Don't import empty mailbox @@ -212,9 +212,9 @@ void FilterOE::dbxImport( FilterInfo *info, TQDataStream& ds) { // Get item count & offset of index TQ_UINT32 itemCount, indexPtr; - ds.tqdevice()->at(0xc4); + ds.device()->at(0xc4); ds >> itemCount; - ds.tqdevice()->at(0xe4); + ds.device()->at(0xe4); ds >> indexPtr; kdDebug() << "Item count is " << itemCount << ", Index at " << indexPtr << endl; @@ -223,7 +223,7 @@ void FilterOE::dbxImport( FilterInfo *info, TQDataStream& ds) totalEmails = itemCount; currentEmail = 0; // Parse the indexes - ds.tqdevice()->at(indexPtr); + ds.device()->at(indexPtr); dbxReadIndex(info, ds, indexPtr); } @@ -234,8 +234,8 @@ void FilterOE::dbxReadIndex( FilterInfo *info, TQDataStream& ds, int filePos) TQ_UINT32 self, unknown, nextIndexPtr, parent, indexCount; TQ_UINT8 unknown2, ptrCount; TQ_UINT16 unknown3; - int wasAt = ds.tqdevice()->at(); - ds.tqdevice()->at(filePos); + int wasAt = ds.device()->at(); + ds.device()->at(filePos); kdDebug() << "Reading index of file " << folderName << endl; @@ -260,7 +260,7 @@ void FilterOE::dbxReadIndex( FilterInfo *info, TQDataStream& ds, int filePos) dbxReadIndex(info, ds, nextIndexPtr); } - ds.tqdevice()->at(wasAt); // Restore file position to same as when function called + ds.device()->at(wasAt); // Restore file position to same as when function called } void FilterOE::dbxReadDataBlock( FilterInfo *info, TQDataStream& ds, int filePos) @@ -268,11 +268,11 @@ void FilterOE::dbxReadDataBlock( FilterInfo *info, TQDataStream& ds, int filePos TQ_UINT32 curOffset, blockSize; TQ_UINT16 unknown; TQ_UINT8 count, unknown2; - int wasAt = ds.tqdevice()->at(); + int wasAt = ds.device()->at(); TQString folderEntry[4]; - ds.tqdevice()->at(filePos); + ds.device()->at(filePos); ds >> curOffset >> blockSize >> unknown >> count >> unknown2; // _dbx_email_headerstruct kdDebug() << "Data block has " << (int) count << " elements" << endl; @@ -284,7 +284,7 @@ void FilterOE::dbxReadDataBlock( FilterInfo *info, TQDataStream& ds, int filePos ds >> type >> value; value &= 0xffffff; - ds.tqdevice()->at(ds.tqdevice()->at() - 1); // We only wanted 3 bytes + ds.device()->at(ds.device()->at() - 1); // We only wanted 3 bytes if(!currentIsFolderFile) { if (type == 0x84) { // It's an email! @@ -292,12 +292,12 @@ void FilterOE::dbxReadDataBlock( FilterInfo *info, TQDataStream& ds, int filePos dbxReadEmail(info, ds, value); ++count0x84; } else if( type == 0x04) { - int currentFilePos = ds.tqdevice()->at(); - ds.tqdevice()->at(filePos + 12 + value + (count*4) ); + int currentFilePos = ds.device()->at(); + ds.device()->at(filePos + 12 + value + (count*4) ); TQ_UINT32 newOFF; ds >> newOFF; kdDebug() << "**** Offset of emaildata (0x04) " << newOFF << endl; - ds.tqdevice()->at(currentFilePos); + ds.device()->at(currentFilePos); dbxReadEmail(info, ds, newOFF); ++count0x04; } @@ -324,7 +324,7 @@ void FilterOE::dbxReadDataBlock( FilterInfo *info, TQDataStream& ds, int filePos if(currentIsFolderFile) { folderStructure.append(folderEntry); } - ds.tqdevice()->at(wasAt); // Restore file position to same as when function called + ds.device()->at(wasAt); // Restore file position to same as when function called } void FilterOE::dbxReadEmail( FilterInfo *info, TQDataStream& ds, int filePos) @@ -335,8 +335,8 @@ void FilterOE::dbxReadEmail( FilterInfo *info, TQDataStream& ds, int filePos) TQ_UINT8 intCount, unknown; KTempFile tmp; bool _break = false; - int wasAt = ds.tqdevice()->at(); - ds.tqdevice()->at(filePos); + int wasAt = ds.device()->at(); + ds.device()->at(filePos); do { ds >> self >> nextAddressOffset >> blockSize >> intCount >> unknown >> nextAddress; // _dbx_block_hdrstruct @@ -348,7 +348,7 @@ void FilterOE::dbxReadEmail( FilterInfo *info, TQDataStream& ds, int filePos) _break = true; break; } - ds.tqdevice()->at(nextAddress); + ds.device()->at(nextAddress); } while (nextAddress != 0); tmp.close(); @@ -361,7 +361,7 @@ void FilterOE::dbxReadEmail( FilterInfo *info, TQDataStream& ds, int filePos) currentEmail++; int currentPercentage = (int) ( ( (float) currentEmail / totalEmails ) * 100 ); info->setCurrent(currentPercentage); - ds.tqdevice()->at(wasAt); + ds.device()->at(wasAt); } tmp.unlink(); } @@ -371,18 +371,18 @@ TQString FilterOE::parseFolderString( TQDataStream& ds, int filePos ) { char tmp; TQString returnString; - int wasAt = ds.tqdevice()->at(); - ds.tqdevice()->at(filePos); + int wasAt = ds.device()->at(); + ds.device()->at(filePos); // read while != 0x00 - while( !ds.tqdevice()->atEnd() ) { - tmp = ds.tqdevice()->getch(); + while( !ds.device()->atEnd() ) { + tmp = ds.device()->getch(); if( tmp != 0x00) { returnString += tmp; } else break; } - ds.tqdevice()->at(wasAt); + ds.device()->at(wasAt); return returnString; } @@ -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..65e2eae4b 100644 --- a/kmailcvt/filter_opera.cxx +++ b/kmailcvt/filter_opera.cxx @@ -84,9 +84,9 @@ void FilterOpera::import(FilterInfo *info) info->setCurrent(0); TQFile operaArchiv( importDir.filePath(*mailFile) ); if (! operaArchiv.open( IO_ReadOnly ) ) { - info->alert( i18n("Unable to open %1, skipping").tqarg( *mailFile ) ); + info->alert( i18n("Unable to open %1, skipping").arg( *mailFile ) ); } else { - info->addLog( i18n("Importing emails from %1...").tqarg( *mailFile ) ); + info->addLog( i18n("Importing emails from %1...").arg( *mailFile ) ); TQFileInfo filenameInfo( importDir.filePath(*mailFile) ); TQString folderName( "OPERA-" + importDir.dirName() ); @@ -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 ); } @@ -138,7 +138,7 @@ void FilterOpera::import(FilterInfo *info) if ( info->shouldTerminate() ) break; } - info->addLog( i18n("Finished importing emails from %1").tqarg( *mailFile )); + info->addLog( i18n("Finished importing emails from %1").arg( *mailFile )); if (count_duplicates > 0) { info->addLog( i18n("1 duplicate message not imported", "%n duplicate messages not imported", count_duplicates)); } diff --git a/kmailcvt/filter_outlook.cxx b/kmailcvt/filter_outlook.cxx index 7d6a9b8c4..a5a9f407c 100644 --- a/kmailcvt/filter_outlook.cxx +++ b/kmailcvt/filter_outlook.cxx @@ -54,8 +54,8 @@ void FilterOutlook::import(FilterInfo *info) TQDir importDir (outlookDir); TQStringList files = importDir.entryList("*.[pP][sS][tT]", TQDir::Files, TQDir::Name); for ( TQStringList::Iterator pstFile = files.begin(); pstFile != files.end(); ++pstFile) { - info->addLog( i18n("Importing emails from %1...").tqarg( *pstFile ) ); + info->addLog( i18n("Importing emails from %1...").arg( *pstFile ) ); info->addLog( i18n("1 duplicate message not imported", "%n duplicate messages not imported", count_duplicates)); - info->alert( i18n("Unable to open %1, skipping").tqarg( *pstFile ) ); + info->alert( i18n("Unable to open %1, skipping").arg( *pstFile ) ); } } diff --git a/kmailcvt/filter_plain.cxx b/kmailcvt/filter_plain.cxx index a0dbad135..04abea3d3 100644 --- a/kmailcvt/filter_plain.cxx +++ b/kmailcvt/filter_plain.cxx @@ -64,11 +64,11 @@ void FilterPlain::import(FilterInfo *info) */ if(info->removeDupMsg) { if(! addMessage( info, "PLAIN-" + dir.dirName(), dir.filePath(*mailFile) )) { - info->addLog( i18n("Could not import %1").tqarg( *mailFile ) ); + info->addLog( i18n("Could not import %1").arg( *mailFile ) ); } } else { if( ! addMessage_fastImport( info, "PLAIN-" + dir.dirName(), dir.filePath(*mailFile) )) { - info->addLog( i18n("Could not import %1").tqarg( *mailFile ) ); + info->addLog( i18n("Could not import %1").arg( *mailFile ) ); } } @@ -77,7 +77,7 @@ void FilterPlain::import(FilterInfo *info) if ( info->shouldTerminate() ) break; } - info->addLog( i18n("Finished importing emails from %1").tqarg( mailDir )); + info->addLog( i18n("Finished importing emails from %1").arg( mailDir )); if (count_duplicates > 0) { info->addLog( i18n("1 duplicate message not imported", "%n duplicate messages not imported", count_duplicates)); } diff --git a/kmailcvt/filter_pmail.cxx b/kmailcvt/filter_pmail.cxx index 982d713a9..699e3adb3 100644 --- a/kmailcvt/filter_pmail.cxx +++ b/kmailcvt/filter_pmail.cxx @@ -76,7 +76,7 @@ void FilterPMail::import(FilterInfo *info) info->addLog(i18n("Importing 'UNIX' mail folders ('.mbx')...")); processFiles("*.[mM][bB][xX]", &FilterPMail::importUnixMailFolder); - info->addLog( i18n("Finished importing emails from %1").tqarg( chosenDir )); + info->addLog( i18n("Finished importing emails from %1").arg( chosenDir )); info->setCurrent(100); info->setOverall(100); } @@ -162,7 +162,7 @@ void FilterPMail::importMailFolder(const TQString& file) long l = 0; TQFile f(file); if (!f.open(IO_ReadOnly)) { - inf->alert(i18n("Unable to open %1, skipping").tqarg(file)); + inf->alert(i18n("Unable to open %1, skipping").arg(file)); } else { // Get folder name l = f.readBlock((char *) &pmm_head, sizeof(pmm_head)); @@ -172,7 +172,7 @@ void FilterPMail::importMailFolder(const TQString& file) else folder.append(pmm_head.folder); inf->setTo(folder); - inf->addLog(i18n("Importing %1").tqarg("../" + TQString(pmm_head.folder))); + inf->addLog(i18n("Importing %1").arg("../" + TQString(pmm_head.folder))); TQByteArray input(MAX_LINE); bool first_msg = true; @@ -232,7 +232,7 @@ void FilterPMail::importUnixMailFolder(const TQString& file) s.replace( TQRegExp("MBX$"), "PMG"); f.setName(s); if (! f.open( IO_ReadOnly ) ) { - inf->alert( i18n("Unable to open %1, skipping").tqarg( s ) ); + inf->alert( i18n("Unable to open %1, skipping").arg( s ) ); return; } else { f.readBlock((char *) &pmg_head, sizeof(pmg_head)); @@ -250,9 +250,9 @@ void FilterPMail::importUnixMailFolder(const TQString& file) /** Read in the mbox */ f.setName(file); if (! f.open( IO_ReadOnly ) ) { - inf->alert( i18n("Unable to open %1, skipping").tqarg( s ) ); + inf->alert( i18n("Unable to open %1, skipping").arg( s ) ); } else { - inf->addLog(i18n("Importing %1").tqarg("../" + TQString(pmg_head.folder))); + inf->addLog(i18n("Importing %1").arg("../" + TQString(pmg_head.folder))); l = f.readLine( line.data(),MAX_LINE); // read the first line which is unneeded while ( ! f.atEnd() ) { KTempFile tempfile; @@ -276,7 +276,7 @@ void FilterPMail::importUnixMailFolder(const TQString& file) tempfile.unlink(); n++; - inf->setCurrent(i18n("Message %1").tqarg(n)); + inf->setCurrent(i18n("Message %1").arg(n)); inf->setCurrent( (int) ( ( (float) f.at() / f.size() ) * 100 ) ); } } @@ -291,7 +291,7 @@ bool FilterPMail::parseFolderMatrix() TQFile hierarch(chosenDir + "/hierarch.pm"); if (! hierarch.open( IO_ReadOnly ) ) { - inf->alert( i18n("Unable to open %1, skipping").tqarg( chosenDir + "hierarch.pm" ) ); + inf->alert( i18n("Unable to open %1, skipping").arg( chosenDir + "hierarch.pm" ) ); return false; } else { TQStringList tmpList; diff --git a/kmailcvt/filter_sylpheed.cxx b/kmailcvt/filter_sylpheed.cxx index 47c134b47..2174c681f 100644 --- a/kmailcvt/filter_sylpheed.cxx +++ b/kmailcvt/filter_sylpheed.cxx @@ -75,7 +75,7 @@ void FilterSylpheed::import( FilterInfo *info ) } } - info->addLog( i18n("Finished importing emails from %1").tqarg( mailDir )); + info->addLog( i18n("Finished importing emails from %1").arg( mailDir )); if (count_duplicates > 0) { info->addLog( i18n("1 duplicate message not imported", "%n duplicate messages not imported", count_duplicates)); } @@ -137,7 +137,7 @@ void FilterSylpheed::importFiles( FilterInfo *info, const TQString& dirName) _tmp = _tmp.remove(_tmp.length() - _mfile.length() -1, _mfile.length()+1); _path += _tmp.remove( mailDir ,TRUE); TQString _info = _path; - info->addLog(i18n("Import folder %1...").tqarg(_info.remove(0,15))); + info->addLog(i18n("Import folder %1...").arg(_info.remove(0,15))); info->setFrom(_info); info->setTo(_path); @@ -150,12 +150,12 @@ void FilterSylpheed::importFiles( FilterInfo *info, const TQString& dirName) if(info->removeDupMsg) { if(! addMessage( info, _path, dir.filePath(*mailFile), flags )) { - info->addLog( i18n("Could not import %1").tqarg( *mailFile ) ); + info->addLog( i18n("Could not import %1").arg( *mailFile ) ); } info->setCurrent((int) ((float) currentFile / numFiles * 100)); } else { if(! addMessage_fastImport( info, _path, dir.filePath(*mailFile), flags )) { - info->addLog( i18n("Could not import %1").tqarg( *mailFile ) ); + info->addLog( i18n("Could not import %1").arg( *mailFile ) ); } info->setCurrent((int) ((float) currentFile / numFiles * 100)); } @@ -167,7 +167,7 @@ void FilterSylpheed::importFiles( FilterInfo *info, const TQString& dirName) void FilterSylpheed::readMarkFile( FilterInfo *info, const TQString &path, TQDict<unsigned long> &dict ) { /* Each sylpheed mail directory contains a .sylpheed_mark file which - * contains all the flags for each messages. The tqlayout of this file + * contains all the flags for each messages. The layout of this file * is documented in the source code of sylpheed: in procmsg.h for * the flag bits, and procmsg.c. * diff --git a/kmailcvt/filter_thebat.cxx b/kmailcvt/filter_thebat.cxx index 04dcdb127..52cd98589 100644 --- a/kmailcvt/filter_thebat.cxx +++ b/kmailcvt/filter_thebat.cxx @@ -81,7 +81,7 @@ void FilterTheBat::import( FilterInfo *info ) } } - info->addLog( i18n("Finished importing emails from %1").tqarg( mailDir )); + info->addLog( i18n("Finished importing emails from %1").arg( mailDir )); if (count_duplicates > 0) { info->addLog( i18n("1 duplicate message not imported", "%n duplicate messages not imported", count_duplicates)); } @@ -148,7 +148,7 @@ void FilterTheBat::importFiles( FilterInfo *info, const TQString& FileName) TQValueList<long> offsets; if (!tbb.open(IO_ReadOnly)) { - info->alert(i18n("Unable to open %1, skipping").tqarg(FileName)); + info->alert(i18n("Unable to open %1, skipping").arg(FileName)); } else { // BUILD the index of messages : // We need this really ugly way, because read with tbb.readLine() @@ -182,7 +182,7 @@ void FilterTheBat::importFiles( FilterInfo *info, const TQString& FileName) offsets.append(endOfEmail); } } - // info->addLog(i18n("--COUNTED: %1").tqarg(count)); + // info->addLog(i18n("--COUNTED: %1").arg(count)); // IMPORT the messages: if(!offsets.empty() || (offsets.empty() && (tbb.size() > 3128))) { @@ -196,7 +196,7 @@ void FilterTheBat::importFiles( FilterInfo *info, const TQString& FileName) _tmp = _tmp.remove(_tmp.length() - 13, 13); _path += _tmp.remove( mailDir ,TRUE); TQString _info = _path; - info->addLog(i18n("Import folder %1...").tqarg(_info.remove(0,14))); + info->addLog(i18n("Import folder %1...").arg(_info.remove(0,14))); info->setTo(_path); info->setFrom("../" + _info + "/messages.tbb"); diff --git a/kmailcvt/filter_thunderbird.cxx b/kmailcvt/filter_thunderbird.cxx index 301d29d0e..ea739dac1 100644 --- a/kmailcvt/filter_thunderbird.cxx +++ b/kmailcvt/filter_thunderbird.cxx @@ -91,12 +91,12 @@ void FilterThunderbird::import(FilterInfo *info) TQString temp_mailfile = *mailFile; if (temp_mailfile.endsWith(".msf") || temp_mailfile.endsWith("msgFilterRules.dat")) {} else { - info->addLog( i18n("Start import file %1...").tqarg( temp_mailfile ) ); + info->addLog( i18n("Start import file %1...").arg( temp_mailfile ) ); importMBox(info, mailDir + temp_mailfile , temp_mailfile, TQString()); } } - info->addLog( i18n("Finished importing emails from %1").tqarg( mailDir )); + info->addLog( i18n("Finished importing emails from %1").arg( mailDir )); if(count_duplicates > 0) { info->addLog( i18n("1 duplicate message not imported", "%n duplicate messages not imported", count_duplicates)); } @@ -126,7 +126,7 @@ void FilterThunderbird::importDirContents(FilterInfo *info, const TQString& dirN TQString temp_mailfile = *mailFile; if (temp_mailfile.endsWith(".msf") || temp_mailfile.endsWith("msgFilterRules.dat")) {} else { - info->addLog( i18n("Start import file %1...").tqarg( temp_mailfile ) ); + info->addLog( i18n("Start import file %1...").arg( temp_mailfile ) ); importMBox(info, (dirName + "/" + temp_mailfile) , KMailRootDir, KMailSubDir); } } @@ -158,7 +158,7 @@ void FilterThunderbird::importMBox(FilterInfo *info, const TQString& mboxName, c TQFile mbox(mboxName); bool first_msg = true; if (!mbox.open(IO_ReadOnly)) { - info->alert(i18n("Unable to open %1, skipping").tqarg(mboxName)); + info->alert(i18n("Unable to open %1, skipping").arg(mboxName)); } else { TQFileInfo filenameInfo(mboxName); diff --git a/kmailcvt/filters.cxx b/kmailcvt/filters.cxx index 8feae7fd0..a406f1c3f 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 ) @@ -150,16 +150,16 @@ bool Filter::addMessage( FilterInfo* info, const TQString& folderName, switch ( int( reply ) ) { case -1: - info->alert( i18n( "Cannot make folder %1 in KMail" ).tqarg( folderName ) ); + info->alert( i18n( "Cannot make folder %1 in KMail" ).arg( folderName ) ); return false; case -2: - info->alert( i18n( "Cannot add message to folder %1 in KMail" ).tqarg( folderName ) ); + info->alert( i18n( "Cannot add message to folder %1 in KMail" ).arg( folderName ) ); return false; case -4: count_duplicates++; return false; case 0: - info->alert( i18n( "Error while adding message to folder %1 in KMail" ).tqarg( folderName ) ); + info->alert( i18n( "Error while adding message to folder %1 in KMail" ).arg( folderName ) ); return false; } return true; @@ -185,13 +185,13 @@ bool Filter::addMessage_fastImport( FilterInfo* info, const TQString& folderName switch ( int( reply ) ) { case -1: - info->alert( i18n( "Cannot make folder %1 in KMail" ).tqarg( folderName ) ); + info->alert( i18n( "Cannot make folder %1 in KMail" ).arg( folderName ) ); return false; case -2: - info->alert( i18n( "Cannot add message to folder %1 in KMail" ).tqarg( folderName ) ); + info->alert( i18n( "Cannot add message to folder %1 in KMail" ).arg( folderName ) ); return false; case 0: - info->alert( i18n( "Error while adding message to folder %1 in KMail" ).tqarg( folderName ) ); + info->alert( i18n( "Error while adding message to folder %1 in KMail" ).arg( folderName ) ); return false; } return true; diff --git a/kmailcvt/kimportpagedlg.ui b/kmailcvt/kimportpagedlg.ui index cdb9eaa7b..0a1e7da4f 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> @@ -69,7 +69,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout16</cstring> + <cstring>layout16</cstring> </property> <vbox> <property name="name"> @@ -77,7 +77,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout90</cstring> + <cstring>layout90</cstring> </property> <grid> <property name="name"> @@ -109,12 +109,12 @@ </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> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop</set> </property> </widget> diff --git a/kmailcvt/kselfilterpage.cpp b/kmailcvt/kselfilterpage.cpp index a562219a3..cc02bbfc0 100644 --- a/kmailcvt/kselfilterpage.cpp +++ b/kmailcvt/kselfilterpage.cpp @@ -16,7 +16,7 @@ ***************************************************************************/ #include <kstandarddirs.h> -#include <tqtextedit.h> +#include <textedit.h> #include <tqcheckbox.h> #include <klocale.h> #include "filters.hxx" @@ -75,7 +75,7 @@ void KSelFilterPage::filterSelected(int i) TQString info = mFilterList.at(i)->info(); TQString author = mFilterList.at(i)->author(); if(!author.isEmpty()) - info += i18n("<p><i>Written by %1.</i></p>").tqarg(author); + info += i18n("<p><i>Written by %1.</i></p>").arg(author); mDesc->setText(info); } diff --git a/kmailcvt/kselfilterpagedlg.ui b/kmailcvt/kselfilterpagedlg.ui index de52967ef..f8237504b 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> @@ -69,7 +69,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout19</cstring> + <cstring>layout19</cstring> </property> <vbox> <property name="name"> @@ -96,7 +96,7 @@ This program will help you import your email from your previous email program in <property name="textFormat"> <enum>RichText</enum> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop|AlignLeft</set> </property> <property name="vAlign" stdset="0"> diff --git a/kmobile/DESIGN b/kmobile/DESIGN index 96dea2b1b..287a3d9a2 100644 --- a/kmobile/DESIGN +++ b/kmobile/DESIGN @@ -7,10 +7,10 @@ "kmobile" is suite to easily access "Mobile Devices", which means, that you have one single interface to access -any type of mobile tqdevice (e.g. cellular phone, PDAs, +any type of mobile device (e.g. cellular phone, PDAs, MP3-Players, Digital Cameras and a lot more). -Each of this tqdevices have different types of information, +Each of this devices have different types of information, (capatibilities) which can be: - An addressbook - A collection of notes @@ -18,28 +18,28 @@ Each of this tqdevices have different types of information, - a file storage section (e.g. pictures in digital cameras) - and more -The whole interface is pretty extendable. Each tqdevice has -a tqdevice driver, which reports the capatibilities of the -connected tqdevice to the higher level. -So, if you once write a tqdevice driver, you can access it's +The whole interface is pretty extendable. Each device has +a device driver, which reports the capatibilities of the +connected device to the higher level. +So, if you once write a device driver, you can access it's contents from any KDE application later. Currently the whole interface is divided into 3 sections: -a) The low-level tqdevice driver +a) The low-level device driver b) A mid-layer, which is realized in the "kmobile" application c) A userland library, to which KDE applications should link. Here is some background info: -a) The low-level tqdevice driver (libkmobile_xxxx.so) +a) The low-level device driver (libkmobile_xxxx.so) The low-level driver has to be derived from the KMobileDevice class (#include <kmobiledevice.h>). The drivers should be located below the -directory /tqdevice, and you can find a sample implementation in -/tqdevice/skeleton-directory. See below for some hints on how to -write such a tqdevice driver. +directory /device, and you can find a sample implementation in +/device/skeleton-directory. See below for some hints on how to +write such a device driver. b) The mid-layer (kmobile) @@ -47,7 +47,7 @@ b) The mid-layer (kmobile) The mid-layer handles the main functionality, which is entirely implemented in the kmobile application. All low-level drivers are loaded by kmobile only, and then all low-level functions -to any tqdevice is made available to other applications +to any device is made available to other applications with a DCOP interface. Normal KDE applications should prefer the userland library (see below) instead of using direct DCOP calls. Nevertheless, the DCOP interface might be very interesting to write @@ -56,14 +56,14 @@ standalone command line tools. c) The userland library (libkmobileclient.so) -Any KDE application which wants to access mobile tqdevices +Any KDE application which wants to access mobile devices should #include <kmobileclient.h> and link to the libkmobileclient.la library. libkmobileclient translates all calls to DCOP calls and -makes accessing mobile tqdevices completely transparent to the +makes accessing mobile devices completely transparent to the application. One sample program which uses the client library is the kmobile -kioslave. In Konqueror you might access any mobile tqdevice directly +kioslave. In Konqueror you might access any mobile device directly by giving "mobile:/" as the URL. @@ -72,7 +72,7 @@ by giving "mobile:/" as the URL. HINTS FOR DRIVER DEVELOPERS: ---------------------------- -- KMobile tqdevice drivers are very similiar to kioslaves. Refer +- KMobile device drivers are very similiar to kioslaves. Refer at the kioslave documentation if needed. - derive your driver only from the KMobileDevice class (#include <kmobiledevice.h>) @@ -86,8 +86,8 @@ HINTS FOR DRIVER DEVELOPERS: all calls to your driver, so you always will have a clean state - use lockDevice("/dev/ttyS1") and unlockDevice("/dev/ttyS1") to - lock those tqdevices system-wide (creates /var/lock/LCK..<devname> files), - and to prevent other applications to access the same physical ports/tqdevices + lock those devices system-wide (creates /var/lock/LCK..<devname> files), + and to prevent other applications to access the same physical ports/devices - use the helper functions createDirEntry() and createFileEntry() to create the right UDSEntries for listEntries(), stat(), ... diff --git a/kmobile/TODO b/kmobile/TODO index 308ce6744..457393bbc 100644 --- a/kmobile/TODO +++ b/kmobile/TODO @@ -1,7 +1,7 @@ DONE: ----- -- tqdevices:/ kioslave integration -- show per-tqdevice icons in konqueror (same as in the kmobile view) +- devices:/ kioslave integration +- show per-device icons in konqueror (same as in the kmobile view) - fix mimetypes and their location under /share/mimelnk - kioslaves: cellphone:/, organizer:/, pda:/, (camera:/ not activated) - system tray plugin @@ -10,11 +10,11 @@ DONE: TODO: ----- - fix doubled loading of plugins -- where do I get the tqdevice name from the kmobile unique process? +- where do I get the device name from the kmobile unique process? - finish the functions which are available to client apps. - kitchensync driver/plugin (starting...) - a plugin for the left side of the "Open File Dialog". -> - makes direct access to mobile tqdevices really easy + makes direct access to mobile devices really easy - make the daemon a KDED (KDE Meta Daemon) module (tdelibs/kded/HOWTO, README.kded) - more drivers (always) diff --git a/kmobile/devices/digicam/libkmobile_digicam.desktop b/kmobile/devices/digicam/libkmobile_digicam.desktop index 6e39cce6b..adb3c9ab9 100644 --- a/kmobile/devices/digicam/libkmobile_digicam.desktop +++ b/kmobile/devices/digicam/libkmobile_digicam.desktop @@ -107,6 +107,6 @@ Comment[uk]=Цей драйвер підтримує багато цифрови Comment[zh_CN]=此驱动程序支持许多数码相机 Comment[zh_TW]=此驅動程式支援許多數位相機 Type=Service -ServiceTypes=kdetqdevice/mobiletqdevice +ServiceTypes=kdedevice/mobiledevice X-KDE-Library=libkmobile_digicam Icon=mobile_camera diff --git a/kmobile/devices/gammu/libkmobile_gammu.desktop b/kmobile/devices/gammu/libkmobile_gammu.desktop index daaa2372f..f706b6806 100644 --- a/kmobile/devices/gammu/libkmobile_gammu.desktop +++ b/kmobile/devices/gammu/libkmobile_gammu.desktop @@ -101,6 +101,6 @@ Comment[uk]=Цей драйвер підтримує багато мобільн Comment[zh_CN]=此驱动程序通过 gammu 库支持许多诺基亚和其它移动电话 Comment[zh_TW]=此驅動程式支援許多 NOKIA 及其他手機，使用 gammu 函式庫 Type=Service -ServiceTypes=kdetqdevice/mobiletqdevice +ServiceTypes=kdedevice/mobiledevice X-KDE-Library=libkmobile_gammu Icon=mobile_phone diff --git a/kmobile/devices/gnokii/gnokii_mobile.cpp b/kmobile/devices/gnokii/gnokii_mobile.cpp index bd35ddf8b..48c3b8ae2 100644 --- a/kmobile/devices/gnokii/gnokii_mobile.cpp +++ b/kmobile/devices/gnokii/gnokii_mobile.cpp @@ -48,7 +48,7 @@ #define GNOKII_CHECK_ERROR(error) \ do { \ if (error) \ - PRINT_DEBUG << TQString("ERROR %1: %2\n").tqarg(error).tqarg(gn_error_print(error));\ + PRINT_DEBUG << TQString("ERROR %1: %2\n").arg(error).arg(gn_error_print(error));\ } while (0) @@ -74,16 +74,16 @@ static gn_calnote_list calnote_list; /** - * The KDE gnokii mobile tqdevice driver. + * The KDE gnokii mobile device driver. */ KMobileGnokii::KMobileGnokii(TQObject *obj, const char *name, const TQStringList &args ) : KMobileDevice(obj, name, args) { - // set initial tqdevice info + // set initial device info setClassType( Phone ); - m_tqdeviceName = i18n("Mobile Phone accessed via GNOKII"); - m_tqdeviceRevision = ""; + m_deviceName = i18n("Mobile Phone accessed via GNOKII"); + m_deviceRevision = ""; m_connectionName = "/dev/ircomm0"; setCapabilities( hasAddressBook | hasNotes ); @@ -103,8 +103,8 @@ KMobileGnokii::KMobileGnokii(TQObject *obj, const char *name, const TQStringList m_baud = "9600"; } - PRINT_DEBUG << TQString("Using GNOKII configuration: %1 %2 %3 %4\n").tqarg(m_modelnr) - .tqarg(m_connection).tqarg(m_port).tqarg(m_baud); + PRINT_DEBUG << TQString("Using GNOKII configuration: %1 %2 %3 %4\n").arg(m_modelnr) + .arg(m_connection).arg(m_port).arg(m_baud); saveDeviceConfiguration(); saveGnokiiConfiguration(); @@ -148,7 +148,7 @@ bool KMobileGnokii::setGnokiiStateMachine() { // set the state machine to our configuration qstrncpy( state.config.model, m_modelnr.utf8(), sizeof(state.config.model)-1 ); - qstrncpy( state.config.port_tqdevice, m_port.utf8(), sizeof(state.config.port_tqdevice)-1 ); + qstrncpy( state.config.port_device, m_port.utf8(), sizeof(state.config.port_device)-1 ); state.config.connection_type = connectionToValue(m_connection); state.config.serial_baudrate = m_baud.toUInt(); return true; @@ -206,7 +206,7 @@ bool KMobileGnokii::loadDeviceConfiguration() static void busterminate(void) { gn_sm_functions(GN_OP_Terminate, NULL, &state); - if (lockfile) gn_tqdevice_unlock(lockfile); + if (lockfile) gn_device_unlock(lockfile); } static TQString businit(void) @@ -222,7 +222,7 @@ static TQString businit(void) aux = gn_cfg_get(gn_cfg_info, "global", "use_locking"); // Defaults to 'no' if (aux && !strcmp(aux, "yes")) { - lockfile = gn_tqdevice_lock(state.config.port_tqdevice); + lockfile = gn_device_lock(state.config.port_device); if (lockfile == NULL) { return i18n("Lock file error.\n " "Please exit all other running instances of gnokii and try again."); @@ -237,7 +237,7 @@ static TQString businit(void) state.config.require_dcd = old_dcd; if (error != GN_ERR_NONE) { busterminate(); - return i18n("Mobile phone interface initialization failed:\n%1").tqarg(gn_error_print(error)); + return i18n("Mobile phone interface initialization failed:\n%1").arg(gn_error_print(error)); } // model @@ -265,9 +265,9 @@ static TQString businit(void) data.imei = NULL; GNOKII_DEBUG( TQString("Found mobile phone: Model: %1, Revision: %2, IMEI: %3\n") - .tqarg(model).tqarg(revision).tqarg(imei) ); + .arg(model).arg(revision).arg(imei) ); - PhoneProductId = TQString("%1-%2-%3-%4").tqarg(APP).tqarg(model).tqarg(revision).tqarg(imei); + PhoneProductId = TQString("%1-%2-%3-%4").arg(APP).arg(model).arg(revision).arg(imei); return TQString(); } @@ -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) { @@ -299,7 +299,7 @@ static gn_error read_phone_memstat( gn_memory_type memtype, gn_memory_status *me } } GNOKII_DEBUG( TQString("\n\nMobile phone memory status: Type: %1, used=%2, free=%3, total=%4\n\n") - .tqarg(memtype).tqarg(memstat->used).tqarg(memstat->free).tqarg(memstat->used+memstat->free) ); + .arg(memtype).arg(memstat->used).arg(memstat->free).arg(memstat->used+memstat->free) ); return error; } @@ -372,8 +372,8 @@ static gn_error read_phone_entry_highlevel( int index, const gn_memory_type memt if (error != GN_ERR_NONE) return error; - GNOKII_DEBUG(TQString("%1: %2, num=%3, location=%4, group=%5, count=%6\n").tqarg(index).tqarg(entry.name) - .tqarg(entry.number).tqarg(entry.location).tqarg(entry.caller_group).tqarg(entry.subentries_count)); + GNOKII_DEBUG(TQString("%1: %2, num=%3, location=%4, group=%5, count=%6\n").arg(index).arg(entry.name) + .arg(entry.number).arg(entry.location).arg(entry.caller_group).arg(entry.subentries_count)); // try to split Name into FamilyName and GivenName s = TQString(entry.name).simplifyWhiteSpace(); @@ -395,7 +395,7 @@ static gn_error read_phone_entry_highlevel( int index, const gn_memory_type memt } a->insertCustom(APP, "X_GSM_CALLERGROUP", s.setNum(entry.caller_group)); - a->insertCustom(APP, "X_GSM_STORE_AT", TQString("%1_%2").tqarg(GN_MT_ME).tqarg(entry.location)); + a->insertCustom(APP, "X_GSM_STORE_AT", TQString("%1_%2").arg(GN_MT_ME).arg(entry.location)); // set ProductId a->setProductId(PhoneProductId); @@ -403,11 +403,11 @@ 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) ); - GNOKII_DEBUG(TQString(" date=%1\n").tqarg(datetime.toString())); + GNOKII_DEBUG(TQString(" date=%1\n").arg(datetime.toString())); a->setRevision(datetime); if (!entry.subentries_count) @@ -418,8 +418,8 @@ static gn_error read_phone_entry_highlevel( int index, const gn_memory_type memt for (int n=0; n<entry.subentries_count; n++) { TQString s = TQString(entry.subentries[n].data.number).simplifyWhiteSpace(); GNOKII_DEBUG(TQString(" Subentry#%1, entry_type=%2, number_type=%3, number=%4\n") - .tqarg(n).tqarg(entry.subentries[n].entry_type) - .tqarg(entry.subentries[n].number_type).tqarg(s)); + .arg(n).arg(entry.subentries[n].entry_type) + .arg(entry.subentries[n].number_type).arg(s)); if (s.isEmpty()) continue; switch(entry.subentries[n].entry_type) { @@ -478,7 +478,7 @@ static gn_error read_phone_entry_highlevel( int index, const gn_memory_type memt break; default: GNOKII_DEBUG(TQString(" Not handled id=%1, entry=%2\n") - .tqarg(entry.subentries[n].entry_type).tqarg(s)); + .arg(entry.subentries[n].entry_type).arg(s)); break; } // switch() } // for(subentry) @@ -493,7 +493,7 @@ static gn_error read_phone_entry_highlevel( int index, const gn_memory_type memt -// connect the tqdevice and ask user to turn tqdevice on (if necessary) +// connect the device and ask user to turn device on (if necessary) bool KMobileGnokii::connectDevice(TQWidget * /*parent*/) { if (connected()) @@ -501,18 +501,18 @@ bool KMobileGnokii::connectDevice(TQWidget * /*parent*/) TQString err = businit(); m_connected = err.isEmpty(); - PRINT_DEBUG << TQString("connectDevice() : %1\n").tqarg(m_connected ? "Ok" : err); + PRINT_DEBUG << TQString("connectDevice() : %1\n").arg(m_connected ? "Ok" : err); return m_connected; } -// disconnect the tqdevice and return true, if sucessful +// disconnect the device and return true, if sucessful bool KMobileGnokii::disconnectDevice(TQWidget * /*parent*/) { if (!connected()) return true; busterminate(); m_connected = false; - PRINT_DEBUG << TQString("disconnectDevice() : %1\n").tqarg("done"); + PRINT_DEBUG << TQString("disconnectDevice() : %1\n").arg("done"); return true; } @@ -545,9 +545,9 @@ TQString KMobileGnokii::iconFileName() const // return a unique ID, e.g. the IMEI number of phones, or a serial number // this String is used to have a unique identification for syncronisation. -TQString KMobileGnokii::tqdeviceUniqueID() +TQString KMobileGnokii::deviceUniqueID() { - return TQString("GNOKII-IMEI-%1").tqarg(TQString::fromLocal8Bit(imei)); + return TQString("GNOKII-IMEI-%1").arg(TQString::fromLocal8Bit(imei)); } @@ -587,7 +587,7 @@ int KMobileGnokii::numAddresses() int KMobileGnokii::readAddress( int index, KABC::Addressee &addr ) { - PRINT_DEBUG << TQString("############ GET ADDRESS #%1\n").tqarg(index); + PRINT_DEBUG << TQString("############ GET ADDRESS #%1\n").arg(index); // index is zero-based, but in gnokii the first address starts at 1 if (index<0 || index>=numAddresses()) return KIO::ERR_DOES_NOT_EXIST; @@ -609,7 +609,7 @@ int KMobileGnokii::readAddress( int index, KABC::Addressee &addr ) int KMobileGnokii::storeAddress( int, const KABC::Addressee &, bool ) { - /* XXX: this is a read-only tqdevice */ + /* XXX: this is a read-only device */ return KIO::ERR_WRITE_ACCESS_DENIED; } @@ -870,8 +870,8 @@ int KMobileGnokii::readNote( int index, TQString ¬e ) "DeviceClassName: %3\n" "Device Driver : %4\n" "Device Revision: %5\n") - .tqarg(index).tqarg(index) - .tqarg(tqdeviceClassName()).tqarg(tqdeviceName()).tqarg(revision()); + .arg(index).arg(index) + .arg(deviceClassName()).arg(deviceName()).arg(revision()); return 0; } diff --git a/kmobile/devices/gnokii/gnokii_mobile.h b/kmobile/devices/gnokii/gnokii_mobile.h index 96f32a5c0..e3fe7bdef 100644 --- a/kmobile/devices/gnokii/gnokii_mobile.h +++ b/kmobile/devices/gnokii/gnokii_mobile.h @@ -43,13 +43,13 @@ public: bool connectDevice(TQWidget *parent); bool disconnectDevice(TQWidget *parent); - // provide a tqdevice-specific configure dialog + // provide a device-specific configure dialog bool configDialog(TQWidget *parent); // filename and path to gnokii-icon TQString iconFileName() const; - TQString tqdeviceUniqueID(); + TQString deviceUniqueID(); /* * Addressbook / Phonebook support diff --git a/kmobile/devices/gnokii/gnokiiconfigui.ui b/kmobile/devices/gnokii/gnokiiconfigui.ui index d550eb9a2..e7f6bb31d 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> @@ -127,7 +127,7 @@ <cstring>textLabel2</cstring> </property> <property name="text"> - <string>Please configure your Gnokii mobile tqdevice</string> + <string>Please configure your Gnokii mobile device</string> </property> </widget> <spacer row="2" column="0"> @@ -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/devices/gnokii/libkmobile_gnokii.desktop b/kmobile/devices/gnokii/libkmobile_gnokii.desktop index 986eded04..7e732ecd2 100644 --- a/kmobile/devices/gnokii/libkmobile_gnokii.desktop +++ b/kmobile/devices/gnokii/libkmobile_gnokii.desktop @@ -101,6 +101,6 @@ Comment[uk]=Цей драйвер підтримує багато мобільн Comment[zh_CN]=此驱动程序通过 gnokii 库支持许多诺基亚和其它移动电话 Comment[zh_TW]=此驅動程式支援許多 NOKIA 及其他手機，使用 gnokii 函式庫 Type=Service -ServiceTypes=kdetqdevice/mobiletqdevice +ServiceTypes=kdedevice/mobiledevice X-KDE-Library=libkmobile_gnokii Icon=mobile_phone diff --git a/kmobile/devices/skeleton/libkmobile_skeleton.desktop b/kmobile/devices/skeleton/libkmobile_skeleton.desktop index 2b22ca6eb..72943d15a 100644 --- a/kmobile/devices/skeleton/libkmobile_skeleton.desktop +++ b/kmobile/devices/skeleton/libkmobile_skeleton.desktop @@ -102,6 +102,6 @@ Comment[uk]=Прототип мобільного пристрою Comment[zh_CN]=移动万能设备 Comment[zh_TW]=行動通訊空殼裝置 Type=Service -ServiceTypes=kdetqdevice/mobiletqdevice +ServiceTypes=kdedevice/mobiledevice X-KDE-Library=libkmobile_skeleton Icon=mobile_unknown diff --git a/kmobile/devices/skeleton/skeleton.cpp b/kmobile/devices/skeleton/skeleton.cpp index b5073de87..e6b1d9c59 100644 --- a/kmobile/devices/skeleton/skeleton.cpp +++ b/kmobile/devices/skeleton/skeleton.cpp @@ -43,16 +43,16 @@ TQObject *KMobileSkeleton::createObject( TQObject *parent, const char *name, /** - * The KDE skeleton mobile tqdevice driver. + * The KDE skeleton mobile device driver. */ KMobileSkeleton::KMobileSkeleton(TQObject *obj, const char *name, const TQStringList &args ) : KMobileDevice(obj, name, args) { - // set initial tqdevice info + // set initial device info setClassType( Phone ); - m_tqdeviceName = i18n("LX-50-Moohoo Addressbook (Skeleton)"); - m_tqdeviceRevision = "0.1"; + m_deviceName = i18n("LX-50-Moohoo Addressbook (Skeleton)"); + m_deviceRevision = "0.1"; setCapabilities( hasAddressBook | hasNotes ); } @@ -60,26 +60,26 @@ KMobileSkeleton::~KMobileSkeleton() { } -// connect the tqdevice and ask user to turn tqdevice on (if necessary) +// connect the device and ask user to turn device on (if necessary) bool KMobileSkeleton::connectDevice(TQWidget *parent) { if (KMessageBox::Continue != KMessageBox::warningContinueCancel(parent, - i18n("Please turn on your %1 on now and press continue to proceed.").tqarg(m_tqdeviceName), - m_tqdeviceClassName ) ) + i18n("Please turn on your %1 on now and press continue to proceed.").arg(m_deviceName), + m_deviceClassName ) ) return false; // connect it now... m_connected = true; return m_connected; } -// disconnect the tqdevice and return true, if sucessful +// disconnect the device and return true, if sucessful bool KMobileSkeleton::disconnectDevice(TQWidget *) { m_connected = true; return true; } -// returns true, if this tqdevice is read-only (default: false) +// returns true, if this device is read-only (default: false) bool KMobileSkeleton::isReadOnly() const { return true; @@ -87,7 +87,7 @@ bool KMobileSkeleton::isReadOnly() const // return a unique ID, e.g. the IMEI number of phones, or a serial number // this String is used to have a unique identification for syncronisation. -TQString KMobileSkeleton::tqdeviceUniqueID() +TQString KMobileSkeleton::deviceUniqueID() { return TQString::fromLocal8Bit("SkElEtOn-123456789"); } @@ -112,7 +112,7 @@ int KMobileSkeleton::readAddress( int index, KABC::Addressee &addr ) return KIO::ERR_DOES_NOT_EXIST; // now build our own sample name - addr.setFamilyName(TQString("Meyer_%1").tqarg(index+1)); + addr.setFamilyName(TQString("Meyer_%1").arg(index+1)); addr.setGivenName("Peter"); addr.setFormattedName("Peter "+addr.familyName()); addr.setNickName("PeterM"); @@ -132,7 +132,7 @@ int KMobileSkeleton::readAddress( int index, KABC::Addressee &addr ) int KMobileSkeleton::storeAddress( int, const KABC::Addressee &, bool ) { - /* this is a read-only tqdevice */ + /* this is a read-only device */ return KIO::ERR_WRITE_ACCESS_DENIED; } @@ -156,8 +156,8 @@ int KMobileSkeleton::readNote( int index, TQString ¬e ) "DeviceClassName: %3\n" "Device Driver : %4\n" "Device Revision: %5\n") - .tqarg(index).tqarg(index) - .tqarg(tqdeviceClassName()).tqarg(tqdeviceName()).tqarg(revision()); + .arg(index).arg(index) + .arg(deviceClassName()).arg(deviceName()).arg(revision()); return 0; } diff --git a/kmobile/devices/skeleton/skeleton.h b/kmobile/devices/skeleton/skeleton.h index 6ae0287b9..ab3ce7701 100644 --- a/kmobile/devices/skeleton/skeleton.h +++ b/kmobile/devices/skeleton/skeleton.h @@ -42,14 +42,14 @@ public: bool connectDevice(TQWidget *parent); bool disconnectDevice(TQWidget *parent); - // returns true, if this tqdevice is read-only (default: false) + // returns true, if this device is read-only (default: false) bool isReadOnly() const; // you may provide your own icon() implementation to display // an appropriate Pixmap (e.g. a Palm Pilot or a Zaurus image). TQString iconFileName() const; - TQString tqdeviceUniqueID(); + TQString deviceUniqueID(); /* * Addressbook / Phonebook support diff --git a/kmobile/kioslave/kio_mobile.cpp b/kmobile/kioslave/kio_mobile.cpp index ed570196d..d8216bcd3 100644 --- a/kmobile/kioslave/kio_mobile.cpp +++ b/kmobile/kioslave/kio_mobile.cpp @@ -78,13 +78,13 @@ KMobileProtocol::~KMobileProtocol() } /* - * getDeviceAndRessource("mobile:/<tqdevicename>/<resource>/...") - split + * getDeviceAndRessource("mobile:/<devicename>/<resource>/...") - split */ int KMobileProtocol::getDeviceAndRessource(const TQString &_path, TQString &devName, TQString &resource, TQString &devPath, KMobileDevice::Capabilities &devCaps) { -// PRINT_DEBUG << TQString("###getDeviceAndRessource### %1\n").tqarg(_path); +// PRINT_DEBUG << TQString("###getDeviceAndRessource### %1\n").arg(_path); TQStringList path = TQStringList::split('/', _path, false); devName = resource = devPath = TQString(); @@ -140,7 +140,7 @@ void createDirEntry(KIO::UDSEntry& entry, const TQString& name, const TQString& addAtom(entry, KIO::UDS_URL, 0, url); addAtom(entry, KIO::UDS_USER, 0, getenv("USER")); addAtom(entry, KIO::UDS_GROUP, 0, getenv("USER")); - PRINT_DEBUG << TQString("createDirEntry: File: %1 MIME: %2 URL: %3\n").tqarg(name).tqarg(mime).tqarg(url); + PRINT_DEBUG << TQString("createDirEntry: File: %1 MIME: %2 URL: %3\n").arg(name).arg(mime).arg(url); // addAtom(entry, KIO::UDS_SIZE, 0); addAtom(entry, KIO::UDS_GUESSED_MIME_TYPE, 0, mime); } @@ -159,7 +159,7 @@ void createFileEntry(KIO::UDSEntry& entry, const TQString& name, const TQString& addAtom(entry, KIO::UDS_MIME_TYPE, 0, mime); if (size) addAtom(entry, KIO::UDS_SIZE, size); addAtom(entry, KIO::UDS_GUESSED_MIME_TYPE, 0, mime); - PRINT_DEBUG << TQString("createFileEntry: File: %1, Size: %2, MIME: %3\n").tqarg(name).tqarg(size).tqarg(mime); + PRINT_DEBUG << TQString("createFileEntry: File: %1, Size: %2, MIME: %3\n").arg(name).arg(size).arg(mime); } @@ -169,7 +169,7 @@ void createFileEntry(KIO::UDSEntry& entry, const TQString& name, const TQString& void KMobileProtocol::get(const KURL &url) { PRINT_DEBUG << "###############################\n"; - PRINT_DEBUG << TQString("get(%1)\n").tqarg(url.path()); + PRINT_DEBUG << TQString("get(%1)\n").arg(url.path()); KMobileDevice::Capabilities devCaps; TQString devName, resource, devPath; @@ -227,16 +227,16 @@ void KMobileProtocol::get(const KURL &url) /* - * listRoot() - gives listing of all tqdevices + * listRoot() - gives listing of all devices */ void KMobileProtocol::listRoot(const KURL& url) { - PRINT_DEBUG << TQString("########## listRoot(%1) for %2:/\n").tqarg(url.path()).tqarg(url.protocol()); + PRINT_DEBUG << TQString("########## listRoot(%1) for %2:/\n").arg(url.path()).arg(url.protocol()); KIO::UDSEntry entry; - TQStringList tqdeviceNames = m_dev.tqdeviceNames(); - unsigned int dirs = tqdeviceNames.count(); + TQStringList deviceNames = m_dev.deviceNames(); + unsigned int dirs = deviceNames.count(); totalSize(dirs); int classMask = KMobileDevice::Unclassified; @@ -251,7 +251,7 @@ void KMobileProtocol::listRoot(const KURL& url) for (unsigned int i=0; i<dirs; i++) { - TQString devName = tqdeviceNames[i]; + TQString devName = deviceNames[i]; if (classMask != KMobileDevice::Unclassified && m_dev.classType(devName) != classMask) @@ -307,12 +307,12 @@ TQString KMobileProtocol::entryMimeType(int cap) } /* - * listTopDeviceDir("mobile:/<tqdevicename>") - sub-directory of a tqdevices + * listTopDeviceDir("mobile:/<devicename>") - sub-directory of a devices */ void KMobileProtocol::listTopDeviceDir(const TQString &devName) { - PRINT_DEBUG << TQString("listTopDeviceDir(%1)\n").tqarg(devName); + PRINT_DEBUG << TQString("listTopDeviceDir(%1)\n").arg(devName); KIO::UDSEntry entry; unsigned int caps = m_dev.capabilities(devName); @@ -325,7 +325,7 @@ void KMobileProtocol::listTopDeviceDir(const TQString &devName) TQString filename = m_dev.nameForCap(devName, cap); TQString mimetype = folderMimeType(cap); - createDirEntry(entry, filename, TQString("mobile:/%1/%2/").tqarg(devName).tqarg(filename), mimetype); + createDirEntry(entry, filename, TQString("mobile:/%1/%2/").arg(devName).arg(filename), mimetype); listEntry(entry, false); } listEntry(entry, true); @@ -334,13 +334,13 @@ void KMobileProtocol::listTopDeviceDir(const TQString &devName) /* - * listEntries("mobile:/<tqdevicename>/<resource>") - resources of a tqdevice + * listEntries("mobile:/<devicename>/<resource>") - resources of a device */ void KMobileProtocol::listEntries(const TQString &devName, const TQString &resource, const TQString &devPath, const KMobileDevice::Capabilities devCaps) { - PRINT_DEBUG << TQString("listEntries(%1,%2,%3)\n").tqarg(devName).tqarg(resource).tqarg(devPath); + PRINT_DEBUG << TQString("listEntries(%1,%2,%3)\n").arg(devName).arg(resource).arg(devPath); switch (devCaps) { case KMobileDevice::hasAddressBook: listAddressBook(devName, resource); break; @@ -351,16 +351,16 @@ void KMobileProtocol::listEntries(const TQString &devName, case KMobileDevice::hasFileStorage: listFileStorage(devName, resource, devPath); break; default: error( ERR_CANNOT_ENTER_DIRECTORY, - TQString("/%1/%2").tqarg(devName).tqarg(resource) ); + TQString("/%1/%2").arg(devName).arg(resource) ); } } /* - * listAddressBook("mobile:/<tqdevicename>/Addressbook) - list the addressbook + * listAddressBook("mobile:/<devicename>/Addressbook) - list the addressbook */ void KMobileProtocol::listAddressBook(const TQString &devName, const TQString &resource) { - PRINT_DEBUG << TQString("listAddressBook(%1)\n").tqarg(devName); + PRINT_DEBUG << TQString("listAddressBook(%1)\n").arg(devName); KIO::UDSEntry entry; @@ -382,11 +382,11 @@ void KMobileProtocol::listAddressBook(const TQString &devName, const TQString &r name = "_" + rx.cap(1); #endif - TQString filename = TQString("%1%2.vcf").tqarg(i,fieldwidth).tqarg(name); + TQString filename = TQString("%1%2.vcf").arg(i,fieldwidth).arg(name); for (int p=0; p<fieldwidth; p++) { if (filename[p]==' ') filename[p]='0'; else break; } - TQString url = TQString("mobile:/%1/%2/%3").tqarg(devName).tqarg(resource).tqarg(filename); + TQString url = TQString("mobile:/%1/%2/%3").arg(devName).arg(resource).arg(filename); createFileEntry(entry, filename, url, entryMimeType(KMobileDevice::hasAddressBook), 400 /*content.utf8().length()*/ ); @@ -403,7 +403,7 @@ void KMobileProtocol::listAddressBook(const TQString &devName, const TQString &r */ int KMobileProtocol::getVCard( const TQString &devName, TQCString &result, TQString &mime, const TQString &path ) { - PRINT_DEBUG << TQString("getVCard(%1)\n").tqarg(path); + PRINT_DEBUG << TQString("getVCard(%1)\n").arg(path); int index = path.find('.'); if (index>0) @@ -421,11 +421,11 @@ int KMobileProtocol::getVCard( const TQString &devName, TQCString &result, TQStr } /* - * listCalendar("mobile:/<tqdevicename>/Calendar) - list the calendar entries + * listCalendar("mobile:/<devicename>/Calendar) - list the calendar entries */ void KMobileProtocol::listCalendar( const TQString &devName, const TQString &resource) { - PRINT_DEBUG << TQString("listCalendar(%1)\n").tqarg(devName); + PRINT_DEBUG << TQString("listCalendar(%1)\n").arg(devName); KIO::UDSEntry entry; @@ -433,8 +433,8 @@ void KMobileProtocol::listCalendar( const TQString &devName, const TQString &res totalSize(entries); for (int i=0; i<entries; i++) { - TQString filename = TQString("%1_%2.vcs").tqarg(i).tqarg(i18n("calendar")); - TQString url = TQString("mobile:/%1/%2/%3").tqarg(devName).tqarg(resource).tqarg(filename); + TQString filename = TQString("%1_%2.vcs").arg(i).arg(i18n("calendar")); + TQString url = TQString("mobile:/%1/%2/%3").arg(devName).arg(resource).arg(filename); createFileEntry(entry, filename, url, entryMimeType(KMobileDevice::hasCalendar)); listEntry(entry, false); @@ -450,7 +450,7 @@ void KMobileProtocol::listCalendar( const TQString &devName, const TQString &res */ int KMobileProtocol::getCalendar( const TQString &devName, TQCString &result, TQString &mime, const TQString &path) { - PRINT_DEBUG << TQString("getCalendar(%1, #%2)\n").tqarg(devName).tqarg(path); + PRINT_DEBUG << TQString("getCalendar(%1, #%2)\n").arg(devName).arg(path); /* TODO */ Q_UNUSED(result); @@ -460,11 +460,11 @@ int KMobileProtocol::getCalendar( const TQString &devName, TQCString &result, TQ /* - * listNotes("mobile:/<tqdevicename>/Notes) - list the notes + * listNotes("mobile:/<devicename>/Notes) - list the notes */ void KMobileProtocol::listNotes( const TQString &devName, const TQString &resource) { - PRINT_DEBUG << TQString("listNotes(%1)\n").tqarg(devName); + PRINT_DEBUG << TQString("listNotes(%1)\n").arg(devName); KIO::UDSEntry entry; @@ -474,8 +474,8 @@ void KMobileProtocol::listNotes( const TQString &devName, const TQString &resour TQString note /*= m_dev.readNote(devName, i)*/; - TQString filename = TQString("%1_%2.txt").tqarg(i).tqarg(i18n("note")); - TQString url = TQString("mobile:/%1/%2/%3").tqarg(devName).tqarg(resource).tqarg(filename); + TQString filename = TQString("%1_%2.txt").arg(i).arg(i18n("note")); + TQString url = TQString("mobile:/%1/%2/%3").arg(devName).arg(resource).arg(filename); createFileEntry(entry, filename, url, entryMimeType(KMobileDevice::hasNotes), 0 /*note.utf8().length()*/); @@ -492,7 +492,7 @@ void KMobileProtocol::listNotes( const TQString &devName, const TQString &resour */ int KMobileProtocol::getNote( const TQString &devName, TQCString &result, TQString &mime, const TQString &path ) { - PRINT_DEBUG << TQString("getNote(%1)\n").tqarg(path); + PRINT_DEBUG << TQString("getNote(%1)\n").arg(path); int index = path.find('_'); if (index>0) @@ -510,14 +510,14 @@ int KMobileProtocol::getNote( const TQString &devName, TQCString &result, TQStri } /* - * listFileStorage("mobile:/<tqdevicename>/Files) - list the files on the tqdevice + * listFileStorage("mobile:/<devicename>/Files) - list the files on the device */ void KMobileProtocol::listFileStorage(const TQString &devName, const TQString &resource, const TQString &devPath) { - PRINT_DEBUG << TQString("listFileStorage(%1,%2)\n").tqarg(devName).tqarg(devPath); + PRINT_DEBUG << TQString("listFileStorage(%1,%2)\n").arg(devName).arg(devPath); /* TODO */ - error( KIO::ERR_DOES_NOT_EXIST, TQString("/%1/%2/%3").tqarg(devName).tqarg(resource).tqarg(devPath) ); + error( KIO::ERR_DOES_NOT_EXIST, TQString("/%1/%2/%3").arg(devName).arg(resource).arg(devPath) ); } /* @@ -525,7 +525,7 @@ void KMobileProtocol::listFileStorage(const TQString &devName, const TQString &r */ int KMobileProtocol::getFileStorage(const TQString &devName, TQCString &result, TQString &mime, const TQString &path) { - PRINT_DEBUG << TQString("getFileStorage(%1)\n").tqarg(path); + PRINT_DEBUG << TQString("getFileStorage(%1)\n").arg(path); /* TODO */ Q_UNUSED(devName); @@ -541,7 +541,7 @@ int KMobileProtocol::getFileStorage(const TQString &devName, TQCString &result, void KMobileProtocol::stat( const KURL &url ) { PRINT_DEBUG << "###############################\n"; - PRINT_DEBUG << TQString("stat(%1)\n").tqarg(url.path()); + PRINT_DEBUG << TQString("stat(%1)\n").arg(url.path()); KMobileDevice::Capabilities devCaps; TQString devName, resource, devPath; @@ -555,7 +555,7 @@ void KMobileProtocol::stat( const KURL &url ) TQStringList path = TQStringList::split('/', url.path(), false); TQString filename = (path.count()>0) ? path[path.count()-1] : "/"; TQString fullPath = path.join("/"); - TQString fullUrl = TQString("mobile:/%1").tqarg(fullPath); + TQString fullUrl = TQString("mobile:/%1").arg(fullPath); UDSEntry entry; @@ -577,7 +577,7 @@ void KMobileProtocol::stat( const KURL &url ) void KMobileProtocol::mimetype(const KURL &url) { PRINT_DEBUG << "###############################\n"; - PRINT_DEBUG << TQString("mimetype(%1)\n").tqarg(url.path()); + PRINT_DEBUG << TQString("mimetype(%1)\n").arg(url.path()); KMobileDevice::Capabilities devCaps; TQString devName, resource, devPath; @@ -599,7 +599,7 @@ void KMobileProtocol::mimetype(const KURL &url) void KMobileProtocol::listDir(const KURL &url) { PRINT_DEBUG << "###############################\n"; - PRINT_DEBUG << TQString("listDir(%1)\n").tqarg(url.path()); + PRINT_DEBUG << TQString("listDir(%1)\n").arg(url.path()); if (!m_dev.isKMobileAvailable()) { error( KIO::ERR_CONNECTION_BROKEN, i18n("KDE Mobile Device Manager") ); @@ -622,7 +622,7 @@ void KMobileProtocol::listDir(const KURL &url) #if 0 if (!dev) { - error( KIO::ERR_DOES_NOT_EXIST, TQString("/%1").tqarg(devName) ); + error( KIO::ERR_DOES_NOT_EXIST, TQString("/%1").arg(devName) ); return; } #endif diff --git a/kmobile/kioslave/mimetypes/mobile_device.desktop b/kmobile/kioslave/mimetypes/mobile_device.desktop index a04b0b8fe..4462b124d 100644 --- a/kmobile/kioslave/mimetypes/mobile_device.desktop +++ b/kmobile/kioslave/mimetypes/mobile_device.desktop @@ -58,7 +58,7 @@ Comment[zh_CN]=移动设备 Comment[zh_TW]=行動裝置 Icon=kmobile Type=MimeType -MimeType=kdetqdevice/mobiletqdevice +MimeType=kdedevice/mobiledevice Patterns= X-KDE-AutoEmbed=true diff --git a/kmobile/kmobile.cpp b/kmobile/kmobile.cpp index 8bd1da8a9..d76282541 100644 --- a/kmobile/kmobile.cpp +++ b/kmobile/kmobile.cpp @@ -77,7 +77,7 @@ KMobile::KMobile() connect(m_view, TQT_SIGNAL(signalChangeStatusbar(const TQString&)), this, TQT_SLOT(changeStatusbar(const TQString&))); - // restore all configured tqdevices + // restore all configured devices restoreAll(); // setup the system tray @@ -105,13 +105,13 @@ void KMobile::setupActions() KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(optionsPreferences()), actionCollection()); new KAction(i18n("&Add Device..."), "folder_new", 0, - TQT_TQOBJECT(this), TQT_SLOT(addDevice()), actionCollection(), "tqdevice_add"); - new KAction( KGuiItem( i18n("&Remove Device"), "edittrash", i18n("Remove this tqdevice") ), - "Delete", TQT_TQOBJECT(this), TQT_SLOT(removeDevice()), actionCollection(), "tqdevice_remove"); + TQT_TQOBJECT(this), TQT_SLOT(addDevice()), actionCollection(), "device_add"); + new KAction( KGuiItem( i18n("&Remove Device"), "edittrash", i18n("Remove this device") ), + "Delete", TQT_TQOBJECT(this), TQT_SLOT(removeDevice()), actionCollection(), "device_remove"); new KAction(i18n("Re&name Device..."), 0, Key_F2, - TQT_TQOBJECT(this), TQT_SLOT(renameDevice()), actionCollection(), "tqdevice_rename"); + TQT_TQOBJECT(this), TQT_SLOT(renameDevice()), actionCollection(), "device_rename"); new KAction(i18n("&Configure Device..."), "configure", 0, - TQT_TQOBJECT(this), TQT_SLOT(configDevice()), actionCollection(), "tqdevice_configure"); + TQT_TQOBJECT(this), TQT_SLOT(configDevice()), actionCollection(), "device_configure"); createGUI(); @@ -240,7 +240,7 @@ void KMobile::optionsPreferences() void KMobile::renameDevice() { - // rename the current selected tqdevice + // rename the current selected device TQIconViewItem *item = m_view->currentItem(); if (item) item->rename(); @@ -258,7 +258,7 @@ void KMobile::addDevice() dialog->setCaption( i18n("Add New Mobile or Portable Device") ); - dialog->helpText->setText( i18n("Please select the category to which your new tqdevice belongs:") ); + dialog->helpText->setText( i18n("Please select the category to which your new device belongs:") ); dialog->addButton->setText( i18n("&Scan for New Devices...") ); dialog->addButton->setDisabled(true); dialog->iconView->connect( dialog->iconView, TQT_SIGNAL(doubleClicked(TQIconViewItem*)), @@ -273,7 +273,7 @@ void KMobile::addDevice() for ( it = list.begin(); it != list.end(); ++it ) { ptr = *it; kdDebug() << TQString("LIBRARY: '%1', NAME: '%2', ICON: '%3', COMMENT: '%4'\n") - .tqarg(ptr->library()).tqarg(ptr->name()).tqarg(ptr->icon()).tqarg(ptr->comment()); + .arg(ptr->library()).arg(ptr->name()).arg(ptr->icon()).arg(ptr->comment()); TQString iconName = ptr->icon(); if (iconName.isEmpty()) @@ -297,13 +297,13 @@ void KMobile::addDevice() ptr = list[index]; - // add the new tqdevice to the list + // add the new device to the list if (!m_view->addNewDevice(m_config, ptr)) { KMessageBox::error(this, TQString("<qt>KMobile could not load the <b>%1</b> Device Driver.<p>" "Please use the Skeleton- or Gnokii Device Driver during development.<p>" "This driver will still be visible, but you won't be able to access it " - "from Konqueror or any other application.</qt>").tqarg(ptr->name()), + "from Konqueror or any other application.</qt>").arg(ptr->name()), kapp->name()); } @@ -313,7 +313,7 @@ void KMobile::addDevice() #if 0 /* * show dialog to user, in which he may choose and select one of the already - * configured mobile tqdevices. + * configured mobile devices. */ KMobileDevice * KMobileFactory::chooseDeviceDialog( TQWidget *parent, enum KMobileDevice::ClassType /*type*/, enum KMobileDevice::Capabilities /*caps*/ ) @@ -322,24 +322,24 @@ KMobileDevice * KMobileFactory::chooseDeviceDialog( TQWidget *parent, m_parent = parent; - // do we already have some tqdevices configured ? + // do we already have some devices configured ? num = readDevicesList(); if (!num) { int answ; answ = KMessageBox::questionYesNo(parent, - i18n( "<qt>You have no mobile tqdevices configured yet.<p>" - "Do you want to add a tqdevice now ?</qt>" ), + i18n( "<qt>You have no mobile devices configured yet.<p>" + "Do you want to add a device now ?</qt>" ), i18n( "KDE Mobile Device Access" ), KStdGuiItem::add(), i18n("Do Not Add") ); if (answ != KMessageBox::Yes) return 0L; - // add a new tqdevice + // add a new device addDeviceDialog(parent); } num = readDevicesList(); if (!num) return 0L; - // let the user select one of the configured tqdevices + // let the user select one of the configured devices KMobile_selectiondialog *dialog = new KMobile_selectiondialog(parent); if (!dialog) return 0L; @@ -357,7 +357,7 @@ KMobileDevice * KMobileFactory::chooseDeviceDialog( TQWidget *parent, continue; // kdDebug() << TQString("LIBRARY: '%1', NAME: '%2', ICON: '%3', COMMENT: '%4' #%5\n") - // .tqarg(ptr->library()).tqarg(ptr->name()).tqarg(ptr->icon()).tqarg(ptr->comment()).tqarg(i); + // .arg(ptr->library()).arg(ptr->name()).arg(ptr->icon()).arg(ptr->comment()).arg(i); TQString iconName = ptr->icon(); if (iconName.isEmpty()) @@ -384,7 +384,7 @@ KMobileDevice * KMobileFactory::chooseDeviceDialog( TQWidget *parent, void KMobile::removeDevice() { - // remove the current selected tqdevice + // remove the current selected device TQIconViewItem *item = m_view->currentItem(); if (item) m_view->removeDevice( item->text() ); @@ -392,7 +392,7 @@ void KMobile::removeDevice() void KMobile::configDevice() { - // configure the current selected tqdevice + // configure the current selected device TQIconViewItem *item = m_view->currentItem(); if (item) m_view->configDevice( item->text() ); diff --git a/kmobile/kmobile_selectiondialog.ui b/kmobile/kmobile_selectiondialog.ui index 7088a6ff0..67b41b143 100644 --- a/kmobile/kmobile_selectiondialog.ui +++ b/kmobile/kmobile_selectiondialog.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <grid> <property name="name"> @@ -32,7 +32,7 @@ <cstring>helpText</cstring> </property> <property name="text"> - <string><b>Select mobile tqdevice:</b></string> + <string><b>Select mobile device:</b></string> </property> </widget> <widget class="TQIconView" row="1" column="0" rowspan="1" colspan="3"> @@ -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..9c95efe8f 100644 --- a/kmobile/kmobileclient.cpp +++ b/kmobile/kmobileclient.cpp @@ -36,10 +36,10 @@ KMobileClient::KMobileClient() m_kmobileObj = "kmobileIface"; bool ok = attach(); - PRINT_DEBUG << TQString("attached to DCOP server %1\n").tqarg(ok?"sucessful.":"failed."); + PRINT_DEBUG << TQString("attached to DCOP server %1\n").arg(ok?"sucessful.":"failed."); // m_clientAppId = registerAs("kmobileclient"); -// PRINT_DEBUG << TQString("registered as DCOP client %1\n").tqarg(m_clientAppId); +// PRINT_DEBUG << TQString("registered as DCOP client %1\n").arg(m_clientAppId); isKMobileAvailable(); } @@ -54,7 +54,7 @@ KMobileClient::~KMobileClient() bool KMobileClient::isKMobileAvailable() { bool available = isApplicationRegistered(m_kmobileApp); - PRINT_DEBUG << TQString("KMobile DCOP server: %1\n").tqarg(available?"available.":"not available"); + PRINT_DEBUG << TQString("KMobile DCOP server: %1\n").arg(available?"available.":"not available"); if (!available) { startKMobileApplication(); // check again... @@ -73,7 +73,7 @@ bool KMobileClient::startKMobileApplication() TQCString replyType; TQByteArray replyData; bool ok = call("klauncher", "klauncher", "tdeinit_exec_wait(TQString,TQStringList)", data, replyType, replyData); - PRINT_DEBUG << TQString("DCOP-CALL to klauncher: %1\n").tqarg(ok?"ok.":"failed."); + PRINT_DEBUG << TQString("DCOP-CALL to klauncher: %1\n").arg(ok?"ok.":"failed."); return ok; } @@ -93,7 +93,7 @@ bool KMobileClient::startKMobileApplication() TQCString replyType; \ TQByteArray replyData; \ bool ok = call(m_kmobileApp, m_kmobileObj, FUNC, data, replyType, replyData, KMOBILECLIENT_USE_EVENTLOOP, KMOBILECLIENT_TIMEOUT); \ - PRINT_DEBUG << TQString("DCOP-CALL to %1: %2\n").tqarg(FUNC).tqarg(ok?"ok.":"FAILED.") + PRINT_DEBUG << TQString("DCOP-CALL to %1: %2\n").arg(FUNC).arg(ok?"ok.":"FAILED.") #define RETURN_TYPE( FUNC, PARAMS, RETURN_TYPE ) \ PREPARE( FUNC, PARAMS ); \ @@ -122,110 +122,110 @@ bool KMobileClient::startKMobileApplication() -TQStringList KMobileClient::tqdeviceNames() +TQStringList KMobileClient::deviceNames() { if (!isKMobileAvailable()) return TQStringList(); - RETURN_TYPE( "tqdeviceNames()", TQString::tqfromLatin1(""), TQStringList ); + RETURN_TYPE( "deviceNames()", TQString::fromLatin1(""), TQStringList ); } -void KMobileClient::removeDevice( TQString tqdeviceName ) +void KMobileClient::removeDevice( TQString deviceName ) { - PREPARE( "removeDevice(TQString)", tqdeviceName ); + PREPARE( "removeDevice(TQString)", deviceName ); Q_UNUSED(ok); } -void KMobileClient::configDevice( TQString tqdeviceName ) +void KMobileClient::configDevice( TQString deviceName ) { - PREPARE( "configDevice(TQString)", tqdeviceName ); + PREPARE( "configDevice(TQString)", deviceName ); Q_UNUSED(ok); } -bool KMobileClient::connectDevice( TQString tqdeviceName ) +bool KMobileClient::connectDevice( TQString deviceName ) { - RETURN_BOOL( "connectDevice(TQString)", tqdeviceName ); + RETURN_BOOL( "connectDevice(TQString)", deviceName ); } -bool KMobileClient::disconnectDevice( TQString tqdeviceName ) +bool KMobileClient::disconnectDevice( TQString deviceName ) { - RETURN_BOOL( "disconnectDevice(TQString)", tqdeviceName ); + RETURN_BOOL( "disconnectDevice(TQString)", deviceName ); } -bool KMobileClient::connected( TQString tqdeviceName ) +bool KMobileClient::connected( TQString deviceName ) { - RETURN_BOOL( "connected(TQString)", tqdeviceName ); + RETURN_BOOL( "connected(TQString)", deviceName ); } -TQString KMobileClient::tqdeviceClassName( TQString tqdeviceName ) +TQString KMobileClient::deviceClassName( TQString deviceName ) { - RETURN_TQSTRING( "tqdeviceClassName(TQString)", tqdeviceName ); + RETURN_TQSTRING( "deviceClassName(TQString)", deviceName ); } -TQString KMobileClient::tqdeviceName( TQString tqdeviceName ) +TQString KMobileClient::deviceName( TQString deviceName ) { - RETURN_TQSTRING( "tqdeviceName(TQString)", tqdeviceName ); + RETURN_TQSTRING( "deviceName(TQString)", deviceName ); } -TQString KMobileClient::revision( TQString tqdeviceName ) +TQString KMobileClient::revision( TQString deviceName ) { - RETURN_TQSTRING( "revision(TQString)", tqdeviceName ); + RETURN_TQSTRING( "revision(TQString)", deviceName ); } -int KMobileClient::classType( TQString tqdeviceName ) +int KMobileClient::classType( TQString deviceName ) { - RETURN_INT( "classType(TQString)", tqdeviceName ); + RETURN_INT( "classType(TQString)", deviceName ); } -int KMobileClient::capabilities( TQString tqdeviceName ) +int KMobileClient::capabilities( TQString deviceName ) { - RETURN_INT( "capabilities(TQString)", tqdeviceName ); + RETURN_INT( "capabilities(TQString)", deviceName ); } -TQString KMobileClient::nameForCap( TQString tqdeviceName, int cap ) +TQString KMobileClient::nameForCap( TQString deviceName, int cap ) { - RETURN_TQSTRING( "nameForCap(TQString,int)", tqdeviceName << cap ); + RETURN_TQSTRING( "nameForCap(TQString,int)", deviceName << cap ); } -TQString KMobileClient::iconFileName( TQString tqdeviceName ) +TQString KMobileClient::iconFileName( TQString deviceName ) { - RETURN_TQSTRING( "iconFileName(TQString)", tqdeviceName ); + RETURN_TQSTRING( "iconFileName(TQString)", deviceName ); } -int KMobileClient::numAddresses( TQString tqdeviceName ) +int KMobileClient::numAddresses( TQString deviceName ) { - RETURN_INT( "numAddresses(TQString)", tqdeviceName ); + RETURN_INT( "numAddresses(TQString)", deviceName ); } -TQString KMobileClient::readAddress( TQString tqdeviceName, int index ) +TQString KMobileClient::readAddress( TQString deviceName, int index ) { - RETURN_TQSTRING( "readAddress(TQString,int)", tqdeviceName << index ); + RETURN_TQSTRING( "readAddress(TQString,int)", deviceName << index ); } -bool KMobileClient::storeAddress( TQString tqdeviceName, int index, TQString vcard, bool append ) +bool KMobileClient::storeAddress( TQString deviceName, int index, TQString vcard, bool append ) { - RETURN_BOOL( "storeAddress(TQString,int,TQString,bool)", tqdeviceName << index << vcard << append ); + RETURN_BOOL( "storeAddress(TQString,int,TQString,bool)", deviceName << index << vcard << append ); } -int KMobileClient::numCalendarEntries( TQString tqdeviceName ) +int KMobileClient::numCalendarEntries( TQString deviceName ) { - RETURN_INT( "numCalendarEntries(TQString)", tqdeviceName ); + RETURN_INT( "numCalendarEntries(TQString)", deviceName ); } -int KMobileClient::numNotes( TQString tqdeviceName ) +int KMobileClient::numNotes( TQString deviceName ) { - RETURN_INT( "numNotes(TQString)", tqdeviceName ); + RETURN_INT( "numNotes(TQString)", deviceName ); } -TQString KMobileClient::readNote( TQString tqdeviceName, int index ) +TQString KMobileClient::readNote( TQString deviceName, int index ) { - RETURN_TQSTRING( "readNote(TQString,int)", tqdeviceName << index ); + RETURN_TQSTRING( "readNote(TQString,int)", deviceName << index ); } -bool KMobileClient::storeNote( TQString tqdeviceName, int index, TQString note ) +bool KMobileClient::storeNote( TQString deviceName, int index, TQString note ) { - RETURN_BOOL( "storeNote(TQString,int,TQString)", tqdeviceName << index << note ); + RETURN_BOOL( "storeNote(TQString,int,TQString)", deviceName << index << note ); } diff --git a/kmobile/kmobileclient.h b/kmobile/kmobileclient.h index 6e5f26b78..8456776c6 100644 --- a/kmobile/kmobileclient.h +++ b/kmobile/kmobileclient.h @@ -24,34 +24,34 @@ public: /** * DCOP implementation */ - TQStringList tqdeviceNames(); + TQStringList deviceNames(); - void removeDevice( TQString tqdeviceName ); - void configDevice( TQString tqdeviceName ); + void removeDevice( TQString deviceName ); + void configDevice( TQString deviceName ); - bool connectDevice( TQString tqdeviceName ); - bool disconnectDevice( TQString tqdeviceName ); - bool connected( TQString tqdeviceName ); + bool connectDevice( TQString deviceName ); + bool disconnectDevice( TQString deviceName ); + bool connected( TQString deviceName ); - TQString tqdeviceClassName( TQString tqdeviceName ); - TQString tqdeviceName( TQString tqdeviceName ); - TQString revision( TQString tqdeviceName ); - int classType( TQString tqdeviceName ); + TQString deviceClassName( TQString deviceName ); + TQString deviceName( TQString deviceName ); + TQString revision( TQString deviceName ); + int classType( TQString deviceName ); - int capabilities( TQString tqdeviceName ); - TQString nameForCap( TQString tqdeviceName, int cap ); + int capabilities( TQString deviceName ); + TQString nameForCap( TQString deviceName, int cap ); - TQString iconFileName( TQString tqdeviceName ); + TQString iconFileName( TQString deviceName ); - int numAddresses( TQString tqdeviceName ); - TQString readAddress( TQString tqdeviceName, int index ); - bool storeAddress( TQString tqdeviceName, int index, TQString vcard, bool append ); + int numAddresses( TQString deviceName ); + TQString readAddress( TQString deviceName, int index ); + bool storeAddress( TQString deviceName, int index, TQString vcard, bool append ); - int numCalendarEntries( TQString tqdeviceName ); + int numCalendarEntries( TQString deviceName ); - int numNotes( TQString tqdeviceName ); - TQString readNote( TQString tqdeviceName, int index ); - bool storeNote( TQString tqdeviceName, int index, TQString note ); + int numNotes( TQString deviceName ); + TQString readNote( TQString deviceName, int index ); + bool storeNote( TQString deviceName, int index, TQString note ); private: TQCString m_clientAppId; diff --git a/kmobile/kmobiledevice.cpp b/kmobile/kmobiledevice.cpp index a4d807da0..36c6bacb7 100644 --- a/kmobile/kmobiledevice.cpp +++ b/kmobile/kmobiledevice.cpp @@ -44,7 +44,7 @@ #define PRINT_DEBUG kdDebug(KMOBILEDEVICE_DEBUG_AREA) << "KMobileDevice: " /** - * The base plugin class of all mobile tqdevice drivers. + * The base plugin class of all mobile device drivers. */ KMobileDevice::KMobileDevice(TQObject *obj, const char *name, const TQStringList &args) @@ -53,8 +53,8 @@ KMobileDevice::KMobileDevice(TQObject *obj, const char *name, const TQStringList { setClassType(Unclassified); setCapabilities(hasNothing); - m_tqdeviceName = i18n("Unknown Device"); - m_tqdeviceRevision = i18n("n/a"); /* not available */ + m_deviceName = i18n("Unknown Device"); + m_deviceRevision = i18n("n/a"); /* not available */ m_connectionName = i18n("Unknown Connection"); // set the config file name @@ -63,7 +63,7 @@ KMobileDevice::KMobileDevice(TQObject *obj, const char *name, const TQStringList m_config = new KConfig(); else m_config = new KConfig(m_configFileName); - PRINT_DEBUG << TQString("name of config file is %1\n").tqarg(m_configFileName); + PRINT_DEBUG << TQString("name of config file is %1\n").arg(m_configFileName); } KMobileDevice::~KMobileDevice() @@ -78,20 +78,20 @@ bool KMobileDevice::connected() } // returns e.g. "Nokia mobile phone", "MP3 Player", "Handspring Organizer" -TQString KMobileDevice::tqdeviceClassName() const +TQString KMobileDevice::deviceClassName() const { - return m_tqdeviceClassName; + return m_deviceClassName; } -// returns real tqdevice name, e.g. "Nokia 6310" or "Rio MP3 Player" -TQString KMobileDevice::tqdeviceName() const +// returns real device name, e.g. "Nokia 6310" or "Rio MP3 Player" +TQString KMobileDevice::deviceName() const { - return m_tqdeviceName; + return m_deviceName; } TQString KMobileDevice::revision() const { - return m_tqdeviceRevision; + return m_deviceRevision; } bool KMobileDevice::isSlowDevice() const @@ -107,15 +107,15 @@ bool KMobileDevice::isReadOnly() const bool KMobileDevice::configDialog( TQWidget *parent ) { KMessageBox::information( parent, - i18n("This tqdevice does not need any configuration."), - tqdeviceName() ); + i18n("This device does not need any configuration."), + deviceName() ); return true; } void KMobileDevice::setClassType( enum ClassType ct ) { m_classType = ct; - m_tqdeviceClassName = defaultClassName(ct); + m_deviceClassName = defaultClassName(ct); } enum KMobileDevice::ClassType KMobileDevice::classType() const @@ -239,7 +239,7 @@ int KMobileDevice::storeNote( int, const TQString & ) /* * File storage support - * @param fileName path and name of a file in the mobile tqdevice, e.g. "/MYFILE.TXT", "/mp3/song1.mp3" + * @param fileName path and name of a file in the mobile device, e.g. "/MYFILE.TXT", "/mp3/song1.mp3" */ static @@ -260,7 +260,7 @@ void KMobileDevice::createDirEntry(KIO::UDSEntry& entry, const TQString& name, c addAtom(entry, KIO::UDS_ACCESS, 0500); addAtom(entry, KIO::UDS_MIME_TYPE, 0, mime); addAtom(entry, KIO::UDS_URL, 0, url); - PRINT_DEBUG << TQString("createDirEntry: File: %1 MIME: %2 URL: %3\n").tqarg(name).tqarg(mime).tqarg(url); + PRINT_DEBUG << TQString("createDirEntry: File: %1 MIME: %2 URL: %3\n").arg(name).arg(mime).arg(url); // addAtom(entry, KIO::UDS_SIZE, 0); addAtom(entry, KIO::UDS_GUESSED_MIME_TYPE, 0, mime); } @@ -276,7 +276,7 @@ void KMobileDevice::createFileEntry(KIO::UDSEntry& entry, const TQString& name, addAtom(entry, KIO::UDS_MIME_TYPE, 0, mime); if (size) addAtom(entry, KIO::UDS_SIZE, size); addAtom(entry, KIO::UDS_GUESSED_MIME_TYPE, 0, mime); - PRINT_DEBUG << TQString("createFileEntry: File: %1, Size: %2, MIME: %3\n").tqarg(name).tqarg(size).tqarg(mime); + PRINT_DEBUG << TQString("createFileEntry: File: %1, Size: %2, MIME: %3\n").arg(name).arg(size).arg(mime); } @@ -339,7 +339,7 @@ void KMobileDevice::special( const TQByteArray & ) /* - * tqdevice locking/unlocking functions + * device locking/unlocking functions */ #ifdef HAVE_BAUDBOY_H @@ -374,7 +374,7 @@ void KMobileDevice::special( const TQByteArray & ) #define DEVICE_LOCK_PATH_PREFIX "/var/lock/LCK.." -bool KMobileDevice::lockDevice(const TQString &tqdevice, TQString &err_reason) +bool KMobileDevice::lockDevice(const TQString &device, TQString &err_reason) { #ifdef HAVE_BAUDBOY_H return ttylock(device.local8bit()) == EXIT_SUCCESS; @@ -383,9 +383,9 @@ bool KMobileDevice::lockDevice(const TQString &tqdevice, TQString &err_reason) return !dev_lock(device.local8bit()); # else int pid = -1; - TQStringList all = TQStringList::split('/', tqdevice); + TQStringList all = TQStringList::split('/', device); if (!all.count()) { - err_reason = i18n("Invalid tqdevice (%1)").tqarg(tqdevice); + err_reason = i18n("Invalid device (%1)").arg(device); return false; } TQString lockName = DEVICE_LOCK_PATH_PREFIX + all[all.count()-1]; @@ -393,7 +393,7 @@ bool KMobileDevice::lockDevice(const TQString &tqdevice, TQString &err_reason) if (file.exists() && file.open(IO_ReadOnly)) { if (file.size() == 0) { err_reason = i18n("Unable to read lockfile %s. Please check for reason and " - "remove the lockfile by hand.").tqarg(lockName); + "remove the lockfile by hand.").arg(lockName); PRINT_DEBUG << err_reason; return false; } @@ -406,16 +406,16 @@ bool KMobileDevice::lockDevice(const TQString &tqdevice, TQString &err_reason) file.close(); if (pid > 0 && kill((pid_t)pid, 0) < 0 && errno == ESRCH) { - PRINT_DEBUG << TQString("Lockfile %1 is stale. Overriding it..\n").tqarg(lockName); + PRINT_DEBUG << TQString("Lockfile %1 is stale. Overriding it..\n").arg(lockName); sleep(1); if (!file.remove()) { PRINT_DEBUG << TQString("Overriding failed, please check the permissions\n"); - PRINT_DEBUG << TQString("Cannot lock tqdevice %1\n").tqarg(tqdevice); - err_reason = i18n("Lockfile %1 is stale. Please check permissions.").tqarg(lockName); + PRINT_DEBUG << TQString("Cannot lock device %1\n").arg(device); + err_reason = i18n("Lockfile %1 is stale. Please check permissions.").arg(lockName); return false; } } else { - err_reason = i18n("Device %1 already locked.").tqarg(tqdevice); + err_reason = i18n("Device %1 already locked.").arg(device); return false; } } @@ -424,22 +424,22 @@ bool KMobileDevice::lockDevice(const TQString &tqdevice, TQString &err_reason) int fd = open(lockName.local8Bit(), O_CREAT | O_EXCL | O_WRONLY, 0644); if (fd == -1) { if (errno == EEXIST) - err_reason = i18n("Device %1 seems to be locked by unknown process.").tqarg(tqdevice); + err_reason = i18n("Device %1 seems to be locked by unknown process.").arg(device); else if (errno == EACCES) err_reason = i18n("Please check permission on lock directory."); else if (errno == ENOENT) - err_reason = i18n("Cannot create lockfile %1. Please check for existence of path.").tqarg(lockName); + err_reason = i18n("Cannot create lockfile %1. Please check for existence of path.").arg(lockName); else - err_reason = i18n("Could not create lockfile %1. Error-Code is %2.").tqarg(lockName).tqarg(errno); + err_reason = i18n("Could not create lockfile %1. Error-Code is %2.").arg(lockName).arg(errno); return false; } TQString lockText; - lockText = TQString("%1 kmobile\n").tqarg(getpid(),10); + lockText = TQString("%1 kmobile\n").arg(getpid(),10); write(fd, lockText.utf8(), lockText.utf8().length()); close(fd); PRINT_DEBUG << TQString("%1: Device %2 locked with lockfile %3.\n") - .tqarg(tqdeviceName()).tqarg(tqdevice).tqarg(lockName); + .arg(deviceName()).arg(device).arg(lockName); err_reason = TQString(); @@ -448,7 +448,7 @@ bool KMobileDevice::lockDevice(const TQString &tqdevice, TQString &err_reason) #endif } -bool KMobileDevice::unlockDevice(const TQString &tqdevice) +bool KMobileDevice::unlockDevice(const TQString &device) { #ifdef HAVE_BAUDBOY_H return ttyunlock(device.local8bit()) == EXIT_SUCCESS; @@ -456,7 +456,7 @@ bool KMobileDevice::unlockDevice(const TQString &tqdevice) # ifdef HAVE_LOCKDEV_H return 0 <= dev_unlock(device.local8bit(), getpid()); # else - TQStringList all = TQStringList::split('/', tqdevice); + TQStringList all = TQStringList::split('/', device); if (!all.count()) return false; TQString lockName = DEVICE_LOCK_PATH_PREFIX + all[all.count()-1]; TQFile file(lockName); diff --git a/kmobile/kmobiledevice.h b/kmobile/kmobiledevice.h index 88a4bc10f..b0b1a6540 100644 --- a/kmobile/kmobiledevice.h +++ b/kmobile/kmobiledevice.h @@ -37,20 +37,20 @@ class KConfig; -#define KMOBILE_MIMETYPE_DEVICE "kdetqdevice/mobiletqdevice" -#define KMOBILE_MIMETYPE_DEVICE_KONTQUEROR(name) TQString("kdetqdevice/kmobile_%1").tqarg(name) +#define KMOBILE_MIMETYPE_DEVICE "kdedevice/mobiledevice" +#define KMOBILE_MIMETYPE_DEVICE_KONTQUEROR(name) TQString("kdedevice/kmobile_%1").arg(name) #define KMOBILE_MIMETYPE_INODE "inode/" #define KMOBILE_ICON_UNKNOWN "mobile_unknown" /** - * @short Represents the base class for dynamically loaded mobile tqdevice drivers. + * @short Represents the base class for dynamically loaded mobile device drivers. * - * KMobileDevice is the base class for all hardware tqdevice drivers. + * KMobileDevice is the base class for all hardware device drivers. * Every derived class has to add additional functionality. * * For a KMobileSomeDevice driver you have to write the following code: * <pre> - * K_EXPORT_COMPONENT_FACTORY( libkmobile_sometqdevice, KMobileSomeDevice() ); + * K_EXPORT_COMPONENT_FACTORY( libkmobile_somedevice, KMobileSomeDevice() ); * TQObject *KMobileSomeDevice::createObject( TQObject *parent, const char *name, * const char *, const TQStringList &args ) * { @@ -95,34 +95,34 @@ public: virtual bool disconnectDevice( TQWidget *parent = 0 ) = 0; /** - * Returns true, if the tqdevice is currently connected and the link is online. + * Returns true, if the device is currently connected and the link is online. */ virtual bool connected(); /** - * Returns the classname, to which the tqdevice belongs. Examples are e.g. + * Returns the classname, to which the device belongs. Examples are e.g. * "Nokia mobile phone", "MP3 Player", "Handspring Organizer" */ - virtual TQString tqdeviceClassName() const; + virtual TQString deviceClassName() const; /** - * Returns the real tqdevices name, e.g. "Nokia 6310" or "Rio MP3 Player" + * Returns the real devices name, e.g. "Nokia 6310" or "Rio MP3 Player" */ - virtual TQString tqdeviceName() const; + virtual TQString deviceName() const; /** - * Returns the hardware revision of the tqdevices, e.g. "Revision 1.2" + * Returns the hardware revision of the devices, e.g. "Revision 1.2" */ virtual TQString revision() const; /** - * Returns an unique ID for the tqdevice, e.g. IMEI number on phones, or serial number. + * Returns an unique ID for the device, e.g. IMEI number on phones, or serial number. * The returned String is used to have a unique identification for syncronisation. */ - virtual TQString tqdeviceUniqueID() = 0; + virtual TQString deviceUniqueID() = 0; /** - * Returns true, if the tqdevice is connected via a slow connection. + * Returns true, if the device is connected via a slow connection. * Good examples for slow connections are serial or infrared ports. */ virtual bool isSlowDevice() const; @@ -133,7 +133,7 @@ public: virtual bool isReadOnly() const; /** - * Pop-up a tqdevice-specific configuration dialog. + * Pop-up a device-specific configuration dialog. * * @param parent The parent widget. It will be used as parent for the configuration dialog. */ @@ -158,14 +158,14 @@ public: static TQString defaultIconFileName( ClassType ct = Unclassified ); static TQString defaultClassName( ClassType ct = Unclassified ); - // The capabilities of this tqdevice (bitmapped value) + // The capabilities of this device (bitmapped value) enum Capabilities { hasNothing = 0, // not supported hasAddressBook = 1, // mobile phones, organizers, ... hasCalendar = 2, // organizers, mobile phones, ... hasNotes = 4, // organizers, mobile phones, ... hasFileStorage = 8, // organizers, handhelds, mp3-player, ... - hasAnyCapability = 0xffff // used to select tqdevices independent of the capatibilities + hasAnyCapability = 0xffff // used to select devices independent of the capatibilities }; int capabilities() const; const TQString nameForCap(int cap) const; @@ -206,7 +206,7 @@ public: */ /** - * helper functions for the kmobile tqdevice drivers + * helper functions for the kmobile device drivers */ void createDirEntry(KIO::UDSEntry& entry, const TQString& name, const TQString& url, const TQString& mime) const; @@ -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> * @@ -471,7 +471,7 @@ signals: void connectionChanged( bool conn_established ); protected: - // only available to sub-classed tqdevice drivers: + // only available to sub-classed device drivers: void setClassType( enum ClassType ct ); void setCapabilities( int caps ); KConfig *config() const { return m_config; }; @@ -479,21 +479,21 @@ protected: /** - * Lock/Unlock serial ports and other tqdevices - * @param tqdevice Name of a tqdevice port (e.g. /dev/ttyS1, ttyS1, /dev/ircomm0) - * Returns true, if tqdevice could be locked or unlocked + * Lock/Unlock serial ports and other devices + * @param device Name of a device port (e.g. /dev/ttyS1, ttyS1, /dev/ircomm0) + * Returns true, if device could be locked or unlocked */ - bool lockDevice(const TQString &tqdevice, TQString &err_reason); - bool unlockDevice(const TQString &tqdevice); + bool lockDevice(const TQString &device, TQString &err_reason); + bool unlockDevice(const TQString &device); protected: - TQMutex m_mutex; // mutex to syncronize DCOP accesses to this tqdevice + TQMutex m_mutex; // mutex to syncronize DCOP accesses to this device TQString m_configFileName; - KConfig *m_config; // this is where this tqdevice should store it's configuration + KConfig *m_config; // this is where this device should store it's configuration enum ClassType m_classType; - TQString m_tqdeviceClassName; // e.g. "Nokia mobile phone", "MP3 Player", "Handspring Organizer" - TQString m_tqdeviceName; // e.g. "Nokia 6310", "Opie" - TQString m_tqdeviceRevision; // e.g. "Revision 1.2" or "n/a" + TQString m_deviceClassName; // e.g. "Nokia mobile phone", "MP3 Player", "Handspring Organizer" + TQString m_deviceName; // e.g. "Nokia 6310", "Opie" + TQString m_deviceRevision; // e.g. "Revision 1.2" or "n/a" TQString m_connectionName; // e.g. "IRDA", "USB", "Cable", "gnokii", "gammu", ... int m_caps; // see enum Capabilities bool m_connected; diff --git a/kmobile/kmobileiface.h b/kmobile/kmobileiface.h index 5d39f236c..60974b268 100644 --- a/kmobile/kmobileiface.h +++ b/kmobile/kmobileiface.h @@ -16,40 +16,40 @@ class kmobileIface : virtual public DCOPObject public: k_dcop: - virtual TQStringList tqdeviceNames() = 0; + virtual TQStringList deviceNames() = 0; - virtual void removeDevice( TQString tqdeviceName ) = 0; - virtual void configDevice( TQString tqdeviceName ) = 0; + virtual void removeDevice( TQString deviceName ) = 0; + virtual void configDevice( TQString deviceName ) = 0; - virtual bool connectDevice( TQString tqdeviceName ) = 0; - virtual bool disconnectDevice( TQString tqdeviceName ) = 0; - virtual bool connected( TQString tqdeviceName ) = 0; + virtual bool connectDevice( TQString deviceName ) = 0; + virtual bool disconnectDevice( TQString deviceName ) = 0; + virtual bool connected( TQString deviceName ) = 0; - virtual TQString tqdeviceClassName( TQString tqdeviceName ) = 0; - virtual TQString tqdeviceName( TQString tqdeviceName ) = 0; - virtual TQString revision( TQString tqdeviceName ) = 0; - virtual int classType( TQString tqdeviceName ) = 0; + virtual TQString deviceClassName( TQString deviceName ) = 0; + virtual TQString deviceName( TQString deviceName ) = 0; + virtual TQString revision( TQString deviceName ) = 0; + virtual int classType( TQString deviceName ) = 0; - virtual int capabilities( TQString tqdeviceName ) = 0; - virtual TQString nameForCap( TQString tqdeviceName, int cap ) = 0; + virtual int capabilities( TQString deviceName ) = 0; + virtual TQString nameForCap( TQString deviceName, int cap ) = 0; - virtual TQString iconFileName( TQString tqdeviceName ) = 0; + virtual TQString iconFileName( TQString deviceName ) = 0; - virtual int numAddresses( TQString tqdeviceName ) = 0; - virtual TQString readAddress( TQString tqdeviceName, int index ) = 0; - virtual bool storeAddress( TQString tqdeviceName, int index, TQString vcard, bool append ) = 0; + virtual int numAddresses( TQString deviceName ) = 0; + virtual TQString readAddress( TQString deviceName, int index ) = 0; + virtual bool storeAddress( TQString deviceName, int index, TQString vcard, bool append ) = 0; - virtual int numCalendarEntries( TQString tqdeviceName ) = 0; + virtual int numCalendarEntries( TQString deviceName ) = 0; - virtual int numNotes( TQString tqdeviceName ) = 0; - virtual TQString readNote( TQString tqdeviceName, int index ) = 0; - virtual bool storeNote( TQString tqdeviceName, int index, TQString note ) = 0; + virtual int numNotes( TQString deviceName ) = 0; + virtual TQString readNote( TQString deviceName, int index ) = 0; + virtual bool storeNote( TQString deviceName, int index, TQString note ) = 0; /* - * DCOP functions for the tqdevices:/ kioslave + * DCOP functions for the devices:/ kioslave */ k_dcop: - virtual TQStringList kio_tqdevices_tqdeviceInfo(TQString tqdeviceName) = 0; + virtual TQStringList kio_devices_deviceInfo(TQString deviceName) = 0; }; #endif // _KMOBILEIFACE_H_ diff --git a/kmobile/kmobileitem.cpp b/kmobile/kmobileitem.cpp index 3778f1c16..d895a3666 100644 --- a/kmobile/kmobileitem.cpp +++ b/kmobile/kmobileitem.cpp @@ -37,9 +37,9 @@ KMobileItem::KMobileItem(TQIconView *parent, KConfig *_config, KService::Ptr ser Q_CHECK_PTR(service); if (service) { setText(service->name()); - m_tqdeviceDesktopFile = service->desktopEntryName(); - m_tqdeviceConfigFile = TQString("kmobile_%1_rc").tqarg(text()); - m_tqdeviceConfigFile = m_tqdeviceConfigFile.replace(' ', ""); + m_deviceDesktopFile = service->desktopEntryName(); + m_deviceConfigFile = TQString("kmobile_%1_rc").arg(text()); + m_deviceConfigFile = m_deviceConfigFile.replace(' ', ""); m_iconName = service->icon(); }; @@ -75,8 +75,8 @@ void KMobileItem::configSave() const { config->setGroup( config_SectionName() ); config->writeEntry( "Name", text() ); - config->writeEntry( "Config", m_tqdeviceConfigFile ); - config->writeEntry( "DesktopFile", m_tqdeviceDesktopFile ); + config->writeEntry( "Config", m_deviceConfigFile ); + config->writeEntry( "DesktopFile", m_deviceDesktopFile ); config->writeEntry( "IconName", m_iconName ); config->sync(); } @@ -85,12 +85,12 @@ bool KMobileItem::configLoad(int idx) { config->setGroup( config_SectionName(idx) ); setText( config->readEntry("Name") ); - m_tqdeviceConfigFile = config->readEntry( "Config" ); - m_tqdeviceDesktopFile = config->readEntry( "DesktopFile" ); + m_deviceConfigFile = config->readEntry( "Config" ); + m_deviceDesktopFile = config->readEntry( "DesktopFile" ); m_iconName = config->readEntry( "IconName" ); - if (text().isEmpty() || m_tqdeviceConfigFile.isEmpty() || - m_tqdeviceDesktopFile.isEmpty() || m_iconName.isEmpty() ) + if (text().isEmpty() || m_deviceConfigFile.isEmpty() || + m_deviceDesktopFile.isEmpty() || m_iconName.isEmpty() ) return false; return true; @@ -104,7 +104,7 @@ TQPixmap KMobileItem::getIcon() const TQString KMobileItem::config_SectionName(int idx) const { if (idx == -1) idx = index(); - return TQString("MobileDevice_%1").tqarg(idx); + return TQString("MobileDevice_%1").arg(idx); } /* this MimeType is used by konqueror */ @@ -125,7 +125,7 @@ void KMobileItem::writeKonquMimeFile() const TQString comment; if (m_dev) - comment = m_dev->tqdeviceClassName(); + comment = m_dev->deviceClassName(); if (comment.isEmpty()) comment = KMobileDevice::defaultClassName(KMobileDevice::Unclassified); @@ -142,7 +142,7 @@ void KMobileItem::writeKonquMimeFile() const /* - * get a list of all services providing a libkmobile tqdevice driver + * get a list of all services providing a libkmobile device driver */ KTrader::OfferList KMobileItem::getMobileDevicesList() { @@ -158,16 +158,16 @@ KService::Ptr KMobileItem::getServicePtr() const KService::Ptr ptr; for ( it = list.begin(); it != list.end(); ++it ) { KService::Ptr ptr = *it; - if (ptr->desktopEntryName() == m_tqdeviceDesktopFile) + if (ptr->desktopEntryName() == m_deviceDesktopFile) return ptr; } PRINT_DEBUG << TQString("Service for library '%1' not found in KService list\n") - .tqarg(m_tqdeviceDesktopFile); + .arg(m_deviceDesktopFile); return 0L; } /* - * loads & initializes the tqdevice and returns a pointer to it. + * loads & initializes the device and returns a pointer to it. */ bool KMobileItem::driverAvailable() { @@ -178,15 +178,15 @@ bool KMobileItem::driverAvailable() if (!ptr) return false; - PRINT_DEBUG << TQString("Loading library %1\n").tqarg(ptr->library()); + PRINT_DEBUG << TQString("Loading library %1\n").arg(ptr->library()); KLibFactory *factory = KLibLoader::self()->factory( ptr->library().utf8() ); if (!factory) return false; m_dev = static_cast<KMobileDevice *>(factory->create(this, ptr->name().utf8(), - "KMobileDevice", TQStringList(m_tqdeviceConfigFile))); + "KMobileDevice", TQStringList(m_deviceConfigFile))); PRINT_DEBUG << TQString("Got KMobileDevice object at 0x%1, configfile=%2\n") - .tqarg((unsigned long)m_dev, 0, 16).tqarg(m_tqdeviceConfigFile); + .arg((unsigned long)m_dev, 0, 16).arg(m_deviceConfigFile); return (m_dev != 0); } diff --git a/kmobile/kmobileitem.h b/kmobile/kmobileitem.h index e82a5cb15..ba2042659 100644 --- a/kmobile/kmobileitem.h +++ b/kmobile/kmobileitem.h @@ -44,8 +44,8 @@ private slots: private: KConfig *config; - TQString m_tqdeviceConfigFile; - TQString m_tqdeviceDesktopFile; + TQString m_deviceConfigFile; + TQString m_deviceDesktopFile; TQString m_iconName; }; diff --git a/kmobile/kmobileui.rc b/kmobile/kmobileui.rc index 9b259334a..95af1dd3b 100644 --- a/kmobile/kmobileui.rc +++ b/kmobile/kmobileui.rc @@ -8,22 +8,22 @@ </Menu> <Menu name="Device"> <text>&Device</text> - <Action name="tqdevice_add" /> - <Action name="tqdevice_remove" /> + <Action name="device_add" /> + <Action name="device_remove" /> <Separator/> - <Action name="tqdevice_rename" /> - <Action name="tqdevice_changeicon" /> + <Action name="device_rename" /> + <Action name="device_changeicon" /> <Separator/> - <Action name="tqdevice_configure" /> + <Action name="device_configure" /> </Menu> </MenuBar> <ToolBar noMerge="1" name="mainToolBar" fullWidth="true" > <text>Main Toolbar</text> <Action name="file_save" /> <Separator/> - <Action name="tqdevice_add" /> - <Action name="tqdevice_remove" /> + <Action name="device_add" /> + <Action name="device_remove" /> <Separator/> - <Action name="tqdevice_configure"/> + <Action name="device_configure"/> </ToolBar> </kpartgui> diff --git a/kmobile/kmobileview.cpp b/kmobile/kmobileview.cpp index 26ac4d0b3..3770dc0dd 100644 --- a/kmobile/kmobileview.cpp +++ b/kmobile/kmobileview.cpp @@ -49,10 +49,10 @@ KMobileView::~KMobileView() bool KMobileView::addNewDevice(KConfig *config, KService::Ptr service) { - kdDebug() << "New mobile tqdevice item:\n"; + kdDebug() << "New mobile device item:\n"; kdDebug() << TQString("LIBRARY: '%1', NAME: '%2', ICON: '%3', COMMENT: '%4'\n") - .tqarg(service->library()).tqarg(service->name()).tqarg(service->icon()) - .tqarg(service->comment()); + .arg(service->library()).arg(service->name()).arg(service->icon()) + .arg(service->comment()); KMobileItem *it; it = new KMobileItem(this, config, service); @@ -89,10 +89,10 @@ void KMobileView::restoreAll() emit signalChangeStatusbar( i18n("Configuration restored") ); } -KMobileItem *KMobileView::findDevice( const TQString &tqdeviceName ) const +KMobileItem *KMobileView::findDevice( const TQString &deviceName ) const { for ( TQIconViewItem *item = firstItem(); item; item = item->nextItem() ) { - if (item->text() == tqdeviceName) + if (item->text() == deviceName) return static_cast<KMobileItem *>(item); } return 0L; @@ -119,7 +119,7 @@ void KMobileView::slotDoubleClicked( TQIconViewItem * item ) #define MUTEX_UNLOCK(dev) dev->m_mutex.unlock(); } -TQStringList KMobileView::tqdeviceNames() +TQStringList KMobileView::deviceNames() { TQStringList names; for ( TQIconViewItem *item = firstItem(); item; item = item->nextItem() ) { @@ -128,15 +128,15 @@ TQStringList KMobileView::tqdeviceNames() return names; } -void KMobileView::removeDevice( TQString tqdeviceName ) +void KMobileView::removeDevice( TQString deviceName ) { - delete findDevice(tqdeviceName); - emit signalChangeStatusbar( i18n("%1 removed").tqarg(tqdeviceName) ); + delete findDevice(deviceName); + emit signalChangeStatusbar( i18n("%1 removed").arg(deviceName) ); } -void KMobileView::configDevice( TQString tqdeviceName ) +void KMobileView::configDevice( TQString deviceName ) { - KMobileItem *dev = findDevice(tqdeviceName); + KMobileItem *dev = findDevice(deviceName); if (!dev || !dev->driverAvailable()) return; MUTEX_LOCK(dev->m_dev); @@ -145,9 +145,9 @@ void KMobileView::configDevice( TQString tqdeviceName ) } -bool KMobileView::connectDevice( TQString tqdeviceName ) +bool KMobileView::connectDevice( TQString deviceName ) { - KMobileItem *dev = findDevice(tqdeviceName); + KMobileItem *dev = findDevice(deviceName); if (!dev || !dev->driverAvailable()) return false; bool connected; @@ -155,14 +155,14 @@ bool KMobileView::connectDevice( TQString tqdeviceName ) connected = dev->m_dev->connectDevice(); MUTEX_UNLOCK(dev->m_dev); emit signalChangeStatusbar( - connected ? i18n("Connection to %1 established").tqarg(tqdeviceName) - : i18n("Connection to %1 failed").tqarg(tqdeviceName) ); + connected ? i18n("Connection to %1 established").arg(deviceName) + : i18n("Connection to %1 failed").arg(deviceName) ); return connected; } -bool KMobileView::disconnectDevice( TQString tqdeviceName ) +bool KMobileView::disconnectDevice( TQString deviceName ) { - KMobileItem *dev = findDevice(tqdeviceName); + KMobileItem *dev = findDevice(deviceName); if (!dev || !dev->driverAvailable()) return true; bool disconnected; @@ -170,14 +170,14 @@ bool KMobileView::disconnectDevice( TQString tqdeviceName ) disconnected = dev->m_dev->disconnectDevice(); MUTEX_UNLOCK(dev->m_dev); emit signalChangeStatusbar( - disconnected ? i18n("%1 disconnected").tqarg(tqdeviceName) - : i18n("Disconnection of %1 failed").tqarg(tqdeviceName) ); + disconnected ? i18n("%1 disconnected").arg(deviceName) + : i18n("Disconnection of %1 failed").arg(deviceName) ); return disconnected; } -bool KMobileView::connected( TQString tqdeviceName ) +bool KMobileView::connected( TQString deviceName ) { - KMobileItem *dev = findDevice(tqdeviceName); + KMobileItem *dev = findDevice(deviceName); if (!dev || !dev->driverAvailable()) return false; bool conn; @@ -188,33 +188,33 @@ bool KMobileView::connected( TQString tqdeviceName ) } -TQString KMobileView::tqdeviceClassName( TQString tqdeviceName ) +TQString KMobileView::deviceClassName( TQString deviceName ) { - KMobileItem *dev = findDevice(tqdeviceName); + KMobileItem *dev = findDevice(deviceName); if (!dev || !dev->driverAvailable()) return TQString(); TQString cn; MUTEX_LOCK(dev->m_dev); - cn = dev->m_dev->tqdeviceClassName(); + cn = dev->m_dev->deviceClassName(); MUTEX_UNLOCK(dev->m_dev); return cn; } -TQString KMobileView::tqdeviceName( TQString tqdeviceName ) +TQString KMobileView::deviceName( TQString deviceName ) { - KMobileItem *dev = findDevice(tqdeviceName); + KMobileItem *dev = findDevice(deviceName); if (!dev || !dev->driverAvailable()) return TQString(); TQString dn; MUTEX_LOCK(dev->m_dev); - dn = dev->m_dev->tqdeviceName(); + dn = dev->m_dev->deviceName(); MUTEX_UNLOCK(dev->m_dev); return dn; } -TQString KMobileView::revision( TQString tqdeviceName ) +TQString KMobileView::revision( TQString deviceName ) { - KMobileItem *dev = findDevice(tqdeviceName); + KMobileItem *dev = findDevice(deviceName); if (!dev || !dev->driverAvailable()) return TQString(); TQString rev; @@ -224,9 +224,9 @@ TQString KMobileView::revision( TQString tqdeviceName ) return rev; } -int KMobileView::classType( TQString tqdeviceName ) +int KMobileView::classType( TQString deviceName ) { - KMobileItem *dev = findDevice(tqdeviceName); + KMobileItem *dev = findDevice(deviceName); if (!dev || !dev->driverAvailable()) return KMobileDevice::Unclassified; int ct; @@ -236,9 +236,9 @@ int KMobileView::classType( TQString tqdeviceName ) return ct; } -int KMobileView::capabilities( TQString tqdeviceName ) +int KMobileView::capabilities( TQString deviceName ) { - KMobileItem *dev = findDevice(tqdeviceName); + KMobileItem *dev = findDevice(deviceName); if (!dev || !dev->driverAvailable()) return KMobileDevice::hasNothing; int cap; @@ -248,9 +248,9 @@ int KMobileView::capabilities( TQString tqdeviceName ) return cap; } -TQString KMobileView::nameForCap( TQString tqdeviceName, int cap ) +TQString KMobileView::nameForCap( TQString deviceName, int cap ) { - KMobileItem *dev = findDevice(tqdeviceName); + KMobileItem *dev = findDevice(deviceName); if (!dev || !dev->driverAvailable()) return TQString(); TQString nc; @@ -260,9 +260,9 @@ TQString KMobileView::nameForCap( TQString tqdeviceName, int cap ) return nc; } -TQString KMobileView::iconFileName( TQString tqdeviceName ) +TQString KMobileView::iconFileName( TQString deviceName ) { - KMobileItem *dev = findDevice(tqdeviceName); + KMobileItem *dev = findDevice(deviceName); if (!dev || !dev->driverAvailable()) return TQString(); TQString fn; @@ -272,9 +272,9 @@ TQString KMobileView::iconFileName( TQString tqdeviceName ) return fn; } -int KMobileView::numAddresses( TQString tqdeviceName ) +int KMobileView::numAddresses( TQString deviceName ) { - KMobileItem *dev = findDevice(tqdeviceName); + KMobileItem *dev = findDevice(deviceName); if (!dev || !dev->driverAvailable()) return 0; int num; @@ -284,9 +284,9 @@ int KMobileView::numAddresses( TQString tqdeviceName ) return num; } -TQString KMobileView::readAddress( TQString tqdeviceName, int index ) +TQString KMobileView::readAddress( TQString deviceName, int index ) { - KMobileItem *dev = findDevice(tqdeviceName); + KMobileItem *dev = findDevice(deviceName); if (!dev || !dev->driverAvailable()) return TQString(); @@ -304,14 +304,14 @@ TQString KMobileView::readAddress( TQString tqdeviceName, int index ) return TQString(); emit signalChangeStatusbar( i18n("Read addressbook entry %1 from %2") - .tqarg(index).tqarg(tqdeviceName) ); + .arg(index).arg(deviceName) ); return str; } -bool KMobileView::storeAddress( TQString tqdeviceName, int index, TQString vcard, bool append ) +bool KMobileView::storeAddress( TQString deviceName, int index, TQString vcard, bool append ) { - KMobileItem *dev = findDevice(tqdeviceName); + KMobileItem *dev = findDevice(deviceName); if (!dev || !dev->driverAvailable()) return false; @@ -325,14 +325,14 @@ bool KMobileView::storeAddress( TQString tqdeviceName, int index, TQString vcard err = dev->m_dev->storeAddress(index, adr, append); MUTEX_UNLOCK(dev->m_dev); emit signalChangeStatusbar( - err ? i18n("Storing contact %1 on %2 failed").tqarg(index).tqarg(tqdeviceName) - : i18n("Contact %1 stored on %2").tqarg(index).tqarg(tqdeviceName) ); + err ? i18n("Storing contact %1 on %2 failed").arg(index).arg(deviceName) + : i18n("Contact %1 stored on %2").arg(index).arg(deviceName) ); return (err == 0); } -int KMobileView::numCalendarEntries( TQString tqdeviceName ) +int KMobileView::numCalendarEntries( TQString deviceName ) { - KMobileItem *dev = findDevice(tqdeviceName); + KMobileItem *dev = findDevice(deviceName); if (!dev || !dev->driverAvailable()) return 0; int num; @@ -342,9 +342,9 @@ int KMobileView::numCalendarEntries( TQString tqdeviceName ) return num; } -int KMobileView::numNotes( TQString tqdeviceName ) +int KMobileView::numNotes( TQString deviceName ) { - KMobileItem *dev = findDevice(tqdeviceName); + KMobileItem *dev = findDevice(deviceName); if (!dev || !dev->driverAvailable()) return 0; int num; @@ -354,9 +354,9 @@ int KMobileView::numNotes( TQString tqdeviceName ) return num; } -TQString KMobileView::readNote( TQString tqdeviceName, int index ) +TQString KMobileView::readNote( TQString deviceName, int index ) { - KMobileItem *dev = findDevice(tqdeviceName); + KMobileItem *dev = findDevice(deviceName); if (!dev || !dev->driverAvailable()) return TQString(); @@ -368,13 +368,13 @@ TQString KMobileView::readNote( TQString tqdeviceName, int index ) if (err) return TQString(); emit signalChangeStatusbar( i18n("Read note %1 from %2") - .tqarg(index).tqarg(tqdeviceName) ); + .arg(index).arg(deviceName) ); return note; } -bool KMobileView::storeNote( TQString tqdeviceName, int index, TQString note ) +bool KMobileView::storeNote( TQString deviceName, int index, TQString note ) { - KMobileItem *dev = findDevice(tqdeviceName); + KMobileItem *dev = findDevice(deviceName); if (!dev || !dev->driverAvailable()) return false; @@ -385,28 +385,28 @@ bool KMobileView::storeNote( TQString tqdeviceName, int index, TQString note ) if (err) return false; emit signalChangeStatusbar( i18n("Stored note %1 to %2") - .tqarg(index).tqarg(tqdeviceName) ); + .arg(index).arg(deviceName) ); return true; } /* - * DCOP Implementation for the tqdevices:/ kioslave + * DCOP Implementation for the devices:/ kioslave */ /* - * returns the information for the given tqdeviceName for usage in the - * the tqdevices kioslave. The TQStringList returned is comparable to the - * format of /etc/fstab file. Please refer to the tqdevices kioslave for + * returns the information for the given deviceName for usage in the + * the devices kioslave. The TQStringList returned is comparable to the + * format of /etc/fstab file. Please refer to the devices kioslave for * further information. - * If tqdeviceName is empty, this functions returns information for all - * active mobile tqdevices. - * (function is only used by the tqdevices kioslave - don't use elsewhere !) + * If deviceName is empty, this functions returns information for all + * active mobile devices. + * (function is only used by the devices kioslave - don't use elsewhere !) */ -TQStringList KMobileView::kio_tqdevices_tqdeviceInfo(TQString tqdeviceName) +TQStringList KMobileView::kio_devices_deviceInfo(TQString deviceName) { - TQStringList mobiles = tqdeviceNames(); + TQStringList mobiles = deviceNames(); if (mobiles.count() == 0) return mobiles; @@ -414,10 +414,10 @@ TQStringList KMobileView::kio_tqdevices_tqdeviceInfo(TQString tqdeviceName) for ( TQStringList::Iterator it = mobiles.begin(); it != mobiles.end(); ++it ) { TQString name = *it; - if (tqdeviceName.isEmpty()) + if (deviceName.isEmpty()) mountList << name; else - if (tqdeviceName!=name) + if (deviceName!=name) continue; KMobileItem *dev = findDevice(name); @@ -425,11 +425,11 @@ TQStringList KMobileView::kio_tqdevices_tqdeviceInfo(TQString tqdeviceName) mountList << name; mountList << " "; - mountList << TQString("mobile:/%1").tqarg(name); // KIO::encodeFileName() + mountList << TQString("mobile:/%1").arg(name); // KIO::encodeFileName() mountList << mime; mountList << "true"; // mountState mountList << "---"; - if (!tqdeviceName.isEmpty()) + if (!deviceName.isEmpty()) break; } return mountList; diff --git a/kmobile/kmobileview.h b/kmobile/kmobileview.h index 16d2b2e2d..ee8b1e532 100644 --- a/kmobile/kmobileview.h +++ b/kmobile/kmobileview.h @@ -34,44 +34,44 @@ public: /** * DCOP implementation */ - TQStringList tqdeviceNames(); + TQStringList deviceNames(); - void removeDevice( TQString tqdeviceName ); - void configDevice( TQString tqdeviceName ); + void removeDevice( TQString deviceName ); + void configDevice( TQString deviceName ); - bool connectDevice( TQString tqdeviceName ); - bool disconnectDevice( TQString tqdeviceName ); - bool connected( TQString tqdeviceName ); + bool connectDevice( TQString deviceName ); + bool disconnectDevice( TQString deviceName ); + bool connected( TQString deviceName ); - TQString tqdeviceClassName( TQString tqdeviceName ); - TQString tqdeviceName( TQString tqdeviceName ); - TQString revision( TQString tqdeviceName ); - int classType( TQString tqdeviceName ); + TQString deviceClassName( TQString deviceName ); + TQString deviceName( TQString deviceName ); + TQString revision( TQString deviceName ); + int classType( TQString deviceName ); - int capabilities( TQString tqdeviceName ); - TQString nameForCap( TQString tqdeviceName, int cap ); + int capabilities( TQString deviceName ); + TQString nameForCap( TQString deviceName, int cap ); - TQString iconFileName( TQString tqdeviceName ); + TQString iconFileName( TQString deviceName ); - int numAddresses( TQString tqdeviceName ); - TQString readAddress( TQString tqdeviceName, int index ); - bool storeAddress( TQString tqdeviceName, int index, TQString vcard, bool append ); + int numAddresses( TQString deviceName ); + TQString readAddress( TQString deviceName, int index ); + bool storeAddress( TQString deviceName, int index, TQString vcard, bool append ); - int numCalendarEntries( TQString tqdeviceName ); + int numCalendarEntries( TQString deviceName ); - int numNotes( TQString tqdeviceName ); - TQString readNote( TQString tqdeviceName, int index ); - bool storeNote( TQString tqdeviceName, int index, TQString note ); + int numNotes( TQString deviceName ); + TQString readNote( TQString deviceName, int index ); + bool storeNote( TQString deviceName, int index, TQString note ); - /* tqdevices kioslave support: */ - TQStringList kio_tqdevices_tqdeviceInfo(TQString tqdeviceName); + /* devices kioslave support: */ + TQStringList kio_devices_deviceInfo(TQString deviceName); public: void saveAll(); void restoreAll(); protected: - KMobileItem * findDevice( const TQString &tqdeviceName ) const; + KMobileItem * findDevice( const TQString &deviceName ) const; protected slots: void slotDoubleClicked( TQIconViewItem * item ); diff --git a/kmobile/libkmobile.desktop b/kmobile/libkmobile.desktop index f5a1e746a..b6444d2a8 100644 --- a/kmobile/libkmobile.desktop +++ b/kmobile/libkmobile.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=ServiceType -X-KDE-ServiceType=kdetqdevice/mobiletqdevice +X-KDE-ServiceType=kdedevice/mobiledevice Name=KDE Mobile Device Lowlevel Hardware Driver Name[af]=KDE draagbare toestel laevlak hardeware toestel Name[bs]=KDE hardverski drajver niskog nivoa za mobilne uređaje diff --git a/kmobile/main.cpp b/kmobile/main.cpp index c9d7d124d..1b03f9716 100644 --- a/kmobile/main.cpp +++ b/kmobile/main.cpp @@ -25,7 +25,7 @@ #include <klocale.h> static const char description[] = - I18N_NOOP("KDE mobile tqdevices manager"); + I18N_NOOP("KDE mobile devices manager"); static const char version[] = "0.1"; diff --git a/kmobile/pref.cpp b/kmobile/pref.cpp index 2bb907445..f149931b0 100644 --- a/kmobile/pref.cpp +++ b/kmobile/pref.cpp @@ -6,7 +6,7 @@ #include <klocale.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> KMobilePreferences::KMobilePreferences() @@ -27,8 +27,8 @@ KMobilePreferences::KMobilePreferences() KMobilePrefPageOne::KMobilePrefPageOne(TQWidget *parent) : TQFrame(parent) { - TQHBoxLayout *tqlayout = new TQHBoxLayout(this); - tqlayout->setAutoAdd(true); + TQHBoxLayout *layout = new TQHBoxLayout(this); + layout->setAutoAdd(true); new TQLabel(i18n("Add something here"), this); } @@ -36,8 +36,8 @@ KMobilePrefPageOne::KMobilePrefPageOne(TQWidget *parent) KMobilePrefPageTwo::KMobilePrefPageTwo(TQWidget *parent) : TQFrame(parent) { - TQHBoxLayout *tqlayout = new TQHBoxLayout(this); - tqlayout->setAutoAdd(true); + TQHBoxLayout *layout = new TQHBoxLayout(this); + layout->setAutoAdd(true); new TQLabel(i18n("Add something here"), this); } diff --git a/kmobile/systemtray.cpp b/kmobile/systemtray.cpp index c0c0bec03..7796a55b1 100644 --- a/kmobile/systemtray.cpp +++ b/kmobile/systemtray.cpp @@ -44,7 +44,7 @@ SystemTray::SystemTray(KMainWindow *parent, const char *name) : KSystemTray(pare setToolTip(); m_actionCollection = parent->actionCollection(); - KAction *addAction = m_actionCollection->action("tqdevice_add"); + KAction *addAction = m_actionCollection->action("device_add"); KPopupMenu* menu = contextMenu(); addAction->plug(menu); @@ -67,8 +67,8 @@ void SystemTray::contextMenuAboutToShow(KPopupMenu *menu) menu->idAt(pos)<=(SYSTEMTRAY_STARTID+1000)) menu->removeItemAt(pos); - // create menu entries for each mobile tqdevice and add it's icon - TQStringList list = main->mainView()->tqdeviceNames(); + // create menu entries for each mobile device and add it's icon + TQStringList list = main->mainView()->deviceNames(); for (unsigned int no=0; no<list.count(); no++) { TQString devName = list[no]; TQString iconName = main->mainView()->iconFileName(devName); diff --git a/kmobile/testlibkmobile.cpp b/kmobile/testlibkmobile.cpp index 774a191e7..e8ff85580 100644 --- a/kmobile/testlibkmobile.cpp +++ b/kmobile/testlibkmobile.cpp @@ -25,16 +25,16 @@ int main(int argc, char **argv) TQCString replyType; TQByteArray replyData; - ok = client->call("kmobile", "kmobileIface", "tqdeviceNames()", data, replyType, replyData); + ok = client->call("kmobile", "kmobileIface", "deviceNames()", data, replyType, replyData); TQDataStream reply(replyData, IO_ReadOnly); - TQStringList tqdeviceNames; - reply >> tqdeviceNames; + TQStringList deviceNames; + reply >> deviceNames; - kdDebug() << TQString("%1\n").tqarg(ok?"Ok":"Failure"); - kdDebug() << TQString("Number of currently registered drivers: %1\n").tqarg(tqdeviceNames.count()); - for (int i=0; i<tqdeviceNames.count(); i++) - kdDebug() << TQString("Device %1: %2\n").tqarg(i+1).tqarg(tqdeviceNames[i]); + kdDebug() << TQString("%1\n").arg(ok?"Ok":"Failure"); + kdDebug() << TQString("Number of currently registered drivers: %1\n").arg(deviceNames.count()); + for (int i=0; i<deviceNames.count(); i++) + kdDebug() << TQString("Device %1: %2\n").arg(i+1).arg(deviceNames[i]); // return app.exec(); } diff --git a/knode/articlewidget.cpp b/knode/articlewidget.cpp index 9e74cbb6d..37f07d475 100644 --- a/knode/articlewidget.cpp +++ b/knode/articlewidget.cpp @@ -16,15 +16,15 @@ #include <sys/stat.h> #include <tqbuffer.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqdir.h> #include <tqfile.h> #include <tqimage.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpaintdevicemetrics.h> #include <tqpopupmenu.h> #include <tqstringlist.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <tqtimer.h> #include <kaction.h> @@ -290,9 +290,9 @@ void ArticleWidget::readConfig() mAttachmentStyle = conf->readEntry( "attachmentStyle", "inline" ); mHeaderStyle = conf->readEntry( "headerStyle", "fancy" ); KRadioAction *ra = 0; - ra = static_cast<KRadioAction*>( mActionCollection->action( TQString("view_attachments_%1").tqarg(mAttachmentStyle).latin1() ) ); + ra = static_cast<KRadioAction*>( mActionCollection->action( TQString("view_attachments_%1").arg(mAttachmentStyle).latin1() ) ); ra->setChecked( true ); - ra = static_cast<KRadioAction*>( mActionCollection->action( TQString("view_headers_%1").tqarg(mHeaderStyle).latin1() ) ); + ra = static_cast<KRadioAction*>( mActionCollection->action( TQString("view_headers_%1").arg(mHeaderStyle).latin1() ) ); ra->setChecked( true ); delete mCSSHelper; @@ -402,7 +402,7 @@ void ArticleWidget::displayArticle() // check if codec is available if ( text && !canDecodeText( text->contentType()->charset() ) ) { html += TQString("<table width=\"100%\" border=\"0\"><tr><td bgcolor=\"#FF0000\">%1</td></tr></table>") - .tqarg( i18n("Unknown charset. Default charset is used instead.") ); + .arg( i18n("Unknown charset. Default charset is used instead.") ); kdDebug(5003) << k_funcinfo << "unknown charset = " << text->contentType()->charset() << endl; } @@ -560,8 +560,8 @@ void ArticleWidget::displayHeader() if ( header ) { headerHtml += "<tr>"; headerHtml+=TQString( "<td align=\"right\" valign=\"top\"><b>%1</b></td><td width=\"100%\">%2</td></tr>" ) - .tqarg( toHtmlString( header->type(), None ) + ": " ) - .tqarg( toHtmlString( header->asUnicodeString() , ParseURL ) ); + .arg( toHtmlString( header->type(), None ) + ": " ) + .arg( toHtmlString( header->asUnicodeString() , ParseURL ) ); delete header; } } @@ -597,8 +597,8 @@ void ArticleWidget::displayHeader() if ( hb->is("From") ) { headerHtml += TQString( "<a href=\"mailto:%1\">%2</a>") - .tqarg( KPIM::getEmailAddress( hb->asUnicodeString() ) ) - .tqarg( toHtmlString( hb->asUnicodeString(), None ) ); + .arg( KPIM::getEmailAddress( hb->asUnicodeString() ) ) + .arg( toHtmlString( hb->asUnicodeString(), None ) ); KMime::Headers::Base *orgHdr = mArticle->getHeaderByType( "Organization" ); if ( orgHdr && !orgHdr->isEmpty() ) { headerHtml += " ("; @@ -635,8 +635,8 @@ 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>" ) - .tqarg( imgToDataUrl( xf.toImage( xfhead ), "PNG" ) ); + xface = TQString::fromLatin1( "<div class=\"senderpic\"><img src=\"%1\" width=\"48\" height=\"48\"/></div>" ) + .arg( imgToDataUrl( xf.toImage( xfhead ), "PNG" ) ); } // fancy header style @@ -660,10 +660,10 @@ void ArticleWidget::displayHeader() int refCnt = refs->count(), i = 1; TQCString id = refs->first(); id = id.mid( 1, id.length() - 2 ); // remove <> - html += TQString( "<b>%1</b>" ).tqarg( i18n("References:") ); + html += TQString( "<b>%1</b>" ).arg( i18n("References:") ); while ( i <= refCnt ) { - html += " <a href=\"news:" + TQString::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++; @@ -748,7 +748,7 @@ TQString ArticleWidget::displaySigHeader( Kpgp::Block* block ) TQString message; if ( signer.isEmpty() ) { message = i18n( "Message was signed with unknown key 0x%1." ) - .tqarg( TQString(signerKey) ); + .arg( TQString(signerKey) ); message += "<br/>"; message += i18n( "The validity of the signature cannot be verified." ); signClass = "signWarn"; @@ -769,10 +769,10 @@ TQString ArticleWidget::displaySigHeader( Kpgp::Block* block ) if( !signerKey.isEmpty() ) message += i18n( "Message was signed by %1 (Key ID: 0x%2)." ) - .tqarg( signer ) - .tqarg( TQString(signerKey) ); + .arg( signer ) + .arg( TQString(signerKey) ); else - message += i18n( "Message was signed by %1." ).tqarg( signer ); + message += i18n( "Message was signed by %1." ).arg( signer ); message += "<br/>"; if( block->goodSignature() ) { @@ -915,8 +915,8 @@ 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") - .tqarg( fmt, TQString(KCodecs::base64Encode( ba )) ); + return TQString::fromLatin1("data:image/%1;base64,%2") + .arg( fmt, TQString(KCodecs::base64Encode( ba )) ); } @@ -1030,7 +1030,7 @@ void ArticleWidget::processJob( KNJobData * job ) if ( !job->canceled() ) { if ( !job->success() ) KMessageBox::error( this, i18n("An error occurred while downloading the article source:\n") - .tqarg( job->errorString() ) ); + .arg( job->errorString() ) ); else new KNSourceViewWindow( a->head() + "\n" + a->body() ); } @@ -1408,15 +1408,15 @@ void ArticleWidget::slotCopyURL() address = mCurrentURL.path(); else address = mCurrentURL.url(); - TQApplication::tqclipboard()->setText( address, TQClipboard::Clipboard ); - TQApplication::tqclipboard()->setText( address, TQClipboard::Selection ); + TQApplication::clipboard()->setText( address, TQClipboard::Clipboard ); + TQApplication::clipboard()->setText( address, TQClipboard::Selection ); } 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..324e9d3e5 100644 --- a/knode/headerview.cpp +++ b/knode/headerview.cpp @@ -14,7 +14,7 @@ #include <tqcursor.h> #include <tqheader.h> -#include <tqstylesheet.h> +#include <stylesheet.h> #include <tqtimer.h> #include <klocale.h> @@ -64,7 +64,7 @@ KNHeaderView::KNHeaderView(TQWidget *parent, const char *name) : setColumnAlignment( mPaintInfo.sizeCol, TQt::AlignRight ); setColumnAlignment( mPaintInfo.scoreCol, TQt::AlignRight ); - // due to our own column text squeezing we need to tqrepaint on column resizing + // due to our own column text squeezing we need to repaint on column resizing disconnect( header(), TQT_SIGNAL(sizeChange(int, int, int)) ); connect( header(), TQT_SIGNAL(sizeChange(int, int, int)), TQT_SLOT(slotSizeChanged(int, int, int)) ); @@ -534,7 +534,7 @@ TQDragObject* KNHeaderView::dragObject() void KNHeaderView::slotSizeChanged( int section, int, int newSize ) { - viewport()->tqrepaint( header()->sectionPos(section), 0, newSize, visibleHeight(), false); + viewport()->repaint( header()->sectionPos(section), 0, newSize, visibleHeight(), false); } @@ -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..2dc8c931a 100644 --- a/knode/knaccountmanager.cpp +++ b/knode/knaccountmanager.cpp @@ -127,12 +127,12 @@ bool KNAccountManager::newAccount(KNNntpAccount *a) TQStringList entries(d.entryList("nntp.*", TQDir::Dirs)); int id = 1; - while (entries.findIndex(TQString("nntp.%1").tqarg(id))!=-1) + while (entries.findIndex(TQString("nntp.%1").arg(id))!=-1) ++id; a->setId(id); - dir = locateLocal("data",TQString("knode/nntp.%1/").tqarg(a->id())); + dir = locateLocal("data",TQString("knode/nntp.%1/").arg(a->id())); if (!dir.isNull()) { mAccounts.append(a); emit(accountAdded(a)); @@ -177,7 +177,7 @@ bool KNAccountManager::removeAccount(KNNntpAccount *a) } } dir.cdUp(); // directory should now be empty, deleting it - dir.rmdir(TQString("nntp.%1/").tqarg(a->id())); + dir.rmdir(TQString("nntp.%1/").arg(a->id())); } if(c_urrentAccount==a) setCurrentAccount(0); @@ -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/knarticle.cpp b/knode/knarticle.cpp index e253d2ef8..fe475b1b3 100644 --- a/knode/knarticle.cpp +++ b/knode/knarticle.cpp @@ -209,7 +209,7 @@ void KNRemoteArticle::updateListItem() i_tem->setExpandable( (threadMode() && hasVisibleFollowUps()) ); - i_tem->tqrepaint(); //force tqrepaint + i_tem->repaint(); //force repaint } diff --git a/knode/knarticle.h b/knode/knarticle.h index 798742e17..b4e039ffd 100644 --- a/knode/knarticle.h +++ b/knode/knarticle.h @@ -16,7 +16,7 @@ #define KNARTICLE_H #include <tqstringlist.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqfile.h> #include <tqfont.h> #include <tqcolor.h> diff --git a/knode/knarticlefactory.cpp b/knode/knarticlefactory.cpp index d82bb5c74..2b686cf2a 100644 --- a/knode/knarticlefactory.cpp +++ b/knode/knarticlefactory.cpp @@ -12,7 +12,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, US */ -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqvbox.h> @@ -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()); @@ -306,7 +306,7 @@ void KNArticleFactory::createForward(KNArticle *a) //--------------------------- <Body> ----------------------------- - TQString fwd = TQString("\n--------------- %1\n\n").tqarg(i18n("Forwarded message (begin)")); + TQString fwd = TQString("\n--------------- %1\n\n").arg(i18n("Forwarded message (begin)")); fwd+=( i18n("Subject") + ": " + a->subject()->asUnicodeString() + "\n" ); fwd+=( i18n("From") + ": " + a->from()->asUnicodeString() + "\n" ); @@ -321,7 +321,7 @@ void KNArticleFactory::createForward(KNArticle *a) fwd += (*it) + "\n"; } - fwd += TQString("\n--------------- %1\n").tqarg(i18n("Forwarded message (end)")); + fwd += TQString("\n--------------- %1\n").arg(i18n("Forwarded message (end)")); //--------------------------- </Body> ---------------------------- @@ -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(); @@ -601,7 +601,7 @@ void KNArticleFactory::edit(KNLocalArticle *a) KMessageBox::information(knGlobals.topWidget, i18n("<qt>The signature generator program produced the " "following output:<br><br>%1</qt>") - .tqarg(id->getSigGeneratorStdErr())); + .arg(id->getSigGeneratorStdErr())); mCompList.append( com ); connect(com, TQT_SIGNAL(composerDone(KNComposer*)), this, TQT_SLOT(slotComposerDone(KNComposer*))); @@ -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) @@ -895,7 +895,7 @@ KNLocalArticle* KNArticleFactory::newArticle(KNCollection *col, TQString &sig, T KMessageBox::information(knGlobals.topWidget, i18n("<qt>The signature generator program produced the " "following output:<br><br>%1</qt>") - .tqarg(id->getSigGeneratorStdErr())); + .arg(id->getSigGeneratorStdErr())); } else sig=TQString(); @@ -1070,8 +1070,8 @@ KNSendErrorDialog::KNSendErrorDialog() TQVBox *page = makeVBoxMainWidget(); - new TQLabel(TQString("<b>%1</b><br>%2").tqarg(i18n("Errors occurred while sending these articles:")) - .tqarg(i18n("The unsent articles are stored in the \"Outbox\" folder.")), page); + new TQLabel(TQString("<b>%1</b><br>%2").arg(i18n("Errors occurred while sending these articles:")) + .arg(i18n("The unsent articles are stored in the \"Outbox\" folder.")), page); j_obs=new KNDialogListBox(true, page); e_rror=new TQLabel(TQString(), page); diff --git a/knode/knarticlefilter.cpp b/knode/knarticlefilter.cpp index 359985198..65acb7c0b 100644 --- a/knode/knarticlefilter.cpp +++ b/knode/knarticlefilter.cpp @@ -74,7 +74,7 @@ KNArticleFilter::~KNArticleFilter() bool KNArticleFilter::loadInfo() { if (i_d!=-1) { - TQString fname(locate("data",TQString( "knode/filters/%1.fltr" ).tqarg(i_d) ) ); + TQString fname(locate("data",TQString( "knode/filters/%1.fltr" ).arg(i_d) ) ); if (fname.isNull()) return false; @@ -94,7 +94,7 @@ bool KNArticleFilter::loadInfo() void KNArticleFilter::load() { - TQString fname(locate("data",TQString( "knode/filters/%1.fltr").tqarg(i_d) ) ); + TQString fname(locate("data",TQString( "knode/filters/%1.fltr").arg(i_d) ) ); if (fname.isNull()) return; @@ -141,7 +141,7 @@ void KNArticleFilter::save() KNHelper::displayInternalFileError(); return; } - KSimpleConfig conf(dir+TQString("%1.fltr").tqarg(i_d)); + KSimpleConfig conf(dir+TQString("%1.fltr").arg(i_d)); conf.setGroup("GENERAL"); conf.writeEntry("name", TQString(n_ame)); @@ -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/knarticlemanager.cpp b/knode/knarticlemanager.cpp index 7673eabfd..088e98818 100644 --- a/knode/knarticlemanager.cpp +++ b/knode/knarticlemanager.cpp @@ -992,10 +992,10 @@ void KNArticleManager::updateStatusString() name += i18n(" (moderated)"); knGlobals.seStatusMsg(i18n(" %1: %2 new , %3 displayed") - .tqarg(name).tqarg(g_roup->newCount()).tqarg(displCnt),SB_GROUP); + .arg(name).arg(g_roup->newCount()).arg(displCnt),SB_GROUP); if(f_ilter) - knGlobals.seStatusMsg(i18n(" Filter: %1").tqarg(f_ilter->translatedName()), SB_FILTER); + knGlobals.seStatusMsg(i18n(" Filter: %1").arg(f_ilter->translatedName()), SB_FILTER); else knGlobals.seStatusMsg(TQString(), SB_FILTER); } @@ -1005,7 +1005,7 @@ void KNArticleManager::updateStatusString() else displCnt=f_older->count(); knGlobals.seStatusMsg(i18n(" %1: %2 displayed") - .tqarg(f_older->name()).tqarg(displCnt), SB_GROUP); + .arg(f_older->name()).arg(displCnt), SB_GROUP); knGlobals.seStatusMsg(TQString(), SB_FILTER); } else { knGlobals.seStatusMsg(TQString(), SB_GROUP); diff --git a/knode/kncleanup.cpp b/knode/kncleanup.cpp index 28993e7ce..70ab15f4c 100644 --- a/knode/kncleanup.cpp +++ b/knode/kncleanup.cpp @@ -16,7 +16,7 @@ #include <tqdir.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqprogressbar.h> #include <klocale.h> @@ -56,13 +56,13 @@ void KNCleanUp::start() for ( TQValueList<KNArticleCollection*>::Iterator it = mColList.begin(); it != mColList.end(); ++it ) { if ( (*it)->type() == KNCollection::CTgroup ) { - d_lg->showMessage( i18n("Deleting expired articles in <b>%1</b>").tqarg( (*it)->name() ) ); + d_lg->showMessage( i18n("Deleting expired articles in <b>%1</b>").arg( (*it)->name() ) ); kapp->processEvents(); expireGroup( static_cast<KNGroup*>( (*it) ) ); d_lg->doProgress(); } else if ( (*it)->type() == KNCollection::CTfolder ) { - d_lg->showMessage( i18n("Compacting folder <b>%1</b>").tqarg( (*it)->name() ) ); + d_lg->showMessage( i18n("Compacting folder <b>%1</b>").arg( (*it)->name() ) ); kapp->processEvents(); compactFolder( static_cast<KNFolder*>( (*it) ) ); d_lg->doProgress(); @@ -187,7 +187,7 @@ void KNCleanUp::expireGroup( KNGroup *g, bool showResult ) if(showResult) KMessageBox::information(knGlobals.topWidget, - i18n("<b>%1</b><br>expired: %2<br>left: %3").tqarg(g->groupname()).tqarg(delCnt).tqarg(leftCnt)); + i18n("<b>%1</b><br>expired: %2<br>left: %3").arg(g->groupname()).arg(delCnt).arg(leftCnt)); } diff --git a/knode/kncollectionview.cpp b/knode/kncollectionview.cpp index 7b73cc7ba..e1fb20697 100644 --- a/knode/kncollectionview.cpp +++ b/knode/kncollectionview.cpp @@ -93,7 +93,7 @@ void KNCollectionView::readConfig() KConfig *conf = knGlobals.config(); conf->setGroup( "GroupView" ); - // execute the listview tqlayout stuff only once + // execute the listview layout stuff only once static bool initDone = false; if (!initDone) { initDone = true; diff --git a/knode/kncomposer.cpp b/knode/kncomposer.cpp index de354ef76..ac14f0607 100644 --- a/knode/kncomposer.cpp +++ b/knode/kncomposer.cpp @@ -13,8 +13,8 @@ */ #include <tqheader.h> -#include <tqtextcodec.h> -#include <tqclipboard.h> +#include <textcodec.h> +#include <clipboard.h> #include <tqapplication.h> #include <kspelldlg.h> #include <tdeversion.h> @@ -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").arg(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); @@ -1374,18 +1374,18 @@ void KNComposer::slotUpdateStatusBar() else overwriteDesc = i18n(" INS "); - statusBar()->changeItem(i18n(" Type: %1 ").tqarg(typeDesc), 1); - statusBar()->changeItem(i18n(" Charset: %1 ").tqarg(TQString(c_harset)), 2); + statusBar()->changeItem(i18n(" Type: %1 ").arg(typeDesc), 1); + statusBar()->changeItem(i18n(" Charset: %1 ").arg(TQString(c_harset)), 2); statusBar()->changeItem(overwriteDesc, 3); - statusBar()->changeItem(i18n(" Column: %1 ").tqarg(v_iew->e_dit->currentColumn() + 1), 4); - statusBar()->changeItem(i18n(" Line: %1 ").tqarg(v_iew->e_dit->currentLine() + 1), 5); + statusBar()->changeItem(i18n(" Column: %1 ").arg(v_iew->e_dit->currentColumn() + 1), 4); + statusBar()->changeItem(i18n(" Line: %1 ").arg(v_iew->e_dit->currentLine() + 1), 5); } void KNComposer::slotUpdateCursorPos() { - statusBar()->changeItem(i18n(" Column: %1 ").tqarg(v_iew->e_dit->currentColumn() + 1), 4); - statusBar()->changeItem(i18n(" Line: %1 ").tqarg(v_iew->e_dit->currentLine() + 1), 5); + statusBar()->changeItem(i18n(" Column: %1 ").arg(v_iew->e_dit->currentColumn() + 1), 4); + statusBar()->changeItem(i18n(" Line: %1 ").arg(v_iew->e_dit->currentLine() + 1), 5); } @@ -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(""); @@ -1781,10 +1781,10 @@ KNComposer::ComposerView::ComposerView(KNComposer *composer, const char *n) KConfig *config = knGlobals.config(); KConfigGroupSaver saver(config, "VISUAL_APPEARANCE"); - TQColor defaultColor1( kapp->tqpalette().active().text()); // defaults from kmreaderwin.cpp - TQColor defaultColor2( kapp->tqpalette().active().text() ); - TQColor defaultColor3( kapp->tqpalette().active().text() ); - TQColor defaultForeground( kapp->tqpalette().active().text() ); + TQColor defaultColor1( kapp->palette().active().text()); // defaults from kmreaderwin.cpp + TQColor defaultColor2( kapp->palette().active().text() ); + TQColor defaultColor3( kapp->palette().active().text() ); + TQColor defaultForeground( kapp->palette().active().text() ); TQColor col1 = config->readColorEntry( "ForegroundColor", &defaultForeground ); TQColor col2 = config->readColorEntry( "quote3Color", &defaultColor3 ); TQColor col3 = config->readColorEntry( "quote2Color", &defaultColor2 ); @@ -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]") ); } @@ -2152,7 +2152,7 @@ TQStringList KNComposer::Editor::processedText() void KNComposer::Editor::slotPasteAsQuotation() { - TQString s = TQApplication::tqclipboard()->text(); + TQString s = TQApplication::clipboard()->text(); if (!s.isEmpty()) { for (int i=0; (uint)i<s.length(); i++) { if ( s[i] < ' ' && s[i] != '\n' && s[i] != '\t' ) @@ -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`----").arg(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"); @@ -2297,7 +2297,7 @@ void KNComposer::Editor::slotRemoveBox() setCursorPosition(l,c-2); setAutoUpdate(true); - tqrepaint(false); + repaint(false); } } @@ -2560,7 +2560,7 @@ KNComposer::AttachmentPropertiesDlg::AttachmentPropertiesDlg(KNAttachment *a, TQ fileL->addRowSpacing(0, fontMetrics().lineSpacing()-9); fileL->addWidget(new TQLabel(i18n("Name:"), fileGB) ,1,0); - fileL->addWidget(new TQLabel(TQString("<b>%1</b>").tqarg(a->name()), fileGB), 1,1, TQt::AlignLeft); + fileL->addWidget(new TQLabel(TQString("<b>%1</b>").arg(a->name()), fileGB), 1,1, TQt::AlignLeft); fileL->addWidget(new TQLabel(i18n("Size:"), fileGB), 2,0); fileL->addWidget(new TQLabel(a->contentSize(), fileGB), 2,1, TQt::AlignLeft); @@ -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..4e2d7f330 100644 --- a/knode/knconfig.cpp +++ b/knode/knconfig.cpp @@ -16,7 +16,7 @@ #include <stdlib.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <ksimpleconfig.h> #include <kmessagebox.h> @@ -452,7 +452,7 @@ TQColor KNConfig::Appearance::defaultColor(int i) const switch(i) { case background: - return kapp->tqpalette().active().base(); + return kapp->palette().active().base(); case alternateBackground: return KGlobalSettings::alternateBackgroundColor(); @@ -466,13 +466,13 @@ TQColor KNConfig::Appearance::defaultColor(int i) const case normalText: case unreadThread: - return kapp->tqpalette().active().text(); + return kapp->palette().active().text(); case url: return KGlobalSettings::linkColor(); case readThread: - return kapp->tqpalette().disabled().text(); + return kapp->palette().disabled().text(); case unreadArticle: return TQColor( 183, 154, 11 ); @@ -492,7 +492,7 @@ TQColor KNConfig::Appearance::defaultColor(int i) const return TQColor( 0xFF, 0x40, 0x40 ); } - return kapp->tqpalette().disabled().text(); + return kapp->palette().disabled().text(); } @@ -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/knconfigpages.cpp b/knode/knconfigpages.cpp index c44b96954..547bf27a9 100644 --- a/knode/knconfigpages.cpp +++ b/knode/knconfigpages.cpp @@ -11,7 +11,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, US */ -#include <tqlayout.h> +#include <layout.h> #include <kcmodule.h> #include <kdebug.h> diff --git a/knode/knconfigwidgets.cpp b/knode/knconfigwidgets.cpp index 0860ee05e..b34d76381 100644 --- a/knode/knconfigwidgets.cpp +++ b/knode/knconfigwidgets.cpp @@ -395,8 +395,8 @@ void KNConfig::NntpAccountListWidget::slotSelectionChanged() LBoxItem *it = static_cast<LBoxItem*>(l_box->item(curr)); if(it) { - s_erverInfo->setText(i18n("Server: %1").tqarg(it->account->server())); - p_ortInfo->setText(i18n("Port: %1").tqarg(it->account->port())); + s_erverInfo->setText(i18n("Server: %1").arg(it->account->server())); + p_ortInfo->setText(i18n("Port: %1").arg(it->account->port())); } else { s_erverInfo->setText(i18n("Server: ")); @@ -461,7 +461,7 @@ void KNConfig::NntpAccountListWidget::slotSubBtnClicked() KNConfig::NntpAccountConfDialog::NntpAccountConfDialog(KNNntpAccount *a, TQWidget *p, const char *n) - : KDialogBase(Tabbed, (a->id()!=-1)? i18n("Properties of %1").tqarg(a->name()):i18n("New Account"), + : KDialogBase(Tabbed, (a->id()!=-1)? i18n("Properties of %1").arg(a->name()):i18n("New Account"), Ok|Cancel|Help, Ok, p, n), a_ccount(a) { @@ -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"); } @@ -773,7 +773,7 @@ int KNConfig::AppearanceWidget::ColorListItem::width(const TQListBox *lb ) const KNConfig::AppearanceWidget::FontListItem::FontListItem( const TQString &name, const TQFont &font ) : TQListBoxText(name), f_ont(font) { - fontInfo = TQString("[%1 %2]").tqarg(f_ont.family()).tqarg(f_ont.pointSize()); + fontInfo = TQString("[%1 %2]").arg(f_ont.family()).arg(f_ont.pointSize()); } @@ -785,7 +785,7 @@ KNConfig::AppearanceWidget::FontListItem::~FontListItem() void KNConfig::AppearanceWidget::FontListItem::setFont(const TQFont &font) { f_ont = font; - fontInfo = TQString("[%1 %2]").tqarg(f_ont.family()).tqarg(f_ont.pointSize()); + fontInfo = TQString("[%1 %2]").arg(f_ont.family()).arg(f_ont.pointSize()); } @@ -896,7 +896,7 @@ void KNConfig::AppearanceWidget::defaults() colorItem->setColor(d_ata->defaultColor(i)); } c_List->triggerUpdate(true); - c_List->tqrepaint(true); + c_List->repaint(true); // default fonts FontListItem *fontItem; @@ -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(); } @@ -2158,7 +2158,7 @@ TQString KNConfig::XHeaderConfDialog::result() TQString value = v_alue->text(); // just in case someone pastes a newline value.replace( '\n', ' ' ); - return TQString( "X-%1: %2" ).tqarg( n_ame->text() ).tqarg( value ); + return TQString( "X-%1: %2" ).arg( n_ame->text() ).arg( value ); } @@ -2373,10 +2373,10 @@ KNConfig::GroupCleanupWidget::GroupCleanupWidget( Cleanup *data, TQWidget *paren mExpGroup = new TQGroupBox( i18n("Newsgroup Cleanup Settings"), this ); mExpGroup->setColumnLayout(0, Qt::Vertical ); - mExpGroup->tqlayout()->setSpacing( KDialog::spacingHint() ); - mExpGroup->tqlayout()->setMargin( KDialog::marginHint() ); + mExpGroup->layout()->setSpacing( KDialog::spacingHint() ); + mExpGroup->layout()->setMargin( KDialog::marginHint() ); top->addWidget( mExpGroup ); - TQGridLayout *grid = new TQGridLayout( mExpGroup->tqlayout(), 7, 2 ); + TQGridLayout *grid = new TQGridLayout( mExpGroup->layout(), 7, 2 ); grid->setRowSpacing( 0, KDialog::spacingHint() ); @@ -2482,11 +2482,11 @@ KNConfig::CleanupWidget::CleanupWidget( TQWidget *p, const char *n ) : TQGroupBox *foldersB=new TQGroupBox(i18n("Folders"), this); foldersB->setColumnLayout(0, Qt::Vertical ); - foldersB->tqlayout()->setSpacing( KDialog::spacingHint() ); - foldersB->tqlayout()->setMargin( KDialog::marginHint() ); + foldersB->layout()->setSpacing( KDialog::spacingHint() ); + foldersB->layout()->setMargin( KDialog::marginHint() ); topL->addWidget(foldersB); - TQGridLayout *foldersL=new TQGridLayout(foldersB->tqlayout(), 3,2); + TQGridLayout *foldersL=new TQGridLayout(foldersB->layout(), 3,2); foldersL->setRowSpacing( 0, KDialog::spacingHint() ); diff --git a/knode/knconvert.cpp b/knode/knconvert.cpp index 70d447034..aa730ab7f 100644 --- a/knode/knconvert.cpp +++ b/knode/knconvert.cpp @@ -12,7 +12,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, US */ -#include <tqlayout.h> +#include <layout.h> #include <tqwidgetstack.h> #include <tqlabel.h> #include <tqcheckbox.h> @@ -73,7 +73,7 @@ KNConvert::KNConvert(const TQString &version) Unfortunately this version uses a different format for some data-files, so \ in order to keep your existing data it is necessary to convert it first. This is \ now done automatically by KNode. If you want to, a backup of your existing data \ -will be created before the conversion starts.").tqarg(KNODE_VERSION), w_1); +will be created before the conversion starts.").arg(KNODE_VERSION), w_1); w1L->addMultiCellWidget(l1, 0,0, 0,2); c_reateBkup=new TQCheckBox(i18n("Create backup of old data"), w_1); @@ -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); @@ -224,7 +224,7 @@ void KNConvert::slotTarExited(KProcess *proc) delete t_ar; t_ar = 0; if(success) - l_og.append(i18n("created backup of the old data-files in %1").tqarg(b_ackupPath->text())); + l_og.append(i18n("created backup of the old data-files in %1").arg(b_ackupPath->text())); else l_og.append(i18n("backup failed.")); @@ -402,7 +402,7 @@ int KNConvert::Converter04::convertFolder(TQString srcPrefix, TQString dstPrefix TQCString buff(size+10); srcMBox.at(oldIdx.so); int readBytes=srcMBox.readBlock(buff.data(), size); - buff.tqat(readBytes)='\0'; //terminate string; + buff.at(readBytes)='\0'; //terminate string; //remove "X-KNode-Overview" int pos=buff.find('\n'); diff --git a/knode/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/knfilterconfigwidget.cpp b/knode/knfilterconfigwidget.cpp index 3c7daee1e..3ff509194 100644 --- a/knode/knfilterconfigwidget.cpp +++ b/knode/knfilterconfigwidget.cpp @@ -14,7 +14,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, US */ -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <klocale.h> diff --git a/knode/knfilterdialog.cpp b/knode/knfilterdialog.cpp index ea05a21cc..79b0dad77 100644 --- a/knode/knfilterdialog.cpp +++ b/knode/knfilterdialog.cpp @@ -16,7 +16,7 @@ #include <tqlabel.h> #include <tqcheckbox.h> -#include <tqlayout.h> +#include <layout.h> #include <klocale.h> #include <kmessagebox.h> @@ -31,7 +31,7 @@ KNFilterDialog::KNFilterDialog(KNArticleFilter *f, TQWidget *parent, const char *name) - : KDialogBase(Plain, (f->id()==-1)? i18n("New Filter"):i18n("Properties of %1").tqarg(f->name()), + : KDialogBase(Plain, (f->id()==-1)? i18n("New Filter"):i18n("Properties of %1").arg(f->name()), Ok|Cancel|Help, Ok, parent, name), fltr(f) { @@ -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/knfolder.cpp b/knode/knfolder.cpp index 58ac7d0fc..852fe9aef 100644 --- a/knode/knfolder.cpp +++ b/knode/knfolder.cpp @@ -44,7 +44,7 @@ KNFolder::KNFolder() KNFolder::KNFolder(int id, const TQString &name, KNFolder *parent) : KNArticleCollection(parent), i_d(id), i_ndexDirty(false), w_asOpen(true) { - TQString fname=path()+TQString("custom_%1").tqarg(i_d); + TQString fname=path()+TQString("custom_%1").arg(i_d); n_ame = name; m_boxFile.setName(fname+".mbox"); @@ -63,7 +63,7 @@ KNFolder::KNFolder(int id, const TQString &name, KNFolder *parent) KNFolder::KNFolder(int id, const TQString &name, const TQString &prefix, KNFolder *parent) : KNArticleCollection(parent), i_d(id), i_ndexDirty(false), w_asOpen(true) { - TQString fname=path()+TQString("%1_%2").tqarg(prefix).tqarg(i_d); + TQString fname=path()+TQString("%1_%2").arg(prefix).arg(i_d); n_ame = name; m_boxFile.setName(fname+".mbox"); @@ -356,7 +356,7 @@ bool KNFolder::loadArticle(KNLocalArticle *a) } //set content - buff.tqat(readBytes)='\0'; //terminate string + buff.at(readBytes)='\0'; //terminate string a->setContent(buff); a->parse(); diff --git a/knode/knfoldermanager.cpp b/knode/knfoldermanager.cpp index 7041f4562..44ae78b4a 100644 --- a/knode/knfoldermanager.cpp +++ b/knode/knfoldermanager.cpp @@ -326,7 +326,7 @@ void KNFolderManager::importFromMBox(KNFolder *f) int readBytes=file->readBlock(buff.data(), size); if (readBytes != -1) { - buff.tqat(readBytes)='\0'; //terminate string + buff.at(readBytes)='\0'; //terminate string art = new KNLocalArticle(0); art->setEditDisabled(true); art->setContent(buff); @@ -345,7 +345,7 @@ void KNFolderManager::importFromMBox(KNFolder *f) int readBytes=file->readBlock(buff.data(), size); if (readBytes != -1) { - buff.tqat(readBytes)='\0'; //terminate string + buff.at(readBytes)='\0'; //terminate string art = new KNLocalArticle(0); art->setEditDisabled(true); art->setContent(buff); diff --git a/knode/kngroup.cpp b/knode/kngroup.cpp index df40915f2..c306b178e 100644 --- a/knode/kngroup.cpp +++ b/knode/kngroup.cpp @@ -71,7 +71,7 @@ void KNGroup::updateListItem() if(!l_istItem) return; l_istItem->setTotalCount( c_ount ); l_istItem->setUnreadCount( c_ount - r_eadCount - i_gnoreCount ); - l_istItem->tqrepaint(); + l_istItem->repaint(); } @@ -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; @@ -964,7 +964,7 @@ void KNGroup::reorganize() buildThreads(length()); saveStaticData(length(), true); saveDynamicData(length(), true); - knGlobals.top->headerView()->tqrepaint(); + knGlobals.top->headerView()->repaint(); knGlobals.seStatusMsg(TQString()); knGlobals.top->setCursorBusy(false); } @@ -1052,7 +1052,7 @@ TQString KNGroup::prepareForExecution() if (knGlobals.groupManager()->loadHeaders(this)) return TQString(); else - return i18n("Cannot load saved headers: %1").tqarg(groupname()); + return i18n("Cannot load saved headers: %1").arg(groupname()); } //*************************************************************************** diff --git a/knode/kngroup.h b/knode/kngroup.h index 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/kngroupbrowser.cpp b/knode/kngroupbrowser.cpp index a3bcb89f4..7c2176e16 100644 --- a/knode/kngroupbrowser.cpp +++ b/knode/kngroupbrowser.cpp @@ -14,7 +14,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, US */ -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> #include <tqtimer.h> #include <tqapplication.h> @@ -92,7 +92,7 @@ KNGroupBrowser::KNGroupBrowser(TQWidget *parent, const TQString &caption, KNNntp connect(groupView, TQT_SIGNAL(doubleClicked(TQListViewItem*)), this, TQT_SLOT(slotItemDoubleClicked(TQListViewItem*))); - //tqlayout + //layout TQGridLayout *topL=new TQGridLayout(page,3,1,0,5); TQHBoxLayout *filterL=new TQHBoxLayout(10); TQVBoxLayout *arrL=new TQVBoxLayout(10); @@ -358,7 +358,7 @@ void KNGroupBrowser::slotFilter(const TQString &txt) lastFilter = filtertxt; incrementalFilter = !isRegexp; - leftLabel->setText(i18n("Groups on %1: (%2 displayed)").tqarg(a_ccount->name()).tqarg(matchList->count())); + leftLabel->setText(i18n("Groups on %1: (%2 displayed)").arg(a_ccount->name()).arg(matchList->count())); arrowBtn1->setEnabled(false); arrowBtn2->setEnabled(false); diff --git a/knode/kngroupdialog.cpp b/knode/kngroupdialog.cpp index 0050e96a5..d9b25ba17 100644 --- a/knode/kngroupdialog.cpp +++ b/knode/kngroupdialog.cpp @@ -15,7 +15,7 @@ */ #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqbuttongroup.h> #include <tqradiobutton.h> #include <tqcheckbox.h> @@ -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..4aa6a9444 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); @@ -449,7 +449,7 @@ bool KNGroupManager::unsubscribeGroup(KNGroup *g) if(!g) return false; if((g->isLocked()) || (g->lockedArticles()>0)) { - KMessageBox::sorry(knGlobals.topWidget, i18n("The group \"%1\" is being updated currently.\nIt is not possible to unsubscribe from it at the moment.").tqarg(g->groupname())); + KMessageBox::sorry(knGlobals.topWidget, i18n("The group \"%1\" is being updated currently.\nIt is not possible to unsubscribe from it at the moment.").arg(g->groupname())); return false; } @@ -596,7 +596,7 @@ void KNGroupManager::processJob(KNJobData *j) for ( KNGroupInfo* inf = d->groups->first(); inf; inf = d->groups->next() ) if ( inf->name == (*it)->groupname() ) { (*it)->setDescription( inf->description ); - (*it)->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..8e18802af 100644 --- a/knode/kngrouppropdlg.cpp +++ b/knode/kngrouppropdlg.cpp @@ -13,7 +13,7 @@ */ #include <tqgroupbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqvbox.h> #include <tqcheckbox.h> @@ -30,7 +30,7 @@ KNGroupPropDlg::KNGroupPropDlg(KNGroup *group, TQWidget *parent, const char *name ) - : KDialogBase(Tabbed, i18n("Properties of %1").tqarg(group->groupname()), + : KDialogBase(Tabbed, i18n("Properties of %1").arg(group->groupname()), Ok|Cancel|Help, Ok, parent, name), g_rp(group), n_ickChanged(false) { @@ -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/kngroupselectdialog.cpp b/knode/kngroupselectdialog.cpp index 6767d3f64..595fe0450 100644 --- a/knode/kngroupselectdialog.cpp +++ b/knode/kngroupselectdialog.cpp @@ -14,7 +14,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, US */ -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqheader.h> #include <tqcheckbox.h> diff --git a/knode/knhdrviewitem.cpp b/knode/knhdrviewitem.cpp index cf2713b8d..6330b89ab 100644 --- a/knode/knhdrviewitem.cpp +++ b/knode/knhdrviewitem.cpp @@ -114,7 +114,7 @@ int KNHdrViewItem::compare( TQListViewItem *i, int col, bool ) const } -void KNHdrViewItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment ) +void KNHdrViewItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment ) { int xText = 0, xPM = 3, yPM = 0; TQColor base; @@ -159,7 +159,7 @@ void KNHdrViewItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column, TQString t2; TQFont f2; if (countUnreadInThread() > 0 && column == paintInfo->subCol && !isOpen()) { - t2 = TQString( " (%1)" ).tqarg( countUnreadInThread() ); + t2 = TQString( " (%1)" ).arg( countUnreadInThread() ); f2 = p->font(); f2.setBold( true ); cntWidth = TQFontMetrics( f2 ).width( t2, -1 ); @@ -172,7 +172,7 @@ void KNHdrViewItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column, else mShowToolTip[column] = false; - p->drawText( xText, 0, width - xText - 5, height(), tqalignment | AlignVCenter, t ); + p->drawText( xText, 0, width - xText - 5, height(), alignment | AlignVCenter, t ); if (cntWidth) { TQFont orig = p->font(); p->setFont( f2 ); @@ -183,7 +183,7 @@ void KNHdrViewItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column, pen.setColor( cg.link() ); } p->setPen( pen ); - p->drawText( xText + TQFontMetrics( orig ).width( t, -1 ), 0, width - xText - 5, height(), tqalignment | AlignVCenter, t2 ); + p->drawText( xText + TQFontMetrics( orig ).width( t, -1 ), 0, width - xText - 5, height(), alignment | AlignVCenter, t2 ); } } } diff --git a/knode/knhdrviewitem.h b/knode/knhdrviewitem.h index 163a45070..476c6d53c 100644 --- a/knode/knhdrviewitem.h +++ b/knode/knhdrviewitem.h @@ -33,7 +33,7 @@ class KNHdrViewItem : public KListViewItem { virtual int compare(TQListViewItem *i, int col, bool ascending) const; - void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment); + void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment); int width(const TQFontMetrics &fm, const TQListView *lv, int column); virtual TQString text( int col ) const; diff --git a/knode/knjobdata.cpp b/knode/knjobdata.cpp index a5cdac894..8d2c47bf1 100644 --- a/knode/knjobdata.cpp +++ b/knode/knjobdata.cpp @@ -24,7 +24,7 @@ #include "knnetaccess.h" #include "knnntpaccount.h" -#include <tqstylesheet.h> +#include <stylesheet.h> KNJobConsumer::KNJobConsumer() { @@ -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..21ead952a 100644 --- a/knode/knmainwidget.cpp +++ b/knode/knmainwidget.cpp @@ -14,7 +14,7 @@ #include "knmainwidget.h" #include <tqhbox.h> -#include <tqlayout.h> +#include <layout.h> #include <ktoolbar.h> #include <kinputdialog.h> @@ -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 } @@ -775,7 +775,7 @@ bool KNMainWidget::firstStart() emailConf.setGroup("Defaults"); TQString group = emailConf.readEntry("Profile","Default"); - emailConf.setGroup(TQString("PROFILE_%1").tqarg(group)); + emailConf.setGroup(TQString("PROFILE_%1").arg(group)); KNConfig::Identity *id=knGlobals.configManager()->identity(); id->setName(emailConf.readEntry("FullName")); id->setEmail(emailConf.readEntry("EmailAddress").latin1()); @@ -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()); @@ -1511,7 +1511,7 @@ void KNMainWidget::slotGrpUnsubscribe() kdDebug(5003) << "KNMainWidget::slotGrpUnsubscribe()" << endl; if(g_rpManager->currentGroup()) { if(KMessageBox::Yes==KMessageBox::questionYesNo(knGlobals.topWidget, - i18n("Do you really want to unsubscribe from %1?").tqarg(g_rpManager->currentGroup()->groupname()), TQString(), i18n("Unsubscribe"), KStdGuiItem::cancel())) + i18n("Do you really want to unsubscribe from %1?").arg(g_rpManager->currentGroup()->groupname()), TQString(), i18n("Unsubscribe"), KStdGuiItem::cancel())) if (g_rpManager->unsubscribeGroup(g_rpManager->currentGroup())) slotCollectionSelected(0); } @@ -1588,7 +1588,7 @@ void KNMainWidget::slotFolDelete() KMessageBox::sorry(knGlobals.topWidget, i18n("You cannot delete a standard folder.")); else if( KMessageBox::Continue==KMessageBox::warningContinueCancel(knGlobals.topWidget, - i18n("Do you really want to delete this folder and all its tqchildren?"),"",KGuiItem(i18n("&Delete"),"editdelete")) ) { + i18n("Do you really want to delete this folder and all its children?"),"",KGuiItem(i18n("&Delete"),"editdelete")) ) { if(!f_olManager->deleteFolder(f_olManager->currentFolder())) KMessageBox::sorry(knGlobals.topWidget, @@ -1639,7 +1639,7 @@ void KNMainWidget::slotFolEmpty() return; } if( KMessageBox::Continue == KMessageBox::warningContinueCancel( - this, i18n("Do you really want to delete all articles in %1?").tqarg(f_olManager->currentFolder()->name()),"",KGuiItem(i18n("&Delete"),"editdelete")) ) + this, i18n("Do you really want to delete all articles in %1?").arg(f_olManager->currentFolder()->name()),"",KGuiItem(i18n("&Delete"),"editdelete")) ) f_olManager->emptyFolder(f_olManager->currentFolder()); } } @@ -1948,7 +1948,7 @@ void KNMainWidget::slotFetchArticleWithID() TQString id = dlg->messageId().simplifyWhiteSpace(); if (id.find(TQRegExp("*@*",false,true))!=-1) { if (id.find(TQRegExp("<*>",false,true))==-1) // add "<>" when necessary - id = TQString("<%1>").tqarg(id); + id = TQString("<%1>").arg(id); if(!KNArticleWindow::raiseWindowForArticle(id.latin1())) { //article not yet opened KNRemoteArticle *a=new KNRemoteArticle(g_rpManager->currentGroup()); @@ -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/knmemorymanager.cpp b/knode/knmemorymanager.cpp index 365e9f8c9..37a639287 100644 --- a/knode/knmemorymanager.cpp +++ b/knode/knmemorymanager.cpp @@ -162,7 +162,7 @@ void KNMemoryManager::checkMemoryUsageCollections() for ( TQValueList<CollectionItem*>::Iterator it = tempList.begin(); it != tempList.end(); ) { if ( c_ollCacheSize <= maxSize ) break; - // unloadHeaders() will remove the cache entry and thus tqinvalidate the iterator! + // unloadHeaders() will remove the cache entry and thus invalidate the iterator! c = (*it)->col; ++it; @@ -191,7 +191,7 @@ void KNMemoryManager::checkMemoryUsageArticles() for ( TQValueList<ArticleItem*>::Iterator it = mArtList.begin(); it != mArtList.end(); ) { if ( a_rtCacheSize <= maxSize ) break; - // unloadArticle() will remove the cache entry and thus tqinvalidate the iterator! + // unloadArticle() will remove the cache entry and thus invalidate the iterator! KNArticle *art = (*it)->art; ++it; knGlobals.articleManager()->unloadArticle( art, false ); // *try* to unload diff --git a/knode/knnetaccess.cpp b/knode/knnetaccess.cpp index 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..ba1657c0c 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 ); } @@ -174,7 +174,7 @@ void KNNntpAccount::saveInfo() TQString KNNntpAccount::path() { - TQString dir(locateLocal("data","knode/")+TQString("nntp.%1/").tqarg(i_d)); + TQString dir(locateLocal("data","knode/")+TQString("nntp.%1/").arg(i_d)); if (dir.isNull()) KNHelper::displayInternalFileError(); return (dir); diff --git a/knode/knnntpclient.cpp b/knode/knnntpclient.cpp index 26473b6a1..d49f9053a 100644 --- a/knode/knnntpclient.cpp +++ b/knode/knnntpclient.cpp @@ -16,7 +16,7 @@ #include <stdlib.h> #include <klocale.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <tqmutex.h> #include "kngroupmanager.h" @@ -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); @@ -336,7 +336,7 @@ void KNNntpClient::doFetchNewHeaders() sendSignal(TSdownloadNew); errorPrefix=i18n("No new articles could be retrieved for\n%1/%2.\nThe following error occurred:\n") - .tqarg(account.server()).tqarg(target->groupname()); + .arg(account.server()).arg(target->groupname()); cmd="GROUP "; cmd+=target->groupname().utf8(); @@ -482,7 +482,7 @@ void KNNntpClient::doFetchArticle() job->setErrorString( errorPrefix + getCurrentLine() + i18n("<br><br>The article you requested is not available on your news server." "<br>You could try to get it from <a href=\"http://groups.google.com/groups?selm=%1\">groups.google.com</a>.") - .tqarg( msgId ) ); + .arg( msgId ) ); } return; } @@ -638,7 +638,7 @@ bool KNNntpClient::openConnection() #ifndef NDEBUG qDebug("knode: Authorization failed"); #endif - job->setErrorString(i18n("Authentication failed.\nCheck your username and password.\n\n%1").tqarg(getCurrentLine())); + job->setErrorString(i18n("Authentication failed.\nCheck your username and password.\n\n%1").arg(getCurrentLine())); job->setAuthError(true); closeConnection(); return false; @@ -695,7 +695,7 @@ bool KNNntpClient::sendCommand(const TQCString &cmd, int &rep) //qDebug("knode: Password required"); if (!account.pass().length()) { - job->setErrorString(i18n("Authentication failed.\nCheck your username and password.\n\n%1").tqarg(getCurrentLine())); + job->setErrorString(i18n("Authentication failed.\nCheck your username and password.\n\n%1").arg(getCurrentLine())); job->setAuthError(true); closeConnection(); return false; @@ -716,7 +716,7 @@ bool KNNntpClient::sendCommand(const TQCString &cmd, int &rep) if (!KNProtocolClient::sendCommand(cmd,rep)) // retry the original command return false; } else { - job->setErrorString(i18n("Authentication failed.\nCheck your username and password.\n\n%1").tqarg(getCurrentLine())); + job->setErrorString(i18n("Authentication failed.\nCheck your username and password.\n\n%1").arg(getCurrentLine())); job->setAuthError(true); closeConnection(); return false; @@ -729,7 +729,7 @@ bool KNNntpClient::sendCommand(const TQCString &cmd, int &rep) void KNNntpClient::handleErrors() { if (errorPrefix.isEmpty()) - job->setErrorString(i18n("An error occurred:\n%1").tqarg(getCurrentLine())); + job->setErrorString(i18n("An error occurred:\n%1").arg(getCurrentLine())); else job->setErrorString(errorPrefix + getCurrentLine()); diff --git a/knode/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/knode_part.cpp b/knode/knode_part.cpp index b20a5bb8b..1268733cb 100644 --- a/knode/knode_part.cpp +++ b/knode/knode_part.cpp @@ -41,7 +41,7 @@ #include <kstatusbar.h> #include <krsqueezedtextlabel.h> -#include <tqlayout.h> +#include <layout.h> typedef KParts::GenericFactory< KNodePart > KNodeFactory; diff --git a/knode/knprotocolclient.cpp b/knode/knprotocolclient.cpp index dd0db677a..330199bde 100644 --- a/knode/knprotocolclient.cpp +++ b/knode/knprotocolclient.cpp @@ -201,11 +201,11 @@ bool KNProtocolClient::openConnection() if (ks.status() == IO_LookupError) { job->setErrorString(i18n("Unable to resolve hostname")); } else if (ks.status() == IO_ConnectError) { - job->setErrorString(i18n("Unable to connect:\n%1").tqarg(KExtendedSocket::strError(ks.status(), errno))); + job->setErrorString(i18n("Unable to connect:\n%1").arg(KExtendedSocket::strError(ks.status(), errno))); } else if (ks.status() == IO_TimeOutError) job->setErrorString(i18n("A delay occurred which exceeded the\ncurrent timeout limit.")); else - job->setErrorString(i18n("Unable to connect:\n%1").tqarg(KExtendedSocket::strError(ks.status(), errno))); + job->setErrorString(i18n("Unable to connect:\n%1").arg(KExtendedSocket::strError(ks.status(), errno))); closeSocket(); return false; @@ -432,7 +432,7 @@ bool KNProtocolClient::checkNextResponse(int code) void KNProtocolClient::handleErrors() { if (errorPrefix.isEmpty()) - job->setErrorString(i18n("An error occurred:\n%1").tqarg(thisLine)); + job->setErrorString(i18n("An error occurred:\n%1").arg(thisLine)); else job->setErrorString(errorPrefix + thisLine); diff --git a/knode/knrangefilter.cpp b/knode/knrangefilter.cpp index 28c67b030..ef9b611ec 100644 --- a/knode/knrangefilter.cpp +++ b/knode/knrangefilter.cpp @@ -15,7 +15,7 @@ */ #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> #include <tqcombobox.h> @@ -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..f4e3bbb3a 100644 --- a/knode/knsearchdialog.cpp +++ b/knode/knsearchdialog.cpp @@ -14,7 +14,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, US */ -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> #include <klocale.h> @@ -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/knserverinfo.cpp b/knode/knserverinfo.cpp index c0351349b..d314a7710 100644 --- a/knode/knserverinfo.cpp +++ b/knode/knserverinfo.cpp @@ -111,7 +111,7 @@ void KNServerInfo::saveConf(KConfig *conf) "but should not be considered secure from decryption efforts " "if access to the configuration file is obtained.\n" "Do you want to store the password for server '%1' in the " - "configuration file?").tqarg( server() ), + "configuration file?").arg( server() ), i18n("KWallet Not Available"), KGuiItem( i18n("Store Password") ), KGuiItem( i18n("Do Not Store Password") ) ) diff --git a/knode/knstatusfilter.cpp b/knode/knstatusfilter.cpp index a1379a265..e99d764c4 100644 --- a/knode/knstatusfilter.cpp +++ b/knode/knstatusfilter.cpp @@ -14,7 +14,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, US */ -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> #include <klocale.h> #include <ksimpleconfig.h> diff --git a/knode/knstringfilter.cpp b/knode/knstringfilter.cpp index 4f69f7eaf..322840b25 100644 --- a/knode/knstringfilter.cpp +++ b/knode/knstringfilter.cpp @@ -13,7 +13,7 @@ */ #include <tqcombobox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> #include <klocale.h> diff --git a/knode/knwidgets.cpp b/knode/knwidgets.cpp index c3f21959a..b4c9a160c 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,9 +141,9 @@ 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.setPen(palette().active().highlight()); paint.drawLine(1, 2, width(), 2); paint.drawLine(1, 3, width(), 3); paint.drawLine(1, 5, width(), 5); 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/knode/utilities.cpp b/knode/utilities.cpp index 2297387bf..49454c0e5 100644 --- a/knode/utilities.cpp +++ b/knode/utilities.cpp @@ -12,7 +12,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, US */ -#include <tqlayout.h> +#include <layout.h> #include <tqregexp.h> #include <tqapplication.h> #include <tqcursor.h> @@ -167,7 +167,7 @@ TQFile* KNSaveHelper::getFile(const TQString &dialogTitle) if (url.isLocalFile()) { if (TQFileInfo(url.path()).exists() && (KMessageBox::warningContinueCancel(knGlobals.topWidget, - i18n("<qt>A file named <b>%1</b> already exists.<br>Do you want to replace it?</qt>").tqarg(url.path()), + i18n("<qt>A file named <b>%1</b> already exists.<br>Do you want to replace it?</qt>").arg(url.path()), dialogTitle, i18n("&Replace")) != KMessageBox::Continue)) { return 0; } @@ -293,7 +293,7 @@ int KNHelper::selectDialog(TQWidget *parent, const TQString &caption, const TQSt return ret; } -// **** window tqgeometry managing ********************************************* +// **** window geometry managing ********************************************* void KNHelper::saveWindowSize(const TQString &name, const TQSize &s) { diff --git a/knotes/ChangeLog b/knotes/ChangeLog index 41ff85579..532a92792 100644 --- a/knotes/ChangeLog +++ b/knotes/ChangeLog @@ -3,7 +3,7 @@ ChangeLog for KNotes 2006/07/10 Michael Brade <brade@kde.org> - * added DCOP methods to get and change tqgeometry: + * added DCOP methods to get and change geometry: height(), width(), move(), resize() 2006/06/10 Michael Brade <brade@kde.org> @@ -616,7 +616,7 @@ ChangeLog for KNotes 2001/06/23 Michael Brade <brade@informatik.uni-muenchen.de> * fixed #18086 (add a size grip for the notes) - * update the title tqlayout if the font was changed + * update the title layout if the font was changed 2001/06/17 Michael Brade <brade@informatik.uni-muenchen.de> @@ -631,7 +631,7 @@ ChangeLog for KNotes - removed the size setting from the local note config dialog - #20172: separate font settings for title and body * don't reload the display setting if changing e.g. only the color - - the note's tqgeometry could have been changed already + the note's geometry could have been changed already * fixed some bugs introduced by the QTextEdit port 2001/06/10 Michael Brade <brade@informatik.uni-muenchen.de> @@ -863,7 +863,7 @@ Tue Aug 3 02:23:09 1999 Carsten Pfeiffer <pfeiffer@kde.org> * added possibility to play a sound when an alarm is activated, configurable in the defaults dialog * replaced the custom spinboxes with QSpinBoxes and made the dialog use - tqlayout management (still not perfect, yet) + layout management (still not perfect, yet) 1999-06-07 Petter Reinholdtsen <pere@td.org.uit.no> * knotes.cpp: Changed text Quit to Exit to match KDE style guide. @@ -922,7 +922,7 @@ Mon Nov 17 21:32:28 1997 Didier Belot <dib@avo.fr> Sat Nov 22 13:13:05 1997 Matthias Ettrich <ettrich@kde.org> - * sessionmanagement: uses kwm properties now, not only tqgeometry info + * sessionmanagement: uses kwm properties now, not only geometry info * look: pretty thin border. KPostit does no longer inherit QMultiline but simply QFrame. New class: KPostitMultilineEdit. New QMessage box for warning. Icon+Miniicon. diff --git a/knotes/knote.cpp b/knotes/knote.cpp index 430a5dca5..2b0ae9599 100644 --- a/knotes/knote.cpp +++ b/knotes/knote.cpp @@ -393,7 +393,7 @@ void KNote::slotKill( bool force ) m_blockEmitDataChanged = true; if ( !force && KMessageBox::warningContinueCancel( this, - i18n("<qt>Do you really want to delete note <b>%1</b>?</qt>").tqarg( m_label->text() ), + i18n("<qt>Do you really want to delete note <b>%1</b>?</qt>").arg( m_label->text() ), i18n("Confirm Delete"), KGuiItem( i18n("&Delete"), "editdelete" ), "ConfirmDeleteNote" ) @@ -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() @@ -804,7 +804,7 @@ void KNote::slotPreferences() void KNote::slotSend() { // pop up dialog to get the IP - KNoteHostDlg hostDlg( i18n("Send \"%1\"").tqarg( name() ), this ); + KNoteHostDlg hostDlg( i18n("Send \"%1\"").arg( name() ), this ); aboutToEnterEventLoop(); bool ok = (hostDlg.exec() == TQDialog::Accepted); eventLoopLeft(); @@ -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 ); } @@ -891,7 +891,7 @@ void KNote::slotSaveAs() if ( file.exists() && KMessageBox::warningContinueCancel( this, i18n("<qt>A file named <b>%1</b> already exists.<br>" - "Are you sure you want to overwrite it?</qt>").tqarg( TQFileInfo(file).fileName() ) ) + "Are you sure you want to overwrite it?</qt>").arg( TQFileInfo(file).fileName() ) ) != KMessageBox::Continue ) { m_blockEmitDataChanged = false; @@ -986,7 +986,7 @@ void KNote::slotUpdateDesktopActions() int count = wm_root.numberOfDesktops(); for ( int n = 1; n <= count; n++ ) - desktops.append( TQString("&%1 %2").tqarg( n ).tqarg( TQString::fromUtf8(wm_root.desktopName( n )) ) ); + desktops.append( TQString("&%1 %2").arg( n ).arg( TQString::fromUtf8(wm_root.desktopName( n )) ) ); m_toDesktop->setItems( desktops ); @@ -1020,7 +1020,7 @@ void KNote::createFold() TQPixmap fold( 15, 15 ); TQPainter foldp( &fold ); foldp.setPen( TQt::NoPen ); - foldp.setBrush( tqpalette().active().dark() ); + foldp.setBrush( palette().active().dark() ); TQPointArray foldpoints( 3 ); foldpoints.putPoints( 0, 3, 0, 0, 14, 0, 0, 14 ); foldp.drawPolygon( foldpoints ); @@ -1033,16 +1033,16 @@ 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() { if ( hasFocus() ) { - m_label->setBackgroundColor( tqpalette().active().shadow() ); + m_label->setBackgroundColor( palette().active().shadow() ); m_button->show(); if ( !m_editor->isReadOnly() ) @@ -1081,11 +1081,11 @@ void KNote::updateFocus() if ( s_ppOffset ) { - m_label->setBackgroundColor( tqpalette().active().midlight() ); + m_label->setBackgroundColor( palette().active().midlight() ); m_fold->show(); } else - m_label->setBackgroundColor( tqpalette().active().background() ); + m_label->setBackgroundColor( palette().active().background() ); } } @@ -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; } @@ -1138,7 +1138,7 @@ void KNote::updateBackground( int y_offset ) TQImage grad_img( w, h, 32 ); TQRgb rgbcol; - TQColor bg = tqpalette().active().background(); + TQColor bg = palette().active().background(); for ( int i = 0; i < h; ++i ) { @@ -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; @@ -1172,7 +1172,7 @@ void KNote::updateLayout() if ( s_ppOffset ) { if ( !m_editor->paper().pixmap() ) // just changed the style - setColor( tqpalette().active().foreground(), tqpalette().active().background() ); + setColor( palette().active().foreground(), palette().active().background() ); m_pushpin->show(); setFrameStyle( Panel | Raised ); @@ -1185,7 +1185,7 @@ void KNote::updateLayout() else { if ( m_editor->paper().pixmap() ) // just changed the style - setColor( tqpalette().active().foreground(), tqpalette().active().background() ); + setColor( palette().active().foreground(), palette().active().background() ); setFrameStyle( WinPanel | Raised ); m_pushpin->hide(); @@ -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..be141088d 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; @@ -49,18 +49,18 @@ KNoteButton::~KNoteButton() void KNoteButton::enterEvent( TQEvent * ) { m_flat = false; - tqrepaint( false ); + repaint( false ); } void KNoteButton::leaveEvent( TQEvent * ) { m_flat = true; - tqrepaint(); + repaint(); } -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..51e22fbfb 100644 --- a/knotes/knoteconfigdlg.cpp +++ b/knotes/knoteconfigdlg.cpp @@ -19,7 +19,7 @@ *******************************************************************/ #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> #include <tqcombobox.h> #include <tqhgroupbox.h> @@ -89,22 +89,22 @@ void KNoteConfigDlg::slotUpdateCaption() TQWidget *KNoteConfigDlg::makeDisplayPage( bool defaults ) { TQWidget *displayPage = new TQWidget(); - TQGridLayout *tqlayout = new TQGridLayout( displayPage, 2, 2, + TQGridLayout *layout = new TQGridLayout( displayPage, 2, 2, defaults ? marginHint() : 0, spacingHint() ); TQLabel *label_FgColor = new TQLabel( i18n("&Text color:"), displayPage, "label_FgColor" ); - tqlayout->addWidget( label_FgColor, 0, 0 ); + layout->addWidget( label_FgColor, 0, 0 ); KColorButton *kcfg_FgColor = new KColorButton( displayPage, "kcfg_FgColor" ); label_FgColor->setBuddy( kcfg_FgColor ); - tqlayout->addWidget( kcfg_FgColor, 0, 1 ); + layout->addWidget( kcfg_FgColor, 0, 1 ); TQLabel *label_BgColor = new TQLabel( i18n("&Background color:"), displayPage, "label_BgColor" ); - tqlayout->addWidget( label_BgColor, 1, 0 ); + layout->addWidget( label_BgColor, 1, 0 ); KColorButton *kcfg_BgColor = new KColorButton( displayPage, "kcfg_BgColor" ); label_BgColor->setBuddy( kcfg_BgColor ); - tqlayout->addWidget( kcfg_BgColor, 1, 1 ); + layout->addWidget( kcfg_BgColor, 1, 1 ); TQCheckBox *kcfg_ShowInTaskbar = new TQCheckBox( i18n("&Show note in taskbar"), displayPage, "kcfg_ShowInTaskbar" ); @@ -112,25 +112,25 @@ TQWidget *KNoteConfigDlg::makeDisplayPage( bool defaults ) if ( defaults ) { TQLabel *label_Width = new TQLabel( i18n("Default &width:"), displayPage, "label_Width" ); - tqlayout->addWidget( label_Width, 2, 0 ); + layout->addWidget( label_Width, 2, 0 ); KIntNumInput *kcfg_Width = new KIntNumInput( displayPage, "kcfg_Width" ); label_Width->setBuddy( kcfg_Width ); kcfg_Width->setRange( 50, 2000, 10, false ); - tqlayout->addWidget( kcfg_Width, 2, 1 ); + layout->addWidget( kcfg_Width, 2, 1 ); TQLabel *label_Height = new TQLabel( i18n("Default &height:"), displayPage, "label_Height" ); - tqlayout->addWidget( label_Height, 3, 0 ); + layout->addWidget( label_Height, 3, 0 ); KIntNumInput *kcfg_Height = new KIntNumInput( displayPage, "kcfg_Height" ); kcfg_Height->setRange( 50, 2000, 10, false ); label_Height->setBuddy( kcfg_Height ); - tqlayout->addWidget( kcfg_Height, 3, 1 ); + layout->addWidget( kcfg_Height, 3, 1 ); - tqlayout->addWidget( kcfg_ShowInTaskbar, 4, 0 ); + layout->addWidget( kcfg_ShowInTaskbar, 4, 0 ); } else - tqlayout->addWidget( kcfg_ShowInTaskbar, 2, 0 ); + layout->addWidget( kcfg_ShowInTaskbar, 2, 0 ); return displayPage; } @@ -138,36 +138,36 @@ TQWidget *KNoteConfigDlg::makeDisplayPage( bool defaults ) TQWidget *KNoteConfigDlg::makeEditorPage( bool defaults ) { TQWidget *editorPage = new TQWidget(); - TQGridLayout *tqlayout = new TQGridLayout( editorPage, 4, 3, + TQGridLayout *layout = new TQGridLayout( editorPage, 4, 3, defaults ? marginHint() : 0, spacingHint() ); TQLabel *label_TabSize = new TQLabel( i18n( "&Tab size:" ), editorPage, "label_TabSize" ); - tqlayout->addMultiCellWidget( label_TabSize, 0, 0, 0, 1 ); + layout->addMultiCellWidget( label_TabSize, 0, 0, 0, 1 ); KIntNumInput *kcfg_TabSize = new KIntNumInput( editorPage, "kcfg_TabSize" ); kcfg_TabSize->setRange( 0, 40, 1, false ); label_TabSize->setBuddy( kcfg_TabSize ); - tqlayout->addWidget( kcfg_TabSize, 0, 2 ); + layout->addWidget( kcfg_TabSize, 0, 2 ); TQCheckBox *kcfg_AutoIndent = new TQCheckBox( i18n("Auto &indent"), editorPage, "kcfg_AutoIndent" ); - tqlayout->addMultiCellWidget( kcfg_AutoIndent, 1, 1, 0, 1 ); + layout->addMultiCellWidget( kcfg_AutoIndent, 1, 1, 0, 1 ); TQCheckBox *kcfg_RichText = new TQCheckBox( i18n("&Rich text"), editorPage, "kcfg_RichText" ); - tqlayout->addWidget( kcfg_RichText, 1, 2 ); + layout->addWidget( kcfg_RichText, 1, 2 ); TQLabel *label_Font = new TQLabel( i18n("Text font:"), editorPage, "label_Font" ); - tqlayout->addWidget( label_Font, 3, 0 ); + layout->addWidget( label_Font, 3, 0 ); KFontRequester *kcfg_Font = new KFontRequester( editorPage, "kcfg_Font" ); - kcfg_Font->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) ); - tqlayout->addMultiCellWidget( kcfg_Font, 3, 3, 1, 2 ); + kcfg_Font->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) ); + layout->addMultiCellWidget( kcfg_Font, 3, 3, 1, 2 ); TQLabel *label_TitleFont = new TQLabel( i18n("Title font:"), editorPage, "label_TitleFont" ); - tqlayout->addWidget( label_TitleFont, 2, 0 ); + layout->addWidget( label_TitleFont, 2, 0 ); KFontRequester *kcfg_TitleFont = new KFontRequester( editorPage, "kcfg_TitleFont" ); - kcfg_TitleFont->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) ); - tqlayout->addMultiCellWidget( kcfg_TitleFont, 2, 2, 1, 2 ); + kcfg_TitleFont->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) ); + layout->addMultiCellWidget( kcfg_TitleFont, 2, 2, 1, 2 ); return editorPage; } @@ -184,14 +184,14 @@ TQWidget *KNoteConfigDlg::makeDefaultsPage() TQWidget *KNoteConfigDlg::makeActionsPage() { TQWidget *actionsPage = new TQWidget(); - TQGridLayout *tqlayout = new TQGridLayout( actionsPage, 2, 2, 0, spacingHint() ); + TQGridLayout *layout = new TQGridLayout( actionsPage, 2, 2, 0, spacingHint() ); TQLabel *label_MailAction = new TQLabel( i18n("&Mail action:"), actionsPage, "label_MailAction" ); - tqlayout->addWidget( label_MailAction, 0, 0 ); + layout->addWidget( label_MailAction, 0, 0 ); KLineEdit *kcfg_MailAction = new KLineEdit( actionsPage, "kcfg_MailAction" ); label_MailAction->setBuddy( kcfg_MailAction ); - tqlayout->addWidget( kcfg_MailAction, 0, 1 ); + layout->addWidget( kcfg_MailAction, 0, 1 ); return actionsPage; } @@ -199,27 +199,27 @@ TQWidget *KNoteConfigDlg::makeActionsPage() TQWidget *KNoteConfigDlg::makeNetworkPage() { TQWidget *networkPage = new TQWidget(); - TQGridLayout *tqlayout = new TQGridLayout( networkPage, 4, 2, 0, spacingHint() ); + TQGridLayout *layout = new TQGridLayout( networkPage, 4, 2, 0, spacingHint() ); TQGroupBox *incoming = new TQHGroupBox( i18n("Incoming Notes"), networkPage ); - tqlayout->addMultiCellWidget( incoming, 0, 0, 0, 1 ); + layout->addMultiCellWidget( incoming, 0, 0, 0, 1 ); new TQCheckBox( i18n("Accept incoming notes"), incoming, "kcfg_ReceiveNotes" ); TQGroupBox *outgoing = new TQHGroupBox( i18n("Outgoing Notes"), networkPage ); - tqlayout->addMultiCellWidget( outgoing, 1, 1, 0, 1 ); + layout->addMultiCellWidget( outgoing, 1, 1, 0, 1 ); TQLabel *label_SenderID = new TQLabel( i18n("&Sender ID:"), outgoing, "label_SenderID" ); KLineEdit *kcfg_SenderID = new KLineEdit( outgoing, "kcfg_SenderID" ); label_SenderID->setBuddy( kcfg_SenderID ); TQLabel *label_Port = new TQLabel( i18n("&Port:"), networkPage, "label_Port" ); - tqlayout->addWidget( label_Port, 2, 0 ); + layout->addWidget( label_Port, 2, 0 ); KIntNumInput *kcfg_Port = new KIntNumInput( networkPage, "kcfg_Port" ); kcfg_Port->setRange( 0, 65535, 1, false ); label_Port->setBuddy( kcfg_Port ); - tqlayout->addWidget( kcfg_Port, 2, 1 ); + layout->addWidget( kcfg_Port, 2, 1 ); return networkPage; } @@ -227,17 +227,17 @@ TQWidget *KNoteConfigDlg::makeNetworkPage() TQWidget *KNoteConfigDlg::makeStylePage() { TQWidget *stylePage = new TQWidget(); - TQGridLayout *tqlayout = new TQGridLayout( stylePage, 2, 2, 0, spacingHint() ); + TQGridLayout *layout = new TQGridLayout( stylePage, 2, 2, 0, spacingHint() ); TQLabel *label_Style = new TQLabel( i18n("&Style:"), stylePage, "label_Style" ); - tqlayout->addWidget( label_Style, 0, 0 ); + layout->addWidget( label_Style, 0, 0 ); TQComboBox *kcfg_Style = new TQComboBox( stylePage, "kcfg_Style" ); TQStringList list; list << "Plain" << "Fancy"; kcfg_Style->insertStringList( list ); label_Style->setBuddy( kcfg_Style ); - tqlayout->addWidget( kcfg_Style, 0, 1 ); + layout->addWidget( kcfg_Style, 0, 1 ); return stylePage; } 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..c58031671 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 ) @@ -71,7 +71,7 @@ void KNotePrinter::doPrint( KPrinter& printer, TQPainter& painter, { const int margin = 40; // pt - TQPaintDeviceMetrics metrics( painter.tqdevice() ); + TQPaintDeviceMetrics metrics( painter.device() ); int marginX = margin * metrics.logicalDpiX() / 72; int marginY = margin * metrics.logicalDpiY() / 72; @@ -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() ); @@ -117,7 +117,7 @@ void KNotePrinter::printNote( const TQString& name, const TQString& content ) co KPrinter printer; printer.setFullPage( true ); - if ( !printer.setup( 0, i18n("Print %1").tqarg(name) ) ) + if ( !printer.setup( 0, i18n("Print %1").arg(name) ) ) return; TQPainter painter; painter.begin( &printer ); diff --git a/knotes/knoteprinter.h b/knotes/knoteprinter.h index 148a2ec45..090bac334 100644 --- a/knotes/knoteprinter.h +++ b/knotes/knoteprinter.h @@ -2,7 +2,7 @@ #define KNOTEPRINTER_H #include <tqfont.h> -#include <tqpalette.h> +#include <palette.h> #include <tqstring.h> class TQMimeSourceFactory; @@ -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..26a02465f 100644 --- a/knotes/knotesapp.cpp +++ b/knotes/knotesapp.cpp @@ -18,7 +18,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *******************************************************************/ -#include <tqclipboard.h> +#include <clipboard.h> #include <tqptrlist.h> #include <tqtooltip.h> @@ -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 ); @@ -266,7 +266,7 @@ TQString KNotesApp::newNote( const TQString& name, const TQString& text ) TQString KNotesApp::newNoteFromClipboard( const TQString& name ) { - const TQString& text = KApplication::tqclipboard()->text(); + const TQString& text = KApplication::clipboard()->text(); return newNote( name, text ); } diff --git a/knotes/knoteslegacy.cpp b/knotes/knoteslegacy.cpp index 129517b30..03b37995c 100644 --- a/knotes/knoteslegacy.cpp +++ b/knotes/knoteslegacy.cpp @@ -23,7 +23,7 @@ #include <tqpoint.h> #include <tqcolor.h> #include <tqstringlist.h> -#include <tqtextstream.h> +#include <textstream.h> #include <kdebug.h> #include <kapplication.h> @@ -156,7 +156,7 @@ bool KNotesLegacy::convertKNotes1Config( Journal *journal, TQDir& noteDir, config.readConfig(); config.setVersion( KNOTES_VERSION ); - // get the tqgeometry + // get the geometry config.setWidth( props[3].toUInt() ); config.setHeight( props[4].toUInt() ); diff --git a/knotes/knotesnetrecv.cpp b/knotes/knotesnetrecv.cpp index 2adf8e784..9120336a8 100644 --- a/knotes/knotesnetrecv.cpp +++ b/knotes/knotesnetrecv.cpp @@ -61,13 +61,13 @@ 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. m_titleAddon = TQString(" [%1, %2]") - .tqarg( m_sock->peerAddress().nodeName() ) - .tqarg( date ); + .arg( m_sock->peerAddress().nodeName() ) + .arg( date ); // Setup the communications connect( m_sock, TQT_SIGNAL(readyRead()), TQT_SLOT(slotDataAvailable()) ); diff --git a/knotes/knotesnetsend.cpp b/knotes/knotesnetsend.cpp index ca3005d6a..998439de4 100644 --- a/knotes/knotesnetsend.cpp +++ b/knotes/knotesnetsend.cpp @@ -62,7 +62,7 @@ void KNotesNetworkSender::setSenderId( const TQString& sender ) void KNotesNetworkSender::setNote( const TQString& title, const TQString& text ) { - // TODO: support for tqunicode and rich text. + // TODO: support for unicode and rich text. // Mmmmmm... how to behave with such heterogeneous environment? // AFAIK, ATnotes does not allow UNICODE. m_title = title.ascii(); @@ -91,7 +91,7 @@ void KNotesNetworkSender::slotReadyWrite() void KNotesNetworkSender::slotError( int err ) { KMessageBox::sorry( 0, i18n("Communication error: %1") - .tqarg( TQString(KNetwork::KSocketBase::errorString( static_cast<KSocketBase::SocketError>(err) )) ) + .arg( TQString(KNetwork::KSocketBase::errorString( static_cast<KSocketBase::SocketError>(err) )) ) ); slotClosed(); } diff --git a/knotes/resourcelocal.cpp b/knotes/resourcelocal.cpp index aed70e236..53ea68ac8 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" ); @@ -89,7 +89,7 @@ bool ResourceLocal::save() i18n("<qt>Unable to save the notes to <b>%1</b>. " "Check that there is sufficient disk space." "<br>There should be a backup in the same directory " - "though.</qt>").tqarg( mURL.path() ) ); + "though.</qt>").arg( mURL.path() ) ); return false; } diff --git a/knotes/resourcelocalconfig.cpp b/knotes/resourcelocalconfig.cpp index 207730a14..7d2636567 100644 --- a/knotes/resourcelocalconfig.cpp +++ b/knotes/resourcelocalconfig.cpp @@ -19,7 +19,7 @@ *******************************************************************/ #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <kdebug.h> #include <klocale.h> @@ -32,15 +32,15 @@ ResourceLocalConfig::ResourceLocalConfig( TQWidget *parent, const char *name ) : KRES::ConfigWidget( parent, name ) { - TQHBoxLayout *tqlayout = new TQHBoxLayout( this ); + TQHBoxLayout *layout = new TQHBoxLayout( this ); TQLabel *label = new TQLabel( i18n( "Location:" ), this ); mURL = new KURLRequester( this ); KFile::Mode mode = static_cast<KFile::Mode>( KFile::File | KFile::LocalOnly ); mURL->setMode( mode ); - tqlayout->addWidget( label ); - tqlayout->addWidget( mURL ); + layout->addWidget( label ); + layout->addWidget( mURL ); } ResourceLocalConfig::~ResourceLocalConfig() diff --git a/kode/code.cpp b/kode/code.cpp index ce4e9708a..3c4c38165 100644 --- a/kode/code.cpp +++ b/kode/code.cpp @@ -24,7 +24,7 @@ #include <kdebug.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> using namespace KODE; diff --git a/kode/enum.cpp b/kode/enum.cpp index 8a41f58b6..64bf8f790 100644 --- a/kode/enum.cpp +++ b/kode/enum.cpp @@ -41,9 +41,9 @@ TQString Enum::declaration() const for ( it = mEnums.begin(); it != mEnums.end(); ++it, ++value ) { if ( mCombinable ) { if ( it == mEnums.begin() ) - retval += TQString( " %1 = %2" ).tqarg( *it ).tqarg( 1 << value ); + retval += TQString( " %1 = %2" ).arg( *it ).arg( 1 << value ); else - retval += TQString( ", %1 = %2" ).tqarg( *it ).tqarg( 1 << value ); + retval += TQString( ", %1 = %2" ).arg( *it ).arg( 1 << value ); } else { if ( it == mEnums.begin() ) retval += " " + *it; diff --git a/kode/file.cpp b/kode/file.cpp index b6e7619fe..451ee801e 100644 --- a/kode/file.cpp +++ b/kode/file.cpp @@ -24,7 +24,7 @@ #include <kdebug.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> using namespace KODE; diff --git a/kode/kodemain.cpp b/kode/kodemain.cpp index 6e9b62225..30c469495 100644 --- a/kode/kodemain.cpp +++ b/kode/kodemain.cpp @@ -40,7 +40,7 @@ #include <kprocess.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqfileinfo.h> #include <tqregexp.h> @@ -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/binaryinputfield.cpp b/kode/kwsdl/kung/binaryinputfield.cpp index 8d897c4c5..9d971893e 100644 --- a/kode/kwsdl/kung/binaryinputfield.cpp +++ b/kode/kwsdl/kung/binaryinputfield.cpp @@ -31,7 +31,7 @@ #include <tqfile.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <tqwidget.h> @@ -131,7 +131,7 @@ void BinaryWidget::setData( const TQByteArray &data ) part->openURL( KURL( file.name() ) ); mMainWidget = part->widget(); } else { - mMainWidget = new TQLabel( i18n( "No part found for visualization of mimetype %1" ).tqarg( mimetype ), this ); + mMainWidget = new TQLabel( i18n( "No part found for visualization of mimetype %1" ).arg( mimetype ), this ); } mData = data; @@ -154,7 +154,7 @@ void BinaryWidget::load() if ( KIO::NetAccess::download( url, tempFile, this ) ) { TQFile file( tempFile ); if ( !file.open( IO_ReadOnly ) ) { - KMessageBox::error( this, i18n( "Unable to open file %1" ).tqarg( url.url() ) ); + KMessageBox::error( this, i18n( "Unable to open file %1" ).arg( url.url() ) ); return; } diff --git a/kode/kwsdl/kung/complexbaseinputfield.cpp b/kode/kwsdl/kung/complexbaseinputfield.cpp index bfcd375e2..676ee3bac 100644 --- a/kode/kwsdl/kung/complexbaseinputfield.cpp +++ b/kode/kwsdl/kung/complexbaseinputfield.cpp @@ -21,7 +21,7 @@ #include <tqgroupbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <schema/complextype.h> @@ -141,14 +141,14 @@ TQWidget *ComplexBaseInputField::createWidget( TQWidget *parent ) { TQGroupBox *inputWidget = new TQGroupBox( mName, parent ); inputWidget->setColumnLayout( 0, TQt::Horizontal ); - TQGridLayout *tqlayout = new TQGridLayout( inputWidget->tqlayout(), 2, 2, 6 ); + TQGridLayout *layout = new TQGridLayout( inputWidget->layout(), 2, 2, 6 ); InputField::List::Iterator it; int row = 0; for ( it = mFields.begin(); it != mFields.end(); ++it, ++row ) { TQLabel *label = new TQLabel( (*it)->name(), inputWidget ); - tqlayout->addWidget( label, row, 0 ); - tqlayout->addWidget( (*it)->createWidget( inputWidget ), row, 1 ); + layout->addWidget( label, row, 0 ); + layout->addWidget( (*it)->createWidget( inputWidget ), row, 1 ); } return inputWidget; 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/inputfield.cpp b/kode/kwsdl/kung/inputfield.cpp index a8a1c66f3..7bdd4cdeb 100644 --- a/kode/kwsdl/kung/inputfield.cpp +++ b/kode/kwsdl/kung/inputfield.cpp @@ -25,7 +25,7 @@ #include "inputfield.h" InputField::InputField( const TQString &name ) - : TQObject( 0, TQString( "InputField( %1 )" ).tqarg( name ).latin1() ), + : TQObject( 0, TQString( "InputField( %1 )" ).arg( name ).latin1() ), mName( name ) { } diff --git a/kode/kwsdl/kung/listinputfield.cpp b/kode/kwsdl/kung/listinputfield.cpp index 7a5eeb713..0b95daf31 100644 --- a/kode/kwsdl/kung/listinputfield.cpp +++ b/kode/kwsdl/kung/listinputfield.cpp @@ -19,7 +19,7 @@ Boston, MA 02110-1301, USA. */ -#include <tqlayout.h> +#include <layout.h> #include <tqlistbox.h> #include <tqpushbutton.h> @@ -91,19 +91,19 @@ ListWidget::ListWidget( InputField *parentField, const TQString &name, const TQS : TQWidget( parent ), mParentField( parentField ), mName( name ), mType( type ) { - TQGridLayout *tqlayout = new TQGridLayout( this, 4, 2, 11, 6 ); + TQGridLayout *layout = new TQGridLayout( this, 4, 2, 11, 6 ); mView = new TQListBox( this ); - tqlayout->addMultiCellWidget( mView, 0, 3, 0, 0 ); + layout->addMultiCellWidget( mView, 0, 3, 0, 0 ); mAddButton = new TQPushButton( i18n( "Add" ), this ); - tqlayout->addWidget( mAddButton, 0, 1 ); + layout->addWidget( mAddButton, 0, 1 ); mEditButton = new TQPushButton( i18n( "Edit..." ), this ); - tqlayout->addWidget( mEditButton, 1, 1 ); + layout->addWidget( mEditButton, 1, 1 ); mRemoveButton = new TQPushButton( i18n( "Remove" ), this ); - tqlayout->addWidget( mRemoveButton, 2, 1 ); + layout->addWidget( mRemoveButton, 2, 1 ); connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( add() ) ); connect( mEditButton, TQT_SIGNAL( clicked() ), TQT_SLOT( edit() ) ); diff --git a/kode/kwsdl/kung/pageinputfield.cpp b/kode/kwsdl/kung/pageinputfield.cpp index 6ca3409d7..261f58ab4 100644 --- a/kode/kwsdl/kung/pageinputfield.cpp +++ b/kode/kwsdl/kung/pageinputfield.cpp @@ -20,7 +20,7 @@ */ #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include "inputfieldfactory.h" @@ -88,18 +88,18 @@ TQString PageInputField::data() const TQWidget *PageInputField::createWidget( TQWidget *parent ) { TQWidget *mInputWidget = new TQWidget( parent, "PageInputWidget" ); - TQGridLayout *tqlayout = new TQGridLayout( mInputWidget, 2, 2, 11, 6 ); + TQGridLayout *layout = new TQGridLayout( mInputWidget, 2, 2, 11, 6 ); InputField::List::Iterator it; int row = 0; for ( it = mFields.begin(); it != mFields.end(); ++it, ++row ) { TQLabel *label = new TQLabel( (*it)->name(), mInputWidget ); - label->tqsetAlignment( TQt::AlignTop ); - tqlayout->addWidget( label, row, 0 ); - tqlayout->addWidget( (*it)->createWidget( mInputWidget ), row, 1 ); + label->setAlignment( TQt::AlignTop ); + layout->addWidget( label, row, 0 ); + layout->addWidget( (*it)->createWidget( mInputWidget ), row, 1 ); } - tqlayout->setRowStretch( ++row, 1 ); + layout->setRowStretch( ++row, 1 ); return mInputWidget; } diff --git a/kode/kxml_compiler/creator.cpp b/kode/kxml_compiler/creator.cpp index 3d4983f93..2460f3141 100644 --- a/kode/kxml_compiler/creator.cpp +++ b/kode/kxml_compiler/creator.cpp @@ -37,7 +37,7 @@ #include <kstandarddirs.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqdom.h> #include <tqregexp.h> #include <tqmap.h> @@ -659,7 +659,7 @@ void Creator::createFileWriter( Element *element, const TQString &dtd ) KODE::Class c = mFile.findClass( className ); c.addInclude( "kdebug.h" ); - c.addInclude( "tqtextstream.h" ); + c.addInclude( "textstream.h" ); c.addInclude( "tqfile.h" ); if ( !externalWriter() ) { diff --git a/kode/kxml_compiler/creator.h b/kode/kxml_compiler/creator.h index 2103f928e..b81c8fc13 100644 --- a/kode/kxml_compiler/creator.h +++ b/kode/kxml_compiler/creator.h @@ -39,7 +39,7 @@ #include <kstandarddirs.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqdom.h> #include <tqregexp.h> #include <tqmap.h> diff --git a/kode/kxml_compiler/kxml_compiler.cpp b/kode/kxml_compiler/kxml_compiler.cpp index 71720d6b9..a9add1ab4 100644 --- a/kode/kxml_compiler/kxml_compiler.cpp +++ b/kode/kxml_compiler/kxml_compiler.cpp @@ -37,7 +37,7 @@ #include <kstandarddirs.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqdom.h> #include <tqregexp.h> #include <tqmap.h> diff --git a/kode/kxml_compiler/parser.cpp b/kode/kxml_compiler/parser.cpp index 9a123581b..3777c4786 100644 --- a/kode/kxml_compiler/parser.cpp +++ b/kode/kxml_compiler/parser.cpp @@ -36,7 +36,7 @@ #include <kstandarddirs.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqdom.h> #include <tqregexp.h> #include <tqmap.h> diff --git a/kode/kxml_compiler/parser.h b/kode/kxml_compiler/parser.h index 6efd6f746..786b11236 100644 --- a/kode/kxml_compiler/parser.h +++ b/kode/kxml_compiler/parser.h @@ -36,7 +36,7 @@ #include <kstandarddirs.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqdom.h> #include <tqregexp.h> #include <tqmap.h> diff --git a/kode/printer.cpp b/kode/printer.cpp index f36b1c38f..786d447fd 100644 --- a/kode/printer.cpp +++ b/kode/printer.cpp @@ -25,7 +25,7 @@ #include <ksavefile.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> using namespace KODE; diff --git a/kode/style.cpp b/kode/style.cpp index e92c36919..3f6b5ecbc 100644 --- a/kode/style.cpp +++ b/kode/style.cpp @@ -24,7 +24,7 @@ #include <kdebug.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> using namespace KODE; diff --git a/konsolekalendar/konsolekalendar.cpp b/konsolekalendar/konsolekalendar.cpp index ca68b82ca..8cfd060cb 100644 --- a/konsolekalendar/konsolekalendar.cpp +++ b/konsolekalendar/konsolekalendar.cpp @@ -37,7 +37,7 @@ #include <tqdatetime.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include <kdebug.h> #include <klocale.h> @@ -84,7 +84,7 @@ bool KonsoleKalendar::createCalendar() if ( m_variables->isDryRun() ) { cout << i18n( "Create Calendar <Dry Run>: %1" ). - tqarg( m_variables->getCalendarFile() ).local8Bit().data() + arg( m_variables->getCalendarFile() ).local8Bit().data() << endl; } else { kdDebug() << "konsolekalendar.cpp::createCalendar() | " @@ -94,7 +94,7 @@ bool KonsoleKalendar::createCalendar() if ( m_variables->isVerbose() ) { cout << i18n( "Create Calendar <Verbose>: %1" ). - tqarg( m_variables->getCalendarFile() ).local8Bit().data() + arg( m_variables->getCalendarFile() ).local8Bit().data() << endl; } @@ -272,11 +272,11 @@ bool KonsoleKalendar::showInstance() } else { if ( firstdate == lastdate ) { title = i18n( "Events: %1" ) - .tqarg( firstdate.toString( Qt::TextDate ) ); + .arg( firstdate.toString( Qt::TextDate ) ); } else { title = i18n( "Events: %1 - %2" ) - .tqarg( firstdate.toString( Qt::TextDate ) ) - .tqarg( lastdate.toString( Qt::TextDate ) ); + .arg( firstdate.toString( Qt::TextDate ) ) + .arg( lastdate.toString( Qt::TextDate ) ); } htmlSettings.setEventView( true ); } @@ -435,15 +435,15 @@ bool KonsoleKalendar::isEvent( TQDateTime startdate, void KonsoleKalendar::printSpecs() { cout << i18n( " What: %1" ). - tqarg( m_variables->getSummary() ).local8Bit().data() + arg( m_variables->getSummary() ).local8Bit().data() << endl; cout << i18n( " Begin: %1" ). - tqarg( m_variables->getStartDateTime().toString( Qt::TextDate ) ).local8Bit().data() + arg( m_variables->getStartDateTime().toString( Qt::TextDate ) ).local8Bit().data() << endl; cout << i18n( " End: %1" ). - tqarg( m_variables->getEndDateTime().toString( Qt::TextDate ) ).local8Bit().data() + arg( m_variables->getEndDateTime().toString( Qt::TextDate ) ).local8Bit().data() << endl; if ( m_variables->getFloating() == true ) { @@ -452,10 +452,10 @@ void KonsoleKalendar::printSpecs() } cout << i18n( " Desc: %1" ). - tqarg( m_variables->getDescription() ).local8Bit().data() + arg( m_variables->getDescription() ).local8Bit().data() << endl; cout << i18n( " Location: %1" ). - tqarg( m_variables->getLocation() ).local8Bit().data() + arg( m_variables->getLocation() ).local8Bit().data() << endl; } diff --git a/konsolekalendar/konsolekalendaradd.cpp b/konsolekalendar/konsolekalendaradd.cpp index 8ef25f6db..36e23629c 100644 --- a/konsolekalendar/konsolekalendaradd.cpp +++ b/konsolekalendar/konsolekalendaradd.cpp @@ -91,14 +91,14 @@ bool KonsoleKalendarAdd::addEvent() if ( m_variables->getCalendar()->addEvent( event ) ) { cout << i18n( "Success: \"%1\" inserted" ). - tqarg( m_variables->getSummary() ).local8Bit().data() + arg( m_variables->getSummary() ).local8Bit().data() << endl; m_variables->getCalendar()->save(); } else { cout << i18n( "Failure: \"%1\" not inserted" ). - tqarg( m_variables->getSummary() ).local8Bit().data() + arg( m_variables->getSummary() ).local8Bit().data() << endl; status = false; } @@ -142,15 +142,15 @@ bool KonsoleKalendarAdd::addImportedCalendar() void KonsoleKalendarAdd::printSpecs() { cout << i18n( " What: %1" ). - tqarg( m_variables->getSummary() ).local8Bit().data() + arg( m_variables->getSummary() ).local8Bit().data() << endl; cout << i18n( " Begin: %1" ). - tqarg( m_variables->getStartDateTime().toString( Qt::TextDate ) ).local8Bit().data() + arg( m_variables->getStartDateTime().toString( Qt::TextDate ) ).local8Bit().data() << endl; cout << i18n( " End: %1" ). - tqarg( m_variables->getEndDateTime().toString( Qt::TextDate ) ).local8Bit().data() + arg( m_variables->getEndDateTime().toString( Qt::TextDate ) ).local8Bit().data() << endl; if ( m_variables->getFloating() == true ) { @@ -159,10 +159,10 @@ void KonsoleKalendarAdd::printSpecs() } cout << i18n( " Desc: %1" ). - tqarg( m_variables->getDescription() ).local8Bit().data() + arg( m_variables->getDescription() ).local8Bit().data() << endl; cout << i18n( " Location: %1" ). - tqarg( m_variables->getLocation() ).local8Bit().data() + arg( m_variables->getLocation() ).local8Bit().data() << endl; } diff --git a/konsolekalendar/konsolekalendarchange.cpp b/konsolekalendar/konsolekalendarchange.cpp index 5ba9d2769..338ed1e54 100644 --- a/konsolekalendar/konsolekalendarchange.cpp +++ b/konsolekalendar/konsolekalendarchange.cpp @@ -108,14 +108,14 @@ bool KonsoleKalendarChange::changeEvent() if ( m_variables->getCalendar()->addEvent( event ) ) { cout << i18n( "Success: \"%1\" changed" ) - .tqarg( event->summary() ).local8Bit().data() + .arg( event->summary() ).local8Bit().data() << endl; m_variables->getCalendar()->save(); status = true; } else { cout << i18n( "Failure: \"%1\" not changed" ) - .tqarg( event->summary() ).local8Bit().data() + .arg( event->summary() ).local8Bit().data() << endl; } } @@ -128,53 +128,53 @@ bool KonsoleKalendarChange::changeEvent() void KonsoleKalendarChange::printSpecs( Event *event ) { cout << i18n( " UID: %1" ). - tqarg( event->uid() ).local8Bit().data() + arg( event->uid() ).local8Bit().data() << endl; cout << i18n( " What: %1" ). - tqarg( event->summary() ).local8Bit().data() + arg( event->summary() ).local8Bit().data() << endl; cout << i18n( " Begin: %1" ). - tqarg( event->dtStart().toString( Qt::TextDate ) ).local8Bit().data() + arg( event->dtStart().toString( Qt::TextDate ) ).local8Bit().data() << endl; cout << i18n( " End: %1" ). - tqarg( event->dtEnd().toString( Qt::TextDate ) ).local8Bit().data() + arg( event->dtEnd().toString( Qt::TextDate ) ).local8Bit().data() << endl; cout << i18n( " Desc: %1" ). - tqarg( event->description() ).local8Bit().data() + arg( event->description() ).local8Bit().data() << endl; cout << i18n( " Location: %1" ). - tqarg( event->location() ).local8Bit().data() + arg( event->location() ).local8Bit().data() << endl; } void KonsoleKalendarChange::printSpecs() { cout << i18n( " UID: %1" ). - tqarg( m_variables->getUID() ).local8Bit().data() + arg( m_variables->getUID() ).local8Bit().data() << endl; cout << i18n( " What: %1" ). - tqarg( m_variables->getSummary() ).local8Bit().data() + arg( m_variables->getSummary() ).local8Bit().data() << endl; cout << i18n( " Begin: %1" ). - tqarg( m_variables->getStartDateTime().toString( Qt::TextDate ) ).local8Bit().data() + arg( m_variables->getStartDateTime().toString( Qt::TextDate ) ).local8Bit().data() << endl; cout << i18n( " End: %1" ). - tqarg( m_variables->getEndDateTime().toString( Qt::TextDate ) ).local8Bit().data() + arg( m_variables->getEndDateTime().toString( Qt::TextDate ) ).local8Bit().data() << endl; cout << i18n( " Desc: %1" ). - tqarg( m_variables->getDescription() ).local8Bit().data() + arg( m_variables->getDescription() ).local8Bit().data() << endl; cout << i18n( " Location: %1" ). - tqarg( m_variables->getLocation() ).local8Bit().data() + arg( m_variables->getLocation() ).local8Bit().data() << endl; } diff --git a/konsolekalendar/konsolekalendardelete.cpp b/konsolekalendar/konsolekalendardelete.cpp index 160e87e1a..65b8d4254 100644 --- a/konsolekalendar/konsolekalendardelete.cpp +++ b/konsolekalendar/konsolekalendardelete.cpp @@ -78,7 +78,7 @@ bool KonsoleKalendarDelete::deleteEvent() m_variables->getCalendar()->deleteEvent( event ); cout << i18n( "Success: \"%1\" deleted" ) - .tqarg( event->summary() ).local8Bit().data() + .arg( event->summary() ).local8Bit().data() << endl; m_variables->getCalendar()->save(); @@ -93,26 +93,26 @@ bool KonsoleKalendarDelete::deleteEvent() void KonsoleKalendarDelete::printSpecs( Event *event ) { cout << i18n( " UID: %1" ). - tqarg( m_variables->getUID() ).local8Bit().data() + arg( m_variables->getUID() ).local8Bit().data() << endl; cout << i18n( " What: %1" ). - tqarg( event->summary() ).local8Bit().data() + arg( event->summary() ).local8Bit().data() << endl; cout << i18n( " Begin: %1" ). - tqarg( event->dtStart().toString( Qt::TextDate ) ).local8Bit().data() + arg( event->dtStart().toString( Qt::TextDate ) ).local8Bit().data() << endl; cout << i18n( " End: %1" ). - tqarg( event->dtEnd().toString( Qt::TextDate ) ).local8Bit().data() + arg( event->dtEnd().toString( Qt::TextDate ) ).local8Bit().data() << endl; cout << i18n( " Desc: %1" ). - tqarg( event->description() ).local8Bit().data() + arg( event->description() ).local8Bit().data() << endl; cout << i18n( " Location: %1" ). - tqarg( event->location() ).local8Bit().data() + arg( event->location() ).local8Bit().data() << endl; } diff --git a/konsolekalendar/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/konsolekalendarexports.h b/konsolekalendar/konsolekalendarexports.h index 930426d48..84c67a3e9 100644 --- a/konsolekalendar/konsolekalendarexports.h +++ b/konsolekalendar/konsolekalendarexports.h @@ -28,7 +28,7 @@ #ifndef _KONSOLEKALENDAREXPORTS_H_ #define _KONSOLEKALENDAREXPORTS_H_ -#include <tqtextstream.h> +#include <textstream.h> #include "konsolekalendarvariables.h" diff --git a/konsolekalendar/main.cpp b/konsolekalendar/main.cpp index 0fc5bf72c..02aa5b6e2 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 @@ -241,22 +241,22 @@ int main( int argc, char *argv[] ) if ( args->isSet( "export-list" ) ) { cout << endl; cout << i18n( "%1 supports these export formats:" ). - tqarg( progDisplay ).local8Bit().data() + arg( progDisplay ).local8Bit().data() << endl; cout << i18n( " %1 [Default]" ). - tqarg( "Text" ).local8Bit().data() + arg( "Text" ).local8Bit().data() << endl; cout << i18n( " %1 (like %2, but more compact)" ). - tqarg( "Short", "Text" ).local8Bit().data() + arg( "Short", "Text" ).local8Bit().data() << endl; cout << i18n( " %1" ). - tqarg( "HTML" ).local8Bit().data() + arg( "HTML" ).local8Bit().data() << endl; cout << i18n( " %1 (like %2, but in a month view)" ). - tqarg( "HTMLmonth", "HTML" ).local8Bit().data() + arg( "HTMLmonth", "HTML" ).local8Bit().data() << endl; cout << i18n( " %1 (Comma-Separated Values)" ). - tqarg( "CSV" ).local8Bit().data() + arg( "CSV" ).local8Bit().data() << endl; cout << endl; return 0; @@ -315,7 +315,7 @@ int main( int argc, char *argv[] ) variables.setExportType( ExportTypeTextShort ); } else { cout << i18n( "Invalid Export Type Specified: %1" ). - tqarg( option ).local8Bit().data() + arg( option ).local8Bit().data() << endl; return 1; } @@ -475,7 +475,7 @@ int main( int argc, char *argv[] ) startdate = TQDate::fromString( option, Qt::ISODate ); if ( !startdate.isValid() ) { cout << i18n( "Invalid Start Date Specified: %1" ). - tqarg( option ).local8Bit().data() + arg( option ).local8Bit().data() << endl; return 1; } @@ -500,7 +500,7 @@ int main( int argc, char *argv[] ) starttime = TQTime::fromString( option, Qt::ISODate ); if ( !starttime.isValid() ) { cout << i18n( "Invalid Start Time Specified: %1" ). - tqarg( option ).local8Bit().data() + arg( option ).local8Bit().data() << endl; return 1; } @@ -530,7 +530,7 @@ int main( int argc, char *argv[] ) enddate = TQDate::fromString( option, Qt::ISODate ); if ( !enddate.isValid() ) { cout << i18n( "Invalid End Date Specified: %1" ). - tqarg( option ).local8Bit().data() + arg( option ).local8Bit().data() << endl; return 1; } @@ -554,7 +554,7 @@ int main( int argc, char *argv[] ) if ( !ok ) { cout << i18n( "Invalid Date Count Specified: %1" ). - tqarg( option ).local8Bit().data() + arg( option ).local8Bit().data() << endl; return 1; } @@ -582,7 +582,7 @@ int main( int argc, char *argv[] ) endtime = TQTime::fromString( option, Qt::ISODate ); if ( !endtime.isValid() ) { cout << i18n( "Invalid End Time Specified: %1" ). - tqarg( option ).local8Bit().data() + arg( option ).local8Bit().data() << endl; return 1; } @@ -682,12 +682,12 @@ int main( int argc, char *argv[] ) if ( remote ) { cout << i18n( "Attempting to create a remote file %1" ). - tqarg( variables.getCalendarFile() ).local8Bit().data() << endl; + arg( variables.getCalendarFile() ).local8Bit().data() << endl; return 1; } else { if ( exists ) { cout << i18n( "Calendar %1 already exists" ). - tqarg( variables.getCalendarFile() ).local8Bit().data() + arg( variables.getCalendarFile() ).local8Bit().data() << endl; return 1; } @@ -695,12 +695,12 @@ int main( int argc, char *argv[] ) if ( konsolekalendar->createCalendar() ) { cout << i18n( "Calendar %1 successfully created" ). - tqarg( variables.getCalendarFile() ).local8Bit().data() + arg( variables.getCalendarFile() ).local8Bit().data() << endl; return 0; } else { cout << i18n( "Unable to create calendar: %1" ). - tqarg( variables.getCalendarFile() ).local8Bit().data() + arg( variables.getCalendarFile() ).local8Bit().data() << endl; return 1; } @@ -708,7 +708,7 @@ int main( int argc, char *argv[] ) if ( !exists ) { cout << i18n( "Calendar file not found %1" ). - tqarg( variables.getCalendarFile() ).local8Bit().data() + arg( variables.getCalendarFile() ).local8Bit().data() << endl; cout << i18n( "Try --create to create new calendar file" ).local8Bit().data() << endl; @@ -894,17 +894,17 @@ int main( int argc, char *argv[] ) */ TQString prodId = "-//K Desktop Environment//NONSGML %1 %2//EN"; CalFormat::setApplication( progDisplay, - prodId.tqarg( progDisplay ).tqarg( progVersion ) ); + prodId.arg( progDisplay ).arg( progVersion ) ); if ( importFile ) { if ( konsolekalendar->importCalendar() ) { cout << i18n( "Calendar %1 successfully imported" ). - tqarg( variables.getImportFile() ).local8Bit().data() + arg( variables.getImportFile() ).local8Bit().data() << endl; return 0; } else { cout << i18n( "Unable to import calendar: %1" ). - tqarg( variables.getImportFile() ).local8Bit().data() + arg( variables.getImportFile() ).local8Bit().data() << endl; return 1; } @@ -971,7 +971,7 @@ int main( int argc, char *argv[] ) << endl; if ( !konsolekalendar->showInstance() ) { cout << i18n( "Cannot open specified export file: %1" ). - tqarg( variables.getExportFile() ).local8Bit().data() + arg( variables.getExportFile() ).local8Bit().data() << endl; return 1; } diff --git a/kontact/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..92e0f624d 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 ); } @@ -86,10 +86,10 @@ KParts::ReadOnlyPart *Core::createPart( const char *libname ) d->lastErrorMessage = KLibLoader::self()->lastErrorMessage(); break; case KParts::ComponentFactory::ErrNoFactory: - d->lastErrorMessage = i18n( "Program error: the library %1 does not provide a factory." ).tqarg( libname ); + d->lastErrorMessage = i18n( "Program error: the library %1 does not provide a factory." ).arg( libname ); break; case KParts::ComponentFactory::ErrNoComponent: - d->lastErrorMessage = i18n( "Program error: the library %1 does not support creating components of the specified type" ).tqarg( libname ); + d->lastErrorMessage = i18n( "Program error: the library %1 does not support creating components of the specified type" ).arg( libname ); break; } kdWarning(5601) << d->lastErrorMessage << endl; @@ -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..6192dd4c4 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; } @@ -109,8 +109,8 @@ void Summary::dragEnterEvent( TQDragEnterEvent *event ) void Summary::dropEvent( TQDropEvent *event ) { - int tqalignment = (event->pos().y() < (height() / 2) ? TQt::AlignTop : TQt::AlignBottom); - emit summaryWidgetDropped( this, event->source(), tqalignment ); + int alignment = (event->pos().y() < (height() / 2) ? TQt::AlignTop : TQt::AlignBottom); + emit summaryWidgetDropped( this, event->source(), alignment ); } #include "summary.moc" diff --git a/kontact/interfaces/summary.h b/kontact/interfaces/summary.h index f50507ce7..f490f517e 100644 --- a/kontact/interfaces/summary.h +++ b/kontact/interfaces/summary.h @@ -74,7 +74,7 @@ class KDE_EXPORT Summary : public TQWidget signals: void message( const TQString &message ); - void summaryWidgetDropped( TQWidget *target, TQWidget *widget, int tqalignment ); + void summaryWidgetDropped( TQWidget *target, TQWidget *widget, int alignment ); protected: virtual void mousePressEvent( TQMouseEvent* ); diff --git a/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp b/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp index 34bec493e..88a975b70 100644 --- a/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp +++ b/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp @@ -171,7 +171,7 @@ void KAddressbookPlugin::processDropEvent( TQDropEvent *event ) } KMessageBox::sorry( core(), i18n( "Cannot handle drop events of type '%1'." ) - .tqarg( event->format() ) ); + .arg( event->format() ) ); } diff --git a/kontact/plugins/kmail/kcmkmailsummary.cpp b/kontact/plugins/kmail/kcmkmailsummary.cpp index 16146f2c7..14202cabe 100644 --- a/kontact/plugins/kmail/kcmkmailsummary.cpp +++ b/kontact/plugins/kmail/kcmkmailsummary.cpp @@ -22,7 +22,7 @@ */ #include <tqcheckbox.h> -#include <tqlayout.h> +#include <layout.h> #include <dcopref.h> @@ -75,7 +75,7 @@ void KCMKMailSummary::modified() void KCMKMailSummary::initGUI() { - TQVBoxLayout *tqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); + TQVBoxLayout *layout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); mFolderView = new KListView( this ); mFolderView->setRootIsDecorated( true ); @@ -85,8 +85,8 @@ void KCMKMailSummary::initGUI() mFullPath = new TQCheckBox( i18n( "Show full path for folders" ), this ); - tqlayout->addWidget( mFolderView ); - tqlayout->addWidget( mFullPath ); + layout->addWidget( mFolderView ); + layout->addWidget( mFullPath ); } void KCMKMailSummary::initFolders() 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..42625f705 100644 --- a/kontact/plugins/kmail/summarywidget.cpp +++ b/kontact/plugins/kmail/summarywidget.cpp @@ -23,7 +23,7 @@ */ #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <dcopref.h> #include <kapplication.h> @@ -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& ) ) ); @@ -142,8 +142,8 @@ void SummaryWidget::updateFolderList( const TQStringList& folders ) TQLabel *label = new TQLabel( TQString( i18n("%1: number of unread messages " "%2: total number of messages", "%1 / %2") ) - .tqarg( numUnreadMsg ).tqarg( numMsg ), this ); - label->tqsetAlignment( AlignLeft ); + .arg( numUnreadMsg ).arg( numMsg ), this ); + 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 ); @@ -166,7 +166,7 @@ bool SummaryWidget::eventFilter( TQObject *obj, TQEvent* e ) if ( obj->inherits( "KURLLabel" ) ) { KURLLabel* label = static_cast<KURLLabel*>( TQT_TQWIDGET(obj) ); if ( e->type() == TQEvent::Enter ) - emit message( i18n( "Open Folder: \"%1\"" ).tqarg( label->text() ) ); + emit message( i18n( "Open Folder: \"%1\"" ).arg( label->text() ) ); if ( e->type() == TQEvent::Leave ) emit message( TQString() ); } diff --git a/kontact/plugins/knotes/knotes_part.cpp b/kontact/plugins/knotes/knotes_part.cpp index 769c1acf5..a723ef31d 100644 --- a/kontact/plugins/knotes/knotes_part.cpp +++ b/kontact/plugins/knotes/knotes_part.cpp @@ -20,7 +20,7 @@ */ #include <tqpopupmenu.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <kapplication.h> #include <kdebug.h> @@ -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 ); @@ -201,7 +201,7 @@ TQString KNotesPart::newNote( const TQString& name, const TQString& text ) TQString KNotesPart::newNoteFromClipboard( const TQString& name ) { - const TQString& text = KApplication::tqclipboard()->text(); + const TQString& text = KApplication::clipboard()->text(); return newNote( name, text ); } diff --git a/kontact/plugins/knotes/knotes_part_p.h b/kontact/plugins/knotes/knotes_part_p.h index 274d140e1..7ae154859 100644 --- a/kontact/plugins/knotes/knotes_part_p.h +++ b/kontact/plugins/knotes/knotes_part_p.h @@ -32,7 +32,7 @@ #ifndef KNOTES_PART_P_H #define KNOTES_PART_P_H -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <kactioncollection.h> @@ -130,9 +130,9 @@ class KNoteEditDlg : public KDialogBase, virtual public KXMLGUIClient actionCollection()->setWidget( this ); TQWidget *page = plainPage(); - TQVBoxLayout *tqlayout = new TQVBoxLayout( page ); + TQVBoxLayout *layout = new TQVBoxLayout( page ); - TQHBoxLayout *hbl = new TQHBoxLayout( tqlayout, marginHint() ); + TQHBoxLayout *hbl = new TQHBoxLayout( layout, marginHint() ); TQLabel *label = new TQLabel( page); label->setText( i18n( "Name:" ) ); hbl->addWidget( label,0 ); @@ -149,8 +149,8 @@ class KNoteEditDlg : public KDialogBase, virtual public KXMLGUIClient mTool = static_cast<KToolBar *>(factory.container( "note_tool", this )); - tqlayout->addWidget( mTool ); - tqlayout->addWidget( mNoteEdit ); + layout->addWidget( mTool ); + layout->addWidget( mNoteEdit ); } TQString text() const diff --git a/kontact/plugins/knotes/knotetip.cpp b/kontact/plugins/knotes/knotetip.cpp index 79a45d21e..17638d0cb 100644 --- a/kontact/plugins/knotes/knotetip.cpp +++ b/kontact/plugins/knotes/knotetip.cpp @@ -30,8 +30,8 @@ */ #include <tqtooltip.h> -#include <tqlayout.h> -#include <tqtextedit.h> +#include <layout.h> +#include <textedit.h> #include <kapplication.h> #include <kglobalsettings.h> @@ -52,8 +52,8 @@ KNoteTip::KNoteTip( KIconView *parent ) mPreview->setHScrollBarMode( TQScrollView::AlwaysOff ); mPreview->setVScrollBarMode( TQScrollView::AlwaysOff ); - TQBoxLayout *tqlayout = new TQVBoxLayout( this ); - tqlayout->addWidget( mPreview ); + TQBoxLayout *layout = new TQVBoxLayout( this ); + layout->addWidget( mPreview ); setPalette( TQToolTip::palette() ); setMargin( 1 ); diff --git a/kontact/plugins/knotes/summarywidget.cpp b/kontact/plugins/knotes/summarywidget.cpp index 2bd0456ca..0fbd7d9a9 100644 --- a/kontact/plugins/knotes/summarywidget.cpp +++ b/kontact/plugins/knotes/summarywidget.cpp @@ -23,7 +23,7 @@ #include <tqobject.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtooltip.h> #include <dcopclient.h> @@ -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->alignment() | 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 ); } @@ -140,7 +140,7 @@ bool KNotesSummaryWidget::eventFilter( TQObject *obj, TQEvent* e ) if ( obj->inherits( "KURLLabel" ) ) { KURLLabel* label = static_cast<KURLLabel*>( TQT_TQWIDGET(obj) ); if ( e->type() == TQEvent::Enter ) - emit message( i18n( "Read Note: \"%1\"" ).tqarg( label->text() ) ); + emit message( i18n( "Read Note: \"%1\"" ).arg( label->text() ) ); if ( e->type() == TQEvent::Leave ) emit message( TQString() ); } diff --git a/kontact/plugins/korganizer/kcmkorgsummary.cpp b/kontact/plugins/korganizer/kcmkorgsummary.cpp index 4466c5c6d..115de0e9a 100644 --- a/kontact/plugins/korganizer/kcmkorgsummary.cpp +++ b/kontact/plugins/korganizer/kcmkorgsummary.cpp @@ -23,7 +23,7 @@ #include <tqbuttongroup.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqradiobutton.h> #include <tqspinbox.h> @@ -90,10 +90,10 @@ void KCMKOrgSummary::customDaysChanged( int value ) void KCMKOrgSummary::initGUI() { - TQVBoxLayout *tqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); + TQVBoxLayout *layout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); mCalendarGroup = new TQButtonGroup( 0, Qt::Vertical, i18n( "Appointments" ), this ); - TQVBoxLayout *boxLayout = new TQVBoxLayout( mCalendarGroup->tqlayout(), + TQVBoxLayout *boxLayout = new TQVBoxLayout( mCalendarGroup->layout(), KDialog::spacingHint() ); TQLabel *label = new TQLabel( i18n( "How many days should the calendar show at once?" ), mCalendarGroup ); @@ -122,15 +122,15 @@ void KCMKOrgSummary::initGUI() hbox->addStretch( 1 ); - tqlayout->addWidget( mCalendarGroup ); + layout->addWidget( mCalendarGroup ); mTodoGroup = new TQButtonGroup( 2, Qt::Horizontal, i18n( "To-dos" ), this ); new TQRadioButton( i18n( "Show all to-dos" ), mTodoGroup ); new TQRadioButton( i18n( "Show today's to-dos only" ), mTodoGroup ); - tqlayout->addWidget( mTodoGroup ); + layout->addWidget( mTodoGroup ); - tqlayout->addStretch(); + layout->addStretch(); } void KCMKOrgSummary::load() diff --git a/kontact/plugins/korganizer/korganizerplugin.cpp b/kontact/plugins/korganizer/korganizerplugin.cpp index 7c2140b36..2262dcef3 100644 --- a/kontact/plugins/korganizer/korganizerplugin.cpp +++ b/kontact/plugins/korganizer/korganizerplugin.cpp @@ -195,7 +195,7 @@ void KOrganizerPlugin::processDropEvent( TQDropEvent *event ) KCal::Incidence *i = incidences.first(); TQString summary; if ( dynamic_cast<KCal::Journal*>( i ) ) - summary = i18n( "Note: %1" ).tqarg( i->summary() ); + summary = i18n( "Note: %1" ).arg( i->summary() ); else summary = i->summary(); interface()->openEventEditor( summary, i->description(), TQString() ); @@ -219,22 +219,22 @@ void KOrganizerPlugin::processDropEvent( TQDropEvent *event ) i18n("Drops of multiple mails are not supported." ) ); } else { KPIM::MailSummary mail = mails.first(); - TQString txt = i18n("From: %1\nTo: %2\nSubject: %3").tqarg( mail.from() ) - .tqarg( mail.to() ).tqarg( mail.subject() ); + TQString txt = i18n("From: %1\nTo: %2\nSubject: %3").arg( mail.from() ) + .arg( mail.to() ).arg( mail.subject() ); KTempFile tf; tf.setAutoDelete( true ); - TQString uri = TQString::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, + interface()->openEventEditor( i18n("Mail: %1").arg( mail.subject() ), txt, uri, tf.name(), TQStringList(), "message/rfc822" ); } return; } KMessageBox::sorry( core(), i18n("Cannot handle drop events of type '%1'.") - .tqarg( event->format() ) ); + .arg( event->format() ) ); } bool KOrganizerPlugin::queryClose() const { diff --git a/kontact/plugins/korganizer/summarywidget.cpp b/kontact/plugins/korganizer/summarywidget.cpp index 7c3a1bed9..8803f05f9 100644 --- a/kontact/plugins/korganizer/summarywidget.cpp +++ b/kontact/plugins/korganizer/summarywidget.cpp @@ -23,7 +23,7 @@ #include <tqcursor.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtooltip.h> #include <kdialog.h> @@ -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 ); @@ -191,14 +191,14 @@ void SummaryWidget::updateView() // Fill Event Summary Field TQString newtext = ev->summary(); if ( ev->isMultiDay() && !ev->doesFloat() ) { - newtext.append( TQString(" (%1/%2)").tqarg( dayof ).tqarg( span ) ); + newtext.append( TQString(" (%1/%2)").arg( dayof ).arg( span ) ); } KURLLabel *urlLabel = new KURLLabel( this ); urlLabel->setText( newtext ); urlLabel->setURL( ev->uid() ); urlLabel->installEventFilter( this ); - urlLabel->tqsetAlignment( urlLabel->tqalignment() | TQt::WordBreak ); + urlLabel->setAlignment( urlLabel->alignment() | TQt::WordBreak ); mLayout->addWidget( urlLabel, counter, 2 ); mLabels.append( urlLabel ); @@ -225,10 +225,10 @@ void SummaryWidget::updateView() } } datestr = i18n( "Time from - to", "%1 - %2" ) - .tqarg( KGlobal::locale()->formatTime( sST ) ) - .tqarg( KGlobal::locale()->formatTime( sET ) ); + .arg( KGlobal::locale()->formatTime( sST ) ) + .arg( KGlobal::locale()->formatTime( sET ) ); label = new TQLabel( datestr, this ); - label->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 ); } @@ -288,7 +288,7 @@ bool SummaryWidget::eventFilter( TQObject *obj, TQEvent* e ) if ( obj->inherits( "KURLLabel" ) ) { KURLLabel* label = static_cast<KURLLabel*>( TQT_TQWIDGET(obj) ); if ( e->type() == TQEvent::Enter ) - emit message( i18n( "Edit Appointment: \"%1\"" ).tqarg( label->text() ) ); + emit message( i18n( "Edit Appointment: \"%1\"" ).arg( label->text() ) ); if ( e->type() == TQEvent::Leave ) emit message( TQString() ); } diff --git a/kontact/plugins/korganizer/todoplugin.cpp b/kontact/plugins/korganizer/todoplugin.cpp index caaaaf91d..e3ff2ba8f 100644 --- a/kontact/plugins/korganizer/todoplugin.cpp +++ b/kontact/plugins/korganizer/todoplugin.cpp @@ -187,7 +187,7 @@ void TodoPlugin::processDropEvent( TQDropEvent *event ) KCal::Incidence *i = incidences.first(); TQString summary; if ( dynamic_cast<KCal::Journal*>( i ) ) - summary = i18n( "Note: %1" ).tqarg( i->summary() ); + summary = i18n( "Note: %1" ).arg( i->summary() ); else summary = i->summary(); interface()->openTodoEditor( summary, i->description(), TQString() ); @@ -210,23 +210,23 @@ void TodoPlugin::processDropEvent( TQDropEvent *event ) i18n("Drops of multiple mails are not supported." ) ); } else { KPIM::MailSummary mail = mails.first(); - TQString txt = i18n("From: %1\nTo: %2\nSubject: %3").tqarg( mail.from() ) - .tqarg( mail.to() ).tqarg( mail.subject() ); + TQString txt = i18n("From: %1\nTo: %2\nSubject: %3").arg( mail.from() ) + .arg( mail.to() ).arg( mail.subject() ); KTempFile tf; tf.setAutoDelete( true ); 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() ), + interface()->openTodoEditor( i18n("Mail: %1").arg( mail.subject() ), txt, uri, tf.name(), TQStringList(), "message/rfc822", false ); } return; } KMessageBox::sorry( core(), i18n("Cannot handle drop events of type '%1'.") - .tqarg( event->format() ) ); + .arg( event->format() ) ); } #include "todoplugin.moc" diff --git a/kontact/plugins/korganizer/todosummarywidget.cpp b/kontact/plugins/korganizer/todosummarywidget.cpp index 0849dde74..b16b638c9 100644 --- a/kontact/plugins/korganizer/todosummarywidget.cpp +++ b/kontact/plugins/korganizer/todosummarywidget.cpp @@ -23,7 +23,7 @@ #include <tqcursor.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtooltip.h> #include <kdialog.h> @@ -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; @@ -253,7 +253,7 @@ bool TodoSummaryWidget::eventFilter( TQObject *obj, TQEvent* e ) if ( obj->inherits( "KURLLabel" ) ) { KURLLabel* label = static_cast<KURLLabel*>( TQT_TQWIDGET(obj) ); if ( e->type() == TQEvent::Enter ) - emit message( i18n( "Edit To-do: \"%1\"" ).tqarg( label->text() ) ); + emit message( i18n( "Edit To-do: \"%1\"" ).arg( label->text() ) ); if ( e->type() == TQEvent::Leave ) emit message( TQString() ); } diff --git a/kontact/plugins/kpilot/summarywidget.cpp b/kontact/plugins/kpilot/summarywidget.cpp index 46ec7fdfe..51539f598 100644 --- a/kontact/plugins/kpilot/summarywidget.cpp +++ b/kontact/plugins/kpilot/summarywidget.cpp @@ -24,11 +24,11 @@ #include <tqimage.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtooltip.h> #include <tqfile.h> #include <tqlabel.h> -#include <tqtextedit.h> +#include <textedit.h> #include <tqvbox.h> #include <dcopclient.h> @@ -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->alignment() | 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?)" ) ); @@ -202,7 +202,7 @@ void SummaryWidget::showSyncLog( const TQString &filename ) TQFile f(filename); if ( !f.open( IO_ReadOnly ) ) { - KMessageBox::error( this, i18n( "Unable to open Hotsync log %1." ).tqarg( filename ) ); + KMessageBox::error( this, i18n( "Unable to open Hotsync log %1." ).arg( filename ) ); return; } diff --git a/kontact/plugins/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/kcmkontactknt.cpp b/kontact/plugins/newsticker/kcmkontactknt.cpp index fe2a20c63..4f0bbd38d 100644 --- a/kontact/plugins/newsticker/kcmkontactknt.cpp +++ b/kontact/plugins/newsticker/kcmkontactknt.cpp @@ -23,7 +23,7 @@ #include <tqgroupbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlineedit.h> #include <tqvaluevector.h> #include <tqspinbox.h> @@ -60,22 +60,22 @@ NewsEditDialog::NewsEditDialog( const TQString& title, const TQString& url, TQWi Ok, parent, 0, true, true ) { TQWidget *page = plainPage(); - TQGridLayout *tqlayout = new TQGridLayout( page, 2, 3, marginHint(), + TQGridLayout *layout = new TQGridLayout( page, 2, 3, marginHint(), spacingHint() ); TQLabel *label = new TQLabel( i18n( "Name:" ), page ); - tqlayout->addWidget( label, 0, 0 ); + layout->addWidget( label, 0, 0 ); mTitle = new TQLineEdit( page ); label->setBuddy( mTitle ); - tqlayout->addMultiCellWidget( mTitle, 0, 0, 1, 2 ); + layout->addMultiCellWidget( mTitle, 0, 0, 1, 2 ); label = new TQLabel( i18n( "URL:" ), page ); - tqlayout->addWidget( label, 1, 0 ); + layout->addWidget( label, 1, 0 ); mURL = new TQLineEdit( page ); label->setBuddy( mURL ); - tqlayout->addMultiCellWidget( mURL, 1, 1, 1, 2 ); + layout->addMultiCellWidget( mURL, 1, 1, 1, 2 ); mTitle->setText( title ); mURL->setText( url ); @@ -331,16 +331,16 @@ void KCMKontactKNT::modified() void KCMKontactKNT::initGUI() { - TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3, KDialog::marginHint(), + TQGridLayout *layout = new TQGridLayout( this, 2, 3, KDialog::marginHint(), KDialog::spacingHint() ); mAllNews = new KListView( this ); mAllNews->addColumn( i18n( "All" ) ); mAllNews->setRootIsDecorated( true ); mAllNews->setFullWidth( true ); - tqlayout->addWidget( mAllNews, 0, 0 ); + layout->addWidget( mAllNews, 0, 0 ); - TQVBoxLayout *vbox = new TQVBoxLayout( tqlayout, KDialog::spacingHint() ); + TQVBoxLayout *vbox = new TQVBoxLayout( layout, KDialog::spacingHint() ); vbox->addStretch(); mAddButton = new KPushButton( i18n( "Add" ), this ); @@ -354,12 +354,12 @@ void KCMKontactKNT::initGUI() mSelectedNews = new KListView( this ); mSelectedNews->addColumn( i18n( "Selected" ) ); mSelectedNews->setFullWidth( true ); - tqlayout->addWidget( mSelectedNews, 0, 2 ); + layout->addWidget( mSelectedNews, 0, 2 ); TQGroupBox *box = new TQGroupBox( 0, Qt::Vertical, i18n( "News Feed Settings" ), this ); - TQGridLayout *boxLayout = new TQGridLayout( box->tqlayout(), 2, 3, + TQGridLayout *boxLayout = new TQGridLayout( box->layout(), 2, 3, KDialog::spacingHint() ); TQLabel *label = new TQLabel( i18n( "Refresh time:" ), box ); @@ -384,7 +384,7 @@ void KCMKontactKNT::initGUI() mDeleteButton->setEnabled( false ); boxLayout->addWidget( mDeleteButton, 1, 2 ); - tqlayout->addMultiCellWidget( box, 1, 1, 0, 2 ); + layout->addMultiCellWidget( box, 1, 1, 0, 2 ); } bool KCMKontactKNT::dcopActive() const 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..40eddd2f5 100644 --- a/kontact/plugins/newsticker/summarywidget.cpp +++ b/kontact/plugins/newsticker/summarywidget.cpp @@ -21,10 +21,10 @@ without including the source code for TQt in the source distribution. */ -#include <tqclipboard.h> +#include <clipboard.h> #include <tqeventloop.h> #include <tqhbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpixmap.h> #include <tqpopupmenu.h> #include <tqcursor.h> @@ -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 @@ -300,7 +300,7 @@ void SummaryWidget::rmbMenu( const TQString& url ) menu.insertItem( i18n( "Copy URL to Clipboard" ) ); int id = menu.exec( TQCursor::pos() ); if ( id != -1 ) - kapp->tqclipboard()->setText( url, TQClipboard::Clipboard ); + kapp->clipboard()->setText( url, TQClipboard::Clipboard ); } bool SummaryWidget::eventFilter( TQObject *obj, TQEvent* e ) diff --git a/kontact/plugins/specialdates/kcmsdsummary.cpp b/kontact/plugins/specialdates/kcmsdsummary.cpp index a59406590..eb954ccf2 100644 --- a/kontact/plugins/specialdates/kcmsdsummary.cpp +++ b/kontact/plugins/specialdates/kcmsdsummary.cpp @@ -25,7 +25,7 @@ #include <tqbuttongroup.h> #include <tqcheckbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqradiobutton.h> #include <tqspinbox.h> @@ -85,10 +85,10 @@ void KCMSDSummary::customDaysChanged( int value ) void KCMSDSummary::initGUI() { - TQGridLayout *tqlayout = new TQGridLayout( this, 3, 2, KDialog::spacingHint() ); + TQGridLayout *layout = new TQGridLayout( this, 3, 2, KDialog::spacingHint() ); mDaysGroup = new TQButtonGroup( 0, Qt::Vertical, i18n( "Special Dates Summary" ), this ); - TQVBoxLayout *boxLayout = new TQVBoxLayout( mDaysGroup->tqlayout(), + TQVBoxLayout *boxLayout = new TQVBoxLayout( mDaysGroup->layout(), KDialog::spacingHint() ); TQLabel *label = new TQLabel( i18n( "How many days should the special dates summary show at once?" ), mDaysGroup ); @@ -117,7 +117,7 @@ void KCMSDSummary::initGUI() hbox->addStretch( 1 ); - tqlayout->addMultiCellWidget( mDaysGroup, 0, 0, 0, 1 ); + layout->addMultiCellWidget( mDaysGroup, 0, 0, 0, 1 ); mCalendarGroup = new TQButtonGroup( 1, Qt::Horizontal, i18n( "Special Dates From Calendar" ), this ); @@ -132,10 +132,10 @@ void KCMSDSummary::initGUI() mShowBirthdaysFromKAB = new TQCheckBox( i18n( "Show birthdays" ), mContactGroup ); mShowAnniversariesFromKAB = new TQCheckBox( i18n( "Show anniversaries" ), mContactGroup ); - tqlayout->addWidget( mCalendarGroup, 1, 0 ); - tqlayout->addWidget( mContactGroup, 1, 1 ); + layout->addWidget( mCalendarGroup, 1, 0 ); + layout->addWidget( mContactGroup, 1, 1 ); - tqlayout->setRowStretch( 2, 1 ); + layout->setRowStretch( 2, 1 ); } void KCMSDSummary::load() diff --git a/kontact/plugins/specialdates/sdsummarywidget.cpp b/kontact/plugins/specialdates/sdsummarywidget.cpp index 3fbac9d2e..733ef1ac4 100644 --- a/kontact/plugins/specialdates/sdsummarywidget.cpp +++ b/kontact/plugins/specialdates/sdsummarywidget.cpp @@ -24,7 +24,7 @@ #include <tqcursor.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqimage.h> #include <tqtooltip.h> @@ -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 ); } @@ -595,7 +595,7 @@ bool SDSummaryWidget::eventFilter( TQObject *obj, TQEvent* e ) if ( obj->inherits( "KURLLabel" ) ) { KURLLabel* label = static_cast<KURLLabel*>( TQT_TQWIDGET(obj) ); if ( e->type() == TQEvent::Enter ) - emit message( i18n( "Mail to:\"%1\"" ).tqarg( label->text() ) ); + emit message( i18n( "Mail to:\"%1\"" ).arg( label->text() ) ); if ( e->type() == TQEvent::Leave ) emit message( TQString() ); } @@ -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/dropwidget.cpp b/kontact/plugins/summary/dropwidget.cpp index 63c1d3ceb..4b5373b34 100644 --- a/kontact/plugins/summary/dropwidget.cpp +++ b/kontact/plugins/summary/dropwidget.cpp @@ -36,9 +36,9 @@ void DropWidget::dragEnterEvent( TQDragEnterEvent *event ) void DropWidget::dropEvent( TQDropEvent *event ) { - int tqalignment = ( event->pos().x() < (width() / 2) ? TQt::AlignLeft : TQt::AlignRight ); - tqalignment |= ( event->pos().y() < (height() / 2) ? TQt::AlignTop : TQt::AlignBottom ); - emit summaryWidgetDropped( this, event->source(), tqalignment ); + int alignment = ( event->pos().x() < (width() / 2) ? TQt::AlignLeft : TQt::AlignRight ); + alignment |= ( event->pos().y() < (height() / 2) ? TQt::AlignTop : TQt::AlignBottom ); + emit summaryWidgetDropped( this, event->source(), alignment ); } #include "dropwidget.moc" diff --git a/kontact/plugins/summary/dropwidget.h b/kontact/plugins/summary/dropwidget.h index e2d11c9ee..c4fe2c8b2 100644 --- a/kontact/plugins/summary/dropwidget.h +++ b/kontact/plugins/summary/dropwidget.h @@ -33,7 +33,7 @@ class DropWidget : public TQWidget DropWidget( TQWidget *parent, const char *name = 0 ); signals: - void summaryWidgetDropped( TQWidget *target, TQWidget *widget, int tqalignment ); + void summaryWidgetDropped( TQWidget *target, TQWidget *widget, int alignment ); protected: virtual void dragEnterEvent( TQDragEnterEvent* ); diff --git a/kontact/plugins/summary/kcmkontactsummary.cpp b/kontact/plugins/summary/kcmkontactsummary.cpp index 47c9bca64..d96095699 100644 --- a/kontact/plugins/summary/kcmkontactsummary.cpp +++ b/kontact/plugins/summary/kcmkontactsummary.cpp @@ -33,7 +33,7 @@ #include <kplugininfo.h> #include <ktrader.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqpixmap.h> @@ -93,15 +93,15 @@ PluginView::~PluginView() KCMKontactSummary::KCMKontactSummary( TQWidget *parent, const char *name ) : KCModule( parent, name ) { - TQVBoxLayout *tqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); + TQVBoxLayout *layout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); TQLabel *label = new TQLabel( i18n( "Here you can select which summary plugins to have visible in your summary view." ), this ); - tqlayout->addWidget( label ); + layout->addWidget( label ); mPluginView = new PluginView( this ); - tqlayout->addWidget( mPluginView ); + layout->addWidget( mPluginView ); - tqlayout->setStretchFactor( mPluginView, 1 ); + layout->setStretchFactor( mPluginView, 1 ); connect( mPluginView, TQT_SIGNAL( clicked( TQListViewItem* ) ), this, TQT_SLOT( itemClicked( TQListViewItem* ) ) ); @@ -119,8 +119,8 @@ KCMKontactSummary::KCMKontactSummary( TQWidget *parent, const char *name ) void KCMKontactSummary::load() { KTrader::OfferList offers = KTrader::self()->query( - TQString::tqfromLatin1( "Kontact/Plugin" ), - TQString( "[X-KDE-KontactPluginVersion] == %1" ).tqarg( KONTACT_PLUGIN_VERSION ) ); + TQString::fromLatin1( "Kontact/Plugin" ), + TQString( "[X-KDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) ); TQStringList activeSummaries; diff --git a/kontact/plugins/summary/summaryview_part.cpp b/kontact/plugins/summary/summaryview_part.cpp index d65228cd1..93f48d667 100644 --- a/kontact/plugins/summary/summaryview_part.cpp +++ b/kontact/plugins/summary/summaryview_part.cpp @@ -23,7 +23,7 @@ #include <tqframe.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtimer.h> #include <dcopclient.h> @@ -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& ) ) ); @@ -136,8 +136,8 @@ void SummaryViewPart::updateWidgets() KPIM::IdentityManager idm( true, this ); const KPIM::Identity &id = idm.defaultIdentity(); - TQString currentUser = i18n( "Summary for %1" ).tqarg( id.fullName() ); - mUsernameLabel->setText( TQString::tqfromLatin1( "<b>%1</b>" ).tqarg( currentUser ) ); + TQString currentUser = i18n( "Summary for %1" ).arg( id.fullName() ); + mUsernameLabel->setText( TQString::fromLatin1( "<b>%1</b>" ).arg( currentUser ) ); mSummaries.clear(); @@ -214,11 +214,11 @@ void SummaryViewPart::updateWidgets() TQFrame *vline = new TQFrame( mFrame ); vline->setFrameStyle( TQFrame::VLine | TQFrame::Plain ); - TQHBoxLayout *tqlayout = new TQHBoxLayout( mFrame ); + TQHBoxLayout *layout = new TQHBoxLayout( mFrame ); - mLeftColumn = new TQVBoxLayout( tqlayout, KDialog::spacingHint() ); - tqlayout->addWidget( vline ); - mRightColumn = new TQVBoxLayout( tqlayout, KDialog::spacingHint() ); + mLeftColumn = new TQVBoxLayout( layout, KDialog::spacingHint() ); + layout->addWidget( vline ); + mRightColumn = new TQVBoxLayout( layout, KDialog::spacingHint() ); TQStringList::Iterator strIt; @@ -241,7 +241,7 @@ void SummaryViewPart::updateWidgets() mRightColumn->addStretch(); } -void SummaryViewPart::summaryWidgetMoved( TQWidget *target, TQWidget *widget, int tqalignment ) +void SummaryViewPart::summaryWidgetMoved( TQWidget *target, TQWidget *widget, int alignment ) { if ( target == widget ) return; @@ -266,17 +266,17 @@ void SummaryViewPart::summaryWidgetMoved( TQWidget *target, TQWidget *widget, in if ( target == mFrame ) { int pos = 0; - if ( tqalignment & TQt::AlignTop ) + if ( alignment & TQt::AlignTop ) pos = 0; - if ( tqalignment & TQt::AlignLeft ) { - if ( tqalignment & TQt::AlignBottom ) + if ( alignment & TQt::AlignLeft ) { + if ( alignment & TQt::AlignBottom ) pos = mLeftColumnSummaries.count(); mLeftColumn->insertWidget( pos, widget ); mLeftColumnSummaries.insert( mLeftColumnSummaries.at( pos ), widgetName( widget ) ); } else { - if ( tqalignment & TQt::AlignBottom ) + if ( alignment & TQt::AlignBottom ) pos = mRightColumnSummaries.count(); mRightColumn->insertWidget( pos, widget ); @@ -288,7 +288,7 @@ void SummaryViewPart::summaryWidgetMoved( TQWidget *target, TQWidget *widget, in int targetPos = mLeftColumn->findWidget( target ); if ( targetPos != -1 ) { - if ( tqalignment == TQt::AlignBottom ) + if ( alignment == TQt::AlignBottom ) targetPos++; mLeftColumn->insertWidget( targetPos, widget ); @@ -296,7 +296,7 @@ void SummaryViewPart::summaryWidgetMoved( TQWidget *target, TQWidget *widget, in } else { targetPos = mRightColumn->findWidget( target ); - if ( tqalignment == TQt::AlignBottom ) + if ( alignment == TQt::AlignBottom ) targetPos++; mRightColumn->insertWidget( targetPos, widget ); @@ -311,13 +311,13 @@ void SummaryViewPart::slotTextChanged() void SummaryViewPart::slotAdjustPalette() { - mMainWidget->setPaletteBackgroundColor( kapp->tqpalette().active().base() ); + mMainWidget->setPaletteBackgroundColor( kapp->palette().active().base() ); } void SummaryViewPart::setDate( const TQDate& newDate ) { TQString date( "<b>%1</b>" ); - date = date.tqarg( KGlobal::locale()->formatDate( newDate ) ); + date = date.arg( KGlobal::locale()->formatDate( newDate ) ); mDateLabel->setText( date ); } @@ -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/summary/summaryview_part.h b/kontact/plugins/summary/summaryview_part.h index 5a99b947d..28a591dde 100644 --- a/kontact/plugins/summary/summaryview_part.h +++ b/kontact/plugins/summary/summaryview_part.h @@ -76,7 +76,7 @@ class SummaryViewPart : public KParts::ReadOnlyPart protected slots: void slotConfigure(); void updateWidgets(); - void summaryWidgetMoved( TQWidget *target, TQWidget *widget, int tqalignment ); + void summaryWidgetMoved( TQWidget *target, TQWidget *widget, int alignment ); private: void initGUI( Kontact::Core *core ); diff --git a/kontact/plugins/test/test_part.cpp b/kontact/plugins/test/test_part.cpp index 3c900a535..a114dd4dc 100644 --- a/kontact/plugins/test/test_part.cpp +++ b/kontact/plugins/test/test_part.cpp @@ -25,7 +25,7 @@ #include "test_part.h" #include "kaddressbookiface_stub.h" -#include <tqtextedit.h> +#include <textedit.h> #include <tqcombobox.h> #include "sidebarextension.h" diff --git a/kontact/plugins/weather/summarywidget.cpp b/kontact/plugins/weather/summarywidget.cpp index bf4d452ad..a9dae3f06 100644 --- a/kontact/plugins/weather/summarywidget.cpp +++ b/kontact/plugins/weather/summarywidget.cpp @@ -22,7 +22,7 @@ */ #include <tqimage.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtooltip.h> #include <dcopclient.h> @@ -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" ) ); @@ -101,50 +101,50 @@ void SummaryWidget::updateView() for ( it = dataList.begin(); it != dataList.end(); ++it ) { TQString cover; for ( uint i = 0; i < (*it).cover().count(); ++i ) - cover += TQString( "- %1\n" ).tqarg( (*it).cover()[ i ] ); + cover += TQString( "- %1\n" ).arg( (*it).cover()[ i ] ); TQImage img; img = (*it).icon(); - TQGridLayout *tqlayout = new TQGridLayout( mLayout, 3, 3, 3 ); - mLayouts.append( tqlayout ); + TQGridLayout *layout = new TQGridLayout( mLayout, 3, 3, 3 ); + mLayouts.append( layout ); KURLLabel* urlLabel = new KURLLabel( this ); urlLabel->installEventFilter( this ); urlLabel->setURL( (*it).stationID() ); urlLabel->setPixmap( img.smoothScale( 32, 32 ) ); - urlLabel->setMaximumSize( urlLabel->tqsizeHint() ); - urlLabel->tqsetAlignment( AlignTop ); - tqlayout->addMultiCellWidget( urlLabel, 0, 1, 0, 0 ); + urlLabel->setMaximumSize( urlLabel->sizeHint() ); + urlLabel->setAlignment( AlignTop ); + layout->addMultiCellWidget( urlLabel, 0, 1, 0, 0 ); mLabels.append( urlLabel ); connect ( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ), this, TQT_SLOT( showReport( const TQString& ) ) ); TQLabel* label = new TQLabel( this ); - label->setText( TQString( "%1 (%2)" ).tqarg( (*it).name() ).tqarg( (*it).temperature() ) ); + label->setText( TQString( "%1 (%2)" ).arg( (*it).name() ).arg( (*it).temperature() ) ); TQFont font = label->font(); font.setBold( true ); label->setFont( font ); - label->tqsetAlignment( AlignLeft ); - tqlayout->addMultiCellWidget( label, 0, 0, 1, 2 ); + label->setAlignment( AlignLeft ); + layout->addMultiCellWidget( label, 0, 0, 1, 2 ); mLabels.append( label ); TQString labelText; labelText = TQString( "<b>%1:</b> %2<br>" "<b>%3:</b> %4<br>" "<b>%5:</b> %6" ) - .tqarg( i18n( "Last updated on" ) ) - .tqarg( (*it).date() ) - .tqarg( i18n( "Wind Speed" ) ) - .tqarg( (*it).windSpeed() ) - .tqarg( i18n( "Rel. Humidity" ) ) - .tqarg( (*it).relativeHumidity() ); + .arg( i18n( "Last updated on" ) ) + .arg( (*it).date() ) + .arg( i18n( "Wind Speed" ) ) + .arg( (*it).windSpeed() ) + .arg( i18n( "Rel. Humidity" ) ) + .arg( (*it).relativeHumidity() ); TQToolTip::add( label, labelText.replace( " ", " " ) ); label = new TQLabel( cover, this ); - label->tqsetAlignment( AlignLeft ); - tqlayout->addMultiCellWidget( label, 1, 1, 1, 2 ); + label->setAlignment( AlignLeft ); + layout->addMultiCellWidget( label, 1, 1, 1, 2 ); mLabels.append( label ); } diff --git a/kontact/src/aboutdialog.cpp b/kontact/src/aboutdialog.cpp index 1bbd0ef6c..6f27a4cfc 100644 --- a/kontact/src/aboutdialog.cpp +++ b/kontact/src/aboutdialog.cpp @@ -33,7 +33,7 @@ #include <kactivelabel.h> #include <ktextbrowser.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <kdebug.h> @@ -81,7 +81,7 @@ void AboutDialog::addAboutData( const TQString &title, const TQString &icon, text += "<p><b>" + about->programName() + "</b><br>"; - text += i18n( "Version %1</p>" ).tqarg( about->version() ); + text += i18n( "Version %1</p>" ).arg( about->version() ); if ( !about->shortDescription().isEmpty() ) { text += "<p>" + about->shortDescription() + "<br>" + @@ -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 ); @@ -163,13 +163,13 @@ void AboutDialog::addLicenseText( const KAboutData *about ) TQPixmap pixmap = KGlobal::iconLoader()->loadIcon( "signature", KIcon::Desktop, 48 ); - TQString title = i18n( "%1 License" ).tqarg( about->programName() ); + TQString title = i18n( "%1 License" ).arg( about->programName() ); TQFrame *topFrame = addPage( title, TQString(), pixmap ); TQBoxLayout *topLayout = new TQVBoxLayout( topFrame ); KTextBrowser *textBrowser = new KTextBrowser( topFrame ); - textBrowser->setText( TQString( "<pre>%1</pre>" ).tqarg( about->license() ) ); + textBrowser->setText( TQString( "<pre>%1</pre>" ).arg( about->license() ) ); topLayout->addWidget( textBrowser ); } diff --git a/kontact/src/iconsidepane.cpp b/kontact/src/iconsidepane.cpp index 4eacd6088..a64907663 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() ) { @@ -223,15 +223,15 @@ void EntryItem::paint( TQPainter *p ) } if ( plugin()->disabled() ) { - p->setPen( box->tqpalette().disabled().text( ) ); + p->setPen( box->palette().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..87ce5726b 100644 --- a/kontact/src/kcmkontact.cpp +++ b/kontact/src/kcmkontact.cpp @@ -36,7 +36,7 @@ #include <tqcheckbox.h> #include <tqcombobox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tdepimmacros.h> @@ -114,8 +114,8 @@ PluginSelection::~PluginSelection() void PluginSelection::readConfig() { const KTrader::OfferList offers = KTrader::self()->query( - TQString::tqfromLatin1( "Kontact/Plugin" ), - TQString( "[X-KDE-KontactPluginVersion] == %1" ).tqarg( KONTACT_PLUGIN_VERSION ) ); + TQString::fromLatin1( "Kontact/Plugin" ), + TQString( "[X-KDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) ); int activeComponent = 0; mPluginCombo->clear(); diff --git a/kontact/src/main.cpp b/kontact/src/main.cpp index d2a57bcb7..20c6f5456 100644 --- a/kontact/src/main.cpp +++ b/kontact/src/main.cpp @@ -76,8 +76,8 @@ 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( "[X-KDE-KontactPluginVersion] == %1" ).tqarg( KONTACT_PLUGIN_VERSION ) ); + TQString::fromLatin1( "Kontact/Plugin" ), + TQString( "[X-KDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) ); for ( KService::List::Iterator it = offers.begin(); it != offers.end(); ++it ) { KService::Ptr service = (*it); // skip summary only plugins diff --git a/kontact/src/mainwindow.cpp b/kontact/src/mainwindow.cpp index fe24bd8dd..88be77c73 100644 --- a/kontact/src/mainwindow.cpp +++ b/kontact/src/mainwindow.cpp @@ -124,8 +124,8 @@ void MainWindow::initGUI() TQT_SLOT( showAboutDialog() ) ); KTrader::OfferList offers = KTrader::self()->query( - TQString::tqfromLatin1( "Kontact/Plugin" ), - TQString( "[X-KDE-KontactPluginVersion] == %1" ).tqarg( KONTACT_PLUGIN_VERSION ) ); + TQString::fromLatin1( "Kontact/Plugin" ), + TQString( "[X-KDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) ); mPluginInfos = KPluginInfo::fromServices( offers, Prefs::self()->config(), "Plugins" ); KPluginInfo::List::Iterator it; @@ -136,7 +136,7 @@ void MainWindow::initGUI() TQT_TQOBJECT(this), TQT_SLOT(slotActionTriggered()), actionCollection(), (*it)->pluginName().latin1() ); action->setName( (*it)->pluginName().latin1() ); - action->setWhatsThis( i18n( "Switch to plugin %1" ).tqarg( (*it)->name() ) ); + action->setWhatsThis( i18n( "Switch to plugin %1" ).arg( (*it)->name() ) ); TQVariant hasPartProp = (*it)->property( "X-KDE-KontactPluginHasPart" ); if ( !hasPartProp.isValid() || hasPartProp.toBool() ) { @@ -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; @@ -267,7 +267,7 @@ void MainWindow::initWidgets() initAboutScreen(); TQString loading = i18n( "<h2 style='text-align:center; margin-top: 0px; margin-bottom: 0px'>%1</h2>" ) - .tqarg( i18n("Loading Kontact...") ); + .arg( i18n("Loading Kontact...") ); paintAboutScreen( loading ); @@ -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 ); @@ -290,11 +290,11 @@ void MainWindow::paintAboutScreen( const TQString& msg ) { TQString location = locate( "data", "kontact/about/main.html" ); TQString content = KPIM::kFileToString( location ); - content = content.tqarg( locate( "data", "libtdepim/about/kde_infopage.css" ) ); + content = content.arg( locate( "data", "libtdepim/about/kde_infopage.css" ) ); if ( kapp->reverseLayout() ) - content = content.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "libtdepim/about/kde_infopage_rtl.css" ) ); + content = content.arg( "@import \"%1\";" ).arg( locate( "data", "libtdepim/about/kde_infopage_rtl.css" ) ); else - content = content.tqarg( "" ); + content = content.arg( "" ); mIntroPart->begin( KURL( location ) ); @@ -302,8 +302,8 @@ void MainWindow::paintAboutScreen( const TQString& msg ) TQString catchPhrase( i18n( "Get Organized!" ) ); TQString quickDescription( i18n( "The KDE Personal Information Management Suite" ) ); - mIntroPart->write( content.tqarg( TQFont().pointSize() + 2 ).tqarg( appName ) - .tqarg( catchPhrase ).tqarg( quickDescription ).tqarg( msg ) ); + mIntroPart->write( content.arg( TQFont().pointSize() + 2 ).arg( appName ) + .arg( catchPhrase ).arg( quickDescription ).arg( msg ) ); mIntroPart->end(); } @@ -629,7 +629,7 @@ void MainWindow::updateShortcuts() ++it; if ( isPluginLoadedByAction( action ) ) { loadedActions.append( action ); - TQString shortcut = TQString( "CTRL+%1" ).tqarg( i ); + TQString shortcut = TQString( "CTRL+%1" ).arg( i ); action->setShortcut( KShortcut( shortcut ) ); i++; } else { @@ -794,7 +794,7 @@ void MainWindow::selectPlugin( Kontact::Plugin *plugin ) if ( !part ) { KApplication::restoreOverrideCursor(); KMessageBox::error( this, i18n( "Cannot load part for %1." ) - .tqarg( plugin->title() ) + .arg( plugin->title() ) + "\n" + lastErrorMessage() ); plugin->setDisabled( true ); mSidePane->updatePlugins(); @@ -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(); @@ -848,7 +848,7 @@ void MainWindow::selectPlugin( Kontact::Plugin *plugin ) topDock()->moveDockWindow( navigatorToolBar, -1 ); } - setCaption( i18n( "Plugin dependent window title" ,"%1 - Kontact" ).tqarg( plugin->title() ) ); + setCaption( i18n( "Plugin dependent window title" ,"%1 - Kontact" ).arg( plugin->title() ) ); if ( newAction ) { mNewActions->setIcon( newAction->icon() ); @@ -1178,30 +1178,30 @@ TQString MainWindow::introductionString() "<td><a href=\"%1\">%1</a><br><span id=\"subtext\"><nobr>%1</td></tr>" "</table>" "<p style=\"margin-bottom: 0px\"> <a href=\"%1\">Skip this introduction</a></p>" ) - .tqarg( kapp->aboutData()->version() ) - .tqarg( i18n( "Kontact handles your e-mail, addressbook, calendar, to-do list and more." ) ) - .tqarg( "exec:/help?kontact" ) - .tqarg( iconSize ) - .tqarg( iconSize ) - .tqarg( handbook_icon_path ) - .tqarg( "exec:/help?kontact" ) - .tqarg( i18n( "Read Manual" ) ) - .tqarg( i18n( "Learn more about Kontact and its components" ) ) - .tqarg( "http://kontact.org" ) - .tqarg( iconSize ) - .tqarg( iconSize ) - .tqarg( html_icon_path ) - .tqarg( "http://kontact.org" ) - .tqarg( i18n( "Visit Kontact Website" ) ) - .tqarg( i18n( "Access online resources and tutorials" ) ) - .tqarg( "exec:/gwwizard" ) - .tqarg( iconSize ) - .tqarg( iconSize ) - .tqarg( wizard_icon_path ) - .tqarg( "exec:/gwwizard" ) - .tqarg( i18n( "Configure Kontact as Groupware Client" ) ) - .tqarg( i18n( "Prepare Kontact for use in corporate networks" ) ) - .tqarg( "exec:/switch" ); + .arg( kapp->aboutData()->version() ) + .arg( i18n( "Kontact handles your e-mail, addressbook, calendar, to-do list and more." ) ) + .arg( "exec:/help?kontact" ) + .arg( iconSize ) + .arg( iconSize ) + .arg( handbook_icon_path ) + .arg( "exec:/help?kontact" ) + .arg( i18n( "Read Manual" ) ) + .arg( i18n( "Learn more about Kontact and its components" ) ) + .arg( "http://kontact.org" ) + .arg( iconSize ) + .arg( iconSize ) + .arg( html_icon_path ) + .arg( "http://kontact.org" ) + .arg( i18n( "Visit Kontact Website" ) ) + .arg( i18n( "Access online resources and tutorials" ) ) + .arg( "exec:/gwwizard" ) + .arg( iconSize ) + .arg( iconSize ) + .arg( wizard_icon_path ) + .arg( "exec:/gwwizard" ) + .arg( i18n( "Configure Kontact as Groupware Client" ) ) + .arg( i18n( "Prepare Kontact for use in corporate networks" ) ) + .arg( "exec:/switch" ); return info; } diff --git a/kontact/src/profiledialog.cpp b/kontact/src/profiledialog.cpp index c58377806..87b5d1394 100644 --- a/kontact/src/profiledialog.cpp +++ b/kontact/src/profiledialog.cpp @@ -30,7 +30,7 @@ #include <klocale.h> #include <kmessagebox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <tqstring.h> @@ -140,7 +140,7 @@ void Kontact::ProfileDialog::profileLoaded( const TQString& id ) const Kontact::Profile profile = Kontact::ProfileManager::self()->profileById( id ); if ( profile.isNull() ) return; - KMessageBox::information( this, i18n("The profile \"%1\" was successfully loaded. Some profile settings require a restart to get activated.").tqarg( profile.name() ), i18n("Profile Loaded") ); + KMessageBox::information( this, i18n("The profile \"%1\" was successfully loaded. Some profile settings require a restart to get activated.").arg( profile.name() ), i18n("Profile Loaded") ); } void Kontact::ProfileDialog::saveToSelectedProfile() @@ -148,7 +148,7 @@ void Kontact::ProfileDialog::saveToSelectedProfile() const Kontact::Profile profile = Kontact::ProfileManager::self()->profileById( selectedProfile() ); if ( profile.isNull() ) return; - if ( KMessageBox::Yes != KMessageBox::warningYesNo( this, i18n("The profile \"%1\" will be overwritten with the current settings. Are you sure?").tqarg( profile.name() ), i18n("Save to Profile"), KStdGuiItem::overwrite(), KStdGuiItem::cancel() ) ) + if ( KMessageBox::Yes != KMessageBox::warningYesNo( this, i18n("The profile \"%1\" will be overwritten with the current settings. Are you sure?").arg( profile.name() ), i18n("Save to Profile"), KStdGuiItem::overwrite(), KStdGuiItem::cancel() ) ) return; Kontact::ProfileManager::self()->saveToProfile( profile.id() ); } @@ -158,7 +158,7 @@ void Kontact::ProfileDialog::deleteSelectedProfile() const Kontact::Profile profile = Kontact::ProfileManager::self()->profileById( selectedProfile() ); if ( profile.isNull() ) return; - if ( KMessageBox::Yes != KMessageBox::warningYesNo( this, i18n("Do you really want to delete the profile \"%1\"? All profile settings will be lost!").tqarg( profile.name() ), i18n("Delete Profile"), KStdGuiItem::del(), KStdGuiItem::cancel() ) ) + if ( KMessageBox::Yes != KMessageBox::warningYesNo( this, i18n("Do you really want to delete the profile \"%1\"? All profile settings will be lost!").arg( profile.name() ), i18n("Delete Profile"), KStdGuiItem::del(), KStdGuiItem::cancel() ) ) return; Kontact::ProfileManager::self()->removeProfile( profile ); } @@ -175,7 +175,7 @@ void Kontact::ProfileDialog::exportSelectedProfile() const Kontact::ProfileManager::ExportError error = Kontact::ProfileManager::self()->exportProfileToDirectory( id, path ); if ( error == Kontact::ProfileManager::SuccessfulExport ) { - KMessageBox::information( this, i18n("The profile \"%1\" was successfully exported.").tqarg( profile.name() ), i18n("Profile Exported") ); + KMessageBox::information( this, i18n("The profile \"%1\" was successfully exported.").arg( profile.name() ), i18n("Profile Exported") ); } else { diff --git a/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..10a791a95 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(), @@ -872,7 +872,7 @@ bool ActionManager::openURL( const KURL &url,bool merge ) mFile = url.path(); if ( !KStandardDirs::exists( mFile ) ) { mMainWindow->showStatusMessage( i18n("New calendar '%1'.") - .tqarg( url.prettyURL() ) ); + .arg( url.prettyURL() ) ); mCalendarView->setModified(); } else { bool success = mCalendarView->openCalendar( mFile, merge ); @@ -906,7 +906,7 @@ bool ActionManager::openURL( const KURL &url,bool merge ) return success; } else { TQString msg; - msg = i18n("Cannot download calendar from '%1'.").tqarg( url.prettyURL() ); + msg = i18n("Cannot download calendar from '%1'.").arg( url.prettyURL() ); KMessageBox::error( dialogParent(), msg ); return false; } @@ -945,7 +945,7 @@ bool ActionManager::addResource( const KURL &mUrl ) resource->setResourceName( name ); manager->add( resource ); mMainWindow->showStatusMessage( i18n( "Added calendar resource for URL '%1'." ) - .tqarg( name ) ); + .arg( name ) ); // we have to call resourceAdded manually, because for in-process changes // the dcop signals are not connected, so the resource's signals would not // be connected otherwise @@ -953,7 +953,7 @@ bool ActionManager::addResource( const KURL &mUrl ) mCalendarResources->resourceAdded( resource ); } else { TQString msg = i18n("Unable to create calendar resource '%1'.") - .tqarg( name ); + .arg( name ); KMessageBox::error( dialogParent(), msg ); } return true; @@ -964,10 +964,10 @@ void ActionManager::showStatusMessageOpen( const KURL &url, bool merge ) { if ( merge ) { mMainWindow->showStatusMessage( i18n("Merged calendar '%1'.") - .tqarg( url.prettyURL() ) ); + .arg( url.prettyURL() ) ); } else { mMainWindow->showStatusMessage( i18n("Opened calendar '%1'.") - .tqarg( url.prettyURL() ) ); + .arg( url.prettyURL() ) ); } } @@ -1018,7 +1018,7 @@ bool ActionManager::saveURL() if ( !mURL.isLocalFile() ) { if ( !KIO::NetAccess::upload( mFile, mURL, view() ) ) { TQString msg = i18n("Cannot upload calendar to '%1'") - .tqarg( mURL.prettyURL() ); + .arg( mURL.prettyURL() ); KMessageBox::error( dialogParent() ,msg ); return false; } @@ -1030,7 +1030,7 @@ bool ActionManager::saveURL() mAutoSaveTimer->start( 1000*60*KOPrefs::instance()->mAutoSaveInterval ); } - mMainWindow->showStatusMessage( i18n("Saved calendar '%1'.").tqarg( mURL.prettyURL() ) ); + mMainWindow->showStatusMessage( i18n("Saved calendar '%1'.").arg( mURL.prettyURL() ) ); return true; } @@ -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 @@ -1061,7 +1061,7 @@ void ActionManager::exportHTML( HTMLExportSettings *settings ) return; kdDebug()<<" settings->outputFile() :"<<settings->outputFile()<<endl; if ( TQFileInfo( settings->outputFile() ).exists() ) { - if(KMessageBox::questionYesNo( dialogParent(), i18n("Do you want to overwrite file \"%1\"").tqarg( settings->outputFile()) ) == KMessageBox::No) + if(KMessageBox::questionYesNo( dialogParent(), i18n("Do you want to overwrite file \"%1\"").arg( settings->outputFile()) ) == KMessageBox::No) return; } settings->setEMail( KOPrefs::instance()->email() ); @@ -1136,7 +1136,7 @@ bool ActionManager::saveAsURL( const KURL &url ) setTitle(); if ( mRecent ) mRecent->addURL( mURL ); } else { - KMessageBox::sorry( dialogParent(), i18n("Unable to save calendar to the file %1.").tqarg( mFile ), i18n("Error") ); + KMessageBox::sorry( dialogParent(), i18n("Unable to save calendar to the file %1.").arg( mFile ), i18n("Error") ); kdDebug(5850) << "ActionManager::saveAsURL() failed" << endl; mURL = URLOrig; mFile = fileOrig; @@ -1702,7 +1702,7 @@ void ActionManager::openEventEditor( const TQString & summary, attData = file; } else { if ( KMessageBox::warningContinueCancel( 0, - i18n("Removing attachments from an email might tqinvalidate its signature."), + i18n("Removing attachments from an email might invalidate its signature."), i18n("Remove Attachments"), KStdGuiItem::cont(), "BodyOnlyInlineAttachment" ) != KMessageBox::Continue ) return; @@ -1892,7 +1892,7 @@ void ActionManager::updateUndoAction( const TQString &text ) } else { mUndoAction->setEnabled( true ); if ( text.isEmpty() ) mUndoAction->setText( i18n("Undo") ); - else mUndoAction->setText( i18n("Undo (%1)").tqarg( text ) ); + else mUndoAction->setText( i18n("Undo (%1)").arg( text ) ); } } @@ -1904,7 +1904,7 @@ void ActionManager::updateRedoAction( const TQString &text ) } else { mRedoAction->setEnabled( true ); if ( text.isEmpty() ) mRedoAction->setText( i18n("Redo") ); - else mRedoAction->setText( i18n( "Redo (%1)" ).tqarg( text ) ); + else mRedoAction->setText( i18n( "Redo (%1)" ).arg( text ) ); } } @@ -1983,7 +1983,7 @@ bool ActionManager::saveResourceCalendar() int result = KMessageBox::warningContinueCancel( view(), i18n( "Saving of '%1' failed. Check that the resource is " "properly configured.\nIgnore problem and continue without " - "saving or cancel save?" ).tqarg( (*it)->resourceName() ), + "saving or cancel save?" ).arg( (*it)->resourceName() ), i18n("Save Error"), KStdGuiItem::dontSave() ); if ( result == KMessageBox::Cancel ) return false; } @@ -2006,12 +2006,12 @@ void ActionManager::importCalendar( const KURL &url ) { if ( !url.isValid() ) { KMessageBox::error( dialogParent(), - i18n("URL '%1' is invalid.").tqarg( url.prettyURL() ) ); + i18n("URL '%1' is invalid.").arg( url.prettyURL() ) ); return; } 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/archivedialog.cpp b/korganizer/archivedialog.cpp index 6609b183a..04596b8c8 100644 --- a/korganizer/archivedialog.cpp +++ b/korganizer/archivedialog.cpp @@ -25,7 +25,7 @@ // ArchiveDialog -- archive/delete past events. #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqdatetime.h> #include <tqcheckbox.h> #include <tqwhatsthis.h> diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 5b6d94928..b45b4ae01 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp @@ -93,14 +93,14 @@ #include <kdirwatch.h> #include <tqapplication.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqcursor.h> #include <tqmultilineedit.h> #include <tqtimer.h> #include <tqwidgetstack.h> #include <tqptrlist.h> #include <tqfile.h> -#include <tqlayout.h> +#include <layout.h> #ifndef KORG_NOSPLITTER #include <tqsplitter.h> #endif @@ -137,7 +137,7 @@ CalendarView::CalendarView( TQWidget *parent, const char *name ) TQBoxLayout *topLayout = new TQVBoxLayout( this ); #ifndef KORG_NOSPLITTER - // create the main tqlayout frames. + // create the main layout frames. mPanner = new TQSplitter( Qt::Horizontal, this, "CalendarView::Panner" ); topLayout->addWidget( mPanner ); @@ -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 @@ -277,7 +277,7 @@ CalendarView::CalendarView( TQWidget *parent, const char *name ) KOGlobals::self()-> setHolidays( new KHolidays( KOPrefs::instance()->mHolidays ) ); - connect( TQApplication::tqclipboard(), TQT_SIGNAL( dataChanged() ), + connect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ), TQT_SLOT( checkClipboard() ) ); connect( mTodoList, TQT_SIGNAL( incidenceSelected( Incidence *,const TQDate & ) ), @@ -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(); } @@ -487,7 +487,7 @@ bool CalendarView::openCalendar(const TQString& filename, bool merge) // have become partially populated. Clear it out. if ( !merge ) mCalendar->close(); - KMessageBox::error(this,i18n("Could not load calendar '%1'.").tqarg(filename)); + KMessageBox::error(this,i18n("Could not load calendar '%1'.").arg(filename)); return false; } @@ -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 ); @@ -776,18 +776,18 @@ void CalendarView::incidenceChanged( Incidence *oldIncidence, if ( todo->isCompleted() || modification == KOGlobals::COMPLETION_MODIFIED_WITH_RECURRENCE ) { TQString timeStr = KGlobal::locale()->formatTime( TQTime::currentTime() ); - TQString description = i18n( "To-do completed: %1 (%2)" ).tqarg( - newIncidence->summary() ).tqarg( timeStr ); + TQString description = i18n( "To-do completed: %1 (%2)" ).arg( + newIncidence->summary() ).arg( timeStr ); - Journal::List journals = calendar()->journals( TQDate::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() ); - journal->setSummary( i18n("Journal of %1").tqarg( dateStr ) ); + TQString dateStr = KGlobal::locale()->formatDate( TQDate::currentDate() ); + journal->setSummary( i18n("Journal of %1").arg( dateStr ) ); journal->setDescription( description ); //TODO: recorded to-dos should save into the standard resource always @@ -844,7 +844,7 @@ void CalendarView::checkForFilteredChange( Incidence *incidence ) // user so that he isn't surprised if his new event doesn't show up KMessageBox::information( this, i18n("The item \"%1\" is filtered by " "your current filter rules, so it will be hidden and not " - "appear in the view.").tqarg( incidence->summary() ), + "appear in the view.").arg( incidence->summary() ), i18n("Filter Applied"), "ChangedIncidenceFiltered" ); } } @@ -901,7 +901,7 @@ void CalendarView::updateUnmanagedViews() int CalendarView::msgItemDelete( Incidence *incidence ) { return KMessageBox::warningContinueCancel(this, - i18n("The item \"%1\" will be permanently deleted.").tqarg( incidence->summary() ), + i18n("The item \"%1\" will be permanently deleted.").arg( incidence->summary() ), i18n("KOrganizer Confirmation"), KGuiItem(i18n("&Delete"),"editdelete")); } @@ -925,7 +925,7 @@ void CalendarView::edit_cut() "Do you want to cut just this item and " "make all its sub-to-dos independent, or " "cut the to-do with all its sub-to-dos?" - ).tqarg( incidence->summary() ), + ).arg( incidence->summary() ), i18n("KOrganizer Confirmation"), i18n("Cut Only This"), i18n("Cut All")); @@ -935,7 +935,7 @@ void CalendarView::edit_cut() incidences.append( incidence ); makeChildrenIndependent( incidence ); } else if ( km == KMessageBox::No ) { // all - // load incidence + tqchildren + grandtqchildren... + // load incidence + children + grandchildren... getIncidenceHierarchy( incidence, incidences ); } @@ -962,7 +962,7 @@ void CalendarView::edit_copy() i18n("The item \"%1\" has sub-to-dos. " "Do you want to copy just this item or " "copy the to-do with all its sub-to-dos?" - ).tqarg( incidence->summary() ), + ).arg( incidence->summary() ), i18n("KOrganizer Confirmation"), i18n("Copy Only This"), i18n("Copy All")); @@ -971,7 +971,7 @@ void CalendarView::edit_copy() if ( km == KMessageBox::Yes ) { // only one incidences.append( incidence ); } else if ( km == KMessageBox::No ) { // all - // load incidence + tqchildren + grandtqchildren... + // load incidence + children + grandchildren... getIncidenceHierarchy( incidence, incidences ); } @@ -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 ); } @@ -1585,7 +1585,7 @@ void CalendarView::schedule_publish(Incidence *incidence) KMessageBox::information( this, i18n("The item information was successfully sent."), i18n("Publishing"), "IncidencePublishSuccess" ); } else { - KMessageBox::error( this, i18n("Unable to publish the item '%1'").tqarg( incidence->summary() ) ); + KMessageBox::error( this, i18n("Unable to publish the item '%1'").arg( incidence->summary() ) ); } } delete publishdlg; @@ -1661,7 +1661,7 @@ void CalendarView::schedule_forward( Incidence *incidence ) } else { KMessageBox::error( this, - i18n( "Unable to forward the item '%1'" ).tqarg( incidence->summary() ), + i18n( "Unable to forward the item '%1'" ).arg( incidence->summary() ), i18n( "Forwarding Error" ) ); } } @@ -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); @@ -1727,16 +1727,16 @@ void CalendarView::schedule(Scheduler::Method method, Incidence *incidence) if ( scheduler.performTransaction( incidence, method ) ) { KMessageBox::information( this, i18n("The groupware message for item '%1'" "was successfully sent.\nMethod: %2") - .tqarg( incidence->summary() ) - .tqarg( Scheduler::methodName( method ) ), + .arg( incidence->summary() ) + .arg( Scheduler::methodName( method ) ), i18n("Sending Free/Busy"), "FreeBusyPublishSuccess" ); } else { KMessageBox::error( this, i18n("Groupware message sending failed. " "%2 is request/reply/add/cancel/counter/etc.", "Unable to send the item '%1'.\nMethod: %2") - .tqarg( incidence->summary() ) - .tqarg( Scheduler::methodName( method ) ) ); + .arg( incidence->summary() ) + .arg( Scheduler::methodName( method ) ) ); } } @@ -1817,7 +1817,7 @@ void CalendarView::exportICalendar() if ( TQFile( filename ).exists() ) { if ( KMessageBox::No == KMessageBox::warningYesNo( this, - i18n( "Do you want to overwrite %1?").tqarg(filename) ) ) { + i18n( "Do you want to overwrite %1?").arg(filename) ) ) { return; } } @@ -1845,7 +1845,7 @@ void CalendarView::exportVCalendar() if ( TQFile( filename ).exists() ) { if ( KMessageBox::No == KMessageBox::warningYesNo( this, - i18n( "Do you want to overwrite %1?").tqarg(filename ) ) ) { + i18n( "Do you want to overwrite %1?").arg(filename ) ) ) { return; } } @@ -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")); @@ -1934,7 +1934,7 @@ void CalendarView::processIncidenceSelection( Incidence *incidence, const TQDate void CalendarView::checkClipboard() { #ifndef KORG_NODND - if (ICalDrag::canDecode(TQApplication::tqclipboard()->data())) { + if (ICalDrag::canDecode(TQApplication::clipboard()->data())) { kdDebug(5850) << "CalendarView::checkClipboard() true" << endl; emit pasteEnabled(true); } else { @@ -2334,7 +2334,7 @@ void CalendarView::deleteTodoIncidence ( Todo *todo, bool force ) "Do you want to delete just this item and " "make all its sub-to-dos independent, or " "delete the to-do with all its sub-to-dos?" - ).tqarg( todo->summary() ), + ).arg( todo->summary() ), i18n("KOrganizer Confirmation"), i18n("Delete Only This"), i18n("Delete All")); @@ -2367,7 +2367,7 @@ void CalendarView::deleteIncidence(Incidence *incidence, bool force) KMessageBox::information( this, i18n("The item \"%1\" is marked read-only " "and cannot be deleted; it probably belongs to " "a read-only calendar resource.") - .tqarg(incidence->summary()), + .arg(incidence->summary()), i18n("Removing not possible"), "deleteReadOnlyIncidence" ); } @@ -2377,7 +2377,7 @@ void CalendarView::deleteIncidence(Incidence *incidence, bool force) CanDeleteIncidenceVisitor v; // Let the visitor do special things for special incidence types. - // e.g. todos with tqchildren cannot be deleted, so act(..) returns false + // e.g. todos with children cannot be deleted, so act(..) returns false if ( !v.act( incidence, this ) ) return; //If it is a todo, there are specific delete function @@ -2397,15 +2397,15 @@ void CalendarView::deleteIncidence(Incidence *incidence, bool force) km = KMessageBox::warningContinueCancel(this, i18n("The calendar item \"%1\" recurs over multiple dates; " "are you sure you want to delete it " - "and all its recurrences?").tqarg( incidence->summary() ), + "and all its recurrences?").arg( incidence->summary() ), i18n("KOrganizer Confirmation"), i18n("Delete All") ); } else { km = KOMessageBox::fourBtnMsgBox( this, TQMessageBox::Warning, i18n("The calendar item \"%1\" recurs over multiple dates. " "Do you want to delete only the current one on %2, only all " "future recurrences, or all its recurrences?" ) - .tqarg( incidence->summary() ) - .tqarg( KGlobal::locale()->formatDate(itemDate)), + .arg( incidence->summary() ) + .arg( KGlobal::locale()->formatDate(itemDate)), i18n("KOrganizer Confirmation"), i18n("Delete C&urrent"), i18n("Delete &Future"), i18n("Delete &All")); @@ -2524,14 +2524,14 @@ void CalendarView::purgeCompleted() if ( aTodo && !aTodo->relatedTo() ) rootTodos.append( aTodo ); } - // now that we have a list of all root todos, check them and their tqchildren + // now that we have a list of all root todos, check them and their children for ( it = rootTodos.begin(); it != rootTodos.end(); ++it ) { purgeCompletedSubTodos( *it, allDeleted ); } endMultiModify(); if ( !allDeleted ) { KMessageBox::information( this, i18n("Unable to purge to-dos with " - "uncompleted tqchildren."), i18n("Delete To-do"), + "uncompleted children."), i18n("Delete To-do"), "UncompletedChildrenPurgeTodos" ); } } @@ -2577,7 +2577,7 @@ void CalendarView::addIncidenceOn( Incidence *incadd, const TQDate &dt ) { if ( !incadd || !mChanger ) { KMessageBox::sorry(this, i18n("Unable to copy the item to %1.") - .tqarg( dt.toString() ), i18n("Copying Failed") ); + .arg( dt.toString() ), i18n("Copying Failed") ); return; } Incidence *incidence = mCalendar->incidence( incadd->uid() ); @@ -2621,7 +2621,7 @@ void CalendarView::moveIncidenceTo( Incidence *incmove, const TQDate &dt ) { if ( !incmove || !mChanger ) { KMessageBox::sorry( this, i18n("Unable to move the item to %1.") - .tqarg( dt.toString() ), i18n("Moving Failed") ); + .arg( dt.toString() ), i18n("Moving Failed") ); return; } Incidence *incidence = mCalendar->incidence( incmove->uid() ); @@ -2794,16 +2794,16 @@ void CalendarView::selectWeek( const TQDate &date ) } void CalendarView::getIncidenceHierarchy( Incidence *inc, - Incidence::List &tqchildren ) + Incidence::List &children ) { // protecion against looping hierarchies - if ( inc && !tqchildren.contains( inc ) ) { + if ( inc && !children.contains( inc ) ) { Incidence::List::ConstIterator it; Incidence::List immediateChildren = inc->relations(); for ( it = immediateChildren.constBegin(); it != immediateChildren.constEnd(); ++it ) { - getIncidenceHierarchy( *it, tqchildren ); + getIncidenceHierarchy( *it, children ); } - tqchildren.append( inc ); + children.append( inc ); } } diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h index c10d92414..131cd878f 100644 --- a/korganizer/calendarview.h +++ b/korganizer/calendarview.h @@ -454,10 +454,10 @@ class KDE_EXPORT CalendarView : public KOrg::CalendarViewBase, public Calendar:: */ void appointment_delete(); - /* frees the selected to-do's tqchildren from it's relation, update the view */ + /* frees the selected to-do's children from it's relation, update the view */ void todo_unsub(); - /* frees an incidence's tqchildren from it's relation, without update the view + /* frees an incidence's children from it's relation, without update the view Works with any incidence type, although currently we only pass to-dos */ bool incidence_unsub( Incidence *inc ); @@ -465,7 +465,7 @@ class KDE_EXPORT CalendarView : public KOrg::CalendarViewBase, public Calendar:: /** Make all sub-to-dos of the selected todo independent, update the view */ bool makeSubTodosIndependent ( ); - /** Make all tqchildren of incidence independent, not update the view + /** Make all children of incidence independent, not update the view Works with any incidence type, although currently we only pass to-dos */ bool makeChildrenIndependent( Incidence *inc ); diff --git a/korganizer/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..be6854413 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 @@ -99,7 +99,7 @@ void EventArchiver::run( Calendar* calendar, const TQDate& limitDate, TQWidget* KMessageBox::information( widget, i18n( "Unable to archive to-do \"%1\" because at least one of its " - "sub-to-dos does not meet the archival requirements." ).tqarg( (*it)->summary() ), + "sub-to-dos does not meet the archival requirements." ).arg( (*it)->summary() ), i18n( "Archive To-do" ), "UncompletedChildrenArchiveTodos" ); } else if ( todoComplete ) { @@ -118,7 +118,7 @@ void EventArchiver::run( Calendar* calendar, const TQDate& limitDate, TQWidget* KMessageBox::information( widget, i18n( "There are no incidences available to archive before the specified cut-off date %1. " - "Archiving will not be performed." ).tqarg( KGlobal::locale()->formatDate( limitDate ) ), + "Archiving will not be performed." ).arg( KGlobal::locale()->formatDate( limitDate ) ), "ArchiverNoIncidences" ); } return; @@ -147,7 +147,7 @@ void EventArchiver::deleteIncidences( Calendar* calendar, const TQDate& limitDat int result = KMessageBox::warningContinueCancelList( widget, i18n("Delete all items before %1 without saving?\n" "The following items will be deleted:") - .tqarg(KGlobal::locale()->formatDate(limitDate)), incidenceStrs, + .arg(KGlobal::locale()->formatDate(limitDate)), incidenceStrs, i18n("Delete Old Items"),KStdGuiItem::del()); if (result != KMessageBox::Continue) return; @@ -216,7 +216,7 @@ void EventArchiver::archiveIncidences( Calendar* calendar, const TQDate& /*limit // Save archive calendar if ( !archiveStore.save() ) { - KMessageBox::error(widget,i18n("Cannot write archive file %1.").tqarg( archiveStore.fileName() )); + KMessageBox::error(widget,i18n("Cannot write archive file %1.").arg( archiveStore.fileName() )); return; } diff --git a/korganizer/exportwebdialog.cpp b/korganizer/exportwebdialog.cpp index c5868f146..ea04c9dbd 100644 --- a/korganizer/exportwebdialog.cpp +++ b/korganizer/exportwebdialog.cpp @@ -22,7 +22,7 @@ without including the source code for TQt in the source distribution. */ -#include <tqlayout.h> +#include <layout.h> #include <tqhgroupbox.h> #include <tqvgroupbox.h> #include <tqvbuttongroup.h> @@ -33,7 +33,7 @@ #include <tqvbox.h> #include <tqpushbutton.h> #include <tqfiledialog.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqlabel.h> #include <klocale.h> diff --git a/korganizer/filteredit_base.ui b/korganizer/filteredit_base.ui index f1bdc7902..a5c3f792b 100644 --- a/korganizer/filteredit_base.ui +++ b/korganizer/filteredit_base.ui @@ -50,7 +50,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -95,7 +95,7 @@ </widget> <widget class="TQLayoutWidget" row="3" column="0"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -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/filtereditdialog.cpp b/korganizer/filtereditdialog.cpp index aceb6d27c..c8251ca61 100644 --- a/korganizer/filtereditdialog.cpp +++ b/korganizer/filtereditdialog.cpp @@ -186,7 +186,7 @@ void FilterEdit::filterSelected(CalFilter *filter) } void FilterEdit::bNewPressed() { - CalFilter *newFilter = new CalFilter( i18n("New Filter %1").tqarg(mFilters->count()) ); + CalFilter *newFilter = new CalFilter( i18n("New Filter %1").arg(mFilters->count()) ); mFilters->append( newFilter ); updateFilterList(); mRulesList->setSelected(mRulesList->count()-1, true); diff --git a/korganizer/freebusymanager.cpp b/korganizer/freebusymanager.cpp index ec32367b1..59775f070 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; @@ -245,7 +245,7 @@ void FreeBusyManager::publishFreeBusy() if ( !targetURL.isValid() ) { KMessageBox::sorry( 0, i18n( "<qt>The target URL '%1' provided is invalid." - "</qt>" ).tqarg( targetURL.prettyURL() ), i18n("Invalid URL") ); + "</qt>" ).arg( targetURL.prettyURL() ), i18n("Invalid URL") ); mBrokenUrl = true; return; } @@ -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 * ) ) ); @@ -353,8 +353,8 @@ void FreeBusyManager::slotUploadFreeBusyResult(KIO::Job *_job) "URL '%1'. There might be a problem with the access rights, or " "you specified an incorrect URL. The system said: <em>%2</em>." "<br>Please check the URL or contact your system administrator." - "</qt>" ).tqarg( job->destURL().prettyURL() ) - .tqarg( job->errorString() ) ); + "</qt>" ).arg( job->destURL().prettyURL() ) + .arg( job->errorString() ) ); // Delete temp file KURL src = job->srcURL(); Q_ASSERT( src.isLocalFile() ); @@ -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/freebusymanager.h b/korganizer/freebusymanager.h index 1cda25fa3..d8fcc9522 100644 --- a/korganizer/freebusymanager.h +++ b/korganizer/freebusymanager.h @@ -92,7 +92,7 @@ class FreeBusyManager : public TQObject, public KCal::FreeBusyCache /** KOrganizer downloads somebody else's free/busy list The call is asynchronous, and upon download, the - tqreceivers slot specified by member will be called. + receivers slot specified by member will be called. The slot should be of type "member(const TQString&, KCal::FreeBusy*)" Return true if a download is initiated, and false otherwise diff --git a/korganizer/freebusyurldialog.cpp b/korganizer/freebusyurldialog.cpp index 67f23d35e..39dc7e691 100644 --- a/korganizer/freebusyurldialog.cpp +++ b/korganizer/freebusyurldialog.cpp @@ -32,7 +32,7 @@ #include <kdebug.h> #include <kstandarddirs.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> FreeBusyUrlDialog::FreeBusyUrlDialog( KCal::Attendee *attendee, TQWidget *parent, @@ -66,7 +66,7 @@ FreeBusyUrlWidget::FreeBusyUrlWidget( KCal::Attendee *attendee, TQWidget *parent TQLabel *label = new TQLabel( i18n("Location of Free/Busy information for %1 <%2>:") - .tqarg( mAttendee->name() ).tqarg( mAttendee->email() ), this ); + .arg( mAttendee->name() ).arg( mAttendee->email() ), this ); topLayout->addWidget( label ); mUrlEdit = new KLineEdit( this ); diff --git a/korganizer/history.cpp b/korganizer/history.cpp index 002f84a6b..0b9e5d995 100644 --- a/korganizer/history.cpp +++ b/korganizer/history.cpp @@ -182,7 +182,7 @@ void History::EntryDelete::redo() TQString History::EntryDelete::text() { - return i18n("Delete %1").tqarg(mIncidence->type().data()); + return i18n("Delete %1").arg(mIncidence->type().data()); } @@ -211,7 +211,7 @@ void History::EntryAdd::redo() TQString History::EntryAdd::text() { - return i18n("Add %1").tqarg(mIncidence->type().data()); + return i18n("Add %1").arg(mIncidence->type().data()); } @@ -248,7 +248,7 @@ void History::EntryEdit::redo() TQString History::EntryEdit::text() { - return i18n("Edit %1").tqarg(mNewIncidence->type().data()); + return i18n("Edit %1").arg(mNewIncidence->type().data()); } History::MultiEntry::MultiEntry( Calendar *calendar, const TQString &text ) diff --git a/korganizer/importdialog.cpp b/korganizer/importdialog.cpp index 4db3a069b..7d4dd3fbc 100644 --- a/korganizer/importdialog.cpp +++ b/korganizer/importdialog.cpp @@ -31,7 +31,7 @@ #include <klocale.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqradiobutton.h> #include <tqbuttongroup.h> @@ -46,7 +46,7 @@ ImportDialog::ImportDialog( const KURL &url, TQWidget *parent, bool isPart ) TQVBoxLayout *topLayout = new TQVBoxLayout( topFrame, 0, spacingHint() ); TQString txt = i18n("Import calendar/event at '%1' into KOrganizer.") - .tqarg( mUrl.prettyURL() ); + .arg( mUrl.prettyURL() ); topLayout->addWidget( new TQLabel( txt, topFrame ) ); diff --git a/korganizer/incidencechanger.cpp b/korganizer/incidencechanger.cpp index 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..5734b6cc5 100644 --- a/korganizer/journalentry.cpp +++ b/korganizer/journalentry.cpp @@ -26,7 +26,7 @@ // Journal Entry #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> #include <tqwhatsthis.h> #include <tqtooltip.h> @@ -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() ) ); } @@ -86,7 +86,7 @@ JournalDateEntry::~JournalDateEntry() void JournalDateEntry::setDate(const TQDate &date) { TQString dtstring = TQString( "<qt><center><b><i>%1</i></b> " ) - .tqarg( KGlobal::locale()->formatDate(date) ); + .arg( KGlobal::locale()->formatDate(date) ); dtstring += " <font size=\"-1\"><a href=\"#\">" + i18n("[Add Journal Entry]") + @@ -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 ); @@ -259,8 +259,8 @@ void JournalEntry::deleteItem() { /* KMessageBox::ButtonCode *code = KMessageBox::warningContinueCancel(this, i18n("The journal \"%1\" on %2 will be permanently deleted.") - .tqarg( mJournal->summary() ) - .tqarg( mJournal->dtStartStr() ), + .arg( mJournal->summary() ) + .arg( mJournal->dtStartStr() ), i18n("KOrganizer Confirmation"), KStdGuiItem::del() ); if ( code == KMessageBox::Yes ) {*/ if ( mJournal ) diff --git a/korganizer/kdatenavigator.cpp b/korganizer/kdatenavigator.cpp index d47b79748..980bd1124 100644 --- a/korganizer/kdatenavigator.cpp +++ b/korganizer/kdatenavigator.cpp @@ -25,7 +25,7 @@ #include <tqstring.h> #include <tqkeycode.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtimer.h> #include <tqframe.h> #include <tqlabel.h> @@ -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 ); @@ -121,8 +121,8 @@ void KDateNavigator::setBaseDate( const TQDate &date ) dates.append( date ); mNavigatorBar->selectDates( dates ); - tqrepaint(); - mDayMatrix->tqrepaint(); + repaint(); + mDayMatrix->repaint(); } } @@ -135,7 +135,7 @@ TQSizePolicy KDateNavigator::sizePolicy () const void KDateNavigator::updateToday() { mDayMatrix->recalculateToday(); - mDayMatrix->tqrepaint(); + mDayMatrix->repaint(); } TQDate KDateNavigator::startDate() const @@ -188,21 +188,21 @@ void KDateNavigator::updateDates() if ( weeknumstart != weeknumend ) { weeknum = i18n("start/end week number of line in date picker", "%1/%2") - .tqarg( weeknumstart ).tqarg( weeknumend ); + .arg( weeknumstart ).arg( weeknumend ); } else { weeknum.setNum( weeknumstart ); } mWeeknos[i]->setText( weeknum ); } -// each updateDates is followed by an updateView -> tqrepaint is issued there ! -// mDayMatrix->tqrepaint(); +// each updateDates is followed by an updateView -> repaint is issued there ! +// mDayMatrix->repaint(); } void KDateNavigator::updateDayMatrix() { mDayMatrix->updateView(); - mDayMatrix->tqrepaint(); + mDayMatrix->repaint(); } void KDateNavigator::setUpdateNeeded() @@ -228,7 +228,7 @@ void KDateNavigator::updateView() // kdDebug(5850) << "KDateNavigator::updateView(), view " << this << endl; updateDayMatrix(); - tqrepaint(); + repaint(); } void KDateNavigator::updateConfig() diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp index 5600682f1..6c1c79521 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; @@ -296,7 +296,7 @@ void KOAgenda::init() setMinimumSize( 30, int( mGridSpacingY + 1 ) ); // setMaximumHeight(mGridSpacingY * mRows + 5); - // Disable horizontal scrollbar. This is a hack. The tqgeometry should be + // Disable horizontal scrollbar. This is a hack. The geometry should be // controlled in a way that the contents horizontally always fits. Then it is // not necessary to turn off the scrollbar. setHScrollBarMode( AlwaysOff ); @@ -1300,11 +1300,11 @@ void KOAgenda::placeAgendaItem( KOAgendaItem *item, double subCellWidth ) xpos = pt.x() + int( subCellPos ); ypos = pt.y(); } - if ( KOGlobals::self()->reverseLayout() ) { // RTL language/tqlayout + if ( KOGlobals::self()->reverseLayout() ) { // RTL language/layout xpos += width; width = -width; } - if ( height<0 ) { // BTT (bottom-to-top) tqlayout ?!? + if ( height<0 ) { // BTT (bottom-to-top) layout ?!? ypos += height; height = -height; } @@ -1708,7 +1708,7 @@ void KOAgenda::insertMultiItem( Event *event, const TQDate &qd, int XBegin, int cellYBottom = rows() - 1; } - newtext = TQString("(%1/%2): ").tqarg( count ).tqarg( width ); + newtext = TQString("(%1/%2): ").arg( count ).arg( width ); newtext.append( event->summary() ); current = insertItem( event, qd, cellX, cellYTop, cellYBottom, count, width ); diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp index 124102b00..f11ea8c01 100644 --- a/korganizer/koagendaitem.cpp +++ b/korganizer/koagendaitem.cpp @@ -562,7 +562,7 @@ void KOAgendaItem::addAttendee( const TQString &newAttendee ) KPIM::getNameAndMail( newAttendee, name, email ); if ( !( name.isEmpty() && email.isEmpty() ) ) { mIncidence->addAttendee(new Attendee(name,email)); - KMessageBox::information( this, i18n("Attendee \"%1\" added to the calendar item \"%2\"").tqarg(KPIM::normalizedAddress(name, email, TQString())).tqarg(text()), i18n("Attendee added"), "AttendeeDroppedAdded" ); + KMessageBox::information( this, i18n("Attendee \"%1\" added to the calendar item \"%2\"").arg(KPIM::normalizedAddress(name, email, TQString())).arg(text()), i18n("Attendee added"), "AttendeeDroppedAdded" ); } } @@ -739,14 +739,14 @@ void KOAgendaItem::paintEvent( TQPaintEvent *ev ) TQRect visRect = visibleRect(); // when scrolling horizontally in the side-by-side view, the repainted area is clipped // to the newly visible area, which is a problem since the content changes when visRect - // changes, so tqrepaint the full item in that case + // changes, so repaint the full item in that case if ( ev->rect() != visRect && visRect.isValid() && ev->rect().isValid() ) { - tqrepaint( visRect ); + repaint( visRect ); return; } TQPainter p( this ); - const int ft = 2; // frame thickness for tqlayout, see paintFrame() + const int ft = 2; // frame thickness for layout, see paintFrame() const int margin = 1 + ft; // frame + space between frame and content // General idea is to always show the icons (even in the all-day events). @@ -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(); } @@ -838,8 +838,8 @@ void KOAgendaItem::paintEvent( TQPaintEvent *ev ) if ( !isMultiItem() ) { shortH = KGlobal::locale()->formatTime(mIncidence->dtStart().time()); if (mIncidence->type() != "Todo") - longH = i18n("%1 - %2").tqarg(shortH) - .tqarg(KGlobal::locale()->formatTime(mIncidence->dtEnd().time())); + longH = i18n("%1 - %2").arg(shortH) + .arg(KGlobal::locale()->formatTime(mIncidence->dtEnd().time())); else longH = shortH; } else if ( !mMultiItemInfo->mFirstMultiItem ) { @@ -847,7 +847,7 @@ void KOAgendaItem::paintEvent( TQPaintEvent *ev ) longH = shortH; } else { shortH = KGlobal::locale()->formatTime(mIncidence->dtEnd().time()); - longH = i18n("- %1").tqarg(shortH); + longH = i18n("- %1").arg(shortH); } KWordWrap *ww = KWordWrap::formatText( fm, @@ -937,8 +937,8 @@ void KOAgendaItem::paintEvent( TQPaintEvent *ev ) (mIncidence->dtStart() != mIncidence->dtEnd()) ) { // multi days shortH = longH = i18n("%1 - %2") - .tqarg(KGlobal::locale()->formatDate(mIncidence->dtStart().date())) - .tqarg(KGlobal::locale()->formatDate(mIncidence->dtEnd().date())); + .arg(KGlobal::locale()->formatDate(mIncidence->dtStart().date())) + .arg(KGlobal::locale()->formatDate(mIncidence->dtEnd().date())); // paint headline p.fillRect( 0, 0, width(), (ft/2) + margin + hlHeight, diff --git a/korganizer/koagendaitem.h b/korganizer/koagendaitem.h index 23a36acf9..c95a9f4fb 100644 --- a/korganizer/koagendaitem.h +++ b/korganizer/koagendaitem.h @@ -53,7 +53,7 @@ struct MultiItemInfo /* The KOAgendaItem has to make sure that it receives all mouse events, which are to be used for dragging and resizing. That means it has to be installed as - eventfiler for its tqchildren, if it has tqchildren, and it has to pass mouse + eventfiler for its children, if it has children, and it has to pass mouse events from the cildren to itself. See eventFilter(). diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp index ba565a8d2..cb604fcf7 100644 --- a/korganizer/koagendaview.cpp +++ b/korganizer/koagendaview.cpp @@ -26,7 +26,7 @@ #include <tqvbox.h> #include <tqlabel.h> #include <tqframe.h> -#include <tqlayout.h> +#include <layout.h> #ifndef KORG_NOSPLITTER #include <tqsplitter.h> #endif @@ -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 ); @@ -476,7 +476,7 @@ void KOAgendaView::zoomInVertically( ) mTimeLabels->updateConfig(); mTimeLabels->positionChanged(); - mTimeLabels->tqrepaint(); + mTimeLabels->repaint(); updateView(); } @@ -493,7 +493,7 @@ void KOAgendaView::zoomOutVertically( ) mTimeLabels->updateConfig(); mTimeLabels->positionChanged(); - mTimeLabels->tqrepaint(); + mTimeLabels->repaint(); updateView(); } @@ -627,16 +627,16 @@ void KOAgendaView::createDayLabels( bool force ) int dW = calsys->dayOfWeek(date); TQString veryLongStr = KGlobal::locale()->formatDate( date ); TQString longstr = i18n( "short_weekday date (e.g. Mon 13)","%1 %2" ) - .tqarg( calsys->weekDayName( dW, true ) ) - .tqarg( calsys->day(date) ); + .arg( calsys->weekDayName( dW, true ) ) + .arg( calsys->day(date) ); TQString shortstr = TQString::number(calsys->day(date)); KOAlternateLabel *dayLabel = new KOAlternateLabel(shortstr, 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(); } @@ -783,7 +783,7 @@ void KOAgendaView::updateConfig() { // kdDebug(5850) << "KOAgendaView::updateConfig()" << endl; - // update config for tqchildren + // update config for children mTimeLabels->updateConfig(); mAgenda->updateConfig(); mAllDayAgenda->updateConfig(); @@ -793,7 +793,7 @@ void KOAgendaView::updateConfig() mTimeLabels->positionChanged(); // for some reason, this needs to be called explicitly - mTimeLabels->tqrepaint(); + mTimeLabels->repaint(); updateTimeBarWidth(); @@ -1343,7 +1343,7 @@ void KOAgendaView::changeIncidenceDisplay( Incidence *incidence, int mode ) } // HACK: Update the view if the all-day agenda has been modified. - // Do this because there are some tqlayout problems in the + // Do this because there are some layout problems in the // all-day agenda that are not easily solved, but clearing // and redrawing works ok. if ( incidence->doesFloat() ) { @@ -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..e20c42db1 100644 --- a/korganizer/koapp.cpp +++ b/korganizer/koapp.cpp @@ -57,7 +57,7 @@ using namespace std; KOrganizerApp::KOrganizerApp() : KUniqueApplication() { TQString prodId = "-//K Desktop Environment//NONSGML KOrganizer %1//EN"; - CalFormat::setApplication( "KOrganizer", prodId.tqarg( korgVersion ) ); + CalFormat::setApplication( "KOrganizer", prodId.arg( korgVersion ) ); } KOrganizerApp::~KOrganizerApp() @@ -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..cb5ca0122 100644 --- a/korganizer/koattendeeeditor.cpp +++ b/korganizer/koattendeeeditor.cpp @@ -49,7 +49,7 @@ #include <tqcombobox.h> #include <tqhbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <tqwhatsthis.h> @@ -61,10 +61,10 @@ KOAttendeeEditor::KOAttendeeEditor( TQWidget * parent, const char *name ) : { } -void KOAttendeeEditor::initOrganizerWidgets(TQWidget * parent, TQBoxLayout * tqlayout) +void KOAttendeeEditor::initOrganizerWidgets(TQWidget * parent, TQBoxLayout * layout) { mOrganizerHBox = new TQHBox( parent ); - tqlayout->addWidget( mOrganizerHBox ); + layout->addWidget( mOrganizerHBox ); // If creating a new event, then the user is the organizer -> show the // identity combo // readEvent will delete it and set another label text instead, if the user @@ -91,10 +91,10 @@ void KOAttendeeEditor::initOrganizerWidgets(TQWidget * parent, TQBoxLayout * tql mOrganizerHBox->setStretchFactor( mOrganizerCombo, 100 ); } -void KOAttendeeEditor::initEditWidgets(TQWidget * parent, TQBoxLayout * tqlayout) +void KOAttendeeEditor::initEditWidgets(TQWidget * parent, TQBoxLayout * layout) { TQGridLayout *topLayout = new TQGridLayout(); - tqlayout->addLayout( topLayout ); + layout->addLayout( topLayout ); TQString whatsThis = i18n("Edits the name of the attendee selected in the list " "above, or adds a new attendee if there are no attendees" @@ -309,7 +309,7 @@ void KOAttendeeEditor::readEvent(KCal::Incidence * incidence) delete mOrganizerCombo; mOrganizerCombo = 0; } - mOrganizerLabel->setText( i18n( "Organizer: %1" ).tqarg( incidence->organizer().fullName() ) ); + mOrganizerLabel->setText( i18n( "Organizer: %1" ).arg( incidence->organizer().fullName() ) ); } Attendee::List al = incidence->attendees(); @@ -430,7 +430,7 @@ void KOAttendeeEditor::updateAttendee() a->setUid( mUid ); a->setEmail( email ); a->setRole( Attendee::Role( mRoleCombo->currentItem() ) ); - a->setqStatus( Attendee::PartStat( mStatusCombo->currentItem() ) ); + a->seStatus( Attendee::PartStat( mStatusCombo->currentItem() ) ); a->setRSVP( mRsvpButton->isChecked() ); updateCurrentItem(); @@ -477,9 +477,9 @@ void KOAttendeeEditor::fillAttendeeInput( KCal::Attendee *a ) if ( a->status() == Attendee::Delegated ) { if ( !a->delegate().isEmpty() ) - mDelegateLabel->setText( i18n( "Delegated to %1" ).tqarg( a->delegate() ) ); + mDelegateLabel->setText( i18n( "Delegated to %1" ).arg( a->delegate() ) ); else if ( !a->delegator().isEmpty() ) - mDelegateLabel->setText( i18n( "Delegated from %1" ).tqarg( a->delegator() ) ); + mDelegateLabel->setText( i18n( "Delegated from %1" ).arg( a->delegator() ) ); else mDelegateLabel->setText( i18n( "Not delegated" ) ); } diff --git a/korganizer/koattendeeeditor.h b/korganizer/koattendeeeditor.h index 828bf479e..0719744bf 100644 --- a/korganizer/koattendeeeditor.h +++ b/korganizer/koattendeeeditor.h @@ -68,8 +68,8 @@ class KOAttendeeEditor : public TQWidget void updateAttendeeSummary( int count ); protected: - void initOrganizerWidgets( TQWidget *parent, TQBoxLayout *tqlayout ); - void initEditWidgets( TQWidget *parent, TQBoxLayout *tqlayout ); + void initOrganizerWidgets( TQWidget *parent, TQBoxLayout *layout ); + void initEditWidgets( TQWidget *parent, TQBoxLayout *layout ); /** Reads values from a KABC::Addressee and inserts a new Attendee * item into the listview with those items. Used when adding attendees diff --git a/korganizer/kocore.cpp b/korganizer/kocore.cpp index b3781e2d9..7503d2de4 100644 --- a/korganizer/kocore.cpp +++ b/korganizer/kocore.cpp @@ -67,7 +67,7 @@ KTrader::OfferList KOCore::availablePlugins( const TQString &type, int version ) TQString constraint; if ( version >= 0 ) { constraint = TQString("[X-KDE-PluginInterfaceVersion] == %1") - .tqarg( TQString::number( version ) ); + .arg( TQString::number( version ) ); } return KTrader::self()->query( type, constraint ); @@ -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..1ced5338e 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; } } @@ -386,15 +386,15 @@ void KODayMatrix::mouseReleaseEvent( TQMouseEvent *e ) mSelEnd = mSelInit; if (tmp != mSelStart) { mSelStart = tmp; - tqrepaint(); + repaint(); } } else { mSelStart = mSelInit; - //tqrepaint only if selection has changed + //repaint only if selection has changed if (tmp != mSelEnd) { mSelEnd = tmp; - tqrepaint(); + repaint(); } } @@ -415,15 +415,15 @@ void KODayMatrix::mouseMoveEvent( TQMouseEvent *e ) mSelEnd = mSelInit; if ( tmp != mSelStart ) { mSelStart = tmp; - tqrepaint(); + repaint(); } } else { mSelStart = mSelInit; - //tqrepaint only if selection has changed + //repaint only if selection has changed if ( tmp != mSelEnd ) { mSelEnd = tmp; - tqrepaint(); + repaint(); } } } @@ -562,9 +562,9 @@ void KODayMatrix::paintEvent( TQPaintEvent * ) int selw, selh; bool isRTL = KOGlobals::self()->reverseLayout(); - TQColorGroup cg = tqpalette().active(); + TQColorGroup cg = palette().active(); - p.tqbegin( &pm, this ); + p.begin( &pm, this ); pm.fill( cg.base() ); // draw topleft frame diff --git a/korganizer/kodaymatrix.h b/korganizer/kodaymatrix.h index 37a48ebd2..d24264253 100644 --- a/korganizer/kodaymatrix.h +++ b/korganizer/kodaymatrix.h @@ -132,7 +132,7 @@ class KODayMatrix: public TQFrame, public KCal::Calendar::Observer /** updates the day matrix to start with the given date. Does all the necessary * checks for holidays or events on a day and stores them for display later on. - * Does NOT update the view visually. Call tqrepaint() for this. + * Does NOT update the view visually. Call repaint() for this. * * @param actdate recalculates the day matrix to show NUMDAYS starting from this * date. @@ -162,7 +162,7 @@ class KODayMatrix: public TQFrame, public KCal::Calendar::Observer /** sets the actual to be displayed selection in the day matrix starting from * start and ending with end. Theview must be manually updated by calling - * tqrepaint. (?) + * repaint. (?) */ void setSelectedDaysFrom( const TQDate &start, const TQDate &end ); @@ -313,7 +313,7 @@ class KODayMatrix: public TQFrame, public KCal::Calendar::Observer int mTodayMarginWidth; /** stores actual size of each day in the widget so that I don't need to ask this data - * on every tqrepaint. + * on every repaint. */ TQRect mDaySize; diff --git a/korganizer/kodialogmanager.cpp b/korganizer/kodialogmanager.cpp index 91e0e27d0..83ceec0ea 100644 --- a/korganizer/kodialogmanager.cpp +++ b/korganizer/kodialogmanager.cpp @@ -111,8 +111,8 @@ KODialogManager::~KODialogManager() void KODialogManager::errorSaveIncidence( TQWidget *parent, Incidence *incidence ) { KMessageBox::sorry( parent, i18n("Unable to save %1 \"%2\".") - .tqarg( i18n( incidence->type() ) ) - .tqarg( incidence->summary() ) ); + .arg( i18n( incidence->type() ) ) + .arg( incidence->summary() ) ); } void KODialogManager::showOptionsDialog() diff --git a/korganizer/koeditoralarms.cpp b/korganizer/koeditoralarms.cpp index 4211e93a9..2cbcf533e 100644 --- a/korganizer/koeditoralarms.cpp +++ b/korganizer/koeditoralarms.cpp @@ -29,14 +29,14 @@ #include <libkcal/duration.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlistview.h> #include <tqpushbutton.h> #include <tqspinbox.h> #include <tqcombobox.h> #include <tqcheckbox.h> #include <tqbuttongroup.h> -#include <tqtextedit.h> +#include <textedit.h> #include <tqwidgetstack.h> #include <tqradiobutton.h> #include <tqtooltip.h> @@ -167,13 +167,13 @@ void AlarmListViewItem::construct() if ( offset % (24*60) == 0 && offset>0 ) { // divides evenly into days? useoffset = offset / (24*60); - offsetstr = offsetstr.tqarg( i18n("1 day", "%n days", useoffset ) ); + offsetstr = offsetstr.arg( i18n("1 day", "%n days", useoffset ) ); } else if (offset % 60 == 0 && offset>0 ) { // divides evenly into hours? useoffset = offset / 60; - offsetstr = offsetstr.tqarg( i18n("1 hour", "%n hours", useoffset ) ); + offsetstr = offsetstr.arg( i18n("1 hour", "%n hours", useoffset ) ); } else { useoffset = offset; - offsetstr = offsetstr.tqarg( i18n("1 minute", "%n minutes", useoffset ) ); + offsetstr = offsetstr.arg( i18n("1 minute", "%n minutes", useoffset ) ); } setText( ColAlarmOffset, offsetstr ); diff --git a/korganizer/koeditoralarms_base.ui b/korganizer/koeditoralarms_base.ui index 9f599b6fd..716252f2a 100644 --- a/korganizer/koeditoralarms_base.ui +++ b/korganizer/koeditoralarms_base.ui @@ -35,7 +35,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -109,7 +109,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <grid> <property name="name"> @@ -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> @@ -530,7 +530,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <grid> <property name="name"> @@ -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..08e80b101 100644 --- a/korganizer/koeditorattachments.cpp +++ b/korganizer/koeditorattachments.cpp @@ -58,14 +58,14 @@ #include <tqcheckbox.h> #include <tqfile.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlistview.h> #include <tqpushbutton.h> #include <tqdragobject.h> #include <tqtooltip.h> #include <tqwhatsthis.h> #include <tqapplication.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <cassert> #include <cstdlib> @@ -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() ); } @@ -718,7 +718,7 @@ void KOEditorAttachments::slotRemove() if ( KMessageBox::questionYesNo( this, - i18n( "<qt>Do you really want to remove these attachments?<p>%1</qt>" ).tqarg( labelsStr ), + i18n( "<qt>Do you really want to remove these attachments?<p>%1</qt>" ).arg( labelsStr ), i18n( "Remove Attachment?" ), KStdGuiItem::yes(), KStdGuiItem::no(), "calendarRemoveAttachments" ) != KMessageBox::Yes ) { @@ -874,7 +874,7 @@ void KOEditorAttachments::writeIncidence( KCal::Incidence *i ) void KOEditorAttachments::slotCopy() { - TQApplication::tqclipboard()->setData( mAttachments->mimeData(), TQClipboard::Clipboard ); + TQApplication::clipboard()->setData( mAttachments->mimeData(), TQClipboard::Clipboard ); } void KOEditorAttachments::slotCut() @@ -885,7 +885,7 @@ void KOEditorAttachments::slotCut() void KOEditorAttachments::slotPaste() { - handlePasteOrDrop( TQApplication::tqclipboard()->data() ); + handlePasteOrDrop( TQApplication::clipboard()->data() ); } void KOEditorAttachments::selectionChanged() diff --git a/korganizer/koeditordetails.cpp b/korganizer/koeditordetails.cpp index a47dc7374..d181e5a71 100644 --- a/korganizer/koeditordetails.cpp +++ b/korganizer/koeditordetails.cpp @@ -33,7 +33,7 @@ #include <tqfiledialog.h> #include <tqgroupbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlineedit.h> #include <tqpushbutton.h> #include <tqradiobutton.h> @@ -329,7 +329,7 @@ void KOEditorDetails::writeEvent(Incidence *event) bool skip = false; if ( attendee->email().endsWith( "example.net" ) ) { if ( KMessageBox::warningYesNo( this, i18n("%1 does not look like a valid email address. " - "Are you sure you want to invite this participant?").tqarg( attendee->email() ), + "Are you sure you want to invite this participant?").arg( attendee->email() ), i18n("Invalid email address") ) != KMessageBox::Yes ) { skip = true; } @@ -407,7 +407,7 @@ void KOEditorDetails::changeStatusForMe(Attendee::PartStat status) AttendeeListItem *item = static_cast<AttendeeListItem*>( it.current() ); for ( TQStringList::ConstIterator it2( myEmails.begin() ), end( myEmails.end() ); it2 != end; ++it2 ) { if ( item->data()->email() == *it2 ) { - item->data()->setqStatus( status ); + item->data()->seStatus( status ); item->updateItem(); } } diff --git a/korganizer/koeditorfreebusy.cpp b/korganizer/koeditorfreebusy.cpp index 2fc7b30fd..d19c2c90a 100644 --- a/korganizer/koeditorfreebusy.cpp +++ b/korganizer/koeditorfreebusy.cpp @@ -23,7 +23,7 @@ */ #include <tqtooltip.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqcombobox.h> #include <tqpushbutton.h> @@ -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 ); } @@ -699,7 +699,7 @@ void KOEditorFreeBusy::updateStatusSummary() mStatusSummaryLabel->setText( i18n( "Of the %1 participants, %2 have accepted, %3" " have tentatively accepted, and %4 have declined.") - .tqarg( total ).tqarg( accepted ).tqarg( tentative ).tqarg( declined ) ); + .arg( total ).arg( accepted ).arg( tentative ).arg( declined ) ); } else { mStatusSummaryLabel->hide(); } @@ -783,7 +783,7 @@ void KOEditorFreeBusy::writeEvent(KCal::Event * event) bool skip = false; if ( attendee->email().endsWith( "example.net" ) ) { if ( KMessageBox::warningYesNo( this, i18n("%1 does not look like a valid email address. " - "Are you sure you want to invite this participant?").tqarg( attendee->email() ), + "Are you sure you want to invite this participant?").arg( attendee->email() ), i18n("Invalid email address") ) != KMessageBox::Yes ) { skip = true; } @@ -852,8 +852,8 @@ void KOEditorFreeBusy::clearSelection() const KDGanttViewItem *item = mGanttView->selectedItem(); if ( item ) mGanttView->setSelected( item, false ); - mGanttView->tqrepaint(); - item->tqrepaint(); + mGanttView->repaint(); + item->repaint(); } void KOEditorFreeBusy::setSelected( int index ) @@ -890,7 +890,7 @@ void KOEditorFreeBusy::changeStatusForMe(KCal::Attendee::PartStat status) { for ( TQStringList::ConstIterator it2( myEmails.begin() ), end( myEmails.end() ); it2 != end; ++it2 ) { if ( item->attendee()->email() == *it2 ) { - item->attendee()->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/koeditorgeneral.cpp b/korganizer/koeditorgeneral.cpp index 8e4cb166c..805739371 100644 --- a/korganizer/koeditorgeneral.cpp +++ b/korganizer/koeditorgeneral.cpp @@ -25,7 +25,7 @@ #include <tqwidget.h> #include <tqtooltip.h> -#include <tqlayout.h> +#include <layout.h> #include <tqvbox.h> #include <tqhbox.h> #include <tqbuttongroup.h> @@ -426,7 +426,7 @@ void KOEditorGeneral::updateAlarmWidgets( Incidence *incidence ) remStr = remStr.left( maxLen ); remStr += etc; } - mAlarmInfoLabel->setText( i18n( "Triggers %1" ).tqarg( remStr ) ); + mAlarmInfoLabel->setText( i18n( "Triggers %1" ).arg( remStr ) ); } } else { // alarm count is 1 Alarm *alarm = mAlarmList.first(); @@ -465,7 +465,7 @@ void KOEditorGeneral::updateAlarmWidgets( Incidence *incidence ) mSimpleAlarmBox->hide(); if ( incidence ) { TQString remStr = IncidenceFormatter::reminderStringList( incidence ).first(); - mAlarmInfoLabel->setText( i18n( "Triggers %1" ).tqarg( remStr ) ); + mAlarmInfoLabel->setText( i18n( "Triggers %1" ).arg( remStr ) ); } } } @@ -497,7 +497,7 @@ void KOEditorGeneral::readIncidence( Incidence *incidence, Calendar *calendar ) TQString resLabel = IncidenceFormatter::resourceString( calendar, incidence ); if ( !resLabel.isEmpty() ) { - mResourceLabel->setText( i18n( "Calendar: %1" ).tqarg( resLabel ) ); + mResourceLabel->setText( i18n( "Calendar: %1" ).arg( resLabel ) ); mResourceLabel->show(); } } diff --git a/korganizer/koeditorgeneralevent.cpp b/korganizer/koeditorgeneralevent.cpp index e069d65de..a916b3741 100644 --- a/korganizer/koeditorgeneralevent.cpp +++ b/korganizer/koeditorgeneralevent.cpp @@ -23,7 +23,7 @@ */ #include <tqtooltip.h> -#include <tqlayout.h> +#include <layout.h> #include <tqvbox.h> #include <tqbuttongroup.h> #include <tqvgroupbox.h> @@ -193,15 +193,15 @@ void KOEditorGeneralEvent::initClass(TQWidget *parent,TQBoxLayout *topLayout) freeTimeLabel->setBuddy( mFreeTimeCombo ); } -void KOEditorGeneralEvent::initInvitationBar(TQWidget * parent, TQBoxLayout * tqlayout) +void KOEditorGeneralEvent::initInvitationBar(TQWidget * parent, TQBoxLayout * layout) { - TQBoxLayout *topLayout = new TQHBoxLayout( tqlayout ); + TQBoxLayout *topLayout = new TQHBoxLayout( layout ); mInvitationBar = new TQFrame( parent ); mInvitationBar->setPaletteBackgroundColor( KGlobalSettings::alternateBackgroundColor() ); topLayout->addWidget( mInvitationBar ); TQBoxLayout *barLayout = new TQHBoxLayout( mInvitationBar ); - barLayout->setSpacing( tqlayout->spacing() ); + barLayout->setSpacing( layout->spacing() ); TQLabel *label = new TQLabel( i18n("You have not yet definitely responded to this invitation." ), mInvitationBar ); barLayout->addWidget( label ); barLayout->addStretch( 1 ); @@ -479,8 +479,8 @@ void KOEditorGeneralEvent::emitDateTimeStr() to = l->formatDateTime(mCurrEndDateTime); } - TQString str = i18n("From: %1 To: %2 %3").tqarg(from).tqarg(to) - .tqarg(mDurationLabel->text()); + TQString str = i18n("From: %1 To: %2 %3").arg(from).arg(to) + .arg(mDurationLabel->text()); emit dateTimeStrChanged(str); } @@ -493,14 +493,14 @@ bool KOEditorGeneralEvent::validateInput() if (!mStartTimeEdit->inputIsValid()) { KMessageBox::sorry( 0, i18n("Please specify a valid start time, for example '%1'.") - .tqarg( KGlobal::locale()->formatTime( TQTime::currentTime() ) ) ); + .arg( KGlobal::locale()->formatTime( TQTime::currentTime() ) ) ); return false; } if (!mEndTimeEdit->inputIsValid()) { KMessageBox::sorry( 0, i18n("Please specify a valid end time, for example '%1'.") - .tqarg( KGlobal::locale()->formatTime( TQTime::currentTime() ) ) ); + .arg( KGlobal::locale()->formatTime( TQTime::currentTime() ) ) ); return false; } } @@ -508,14 +508,14 @@ bool KOEditorGeneralEvent::validateInput() if (!mStartDateEdit->date().isValid()) { KMessageBox::sorry( 0, i18n("Please specify a valid start date, for example '%1'.") - .tqarg( KGlobal::locale()->formatDate( TQDate::tqcurrentDate() ) ) ); + .arg( KGlobal::locale()->formatDate( TQDate::currentDate() ) ) ); return false; } if (!mEndDateEdit->date().isValid()) { KMessageBox::sorry( 0, i18n("Please specify a valid end date, for example '%1'.") - .tqarg( KGlobal::locale()->formatDate( TQDate::tqcurrentDate() ) ) ); + .arg( KGlobal::locale()->formatDate( TQDate::currentDate() ) ) ); return false; } diff --git a/korganizer/koeditorgeneralevent.h b/korganizer/koeditorgeneralevent.h index 734826eb9..037b2323b 100644 --- a/korganizer/koeditorgeneralevent.h +++ b/korganizer/koeditorgeneralevent.h @@ -49,7 +49,7 @@ class KOEditorGeneralEvent : public KOEditorGeneral void initTime(TQWidget *,TQBoxLayout *); void initClass(TQWidget *,TQBoxLayout *); - void initInvitationBar( TQWidget* parent, TQBoxLayout *tqlayout ); + void initInvitationBar( TQWidget* parent, TQBoxLayout *layout ); void finishSetup(); diff --git a/korganizer/koeditorgeneraljournal.cpp b/korganizer/koeditorgeneraljournal.cpp index 25372ba49..fa3e40ac4 100644 --- a/korganizer/koeditorgeneraljournal.cpp +++ b/korganizer/koeditorgeneraljournal.cpp @@ -41,7 +41,7 @@ #include <tqdatetime.h> #include <tqcheckbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqwhatsthis.h> @@ -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() ) ) ); + .arg( KGlobal::locale()->formatDate( TQDate::currentDate() ) ) ); return false; } diff --git a/korganizer/koeditorgeneraltodo.cpp b/korganizer/koeditorgeneraltodo.cpp index fe2fbe2b2..f9cb9d7ec 100644 --- a/korganizer/koeditorgeneraltodo.cpp +++ b/korganizer/koeditorgeneraltodo.cpp @@ -24,7 +24,7 @@ #include <tqtooltip.h> #include <tqfiledialog.h> -#include <tqlayout.h> +#include <layout.h> #include <tqvbox.h> #include <tqbuttongroup.h> #include <tqvgroupbox.h> @@ -206,7 +206,7 @@ void KOEditorGeneralTodo::initCompletion( TQWidget *parent, TQBoxLayout *topLayo i18n( "Use this combobox to set the completion percentage of the to-do." ) ); for ( int i = 0; i <= 100; i+=10 ) { // xgettext:no-c-format - TQString label = i18n( "Percent complete", "%1 %" ).tqarg( i ); + TQString label = i18n( "Percent complete", "%1 %" ).arg( i ); mCompletedCombo->insertItem( label ); } connect( mCompletedCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(completedChanged(int)) ); @@ -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 ); } @@ -569,18 +569,18 @@ void KOEditorGeneralTodo::dateChanged() TQString dateTimeStr = ""; if ( mStartCheck->isChecked() ) { - dateTimeStr += i18n("Start: %1").tqarg( + dateTimeStr += i18n("Start: %1").arg( l->formatDate( mStartDateEdit->date() ) ); if ( mTimeButton->isChecked() ) - dateTimeStr += TQString(" %1").tqarg( + dateTimeStr += TQString(" %1").arg( l->formatTime( mStartTimeEdit->getTime() ) ); } if ( mDueCheck->isChecked() ) { - dateTimeStr += i18n(" Due: %1").tqarg( + dateTimeStr += i18n(" Due: %1").arg( l->formatDate( mDueDateEdit->date() ) ); if ( mTimeButton->isChecked() ) - dateTimeStr += TQString(" %1").tqarg( + dateTimeStr += TQString(" %1").arg( l->formatTime( mDueTimeEdit->getTime() ) ); } diff --git a/korganizer/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..a8b6c816f 100644 --- a/korganizer/koeditorrecurrence.cpp +++ b/korganizer/koeditorrecurrence.cpp @@ -24,7 +24,7 @@ #include <tqtooltip.h> #include <tqfiledialog.h> -#include <tqlayout.h> +#include <layout.h> #include <tqvbox.h> #include <tqbuttongroup.h> #include <tqvgroupbox.h> @@ -135,10 +135,10 @@ TQComboBox *RecurBase::createMonthNameCombo( TQWidget *parent, const char *name return combo; } -TQBoxLayout *RecurBase::createFrequencySpinBar( TQWidget *parent, TQLayout *tqlayout, +TQBoxLayout *RecurBase::createFrequencySpinBar( TQWidget *parent, TQLayout *layout, TQString everyText, TQString unitText ) { - TQBoxLayout *freqLayout = new TQHBoxLayout( tqlayout ); + TQBoxLayout *freqLayout = new TQHBoxLayout( layout ); TQString whatsThis = i18n("Sets how often this event or to-do should recur."); TQLabel *preLabel = new TQLabel( everyText, parent ); @@ -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( @@ -824,7 +824,7 @@ void RecurrenceRangeWidget::setDateTimes( const TQDateTime &start, const TQDateTime & ) { mStartDateLabel->setText( i18n("Begins on: %1") - .tqarg( KGlobal::locale()->formatDate( start.date() ) ) ); + .arg( KGlobal::locale()->formatDate( start.date() ) ) ); } ///////////////////////// RecurrenceRangeDialog /////////////////////////// @@ -1394,8 +1394,8 @@ bool KOEditorRecurrence::validateInput() mEventStartDt.isValid() && ((mRecurrenceRange->endDate())<mEventStartDt.date()) ) { KMessageBox::sorry( 0, i18n("The end date '%1' of the recurrence must be after the start date '%2' of the event.") - .tqarg( KGlobal::locale()->formatDate( mRecurrenceRange->endDate() ) ) - .tqarg( KGlobal::locale()->formatDate( mEventStartDt.date() ) ) ); + .arg( KGlobal::locale()->formatDate( mRecurrenceRange->endDate() ) ) + .arg( KGlobal::locale()->formatDate( mEventStartDt.date() ) ) ); return false; } int recurrenceType = mRecurrenceChooser->type(); diff --git a/korganizer/koeditorrecurrence.h b/korganizer/koeditorrecurrence.h index 1592f4272..f3aeeb41d 100644 --- a/korganizer/koeditorrecurrence.h +++ b/korganizer/koeditorrecurrence.h @@ -61,7 +61,7 @@ class RecurBase : public TQWidget static TQComboBox *createWeekCountCombo( TQWidget *parent=0, const char *name=0 ); static TQComboBox *createWeekdayCombo( TQWidget *parent=0, const char *name=0 ); static TQComboBox *createMonthNameCombo( TQWidget *parent=0, const char *name=0 ); - TQBoxLayout *createFrequencySpinBar( TQWidget *parent, TQLayout *tqlayout, + TQBoxLayout *createFrequencySpinBar( TQWidget *parent, TQLayout *layout, TQString everyText, TQString unitText ); private: diff --git a/korganizer/koeventeditor.cpp b/korganizer/koeventeditor.cpp index c73a67ac2..dbbdfe127 100644 --- a/korganizer/koeventeditor.cpp +++ b/korganizer/koeventeditor.cpp @@ -26,7 +26,7 @@ #include <tqtooltip.h> #include <tqframe.h> #include <tqpixmap.h> -#include <tqlayout.h> +#include <layout.h> #include <tqwidgetstack.h> #include <tqwhatsthis.h> @@ -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 ) ); @@ -285,7 +285,7 @@ bool KOEventEditor::processInput() // add dummy event at the position of the counter proposal Event *event = mEvent->clone(); event->clearAttendees(); - event->setSummary( i18n("My counter proposal for: %1").tqarg( mEvent->summary() ) ); + event->setSummary( i18n("My counter proposal for: %1").arg( mEvent->summary() ) ); mChanger->addIncidence( event, mResource, mSubResource, this ); } else { if ( mRecurIncidence && mRecurIncidenceAfterDissoc ) { diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp index a9746dbe9..2596f0b66 100644 --- a/korganizer/koeventviewer.cpp +++ b/korganizer/koeventviewer.cpp @@ -62,7 +62,7 @@ void KOEventViewer::message( const TQString &link ) if ( link.startsWith( "kmail:" ) ) { ttStr = i18n( "Open the message in KMail" ); } else if ( link.startsWith( "mailto:" ) ) { - ttStr = i18n( "Send an email message to %1" ).tqarg( link.mid( 7 ) ); + ttStr = i18n( "Send an email message to %1" ).arg( link.mid( 7 ) ); } else if ( link.startsWith( "uid:" ) ) { ttStr = i18n( "Lookup the contact in KAddressbook" ); } else if ( link.startsWith( "ATTACH:" ) ) { @@ -70,7 +70,7 @@ void KOEventViewer::message( const TQString &link ) tmp.remove( TQRegExp( "^ATTACH://" ) ); TQString uid = tmp.section( ':', 0, 0 ); TQString name = tmp.section( ':', -1, -1 ); - ttStr = i18n( "View attachment \"%1\"" ).tqarg( name ); + ttStr = i18n( "View attachment \"%1\"" ).arg( name ); mAttachLink = link; } else { // no special URI, let KDE handle it ttStr = i18n( "Launch a viewer on the link" ); @@ -85,7 +85,7 @@ void KOEventViewer::readSettings( KConfig * config ) // With each restart of KOrganizer the font site gets halfed. What should this // be good for? #if 0 - config->setGroup( TQString("EventViewer-%1").tqarg( name() ) ); + config->setGroup( TQString("EventViewer-%1").arg( name() ) ); int zoomFactor = config->readNumEntry("ZoomFactor", pointSize() ); zoomTo( zoomFactor/2 ); kdDebug(5850) << " KOEventViewer: restoring the pointSize: "<< pointSize() @@ -98,7 +98,7 @@ void KOEventViewer::writeSettings( KConfig * config ) { if ( config ) { kdDebug(5850) << " KOEventViewer: saving the zoomFactor: "<< pointSize() << endl; - config->setGroup( TQString("EventViewer-%1").tqarg( name() ) ); + config->setGroup( TQString("EventViewer-%1").arg( name() ) ); config->writeEntry("ZoomFactor", pointSize() ); } } diff --git a/korganizer/koeventviewer.h b/korganizer/koeventviewer.h index bebbb4ed2..d7408aedc 100644 --- a/korganizer/koeventviewer.h +++ b/korganizer/koeventviewer.h @@ -26,7 +26,7 @@ #include <tdepimmacros.h> #include <kconfig.h> -#include <tqtextbrowser.h> +#include <textbrowser.h> namespace KCal { class Calendar; diff --git a/korganizer/kogroupware.cpp b/korganizer/kogroupware.cpp index 5104383c1..10c6a1c1e 100644 --- a/korganizer/kogroupware.cpp +++ b/korganizer/kogroupware.cpp @@ -163,7 +163,7 @@ void KOGroupware::incomingDirChanged( const TQString& path ) if ( !message ) { TQString errorMessage; if (mFormat.exception()) - errorMessage = i18n( "Error message: %1" ).tqarg( mFormat.exception()->message() ); + errorMessage = i18n( "Error message: %1" ).arg( mFormat.exception()->message() ); kdDebug(5850) << "MailScheduler::retrieveTransactions() Error parsing " << errorMessage << endl; KMessageBox::detailedError( mView, @@ -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; } } @@ -401,7 +401,7 @@ void KOGroupware::sendCounterProposal(KCal::Calendar *calendar, KCal::Event * ol return; if ( KOPrefs::instance()->outlookCompatCounterProposals() ) { Incidence* tmp = oldEvent->clone(); - tmp->setSummary( i18n("Counter proposal: %1").tqarg( newEvent->summary() ) ); + tmp->setSummary( i18n("Counter proposal: %1").arg( newEvent->summary() ) ); tmp->setDescription( newEvent->description() ); tmp->addComment( i18n("Proposed new meeting time: %1 - %2"). arg( IncidenceFormatter::dateToString( newEvent->dtStart() ), diff --git a/korganizer/kogroupwareprefspage.ui b/korganizer/kogroupwareprefspage.ui index feec8d710..24cf9bbfc 100644 --- a/korganizer/kogroupwareprefspage.ui +++ b/korganizer/kogroupwareprefspage.ui @@ -41,7 +41,7 @@ <property name="text"> <string>By publishing Free/Busy information, you allow others to take your calendar into account when inviting you for a meeting. Only the times you have already busy are published, not why they are busy. For Kolab2 Server leave this disabled (the information is generated on the server).</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -60,7 +60,7 @@ Note: If KOrganizer is acting as a KDE Kolab client, this is not required, as th </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <hbox> <property name="name"> @@ -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> @@ -319,7 +319,7 @@ Ask the server administrator for this information.</string> <property name="text"> <string>By retrieving Free/Busy information that others have published, you can take their calendar into account when inviting them to a meeting.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -422,7 +422,7 @@ For example: "https://kolab2.example.com/freebusy/user.xfb"</string> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout13</cstring> + <cstring>layout13</cstring> </property> <grid> <property name="name"> @@ -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/koincidenceeditor.cpp b/korganizer/koincidenceeditor.cpp index 0a027181b..eb4880740 100644 --- a/korganizer/koincidenceeditor.cpp +++ b/korganizer/koincidenceeditor.cpp @@ -26,7 +26,7 @@ #include <tqframe.h> #include <tqguardedptr.h> #include <tqpixmap.h> -#include <tqlayout.h> +#include <layout.h> #include <tqwidgetstack.h> #include <tqdatetime.h> #include <tqwhatsthis.h> @@ -172,12 +172,12 @@ void KOIncidenceEditor::slotLoadTemplate( const TQString& templateName ) if ( fileName.isEmpty() ) { KMessageBox::error( this, i18n("Unable to find template '%1'.") - .tqarg( fileName ) ); + .arg( fileName ) ); } else { ICalFormat format; if ( !format.load( &cal, fileName ) ) { KMessageBox::error( this, i18n("Error loading template file '%1'.") - .tqarg( fileName ) ); + .arg( fileName ) ); return; } } diff --git a/korganizer/kojournaleditor.cpp b/korganizer/kojournaleditor.cpp index 30e6c7d71..458b2163e 100644 --- a/korganizer/kojournaleditor.cpp +++ b/korganizer/kojournaleditor.cpp @@ -39,7 +39,7 @@ #include <klocale.h> #include <kdebug.h> -#include <tqlayout.h> +#include <layout.h> using namespace KCal; @@ -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..0eee35a24 100644 --- a/korganizer/kojournalview.cpp +++ b/korganizer/kojournalview.cpp @@ -25,7 +25,7 @@ // // View of Journal entries -#include <tqlayout.h> +#include <layout.h> #include <tqpopupmenu.h> #include <tqvbox.h> #include <tqlabel.h> @@ -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..b714041cf 100644 --- a/korganizer/kolistview.cpp +++ b/korganizer/kolistview.cpp @@ -25,7 +25,7 @@ */ #include <tqlistview.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpopupmenu.h> #include <tqcursor.h> #include <tqstyle.h> @@ -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(); } @@ -299,7 +299,7 @@ void KOListView::showDates( bool show ) mListView->setColumnWidth( 1, oldColWidth1 ); mListView->setColumnWidth( 3, oldColWidth3 ); } - mListView->tqrepaint(); + mListView->repaint(); } void KOListView::showDates() @@ -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..5f6fd8ca7 100644 --- a/korganizer/komonthview.cpp +++ b/korganizer/komonthview.cpp @@ -34,7 +34,7 @@ #include <tqpainter.h> #include <tqcursor.h> #include <tqlistbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <kdebug.h> @@ -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 ); @@ -425,8 +425,8 @@ void MonthViewCell::setDate( const TQDate &date ) TQString text; if ( KOGlobals::self()->calendarSystem()->day( date ) == 1 ) { text = i18n("'Month day' for month view cells", "%1 %2") - .tqarg( KOGlobals::self()->calendarSystem()->monthName( date, true ) ) - .tqarg( KOGlobals::self()->calendarSystem()->day(mDate) ); + .arg( KOGlobals::self()->calendarSystem()->monthName( date, true ) ) + .arg( KOGlobals::self()->calendarSystem()->day(mDate) ); TQFontMetrics fm( mLabel->font() ); mLabel->resize( mLabelSize + TQSize( fm.width( text ), 0 ) ); } else { @@ -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,14 +828,14 @@ 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 ); dayLayout->addMultiCellWidget( mLabel, 0, 0, 0, mDaysPerWeek ); // create the day of the week labels (Sun, Mon, etc) and add them to - // the tqlayout. + // the layout. mDayLabels.resize( mDaysPerWeek ); int i; for( i = 0; i < mDaysPerWeek; i++ ) { @@ -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; } @@ -976,8 +976,8 @@ void KOMonthView::showDates( const TQDate &start, const TQDate & ) mStartDate = mStartDate.addDays( -weekdayCol ); mLabel->setText( i18n( "monthname year", "%1 %2" ) - .tqarg( calSys->monthName( start ) ) - .tqarg( calSys->year( start ) ) ); + .arg( calSys->monthName( start ) ) + .arg( calSys->year( start ) ) ); showLabel( !KOPrefs::instance()->fullViewMonth() ); diff --git a/korganizer/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/koprefs.cpp b/korganizer/koprefs.cpp index 5b431f8e4..a7c4eea21 100644 --- a/korganizer/koprefs.cpp +++ b/korganizer/koprefs.cpp @@ -364,7 +364,7 @@ TQStringList KOPrefs::fullEmails() { TQStringList fullEmails; // The user name and email from the config dialog: - fullEmails << TQString("%1 <%2>").tqarg( fullName() ).tqarg( email() ); + fullEmails << TQString("%1 <%2>").arg( fullName() ).arg( email() ); TQStringList::Iterator it; // Grab emails from the email identities @@ -377,7 +377,7 @@ TQStringList KOPrefs::fullEmails() // Add emails configured in korganizer lst = mAdditionalMails; for ( it = lst.begin(); it != lst.end(); ++it ) { - fullEmails << TQString("%1 <%2>").tqarg( fullName() ).tqarg( *it ); + fullEmails << TQString("%1 <%2>").arg( fullName() ).arg( *it ); } // Add emails from the user's kaddressbook entry KABC::Addressee me = KABC::StdAddressBook::self()->whoAmI(); diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp index 1f3ede91a..47ee5484d 100644 --- a/korganizer/koprefsdialog.cpp +++ b/korganizer/koprefsdialog.cpp @@ -23,7 +23,7 @@ without including the source code for TQt in the source distribution. */ -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqgroupbox.h> #include <tqbuttongroup.h> @@ -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..3f8be65b3 100644 --- a/korganizer/korgac/alarmdialog.cpp +++ b/korganizer/korgac/alarmdialog.cpp @@ -28,7 +28,7 @@ #include <tqlabel.h> #include <tqfile.h> #include <tqspinbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <tqcstring.h> #include <tqdatastream.h> @@ -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 ); @@ -566,7 +566,7 @@ void AlarmDialog::slotSave() if ( !incidence ) { continue; } - config->setGroup( TQString("Incidence-%1").tqarg(numReminders + 1) ); + config->setGroup( TQString("Incidence-%1").arg(numReminders + 1) ); config->writeEntry( "UID", incidence->uid() ); config->writeEntry( "RemindAt", item->mRemindAt ); ++numReminders; diff --git a/korganizer/korgac/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..5b3ee4e9a 100644 --- a/korganizer/korgac/koalarmclient.cpp +++ b/korganizer/korgac/koalarmclient.cpp @@ -71,7 +71,7 @@ KOAlarmClient::KOAlarmClient( TQObject *parent, const char *name ) config->setGroup( "General" ); int numReminders = config->readNumEntry( "Reminders", 0 ); for ( int i = 1; i <= numReminders; ++i ) { - TQString group( TQString( "Incidence-%1" ).tqarg( i ) ); + TQString group( TQString( "Incidence-%1" ).arg( i ) ); config->setGroup( group ); TQString uid = config->readEntry( "UID" ); TQDateTime dt = config->readDateTimeEntry( "RemindAt" ); @@ -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.cpp b/korganizer/korganizer.cpp index 6067ca02a..842c111fa 100644 --- a/korganizer/korganizer.cpp +++ b/korganizer/korganizer.cpp @@ -78,7 +78,7 @@ #include <tqvbox.h> #include <tqfile.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <stdlib.h> 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..26d925ab3 100644 --- a/korganizer/korganizer_part.cpp +++ b/korganizer/korganizer_part.cpp @@ -61,7 +61,7 @@ #include <tqapplication.h> #include <tqfile.h> #include <tqtimer.h> -#include <tqlayout.h> +#include <layout.h> typedef KParts::GenericFactory< KOrganizerPart > KOrganizerFactory; K_EXPORT_COMPONENT_FACTORY( libkorganizerpart, KOrganizerFactory ) @@ -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..811300ed5 100644 --- a/korganizer/kotimelineview.cpp +++ b/korganizer/kotimelineview.cpp @@ -26,7 +26,7 @@ #include <libkcal/calendar.h> #include <libkcal/calendarresources.h> -#include <tqlayout.h> +#include <layout.h> #include <kdgantt/KDGanttViewTaskItem.h> #include <kdgantt/KDGanttViewSubwidgets.h> @@ -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..9640e1b71 100644 --- a/korganizer/kotodoeditor.cpp +++ b/korganizer/kotodoeditor.cpp @@ -27,7 +27,7 @@ #include <tqtooltip.h> #include <tqframe.h> #include <tqpixmap.h> -#include <tqlayout.h> +#include <layout.h> #include <tqdatetime.h> #include <kiconloader.h> @@ -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..72f61439e 100644 --- a/korganizer/kotodoview.cpp +++ b/korganizer/kotodoview.cpp @@ -23,7 +23,7 @@ without including the source code for TQt in the source distribution. */ -#include <tqlayout.h> +#include <layout.h> #include <tqheader.h> #include <tqcursor.h> #include <tqlabel.h> @@ -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..e7fad7dae 100644 --- a/korganizer/kotodoviewitem.cpp +++ b/korganizer/kotodoviewitem.cpp @@ -240,7 +240,7 @@ bool KOTodoViewItem::isAlternate() #endif } -void KOTodoViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment) +void KOTodoViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment) { TQColorGroup _cg = cg; // If no todo is set, just don't paint anything... @@ -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)); @@ -275,6 +275,6 @@ void KOTodoViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, KGlobalSettings::highlightColor() ); p->restore(); } else { - TQCheckListItem::paintCell(p, _cg, column, width, tqalignment); + TQCheckListItem::paintCell(p, _cg, column, width, alignment); } } diff --git a/korganizer/kotodoviewitem.h b/korganizer/kotodoviewitem.h index d2e679757..5bf5e5b72 100644 --- a/korganizer/kotodoviewitem.h +++ b/korganizer/kotodoviewitem.h @@ -28,7 +28,7 @@ #include <tqmap.h> #include <tqlistview.h> -#include <tqpalette.h> +#include <palette.h> #include <tqdatetime.h> namespace KCal { @@ -66,7 +66,7 @@ class KOTodoViewItem : public TQCheckListItem bool isAlternate(); int compare( TQListViewItem *i, int col, bool ascending ) const; virtual void paintCell(TQPainter *p, const TQColorGroup &cg, - int column, int width, int tqalignment); + int column, int width, int alignment); protected: void paintBranches(TQPainter *p,const TQColorGroup & cg,int w,int y,int h); diff --git a/korganizer/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..722ba2681 100644 --- a/korganizer/kowhatsnextview.cpp +++ b/korganizer/kowhatsnextview.cpp @@ -22,9 +22,9 @@ without including the source code for TQt in the source distribution. */ -#include <tqlayout.h> -#include <tqtextbrowser.h> -#include <tqtextcodec.h> +#include <layout.h> +#include <textbrowser.h> +#include <textcodec.h> #include <tqfileinfo.h> #include <tqlabel.h> @@ -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 ); } @@ -106,8 +106,8 @@ void KOWhatsNextView::updateView() mText += KGlobal::locale()->formatDate( mStartDate ); } else { mText += i18n("Date from - to", "%1 - %2") - .tqarg( KGlobal::locale()->formatDate( mStartDate ) ) - .tqarg( KGlobal::locale()->formatDate( mEndDate ) ); + .arg( KGlobal::locale()->formatDate( mStartDate ) ) + .arg( KGlobal::locale()->formatDate( mEndDate ) ); } mText+="</h2>\n"; @@ -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; @@ -281,14 +281,14 @@ void KOWhatsNextView::appendEvent( Incidence *ev, const TQDateTime &start, if ( starttime.date().daysTo( endtime.date() ) >= 1 ) { mText += i18n("date from - to", "%1 - %2") - .tqarg( KGlobal::locale()->formatDateTime( starttime ) ) - .tqarg( KGlobal::locale()->formatDateTime( endtime ) ); + .arg( KGlobal::locale()->formatDateTime( starttime ) ) + .arg( KGlobal::locale()->formatDateTime( endtime ) ); } else { /*if (reply) */ mText += i18n("date, from - to", "%1, %2 - %3") - .tqarg( KGlobal::locale()->formatDate( starttime.date(), true ) ) - .tqarg( KGlobal::locale()->formatTime( starttime.time() ) ) - .tqarg( KGlobal::locale()->formatTime( endtime.time() ) ); + .arg( KGlobal::locale()->formatDate( starttime.date(), true ) ) + .arg( KGlobal::locale()->formatTime( starttime.time() ) ) + .arg( KGlobal::locale()->formatTime( endtime.time() ) ); } } // } diff --git a/korganizer/kowhatsnextview.h b/korganizer/kowhatsnextview.h index e899ae157..ee1e4ad30 100644 --- a/korganizer/kowhatsnextview.h +++ b/korganizer/kowhatsnextview.h @@ -24,7 +24,7 @@ #ifndef KOWHATSNEXTVIEW_H #define KOWHATSNEXTVIEW_H -#include <tqtextbrowser.h> +#include <textbrowser.h> #include <korganizer/baseview.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/mailscheduler.cpp b/korganizer/mailscheduler.cpp index f810e9843..671e15d3d 100644 --- a/korganizer/mailscheduler.cpp +++ b/korganizer/mailscheduler.cpp @@ -86,7 +86,7 @@ bool MailScheduler::performTransaction( IncidenceBase *incidence, TQString subject; Incidence *inc = dynamic_cast<Incidence*>( incidence ); if ( inc && method == Counter ) - subject = i18n( "Counter proposal: %1" ).tqarg( inc->summary() ); + subject = i18n( "Counter proposal: %1" ).arg( inc->summary() ); status = mailer.mailOrganizer( incidence, messageText, subject ); } return status; diff --git a/korganizer/multiagendaview.cpp b/korganizer/multiagendaview.cpp index 8558d846f..b0c0ac370 100644 --- a/korganizer/multiagendaview.cpp +++ b/korganizer/multiagendaview.cpp @@ -27,7 +27,7 @@ #include <kglobalsettings.h> -#include <tqlayout.h> +#include <layout.h> #include <tqvbox.h> #include <tqobjectlist.h> #include <tqheader.h> @@ -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(); @@ -536,7 +536,7 @@ void MultiAgendaView::zoomView( const int delta, const TQPoint & pos, const Qt:: mTimeLabels->updateConfig(); mTimeLabels->positionChanged(); - mTimeLabels->tqrepaint(); + mTimeLabels->repaint(); } // KDE4: not needed, use existing TQSplitter signals instead diff --git a/korganizer/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..4966e24db 100644 --- a/korganizer/navigatorbar.cpp +++ b/korganizer/navigatorbar.cpp @@ -25,7 +25,7 @@ #include <tqstring.h> #include <tqtooltip.h> #include <tqpushbutton.h> -#include <tqlayout.h> +#include <layout.h> #include <tqframe.h> #include <tqpopupmenu.h> #include <tqlabel.h> @@ -71,43 +71,43 @@ 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 + // set up control frame layout TQHBoxLayout *ctrlLayout = new TQHBoxLayout( this ); ctrlLayout->addWidget( mPrevYear ); ctrlLayout->addWidget( mPrevMonth ); @@ -174,8 +174,8 @@ void NavigatorBar::selectDates( const KCal::DateList &dateList ) mHasMinWidth = true; // set the label text at the top of the navigator - mMonth->setText( i18n( "monthname", "%1" ).tqarg( calSys->monthName( mDate ) ) ); - mYear->setText( i18n( "4 digit year", "%1" ).tqarg( calSys->yearString( mDate, false ) ) ); + mMonth->setText( i18n( "monthname", "%1" ).arg( calSys->monthName( mDate ) ) ); + mYear->setText( i18n( "4 digit year", "%1" ).arg( calSys->yearString( mDate, false ) ) ); } } diff --git a/korganizer/plugins/datenums/configdialog.cpp b/korganizer/plugins/datenums/configdialog.cpp index 3766e2ffd..bf524e466 100644 --- a/korganizer/plugins/datenums/configdialog.cpp +++ b/korganizer/plugins/datenums/configdialog.cpp @@ -18,7 +18,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqvbuttongroup.h> #include <tqradiobutton.h> diff --git a/korganizer/plugins/datenums/datenums.cpp b/korganizer/plugins/datenums/datenums.cpp index b0a25ce4a..af022837e 100644 --- a/korganizer/plugins/datenums/datenums.cpp +++ b/korganizer/plugins/datenums/datenums.cpp @@ -56,8 +56,8 @@ TQString Datenums::shortText(const TQDate &date) return TQString::number( KOGlobals::self()->calendarSystem()->daysInYear(date) - doy ); break; case 2: // both day of year and days till end of year - return i18n("dayOfYear / daysTillEndOfYear", "%1 / %2").tqarg( doy ) - .tqarg(KOGlobals::self()->calendarSystem()->daysInYear(date) - doy); + return i18n("dayOfYear / daysTillEndOfYear", "%1 / %2").arg( doy ) + .arg(KOGlobals::self()->calendarSystem()->daysInYear(date) - doy); break; case 0: // only day of year default: diff --git a/korganizer/plugins/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/exchange/exchangeconfig.cpp b/korganizer/plugins/exchange/exchangeconfig.cpp index fe01324ac..1f2c42014 100644 --- a/korganizer/plugins/exchange/exchangeconfig.cpp +++ b/korganizer/plugins/exchange/exchangeconfig.cpp @@ -17,7 +17,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqcombobox.h> diff --git a/korganizer/plugins/exchange/exchangedialog.cpp b/korganizer/plugins/exchange/exchangedialog.cpp index de56a3a19..229333956 100644 --- a/korganizer/plugins/exchange/exchangedialog.cpp +++ b/korganizer/plugins/exchange/exchangedialog.cpp @@ -17,7 +17,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqcombobox.h> diff --git a/korganizer/plugins/hebrew/configdialog.cpp b/korganizer/plugins/hebrew/configdialog.cpp index 6298151ac..fbd82c68c 100644 --- a/korganizer/plugins/hebrew/configdialog.cpp +++ b/korganizer/plugins/hebrew/configdialog.cpp @@ -19,7 +19,7 @@ #include "configdialog.h" #include "configdialog.moc" #include <klocale.h> -#include <tqlayout.h> +#include <layout.h> #include <kapplication.h> #include <kglobal.h> #include <kconfig.h> diff --git a/korganizer/plugins/hebrew/hebrew.cpp b/korganizer/plugins/hebrew/hebrew.cpp index e36925aa5..8a9f37bd4 100644 --- a/korganizer/plugins/hebrew/hebrew.cpp +++ b/korganizer/plugins/hebrew/hebrew.cpp @@ -81,8 +81,8 @@ TQString Hebrew::shortText(const TQDate & date) hebrew_day_number, hebrew_year); KCalendarSystem *cal = KCalendarSystemFactory::create("hebrew"); - label_text = TQString("%1 %2").tqarg(cal->dayString(date, false)) - .tqarg(cal->monthName(date)); + label_text = TQString("%1 %2").arg(cal->dayString(date, false)) + .arg(cal->monthName(date)); if (holidays.count()) { diff --git a/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui b/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui index 1ef0c311b..6868729b5 100644 --- a/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui +++ b/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui @@ -65,7 +65,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -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..249531df0 100644 --- a/korganizer/plugins/printing/list/calprintlistconfig_base.ui +++ b/korganizer/plugins/printing/list/calprintlistconfig_base.ui @@ -40,7 +40,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -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..a3d4fb69c 100644 --- a/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui +++ b/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui @@ -40,7 +40,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -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/printing/year/yearprint.cpp b/korganizer/plugins/printing/year/yearprint.cpp index 5c36772fb..0c124bbeb 100644 --- a/korganizer/plugins/printing/year/yearprint.cpp +++ b/korganizer/plugins/printing/year/yearprint.cpp @@ -177,8 +177,8 @@ void CalPrintYear::print( TQPainter &p, int width, int height ) title = i18n("date from -\nto", "%1 -\n%2"); } drawHeader( p, title - .tqarg( locale->formatDate( start ) ) - .tqarg( locale->formatDate( end ) ), + .arg( locale->formatDate( start ) ) + .arg( locale->formatDate( end ) ), calsys->addMonths( start, -1), calsys->addMonths( start, monthsPerPage ), headerBox ); diff --git a/korganizer/plugins/projectview/koprojectview.cpp b/korganizer/plugins/projectview/koprojectview.cpp index 79b146b35..5c123d02c 100644 --- a/korganizer/plugins/projectview/koprojectview.cpp +++ b/korganizer/plugins/projectview/koprojectview.cpp @@ -17,7 +17,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <tqlayout.h> +#include <layout.h> #include <tqheader.h> #include <tqpushbutton.h> #include <tqfont.h> @@ -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..462fe5489 100644 --- a/korganizer/plugins/timespanview/kotimespanview.cpp +++ b/korganizer/plugins/timespanview/kotimespanview.cpp @@ -22,7 +22,7 @@ without including the source code for TQt in the source distribution. */ -#include <tqlayout.h> +#include <layout.h> #include <kconfig.h> #include <kstandarddirs.h> @@ -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/plugins/timespanview/timespanwidget.cpp b/korganizer/plugins/timespanview/timespanwidget.cpp index b1c156ee5..11204a7fb 100644 --- a/korganizer/plugins/timespanview/timespanwidget.cpp +++ b/korganizer/plugins/timespanview/timespanwidget.cpp @@ -24,7 +24,7 @@ #include <tqsplitter.h> #include <tqlistview.h> -#include <tqlayout.h> +#include <layout.h> #include <tqheader.h> #include <tqpushbutton.h> diff --git a/korganizer/previewdialog.cpp b/korganizer/previewdialog.cpp index 23671bd92..5915e29dd 100644 --- a/korganizer/previewdialog.cpp +++ b/korganizer/previewdialog.cpp @@ -42,7 +42,7 @@ #include <kio/netaccess.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqradiobutton.h> #include <tqpushbutton.h> #include <tqdialog.h> 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/calprintdefaultplugins.cpp b/korganizer/printing/calprintdefaultplugins.cpp index fbb06795f..caa2e69ef 100644 --- a/korganizer/printing/calprintdefaultplugins.cpp +++ b/korganizer/printing/calprintdefaultplugins.cpp @@ -346,13 +346,13 @@ void CalPrintIncidence::print( TQPainter &p, int width, int height ) if ( offset % (24*60) == 0 && offset>0 ) { // divides evenly into days? useoffset = offset / (24*60); - offsetstr = offsetstr.tqarg( i18n("1 day", "%n days", useoffset ) ); + offsetstr = offsetstr.arg( i18n("1 day", "%n days", useoffset ) ); } else if (offset % 60 == 0 && offset>0 ) { // divides evenly into hours? useoffset = offset / 60; - offsetstr = offsetstr.tqarg( i18n("1 hour", "%n hours", useoffset ) ); + offsetstr = offsetstr.arg( i18n("1 hour", "%n hours", useoffset ) ); } else { useoffset = offset; - offsetstr = offsetstr.tqarg( i18n("1 minute", "%n minutes", useoffset ) ); + offsetstr = offsetstr.arg( i18n("1 minute", "%n minutes", useoffset ) ); } alarmStrings << offsetstr; } @@ -481,24 +481,24 @@ void CalPrintIncidence::print( TQPainter &p, int width, int height ) datesString = ""; if ( (*rit)->dtStart().isValid() ) { datesString += i18n( - "Start Date: %1\n").tqarg( + "Start Date: %1\n").arg( KGlobal::locale()->formatDate( (*rit)->dtStart().date(), true ) ); if ( !(*rit)->doesFloat() ) { datesString += i18n( - "Start Time: %1\n").tqarg( + "Start Time: %1\n").arg( KGlobal::locale()->formatTime((*rit)->dtStart().time(), false, false) ); } } if ( (*rit)->dtEnd().isValid() ) { subitemString += i18n( - "Due Date: %1\n").tqarg( + "Due Date: %1\n").arg( KGlobal::locale()->formatDate( (*rit)->dtEnd().date(), true ) ); if ( !(*rit)->doesFloat() ) { subitemString += i18n( - "subitem due time", "Due Time: %1\n").tqarg( + "subitem due time", "Due Time: %1\n").arg( KGlobal::locale()->formatTime((*rit)->dtEnd().time(), false, false) ); } @@ -511,12 +511,12 @@ void CalPrintIncidence::print( TQPainter &p, int width, int height ) subitemString += "\n"; } subitemString += i18n( "subitem Status: statusString", - "Status: %1\n").tqarg( statusString ); + "Status: %1\n").arg( statusString ); subitemString += IncidenceFormatter::recurrenceString((*rit)) + "\n"; subitemString += i18n( "subitem Priority: N", - "Priority: %1\n").tqarg( (*rit)->priority() ); + "Priority: %1\n").arg( (*rit)->priority() ); subitemString += i18n( "subitem Secrecy: secrecyString", - "Secrecy: %1\n").tqarg( (*rit)->secrecyStr() ); + "Secrecy: %1\n").arg( (*rit)->secrecyStr() ); subitemString += "\n"; } drawBoxWithCaption( p, notesBox, i18n("Subitems:"), @@ -562,8 +562,8 @@ void CalPrintIncidence::print( TQPainter &p, int width, int height ) "'Name (Role): Status', e.g. 'Reinhold Kainhofer " "<reinhold@kainhofer.com> (Participant): Awaiting Response'", "%1 (%2): %3") - .tqarg( (*ait)->fullName() ) - .tqarg( (*ait)->roleStr() ).tqarg( (*ait)->statusStr() ); + .arg( (*ait)->fullName() ) + .arg( (*ait)->roleStr() ).arg( (*ait)->statusStr() ); } drawBoxWithCaption( p, attendeesBox, i18n("Attendees:"), attendeeString, /*sameLine=*/false, /*expand=*/false, captionFont, textFont ); @@ -572,11 +572,11 @@ void CalPrintIncidence::print( TQPainter &p, int width, int height ) if ( mShowOptions ) { TQString optionsString; if ( !(*it)->statusStr().isEmpty() ) { - optionsString += i18n("Status: %1").tqarg( (*it)->statusStr() ); + optionsString += i18n("Status: %1").arg( (*it)->statusStr() ); optionsString += "\n"; } if ( !(*it)->secrecyStr().isEmpty() ) { - optionsString += i18n("Secrecy: %1").tqarg( (*it)->secrecyStr() ); + optionsString += i18n("Secrecy: %1").arg( (*it)->secrecyStr() ); optionsString += "\n"; } if ( (*it)->type() == "Event" ) { @@ -936,7 +936,7 @@ void CalPrintWeek::print( TQPainter &p, int width, int height ) } else { title = i18n("date from-\nto", "%1 -\n%2");; } - title = title.tqarg( line1 ).tqarg( line2 ); + title = title.arg( line1 ).arg( line2 ); drawHeader( p, title, curWeek.addDays( -6 ), TQDate(), headerBox ); drawWeek( p, curWeek, weekBox ); @@ -959,7 +959,7 @@ void CalPrintWeek::print( TQPainter &p, int width, int height ) } else { title = i18n("date from -\nto (week number)", "%1 -\n%2 (Week %3)"); } - title = title.tqarg( line1 ).tqarg( line2 ).tqarg( curWeek.weekNumber() ); + title = title.arg( line1 ).arg( line2 ).arg( curWeek.weekNumber() ); drawHeader( p, title, curWeek, TQDate(), headerBox ); TQRect weekBox( headerBox ); @@ -1121,8 +1121,8 @@ void CalPrintMonth::print( TQPainter &p, int width, int height ) do { TQString title( i18n("monthname year", "%1 %2") ); - title = title.tqarg( calSys->monthName( curMonth ) ) - .tqarg( curMonth.year() ); + title = title.arg( calSys->monthName( curMonth ) ) + .arg( curMonth.year() ); TQDate tmp( fromMonth ); int weekdayCol = weekdayColumn( tmp.dayOfWeek() ); tmp = tmp.addDays( -weekdayCol ); diff --git a/korganizer/printing/calprinter.cpp b/korganizer/printing/calprinter.cpp index e87f3c5a3..fc99ffee0 100644 --- a/korganizer/printing/calprinter.cpp +++ b/korganizer/printing/calprinter.cpp @@ -26,7 +26,7 @@ #include <tqvbuttongroup.h> #include <tqwidgetstack.h> #include <tqradiobutton.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <tqcombobox.h> #include <tqlabel.h> @@ -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..26ac86c88 100644 --- a/korganizer/printing/calprintpluginbase.cpp +++ b/korganizer/printing/calprintpluginbase.cpp @@ -24,7 +24,7 @@ */ #include <tqpainter.h> -#include <tqlayout.h> +#include <layout.h> #include <tqframe.h> #include <tqlabel.h> @@ -128,7 +128,7 @@ CalPrintPluginBase::~CalPrintPluginBase() TQWidget *CalPrintPluginBase::createConfigWidget( TQWidget *w ) { TQFrame *wdg = new TQFrame( w ); - TQVBoxLayout *tqlayout = new TQVBoxLayout( wdg ); + TQVBoxLayout *layout = new TQVBoxLayout( wdg ); TQLabel *title = new TQLabel( description(), wdg ); TQFont titleFont( title->font() ); @@ -136,13 +136,13 @@ TQWidget *CalPrintPluginBase::createConfigWidget( TQWidget *w ) titleFont.setBold( true ); title->setFont( titleFont ); - tqlayout->addWidget( title ); - tqlayout->addWidget( new TQLabel( info(), wdg ) ); - tqlayout->addSpacing( 20 ); - tqlayout->addWidget( new TQLabel( i18n("This printing style does not " + layout->addWidget( title ); + layout->addWidget( new TQLabel( info(), wdg ) ); + layout->addSpacing( 20 ); + layout->addWidget( new TQLabel( i18n("This printing style does not " "have any configuration options."), wdg ) ); - tqlayout->addStretch(); + layout->addStretch(); return wdg; } @@ -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,9 +558,9 @@ 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 ) ); + i18n( "print date: formatted-datetime", "printed: %1" ).arg( dateStr ) ); p.setFont( oldfont ); return footbox.bottom(); @@ -933,9 +933,9 @@ void CalPrintPluginBase::drawDayBox( TQPainter &p, const TQDate &qd, if ( fullDate && mCalSys ) { dayNumStr = i18n("weekday month date", "%1 %2 %3") - .tqarg( mCalSys->weekDayName( qd ) ) - .tqarg( mCalSys->monthName( qd ) ) - .tqarg( qd.day() ); + .arg( mCalSys->weekDayName( qd ) ) + .arg( mCalSys->monthName( qd ) ) + .arg( qd.day() ); // dayNumStr = local->formatDate(qd); } else { dayNumStr = TQString::number( qd.day() ); @@ -984,7 +984,7 @@ void CalPrintPluginBase::drawDayBox( TQPainter &p, const TQDate &qd, TQString str; if ( !currEvent->location().isEmpty() ) { str = i18n( "summary, location", "%1, %2" ). - tqarg( currEvent->summary() ).tqarg( currEvent->location() ); + arg( currEvent->summary() ).arg( currEvent->location() ); } else { str = currEvent->summary(); } @@ -1008,7 +1008,7 @@ void CalPrintPluginBase::drawDayBox( TQPainter &p, const TQDate &qd, TQString summaryStr; if ( !todo->location().isEmpty() ) { summaryStr = i18n( "summary, location", "%1, %2" ). - tqarg( todo->summary() ).tqarg( todo->location() ); + arg( todo->summary() ).arg( todo->location() ); } else { summaryStr = todo->summary(); } @@ -1026,7 +1026,7 @@ void CalPrintPluginBase::drawDayBox( TQPainter &p, const TQDate &qd, } else { str = summaryStr; } - drawIncidence( p, box, timeText, i18n("To-do: %1").tqarg( str ), textY ); + drawIncidence( p, box, timeText, i18n("To-do: %1").arg( str ), textY ); } } @@ -1572,7 +1572,7 @@ void CalPrintPluginBase::drawTodo( int &count, Todo *todo, TQPainter &p, } //now, write the percentage - outStr = i18n( "%1%" ).tqarg( todo->percentComplete() ); + outStr = i18n( "%1%" ).arg( todo->percentComplete() ); rect = p.boundingRect( posPercentComplete+lwidth+3, y, x + width, -1, TQt::AlignTop | TQt::AlignLeft, outStr ); p.drawText( rect, TQt::AlignTop | TQt::AlignLeft, outStr ); @@ -1648,7 +1648,7 @@ void CalPrintPluginBase::drawJournalField( TQPainter &p, TQString field, TQStrin { if ( text.isEmpty() ) return; - TQString entry( field.tqarg( text ) ); + TQString entry( field.arg( text ) ); TQRect rect( p.boundingRect( x, y, width, -1, TQt::WordBreak, entry) ); if ( rect.bottom() > pageHeight) { @@ -1677,8 +1677,8 @@ void CalPrintPluginBase::drawJournal( Journal * journal, TQPainter &p, int x, in headerText = dateText; } else { headerText = i18n("Description - date", "%1 - %2") - .tqarg( journal->summary() ) - .tqarg( dateText ); + .arg( journal->summary() ) + .arg( dateText ); } TQRect rect( p.boundingRect( x, y, width, -1, TQt::WordBreak, headerText) ); @@ -1717,15 +1717,15 @@ void CalPrintPluginBase::drawSplitHeaderRight( TQPainter &p, const TQDate &fd, if ( mCalSys ) { if ( fd.month() == td.month() ) { title = i18n("Date range: Month dayStart - dayEnd", "%1 %2 - %3") - .tqarg( mCalSys->monthName( fd.month(), false ) ) - .tqarg( mCalSys->dayString( fd, false ) ) - .tqarg( mCalSys->dayString( td, false ) ); + .arg( mCalSys->monthName( fd.month(), false ) ) + .arg( mCalSys->dayString( fd, false ) ) + .arg( mCalSys->dayString( td, false ) ); } else { title = i18n("Date range: monthStart dayStart - monthEnd dayEnd", "%1 %2 - %3 %4") - .tqarg( mCalSys->monthName( fd.month(), false ) ) - .tqarg( mCalSys->dayString( fd, false ) ) - .tqarg( mCalSys->monthName( td.month(), false ) ) - .tqarg( mCalSys->dayString( td, false ) ); + .arg( mCalSys->monthName( fd.month(), false ) ) + .arg( mCalSys->dayString( fd, false ) ) + .arg( mCalSys->monthName( td.month(), false ) ) + .arg( mCalSys->dayString( td, false ) ); } } diff --git a/korganizer/printing/calprinttodoconfig_base.ui b/korganizer/printing/calprinttodoconfig_base.ui index f416c0ea8..106ffd7d6 100644 --- a/korganizer/printing/calprinttodoconfig_base.ui +++ b/korganizer/printing/calprinttodoconfig_base.ui @@ -86,7 +86,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -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..0be844abb 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> @@ -246,7 +246,7 @@ <string>Print as &timetable view</string> </property> <property name="whatsThis" stdset="0"> - <string>This view is similar to the weekview in KOrganizer. The week is printed in landscape tqlayout. You can even use the same colors for the items if you check <i>Use Colors</i>.</string> + <string>This view is similar to the weekview in KOrganizer. The week is printed in landscape layout. You can even use the same colors for the items if you check <i>Use Colors</i>.</string> </property> </widget> <widget class="TQRadioButton" row="2" column="0" rowspan="1" colspan="3"> @@ -257,7 +257,7 @@ <string>Print as split week view</string> </property> <property name="whatsThis" stdset="0"> - <string>This view is similar to the week view in KOrganizer. The only difference with the timetable view is the page tqlayout. Timetables are printed in landscape, the split week view in portrait.</string> + <string>This view is similar to the week view in KOrganizer. The only difference with the timetable view is the page layout. Timetables are printed in landscape, the split week view in portrait.</string> </property> </widget> </grid> 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/resourceview.cpp b/korganizer/resourceview.cpp index a4475a4c2..322d6b639 100644 --- a/korganizer/resourceview.cpp +++ b/korganizer/resourceview.cpp @@ -44,7 +44,7 @@ #include <tqhbox.h> #include <tqheader.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqpainter.h> #include <tqpushbutton.h> @@ -70,12 +70,12 @@ static TQString labelFromSubResName( ResourceCalendar *resource, const TQString TQString label; if ( (int)reply > 1 ) { if( resource && !resource->resourceName().isEmpty() ) { - label = i18n( "My %1 (%2)" ).tqarg( subRes, resource->resourceName() ); + label = i18n( "My %1 (%2)" ).arg( subRes, resource->resourceName() ); } else { - label = i18n( "My %1" ).tqarg( subRes ); + label = i18n( "My %1" ).arg( subRes ); } } else { - label = i18n( "My %1" ).tqarg( subRes ); + label = i18n( "My %1" ).arg( subRes ); } return label; } @@ -238,18 +238,18 @@ void ResourceItem::setStandardResource( bool std ) { if ( mIsStandardResource != std ) { mIsStandardResource = std; - tqrepaint(); + repaint(); } } void ResourceItem::paintCell(TQPainter *p, const TQColorGroup &cg, - int column, int width, int tqalignment) + int column, int width, int alignment) { TQFont oldFont = p->font(); TQFont newFont = oldFont; newFont.setBold( mIsStandardResource && !mIsSubresource ); p->setFont( newFont ); - TQCheckListItem::paintCell( p, cg, column, width, tqalignment ); + TQCheckListItem::paintCell( p, cg, column, width, alignment ); p->setFont( oldFont ); /* TQColorGroup _cg = cg; if(!mResource) return; @@ -376,7 +376,7 @@ void ResourceView::addResource() if ( !item->resource()->addSubresource( folderName, parentId ) ) { KMessageBox::error( this, - i18n( "<qt>Unable to create subresource <b>%1</b>.</qt>" ).tqarg( folderName ) ); + i18n( "<qt>Unable to create subresource <b>%1</b>.</qt>" ).arg( folderName ) ); } return; } @@ -398,7 +398,7 @@ void ResourceView::addResource() if( !resource ) { KMessageBox::error( this, - i18n( "<qt>Unable to create resource of type <b>%1</b>.</qt>" ).tqarg( type ) ); + i18n( "<qt>Unable to create resource of type <b>%1</b>.</qt>" ).arg( type ) ); return; } @@ -414,7 +414,7 @@ void ResourceView::addResource() if ( resource->isActive() && ( !resource->open() || !resource->load() ) ) { // ### There is a resourceLoadError() signal declared in ResourceCalendar // but no subclass seems to make use of it. We could do better. - KMessageBox::error( this, i18n("Unable to create the resource.").tqarg( type ) ); + KMessageBox::error( this, i18n("Unable to create the resource.").arg( type ) ); success = false; } } @@ -573,7 +573,7 @@ void ResourceView::removeResource() i18n ("<qt>Failed to remove the subresource <b>%1</b>. The " "reason could be that it is a built-in one which cannot " "be removed, or that the removal of the underlying storage " - "folder failed.</qt>").tqarg( item->resource()->name() ) ); + "folder failed.</qt>").arg( item->resource()->name() ) ); return; } else { mCalendar->resourceManager()->remove( item->resource() ); @@ -632,7 +632,7 @@ void ResourceView::editResource() } else { KMessageBox::sorry( this, - i18n ("<qt>Cannot edit the subresource <b>%1</b>.</qt>").tqarg( item->resource()->name() ) ); + i18n ("<qt>Cannot edit the subresource <b>%1</b>.</qt>").arg( item->resource()->name() ) ); } } else { KRES::ConfigDialog dlg( this, TQString("calendar"), resource, "KRES::ConfigDialog" ); diff --git a/korganizer/resourceview.h b/korganizer/resourceview.h index e5bb9d3e6..6734c4bcb 100644 --- a/korganizer/resourceview.h +++ b/korganizer/resourceview.h @@ -69,7 +69,7 @@ class ResourceItem : public TQCheckListItem void update(); virtual void paintCell(TQPainter *p, const TQColorGroup &cg, - int column, int width, int tqalignment); + int column, int width, int alignment); void setResourceColor(TQColor& color); TQColor &resourceColor() {return mResourceColor;} diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp index 497ad1f6e..bec56d41a 100644 --- a/korganizer/searchdialog.cpp +++ b/korganizer/searchdialog.cpp @@ -24,7 +24,7 @@ without including the source code for TQt in the source distribution. */ -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> #include <tqgroupbox.h> #include <tqhbuttongroup.h> @@ -52,11 +52,11 @@ SearchDialog::SearchDialog(Calendar *calendar,TQWidget *parent) mCalendar = calendar; TQFrame *topFrame = plainPage(); - TQVBoxLayout *tqlayout = new TQVBoxLayout(topFrame,0,spacingHint()); + TQVBoxLayout *layout = new TQVBoxLayout(topFrame,0,spacingHint()); // Search expression TQHBoxLayout *subLayout = new TQHBoxLayout(); - tqlayout->addLayout(subLayout); + layout->addLayout(subLayout); searchEdit = new TQLineEdit( "*", topFrame ); // Find all events by default searchLabel = new TQLabel( searchEdit, i18n("&Search for:"), topFrame ); @@ -68,7 +68,7 @@ SearchDialog::SearchDialog(Calendar *calendar,TQWidget *parent) TQHButtonGroup *itemsGroup = new TQHButtonGroup( i18n("Search For"), topFrame ); - tqlayout->addWidget( itemsGroup ); + layout->addWidget( itemsGroup ); mEventsCheck = new TQCheckBox( i18n("&Events"), itemsGroup ); mTodosCheck = new TQCheckBox( i18n("To-&dos"), itemsGroup ); mJournalsCheck = new TQCheckBox( i18n("&Journal entries"), itemsGroup ); @@ -78,7 +78,7 @@ SearchDialog::SearchDialog(Calendar *calendar,TQWidget *parent) // Date range TQGroupBox *rangeGroup = new TQGroupBox( 1, Qt::Horizontal, i18n( "Date Range" ), topFrame ); - tqlayout->addWidget( rangeGroup ); + layout->addWidget( rangeGroup ); TQWidget *rangeWidget = new TQWidget( rangeGroup ); TQHBoxLayout *rangeLayout = new TQHBoxLayout( rangeWidget, 0, spacingHint() ); @@ -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"), @@ -100,7 +100,7 @@ SearchDialog::SearchDialog(Calendar *calendar,TQWidget *parent) // Subjects to search TQHButtonGroup *subjectGroup = new TQHButtonGroup( i18n("Search In"), topFrame ); - tqlayout->addWidget(subjectGroup); + layout->addWidget(subjectGroup); mSummaryCheck = new TQCheckBox( i18n("Su&mmaries"), subjectGroup ); mSummaryCheck->setChecked( true ); @@ -111,7 +111,7 @@ SearchDialog::SearchDialog(Calendar *calendar,TQWidget *parent) // Results list view listView = new KOListView( mCalendar, topFrame ); listView->showDates(); - tqlayout->addWidget( listView ); + layout->addWidget( listView ); if ( KOPrefs::instance()->mCompactDialogs ) { KOGlobals::fitDialogToScreen( this, true ); diff --git a/korganizer/statusdialog.cpp b/korganizer/statusdialog.cpp index 15e15e5ab..1aea9e21a 100644 --- a/korganizer/statusdialog.cpp +++ b/korganizer/statusdialog.cpp @@ -24,7 +24,7 @@ #include <tqlabel.h> #include <tqstringlist.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcombobox.h> #include <kdebug.h> @@ -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/korganizer/timelabels.cpp b/korganizer/timelabels.cpp index c2802acb3..a4aa4a7dd 100644 --- a/korganizer/timelabels.cpp +++ b/korganizer/timelabels.cpp @@ -28,7 +28,7 @@ #include <tqvbox.h> #include <tqlabel.h> #include <tqframe.h> -#include <tqlayout.h> +#include <layout.h> #include <tqfont.h> #include <tqfontmetrics.h> #include <tqpainter.h> @@ -197,7 +197,7 @@ void TimeLabels::updateConfig() sFont.setPointSize( sFont.pointSize()/2 ); TQFontMetrics fmS( sFont ); mMiniWidth += fmS.width( test ) + frameWidth()*2+4 ; - // update tqgeometry restrictions based on new settings + // update geometry restrictions based on new settings setFixedWidth( mMiniWidth ); // update HourSize @@ -237,7 +237,7 @@ void TimeLabels::setAgenda( KOAgenda* agenda ) } -/** This is called in response to tqrepaint() */ +/** This is called in response to repaint() */ void TimeLabels::paintEvent(TQPaintEvent*) { // kdDebug(5850) << "paintevent..." << endl; diff --git a/korn/ChangeLog b/korn/ChangeLog index e644587e3..d22d617aa 100644 --- a/korn/ChangeLog +++ b/korn/ChangeLog @@ -14,7 +14,7 @@ * Converted C-style casts to C++-style, and checked retvals of dynamic_casts. Currently only assert() used, but that's better than crashing. - * Fixed tqlayout of polldlg. + * Fixed layout of polldlg. * Split 'General' cfg widget into two, 'View' and 'Commands' * Added some keyboard accelerators. * Still need to connect config stuff up properly... @@ -28,7 +28,7 @@ * temporarily take care of korn (with Taj's blessing) * fix most of the layouts (/me being too stupid to fix Taj's nice - custom tqlayout classes, I switched completely to pure QLayouts) + custom layout classes, I switched completely to pure QLayouts) * fixed most of the i18n * made FileDialogs start with the current path by default (instead no path, used before) diff --git a/korn/accountmanager.cpp b/korn/accountmanager.cpp index ddadf7c23..a791c53d4 100644 --- a/korn/accountmanager.cpp +++ b/korn/accountmanager.cpp @@ -53,14 +53,14 @@ AccountManager::~AccountManager() void AccountManager::readConfig( KConfig* config, const int index ) { - KConfigGroup *masterGroup = new KConfigGroup( config, TQString( "korn-%1" ).tqarg( index ) ); + KConfigGroup *masterGroup = new KConfigGroup( config, TQString( "korn-%1" ).arg( index ) ); TQStringList dcop = masterGroup->readListEntry( "dcop", ',' ); KConfigGroup *accountGroup; int counter = 0; - while( config->hasGroup( TQString( "korn-%1-%2" ).tqarg( index ).tqarg( counter ) ) ) + while( config->hasGroup( TQString( "korn-%1-%2" ).arg( index ).arg( counter ) ) ) { - accountGroup = new KConfigGroup( config, TQString( "korn-%1-%2" ).tqarg( index ).tqarg( counter ) ); + accountGroup = new KConfigGroup( config, TQString( "korn-%1-%2" ).arg( index ).arg( counter ) ); const Protocol *proto = Protocols::getProto( accountGroup->readEntry( "protocol" ) ); if( !proto ) @@ -144,7 +144,7 @@ void AccountManager::writeConfig( KConfig* config, const int index ) TQMap< KMailDrop*, Dropinfo* >::Iterator it; for( it = _dropInfo->begin(); it != _dropInfo->end(); ++it ) { - config->setGroup( TQString( "korn-%1-%2" ).tqarg( index ).tqarg( it.data()->index ) ); + config->setGroup( TQString( "korn-%1-%2" ).arg( index ).arg( it.data()->index ) ); config->writeEntry( "reset", it.data()->reset ); } } @@ -155,9 +155,9 @@ TQString AccountManager::getTooltip() const TQMap< KMailDrop*, Dropinfo* >::Iterator it; for( it = _dropInfo->begin(); it != _dropInfo->end(); ++it ) if( it.key()->valid() ) - result.append( TQString( "%1: %2" ).tqarg( it.key()->realName() ).tqarg( it.data()->msgnr - it.data()->reset )); + result.append( TQString( "%1: %2" ).arg( it.key()->realName() ).arg( it.data()->msgnr - it.data()->reset )); else - result.append( TQString( "%1: invalid" ).tqarg( it.key()->realName() ) ); + result.append( TQString( "%1: invalid" ).arg( it.key()->realName() ) ); result.sort(); return result.join( TQChar( '\n' ) ); } diff --git a/korn/boxcontainer.cpp b/korn/boxcontainer.cpp index 72719812d..934a47c53 100644 --- a/korn/boxcontainer.cpp +++ b/korn/boxcontainer.cpp @@ -39,9 +39,9 @@ BoxContainer::~BoxContainer() void BoxContainer::readConfig( KConfig* config ) { int counter = 0; - while( config->hasGroup( TQString( "korn-%1" ).tqarg( counter ) ) ) + while( config->hasGroup( TQString( "korn-%1" ).arg( counter ) ) ) { - config->setGroup( TQString( "korn-%1" ).tqarg( counter ) ); + config->setGroup( TQString( "korn-%1" ).arg( counter ) ); BoxContainerItem *item = newBoxInstance(); item->readConfig( config, counter ); addItem( item ); diff --git a/korn/boxcontaineritem.cpp b/korn/boxcontaineritem.cpp index c412a07b2..b026e95c4 100644 --- a/korn/boxcontaineritem.cpp +++ b/korn/boxcontaineritem.cpp @@ -81,7 +81,7 @@ BoxContainerItem::~BoxContainerItem() void BoxContainerItem::readConfig( KConfig* config, const int index ) { //Read information about how the thing have to look like - config->setGroup( TQString( "korn-%1" ).tqarg( index ) ); + config->setGroup( TQString( "korn-%1" ).arg( index ) ); if( config->readBoolEntry( "hasnormalicon", false ) ) _icons[ 0 ] = new TQString( config->readEntry( "normalicon", "" ) ); else @@ -216,23 +216,23 @@ void BoxContainerItem::showPassivePopup( TQWidget* parent, TQPtrList< KornMailSu { KPassivePopup *popup = new KPassivePopup( parent, "Passive popup" ); - TQVBox *mainvtqlayout = popup->standardView( i18n( "KOrn - %1/%2 (total: %3)" ).tqarg( TQString(objId()) ).tqarg( accountName ) - .tqarg( total ), "", TQPixmap(), 0 ); - TQGrid *maingtqlayout = new TQGrid( date ? 3 : 2 ,mainvtqlayout, "Grid-Layout" ); + TQVBox *mainvlayout = popup->standardView( i18n( "KOrn - %1/%2 (total: %3)" ).arg( TQString(objId()) ).arg( accountName ) + .arg( total ), "", TQPixmap(), 0 ); + TQGrid *mainglayout = new TQGrid( date ? 3 : 2 ,mainvlayout, "Grid-Layout" ); - TQLabel *title = new TQLabel( i18n("From"), maingtqlayout, "from_label" ); + TQLabel *title = new TQLabel( i18n("From"), mainglayout, "from_label" ); TQFont font = title->font(); font.setBold( true ); title->setFont( font ); - title = new TQLabel( i18n("Subject"), maingtqlayout, "subject_label" ); + title = new TQLabel( i18n("Subject"), mainglayout, "subject_label" ); font = title->font(); font.setBold( true ); title->setFont( font ); if( date ) { - title = new TQLabel( i18n("Date"), maingtqlayout, "date_label" ); + title = new TQLabel( i18n("Date"), mainglayout, "date_label" ); font = title->font(); font.setBold( true ); title->setFont( font ); @@ -240,19 +240,19 @@ void BoxContainerItem::showPassivePopup( TQWidget* parent, TQPtrList< KornMailSu for( KornMailSubject* subject = list->first(); subject; subject = list->next() ) { - new TQLabel( subject->getSender(), maingtqlayout, "from-value" ); - new TQLabel( subject->getSubject(), maingtqlayout, "subject-value" ); + new TQLabel( subject->getSender(), mainglayout, "from-value" ); + new TQLabel( subject->getSubject(), mainglayout, "subject-value" ); if( date ) { TQDateTime tijd; tijd.setTime_t( subject->getDate() ); - new TQLabel( tijd.toString(), maingtqlayout, "date-value" ); + new TQLabel( tijd.toString(), mainglayout, "date-value" ); } } popup->setAutoDelete( true ); //Now, now care for deleting these pointers. - popup->setView( mainvtqlayout ); + popup->setView( mainvlayout ); popup->show(); //Display it } @@ -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 ) ); } @@ -339,7 +339,7 @@ TQPixmap BoxContainerItem::calcComplexPixmap( const TQPixmap &icon, const TQColo //Make a transparent number; first make a white number on a black background. //This pixmap also is the base alpha-channel, the foreground colour is added later. numberPixmap.fill( TQt::black ); - p.tqbegin( &numberPixmap, false ); + p.begin( &numberPixmap, false ); p.setPen( TQt::white ); if( font ) p.setFont( *font ); @@ -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..407a6ff06 100644 --- a/korn/dcopdrop.cpp +++ b/korn/dcopdrop.cpp @@ -159,10 +159,10 @@ int DCOPDrop::addMessage( const TQString& subject, const TQString& message ) ++_counter; mailsubject->setSubject( subject ); - mailsubject->setSender( TQString( "DCOP: %1" ).tqarg( *_name ) ); + mailsubject->setSender( TQString( "DCOP: %1" ).arg( *_name ) ); mailsubject->setHeader( message, true ); mailsubject->setSize( message.length() ); - mailsubject->setDate( TQDateTime::tqcurrentDateTime().toTime_t() ); + mailsubject->setDate( TQDateTime::currentDateTime().toTime_t() ); _msgList->insert( id->getId(), mailsubject ); diff --git a/korn/dockeditem.cpp b/korn/dockeditem.cpp index 5ff6fb8af..9d30717f0 100644 --- a/korn/dockeditem.cpp +++ b/korn/dockeditem.cpp @@ -81,7 +81,7 @@ void DockedItem::slotShowPassivePopup( TQPtrList< KornMailSubject >* list, int t void DockedItem::slotShowPassivePopup( const TQString& message, const TQString& name ) { - KPassivePopup::message( i18n( "Korn - %1/%2" ).tqarg( TQString(objId()) ).tqarg( name ), message, _systemtray, "Passive error message" ); + KPassivePopup::message( i18n( "Korn - %1/%2" ).arg( TQString(objId()) ).arg( name ), message, _systemtray, "Passive error message" ); } void DockedItem::doPopup() diff --git a/korn/hvitem.cpp b/korn/hvitem.cpp index bf621445f..d2453b64c 100644 --- a/korn/hvitem.cpp +++ b/korn/hvitem.cpp @@ -71,7 +71,7 @@ void HVItem::slotShowPassivePopup( TQPtrList< KornMailSubject >* list, int total void HVItem::slotShowPassivePopup( const TQString& errorMessage, const TQString& name ) { - KPassivePopup::message( TQString( "korn-%1-%2" ).tqarg( TQString(objId()) ).tqarg( name ), errorMessage, _label, "Passive error message" ); + KPassivePopup::message( TQString( "korn-%1-%2" ).arg( TQString(objId()) ).arg( name ), errorMessage, _label, "Passive error message" ); } void HVItem::doPopup() diff --git a/korn/imap_proto.cpp b/korn/imap_proto.cpp index 304fed5ed..caedb4597 100644 --- a/korn/imap_proto.cpp +++ b/korn/imap_proto.cpp @@ -68,9 +68,9 @@ void Imap_Protocol::readEntries( TQMap< TQString, TQString >* map, TQMap< TQStri if( map->contains( "ssl" ) && *map->find( "ssl" ) == "true" ) map->insert( "encryption", "ssl" ); if( metadata->contains( "tls" ) ) - map->insert( "encryption", TQString( "tls=%1" ).tqarg( *metadata->find( "tls" ) ) ); + map->insert( "encryption", TQString( "tls=%1" ).arg( *metadata->find( "tls" ) ) ); if( metadata->contains( "auth" ) ) - map->insert( "auth", TQString( "auth=%1" ).tqarg( *metadata->find( "auth" ) ) ); + map->insert( "auth", TQString( "auth=%1" ).arg( *metadata->find( "auth" ) ) ); } void Imap_Protocol::writeEntries( TQMap< TQString, TQString >* map ) const diff --git a/korn/kconf_update/korn-3-4-config_change.cpp b/korn/kconf_update/korn-3-4-config_change.cpp index 7ff7a922c..e3c11610f 100644 --- a/korn/kconf_update/korn-3-4-config_change.cpp +++ b/korn/kconf_update/korn-3-4-config_change.cpp @@ -18,7 +18,7 @@ #include <tqstring.h> #include <tqregexp.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqmap.h> #include <tqvaluelist.h> @@ -175,8 +175,8 @@ int main( int, char** ) { if( numboxes > -1 && interesting_group.cap( 1 ).toInt() < numboxes ) { - currentGroup1 = TQString( "[korn-%1]" ).tqarg( interesting_group.cap( 1 ) ); - currentGroup2 = TQString( "[korn-%1-0]" ).tqarg( interesting_group.cap( 1 ) ); + currentGroup1 = TQString( "[korn-%1]" ).arg( interesting_group.cap( 1 ) ); + currentGroup2 = TQString( "[korn-%1-0]" ).arg( interesting_group.cap( 1 ) ); } tobe_deleted.append( line ); continue; diff --git a/korn/keditlistboxman.cpp b/korn/keditlistboxman.cpp index d5ae323a5..d3dce86e0 100644 --- a/korn/keditlistboxman.cpp +++ b/korn/keditlistboxman.cpp @@ -109,9 +109,9 @@ void KEditListBoxManager::readNames() int number = 0; this->clear(); - while( _config->hasGroup( _groupName->tqarg( number ) ) ) + while( _config->hasGroup( _groupName->arg( number ) ) ) { - _config->setGroup( _groupName->tqarg( number ) ); + _config->setGroup( _groupName->arg( number ) ); this->insertItem( _config->readEntry( "name", TQString() ) ); ++number; } @@ -138,7 +138,7 @@ void KEditListBoxManager::slotChanged() //First check if the item was moved up - _config->setGroup( _groupName->tqarg( this->currentItem() ) ); + _config->setGroup( _groupName->arg( this->currentItem() ) ); if( this->currentItem() > 0 && this->text( this->currentItem() - 1 ) == _config->readEntry( "name", TQString() ) ) changeItem( this->currentItem() - 1, this->currentItem() ); //moved down @@ -158,10 +158,10 @@ void KEditListBoxManager::slotAdded( const TQString& name ) return; int number = 0; - while( _config->hasGroup( _groupName->tqarg( number ) ) ) + while( _config->hasGroup( _groupName->arg( number ) ) ) ++number; - _config->setGroup( _groupName->tqarg( number ) ); + _config->setGroup( _groupName->arg( number ) ); _config->writeEntry( "name", name ); emit setDefaults( name, number, _config ); @@ -180,12 +180,12 @@ void KEditListBoxManager::slotRemoved( const TQString& name ) int subnumber = 0; while( true ) { - if( !_config->hasGroup( _groupName->tqarg( number ) ) ) + if( !_config->hasGroup( _groupName->arg( number ) ) ) { number = -1; //not found break; } - _config->setGroup( _groupName->tqarg( number ) ); + _config->setGroup( _groupName->arg( number ) ); if( name == _config->readEntry( "name", TQString() ) ) break; //found @@ -195,16 +195,16 @@ void KEditListBoxManager::slotRemoved( const TQString& name ) if( number < 0 ) //failure return; //do nothing - _config->deleteGroup( _groupName->tqarg( number ), true, false ); + _config->deleteGroup( _groupName->arg( number ), true, false ); emit elementDeleted( number ); - while( _subGroupName && _config->hasGroup( _subGroupName->tqarg( number ).tqarg( subnumber ) ) ) + while( _subGroupName && _config->hasGroup( _subGroupName->arg( number ).arg( subnumber ) ) ) { - _config->deleteGroup( _subGroupName->tqarg( number ).tqarg( subnumber ) ); + _config->deleteGroup( _subGroupName->arg( number ).arg( subnumber ) ); ++subnumber; } //rotate groups - while( _config->hasGroup( _groupName->tqarg( number + 1 ) ) ) + while( _config->hasGroup( _groupName->arg( number + 1 ) ) ) { moveItem( number + 1, number ); @@ -224,17 +224,17 @@ void KEditListBoxManager::moveItem( int src, int dest ) TQMap<TQString, TQString>::iterator it; int subnumber = 0; - *srcList = _config->entryMap( _groupName->tqarg( src ) ); - _config->deleteGroup( _groupName->tqarg( src ) ); + *srcList = _config->entryMap( _groupName->arg( src ) ); + _config->deleteGroup( _groupName->arg( src ) ); - _config->setGroup( _groupName->tqarg( dest ) ); + _config->setGroup( _groupName->arg( dest ) ); for( it = srcList->begin(); it != srcList->end(); ++it ) _config->writeEntry( it.key(), it.data() ); - while( _subGroupName && _config->hasGroup( _subGroupName->tqarg( src ).tqarg( subnumber ) ) ) + while( _subGroupName && _config->hasGroup( _subGroupName->arg( src ).arg( subnumber ) ) ) { - _config->deleteGroup( _subGroupName->tqarg( dest ).tqarg( subnumber ) ); - _config->setGroup( _subGroupName->tqarg( dest ).tqarg( subnumber ) ); + _config->deleteGroup( _subGroupName->arg( dest ).arg( subnumber ) ); + _config->setGroup( _subGroupName->arg( dest ).arg( subnumber ) ); for( it = srcList->begin(); it != srcList->end(); ++it ) _config->writeEntry( it.key(), it.data() ); @@ -253,33 +253,33 @@ void KEditListBoxManager::changeItem( int first, int last ) TQMap<TQString, TQString>::iterator it; int subnumber = 0; - *firstList = _config->entryMap( _groupName->tqarg( first ) ); - *lastList = _config->entryMap( _groupName->tqarg( last ) ); - _config->deleteGroup( _groupName->tqarg( first ) ); - _config->deleteGroup( _groupName->tqarg( last ) ); + *firstList = _config->entryMap( _groupName->arg( first ) ); + *lastList = _config->entryMap( _groupName->arg( last ) ); + _config->deleteGroup( _groupName->arg( first ) ); + _config->deleteGroup( _groupName->arg( last ) ); - _config->setGroup( _groupName->tqarg( last ) ); + _config->setGroup( _groupName->arg( last ) ); for( it = firstList->begin(); it != firstList->end(); ++it ) _config->writeEntry( it.key(), it.data() ); - _config->setGroup( _groupName->tqarg( first ) ); + _config->setGroup( _groupName->arg( first ) ); for( it = lastList->begin(); it != lastList->end(); ++it ) _config->writeEntry( it.key(), it.data() ); while( _subGroupName && ( - _config->hasGroup( _subGroupName->tqarg( first ).tqarg( subnumber ) ) || - _config->hasGroup( _subGroupName->tqarg( last ).tqarg( subnumber ) ) ) ) + _config->hasGroup( _subGroupName->arg( first ).arg( subnumber ) ) || + _config->hasGroup( _subGroupName->arg( last ).arg( subnumber ) ) ) ) { - *firstList = _config->entryMap( _subGroupName->tqarg( first ).tqarg( subnumber ) ); - *lastList = _config->entryMap( _subGroupName->tqarg( last ).tqarg( subnumber ) ); - _config->deleteGroup( _subGroupName->tqarg( first ).tqarg( subnumber ) ); - _config->deleteGroup( _subGroupName->tqarg( last ).tqarg( subnumber ) ); + *firstList = _config->entryMap( _subGroupName->arg( first ).arg( subnumber ) ); + *lastList = _config->entryMap( _subGroupName->arg( last ).arg( subnumber ) ); + _config->deleteGroup( _subGroupName->arg( first ).arg( subnumber ) ); + _config->deleteGroup( _subGroupName->arg( last ).arg( subnumber ) ); - _config->setGroup( _subGroupName->tqarg( last ).tqarg( subnumber ) ); + _config->setGroup( _subGroupName->arg( last ).arg( subnumber ) ); for( it = firstList->begin(); it != firstList->end(); ++it ) _config->writeEntry( it.key(), it.data() ); - _config->setGroup( _subGroupName->tqarg( first ).tqarg( subnumber ) ); + _config->setGroup( _subGroupName->arg( first ).arg( subnumber ) ); for( it = lastList->begin(); it != lastList->end(); ++it ) _config->writeEntry( it.key(), it.data() ); @@ -294,7 +294,7 @@ void KEditListBoxManager::changeItem( int first, int last ) void KEditListBoxManager::changedText() { - _config->setGroup( _groupName->tqarg( this->currentItem() ) ); + _config->setGroup( _groupName->arg( this->currentItem() ) ); _config->writeEntry( "name", this->currentText() ); } diff --git a/korn/kio.cpp b/korn/kio.cpp index 0977eb603..8015595c0 100644 --- a/korn/kio.cpp +++ b/korn/kio.cpp @@ -96,7 +96,7 @@ KKioDrop::KKioDrop() _protocol = Protocols::firstProtocol()->getKIOProtocol(); //The first protocol is the default _kurl->setPort( _protocol->defaultPort( _ssl ) ); - //Creating tqchildren and connect them to the outside world; this class passes the messages for them... + //Creating children and connect them to the outside world; this class passes the messages for them... //This class handles all the counting. _count = new KIO_Count( this, "kio_count" ); @@ -134,7 +134,7 @@ KKioDrop::KKioDrop( KConfigGroup* ) _protocol = Protocols::firstProtocol()->getKIOProtocol(); //The first protocol is the default _kurl->setPort( _protocol->defaultPort( _ssl ) ); - //Creating tqchildren and connect them to the outside world; this class passes the messages for them... + //Creating children and connect them to the outside world; this class passes the messages for them... //This class handles all the counting. _count = new KIO_Count( this, "kio_count" ); diff --git a/korn/kio_count.cpp b/korn/kio_count.cpp index a1635fd9f..a1f8e825c 100644 --- a/korn/kio_count.cpp +++ b/korn/kio_count.cpp @@ -86,8 +86,8 @@ void KIO_Count::count( KKioDrop *drop ) if( ! ( _slave = KIO::Scheduler::getConnectedSlave( kurl, metadata ) ) ) //Forcing reload { - kdWarning() << i18n( "Not able to open a kio slave for %1." ).tqarg( _protocol->configName() ) << endl; - _kio->emitShowPassivePopup( i18n( "Not able to open a kio slave for %1." ).tqarg( _protocol->configName() ) ); + kdWarning() << i18n( "Not able to open a kio slave for %1." ).arg( _protocol->configName() ) << endl; + _kio->emitShowPassivePopup( i18n( "Not able to open a kio slave for %1." ).arg( _protocol->configName() ) ); _valid = false; _kio->emitValidChanged(); _slave = 0; @@ -207,8 +207,8 @@ void KIO_Count::result( KIO::Job* job ) //This could be very useful by resolving bugs. if( job->error() ) { - kdError() << i18n( "The next KIO-error occurred by counting: %1" ).tqarg( job->errorString() ) << endl; - _kio->emitShowPassivePopup( i18n( "The next KIO-error occurred by counting: %1" ).tqarg( job->errorString() ) ); + kdError() << i18n( "The next KIO-error occurred by counting: %1" ).arg( job->errorString() ) << endl; + _kio->emitShowPassivePopup( i18n( "The next KIO-error occurred by counting: %1" ).arg( job->errorString() ) ); _valid = false; _kio->emitValidChanged(); } diff --git a/korn/kio_delete.cpp b/korn/kio_delete.cpp index 576463bef..db27e28d9 100644 --- a/korn/kio_delete.cpp +++ b/korn/kio_delete.cpp @@ -182,7 +182,7 @@ void KIO_Delete::slotResult( KIO::Job* job ) { if( job->error() ) { - kdWarning() << i18n( "An error occurred when deleting email: %1." ).tqarg( job->errorString() ) << endl; + kdWarning() << i18n( "An error occurred when deleting email: %1." ).arg( job->errorString() ) << endl; _valid = false; } diff --git a/korn/kio_read.cpp b/korn/kio_read.cpp index c14377c0b..b92da304c 100644 --- a/korn/kio_read.cpp +++ b/korn/kio_read.cpp @@ -77,7 +77,7 @@ void KIO_Read::slotResult( KIO::Job* job ) kdWarning() << i18n( "Unknown job returned; I will try if this one will do... " ) << endl; if( job->error() ) - kdWarning() << i18n( "An error occurred when fetching the requested email: %1." ).tqarg( job->errorString() ) << endl; + kdWarning() << i18n( "An error occurred when fetching the requested email: %1." ).arg( job->errorString() ) << endl; _kio->emitReadMailReady( _message ); diff --git a/korn/kio_single_subject.cpp b/korn/kio_single_subject.cpp index fad2790b5..02a6a103d 100644 --- a/korn/kio_single_subject.cpp +++ b/korn/kio_single_subject.cpp @@ -138,7 +138,7 @@ void KIO_Single_Subject::slotResult( KIO::Job *job ) if( job->error() ) { - kdWarning() << i18n( "Error when fetching %1: %2" ).tqarg( *_name ).tqarg( job->errorString() ) << endl; + kdWarning() << i18n( "Error when fetching %1: %2" ).arg( *_name ).arg( job->errorString() ) << endl; } else { KornMailSubject * mailSubject = new KornMailSubject( new KornStringId( *_name ), 0 ); parseMail( _message, mailSubject, _protocol->fullMessage() ); diff --git a/korn/kio_subjects.cpp b/korn/kio_subjects.cpp index 2e1e33855..2de6ac59a 100644 --- a/korn/kio_subjects.cpp +++ b/korn/kio_subjects.cpp @@ -101,8 +101,8 @@ void KIO_Subjects::getConnection( ) if( ! ( _slave = KIO::Scheduler::getConnectedSlave( kurl, metadata ) ) ) { - kdWarning() << i18n( "Not able to open a kio-slave for %1." ).tqarg( _protocol->configName() ); - _kio->emitShowPassivePopup( i18n( "Not able to open a kio-slave for %1." ).tqarg( _protocol->configName() ) ); + kdWarning() << i18n( "Not able to open a kio-slave for %1." ).arg( _protocol->configName() ); + _kio->emitShowPassivePopup( i18n( "Not able to open a kio-slave for %1." ).arg( _protocol->configName() ) ); _valid = false; _kio->emitValidChanged(); _slave = 0; diff --git a/korn/kmail_proto.cpp b/korn/kmail_proto.cpp index 1ff68213b..fb6166c31 100644 --- a/korn/kmail_proto.cpp +++ b/korn/kmail_proto.cpp @@ -99,7 +99,7 @@ TQMap< TQString, TQString > * KMail_Protocol::createConfig( KConfigGroup* config { //Construct metadata if( kmailconfig.hasKey( "auth" ) ) - metadata += TQString( "auth=%1," ).tqarg( kmailconfig.readEntry( "auth" ) ); + metadata += TQString( "auth=%1," ).arg( kmailconfig.readEntry( "auth" ) ); if( !kmailconfig.hasKey( "use-tls" ) ) metadata += "tls=auto"; else @@ -124,7 +124,7 @@ TQMap< TQString, TQString > * KMail_Protocol::createConfig( KConfigGroup* config { //Constructing metadata if( kmailconfig.hasKey( "auth" ) ) - metadata += TQString( "auth=%1," ).tqarg( kmailconfig.readEntry( "auth" ) ); + metadata += TQString( "auth=%1," ).arg( kmailconfig.readEntry( "auth" ) ); if( !kmailconfig.hasKey( "use-tls" ) ) metadata += "tls=auto"; else @@ -185,9 +185,9 @@ void KMail_Protocol::configFields( TQPtrVector< TQWidget >* vector, const TQObje int nummer = kmailFirstGroup - 1; KConfig kmailconfig( "kmailrc", true, false ); - while( kmailconfig.hasGroup( TQString( kmailGroupName ).tqarg( ++nummer ) ) ) + while( kmailconfig.hasGroup( TQString( kmailGroupName ).arg( ++nummer ) ) ) { - kmailconfig.setGroup( TQString( kmailGroupName ).tqarg( nummer ) ); + kmailconfig.setGroup( TQString( kmailGroupName ).arg( nummer ) ); type = kmailconfig.readEntry( kmailKeyType, TQString() ); name = kmailconfig.readEntry( kmailKeyName, TQString() ); if( type == "imap" || type == "cachedimap" || type == "pop" || type == "local" ) @@ -224,9 +224,9 @@ TQString KMail_Protocol::getTypeAndConfig( const TQString& kmailname, KConfig &k id = -1; - while( kmailconfig.hasGroup( TQString( kmailGroupName ).tqarg( ++nummer ) ) ) + while( kmailconfig.hasGroup( TQString( kmailGroupName ).arg( ++nummer ) ) ) { - kmailconfig.setGroup( TQString( kmailGroupName ).tqarg( nummer ) ); + kmailconfig.setGroup( TQString( kmailGroupName ).arg( nummer ) ); if( kmailconfig.readEntry( kmailKeyName, TQString() ) == kmailname ) { id = kmailconfig.readNumEntry( kmailKeyId, 0 ); diff --git a/korn/kornaccountcfg.ui b/korn/kornaccountcfg.ui index 9a640718e..5e540b4b2 100644 --- a/korn/kornaccountcfg.ui +++ b/korn/kornaccountcfg.ui @@ -73,7 +73,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout35</cstring> + <cstring>layout35</cstring> </property> <hbox> <property name="name"> @@ -137,7 +137,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout33</cstring> + <cstring>layout33</cstring> </property> <grid> <property name="name"> diff --git a/korn/kornaccountcfgimpl.cpp b/korn/kornaccountcfgimpl.cpp index ce1c9058b..5da0210e7 100644 --- a/korn/kornaccountcfgimpl.cpp +++ b/korn/kornaccountcfgimpl.cpp @@ -32,7 +32,7 @@ #include <tqcheckbox.h> #include <tqcombobox.h> #include <tqptrvector.h> -#include <tqlayout.h> +#include <layout.h> #include <tqmap.h> #include <tqlabel.h> #include <tqwidget.h> @@ -44,7 +44,7 @@ KornAccountCfgImpl::KornAccountCfgImpl( TQWidget * parent, const char * name ) _urlfields( 0 ), _boxnr( 0 ), _accountnr( 0 ), - _vtqlayout( 0 ), + _vlayout( 0 ), _protocolLayout( 0 ), _groupBoxes( 0 ), _accountinput( new TQPtrList< AccountInput >() ) @@ -173,12 +173,12 @@ void KornAccountCfgImpl::slotProtocolChanged( const TQString& proto ) _accountinput->clear(); delete _groupBoxes; delete _protocolLayout; - delete _vtqlayout; - _vtqlayout = new TQVBoxLayout( this->server_tab, groupBoxes->count() + 1 ); - _vtqlayout->setSpacing( 10 ); - _vtqlayout->setMargin( 10 ); + delete _vlayout; + _vlayout = new TQVBoxLayout( this->server_tab, groupBoxes->count() + 1 ); + _vlayout->setSpacing( 10 ); + _vlayout->setMargin( 10 ); - _protocolLayout = new TQHBoxLayout( _vtqlayout ); + _protocolLayout = new TQHBoxLayout( _vlayout ); _protocolLayout->addWidget( this->lbProtocol ); _protocolLayout->addWidget( this->cbProtocol ); @@ -189,7 +189,7 @@ void KornAccountCfgImpl::slotProtocolChanged( const TQString& proto ) for( it = groupBoxes->begin(); it != groupBoxes->end(); ++it ) { _groupBoxes->insert( counter, new TQGroupBox( (*it), this->server_tab, "groupbox" ) ); - _vtqlayout->addWidget( _groupBoxes->at( counter ) ); + _vlayout->addWidget( _groupBoxes->at( counter ) ); ++counter; } delete groupBoxes; diff --git a/korn/kornaccountcfgimpl.h b/korn/kornaccountcfgimpl.h index 10c1cbf71..c17885d6d 100644 --- a/korn/kornaccountcfgimpl.h +++ b/korn/kornaccountcfgimpl.h @@ -60,7 +60,7 @@ private: int _urlfields; int _boxnr, _accountnr; - TQVBoxLayout *_vtqlayout; + TQVBoxLayout *_vlayout; TQHBoxLayout *_protocolLayout; TQPtrVector< TQWidget > *_groupBoxes; diff --git a/korn/kornboxcfg.ui b/korn/kornboxcfg.ui index 3d9ca6092..f47b0f3e4 100644 --- a/korn/kornboxcfg.ui +++ b/korn/kornboxcfg.ui @@ -33,7 +33,7 @@ </property> <widget class="TQLayoutWidget" row="1" column="2"> <property name="name"> - <cstring>tqlayout32</cstring> + <cstring>layout32</cstring> </property> <hbox> <property name="name"> @@ -69,7 +69,7 @@ </widget> <widget class="TQLayoutWidget" row="2" column="1"> <property name="name"> - <cstring>tqlayout34</cstring> + <cstring>layout34</cstring> </property> <hbox> <property name="name"> @@ -124,7 +124,7 @@ </widget> <widget class="TQLayoutWidget" row="2" column="2"> <property name="name"> - <cstring>tqlayout33</cstring> + <cstring>layout33</cstring> </property> <hbox> <property name="name"> @@ -161,13 +161,13 @@ <property name="text"> <string>Normal</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> <widget class="TQLayoutWidget" row="3" column="2"> <property name="name"> - <cstring>tqlayout36</cstring> + <cstring>layout36</cstring> </property> <hbox> <property name="name"> @@ -201,7 +201,7 @@ <property name="text"> <string>New Mail</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> @@ -215,7 +215,7 @@ </widget> <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> - <cstring>tqlayout31</cstring> + <cstring>layout31</cstring> </property> <hbox> <property name="name"> @@ -251,7 +251,7 @@ </widget> <widget class="TQLayoutWidget" row="3" column="1"> <property name="name"> - <cstring>tqlayout35</cstring> + <cstring>layout35</cstring> </property> <hbox> <property name="name"> @@ -288,7 +288,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>41</width> <height>160</height> @@ -297,7 +297,7 @@ </spacer> <widget class="TQLayoutWidget" row="5" column="1"> <property name="name"> - <cstring>tqlayout29</cstring> + <cstring>layout29</cstring> </property> <hbox> <property name="name"> @@ -326,7 +326,7 @@ </widget> <widget class="TQLayoutWidget" row="5" column="2"> <property name="name"> - <cstring>tqlayout28</cstring> + <cstring>layout28</cstring> </property> <hbox> <property name="name"> @@ -371,7 +371,7 @@ </widget> <widget class="TQLayoutWidget" row="4" column="2"> <property name="name"> - <cstring>tqlayout28_2</cstring> + <cstring>layout28_2</cstring> </property> <hbox> <property name="name"> @@ -400,7 +400,7 @@ </widget> <widget class="TQLayoutWidget" row="4" column="1"> <property name="name"> - <cstring>tqlayout29_2</cstring> + <cstring>layout29_2</cstring> </property> <hbox> <property name="name"> @@ -442,7 +442,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout31</cstring> + <cstring>layout31</cstring> </property> <grid> <property name="name"> @@ -455,13 +455,13 @@ <property name="text"> <string>Left</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> <widget class="TQLayoutWidget" row="5" column="2"> <property name="name"> - <cstring>tqlayout52_7</cstring> + <cstring>layout52_7</cstring> </property> <hbox> <property name="name"> @@ -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> @@ -518,13 +518,13 @@ <property name="text"> <string>Right</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> <widget class="TQLayoutWidget" row="2" column="2"> <property name="name"> - <cstring>tqlayout52</cstring> + <cstring>layout52</cstring> </property> <hbox> <property name="name"> @@ -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> @@ -576,7 +576,7 @@ </widget> <widget class="TQLayoutWidget" row="3" column="1"> <property name="name"> - <cstring>tqlayout52_4</cstring> + <cstring>layout52_4</cstring> </property> <hbox> <property name="name"> @@ -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> @@ -628,7 +628,7 @@ </widget> <widget class="TQLayoutWidget" row="5" column="3"> <property name="name"> - <cstring>tqlayout52_9</cstring> + <cstring>layout52_9</cstring> </property> <hbox> <property name="name"> @@ -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> @@ -680,7 +680,7 @@ </widget> <widget class="TQLayoutWidget" row="2" column="1"> <property name="name"> - <cstring>tqlayout52</cstring> + <cstring>layout52</cstring> </property> <hbox> <property name="name"> @@ -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> @@ -745,13 +745,13 @@ <property name="text"> <string>Mousebutton</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> <widget class="TQLayoutWidget" row="4" column="3"> <property name="name"> - <cstring>tqlayout52_9</cstring> + <cstring>layout52_9</cstring> </property> <hbox> <property name="name"> @@ -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> @@ -803,7 +803,7 @@ </widget> <widget class="TQLayoutWidget" row="5" column="1"> <property name="name"> - <cstring>tqlayout52_5</cstring> + <cstring>layout52_5</cstring> </property> <hbox> <property name="name"> @@ -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> @@ -860,13 +860,13 @@ <property name="text"> <string>Middle</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> <widget class="TQLayoutWidget" row="6" column="1"> <property name="name"> - <cstring>tqlayout52_5</cstring> + <cstring>layout52_5</cstring> </property> <hbox> <property name="name"> @@ -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> @@ -926,7 +926,7 @@ </widget> <widget class="TQLayoutWidget" row="3" column="3"> <property name="name"> - <cstring>tqlayout52_8</cstring> + <cstring>layout52_8</cstring> </property> <hbox> <property name="name"> @@ -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> @@ -986,7 +986,7 @@ </widget> <widget class="TQLayoutWidget" row="6" column="2"> <property name="name"> - <cstring>tqlayout52_7</cstring> + <cstring>layout52_7</cstring> </property> <hbox> <property name="name"> @@ -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> @@ -1046,7 +1046,7 @@ </widget> <widget class="TQLayoutWidget" row="4" column="1"> <property name="name"> - <cstring>tqlayout52_5</cstring> + <cstring>layout52_5</cstring> </property> <hbox> <property name="name"> @@ -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> @@ -1098,7 +1098,7 @@ </widget> <widget class="TQLayoutWidget" row="2" column="3"> <property name="name"> - <cstring>tqlayout52_3</cstring> + <cstring>layout52_3</cstring> </property> <hbox> <property name="name"> @@ -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> @@ -1150,7 +1150,7 @@ </widget> <widget class="TQLayoutWidget" row="3" column="2"> <property name="name"> - <cstring>tqlayout52_6</cstring> + <cstring>layout52_6</cstring> </property> <hbox> <property name="name"> @@ -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> @@ -1202,7 +1202,7 @@ </widget> <widget class="TQLayoutWidget" row="4" column="2"> <property name="name"> - <cstring>tqlayout52_7</cstring> + <cstring>layout52_7</cstring> </property> <hbox> <property name="name"> @@ -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> @@ -1262,7 +1262,7 @@ </widget> <widget class="TQLayoutWidget" row="6" column="3"> <property name="name"> - <cstring>tqlayout52_9</cstring> + <cstring>layout52_9</cstring> </property> <hbox> <property name="name"> @@ -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> @@ -1316,7 +1316,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout31_3</cstring> + <cstring>layout31_3</cstring> </property> <hbox> <property name="name"> @@ -1356,7 +1356,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout33</cstring> + <cstring>layout33</cstring> </property> <grid> <property name="name"> diff --git a/korn/kornboxcfgimpl.cpp b/korn/kornboxcfgimpl.cpp index 4cb911bef..ab6671427 100644 --- a/korn/kornboxcfgimpl.cpp +++ b/korn/kornboxcfgimpl.cpp @@ -78,7 +78,7 @@ void KornBoxCfgImpl::readConfig( KConfig * config, const int index ) _config = config; _index = index; - _config->setGroup( TQString( "korn-%1" ).tqarg( index ) ); + _config->setGroup( TQString( "korn-%1" ).arg( index ) ); readViewConfig(); readEventConfig(); @@ -88,7 +88,7 @@ void KornBoxCfgImpl::readConfig( KConfig * config, const int index ) void KornBoxCfgImpl::writeConfig( KConfig * config, const int index ) { - config->setGroup( TQString( "korn-%1" ).tqarg( index ) ); + config->setGroup( TQString( "korn-%1" ).arg( index ) ); writeViewConfig( config ); writeEventConfig( config ); @@ -155,7 +155,7 @@ void KornBoxCfgImpl::readEventConfig() void KornBoxCfgImpl::readAccountsConfig() { - elbAccounts->setGroupName( TQString( "korn-%1-%2" ).tqarg( _index ) ); + elbAccounts->setGroupName( TQString( "korn-%1-%2" ).arg( _index ) ); elbAccounts->setConfig( _config ); } @@ -250,10 +250,10 @@ void KornBoxCfgImpl::slotEditBox() connect( _base, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotDialogDestroyed() ) ); _group = new KConfigGroup( _config, TQString( "korn-%1-%2" ). - tqarg( _index ).tqarg(elbAccounts->listBox()->currentItem() ) ); + arg( _index ).arg(elbAccounts->listBox()->currentItem() ) ); TQMap< TQString, TQString > *map = new TQMap< TQString, TQString >( _config->entryMap( TQString( "korn-%1-%2" ). - tqarg( _index ).tqarg(elbAccounts->listBox()->currentItem() ) ) ); + arg( _index ).arg(elbAccounts->listBox()->currentItem() ) ) ); widget->readConfig( _group, map, _index, elbAccounts->listBox()->currentItem() ); delete map; diff --git a/korn/korncfgimpl.cpp b/korn/korncfgimpl.cpp index 0616e6fee..33af34065 100644 --- a/korn/korncfgimpl.cpp +++ b/korn/korncfgimpl.cpp @@ -91,10 +91,10 @@ void KornCfgImpl::slotDialogDestroyed() void KornCfgImpl::slotElementsSwapped( int box1, int box2 ) { int accountnumber1 = 0, accountnumber2 = 0; - while( _config->hasGroup( TQString( "korn-%1-%2" ).tqarg( box1 ).tqarg( accountnumber1 ) ) ) + while( _config->hasGroup( TQString( "korn-%1-%2" ).arg( box1 ).arg( accountnumber1 ) ) ) ++accountnumber1; - while( _config->hasGroup( TQString( "korn-%1-%2" ).tqarg( box2 ).tqarg( accountnumber2 ) ) ) + while( _config->hasGroup( TQString( "korn-%1-%2" ).arg( box2 ).arg( accountnumber2 ) ) ) ++accountnumber2; KOrnPassword::swapKOrnWalletPasswords( box1, accountnumber1, box2, accountnumber2 ); @@ -103,7 +103,7 @@ void KornCfgImpl::slotElementsSwapped( int box1, int box2 ) void KornCfgImpl::slotElementDeleted( int box ) { int accountnumber = 0; - while( _config->hasGroup( TQString( "korn-%1-%2" ).tqarg( box ).tqarg( accountnumber ) ) ) + while( _config->hasGroup( TQString( "korn-%1-%2" ).arg( box ).arg( accountnumber ) ) ) { KOrnPassword::deleteKOrnPassword( box, accountnumber ); ++accountnumber; @@ -161,7 +161,7 @@ void KornCfgImpl::slotSetDefaults( const TQString& name, const int index, KConfi config->writeEntry( "passivedate", false ); config->writeEntry( "numaccounts", 1 ); config->writeEntry( "dcop", TQStringList() ); - config->setGroup( TQString( "korn-%1-0" ).tqarg( index ) ); + config->setGroup( TQString( "korn-%1-0" ).arg( index ) ); config->writeEntry( "name", name ); config->writeEntry( "protocol", "mbox" ); config->writeEntry( "server", TQString() ); @@ -198,10 +198,10 @@ void KornCfgImpl::readConfig() { _config->setGroup( "korn" ); - TQChar tqlayout = _config->readEntry( "tqlayout" ).stripWhiteSpace()[0].upper(); - if( tqlayout == TQChar( 'H' ) ) + TQChar layout = _config->readEntry( "layout" ).stripWhiteSpace()[0].upper(); + if( layout == TQChar( 'H' ) ) rbHorizontal->setChecked( true ); - else if( tqlayout == TQChar( 'V' ) ) + else if( layout == TQChar( 'V' ) ) rbVertical->setChecked( true ); else rbDocked->setChecked( true ); @@ -214,11 +214,11 @@ void KornCfgImpl::writeConfig() _config->setGroup( "korn" ); if( rbHorizontal->isChecked() ) - _config->writeEntry( "tqlayout", "Horizontal" ); + _config->writeEntry( "layout", "Horizontal" ); if( rbVertical->isChecked() ) - _config->writeEntry( "tqlayout", "Vertical" ); + _config->writeEntry( "layout", "Vertical" ); if( rbDocked->isChecked() ) - _config->writeEntry( "tqlayout", "Docked" ); + _config->writeEntry( "layout", "Docked" ); //Default is 'false' here, because if no option is set, KWallet isn't used. if( _config->readBoolEntry( "usewallet", false ) != chUseWallet->isChecked() ) @@ -236,12 +236,12 @@ void KornCfgImpl::rewritePasswords() int account = 0 - 1; KConfigGroup *group; - while( _config->hasGroup( TQString( "korn-%1" ).tqarg( ++box ) ) ) + while( _config->hasGroup( TQString( "korn-%1" ).arg( ++box ) ) ) { account = 0 - 1; - while( _config->hasGroup( TQString( "korn-%1-%2" ).tqarg( box ).tqarg( ++account ) ) ) + while( _config->hasGroup( TQString( "korn-%1-%2" ).arg( box ).arg( ++account ) ) ) { - group = new KConfigGroup( _config, TQString( "korn-%1-%2" ).tqarg( box ).tqarg( account ) ); + group = new KConfigGroup( _config, TQString( "korn-%1-%2" ).arg( box ).arg( account ) ); KOrnPassword::rewritePassword( box, account, *group, chUseWallet->isChecked() ); delete group; } diff --git a/korn/kornshell.cpp b/korn/kornshell.cpp index eb3a0253b..dc823779d 100644 --- a/korn/kornshell.cpp +++ b/korn/kornshell.cpp @@ -95,12 +95,12 @@ void KornShell::readConfig() static bool shownConfig = false; _config->setGroup( "korn" ); - TQChar tqlayout = _config->readEntry( "tqlayout", "Docked" )[0].upper(); + TQChar layout = _config->readEntry( "layout", "Docked" )[0].upper(); KOrnPassword::setUseWallet( _config->readBoolEntry( "usewallet", false ) ); - if( tqlayout == 'H' ) + if( layout == 'H' ) _box = new HVContainer( Qt::Horizontal, TQT_TQOBJECT(this), "horizontal container" ); - else if( tqlayout == 'V' ) + else if( layout == 'V' ) _box = new HVContainer( Qt::Vertical, TQT_TQOBJECT(this), "vertical container" ); else _box = new DockedContainer( TQT_TQOBJECT(this), "docked container" ); diff --git a/korn/maildlg.cpp b/korn/maildlg.cpp index 3424e19e4..bcd22888d 100644 --- a/korn/maildlg.cpp +++ b/korn/maildlg.cpp @@ -1,5 +1,5 @@ #include "maildlg.h" -#include <tqlayout.h> +#include <layout.h> #include<kdebug.h> #include<klocale.h> #include<tqapplication.h> diff --git a/korn/maildrop.cpp b/korn/maildrop.cpp index d0818962c..9d2f12f67 100644 --- a/korn/maildrop.cpp +++ b/korn/maildrop.cpp @@ -40,10 +40,10 @@ KMailDrop::KMailDrop() connect(this, TQT_SIGNAL(changed( int, KMailDrop* )), TQT_SLOT(setCount( int, KMailDrop* ))); //Set default colours; this prevents black (TQColor::invalid) boxes after creating a new box. - _bgColour = TQApplication::tqpalette().active().background(); - _fgColour = TQApplication::tqpalette().active().text(); - _nbgColour = TQApplication::tqpalette().active().background(); - _nfgColour = TQApplication::tqpalette().active().text(); + _bgColour = TQApplication::palette().active().background(); + _fgColour = TQApplication::palette().active().text(); + _nbgColour = TQApplication::palette().active().background(); + _nfgColour = TQApplication::palette().active().text(); } KMailDrop::~KMailDrop() @@ -87,10 +87,10 @@ bool KMailDrop::readConfigGroup(const KConfigBase & c) _caption = c.readEntry(fu(CaptionConfigKey)); _clickCmd = c.readPathEntry(fu(ClickConfigKey)); _style = Style(c.readUnsignedNumEntry(fu(DisplayStyleConfigKey), Plain)); - _bgColour = c.readColorEntry(fu(BgColourConfigKey), &TQApplication::tqpalette().active().background()); - _fgColour = c.readColorEntry(fu(FgColourConfigKey), &TQApplication::tqpalette().active().text()); - _nbgColour = c.readColorEntry(fu(NBgColourConfigKey), &TQApplication::tqpalette().active().background()); - _nfgColour = c.readColorEntry(fu(NFgColourConfigKey), &TQApplication::tqpalette().active().text()); + _bgColour = c.readColorEntry(fu(BgColourConfigKey), &TQApplication::palette().active().background()); + _fgColour = c.readColorEntry(fu(FgColourConfigKey), &TQApplication::palette().active().text()); + _nbgColour = c.readColorEntry(fu(NBgColourConfigKey), &TQApplication::palette().active().background()); + _nfgColour = c.readColorEntry(fu(NFgColourConfigKey), &TQApplication::palette().active().text()); _icon = c.readEntry(fu(IconConfigKey)); _nIcon = c.readEntry(fu(NewMailIconConfigKey)); _realName = c.readEntry(fu(RealNameConfigKey)); diff --git a/korn/mailsubject.cpp b/korn/mailsubject.cpp index 747d9ec7c..c7c98d82c 100644 --- a/korn/mailsubject.cpp +++ b/korn/mailsubject.cpp @@ -6,7 +6,7 @@ #include <kglobal.h> #include <klocale.h> #include <tqdatetime.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <ctype.h> KornMailSubject::KornMailSubject() : _id(0), _drop(0), _size(-1), _date(-1), _fullMessage(false) diff --git a/korn/mbox_proto.cpp b/korn/mbox_proto.cpp index eb53449d0..880f86a82 100644 --- a/korn/mbox_proto.cpp +++ b/korn/mbox_proto.cpp @@ -21,7 +21,7 @@ #include <kdebug.h> -#include <tqlayout.h> +#include <layout.h> #include <tqptrvector.h> #include <tqstringlist.h> diff --git a/korn/password.cpp b/korn/password.cpp index bc997d51a..764b90f98 100644 --- a/korn/password.cpp +++ b/korn/password.cpp @@ -52,7 +52,7 @@ TQString KOrnPassword::readKMailPassword( int accountnr, const KConfigBase& fall return KMailDecrypt( fallbackConfig.readEntry( "pass" )); m_wallet->setFolder( "kmail" ); - if( m_wallet->readPassword( TQString( "account-%1" ).tqarg( accountnr ), password ) != 0 ) + if( m_wallet->readPassword( TQString( "account-%1" ).arg( accountnr ), password ) != 0 ) return fallbackConfig.readEntry( "password" ); return password; @@ -95,7 +95,7 @@ bool KOrnPassword::deleteKOrnPassword( int box, int account ) m_wallet->setFolder( "korn" ); //Write to wallet - if( m_wallet->removeEntry( TQString( "account-%1-%2" ).tqarg( box ).tqarg( account ) ) != 0 ) + if( m_wallet->removeEntry( TQString( "account-%1-%2" ).arg( box ).arg( account ) ) != 0 ) //Writing failed return false; @@ -201,7 +201,7 @@ bool KOrnPassword::readKOrnPassword( int box, int account, TQString& password ) return false; m_wallet->setFolder( "korn" ); - if( m_wallet->readPassword( TQString( "account-%1-%2" ).tqarg( box ).tqarg( account ), password ) != 0 ) + if( m_wallet->readPassword( TQString( "account-%1-%2" ).arg( box ).arg( account ), password ) != 0 ) //Error during reading the password: use the one in the config file return false; @@ -228,7 +228,7 @@ bool KOrnPassword::writeKOrnPassword( int box, int account, const TQString& pass m_wallet->setFolder( "korn" ); //Write to wallet - if( m_wallet->writePassword( TQString( "account-%1-%2" ).tqarg( box ).tqarg( account ), password ) != 0 ) + if( m_wallet->writePassword( TQString( "account-%1-%2" ).arg( box ).arg( account ), password ) != 0 ) //Writing failed return false; @@ -241,7 +241,7 @@ TQString KOrnPassword::KMailDecrypt( const TQString& enc ) { TQString result; for (uint i = 0; i < enc.length(); i++) - result += (enc[i].tqunicode() <= 0x21) ? enc[i] : TQChar(0x1001F - enc[i].tqunicode()); + result += (enc[i].unicode() <= 0x21) ? enc[i] : TQChar(0x1001F - enc[i].unicode()); return result; } diff --git a/korn/polldrop.cpp b/korn/polldrop.cpp index 7cc6bc572..8d05a03be 100644 --- a/korn/polldrop.cpp +++ b/korn/polldrop.cpp @@ -52,7 +52,7 @@ void KPollableDrop::timerEvent( TQTimerEvent *ev ) { if( _timerRunning && (ev->timerId() == _timerId) ) { // this event is ours. - recheck(); // should be reimplemented by tqchildren. + recheck(); // should be reimplemented by children. } else { TQObject::timerEvent( ev ); diff --git a/korn/pop3_proto.cpp b/korn/pop3_proto.cpp index c4ecd6b16..b42a63ec2 100644 --- a/korn/pop3_proto.cpp +++ b/korn/pop3_proto.cpp @@ -67,7 +67,7 @@ void Pop3_Protocol::readEntries( TQMap< TQString, TQString >* map, TQMap< TQStri if( map->contains( "ssl" ) && *map->find( "ssl" ) == "true" ) map->insert( "encryption", "ssl" ); if( metadata->contains( "tls" ) ) - map->insert( "encryption", TQString( "tls=%1" ).tqarg( *metadata->find( "tls" ) ) ); + map->insert( "encryption", TQString( "tls=%1" ).arg( *metadata->find( "tls" ) ) ); if( metadata->contains( "auth" ) ) map->insert( "auth", TQString( "auth=APOP" ) ); } diff --git a/korn/process_proto.cpp b/korn/process_proto.cpp index 2d4885fdf..60740320d 100644 --- a/korn/process_proto.cpp +++ b/korn/process_proto.cpp @@ -21,7 +21,7 @@ #include <kdebug.h> -#include <tqlayout.h> +#include <layout.h> #include <tqptrvector.h> #include <tqstringlist.h> diff --git a/korn/progress_dialog.ui b/korn/progress_dialog.ui index e56703418..9c8910286 100644 --- a/korn/progress_dialog.ui +++ b/korn/progress_dialog.ui @@ -39,7 +39,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -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/korn/qmail_proto.cpp b/korn/qmail_proto.cpp index c902ad497..0663e1ff5 100644 --- a/korn/qmail_proto.cpp +++ b/korn/qmail_proto.cpp @@ -22,7 +22,7 @@ #include <kdebug.h> #include <kurlrequester.h> -#include <tqlayout.h> +#include <layout.h> #include <tqptrvector.h> #include <tqstringlist.h> diff --git a/korn/subjectsdlg.cpp b/korn/subjectsdlg.cpp index 43e5102dc..45e239936 100644 --- a/korn/subjectsdlg.cpp +++ b/korn/subjectsdlg.cpp @@ -3,7 +3,7 @@ #include <tqapplication.h> #include <kcursor.h> #include <kdebug.h> -#include <tqlayout.h> +#include <layout.h> #include <tqdatetime.h> #include <tqtimer.h> #include "mailsubject.h" @@ -88,7 +88,7 @@ KornSubjectsDlg::KornSubjectsDlg( TQWidget *parent ) _list->addColumn(i18n("Date")); _list->addColumn(i18n("Size (Bytes)")); - // column 3 contains a number (change tqalignment) + // column 3 contains a number (change alignment) _list->setColumnAlignment(3, TQt::AlignRight); _list->setItemMargin(3); @@ -204,7 +204,7 @@ void KornSubjectsDlg::showMessage(TQListViewItem * item ) void KornSubjectsDlg::showSubjectsDlg( const TQString& name ) { - setCaption( i18n("Mails in Box: %1").tqarg( name ) ); + setCaption( i18n("Mails in Box: %1").arg( name ) ); // load the subjects reloadSubjects(); diff --git a/kresources/birthdays/resourcekabc.cpp b/kresources/birthdays/resourcekabc.cpp index db0a7b77d..7102c8be4 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(); @@ -169,7 +169,7 @@ bool ResourceKABC::doLoad() email_1 = (*it).fullEmail(); uid_1 = (*it).uid(); if (name_1.isEmpty()) name_1 = (*it).realName(); - summary = i18n("%1's birthday").tqarg( name_1 ); + summary = i18n("%1's birthday").arg( name_1 ); Event *ev = new Event(); @@ -276,10 +276,10 @@ bool ResourceKABC::doLoad() name_2 = spouse.realName(); } summary = i18n("insert names of both spouses", - "%1's & %2's anniversary").tqarg( name_1 ).tqarg( name_2 ); + "%1's & %2's anniversary").arg( name_1 ).arg( name_2 ); } else { summary = i18n("only one spouse in addressbook, insert the name", - "%1's anniversary").tqarg( name_1 ); + "%1's anniversary").arg( name_1 ); } Event *ev = new Event(); diff --git a/kresources/birthdays/resourcekabcconfig.cpp b/kresources/birthdays/resourcekabcconfig.cpp index 2f7671dc7..f7aa2a140 100644 --- a/kresources/birthdays/resourcekabcconfig.cpp +++ b/kresources/birthdays/resourcekabcconfig.cpp @@ -22,7 +22,7 @@ #include <typeinfo> #include <tqheader.h> -#include <tqlayout.h> +#include <layout.h> #include <kabprefs.h> #include <kdebug.h> diff --git a/kresources/blogging/resourcebloggingsettings.ui b/kresources/blogging/resourcebloggingsettings.ui index 917933cee..7d7e02279 100644 --- a/kresources/blogging/resourcebloggingsettings.ui +++ b/kresources/blogging/resourcebloggingsettings.ui @@ -19,7 +19,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout12</cstring> + <cstring>layout12</cstring> </property> <hbox> <property name="name"> @@ -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/blogging/xmlrpcjob.cpp b/kresources/blogging/xmlrpcjob.cpp index ae2b1b802..19582ec35 100644 --- a/kresources/blogging/xmlrpcjob.cpp +++ b/kresources/blogging/xmlrpcjob.cpp @@ -171,14 +171,14 @@ kdDebug() << m_str_response << endl; // TODO: Set the error of the job m_response.clear(); m_response << TQVariant( i18n( "Unknown type of XML markup received. " - "Markup: \n %1" ).tqarg( m_str_response ) ); + "Markup: \n %1" ).arg( m_str_response ) ); m_responseType = XMLRPCUnknownResponse; } } else { // TODO: if we can't parse the XML response, set the correct error message! // emit fault( -1, i18n( "Received invalid XML markup: %1 at %2:%3" ) -// .tqarg( errMsg ).tqarg( errLine ).tqarg( errCol ), m_id ); +// .arg( errMsg ).arg( errLine ).arg( errCol ), m_id ); } TransferJob::slotFinished(); diff --git a/kresources/caldav/config.cpp b/kresources/caldav/config.cpp index f3cf57fdc..9f2190520 100644 --- a/kresources/caldav/config.cpp +++ b/kresources/caldav/config.cpp @@ -27,7 +27,7 @@ #include <kurlrequester.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> /*========================================================================= diff --git a/kresources/caldav/configwidgets.cpp b/kresources/caldav/configwidgets.cpp index 4a7072b5f..34fb5fe6c 100644 --- a/kresources/caldav/configwidgets.cpp +++ b/kresources/caldav/configwidgets.cpp @@ -41,7 +41,7 @@ #include <kdebug.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> #include <tqradiobutton.h> #include <tqspinbox.h> @@ -114,7 +114,7 @@ CalDavReloadConfig::CalDavReloadConfig( TQWidget *parent ) d->mIntervalSpin->setEnabled( false ); groupBox->setColumnLayout(1, Qt::Vertical); - TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->tqlayout()); + TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->layout()); vbox->addWidget(intervalRadio); vbox->addWidget(intervalBox); vbox->addWidget(automaticReloadOnStartup); @@ -207,7 +207,7 @@ CalDavSaveConfig::CalDavSaveConfig( TQWidget *parent ) intervalBox->hide(); groupBox->setColumnLayout(1, Qt::Vertical); - TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->tqlayout()); + TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->layout()); vbox->addWidget(delay); vbox->addWidget(every); vbox->addWidget(intervalRadio); diff --git a/kresources/caldav/job.cpp b/kresources/caldav/job.cpp index c79ef06ac..8e49041f6 100644 --- a/kresources/caldav/job.cpp +++ b/kresources/caldav/job.cpp @@ -82,7 +82,7 @@ void CalDavJob::processError(const caldav_error* err) { if (-401 == code) { // unauthorized error_string = i18n("Unauthorized. Username or password incorrect."); } else if (-599 <= code && code <= -300) { - error_string = i18n("HTTP error %1. Please ensure that the URL is a valid CalDAV resource.").tqarg(-code); + error_string = i18n("HTTP error %1. Please ensure that the URL is a valid CalDAV resource.").arg(-code); } else { error_string = err->str; } @@ -98,7 +98,7 @@ void CalDavJob::processTasksError(const caldav_error* err) { if (-401 == code) { // unauthorized error_string = i18n("Unauthorized. Username or password incorrect."); } else if (-599 <= code && code <= -300) { - error_string = i18n("HTTP error %1. Please ensure that the URL is a valid CalDAV resource.").tqarg(-code); + error_string = i18n("HTTP error %1. Please ensure that the URL is a valid CalDAV resource.").arg(-code); } else { error_string = err->str; } @@ -114,7 +114,7 @@ void CalDavJob::processJournalsError(const caldav_error* err) { if (-401 == code) { // unauthorized error_string = i18n("Unauthorized. Username or password incorrect."); } else if (-599 <= code && code <= -300) { - error_string = i18n("HTTP error %1. Please ensure that the URL is a valid CalDAV resource.").tqarg(-code); + error_string = i18n("HTTP error %1. Please ensure that the URL is a valid CalDAV resource.").arg(-code); } else { error_string = err->str; } diff --git a/kresources/caldav/resource.cpp b/kresources/caldav/resource.cpp index db4546d82..daf7ebdeb 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) { @@ -147,7 +147,7 @@ bool ResourceCalDav::doLoad() { return true; // Silently fail; the user has obviously not responded to a dialog and we don't need to pop up more of them! } - log(TQString("doLoad(%1)").tqarg(syncCache)); + log(TQString("doLoad(%1)").arg(syncCache)); clearCache(); @@ -168,7 +168,7 @@ bool ResourceCalDav::doLoad() { bool ResourceCalDav::doSave() { bool syncCache = true; - log(TQString("doSave(%1)").tqarg(syncCache)); + log(TQString("doSave(%1)").arg(syncCache)); if (!hasChanges()) { log("no changes"); @@ -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(); @@ -378,7 +378,7 @@ void ResourceCalDav::loadFinished() { TQCString newpass; if (KPasswordDialog::getPassword (newpass, TQString("<b>") + i18n("Remote authorization required") + TQString("</b><p>") + i18n("Please input the password for") + TQString(" ") + mPrefs->getusername(), NULL) != 1) { log("load error: " + loader->errorString() ); - loadError(TQString("[%1] ").tqarg(abs(loader->errorNumber())) + loader->errorString()); + loadError(TQString("[%1] ").arg(abs(loader->errorNumber())) + loader->errorString()); } else { // Set new password and try again @@ -388,12 +388,12 @@ void ResourceCalDav::loadFinished() { } else { log("load error: " + loader->errorString() ); - loadError(TQString("[%1] ").tqarg(abs(loader->errorNumber())) + loader->errorString()); + loadError(TQString("[%1] ").arg(abs(loader->errorNumber())) + loader->errorString()); } } else { log("load error: " + loader->errorString() ); - loadError(TQString("[%1] ").tqarg(abs(loader->errorNumber())) + loader->errorString()); + loadError(TQString("[%1] ").arg(abs(loader->errorNumber())) + loader->errorString()); } } else { log("successful event load"); @@ -426,7 +426,7 @@ void ResourceCalDav::loadFinished() { // TQCString newpass; // if (KPasswordDialog::getPassword (newpass, TQString("<b>") + i18n("Remote authorization required") + TQString("</b><p>") + i18n("Please input the password for") + TQString(" ") + mPrefs->getusername(), NULL) != 1) { // log("load error: " + loader->tasksErrorString() ); -// loadError(TQString("[%1] ").tqarg(abs(loader->tasksErrorNumber())) + loader->tasksErrorString()); +// loadError(TQString("[%1] ").arg(abs(loader->tasksErrorNumber())) + loader->tasksErrorString()); // } // else { // // Set new password and try again @@ -436,12 +436,12 @@ void ResourceCalDav::loadFinished() { } else { log("load error: " + loader->tasksErrorString() ); - loadError(TQString("[%1] ").tqarg(abs(loader->tasksErrorNumber())) + loader->tasksErrorString()); + loadError(TQString("[%1] ").arg(abs(loader->tasksErrorNumber())) + loader->tasksErrorString()); } } else { log("load error: " + loader->tasksErrorString() ); - loadError(TQString("[%1] ").tqarg(abs(loader->tasksErrorNumber())) + loader->tasksErrorString()); + loadError(TQString("[%1] ").arg(abs(loader->tasksErrorNumber())) + loader->tasksErrorString()); } } else { log("successful tasks load"); @@ -474,7 +474,7 @@ void ResourceCalDav::loadFinished() { // TQCString newpass; // if (KPasswordDialog::getPassword (newpass, TQString("<b>") + i18n("Remote authorization required") + TQString("</b><p>") + i18n("Please input the password for") + TQString(" ") + mPrefs->getusername(), NULL) != 1) { // log("load error: " + loader->journalsErrorString() ); -// loadError(TQString("[%1] ").tqarg(abs(loader->journalsErrorNumber())) + loader->journalsErrorString()); +// loadError(TQString("[%1] ").arg(abs(loader->journalsErrorNumber())) + loader->journalsErrorString()); // } // else { // // Set new password and try again @@ -484,12 +484,12 @@ void ResourceCalDav::loadFinished() { } else { log("load error: " + loader->journalsErrorString() ); - loadError(TQString("[%1] ").tqarg(abs(loader->journalsErrorNumber())) + loader->journalsErrorString()); + loadError(TQString("[%1] ").arg(abs(loader->journalsErrorNumber())) + loader->journalsErrorString()); } } else { log("load error: " + loader->journalsErrorString() ); - loadError(TQString("[%1] ").tqarg(abs(loader->journalsErrorNumber())) + loader->journalsErrorString()); + loadError(TQString("[%1] ").arg(abs(loader->journalsErrorNumber())) + loader->journalsErrorString()); } } else { log("successful journals load"); @@ -971,7 +971,7 @@ void ResourceCalDav::writingFinished() { TQCString newpass; if (KPasswordDialog::getPassword (newpass, TQString("<b>") + i18n("Remote authorization required") + TQString("</b><p>") + i18n("Please input the password for") + TQString(" ") + mPrefs->getusername(), NULL) != 1) { log("write error: " + mWriter->errorString()); - saveError(TQString("[%1] ").tqarg(abs(mWriter->errorNumber())) + mWriter->errorString()); + saveError(TQString("[%1] ").arg(abs(mWriter->errorNumber())) + mWriter->errorString()); } else { // Set new password and try again @@ -981,12 +981,12 @@ void ResourceCalDav::writingFinished() { } else { log("write error: " + mWriter->errorString()); - saveError(TQString("[%1] ").tqarg(abs(mWriter->errorNumber())) + mWriter->errorString()); + saveError(TQString("[%1] ").arg(abs(mWriter->errorNumber())) + mWriter->errorString()); } } else { log("write error: " + mWriter->errorString()); - saveError(TQString("[%1] ").tqarg(abs(mWriter->errorNumber())) + mWriter->errorString()); + saveError(TQString("[%1] ").arg(abs(mWriter->errorNumber())) + mWriter->errorString()); } } else { log("success"); diff --git a/kresources/carddav/config.cpp b/kresources/carddav/config.cpp index 390e3adc7..a836de3a4 100644 --- a/kresources/carddav/config.cpp +++ b/kresources/carddav/config.cpp @@ -26,7 +26,7 @@ #include <kurlrequester.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> /*========================================================================= diff --git a/kresources/carddav/configwidgets.cpp b/kresources/carddav/configwidgets.cpp index b159a0211..e21f75b0e 100644 --- a/kresources/carddav/configwidgets.cpp +++ b/kresources/carddav/configwidgets.cpp @@ -40,7 +40,7 @@ #include <kdebug.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> #include <tqradiobutton.h> #include <tqspinbox.h> @@ -113,7 +113,7 @@ CardDavReloadConfig::CardDavReloadConfig( TQWidget *parent ) d->mIntervalSpin->setEnabled( false ); groupBox->setColumnLayout(1, Qt::Vertical); - TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->tqlayout()); + TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->layout()); vbox->addWidget(intervalRadio); vbox->addWidget(intervalBox); vbox->addWidget(automaticReloadOnStartup); @@ -206,7 +206,7 @@ CardDavSaveConfig::CardDavSaveConfig( TQWidget *parent ) intervalBox->hide(); groupBox->setColumnLayout(1, Qt::Vertical); - TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->tqlayout()); + TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->layout()); vbox->addWidget(delay); vbox->addWidget(every); vbox->addWidget(intervalRadio); diff --git a/kresources/carddav/job.cpp b/kresources/carddav/job.cpp index a842b00a4..994964afb 100644 --- a/kresources/carddav/job.cpp +++ b/kresources/carddav/job.cpp @@ -69,7 +69,7 @@ void CardDavJob::processError(const carddav_error* err) { if (-401 == code) { // unauthorized error_string = i18n("Unauthorized. Username or password incorrect."); } else if (-599 <= code && code <= -300) { - error_string = i18n("HTTP error %1. Maybe, URL is not a CardDAV resource.").tqarg(-code); + error_string = i18n("HTTP error %1. Maybe, URL is not a CardDAV resource.").arg(-code); } else { error_string = err->str; } diff --git a/kresources/carddav/resource.cpp b/kresources/carddav/resource.cpp index 4fb33af55..a708eef02 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) { @@ -144,7 +144,7 @@ bool ResourceCardDav::load() { return true; // Silently fail; the user has obviously not responded to a dialog and we don't need to pop up more of them! } - log(TQString("doLoad(%1)").tqarg(syncCache)); + log(TQString("doLoad(%1)").arg(syncCache)); // FIXME KABC //clearCache(); @@ -166,7 +166,7 @@ bool ResourceCardDav::load() { bool ResourceCardDav::doSave() { bool syncCache = true; - log(TQString("doSave(%1)").tqarg(syncCache)); + log(TQString("doSave(%1)").arg(syncCache)); if (!hasChanges()) { log("no changes"); @@ -372,7 +372,7 @@ void ResourceCardDav::loadFinished() { TQCString newpass; if (KPasswordDialog::getPassword (newpass, TQString("<b>") + i18n("Remote authorization required") + TQString("</b><p>") + i18n("Please input the password for") + TQString(" ") + mPrefs->getusername(), NULL) != 1) { log("load error: " + loader->errorString() ); - addressBook()->error(TQString("[%1] ").tqarg(abs(loader->errorNumber())) + loader->errorString()); + addressBook()->error(TQString("[%1] ").arg(abs(loader->errorNumber())) + loader->errorString()); } else { // Set new password and try again @@ -382,12 +382,12 @@ void ResourceCardDav::loadFinished() { } else { log("load error: " + loader->errorString() ); - addressBook()->error(TQString("[%1] ").tqarg(abs(loader->errorNumber())) + loader->errorString()); + addressBook()->error(TQString("[%1] ").arg(abs(loader->errorNumber())) + loader->errorString()); } } else { log("load error: " + loader->errorString() ); - addressBook()->error(TQString("[%1] ").tqarg(abs(loader->errorNumber())) + loader->errorString()); + addressBook()->error(TQString("[%1] ").arg(abs(loader->errorNumber())) + loader->errorString()); } } else { log("successful load"); @@ -641,7 +641,7 @@ void ResourceCardDav::writingFinished() { TQCString newpass; if (KPasswordDialog::getPassword (newpass, TQString("<b>") + i18n("Remote authorization required") + TQString("</b><p>") + i18n("Please input the password for") + TQString(" ") + mPrefs->getusername(), NULL) != 1) { log("write error: " + mWriter->errorString()); - addressBook()->error(TQString("[%1] ").tqarg(abs(mWriter->errorNumber())) + mWriter->errorString()); + addressBook()->error(TQString("[%1] ").arg(abs(mWriter->errorNumber())) + mWriter->errorString()); } else { // Set new password and try again @@ -651,12 +651,12 @@ void ResourceCardDav::writingFinished() { } else { log("write error: " + mWriter->errorString()); - addressBook()->error(TQString("[%1] ").tqarg(abs(mWriter->errorNumber())) + mWriter->errorString()); + addressBook()->error(TQString("[%1] ").arg(abs(mWriter->errorNumber())) + mWriter->errorString()); } } else { log("write error: " + mWriter->errorString()); - addressBook()->error(TQString("[%1] ").tqarg(abs(mWriter->errorNumber())) + mWriter->errorString()); + addressBook()->error(TQString("[%1] ").arg(abs(mWriter->errorNumber())) + mWriter->errorString()); } } else { log("success"); diff --git a/kresources/egroupware/debugdialog.cpp b/kresources/egroupware/debugdialog.cpp index 0b2764c64..975cae8c7 100644 --- a/kresources/egroupware/debugdialog.cpp +++ b/kresources/egroupware/debugdialog.cpp @@ -20,7 +20,7 @@ #include <tqfile.h> #include <tqfiledialog.h> -#include <tqlayout.h> +#include <layout.h> #include <ktextbrowser.h> #include <kstaticdeleter.h> @@ -38,10 +38,10 @@ DebugDialog::DebugDialog() User1 | User2 | Ok, Ok, true ) { TQWidget *page = plainPage(); - TQVBoxLayout *tqlayout = new TQVBoxLayout( page, marginHint(), spacingHint() ); + TQVBoxLayout *layout = new TQVBoxLayout( page, marginHint(), spacingHint() ); mView = new KTextBrowser( page ); - tqlayout->addWidget( mView ); + layout->addWidget( mView ); setButtonText( User1, "Save As..." ); setButtonText( User2, "Clear" ); diff --git a/kresources/egroupware/kabc_resourcexmlrpc.cpp b/kresources/egroupware/kabc_resourcexmlrpc.cpp index 1247975f7..222c4f4f2 100644 --- a/kresources/egroupware/kabc_resourcexmlrpc.cpp +++ b/kresources/egroupware/kabc_resourcexmlrpc.cpp @@ -393,7 +393,7 @@ void ResourceXMLRPC::deleteContactFinished( const TQValueList<TQVariant>&, void ResourceXMLRPC::fault( int error, const TQString &errorMsg, const TQVariant& ) { - TQString msg = i18n( "<qt>Server sent error %1: <b>%2</b></qt>" ).tqarg( error ).tqarg( errorMsg ); + TQString msg = i18n( "<qt>Server sent error %1: <b>%2</b></qt>" ).arg( error ).arg( errorMsg ); if ( addressBook() ) addressBook()->error( msg ); @@ -408,7 +408,7 @@ void ResourceXMLRPC::addContactFault( int, const TQString &errorMsg, mAddrMap.remove( addr.uid() ); TQString msg = i18n( "Unable to add contact %1 to server. (%2)" ); - addressBook()->error( msg.tqarg( addr.formattedName(), errorMsg ) ); + addressBook()->error( msg.arg( addr.formattedName(), errorMsg ) ); } void ResourceXMLRPC::updateContactFault( int, const TQString &errorMsg, @@ -417,7 +417,7 @@ void ResourceXMLRPC::updateContactFault( int, const TQString &errorMsg, KABC::Addressee addr = mAddrMap[ id.toString() ]; TQString msg = i18n( "Unable to update contact %1 on server. (%2)" ); - addressBook()->error( msg.tqarg( addr.formattedName(), errorMsg ) ); + addressBook()->error( msg.arg( addr.formattedName(), errorMsg ) ); } void ResourceXMLRPC::deleteContactFault( int, const TQString &errorMsg, @@ -437,7 +437,7 @@ void ResourceXMLRPC::deleteContactFault( int, const TQString &errorMsg, mAddrMap.insert( addr.uid(), addr ); TQString msg = i18n( "Unable to delete contact %1 from server. (%2)" ); - addressBook()->error( msg.tqarg( addr.formattedName(), errorMsg ) ); + addressBook()->error( msg.arg( addr.formattedName(), errorMsg ) ); } TQString ResourceXMLRPC::addrTypesToTypeStr( int typeMask ) diff --git a/kresources/egroupware/kabc_resourcexmlrpcconfig.cpp b/kresources/egroupware/kabc_resourcexmlrpcconfig.cpp index ddafbd1f2..56caa2ea1 100644 --- a/kresources/egroupware/kabc_resourcexmlrpcconfig.cpp +++ b/kresources/egroupware/kabc_resourcexmlrpcconfig.cpp @@ -19,7 +19,7 @@ */ #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <kdebug.h> #include <kdialog.h> 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/kcal_resourcexmlrpcconfig.cpp b/kresources/egroupware/kcal_resourcexmlrpcconfig.cpp index 213da26e3..846c648fe 100644 --- a/kresources/egroupware/kcal_resourcexmlrpcconfig.cpp +++ b/kresources/egroupware/kcal_resourcexmlrpcconfig.cpp @@ -19,7 +19,7 @@ */ #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <kdebug.h> #include <kdialog.h> 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/egroupware/knotes_resourcexmlrpcconfig.cpp b/kresources/egroupware/knotes_resourcexmlrpcconfig.cpp index 8cf2a35c8..e240bab8a 100644 --- a/kresources/egroupware/knotes_resourcexmlrpcconfig.cpp +++ b/kresources/egroupware/knotes_resourcexmlrpcconfig.cpp @@ -19,7 +19,7 @@ */ #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <kdebug.h> #include <kdialog.h> diff --git a/kresources/egroupware/todostatemapper.cpp b/kresources/egroupware/todostatemapper.cpp index 81c517d0c..531b298f5 100644 --- a/kresources/egroupware/todostatemapper.cpp +++ b/kresources/egroupware/todostatemapper.cpp @@ -153,7 +153,7 @@ TQString TodoStateMapper::toRemote( int localState ) else if ( localState == 100 ) return "done"; else - return TQString( "%1%" ).tqarg( localState ); + return TQString( "%1%" ).arg( localState ); } TQString TodoStateMapper::filename() diff --git a/kresources/egroupware/xmlrpciface.cpp b/kresources/egroupware/xmlrpciface.cpp index 09176ae6b..fd12d174d 100644 --- a/kresources/egroupware/xmlrpciface.cpp +++ b/kresources/egroupware/xmlrpciface.cpp @@ -113,7 +113,7 @@ void Query::slotResult( KIO::Job *job ) if ( !doc.setContent( data, false, &errMsg, &errLine, &errCol ) ) { emit fault( -1, i18n( "Received invalid XML markup: %1 at %2:%3" ) - .tqarg( errMsg ).tqarg( errLine ).tqarg( errCol ), m_id ); + .arg( errMsg ).arg( errLine ).arg( errCol ), m_id ); emit finished( this ); return ; } diff --git a/kresources/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/exchange/resourceexchangeconfig.cpp b/kresources/exchange/resourceexchangeconfig.cpp index 36774901b..c5b59740d 100644 --- a/kresources/exchange/resourceexchangeconfig.cpp +++ b/kresources/exchange/resourceexchangeconfig.cpp @@ -20,7 +20,7 @@ */ #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <klocale.h> #include <kdebug.h> diff --git a/kresources/featureplan/benchmarkfeaturelist.cpp b/kresources/featureplan/benchmarkfeaturelist.cpp index f30ec2700..856b2526d 100644 --- a/kresources/featureplan/benchmarkfeaturelist.cpp +++ b/kresources/featureplan/benchmarkfeaturelist.cpp @@ -28,7 +28,7 @@ #include <kdebug.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include <iostream> diff --git a/kresources/featureplan/dumpfeaturelist.cpp b/kresources/featureplan/dumpfeaturelist.cpp index 08f6fdf0a..8d77cfa93 100644 --- a/kresources/featureplan/dumpfeaturelist.cpp +++ b/kresources/featureplan/dumpfeaturelist.cpp @@ -28,7 +28,7 @@ #include <kdebug.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include <iostream> diff --git a/kresources/featureplan/kcal_resourcefeatureplanconfig.cpp b/kresources/featureplan/kcal_resourcefeatureplanconfig.cpp index 55d12cbd9..8b7714ea1 100644 --- a/kresources/featureplan/kcal_resourcefeatureplanconfig.cpp +++ b/kresources/featureplan/kcal_resourcefeatureplanconfig.cpp @@ -20,7 +20,7 @@ */ #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> #include <kdebug.h> 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/groupware/kabc_resourcegroupwareconfig.cpp b/kresources/groupware/kabc_resourcegroupwareconfig.cpp index 956ee4321..b9c351633 100644 --- a/kresources/groupware/kabc_resourcegroupwareconfig.cpp +++ b/kresources/groupware/kabc_resourcegroupwareconfig.cpp @@ -32,7 +32,7 @@ #include <kurlrequester.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> using namespace KABC; diff --git a/kresources/groupware/kcal_resourcegroupwareconfig.cpp b/kresources/groupware/kcal_resourcegroupwareconfig.cpp index 9a191bc30..45a5c7962 100644 --- a/kresources/groupware/kcal_resourcegroupwareconfig.cpp +++ b/kresources/groupware/kcal_resourcegroupwareconfig.cpp @@ -21,7 +21,7 @@ #include <typeinfo> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> #include <klocale.h> diff --git a/kresources/groupwise/kabc_resourcegroupwise.cpp b/kresources/groupwise/kabc_resourcegroupwise.cpp index 8291b2bfc..d14d1a419 100644 --- a/kresources/groupwise/kabc_resourcegroupwise.cpp +++ b/kresources/groupwise/kabc_resourcegroupwise.cpp @@ -287,7 +287,7 @@ bool ResourceGroupwise::asyncLoad() if ( !mProgress ) { mProgress = KPIM::ProgressManager::instance()->createProgressItem( - KPIM::ProgressManager::getUniqueID(), i18n( "Loading GroupWise resource %1" ).tqarg( resourceName() ), TQString(), true /*CanBeCancelled*/, mPrefs->url().startsWith("https" ) ); + KPIM::ProgressManager::getUniqueID(), i18n( "Loading GroupWise resource %1" ).arg( resourceName() ), TQString(), true /*CanBeCancelled*/, mPrefs->url().startsWith("https" ) ); connect( mProgress, TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), TQT_SLOT( cancelLoad() ) ); } @@ -708,7 +708,7 @@ KURL ResourceGroupwise::createAccessUrl( BookType bookType, AccessMode mode, uns if ( mode == Update && lastSequenceNumber > 0 && lastPORebuildTime > 0 ) { - query += TQString::tqfromLatin1( "&update=true&lastSeqNo=%1&PORebuildTime=%2" ).tqarg( lastSequenceNumber ).tqarg( lastPORebuildTime );; + query += TQString::fromLatin1( "&update=true&lastSeqNo=%1&PORebuildTime=%2" ).arg( lastSequenceNumber ).arg( lastPORebuildTime );; } url.setQuery( query ); return url; diff --git a/kresources/groupwise/kabc_resourcegroupwiseconfig.cpp b/kresources/groupwise/kabc_resourcegroupwiseconfig.cpp index 483268cc2..65e8a8bfe 100644 --- a/kresources/groupwise/kabc_resourcegroupwiseconfig.cpp +++ b/kresources/groupwise/kabc_resourcegroupwiseconfig.cpp @@ -32,7 +32,7 @@ #include <kurlrequester.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> using namespace KABC; 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/kcal_resourcegroupwiseconfig.cpp b/kresources/groupwise/kcal_resourcegroupwiseconfig.cpp index 26689315e..a891e3d45 100644 --- a/kresources/groupwise/kcal_resourcegroupwiseconfig.cpp +++ b/kresources/groupwise/kcal_resourcegroupwiseconfig.cpp @@ -21,7 +21,7 @@ #include <typeinfo> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> #include <klocale.h> @@ -124,7 +124,7 @@ void ResourceGroupwiseConfig::slotViewUserSettings() if ( s ) { KDialogBase * dialog = new KDialogBase( ::tqqt_cast<TQWidget*>(parent() ), "gwsettingswidget", true, i18n( "GroupWise Settings" ) ); -// TQVBoxLayout * tqlayout = new TQVBoxLayout( dialog ); +// TQVBoxLayout * layout = new TQVBoxLayout( dialog ); GroupWiseSettingsWidget * settingsWidget = new GroupWiseSettingsWidget( dialog ); dialog->setMainWidget( settingsWidget ); // populate dialog diff --git a/kresources/groupwise/kioslave/groupwise.cpp b/kresources/groupwise/kioslave/groupwise.cpp index 4ebb2e387..e257ba71e 100644 --- a/kresources/groupwise/kioslave/groupwise.cpp +++ b/kresources/groupwise/kioslave/groupwise.cpp @@ -117,7 +117,7 @@ void Groupwise::get( const KURL &url ) getAddressbook( url ); } else { TQString error = i18n("Unknown path. Known paths are '/freebusy/', " - "'/calendar/' and '/addressbook/'.") + TQString(" path was %1" ).tqarg( url.url() ); + "'/calendar/' and '/addressbook/'.") + TQString(" path was %1" ).arg( url.url() ); errorMessage( error ); } @@ -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() ) { @@ -419,7 +419,7 @@ void Groupwise::slotReadAddressBookProcessedSize( int size ) void Groupwise::slotServerErrorMessage( const TQString & serverErrorMessage, bool fatal ) { kdDebug() << "Groupwise::slotJobErrorMessage()" << serverErrorMessage << ( fatal ? ", FATAL!" : ", proceeding" ) << endl; - errorMessage( i18n( "An error occurred while communicating with the GroupWise server:\n%1" ).tqarg( serverErrorMessage ) ); + errorMessage( i18n( "An error occurred while communicating with the GroupWise server:\n%1" ).arg( serverErrorMessage ) ); } #include "groupwise.moc" diff --git a/kresources/groupwise/soap/contactconverter.cpp b/kresources/groupwise/soap/contactconverter.cpp index 4f4454399..69c4b90f2 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").arg( 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..130895cdc 100644 --- a/kresources/groupwise/soap/groupwiseserver.cpp +++ b/kresources/groupwise/soap/groupwiseserver.cpp @@ -129,10 +129,10 @@ 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 ); + mErrorText = i18n("Connect failed: %1.").arg( errorMessage ); return SOAP_INVALID_SOCKET; } @@ -141,15 +141,15 @@ 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 ); + mErrorText = i18n("Connect failed: %1.").arg( errorMessage ); soap->error =SOAP_TCP_ERROR; return SOAP_INVALID_SOCKET; } @@ -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..47aa67745 100644 --- a/kresources/groupwise/soap/gwjobs.cpp +++ b/kresources/groupwise/soap/gwjobs.cpp @@ -121,7 +121,7 @@ void ReadAddressBooksJob::readAddressBook( std::string &id ) &itemsRequest, &itemsResponse ); if ( result != 0 ) { soap_print_fault( mSoap, stderr ); - mServer->emitErrorMessage( i18n("Unable to read GroupWise address book: %1" ).tqarg( id.c_str() ), false ); + mServer->emitErrorMessage( i18n("Unable to read GroupWise address book: %1" ).arg( id.c_str() ), false ); return; } @@ -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; @@ -613,7 +613,7 @@ void ReadCalendarJob::readCalendarFolder( const std::string &id, ReadItemCounts else { kdDebug() << " readCursor got no Items in Response!" << endl; - mServer->emitErrorMessage( i18n("Unable to read GroupWise address book: reading %1 returned no items." ).tqarg( id.c_str() ), false ); + mServer->emitErrorMessage( i18n("Unable to read GroupWise address book: reading %1 returned no items." ).arg( id.c_str() ), false ); break; } } diff --git a/kresources/groupwise/soap/incidenceconverter.cpp b/kresources/groupwise/soap/incidenceconverter.cpp index 7360d8a42..f0fe73892 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" ).arg( (*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..e38f00d04 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; @@ -325,7 +325,7 @@ int KSSLSocket::verifyCertificate() "does not match the one the " "certificate was issued to."); result = messageBox( KIO::SlaveBase::WarningYesNoCancel, - msg.tqarg(ourHost), + msg.arg(ourHost), i18n("Server Authentication"), i18n("&Details"), KStdGuiItem::cont().text() ); @@ -335,7 +335,7 @@ int KSSLSocket::verifyCertificate() TQString msg = i18n("The server certificate failed the " "authenticity test (%1)."); result = messageBox( KIO::SlaveBase::WarningYesNoCancel, - msg.tqarg(ourHost), + msg.arg(ourHost), i18n("Server Authentication"), i18n("&Details"), KStdGuiItem::cont().text() ); diff --git a/kresources/groupwise/soap/soapC.cpp b/kresources/groupwise/soap/soapC.cpp index 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/groupwise/soap/stdsoap2.h b/kresources/groupwise/soap/stdsoap2.h index 7dee722a1..4ff4725a7 100644 --- a/kresources/groupwise/soap/stdsoap2.h +++ b/kresources/groupwise/soap/stdsoap2.h @@ -1350,8 +1350,8 @@ struct soap std::ostream *os; std::istream *is; #else - void *os; /* preserve tqalignment */ - void *is; /* preserve tqalignment */ + void *os; /* preserve alignment */ + void *is; /* preserve alignment */ #endif #ifndef UNDER_CE int sendfd; diff --git a/kresources/kolab/kabc/contact.cpp b/kresources/kolab/kabc/contact.cpp index 7a26f62f7..796099025 100644 --- a/kresources/kolab/kabc/contact.cpp +++ b/kresources/kolab/kabc/contact.cpp @@ -293,12 +293,12 @@ TQDate Contact::anniversary() const return mAnniversary; } -void Contact::setChildren( const TQString& tqchildren ) +void Contact::setChildren( const TQString& children ) { - mChildren = tqchildren; + mChildren = children; } -TQString Contact::tqchildren() const +TQString Contact::children() const { return mChildren; } @@ -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; } @@ -619,7 +619,7 @@ bool Contact::loadAttribute( TQDomElement& element ) } break; case 'c': - if ( tagName == "tqchildren" ) { + if ( tagName == "children" ) { setChildren( element.text() ); return true; } @@ -798,7 +798,7 @@ bool Contact::saveAttributes( TQDomElement& element ) const writeString( element, "x-logo", mLogoAttachmentName ); if ( !sound().isNull() ) writeString( element, "x-sound", mSoundAttachmentName ); - writeString( element, "tqchildren", tqchildren() ); + writeString( element, "children", children() ); writeString( element, "gender", gender() ); writeString( element, "language", language() ); savePhoneAttributes( element ); @@ -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 @@ -1146,7 +1146,7 @@ void Contact::setFields( const KABC::Addressee* addressee ) // mailer, timezone, productId, sortString, agent, rfc2426 name() // Things KAddressBook can't handle, so they are saved as unhandled tags: - // initials, tqchildren, gender, language + // initials, children, gender, language } // The loading is: xml -> Contact -> addressee, this is the second part @@ -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/kabc/contact.h b/kresources/kolab/kabc/contact.h index 60c399335..6e0de80bc 100644 --- a/kresources/kolab/kabc/contact.h +++ b/kresources/kolab/kabc/contact.h @@ -154,8 +154,8 @@ public: TQString soundAttachmentName() const { return mSoundAttachmentName; } TQByteArray sound() const { return mSound; } - void setChildren( const TQString& tqchildren ); - TQString tqchildren() const; + void setChildren( const TQString& children ); + TQString children() const; void setGender( const TQString& gender ); TQString gender() const; diff --git a/kresources/kolab/kcal/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..2617da4a1 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 ); @@ -1030,7 +1030,7 @@ void Incidence::loadAttachments() TQString Incidence::productID() const { - return TQString( "KOrganizer %1, Kolab resource" ).tqarg( korgVersion ); + return TQString( "KOrganizer %1, Kolab resource" ).arg( korgVersion ); } // Unhandled KCal::Incidence fields: diff --git a/kresources/kolab/kcal/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..edd94303c 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. @@ -423,7 +423,7 @@ void ResourceKolab::resolveConflict( KCal::Incidence* inc, const TQString& subre addedIncidence = inc; } else if ( result == 0 ) { // take both addedIncidence = inc; - addedIncidence->setSummary( i18n("Copy of: %1").tqarg( addedIncidence->summary() ) ); + addedIncidence->setSummary( i18n("Copy of: %1").arg( addedIncidence->summary() ) ); addedIncidence->setUid( CalFormat::createUniqueId() ); localIncidence = local; } @@ -604,24 +604,24 @@ bool ResourceKolab::addIncidence( KCal::Incidence* incidence, const TQString& _s } text += "<font></b><br>"; if ( !incidence->summary().isEmpty() ) - text += i18n( "<b>Summary:</b> %1" ).tqarg( incidence->summary() ) + "<br>"; + text += i18n( "<b>Summary:</b> %1" ).arg( incidence->summary() ) + "<br>"; if ( !incidence->location().isEmpty() ) - text += i18n( "<b>Location:</b> %1" ).tqarg( incidence->location() ); + text += i18n( "<b>Location:</b> %1" ).arg( incidence->location() ); text += "<br>"; if ( !incidence->doesFloat() ) text += i18n( "<b>Start:</b> %1, %2" ) - .tqarg( incidence->dtStartDateStr(), incidence->dtStartTimeStr() ); + .arg( incidence->dtStartDateStr(), incidence->dtStartTimeStr() ); else - text += i18n( "<b>Start:</b> %1" ).tqarg( incidence->dtStartDateStr() ); + text += i18n( "<b>Start:</b> %1" ).arg( incidence->dtStartDateStr() ); text += "<br>"; if ( incidence->type() == "Event" ) { Event* event = static_cast<Event*>( incidence ); if ( event->hasEndDate() ) { if ( !event->doesFloat() ) { text += i18n( "<b>End:</b> %1, %2" ) - .tqarg( event->dtEndDateStr(), event->dtEndTimeStr() ); + .arg( event->dtEndDateStr(), event->dtEndTimeStr() ); } else { - text += i18n( "<b>End:</b> %1" ).tqarg( event->dtEndDateStr() ); + text += i18n( "<b>End:</b> %1" ).arg( event->dtEndDateStr() ); } } text += "<br>"; diff --git a/kresources/kolab/kcal/task.cpp b/kresources/kolab/kcal/task.cpp index 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/note.cpp b/kresources/kolab/knotes/note.cpp index ea5f6b285..e456e43be 100644 --- a/kresources/kolab/knotes/note.cpp +++ b/kresources/kolab/knotes/note.cpp @@ -225,5 +225,5 @@ void Note::saveTo( KCal::Journal* journal ) TQString Note::productID() const { - return TQString( "KNotes %1, Kolab resource" ).tqarg( KNOTES_VERSION ); + return TQString( "KNotes %1, Kolab resource" ).arg( KNOTES_VERSION ); } diff --git a/kresources/kolab/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..a56383af8 100644 --- a/kresources/kolab/shared/resourcekolabbase.cpp +++ b/kresources/kolab/shared/resourcekolabbase.cpp @@ -42,7 +42,7 @@ #include <kurl.h> #include <ktempfile.h> #include <kmessagebox.h> -#include <tqtextstream.h> +#include <textstream.h> #include <kdebug.h> using namespace Kolab; @@ -126,8 +126,8 @@ static TQString plainTextBody() " Groupware format.\nFor a list of such email clients please" " visit\n%1" ); const char * url = "http://www.kolab.org/kolab2-clients.html"; - TQString firstPartTextUntranslated = TQString::tqfromLatin1( firstPartTextToTranslate ).tqarg( url ); - TQString firstPartText = i18n( firstPartTextToTranslate ).tqarg( url ); + TQString firstPartTextUntranslated = TQString::fromLatin1( firstPartTextToTranslate ).arg( url ); + TQString firstPartText = i18n( firstPartTextToTranslate ).arg( url ); if ( firstPartText != firstPartTextUntranslated ) { firstPartText.append("\n\n-----------------------------------------------------\n\n"); firstPartText.append( firstPartTextUntranslated ); @@ -190,7 +190,7 @@ bool ResourceKolabBase::kmailUpdate( const TQString& resource, TQString ResourceKolabBase::configFile( const TQString& type ) const { return locateLocal( "config", - TQString( "kresources/kolab/%1rc" ).tqarg( type ) ); + TQString( "kresources/kolab/%1rc" ).arg( type ) ); } bool ResourceKolabBase::connectToKMail() const diff --git a/kresources/lib/folderconfig.cpp b/kresources/lib/folderconfig.cpp index 20fa6fa1b..c82f39757 100644 --- a/kresources/lib/folderconfig.cpp +++ b/kresources/lib/folderconfig.cpp @@ -32,7 +32,7 @@ #include <kdebug.h> #include <kdialog.h> -#include <tqlayout.h> +#include <layout.h> #include <tqgroupbox.h> #include <tqpushbutton.h> #include <tqcombobox.h> diff --git a/kresources/lib/folderlister.cpp b/kresources/lib/folderlister.cpp index eec969c26..affc6af57 100644 --- a/kresources/lib/folderlister.cpp +++ b/kresources/lib/folderlister.cpp @@ -137,7 +137,7 @@ void FolderLister::readConfig( KPIM::GroupwarePrefsBase *newprefs ) for ( int i=0; i<nr; ++i ) { TQStringList l( newprefs->folder( i ) ); -// TQStringList l( cfgg.readListEntry( TQString("Folder%1").tqarg( i ) ) ); +// TQStringList l( cfgg.readListEntry( TQString("Folder%1").arg( i ) ) ); Entry e; if ( l.count()>0 ) { e.id = l.first(); @@ -186,7 +186,7 @@ void FolderLister::writeConfig( GroupwarePrefsBase *newprefs ) lst << (*it).name; lst += contentTypeToStrings( (*it).type ); newprefs->setFolder( nr, lst ); -// cfgg.writeEntry( TQString("Folder%1").tqarg( nr ), lst ); +// cfgg.writeEntry( TQString("Folder%1").arg( nr ), lst ); if ( (*it).active ) active.append( (*it).id ); nr++; } diff --git a/kresources/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/lib/folderselectdialog.cpp b/kresources/lib/folderselectdialog.cpp index f05dccf0a..44fbeb6b9 100644 --- a/kresources/lib/folderselectdialog.cpp +++ b/kresources/lib/folderselectdialog.cpp @@ -32,7 +32,7 @@ #include "folderselectdialog.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> using namespace KPIM; @@ -42,16 +42,16 @@ FolderSelectDialog::FolderSelectDialog( const TQString& caption, const TQString& : KDialogBase(0, 0, true, caption, Ok|Cancel, Ok, true) { TQFrame* frame = makeMainWidget(); - TQVBoxLayout* tqlayout = new TQVBoxLayout( frame, 0, spacingHint() ); + TQVBoxLayout* layout = new TQVBoxLayout( frame, 0, spacingHint() ); TQLabel* labelWidget = new TQLabel( label, frame ); - tqlayout->addWidget( labelWidget ); + layout->addWidget( labelWidget ); mListBox = new KListBox( frame ); mListBox->insertStringList( list ); mListBox->setSelected( 0, true ); mListBox->ensureCurrentVisible(); - tqlayout->addWidget( mListBox, 10 ); + layout->addWidget( mListBox, 10 ); connect( mListBox, TQT_SIGNAL( doubleClicked( TQListBoxItem * ) ), TQT_SLOT( slotOk() ) ); @@ -60,7 +60,7 @@ FolderSelectDialog::FolderSelectDialog( const TQString& caption, const TQString& mListBox->setFocus(); - tqlayout->addStretch(); + layout->addStretch(); setMinimumWidth( 320 ); } diff --git a/kresources/lib/kabc_resourcegroupwarebaseconfig.cpp b/kresources/lib/kabc_resourcegroupwarebaseconfig.cpp index 6609a3b28..2997ae021 100644 --- a/kresources/lib/kabc_resourcegroupwarebaseconfig.cpp +++ b/kresources/lib/kabc_resourcegroupwarebaseconfig.cpp @@ -33,7 +33,7 @@ #include <kurlrequester.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> using namespace KABC; diff --git a/kresources/lib/kcal_cachesettingsdlg.cpp b/kresources/lib/kcal_cachesettingsdlg.cpp index 20b48ad9e..7eafa5307 100644 --- a/kresources/lib/kcal_cachesettingsdlg.cpp +++ b/kresources/lib/kcal_cachesettingsdlg.cpp @@ -33,7 +33,7 @@ #include <kdialog.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> using namespace KCal; diff --git a/kresources/lib/kcal_resourcegroupwarebaseconfig.cpp b/kresources/lib/kcal_resourcegroupwarebaseconfig.cpp index ed8a63f92..8ad00e62b 100644 --- a/kresources/lib/kcal_resourcegroupwarebaseconfig.cpp +++ b/kresources/lib/kcal_resourcegroupwarebaseconfig.cpp @@ -36,7 +36,7 @@ #include <kpushbutton.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqhbox.h> 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/remote/resourceremote.cpp b/kresources/remote/resourceremote.cpp index 18b8782e1..229dd86bf 100644 --- a/kresources/remote/resourceremote.cpp +++ b/kresources/remote/resourceremote.cpp @@ -330,7 +330,7 @@ void ResourceRemote::dump() const void ResourceRemote::addInfoText( TQString &txt ) const { txt += "<br>"; - txt += i18n("URL: %1").tqarg( mDownloadUrl.prettyURL() ); + txt += i18n("URL: %1").arg( mDownloadUrl.prettyURL() ); } bool ResourceRemote::setValue( const TQString &key, const TQString &value ) diff --git a/kresources/remote/resourceremoteconfig.cpp b/kresources/remote/resourceremoteconfig.cpp index 67d7f4b94..a84c709ba 100644 --- a/kresources/remote/resourceremoteconfig.cpp +++ b/kresources/remote/resourceremoteconfig.cpp @@ -22,7 +22,7 @@ #include <typeinfo> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <klocale.h> #include <kdebug.h> diff --git a/kresources/scalix/kabc/contact.cpp b/kresources/scalix/kabc/contact.cpp index 762d4b9fe..9f38674ef 100644 --- a/kresources/scalix/kabc/contact.cpp +++ b/kresources/scalix/kabc/contact.cpp @@ -103,19 +103,19 @@ TQString Contact::toXml( const KABC::Addressee &addr ) comment = addr.formattedName(); display = emails[ i ]; } else { - comment = custom( TQString( "email%1_address_with_comment" ).tqarg( i + 1 ), addr ); - display = custom( TQString( "email%1_display_name" ).tqarg( i + 1 ), addr ); + comment = custom( TQString( "email%1_address_with_comment" ).arg( i + 1 ), addr ); + display = custom( TQString( "email%1_display_name" ).arg( i + 1 ), addr ); } } - xml += TQString( "<email%1_address_type>" ).tqarg( i + 1 ) + type + - TQString( "</email%1_address_type>" ).tqarg( i + 1 ) +"\n"; - xml += TQString( "<email%1_address>" ).tqarg( i + 1 ) + address + - TQString( "</email%1_address>" ).tqarg( i + 1 ) +"\n"; - xml += TQString( "<email%1_address_with_comment>" ).tqarg( i + 1 ) + comment + - TQString( "</email%1_address_with_comment>" ).tqarg( i + 1 ) + "\n"; - xml += TQString( "<email%1_display_name>" ).tqarg( i + 1 ) + display + - TQString( "</email%1_display_name>" ).tqarg( i + 1 ) + "\n"; + xml += TQString( "<email%1_address_type>" ).arg( i + 1 ) + type + + TQString( "</email%1_address_type>" ).arg( i + 1 ) +"\n"; + xml += TQString( "<email%1_address>" ).arg( i + 1 ) + address + + TQString( "</email%1_address>" ).arg( i + 1 ) +"\n"; + xml += TQString( "<email%1_address_with_comment>" ).arg( i + 1 ) + comment + + TQString( "</email%1_address_with_comment>" ).arg( i + 1 ) + "\n"; + xml += TQString( "<email%1_display_name>" ).arg( i + 1 ) + display + + TQString( "</email%1_display_name>" ).arg( i + 1 ) + "\n"; } KABC::PhoneNumber phone = addr.phoneNumber( KABC::PhoneNumber::Home ); diff --git a/kresources/scalix/kcal/resourcescalix.cpp b/kresources/scalix/kcal/resourcescalix.cpp index 645c5b88e..eeebb32f8 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. @@ -325,7 +325,7 @@ void ResourceScalix::resolveConflict( KCal::Incidence* inc, const TQString& subr } else if ( result == 0 ) { // take both localIncidence = local->clone(); localIncidence->recreate(); - localIncidence->setSummary( i18n("Copy of: %1").tqarg(localIncidence->summary()) ); + localIncidence->setSummary( i18n("Copy of: %1").arg(localIncidence->summary()) ); addedIncidence = inc; } bool silent = mSilent; diff --git a/kresources/scalix/kioslave/scalix.cpp b/kresources/scalix/kioslave/scalix.cpp index acfa088e6..c5631f78c 100644 --- a/kresources/scalix/kioslave/scalix.cpp +++ b/kresources/scalix/kioslave/scalix.cpp @@ -104,14 +104,14 @@ void Scalix::retrieveFreeBusy( const KURL &url ) TQByteArray packedArgs; TQDataStream stream( packedArgs, IO_WriteOnly ); - const TQString argument = TQString( "BEGIN:VFREEBUSY\nATTENDEE:MAILTO:%1\nEND:VFREEBUSY" ).tqarg( requestUser ); - const TQString command = TQString( "X-GET-ICAL-FREEBUSY {%1}" ).tqarg( argument.length() ); + const TQString argument = TQString( "BEGIN:VFREEBUSY\nATTENDEE:MAILTO:%1\nEND:VFREEBUSY" ).arg( requestUser ); + const TQString command = TQString( "X-GET-ICAL-FREEBUSY {%1}" ).arg( argument.length() ); stream << (int) 'X' << 'E' << command << argument; - TQString imapUrl = TQString( "imap://%1@%3/" ).tqarg( url.pass().isEmpty() ? + TQString imapUrl = TQString( "imap://%1@%3/" ).arg( url.pass().isEmpty() ? url.user() : url.user() + ":" + url.pass() ) - .tqarg( url.host() ); + .arg( url.host() ); mFreeBusyData = TQString(); @@ -173,13 +173,13 @@ void Scalix::publishFreeBusy( const KURL &url ) TQDataStream stream( packedArgs, IO_WriteOnly ); const TQString argument = TQString::fromUtf8( data ); - const TQString command = TQString( "X-PUT-ICAL-FREEBUSY Calendar {%1}" ).tqarg( argument.length() ); + const TQString command = TQString( "X-PUT-ICAL-FREEBUSY Calendar {%1}" ).arg( argument.length() ); stream << (int) 'X' << 'E' << command << argument; - TQString imapUrl = TQString( "imap://%1@%3/" ).tqarg( url.pass().isEmpty() ? + TQString imapUrl = TQString( "imap://%1@%3/" ).arg( url.pass().isEmpty() ? url.user() : url.user() + ":" + url.pass() ) - .tqarg( url.host() ); + .arg( url.host() ); KIO::SimpleJob *job = KIO::special( imapUrl, packedArgs, false ); connect( job, TQT_SIGNAL( result( KIO::Job* ) ), diff --git a/kresources/scalix/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/scalixadmin/delegatedialog.cpp b/kresources/scalix/scalixadmin/delegatedialog.cpp index d0a9644e8..3b24f2d4c 100644 --- a/kresources/scalix/scalixadmin/delegatedialog.cpp +++ b/kresources/scalix/scalixadmin/delegatedialog.cpp @@ -20,7 +20,7 @@ #include <tqcheckbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlineedit.h> #include <tqtoolbutton.h> @@ -35,18 +35,18 @@ DelegateDialog::DelegateDialog( TQWidget *parent ) : KDialogBase( parent, "", true, "", Ok | Cancel, Ok, true ) { TQWidget *page = new TQWidget( this ); - TQGridLayout *tqlayout = new TQGridLayout( page, 5, 3, 11, 6 ); + TQGridLayout *layout = new TQGridLayout( page, 5, 3, 11, 6 ); TQLabel *label = new TQLabel( i18n( "User:" ), page ); - tqlayout->addWidget( label, 0, 0 ); + layout->addWidget( label, 0, 0 ); mEmail = new TQLineEdit( page ); - tqlayout->addWidget( mEmail, 0, 1 ); + layout->addWidget( mEmail, 0, 1 ); TQToolButton *emailSelector = new TQToolButton( page ); emailSelector->setUsesTextLabel( true ); emailSelector->setTextLabel( i18n( "..." ) ); - tqlayout->addWidget( emailSelector, 0, 2 ); + layout->addWidget( emailSelector, 0, 2 ); TQValueList<Scalix::DelegateTypes> types; types << Scalix::SendOnBehalfOf; @@ -57,7 +57,7 @@ DelegateDialog::DelegateDialog( TQWidget *parent ) int row = 1; for ( uint i = 0; i < types.count(); ++i ) { TQCheckBox *box = new TQCheckBox( Scalix::Delegate::rightsAsString( types[ i ] ), page ); - tqlayout->addMultiCellWidget( box, row, row, 1, 2 ); + layout->addMultiCellWidget( box, row, row, 1, 2 ); mRights.insert( types[ i ], box ); row++; diff --git a/kresources/scalix/scalixadmin/delegatepage.cpp b/kresources/scalix/scalixadmin/delegatepage.cpp index 32b29d465..d1610d232 100644 --- a/kresources/scalix/scalixadmin/delegatepage.cpp +++ b/kresources/scalix/scalixadmin/delegatepage.cpp @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <kinputdialog.h> @@ -37,21 +37,21 @@ DelegatePage::DelegatePage( TQWidget *parent ) : TQWidget( parent ) { - TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3, 11, 6 ); + TQGridLayout *layout = new TQGridLayout( this, 2, 3, 11, 6 ); mView = new DelegateView( &mManager, this ); - tqlayout->addMultiCellWidget( mView, 0, 0, 0, 2 ); + layout->addMultiCellWidget( mView, 0, 0, 0, 2 ); mAddButton = new TQPushButton( i18n( "Add Delegate..." ), this ); - tqlayout->addWidget( mAddButton, 1, 0 ); + layout->addWidget( mAddButton, 1, 0 ); mEditButton = new TQPushButton( i18n( "Edit Delegate..." ), this ); mEditButton->setEnabled( false ); - tqlayout->addWidget( mEditButton, 1, 1 ); + layout->addWidget( mEditButton, 1, 1 ); mRemoveButton = new TQPushButton( i18n( "Remove Delegate" ), this ); mRemoveButton->setEnabled( false ); - tqlayout->addWidget( mRemoveButton, 1, 2 ); + layout->addWidget( mRemoveButton, 1, 2 ); connect( mView, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( selectionChanged() ) ); connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addDelegate() ) ); diff --git a/kresources/scalix/scalixadmin/jobs.cpp b/kresources/scalix/scalixadmin/jobs.cpp index 2d6823918..f1bce9f2c 100644 --- a/kresources/scalix/scalixadmin/jobs.cpp +++ b/kresources/scalix/scalixadmin/jobs.cpp @@ -73,7 +73,7 @@ SetPasswordJob* Scalix::setPassword( KIO::Slave* slave, const KURL& url, TQByteArray packedArgs; TQDataStream stream( packedArgs, IO_WriteOnly ); stream << (int)'X' << (int)'N' - << TQString( "X-SCALIX-PASSWORD" ) << TQString( "%1 %2" ).tqarg( oldPassword ).tqarg( newPassword ); + << TQString( "X-SCALIX-PASSWORD" ) << TQString( "%1 %2" ).arg( oldPassword ).arg( newPassword ); SetPasswordJob* job = new SetPasswordJob( url, packedArgs, false ); KIO::Scheduler::assignJobToSlave( slave, job ); @@ -95,7 +95,7 @@ SetDelegateJob* Scalix::setDelegate( KIO::Slave* slave, const KURL& url, const T TQByteArray packedArgs; TQDataStream stream( packedArgs, IO_WriteOnly ); stream << (int)'X' << (int)'N' - << TQString( "X-SET-DELEGATE" ) << TQString( "%1 %2" ).tqarg( email ).tqarg( types.join( " " ) ); + << TQString( "X-SET-DELEGATE" ) << TQString( "%1 %2" ).arg( email ).arg( types.join( " " ) ); SetDelegateJob* job = new SetDelegateJob( url, packedArgs, false ); KIO::Scheduler::assignJobToSlave( slave, job ); @@ -164,9 +164,9 @@ GetOtherUsersJob* Scalix::getOtherUsers( KIO::Slave* slave, const KURL& url ) SetOutOfOfficeJob* Scalix::setOutOfOffice( KIO::Slave* slave, const KURL& url, bool enabled, const TQString& msg ) { const TQString argument = msg; - const TQString command = TQString( "X-SET-OUT-OF-OFFICE %1 %2 {%3}" ).tqarg( enabled ? "ENABLED" : "DISABLED" ) - .tqarg( "UTF-8" ) - .tqarg( msg.utf8().length() ); + const TQString command = TQString( "X-SET-OUT-OF-OFFICE %1 %2 {%3}" ).arg( enabled ? "ENABLED" : "DISABLED" ) + .arg( "UTF-8" ) + .arg( msg.utf8().length() ); TQByteArray packedArgs; TQDataStream stream( packedArgs, IO_WriteOnly ); diff --git a/kresources/scalix/scalixadmin/ldapview.cpp b/kresources/scalix/scalixadmin/ldapview.cpp index b52c0aad9..adf2fe3fa 100644 --- a/kresources/scalix/scalixadmin/ldapview.cpp +++ b/kresources/scalix/scalixadmin/ldapview.cpp @@ -85,8 +85,8 @@ void LdapView::setQuery( const TQString &query ) void LdapView::entryAdded( const KABC::LdapObject &obj ) { - const TQString text = TQString( "%1 (%2)" ).tqarg( TQString(obj.attrs[ "surname" ].first()) ) - .tqarg( TQString(obj.attrs[ "mail" ].first()) ); + const TQString text = TQString( "%1 (%2)" ).arg( TQString(obj.attrs[ "surname" ].first()) ) + .arg( TQString(obj.attrs[ "mail" ].first()) ); new LdapItem( this, text, obj.attrs[ "mail" ].first() ); } diff --git a/kresources/scalix/scalixadmin/otheruserpage.cpp b/kresources/scalix/scalixadmin/otheruserpage.cpp index ab5a417a9..daec37f2d 100644 --- a/kresources/scalix/scalixadmin/otheruserpage.cpp +++ b/kresources/scalix/scalixadmin/otheruserpage.cpp @@ -19,7 +19,7 @@ */ #include <tqapplication.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <dcopref.h> @@ -40,17 +40,17 @@ OtherUserPage::OtherUserPage( TQWidget *parent ) : TQWidget( parent ) { - TQGridLayout *tqlayout = new TQGridLayout( this, 2, 2, 11, 6 ); + TQGridLayout *layout = new TQGridLayout( this, 2, 2, 11, 6 ); mView = new OtherUserView( &mManager, this ); - tqlayout->addMultiCellWidget( mView, 0, 0, 0, 1 ); + layout->addMultiCellWidget( mView, 0, 0, 0, 1 ); mAddButton = new TQPushButton( i18n( "Add Account..." ), this ); - tqlayout->addWidget( mAddButton, 1, 0 ); + layout->addWidget( mAddButton, 1, 0 ); mDeleteButton = new TQPushButton( i18n( "Remove Account" ), this ); mDeleteButton->setEnabled( false ); - tqlayout->addWidget( mDeleteButton, 1, 1 ); + layout->addWidget( mDeleteButton, 1, 1 ); connect( mView, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( selectionChanged() ) ); connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addUser() ) ); diff --git a/kresources/scalix/scalixadmin/outofofficepage.cpp b/kresources/scalix/scalixadmin/outofofficepage.cpp index 401d4de18..deb01a7d6 100644 --- a/kresources/scalix/scalixadmin/outofofficepage.cpp +++ b/kresources/scalix/scalixadmin/outofofficepage.cpp @@ -20,10 +20,10 @@ #include <tqbuttongroup.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <tqradiobutton.h> -#include <tqtextedit.h> +#include <textedit.h> #include <klocale.h> #include <kmessagebox.h> @@ -36,7 +36,7 @@ OutOfOfficePage::OutOfOfficePage( TQWidget *parent ) : TQWidget( parent ) { - TQGridLayout *tqlayout = new TQGridLayout( this, 4, 2, 11, 6 ); + TQGridLayout *layout = new TQGridLayout( this, 4, 2, 11, 6 ); TQButtonGroup *group = new TQButtonGroup( 1, Qt::Vertical, this ); @@ -48,10 +48,10 @@ OutOfOfficePage::OutOfOfficePage( TQWidget *parent ) mMessage = new TQTextEdit( this ); mSaveButton = new TQPushButton( i18n( "Save" ), this ); - tqlayout->addMultiCellWidget( group, 0, 0, 0, 1 ); - tqlayout->addMultiCellWidget( mLabel, 1, 1, 0, 1 ); - tqlayout->addMultiCellWidget( mMessage, 2, 2, 0, 1 ); - tqlayout->addWidget( mSaveButton, 3, 1 ); + layout->addMultiCellWidget( group, 0, 0, 0, 1 ); + layout->addMultiCellWidget( mLabel, 1, 1, 0, 1 ); + layout->addMultiCellWidget( mMessage, 2, 2, 0, 1 ); + layout->addWidget( mSaveButton, 3, 1 ); statusChanged(); diff --git a/kresources/scalix/scalixadmin/passwordpage.cpp b/kresources/scalix/scalixadmin/passwordpage.cpp index 51b11f6ff..ba7f25a07 100644 --- a/kresources/scalix/scalixadmin/passwordpage.cpp +++ b/kresources/scalix/scalixadmin/passwordpage.cpp @@ -20,7 +20,7 @@ #include <tqapplication.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlineedit.h> #include <tqpushbutton.h> @@ -38,29 +38,29 @@ PasswordPage::PasswordPage( TQWidget *parent ) : TQWidget( parent ), mJob( 0 ) { - TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3, 11, 6 ); + TQGridLayout *layout = new TQGridLayout( this, 2, 3, 11, 6 ); TQLabel *label = new TQLabel( i18n( "New password:" ), this ); - tqlayout->addWidget( label, 0, 0 ); + layout->addWidget( label, 0, 0 ); mPassword = new TQLineEdit( this ); mPassword->setEchoMode( TQLineEdit::Password ); label->setBuddy( mPassword ); - tqlayout->addWidget( mPassword, 0, 1 ); + layout->addWidget( mPassword, 0, 1 ); label = new TQLabel( i18n( "Retype new password:" ), this ); - tqlayout->addWidget( label, 1, 0 ); + layout->addWidget( label, 1, 0 ); mPasswordRetype = new TQLineEdit( this ); mPasswordRetype->setEchoMode( TQLineEdit::Password ); label->setBuddy( mPasswordRetype ); - tqlayout->addWidget( mPasswordRetype, 1, 1 ); + layout->addWidget( mPasswordRetype, 1, 1 ); mButton = new TQPushButton( i18n( "Change" ), this ); mButton->setEnabled( false ); - tqlayout->addWidget( mButton, 2, 1 ); + layout->addWidget( mButton, 2, 1 ); - tqlayout->setRowSpacing( 3, 1 ); + layout->setRowSpacing( 3, 1 ); connect( mPassword, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( textChanged() ) ); connect( mPasswordRetype, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( textChanged() ) ); @@ -179,7 +179,7 @@ void PasswordPage::finished( KIO::Job* job ) group.writeEntry( "pass", KStringHandler::obscure( newPassword ) ); } - KConfigGroup fileGroup( &config, TQString( "Folder-%1" ).tqarg( group.readNumEntry( "Folder" ) ) ); + KConfigGroup fileGroup( &config, TQString( "Folder-%1" ).arg( group.readNumEntry( "Folder" ) ) ); fileGroup.writeEntry( "pass", KStringHandler::obscure( newPassword ) ); } } diff --git a/kresources/scalix/scalixadmin/settings.cpp b/kresources/scalix/scalixadmin/settings.cpp index d5c5cdb1c..52f72296f 100644 --- a/kresources/scalix/scalixadmin/settings.cpp +++ b/kresources/scalix/scalixadmin/settings.cpp @@ -92,8 +92,8 @@ TQString Settings::rulesWizardUrl() const TQString url = group.readEntry( "rulesWizardUrl" ); if ( url.isEmpty() ) { KConfigGroup group( &config, "Account" ); - url = TQString( "http://%1/Scalix/rw/?username=%2" ).tqarg( group.readEntry( "host" ) ) - .tqarg( group.readEntry( "user" ) ); + url = TQString( "http://%1/Scalix/rw/?username=%2" ).arg( group.readEntry( "host" ) ) + .arg( group.readEntry( "user" ) ); } return url; diff --git a/kresources/scalix/shared/resourcescalixbase.cpp b/kresources/scalix/shared/resourcescalixbase.cpp index c9bfca350..5f1c36497 100644 --- a/kresources/scalix/shared/resourcescalixbase.cpp +++ b/kresources/scalix/shared/resourcescalixbase.cpp @@ -41,7 +41,7 @@ #include <kurl.h> #include <ktempfile.h> #include <kmessagebox.h> -#include <tqtextstream.h> +#include <textstream.h> #include <kdebug.h> using namespace Scalix; @@ -130,7 +130,7 @@ bool ResourceScalixBase::kmailUpdate( const TQString& resource, TQString ResourceScalixBase::configFile( const TQString& type ) const { return locateLocal( "config", - TQString( "kresources/scalix/%1rc" ).tqarg( type ) ); + TQString( "kresources/scalix/%1rc" ).arg( type ) ); } bool ResourceScalixBase::connectToKMail() const diff --git a/kresources/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/kabcresourcesloxconfig.cpp b/kresources/slox/kabcresourcesloxconfig.cpp index d9e32a556..0ae1f431f 100644 --- a/kresources/slox/kabcresourcesloxconfig.cpp +++ b/kresources/slox/kabcresourcesloxconfig.cpp @@ -35,7 +35,7 @@ #include <tqcheckbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> using namespace KABC; diff --git a/kresources/slox/kcalresourceslox.cpp b/kresources/slox/kcalresourceslox.cpp index a47c64b6f..14f3bab62 100644 --- a/kresources/slox/kcalresourceslox.cpp +++ b/kresources/slox/kcalresourceslox.cpp @@ -177,7 +177,7 @@ bool KCalResourceSlox::doLoad() TQString p = KURL( mPrefs->url() ).protocol(); if ( p != "http" && p != "https" && p != "webdav" && p != "webdavs" ) { - TQString err = i18n("Non-http protocol: '%1'").tqarg( p ); + TQString err = i18n("Non-http protocol: '%1'").arg( p ); kdDebug() << "KCalResourceSlox::load(): " << err << endl; loadError( err ); return false; @@ -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/kcalresourcesloxconfig.cpp b/kresources/slox/kcalresourcesloxconfig.cpp index e09cf85c1..9038d4f16 100644 --- a/kresources/slox/kcalresourcesloxconfig.cpp +++ b/kresources/slox/kcalresourcesloxconfig.cpp @@ -21,7 +21,7 @@ #include <typeinfo> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> #include <klocale.h> 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/kresources/tvanytime/kcal_resourcetvanytimeconfig.cpp b/kresources/tvanytime/kcal_resourcetvanytimeconfig.cpp index 110a62f9e..c667f95c3 100644 --- a/kresources/tvanytime/kcal_resourcetvanytimeconfig.cpp +++ b/kresources/tvanytime/kcal_resourcetvanytimeconfig.cpp @@ -21,7 +21,7 @@ #include <typeinfo> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqspinbox.h> #include <tqwhatsthis.h> 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..010dd9208 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> @@ -211,7 +211,7 @@ </widget> <widget class="TQLayoutWidget" row="8" column="0" rowspan="1" colspan="3"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -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..ccb1bb54f 100644 --- a/ktnef/gui/ktnefmain.cpp +++ b/ktnef/gui/ktnefmain.cpp @@ -230,7 +230,7 @@ void KTNEFMain::extractAllFiles() for (;it.current();++it) if (!parser_->extractFileTo(it.current()->name(), dir)) { - TQString msg = i18n( "Unable to extract file \"%1\"" ).tqarg( it.current()->name() ); + TQString msg = i18n( "Unable to extract file \"%1\"" ).arg( it.current()->name() ); TQMessageBox::critical(this,i18n("Error"),msg,TQMessageBox::Ok|TQMessageBox::Default,0); return; } @@ -301,7 +301,7 @@ void KTNEFMain::extractTo(const TQString& dirname) for (;it.current();++it) if (!parser_->extractFileTo(it.current()->name(), dir)) { - TQString msg = i18n("Unable to extract file \"%1\"").tqarg( it.current()->name() ); + TQString msg = i18n("Unable to extract file \"%1\"").arg( it.current()->name() ); TQMessageBox::critical(this,i18n("Error"),msg,TQMessageBox::Ok|TQMessageBox::Default,0); return; } @@ -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..bc31584c1 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 ); } @@ -762,7 +762,7 @@ void TQWinMetaFile::extTextOut( long num, short* parm ) mPainter.translate( -parm[ 1 ], -parm[ 0 ] ); } - // tqalignment + // alignment if ( mTextAlign & 0x06 ) x -= ( width / 2 ); if ( mTextAlign & 0x08 ) @@ -939,10 +939,10 @@ void TQWinMetaFile::createBrushIndirect( long, short* parm ) Qt::FDiagPattern, /* hatched */ Qt::Dense4Pattern, /* should be custom bitmap pattern */ Qt::HorPattern, /* should be BS_INDEXED (?) */ - Qt::VerPattern, /* should be tqdevice-independent bitmap */ - Qt::Dense6Pattern, /* should be tqdevice-independent packed-bitmap */ + Qt::VerPattern, /* should be device-independent bitmap */ + Qt::Dense6Pattern, /* should be device-independent packed-bitmap */ Qt::Dense2Pattern, /* should be BS_PATTERN8x8 */ - Qt::Dense3Pattern /* should be tqdevice-independent BS_DIBPATTERN8x8 */ + Qt::Dense3Pattern /* should be device-independent BS_DIBPATTERN8x8 */ }; Qt::BrushStyle style; short arg; @@ -994,7 +994,7 @@ void TQWinMetaFile::createPenIndirect( long, short* parm ) handle->pen.setCapStyle( Qt::RoundCap ); //int width = 0; - // TODO : width of pen proportional to tqdevice context width + // TODO : width of pen proportional to device context width // DOESN'T WORK /* TQRect devRec; diff --git a/ktnef/gui/qwmf.h b/ktnef/gui/qwmf.h index 2ac861d77..e61eeabaf 100644 --- a/ktnef/gui/qwmf.h +++ b/ktnef/gui/qwmf.h @@ -60,7 +60,7 @@ public: virtual bool load( TQBuffer &buffer ); /** - * Paint metafile to given paint-tqdevice using absolute or relative coordinate. + * Paint metafile to given paint-device using absolute or relative coordinate. * abosute coord. reset the world transfomation Matrix * relative coord. use the existing world transfomation Matrix * Returns true on success. @@ -124,9 +124,9 @@ public: // should be protected but cannot void setPixel( long num, short* parms ); // Set raster operation mode void setRop( long num, short* parms ); - /* save tqdevice context */ + /* save device context */ void saveDC( long num, short* parms ); - /* restore tqdevice context */ + /* restore device context */ void restoreDC( long num, short* parms ); /* clipping region is the intersection of this region and the original region */ void intersectClipRect( long num, short* parms ); @@ -136,7 +136,7 @@ public: // should be protected but cannot /****************** Text *******************/ /* set text color */ void setTextColor( long num, short* parms ); - /* set text tqalignment */ + /* set text alignment */ void setTextAlign( long num, short* parms ); /* draw text */ void textOut( long num, short* parms ); diff --git a/ktnef/gui/wmfstruct.h b/ktnef/gui/wmfstruct.h index 5e50f022e..7400e896e 100644 --- a/ktnef/gui/wmfstruct.h +++ b/ktnef/gui/wmfstruct.h @@ -43,7 +43,7 @@ struct WmfEnhMetaHeader DWORD iType; // Record type EMR_HEADER DWORD nSize; // Record size in bytes. This may be greater // than the sizeof( ENHMETAHEADER ). - RECTL rclBounds; // Inclusive-inclusive bounds in tqdevice units + RECTL rclBounds; // Inclusive-inclusive bounds in device units RECTL rclFrame; // Inclusive-inclusive Picture Frame of metafile // in .01 mm units DWORD dSignature; // Signature. Must be ENHMETA_SIGNATURE. @@ -53,13 +53,13 @@ struct WmfEnhMetaHeader WORD nHandles; // Number of handles in the handle table // Handle index zero is reserved. WORD sReserved; // Reserved. Must be zero. - DWORD nDescription; // Number of chars in the tqunicode description string + DWORD nDescription; // Number of chars in the unicode description string // This is 0 if there is no description string DWORD offDescription; // Offset to the metafile description record. // This is 0 if there is no description string DWORD nPalEntries; // Number of entries in the metafile palette. - SIZEL szlDevice; // Size of the reference tqdevice in pels - SIZEL szlMillimeters; // Size of the reference tqdevice in millimeters + SIZEL szlDevice; // Size of the reference device in pels + SIZEL szlMillimeters; // Size of the reference device in millimeters }; #define ENHMETA_SIGNATURE 0x464D4520 diff --git a/ktnef/ktnef/ktnefparser.h b/ktnef/ktnef/ktnefparser.h index 92c44dc22..fc93391cf 100644 --- a/ktnef/ktnef/ktnefparser.h +++ b/ktnef/ktnef/ktnefparser.h @@ -34,7 +34,7 @@ public: ~KTNEFParser(); bool openFile(const TQString& filename); - bool openDevice( TQIODevice *tqdevice ); + bool openDevice( TQIODevice *device ); bool extractFile(const TQString& filename); bool extractFileTo(const TQString& filename, const TQString& dirname); bool extractAll(); diff --git a/ktnef/lib/ktnefparser.cpp b/ktnef/lib/ktnefparser.cpp index a05e05721..3edd7b6ad 100644 --- a/ktnef/lib/ktnefparser.cpp +++ b/ktnef/lib/ktnefparser.cpp @@ -70,7 +70,7 @@ public: defaultdir_ = "/tmp/"; current_ = 0; deleteDevice_ = false; - tqdevice_ = 0; + device_ = 0; message_ = new KTNEFMessage; } ~ParserPrivate() @@ -79,7 +79,7 @@ public: } TQDataStream stream_; - TQIODevice *tqdevice_; + TQIODevice *device_; bool deleteDevice_; TQString defaultdir_; KTNEFAttach *current_; @@ -105,8 +105,8 @@ KTNEFMessage* KTNEFParser::message() const void KTNEFParser::deleteDevice() { if ( d->deleteDevice_ ) - delete d->tqdevice_; - d->tqdevice_ = 0; + delete d->device_; + d->device_ = 0; d->deleteDevice_ = false; } @@ -124,7 +124,7 @@ bool KTNEFParser::decodeMessage() // read data length d->stream_ >> i2; // offset after reading the value - off = d->tqdevice_->at() + i2; + off = d->device_->at() + i2; switch ( tag ) { case attAIDOWNER: @@ -158,11 +158,11 @@ bool KTNEFParser::decodeMessage() kdDebug() << "Message MAPI Properties" << " (length=" << i2 << ")" << endl; { int nProps = d->message_->properties().count(); - i2 += d->tqdevice_->at(); + i2 += d->device_->at(); readMAPIProperties( d->message_->properties(), 0 ); - d->tqdevice_->at( i2 ); + d->device_->at( i2 ); kdDebug() << "Properties: " << d->message_->properties().count() << endl; - value = TQString( "< %1 properties >" ).tqarg( d->message_->properties().count() - nProps ); + value = TQString( "< %1 properties >" ).arg( d->message_->properties().count() - nProps ); } break; case attTNEFVERSION: @@ -171,7 +171,7 @@ bool KTNEFParser::decodeMessage() break; case attFROM: d->message_->addProperty( 0x0024, MAPI_TYPE_STRING8, readTNEFAddress( d->stream_ ) ); - d->tqdevice_->at( d->tqdevice_->at() - i2 ); + d->device_->at( d->device_->at() - i2 ); value = readTNEFData( d->stream_, i2 ); kdDebug() << "Message From" << " (length=" << i2 << ")" << endl; break; @@ -212,7 +212,7 @@ bool KTNEFParser::decodeMessage() recipTable << formatRecipient( props ); } d->message_->addProperty( 0x0E12, MAPI_TYPE_STRING8, recipTable ); - d->tqdevice_->at( d->tqdevice_->at() - i2 ); + d->device_->at( d->device_->at() - i2 ); value = readTNEFData( d->stream_, i2 ); } kdDebug() << "Message Recipient Table" << " (length=" << i2 << ")" << endl; @@ -242,13 +242,13 @@ bool KTNEFParser::decodeMessage() break; } // skip data - if ( d->tqdevice_->at() != off && !d->tqdevice_->at( off ) ) + if ( d->device_->at() != off && !d->device_->at( off ) ) return false; // get checksum d->stream_ >> u; // add TNEF attribute d->message_->addAttribute( tag, type, value, true ); - //kdDebug() << "stream: " << d->tqdevice_->at() << endl; + //kdDebug() << "stream: " << d->device_->at() << endl; return true; } @@ -273,15 +273,15 @@ bool KTNEFParser::decodeAttachment() break; case attATTACHDATA: d->current_->setSize( i ); - d->current_->setOffset( d->tqdevice_->at() ); - d->tqdevice_->at( d->tqdevice_->at() + i ); - value = TQString( "< size=%1 >" ).tqarg( i ); + d->current_->setOffset( d->device_->at() ); + d->device_->at( d->device_->at() + i ); + value = TQString( "< size=%1 >" ).arg( i ); kdDebug() << "Attachment Data: size=" << i << endl; break; case attATTACHMENT: // try to get attachment info - i += d->tqdevice_->at(); + i += d->device_->at(); readMAPIProperties( d->current_->properties(), d->current_ ); - d->tqdevice_->at( i ); + d->device_->at( i ); d->current_->setIndex( d->current_->property( MAPI_TAG_INDEX ).toUInt() ); d->current_->setDisplaySize( d->current_->property( MAPI_TAG_SIZE ).toUInt() ); str = d->current_->property( MAPI_TAG_DISPLAYNAME ).toString(); @@ -292,7 +292,7 @@ bool KTNEFParser::decodeAttachment() if ( !str.isEmpty() ) d->current_->setMimeTag( str ); d->current_->setExtension( d->current_->property( MAPI_TAG_EXTENSION ).toString() ); - value = TQString( "< %1 properties >" ).tqarg( d->current_->properties().count() ); + value = TQString( "< %1 properties >" ).arg( d->current_->properties().count() ); break; case attATTACHMODDATE: value = readTNEFDate( d->stream_ ); @@ -304,8 +304,8 @@ bool KTNEFParser::decodeAttachment() break; case attATTACHMETAFILE: kdDebug() << "Attachment Metafile: size=" << i << endl; - //value = TQString( "< size=%1 >" ).tqarg( i ); - //d->tqdevice_->at( d->tqdevice_->at()+i ); + //value = TQString( "< size=%1 >" ).arg( i ); + //d->device_->at( d->device_->at()+i ); value = readTNEFData( d->stream_, i ); break; default: @@ -316,7 +316,7 @@ bool KTNEFParser::decodeAttachment() d->stream_ >> u; // u <- checksum // add TNEF attribute d->current_->addAttribute( tag, type, value, true ); - //kdDebug() << "stream: " << d->tqdevice_->at() << endl; + //kdDebug() << "stream: " << d->device_->at() << endl; return true; } @@ -339,19 +339,19 @@ bool KTNEFParser::parseDevice() d->current_ = 0; } - if ( !d->tqdevice_->open( IO_ReadOnly ) ) { - kdDebug() << "Couldn't open tqdevice" << endl; + if ( !d->device_->open( IO_ReadOnly ) ) { + kdDebug() << "Couldn't open device" << endl; return false; } - d->stream_.setDevice( d->tqdevice_ ); + d->stream_.setDevice( d->device_ ); d->stream_.setByteOrder( TQDataStream::LittleEndian ); d->stream_ >> i; if (i == TNEF_SIGNATURE) { d->stream_ >> u; kdDebug().form( "Attachment cross reference key: 0x%04x\n",u ); - //kdDebug() << "stream: " << d->tqdevice_->at() << endl; + //kdDebug() << "stream: " << d->device_->at() << endl; while (!d->stream_.eof()) { d->stream_ >> c; @@ -364,7 +364,7 @@ bool KTNEFParser::parseDevice() if (!decodeAttachment()) goto end; break; default: - kdDebug() << "Unknown Level: " << c << ", at offset " << d->tqdevice_->at() << endl; + kdDebug() << "Unknown Level: " << c << ", at offset " << d->device_->at() << endl; goto end; } } @@ -381,7 +381,7 @@ bool KTNEFParser::parseDevice() else { kdDebug() << "This is not a TNEF file" << endl; -end: d->tqdevice_->close(); +end: d->device_->close(); return false; } } @@ -396,9 +396,9 @@ bool KTNEFParser::extractFile(const TQString& filename) bool KTNEFParser::extractAttachmentTo(KTNEFAttach *att, const TQString& dirname) { TQString filename = dirname + "/" + att->name(); - if (!d->tqdevice_->isOpen()) + if (!d->device_->isOpen()) return false; - if (!d->tqdevice_->at(att->offset())) + if (!d->device_->at(att->offset())) return false; KSaveFile saveFile( filename ); TQFile *outfile = saveFile.file(); @@ -411,7 +411,7 @@ bool KTNEFParser::extractAttachmentTo(KTNEFAttach *att, const TQString& dirname) bool ok(true); while (ok && len > 0) { - n = d->tqdevice_->readBlock(buf,TQMIN(sz,len)); + n = d->device_->readBlock(buf,TQMIN(sz,len)); if (n < 0) ok = false; else @@ -447,15 +447,15 @@ bool KTNEFParser::openFile(const TQString& filename) deleteDevice(); delete d->message_; d->message_ = new KTNEFMessage(); - d->tqdevice_ = TQT_TQIODEVICE(new TQFile( filename )); + d->device_ = TQT_TQIODEVICE(new TQFile( filename )); d->deleteDevice_ = true; return parseDevice(); } -bool KTNEFParser::openDevice( TQIODevice *tqdevice ) +bool KTNEFParser::openDevice( TQIODevice *device ) { deleteDevice(); - d->tqdevice_ = tqdevice; + d->device_ = device; return parseDevice(); } @@ -482,12 +482,12 @@ void KTNEFParser::checkCurrent( int key ) if (!mimetype) return; // FIXME if ( mimetype->name() == "application/octet-stream" && d->current_->size() > 0 ) { - int oldOffset = d->tqdevice_->at(); + int oldOffset = d->device_->at(); TQByteArray buffer( TQMIN( 32, d->current_->size() ) ); - d->tqdevice_->at( d->current_->offset() ); - d->tqdevice_->readBlock( buffer.data(), buffer.size() ); + d->device_->at( d->current_->offset() ); + d->device_->readBlock( buffer.data(), buffer.size() ); mimetype = KMimeType::findByContent( buffer ); - d->tqdevice_->at( oldOffset ); + d->device_->at( oldOffset ); } d->current_->setMimeTag( mimetype->name() ); } @@ -791,20 +791,20 @@ bool KTNEFParser::readMAPIProperties( TQMap<int,KTNEFProperty*>& props, KTNEFAtt TQByteArray data = mapi.value.toByteArray(); int len = data.size(); ALIGN( len, 4 ); - d->tqdevice_->at( d->tqdevice_->at()-len ); + d->device_->at( d->device_->at()-len ); TQ_UINT32 interface_ID; d->stream_ >> interface_ID; if ( interface_ID == MAPI_IID_IMessage ) { // embedded TNEF file attach->unsetDataParser(); - attach->setOffset( d->tqdevice_->at()+12 ); + attach->setOffset( d->device_->at()+12 ); attach->setSize( data.size()-16 ); attach->setMimeTag( "application/ms-tnef" ); attach->setDisplayName( "Embedded Message" ); kdDebug() << "MAPI Embedded Message: size=" << data.size() << endl; } - d->tqdevice_->at( d->tqdevice_->at() + ( len-4 ) ); + d->device_->at( d->device_->at() + ( len-4 ) ); break; } else if ( mapi.type == MAPI_TYPE_BINARY && attach && attach->offset() < 0 ) @@ -813,8 +813,8 @@ bool KTNEFParser::readMAPIProperties( TQMap<int,KTNEFProperty*>& props, KTNEFAtt int len = mapi.value.toByteArray().size(); ALIGN( len, 4 ) attach->setSize( len ); - attach->setOffset( d->tqdevice_->at() - len ); - attach->addAttribute( attATTACHDATA, atpBYTE, TQString( "< size=%1 >" ).tqarg( len ), false ); + attach->setOffset( d->device_->at() - len ); + attach->addAttribute( attATTACHDATA, atpBYTE, TQString( "< size=%1 >" ).arg( len ), false ); } } kdDebug().form( "MAPI data: size=%d\n", mapi.value.toByteArray().size() ); @@ -827,7 +827,7 @@ bool KTNEFParser::readMAPIProperties( TQMap<int,KTNEFProperty*>& props, KTNEFAtt if ( mapi.name.type == 0 ) mapiname = TQString().sprintf( " [name = 0x%04x]", mapi.name.value.toUInt() ); else - mapiname = TQString( " [name = %1]" ).tqarg( mapi.name.value.toString() ); + mapiname = TQString( " [name = %1]" ).arg( mapi.name.value.toString() ); } switch ( mapi.type & 0x0FFF ) { @@ -860,7 +860,7 @@ bool KTNEFParser::readMAPIProperties( TQMap<int,KTNEFProperty*>& props, KTNEFAtt p = new KTNEFProperty( key, ( mapi.type & 0x0FFF ), mapi.value, mapi.name.value ); props[ p->key() ] = p; } - //kdDebug() << "stream: " << d->tqdevice_->at() << endl; + //kdDebug() << "stream: " << d->device_->at() << endl; } if ( foundAttachment && attach ) diff --git a/ktnef/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/ktnef/tests/mapi_attach_data_obj.tnef b/ktnef/tests/mapi_attach_data_obj.tnef Binary files differindex 66f7890c3..aea529ec2 100644 --- a/ktnef/tests/mapi_attach_data_obj.tnef +++ b/ktnef/tests/mapi_attach_data_obj.tnef diff --git a/libemailfunctions/networkstatus.cpp b/libemailfunctions/networkstatus.cpp index 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/attachmenthandler.cpp b/libkcal/attachmenthandler.cpp index 009c57785..47ba6d1ce 100644 --- a/libkcal/attachmenthandler.cpp +++ b/libkcal/attachmenthandler.cpp @@ -70,7 +70,7 @@ Attachment *AttachmentHandler::find( TQWidget *parent, const TQString &attachmen if ( !a ) { KMessageBox::error( parent, - i18n( "No attachment named \"%1\" found in the incidence." ).tqarg( attachmentName ) ); + i18n( "No attachment named \"%1\" found in the incidence." ).arg( attachmentName ) ); return 0; } @@ -101,7 +101,7 @@ Attachment *AttachmentHandler::find( TQWidget *parent, KMessageBox::error( parent, i18n( "The incidence that owns the attachment named \"%1\" could not be found. " - "Perhaps it was removed from your calendar?" ).tqarg( attachmentName ) ); + "Perhaps it was removed from your calendar?" ).arg( attachmentName ) ); return 0; } diff --git a/libkcal/attendee.cpp b/libkcal/attendee.cpp index 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..ad5030a15 100644 --- a/libkcal/calendar.cpp +++ b/libkcal/calendar.cpp @@ -474,7 +474,7 @@ bool Calendar::deleteIncidence( Incidence *incidence ) { if ( beginChange( incidence ) ) { if (incidence->hasRecurrenceID()) { - // Delete this event's UID from the parent's list of tqchildren + // Delete this event's UID from the parent's list of children Incidence *parentIncidence; IncidenceList il = incidence->childIncidences(); IncidenceListIterator it; @@ -483,7 +483,7 @@ bool Calendar::deleteIncidence( Incidence *incidence ) parentIncidence->deleteChildIncidence(incidence->uid()); } else { - // Delete all tqchildren as well + // Delete all children as well IncidenceList il = incidence->childIncidences(); IncidenceListIterator it; for ( it = il.begin(); it != il.end(); ++it ) { @@ -861,7 +861,7 @@ void Calendar::setupRelations( Incidence *forincidence ) } else { // Not found, put this in the mOrphans list // Note that the mOrphans dict might have several entries with the same key! That are - // multiple tqchildren that wait for the parent incidence to be inserted. + // multiple children that wait for the parent incidence to be inserted. mOrphans.insert( forincidence->relatedToUid(), forincidence ); mOrphanUids.insert( forincidence->uid(), forincidence ); } @@ -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..fd7025f76 100644 --- a/libkcal/calendarlocal.cpp +++ b/libkcal/calendarlocal.cpp @@ -229,7 +229,7 @@ bool CalendarLocal::addTodo( Todo *todo ) bool CalendarLocal::deleteTodo( Todo *todo ) { - // Handle orphaned tqchildren + // Handle orphaned children removeRelations( todo ); if ( mTodoList.removeRef( todo ) ) { @@ -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..e506b8dfe 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() @@ -70,9 +70,9 @@ TQString CalFormat::createUniqueId() TQTime::currentTime().minute() + TQTime::currentTime().second() + TQTime::currentTime().msec(); TQString uidStr = TQString("%1-%2.%3") - .tqarg(mApplication) - .tqarg(KApplication::random()) - .tqarg(hashTime); + .arg(mApplication) + .arg(KApplication::random()) + .arg(hashTime); return uidStr; } diff --git a/libkcal/calselectdialog.cpp b/libkcal/calselectdialog.cpp index 3022d7cc0..49f88056b 100644 --- a/libkcal/calselectdialog.cpp +++ b/libkcal/calselectdialog.cpp @@ -45,7 +45,7 @@ #include "calselectdialog.h" #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> using namespace KCal; @@ -54,16 +54,16 @@ CalSelectDialog::CalSelectDialog( const TQString &caption, const TQString &label : KDialogBase( 0, 0, true, caption, Ok|Cancel, Ok, true ) { TQFrame *frame = makeMainWidget(); - TQVBoxLayout *tqlayout = new TQVBoxLayout( frame, 0, spacingHint() ); + TQVBoxLayout *layout = new TQVBoxLayout( frame, 0, spacingHint() ); TQLabel *labelWidget = new TQLabel( label, frame ); - tqlayout->addWidget( labelWidget ); + layout->addWidget( labelWidget ); mListBox = new KListBox( frame ); mListBox->insertStringList( list ); mListBox->setSelected( 0, true ); mListBox->ensureCurrentVisible(); - tqlayout->addWidget( mListBox, 10 ); + layout->addWidget( mListBox, 10 ); connect( mListBox, TQT_SIGNAL(doubleClicked(TQListBoxItem *)), TQT_SLOT(slotOk()) ); @@ -72,7 +72,7 @@ CalSelectDialog::CalSelectDialog( const TQString &caption, const TQString &label mListBox->setFocus(); - tqlayout->addStretch(); + layout->addStretch(); setMinimumWidth( 320 ); } diff --git a/libkcal/confirmsavedialog.cpp b/libkcal/confirmsavedialog.cpp index 298341488..0b193058b 100644 --- a/libkcal/confirmsavedialog.cpp +++ b/libkcal/confirmsavedialog.cpp @@ -23,7 +23,7 @@ #include <klistview.h> #include <klocale.h> -#include <tqlayout.h> +#include <layout.h> #include <tqframe.h> #include <tqlabel.h> @@ -40,7 +40,7 @@ ConfirmSaveDialog::ConfirmSaveDialog( const TQString &destination, TQLabel *label = new TQLabel( i18n("You have requested to save the following objects to '%1':") - .tqarg( destination ), topFrame ); + .arg( destination ), topFrame ); topLayout->addWidget( label ); mListView = new KListView( topFrame ); diff --git a/libkcal/convertqtopia.cpp b/libkcal/convertqtopia.cpp index 4af6affa7..0e4b4352c 100644 --- a/libkcal/convertqtopia.cpp +++ b/libkcal/convertqtopia.cpp @@ -105,7 +105,7 @@ int main(int argc,char **argv) } else { bool success = icalendarFormat.save( &cal, outputFile ); if ( !success ) { - std::cerr << i18n( "Error saving to '%1'." ).tqarg( outputFile ).local8Bit() + std::cerr << i18n( "Error saving to '%1'." ).arg( outputFile ).local8Bit() << std::endl; return 1; } diff --git a/libkcal/dndfactory.cpp b/libkcal/dndfactory.cpp index 086323b0d..6524ef342 100644 --- a/libkcal/dndfactory.cpp +++ b/libkcal/dndfactory.cpp @@ -22,7 +22,7 @@ */ #include <tqapplication.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqmap.h> #include <kiconloader.h> @@ -178,7 +178,7 @@ bool DndFactory::cutIncidences( const Incidence::List &incidences ) bool DndFactory::copyIncidences( const Incidence::List &incidences ) { - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); CalendarLocal cal( mCalendar->timeZoneId() ); Incidence::List::ConstIterator it; @@ -206,7 +206,7 @@ bool DndFactory::copyIncidence( Incidence *selectedInc ) Incidence::List DndFactory::pasteIncidences( const TQDate &newDate, const TQTime *newTime ) { CalendarLocal cal( mCalendar->timeZoneId() ); - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); Incidence::List list; if ( !ICalDrag::decode( cb->data(), &cal ) && @@ -249,7 +249,7 @@ Incidence::List DndFactory::pasteIncidences( const TQDate &newDate, const TQTime Incidence *DndFactory::pasteIncidence( const TQDate &newDate, const TQTime *newTime ) { CalendarLocal cal( mCalendar->timeZoneId() ); - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); if ( !ICalDrag::decode( cb->data(), &cal ) && !VCalDrag::decode( cb->data(), &cal ) ) { diff --git a/libkcal/dummyscheduler.cpp b/libkcal/dummyscheduler.cpp index 7a824f08a..5b16759f0 100644 --- a/libkcal/dummyscheduler.cpp +++ b/libkcal/dummyscheduler.cpp @@ -24,7 +24,7 @@ // #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include <kdebug.h> #include <kstandarddirs.h> diff --git a/libkcal/exceptions.cpp b/libkcal/exceptions.cpp index 0394a4003..99c804ddf 100644 --- a/libkcal/exceptions.cpp +++ b/libkcal/exceptions.cpp @@ -38,7 +38,7 @@ Exception::~Exception() TQString Exception::message() { if ( mMessage.isEmpty() ) { - return i18n( "%1 Error" ).tqarg( CalFormat::application() ); + return i18n( "%1 Error" ).arg( CalFormat::application() ); } else { return mMessage; } diff --git a/libkcal/htmlexport.cpp b/libkcal/htmlexport.cpp index 4bedf8806..02f9f685a 100644 --- a/libkcal/htmlexport.cpp +++ b/libkcal/htmlexport.cpp @@ -22,8 +22,8 @@ #include <tqapplication.h> #include <tqfile.h> -#include <tqtextstream.h> -#include <tqtextcodec.h> +#include <textstream.h> +#include <textcodec.h> #include <tqregexp.h> #include <kcharsets.h> @@ -147,8 +147,8 @@ void HtmlExport::createMonthView(TQTextStream *ts) while ( start < toDate() ) { // Write header - *ts << "<h2>" << (i18n("month_year","%1 %2").tqarg(KGlobal::locale()->calendar()->monthName(start)) - .tqarg(start.year())) << "</h2>\n"; + *ts << "<h2>" << (i18n("month_year","%1 %2").arg(KGlobal::locale()->calendar()->monthName(start)) + .arg(start.year())) << "</h2>\n"; if ( KGlobal::locale()->weekStartDay() == 1 ) { start = start.addDays(1 - start.dayOfWeek()); } else { @@ -459,7 +459,7 @@ void HtmlExport::createTodo (TQTextStream *ts,Todo *todo) *ts << " <td"; if (completed) *ts << " class=\"done\""; *ts << ">\n"; - *ts << " " << i18n("%1 %").tqarg(todo->percentComplete()) << "\n"; + *ts << " " << i18n("%1 %").arg(todo->percentComplete()) << "\n"; *ts << " </td>\n"; if ( mSettings->taskDueDate() ) { @@ -618,20 +618,20 @@ void HtmlExport::createFooter( TQTextStream *ts ) TQString mail, name, credit, creditURL;*/ if (!mSettings->eMail().isEmpty()) { if (!mSettings->name().isEmpty()) - trailer += i18n("by <a href=\"mailto:%1\">%2</a> ").tqarg( mSettings->eMail() ).tqarg( mSettings->name() ); + trailer += i18n("by <a href=\"mailto:%1\">%2</a> ").arg( mSettings->eMail() ).arg( mSettings->name() ); else - trailer += i18n("by <a href=\"mailto:%1\">%2</a> ").tqarg( mSettings->eMail() ).tqarg( mSettings->eMail() ); + trailer += i18n("by <a href=\"mailto:%1\">%2</a> ").arg( mSettings->eMail() ).arg( mSettings->eMail() ); } else { if (!mSettings->name().isEmpty()) - trailer += i18n("by %1 ").tqarg( mSettings->name() ); + trailer += i18n("by %1 ").arg( mSettings->name() ); } if (!mSettings->creditName().isEmpty()) { if (!mSettings->creditURL().isEmpty()) trailer += i18n("with <a href=\"%1\">%2</a>") - .tqarg( mSettings->creditURL() ) - .tqarg( mSettings->creditName() ); + .arg( mSettings->creditURL() ) + .arg( mSettings->creditName() ); else - trailer += i18n("with %1").tqarg( mSettings->creditName() ); + trailer += i18n("with %1").arg( mSettings->creditName() ); } *ts << "<p>" << trailer << "</p>\n"; } @@ -706,7 +706,7 @@ void HtmlExport::addHoliday( const TQDate &date, const TQString &name) if ( mHolidayMap[date].isEmpty() ) { mHolidayMap[date] = name; } else { - mHolidayMap[date] = i18n("list of holidays", "%1, %2").tqarg(mHolidayMap[date]).tqarg(name); + mHolidayMap[date] = i18n("list of holidays", "%1, %2").arg(mHolidayMap[date]).arg(name); } } diff --git a/libkcal/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..ff792e28c 100644 --- a/libkcal/icalformat.cpp +++ b/libkcal/icalformat.cpp @@ -23,9 +23,9 @@ #include <tqstring.h> #include <tqptrlist.h> #include <tqregexp.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include <kdebug.h> #include <klocale.h> @@ -117,7 +117,7 @@ bool ICalFormat::save( Calendar *calendar, const TQString &fileName ) kdDebug(5800) << "ICalFormat::save() errno: " << strerror( file.status() ) << endl; setException( new ErrorFormat( ErrorFormat::SaveError, - i18n( "Error saving to '%1'." ).tqarg( fileName ) ) ); + i18n( "Error saving to '%1'." ).arg( fileName ) ) ); return false; } @@ -128,7 +128,7 @@ bool ICalFormat::save( Calendar *calendar, const TQString &fileName ) if ( !file.close() ) { kdDebug(5800) << "KSaveFile: close: status was " << file.status() << ". See errno.h." << endl; setException(new ErrorFormat(ErrorFormat::SaveError, - i18n("Could not save '%1'").tqarg(fileName))); + i18n("Could not save '%1'").arg(fileName))); return false; } @@ -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..1d95f4555 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; @@ -2166,7 +2166,7 @@ bool ICalFormatImpl::populate( Calendar *cal, icalcomponent *calendar ) if (todo) { if (todo->hasRecurrenceID()) { TQString originalUid = todo->uid(); - todo->setUid(originalUid + TQString("-recur-%1").tqarg(todo->recurrenceID().toTime_t())); + todo->setUid(originalUid + TQString("-recur-%1").arg(todo->recurrenceID().toTime_t())); if (!cal->todo(todo->uid())) { if ( !cal->addTodo( todo ) ) { cal->endBatchAdding(); @@ -2208,7 +2208,7 @@ bool ICalFormatImpl::populate( Calendar *cal, icalcomponent *calendar ) if (event) { if (event->hasRecurrenceID()) { TQString originalUid = event->uid(); - event->setUid(originalUid + TQString("-recur-%1").tqarg(event->recurrenceID().toTime_t())); + event->setUid(originalUid + TQString("-recur-%1").arg(event->recurrenceID().toTime_t())); if (!cal->event(event->uid())) { cal->addEvent(event); if (!cal->event(originalUid)) { @@ -2246,7 +2246,7 @@ bool ICalFormatImpl::populate( Calendar *cal, icalcomponent *calendar ) if (journal) { if (journal->hasRecurrenceID()) { TQString originalUid = journal->uid(); - journal->setUid(originalUid + TQString("-recur-%1").tqarg(journal->recurrenceID().toTime_t())); + journal->setUid(originalUid + TQString("-recur-%1").arg(journal->recurrenceID().toTime_t())); if (!cal->journal(journal->uid())) { cal->addJournal(journal); if (!cal->event(originalUid)) { diff --git a/libkcal/incidence.cpp b/libkcal/incidence.cpp index 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..d51de5839 100644 --- a/libkcal/incidenceformatter.cpp +++ b/libkcal/incidenceformatter.cpp @@ -52,7 +52,7 @@ #include <kmimetype.h> #include <tqbuffer.h> -#include <tqstylesheet.h> +#include <stylesheet.h> #include <tqdatetime.h> #include <tqregexp.h> @@ -248,10 +248,10 @@ static TQString displayViewFormatAttendeeRoleList( Incidence *incidence, Attende } tmpStr += displayViewLinkPerson( a->email(), a->name(), a->uid() ); if ( !a->delegator().isEmpty() ) { - tmpStr += i18n(" (delegated by %1)" ).tqarg( a->delegator() ); + tmpStr += i18n(" (delegated by %1)" ).arg( a->delegator() ); } if ( !a->delegate().isEmpty() ) { - tmpStr += i18n(" (delegated to %1)" ).tqarg( a->delegate() ); + tmpStr += i18n(" (delegated to %1)" ).arg( a->delegate() ); } tmpStr += "<br>"; } @@ -359,7 +359,7 @@ static TQString displayViewFormatCategories( Incidence *incidence ) static TQString displayViewFormatCreationDate( Incidence *incidence ) { return i18n( "Creation date: %1" ). - tqarg( IncidenceFormatter::dateTimeToString( incidence->created(), false, true ) ); + arg( IncidenceFormatter::dateTimeToString( incidence->created(), false, true ) ); } static TQString displayViewFormatBirthday( Event *event ) @@ -502,14 +502,14 @@ static TQString displayViewFormatEvent( Calendar *calendar, Event *event, tmpStr += "<td><b>" + i18n( "Date:" ) + "</b></td>"; tmpStr += "<td>" + i18n("<beginDate> - <endDate>","%1 - %2"). - tqarg( IncidenceFormatter::dateToString( startDt, false ) ). - tqarg( IncidenceFormatter::dateToString( endDt, false ) ) + + arg( IncidenceFormatter::dateToString( startDt, false ) ). + arg( IncidenceFormatter::dateToString( endDt, false ) ) + "</td>"; } else { tmpStr += "<td><b>" + i18n( "Date:" ) + "</b></td>"; tmpStr += "<td>" + i18n("date as string","%1"). - tqarg( IncidenceFormatter::dateToString( startDt, false ) ) + + arg( IncidenceFormatter::dateToString( startDt, false ) ) + "</td>"; } } else { @@ -517,14 +517,14 @@ static TQString displayViewFormatEvent( Calendar *calendar, Event *event, tmpStr += "<td><b>" + i18n( "Date:" ) + "</b></td>"; tmpStr += "<td>" + i18n("<beginDate> - <endDate>","%1 - %2"). - tqarg( IncidenceFormatter::dateToString( startDt, false ) ). - tqarg( IncidenceFormatter::dateToString( endDt, false ) ) + + arg( IncidenceFormatter::dateToString( startDt, false ) ). + arg( IncidenceFormatter::dateToString( endDt, false ) ) + "</td>"; } else { tmpStr += "<td><b>" + i18n( "Date:" ) + "</b></td>"; tmpStr += "<td>" + i18n("date as string","%1"). - tqarg( IncidenceFormatter::dateToString( startDt, false ) ) + + arg( IncidenceFormatter::dateToString( startDt, false ) ) + "</td>"; tmpStr += "</tr><tr>"; @@ -532,8 +532,8 @@ static TQString displayViewFormatEvent( Calendar *calendar, Event *event, if ( event->hasEndDate() && startDt != endDt ) { tmpStr += "<td>" + i18n("<beginTime> - <endTime>","%1 - %2"). - tqarg( IncidenceFormatter::timeToString( startDt, true ) ). - tqarg( IncidenceFormatter::timeToString( endDt, true ) ) + + arg( IncidenceFormatter::timeToString( startDt, true ) ). + arg( IncidenceFormatter::timeToString( endDt, true ) ) + "</td>"; } else { tmpStr += "<td>" + @@ -750,7 +750,7 @@ static TQString displayViewFormatTodo( Calendar *calendar, Todo *todo, } else { tmpStr += "<td><b>" + i18n( "Percent Done:" ) + "</b></td>"; tmpStr += "<td>"; - tmpStr += i18n( "%1%" ).tqarg( todo->percentComplete() ); + tmpStr += i18n( "%1%" ).arg( todo->percentComplete() ); } tmpStr += "</td>"; tmpStr += "</tr>"; @@ -833,11 +833,11 @@ static TQString displayViewFormatFreeBusy( Calendar * /*calendar*/, FreeBusy *fb TQString tmpStr = htmlAddTag( "h2", htmlAddTag( "b", i18n("Free/Busy information for %1"). - tqarg( fb->organizer().fullName() ) ) ); + arg( fb->organizer().fullName() ) ) ); tmpStr += htmlAddTag( "h4", i18n("Busy times in date range %1 - %2:"). - tqarg( IncidenceFormatter::dateToString( fb->dtStart(), true ) ). - tqarg( IncidenceFormatter::dateToString( fb->dtEnd(), true ) ) ); + arg( IncidenceFormatter::dateToString( fb->dtStart(), true ) ). + arg( IncidenceFormatter::dateToString( fb->dtEnd(), true ) ) ); TQValueList<Period> periods = fb->busyPeriods(); @@ -860,19 +860,19 @@ static TQString displayViewFormatFreeBusy( Calendar * /*calendar*/, FreeBusy *fb cont += i18n("1 second", "%n seconds", dur); } text += i18n("startDate for duration", "%1 for %2"). - tqarg( IncidenceFormatter::dateTimeToString( per.start(), false, true ) ). - tqarg( cont ); + arg( IncidenceFormatter::dateTimeToString( per.start(), false, true ) ). + arg( cont ); text += "<br>"; } else { if ( per.start().date() == per.end().date() ) { text += i18n("date, fromTime - toTime ", "%1, %2 - %3"). - tqarg( IncidenceFormatter::dateToString( per.start().date(), true ) ). - tqarg( IncidenceFormatter::timeToString( per.start(), true ) ). - tqarg( IncidenceFormatter::timeToString( per.end(), true ) ); + arg( IncidenceFormatter::dateToString( per.start().date(), true ) ). + arg( IncidenceFormatter::timeToString( per.start(), true ) ). + arg( IncidenceFormatter::timeToString( per.end(), true ) ); } else { text += i18n("fromDateTime - toDateTime", "%1 - %2"). - tqarg( IncidenceFormatter::dateTimeToString( per.start(), false, true ) ). - tqarg( IncidenceFormatter::dateTimeToString( per.end(), false, true ) ); + arg( IncidenceFormatter::dateTimeToString( per.start(), false, true ) ). + arg( IncidenceFormatter::dateTimeToString( per.end(), false, true ) ); } text += "<br>"; } @@ -969,11 +969,11 @@ static TQString eventStartTimeStr( Event *event ) TQString tmp; if ( !event->doesFloat() ) { tmp = i18n( "%1: Start Date, %2: Start Time", "%1 %2" ). - tqarg( IncidenceFormatter::dateToString( event->dtStart(), true ), + arg( IncidenceFormatter::dateToString( event->dtStart(), true ), IncidenceFormatter::timeToString( event->dtStart(), true ) ); } else { tmp = i18n( "%1: Start Date", "%1 (all day)" ). - tqarg( IncidenceFormatter::dateToString( event->dtStart(), true ) ); + arg( IncidenceFormatter::dateToString( event->dtStart(), true ) ); } return tmp; } @@ -984,11 +984,11 @@ static TQString eventEndTimeStr( Event *event ) if ( event->hasEndDate() && event->dtEnd().isValid() ) { if ( !event->doesFloat() ) { tmp = i18n( "%1: End Date, %2: End Time", "%1 %2" ). - tqarg( IncidenceFormatter::dateToString( event->dtEnd(), true ), + arg( IncidenceFormatter::dateToString( event->dtEnd(), true ), IncidenceFormatter::timeToString( event->dtEnd(), true ) ); } else { tmp = i18n( "%1: End Date", "%1 (all day)" ). - tqarg( IncidenceFormatter::dateToString( event->dtEnd(), true ) ); + arg( IncidenceFormatter::dateToString( event->dtEnd(), true ) ); } } return tmp; @@ -1106,13 +1106,13 @@ static TQString rsvpRequestedStr( bool rsvpRequested, const TQString &role ) if ( role.isEmpty() ) { return i18n( "Your response is requested" ); } else { - return i18n( "Your response as <b>%1</b> is requested" ).tqarg( role ); + return i18n( "Your response as <b>%1</b> is requested" ).arg( role ); } } else { if ( role.isEmpty() ) { return i18n( "No response is necessary" ); } else { - return i18n( "No response as <b>%1</b> is necessary" ).tqarg( role ); + return i18n( "No response as <b>%1</b> is necessary" ).arg( role ); } } } @@ -1124,7 +1124,7 @@ static TQString myStatusStr( Incidence *incidence ) if ( a && a->status() != Attendee::NeedsAction && a->status() != Attendee::Delegated ) { ret = i18n( "(<b>Note</b>: the Organizer preset your response to <b>%1</b>)" ). - tqarg( Attendee::statusName( a->status() ) ); + arg( Attendee::statusName( a->status() ) ); } return ret; } @@ -1302,7 +1302,7 @@ static TQString invitationDetailsEvent( Event* event, bool noHtmlMode ) } TQString dir = ( TQApplication::reverseLayout() ? "rtl" : "ltr" ); - TQString html = TQString("<div dir=\"%1\">\n").tqarg(dir); + TQString html = TQString("<div dir=\"%1\">\n").arg(dir); html += "<table border=\"0\" cellpadding=\"1\" cellspacing=\"1\">\n"; @@ -1413,7 +1413,7 @@ static TQString invitationDetailsTodo( Todo *todo, bool noHtmlMode ) } TQString dir = ( TQApplication::reverseLayout() ? "rtl" : "ltr" ); - TQString html = TQString("<div dir=\"%1\">\n").tqarg(dir); + TQString html = TQString("<div dir=\"%1\">\n").arg(dir); html += "<table border=\"0\" cellpadding=\"1\" cellspacing=\"1\">\n"; // Invitation summary & location rows @@ -1511,19 +1511,19 @@ static TQString invitationDetailsFreeBusy( FreeBusy *fb, bool /*noHtmlMode*/ ) cont += i18n("1 second", "%n seconds", dur); } html += invitationRow( TQString(), i18n("startDate for duration", "%1 for %2") - .tqarg( KGlobal::locale()->formatDateTime( per.start(), false ) ) - .tqarg(cont) ); + .arg( KGlobal::locale()->formatDateTime( per.start(), false ) ) + .arg(cont) ); } else { TQString cont; if ( per.start().date() == per.end().date() ) { cont = i18n("date, fromTime - toTime ", "%1, %2 - %3") - .tqarg( KGlobal::locale()->formatDate( per.start().date() ) ) - .tqarg( KGlobal::locale()->formatTime( per.start().time() ) ) - .tqarg( KGlobal::locale()->formatTime( per.end().time() ) ); + .arg( KGlobal::locale()->formatDate( per.start().date() ) ) + .arg( KGlobal::locale()->formatTime( per.start().time() ) ) + .arg( KGlobal::locale()->formatTime( per.end().time() ) ); } else { cont = i18n("fromDateTime - toDateTime", "%1 - %2") - .tqarg( KGlobal::locale()->formatDateTime( per.start(), false ) ) - .tqarg( KGlobal::locale()->formatDateTime( per.end(), false ) ); + .arg( KGlobal::locale()->formatDateTime( per.start(), false ) ) + .arg( KGlobal::locale()->formatDateTime( per.end(), false ) ); } html += invitationRow( TQString(), cont ); @@ -1565,7 +1565,7 @@ static TQString invitationHeaderEvent( Event *event, Incidence *existingIncidenc case Scheduler::Request: if ( existingIncidence && event->revision() > 0 ) { return i18n( "This invitation has been updated by the organizer %1" ). - tqarg( event->organizer().fullName() ); + arg( event->organizer().fullName() ); } if ( iamOrganizer( event ) ) { return i18n( "I created this invitation" ); @@ -1578,17 +1578,17 @@ static TQString invitationHeaderEvent( Event *event, Incidence *existingIncidenc } if ( senderIsOrganizer( event, sender ) ) { if ( !orgStr.isEmpty() ) { - return i18n( "You received an invitation from %1" ).tqarg( orgStr ); + return i18n( "You received an invitation from %1" ).arg( orgStr ); } else { return i18n( "You received an invitation" ); } } else { if ( !orgStr.isEmpty() ) { return i18n( "You received an invitation from %1 as a representative of %2" ). - tqarg( sender, orgStr ); + arg( sender, orgStr ); } else { return i18n( "You received an invitation from %1 as the organizer's representative" ). - tqarg( sender ); + arg( sender ); } } } @@ -1602,7 +1602,7 @@ static TQString invitationHeaderEvent( Event *event, Incidence *existingIncidenc { if ( replyMeansCounter( event ) ) { return i18n( "%1 makes this counter proposal" ). - tqarg( firstAttendeeName( event, i18n( "Sender" ) ) ); + arg( firstAttendeeName( event, i18n( "Sender" ) ) ); } Attendee::List attendees = event->attendees(); @@ -1625,36 +1625,36 @@ static TQString invitationHeaderEvent( Event *event, Incidence *existingIncidenc switch( attendee->status() ) { case Attendee::NeedsAction: - return i18n( "%1 indicates this invitation still needs some action" ).tqarg( attendeeName ); + return i18n( "%1 indicates this invitation still needs some action" ).arg( attendeeName ); case Attendee::Accepted: if ( event->revision() > 0 ) { if ( !sender.isEmpty() ) { - return i18n( "This invitation has been updated by attendee %1" ).tqarg( sender ); + return i18n( "This invitation has been updated by attendee %1" ).arg( sender ); } else { return i18n( "This invitation has been updated by an attendee" ); } } else { if ( delegatorName.isEmpty() ) { - return i18n( "%1 accepts this invitation" ).tqarg( attendeeName ); + return i18n( "%1 accepts this invitation" ).arg( attendeeName ); } else { return i18n( "%1 accepts this invitation on behalf of %2" ). - tqarg( attendeeName ).tqarg( delegatorName ); + arg( attendeeName ).arg( delegatorName ); } } case Attendee::Tentative: if ( delegatorName.isEmpty() ) { return i18n( "%1 tentatively accepts this invitation" ). - tqarg( attendeeName ); + arg( attendeeName ); } else { return i18n( "%1 tentatively accepts this invitation on behalf of %2" ). - tqarg( attendeeName ).tqarg( delegatorName ); + arg( attendeeName ).arg( delegatorName ); } case Attendee::Declined: if ( delegatorName.isEmpty() ) { - return i18n( "%1 declines this invitation" ).tqarg( attendeeName ); + return i18n( "%1 declines this invitation" ).arg( attendeeName ); } else { return i18n( "%1 declines this invitation on behalf of %2" ). - tqarg( attendeeName ).tqarg( delegatorName ); + arg( attendeeName ).arg( delegatorName ); } case Attendee::Delegated: { TQString delegate, dummy; @@ -1664,16 +1664,16 @@ static TQString invitationHeaderEvent( Event *event, Incidence *existingIncidenc } if ( !delegate.isEmpty() ) { return i18n( "%1 has delegated this invitation to %2" ). - tqarg( attendeeName ) .tqarg( delegate ); + arg( attendeeName ) .arg( delegate ); } else { - return i18n( "%1 has delegated this invitation" ).tqarg( attendeeName ); + return i18n( "%1 has delegated this invitation" ).arg( attendeeName ); } } case Attendee::Completed: return i18n( "This invitation is now completed" ); case Attendee::InProcess: return i18n( "%1 is still processing the invitation" ). - tqarg( attendeeName ); + arg( attendeeName ); default: return i18n( "Unknown response to this invitation" ); } @@ -1682,15 +1682,15 @@ static TQString invitationHeaderEvent( Event *event, Incidence *existingIncidenc case Scheduler::Counter: return i18n( "%1 makes this counter proposal" ). - tqarg( firstAttendeeName( event, i18n( "Sender" ) ) ); + arg( firstAttendeeName( event, i18n( "Sender" ) ) ); case Scheduler::Declinecounter: return i18n( "%1 declines the counter proposal" ). - tqarg( firstAttendeeName( event, i18n( "Sender" ) ) ); + arg( firstAttendeeName( event, i18n( "Sender" ) ) ); case Scheduler::NoMethod: return i18n("Error: iMIP message with unknown method: '%1'"). - tqarg( msg->method() ); + arg( msg->method() ); } return TQString(); } @@ -1708,7 +1708,7 @@ static TQString invitationHeaderTodo( Todo *todo, Incidence *existingIncidence, case Scheduler::Request: if ( existingIncidence && todo->revision() > 0 ) { return i18n( "This task has been updated by the organizer %1" ). - tqarg( todo->organizer().fullName() ); + arg( todo->organizer().fullName() ); } else { if ( iamOrganizer( todo ) ) { return i18n( "I created this task" ); @@ -1721,17 +1721,17 @@ static TQString invitationHeaderTodo( Todo *todo, Incidence *existingIncidence, } if ( senderIsOrganizer( todo, sender ) ) { if ( !orgStr.isEmpty() ) { - return i18n( "You have been assigned this task by %1" ).tqarg( orgStr ); + return i18n( "You have been assigned this task by %1" ).arg( orgStr ); } else { return i18n( "You have been assigned this task" ); } } else { if ( !orgStr.isEmpty() ) { return i18n( "You have been assigned this task by %1 as a representative of %2" ). - tqarg( sender, orgStr ); + arg( sender, orgStr ); } else { return i18n( "You have been assigned this task by %1 as the organizer's representative" ). - tqarg( sender ); + arg( sender ); } } } @@ -1746,7 +1746,7 @@ static TQString invitationHeaderTodo( Todo *todo, Incidence *existingIncidence, { if ( replyMeansCounter( todo ) ) { return i18n( "%1 makes this counter proposal" ). - tqarg( firstAttendeeName( todo, i18n( "Sender" ) ) ); + arg( firstAttendeeName( todo, i18n( "Sender" ) ) ); } Attendee::List attendees = todo->attendees(); @@ -1769,14 +1769,14 @@ static TQString invitationHeaderTodo( Todo *todo, Incidence *existingIncidence, switch( attendee->status() ) { case Attendee::NeedsAction: - return i18n( "%1 indicates this task assignment still needs some action" ).tqarg( attendeeName ); + return i18n( "%1 indicates this task assignment still needs some action" ).arg( attendeeName ); case Attendee::Accepted: if ( todo->revision() > 0 ) { if ( !sender.isEmpty() ) { if ( todo->isCompleted() ) { - return i18n( "This task has been completed by assignee %1" ).tqarg( sender ); + return i18n( "This task has been completed by assignee %1" ).arg( sender ); } else { - return i18n( "This task has been updated by assignee %1" ).tqarg( sender ); + return i18n( "This task has been updated by assignee %1" ).arg( sender ); } } else { if ( todo->isCompleted() ) { @@ -1787,26 +1787,26 @@ static TQString invitationHeaderTodo( Todo *todo, Incidence *existingIncidence, } } else { if ( delegatorName.isEmpty() ) { - return i18n( "%1 accepts this task" ).tqarg( attendeeName ); + return i18n( "%1 accepts this task" ).arg( attendeeName ); } else { return i18n( "%1 accepts this task on behalf of %2" ). - tqarg( attendeeName ).tqarg( delegatorName ); + arg( attendeeName ).arg( delegatorName ); } } case Attendee::Tentative: if ( delegatorName.isEmpty() ) { return i18n( "%1 tentatively accepts this task" ). - tqarg( attendeeName ); + arg( attendeeName ); } else { return i18n( "%1 tentatively accepts this task on behalf of %2" ). - tqarg( attendeeName ).tqarg( delegatorName ); + arg( attendeeName ).arg( delegatorName ); } case Attendee::Declined: if ( delegatorName.isEmpty() ) { - return i18n( "%1 declines this task" ).tqarg( attendeeName ); + return i18n( "%1 declines this task" ).arg( attendeeName ); } else { return i18n( "%1 declines this task on behalf of %2" ). - tqarg( attendeeName ).tqarg( delegatorName ); + arg( attendeeName ).arg( delegatorName ); } case Attendee::Delegated: { TQString delegate, dummy; @@ -1816,17 +1816,17 @@ static TQString invitationHeaderTodo( Todo *todo, Incidence *existingIncidence, } if ( !delegate.isEmpty() ) { return i18n( "%1 has delegated this request for the task to %2" ). - tqarg( attendeeName ).tqarg( delegate ); + arg( attendeeName ).arg( delegate ); } else { return i18n( "%1 has delegated this request for the task" ). - tqarg( attendeeName ); + arg( attendeeName ); } } case Attendee::Completed: return i18n( "The request for this task is now completed" ); case Attendee::InProcess: return i18n( "%1 is still processing the task" ). - tqarg( attendeeName ); + arg( attendeeName ); default: return i18n( "Unknown response to this task" ); } @@ -1835,15 +1835,15 @@ static TQString invitationHeaderTodo( Todo *todo, Incidence *existingIncidence, case Scheduler::Counter: return i18n( "%1 makes this counter proposal" ). - tqarg( firstAttendeeName( todo, i18n( "Sender" ) ) ); + arg( firstAttendeeName( todo, i18n( "Sender" ) ) ); case Scheduler::Declinecounter: return i18n( "%1 declines the counter proposal" ). - tqarg( firstAttendeeName( todo, i18n( "Sender" ) ) ); + arg( firstAttendeeName( todo, i18n( "Sender" ) ) ); case Scheduler::NoMethod: return i18n( "Error: iMIP message with unknown method: '%1'" ). - tqarg( msg->method() ); + arg( msg->method() ); } return TQString(); } @@ -1908,7 +1908,7 @@ static TQString invitationHeaderJournal( Journal *journal, ScheduleMessage *msg return i18n( "Sender declines the counter proposal" ); case Scheduler::NoMethod: return i18n("Error: iMIP message with unknown method: '%1'"). - tqarg( msg->method() ); + arg( msg->method() ); } return TQString(); } @@ -1933,7 +1933,7 @@ static TQString invitationHeaderFreeBusy( FreeBusy *fb, ScheduleMessage *msg ) case Scheduler::NoMethod: default: return i18n("Error: Free/Busy iMIP message with unknown method: '%1'"). - tqarg( msg->method() ); + arg( msg->method() ); } } @@ -1967,10 +1967,10 @@ static TQString invitationAttendees( Incidence *incidence ) tmpStr += "<td>"; tmpStr += invitationPerson( a->email(), a->name(), TQString() ); if ( !a->delegator().isEmpty() ) { - tmpStr += i18n(" (delegated by %1)" ).tqarg( a->delegator() ); + tmpStr += i18n(" (delegated by %1)" ).arg( a->delegator() ); } if ( !a->delegate().isEmpty() ) { - tmpStr += i18n(" (delegated to %1)" ).tqarg( a->delegate() ); + tmpStr += i18n(" (delegated to %1)" ).arg( a->delegate() ); } tmpStr += "</td>"; tmpStr += "<td>" + a->statusStr() + "</td>"; @@ -2156,10 +2156,10 @@ class IncidenceFormatter::IncidenceCompareVisitor return; if ( oldEvent->dtStart() != newEvent->dtStart() || oldEvent->doesFloat() != newEvent->doesFloat() ) mChanges += i18n( "The invitation starting time has been changed from %1 to %2" ) - .tqarg( eventStartTimeStr( oldEvent ) ).tqarg( eventStartTimeStr( newEvent ) ); + .arg( eventStartTimeStr( oldEvent ) ).arg( eventStartTimeStr( newEvent ) ); if ( oldEvent->dtEnd() != newEvent->dtEnd() || oldEvent->doesFloat() != newEvent->doesFloat() ) mChanges += i18n( "The invitation ending time has been changed from %1 to %2" ) - .tqarg( eventEndTimeStr( oldEvent ) ).tqarg( eventEndTimeStr( newEvent ) ); + .arg( eventEndTimeStr( oldEvent ) ).arg( eventEndTimeStr( newEvent ) ); } void compareTodos( Todo *newTodo, Todo *oldTodo ) @@ -2175,10 +2175,10 @@ class IncidenceFormatter::IncidenceCompareVisitor mChanges += i18n( "The task is no longer completed" ); } if ( oldTodo->percentComplete() != newTodo->percentComplete() ) { - const TQString oldPer = i18n( "%1%" ).tqarg( oldTodo->percentComplete() ); - const TQString newPer = i18n( "%1%" ).tqarg( newTodo->percentComplete() ); + const TQString oldPer = i18n( "%1%" ).arg( oldTodo->percentComplete() ); + const TQString newPer = i18n( "%1%" ).arg( newTodo->percentComplete() ); mChanges += i18n( "The task completed percentage has changed from %1 to %2" ). - tqarg( oldPer, newPer ); + arg( oldPer, newPer ); } if ( !oldTodo->hasStartDate() && newTodo->hasStartDate() ) { @@ -2190,7 +2190,7 @@ class IncidenceFormatter::IncidenceCompareVisitor if ( oldTodo->hasStartDate() && newTodo->hasStartDate() && oldTodo->dtStart() != newTodo->dtStart() ) { mChanges += i18n( "The task starting time has been changed from %1 to %2" ). - tqarg( dateTimeToString( oldTodo->dtStart(), oldTodo->doesFloat(), false ), + arg( dateTimeToString( oldTodo->dtStart(), oldTodo->doesFloat(), false ), dateTimeToString( newTodo->dtStart(), newTodo->doesFloat(), false ) ); } @@ -2203,7 +2203,7 @@ class IncidenceFormatter::IncidenceCompareVisitor if ( oldTodo->hasDueDate() && newTodo->hasDueDate() && oldTodo->dtDue() != newTodo->dtDue() ) { mChanges += i18n( "The task due time has been changed from %1 to %2" ). - tqarg( dateTimeToString( oldTodo->dtDue(), oldTodo->doesFloat(), false ), + arg( dateTimeToString( oldTodo->dtDue(), oldTodo->doesFloat(), false ), dateTimeToString( newTodo->dtDue(), newTodo->doesFloat(), false ) ); } } @@ -2213,22 +2213,22 @@ class IncidenceFormatter::IncidenceCompareVisitor if ( !oldInc || !newInc ) return; if ( oldInc->summary() != newInc->summary() ) - mChanges += i18n( "The summary has been changed to: \"%1\"" ).tqarg( newInc->summary() ); + mChanges += i18n( "The summary has been changed to: \"%1\"" ).arg( newInc->summary() ); if ( oldInc->location() != newInc->location() ) - mChanges += i18n( "The location has been changed to: \"%1\"" ).tqarg( newInc->location() ); + mChanges += i18n( "The location has been changed to: \"%1\"" ).arg( newInc->location() ); if ( oldInc->description() != newInc->description() ) - mChanges += i18n( "The description has been changed to: \"%1\"" ).tqarg( newInc->description() ); + mChanges += i18n( "The description has been changed to: \"%1\"" ).arg( newInc->description() ); Attendee::List oldAttendees = oldInc->attendees(); Attendee::List newAttendees = newInc->attendees(); for ( Attendee::List::ConstIterator it = newAttendees.constBegin(); it != newAttendees.constEnd(); ++it ) { Attendee *oldAtt = oldInc->attendeeByMail( (*it)->email() ); if ( !oldAtt ) { - mChanges += i18n( "Attendee %1 has been added" ).tqarg( (*it)->fullName() ); + mChanges += i18n( "Attendee %1 has been added" ).arg( (*it)->fullName() ); } else { if ( oldAtt->status() != (*it)->status() ) mChanges += i18n( "The status of attendee %1 has been changed to: %2" ). - tqarg( (*it)->fullName() ).tqarg( (*it)->statusStr() ); + arg( (*it)->fullName() ).arg( (*it)->statusStr() ); } } if ( method == Scheduler::Request ) { @@ -2237,7 +2237,7 @@ class IncidenceFormatter::IncidenceCompareVisitor if ( (*it)->email() != oldInc->organizer().email() ) { Attendee *newAtt = newInc->attendeeByMail( (*it)->email() ); if ( !newAtt ) { - mChanges += i18n( "Attendee %1 has been removed" ).tqarg( (*it)->fullName() ); + mChanges += i18n( "Attendee %1 has been removed" ).arg( (*it)->fullName() ); } } } @@ -2255,12 +2255,12 @@ TQString InvitationFormatterHelper::makeLink( const TQString &id, const TQString { if ( !id.startsWith( "ATTACH:" ) ) { TQString res = TQString( "<a href=\"%1\"><b>%2</b></a>" ). - tqarg( generateLinkURL( id ), text ); + arg( generateLinkURL( id ), text ); return res; } else { // draw the attachment links in non-bold face TQString res = TQString( "<a href=\"%1\">%2</a>" ). - tqarg( generateLinkURL( id ), text ); + arg( generateLinkURL( id ), text ); return res; } } @@ -2426,12 +2426,12 @@ 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); + "<tr><td>").arg(tableStyle); html += tableHead; InvitationHeaderVisitor headerVisitor; @@ -2459,7 +2459,7 @@ TQString IncidenceFormatter::formatICalInvitationHelper( TQString invitation, if ( compareVisitor.act( incBase, existingIncidence, msg->method() ) ) { html += "<p align=\"left\">"; if ( !sender.isEmpty() ) { - html += i18n( "The following changes have been made by %1:" ).tqarg( sender ); + html += i18n( "The following changes have been made by %1:" ).arg( sender ); } else { html += i18n( "The following changes have been made by an attendee:" ); } @@ -2514,10 +2514,10 @@ TQString IncidenceFormatter::formatICalInvitationHelper( TQString invitation, if ( rsvpRec && inc ) { if ( inc->revision() == 0 ) { html += i18n( "Your <b>%1</b> response has already been recorded" ). - tqarg( ea->statusStr() ); + arg( ea->statusStr() ); } else { html += i18n( "Your status for this invitation is <b>%1</b>" ). - tqarg( ea->statusStr() ); + arg( ea->statusStr() ); } rsvpReq = false; } else if ( msg->method() == Scheduler::Cancel ) { @@ -2627,7 +2627,7 @@ TQString IncidenceFormatter::formatICalInvitationHelper( TQString invitation, if ( ea && ( ea->status() != Attendee::NeedsAction ) && ( ea->status() == a->status() ) ) { if ( inc && inc->revision() > 0 ) { html += "<br><u><i>"; - html += i18n( "The response has been recorded [%1]" ).tqarg( ea->statusStr() ); + html += i18n( "The response has been recorded [%1]" ).arg( ea->statusStr() ); html += "</i></u>"; } } else { @@ -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" ); @@ -3218,20 +3218,20 @@ TQString IncidenceFormatter::ToolTipVisitor::dateRangeText( Event *event, const tmp = "<br>" + i18n("Event start", "<i>From:</i> %1"); if (event->doesFloat()) - ret += tmp.tqarg( IncidenceFormatter::dateToString( startDt, false ).replace(" ", " ") ); + ret += tmp.arg( IncidenceFormatter::dateToString( startDt, false ).replace(" ", " ") ); else - ret += tmp.tqarg( IncidenceFormatter::dateToString( startDt ).replace(" ", " ") ); + ret += tmp.arg( IncidenceFormatter::dateToString( startDt ).replace(" ", " ") ); tmp = "<br>" + i18n("Event end","<i>To:</i> %1"); if (event->doesFloat()) - ret += tmp.tqarg( IncidenceFormatter::dateToString( endDt, false ).replace(" ", " ") ); + ret += tmp.arg( IncidenceFormatter::dateToString( endDt, false ).replace(" ", " ") ); else - ret += tmp.tqarg( IncidenceFormatter::dateToString( endDt ).replace(" ", " ") ); + ret += tmp.arg( IncidenceFormatter::dateToString( endDt ).replace(" ", " ") ); } else { ret += "<br>"+i18n("<i>Date:</i> %1"). - tqarg( IncidenceFormatter::dateToString( startDt, false ).replace(" ", " ") ); + arg( IncidenceFormatter::dateToString( startDt, false ).replace(" ", " ") ); if ( !event->doesFloat() ) { const TQString dtStartTime = IncidenceFormatter::timeToString( startDt, true ).replace( " ", " " ); @@ -3240,11 +3240,11 @@ TQString IncidenceFormatter::ToolTipVisitor::dateRangeText( Event *event, const if ( dtStartTime == dtEndTime ) { // to prevent 'Time: 17:00 - 17:00' tmp = "<br>" + i18n("time for event, to prevent ugly line breaks", "<i>Time:</i> %1"). - tqarg( dtStartTime ); + arg( dtStartTime ); } else { tmp = "<br>" + i18n("time range for event, to prevent ugly line breaks", "<i>Time:</i> %1 - %2"). - tqarg( dtStartTime, dtEndTime ); + arg( dtStartTime, dtEndTime ); } ret += tmp; } @@ -3267,7 +3267,7 @@ TQString IncidenceFormatter::ToolTipVisitor::dateRangeText( Todo *todo, const TQ } ret += "<br>" + i18n("<i>Start:</i> %1"). - tqarg( IncidenceFormatter::dateTimeToString( startDt, floats, false ). + arg( IncidenceFormatter::dateTimeToString( startDt, floats, false ). replace( " ", " " ) ); } @@ -3282,7 +3282,7 @@ TQString IncidenceFormatter::ToolTipVisitor::dateRangeText( Todo *todo, const TQ } ret += "<br>" + i18n("<i>Due:</i> %1"). - tqarg( IncidenceFormatter::dateTimeToString( dueDt, floats, false ). + arg( IncidenceFormatter::dateTimeToString( dueDt, floats, false ). replace( " ", " " ) ); } @@ -3300,7 +3300,7 @@ TQString IncidenceFormatter::ToolTipVisitor::dateRangeText( Todo *todo, const TQ ret += todo->completedStr().replace( " ", " " ); } else { ret += "<i>" + i18n( "Percent Done:" ) + "</i>" + " "; - ret += i18n( "%1%" ).tqarg( todo->percentComplete() ); + ret += i18n( "%1%" ).arg( todo->percentComplete() ); } return ret; @@ -3312,7 +3312,7 @@ TQString IncidenceFormatter::ToolTipVisitor::dateRangeText( Journal*journal ) if (journal->dtStart().isValid() ) { ret += "<br>" + i18n("<i>Date:</i> %1"). - tqarg( IncidenceFormatter::dateToString( journal->dtStart(), false ) ); + arg( IncidenceFormatter::dateToString( journal->dtStart(), false ) ); } return ret; } @@ -3320,9 +3320,9 @@ TQString IncidenceFormatter::ToolTipVisitor::dateRangeText( Journal*journal ) TQString IncidenceFormatter::ToolTipVisitor::dateRangeText( FreeBusy *fb ) { TQString tmp( "<br>" + i18n("<i>Period start:</i> %1") ); - TQString ret = tmp.tqarg( KGlobal::locale()->formatDateTime( fb->dtStart() ) ); + TQString ret = tmp.arg( KGlobal::locale()->formatDateTime( fb->dtStart() ) ); tmp = "<br>" + i18n("<i>Period start:</i> %1"); - ret += tmp.tqarg( KGlobal::locale()->formatDateTime( fb->dtEnd() ) ); + ret += tmp.arg( KGlobal::locale()->formatDateTime( fb->dtEnd() ) ); return ret; } @@ -3349,7 +3349,7 @@ bool IncidenceFormatter::ToolTipVisitor::visit( Journal *journal ) bool IncidenceFormatter::ToolTipVisitor::visit( FreeBusy *fb ) { mResult = "<qt><b>" + i18n("Free/Busy information for %1") - .tqarg(fb->organizer().fullName()) + "</b>"; + .arg(fb->organizer().fullName()) + "</b>"; mResult += dateRangeText( fb ); mResult += "</qt>"; return !mResult.isEmpty(); @@ -3405,10 +3405,10 @@ static TQString tooltipFormatAttendeeRoleList( Incidence *incidence, Attendee::R } tmpStr += tooltipPerson( a->email(), a->name() ); if ( !a->delegator().isEmpty() ) { - tmpStr += i18n(" (delegated by %1)" ).tqarg( a->delegator() ); + tmpStr += i18n(" (delegated by %1)" ).arg( a->delegator() ); } if ( !a->delegate().isEmpty() ) { - tmpStr += i18n(" (delegated to %1)" ).tqarg( a->delegate() ); + tmpStr += i18n(" (delegated to %1)" ).arg( a->delegate() ); } tmpStr += sep; i++; @@ -3588,13 +3588,13 @@ static TQString mailBodyIncidence( Incidence *incidence ) { TQString body; if ( !incidence->summary().isEmpty() ) { - body += i18n("Summary: %1\n").tqarg( incidence->summary() ); + body += i18n("Summary: %1\n").arg( incidence->summary() ); } if ( !incidence->organizer().isEmpty() ) { - body += i18n("Organizer: %1\n").tqarg( incidence->organizer().fullName() ); + body += i18n("Organizer: %1\n").arg( incidence->organizer().fullName() ); } if ( !incidence->location().isEmpty() ) { - body += i18n("Location: %1\n").tqarg( incidence->location() ); + body += i18n("Location: %1\n").arg( incidence->location() ); } return body; } @@ -3608,26 +3608,26 @@ bool IncidenceFormatter::MailBodyVisitor::visit( Event *event ) mResult = mailBodyIncidence( event ); mResult += i18n("Start Date: %1\n"). - tqarg( IncidenceFormatter::dateToString( event->dtStart(), true ) ); + arg( IncidenceFormatter::dateToString( event->dtStart(), true ) ); if ( !event->doesFloat() ) { mResult += i18n("Start Time: %1\n"). - tqarg( IncidenceFormatter::timeToString( event->dtStart(), true ) ); + arg( IncidenceFormatter::timeToString( event->dtStart(), true ) ); } if ( event->dtStart() != event->dtEnd() ) { mResult += i18n("End Date: %1\n"). - tqarg( IncidenceFormatter::dateToString( event->dtEnd(), true ) ); + arg( IncidenceFormatter::dateToString( event->dtEnd(), true ) ); } if ( !event->doesFloat() ) { mResult += i18n("End Time: %1\n"). - tqarg( IncidenceFormatter::timeToString( event->dtEnd(), true ) ); + arg( IncidenceFormatter::timeToString( event->dtEnd(), true ) ); } if ( event->doesRecur() ) { Recurrence *recur = event->recurrence(); // TODO: Merge these two to one of the form "Recurs every 3 days" mResult += i18n("Recurs: %1\n") - .tqarg( recurrence[ recur->recurrenceType() ] ); + .arg( recurrence[ recur->recurrenceType() ] ); mResult += i18n("Frequency: %1\n") - .tqarg( event->recurrence()->frequency() ); + .arg( event->recurrence()->frequency() ); if ( recur->duration() > 0 ) { mResult += i18n ("Repeats once", "Repeats %n times", recur->duration()); @@ -3641,7 +3641,7 @@ bool IncidenceFormatter::MailBodyVisitor::visit( Event *event ) } else { endstr = KGlobal::locale()->formatDateTime( recur->endDateTime() ); } - mResult += i18n("Repeat until: %1\n").tqarg( endstr ); + mResult += i18n("Repeat until: %1\n").arg( endstr ); } else { mResult += i18n("Repeats forever\n"); } @@ -3652,13 +3652,13 @@ bool IncidenceFormatter::MailBodyVisitor::visit( Event *event ) mResult += i18n("This recurring meeting has been cancelled on the following days:\n"); DateList::ConstIterator ex_iter; for ( ex_iter = exceptions.begin(); ex_iter != exceptions.end(); ++ex_iter ) { - mResult += i18n(" %1\n").tqarg( KGlobal::locale()->formatDate(* ex_iter ) ); + mResult += i18n(" %1\n").arg( KGlobal::locale()->formatDate(* ex_iter ) ); } } } TQString details = event->description(); if ( !details.isEmpty() ) { - mResult += i18n("Details:\n%1\n").tqarg( details ); + mResult += i18n("Details:\n%1\n").arg( details ); } return !mResult.isEmpty(); } @@ -3669,23 +3669,23 @@ bool IncidenceFormatter::MailBodyVisitor::visit( Todo *todo ) if ( todo->hasStartDate() ) { mResult += i18n("Start Date: %1\n"). - tqarg( IncidenceFormatter::dateToString( todo->dtStart( false ), true ) ); + arg( IncidenceFormatter::dateToString( todo->dtStart( false ), true ) ); if ( !todo->doesFloat() ) { mResult += i18n("Start Time: %1\n"). - tqarg( IncidenceFormatter::timeToString( todo->dtStart( false ),true ) ); + arg( IncidenceFormatter::timeToString( todo->dtStart( false ),true ) ); } } if ( todo->hasDueDate() ) { mResult += i18n("Due Date: %1\n"). - tqarg( IncidenceFormatter::dateToString( todo->dtDue(), true ) ); + arg( IncidenceFormatter::dateToString( todo->dtDue(), true ) ); if ( !todo->doesFloat() ) { mResult += i18n("Due Time: %1\n"). - tqarg( IncidenceFormatter::timeToString( todo->dtDue(), true ) ); + arg( IncidenceFormatter::timeToString( todo->dtDue(), true ) ); } } TQString details = todo->description(); if ( !details.isEmpty() ) { - mResult += i18n("Details:\n%1\n").tqarg( details ); + mResult += i18n("Details:\n%1\n").arg( details ); } return !mResult.isEmpty(); } @@ -3694,13 +3694,13 @@ bool IncidenceFormatter::MailBodyVisitor::visit( Journal *journal ) { mResult = mailBodyIncidence( journal ); mResult += i18n("Date: %1\n"). - tqarg( IncidenceFormatter::dateToString( journal->dtStart(), true ) ); + arg( IncidenceFormatter::dateToString( journal->dtStart(), true ) ); if ( !journal->doesFloat() ) { mResult += i18n("Time: %1\n"). - tqarg( IncidenceFormatter::timeToString( journal->dtStart(), true ) ); + arg( IncidenceFormatter::timeToString( journal->dtStart(), true ) ); } if ( !journal->description().isEmpty() ) - mResult += i18n("Text of the journal:\n%1\n").tqarg( journal->description() ); + mResult += i18n("Text of the journal:\n%1\n").arg( journal->description() ); return !mResult.isEmpty(); } @@ -3813,9 +3813,9 @@ TQString IncidenceFormatter::recurrenceString( Incidence *incidence ) case Recurrence::rMinutely: recurStr = i18n( "Recurs every minute", "Recurs every %n minutes", recur->frequency() ); if ( recur->duration() != -1 ) { - txt = i18n( "%1 until %2" ).tqarg( recurStr ).tqarg( recurEnd( incidence ) ); + txt = i18n( "%1 until %2" ).arg( recurStr ).arg( recurEnd( incidence ) ); if ( recur->duration() > 0 ) { - txt += i18n( " (%1 occurrences)" ).tqarg( recur->duration() ); + txt += i18n( " (%1 occurrences)" ).arg( recur->duration() ); } return txt; } @@ -3824,9 +3824,9 @@ TQString IncidenceFormatter::recurrenceString( Incidence *incidence ) case Recurrence::rHourly: recurStr = i18n( "Recurs hourly", "Recurs every %n hours", recur->frequency() ); if ( recur->duration() != -1 ) { - txt = i18n( "%1 until %2" ).tqarg( recurStr ).tqarg( recurEnd( incidence ) ); + txt = i18n( "%1 until %2" ).arg( recurStr ).arg( recurEnd( incidence ) ); if ( recur->duration() > 0 ) { - txt += i18n( " (%1 occurrences)" ).tqarg( recur->duration() ); + txt += i18n( " (%1 occurrences)" ).arg( recur->duration() ); } return txt; } @@ -3836,9 +3836,9 @@ TQString IncidenceFormatter::recurrenceString( Incidence *incidence ) recurStr = i18n( "Recurs daily", "Recurs every %n days", recur->frequency() ); if ( recur->duration() != -1 ) { - txt = i18n( "%1 until %2" ).tqarg( recurStr ).tqarg( recurEnd( incidence ) ); + txt = i18n( "%1 until %2" ).arg( recurStr ).arg( recurEnd( incidence ) ); if ( recur->duration() > 0 ) { - txt += i18n( " (%1 occurrences)" ).tqarg( recur->duration() ); + txt += i18n( " (%1 occurrences)" ).arg( recur->duration() ); } return txt; } @@ -3863,13 +3863,13 @@ TQString IncidenceFormatter::recurrenceString( Incidence *incidence ) } if ( recur->duration() != -1 ) { txt = i18n( "%1 on %2 until %3" ). - tqarg( recurStr ).tqarg( dayNames ).tqarg( recurEnd( incidence ) ); + arg( recurStr ).arg( dayNames ).arg( recurEnd( incidence ) ); if ( recur->duration() > 0 ) { - txt += i18n( " (%1 occurrences)" ).tqarg( recur->duration() ); + txt += i18n( " (%1 occurrences)" ).arg( recur->duration() ); } return txt; } - txt = i18n( "%1 on %2" ).tqarg( recurStr ).tqarg( dayNames ); + txt = i18n( "%1 on %2" ).arg( recurStr ).arg( dayNames ); return txt; } case Recurrence::rMonthlyPos: @@ -3880,19 +3880,19 @@ TQString IncidenceFormatter::recurrenceString( Incidence *incidence ) KCal::RecurrenceRule::WDayPos rule = recur->monthPositions()[0]; if ( recur->duration() != -1 ) { txt = i18n( "%1 on the %2 %3 until %4" ). - tqarg( recurStr ). - tqarg( dayList[rule.pos() + 31] ). - tqarg( calSys->weekDayName( rule.day(), false ) ). - tqarg( recurEnd( incidence ) ); + arg( recurStr ). + arg( dayList[rule.pos() + 31] ). + arg( calSys->weekDayName( rule.day(), false ) ). + arg( recurEnd( incidence ) ); if ( recur->duration() > 0 ) { - txt += i18n( " (%1 occurrences)" ).tqarg( recur->duration() ); + txt += i18n( " (%1 occurrences)" ).arg( recur->duration() ); } return txt; } txt = i18n( "%1 on the %2 %3" ). - tqarg( recurStr ). - tqarg( dayList[rule.pos() + 31] ). - tqarg( calSys->weekDayName( rule.day(), false ) ); + arg( recurStr ). + arg( dayList[rule.pos() + 31] ). + arg( calSys->weekDayName( rule.day(), false ) ); return txt; } else { return recurStr; @@ -3907,15 +3907,15 @@ TQString IncidenceFormatter::recurrenceString( Incidence *incidence ) int days = recur->monthDays()[0]; if ( recur->duration() != -1 ) { txt = i18n( "%1 on the %2 day until %3" ). - tqarg( recurStr ). - tqarg( dayList[days + 31] ). - tqarg( recurEnd( incidence ) ); + arg( recurStr ). + arg( dayList[days + 31] ). + arg( recurEnd( incidence ) ); if ( recur->duration() > 0 ) { - txt += i18n( " (%1 occurrences)" ).tqarg( recur->duration() ); + txt += i18n( " (%1 occurrences)" ).arg( recur->duration() ); } return txt; } - txt = i18n( "%1 on the %2 day" ).tqarg( recurStr ).tqarg( dayList[days + 31] ); + txt = i18n( "%1 on the %2 day" ).arg( recurStr ).arg( dayList[days + 31] ); return txt; } else { return recurStr; @@ -3929,33 +3929,33 @@ TQString IncidenceFormatter::recurrenceString( Incidence *incidence ) if ( recur->duration() != -1 ) { if ( !recur->yearDates().isEmpty() ) { txt = i18n( "%1 on %2 %3 until %4" ). - tqarg( recurStr ). - tqarg( calSys->monthName( recur->yearMonths()[0], recur->startDate().year() ) ). - tqarg( dayList[ recur->yearDates()[0] + 31 ] ). - tqarg( recurEnd( incidence ) ); + arg( recurStr ). + arg( calSys->monthName( recur->yearMonths()[0], recur->startDate().year() ) ). + arg( dayList[ recur->yearDates()[0] + 31 ] ). + arg( recurEnd( incidence ) ); if ( recur->duration() > 0 ) { - txt += i18n( " (%1 occurrences)" ).tqarg( recur->duration() ); + txt += i18n( " (%1 occurrences)" ).arg( recur->duration() ); } return txt; } } if ( !recur->yearDates().isEmpty() ) { txt = i18n( "%1 on %2 %3" ). - tqarg( recurStr ). - tqarg( calSys->monthName( recur->yearMonths()[0], recur->startDate().year() ) ). - tqarg( dayList[ recur->yearDates()[0] + 31 ] ); + arg( recurStr ). + arg( calSys->monthName( recur->yearMonths()[0], recur->startDate().year() ) ). + arg( dayList[ recur->yearDates()[0] + 31 ] ); return txt; } else { if ( !recur->yearMonths().isEmpty() ) { txt = i18n( "Recurs yearly on %1 %2" ). - tqarg( calSys->monthName( recur->yearMonths()[0], + arg( calSys->monthName( recur->yearMonths()[0], recur->startDate().year() ) ). - tqarg( dayList[ recur->startDate().day() + 31 ] ); + arg( dayList[ recur->startDate().day() + 31 ] ); } else { txt = i18n( "Recurs yearly on %1 %2" ). - tqarg( calSys->monthName( recur->startDate().month(), + arg( calSys->monthName( recur->startDate().month(), recur->startDate().year() ) ). - tqarg( dayList[ recur->startDate().day() + 31 ] ); + arg( dayList[ recur->startDate().day() + 31 ] ); } return txt; } @@ -3967,15 +3967,15 @@ TQString IncidenceFormatter::recurrenceString( Incidence *incidence ) if ( !recur->yearDays().isEmpty() ) { if ( recur->duration() != -1 ) { txt = i18n( "%1 on day %2 until %3" ). - tqarg( recurStr ). - tqarg( recur->yearDays()[0] ). - tqarg( recurEnd( incidence ) ); + arg( recurStr ). + arg( recur->yearDays()[0] ). + arg( recurEnd( incidence ) ); if ( recur->duration() > 0 ) { - txt += i18n( " (%1 occurrences)" ).tqarg( recur->duration() ); + txt += i18n( " (%1 occurrences)" ).arg( recur->duration() ); } return txt; } - txt = i18n( "%1 on day %2" ).tqarg( recurStr ).tqarg( recur->yearDays()[0] ); + txt = i18n( "%1 on day %2" ).arg( recurStr ).arg( recur->yearDays()[0] ); return txt; } else { return recurStr; @@ -3989,21 +3989,21 @@ TQString IncidenceFormatter::recurrenceString( Incidence *incidence ) KCal::RecurrenceRule::WDayPos rule = recur->yearPositions()[0]; if ( recur->duration() != -1 ) { txt = i18n( "%1 on the %2 %3 of %4 until %5" ). - tqarg( recurStr ). - tqarg( dayList[rule.pos() + 31] ). - tqarg( calSys->weekDayName( rule.day(), false ) ). - tqarg( calSys->monthName( recur->yearMonths()[0], recur->startDate().year() ) ). - tqarg( recurEnd( incidence ) ); + arg( recurStr ). + arg( dayList[rule.pos() + 31] ). + arg( calSys->weekDayName( rule.day(), false ) ). + arg( calSys->monthName( recur->yearMonths()[0], recur->startDate().year() ) ). + arg( recurEnd( incidence ) ); if ( recur->duration() > 0 ) { - txt += i18n( " (%1 occurrences)" ).tqarg( recur->duration() ); + txt += i18n( " (%1 occurrences)" ).arg( recur->duration() ); } return txt; } txt = i18n( "%1 on the %2 %3 of %4" ). - tqarg( recurStr ). - tqarg( dayList[rule.pos() + 31] ). - tqarg( calSys->weekDayName( rule.day(), false ) ). - tqarg( calSys->monthName( recur->yearMonths()[0], recur->startDate().year() ) ); + arg( recurStr ). + arg( dayList[rule.pos() + 31] ). + arg( calSys->weekDayName( rule.day(), false ) ). + arg( calSys->monthName( recur->yearMonths()[0], recur->startDate().year() ) ); return txt; } else { return recurStr; @@ -4184,18 +4184,18 @@ TQStringList IncidenceFormatter::reminderStringList( Incidence *incidence, bool } if ( offset == 0 ) { if ( !atStr.isEmpty() ) { - remStr = i18n( "reminder occurs at datetime", "at %1" ).tqarg( atStr ); + remStr = i18n( "reminder occurs at datetime", "at %1" ).arg( atStr ); } } else { - remStr = offsetStr.tqarg( secs2Duration( offset ) ); + remStr = offsetStr.arg( secs2Duration( offset ) ); } if ( alarm->repeatCount() > 0 ) { TQString countStr = i18n( "repeats once", "repeats %n times", alarm->repeatCount() ); TQString intervalStr = i18n( "interval is N days/hours/minutes", "interval is %1" ). - tqarg( secs2Duration( alarm->snoozeTime().asSeconds() ) ); + arg( secs2Duration( alarm->snoozeTime().asSeconds() ) ); TQString repeatStr = i18n( "(repeat string, interval string)", "(%1, %2)" ). - tqarg( countStr, intervalStr ); + arg( countStr, intervalStr ); remStr = remStr + ' ' + repeatStr; } diff --git a/libkcal/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/qtopiaformat.cpp b/libkcal/qtopiaformat.cpp index 7b7954b71..b91c1d1c8 100644 --- a/libkcal/qtopiaformat.cpp +++ b/libkcal/qtopiaformat.cpp @@ -23,9 +23,9 @@ #include <tqstring.h> #include <tqptrlist.h> #include <tqregexp.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqxml.h> #include <kdebug.h> @@ -294,7 +294,7 @@ bool TQtopiaFormat::save( Calendar *calendar, const TQString &fileName ) TQFile file( fileName ); if (!file.open( IO_WriteOnly ) ) { setException(new ErrorFormat(ErrorFormat::SaveError, - i18n("Could not open file '%1'").tqarg(fileName))); + i18n("Could not open file '%1'").arg(fileName))); return false; } TQTextStream ts( &file ); diff --git a/libkcal/resourcecached.cpp b/libkcal/resourcecached.cpp index bab09728b..dacab7e9d 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 ) ); @@ -689,12 +689,12 @@ void ResourceCached::addInfoText( TQString &txt ) const if ( mLastLoad.isValid() ) { txt += "<br>"; txt += i18n("Last loaded: %1") - .tqarg( KGlobal::locale()->formatDateTime( mLastLoad ) ); + .arg( KGlobal::locale()->formatDateTime( mLastLoad ) ); } if ( mLastSave.isValid() ) { txt += "<br>"; txt += i18n("Last saved: %1") - .tqarg( KGlobal::locale()->formatDateTime( mLastSave ) ); + .arg( KGlobal::locale()->formatDateTime( mLastSave ) ); } } diff --git a/libkcal/resourcecachedconfig.cpp b/libkcal/resourcecachedconfig.cpp index caa1fddf8..0277ddcc8 100644 --- a/libkcal/resourcecachedconfig.cpp +++ b/libkcal/resourcecachedconfig.cpp @@ -20,7 +20,7 @@ */ #include <tqbuttongroup.h> -#include <tqlayout.h> +#include <layout.h> #include <tqradiobutton.h> #include <tqspinbox.h> #include <tqhbox.h> diff --git a/libkcal/resourcecalendar.cpp b/libkcal/resourcecalendar.cpp index d398357d7..9f611e75e 100644 --- a/libkcal/resourcecalendar.cpp +++ b/libkcal/resourcecalendar.cpp @@ -74,7 +74,7 @@ TQString ResourceCalendar::infoText() const KRES::Factory *factory = KRES::Factory::self( "calendar" ); TQString t = factory->typeName( type() ); - txt += i18n("Type: %1").tqarg( t ); + txt += i18n("Type: %1").arg( t ); addInfoText( txt ); @@ -172,7 +172,7 @@ void ResourceCalendar::loadError( const TQString &err ) mReceivedLoadError = true; - TQString msg = i18n("Error while loading %1.\n") .tqarg( resourceName() ); + TQString msg = i18n("Error while loading %1.\n") .arg( resourceName() ); if ( !err.isEmpty() ) { msg += err; } @@ -209,7 +209,7 @@ void ResourceCalendar::saveError( const TQString &err ) mReceivedSaveError = true; - TQString msg = i18n("Error while saving %1.\n") .tqarg( resourceName() ); + TQString msg = i18n("Error while saving %1.\n") .arg( resourceName() ); if ( !err.isEmpty() ) { msg += err; } diff --git a/libkcal/resourcelocalconfig.cpp b/libkcal/resourcelocalconfig.cpp index e237037c2..ac92aad93 100644 --- a/libkcal/resourcelocalconfig.cpp +++ b/libkcal/resourcelocalconfig.cpp @@ -23,7 +23,7 @@ #include <typeinfo> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <klocale.h> #include <kmessagebox.h> @@ -88,7 +88,7 @@ void ResourceLocalConfig::saveSettings( KRES::Resource *resource ) for( int i = 0; file.exists(); ++i ) file.setName( saveFolder + "/std" + TQString::number(i) + ".ics" ); - KMessageBox::information( this, i18n( "You did not specify a URL for this resource. Therefore, the resource will be saved in %1. It is still possible to change this location by editing the resource properties." ).tqarg( file.name() ) ); + KMessageBox::information( this, i18n( "You did not specify a URL for this resource. Therefore, the resource will be saved in %1. It is still possible to change this location by editing the resource properties." ).arg( file.name() ) ); url = file.name(); } diff --git a/libkcal/resourcelocaldirconfig.cpp b/libkcal/resourcelocaldirconfig.cpp index df2412b3d..71f70bc08 100644 --- a/libkcal/resourcelocaldirconfig.cpp +++ b/libkcal/resourcelocaldirconfig.cpp @@ -22,7 +22,7 @@ #include <typeinfo> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <klocale.h> #include <kdebug.h> diff --git a/libkcal/scheduler.cpp b/libkcal/scheduler.cpp index 70f4dbdf5..2700374fe 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: @@ -60,7 +60,7 @@ TQString ScheduleMessage::statusName(ScheduleMessage::tqStatus status) case RequestUpdate: return i18n("Updated Request"); default: - return i18n("Unknown Status: %1").tqarg(TQString::number(status)); + return i18n("Unknown Status: %1").arg(TQString::number(status)); } } @@ -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; @@ -590,12 +590,12 @@ bool Scheduler::acceptReply(IncidenceBase *incidence,ScheduleMessage::tqStatus / bool attendeeAdded = false; for ( Attendee::List::ConstIterator it = attendeesNew.constBegin(); it != attendeesNew.constEnd(); ++it ) { Attendee* attNew = *it; - TQString msg = i18n("%1 wants to attend %2 but was not invited.").tqarg( attNew->fullName() ) - .tqarg( ev ? ev->summary() : to->summary() ); + TQString msg = i18n("%1 wants to attend %2 but was not invited.").arg( attNew->fullName() ) + .arg( ev ? ev->summary() : to->summary() ); if ( !attNew->delegator().isEmpty() ) - msg = i18n("%1 wants to attend %2 on behalf of %3.").tqarg( attNew->fullName() ) - .tqarg( ev ? ev->summary() : to->summary() ) - .tqarg( attNew->delegator() ); + msg = i18n("%1 wants to attend %2 on behalf of %3.").arg( attNew->fullName() ) + .arg( ev ? ev->summary() : to->summary() ) + .arg( attNew->delegator() ); if ( KMessageBox::questionYesNo( 0, msg, i18n("Uninvited attendee"), KGuiItem(i18n("Accept Attendance")), KGuiItem(i18n("Reject Attendance")) ) != KMessageBox::Yes ) @@ -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..8525b0de7 100644 --- a/libkcal/vcalformat.cpp +++ b/libkcal/vcalformat.cpp @@ -25,7 +25,7 @@ #include <tqstring.h> #include <tqptrlist.h> #include <tqregexp.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqdialog.h> #include <tqfile.h> @@ -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/libkcal/versit/readme.txt b/libkcal/versit/readme.txt index e51acb6dd..5f38fe005 100644 --- a/libkcal/versit/readme.txt +++ b/libkcal/versit/readme.txt @@ -228,9 +228,9 @@ Use the API isAPropertyOf() to query if a name match the name of VObject tree can be pretty printed with the printVObject() function. The output of pretty printing a VObject representation of the input test file "vobject.vcf" is shown below. Note that the indentation -indicates the tree hirerarchy where the immediate tqchildren nodes +indicates the tree hirerarchy where the immediate children nodes of a parent node is all at the same indentation level and the -immediate tqchildren nodes are the immediate properties of the +immediate children nodes are the immediate properties of the associated parent nodes. In the following, {N,FN,ORG,TITLE,...} are immediate properties of VCARD. {F and G} are properties of N with value {"Alden" and "Roland"} respectively; FN has no property @@ -391,7 +391,7 @@ c. values of a property is determined by the property definition itself. The vobject APIs does not attempt to enforce any of such definition. It is the consumer responsibility to know what value is expected from a property. e.g - most properties have tqunicode string value, so to access + most properties have unicode string value, so to access the value of these type of properties, you will use the vObjectUStringZValue() to read the value and setVObjectUStringZValue() to set or modify the value. @@ -498,7 +498,7 @@ d. properties name (id) are case incensitive. const wchar_t* vObjectUStringZValue(VObject *o); -- retrieve the VObject's value interpreted as - null-terminated tqunicode string. + null-terminated unicode string. unsigned int vObjectIntegerValue(VObject *o); -- retrieve the VObject's value interpreted as @@ -578,7 +578,7 @@ d. properties name (id) are case incensitive. -- convert char* to wchar_t*. extern int uStrLen(const wchar_t *u); - -- length of tqunicode u. + -- length of unicode u. char *fakeCString(const wchar_t *u); -- convert wchar_t to CString (blindly assumes that 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_content.cpp b/libkmime/kmime_content.cpp index eb8deb8a2..b49ccf4ea 100644 --- a/libkmime/kmime_content.cpp +++ b/libkmime/kmime_content.cpp @@ -22,7 +22,7 @@ #include <klocale.h> #include <kdebug.h> -#include <tqtextcodec.h> +#include <textcodec.h> using namespace KMime; @@ -439,25 +439,25 @@ void Content::decodedText(TQStringList &l, bool trimText, if(!decodeText()) //this is not a text content !! return; - TQString tqunicode; + TQString unicode; bool ok=true; TQTextCodec *codec=KGlobal::charsets()->codecForName(contentType()->charset(),ok); - tqunicode=codec->toUnicode(b_ody.data(), b_ody.length()); + unicode=codec->toUnicode(b_ody.data(), b_ody.length()); if (trimText && removeTrailingNewlines) { int i; - for (i=tqunicode.length()-1; i>=0; i--) - if (!tqunicode[i].isSpace()) + for (i=unicode.length()-1; i>=0; i--) + if (!unicode[i].isSpace()) break; - tqunicode.truncate(i+1); + unicode.truncate(i+1); } else { - if (tqunicode.right(1)=="\n") - tqunicode.truncate(tqunicode.length()-1); // remove trailing new-line + if (unicode.right(1)=="\n") + unicode.truncate(unicode.length()-1); // remove trailing new-line } - l=TQStringList::split('\n', tqunicode, true); //split the string at linebreaks + l=TQStringList::split('\n', unicode, true); //split the string at linebreaks } diff --git a/libkmime/kmime_content.h b/libkmime/kmime_content.h index 1d2aac2d3..b7f56e6fe 100644 --- a/libkmime/kmime_content.h +++ b/libkmime/kmime_content.h @@ -29,7 +29,7 @@ class KMime::Headers::List; #include "kmime_util.h" #include "kmime_headers.h" -#include <tqtextstream.h> +#include <textstream.h> namespace KMime { diff --git a/libkmime/kmime_header_parsing.cpp b/libkmime/kmime_header_parsing.cpp index 59957f10b..adbf72fc1 100644 --- a/libkmime/kmime_header_parsing.cpp +++ b/libkmime/kmime_header_parsing.cpp @@ -39,7 +39,7 @@ #include <kglobal.h> #include <kcharsets.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <tqmap.h> #include <tqcstring.h> #include <tqstringlist.h> @@ -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..e939d8f40 100644 --- a/libkmime/kmime_headers.cpp +++ b/libkmime/kmime_headers.cpp @@ -25,7 +25,7 @@ #include "kqcstringsplitter.h" -#include <tqtextcodec.h> +#include <textcodec.h> #include <tqstring.h> #include <tqcstring.h> #include <tqstringlist.h> @@ -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); } @@ -1174,7 +1174,7 @@ void References::append(const TQCString &s) for (int i=1;i<=3;i++) { // include the last three ids if (!lst.isEmpty()) { temp = lst.last(); - r_ef.insert(insPos,(TQString(" %1").tqarg(temp)).latin1()); + r_ef.insert(insPos,(TQString(" %1").arg(temp)).latin1()); lst.remove(temp); } else break; @@ -1183,7 +1183,7 @@ void References::append(const TQCString &s) while (!lst.isEmpty()) { // now insert the rest, up to 1000 characters temp = lst.last(); if ((15+r_ef.length()+temp.length())<1000) { - r_ef.insert(insPos,(TQString(" %1").tqarg(temp)).latin1()); + r_ef.insert(insPos,(TQString(" %1").arg(temp)).latin1()); lst.remove(temp); } else return; @@ -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_parsers.cpp b/libkmime/kmime_parsers.cpp index bd07c2375..202ce4bf4 100644 --- a/libkmime/kmime_parsers.cpp +++ b/libkmime/kmime_parsers.cpp @@ -391,7 +391,7 @@ bool YENCEncoded::parse() ch+=256; if (totalSize>=yencSize) break; - binary.tqat(totalSize++)=ch; + binary.at(totalSize++)=ch; lineLength++; } else @@ -404,7 +404,7 @@ bool YENCEncoded::parse() ch+=256; if (totalSize>=yencSize) break; - binary.tqat(totalSize++)=ch; + binary.at(totalSize++)=ch; lineLength++; pos++; } diff --git a/libkmime/kmime_util.cpp b/libkmime/kmime_util.cpp index 8110227e5..a31008d3d 100644 --- a/libkmime/kmime_util.cpp +++ b/libkmime/kmime_util.cpp @@ -29,7 +29,7 @@ #include <kcalendarsystem.h> #endif -#include <tqtextcodec.h> +#include <textcodec.h> #include <tqstrlist.h> // for TQStrIList #include <tqregexp.h> #include <tqdatetime.h> @@ -72,7 +72,7 @@ bool isUsAscii(const TQString &s) { uint sLength = s.length(); for (uint i=0; i<sLength; i++) - if (s.tqat(i).latin1()<=0) // c==0: non-latin1, c<0: non-us-ascii + if (s.at(i).latin1()<=0) // c==0: non-latin1, c<0: non-us-ascii return false; return true; @@ -683,14 +683,14 @@ DateFormatter::fancy(time_t otime) const if ( diff < 24 * 60 * 60 ) { if ( old.date().year() == mDate.date().year() && old.date().dayOfYear() == mDate.date().dayOfYear() ) - return i18n( "Today %1" ).tqarg( locale-> + return i18n( "Today %1" ).arg( locale-> formatTime( old.time(), true ) ); } if ( diff < 2 * 24 * 60 * 60 ) { TQDateTime yesterday( mDate.addDays( -1 ) ); if ( old.date().year() == yesterday.date().year() && old.date().dayOfYear() == yesterday.date().dayOfYear() ) - return i18n( "Yesterday %1" ).tqarg( locale-> + return i18n( "Yesterday %1" ).arg( locale-> formatTime( old.time(), true) ); } for ( int i = 3; i < 7; i++ ) @@ -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/kpgp.cpp b/libkpgp/kpgp.cpp index 6035112c8..08557a727 100644 --- a/libkpgp/kpgp.cpp +++ b/libkpgp/kpgp.cpp @@ -313,7 +313,7 @@ Module::clearsign( Block& block, Kpgp::Result Module::encrypt( Block& block, - const TQStringList& tqreceivers, const KeyID& keyId, + const TQStringList& receivers, const KeyID& keyId, bool sign, const TQCString& charset ) { KeyIDList encryptionKeyIds; // list of keys which are used for encryption @@ -324,8 +324,8 @@ Module::encrypt( Block& block, setUser( keyId ); - if( !tqreceivers.empty() ) { - Kpgp::Result result = getEncryptionKeys( encryptionKeyIds, tqreceivers, + if( !receivers.empty() ) { + Kpgp::Result result = getEncryptionKeys( encryptionKeyIds, receivers, keyId ); if( Kpgp::Ok != result ) { return result; @@ -371,7 +371,7 @@ Module::encrypt( Block& block, TQString str = i18n("%1 = 'signing failed' error message", "%1\nDo you want to send the message unsigned, " "or cancel sending the message?") - .tqarg( pgp->lastErrorMessage() ); + .arg( pgp->lastErrorMessage() ); TQApplication::setOverrideCursor( TQCursor(TQCursor::ArrowCursor) ); int ret = KMessageBox::warningContinueCancel( 0, str, i18n("PGP Warning"), @@ -389,7 +389,7 @@ Module::encrypt( Block& block, TQString str = i18n("%1 = 'bad keys' error message", "%1\nDo you want to encrypt anyway, leave the " "message as-is, or cancel sending the message?") - .tqarg( pgp->lastErrorMessage() ); + .arg( pgp->lastErrorMessage() ); TQApplication::setOverrideCursor( TQCursor(TQCursor::ArrowCursor) ); int ret = KMessageBox::warningYesNoCancel( 0, str, @@ -416,7 +416,7 @@ Module::encrypt( Block& block, TQString str = i18n("%1 = 'missing keys' error message", "%1\nDo you want to leave the message as-is, " "or cancel sending the message?") - .tqarg( pgp->lastErrorMessage() ); + .arg( pgp->lastErrorMessage() ); TQApplication::setOverrideCursor( TQCursor(TQCursor::ArrowCursor) ); int ret = KMessageBox::warningContinueCancel( 0, str, i18n("PGP Warning"), @@ -432,10 +432,10 @@ Module::encrypt( Block& block, if( status & ERROR ) { // show error dialog errMsg = i18n( "The following error occurred:\n%1" ) - .tqarg( pgp->lastErrorMessage() ); + .arg( pgp->lastErrorMessage() ); TQString details = i18n( "This is the error message of %1:\n%2" ) - .tqarg( ( pgpType == tGPG ) ? "GnuPG" : "PGP" ) - .tqarg( block.error().data() ); + .arg( ( pgpType == tGPG ) ? "GnuPG" : "PGP" ) + .arg( block.error().data() ); TQApplication::setOverrideCursor( TQCursor(TQCursor::ArrowCursor) ); KMessageBox::detailedSorry( 0, errMsg, details ); TQApplication::restoreOverrideCursor(); @@ -1216,7 +1216,7 @@ Module::getEncryptionKeys( const TQString& person ) "encryption key(s) for \"%1\".\n\n" "Please re-select the key(s) which should " "be used for this recipient." - ).tqarg(person), + ).arg(person), keyIds, allowedKeys ); if( !keyIds.isEmpty() ) { @@ -1280,7 +1280,7 @@ Module::getEncryptionKeys( const TQString& person ) "found for \"%1\".\n\n" "Select the key(s) which should " "be used for this recipient." - ).tqarg(person), + ).arg(person), KeyIDList(), allowedKeys ); if( !keyIds.isEmpty() ) { @@ -1305,7 +1305,7 @@ Module::getEncryptionKeys( const TQString& person ) "More than one key matches \"%1\".\n\n" "Select the key(s) which should " "be used for this recipient." - ).tqarg(person), + ).arg(person), KeyIDList(), allowedKeys ); if( !keyIds.isEmpty() ) { @@ -1744,7 +1744,7 @@ Module::readAddressData() addressDataDict.clear(); for( int i=1; i<=num; i++ ) { - KConfigGroup addrGroup( config, TQString("Address #%1").tqarg(i).local8Bit() ); + KConfigGroup addrGroup( config, TQString("Address #%1").arg(i).local8Bit() ); address = addrGroup.readEntry( "Address" ); data.keyIds = KeyIDList::fromStringList( addrGroup.readListEntry( "Key IDs" ) ); data.encrPref = (EncryptPref) addrGroup.readNumEntry( "EncryptionPreference", @@ -1769,7 +1769,7 @@ Module::writeAddressData() for ( i=1, it = addressDataDict.begin(); it != addressDataDict.end(); ++it, i++ ) { - KConfigGroup addrGroup( config, TQString("Address #%1").tqarg(i).local8Bit() ); + KConfigGroup addrGroup( config, TQString("Address #%1").arg(i).local8Bit() ); addrGroup.writeEntry( "Address", it.key() ); addrGroup.writeEntry( "Key IDs", it.data().keyIds.toStringList() ); addrGroup.writeEntry( "EncryptionPreference", it.data().encrPref ); diff --git a/libkpgp/kpgp.h b/libkpgp/kpgp.h index f9f492360..25dc44c0c 100644 --- a/libkpgp/kpgp.h +++ b/libkpgp/kpgp.h @@ -25,7 +25,7 @@ #include <tqdialog.h> #include <tqwidget.h> #include <tqcombobox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <tqlistview.h> #include <tqbuttongroup.h> @@ -123,7 +123,7 @@ public: Ok if everything is o.k. */ Kpgp::Result encrypt( Block& block, - const TQStringList& tqreceivers, const KeyID& keyId, + const TQStringList& receivers, const KeyID& keyId, bool sign, const TQCString& charset = 0 ); /** Determines the keys which should be used for encrypting the message diff --git a/libkpgp/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..23458e022 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 @@ -139,12 +139,12 @@ Base2::encsign( Block& block, const KeyIDList& recipients, errMsg = i18n("Could not find public keys matching the userid(s)\n" "%1;\n" "the message is not encrypted.") - .tqarg( badkeys.data() ); + .arg( badkeys.data() ); else errMsg = i18n("Could not find public keys matching the userid(s)\n" "%1;\n" "these persons will not be able to read the message.") - .tqarg( badkeys.data() ); + .arg( badkeys.data() ); status |= MISSINGKEY; status |= ERROR; } @@ -171,13 +171,13 @@ Base2::encsign( Block& block, const KeyIDList& recipients, "for userid(s)\n" "%1.\n" "The message is not encrypted.") - .tqarg( badkeys.data() ); + .arg( badkeys.data() ); else errMsg = i18n("Public keys not certified with trusted signature " "for userid(s)\n" "%1;\n" "these persons will not be able to read the message.") - .tqarg( badkeys.data() ); + .arg( badkeys.data() ); status |= BADKEYS; status |= ERROR; return status; @@ -218,7 +218,7 @@ Base2::encsign( Block& block, const KeyIDList& recipients, } //kdDebug(5100) << "status = " << status << endl; - block.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; } @@ -448,7 +448,7 @@ Base2::decrypt( Block& block, const char *passphrase ) index = error.find('\'', index) + 1; index2 = error.find('\'', index); block.setSignatureUserId( i18n("The keyring file %1 does not exist.\n" - "Please check your PGP setup.").tqarg(TQString(error.mid(index, index2-index))) ); + "Please check your PGP setup.").arg(TQString(error.mid(index, index2-index))) ); } else { @@ -457,7 +457,7 @@ Base2::decrypt( Block& block, const char *passphrase ) } } //kdDebug(5100) << "status = " << status << endl; - block.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..1f7d67326 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 @@ -156,7 +156,7 @@ Base5::encsign( Block& block, const KeyIDList& recipients, else errMsg = i18n("The following key(s) are not trusted:\n%1\n" "Their owner(s) will not be able to decrypt the message.") - .tqarg(TQString(aStr)); + .arg(TQString(aStr)); status |= ERROR; status |= BADKEYS; } @@ -167,9 +167,9 @@ Base5::encsign( Block& block, const KeyIDList& recipients, int index2 = error.find('\n',index); errMsg = i18n("Missing encryption key(s) for:\n%1") - .tqarg(TQString(error.mid(index,index2-index))); + .arg(TQString(error.mid(index,index2-index))); // errMsg = TQString("Missing encryption key(s) for: %1") -// .tqarg(error.mid(index,index2-index)); +// .arg(error.mid(index,index2-index)); status |= ERROR; status |= MISSINGKEY; } @@ -185,7 +185,7 @@ Base5::encsign( Block& block, const KeyIDList& recipients, } block.setProcessedText( output ); - block.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..7ce5c2358 100644 --- a/libkpgp/kpgpbaseG.cpp +++ b/libkpgp/kpgpbaseG.cpp @@ -27,7 +27,7 @@ #include <kprocess.h> #include <kdebug.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <string.h> /* strncmp */ @@ -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." ); @@ -153,12 +153,12 @@ BaseG::encsign( Block& block, const KeyIDList& recipients, errMsg = i18n("Could not find public keys matching the userid(s)\n" "%1;\n" "the message is not encrypted.") - .tqarg( badkeys.data() ); + .arg( badkeys.data() ); else errMsg = i18n("Could not find public keys matching the userid(s)\n" "%1;\n" "these persons will not be able to read the message.") - .tqarg( badkeys.data() ); + .arg( badkeys.data() ); status |= MISSINGKEY; status |= ERROR; } @@ -199,7 +199,7 @@ BaseG::encsign( Block& block, const KeyIDList& recipients, } //kdDebug(5100) << "status = " << status << endl; - block.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(); } @@ -722,7 +722,7 @@ BaseG::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ ) // check whether uid was utf-8 encoded bool isUtf8 = true; for ( unsigned int i = 0; i + 1 < uidString.length(); ++i ) { - if ( uidString[i].tqunicode() == 0xdbff && + if ( uidString[i].unicode() == 0xdbff && uidString[i+1].row() == 0xde ) { // we found a non-Unicode character (see TQString::fromUtf8()) isUtf8 = false; @@ -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..f1c6a5aef 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; } @@ -122,7 +122,7 @@ Block::clearsign( const TQCString& keyId, const TQCString& charset ) } Kpgp::Result -Block::encrypt( const TQStringList& tqreceivers, const TQCString& keyId, +Block::encrypt( const TQStringList& receivers, const TQCString& keyId, const bool sign, const TQCString& charset ) { Kpgp::Module *pgp = Kpgp::Module::getKpgp(); @@ -130,7 +130,7 @@ Block::encrypt( const TQStringList& tqreceivers, const TQCString& keyId, if( pgp == 0 ) return Kpgp::Failure; - return pgp->encrypt( *this, tqreceivers, keyId, sign, charset ); + return pgp->encrypt( *this, receivers, keyId, sign, charset ); } } // namespace Kpgp diff --git a/libkpgp/kpgpblock.h b/libkpgp/kpgpblock.h index e3308eab9..ac0214aaa 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(); @@ -169,7 +169,7 @@ class KDE_EXPORT Block false if there was an unresolvable error or if encryption was canceled true if everything is o.k. */ - Kpgp::Result encrypt( const TQStringList& tqreceivers, const TQCString& keyId, + Kpgp::Result encrypt( const TQStringList& receivers, const TQCString& keyId, const bool sign, const TQCString& charset = TQCString() ); private: @@ -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..ea1262515 100644 --- a/libkpgp/kpgpui.cpp +++ b/libkpgp/kpgpui.cpp @@ -24,10 +24,10 @@ #include <tqwhatsthis.h> #include <tqtooltip.h> #include <tqapplication.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <tqdatetime.h> #include <tqpixmap.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtimer.h> #include <tqpopupmenu.h> #include <tqregexp.h> @@ -76,7 +76,7 @@ PassphraseDialog::PassphraseDialog( TQWidget *parent, if (keyID.isNull()) label = new TQLabel(i18n("Please enter your OpenPGP passphrase:"),rightArea); else - label = new TQLabel(i18n("Please enter the OpenPGP passphrase for\n\"%1\":").tqarg(keyID), + label = new TQLabel(i18n("Please enter the OpenPGP passphrase for\n\"%1\":").arg(keyID), rightArea); lineedit = new KPasswordEdit( rightArea ); lineedit->setEchoMode(TQLineEdit::Password); @@ -115,7 +115,7 @@ Config::Config( TQWidget *parent, const char *name, bool encrypt ) TQVBoxLayout *topLayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); group = new TQVGroupBox( i18n("Warning"), this ); - group->tqlayout()->setSpacing( KDialog::spacingHint() ); + group->layout()->setSpacing( KDialog::spacingHint() ); // (mmutz) work around TQt label bug in 3.0.0 (and possibly later): // 1. Don't use rich text: No <qt><b>...</b></qt> label = new TQLabel( i18n("Please check if encryption really " @@ -126,13 +126,13 @@ 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 ); - group->tqlayout()->setSpacing( KDialog::spacingHint() ); + group->layout()->setSpacing( KDialog::spacingHint() ); TQHBox * hbox = new TQHBox( group ); label = new TQLabel( i18n("Select encryption tool to &use:"), hbox ); @@ -153,7 +153,7 @@ Config::Config( TQWidget *parent, const char *name, bool encrypt ) topLayout->addWidget( group ); mpOptionsGroupBox = new TQVGroupBox( i18n("Options"), this ); - mpOptionsGroupBox->tqlayout()->setSpacing( KDialog::spacingHint() ); + mpOptionsGroupBox->layout()->setSpacing( KDialog::spacingHint() ); storePass = new TQCheckBox( i18n("&Keep passphrase in memory"), mpOptionsGroupBox ); connect( storePass, TQT_SIGNAL( toggled( bool ) ), @@ -461,7 +461,7 @@ void KeySelectionDialog::initKeylist( const KeyList& keyList, childItem = new TQListViewItem( primaryUserID, "", i18n( "Fingerprint: %1" ) - .tqarg( beautifyFingerprint( (*it)->primaryFingerprint() ) ) ); + .arg( beautifyFingerprint( (*it)->primaryFingerprint() ) ) ); if( primaryUserID->isSelected() && mListView->isMultiSelection() ) { mListView->setSelected( childItem, true ); } @@ -543,15 +543,15 @@ TQString KeySelectionDialog::keyInfo( const Kpgp::Key *key ) const if( remark.isEmpty() ) { return " " + i18n("creation date and status of an OpenPGP key", "Creation date: %1, Status: %2") - .tqarg( KGlobal::locale()->formatDate( dt.date(), true ) ) - .tqarg( status ); + .arg( KGlobal::locale()->formatDate( dt.date(), true ) ) + .arg( status ); } else { return " " + i18n("creation date, status and remark of an OpenPGP key", "Creation date: %1, Status: %2 (%3)") - .tqarg( KGlobal::locale()->formatDate( dt.date(), true ) ) - .tqarg( status ) - .tqarg( remark ); + .arg( KGlobal::locale()->formatDate( dt.date(), true ) ) + .arg( status ) + .arg( remark ); } } @@ -1014,7 +1014,7 @@ bool KeySelectionDialog::checkKeys( const TQValueList<TQListViewItem*>& keys ) c ++it ) { kdDebug(5100) << "Checking key 0x" << getKeyId( *it ) << "...\n"; pProgressDlg->setLabel( i18n("Checking key 0x%1...") - .tqarg( TQString( getKeyId( *it ) ) ) ); + .arg( TQString( getKeyId( *it ) ) ) ); kapp->processEvents(); keysAllowed = keysAllowed && ( -1 != keyAdmissibility( *it, AllowExpensiveTrustCheck ) ); pProgressDlg->progressBar()->advance( 1 ); @@ -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 @@ -1543,7 +1543,7 @@ KeyApprovalDialog::slotChangeEncryptionKey( int nr ) "Select the key(s) which should " "be used to encrypt the message " "for\n%1") - .tqarg( mAddressLabels[nr-1]->text() ), + .arg( mAddressLabels[nr-1]->text() ), keyIds, mAddressLabels[nr-1]->text(), mAllowedKeys ); @@ -1630,26 +1630,26 @@ CipherTextDialog::CipherTextDialog( const TQCString & text, mEditBox->setReadOnly(true); topLayout->addWidget( mEditBox, 10 ); - TQString tqunicodeText; + TQString unicodeText; if (charset.isEmpty()) - tqunicodeText = TQString::fromLocal8Bit(text.data()); + unicodeText = TQString::fromLocal8Bit(text.data()); else { bool ok=true; TQTextCodec *codec = KGlobal::charsets()->codecForName(charset, ok); if(!ok) - tqunicodeText = TQString::fromLocal8Bit(text.data()); + unicodeText = TQString::fromLocal8Bit(text.data()); else - tqunicodeText = codec->toUnicode(text.data(), text.length()); + unicodeText = codec->toUnicode(text.data(), text.length()); } - mEditBox->setText(tqunicodeText); + mEditBox->setText(unicodeText); setMinimumSize(); } void CipherTextDialog::setMinimumSize() { - // this seems to force a tqlayout of the entire document, so we get a + // this seems to force a layout of the entire document, so we get a // a proper contentsWidth(). Is there a better way? for ( int i = 0; i < mEditBox->paragraphs(); i++ ) (void) mEditBox->paragraphRect( i ); @@ -1670,7 +1670,7 @@ void CipherTextDialog::setMinimumSize() gc.readBoolEntry("XineramaPlacementEnabled", true)) { maxWidth = TQApplication::desktop()->screenGeometry(TQApplication::desktop()->screenNumber(parentWidget())).width()-100; } else { - maxWidth = TQApplication::desktop()->tqgeometry().width()-100; + maxWidth = TQApplication::desktop()->geometry().width()-100; } #endif diff --git a/libkpimexchange/core/exchangeaccount.cpp b/libkpimexchange/core/exchangeaccount.cpp index acff34f12..085292309 100644 --- a/libkpimexchange/core/exchangeaccount.cpp +++ b/libkpimexchange/core/exchangeaccount.cpp @@ -21,7 +21,7 @@ */ #include <tqstring.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqapplication.h> #include <tqdom.h> #include <tqwidgetlist.h> @@ -89,8 +89,8 @@ TQString endecryptStr( const TQString &aStr ) { TQString result; for (uint i = 0; i < aStr.length(); i++) - result += (aStr[i].tqunicode() < 0x20) ? aStr[i] : - TQChar(0x1001F - aStr[i].tqunicode()); + result += (aStr[i].unicode() < 0x20) ? aStr[i] : + TQChar(0x1001F - aStr[i].unicode()); return result; } @@ -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 @@ -249,7 +249,7 @@ void ExchangeAccount::slotFolderResult( KIO::Job *job ) if ( job->error() ) { kdError() << "Error: Cannot get well-know folder names; " << job->error() << endl; TQString text = i18n("ExchangeAccount\nError accessing '%1': %2") - .tqarg( baseURL().prettyURL() ).tqarg( job->errorString() ); + .arg( baseURL().prettyURL() ).arg( job->errorString() ); KMessageBox::error( 0, text ); mError = true; return; diff --git a/libkpimexchange/core/exchangedownload.cpp b/libkpimexchange/core/exchangedownload.cpp index e5a09b530..d51a7a43e 100644 --- a/libkpimexchange/core/exchangedownload.cpp +++ b/libkpimexchange/core/exchangedownload.cpp @@ -19,7 +19,7 @@ */ #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqdatastream.h> #include <tqcstring.h> #include <tqregexp.h> @@ -182,8 +182,8 @@ void ExchangeDownload::slotSearchResult( KIO::Job *job ) kdError() << "ExchangeDownload::slotSearchResult() error: " << job->error() << endl; TQString text = i18n("ExchangeDownload\nError accessing '%1': %2") - .tqarg( mAccount->calendarURL().prettyURL() ) - .tqarg( job->errorString() ); + .arg( mAccount->calendarURL().prettyURL() ) + .arg( job->errorString() ); KMessageBox::error( 0, text ); finishUp( ExchangeClient::CommunicationError, job ); return; @@ -231,7 +231,7 @@ void ExchangeDownload::handleAppointments( const TQDomDocument &response, item = item.nextSibling().toElement() ) { //kdDebug() << "Current item:" << item.tagName() << endl; TQDomNodeList propstats = item.elementsByTagNameNS( "DAV:", "propstat" ); - // kdDebug() << "Item has " << propstats.count() << " propstat tqchildren" << endl; + // kdDebug() << "Item has " << propstats.count() << " propstat children" << endl; for( uint i=0; i < propstats.count(); i++ ) { TQDomElement propstat = propstats.item(i).toElement(); TQDomElement prop = propstat.namedItem( "prop" ).toElement(); diff --git a/libkpimexchange/core/exchangemonitor.cpp b/libkpimexchange/core/exchangemonitor.cpp index c9f8c627a..c932436af 100644 --- a/libkpimexchange/core/exchangemonitor.cpp +++ b/libkpimexchange/core/exchangemonitor.cpp @@ -22,7 +22,7 @@ #include <tqregexp.h> #include <tqsocketdevice.h> #include <tqsocketnotifier.h> -#include <tqtextstream.h> +#include <textstream.h> #include <kurl.h> #include <kdebug.h> diff --git a/libkpimexchange/core/exchangeprogress.cpp b/libkpimexchange/core/exchangeprogress.cpp index 911e8f59d..502d72fe1 100644 --- a/libkpimexchange/core/exchangeprogress.cpp +++ b/libkpimexchange/core/exchangeprogress.cpp @@ -18,7 +18,7 @@ Boston, MA 02110-1301, USA. */ -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqcombobox.h> @@ -65,7 +65,7 @@ void ExchangeProgress::slotTransferFinished() void ExchangeProgress::updateLabel() { progressBar()->setValue( m_finished ); - TQString str = i18n( "Downloading, %1 of %2" ).tqarg( m_finished ).tqarg( m_total ); + TQString str = i18n( "Downloading, %1 of %2" ).arg( m_finished ).arg( m_total ); setLabel( str ); } diff --git a/libkpimexchange/core/exchangeupload.cpp b/libkpimexchange/core/exchangeupload.cpp index 4317a2565..d317976d0 100644 --- a/libkpimexchange/core/exchangeupload.cpp +++ b/libkpimexchange/core/exchangeupload.cpp @@ -253,9 +253,9 @@ void ExchangeUpload::startUpload( const KURL &url ) if ( tzOffset == 0 ) offsetString = "Z"; else if ( tzOffset > 0 ) - offsetString = TQString( "+%1:%2" ).tqarg(tzOffset/60, 2).tqarg( tzOffset%60, 2 ); + offsetString = TQString( "+%1:%2" ).arg(tzOffset/60, 2).arg( tzOffset%60, 2 ); else - offsetString = TQString( "-%1:%2" ).tqarg((-tzOffset)/60, 2).tqarg( (-tzOffset)%60, 2 ); + offsetString = TQString( "-%1:%2" ).arg((-tzOffset)/60, 2).arg( (-tzOffset)%60, 2 ); offsetString = offsetString.replace( TQRegExp(" "), "0" ); kdDebug() << "Timezone offset: " << tzOffset << " : " << offsetString << endl; diff --git a/libkpimidentities/identity.cpp b/libkpimidentities/identity.cpp index c7bd624cc..bb947b3bd 100644 --- a/libkpimidentities/identity.cpp +++ b/libkpimidentities/identity.cpp @@ -102,7 +102,7 @@ TQString Signature::textFromCommand( bool * ok ) const if ( rc != 0 ) { if ( ok ) *ok = false; TQString wmsg = i18n("<qt>Failed to execute signature script<br><b>%1</b>:<br>%2</qt>") - .tqarg( mUrl ).tqarg( strerror(rc) ); + .arg( mUrl ).arg( strerror(rc) ); KMessageBox::error(0, wmsg); return TQString(); } @@ -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/identitycombo.cpp b/libkpimidentities/identitycombo.cpp index 1b250fa34..5ddc01975 100644 --- a/libkpimidentities/identitycombo.cpp +++ b/libkpimidentities/identitycombo.cpp @@ -93,7 +93,7 @@ void IdentityCombo::reloadCombo() { TQStringList identities = mIdentityManager->identities(); // the IM should prevent this from happening: assert( !identities.isEmpty() ); - identities.first() = i18n("%1 (Default)").tqarg( identities.first() ); + identities.first() = i18n("%1 (Default)").arg( identities.first() ); clear(); insertStringList( identities ); } diff --git a/libkpimidentities/identitymanager.cpp b/libkpimidentities/identitymanager.cpp index 2c63d0534..2935fe0a2 100644 --- a/libkpimidentities/identitymanager.cpp +++ b/libkpimidentities/identitymanager.cpp @@ -201,7 +201,7 @@ void IdentityManager::writeConfig() const { int i = 0; for ( ConstIterator it = mIdentities.begin() ; it != mIdentities.end() ; ++it, ++i ) { - KConfigGroup cg( mConfig, TQString::tqfromLatin1("Identity #%1").tqarg(i) ); + KConfigGroup cg( mConfig, TQString::fromLatin1("Identity #%1").arg(i) ); (*it).writeConfig( &cg ); if ( (*it).isDefault() ) { // remember which one is default: diff --git a/libksieve/parser/lexer.cpp b/libksieve/parser/lexer.cpp index a38c61021..3bc75c96e 100644 --- a/libksieve/parser/lexer.cpp +++ b/libksieve/parser/lexer.cpp @@ -40,7 +40,7 @@ #include <tqstring.h> #include <tqstringlist.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <memory> // std::auto_ptr @@ -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/libksieve/shared/error.cpp b/libksieve/shared/error.cpp index 9fe79c1da..faf20bcc6 100644 --- a/libksieve/shared/error.cpp +++ b/libksieve/shared/error.cpp @@ -129,7 +129,7 @@ namespace KSieve { "follow \"text:\" on the same line"); break; case NumberOutOfRange: - err = i18n("Parse error: Number out of Range (must be smaller than %1)").tqarg(UINT_MAX); + err = i18n("Parse error: Number out of Range (must be smaller than %1)").arg(UINT_MAX); break; case InvalidUTF8: err = i18n("Parse error: Invalid UTF-8 sequence"); @@ -188,51 +188,51 @@ namespace KSieve { err = i18n("\"require\" must be first command"); break; case RequireMissingForCommand: - err = i18n("\"require\" missing for command \"%1\"").tqarg(mStringOne); + err = i18n("\"require\" missing for command \"%1\"").arg(mStringOne); break; case RequireMissingForTest: - err = i18n("\"require\" missing for test \"%1\"").tqarg(mStringOne); + err = i18n("\"require\" missing for test \"%1\"").arg(mStringOne); break; case RequireMissingForComparator: - err = i18n("\"require\" missing for comparator \"%1\"").tqarg(mStringOne); + err = i18n("\"require\" missing for comparator \"%1\"").arg(mStringOne); break; case UnsupportedCommand: - err = i18n("Command \"%1\" not supported").tqarg(mStringOne); + err = i18n("Command \"%1\" not supported").arg(mStringOne); break; case UnsupportedTest: - err = i18n("Test \"%1\" not supported").tqarg(mStringOne); + err = i18n("Test \"%1\" not supported").arg(mStringOne); break; case UnsupportedComparator: - err = i18n("Comparator \"%1\" not supported").tqarg(mStringOne); + err = i18n("Comparator \"%1\" not supported").arg(mStringOne); break; case TestNestingTooDeep: - err = i18n("Site Policy Limit Violation: Test nesting too deep (max. %1)").tqarg( mStringOne.toUInt() ); + err = i18n("Site Policy Limit Violation: Test nesting too deep (max. %1)").arg( mStringOne.toUInt() ); break; case BlockNestingTooDeep: - err = i18n("Site Policy Limit Violation: Block nesting too deep (max. %1)").tqarg( mStringOne.toUInt() ); + err = i18n("Site Policy Limit Violation: Block nesting too deep (max. %1)").arg( mStringOne.toUInt() ); break; case InvalidArgument: - err = i18n("Invalid Argument \"%1\" to \"%2\"").tqarg(mStringOne).tqarg(mStringTwo); + err = i18n("Invalid Argument \"%1\" to \"%2\"").arg(mStringOne).arg(mStringTwo); break; case ConflictingArguments: - err = i18n("Conflicting Arguments: \"%1\" and \"%2\"").tqarg(mStringOne).tqarg(mStringTwo); + err = i18n("Conflicting Arguments: \"%1\" and \"%2\"").arg(mStringOne).arg(mStringTwo); break; case ArgumentsRepeated: - err = i18n("Argument \"%1\" Repeated").tqarg(mStringOne); + err = i18n("Argument \"%1\" Repeated").arg(mStringOne); break; case CommandOrderingConstraintViolation: - err = i18n("Command \"%1\" violates command ordering constraints").tqarg(mStringOne); + err = i18n("Command \"%1\" violates command ordering constraints").arg(mStringOne); break; // runtime errors: case IncompatibleActionsRequested: - err = i18n("Incompatible Actions \"%1\" and \"%2\" requested").tqarg(mStringOne).tqarg(mStringTwo); + err = i18n("Incompatible Actions \"%1\" and \"%2\" requested").arg(mStringOne).arg(mStringTwo); break; case MailLoopDetected: err = i18n("Mail Loop detected"); break; case TooManyActions: - err = i18n("Site Policy Limit Violation: Too many Actions requested (max. %1)").tqarg( mStringOne.toUInt() ); + err = i18n("Site Policy Limit Violation: Too many Actions requested (max. %1)").arg( mStringOne.toUInt() ); break; default: err = i18n("Unknown error"); diff --git a/libksieve/tests/parsertest.cpp b/libksieve/tests/parsertest.cpp index f4efcee58..ea718e4d2 100644 --- a/libksieve/tests/parsertest.cpp +++ b/libksieve/tests/parsertest.cpp @@ -397,7 +397,7 @@ public: write( multiLine ? "string type=\"multiline\"" : "string type=\"quoted\"", string ); } void numberArgument( unsigned long number, char quantifier ) { - const TQString txt = "number" + ( quantifier ? TQString(" quantifier=\"%1\"").tqarg( quantifier ) : TQString() ) ; + const TQString txt = "number" + ( quantifier ? TQString(" quantifier=\"%1\"").arg( quantifier ) : TQString() ) ; write( txt.latin1(), TQString::number( number ) ); } void commandStart( const TQString & identifier ) { diff --git a/libtdenetwork/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-uds.c b/libtdenetwork/libgpgme-copy/assuan/assuan-uds.c index e9e81016c..77945fb50 100644 --- a/libtdenetwork/libgpgme-copy/assuan/assuan-uds.c +++ b/libtdenetwork/libgpgme-copy/assuan/assuan-uds.c @@ -46,7 +46,7 @@ #ifdef USE_DESCRIPTOR_PASSING /* Provide replacement for missing CMSG maccros. We assume that - size_t matches the tqalignment requirement. */ + size_t matches the alignment requirement. */ #define MY_ALIGN(n) ((((n))+ sizeof(size_t)-1) & (size_t)~(sizeof(size_t)-1)) #ifndef CMSG_SPACE #define CMSG_SPACE(n) (MY_ALIGN(sizeof(struct cmsghdr)) + MY_ALIGN((n))) diff --git a/libtdenetwork/libgpgme-copy/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..c9665e2a2 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. @@ -5218,7 +5218,7 @@ * types.h: Add ulong typedef. * rungpg.c (do_reaping,_gpgme_gpg_housecleaning): New. - (_gpgme_gpg_release): Reap tqchildren. + (_gpgme_gpg_release): Reap children. * io.h, posix-io.c (_gpgme_io_kill): New. * w32-io.c (_gpgme_io_kill): New (dummy). diff --git a/libtdenetwork/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/libtdenetwork/qgpgme/dataprovider.cpp b/libtdenetwork/qgpgme/dataprovider.cpp index 052b84c48..a37684d0d 100644 --- a/libtdenetwork/qgpgme/dataprovider.cpp +++ b/libtdenetwork/qgpgme/dataprovider.cpp @@ -30,7 +30,7 @@ static bool resizeAndInit( TQByteArray & ba, size_t newSize ) { const size_t oldSize = ba.size(); - bool ok = ba.tqresize( newSize ); + bool ok = ba.resize( newSize ); if ( ok ) memset( ba.data() + oldSize, 0, newSize - oldSize ); return ok; diff --git a/libtdepim/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..35c80b7a1 100644 --- a/libtdepim/addresseelineedit.cpp +++ b/libtdepim/addresseelineedit.cpp @@ -57,7 +57,7 @@ #include <tqregexp.h> #include <tqevent.h> #include <tqdragobject.h> -#include <tqclipboard.h> +#include <clipboard.h> using namespace KPIM; @@ -344,7 +344,7 @@ void AddresseeLineEdit::mouseReleaseEvent( TQMouseEvent *e ) { // reimplemented from TQLineEdit::mouseReleaseEvent() if ( m_useCompletion - && TQApplication::tqclipboard()->supportsSelection() + && TQApplication::clipboard()->supportsSelection() && !isReadOnly() && e->button() == Qt::MidButton ) { m_smartPaste = true; @@ -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..006e4591b 100644 --- a/libtdepim/addresseeselector.cpp +++ b/libtdepim/addresseeselector.cpp @@ -21,7 +21,7 @@ #include <tqheader.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqsignalmapper.h> #include <tqtoolbutton.h> @@ -267,7 +267,7 @@ void AddresseeSelector::init() void AddresseeSelector::initGUI() { - TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3, KDialog::marginHint(), KDialog::spacingHint() ); + TQGridLayout *layout = new TQGridLayout( this, 2, 3, KDialog::marginHint(), KDialog::spacingHint() ); TQGridLayout *topLayout = new TQGridLayout( this, 2, 2, KDialog::marginHint() ); TQLabel *label = new TQLabel( i18n( "Address book:" ), this ); @@ -284,7 +284,7 @@ void AddresseeSelector::initGUI() topLayout->setColStretch( 1, 1 ); - tqlayout->addMultiCellLayout( topLayout, 0, 0, 0, 2 ); + layout->addMultiCellLayout( topLayout, 0, 0, 0, 2 ); int row = 1; @@ -303,8 +303,8 @@ void AddresseeSelector::initGUI() mRemoveMapper->setMapping( TQT_TQOBJECT(listView), i ); TQVBoxLayout *buttonLayout = new TQVBoxLayout( this ); - buttonLayout->tqsetAlignment( TQt::AlignBottom ); - tqlayout->addLayout( buttonLayout, row, 1 ); + buttonLayout->setAlignment( TQt::AlignBottom ); + layout->addLayout( buttonLayout, row, 1 ); // move button TQToolButton *moveButton = new TQToolButton( this ); @@ -327,7 +327,7 @@ void AddresseeSelector::initGUI() buttonLayout->addWidget( moveButton ); buttonLayout->addWidget( removeButton ); - tqlayout->addWidget( listView, row, 2 ); + layout->addWidget( listView, row, 2 ); } mAddresseeView = new KListView( this ); @@ -335,7 +335,7 @@ void AddresseeSelector::initGUI() mAddresseeView->header()->hide(); mAddresseeView->setFullWidth( true ); - tqlayout->addMultiCellWidget( mAddresseeView, 1, row, 0, 0 ); + layout->addMultiCellWidget( mAddresseeView, 1, row, 0, 0 ); } void AddresseeSelector::finish() @@ -565,9 +565,9 @@ AddresseeSelectorDialog::AddresseeSelectorDialog( Selection *selection, : KDialogBase( Plain, "", Ok | Cancel, Ok, parent, name, true ) { TQFrame *frame = plainPage(); - TQVBoxLayout *tqlayout = new TQVBoxLayout( frame ); + TQVBoxLayout *layout = new TQVBoxLayout( frame ); mSelector = new KPIM::AddresseeSelector( selection, frame ); - tqlayout->addWidget( mSelector ); + layout->addWidget( mSelector ); resize( 500, 490 ); } diff --git a/libtdepim/addresseeview.cpp b/libtdepim/addresseeview.cpp index 15c7215ed..b3bccffad 100644 --- a/libtdepim/addresseeview.cpp +++ b/libtdepim/addresseeview.cpp @@ -151,27 +151,27 @@ void AddresseeView::enableLinks( int linkMask ) TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *proxy, LinkMask linkMask, bool internalLoading, FieldMask fieldMask ) { - TQString image = TQString( "contact_%1_image" ).tqarg( addr.uid() ); + TQString image = TQString( "contact_%1_image" ).arg( addr.uid() ); // Style strings from Gentix; this is just an initial version. // - // These will be substituted into various HTML strings with .tqarg(). + // These will be substituted into various HTML strings with .arg(). // Search for @STYLE@ to find where. Note how we use %1 as a // placeholder where we fill in something else (in this case, // the global background color). // 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); + "background: %1;\"").arg(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( + "background: %1;\"").arg(backgroundColor2); + 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>" @@ -216,8 +216,8 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr if ( date.isValid() ) dynamicPart += rowFmtStr - .tqarg( KABC::Addressee::birthdayLabel() ) - .tqarg( KGlobal::locale()->formatDate( date, true ) ); + .arg( KABC::Addressee::birthdayLabel() ) + .arg( KGlobal::locale()->formatDate( date, true ) ); } if ( fieldMask & PhoneFields ) { @@ -228,22 +228,22 @@ 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; if ( (*phoneIt).type() & KABC::PhoneNumber::Cell ) - smsURL = TQString(" (<a href=\"sms:%1\">%2</a>)" ).tqarg( number ).tqarg( i18n( "SMS") ); + smsURL = TQString(" (<a href=\"sms:%1\">%2</a>)" ).arg( number ).arg( i18n( "SMS") ); dynamicPart += rowFmtStr - .tqarg( (*phoneIt).typeLabel().replace( " ", " " ) ) - .tqarg( TQString::tqfromLatin1( "<a href=\"%1\">%2</a>%3" ).tqarg( url ).tqarg( number ).tqarg( smsURL ) ); + .arg( (*phoneIt).typeLabel().replace( " ", " " ) ) + .arg( TQString::fromLatin1( "<a href=\"%1\">%2</a>%3" ).arg( url ).arg( number ).arg( smsURL ) ); } else { dynamicPart += rowFmtStr - .tqarg( (*phoneIt).typeLabel().replace( " ", " " ) ) - .tqarg( number ); + .arg( (*phoneIt).typeLabel().replace( " ", " " ) ) + .arg( number ); } } } @@ -257,11 +257,11 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr TQUrl::encode( fullEmail ); if ( linkMask & EmailLinks ) { - dynamicPart += rowFmtStr.tqarg( type ) - .tqarg( TQString::tqfromLatin1( "<a href=\"mailto:%1\">%2</a>" ) - .tqarg( fullEmail, TQStyleSheet::escape( *emailIt ) ) ); + dynamicPart += rowFmtStr.arg( type ) + .arg( TQString::fromLatin1( "<a href=\"mailto:%1\">%2</a>" ) + .arg( fullEmail, TQStyleSheet::escape( *emailIt ) ) ); } else { - dynamicPart += rowFmtStr.tqarg( type ).tqarg( *emailIt ); + dynamicPart += rowFmtStr.arg( type ).arg( *emailIt ); } } } @@ -276,7 +276,7 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr } else { url = addr.url().prettyURL(); } - dynamicPart += rowFmtStr.tqarg( i18n("Homepage") ).tqarg( url ); + dynamicPart += rowFmtStr.arg( i18n("Homepage") ).arg( url ); } TQString blog = addr.custom( "KADDRESSBOOK", "BlogFeed" ); @@ -284,7 +284,7 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr if ( linkMask & URLLinks ) { blog = KStringHandler::tagURLs( blog ); } - dynamicPart += rowFmtStr.tqarg( i18n("Blog Feed") ).tqarg( blog ); + dynamicPart += rowFmtStr.arg( i18n("Blog Feed") ).arg( blog ); } } @@ -303,12 +303,12 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr if ( linkMask & AddressLinks ) { dynamicPart += rowFmtStr - .tqarg( KABC::Address::typeLabel( (*addrIt).type() ) ) - .tqarg( link ); + .arg( KABC::Address::typeLabel( (*addrIt).type() ) ) + .arg( link ); } else { dynamicPart += rowFmtStr - .tqarg( KABC::Address::typeLabel( (*addrIt).type() ) ) - .tqarg( formattedAddress ); + .arg( KABC::Address::typeLabel( (*addrIt).type() ) ) + .arg( formattedAddress ); } } else { TQString link = "<a href=\"addr:" + (*addrIt).id() + "\">" + @@ -316,12 +316,12 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr if ( linkMask & AddressLinks ) { dynamicPart += rowFmtStr - .tqarg( KABC::Address::typeLabel( (*addrIt).type() ) ) - .tqarg( link ); + .arg( KABC::Address::typeLabel( (*addrIt).type() ) ) + .arg( link ); } else { dynamicPart += rowFmtStr - .tqarg( KABC::Address::typeLabel( (*addrIt).type() ) ) - .tqarg( (*addrIt).label().replace( '\n', "<br>" ) ); + .arg( KABC::Address::typeLabel( (*addrIt).type() ) ) + .arg( (*addrIt).label().replace( '\n', "<br>" ) ); } } } @@ -333,7 +333,7 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr // the data afterwards (keeps us safe from possible % signs // in either one). notes = TQStyleSheet::escape( addr.note() ); - notes = rowFmtStr.tqarg( i18n( "Notes" ) ).tqarg( notes.replace( '\n', "<br>" ) ) ; + notes = rowFmtStr.arg( i18n( "Notes" ) ).arg( notes.replace( '\n', "<br>" ) ) ; } TQString customData; @@ -371,7 +371,7 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr if ( keyIt != titleMap.end() ) key = keyIt.data(); - customData += rowFmtStr.tqarg( key ).tqarg( TQStyleSheet::escape( value ) ) ; + customData += rowFmtStr.arg( key ).arg( TQStyleSheet::escape( value ) ) ; } } } @@ -385,7 +385,7 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr const TQString imAddress = addr.custom( "KADDRESSBOOK", "X-IMAddress" ); if ( !imAddress.isEmpty() ) { - customData += rowFmtStr.tqarg( i18n( "IM Address" ) ).tqarg( TQStyleSheet::escape( imAddress ) ) ; + customData += rowFmtStr.arg( i18n( "IM Address" ) ).arg( TQStyleSheet::escape( imAddress ) ) ; } if ( proxy ) { @@ -393,24 +393,24 @@ 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").arg( 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( imgSrc ) - .tqarg( proxy->presenceString( addr.uid() ) ) + .arg( i18n( "Presence" ) ) + .arg( imStatus + .arg( imgSrc ) + .arg( 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); + "<tr>").arg(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( + .arg( cellStyle ) ); + strAddr.append( TQString::fromLatin1( "<img src=\"%1\" width=\"50\" vspace=\"1\">" // image "</td>") - .tqarg( image ) ); - strAddr.append( TQString::tqfromLatin1( + .arg( image ) ); + strAddr.append( TQString::fromLatin1( "<td align=\"left\" width=\"70%\" %2>") - .tqarg( cellStyle2 ) ); - strAddr.append( TQString::tqfromLatin1( + .arg( cellStyle2 ) ); + strAddr.append( TQString::fromLatin1( "<font size=\"+2\"><b>%2</b></font></td>" // name "</tr>") - .tqarg( name ) ); - strAddr.append( TQString::tqfromLatin1( + .arg( name ) ); + strAddr.append( TQString::fromLatin1( "<tr>" "<td align=\"left\" width=\"70%\" %2>") - .tqarg( cellStyle2 ) ); - strAddr.append( TQString::tqfromLatin1( + .arg( cellStyle2 ) ); + strAddr.append( TQString::fromLatin1( "%3</td>" // role "</tr>") - .tqarg( role ) ); - strAddr.append( TQString::tqfromLatin1( + .arg( role ) ); + strAddr.append( TQString::fromLatin1( "<tr>" "<td align=\"left\" width=\"70%\" %2>") - .tqarg( cellStyle2 ) ); - strAddr.append( TQString::tqfromLatin1( + .arg( cellStyle2 ) ); + strAddr.append( TQString::fromLatin1( "%4</td>" // organization "</tr>") - .tqarg( organization ) ); - strAddr.append( TQString::tqfromLatin1( + .arg( organization ) ); + strAddr.append( TQString::fromLatin1( "<tr><td %2>") - .tqarg( cellStyle ) ); - strAddr.append( TQString::tqfromLatin1( + .arg( cellStyle ) ); + strAddr.append( TQString::fromLatin1( " </td><td %2> </td></tr>") - .tqarg( cellStyle2 ) ); + .arg( 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(); @@ -476,7 +476,7 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr if ( !label.isEmpty() ) addrBookName = label; } - strAddr.append( i18n( "<p><b>Address book</b>: %1</p>" ).tqarg( addrBookName ) ); + strAddr.append( i18n( "<p><b>Address book</b>: %1</p>" ).arg( addrBookName ) ); } return strAddr; } @@ -526,17 +526,17 @@ 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 "</body>" "</html>" ) - .tqarg( KGlobalSettings::textColor().name() ) - .tqarg( KGlobalSettings::baseColor().name() ) - .tqarg( strAddr ); + .arg( KGlobalSettings::textColor().name() ) + .arg( KGlobalSettings::baseColor().name() ) + .arg( strAddr ); - TQString imageURL = TQString( "contact_%1_image" ).tqarg( mAddressee.uid() ); + TQString imageURL = TQString( "contact_%1_image" ).arg( mAddressee.uid() ); KABC::Picture picture = mAddressee.photo(); if ( picture.isIntern() && !picture.data().isNull() ) @@ -690,27 +690,27 @@ void AddresseeView::slotHighlighted( const TQString &link ) TQString email = link.mid( 7 ); emit emailHighlighted( email ); - emit highlightedMessage( i18n( "Send mail to '%1'" ).tqarg( email ) ); + emit highlightedMessage( i18n( "Send mail to '%1'" ).arg( email ) ); } else if ( link.startsWith( "phone:" ) ) { TQString number = link.mid( 8 ); emit phoneNumberHighlighted( strippedNumber( number ) ); - emit highlightedMessage( i18n( "Call number %1" ).tqarg( number ) ); + emit highlightedMessage( i18n( "Call number %1" ).arg( number ) ); } else if ( link.startsWith( "fax:" ) ) { TQString number = link.mid( 6 ); emit faxNumberHighlighted( strippedNumber( number ) ); - emit highlightedMessage( i18n( "Send fax to %1" ).tqarg( number ) ); + emit highlightedMessage( i18n( "Send fax to %1" ).arg( number ) ); } else if ( link.startsWith( "addr:" ) ) { emit highlightedMessage( i18n( "Show address on map" ) ); } else if ( link.startsWith( "sms:" ) ) { TQString number = link.mid( 6 ); - emit highlightedMessage( i18n( "Send SMS to %1" ).tqarg( number ) ); + emit highlightedMessage( i18n( "Send SMS to %1" ).arg( number ) ); } else if ( link.startsWith( "http:" ) || link.startsWith( "https:" ) ) { emit urlHighlighted( link ); - emit highlightedMessage( i18n( "Open URL %1" ).tqarg( link ) ); + emit highlightedMessage( i18n( "Open URL %1" ).arg( link ) ); } else if ( link.startsWith( "im:" ) ) { - emit highlightedMessage( i18n( "Chat with %1" ).tqarg( mAddressee.realName() ) ); + emit highlightedMessage( i18n( "Chat with %1" ).arg( mAddressee.realName() ) ); } else emit highlightedMessage( "" ); } diff --git a/libtdepim/addressesdialog.cpp b/libtdepim/addressesdialog.cpp index a8d993bf8..0a9e1ab0c 100644 --- a/libtdepim/addressesdialog.cpp +++ b/libtdepim/addressesdialog.cpp @@ -53,7 +53,7 @@ #include <kstandarddirs.h> #include <tqdict.h> -#include <tqlayout.h> +#include <layout.h> #include <tqvbox.h> #include <tqwidget.h> @@ -912,7 +912,7 @@ AddressesDialog::saveAs() KMessageBox::information( 0, i18n( "<qt>Distribution list with the given name <b>%1</b> " "already exists. Please select a different name.</qt>" ) - .tqarg( name ) ); + .arg( name ) ); return; } diff --git a/libtdepim/addresspicker.ui b/libtdepim/addresspicker.ui index fc88d52a0..8469730a4 100644 --- a/libtdepim/addresspicker.ui +++ b/libtdepim/addresspicker.ui @@ -66,7 +66,7 @@ </widget> <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <vbox> <property name="name"> @@ -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> @@ -181,7 +181,7 @@ <property name="text"> <string>&Selected Addresses</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignCenter</set> </property> <property name="buddy" stdset="0"> @@ -200,7 +200,7 @@ <property name="text"> <string>&Address Book</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignCenter</set> </property> <property name="buddy" stdset="0"> @@ -209,7 +209,7 @@ </widget> <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> diff --git a/libtdepim/broadcaststatus.cpp b/libtdepim/broadcaststatus.cpp index 1c1613795..a9e8a207a 100644 --- a/libtdepim/broadcaststatus.cpp +++ b/libtdepim/broadcaststatus.cpp @@ -57,9 +57,9 @@ void BroadcastStatus::seStatusMsgWithTimestamp( const TQString& message ) { KLocale* locale = KGlobal::locale(); seStatusMsg( i18n( "%1 is a time, %2 is a status message", "[%1] %2" ) - .tqarg( locale->formatTime( TQTime::currentTime(), + .arg( locale->formatTime( TQTime::currentTime(), true /* with seconds */ ) ) - .tqarg( message ) ); + .arg( message ) ); } void BroadcastStatus::seStatusMsgTransmissionCompleted( int numMessages, @@ -78,13 +78,13 @@ void BroadcastStatus::seStatusMsgTransmissionCompleted( int numMessages, "Transmission complete. %n new messages in %1 KB " "(%2 KB remaining on the server).", numMessages ) - .tqarg( numBytesRead / 1024 ) - .tqarg( numBytes / 1024 ); + .arg( numBytesRead / 1024 ) + .arg( numBytes / 1024 ); else statusMsg = i18n( "Transmission complete. %n message in %1 KB.", "Transmission complete. %n messages in %1 KB.", numMessages ) - .tqarg( numBytesRead / 1024 ); + .arg( numBytesRead / 1024 ); } else statusMsg = i18n( "Transmission complete. %n new message.", @@ -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, @@ -118,17 +118,17 @@ void BroadcastStatus::seStatusMsgTransmissionCompleted( const TQString& account, "%n new messages in %1 KB " "(%2 KB remaining on the server).", numMessages ) - .tqarg( numBytesRead / 1024 ) - .tqarg( numBytes / 1024 ) - .tqarg( account ); + .arg( numBytesRead / 1024 ) + .arg( numBytes / 1024 ) + .arg( account ); else statusMsg = i18n( "Transmission for account %2 complete. " "%n message in %1 KB.", "Transmission for account %2 complete. " "%n messages in %1 KB.", numMessages ) - .tqarg( numBytesRead / 1024 ) - .tqarg( account ); + .arg( numBytesRead / 1024 ) + .arg( account ); } else statusMsg = i18n( "Transmission for account %1 complete. " @@ -136,15 +136,15 @@ void BroadcastStatus::seStatusMsgTransmissionCompleted( const TQString& account, "Transmission for account %1 complete. " "%n new messages.", numMessages ) - .tqarg( account ); + .arg( account ); } else statusMsg = i18n( "Transmission for account %1 complete. No new messages.") - .tqarg( account ); + .arg( account ); seStatusMsgWithTimestamp( statusMsg ); if ( item ) - item->setqStatus( statusMsg ); + item->seStatus( statusMsg ); } void BroadcastStatus::setTransienStatusMsg( const TQString& msg ) diff --git a/libtdepim/categoryeditdialog.cpp b/libtdepim/categoryeditdialog.cpp index 72e1de8ae..6c4afef6e 100644 --- a/libtdepim/categoryeditdialog.cpp +++ b/libtdepim/categoryeditdialog.cpp @@ -23,7 +23,7 @@ #include <tqstringlist.h> #include <tqlineedit.h> #include <tqlistview.h> -#include <tqlayout.h> +#include <layout.h> #include <tqheader.h> #include <tqpushbutton.h> #include <klocale.h> @@ -66,23 +66,23 @@ CategoryEditDialog::CategoryEditDialog( KPimPrefs *prefs, TQWidget* parent, TQWidget *widget = new TQWidget( this ); setMainWidget( widget ); - TQGridLayout *tqlayout = new TQGridLayout( widget, 4, 2, marginHint(), spacingHint() ); + TQGridLayout *layout = new TQGridLayout( widget, 4, 2, marginHint(), spacingHint() ); d->mView = new TQListView( widget ); d->mView->addColumn( "" ); d->mView->header()->hide(); d->mView->setDefaultRenameAction( TQListView::Accept ); - tqlayout->addMultiCellWidget( d->mView, 0, 3, 0, 0 ); + layout->addMultiCellWidget( d->mView, 0, 3, 0, 0 ); d->mAddButton = new TQPushButton( i18n( "Add" ), widget ); - tqlayout->addWidget( d->mAddButton, 0, 1 ); + layout->addWidget( d->mAddButton, 0, 1 ); d->mEditButton = new TQPushButton( i18n( "Edit" ), widget ); - tqlayout->addWidget( d->mEditButton, 1, 1 ); + layout->addWidget( d->mEditButton, 1, 1 ); d->mDeleteButton = new TQPushButton( i18n( "Remove" ), widget ); - tqlayout->addWidget( d->mDeleteButton, 2, 1 ); + layout->addWidget( d->mDeleteButton, 2, 1 ); fillList(); diff --git a/libtdepim/categoryeditdialog_base.ui b/libtdepim/categoryeditdialog_base.ui index 11cd98740..9064bce3d 100644 --- a/libtdepim/categoryeditdialog_base.ui +++ b/libtdepim/categoryeditdialog_base.ui @@ -54,7 +54,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>tqlayout103</cstring> + <cstring>layout103</cstring> </property> <vbox> <property name="name"> @@ -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/clicklineedit.cpp b/libtdepim/clicklineedit.cpp index 28e66a0ba..352b26795 100644 --- a/libtdepim/clicklineedit.cpp +++ b/libtdepim/clicklineedit.cpp @@ -39,13 +39,13 @@ ClickLineEdit::~ClickLineEdit() {} void ClickLineEdit::setClickMessage( const TQString &msg ) { mClickMessage = msg; - tqrepaint(); + repaint(); } void ClickLineEdit::setText( const TQString &txt ) { mDrawClickMsg = txt.isEmpty(); - tqrepaint(); + repaint(); KLineEdit::setText( txt ); } @@ -67,7 +67,7 @@ void ClickLineEdit::focusInEvent( TQFocusEvent *ev ) if ( mDrawClickMsg == true ) { mDrawClickMsg = false; - tqrepaint(); + repaint(); } TQLineEdit::focusInEvent( ev ); } @@ -77,7 +77,7 @@ void ClickLineEdit::focusOutEvent( TQFocusEvent *ev ) if ( text().isEmpty() ) { mDrawClickMsg = true; - tqrepaint(); + repaint(); } TQLineEdit::focusOutEvent( ev ); } diff --git a/libtdepim/completionordereditor.cpp b/libtdepim/completionordereditor.cpp index 0ee36a290..68339f9e1 100644 --- a/libtdepim/completionordereditor.cpp +++ b/libtdepim/completionordereditor.cpp @@ -88,7 +88,7 @@ class LDAPCompletionItem : public CompletionItem { public: LDAPCompletionItem( LdapClient* ldapClient ) : mLdapClient( ldapClient ) {} - virtual TQString label() const { return i18n( "LDAP server %1" ).tqarg( mLdapClient->server().host() ); } + virtual TQString label() const { return i18n( "LDAP server %1" ).arg( mLdapClient->server().host() ); } virtual int completionWeight() const { return mLdapClient->completionWeight(); } virtual void save( CompletionOrderEditor* ); protected: @@ -102,7 +102,7 @@ void LDAPCompletionItem::save( CompletionOrderEditor* ) { KConfig * config = LdapSearch::config(); config->setGroup( "LDAP" ); - config->writeEntry( TQString( "SelectedCompletionWeight%1" ).tqarg( mLdapClient->clientNumber() ), + config->writeEntry( TQString( "SelectedCompletionWeight%1" ).arg( mLdapClient->clientNumber() ), mWeight ); config->sync(); } @@ -141,7 +141,7 @@ public: KABCImapSubResCompletionItem( ResourceABC* resource, const TQString& subResource ) : mResource( resource ), mSubResource( subResource ), mWeight( completionWeight() ) {} virtual TQString label() const { - return TQString( "%1 %2" ).tqarg( mResource->resourceName() ).tqarg( mResource->subresourceLabel( mSubResource ) ); + return TQString( "%1 %2" ).arg( mResource->resourceName() ).arg( mResource->subresourceLabel( mSubResource ) ); } virtual int completionWeight() const { return mResource->subresourceCompletionWeight( mSubResource ); diff --git a/libtdepim/csshelper.cpp b/libtdepim/csshelper.cpp index 05f20e390..d773c7d66 100644 --- a/libtdepim/csshelper.cpp +++ b/libtdepim/csshelper.cpp @@ -73,10 +73,10 @@ namespace KPIM { mMetrics( pdm ) { // initialize with defaults - should match the corresponding application defaults - mForegroundColor = TQApplication::tqpalette().active().text(); + mForegroundColor = TQApplication::palette().active().text(); mLinkColor = KGlobalSettings::linkColor(); mVisitedLinkColor = KGlobalSettings::visitedLinkColor(); - mBackgroundColor = TQApplication::tqpalette().active().base(); + mBackgroundColor = TQApplication::palette().active().base(); cHtmlWarning = TQColor( 0xFF, 0x40, 0x40 ); // warning frame color: light red cPgpEncrH = TQColor( 0x00, 0x80, 0xFF ); // light blue @@ -184,9 +184,9 @@ namespace KPIM { ? level % numQuoteLevels + 1 : kMin( level + 1, numQuoteLevels ) ; if ( level >= numQuoteLevels ) - return TQString( "<div class=\"deepquotelevel%1\">" ).tqarg( effectiveLevel ); + return TQString( "<div class=\"deepquotelevel%1\">" ).arg( effectiveLevel ); else - return TQString( "<div class=\"quotelevel%1\">" ).tqarg( effectiveLevel ); + return TQString( "<div class=\"quotelevel%1\">" ).arg( effectiveLevel ); } TQString CSSHelper::nonQuotedFontTag() const { @@ -214,9 +214,9 @@ namespace KPIM { TQString CSSHelper::printCssDefinitions( bool fixed ) const { const TQString headerFont = TQString( " font-family: \"%1\" ! important;\n" " font-size: %2pt ! important;\n" ) - .tqarg( mPrintFont.family() ) - .tqarg( mPrintFont.pointSize() ); - const TQColorGroup & cg = TQApplication::tqpalette().active(); + .arg( mPrintFont.family() ) + .arg( mPrintFont.pointSize() ); + const TQColorGroup & cg = TQApplication::palette().active(); const TQFont printFont = bodyFont( fixed, true /* print */ ); TQString quoteCSS; @@ -234,7 +234,7 @@ namespace KPIM { " color: #000000 ! important;\n" " background-color: #ffffff ! important\n" "}\n\n" ) - .tqarg( printFont.family(), + .arg( printFont.family(), TQString::number( printFont.pointSize() ) ) + TQString( "tr.textAtmH,\n" @@ -288,7 +288,7 @@ namespace KPIM { " display:none ! important;\n" "}\n\n" ) - .tqarg( headerFont, + .arg( headerFont, cg.background().name(), cg.foreground().name() ) + quoteCSS; @@ -300,15 +300,15 @@ namespace KPIM { const TQString linkColor = mLinkColor.name(); const TQString headerFont = TQString(" font-family: \"%1\" ! important;\n" " font-size: %2px ! important;\n") - .tqarg( mBodyFont.family() ) - .tqarg( pointsToPixel( helper->mMetrics, mBodyFont.pointSize() ) ); + .arg( mBodyFont.family() ) + .arg( pointsToPixel( helper->mMetrics, mBodyFont.pointSize() ) ); const TQString background = ( mBackingPixmapOn ? TQString( " background-image:url(file://%1) ! important;\n" ) - .tqarg( mBackingPixmapStr ) + .arg( mBackingPixmapStr ) : TQString( " background-color: %1 ! important;\n" ) - .tqarg( bgColor ) ); + .arg( bgColor ) ); const TQString bodyFontSize = TQString::number( pointsToPixel( helper->mMetrics, fontSize( fixed ) ) ) + "px" ; - const TQColorGroup & cg = TQApplication::tqpalette().active(); + const TQColorGroup & cg = TQApplication::palette().active(); TQString quoteCSS; if ( bodyFont( fixed ).italic() ) @@ -322,13 +322,13 @@ namespace KPIM { for ( int i = 0 ; i < 3 ; ++i ) { quoteCSS += TQString( "div.quotelevel%1 {\n" " color: %2 ! important;\n" ) - .tqarg( TQString::number(i+1), mQuoteColor[i].name() ); + .arg( TQString::number(i+1), mQuoteColor[i].name() ); if ( mQuoteFont[i].italic() ) quoteCSS += " font-style: italic ! important;\n"; if ( mQuoteFont[i].bold() ) 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"; } @@ -337,7 +337,7 @@ namespace KPIM { for ( int i = 0 ; i < 3 ; ++i ) { quoteCSS += TQString( "div.deepquotelevel%1 {\n" " color: %2 ! important;\n" ) - .tqarg( TQString::number(i+1), mQuoteColor[i].name() ); + .arg( TQString::number(i+1), mQuoteColor[i].name() ); if ( mQuoteFont[i].italic() ) quoteCSS += " font-style: italic ! important;\n"; if ( mQuoteFont[i].bold() ) @@ -354,7 +354,7 @@ namespace KPIM { " color: %3 ! important;\n" "%4" "}\n\n" ) - .tqarg( bodyFont( fixed ).family(), + .arg( bodyFont( fixed ).family(), bodyFontSize, fgColor, background ) @@ -392,7 +392,7 @@ namespace KPIM { "tr.rfc822H {\n" "%4" "}\n\n" ) - .tqarg( linkColor, fgColor, bgColor, headerFont ) + .arg( linkColor, fgColor, bgColor, headerFont ) + TQString( "table.encr {\n" " background-color: %1 ! important;\n" @@ -404,7 +404,7 @@ namespace KPIM { "}\n\n" "tr.encrB { background-color: %4 ! important; }\n\n" ) - .tqarg( cPgpEncrF.name(), + .arg( cPgpEncrF.name(), cPgpEncrH.name(), headerFont, cPgpEncrB.name() ) @@ -419,7 +419,7 @@ namespace KPIM { "}\n\n" "tr.signOkKeyOkB { background-color: %4 ! important; }\n\n" ) - .tqarg( cPgpOk1F.name(), + .arg( cPgpOk1F.name(), cPgpOk1H.name(), headerFont, cPgpOk1B.name() ) @@ -434,7 +434,7 @@ namespace KPIM { "}\n\n" "tr.signOkKeyBadB { background-color: %4 ! important; }\n\n" ) - .tqarg( cPgpOk0F.name(), + .arg( cPgpOk0F.name(), cPgpOk0H.name(), headerFont, cPgpOk0B.name() ) @@ -449,7 +449,7 @@ namespace KPIM { "}\n\n" "tr.signWarnB { background-color: %4 ! important; }\n\n" ) - .tqarg( cPgpWarnF.name(), + .arg( cPgpWarnF.name(), cPgpWarnH.name(), headerFont, cPgpWarnB.name() ) @@ -464,7 +464,7 @@ namespace KPIM { "}\n\n" "tr.signErrB { background-color: %4 ! important; }\n\n" ) - .tqarg( cPgpErrF.name(), + .arg( cPgpErrF.name(), cPgpErrH.name(), headerFont, cPgpErrB.name() ) @@ -472,7 +472,7 @@ namespace KPIM { TQString( "div.htmlWarn {\n" " border: 2px solid %1 ! important;\n" "}\n\n" ) - .tqarg( cHtmlWarning.name() ) + .arg( cHtmlWarning.name() ) + TQString( "div.header {\n" "%1" @@ -519,12 +519,12 @@ namespace KPIM { "}\n\n" ) - .tqarg( headerFont ) - .tqarg( cg.highlight().name(), + .arg( headerFont ) + .arg( cg.highlight().name(), cg.highlightedText().name(), cg.foreground().name(), cg.background().name() ) - .tqarg( cg.mid().name() ) + .arg( cg.mid().name() ) + quoteCSS; } diff --git a/libtdepim/designerfields.cpp b/libtdepim/designerfields.cpp index 1a07655f7..8ead24b98 100644 --- a/libtdepim/designerfields.cpp +++ b/libtdepim/designerfields.cpp @@ -23,11 +23,11 @@ #include <tqcheckbox.h> #include <tqcombobox.h> #include <tqdatetimeedit.h> -#include <tqlayout.h> +#include <layout.h> #include <tqobjectlist.h> #include <tqspinbox.h> #include <tqregexp.h> -#include <tqtextedit.h> +#include <textedit.h> #include <tqwidgetfactory.h> #include <kdatepicker.h> @@ -50,7 +50,7 @@ DesignerFields::DesignerFields( const TQString &uiFile, TQWidget *parent, void DesignerFields::initGUI( const TQString &uiFile ) { - TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); + TQVBoxLayout *layout = new TQVBoxLayout( this ); TQWidget *wdg = TQWidgetFactory::create( uiFile, 0, this ); if ( !wdg ) { @@ -61,7 +61,7 @@ void DesignerFields::initGUI( const TQString &uiFile ) mTitle = wdg->caption(); mIdentifier = wdg->name(); - tqlayout->addWidget( wdg ); + layout->addWidget( wdg ); TQObjectList *list = wdg->queryList( TQWIDGET_OBJECT_NAME_STRING ); TQObjectListIt it( *list ); @@ -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/embeddedurlpage.cpp b/libtdepim/embeddedurlpage.cpp index 3971bf367..fa5eea89d 100644 --- a/libtdepim/embeddedurlpage.cpp +++ b/libtdepim/embeddedurlpage.cpp @@ -27,7 +27,7 @@ #include <kparts/part.h> #include <kmimetype.h> #include <klocale.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> using namespace KPIM; @@ -41,9 +41,9 @@ EmbeddedURLPage::EmbeddedURLPage( const TQString &url, const TQString &mimetype, void EmbeddedURLPage::initGUI( const TQString &url, const TQString &/*mimetype*/ ) { - TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); - tqlayout->setAutoAdd( true ); - new TQLabel( i18n("Showing URL %1").tqarg( url ), this ); + TQVBoxLayout *layout = new TQVBoxLayout( this ); + layout->setAutoAdd( true ); + new TQLabel( i18n("Showing URL %1").arg( url ), this ); } void EmbeddedURLPage::loadContents() diff --git a/libtdepim/htmldiffalgodisplay.cpp b/libtdepim/htmldiffalgodisplay.cpp index 726854e4e..4be6b6cde 100644 --- a/libtdepim/htmldiffalgodisplay.cpp +++ b/libtdepim/htmldiffalgodisplay.cpp @@ -45,13 +45,13 @@ void HTMLDiffAlgoDisplay::begin() mText.append( "<html>" ); mText.append( TQString( "<body text=\"%1\" bgcolor=\"%2\">" ) - .tqarg( KGlobalSettings::textColor().name() ) - .tqarg( KGlobalSettings::baseColor().name() ) ); + .arg( KGlobalSettings::textColor().name() ) + .arg( KGlobalSettings::baseColor().name() ) ); mText.append( "<center><table>" ); mText.append( TQString( "<tr><th></th><th align=\"center\">%1</th><td> </td><th align=\"center\">%2</th></tr>" ) - .tqarg( mLeftTitle ) - .tqarg( mRightTitle ) ); + .arg( mLeftTitle ) + .arg( mRightTitle ) ); } void HTMLDiffAlgoDisplay::end() @@ -76,22 +76,22 @@ void HTMLDiffAlgoDisplay::setRightSourceTitle( const TQString &title ) void HTMLDiffAlgoDisplay::additionalLeftField( const TQString &id, const TQString &value ) { mText.append( TQString( "<tr><td align=\"right\"><b>%1:</b></td><td bgcolor=\"#9cff83\">%2</td><td></td><td></td></tr>" ) - .tqarg( id ) - .tqarg( textToHTML( value ) ) ); + .arg( id ) + .arg( textToHTML( value ) ) ); } void HTMLDiffAlgoDisplay::additionalRightField( const TQString &id, const TQString &value ) { mText.append( TQString( "<tr><td align=\"right\"><b>%1:</b></td><td></td><td></td><td bgcolor=\"#9cff83\">%2</td></tr>" ) - .tqarg( id ) - .tqarg( textToHTML( value ) ) ); + .arg( id ) + .arg( textToHTML( value ) ) ); } void HTMLDiffAlgoDisplay::conflictField( const TQString &id, const TQString &leftValue, const TQString &rightValue ) { mText.append( TQString( "<tr><td align=\"right\"><b>%1:</b></td><td bgcolor=\"#ff8686\">%2</td><td></td><td bgcolor=\"#ff8686\">%3</td></tr>" ) - .tqarg( id ) - .tqarg( textToHTML( leftValue ) ) - .tqarg( textToHTML( rightValue ) ) ); + .arg( id ) + .arg( textToHTML( leftValue ) ) + .arg( textToHTML( rightValue ) ) ); } diff --git a/libtdepim/kaddrbook.cpp b/libtdepim/kaddrbook.cpp index 7854be1d1..230f4ef4b 100644 --- a/libtdepim/kaddrbook.cpp +++ b/libtdepim/kaddrbook.cpp @@ -74,7 +74,7 @@ void KAddrBookExternal::openEmail( const TQString &addr, TQWidget *parent ) { //TODO: Enable the better message at the next string unfreeze #if 0 TQString text = i18n("<qt>The email address <b>%1</b> cannot be " - "found in your addressbook.</qt>").tqarg( email ); + "found in your addressbook.</qt>").arg( email ); #else TQString text = email + " " + i18n( "is not in address book" ); #endif @@ -150,12 +150,12 @@ void KAddrBookExternal::addEmail( const TQString& addr, TQWidget *parent) { if ( KAddrBookExternal::addAddressee( a ) ) { TQString text = i18n("<qt>The email address <b>%1</b> was added to your " "addressbook; you can add more information to this " - "entry by opening the addressbook.</qt>").tqarg( addr ); + "entry by opening the addressbook.</qt>").arg( addr ); KMessageBox::information( parent, text, TQString(), "addedtokabc" ); } } else { TQString text = i18n("<qt>The email address <b>%1</b> is already in your " - "addressbook.</qt>").tqarg( addr ); + "addressbook.</qt>").arg( addr ); KMessageBox::information( parent, text, TQString(), "alreadyInAddressBook" ); } diff --git a/libtdepim/kcmdesignerfields.cpp b/libtdepim/kcmdesignerfields.cpp index 870d89ce2..b0baf9673 100644 --- a/libtdepim/kcmdesignerfields.cpp +++ b/libtdepim/kcmdesignerfields.cpp @@ -24,7 +24,7 @@ #include <tqimage.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqobjectlist.h> #include <tqpixmap.h> #include <tqpushbutton.h> @@ -176,7 +176,7 @@ void KCMDesignerFields::deleteFile() if ( item ) { PageItem *pageItem = static_cast<PageItem*>( item->parent() ? item->parent() : item ); if (KMessageBox::warningContinueCancel(this, - i18n( "<qt>Do you really want to delete '<b>%1</b>'?</qt>").tqarg( pageItem->text(0) ), "", KStdGuiItem::del() ) + i18n( "<qt>Do you really want to delete '<b>%1</b>'?</qt>").arg( pageItem->text(0) ), "", KStdGuiItem::del() ) == KMessageBox::Continue) KIO::NetAccess::del( pageItem->path(), 0 ); } @@ -261,7 +261,7 @@ void KCMDesignerFields::defaults() void KCMDesignerFields::initGUI() { - TQVBoxLayout *tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), + TQVBoxLayout *layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); bool noDesigner = KStandardDirs::findExe("designer").isEmpty(); @@ -272,10 +272,10 @@ void KCMDesignerFields::initGUI() i18n("<qt><b>Warning:</b> TQt Designer could not be found. It is probably not " "installed. You will only be able to import existing designer files.</qt>"); TQLabel *lbl = new TQLabel( txt, this ); - tqlayout->addWidget( lbl ); + layout->addWidget( lbl ); } - TQHBoxLayout *hbox = new TQHBoxLayout( tqlayout, KDialog::spacingHint() ); + TQHBoxLayout *hbox = new TQHBoxLayout( layout, KDialog::spacingHint() ); mPageView = new KListView( this ); mPageView->addColumn( i18n( "Available Pages" ) ); @@ -295,7 +295,7 @@ void KCMDesignerFields::initGUI() loadUiFiles(); - hbox = new TQHBoxLayout( tqlayout, KDialog::spacingHint() ); + hbox = new TQHBoxLayout( layout, KDialog::spacingHint() ); TQString cwHowto = i18n("<qt><p>This section allows you to add your own GUI" " Elements ('<i>Widgets</i>') to store your own values" @@ -316,14 +316,14 @@ void KCMDesignerFields::initGUI() "<p><b>Important:</b> The widget will edit custom fields with an" " application name of %2. To change the application name" " to be edited, set the widget name in TQt Designer.</p></qt>" ) - .tqarg( applicationName(), applicationName() ); + .arg( applicationName(), applicationName() ); KActiveLabel *activeLabel = new KActiveLabel( - i18n( "<a href=\"whatsthis:%1\">How does this work?</a>" ).tqarg(cwHowto), this ); + i18n( "<a href=\"whatsthis:%1\">How does this work?</a>" ).arg(cwHowto), this ); hbox->addWidget( activeLabel ); // ### why is this needed? Looks like a KActiveLabel bug... - activeLabel->tqsetSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Maximum ); + activeLabel->setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Maximum ); hbox->addStretch( 1 ); @@ -360,14 +360,14 @@ void KCMDesignerFields::updatePreview( TQListViewItem *item ) "<tr><td align=\"right\"><b>%5</b></td><td>%6</td></tr>" "<tr><td align=\"right\"><b>%7</b></td><td>%8</td></tr>" "</table></qt>" ) - .tqarg( i18n( "Key:" ) ) - .tqarg( item->text( 0 ).replace("X_","X-") ) - .tqarg( i18n( "Type:" ) ) - .tqarg( item->text( 1 ) ) - .tqarg( i18n( "Classname:" ) ) - .tqarg( item->text( 2 ) ) - .tqarg( i18n( "Description:" ) ) - .tqarg( item->text( 3 ) ); + .arg( i18n( "Key:" ) ) + .arg( item->text( 0 ).replace("X_","X-") ) + .arg( i18n( "Type:" ) ) + .arg( item->text( 1 ) ) + .arg( i18n( "Classname:" ) ) + .arg( item->text( 2 ) ) + .arg( i18n( "Description:" ) ) + .arg( item->text( 3 ) ); mPageDetails->setText( details ); diff --git a/libtdepim/kconfigwizard.cpp b/libtdepim/kconfigwizard.cpp index bceacd656..bf7088f96 100644 --- a/libtdepim/kconfigwizard.cpp +++ b/libtdepim/kconfigwizard.cpp @@ -28,7 +28,7 @@ #include <kapplication.h> #include <tqlistview.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtimer.h> KConfigWizard::KConfigWizard( TQWidget *parent, 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/kfileio.cpp b/libtdepim/kfileio.cpp index e167662bb..fa963e167 100644 --- a/libtdepim/kfileio.cpp +++ b/libtdepim/kfileio.cpp @@ -48,20 +48,20 @@ KDE_EXPORT TQCString kFileToString(const TQString &aFileName, bool aEnsureNL, bo if (!info.exists()) { if (aVerbose) - msgDialog(i18n("The specified file does not exist:\n%1").tqarg(aFileName)); + msgDialog(i18n("The specified file does not exist:\n%1").arg(aFileName)); return TQCString(); } if (info.isDir()) { if (aVerbose) - msgDialog(i18n("This is a folder and not a file:\n%1").tqarg(aFileName)); + msgDialog(i18n("This is a folder and not a file:\n%1").arg(aFileName)); return TQCString(); } if (!info.isReadable()) { if (aVerbose) msgDialog(i18n("You do not have read permissions " - "to the file:\n%1").tqarg(aFileName)); + "to the file:\n%1").arg(aFileName)); return TQCString(); } if (len <= 0) return TQCString(); @@ -71,13 +71,13 @@ KDE_EXPORT TQCString kFileToString(const TQString &aFileName, bool aEnsureNL, bo if (aVerbose) switch(file.status()) { case IO_ReadError: - msgDialog(i18n("Could not read file:\n%1").tqarg(aFileName)); + msgDialog(i18n("Could not read file:\n%1").arg(aFileName)); break; case IO_OpenError: - msgDialog(i18n("Could not open file:\n%1").tqarg(aFileName)); + msgDialog(i18n("Could not open file:\n%1").arg(aFileName)); break; default: - msgDialog(i18n("Error while reading file:\n%1").tqarg(aFileName)); + msgDialog(i18n("Error while reading file:\n%1").arg(aFileName)); } return TQCString(); } @@ -94,7 +94,7 @@ KDE_EXPORT TQCString kFileToString(const TQString &aFileName, bool aEnsureNL, bo if (readLen < len) { TQString msg = i18n("Could only read %1 bytes of %2.") - .tqarg(readLen).tqarg(len); + .arg(readLen).arg(len); msgDialog(msg); return TQCString(); } @@ -120,21 +120,21 @@ TQByteArray kFileToBytes(const TQString &aFileName, bool aVerbose) { if (aVerbose) msgDialog(i18n("The specified file does not exist:\n%1") - .tqarg(aFileName)); + .arg(aFileName)); return result; } if (info.isDir()) { if (aVerbose) msgDialog(i18n("This is a folder and not a file:\n%1") - .tqarg(aFileName)); + .arg(aFileName)); return result; } if (!info.isReadable()) { if (aVerbose) msgDialog(i18n("You do not have read permissions " - "to the file:\n%1").tqarg(aFileName)); + "to the file:\n%1").arg(aFileName)); return result; } if (len <= 0) return result; @@ -144,26 +144,26 @@ TQByteArray kFileToBytes(const TQString &aFileName, bool aVerbose) if (aVerbose) switch(file.status()) { case IO_ReadError: - msgDialog(i18n("Could not read file:\n%1").tqarg(aFileName)); + msgDialog(i18n("Could not read file:\n%1").arg(aFileName)); break; case IO_OpenError: - msgDialog(i18n("Could not open file:\n%1").tqarg(aFileName)); + msgDialog(i18n("Could not open file:\n%1").arg(aFileName)); break; default: - msgDialog(i18n("Error while reading file:\n%1").tqarg(aFileName)); + msgDialog(i18n("Error while reading file:\n%1").arg(aFileName)); } return result; } result.resize(len); readLen = file.readBlock(result.data(), len); - kdDebug(5300) << TQString( "len %1" ).tqarg(len) << endl; + kdDebug(5300) << TQString( "len %1" ).arg(len) << endl; if (readLen < len) { TQString msg; msg = i18n("Could only read %1 bytes of %2.") - .tqarg(readLen).tqarg(len); + .arg(readLen).arg(len); msgDialog(msg); return result; } @@ -191,7 +191,7 @@ KDE_EXPORT bool kBytesToFile(const char* aBuffer, int len, { TQString str; str = i18n("File %1 exists.\nDo you want to replace it?") - .tqarg(aFileName); + .arg(aFileName); rc = KMessageBox::warningContinueCancel(0, str, i18n("Save to File"), i18n("&Replace")); if (rc != KMessageBox::Continue) return FALSE; @@ -209,7 +209,7 @@ KDE_EXPORT bool kBytesToFile(const char* aBuffer, int len, if (!aVerbose) return FALSE; rc = KMessageBox::warningContinueCancel(0, i18n("Failed to make a backup copy of %1.\nContinue anyway?") - .tqarg(aFileName), + .arg(aFileName), i18n("Save to File"), KStdGuiItem::save() ); if (rc != KMessageBox::Continue) return FALSE; } @@ -221,14 +221,14 @@ KDE_EXPORT bool kBytesToFile(const char* aBuffer, int len, if (aVerbose) switch(file.status()) { case IO_WriteError: - msgDialog(i18n("Could not write to file:\n%1").tqarg(aFileName)); + msgDialog(i18n("Could not write to file:\n%1").arg(aFileName)); break; case IO_OpenError: msgDialog(i18n("Could not open file for writing:\n%1") - .tqarg(aFileName)); + .arg(aFileName)); break; default: - msgDialog(i18n("Error while writing file:\n%1").tqarg(aFileName)); + msgDialog(i18n("Error while writing file:\n%1").arg(aFileName)); } return FALSE; } @@ -238,13 +238,13 @@ KDE_EXPORT bool kBytesToFile(const char* aBuffer, int len, if (writeLen < 0) { if (aVerbose) - msgDialog(i18n("Could not write to file:\n%1").tqarg(aFileName)); + msgDialog(i18n("Could not write to file:\n%1").arg(aFileName)); return FALSE; } else if (writeLen < len) { TQString msg = i18n("Could only write %1 bytes of %2.") - .tqarg(writeLen).tqarg(len); + .arg(writeLen).arg(len); if (aVerbose) msgDialog(msg); return FALSE; @@ -283,7 +283,7 @@ TQString checkAndCorrectPermissionsIfPossible( const TQString &toCheck, if ( !fiToCheck.exists() ) { error.append( i18n("%1 does not exist") - .tqarg(toCheck) + "\n"); + .arg(toCheck) + "\n"); } // check the access bit of a folder. @@ -295,7 +295,7 @@ TQString checkAndCorrectPermissionsIfPossible( const TQString &toCheck, if ( !g.isReadable() ) { if ( chmod( toCheckEnc, statbuffer.st_mode + S_IXUSR ) != 0 ) { error.append( i18n("%1 is not accessible and that is " - "unchangeable.").tqarg(toCheck) + "\n"); + "unchangeable.").arg(toCheck) + "\n"); } else { kdDebug() << "Changed access bit for " << toCheck << endl; } @@ -316,7 +316,7 @@ TQString checkAndCorrectPermissionsIfPossible( const TQString &toCheck, // Lets try changing it. if ( chmod( toCheckEnc, statbuffer.st_mode + S_IRUSR ) != 0 ) { error.append( i18n("%1 is not readable and that is unchangeable.") - .tqarg(toCheck) + "\n"); + .arg(toCheck) + "\n"); } else { kdDebug() << "Changed the read bit for " << toCheck << endl; } @@ -332,7 +332,7 @@ TQString checkAndCorrectPermissionsIfPossible( const TQString &toCheck, // Lets try changing it. if ( chmod (toCheckEnc, statbuffer.st_mode + S_IWUSR ) != 0 ) { error.append( i18n("%1 is not writable and that is unchangeable.") - .tqarg(toCheck) + "\n"); + .arg(toCheck) + "\n"); } else { kdDebug() << "Changed the write bit for " << toCheck << endl; } @@ -346,7 +346,7 @@ TQString checkAndCorrectPermissionsIfPossible( const TQString &toCheck, // First check if the folder is readable for us. If not, we get // some ugly crashes. if ( !g.isReadable() ){ - error.append(i18n("Folder %1 is inaccessible.").tqarg(toCheck) + "\n"); + error.append(i18n("Folder %1 is inaccessible.").arg(toCheck) + "\n"); } else { const TQFileInfoList *list = g.entryInfoList(); TQFileInfoListIterator it( *list ); diff --git a/libtdepim/kfoldertree.cpp b/libtdepim/kfoldertree.cpp index 64859199a..79ad6aa9c 100644 --- a/libtdepim/kfoldertree.cpp +++ b/libtdepim/kfoldertree.cpp @@ -198,7 +198,7 @@ void KFolderTreeItem::setFolderSize( TQ_INT64 aSize ) TQ_INT64 recursiveSize = recursiveFolderSize(); if ( recursiveSize != mSize ) { if ( mType != Root ) - size += TQString::tqfromLatin1(" + %1").tqarg( KIO::convertSize( recursiveSize - mSize ) ); + size += TQString::fromLatin1(" + %1").arg( KIO::convertSize( recursiveSize - mSize ) ); else size = KIO::convertSize( recursiveSize ); } @@ -351,7 +351,7 @@ void KFolderTreeItem::setFolderIsCloseToQuota( bool v ) { if ( mFolderIsCloseToQuota != v) { mFolderIsCloseToQuota = v; - tqrepaint(); + repaint(); } } @@ -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() ) @@ -535,7 +535,7 @@ void KFolderTree::setFullWidth( bool fullWidth ) //----------------------------------------------------------------------------- void KFolderTree::slotSizeChanged( int section, int, int newSize ) { - viewport()->tqrepaint( + viewport()->repaint( header()->sectionPos(section), 0, newSize, visibleHeight(), false ); } diff --git a/libtdepim/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/kimportdialog.cpp b/libtdepim/kimportdialog.cpp index da6c98fad..637d60e16 100644 --- a/libtdepim/kimportdialog.cpp +++ b/libtdepim/kimportdialog.cpp @@ -27,13 +27,13 @@ #include <tqbuttongroup.h> #include <tqfile.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlineedit.h> #include <tqlistview.h> #include <tqradiobutton.h> #include <tqregexp.h> #include <tqtable.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqvbox.h> #include <kapplication.h> @@ -337,7 +337,7 @@ void KImportDialog::readFile( int rows ) if (x == mSeparator) { progress->setValue(progressValue++); - if (progressValue % 15 == 0) // try not to constantly tqrepaint + if (progressValue % 15 == 0) // try not to constantly repaint kapp->processEvents(); } diff --git a/libtdepim/kincidencechooser.cpp b/libtdepim/kincidencechooser.cpp index fee89bbb6..57f46d584 100644 --- a/libtdepim/kincidencechooser.cpp +++ b/libtdepim/kincidencechooser.cpp @@ -22,16 +22,16 @@ without including the source code for TQt in the source distribution. */ -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqbuttongroup.h> #include <tqvbox.h> #include <tqhbox.h> #include <tqradiobutton.h> #include <tqpushbutton.h> -#include <tqlayout.h> +#include <layout.h> #include <tqscrollview.h> -#include <tqtextbrowser.h> +#include <textbrowser.h> #include <tqapplication.h> @@ -265,9 +265,9 @@ void KIncidenceChooser::showDiff() } mDisplayDiff = new KPIM::HTMLDiffAlgoDisplay (this); if ( mInc1->summary().left( 20 ) != mInc2->summary().left( 20 ) ) - mDisplayDiff->setCaption( i18n( "Differences of %1 and %2").tqarg( mInc1->summary().left( 20 ) ).tqarg( mInc2->summary().left( 20 ) ) ); + mDisplayDiff->setCaption( i18n( "Differences of %1 and %2").arg( mInc1->summary().left( 20 ) ).arg( mInc2->summary().left( 20 ) ) ); else - mDisplayDiff->setCaption( i18n( "Differences of %1").tqarg( mInc1->summary().left( 20 ) ) ); + mDisplayDiff->setCaption( i18n( "Differences of %1").arg( mInc1->summary().left( 20 ) ) ); diff = new KPIM::CalendarDiffAlgo( mInc1, mInc2); diff->setLeftSourceTitle( i18n( "Local entry")); diff --git a/libtdepim/komposer/core/pluginmanager.cpp b/libtdepim/komposer/core/pluginmanager.cpp index dcfea6f4b..2a55d7349 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'" ).arg( 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..1cd97e724 100644 --- a/libtdepim/komposer/core/prefsmodule.cpp +++ b/libtdepim/komposer/core/prefsmodule.cpp @@ -27,7 +27,7 @@ #include <klocale.h> #include <ktrader.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqbuttongroup.h> @@ -75,8 +75,8 @@ EditorSelection::EditorSelection( const TQString &text, TQString &reference, : m_reference( reference ) { m_box = new TQGroupBox( 0, TQt::Vertical, text, parent ); - TQVBoxLayout *boxLayout = new TQVBoxLayout( m_box->tqlayout() ); - boxLayout->tqsetAlignment( TQt::AlignTop ); + TQVBoxLayout *boxLayout = new TQVBoxLayout( m_box->layout() ); + 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..91dda85c3 100644 --- a/libtdepim/komposer/plugins/default/defaulteditor.cpp +++ b/libtdepim/komposer/plugins/default/defaulteditor.cpp @@ -39,7 +39,7 @@ #include <kreplacedialog.h> #include <kreplace.h> -#include <tqtextedit.h> +#include <textedit.h> #include <tqwidget.h> typedef KGenericFactory<DefaultEditor> DefaultEditorFactory; @@ -87,7 +87,7 @@ DefaultEditor::changeSignature( const TQString &sig ) TQString text = m_textEdit->text(); int sigStart = text.findRev( "-- " ); - TQString sigText = TQString( "-- \n%1" ).tqarg( sig ); + TQString sigText = TQString( "-- \n%1" ).arg( sig ); text.replace( sigStart, text.length(), sigText ); } @@ -202,10 +202,10 @@ DefaultEditor::createActions( KActionCollection *ac ) connect( m_actionAlignJustify, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setAlignJustify(bool)) ); - m_actionAlignLeft->setExclusiveGroup( "tqalignment" ); - m_actionAlignCenter->setExclusiveGroup( "tqalignment" ); - m_actionAlignRight->setExclusiveGroup( "tqalignment" ); - m_actionAlignJustify->setExclusiveGroup( "tqalignment" ); + m_actionAlignLeft->setExclusiveGroup( "alignment" ); + m_actionAlignCenter->setExclusiveGroup( "alignment" ); + m_actionAlignRight->setExclusiveGroup( "alignment" ); + m_actionAlignJustify->setExclusiveGroup( "alignment" ); // // Tools @@ -244,7 +244,7 @@ DefaultEditor::updateCharFmt() void DefaultEditor::updateAligment() { - int align = m_textEdit->tqalignment(); + int align = m_textEdit->alignment(); switch ( align ) { case AlignRight: @@ -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/komposer/plugins/default/defaulteditorui.rc b/libtdepim/komposer/plugins/default/defaulteditorui.rc index de8c2e6d2..479fa8b06 100644 --- a/libtdepim/komposer/plugins/default/defaulteditorui.rc +++ b/libtdepim/komposer/plugins/default/defaulteditorui.rc @@ -24,7 +24,7 @@ <Action name="format_color"/> <DefineGroup name="format_chars_group" /> <Separator/> - <Menu name="tqalignment"><text>&Alignment</text> + <Menu name="alignment"><text>&Alignment</text> <Action name="format_align_left"/> <Action name="format_align_center"/> <Action name="format_align_right"/> diff --git a/libtdepim/kpartsdesignerplugin/kpartsdesignerplugin.cpp b/libtdepim/kpartsdesignerplugin/kpartsdesignerplugin.cpp index a83a5a7a2..35966fb7c 100644 --- a/libtdepim/kpartsdesignerplugin/kpartsdesignerplugin.cpp +++ b/libtdepim/kpartsdesignerplugin/kpartsdesignerplugin.cpp @@ -22,15 +22,15 @@ #include <kparts/componentfactory.h> #include <kparts/part.h> #include <kmimetype.h> -#include <tqlayout.h> +#include <layout.h> #include <kapplication.h> #include <tdepimmacros.h> KPartsGenericPart::KPartsGenericPart( TQWidget* parentWidget, const char* name ) : TQWidget( parentWidget, name ), m_part( 0 ) { - TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); - tqlayout->setAutoAdd( true ); + TQVBoxLayout* layout = new TQVBoxLayout( this ); + layout->setAutoAdd( true ); } void KPartsGenericPart::load() diff --git a/libtdepim/kpixmapregionselectorwidget.cpp b/libtdepim/kpixmapregionselectorwidget.cpp index 04ef9c8f4..8db527fc9 100644 --- a/libtdepim/kpixmapregionselectorwidget.cpp +++ b/libtdepim/kpixmapregionselectorwidget.cpp @@ -29,7 +29,7 @@ #include <tqpainter.h> #include <tqcolor.h> #include <tqimage.h> -#include <tqlayout.h> +#include <layout.h> #include <kimageeffect.h> #include <kdebug.h> #include <klocale.h> @@ -216,7 +216,7 @@ bool KPixmapRegionSelectorWidget::eventFilter(TQObject *obj, TQEvent *ev) if ( ev->type() == TQEvent::MouseButtonPress ) { TQMouseEvent *mev= (TQMouseEvent *)(ev); - //kdDebug() << TQString("click at %1,%2").tqarg( mev->x() ).tqarg( mev->y() ) << endl; + //kdDebug() << TQString("click at %1,%2").arg( mev->x() ).arg( mev->y() ) << endl; if ( mev->button() == Qt::RightButton ) { @@ -249,7 +249,7 @@ bool KPixmapRegionSelectorWidget::eventFilter(TQObject *obj, TQEvent *ev) { TQMouseEvent *mev= (TQMouseEvent *)(ev); - //kdDebug() << TQString("move to %1,%2").tqarg( mev->x() ).tqarg( mev->y() ) << endl; + //kdDebug() << TQString("move to %1,%2").arg( mev->x() ).arg( mev->y() ) << endl; if ( m_state == Resizing ) { @@ -421,7 +421,7 @@ void KPixmapRegionSelectorWidget::setMaximumWidgetSize(int width, int height) if (m_selectedRegion == m_originalPixmap.rect()) m_selectedRegion=TQRect(); // kdDebug() << TQString(" original Pixmap :") << m_originalPixmap.rect() << endl; -// kdDebug() << TQString(" unzoomed Pixmap : %1 x %2 ").tqarg(m_unzoomedPixmap.width()).tqarg(m_unzoomedPixmap.height()) << endl; +// kdDebug() << TQString(" unzoomed Pixmap : %1 x %2 ").arg(m_unzoomedPixmap.width()).arg(m_unzoomedPixmap.height()) << endl; if ( !m_originalPixmap.isNull() && ( m_originalPixmap.width() > m_maxWidth || diff --git a/libtdepim/kprefsdialog.cpp b/libtdepim/kprefsdialog.cpp index 466691083..9eadffeb2 100644 --- a/libtdepim/kprefsdialog.cpp +++ b/libtdepim/kprefsdialog.cpp @@ -21,7 +21,7 @@ Boston, MA 02110-1301, USA. */ -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqbuttongroup.h> #include <tqlineedit.h> @@ -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() @@ -766,18 +766,18 @@ void KPrefsDialog::autoCreate() kdDebug() << "ITEMS: " << (*it)->name() << endl; TQWidget *page; - TQGridLayout *tqlayout; + TQGridLayout *layout; int currentRow; if ( !mGroupPages.contains( group ) ) { page = addPage( group ); - tqlayout = new TQGridLayout( page ); + layout = new TQGridLayout( page ); mGroupPages.insert( group, page ); - mGroupLayouts.insert( group, tqlayout ); + mGroupLayouts.insert( group, layout ); currentRow = 0; mCurrentRows.insert( group, currentRow ); } else { page = mGroupPages[ group ]; - tqlayout = mGroupLayouts[ group ]; + layout = mGroupLayouts[ group ]; currentRow = mCurrentRows[ group ]; } @@ -786,11 +786,11 @@ void KPrefsDialog::autoCreate() if ( wid ) { TQValueList<TQWidget *> widgets = wid->widgets(); if ( widgets.count() == 1 ) { - tqlayout->addMultiCellWidget( widgets[ 0 ], + layout->addMultiCellWidget( widgets[ 0 ], currentRow, currentRow, 0, 1 ); } else if ( widgets.count() == 2 ) { - tqlayout->addWidget( widgets[ 0 ], currentRow, 0 ); - tqlayout->addWidget( widgets[ 1 ], currentRow, 1 ); + layout->addWidget( widgets[ 0 ], currentRow, 0 ); + layout->addWidget( widgets[ 1 ], currentRow, 1 ); } else { kdError() << "More widgets than expected: " << widgets.count() << endl; } diff --git a/libtdepim/kprefsdialog.h b/libtdepim/kprefsdialog.h index b1fffcdd7..907989f8c 100644 --- a/libtdepim/kprefsdialog.h +++ b/libtdepim/kprefsdialog.h @@ -87,7 +87,7 @@ class KDE_EXPORT KPrefsWid : public TQObject @short Widgets for bool settings in @ref KPrefsDialog. This class provides a control element for configuring bool values. It is meant - to be used by KPrefsDialog. The user is responsible for the tqlayout management. + to be used by KPrefsDialog. The user is responsible for the layout management. */ class KDE_EXPORT KPrefsWidBool : public KPrefsWid { @@ -120,7 +120,7 @@ class KDE_EXPORT KPrefsWidBool : public KPrefsWid @short Widgets for int settings in @ref KPrefsDialog. This class provides a control element for configuring integer values. It is - meant to be used by KPrefsDialog. The user is responsible for the tqlayout + meant to be used by KPrefsDialog. The user is responsible for the layout management. */ class KDE_EXPORT KPrefsWidInt : public KPrefsWid @@ -161,7 +161,7 @@ class KDE_EXPORT KPrefsWidInt : public KPrefsWid @short Widgets for time settings in @ref KPrefsDialog. This class provides a control element for configuring time values. It is - meant to be used by KPrefsDialog. The user is responsible for the tqlayout + meant to be used by KPrefsDialog. The user is responsible for the layout management. */ class KDE_EXPORT KPrefsWidTime : public KPrefsWid @@ -198,7 +198,7 @@ class KDE_EXPORT KPrefsWidTime : public KPrefsWid @short Widgets for duration settings in @ref KPrefsDialog. This class provides a control element for configuring duration values. It is - meant to be used by KPrefsDialog. The user is responsible for the tqlayout + meant to be used by KPrefsDialog. The user is responsible for the layout management. */ class KDE_EXPORT KPrefsWidDuration : public KPrefsWid @@ -236,7 +236,7 @@ class KDE_EXPORT KPrefsWidDuration : public KPrefsWid @short Widgets for time settings in @ref KPrefsDialog. This class provides a control element for configuring date values. It is - meant to be used by KPrefsDialog. The user is responsible for the tqlayout + meant to be used by KPrefsDialog. The user is responsible for the layout management. */ class KDE_EXPORT KPrefsWidDate : public KPrefsWid @@ -273,7 +273,7 @@ class KDE_EXPORT KPrefsWidDate : public KPrefsWid @short Widgets for color settings in @ref KPrefsDialog. This class provides a control element for configuring color values. It is - meant to be used by KPrefsDialog. The user is responsible for the tqlayout + meant to be used by KPrefsDialog. The user is responsible for the layout management. */ class KDE_EXPORT KPrefsWidColor : public KPrefsWid @@ -317,7 +317,7 @@ class KDE_EXPORT KPrefsWidColor : public KPrefsWid @short Widgets for font settings in @ref KPrefsDialog. This class provides a control element for configuring font values. It is meant - to be used by KPrefsDialog. The user is responsible for the tqlayout management. + to be used by KPrefsDialog. The user is responsible for the layout management. */ class KDE_EXPORT KPrefsWidFont : public KPrefsWid { @@ -371,7 +371,7 @@ class KDE_EXPORT KPrefsWidFont : public KPrefsWid @ref KPrefsDialog. This class provides a control element for configuring selections. It is meant - to be used by KPrefsDialog. The user is responsible for the tqlayout management. + to be used by KPrefsDialog. The user is responsible for the layout management. The setting is interpreted as an int value, corresponding to the position of the radio button. The position of the button is defined by the sequence of @@ -420,7 +420,7 @@ class KDE_EXPORT KPrefsWidRadios : public KPrefsWid @ref KPrefsDialog. This class provides a control element for configuring selections. It is meant - to be used by KPrefsDialog. The user is responsible for the tqlayout management. + to be used by KPrefsDialog. The user is responsible for the layout management. The setting is interpreted as an int value, corresponding to the index in the combo box. @@ -455,7 +455,7 @@ class KDE_EXPORT KPrefsWidCombo : public KPrefsWid @short Widgets for string settings in @ref KPrefsDialog. This class provides a control element for configuring string values. It is - meant to be used by KPrefsDialog. The user is responsible for the tqlayout + meant to be used by KPrefsDialog. The user is responsible for the layout management. */ class KDE_EXPORT KPrefsWidString : public KPrefsWid @@ -502,7 +502,7 @@ class KDE_EXPORT KPrefsWidString : public KPrefsWid @short Widgets for string settings in @ref KPrefsDialog. This class provides a control element for configuring string values. It is - meant to be used by KPrefsDialog. The user is responsible for the tqlayout + meant to be used by KPrefsDialog. The user is responsible for the layout management. */ class KDE_EXPORT KPrefsWidPath : public KPrefsWid @@ -711,7 +711,7 @@ class KDE_EXPORT KPrefsWidManager This class provides the framework for a preferences dialog. You have to subclass it and add the code to create the actual configuration widgets and - do the tqlayout management. + do the layout management. KPrefsDialog provides functions to add subclasses of @ref KPrefsWid via KPrefsWidManager. For these widgets the reading, writing and setting to diff --git a/libtdepim/kregexp3.cpp b/libtdepim/kregexp3.cpp index bffc491ea..d60946c28 100644 --- a/libtdepim/kregexp3.cpp +++ b/libtdepim/kregexp3.cpp @@ -64,7 +64,7 @@ TQString KRegExp3::replace( const TQString & str, pos = rx.search( replacementStr, pos ); #ifdef DEBUG_KREGEXP3 - kdDebug() << TQString(" Found match at pos %1").tqarg(pos) << endl; + kdDebug() << TQString(" Found match at pos %1").arg(pos) << endl; #endif if ( pos < 0 ) { @@ -88,13 +88,13 @@ TQString KRegExp3::replace( const TQString & str, backRefs << rx.cap(i).toInt(); #ifdef DEBUG_KREGEXP3 kdDebug() << TQString(" Found %1 at position %2 in the capturedTexts.") - .tqarg(backRefs.last()).tqarg(i) << endl; + .arg(backRefs.last()).arg(i) << endl; #endif break; } pos += rx.matchedLength(); #ifdef DEBUG_KREGEXP3 - kdDebug() << TQString(" Setting new pos to %1.").tqarg(pos) << endl; + kdDebug() << TQString(" Setting new pos to %1.").arg(pos) << endl; #endif oldpos = pos; } @@ -125,7 +125,7 @@ TQString KRegExp3::replace( const TQString & str, pos = search( str, pos ); #ifdef DEBUG_KREGEXP3 - kdDebug() << TQString(" Found match at pos %1").tqarg(pos) << endl; + kdDebug() << TQString(" Found match at pos %1").arg(pos) << endl; #endif if ( pos < 0 ) { @@ -168,7 +168,7 @@ TQString KRegExp3::replace( const TQString & str, } pos += matchedLength(); #ifdef DEBUG_KREGEXP3 - kdDebug() << TQString(" Setting new pos to %1.").tqarg(pos) << endl; + kdDebug() << TQString(" Setting new pos to %1.").arg(pos) << endl; #endif oldpos = pos; diff --git a/libtdepim/krsqueezedtextlabel.cpp b/libtdepim/krsqueezedtextlabel.cpp index 968b56d20..d024cd97c 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 alignment ) { // save fullText and restore it TQString tmpFull(fullText); - TQLabel::tqsetAlignment(tqalignment); + TQLabel::setAlignment(alignment); 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..bc8c4a088 100644 --- a/libtdepim/kscoring.cpp +++ b/libtdepim/kscoring.cpp @@ -24,10 +24,10 @@ #include <tqfile.h> #include <tqdom.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqcheckbox.h> -#include <tqtextview.h> +#include <textview.h> #include <klocale.h> #include <kstandarddirs.h> @@ -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); @@ -1137,7 +1137,7 @@ TQString KScoringManager::findUniqueName() const while (nr < 99999999) { nr++; - ret = i18n("rule %1").tqarg(nr); + ret = i18n("rule %1").arg(nr); duplicated=false; TQPtrListIterator<KScoringRule> it(allRules); diff --git a/libtdepim/kscoringeditor.cpp b/libtdepim/kscoringeditor.cpp index 6e520e983..3f3f5111d 100644 --- a/libtdepim/kscoringeditor.cpp +++ b/libtdepim/kscoringeditor.cpp @@ -32,7 +32,7 @@ #include <tqlabel.h> #include <tqpushbutton.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtooltip.h> #include <tqcheckbox.h> #include <tqbuttongroup.h> @@ -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..3113548b1 100644 --- a/libtdepim/ksubscription.cpp +++ b/libtdepim/ksubscription.cpp @@ -13,7 +13,7 @@ #include "ksubscription.h" #include "kaccount.h" -#include <tqlayout.h> +#include <layout.h> #include <tqtimer.h> #include <tqlabel.h> #include <tqpushbutton.h> @@ -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) @@ -133,7 +133,7 @@ void GroupItem::setVisible( bool b ) TQListViewItem::setVisible(b); else { - // leave it visible so that tqchildren remain visible + // leave it visible so that children remain visible setOpen(true); setEnabled(false); } @@ -271,7 +271,7 @@ KSubscription::KSubscription( TQWidget *parent, const TQString &caption, else groupView->header()->setStretchEnabled(true, 0); - // tqlayout + // layout TQGridLayout *topL = new TQGridLayout(page,4,1,0, KDialog::spacingHint()); TQHBoxLayout *filterL = new TQHBoxLayout(KDialog::spacingHint()); TQVBoxLayout *arrL = new TQVBoxLayout(KDialog::spacingHint()); @@ -775,7 +775,7 @@ void KSubscription::slotUpdateStatusLabel() activeItemCount()); else text = i18n("%1: (1 matching)", "%1: (%n matching)", activeItemCount()) - .tqarg(account()->name()); + .arg(account()->name()); leftLabel->setText(text); } diff --git a/libtdepim/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/kwidgetlister.cpp b/libtdepim/kwidgetlister.cpp index 458292bc0..ff4dbb1c6 100644 --- a/libtdepim/kwidgetlister.cpp +++ b/libtdepim/kwidgetlister.cpp @@ -35,7 +35,7 @@ #include <kdebug.h> #include <tqpushbutton.h> -#include <tqlayout.h> +#include <layout.h> #include <tqhbox.h> #include <assert.h> @@ -135,7 +135,7 @@ void KWidgetLister::addWidgetAtEnd(TQWidget *w) void KWidgetLister::removeLastWidget() { - // The tqlayout will take care that the + // The layout will take care that the // widget is removed from screen, too. mWidgetList.removeLast(); enableControls(); diff --git a/libtdepim/kwidgetlister.h b/libtdepim/kwidgetlister.h index 6bfeec157..ebe9c1416 100644 --- a/libtdepim/kwidgetlister.h +++ b/libtdepim/kwidgetlister.h @@ -74,19 +74,19 @@ protected slots: /** Called whenever the user clicks on the 'more' button. Reimplementations should call this method, because this implementation does all the dirty work with adding the widgets - to the tqlayout (through @ref addWidgetAtEnd) and enabling/disabling + to the layout (through @ref addWidgetAtEnd) and enabling/disabling the control buttons. */ virtual void slotMore(); /** Called whenever the user clicks on the 'fewer' button. Reimplementations should call this method, because this implementation does all the dirty work with removing the widgets - from the tqlayout (through @ref removeLastWidget) and + from the layout (through @ref removeLastWidget) and enabling/disabling the control buttons. */ virtual void slotFewer(); /** Called whenever the user clicks on the 'clear' button. Reimplementations should call this method, because this implementation does all the dirty work with removing all but - @ref mMinWidgets widgets from the tqlayout and enabling/disabling + @ref mMinWidgets widgets from the layout and enabling/disabling the control buttons. */ virtual void slotClear(); diff --git a/libtdepim/ldapclient.cpp b/libtdepim/ldapclient.cpp index f8497f084..0a1b44b87 100644 --- a/libtdepim/ldapclient.cpp +++ b/libtdepim/ldapclient.cpp @@ -26,7 +26,7 @@ #include <tqimage.h> #include <tqlabel.h> #include <tqpixmap.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqurl.h> #include <kabc/ldapurl.h> @@ -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" ).arg( dn ); for ( LdapAttrMap::ConstIterator it = attrs.begin(); it != attrs.end(); ++it ) { TQString attr = it.key(); for ( LdapAttrValue::ConstIterator it2 = (*it).begin(); it2 != (*it).end(); ++it2 ) { @@ -278,53 +278,53 @@ void LdapSearch::readConfig( LdapServer &server, KConfig *config, int j, bool ac { TQString prefix; if ( active ) prefix = "Selected"; - TQString host = config->readEntry( prefix + TQString( "Host%1" ).tqarg( j ), "" ).stripWhiteSpace(); + TQString host = config->readEntry( prefix + TQString( "Host%1" ).arg( j ), "" ).stripWhiteSpace(); if ( !host.isEmpty() ) server.setHost( host ); - int port = config->readNumEntry( prefix + TQString( "Port%1" ).tqarg( j ), 389 ); + int port = config->readNumEntry( prefix + TQString( "Port%1" ).arg( j ), 389 ); server.setPort( port ); - TQString base = config->readEntry( prefix + TQString( "Base%1" ).tqarg( j ), "" ).stripWhiteSpace(); + TQString base = config->readEntry( prefix + TQString( "Base%1" ).arg( j ), "" ).stripWhiteSpace(); if ( !base.isEmpty() ) server.setBaseDN( base ); - TQString user = config->readEntry( prefix + TQString( "User%1" ).tqarg( j ) ).stripWhiteSpace(); + TQString user = config->readEntry( prefix + TQString( "User%1" ).arg( j ) ).stripWhiteSpace(); if ( !user.isEmpty() ) server.setUser( user ); - TQString bindDN = config->readEntry( prefix + TQString( "Bind%1" ).tqarg( j ) ).stripWhiteSpace(); + TQString bindDN = config->readEntry( prefix + TQString( "Bind%1" ).arg( j ) ).stripWhiteSpace(); if ( !bindDN.isEmpty() ) server.setBindDN( bindDN ); - TQString pwdBindDN = config->readEntry( prefix + TQString( "PwdBind%1" ).tqarg( j ) ); + TQString pwdBindDN = config->readEntry( prefix + TQString( "PwdBind%1" ).arg( j ) ); if ( !pwdBindDN.isEmpty() ) server.setPwdBindDN( pwdBindDN ); - server.setTimeLimit( config->readNumEntry( prefix + TQString( "TimeLimit%1" ).tqarg( j ) ) ); - server.setSizeLimit( config->readNumEntry( prefix + TQString( "SizeLimit%1" ).tqarg( j ) ) ); - server.setVersion( config->readNumEntry( prefix + TQString( "Version%1" ).tqarg( j ), 3 ) ); - server.setSecurity( config->readNumEntry( prefix + TQString( "Security%1" ).tqarg( j ) ) ); - server.setAuth( config->readNumEntry( prefix + TQString( "Auth%1" ).tqarg( j ) ) ); - server.setMech( config->readEntry( prefix + TQString( "Mech%1" ).tqarg( j ) ) ); + server.setTimeLimit( config->readNumEntry( prefix + TQString( "TimeLimit%1" ).arg( j ) ) ); + server.setSizeLimit( config->readNumEntry( prefix + TQString( "SizeLimit%1" ).arg( j ) ) ); + server.setVersion( config->readNumEntry( prefix + TQString( "Version%1" ).arg( j ), 3 ) ); + server.setSecurity( config->readNumEntry( prefix + TQString( "Security%1" ).arg( j ) ) ); + server.setAuth( config->readNumEntry( prefix + TQString( "Auth%1" ).arg( j ) ) ); + server.setMech( config->readEntry( prefix + TQString( "Mech%1" ).arg( j ) ) ); } void LdapSearch::writeConfig( const LdapServer &server, KConfig *config, int j, bool active ) { TQString prefix; if ( active ) prefix = "Selected"; - config->writeEntry( prefix + TQString( "Host%1" ).tqarg( j ), server.host() ); - config->writeEntry( prefix + TQString( "Port%1" ).tqarg( j ), server.port() ); - config->writeEntry( prefix + TQString( "Base%1" ).tqarg( j ), server.baseDN() ); - config->writeEntry( prefix + TQString( "User%1" ).tqarg( j ), server.user() ); - config->writeEntry( prefix + TQString( "Bind%1" ).tqarg( j ), server.bindDN() ); - config->writeEntry( prefix + TQString( "PwdBind%1" ).tqarg( j ), server.pwdBindDN() ); - config->writeEntry( prefix + TQString( "TimeLimit%1" ).tqarg( j ), server.timeLimit() ); - config->writeEntry( prefix + TQString( "SizeLimit%1" ).tqarg( j ), server.sizeLimit() ); - config->writeEntry( prefix + TQString( "Version%1" ).tqarg( j ), server.version() ); - config->writeEntry( prefix + TQString( "Security%1" ).tqarg( j ), server.security() ); - config->writeEntry( prefix + TQString( "Auth%1" ).tqarg( j ), server.auth() ); - config->writeEntry( prefix + TQString( "Mech%1" ).tqarg( j ), server.mech() ); + config->writeEntry( prefix + TQString( "Host%1" ).arg( j ), server.host() ); + config->writeEntry( prefix + TQString( "Port%1" ).arg( j ), server.port() ); + config->writeEntry( prefix + TQString( "Base%1" ).arg( j ), server.baseDN() ); + config->writeEntry( prefix + TQString( "User%1" ).arg( j ), server.user() ); + config->writeEntry( prefix + TQString( "Bind%1" ).arg( j ), server.bindDN() ); + config->writeEntry( prefix + TQString( "PwdBind%1" ).arg( j ), server.pwdBindDN() ); + config->writeEntry( prefix + TQString( "TimeLimit%1" ).arg( j ), server.timeLimit() ); + config->writeEntry( prefix + TQString( "SizeLimit%1" ).arg( j ), server.sizeLimit() ); + config->writeEntry( prefix + TQString( "Version%1" ).arg( j ), server.version() ); + config->writeEntry( prefix + TQString( "Security%1" ).arg( j ), server.security() ); + config->writeEntry( prefix + TQString( "Auth%1" ).arg( j ), server.auth() ); + config->writeEntry( prefix + TQString( "Mech%1" ).arg( j ), server.mech() ); } KConfig* LdapSearch::config() @@ -351,7 +351,7 @@ LdapSearch::LdapSearch() void LdapSearch::readWeighForClient( LdapClient *client, KConfig *config, int clientNumber ) { - const int completionWeight = config->readNumEntry( TQString( "SelectedCompletionWeight%1" ).tqarg( clientNumber ), -1 ); + const int completionWeight = config->readNumEntry( TQString( "SelectedCompletionWeight%1" ).arg( clientNumber ), -1 ); if ( completionWeight != -1 ) client->setCompletionWeight( completionWeight ); } @@ -442,7 +442,7 @@ void LdapSearch::startSearch( const TQString& txt ) * person entries without an email address to show up, while still not showing things * like structural entries in the ldap tree. */ TQString filter = TQString( "&(|(objectclass=person)(objectclass=groupOfNames)(mail=*))(|(cn=%1*)(mail=%2*)(mail=*@%3*)(givenName=%4*)(sn=%5*))" ) - .tqarg( mSearchText ).tqarg( mSearchText ).tqarg( mSearchText ).tqarg( mSearchText ).tqarg( mSearchText ); + .arg( mSearchText ).arg( mSearchText ).arg( mSearchText ).arg( mSearchText ).arg( mSearchText ); TQValueList< LdapClient* >::Iterator it; for ( it = mClients.begin(); it != mClients.end(); ++it ) { @@ -590,7 +590,7 @@ void LdapSearch::makeSearchData( TQStringList& ret, LdapResultList& resList ) ret.append( mail ); } else { //kdDebug(5300) << "LdapSearch::makeSearchData() name: \"" << name << "\" mail: \"" << mail << "\"" << endl; - ret.append( TQString( "%1 <%2>" ).tqarg( name ).tqarg( mail ) ); + ret.append( TQString( "%1 <%2>" ).arg( name ).arg( mail ) ); } LdapResult sr; diff --git a/libtdepim/ldapsearchdialog.cpp b/libtdepim/ldapsearchdialog.cpp index ed1aa2933..a56057a56 100644 --- a/libtdepim/ldapsearchdialog.cpp +++ b/libtdepim/ldapsearchdialog.cpp @@ -27,7 +27,7 @@ #include <tqgroupbox.h> #include <tqheader.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlistview.h> #include <tqpushbutton.h> @@ -137,7 +137,7 @@ LDAPSearchDialog::LDAPSearchDialog( TQWidget* parent, const char* name ) groupBox->setFrameShape( TQGroupBox::Box ); groupBox->setFrameShadow( TQGroupBox::Sunken ); groupBox->setColumnLayout( 0, Qt::Vertical ); - TQGridLayout *boxLayout = new TQGridLayout( groupBox->tqlayout(), 2, + TQGridLayout *boxLayout = new TQGridLayout( groupBox->layout(), 2, 5, spacingHint() ); boxLayout->setColStretch( 1, 1 ); @@ -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" ) ); @@ -238,23 +238,23 @@ void LDAPSearchDialog::restoreSettings() for ( int j = 0; j < mNumHosts; ++j ) { KPIM::LdapServer ldapServer; - TQString host = config->readEntry( TQString( "SelectedHost%1" ).tqarg( j ), "" ); + TQString host = config->readEntry( TQString( "SelectedHost%1" ).arg( j ), "" ); if ( !host.isEmpty() ) ldapServer.setHost( host ); - int port = config->readUnsignedNumEntry( TQString( "SelectedPort%1" ).tqarg( j ) ); + int port = config->readUnsignedNumEntry( TQString( "SelectedPort%1" ).arg( j ) ); if ( port ) ldapServer.setPort( port ); - TQString base = config->readEntry( TQString( "SelectedBase%1" ).tqarg( j ), "" ); + TQString base = config->readEntry( TQString( "SelectedBase%1" ).arg( j ), "" ); if ( !base.isEmpty() ) ldapServer.setBaseDN( base ); - TQString bindDN = config->readEntry( TQString( "SelectedBind%1" ).tqarg( j ), "" ); + TQString bindDN = config->readEntry( TQString( "SelectedBind%1" ).arg( j ), "" ); if ( !bindDN.isEmpty() ) ldapServer.setBindDN( bindDN ); - TQString pwdBindDN = config->readEntry( TQString( "SelectedPwdBind%1" ).tqarg( j ), "" ); + TQString pwdBindDN = config->readEntry( TQString( "SelectedPwdBind%1" ).arg( j ), "" ); if ( !pwdBindDN.isEmpty() ) ldapServer.setPwdBindDN( pwdBindDN ); @@ -352,15 +352,15 @@ TQString LDAPSearchDialog::makeFilter( const TQString& query, const TQString& at if ( attr == i18n( "Name" ) ) { result += startsWith ? "|(cn=%1*)(sn=%2*)" : "|(cn=*%1*)(sn=*%2*)"; - result = result.tqarg( query ).tqarg( query ); + result = result.arg( query ).arg( query ); } else { result += (startsWith ? "%1=%2*" : "%1=*%2*"); if ( attr == i18n( "Email" ) ) { - result = result.tqarg( "mail" ).tqarg( query ); + result = result.arg( "mail" ).arg( query ); } else if ( attr == i18n( "Home Number" ) ) { - result = result.tqarg( "homePhone" ).tqarg( query ); + result = result.arg( "homePhone" ).arg( query ); } else if ( attr == i18n( "Work Number" ) ) { - result = result.tqarg( "telephoneNumber" ).tqarg( query ); + result = result.arg( "telephoneNumber" ).arg( query ); } else { // Error? result = TQString(); diff --git a/libtdepim/linklocator.cpp b/libtdepim/linklocator.cpp index 399c5d3b3..be2bd1afb 100644 --- a/libtdepim/linklocator.cpp +++ b/libtdepim/linklocator.cpp @@ -28,7 +28,7 @@ #include <kmdcodec.h> #include <kdebug.h> -#include <tqstylesheet.h> +#include <stylesheet.h> #include <tqfile.h> #include <tqregexp.h> @@ -176,7 +176,7 @@ TQString LinkLocator::getEmailAddress() // determine the local part of the email address int start = mPos - 1; - while ( start >= 0 && mText[start].tqunicode() < 128 && + while ( start >= 0 && mText[start].unicode() < 128 && ( mText[start].isLetterOrNumber() || mText[start] == '@' || // allow @ to find invalid email addresses allowedSpecialChars.find( mText[start] ) != -1 ) ) { @@ -361,8 +361,8 @@ TQString LinkLocator::pngToDataUrl( const TQString & iconPath ) TQByteArray ba = pngFile.readAll(); pngFile.close(); - return TQString::tqfromLatin1("data:image/png;base64,%1") - .tqarg( KCodecs::base64Encode( ba ).data() ); + return TQString::fromLatin1("data:image/png;base64,%1") + .arg( 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 ); @@ -422,7 +422,7 @@ TQString LinkLocator::getEmoticon() // for copy & paste) representing the smiley htmlRep = TQString("<img class=\"pimsmileyimg\" src=\"%1\" " "alt=\"%2\" title=\"%3\" width=\"16\" height=\"16\"/>") - .tqarg( dataUrl, + .arg( dataUrl, TQStyleSheet::escape( smiley ), TQStyleSheet::escape( smiley ) ); } @@ -445,7 +445,7 @@ TQString LinkLocator::highlightedText() if ( ch != '/' && ch != '*' && ch != '_' ) return TQString(); - TQRegExp re = TQRegExp( TQString("\\%1([0-9A-Za-z]+)\\%2").tqarg( ch ).tqarg( ch ) ); + TQRegExp re = TQRegExp( TQString("\\%1([0-9A-Za-z]+)\\%2").arg( ch ).arg( ch ) ); if ( re.search( mText, mPos ) == mPos ) { uint length = re.matchedLength(); // there must be a whitespace after the closing formating symbol diff --git a/libtdepim/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/overlaywidget.h b/libtdepim/overlaywidget.h index 9e611fb92..bb4a89de8 100644 --- a/libtdepim/overlaywidget.h +++ b/libtdepim/overlaywidget.h @@ -35,11 +35,11 @@ namespace KPIM { /** - * This is a widget that can align itself with another one, without using a tqlayout, + * This is a widget that can align itself with another one, without using a layout, * so that it can actually be on top of other widgets. - * Currently the only supported type of tqalignment is "right aligned, on top of the other widget". + * Currently the only supported type of alignment is "right aligned, on top of the other widget". * - * OverlayWidget inherits TQHBox for convenience purposes (tqlayout, and frame) + * OverlayWidget inherits TQHBox for convenience purposes (layout, and frame) */ class OverlayWidget : public TQHBox { diff --git a/libtdepim/progressdialog.cpp b/libtdepim/progressdialog.cpp index bd5b594c6..81baa3735 100644 --- a/libtdepim/progressdialog.cpp +++ b/libtdepim/progressdialog.cpp @@ -34,7 +34,7 @@ #endif #include <tqapplication.h> -#include <tqlayout.h> +#include <layout.h> #include <tqprogressbar.h> #include <tqtimer.h> #include <tqheader.h> @@ -84,14 +84,14 @@ void TransactionItemView::resizeContents( int w, int h ) // (handling of TQEvent::LayoutHint in TQScrollView calls this method) //kdDebug(5300) << k_funcinfo << w << "," << h << endl; TQScrollView::resizeContents( w, h ); - // Tell the tqlayout in the parent (progressdialog) that our size changed + // Tell the layout in the parent (progressdialog) that our size changed updateGeometry(); // Resize the parent (progressdialog) - this works but resize horizontally too often //parentWidget()->adjustSize(); 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..0c2c485b1 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 ) @@ -84,7 +84,7 @@ void ProgressItem::cancel() if ( mCanceled || !mCanBeCanceled ) return; kdDebug(5300) << "ProgressItem::cancel() - " << label() << endl; mCanceled = true; - // Cancel all tqchildren. + // Cancel all children. TQValueList<ProgressItem*> kids = mChildren.keys(); TQValueList<ProgressItem*>::Iterator it( kids.begin() ); TQValueList<ProgressItem*>::Iterator end( kids.end() ); @@ -93,7 +93,7 @@ void ProgressItem::cancel() if ( kid->canBeCanceled() ) kid->cancel(); } - 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..ced5449cc 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; @@ -310,8 +310,8 @@ class KDE_EXPORT ProgressManager : public TQObject * interpreted as rich text, so it might have to be escaped. * @param canBeCanceled can the user cancel this operation? * @param usesCrypto does the operation use secure transports (SSL) - * Cancelling the parent will cancel the tqchildren as well (if they can be - * cancelled) and ongoing tqchildren prevent parents from finishing. + * Cancelling the parent will cancel the children as well (if they can be + * cancelled) and ongoing children prevent parents from finishing. * @return The ProgressItem representing the operation. */ static ProgressItem * createProgressItem( ProgressItem* parent, @@ -360,7 +360,7 @@ class KDE_EXPORT ProgressManager : public TQObject * @return the only top level progressitem when there's only one. * Returns 0 if there is no item, or more than one top level item. * Since this is used to calculate the overall progress, it will also return - * 0 if there is an item which uses a busy indicator, since that will tqinvalidate + * 0 if there is an item which uses a busy indicator, since that will invalidate * the overall progress. */ ProgressItem* singleItem() const; @@ -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/qutf7codec.cpp b/libtdepim/qutf7codec.cpp index dc8ef2a2f..d390e6490 100644 --- a/libtdepim/qutf7codec.cpp +++ b/libtdepim/qutf7codec.cpp @@ -18,7 +18,7 @@ with any version of TQt by TrollTech AS, Norway. In this case, the use of this plugin doesn't cause the resulting executable to be covered by the GNU General Public License. - This exception does not however tqinvalidate any other reasons why the + This exception does not however invalidate any other reasons why the executable file might be covered by the GNU General Public License. */ @@ -137,10 +137,10 @@ int TQUtf7Codec::heuristicContentMatch(const char* chars, int len) const } class TQUtf7Decoder : public TQTextDecoder { - // the storage for our tqunicode char until it's finished + // the storage for our unicode char until it's finished ushort uc; // the state of the base64 decoding - // can be 0 (just finished three tqunicode chars) + // can be 0 (just finished three unicode chars) // 1 (have the upper 6 bits of uc already) // 2 (have the upper 12 bits of uc already) // 3 (have the upper 2 bits of uc already) @@ -148,7 +148,7 @@ class TQUtf7Decoder : public TQTextDecoder { // 7 (have the upper 10 bits of uc already) // => n (have the upper (n * 6) % 16 bits of uc already) // "stepNo" cycles through all it's values every three - // tqunicode chars. + // unicode chars. char stepNo; // remembers if we are in shifted-sequence mode bool shifted; @@ -462,7 +462,7 @@ public: #endif // source and destination cursor - const TQChar * s = uc.tqunicode(); + const TQChar * s = uc.unicode(); TQCString::Iterator t = result.data(); if ( uc.isNull() ) { @@ -473,7 +473,7 @@ public: // normal operation: for (int i = 0 ; i < len_in_out ; i++/*, checkOutBuf(result,maxreslen,t,i,len_in_out,5)*/ ) { - ushort ch = s[i].tqunicode(); + ushort ch = s[i].unicode(); // // first, we check whether we might get around encoding: diff --git a/libtdepim/qutf7codec.h b/libtdepim/qutf7codec.h index 4057d276c..a95acea6f 100644 --- a/libtdepim/qutf7codec.h +++ b/libtdepim/qutf7codec.h @@ -18,14 +18,14 @@ with any version of TQt by TrollTech AS, Norway. In this case, the use of this plugin doesn't cause the resulting executable to be covered by the GNU General Public License. - This exception does not however tqinvalidate any other reasons why the + This exception does not however invalidate any other reasons why the executable file might be covered by the GNU General Public License. */ #ifndef TQUTF7CODEC_H #define TQUTF7CODEC_H -#include "tqtextcodec.h" +#include "textcodec.h" #include <tdepimmacros.h> diff --git a/libtdepim/qutf7codecplugin.cpp b/libtdepim/qutf7codecplugin.cpp index 49eb92c8f..2099d9311 100644 --- a/libtdepim/qutf7codecplugin.cpp +++ b/libtdepim/qutf7codecplugin.cpp @@ -18,13 +18,13 @@ with any version of TQt by TrollTech AS, Norway. In this case, the use of this plugin doesn't cause the resulting executable to be covered by the GNU General Public License. - This exception does not however tqinvalidate any other reasons why the + This exception does not however invalidate any other reasons why the executable file might be covered by the GNU General Public License. */ #include "qutf7codec.h" -#include <tqtextcodecplugin.h> +#include <textcodecplugin.h> #include <tqstring.h> #include <tqstringlist.h> #include <tqvaluelist.h> diff --git a/libtdepim/recentaddresses.cpp b/libtdepim/recentaddresses.cpp index ac790693d..c2faab380 100644 --- a/libtdepim/recentaddresses.cpp +++ b/libtdepim/recentaddresses.cpp @@ -39,7 +39,7 @@ #include <keditlistbox.h> -#include <tqlayout.h> +#include <layout.h> using namespace KRecentAddress; @@ -162,11 +162,11 @@ RecentAddressDialog::RecentAddressDialog( TQWidget *parent, const char *name ) parent, name, true ) { TQWidget *page = plainPage(); - TQVBoxLayout *tqlayout = new TQVBoxLayout( page, 0, spacingHint() ); + TQVBoxLayout *layout = new TQVBoxLayout( page, 0, spacingHint() ); mEditor = new KEditListBox( i18n( "Recent Addresses" ), page, "", false, KEditListBox::Add | KEditListBox::Remove ); - tqlayout->addWidget( mEditor ); + layout->addWidget( mEditor ); } void RecentAddressDialog::setAddresses( const TQStringList &addrs ) diff --git a/libtdepim/sendsmsdialog.cpp b/libtdepim/sendsmsdialog.cpp index 218f9617d..1d62e8f55 100644 --- a/libtdepim/sendsmsdialog.cpp +++ b/libtdepim/sendsmsdialog.cpp @@ -20,8 +20,8 @@ Boston, MA 02110-1301, USA. */ #include <tqlabel.h> -#include <tqlayout.h> -#include <tqtextedit.h> +#include <layout.h> +#include <textedit.h> #include <klocale.h> @@ -32,19 +32,19 @@ SendSMSDialog::SendSMSDialog( const TQString &recipientName, TQWidget *parent, c { TQWidget *page = plainPage(); - TQGridLayout *tqlayout = new TQGridLayout( page, 3, 3, marginHint(), spacingHint() ); + TQGridLayout *layout = new TQGridLayout( page, 3, 3, marginHint(), spacingHint() ); - tqlayout->addWidget( new TQLabel( i18n( "Message" ), page ), 0, 0 ); + layout->addWidget( new TQLabel( i18n( "Message" ), page ), 0, 0 ); mMessageLength = new TQLabel( "0/160", page ); - mMessageLength->tqsetAlignment( TQt::AlignRight ); - tqlayout->addWidget( mMessageLength, 0, 2 ); + mMessageLength->setAlignment( TQt::AlignRight ); + layout->addWidget( mMessageLength, 0, 2 ); mText = new TQTextEdit( page ); - tqlayout->addMultiCellWidget( mText, 1, 1, 0, 2 ); + layout->addMultiCellWidget( mText, 1, 1, 0, 2 ); - tqlayout->addWidget( new TQLabel( i18n( "Recipient:" ), page ), 2, 0 ); - tqlayout->addWidget( new TQLabel( recipientName, page ), 2, 2 ); + layout->addWidget( new TQLabel( i18n( "Recipient:" ), page ), 2, 0 ); + layout->addWidget( new TQLabel( recipientName, page ), 2, 2 ); setButtonText( Ok, i18n( "Send" ) ); @@ -68,13 +68,13 @@ void SendSMSDialog::updateMessageLength() int length = mText->length(); if( length > 480 ) - mMessageLength->setText( TQString( "%1/%2 (%3)" ).tqarg( length ).tqarg( 500 ).tqarg( 4 ) ); + mMessageLength->setText( TQString( "%1/%2 (%3)" ).arg( length ).arg( 500 ).arg( 4 ) ); else if( length > 320 ) - mMessageLength->setText( TQString( "%1/%2 (%3)" ).tqarg( length ).tqarg( 480 ).tqarg( 3 ) ); + mMessageLength->setText( TQString( "%1/%2 (%3)" ).arg( length ).arg( 480 ).arg( 3 ) ); else if( length > 160 ) - mMessageLength->setText( TQString( "%1/%2 (%3)" ).tqarg( length ).tqarg( 320 ).tqarg( 2 ) ); + mMessageLength->setText( TQString( "%1/%2 (%3)" ).arg( length ).arg( 320 ).arg( 2 ) ); else - mMessageLength->setText( TQString( "%1/%2" ).tqarg( length ).tqarg( 160 ) ); + mMessageLength->setText( TQString( "%1/%2" ).arg( length ).arg( 160 ) ); } void SendSMSDialog::updateButtons() diff --git a/libtdepim/statusbarprogresswidget.cpp b/libtdepim/statusbarprogresswidget.cpp index c417905a0..7471f5880 100644 --- a/libtdepim/statusbarprogresswidget.cpp +++ b/libtdepim/statusbarprogresswidget.cpp @@ -48,7 +48,7 @@ using KPIM::ProgressManager; #include <tqpushbutton.h> #include <tqtooltip.h> #include <klocale.h> -#include <tqlayout.h> +#include <layout.h> #include <tqwidgetstack.h> #include <tqframe.h> @@ -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/testdateedit.cpp b/libtdepim/tests/testdateedit.cpp index 46fabcfe1..a5f1ce7bf 100644 --- a/libtdepim/tests/testdateedit.cpp +++ b/libtdepim/tests/testdateedit.cpp @@ -19,7 +19,7 @@ Boston, MA 02110-1301, USA. */ -#include <tqlayout.h> +#include <layout.h> #include <kaboutdata.h> #include <kapplication.h> @@ -34,10 +34,10 @@ DateEdit::DateEdit( TQWidget *parent, const char *name ) : TQWidget( parent, name ) { - TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); + TQVBoxLayout *layout = new TQVBoxLayout( this ); KDateEdit *edit = new KDateEdit( this ); - tqlayout->addWidget( edit ); + layout->addWidget( edit ); connect( edit, TQT_SIGNAL( dateChanged( const TQDate& ) ), this, TQT_SLOT( dateChanged( const TQDate& ) ) ); diff --git a/libtdepim/tests/testutf7decoder.cpp b/libtdepim/tests/testutf7decoder.cpp index b13fb30c3..9428c8f06 100644 --- a/libtdepim/tests/testutf7decoder.cpp +++ b/libtdepim/tests/testutf7decoder.cpp @@ -1,6 +1,6 @@ #include "qutf7codec.h" #include "qutf7codec.cpp" -#include <tqtextstream.h> +#include <textstream.h> #include <string.h> #include <assert.h> 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/libtdepim/tests/testutf7encoder2.cpp b/libtdepim/tests/testutf7encoder2.cpp index 65cf8b461..20fc52a07 100644 --- a/libtdepim/tests/testutf7encoder2.cpp +++ b/libtdepim/tests/testutf7encoder2.cpp @@ -1,6 +1,6 @@ #include "qutf7codec.h" #include "qutf7codec.cpp" -#include <tqtextstream.h> +#include <textstream.h> #include <string.h> #include <assert.h> #include <iostream> diff --git a/libtdepim/tests/testwizard.cpp b/libtdepim/tests/testwizard.cpp index d9c9d806c..066f74402 100644 --- a/libtdepim/tests/testwizard.cpp +++ b/libtdepim/tests/testwizard.cpp @@ -29,7 +29,7 @@ #include <klocale.h> #include <kcmdlineargs.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> class TestConfigWizard : public KConfigWizard diff --git a/mimelib/doc/msgcmp.html b/mimelib/doc/msgcmp.html index 2e8a3da77..48a7ab549 100644 --- a/mimelib/doc/msgcmp.html +++ b/mimelib/doc/msgcmp.html @@ -143,13 +143,13 @@ These features are the following: <P> <LI> Children. The preceding discussion about a component's parent is relevant - to an understanding of a component's tqchildren. A component's parse method - calls the parse methods of its tqchildren after it has executed its own parse - method (and, in some cases, created all of its tqchildren). Also, a component - typically calls the assemble method of its tqchildren before it executes its + to an understanding of a component's children. A component's parse method + calls the parse methods of its children after it has executed its own parse + method (and, in some cases, created all of its children). Also, a component + typically calls the assemble method of its children before it executes its own. A component's child may request that the component set its is-modified - flag. <B><TT>DwMessageComponent</TT></B> does not deal directly with tqchildren. - Derived classes bear all the responsibility for handling their tqchildren. + flag. <B><TT>DwMessageComponent</TT></B> does not deal directly with children. + Derived classes bear all the responsibility for handling their children. </UL> <H2> <FONT COLOR="navy"> Public Member Functions </FONT> @@ -174,7 +174,7 @@ The third constructor copies <B><TT>aStr</TT></B> to the new <B><TT>aParent</TT></B> as its parent. In typical cases, the virtual member function <B><TT>Parse()</TT></B> should be called immediately after this constructor to parse the new <B><TT>DwMessageComponent</TT></B> object and -all of its tqchildren into their broken-down representations. +all of its children into their broken-down representations. <P> <FONT COLOR="teal"><B> const DwMessageComponent& <A NAME="op_eq">operator =</A> (const DwMessageComponent& aCmp) </B></FONT> @@ -189,11 +189,11 @@ A pure virtual function which provides an interface to the parse method. The parse method, implemented in derived classes, is responsible for extracting the broken-down representation from the string representation. In some derived classes, such as <B><TT>DwHeaders</TT></B>, the parse method is also responsible -for creating the tqchildren of the object. (In the case of -<B><TT>DwHeaders</TT></B>, the tqchildren created are the +for creating the children of the object. (In the case of +<B><TT>DwHeaders</TT></B>, the children created are the <B><TT>DwField</TT></B> objects that represent the <I>field</I>s contained in the <I>headers</I>.) The <B><TT>Parse()</TT></B> function always calls -the <B><TT>Parse()</TT></B> function of all of its tqchildren. +the <B><TT>Parse()</TT></B> function of all of its children. <P> <FONT COLOR="teal"><B> virtual void <A NAME="Assemble">Assemble</A>() = 0 </B></FONT> @@ -203,11 +203,11 @@ The assemble method, implemented in derived classes, is responsible for creating the string representation from the broken-down representation. In other words, the assemble method is the opposite of the parse method. Before assembling its string representation, the assemble method calls the assemble method -of each of its tqchildren. In this way, the entire tree structure that represents +of each of its children. In this way, the entire tree structure that represents a message may be traversed. If the is-modifed flag for a <B><TT>DwMessageComponent</TT></B> is cleared, the <B><TT>Assemble()</TT></B> function will return immediately without calling -the <B><TT>Assemble()</TT></B> function of any of its tqchildren. +the <B><TT>Assemble()</TT></B> function of any of its children. <P> <FONT COLOR="teal"><B> virtual DwMessageComponent* <A NAME="Clone">Clone</A>() const = 0 </B></FONT> @@ -224,7 +224,7 @@ Sets the object's string representation. <B><TT>aCstr</TT></B> must be NUL-terminated. This member function does not invoke the parse method. Typically, the virtual member function <B><TT>Parse()</TT></B> should be called immediately after this member function to parse the -<B><TT>DwMessageComponent</TT></B> object and all of its tqchildren into their +<B><TT>DwMessageComponent</TT></B> object and all of its children into their broken-down representations. See also <B><TT>DwMessageComponent::Parse()</TT></B> <P> diff --git a/mimelib/mimelib/msgcmp.h b/mimelib/mimelib/msgcmp.h index de2c6d891..00b7cb9f7 100644 --- a/mimelib/mimelib/msgcmp.h +++ b/mimelib/mimelib/msgcmp.h @@ -109,16 +109,16 @@ //. //. \item //. Children. The preceding discussion about a component's parent is -//. relevant to an understanding of a component's tqchildren. A component's -//. parse method calls the parse methods of its tqchildren +//. relevant to an understanding of a component's children. A component's +//. parse method calls the parse methods of its children //. after it has executed its own parse method (and, in some cases, created -//. all of its tqchildren). +//. all of its children). //. Also, a component typically calls the assemble method of its -//. tqchildren before it executes its own. A component's child may request +//. children before it executes its own. A component's child may request //. that the component set its is-modified flag. -//. {\tt DwMessageComponent} does not deal directly with tqchildren. +//. {\tt DwMessageComponent} does not deal directly with children. //. Derived classes bear all the responsibility for handling their -//. tqchildren. +//. children. //. \end{enumerate} //============================================================================= //+ Noentry ~DwMessageComponent _PrintDebugInfo mString mIsModified mParent @@ -174,7 +174,7 @@ public: //. {\tt aParent} as its parent. In typical cases, the virtual //. member function {\tt Parse()} should be called immediately after //. this constructor to parse the new {\tt DwMessageComponent} object - //. and all of its tqchildren into their broken-down representations. + //. and all of its children into their broken-down representations. virtual ~DwMessageComponent(); @@ -188,10 +188,10 @@ public: //. responsible for extracting the broken-down representation from //. the string representation. In some derived classes, such as //. {\tt DwHeaders}, the parse method is also responsible for creating the - //. tqchildren of the object. (In the case of {\tt DwHeaders}, the tqchildren + //. children of the object. (In the case of {\tt DwHeaders}, the children //. created are the {\tt DwField} objects that represent the {\it field}s //. contained in the {\it headers}.) The {\tt Parse()} function always - //. calls the {\tt Parse()} function of all of its tqchildren. + //. calls the {\tt Parse()} function of all of its children. virtual void Assemble() = 0; //. A pure virtual function which provides an interface to the @@ -200,11 +200,11 @@ public: //. from the broken-down representation. In other words, the //. assemble method is the opposite of the parse method. Before //. assembling its string representation, the assemble method calls - //. the assemble method of each of its tqchildren. In this way, the + //. the assemble method of each of its children. In this way, the //. entire tree structure that represents a message may be traversed. //. If the is-modifed flag for a {\tt DwMessageComponent} is cleared, //. the {\tt Assemble()} function will return immediately without - //. calling the {\tt Assemble()} function of any of its tqchildren. + //. calling the {\tt Assemble()} function of any of its children. virtual DwMessageComponent* Clone() const = 0; //. Creates a new {\tt DwMessageComponent} on the free store that is of @@ -217,7 +217,7 @@ public: //. NUL-terminated. This member function does not invoke the parse //. method. Typically, the virtual member function {\tt Parse()} //. should be called immediately after this member function to parse - //. the {\tt DwMessageComponent} object and all of its tqchildren into + //. the {\tt DwMessageComponent} object and all of its children into //. their broken-down representations. See also //. {\tt DwMessageComponent::Parse()} diff --git a/plugins/kmail/bodypartformatter/attendeeselector.cpp b/plugins/kmail/bodypartformatter/attendeeselector.cpp index 5311858f0..ca733e7ea 100644 --- a/plugins/kmail/bodypartformatter/attendeeselector.cpp +++ b/plugins/kmail/bodypartformatter/attendeeselector.cpp @@ -26,7 +26,7 @@ #include <klocale.h> #include <kpushbutton.h> -#include <tqlayout.h> +#include <layout.h> AttendeeSelector::AttendeeSelector(TQWidget * parent) : KDialogBase( parent, 0, true, i18n("Select Attendees"), Ok|Cancel, NoDefault, true ) @@ -34,8 +34,8 @@ AttendeeSelector::AttendeeSelector(TQWidget * parent) ui = new AttendeeSelectorWidget( this ); setMainWidget( ui ); - TQGridLayout *tqlayout = static_cast<TQGridLayout*>( ui->tqlayout() ); - tqlayout->setMargin( 0 ); + TQGridLayout *layout = static_cast<TQGridLayout*>( ui->layout() ); + layout->setMargin( 0 ); ui->addButton->setGuiItem( KStdGuiItem::add() ); connect( ui->addButton, TQT_SIGNAL(clicked()), TQT_SLOT(addClicked()) ); diff --git a/plugins/kmail/bodypartformatter/text_calendar.cpp b/plugins/kmail/bodypartformatter/text_calendar.cpp index 6a8e01996..ec585dcc1 100644 --- a/plugins/kmail/bodypartformatter/text_calendar.cpp +++ b/plugins/kmail/bodypartformatter/text_calendar.cpp @@ -78,7 +78,7 @@ #include <tqurl.h> #include <tqdir.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tdepimmacros.h> @@ -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 ) { @@ -344,16 +344,16 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler TQString subject; switch ( type ) { case Answer: - subject = i18n( "Answer: %1" ).tqarg( summary ); + subject = i18n( "Answer: %1" ).arg( summary ); break; case Delegation: - subject = i18n( "Delegated: %1" ).tqarg( summary ); + subject = i18n( "Delegated: %1" ).arg( summary ); break; case Forward: - subject = i18n( "Forwarded: %1" ).tqarg( summary ); + subject = i18n( "Forwarded: %1" ).arg( summary ); break; case DeclineCounter: - subject = i18n( "Declined Counter Proposal: %1" ).tqarg( summary ); + subject = i18n( "Declined Counter Proposal: %1" ).arg( summary ); break; } @@ -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 ); @@ -434,13 +434,13 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler Q_ASSERT( event ); if ( !event->doesFloat() ) { if ( event->dtEnd() < now ) { - warnStr = i18n( "\"%1\" occurred already." ).tqarg( event->summary() ); + warnStr = i18n( "\"%1\" occurred already." ).arg( event->summary() ); } else if ( event->dtStart() <= now && now <= event->dtEnd() ) { - warnStr = i18n( "\"%1\" is currently in-progress." ).tqarg( event->summary() ); + warnStr = i18n( "\"%1\" is currently in-progress." ).arg( event->summary() ); } } else { if ( event->dtEnd().date() < today ) { - warnStr = i18n( "\"%1\" occurred already." ).tqarg( event->summary() ); + warnStr = i18n( "\"%1\" occurred already." ).arg( event->summary() ); } else if ( event->dtStart().date() <= today && today <= event->dtEnd().date() ) { warnStr = i18n( "\"%1\", happening all day today, is currently in-progress." ). arg( event->summary() ); @@ -451,19 +451,19 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler if ( !todo->doesFloat() ) { if ( todo->hasDueDate() ) { if ( todo->dtDue() < now ) { - warnStr = i18n( "\"%1\" is past due." ).tqarg( todo->summary() ); + warnStr = i18n( "\"%1\" is past due." ).arg( todo->summary() ); } else if ( todo->hasStartDate() && todo->dtStart() <= now && now <= todo->dtDue() ) { - warnStr = i18n( "\"%1\" is currently in-progress." ).tqarg( todo->summary() ); + warnStr = i18n( "\"%1\" is currently in-progress." ).arg( todo->summary() ); } } else if ( todo->hasStartDate() ) { if ( todo->dtStart() < now ) { - warnStr = i18n( "\"%1\" has already started." ).tqarg( todo->summary() ); + warnStr = i18n( "\"%1\" has already started." ).arg( todo->summary() ); } } } else { if ( todo->hasDueDate() ) { if ( todo->dtDue().date() < today) { - warnStr = i18n( "\"%1\" is past due." ).tqarg( todo->summary() ); + warnStr = i18n( "\"%1\" is past due." ).arg( todo->summary() ); } else if ( todo->hasStartDate() && todo->dtStart().date() <= today && today <= todo->dtDue().date() ) { warnStr = i18n( "\"%1\", happening all-day today, is currently in-progress." ). @@ -526,12 +526,12 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler } else if ( path.startsWith( "ATTACH:" ) ) { return false; } else { - queryStr = i18n( "%1?" ).tqarg( path ); + queryStr = i18n( "%1?" ).arg( path ); } if ( KMessageBox::warningYesNo( 0, - i18n( "%1\n%2" ).tqarg( warnStr ).tqarg( queryStr ) ) == KMessageBox::No ) { + i18n( "%1\n%2" ).arg( warnStr ).arg( queryStr ) ) == KMessageBox::No ) { return true; } } @@ -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 ); @@ -820,7 +820,7 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler case KMessageBox::No: // means "send email" summary = incidence->summary(); if ( !summary.isEmpty() ) { - summary = i18n( "Re: %1" ).tqarg( summary ); + summary = i18n( "Re: %1" ).arg( summary ); } KApplication::kApplication()->invokeMailer( incidence->organizer().email(), summary ); diff --git a/plugins/kmail/bodypartformatter/text_vcard.cpp b/plugins/kmail/bodypartformatter/text_vcard.cpp index c99fd1c08..ec3a3bfe5 100644 --- a/plugins/kmail/bodypartformatter/text_vcard.cpp +++ b/plugins/kmail/bodypartformatter/text_vcard.cpp @@ -104,7 +104,7 @@ namespace { writer->queue( contact ); TQString addToLinkText = i18n( "[Add this contact to the addressbook]" ); - TQString op = TQString::tqfromLatin1( "addToAddressBook:%1" ).tqarg( count ); + TQString op = TQString::fromLatin1( "addToAddressBook:%1" ).arg( count ); writer->queue( "<div align=\"center\"><a href=\"" + bodyPart->makeLink( op ) + @@ -195,7 +195,7 @@ namespace { if ( a.realName().isEmpty() ) { return i18n( "Add this contact to the address book." ); } else { - return i18n( "Add \"%1\" to the address book." ).tqarg( a.realName() ); + return i18n( "Add \"%1\" to the address book." ).arg( a.realName() ); } } diff --git a/plugins/kmail/bodypartformatter/text_xdiff.cpp b/plugins/kmail/bodypartformatter/text_xdiff.cpp index df89306f6..7fd053472 100644 --- a/plugins/kmail/bodypartformatter/text_xdiff.cpp +++ b/plugins/kmail/bodypartformatter/text_xdiff.cpp @@ -50,7 +50,7 @@ #include <tqurl.h> #include <tqfile.h> #include <tqdir.h> -#include <tqstylesheet.h> +#include <stylesheet.h> namespace { @@ -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..6279596d1 100644 --- a/wizards/egroupwarewizard.cpp +++ b/wizards/egroupwarewizard.cpp @@ -36,7 +36,7 @@ #include <tqcheckbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqwhatsthis.h> @@ -347,7 +347,7 @@ EGroupwareWizard::EGroupwareWizard() : KConfigWizard( new EGroupwarePropagator ) setupRulesPage(); setupChangesPage(); - resize( tqsizeHint() ); + resize( sizeHint() ); } EGroupwareWizard::~EGroupwareWizard() diff --git a/wizards/exchangewizard.cpp b/wizards/exchangewizard.cpp index 84c2a13d1..3705b107e 100644 --- a/wizards/exchangewizard.cpp +++ b/wizards/exchangewizard.cpp @@ -30,7 +30,7 @@ #include <klineedit.h> #include <klocale.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> #include <tqlabel.h> #include <tqspinbox.h> diff --git a/wizards/groupwarewizard.cpp b/wizards/groupwarewizard.cpp index ef8a2b514..592ffa759 100644 --- a/wizards/groupwarewizard.cpp +++ b/wizards/groupwarewizard.cpp @@ -20,7 +20,7 @@ */ #include <tqapplication.h> -#include <tqlayout.h> +#include <layout.h> #include <klocale.h> @@ -33,11 +33,11 @@ GroupwareWizard::GroupwareWizard( TQWidget *parent, const char *name ) { setCaption( i18n( "KDE Groupware Wizard" ) ); - TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); + TQVBoxLayout *layout = new TQVBoxLayout( this ); mOverViewPage = new OverViewPage( this ); - tqlayout->addWidget( mOverViewPage ); + layout->addWidget( mOverViewPage ); connect( mOverViewPage, TQT_SIGNAL( cancel() ), tqApp, TQT_SLOT( quit() ) ); diff --git a/wizards/groupwisewizard.cpp b/wizards/groupwisewizard.cpp index b28095bce..3009e93a1 100644 --- a/wizards/groupwisewizard.cpp +++ b/wizards/groupwisewizard.cpp @@ -36,7 +36,7 @@ #include <tqcheckbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqspinbox.h> #include <tqgroupbox.h> diff --git a/wizards/kmailchanges.cpp b/wizards/kmailchanges.cpp index 160b63eae..191ea8436 100644 --- a/wizards/kmailchanges.cpp +++ b/wizards/kmailchanges.cpp @@ -176,7 +176,7 @@ void CreateDisconnectedImapAccount::apply() transportId = mExistingTransportId; } - c.setGroup( TQString("Account %1").tqarg( accountId ) ); + c.setGroup( TQString("Account %1").arg( accountId ) ); int uid; if ( mExistingAccountId < 0 ) { uid = kapp->random(); @@ -240,7 +240,7 @@ void CreateDisconnectedImapAccount::apply() } - c.setGroup( TQString("Folder-%1").tqarg( uid ) ); + c.setGroup( TQString("Folder-%1").arg( uid ) ); c.writeEntry( "isOpen", true ); c.setGroup( "AccountWizard" ); @@ -249,7 +249,7 @@ void CreateDisconnectedImapAccount::apply() c.setGroup( "Composer" ); c.writeEntry( "default-transport", mAccountName ); - c.setGroup( TQString("Transport %1").tqarg( transportId ) ); + c.setGroup( TQString("Transport %1").arg( transportId ) ); c.writeEntry( "name", mAccountName ); c.writeEntry( "host", mServer ); c.writeEntry( "type", "smtp" ); @@ -318,7 +318,7 @@ void CreateOnlineImapAccount::apply() uint accCnt = c.readNumEntry( "accounts", 0 ); c.writeEntry( "accounts", accCnt+1 ); - c.setGroup( TQString("Account %1").tqarg(accCnt+1) ); + c.setGroup( TQString("Account %1").arg(accCnt+1) ); int uid = kapp->random(); c.writeEntry( "Folder", uid ); c.writeEntry( "Id", uid ); @@ -354,12 +354,12 @@ void CreateOnlineImapAccount::apply() // locally unsubscribe the default folders c.writeEntry( "locally-subscribed-folders", true ); TQString groupwareFolders = TQString("/INBOX/%1/,/INBOX/%2/,/INBOX/%3/,/INBOX/%4/,/INBOX/%5/") - .tqarg( i18n(s_folderContentsType[0]) ).tqarg( i18n(s_folderContentsType[1]) ) - .tqarg( i18n(s_folderContentsType[2]) ).tqarg( i18n(s_folderContentsType[3]) ) - .tqarg( i18n(s_folderContentsType[4]) ); + .arg( i18n(s_folderContentsType[0]) ).arg( i18n(s_folderContentsType[1]) ) + .arg( i18n(s_folderContentsType[2]) ).arg( i18n(s_folderContentsType[3]) ) + .arg( i18n(s_folderContentsType[4]) ); c.writeEntry( "locallyUnsubscribedFolders", groupwareFolders ); - c.setGroup( TQString("Folder-%1").tqarg( uid ) ); + c.setGroup( TQString("Folder-%1").arg( uid ) ); c.writeEntry( "isOpen", true ); diff --git a/wizards/kolabkmailchanges.cpp b/wizards/kolabkmailchanges.cpp index 8f66e5b33..a77de3037 100644 --- a/wizards/kolabkmailchanges.cpp +++ b/wizards/kolabkmailchanges.cpp @@ -34,7 +34,7 @@ class KolabCustomWriter : public CreateDisconnectedImapAccount::CustomWriter { c.setGroup( "IMAP Resource" ); c.writeEntry( "TheIMAPResourceAccount", id ); - c.writeEntry( "TheIMAPResourceFolderParent", TQString(".%1.directory/INBOX").tqarg( id ) ); + c.writeEntry( "TheIMAPResourceFolderParent", TQString(".%1.directory/INBOX").arg( id ) ); } void writeIds( int, int ) {} }; diff --git a/wizards/kolabwizard.cpp b/wizards/kolabwizard.cpp index 36e99bfba..37feb3291 100644 --- a/wizards/kolabwizard.cpp +++ b/wizards/kolabwizard.cpp @@ -38,7 +38,7 @@ #include <tqcheckbox.h> #include <tqhbuttongroup.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqradiobutton.h> #include <tqwhatsthis.h> @@ -81,13 +81,13 @@ class SetupLDAPSearchAccount : public KConfigPropagator::Change bool hasMyServer = false; uint selHosts = c.readNumEntry("NumSelectedHosts", 0); for ( uint i = 0 ; i < selHosts && !hasMyServer; ++i ) - if ( c.readEntry( TQString("SelectedHost%1").tqarg(i) ) == host ) + if ( c.readEntry( TQString("SelectedHost%1").arg(i) ) == host ) hasMyServer = true; if ( !hasMyServer ) { c.writeEntry( "NumSelectedHosts", selHosts + 1 ); - c.writeEntry( TQString("SelectedHost%1").tqarg(selHosts), host); - c.writeEntry( TQString("SelectedBase%1").tqarg(selHosts), basedn); - c.writeEntry( TQString("SelectedPort%1").tqarg(selHosts), "389"); + c.writeEntry( TQString("SelectedHost%1").arg(selHosts), host); + c.writeEntry( TQString("SelectedBase%1").arg(selHosts), basedn); + c.writeEntry( TQString("SelectedPort%1").arg(selHosts), "389"); } } diff --git a/wizards/overviewpage.cpp b/wizards/overviewpage.cpp index 15df0246f..4ed6c4acf 100644 --- a/wizards/overviewpage.cpp +++ b/wizards/overviewpage.cpp @@ -21,7 +21,7 @@ #include <tqbuttongroup.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqradiobutton.h> #include <kaccelmanager.h> @@ -43,29 +43,29 @@ OverViewPage::OverViewPage( TQWidget *parent, const char *name ) : TQWidget( parent, name ) { - TQGridLayout *tqlayout = new TQGridLayout( this, 7, 4, KDialog::marginHint(), + TQGridLayout *layout = new TQGridLayout( this, 7, 4, KDialog::marginHint(), KDialog::spacingHint() ); const TQString msg = i18n( "KDE Groupware Wizard" ); TQLabel *label = new TQLabel( "<qt><b><u><h2>" + msg + "</h2></u></b></qt>" , this ); - tqlayout->addMultiCellWidget( label, 0, 0, 0, 2 ); + layout->addMultiCellWidget( label, 0, 0, 0, 2 ); label = new TQLabel( this ); label->setPixmap( KGlobal::iconLoader()->loadIcon( "network", KIcon::Desktop ) ); - tqlayout->addWidget( label, 0, 3 ); + layout->addWidget( label, 0, 3 ); label = new TQLabel( "", this ); - tqlayout->addWidget( label, 1, 0 ); - tqlayout->setRowSpacing( 1, 20 ); + layout->addWidget( label, 1, 0 ); + layout->setRowSpacing( 1, 20 ); label = new TQLabel( i18n( "Select the type of server you want connect your KDE to:" ), this ); - tqlayout->addMultiCellWidget( label, 2, 2, 0, 3 ); + layout->addMultiCellWidget( label, 2, 2, 0, 3 ); TQPushButton *button; #ifdef WITH_EGROUPWARE button = new TQPushButton( i18n("eGroupware"), this ); - tqlayout->addMultiCellWidget( button, 3, 3, 0, 3 ); + layout->addMultiCellWidget( button, 3, 3, 0, 3 ); connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( showWizardEGroupware() ) ); #endif @@ -73,33 +73,33 @@ OverViewPage::OverViewPage( TQWidget *parent, const char *name ) #ifdef WITH_KOLAB button = new TQPushButton( i18n("Kolab"), this ); - tqlayout->addMultiCellWidget( button, 4, 4, 0, 3 ); + layout->addMultiCellWidget( button, 4, 4, 0, 3 ); connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( showWizardKolab() ) ); #endif #ifdef WITH_SLOX button = new TQPushButton( i18n("SUSE Linux Openexchange (SLOX)"), this ); - tqlayout->addMultiCellWidget( button, 5, 5, 0, 3 ); + layout->addMultiCellWidget( button, 5, 5, 0, 3 ); connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( showWizardSlox() ) ); #endif #ifdef WITH_NEWEXCHANGE button = new TQPushButton( i18n("Microsoft Exchange"), this ); button->hide(); // not quite ready yet - tqlayout->addMultiCellWidget( button, 6, 6, 0, 3 ); + layout->addMultiCellWidget( button, 6, 6, 0, 3 ); connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( showWizardExchange() ) ); #endif TQFrame *frame = new TQFrame( this ); frame->setFrameStyle( TQFrame::HLine | TQFrame::Sunken ); - tqlayout->addMultiCellWidget( frame, 7, 7, 0, 3 ); + layout->addMultiCellWidget( frame, 7, 7, 0, 3 ); TQPushButton *cancelButton = new KPushButton( KStdGuiItem::close(), this ); - tqlayout->addWidget( cancelButton, 8, 3 ); + layout->addWidget( cancelButton, 8, 3 ); connect( cancelButton, TQT_SIGNAL( clicked() ), this, TQT_SIGNAL( cancel() ) ); - tqlayout->setRowStretch( 7, 1 ); + layout->setRowStretch( 7, 1 ); KAcceleratorManager::manage( this ); } diff --git a/wizards/scalixkmailchanges.cpp b/wizards/scalixkmailchanges.cpp index 221e53d61..56c18afe9 100644 --- a/wizards/scalixkmailchanges.cpp +++ b/wizards/scalixkmailchanges.cpp @@ -34,7 +34,7 @@ class ScalixCustomWriter : public CreateDisconnectedImapAccount::CustomWriter { c.setGroup( "IMAP Resource" ); c.writeEntry( "TheIMAPResourceAccount", id ); - c.writeEntry( "TheIMAPResourceFolderParent", TQString(".%1.directory/INBOX").tqarg( id ) ); + c.writeEntry( "TheIMAPResourceFolderParent", TQString(".%1.directory/INBOX").arg( id ) ); c.writeEntry( "HideGroupwareFolders", false ); } void writeIds( int, int ) {} diff --git a/wizards/scalixwizard.cpp b/wizards/scalixwizard.cpp index b9ecfa10f..e1e1954c1 100644 --- a/wizards/scalixwizard.cpp +++ b/wizards/scalixwizard.cpp @@ -43,7 +43,7 @@ #include <tqcheckbox.h> #include <tqhbuttongroup.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqwhatsthis.h> #include <unistd.h> @@ -74,13 +74,13 @@ class SetupLDAPSearchAccount : public KConfigPropagator::Change bool hasMyServer = false; uint selHosts = c.readNumEntry("NumSelectedHosts", 0); for ( uint i = 0 ; i < selHosts && !hasMyServer; ++i ) - if ( c.readEntry( TQString("SelectedHost%1").tqarg(i) ) == host ) + if ( c.readEntry( TQString("SelectedHost%1").arg(i) ) == host ) hasMyServer = true; if ( !hasMyServer ) { c.writeEntry( "NumSelectedHosts", selHosts + 1 ); - c.writeEntry( TQString("SelectedHost%1").tqarg(selHosts), host); - c.writeEntry( TQString("SelectedBase%1").tqarg(selHosts), basedn); - c.writeEntry( TQString("SelectedPort%1").tqarg(selHosts), "389"); + c.writeEntry( TQString("SelectedHost%1").arg(selHosts), host); + c.writeEntry( TQString("SelectedBase%1").arg(selHosts), basedn); + c.writeEntry( TQString("SelectedPort%1").arg(selHosts), "389"); } } diff --git a/wizards/sloxwizard.cpp b/wizards/sloxwizard.cpp index 5d5481b94..b65e519c9 100644 --- a/wizards/sloxwizard.cpp +++ b/wizards/sloxwizard.cpp @@ -31,7 +31,7 @@ #include <klineedit.h> #include <klocale.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> #include <tqlabel.h> |